Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c48db44 authored by Jacob Pan's avatar Jacob Pan Committed by Joerg Roedel
Browse files

iommu/vt-d: Fix dev iotlb pfsid use 



PFSID should be used in the invalidation descriptor for flushing
device IOTLBs on SRIOV VFs.

Signed-off-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Cc: stable@vger.kernel.org
Cc: "Ashok Raj" <ashok.raj@intel.com>
Cc: "Lu Baolu" <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 0f725561

drivers/iommu/dmar.c

+3 −3
Original line number Diff line number Diff line
@@ -1339,8 +1339,8 @@ void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr, 
	qi_submit_sync(&desc, iommu);

}



void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,

			u64 addr, unsigned mask)

void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,

			u16 qdep, u64 addr, unsigned mask)

{

	struct qi_desc desc;
@@ -1355,7 +1355,7 @@ void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep, 
		qdep = 0;



	desc.low = QI_DEV_IOTLB_SID(sid) | QI_DEV_IOTLB_QDEP(qdep) |

		   QI_DIOTLB_TYPE;

		   QI_DIOTLB_TYPE | QI_DEV_IOTLB_PFSID(pfsid);



	qi_submit_sync(&desc, iommu);

}

drivers/iommu/intel-iommu.c

+16 −1
Original line number Diff line number Diff line
@@ -1475,6 +1475,20 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info) 
		return;



	pdev = to_pci_dev(info->dev);

	/* For IOMMU that supports device IOTLB throttling (DIT), we assign

	 * PFSID to the invalidation desc of a VF such that IOMMU HW can gauge

	 * queue depth at PF level. If DIT is not set, PFSID will be treated as

	 * reserved, which should be set to 0.

	 */

	if (!ecap_dit(info->iommu->ecap))

		info->pfsid = 0;

	else {

		struct pci_dev *pf_pdev;



		/* pdev will be returned if device is not a vf */

		pf_pdev = pci_physfn(pdev);

		info->pfsid = PCI_DEVID(pf_pdev->bus->number, pf_pdev->devfn);

	}



#ifdef CONFIG_INTEL_IOMMU_SVM

	/* The PCIe spec, in its wisdom, declares that the behaviour of
@@ -1540,7 +1554,8 @@ static void iommu_flush_dev_iotlb(struct dmar_domain *domain, 


		sid = info->bus << 8 | info->devfn;

		qdep = info->ats_qdep;

		qi_flush_dev_iotlb(info->iommu, sid, qdep, addr, mask);

		qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,

				qdep, addr, mask);

	}

	spin_unlock_irqrestore(&device_domain_lock, flags);

}

include/linux/intel-iommu.h

+2 −3
Original line number Diff line number Diff line
@@ -455,9 +455,8 @@ extern void qi_flush_context(struct intel_iommu *iommu, u16 did, u16 sid, 
			     u8 fm, u64 type);

extern void qi_flush_iotlb(struct intel_iommu *iommu, u16 did, u64 addr,

			  unsigned int size_order, u64 type);

extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 qdep,

			       u64 addr, unsigned mask);



extern void qi_flush_dev_iotlb(struct intel_iommu *iommu, u16 sid, u16 pfsid,

			u16 qdep, u64 addr, unsigned mask);

extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);



extern int dmar_ir_support(void);