From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>, Ashok Raj <ashok.raj@intel.com>, linux-pci@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Santosh Shilimkar <ssantosh@kernel.org>, iommu@lists.linux-foundation.org, dmaengine@vger.kernel.org, Stuart Yoder <stuyoder@gmail.com>, Laurentiu Tudor <laurentiu.tudor@nxp.com>, Nishanth Menon <nm@ti.com>, Tero Kristo <kristo@kernel.org>, linux-arm-kernel@lists.infradead.org, x86@kernel.org, Vinod Koul <vkoul@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Will Deacon <will@kernel.org>, Sinan Kaya <okaya@kernel.org> Subject: [patch 08/37] genirq/msi: Provide msi_device_populate/destroy_sysfs() Date: Sat, 27 Nov 2021 02:20:19 +0100 (CET) [thread overview] Message-ID: <20211126230524.416227100@linutronix.de> (raw) In-Reply-To: 20211126224100.303046749@linutronix.de Add new allocation functions which can be activated by domain info flags. They store the groups pointer in struct msi_device_data. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/linux/msi.h | 12 +++++++++++- kernel/irq/msi.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 3 deletions(-) --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -174,9 +174,11 @@ struct msi_desc { /** * msi_device_data - MSI per device data * @lock: Spinlock to protect register access + * @attrs: Pointer to the sysfs attribute group */ struct msi_device_data { - raw_spinlock_t lock; + raw_spinlock_t lock; + const struct attribute_group **attrs; }; int msi_setup_device_data(struct device *dev); @@ -242,10 +244,16 @@ void pci_msi_mask_irq(struct irq_data *d void pci_msi_unmask_irq(struct irq_data *data); #ifdef CONFIG_SYSFS +int msi_device_populate_sysfs(struct device *dev); +void msi_device_destroy_sysfs(struct device *dev); + const struct attribute_group **msi_populate_sysfs(struct device *dev); void msi_destroy_sysfs(struct device *dev, const struct attribute_group **msi_irq_groups); #else +static inline int msi_device_populate_sysfs(struct device *dev) { return 0; } +static inline void msi_device_destroy_sysfs(struct device *dev) { } + static inline const struct attribute_group **msi_populate_sysfs(struct device *dev) { return NULL; @@ -393,6 +401,8 @@ enum { MSI_FLAG_MUST_REACTIVATE = (1 << 5), /* Is level-triggered capable, using two messages */ MSI_FLAG_LEVEL_CAPABLE = (1 << 6), + /* Populate sysfs on alloc() and destroy it on free() */ + MSI_FLAG_DEV_SYSFS = (1 << 7), }; int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -214,6 +214,20 @@ const struct attribute_group **msi_popul } /** + * msi_device_populate_sysfs - Populate msi_irqs sysfs entries for a device + * @dev: The device(PCI, platform etc) which will get sysfs entries + */ +int msi_device_populate_sysfs(struct device *dev) +{ + const struct attribute_group **group = msi_populate_sysfs(dev); + + if (IS_ERR(group)) + return PTR_ERR(group); + dev->msi.data->attrs = group; + return 0; +} + +/** * msi_destroy_sysfs - Destroy msi_irqs sysfs entries for devices * @dev: The device(PCI, platform etc) who will remove sysfs entries * @msi_irq_groups: attribute_group for device msi_irqs entries @@ -239,6 +253,17 @@ void msi_destroy_sysfs(struct device *de kfree(msi_irq_groups); } } + +/** + * msi_device_destroy_sysfs - Destroy msi_irqs sysfs entries for a device + * @dev: The device(PCI, platform etc) for which to remove + * sysfs entries + */ +void msi_device_destroy_sysfs(struct device *dev) +{ + msi_destroy_sysfs(dev, dev->msi.data->attrs); + dev->msi.data->attrs = NULL; +} #endif #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN @@ -686,8 +711,19 @@ int msi_domain_alloc_irqs(struct irq_dom { struct msi_domain_info *info = domain->host_data; struct msi_domain_ops *ops = info->ops; + int ret; - return ops->domain_alloc_irqs(domain, dev, nvec); + ret = ops->domain_alloc_irqs(domain, dev, nvec); + if (ret) + return ret; + + if (!(info->flags & MSI_FLAG_DEV_SYSFS)) + return 0; + + ret = msi_device_populate_sysfs(dev); + if (ret) + msi_domain_free_irqs(domain, dev); + return ret; } void __msi_domain_free_irqs(struct irq_domain *domain, struct device *dev) @@ -726,7 +762,9 @@ void msi_domain_free_irqs(struct irq_dom struct msi_domain_info *info = domain->host_data; struct msi_domain_ops *ops = info->ops; - return ops->domain_free_irqs(domain, dev); + if (info->flags & MSI_FLAG_DEV_SYSFS) + msi_device_destroy_sysfs(dev); + ops->domain_free_irqs(domain, dev); } /** _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, Marc Zygnier <maz@kernel.org>, Alex Williamson <alex.williamson@redhat.com>, Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@nvidia.com>, Megha Dey <megha.dey@intel.com>, Ashok Raj <ashok.raj@intel.com>, linux-pci@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Santosh Shilimkar <ssantosh@kernel.org>, iommu@lists.linux-foundation.org, dmaengine@vger.kernel.org, Stuart Yoder <stuyoder@gmail.com>, Laurentiu Tudor <laurentiu.tudor@nxp.com>, Nishanth Menon <nm@ti.com>, Tero Kristo <kristo@kernel.org>, linux-arm-kernel@lists.infradead.org, x86@kernel.org, Vinod Koul <vkoul@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Will Deacon <will@kernel.org>, Sinan Kaya <okaya@kernel.org> Subject: [patch 08/37] genirq/msi: Provide msi_device_populate/destroy_sysfs() Date: Sat, 27 Nov 2021 02:21:30 +0100 (CET) [thread overview] Message-ID: <20211126230524.416227100@linutronix.de> (raw) Message-ID: <20211127012130.6CYb4fbU16D8BQkKAoraxagPusnc4oD0ups8QEAuSoA@z> (raw) In-Reply-To: 20211126224100.303046749@linutronix.de Add new allocation functions which can be activated by domain info flags. They store the groups pointer in struct msi_device_data. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/linux/msi.h | 12 +++++++++++- kernel/irq/msi.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 3 deletions(-) --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -174,9 +174,11 @@ struct msi_desc { /** * msi_device_data - MSI per device data * @lock: Spinlock to protect register access + * @attrs: Pointer to the sysfs attribute group */ struct msi_device_data { - raw_spinlock_t lock; + raw_spinlock_t lock; + const struct attribute_group **attrs; }; int msi_setup_device_data(struct device *dev); @@ -242,10 +244,16 @@ void pci_msi_mask_irq(struct irq_data *d void pci_msi_unmask_irq(struct irq_data *data); #ifdef CONFIG_SYSFS +int msi_device_populate_sysfs(struct device *dev); +void msi_device_destroy_sysfs(struct device *dev); + const struct attribute_group **msi_populate_sysfs(struct device *dev); void msi_destroy_sysfs(struct device *dev, const struct attribute_group **msi_irq_groups); #else +static inline int msi_device_populate_sysfs(struct device *dev) { return 0; } +static inline void msi_device_destroy_sysfs(struct device *dev) { } + static inline const struct attribute_group **msi_populate_sysfs(struct device *dev) { return NULL; @@ -393,6 +401,8 @@ enum { MSI_FLAG_MUST_REACTIVATE = (1 << 5), /* Is level-triggered capable, using two messages */ MSI_FLAG_LEVEL_CAPABLE = (1 << 6), + /* Populate sysfs on alloc() and destroy it on free() */ + MSI_FLAG_DEV_SYSFS = (1 << 7), }; int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -214,6 +214,20 @@ const struct attribute_group **msi_popul } /** + * msi_device_populate_sysfs - Populate msi_irqs sysfs entries for a device + * @dev: The device(PCI, platform etc) which will get sysfs entries + */ +int msi_device_populate_sysfs(struct device *dev) +{ + const struct attribute_group **group = msi_populate_sysfs(dev); + + if (IS_ERR(group)) + return PTR_ERR(group); + dev->msi.data->attrs = group; + return 0; +} + +/** * msi_destroy_sysfs - Destroy msi_irqs sysfs entries for devices * @dev: The device(PCI, platform etc) who will remove sysfs entries * @msi_irq_groups: attribute_group for device msi_irqs entries @@ -239,6 +253,17 @@ void msi_destroy_sysfs(struct device *de kfree(msi_irq_groups); } } + +/** + * msi_device_destroy_sysfs - Destroy msi_irqs sysfs entries for a device + * @dev: The device(PCI, platform etc) for which to remove + * sysfs entries + */ +void msi_device_destroy_sysfs(struct device *dev) +{ + msi_destroy_sysfs(dev, dev->msi.data->attrs); + dev->msi.data->attrs = NULL; +} #endif #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN @@ -686,8 +711,19 @@ int msi_domain_alloc_irqs(struct irq_dom { struct msi_domain_info *info = domain->host_data; struct msi_domain_ops *ops = info->ops; + int ret; - return ops->domain_alloc_irqs(domain, dev, nvec); + ret = ops->domain_alloc_irqs(domain, dev, nvec); + if (ret) + return ret; + + if (!(info->flags & MSI_FLAG_DEV_SYSFS)) + return 0; + + ret = msi_device_populate_sysfs(dev); + if (ret) + msi_domain_free_irqs(domain, dev); + return ret; } void __msi_domain_free_irqs(struct irq_domain *domain, struct device *dev) @@ -726,7 +762,9 @@ void msi_domain_free_irqs(struct irq_dom struct msi_domain_info *info = domain->host_data; struct msi_domain_ops *ops = info->ops; - return ops->domain_free_irqs(domain, dev); + if (info->flags & MSI_FLAG_DEV_SYSFS) + msi_device_destroy_sysfs(dev); + ops->domain_free_irqs(domain, dev); } /** _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-11-27 1:28 UTC|newest] Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-27 1:20 [patch 00/37] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Thomas Gleixner 2021-11-27 1:20 ` [patch 01/37] device: Move MSI related data into a struct Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 12:11 ` Greg Kroah-Hartman 2021-11-27 1:20 ` [patch 02/37] device: Add device::msi_data pointer and struct msi_device_data Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 12:12 ` Greg Kroah-Hartman 2021-11-28 0:14 ` Jason Gunthorpe 2021-11-28 19:09 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 03/37] PCI/MSI: Allocate MSI device data on first use Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 04/37] PCI/MSI: Use lock from msi_device_data Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 12:13 ` Greg Kroah-Hartman 2021-11-27 1:20 ` [patch 05/37] platform-msi: Allocate MSI device data on first use Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 06/37] bus: fsl-mc-msi: " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 07/37] soc: ti: ti_sci_inta_msi: " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` Thomas Gleixner [this message] 2021-11-27 1:21 ` [patch 08/37] genirq/msi: Provide msi_device_populate/destroy_sysfs() Thomas Gleixner 2021-11-30 11:53 ` Jonathan Cameron 2021-11-27 1:20 ` [patch 09/37] PCI/MSI: Let the irq code handle sysfs groups Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 10/37] platform-msi: Let the core " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 11/37] genirq/msi: Remove the original sysfs interfaces Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 12/37] platform-msi: Rename functions and clarify comments Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 13/37] platform-msi: Store platform private data pointer in msi_device_data Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 14/37] genirq/msi: Consolidate MSI descriptor data Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 15/37] platform-msi: Use msi_desc::msi_index Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 16/37] bus: fsl-mc-msi: " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 17/37] soc: ti: ti_sci_inta_msi: " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 18/37] PCI/MSI: " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 19/37] genirq/msi: Add msi_device_data::properties Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 20/37] PCI/MSI: Store properties in device::msi::data Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 21/37] x86/pci/XEN: Use device MSI properties Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 22/37] x86/apic/msi: " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 23/37] genirq/msi: " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 24/37] powerpc/cell/axon_msi: Use MSI device properties Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 25/37] powerpc/pseries/msi: " Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 26/37] PCI/MSI: Provide MSI_FLAG_MSIX_CONTIGUOUS Thomas Gleixner 2021-11-27 1:21 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 27/37] powerpc/pseries/msi: Let core code check for contiguous entries Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 28/37] genirq/msi: Provide interface to retrieve Linux interrupt number Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 29/37] PCI/MSI: Use __msi_get_virq() in pci_get_vector() Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-28 19:37 ` Marc Zyngier 2021-11-28 21:00 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 30/37] PCI/MSI: Simplify pci_irq_get_affinity() Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 31/37] dmaengine: mv_xor_v2: Get rid of msi_desc abuse Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 32/37] perf/smmuv3: Use msi_get_virq() Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-27 1:20 ` [patch 33/37] iommu/arm-smmu-v3: " Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-29 10:55 ` Will Deacon 2021-11-29 12:52 ` Thomas Gleixner 2021-11-29 12:58 ` Thomas Gleixner 2021-11-29 13:13 ` Robin Murphy 2021-11-29 14:42 ` Thomas Gleixner 2021-11-29 14:54 ` Robin Murphy 2021-11-30 9:36 ` Will Deacon 2021-11-30 12:30 ` Thomas Gleixner 2021-11-29 13:25 ` Robin Murphy 2021-11-27 1:21 ` [patch 34/37] mailbox: bcm-flexrm-mailbox: Rework MSI interrupt handling Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-27 1:21 ` [patch 35/37] bus: fsl-mc: fsl-mc-allocator: Rework MSI handling Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-27 1:21 ` [patch 36/37] soc: ti: ti_sci_inta_msi: Get rid of ti_sci_inta_msi_get_virq() Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-27 1:21 ` [patch 37/37] dmaengine: qcom_hidma: Cleanup MSI handling Thomas Gleixner 2021-11-27 1:22 ` Thomas Gleixner 2021-11-29 19:56 ` Sinan Kaya 2021-11-27 1:21 ` [patch 00/37] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Thomas Gleixner 2021-11-27 12:17 ` Greg Kroah-Hartman 2021-11-28 0:39 ` Jason Gunthorpe 2021-11-28 20:27 ` Thomas Gleixner
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=20211126230524.416227100@linutronix.de \ --to=tglx@linutronix.de \ --cc=alex.williamson@redhat.com \ --cc=ashok.raj@intel.com \ --cc=dmaengine@vger.kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=helgaas@kernel.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jgg@nvidia.com \ --cc=kevin.tian@intel.com \ --cc=kristo@kernel.org \ --cc=laurentiu.tudor@nxp.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=maz@kernel.org \ --cc=megha.dey@intel.com \ --cc=nm@ti.com \ --cc=okaya@kernel.org \ --cc=ssantosh@kernel.org \ --cc=stuyoder@gmail.com \ --cc=vkoul@kernel.org \ --cc=will@kernel.org \ --cc=x86@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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).