lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "iommu/arm-smmu: add qsmmuv2 sync timeout handler"

Browse Source
This commit is contained in:
qctecmdr 2020-10-07 12:10:24 -07:00 committed by Gerrit - the friendly Code Review server
commit 6dcc24a002
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,6 +193,14 @@ static phys_addr_t qsmmuv2_iova_to_phys_hard(
return phys;
}
static void qsmmuv2_tlb_sync_timeout(struct arm_smmu_device *smmu)
{
dev_err_ratelimited(smmu->dev,
"TLB sync timed out -- SMMU may be deadlocked\n");
BUG_ON(IS_ENABLED(CONFIG_IOMMU_TLBSYNC_DEBUG));
}
static int qsmmuv2_device_reset(struct arm_smmu_device *smmu)
{
struct qsmmuv2_archdata *data = to_qsmmuv2_archdata(smmu);
@ -280,6 +288,7 @@ static int arm_smmu_parse_impl_def_registers(struct arm_smmu_device *smmu)
static const struct arm_smmu_impl qsmmuv2_impl = {
.init_context_bank = qsmmuv2_init_cb,
.iova_to_phys_hard = qsmmuv2_iova_to_phys_hard,
.tlb_sync_timeout = qsmmuv2_tlb_sync_timeout,
.reset = qsmmuv2_device_reset,
};