iommu: arm-smmu-v3: Mark expected switch fall-through
PATCH v2 1/1 iommu: arm-smmu-v3: Mark expected switch fall-through
Now that -Wimplicit-fallthrough is passed to GCC by default, the following warning shows up:
../drivers/iommu/arm-smmu-v3.c: In function ‘arm_smmu_write_strtab_ent’:../drivers/iommu/arm-smmu-v3.c:1189:7: warning: this statement may fall
through [-Wimplicit-fallthrough=]
if (disable_bypass)
^../drivers/iommu/arm-smmu-v3.c:1191:3: note: here
default:
^~~~~~~
Rework so that the compiler doesn't warn about fall-through. Make it clearer by calling 'BUG_ON()' when disable_bypass is set, and always 'break;'
--- drivers/iommu/arm-smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/arm-smmu-v3.c +2 -2
@@ -1186,8 +1186,8 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, ste_live = true;break ;case STRTAB_STE_0_CFG_ABORT : -if (disable_bypass) -break ; +BUG_ON (!disable_bypass); +break ;default :BUG ();/* STE corruption */ }
Signature · 1 line
2.20.1
Quoted 38 lines · Anders Roxell
Now that -Wimplicit-fallthrough is passed to GCC by default, the following warning shows up:
../drivers/iommu/arm-smmu-v3.c: In function ‘arm_smmu_write_strtab_ent’:../drivers/iommu/arm-smmu-v3.c:1189:7: warning: this statement may fall
through [-Wimplicit-fallthrough=]if (disable_bypass) ^ ../drivers/iommu/arm-smmu-v3.c:1191:3: note: here default: ^~~~~~~Rework so that the compiler doesn't warn about fall-through. Make it clearer by calling '
BUG_ON()' whendisable_bypassis set, and always 'break;'Signed-off-by Anders Roxell <[email protected]>--- drivers/iommu/arm-smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/arm-smmu-v3.c +2
-2@@ -1186,8 +1186,8 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, ste_live = true;break ;case STRTAB_STE_0_CFG_ABORT : -if (disable_bypass) -break ; +BUG_ON (!disable_bypass); +break ;default :BUG ();/* STE corruption */ }Signature · 1 line
2.20.1
Joerg -- if you'd like to pick this up as a fix, feel free, otherwise I'll include it in my pull request for 5.4.
Cheers,
Will
Joerg Roedel
maintainerQuoted 2 lines · Will Deacon
Joerg -- if you'd like to pick this up as a fix, feel free, otherwise I'll include it in my pull request for 5.4.
Applied to iommu/fixes, thanks.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu