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 03/22] ioport: Retire .generate_fdt_node functionality Date: Thu, 25 Feb 2021 00:58:56 +0000 [thread overview] Message-ID: <20210225005915.26423-4-andre.przywara@arm.com> (raw) In-Reply-To: <20210225005915.26423-1-andre.przywara@arm.com> The ioport routines support a special way of registering FDT node generator functions. There is no reason to have this separate from the already existing way via the device header. Now that the only user of this special ioport variety has been transferred, we can retire this code, to simplify ioport handling. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- include/kvm/ioport.h | 4 ---- ioport.c | 34 ---------------------------------- 2 files changed, 38 deletions(-) diff --git a/include/kvm/ioport.h b/include/kvm/ioport.h index d0213541..a61038e2 100644 --- a/include/kvm/ioport.h +++ b/include/kvm/ioport.h @@ -29,10 +29,6 @@ struct ioport { struct ioport_operations { bool (*io_in)(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size); bool (*io_out)(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size); - void (*generate_fdt_node)(struct ioport *ioport, void *fdt, - void (*generate_irq_prop)(void *fdt, - u8 irq, - enum irq_type)); }; void ioport__map_irq(u8 *irq); diff --git a/ioport.c b/ioport.c index a6972179..e0123f27 100644 --- a/ioport.c +++ b/ioport.c @@ -56,7 +56,6 @@ static struct ioport *ioport_get(struct rb_root *root, u64 addr) /* Called with ioport_lock held. */ static void ioport_unregister(struct rb_root *root, struct ioport *data) { - device__unregister(&data->dev_hdr); ioport_remove(root, data); free(data); } @@ -70,30 +69,6 @@ static void ioport_put(struct rb_root *root, struct ioport *data) mutex_unlock(&ioport_lock); } -#ifdef CONFIG_HAS_LIBFDT -static void generate_ioport_fdt_node(void *fdt, - struct device_header *dev_hdr, - void (*generate_irq_prop)(void *fdt, - u8 irq, - enum irq_type)) -{ - struct ioport *ioport = container_of(dev_hdr, struct ioport, dev_hdr); - struct ioport_operations *ops = ioport->ops; - - if (ops->generate_fdt_node) - ops->generate_fdt_node(ioport, fdt, generate_irq_prop); -} -#else -static void generate_ioport_fdt_node(void *fdt, - struct device_header *dev_hdr, - void (*generate_irq_prop)(void *fdt, - u8 irq, - enum irq_type)) -{ - die("Unable to generate device tree nodes without libfdt\n"); -} -#endif - int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, int count, void *param) { struct ioport *entry; @@ -107,10 +82,6 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i .node = RB_INT_INIT(port, port + count), .ops = ops, .priv = param, - .dev_hdr = (struct device_header) { - .bus_type = DEVICE_BUS_IOPORT, - .data = generate_ioport_fdt_node, - }, /* * Start from 0 because ioport__unregister() doesn't decrement * the reference count. @@ -123,15 +94,10 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i r = ioport_insert(&ioport_tree, entry); if (r < 0) goto out_free; - r = device__register(&entry->dev_hdr); - if (r < 0) - goto out_remove; mutex_unlock(&ioport_lock); return port; -out_remove: - ioport_remove(&ioport_tree, entry); out_free: free(entry); mutex_unlock(&ioport_lock); -- 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 03/22] ioport: Retire .generate_fdt_node functionality Date: Thu, 25 Feb 2021 00:58:56 +0000 [thread overview] Message-ID: <20210225005915.26423-4-andre.przywara@arm.com> (raw) In-Reply-To: <20210225005915.26423-1-andre.przywara@arm.com> The ioport routines support a special way of registering FDT node generator functions. There is no reason to have this separate from the already existing way via the device header. Now that the only user of this special ioport variety has been transferred, we can retire this code, to simplify ioport handling. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> --- include/kvm/ioport.h | 4 ---- ioport.c | 34 ---------------------------------- 2 files changed, 38 deletions(-) diff --git a/include/kvm/ioport.h b/include/kvm/ioport.h index d0213541..a61038e2 100644 --- a/include/kvm/ioport.h +++ b/include/kvm/ioport.h @@ -29,10 +29,6 @@ struct ioport { struct ioport_operations { bool (*io_in)(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size); bool (*io_out)(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size); - void (*generate_fdt_node)(struct ioport *ioport, void *fdt, - void (*generate_irq_prop)(void *fdt, - u8 irq, - enum irq_type)); }; void ioport__map_irq(u8 *irq); diff --git a/ioport.c b/ioport.c index a6972179..e0123f27 100644 --- a/ioport.c +++ b/ioport.c @@ -56,7 +56,6 @@ static struct ioport *ioport_get(struct rb_root *root, u64 addr) /* Called with ioport_lock held. */ static void ioport_unregister(struct rb_root *root, struct ioport *data) { - device__unregister(&data->dev_hdr); ioport_remove(root, data); free(data); } @@ -70,30 +69,6 @@ static void ioport_put(struct rb_root *root, struct ioport *data) mutex_unlock(&ioport_lock); } -#ifdef CONFIG_HAS_LIBFDT -static void generate_ioport_fdt_node(void *fdt, - struct device_header *dev_hdr, - void (*generate_irq_prop)(void *fdt, - u8 irq, - enum irq_type)) -{ - struct ioport *ioport = container_of(dev_hdr, struct ioport, dev_hdr); - struct ioport_operations *ops = ioport->ops; - - if (ops->generate_fdt_node) - ops->generate_fdt_node(ioport, fdt, generate_irq_prop); -} -#else -static void generate_ioport_fdt_node(void *fdt, - struct device_header *dev_hdr, - void (*generate_irq_prop)(void *fdt, - u8 irq, - enum irq_type)) -{ - die("Unable to generate device tree nodes without libfdt\n"); -} -#endif - int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, int count, void *param) { struct ioport *entry; @@ -107,10 +82,6 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i .node = RB_INT_INIT(port, port + count), .ops = ops, .priv = param, - .dev_hdr = (struct device_header) { - .bus_type = DEVICE_BUS_IOPORT, - .data = generate_ioport_fdt_node, - }, /* * Start from 0 because ioport__unregister() doesn't decrement * the reference count. @@ -123,15 +94,10 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i r = ioport_insert(&ioport_tree, entry); if (r < 0) goto out_free; - r = device__register(&entry->dev_hdr); - if (r < 0) - goto out_remove; mutex_unlock(&ioport_lock); return port; -out_remove: - ioport_remove(&ioport_tree, entry); out_free: free(entry); mutex_unlock(&ioport_lock); -- 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:01 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 ` Andre Przywara [this message] 2021-02-25 0:58 ` [PATCH kvmtool v2 03/22] ioport: Retire .generate_fdt_node functionality 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 ` [PATCH kvmtool v2 18/22] pci: " Andre Przywara 2021-02-25 0:59 ` 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-4-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.