* [PATCH] intel-iommu: Fix lookup in add device
@ 2012-11-13 17:22 Alex Williamson
2012-11-13 18:12 ` Matthew Thode
2012-11-17 12:27 ` Joerg Roedel
0 siblings, 2 replies; 3+ messages in thread
From: Alex Williamson @ 2012-11-13 17:22 UTC (permalink / raw)
To: iommu, joro
Cc: prometheanfire, cardoe, linux-pci, linux-kernel, mthode, ddutile,
bhelgaas, dwmw2
We can't assume this device exists, fall back to the bridge itself.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Tested-by: Matthew Thode <prometheanfire@gentoo.org>
Cc: stable@vger.kernel.org
---
drivers/iommu/intel-iommu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index d4a4cd4..0badfa4 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4108,7 +4108,7 @@ static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to)
static int intel_iommu_add_device(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
- struct pci_dev *bridge, *dma_pdev;
+ struct pci_dev *bridge, *dma_pdev = NULL;
struct iommu_group *group;
int ret;
@@ -4122,7 +4122,7 @@ static int intel_iommu_add_device(struct device *dev)
dma_pdev = pci_get_domain_bus_and_slot(
pci_domain_nr(pdev->bus),
bridge->subordinate->number, 0);
- else
+ if (!dma_pdev)
dma_pdev = pci_dev_get(bridge);
} else
dma_pdev = pci_dev_get(pdev);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] intel-iommu: Fix lookup in add device
2012-11-13 17:22 [PATCH] intel-iommu: Fix lookup in add device Alex Williamson
@ 2012-11-13 18:12 ` Matthew Thode
2012-11-17 12:27 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Matthew Thode @ 2012-11-13 18:12 UTC (permalink / raw)
To: Alex Williamson
Cc: iommu, joro, cardoe, linux-pci, linux-kernel, mthode, ddutile,
bhelgaas, dwmw2
[-- Attachment #1: Type: text/plain, Size: 1316 bytes --]
On 11/13/2012 11:22 AM, Alex Williamson wrote:
> We can't assume this device exists, fall back to the bridge itself.
>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> Tested-by: Matthew Thode <prometheanfire@gentoo.org>
> Cc: stable@vger.kernel.org
> ---
> drivers/iommu/intel-iommu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index d4a4cd4..0badfa4 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -4108,7 +4108,7 @@ static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to)
> static int intel_iommu_add_device(struct device *dev)
> {
> struct pci_dev *pdev = to_pci_dev(dev);
> - struct pci_dev *bridge, *dma_pdev;
> + struct pci_dev *bridge, *dma_pdev = NULL;
> struct iommu_group *group;
> int ret;
>
> @@ -4122,7 +4122,7 @@ static int intel_iommu_add_device(struct device *dev)
> dma_pdev = pci_get_domain_bus_and_slot(
> pci_domain_nr(pdev->bus),
> bridge->subordinate->number, 0);
> - else
> + if (!dma_pdev)
> dma_pdev = pci_dev_get(bridge);
> } else
> dma_pdev = pci_dev_get(pdev);
>
I've tested this and it works just fine.
--
-- Matthew Thode (prometheanfire)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] intel-iommu: Fix lookup in add device
2012-11-13 17:22 [PATCH] intel-iommu: Fix lookup in add device Alex Williamson
2012-11-13 18:12 ` Matthew Thode
@ 2012-11-17 12:27 ` Joerg Roedel
1 sibling, 0 replies; 3+ messages in thread
From: Joerg Roedel @ 2012-11-17 12:27 UTC (permalink / raw)
To: Alex Williamson
Cc: iommu, prometheanfire, cardoe, linux-pci, linux-kernel, mthode,
ddutile, bhelgaas, dwmw2
On Tue, Nov 13, 2012 at 10:22:03AM -0700, Alex Williamson wrote:
> We can't assume this device exists, fall back to the bridge itself.
>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> Tested-by: Matthew Thode <prometheanfire@gentoo.org>
> Cc: stable@vger.kernel.org
Applied to iommu/fixes, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-17 12:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-13 17:22 [PATCH] intel-iommu: Fix lookup in add device Alex Williamson
2012-11-13 18:12 ` Matthew Thode
2012-11-17 12:27 ` Joerg Roedel
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).