From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 29 Jan 2020 23:00:02 +0000 (-0600)
Subject: Merge branch 'pci/host-vmd'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=db83c269d22598ec1f5e3e6692a58a92a153e5f1;p=linux.git

Merge branch 'pci/host-vmd'

  - Save VMD's pci_dev in x86 struct pci_sysdata (Jon Derrick)

  - Add pci_real_dma_dev() for DMA aliases not on the same bus as requester
    (Jon Derrick)

  - Add IOMMU mappings for pci_real_dma_dev() (Jon Derrick)

  - Remove IOMMU sanity checks for VMD devices (Jon Derrick)

  - Remove VMD dma_map_ops overrides (Jon Derrick)

  - Remove unused X86_DEV_DMA_OPS (Christoph Hellwig)

  - Add VMD device IDs that need bus restriction mode (Sushma Kalakota)

* pci/host-vmd:
  PCI: vmd: Add two VMD Device IDs
  x86/PCI: Remove X86_DEV_DMA_OPS
  PCI: vmd: Remove dma_map_ops overrides
  iommu/vt-d: Remove VMD child device sanity check
  iommu/vt-d: Use pci_real_dma_dev() for mapping
  PCI: Introduce pci_real_dma_dev()
  x86/PCI: Expose VMD's pci_dev in struct pci_sysdata
  x86/PCI: Add to_pci_sysdata() helper
---

db83c269d22598ec1f5e3e6692a58a92a153e5f1