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, Cedric Le Goater <clg@kaod.org>,
xen-devel@lists.xenproject.org, Juergen Gross <jgross@suse.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Will Deacon <will@kernel.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,
Vinod Koul <vkoul@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Robin Murphy <robin.murphy@arm.com>,
Sinan Kaya <okaya@kernel.org>
Subject: [patch V2 10/36] genirq/msi: Remove the original sysfs interfaces
Date: Mon, 6 Dec 2021 23:39:12 +0100 (CET) [thread overview]
Message-ID: <20211206210438.202985003@linutronix.de> (raw)
In-Reply-To: 20211206210307.625116253@linutronix.de
No more users. Refactor the core code accordingly and move the global
interface under CONFIG_PCI_MSI_ARCH_FALLBACKS.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
---
include/linux/msi.h | 29 +++++++---------------------
kernel/irq/msi.c | 53 +++++++++++++++++++---------------------------------
2 files changed, 28 insertions(+), 54 deletions(-)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -246,26 +246,6 @@ void __pci_write_msi_msg(struct msi_desc
void pci_msi_mask_irq(struct irq_data *data);
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;
-}
-static inline void msi_destroy_sysfs(struct device *dev, const struct attribute_group **msi_irq_groups)
-{
-}
-#endif
-
/*
* The arch hooks to setup up msi irqs. Default functions are implemented
* as weak symbols so that they /can/ be overriden by architecture specific
@@ -279,7 +259,14 @@ int arch_setup_msi_irq(struct pci_dev *d
void arch_teardown_msi_irq(unsigned int irq);
int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
void arch_teardown_msi_irqs(struct pci_dev *dev);
-#endif
+#ifdef CONFIG_SYSFS
+int msi_device_populate_sysfs(struct device *dev);
+void msi_device_destroy_sysfs(struct device *dev);
+#else /* CONFIG_SYSFS */
+static inline int msi_device_populate_sysfs(struct device *dev) { return 0; }
+static inline void msi_device_destroy_sysfs(struct device *dev) { }
+#endif /* !CONFIG_SYSFS */
+#endif /* CONFIG_PCI_MSI_ARCH_FALLBACKS */
/*
* The restore hook is still available even for fully irq domain based
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -131,12 +131,8 @@ static ssize_t msi_mode_show(struct devi
/**
* msi_populate_sysfs - Populate msi_irqs sysfs entries for devices
* @dev: The device(PCI, platform etc) who will get sysfs entries
- *
- * Return attribute_group ** so that specific bus MSI can save it to
- * somewhere during initilizing msi irqs. If devices has no MSI irq,
- * return NULL; if it fails to populate sysfs, return ERR_PTR
*/
-const struct attribute_group **msi_populate_sysfs(struct device *dev)
+static const struct attribute_group **msi_populate_sysfs(struct device *dev)
{
const struct attribute_group **msi_irq_groups;
struct attribute **msi_attrs, *msi_attr;
@@ -227,41 +223,32 @@ int msi_device_populate_sysfs(struct dev
}
/**
- * 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
- */
-void msi_destroy_sysfs(struct device *dev, const struct attribute_group **msi_irq_groups)
-{
- struct device_attribute *dev_attr;
- struct attribute **msi_attrs;
- int count = 0;
-
- if (msi_irq_groups) {
- sysfs_remove_groups(&dev->kobj, msi_irq_groups);
- msi_attrs = msi_irq_groups[0]->attrs;
- while (msi_attrs[count]) {
- dev_attr = container_of(msi_attrs[count],
- struct device_attribute, attr);
- kfree(dev_attr->attr.name);
- kfree(dev_attr);
- ++count;
- }
- kfree(msi_attrs);
- kfree(msi_irq_groups[0]);
- 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);
+ const struct attribute_group **msi_irq_groups = dev->msi.data->attrs;
+ struct device_attribute *dev_attr;
+ struct attribute **msi_attrs;
+ int count = 0;
+
dev->msi.data->attrs = NULL;
+ if (!msi_irq_groups)
+ return;
+
+ sysfs_remove_groups(&dev->kobj, msi_irq_groups);
+ msi_attrs = msi_irq_groups[0]->attrs;
+ while (msi_attrs[count]) {
+ dev_attr = container_of(msi_attrs[count], struct device_attribute, attr);
+ kfree(dev_attr->attr.name);
+ kfree(dev_attr);
+ ++count;
+ }
+ kfree(msi_attrs);
+ kfree(msi_irq_groups[0]);
+ kfree(msi_irq_groups);
}
#endif
next prev parent reply other threads:[~2021-12-06 22:39 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 22:38 [patch V2 00/36] genirq/msi, PCI/MSI: Spring cleaning - Part 2 Thomas Gleixner
2021-12-06 22:38 ` [patch V2 01/36] device: Move MSI related data into a struct Thomas Gleixner
2021-12-06 22:38 ` [patch V2 02/36] device: Add device::msi_data pointer and struct msi_device_data Thomas Gleixner
2021-12-06 22:39 ` [patch V2 03/36] PCI/MSI: Allocate MSI device data on first use Thomas Gleixner
2021-12-07 21:03 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 04/36] platform-msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 05/36] bus: fsl-mc-msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 06/36] soc: ti: ti_sci_inta_msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 07/36] genirq/msi: Provide msi_device_populate/destroy_sysfs() Thomas Gleixner
2021-12-06 22:39 ` [patch V2 08/36] PCI/MSI: Let the irq code handle sysfs groups Thomas Gleixner
2021-12-07 21:04 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 09/36] platform-msi: Let the core " Thomas Gleixner
2021-12-06 22:39 ` Thomas Gleixner [this message]
2021-12-06 22:39 ` [patch V2 11/36] platform-msi: Rename functions and clarify comments Thomas Gleixner
2021-12-06 22:39 ` [patch V2 12/36] platform-msi: Store platform private data pointer in msi_device_data Thomas Gleixner
2021-12-06 22:39 ` [patch V2 13/36] genirq/msi: Consolidate MSI descriptor data Thomas Gleixner
2021-12-06 22:39 ` [patch V2 14/36] platform-msi: Use msi_desc::msi_index Thomas Gleixner
2021-12-06 22:39 ` [patch V2 15/36] bus: fsl-mc-msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 16/36] soc: ti: ti_sci_inta_msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 17/36] PCI/MSI: " Thomas Gleixner
2021-12-07 21:04 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 18/36] genirq/msi: Add msi_device_data::properties Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-07 9:04 ` Cédric Le Goater
2021-12-07 12:47 ` Thomas Gleixner
2021-12-07 12:53 ` Thomas Gleixner
2021-12-06 22:39 ` [patch V2 19/36] PCI/MSI: Store properties in device::msi::data Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-07 21:05 ` Bjorn Helgaas
2021-12-08 15:58 ` Jason Gunthorpe
2021-12-09 17:53 ` Thomas Gleixner
2021-12-09 21:02 ` Thomas Gleixner
2021-12-06 22:39 ` [patch V2 20/36] x86/pci/XEN: Use device MSI properties Thomas Gleixner
2021-12-08 15:53 ` Jason Gunthorpe
2021-12-08 17:53 ` Thomas Gleixner
2021-12-06 22:39 ` [patch V2 21/36] x86/apic/msi: " Thomas Gleixner
2021-12-08 15:45 ` Jason Gunthorpe
2021-12-06 22:39 ` [patch V2 22/36] genirq/msi: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 23/36] powerpc/cell/axon_msi: Use MSI device properties Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-08 15:54 ` Jason Gunthorpe
2021-12-06 22:39 ` [patch V2 24/36] powerpc/pseries/msi: " Thomas Gleixner
2021-12-08 15:51 ` Jason Gunthorpe
2021-12-06 22:39 ` [patch V2 25/36] PCI/MSI: Provide MSI_FLAG_MSIX_CONTIGUOUS Thomas Gleixner
2021-12-07 21:05 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 26/36] powerpc/pseries/msi: Let core code check for contiguous entries Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-06 22:39 ` [patch V2 27/36] genirq/msi: Provide interface to retrieve Linux interrupt number Thomas Gleixner
2021-12-07 7:51 ` Greg Kroah-Hartman
2021-12-06 22:39 ` [patch V2 28/36] PCI/MSI: Use __msi_get_virq() in pci_get_vector() Thomas Gleixner
2021-12-07 7:52 ` Greg Kroah-Hartman
2021-12-07 21:05 ` Bjorn Helgaas
2021-12-06 22:39 ` [patch V2 29/36] PCI/MSI: Simplify pci_irq_get_affinity() Thomas Gleixner
2021-12-07 17:42 ` Cédric Le Goater
2021-12-07 21:19 ` Thomas Gleixner
2021-12-06 22:39 ` [patch V2 30/36] dmaengine: mv_xor_v2: Get rid of msi_desc abuse Thomas Gleixner
2021-12-06 22:39 ` [patch V2 31/36] perf/smmuv3: Use msi_get_virq() Thomas Gleixner
2021-12-06 22:39 ` [patch V2 32/36] iommu/arm-smmu-v3: " Thomas Gleixner
2021-12-06 22:39 ` [patch V2 33/36] mailbox: bcm-flexrm-mailbox: Rework MSI interrupt handling Thomas Gleixner
2021-12-06 22:39 ` [patch V2 34/36] bus: fsl-mc: fsl-mc-allocator: Rework MSI handling Thomas Gleixner
2021-12-06 22:39 ` [patch V2 35/36] soc: ti: ti_sci_inta_msi: Get rid of ti_sci_inta_msi_get_virq() Thomas Gleixner
2021-12-06 22:39 ` [patch V2 36/36] dmaengine: qcom_hidma: Cleanup MSI handling 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=20211206210438.202985003@linutronix.de \
--to=tglx@linutronix.de \
--cc=alex.williamson@redhat.com \
--cc=ashok.raj@intel.com \
--cc=clg@kaod.org \
--cc=dmaengine@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=helgaas@kernel.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jgg@nvidia.com \
--cc=jgross@suse.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=robin.murphy@arm.com \
--cc=ssantosh@kernel.org \
--cc=stuyoder@gmail.com \
--cc=vkoul@kernel.org \
--cc=will@kernel.org \
--cc=xen-devel@lists.xenproject.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: link
Be 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).