From: Marc Zyngier <maz@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: Frank Wunderlich <frank-w@public-files.de>,
Thierry Reding <treding@nvidia.com>,
Thomas Gleixner <tglx@linutronix.de>,
Rob Herring <robh@kernel.org>, Will Deacon <will@kernel.org>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Wei Liu <wei.liu@kernel.org>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Ryder Lee <ryder.lee@mediatek.com>,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Michal Simek <michal.simek@xilinx.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-hyperv@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-renesas-soc@vger.kernel.org
Subject: [PATCH 13/13] PCI: quirks: Refactor advertising of the NO_MSI flag
Date: Thu, 25 Feb 2021 15:10:23 +0000 [thread overview]
Message-ID: <20210225151023.3642391-14-maz@kernel.org> (raw)
In-Reply-To: <20210225151023.3642391-1-maz@kernel.org>
The few quirks that deal with NO_MSI tend to be copy-paste heavy.
Refactor them so that the hierarchy of conditions is slightly
cleaner.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
drivers/pci/quirks.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 653660e3ba9e..972bb0f9f994 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2585,10 +2585,8 @@ static int msi_ht_cap_enabled(struct pci_dev *dev)
/* Check the HyperTransport MSI mapping to know whether MSI is enabled or not */
static void quirk_msi_ht_cap(struct pci_dev *dev)
{
- if (dev->subordinate && !msi_ht_cap_enabled(dev)) {
- pci_warn(dev, "MSI quirk detected; subordinate MSI disabled\n");
- dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
- }
+ if (!msi_ht_cap_enabled(dev))
+ quirk_disable_msi(dev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE,
quirk_msi_ht_cap);
@@ -2601,9 +2599,6 @@ static void quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
{
struct pci_dev *pdev;
- if (!dev->subordinate)
- return;
-
/*
* Check HT MSI cap on this chipset and the root one. A single one
* having MSI is enough to be sure that MSI is supported.
@@ -2611,10 +2606,8 @@ static void quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
pdev = pci_get_slot(dev->bus, 0);
if (!pdev)
return;
- if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
- pci_warn(dev, "MSI quirk detected; subordinate MSI disabled\n");
- dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
- }
+ if (!msi_ht_cap_enabled(pdev))
+ quirk_msi_ht_cap(dev);
pci_dev_put(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
--
2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org,
Thierry Reding <thierry.reding@gmail.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Will Deacon <will@kernel.org>,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Rob Herring <robh@kernel.org>, Wei Liu <wei.liu@kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Michal Simek <michal.simek@xilinx.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Thierry Reding <treding@nvidia.com>,
Frank Wunderlich <frank-w@public-files.de>,
Haiyang Zhang <haiyangz@microsoft.com>,
linux-mediatek@lists.infradead.org,
Paul Walmsley <paul.walmsley@sifive.com>,
linux-tegra@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: [PATCH 13/13] PCI: quirks: Refactor advertising of the NO_MSI flag
Date: Thu, 25 Feb 2021 15:10:23 +0000 [thread overview]
Message-ID: <20210225151023.3642391-14-maz@kernel.org> (raw)
In-Reply-To: <20210225151023.3642391-1-maz@kernel.org>
The few quirks that deal with NO_MSI tend to be copy-paste heavy.
Refactor them so that the hierarchy of conditions is slightly
cleaner.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
drivers/pci/quirks.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 653660e3ba9e..972bb0f9f994 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2585,10 +2585,8 @@ static int msi_ht_cap_enabled(struct pci_dev *dev)
/* Check the HyperTransport MSI mapping to know whether MSI is enabled or not */
static void quirk_msi_ht_cap(struct pci_dev *dev)
{
- if (dev->subordinate && !msi_ht_cap_enabled(dev)) {
- pci_warn(dev, "MSI quirk detected; subordinate MSI disabled\n");
- dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
- }
+ if (!msi_ht_cap_enabled(dev))
+ quirk_disable_msi(dev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE,
quirk_msi_ht_cap);
@@ -2601,9 +2599,6 @@ static void quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
{
struct pci_dev *pdev;
- if (!dev->subordinate)
- return;
-
/*
* Check HT MSI cap on this chipset and the root one. A single one
* having MSI is enough to be sure that MSI is supported.
@@ -2611,10 +2606,8 @@ static void quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
pdev = pci_get_slot(dev->bus, 0);
if (!pdev)
return;
- if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
- pci_warn(dev, "MSI quirk detected; subordinate MSI disabled\n");
- dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
- }
+ if (!msi_ht_cap_enabled(pdev))
+ quirk_msi_ht_cap(dev);
pci_dev_put(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
--
2.29.2
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org,
Thierry Reding <thierry.reding@gmail.com>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Will Deacon <will@kernel.org>,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Rob Herring <robh@kernel.org>, Wei Liu <wei.liu@kernel.org>,
Ryder Lee <ryder.lee@mediatek.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Michal Simek <michal.simek@xilinx.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Thierry Reding <treding@nvidia.com>,
Frank Wunderlich <frank-w@public-files.de>,
Haiyang Zhang <haiyangz@microsoft.com>,
linux-mediatek@lists.infradead.org,
Paul Walmsley <paul.walmsley@sifive.com>,
linux-tegra@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: [PATCH 13/13] PCI: quirks: Refactor advertising of the NO_MSI flag
Date: Thu, 25 Feb 2021 15:10:23 +0000 [thread overview]
Message-ID: <20210225151023.3642391-14-maz@kernel.org> (raw)
In-Reply-To: <20210225151023.3642391-1-maz@kernel.org>
The few quirks that deal with NO_MSI tend to be copy-paste heavy.
Refactor them so that the hierarchy of conditions is slightly
cleaner.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
drivers/pci/quirks.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 653660e3ba9e..972bb0f9f994 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2585,10 +2585,8 @@ static int msi_ht_cap_enabled(struct pci_dev *dev)
/* Check the HyperTransport MSI mapping to know whether MSI is enabled or not */
static void quirk_msi_ht_cap(struct pci_dev *dev)
{
- if (dev->subordinate && !msi_ht_cap_enabled(dev)) {
- pci_warn(dev, "MSI quirk detected; subordinate MSI disabled\n");
- dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
- }
+ if (!msi_ht_cap_enabled(dev))
+ quirk_disable_msi(dev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE,
quirk_msi_ht_cap);
@@ -2601,9 +2599,6 @@ static void quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
{
struct pci_dev *pdev;
- if (!dev->subordinate)
- return;
-
/*
* Check HT MSI cap on this chipset and the root one. A single one
* having MSI is enough to be sure that MSI is supported.
@@ -2611,10 +2606,8 @@ static void quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
pdev = pci_get_slot(dev->bus, 0);
if (!pdev)
return;
- if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
- pci_warn(dev, "MSI quirk detected; subordinate MSI disabled\n");
- dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
- }
+ if (!msi_ht_cap_enabled(pdev))
+ quirk_msi_ht_cap(dev);
pci_dev_put(pdev);
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
--
2.29.2
_______________________________________________
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-02-25 15:24 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 15:10 [PATCH 00/13] PCI: MSI: Getting rid of msi_controller, and other cleanups Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 01/13] PCI: tegra: Convert to MSI domains Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 02/13] PCI: rcar: " Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-28 18:48 ` Marek Vasut
2021-02-28 18:48 ` Marek Vasut
2021-02-28 18:48 ` Marek Vasut
2021-02-25 15:10 ` [PATCH 03/13] PCI: xilinx: " Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-03-22 12:21 ` Lorenzo Pieralisi
2021-03-22 12:21 ` Lorenzo Pieralisi
2021-03-22 12:21 ` Lorenzo Pieralisi
2021-03-22 12:33 ` Michal Simek
2021-03-22 12:33 ` Michal Simek
2021-03-22 12:33 ` Michal Simek
2021-03-22 14:04 ` Marc Zyngier
2021-03-22 14:04 ` Marc Zyngier
2021-03-22 14:04 ` Marc Zyngier
2021-03-22 12:23 ` Lorenzo Pieralisi
2021-03-22 12:23 ` Lorenzo Pieralisi
2021-03-22 12:23 ` Lorenzo Pieralisi
2021-03-22 12:33 ` Michal Simek
2021-03-22 12:33 ` Michal Simek
2021-03-22 12:33 ` Michal Simek
2021-03-22 14:04 ` Marc Zyngier
2021-03-22 14:04 ` Marc Zyngier
2021-03-22 14:04 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 04/13] PCI: hyperv: Drop msi_controller structure Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-03-01 4:24 ` Michael Kelley
2021-03-01 4:24 ` Michael Kelley
2021-03-01 4:24 ` Michael Kelley
2021-02-25 15:10 ` [PATCH 05/13] PCI: MSI: Drop use of msi_controller from core code Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 06/13] PCI: MSI: Kill msi_controller structure Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 07/13] PCI: MSI: Kill default_teardown_msi_irqs() Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 08/13] PCI: MSI: Let PCI host bridges declare their lack of MSI handling Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 09/13] PCI: mediatek: Advertise " Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-03-01 10:43 ` Aw: " Frank Wunderlich
2021-03-01 10:43 ` Frank Wunderlich
2021-03-01 10:43 ` Frank Wunderlich
2021-03-01 11:49 ` Marc Zyngier
2021-03-01 11:49 ` Marc Zyngier
2021-03-01 11:49 ` Marc Zyngier
2021-03-01 12:16 ` Aw: " Frank Wunderlich
2021-03-01 12:16 ` Frank Wunderlich
2021-03-01 12:16 ` Frank Wunderlich
2021-03-01 13:31 ` Marc Zyngier
2021-03-01 13:31 ` Marc Zyngier
2021-03-01 13:31 ` Marc Zyngier
2021-03-01 14:06 ` Aw: " Frank Wunderlich
2021-03-01 14:06 ` Frank Wunderlich
2021-03-01 14:06 ` Frank Wunderlich
2021-03-02 10:35 ` Robin Murphy
2021-03-02 10:35 ` Robin Murphy
2021-03-02 10:35 ` Robin Murphy
2021-02-25 15:10 ` [PATCH 10/13] PCI: MSI: Let PCI host bridges declare their reliance on MSI domains Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 11/13] PCI: Make pci_host_common_probe() declare its " Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` [PATCH 12/13] PCI: MSI: Document the various ways of ending up with NO_MSI Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier [this message]
2021-02-25 15:10 ` [PATCH 13/13] PCI: quirks: Refactor advertising of the NO_MSI flag Marc Zyngier
2021-02-25 15:10 ` Marc Zyngier
2021-03-10 19:29 ` [PATCH 00/13] PCI: MSI: Getting rid of msi_controller, and other cleanups Bjorn Helgaas
2021-03-10 19:29 ` Bjorn Helgaas
2021-03-10 19:29 ` Bjorn Helgaas
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=20210225151023.3642391-14-maz@kernel.org \
--to=maz@kernel.org \
--cc=bhelgaas@google.com \
--cc=frank-w@public-files.de \
--cc=haiyangz@microsoft.com \
--cc=jonathanh@nvidia.com \
--cc=kys@microsoft.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marek.vasut+renesas@gmail.com \
--cc=michal.simek@xilinx.com \
--cc=paul.walmsley@sifive.com \
--cc=robh@kernel.org \
--cc=ryder.lee@mediatek.com \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=treding@nvidia.com \
--cc=wei.liu@kernel.org \
--cc=will@kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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 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.