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

Commit ca6e322d authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

iommu/vt-d: Pass pasid table to context mapping 



So that the pasid related info, such as the pasid table and the
maximum of pasid could be used during setting up scalable mode
context.

Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Liu Yi L <yi.l.liu@intel.com>
Cc: Sanjay Kumar <sanjay.k.kumar@intel.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarAshok Raj <ashok.raj@intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent ef848b7e

drivers/iommu/intel-iommu.c

+11 −3
Original line number Diff line number Diff line
@@ -1920,6 +1920,7 @@ static void domain_exit(struct dmar_domain *domain) 


static int domain_context_mapping_one(struct dmar_domain *domain,

				      struct intel_iommu *iommu,

				      struct pasid_table *table,

				      u8 bus, u8 devfn)

{

	u16 did = domain->iommu_did[iommu->seq_id];
@@ -2042,6 +2043,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain, 
struct domain_context_mapping_data {

	struct dmar_domain *domain;

	struct intel_iommu *iommu;

	struct pasid_table *table;

};



static int domain_context_mapping_cb(struct pci_dev *pdev,
@@ -2050,25 +2052,31 @@ static int domain_context_mapping_cb(struct pci_dev *pdev, 
	struct domain_context_mapping_data *data = opaque;



	return domain_context_mapping_one(data->domain, data->iommu,

					  PCI_BUS_NUM(alias), alias & 0xff);

					  data->table, PCI_BUS_NUM(alias),

					  alias & 0xff);

}



static int

domain_context_mapping(struct dmar_domain *domain, struct device *dev)

{

	struct domain_context_mapping_data data;

	struct pasid_table *table;

	struct intel_iommu *iommu;

	u8 bus, devfn;

	struct domain_context_mapping_data data;



	iommu = device_to_iommu(dev, &bus, &devfn);

	if (!iommu)

		return -ENODEV;



	table = intel_pasid_get_table(dev);



	if (!dev_is_pci(dev))

		return domain_context_mapping_one(domain, iommu, bus, devfn);

		return domain_context_mapping_one(domain, iommu, table,

						  bus, devfn);



	data.domain = domain;

	data.iommu = iommu;

	data.table = table;



	return pci_for_each_dma_alias(to_pci_dev(dev),

				      &domain_context_mapping_cb, &data);