github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 05:27:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "ANDROID: iommu/arm-smmu: Allow inherting stream mapping from bootloader"

Browse Source 
This reverts Change-Id: Ibb3784360a4424f7dc7c64a241811642aa0de7f4
(commit 7e24cc89a14d in android-mainline-tracking).

Recently, the commit 792c2bf3a5 ("FROMGIT: iommu/arm-smmu:
Don't bypass pinned stream mappings") was reverted from
android-mainline, due to alternative solutions eventually
landing upstream.

However, that change resolved an issue with another patch that ended
up getting an alternative solution. So reverting it broke the db845c
from booting.

Thus this patch reverts the prior patch as well, so that we are
aligned with upstream and properly boot.

Cc: Todd Kjos <tkjos@google.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Fixes: 5b9e3e32e0 ("Revert "FROMGIT: iommu/arm-smmu: Don't bypass pinned stream mappings"")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I5316d492f22ac797fba6748dd47e4d475e372c86
This commit is contained in:
John Stultz 2021-06-02 01:34:57 +00:00
parent 9f16040d22
commit 729f55b35d
3 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
View File

@ -3,7 +3,6 @@
* Copyright (c) 2019, The Linux Foundation. All rights reserved.
*/
#include <linux/bitfield.h>
#include <linux/adreno-smmu-priv.h>
#include <linux/of_device.h>
#include <linux/qcom_scm.h>
@ -16,43 +15,6 @@ struct qcom_smmu {
u8 bypass_cbndx;
};
static int qcom_sdm845_smmu500_cfg_probe(struct arm_smmu_device *smmu)
{
u32 s2cr;
u32 smr;
int i;
for (i = 0; i < smmu->num_mapping_groups; i++) {
smr = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_SMR(i));
s2cr = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_S2CR(i));
smmu->smrs[i].mask = FIELD_GET(ARM_SMMU_SMR_MASK, smr);
smmu->smrs[i].id = FIELD_GET(ARM_SMMU_SMR_ID, smr);
if (smmu->features & ARM_SMMU_FEAT_EXIDS)
smmu->smrs[i].valid = FIELD_GET(
ARM_SMMU_S2CR_EXIDVALID,
s2cr);
else
smmu->smrs[i].valid = FIELD_GET(
ARM_SMMU_SMR_VALID,
smr);
smmu->s2crs[i].group = NULL;
smmu->s2crs[i].count = 0;
smmu->s2crs[i].type = FIELD_GET(ARM_SMMU_S2CR_TYPE, s2cr);
smmu->s2crs[i].privcfg = FIELD_GET(ARM_SMMU_S2CR_PRIVCFG, s2cr);
smmu->s2crs[i].cbndx = FIELD_GET(ARM_SMMU_S2CR_CBNDX, s2cr);
if (!smmu->smrs[i].valid)
continue;
smmu->s2crs[i].pinned = true;
bitmap_set(smmu->context_map, smmu->s2crs[i].cbndx, 1);
}
return 0;
}
static struct qcom_smmu *to_qcom_smmu(struct arm_smmu_device *smmu)
{
return container_of(smmu, struct qcom_smmu, smmu);
@ -335,7 +297,6 @@ static int qcom_smmu500_reset(struct arm_smmu_device *smmu)
static const struct arm_smmu_impl qcom_smmu_impl = {
.cfg_probe = qcom_smmu_cfg_probe,
.def_domain_type = qcom_smmu_def_domain_type,
.cfg_probe = qcom_sdm845_smmu500_cfg_probe,
.reset = qcom_smmu500_reset,
.write_s2cr = qcom_smmu_write_s2cr,
};

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

@ -1024,19 +1024,12 @@ static int arm_smmu_find_sme(struct arm_smmu_device *smmu, u16 id, u16 mask)
static bool arm_smmu_free_sme(struct arm_smmu_device *smmu, int idx)
{
bool pinned = smmu->s2crs[idx].pinned;
u8 cbndx = smmu->s2crs[idx].cbndx;
if (--smmu->s2crs[idx].count)
return false;
smmu->s2crs[idx] = s2cr_init_val;
if (pinned) {
smmu->s2crs[idx].pinned = true;
smmu->s2crs[idx].cbndx = cbndx;
} else if (smmu->smrs) {
if (smmu->smrs)
smmu->smrs[idx].valid = false;
}
return true;
}

2
drivers/iommu/arm/arm-smmu/arm-smmu.h
View File

@ -263,13 +263,13 @@ struct arm_smmu_s2cr {
enum arm_smmu_s2cr_type type;
enum arm_smmu_s2cr_privcfg privcfg;
u8 cbndx;
bool pinned;
};
struct arm_smmu_smr {
u16 mask;
u16 id;
bool valid;
bool pinned;
};
struct arm_smmu_device {