diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-16 18:17:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-16 18:17:28 +0000 |
| commit | 99c2312e4f131f45993d7f4d741e61d647e7ed10 (patch) | |
| tree | 4ee5bb080ce29457e706d4e733996177afc87e48 | |
| parent | 36cf72bcf576343b2858e434afe3be5cd0cf8f5e (diff) | |
| parent | a39c71321ca4c0bd93952f01be3d4dbecf1a7db4 (diff) | |
| download | msm-android-msm-eos-5.15-tm-wear-kr3-pixel-watch.tar.gz | |
Merge cherrypicks of ['partner-android-review.googlesource.com/2742255'] into android13-msm-pixelwatch-5.15-24Q1-release.android-wear-13.0.0_r0.14android-wear-13.0.0_r0.12android-msm-eos-android13-wear-kr3-pixel-watchandroid-msm-eos-5.15-tm-wear-kr3-pixel-watch
Change-Id: I991a482f905abdf97521048b00560ca55a57f1bf
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>
| -rw-r--r-- | drivers/iommu/qcom-io-pgtable-arm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iommu/qcom-io-pgtable-arm.c b/drivers/iommu/qcom-io-pgtable-arm.c index ce8e40612e37..172fd6bf01d1 100644 --- a/drivers/iommu/qcom-io-pgtable-arm.c +++ b/drivers/iommu/qcom-io-pgtable-arm.c @@ -6,7 +6,7 @@ * * Author: Will Deacon <will.deacon@arm.com> * - * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved. */ #define pr_fmt(fmt) "arm-lpae io-pgtable: " fmt @@ -744,8 +744,10 @@ static int arm_lpae_map_by_pgsize(struct io_pgtable_ops *ops, if (ms->pgtable && (iova < ms->iova_end)) { ms_ptep = ms->pgtable + ARM_LPAE_LVL_IDX(iova, MAP_STATE_LVL, data); - arm_lpae_init_pte(data, iova, paddr, prot, MAP_STATE_LVL, + ret = arm_lpae_init_pte(data, iova, paddr, prot, MAP_STATE_LVL, 1, ms_ptep, ms->prev_pgtable, false); + if (ret) + return ret; ms->num_pte++; } else { ret = __arm_lpae_map(data, iova, paddr, pgsize, 1, |