Commit a1deee90 authored by Yi Liu's avatar Yi Liu Committed by Joerg Roedel
Browse files

iommu/vt-d: Add iommu_domain_did() to get did 



domain_id_iommu() does not support SVA type and identity type domains.
Add iommu_domain_did() to support all domain types.

Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20241107122234.7424-7-yi.l.liu@intel.com


Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent d93cf86c

drivers/iommu/intel/iommu.h

+16 −0
Original line number Diff line number Diff line
@@ -806,6 +806,13 @@ static inline struct dmar_domain *to_dmar_domain(struct iommu_domain *dom) 
	return container_of(dom, struct dmar_domain, domain);

}



/*

 * Domain ID reserved for pasid entries programmed for first-level

 * only and pass-through transfer modes.

 */

#define FLPT_DEFAULT_DID		1

#define NUM_RESERVED_DID		2



/* Retrieve the domain ID which has allocated to the domain */

static inline u16

domain_id_iommu(struct dmar_domain *domain, struct intel_iommu *iommu)
@@ -816,6 +823,15 @@ domain_id_iommu(struct dmar_domain *domain, struct intel_iommu *iommu) 
	return info->did;

}



static inline u16

iommu_domain_did(struct iommu_domain *domain, struct intel_iommu *iommu)

{

	if (domain->type == IOMMU_DOMAIN_SVA ||

	    domain->type == IOMMU_DOMAIN_IDENTITY)

		return FLPT_DEFAULT_DID;

	return domain_id_iommu(to_dmar_domain(domain), iommu);

}



/*

 * 0: readable

 * 1: writable

drivers/iommu/intel/pasid.h

+0 −7
Original line number Diff line number Diff line
@@ -22,13 +22,6 @@ 
#define is_pasid_enabled(entry)		(((entry)->lo >> 3) & 0x1)

#define get_pasid_dir_size(entry)	(1 << ((((entry)->lo >> 9) & 0x7) + 7))



/*

 * Domain ID reserved for pasid entries programmed for first-level

 * only and pass-through transfer modes.

 */

#define FLPT_DEFAULT_DID		1

#define NUM_RESERVED_DID		2



#define PASID_FLAG_NESTED		BIT(1)

#define PASID_FLAG_PAGE_SNOOP		BIT(2)