Since commit cd221bd24ff5 ("iommu/arm-smmu: Allow building as a module"),
there is a side effect that the module name is changed from arm-smmu to
arm-smmu-mod. So the kernel parameter for disable_bypass need to be
changed too. Fix the Kconfig help and error message to the correct
parameter name.
Signed-off-by: Li Yang <leoyang...@nxp.com>
---
drivers/iommu/Kconfig | 2 +-
drivers/iommu/arm-smmu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index d2fade984999..fb54be903c60 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -415,7 +415,7 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT
hardcode the bypass disable in the code.
NOTE: the kernel command line parameter
- 'arm-smmu.disable_bypass' will continue to override this
+ 'arm-smmu-mod.disable_bypass' will continue to override this
config.
config ARM_SMMU_V3
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 16c4b87af42b..2ffe8ff04393 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -512,7 +512,7 @@ static irqreturn_t arm_smmu_global_fault(int irq, void *dev)
if (IS_ENABLED(CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT) &&
(gfsr & ARM_SMMU_sGFSR_USF))
dev_err(smmu->dev,
- "Blocked unknown Stream ID 0x%hx; boot with
\"arm-smmu.disable_bypass=0\" to allow, but this may have security
implications\n",
+ "Blocked unknown Stream ID 0x%hx; boot with
\"arm-smmu-mod.disable_bypass=0\" to allow, but this may have security
implications\n",
(u16)gfsynr1);
else
dev_err(smmu->dev,
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
