提交 24867263 编写于 作者: Z Zhen Lei 提交者: Yang Yingliang

iommu/arm-smmu-v3: add bit field SFM into GERROR_ERR_MASK

mainline inclusion
from mainline-v5.13-rc1
commit 655c447c
category: bugfix
bugzilla: 71819
CVE: NA

-------------------------------------------------

In arm_smmu_gerror_handler(), the value of the SMMU_GERROR register is
filtered by GERROR_ERR_MASK. However, the GERROR_ERR_MASK does not contain
the SFM bit. As a result, the subsequent error processing is not performed
when only the SFM error occurs.

Fixes: 48ec83bc ("iommu/arm-smmu: Add initial driver support for ARM SMMUv3 devices")
Reported-by: NRui Zhu <zhurui3@huawei.com>
Signed-off-by: NZhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20210324081603.1074-1-thunder.leizhen@huawei.comSigned-off-by: NWill Deacon <will@kernel.org>
Signed-off-by: NChen Wandun <chenwandun@huawei.com>
Reviewed-by: Ntong tiangen <tongtiangen@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 283a76a5
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
#define GERROR_PRIQ_ABT_ERR (1 << 3) #define GERROR_PRIQ_ABT_ERR (1 << 3)
#define GERROR_EVTQ_ABT_ERR (1 << 2) #define GERROR_EVTQ_ABT_ERR (1 << 2)
#define GERROR_CMDQ_ERR (1 << 0) #define GERROR_CMDQ_ERR (1 << 0)
#define GERROR_ERR_MASK 0xfd #define GERROR_ERR_MASK 0x1fd
#define ARM_SMMU_GERRORN 0x64 #define ARM_SMMU_GERRORN 0x64
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册