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

Merge "arm-smmu: Add the IGNORE_NUMPAGENDXB option"

Browse Source
This commit is contained in:
qctecmdr 2022-07-09 06:30:09 -07:00 committed by Gerrit - the friendly Code Review server
commit e90f36fad4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,7 @@ static struct arm_smmu_option_prop arm_smmu_options[] = {
{ ARM_SMMU_OPT_NO_ASID_RETENTION, "qcom,no-asid-retention" },
{ ARM_SMMU_OPT_DISABLE_ATOS, "qcom,disable-atos" },
{ ARM_SMMU_OPT_CONTEXT_FAULT_RETRY, "qcom,context-fault-retry" },
{ ARM_SMMU_OPT_IGNORE_NUMPAGENDXB, "qcom,ignore-numpagendxb" },
{ 0, NULL},
};
@ -3163,7 +3164,10 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
"SMMU address space size (0x%x) differs from mapped region size (0x%x)!\n",
2 * size << smmu->pgshift, smmu->numpage);
/* Now properly encode NUMPAGE to subsequently derive SMMU_CB_BASE */
smmu->numpage = size;
if (!(smmu->options & ARM_SMMU_OPT_IGNORE_NUMPAGENDXB))
smmu->numpage = size;
else
smmu->numpage = (smmu->numpage / 2) >> smmu->pgshift;
smmu->num_s2_context_banks = FIELD_GET(ARM_SMMU_ID1_NUMS2CB, id);
smmu->num_context_banks = FIELD_GET(ARM_SMMU_ID1_NUMCB, id);
@ -3380,6 +3384,8 @@ static int arm_smmu_device_dt_probe(struct arm_smmu_device *smmu,
if (of_dma_is_coherent(dev->of_node))
smmu->features |= ARM_SMMU_FEAT_COHERENT_WALK;
parse_driver_options(smmu);
return 0;
}
@ -3552,7 +3558,6 @@ static int arm_smmu_device_probe(struct platform_device *pdev)
/* QCOM Additions */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
smmu->phys_addr = res->start;
parse_driver_options(smmu);
err = arm_smmu_handoff_cbs(smmu);
if (err)
goto out_power_off;

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

@ -381,6 +381,7 @@ struct arm_smmu_device {
#define ARM_SMMU_OPT_NO_ASID_RETENTION (1 << 3)
#define ARM_SMMU_OPT_DISABLE_ATOS (1 << 4)
#define ARM_SMMU_OPT_CONTEXT_FAULT_RETRY (1 << 5)
#define ARM_SMMU_OPT_IGNORE_NUMPAGENDXB (1 << 6)
u32 options;
enum arm_smmu_arch_version version;
enum arm_smmu_implementation model;