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 v2 18/22] pci: Switch trap handling to use MMIO handler Date: Thu, 25 Feb 2021 00:59:11 +0000 [thread overview] Message-ID: <20210225005915.26423-19-andre.przywara@arm.com> (raw) In-Reply-To: <20210225005915.26423-1-andre.przywara@arm.com> With the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype. Merge the existing _in and _out handlers to adhere to that MMIO interface, and register these using the new registration function. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- pci.c | 82 +++++++++++++++++------------------------------------------ 1 file changed, 24 insertions(+), 58 deletions(-) diff --git a/pci.c b/pci.c index 2e2c0270..d6da79e0 100644 --- a/pci.c +++ b/pci.c @@ -87,29 +87,16 @@ static void *pci_config_address_ptr(u16 port) return base + offset; } -static bool pci_config_address_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static void pci_config_address_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, + u32 len, u8 is_write, void *ptr) { - void *p = pci_config_address_ptr(port); + void *p = pci_config_address_ptr(addr); - memcpy(p, data, size); - - return true; -} - -static bool pci_config_address_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - void *p = pci_config_address_ptr(port); - - memcpy(data, p, size); - - return true; + if (is_write) + memcpy(p, data, len); + else + memcpy(data, p, len); } - -static struct ioport_operations pci_config_address_ops = { - .io_in = pci_config_address_in, - .io_out = pci_config_address_out, -}; - static bool pci_device_exists(u8 bus_number, u8 device_number, u8 function_number) { union pci_config_address pci_config_address; @@ -125,49 +112,27 @@ static bool pci_device_exists(u8 bus_number, u8 device_number, u8 function_numbe return !IS_ERR_OR_NULL(device__find_dev(DEVICE_BUS_PCI, device_number)); } -static bool pci_config_data_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - union pci_config_address pci_config_address; - - if (size > 4) - size = 4; - - pci_config_address.w = ioport__read32(&pci_config_address_bits); - /* - * If someone accesses PCI configuration space offsets that are not - * aligned to 4 bytes, it uses ioports to signify that. - */ - pci_config_address.reg_offset = port - PCI_CONFIG_DATA; - - pci__config_wr(vcpu->kvm, pci_config_address, data, size); - - return true; -} - -static bool pci_config_data_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static void pci_config_data_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, + u32 len, u8 is_write, void *kvm) { union pci_config_address pci_config_address; - if (size > 4) - size = 4; + if (len > 4) + len = 4; pci_config_address.w = ioport__read32(&pci_config_address_bits); /* * If someone accesses PCI configuration space offsets that are not * aligned to 4 bytes, it uses ioports to signify that. */ - pci_config_address.reg_offset = port - PCI_CONFIG_DATA; + pci_config_address.reg_offset = addr - PCI_CONFIG_DATA; - pci__config_rd(vcpu->kvm, pci_config_address, data, size); - - return true; + if (is_write) + pci__config_wr(vcpu->kvm, pci_config_address, data, len); + else + pci__config_rd(vcpu->kvm, pci_config_address, data, len); } -static struct ioport_operations pci_config_data_ops = { - .io_in = pci_config_data_in, - .io_out = pci_config_data_out, -}; - static int pci_activate_bar(struct kvm *kvm, struct pci_device_header *pci_hdr, int bar_num) { @@ -512,11 +477,12 @@ int pci__init(struct kvm *kvm) { int r; - r = ioport__register(kvm, PCI_CONFIG_DATA + 0, &pci_config_data_ops, 4, NULL); + r = kvm__register_pio(kvm, PCI_CONFIG_DATA, 4, + pci_config_data_mmio, NULL); if (r < 0) return r; - - r = ioport__register(kvm, PCI_CONFIG_ADDRESS + 0, &pci_config_address_ops, 4, NULL); + r = kvm__register_pio(kvm, PCI_CONFIG_ADDRESS, 4, + pci_config_address_mmio, NULL); if (r < 0) goto err_unregister_data; @@ -528,17 +494,17 @@ int pci__init(struct kvm *kvm) return 0; err_unregister_addr: - ioport__unregister(kvm, PCI_CONFIG_ADDRESS); + kvm__deregister_pio(kvm, PCI_CONFIG_ADDRESS); err_unregister_data: - ioport__unregister(kvm, PCI_CONFIG_DATA); + kvm__deregister_pio(kvm, PCI_CONFIG_DATA); return r; } dev_base_init(pci__init); int pci__exit(struct kvm *kvm) { - ioport__unregister(kvm, PCI_CONFIG_DATA); - ioport__unregister(kvm, PCI_CONFIG_ADDRESS); + kvm__deregister_pio(kvm, PCI_CONFIG_DATA); + kvm__deregister_pio(kvm, PCI_CONFIG_ADDRESS); return 0; } -- 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 v2 18/22] pci: Switch trap handling to use MMIO handler Date: Thu, 25 Feb 2021 00:59:11 +0000 [thread overview] Message-ID: <20210225005915.26423-19-andre.przywara@arm.com> (raw) In-Reply-To: <20210225005915.26423-1-andre.przywara@arm.com> With the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype. Merge the existing _in and _out handlers to adhere to that MMIO interface, and register these using the new registration function. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- pci.c | 82 +++++++++++++++++------------------------------------------ 1 file changed, 24 insertions(+), 58 deletions(-) diff --git a/pci.c b/pci.c index 2e2c0270..d6da79e0 100644 --- a/pci.c +++ b/pci.c @@ -87,29 +87,16 @@ static void *pci_config_address_ptr(u16 port) return base + offset; } -static bool pci_config_address_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static void pci_config_address_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, + u32 len, u8 is_write, void *ptr) { - void *p = pci_config_address_ptr(port); + void *p = pci_config_address_ptr(addr); - memcpy(p, data, size); - - return true; -} - -static bool pci_config_address_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - void *p = pci_config_address_ptr(port); - - memcpy(data, p, size); - - return true; + if (is_write) + memcpy(p, data, len); + else + memcpy(data, p, len); } - -static struct ioport_operations pci_config_address_ops = { - .io_in = pci_config_address_in, - .io_out = pci_config_address_out, -}; - static bool pci_device_exists(u8 bus_number, u8 device_number, u8 function_number) { union pci_config_address pci_config_address; @@ -125,49 +112,27 @@ static bool pci_device_exists(u8 bus_number, u8 device_number, u8 function_numbe return !IS_ERR_OR_NULL(device__find_dev(DEVICE_BUS_PCI, device_number)); } -static bool pci_config_data_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - union pci_config_address pci_config_address; - - if (size > 4) - size = 4; - - pci_config_address.w = ioport__read32(&pci_config_address_bits); - /* - * If someone accesses PCI configuration space offsets that are not - * aligned to 4 bytes, it uses ioports to signify that. - */ - pci_config_address.reg_offset = port - PCI_CONFIG_DATA; - - pci__config_wr(vcpu->kvm, pci_config_address, data, size); - - return true; -} - -static bool pci_config_data_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static void pci_config_data_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, + u32 len, u8 is_write, void *kvm) { union pci_config_address pci_config_address; - if (size > 4) - size = 4; + if (len > 4) + len = 4; pci_config_address.w = ioport__read32(&pci_config_address_bits); /* * If someone accesses PCI configuration space offsets that are not * aligned to 4 bytes, it uses ioports to signify that. */ - pci_config_address.reg_offset = port - PCI_CONFIG_DATA; + pci_config_address.reg_offset = addr - PCI_CONFIG_DATA; - pci__config_rd(vcpu->kvm, pci_config_address, data, size); - - return true; + if (is_write) + pci__config_wr(vcpu->kvm, pci_config_address, data, len); + else + pci__config_rd(vcpu->kvm, pci_config_address, data, len); } -static struct ioport_operations pci_config_data_ops = { - .io_in = pci_config_data_in, - .io_out = pci_config_data_out, -}; - static int pci_activate_bar(struct kvm *kvm, struct pci_device_header *pci_hdr, int bar_num) { @@ -512,11 +477,12 @@ int pci__init(struct kvm *kvm) { int r; - r = ioport__register(kvm, PCI_CONFIG_DATA + 0, &pci_config_data_ops, 4, NULL); + r = kvm__register_pio(kvm, PCI_CONFIG_DATA, 4, + pci_config_data_mmio, NULL); if (r < 0) return r; - - r = ioport__register(kvm, PCI_CONFIG_ADDRESS + 0, &pci_config_address_ops, 4, NULL); + r = kvm__register_pio(kvm, PCI_CONFIG_ADDRESS, 4, + pci_config_address_mmio, NULL); if (r < 0) goto err_unregister_data; @@ -528,17 +494,17 @@ int pci__init(struct kvm *kvm) return 0; err_unregister_addr: - ioport__unregister(kvm, PCI_CONFIG_ADDRESS); + kvm__deregister_pio(kvm, PCI_CONFIG_ADDRESS); err_unregister_data: - ioport__unregister(kvm, PCI_CONFIG_DATA); + kvm__deregister_pio(kvm, PCI_CONFIG_DATA); return r; } dev_base_init(pci__init); int pci__exit(struct kvm *kvm) { - ioport__unregister(kvm, PCI_CONFIG_DATA); - ioport__unregister(kvm, PCI_CONFIG_ADDRESS); + kvm__deregister_pio(kvm, PCI_CONFIG_DATA); + kvm__deregister_pio(kvm, PCI_CONFIG_ADDRESS); return 0; } -- 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-02-25 1:04 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-25 0:58 [PATCH kvmtool v2 00/22] Unify I/O port and MMIO trap handling Andre Przywara 2021-02-25 0:58 ` Andre Przywara 2021-02-25 0:58 ` [PATCH kvmtool v2 01/22] ioport: Remove ioport__setup_arch() Andre Przywara 2021-02-25 0:58 ` Andre Przywara 2021-03-02 18:02 ` Alexandru Elisei 2021-03-02 18:02 ` Alexandru Elisei 2021-02-25 0:58 ` [PATCH kvmtool v2 02/22] hw/serial: Use device abstraction for FDT generator function Andre Przywara 2021-02-25 0:58 ` Andre Przywara 2021-02-25 0:58 ` [PATCH kvmtool v2 03/22] ioport: Retire .generate_fdt_node functionality Andre Przywara 2021-02-25 0:58 ` Andre Przywara 2021-02-25 0:58 ` [PATCH kvmtool v2 04/22] mmio: Extend handling to include ioport emulation Andre Przywara 2021-02-25 0:58 ` Andre Przywara 2021-03-03 17:58 ` Alexandru Elisei 2021-03-03 17:58 ` Alexandru Elisei 2021-03-15 12:24 ` Andre Przywara 2021-03-15 12:24 ` Andre Przywara 2021-02-25 0:58 ` [PATCH kvmtool v2 05/22] hw/i8042: Clean up data types Andre Przywara 2021-02-25 0:58 ` Andre Przywara 2021-02-25 0:58 ` [PATCH kvmtool v2 06/22] hw/i8042: Refactor trap handler Andre Przywara 2021-02-25 0:58 ` Andre Przywara 2021-03-08 17:16 ` Alexandru Elisei 2021-03-08 17:16 ` Alexandru Elisei 2021-02-25 0:59 ` [PATCH kvmtool v2 07/22] hw/i8042: Switch to new trap handlers Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-08 17:22 ` Alexandru Elisei 2021-03-08 17:22 ` Alexandru Elisei 2021-02-25 0:59 ` [PATCH kvmtool v2 08/22] x86/ioport: Refactor " Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-09 11:49 ` Alexandru Elisei 2021-03-09 11:49 ` Alexandru Elisei 2021-03-15 12:26 ` Andre Przywara 2021-03-15 12:26 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 09/22] x86/ioport: Switch to new " Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-09 12:09 ` Alexandru Elisei 2021-03-09 12:09 ` Alexandru Elisei 2021-03-15 12:26 ` Andre Przywara 2021-03-15 12:26 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 10/22] hw/rtc: Refactor " Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 11/22] hw/rtc: Switch to new trap handler Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 12/22] hw/vesa: Switch trap handling to use MMIO handler Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 13/22] hw/serial: Refactor trap handler Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-12 11:29 ` Alexandru Elisei 2021-03-12 11:29 ` Alexandru Elisei 2021-03-15 12:26 ` Andre Przywara 2021-03-15 12:26 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 14/22] hw/serial: Switch to new trap handlers Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 15/22] vfio: Refactor ioport trap handler Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-09 14:21 ` Alexandru Elisei 2021-03-09 14:21 ` Alexandru Elisei 2021-02-25 0:59 ` [PATCH kvmtool v2 16/22] vfio: Switch to new ioport trap handlers Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 17/22] virtio: Switch trap handling to use MMIO handler Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-09 14:43 ` Alexandru Elisei 2021-03-09 14:43 ` Alexandru Elisei 2021-02-25 0:59 ` Andre Przywara [this message] 2021-02-25 0:59 ` [PATCH kvmtool v2 18/22] pci: " Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 19/22] Remove ioport specific routines Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-09 15:13 ` Alexandru Elisei 2021-03-09 15:13 ` Alexandru Elisei 2021-02-25 0:59 ` [PATCH kvmtool v2 20/22] arm: Reorganise and document memory map Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-09 15:46 ` Alexandru Elisei 2021-03-09 15:46 ` Alexandru Elisei 2021-03-15 12:27 ` Andre Przywara 2021-03-15 12:27 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 21/22] hw/serial: ARM/arm64: Use MMIO at higher addresses Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-09 16:02 ` Alexandru Elisei 2021-03-09 16:02 ` Alexandru Elisei 2021-03-15 12:27 ` Andre Przywara 2021-03-15 12:27 ` Andre Przywara 2021-02-25 0:59 ` [PATCH kvmtool v2 22/22] hw/rtc: " Andre Przywara 2021-02-25 0:59 ` Andre Przywara 2021-03-09 16:06 ` Alexandru Elisei 2021-03-09 16:06 ` Alexandru Elisei 2021-03-02 17:57 ` [PATCH kvmtool v2 00/22] Unify I/O port and MMIO trap handling Alexandru Elisei 2021-03-02 17:57 ` Alexandru Elisei 2021-03-03 18:41 ` Andre Przywara 2021-03-03 18:41 ` Andre Przywara
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=20210225005915.26423-19-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.