releases/3.6.8/intel-iommu-fix-lookup-in-add-device.patch

   1 From 3da4af0affbb797e8ac4c2b4598da0c34b8cc52a Mon Sep 17 00:00:00 2001
   2 From: Alex Williamson <alex.williamson@redhat.com>
   3 Date: Tue, 13 Nov 2012 10:22:03 -0700
   4 Subject: intel-iommu: Fix lookup in add device
   5
   6 From: Alex Williamson <alex.williamson@redhat.com>
   7
   8 commit 3da4af0affbb797e8ac4c2b4598da0c34b8cc52a upstream.
   9
  10 We can't assume this device exists, fall back to the bridge itself.
  11
  12 Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
  13 Tested-by: Matthew Thode <prometheanfire@gentoo.org>
  14 Signed-off-by: Joerg Roedel <joro@8bytes.org>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16
  17 ---
  18  drivers/iommu/intel-iommu.c |    4 ++--
  19  1 file changed, 2 insertions(+), 2 deletions(-)
  20
  21 --- a/drivers/iommu/intel-iommu.c
  22 +++ b/drivers/iommu/intel-iommu.c
  23 @@ -4108,7 +4108,7 @@ static void swap_pci_ref(struct pci_dev
  24  static int intel_iommu_add_device(struct device *dev)
  25  {
  26         struct pci_dev *pdev = to_pci_dev(dev);
  27 -       struct pci_dev *bridge, *dma_pdev;
  28 +       struct pci_dev *bridge, *dma_pdev = NULL;
  29         struct iommu_group *group;
  30         int ret;
  31
  32 @@ -4122,7 +4122,7 @@ static int intel_iommu_add_device(struct
  33                         dma_pdev = pci_get_domain_bus_and_slot(
  34                                                 pci_domain_nr(pdev->bus),
  35                                                 bridge->subordinate->number, 0);
  36 -               else
  37 +               if (!dma_pdev)
  38                         dma_pdev = pci_dev_get(bridge);
  39         } else
  40                 dma_pdev = pci_dev_get(pdev);