iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Cc: bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-gpGsJRJZ3PBBDgjK7y7TUQ@public.gmane.org
Subject: [PATCH v3 05/15] PCI: Quirk pci_for_each_dma_alias() for bridges
Date: Sat, 10 May 2014 09:02:53 -0600	[thread overview]
Message-ID: <20140510150253.2997.70728.stgit@bling.home> (raw)
In-Reply-To: <20140510145619.2997.429.stgit-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>

Several PCIe-to-PCI bridges fail to provide a PCIe capability, causing
us to handle them as conventional PCI devices.  In some cases, this
may be correct, in others it's not.  Add a dev_flag bit to identify
devices to be handled as standard PCIe-to-PCI bridges.

Signed-off-by: Alex Williamson <alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 drivers/pci/search.c |   10 ++++++++--
 include/linux/pci.h  |    2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index ad698b2..dab4561 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -98,8 +98,14 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
 				continue;
 			}
 		} else {
-			ret = fn(tmp, PCI_DEVID(tmp->bus->number, tmp->devfn),
-				 data);
+			if (tmp->dev_flags & PCI_DEV_FLAG_PCIE_BRIDGE_ALIAS)
+				ret = fn(tmp,
+					 PCI_DEVID(tmp->subordinate->number,
+						   PCI_DEVFN(0, 0)), data);
+			else
+				ret = fn(tmp,
+					 PCI_DEVID(tmp->bus->number,
+						   tmp->devfn), data);
 			if (ret)
 				return ret;
 		}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index b4c97d2..31d9a90 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -171,6 +171,8 @@ enum pci_dev_flags {
 	PCI_DEV_FLAGS_ASSIGNED = (__force pci_dev_flags_t) 4,
 	/* Flag for quirk use to store if quirk-specific ACS is enabled */
 	PCI_DEV_FLAGS_ACS_ENABLED_QUIRK = (__force pci_dev_flags_t) 8,
+	/* DMA alias the device as if it was a PCIe-to-PCI bridge */
+	PCI_DEV_FLAG_PCIE_BRIDGE_ALIAS = (__force pci_dev_flags_t) 16,
 };
 
 enum pci_irq_reroute_variant {

  parent reply	other threads:[~2014-05-10 15:02 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-10 15:02 [PATCH v3 00/15] PCI/iommu: Fix DMA alias problems Alex Williamson
     [not found] ` <20140510145619.2997.429.stgit-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2014-05-10 15:02   ` [PATCH v3 01/15] PCI: Add DMA alias iterator Alex Williamson
2014-05-10 15:02   ` [PATCH v3 02/15] PCI: quirk pci_for_each_dma_alias() Alex Williamson
2014-05-10 15:02   ` [PATCH v3 03/15] PCI: quirk dma_func_alias for Ricoh devices Alex Williamson
2014-05-10 15:02   ` [PATCH v3 04/15] PCI: quirk dma_func_alias for Marvell devices Alex Williamson
2014-05-10 15:02   ` Alex Williamson [this message]
2014-05-10 15:02   ` [PATCH v3 06/15] PCI: Add quirks for ASMedia and Tundra bridges Alex Williamson
2014-05-10 15:03   ` [PATCH v3 07/15] PCI: Consolidate isolation domain code Alex Williamson
2014-05-10 15:03   ` [PATCH v3 08/15] iommu/amd: Use pci_find_dma_isolation_root() for IOMMU groups Alex Williamson
2014-05-14 10:34     ` Joerg Roedel
     [not found]       ` <20140514103449.GE6026-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2014-05-14 14:27         ` Alex Williamson
2014-05-10 15:03   ` [PATCH v3 09/15] iommu/amd: Update to use PCI DMA aliases Alex Williamson
2014-05-10 15:03   ` [PATCH v3 10/15] iommu/intel: Use pci_find_dma_isolation_root() for IOMMU groups Alex Williamson
2014-05-10 15:03   ` [PATCH v3 11/15] iommu/intel: Update to use PCI DMA aliases Alex Williamson
2014-05-10 15:03   ` [PATCH v3 12/15] iommu/fsl: Use pci_find_dma_isolation_root() for IOMMU groups Alex Williamson
2014-05-10 15:03   ` [PATCH v3 13/15] iommu: Remove pci.h Alex Williamson
2014-05-10 15:03   ` [PATCH v3 14/15] PCI: Remove pci_find_upstream_pcie_bridge() Alex Williamson
2014-05-10 15:03   ` [PATCH v3 15/15] PCI: Remove pci_get_dma_source() Alex Williamson
2014-05-10 16:51   ` [PATCH v3 00/15] PCI/iommu: Fix DMA alias problems George Spelvin
     [not found] ` <1400020520427-859747.post@n7.nabble.com>
     [not found]   ` <1400020520427-859747.post-hbTxXoYVu7Vl57MIdRCFDg@public.gmane.org>
2014-05-14 17:18     ` Alex Williamson

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=20140510150253.2997.70728.stgit@bling.home \
    --to=alex.williamson-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=linux-gpGsJRJZ3PBBDgjK7y7TUQ@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).