diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-13 09:23:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-13 09:23:18 -0400 |
commit | a13f0655503a4a89df67fdc7cac6a7810795d4b3 (patch) | |
tree | 116a389d382f7ae1e1c4b83dd987cd3ade59defc /include/linux/mdev.h | |
parent | 55472bae5331f33582d9f0e8919fed8bebcda0da (diff) | |
parent | b5531563e8a0b8fcc5344a38d1fad9217e08e09b (diff) |
Merge tag 'iommu-updates-v5.2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU updates from Joerg Roedel:
- ATS support for ARM-SMMU-v3.
- AUX domain support in the IOMMU-API and the Intel VT-d driver. This
adds support for multiple DMA address spaces per (PCI-)device. The
use-case is to multiplex devices between host and KVM guests in a
more flexible way than supported by SR-IOV.
- the rest are smaller cleanups and fixes, two of which needed to be
reverted after testing in linux-next.
* tag 'iommu-updates-v5.2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (45 commits)
Revert "iommu/amd: Flush not present cache in iommu_map_page"
Revert "iommu/amd: Remove the leftover of bypass support"
iommu/vt-d: Fix leak in intel_pasid_alloc_table on error path
iommu/vt-d: Make kernel parameter igfx_off work with vIOMMU
iommu/vt-d: Set intel_iommu_gfx_mapped correctly
iommu/amd: Flush not present cache in iommu_map_page
iommu/vt-d: Cleanup: no spaces at the start of a line
iommu/vt-d: Don't request page request irq under dmar_global_lock
iommu/vt-d: Use struct_size() helper
iommu/mediatek: Fix leaked of_node references
iommu/amd: Remove amd_iommu_pd_list
iommu/arm-smmu: Log CBFRSYNRA register on context fault
iommu/arm-smmu-v3: Don't disable SMMU in kdump kernel
iommu/arm-smmu-v3: Disable tagged pointers
iommu/arm-smmu-v3: Add support for PCI ATS
iommu/arm-smmu-v3: Link domains and devices
iommu/arm-smmu-v3: Add a master->domain pointer
iommu/arm-smmu-v3: Store SteamIDs in master
iommu/arm-smmu-v3: Rename arm_smmu_master_data to arm_smmu_master
ACPI/IORT: Check ATS capability in root complex nodes
...
Diffstat (limited to 'include/linux/mdev.h')
-rw-r--r-- | include/linux/mdev.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/mdev.h b/include/linux/mdev.h index 4924d8038814..89a52fd5756e 100644 --- a/include/linux/mdev.h +++ b/include/linux/mdev.h | |||
@@ -15,6 +15,20 @@ | |||
15 | 15 | ||
16 | struct mdev_device; | 16 | struct mdev_device; |
17 | 17 | ||
18 | /* | ||
19 | * Called by the parent device driver to set the device which represents | ||
20 | * this mdev in iommu protection scope. By default, the iommu device is | ||
21 | * NULL, that indicates using vendor defined isolation. | ||
22 | * | ||
23 | * @dev: the mediated device that iommu will isolate. | ||
24 | * @iommu_device: a pci device which represents the iommu for @dev. | ||
25 | * | ||
26 | * Return 0 for success, otherwise negative error value. | ||
27 | */ | ||
28 | int mdev_set_iommu_device(struct device *dev, struct device *iommu_device); | ||
29 | |||
30 | struct device *mdev_get_iommu_device(struct device *dev); | ||
31 | |||
18 | /** | 32 | /** |
19 | * struct mdev_parent_ops - Structure to be registered for each parent device to | 33 | * struct mdev_parent_ops - Structure to be registered for each parent device to |
20 | * register the device to mdev module. | 34 | * register the device to mdev module. |