From: Alex Williamson <alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: joerg.roedel-5C7GfCeVMHo@public.gmane.org,
dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Cc: aik-sLpHqDYs0B2HXe+LvDLADg@public.gmane.org,
benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org,
liuj97-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org
Subject: [PATCH v2 5/7] amd_iommu: Make use of DMA quirks and ACS checks in IOMMU groups
Date: Wed, 30 May 2012 14:19:31 -0600 [thread overview]
Message-ID: <20120530201931.31527.57970.stgit@bling.home> (raw)
In-Reply-To: <20120530201424.31527.33142.stgit-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
Work around broken devices and adhere to ACS support when determining
IOMMU grouping.
Signed-off-by: Alex Williamson <alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
drivers/iommu/amd_iommu.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index e072bd1..0e78d3c 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -254,6 +254,14 @@ static bool check_device(struct device *dev)
return true;
}
+static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to)
+{
+ pci_dev_put(*from);
+ *from = to;
+}
+
+#define REQ_ACS_FLAGS (PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF)
+
static int iommu_init_device(struct device *dev)
{
struct pci_dev *dma_pdev, *pdev = to_pci_dev(dev);
@@ -286,6 +294,23 @@ static int iommu_init_device(struct device *dev)
} else
dma_pdev = pci_dev_get(pdev);
+ swap_pci_ref(&dma_pdev, pci_get_dma_source(dma_pdev));
+
+ if (dma_pdev->multifunction &&
+ !pci_acs_enabled(dma_pdev, REQ_ACS_FLAGS))
+ swap_pci_ref(&dma_pdev,
+ pci_get_slot(dma_pdev->bus,
+ PCI_DEVFN(PCI_SLOT(dma_pdev->devfn),
+ 0)));
+
+ while (!pci_is_root_bus(dma_pdev->bus)) {
+ if (pci_acs_path_enabled(dma_pdev->bus->self,
+ NULL, REQ_ACS_FLAGS))
+ break;
+
+ swap_pci_ref(&dma_pdev, pci_dev_get(dma_pdev->bus->self));
+ }
+
group = iommu_group_get(&dma_pdev->dev);
pci_dev_put(dma_pdev);
if (!group) {
next prev parent reply other threads:[~2012-05-30 20:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-30 20:18 [PATCH v2 0/7] IOMMU: Groups support Alex Williamson
[not found] ` <20120530201424.31527.33142.stgit-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2012-05-30 20:18 ` [PATCH v2 1/7] driver core: Add iommu_group tracking to struct device Alex Williamson
[not found] ` <20120530201840.31527.47813.stgit-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2012-06-20 5:45 ` Benjamin Herrenschmidt
2012-05-30 20:18 ` [PATCH v2 2/7] iommu: IOMMU Groups Alex Williamson
[not found] ` <20120530201852.31527.23265.stgit-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2012-06-20 10:01 ` Benjamin Herrenschmidt
2012-06-20 16:48 ` Alex Williamson
[not found] ` <1340210921.5076.76.camel-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2012-06-21 0:07 ` Benjamin Herrenschmidt
2012-05-30 20:19 ` [PATCH v2 3/7] amd_iommu: Support IOMMU groups Alex Williamson
2012-05-30 20:19 ` [PATCH v2 4/7] intel-iommu: " Alex Williamson
2012-05-30 20:19 ` Alex Williamson [this message]
2012-05-30 20:19 ` [PATCH v2 6/7] intel-iommu: Make use of DMA quirks and ACS checks in " Alex Williamson
[not found] ` <20120530201942.31527.51604.stgit-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2012-05-31 19:47 ` Don Dutile
[not found] ` <4FC7CAE5.7020306-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-05-31 20:41 ` Alex Williamson
2012-05-30 20:19 ` [PATCH v2 7/7] iommu: Remove group_mf Alex Williamson
2012-06-06 11:05 ` [PATCH v2 0/7] IOMMU: Groups support Joerg Roedel
[not found] ` <20120606110514.GG757-5C7GfCeVMHo@public.gmane.org>
2012-06-11 15:37 ` Alex Williamson
2012-06-12 2:55 ` Bjorn Helgaas
[not found] ` <1339429021.24037.8.camel-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2012-06-18 17:31 ` Alex Williamson
2012-06-19 9:49 ` Joerg Roedel
[not found] ` <20120619094918.GH2624-5C7GfCeVMHo@public.gmane.org>
2012-06-19 10:40 ` Benjamin Herrenschmidt
2012-06-25 11:29 ` Joerg Roedel
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=20120530201931.31527.57970.stgit@bling.home \
--to=alex.williamson-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=aik-sLpHqDYs0B2HXe+LvDLADg@public.gmane.org \
--cc=benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org \
--cc=bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org \
--cc=dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=joerg.roedel-5C7GfCeVMHo@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=liuj97-Re5JQEeQqe8AvxtiuMwx3w@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).