2021-12-10 22:19:26

by Thomas Gleixner

Subject: [patch V3 04/35] genirq/msi: Use PCI device property

From: Thomas Gleixner <[email protected]>

to determine whether this is MSI or MSIX instead of consulting MSI
descriptors.

Signed-off-by: Thomas Gleixner <[email protected]>
---
V2: Use PCI device property - Jason
---
kernel/irq/msi.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)

--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -77,21 +77,8 @@ EXPORT_SYMBOL_GPL(get_cached_msi_msg);
static ssize_t msi_mode_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
- struct msi_desc *entry;
- bool is_msix = false;
- unsigned long irq;
- int retval;
-
- retval = kstrtoul(attr->attr.name, 10, &irq);
- if (retval)
- return retval;
-
- entry = irq_get_msi_desc(irq);
- if (!entry)
- return -ENODEV;
-
- if (dev_is_pci(dev))
- is_msix = entry->pci.msi_attrib.is_msix;
+ /* MSI vs. MSIX is per device not per interrupt */
+ bool is_msix = dev_is_pci(dev) ? to_pci_dev(dev)->msix_enabled : false;

return sysfs_emit(buf, "%s\n", is_msix ? "msix" : "msi");
}

2021-12-13 13:59:54

by Jason Gunthorpe

Subject: Re: [patch V3 04/35] genirq/msi: Use PCI device property

On Fri, Dec 10, 2021 at 11:18:49PM +0100, Thomas Gleixner wrote:
> From: Thomas Gleixner <[email protected]>
>
> to determine whether this is MSI or MSIX instead of consulting MSI
> descriptors.
>
> Signed-off-by: Thomas Gleixner <[email protected]>
> ---
> V2: Use PCI device property - Jason
> ---
> kernel/irq/msi.c | 17 ++---------------
> 1 file changed, 2 insertions(+), 15 deletions(-)

Reviewed-by: Jason Gunthorpe <[email protected]>

Jason

2021-12-16 21:43:23

by tip-bot2 for Alexey Makhalov

Subject: [tip: irq/msi] genirq/msi: Use PCI device property

The following commit has been merged into the irq/msi branch of tip:

Commit-ID: 6ef7f771de0182141ef1a0863f27b12963e1d184
Gitweb: https://git.kernel.org/tip/6ef7f771de0182141ef1a0863f27b12963e1d184
Author: Thomas Gleixner <[email protected]>
AuthorDate: Fri, 10 Dec 2021 23:18:49 +01:00
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Thu, 16 Dec 2021 22:16:37 +01:00

genirq/msi: Use PCI device property

to determine whether this is MSI or MSIX instead of consulting MSI
descriptors.

Signed-off-by: Thomas Gleixner <[email protected]>
Tested-by: Michael Kelley <[email protected]>
Tested-by: Nishanth Menon <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

---
kernel/irq/msi.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 4a7a7f0..b3f73ef 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -77,21 +77,8 @@ EXPORT_SYMBOL_GPL(get_cached_msi_msg);
static ssize_t msi_mode_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
- struct msi_desc *entry;
- bool is_msix = false;
- unsigned long irq;
- int retval;
-
- retval = kstrtoul(attr->attr.name, 10, &irq);
- if (retval)
- return retval;
-
- entry = irq_get_msi_desc(irq);
- if (!entry)
- return -ENODEV;
-
- if (dev_is_pci(dev))
- is_msix = entry->pci.msi_attrib.is_msix;
+ /* MSI vs. MSIX is per device not per interrupt */
+ bool is_msix = dev_is_pci(dev) ? to_pci_dev(dev)->msix_enabled : false;

return sysfs_emit(buf, "%s\n", is_msix ? "msix" : "msi");
}