android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "arm-smmu: do not release pinned context"

Browse Source
This commit is contained in:
qctecmdr 2022-02-04 01:21:46 -08:00 committed by Gerrit - the friendly Code Review server
commit 305fa69b81
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/iommu/arm/arm-smmu/arm-smmu.c
View File

@ -1778,7 +1778,8 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
struct arm_smmu_device *smmu = smmu_domain->smmu;
struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
int irq;
int ret;
int ret, i;
bool pinned = false;
if (!smmu || domain->type == IOMMU_DOMAIN_IDENTITY)
return;
@ -1813,7 +1814,15 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
arm_smmu_secure_pool_destroy(smmu_domain);
arm_smmu_unassign_table(smmu_domain);
arm_smmu_secure_domain_unlock(smmu_domain);
__arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
for (i = 0; i < smmu->num_mapping_groups; i++)
if ((cfg->cbndx == smmu->s2crs[i].cbndx) &&
(smmu->s2crs[i].pinned)) {
pinned = true;
}
if (!pinned)
__arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
arm_smmu_rpm_put(smmu);
arm_smmu_domain_reinit(smmu_domain);