42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 7d0023ef0c909bc569477e7676bc4c43734783a3 Mon Sep 17 00:00:00 2001
|
|
From: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
Date: Fri, 18 Nov 2022 15:22:35 +0800
|
|
Subject: [PATCH 16/36] Revert "hw/arm/smmuv3: Store the PASID table GPA in the
|
|
translation config"
|
|
|
|
This reverts commit f937ce4124d57eea27d516957a2efa0e7fbdf198.
|
|
|
|
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
---
|
|
hw/arm/smmuv3.c | 1 -
|
|
include/hw/arm/smmu-common.h | 1 -
|
|
2 files changed, 2 deletions(-)
|
|
|
|
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
|
|
index e09e54a9aa..275f1db430 100644
|
|
--- a/hw/arm/smmuv3.c
|
|
+++ b/hw/arm/smmuv3.c
|
|
@@ -362,7 +362,6 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg,
|
|
"SMMUv3 S1 stalling fault model not allowed yet\n");
|
|
goto bad_ste;
|
|
}
|
|
- cfg->s1ctxptr = STE_CTXPTR(ste);
|
|
return 0;
|
|
|
|
bad_ste:
|
|
diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h
|
|
index d578339935..706be3c6d0 100644
|
|
--- a/include/hw/arm/smmu-common.h
|
|
+++ b/include/hw/arm/smmu-common.h
|
|
@@ -76,7 +76,6 @@ typedef struct SMMUTransCfg {
|
|
uint8_t tbi; /* Top Byte Ignore */
|
|
uint16_t asid;
|
|
SMMUTransTableInfo tt[2];
|
|
- dma_addr_t s1ctxptr;
|
|
uint32_t iotlb_hits; /* counts IOTLB hits for this asid */
|
|
uint32_t iotlb_misses; /* counts IOTLB misses for this asid */
|
|
} SMMUTransCfg;
|
|
--
|
|
2.27.0
|
|
|