mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
iommu/amd: Do not identity map v2 capable device when snp is enabled
[ Upstream commit18792e99ea
] Flow: - Booted system with SNP enabled, memory encryption off and IOMMU DMA translation mode - AMD driver detects v2 capable device and amd_iommu_def_domain_type() returns identity mode - amd_iommu_domain_alloc() returns NULL an SNP is enabled - System will fail to register device On SNP enabled system, passthrough mode is not supported. IOMMU default domain is set to translation mode. We need to return zero from amd_iommu_def_domain_type() so that it allocates translation domain. Fixes:fb2accadaa
("iommu/amd: Introduce function to check and enable SNP") CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Signed-off-by: Vasant Hegde <vasant.hegde@amd.com> Link: https://lore.kernel.org/r/20230207091752.7656-1-vasant.hegde@amd.com Signed-off-by: Joerg Roedel <jroedel@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
4c23124b45
commit
1bfe5bce1b
1 changed files with 9 additions and 4 deletions
|
@ -2394,12 +2394,17 @@ static int amd_iommu_def_domain_type(struct device *dev)
|
|||
return 0;
|
||||
|
||||
/*
|
||||
* Do not identity map IOMMUv2 capable devices when memory encryption is
|
||||
* active, because some of those devices (AMD GPUs) don't have the
|
||||
* encryption bit in their DMA-mask and require remapping.
|
||||
* Do not identity map IOMMUv2 capable devices when:
|
||||
* - memory encryption is active, because some of those devices
|
||||
* (AMD GPUs) don't have the encryption bit in their DMA-mask
|
||||
* and require remapping.
|
||||
* - SNP is enabled, because it prohibits DTE[Mode]=0.
|
||||
*/
|
||||
if (!cc_platform_has(CC_ATTR_MEM_ENCRYPT) && dev_data->iommu_v2)
|
||||
if (dev_data->iommu_v2 &&
|
||||
!cc_platform_has(CC_ATTR_MEM_ENCRYPT) &&
|
||||
!amd_iommu_snp_en) {
|
||||
return IOMMU_DOMAIN_IDENTITY;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue