* [PATCH] pci: quirks: Add ACS quirk for Solarflare SFC9120 & SFC9140
@ 2014-09-17 14:59 Alex Williamson
2014-09-17 15:53 ` Robert Stonehouse
2014-09-22 21:05 ` Bjorn Helgaas
0 siblings, 2 replies; 3+ messages in thread
From: Alex Williamson @ 2014-09-17 14:59 UTC (permalink / raw)
To: linux-pci, bhelgaas; +Cc: linux-kernel, Alex Williamson, Robert Stonehouse
Solarflare confirms that these devices do not allow peer-to-peer
between functions. Quirk them to allow IOMMU grouping to expose this
isolation.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Cc: Robert Stonehouse <rstonehouse@solarflare.com>
---
drivers/pci/quirks.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 80c2d01..78cc83f 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3664,6 +3664,21 @@ static int pci_quirk_intel_pch_acs(struct pci_dev *dev, u16 acs_flags)
return acs_flags & ~flags ? 0 : 1;
}
+static int pci_quirk_solarflare_acs(struct pci_dev *dev, u16 acs_flags)
+{
+ /*
+ * SV, TB, and UF are not relevant to multifunction endpoints.
+ *
+ * Solarflare indicates that peer-to-peer between functions is not
+ * possible, therefore RR, CR, and DT are not implemented. Mask
+ * these out as if they were clear in the ACS capabilities register.
+ */
+ acs_flags &= ~(PCI_ACS_SV | PCI_ACS_TB | PCI_ACS_RR |
+ PCI_ACS_CR | PCI_ACS_UF | PCI_ACS_DT);
+
+ return acs_flags ? 0 : 1;
+}
+
static const struct pci_dev_acs_enabled {
u16 vendor;
u16 device;
@@ -3675,6 +3690,8 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_ATI, 0x439d, pci_quirk_amd_sb_acs },
{ PCI_VENDOR_ID_ATI, 0x4384, pci_quirk_amd_sb_acs },
{ PCI_VENDOR_ID_ATI, 0x4399, pci_quirk_amd_sb_acs },
+ { PCI_VENDOR_ID_SOLARFLARE, 0x0903, pci_quirk_solarflare_acs },
+ { PCI_VENDOR_ID_SOLARFLARE, 0x0923, pci_quirk_solarflare_acs },
{ PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_quirk_intel_pch_acs },
{ 0 }
};
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] pci: quirks: Add ACS quirk for Solarflare SFC9120 & SFC9140
2014-09-17 14:59 [PATCH] pci: quirks: Add ACS quirk for Solarflare SFC9120 & SFC9140 Alex Williamson
@ 2014-09-17 15:53 ` Robert Stonehouse
2014-09-22 21:05 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Robert Stonehouse @ 2014-09-17 15:53 UTC (permalink / raw)
To: Alex Williamson, linux-pci, bhelgaas; +Cc: linux-kernel
On 17/09/14 15:59, Alex Williamson wrote:
> Solarflare confirms that these devices do not allow peer-to-peer
> between functions. Quirk them to allow IOMMU grouping to expose this
> isolation.
>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> Cc: Robert Stonehouse <rstonehouse@solarflare.com>
Acked-by: Robert Stonehouse <rstonehouse@solarflare.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] pci: quirks: Add ACS quirk for Solarflare SFC9120 & SFC9140
2014-09-17 14:59 [PATCH] pci: quirks: Add ACS quirk for Solarflare SFC9120 & SFC9140 Alex Williamson
2014-09-17 15:53 ` Robert Stonehouse
@ 2014-09-22 21:05 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2014-09-22 21:05 UTC (permalink / raw)
To: Alex Williamson; +Cc: linux-pci, linux-kernel, Robert Stonehouse
On Wed, Sep 17, 2014 at 08:59:36AM -0600, Alex Williamson wrote:
> Solarflare confirms that these devices do not allow peer-to-peer
> between functions. Quirk them to allow IOMMU grouping to expose this
> isolation.
>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> Cc: Robert Stonehouse <rstonehouse@solarflare.com>
Applied with Robert's ack to pci/virtualization for v3.18, thanks!
> ---
>
> drivers/pci/quirks.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 80c2d01..78cc83f 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -3664,6 +3664,21 @@ static int pci_quirk_intel_pch_acs(struct pci_dev *dev, u16 acs_flags)
> return acs_flags & ~flags ? 0 : 1;
> }
>
> +static int pci_quirk_solarflare_acs(struct pci_dev *dev, u16 acs_flags)
> +{
> + /*
> + * SV, TB, and UF are not relevant to multifunction endpoints.
> + *
> + * Solarflare indicates that peer-to-peer between functions is not
> + * possible, therefore RR, CR, and DT are not implemented. Mask
> + * these out as if they were clear in the ACS capabilities register.
> + */
> + acs_flags &= ~(PCI_ACS_SV | PCI_ACS_TB | PCI_ACS_RR |
> + PCI_ACS_CR | PCI_ACS_UF | PCI_ACS_DT);
> +
> + return acs_flags ? 0 : 1;
> +}
> +
> static const struct pci_dev_acs_enabled {
> u16 vendor;
> u16 device;
> @@ -3675,6 +3690,8 @@ static const struct pci_dev_acs_enabled {
> { PCI_VENDOR_ID_ATI, 0x439d, pci_quirk_amd_sb_acs },
> { PCI_VENDOR_ID_ATI, 0x4384, pci_quirk_amd_sb_acs },
> { PCI_VENDOR_ID_ATI, 0x4399, pci_quirk_amd_sb_acs },
> + { PCI_VENDOR_ID_SOLARFLARE, 0x0903, pci_quirk_solarflare_acs },
> + { PCI_VENDOR_ID_SOLARFLARE, 0x0923, pci_quirk_solarflare_acs },
> { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_quirk_intel_pch_acs },
> { 0 }
> };
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-22 21:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-17 14:59 [PATCH] pci: quirks: Add ACS quirk for Solarflare SFC9120 & SFC9140 Alex Williamson
2014-09-17 15:53 ` Robert Stonehouse
2014-09-22 21:05 ` Bjorn Helgaas
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).