Merge tag 'iommu-fixes-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu (ec538519) · Commits · 戴 / test

MAINTAINERS

+5 −2

Original line number	Diff line number	Diff line
		@@ -8298,11 +8298,14 @@ F: drivers/hid/intel-ish-hid/

		INTEL IOMMU (VT-d)
		M: David Woodhouse <dwmw2@infradead.org>
		M: Lu Baolu <baolu.lu@linux.intel.com>
		L: iommu@lists.linux-foundation.org
		T: git git://git.infradead.org/iommu-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
		S: Supported
		F: drivers/iommu/intel-iommu.c
		F: drivers/iommu/dmar.c
		F: drivers/iommu/intel*.[ch]
		F: include/linux/intel-iommu.h
		F: include/linux/intel-svm.h

		INTEL IOP-ADMA DMA DRIVER
		R: Dan Williams <dan.j.williams@intel.com>

+4 −2

Original line number	Diff line number	Diff line
		@@ -336,7 +336,8 @@ enum {
		#define QI_DEV_IOTLB_SID(sid) ((u64)((sid) & 0xffff) << 32)
		#define QI_DEV_IOTLB_QDEP(qdep) (((qdep) & 0x1f) << 16)
		#define QI_DEV_IOTLB_ADDR(addr) ((u64)(addr) & VTD_PAGE_MASK)
		#define QI_DEV_IOTLB_PFSID(pfsid) (((u64)(pfsid & 0xf) << 12) \| ((u64)(pfsid & 0xfff) << 52))
		#define QI_DEV_IOTLB_PFSID(pfsid) (((u64)(pfsid & 0xf) << 12) \| \
		((u64)((pfsid >> 4) & 0xfff) << 52))
		#define QI_DEV_IOTLB_SIZE 1
		#define QI_DEV_IOTLB_MAX_INVS 32

		@@ -360,7 +361,8 @@ enum {
		#define QI_DEV_EIOTLB_PASID(p) (((u64)p) << 32)
		#define QI_DEV_EIOTLB_SID(sid) ((u64)((sid) & 0xffff) << 16)
		#define QI_DEV_EIOTLB_QDEP(qd) ((u64)((qd) & 0x1f) << 4)
		#define QI_DEV_EIOTLB_PFSID(pfsid) (((u64)(pfsid & 0xf) << 12) \| ((u64)(pfsid & 0xfff) << 52))
		#define QI_DEV_EIOTLB_PFSID(pfsid) (((u64)(pfsid & 0xf) << 12) \| \
		((u64)((pfsid >> 4) & 0xfff) << 52))
		#define QI_DEV_EIOTLB_MAX_INVS 32

		/* Page group response descriptor QW0 */