From: Andre Przywara <andre.przywara@arm.com> To: Will Deacon <will@kernel.org>, Julien Thierry <julien.thierry.kdev@gmail.com> Cc: Alexandru Elisei <alexandru.elisei@arm.com>, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, Marc Zyngier <maz@kernel.org>, Sami Mujawar <sami.mujawar@arm.com> Subject: [PATCH kvmtool v3 14/22] hw/serial: Switch to new trap handlers Date: Mon, 15 Mar 2021 15:33:42 +0000 [thread overview] Message-ID: <20210315153350.19988-15-andre.przywara@arm.com> (raw) In-Reply-To: <20210315153350.19988-1-andre.przywara@arm.com> Now that the serial device has a trap handler adhering to the MMIO fault handler prototype, let's switch over to the joint registration routine. This allows us to get rid of the ioport shim routines. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- hw/serial.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index 3f797452..16af493b 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -393,26 +393,6 @@ static void serial8250_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, 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; @@ -450,11 +430,6 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, } #endif -static struct ioport_operations serial8250_ops = { - .io_in = serial8250_ioport_in, - .io_out = serial8250_ioport_out, -}; - static int serial8250__device_init(struct kvm *kvm, struct serial8250_device *dev) { @@ -465,7 +440,7 @@ static int serial8250__device_init(struct kvm *kvm, return r; ioport__map_irq(&dev->irq); - r = ioport__register(kvm, dev->iobase, &serial8250_ops, 8, dev); + r = kvm__register_pio(kvm, dev->iobase, 8, serial8250_mmio, dev); return r; } @@ -488,7 +463,7 @@ cleanup: for (j = 0; j <= i; j++) { struct serial8250_device *dev = &devices[j]; - ioport__unregister(kvm, dev->iobase); + kvm__deregister_pio(kvm, dev->iobase); device__unregister(&dev->dev_hdr); } @@ -504,7 +479,7 @@ int serial8250__exit(struct kvm *kvm) for (i = 0; i < ARRAY_SIZE(devices); i++) { struct serial8250_device *dev = &devices[i]; - r = ioport__unregister(kvm, dev->iobase); + r = kvm__deregister_pio(kvm, dev->iobase); if (r < 0) return r; device__unregister(&dev->dev_hdr); -- 2.17.5
WARNING: multiple messages have this Message-ID (diff)
From: Andre Przywara <andre.przywara@arm.com> To: Will Deacon <will@kernel.org>, Julien Thierry <julien.thierry.kdev@gmail.com> Cc: Marc Zyngier <maz@kernel.org>, Sami Mujawar <sami.mujawar@arm.com>, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [PATCH kvmtool v3 14/22] hw/serial: Switch to new trap handlers Date: Mon, 15 Mar 2021 15:33:42 +0000 [thread overview] Message-ID: <20210315153350.19988-15-andre.przywara@arm.com> (raw) In-Reply-To: <20210315153350.19988-1-andre.przywara@arm.com> Now that the serial device has a trap handler adhering to the MMIO fault handler prototype, let's switch over to the joint registration routine. This allows us to get rid of the ioport shim routines. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- hw/serial.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/hw/serial.c b/hw/serial.c index 3f797452..16af493b 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -393,26 +393,6 @@ static void serial8250_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, 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; @@ -450,11 +430,6 @@ void serial8250_generate_fdt_node(void *fdt, struct device_header *dev_hdr, } #endif -static struct ioport_operations serial8250_ops = { - .io_in = serial8250_ioport_in, - .io_out = serial8250_ioport_out, -}; - static int serial8250__device_init(struct kvm *kvm, struct serial8250_device *dev) { @@ -465,7 +440,7 @@ static int serial8250__device_init(struct kvm *kvm, return r; ioport__map_irq(&dev->irq); - r = ioport__register(kvm, dev->iobase, &serial8250_ops, 8, dev); + r = kvm__register_pio(kvm, dev->iobase, 8, serial8250_mmio, dev); return r; } @@ -488,7 +463,7 @@ cleanup: for (j = 0; j <= i; j++) { struct serial8250_device *dev = &devices[j]; - ioport__unregister(kvm, dev->iobase); + kvm__deregister_pio(kvm, dev->iobase); device__unregister(&dev->dev_hdr); } @@ -504,7 +479,7 @@ int serial8250__exit(struct kvm *kvm) for (i = 0; i < ARRAY_SIZE(devices); i++) { struct serial8250_device *dev = &devices[i]; - r = ioport__unregister(kvm, dev->iobase); + r = kvm__deregister_pio(kvm, dev->iobase); if (r < 0) return r; device__unregister(&dev->dev_hdr); -- 2.17.5 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-03-15 15:35 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-15 15:33 [PATCH kvmtool v3 00/22] Unify I/O port and MMIO trap handling Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 01/22] ioport: Remove ioport__setup_arch() Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 02/22] hw/serial: Use device abstraction for FDT generator function Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 03/22] ioport: Retire .generate_fdt_node functionality Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 04/22] mmio: Extend handling to include ioport emulation Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 05/22] hw/i8042: Clean up data types Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 06/22] hw/i8042: Refactor trap handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 07/22] hw/i8042: Switch to new trap handlers Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 08/22] x86/ioport: Refactor " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 09/22] x86/ioport: Switch to new " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 10/22] hw/rtc: Refactor " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 11/22] hw/rtc: Switch to new trap handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 12/22] hw/vesa: Switch trap handling to use MMIO handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 13/22] hw/serial: Refactor trap handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-16 15:40 ` Alexandru Elisei 2021-03-16 15:40 ` Alexandru Elisei 2021-03-15 15:33 ` Andre Przywara [this message] 2021-03-15 15:33 ` [PATCH kvmtool v3 14/22] hw/serial: Switch to new trap handlers Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 15/22] vfio: Refactor ioport trap handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 16/22] vfio: Switch to new ioport trap handlers Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 17/22] virtio: Switch trap handling to use MMIO handler Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 18/22] pci: " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 19/22] Remove ioport specific routines Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-15 15:33 ` [PATCH kvmtool v3 20/22] arm: Reorganise and document memory map Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-17 15:17 ` Alexandru Elisei 2021-03-17 15:17 ` Alexandru Elisei 2021-03-15 15:33 ` [PATCH kvmtool v3 21/22] hw/serial: ARM/arm64: Use MMIO at higher addresses Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-17 16:17 ` Alexandru Elisei 2021-03-17 16:17 ` Alexandru Elisei 2021-03-15 15:33 ` [PATCH kvmtool v3 22/22] hw/rtc: " Andre Przywara 2021-03-15 15:33 ` Andre Przywara 2021-03-17 17:44 ` [PATCH kvmtool v3 00/22] Unify I/O port and MMIO trap handling Alexandru Elisei 2021-03-17 17:44 ` Alexandru Elisei 2021-03-18 10:04 ` Will Deacon 2021-03-18 10:04 ` Will Deacon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210315153350.19988-15-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=alexandru.elisei@arm.com \ --cc=julien.thierry.kdev@gmail.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=maz@kernel.org \ --cc=sami.mujawar@arm.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.