hw/serial: Refactor trap handler
With the planned retirement of the special ioport emulation code, we
need to provide an emulation function compatible with the MMIO prototype.
Adjust the trap handler to use that new function, and provide shims to
implement the old ioport interface, for now.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Link: https://lore.kernel.org/r/20210315153350.19988-14-andre.przywara@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
diff --git a/hw/serial.c b/hw/serial.c
index b0465d9..3f79745 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -242,18 +242,14 @@
sysrq_pending = sysrq;
}
-static bool serial8250_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port,
- void *data, int size)
+static bool serial8250_out(struct serial8250_device *dev, struct kvm_cpu *vcpu,
+ u16 offset, void *data)
{
- struct serial8250_device *dev = ioport->priv;
- u16 offset;
bool ret = true;
char *addr = data;
mutex_lock(&dev->mutex);
- offset = port - dev->iobase;
-
switch (offset) {
case UART_TX:
if (dev->lcr & UART_LCR_DLAB) {
@@ -336,16 +332,13 @@
}
}
-static bool serial8250_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
+static bool serial8250_in(struct serial8250_device *dev, struct kvm_cpu *vcpu,
+ u16 offset, void *data)
{
- struct serial8250_device *dev = ioport->priv;
- u16 offset;
bool ret = true;
mutex_lock(&dev->mutex);
- offset = port - dev->iobase;
-
switch (offset) {
case UART_RX:
if (dev->lcr & UART_LCR_DLAB)
@@ -389,6 +382,37 @@
return ret;
}
+static void serial8250_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len,
+ u8 is_write, void *ptr)
+{
+ struct serial8250_device *dev = ptr;
+
+ if (is_write)
+ serial8250_out(dev, vcpu, addr - dev->iobase, data);
+ else
+ serial8250_in(dev, vcpu, addr - dev->iobase, data);
+}
+
+static bool serial8250_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu,
+ u16 port, void *data, int size)
+{
+ struct serial8250_device *dev = ioport->priv;
+
+ serial8250_mmio(vcpu, port, data, 1, true, dev);
+
+ return true;
+}
+
+static bool serial8250_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu,
+ u16 port, void *data, int size)
+{
+ struct serial8250_device *dev = ioport->priv;
+
+ serial8250_mmio(vcpu, port, data, 1, false, dev);
+
+ return true;
+}
+
#ifdef CONFIG_HAS_LIBFDT
char *fdt_stdout_path = NULL;
@@ -427,8 +451,8 @@
#endif
static struct ioport_operations serial8250_ops = {
- .io_in = serial8250_in,
- .io_out = serial8250_out,
+ .io_in = serial8250_ioport_in,
+ .io_out = serial8250_ioport_out,
};
static int serial8250__device_init(struct kvm *kvm,
