[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 11/12] hw/arm/smmuv3: Add property for OAS
From: |
Mostafa Saleh |
Subject: |
[RFC PATCH 11/12] hw/arm/smmuv3: Add property for OAS |
Date: |
Mon, 25 Mar 2024 10:14:07 +0000 |
Add property that sets the OAS of the SMMU, this in not used in this
patch.
Signed-off-by: Mostafa Saleh <smostafa@google.com>
---
hw/arm/smmuv3-internal.h | 2 +-
hw/arm/smmuv3.c | 27 ++++++++++++++++++++++++++-
include/hw/arm/smmuv3.h | 1 +
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h
index a7d53b3854..9bb4ec9ec6 100644
--- a/hw/arm/smmuv3-internal.h
+++ b/hw/arm/smmuv3-internal.h
@@ -105,7 +105,7 @@ REG32(IDR5, 0x14)
FIELD(IDR5, VAX, 10, 2);
FIELD(IDR5, STALL_MAX, 16, 16);
-#define SMMU_IDR5_OAS 4
+#define SMMU_IDR5_OAS_DEF 4
REG32(IIDR, 0x18)
REG32(AIDR, 0x1c)
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
index 2a29e3bccb..9d0db25379 100644
--- a/hw/arm/smmuv3.c
+++ b/hw/arm/smmuv3.c
@@ -299,7 +299,7 @@ static void smmuv3_init_regs(SMMUv3State *s)
s->idr[3] = FIELD_DP32(s->idr[3], IDR3, RIL, 1);
s->idr[3] = FIELD_DP32(s->idr[3], IDR3, BBML, 2);
- s->idr[5] = FIELD_DP32(s->idr[5], IDR5, OAS, SMMU_IDR5_OAS); /* 44 bits */
+ s->idr[5] = FIELD_DP32(s->idr[5], IDR5, OAS, s->oas);
/* 4K, 16K and 64K granule support */
s->idr[5] = FIELD_DP32(s->idr[5], IDR5, GRAN4K, 1);
s->idr[5] = FIELD_DP32(s->idr[5], IDR5, GRAN16K, 1);
@@ -1869,11 +1869,34 @@ static const VMStateDescription vmstate_gbpa = {
}
};
+static const VMStateDescription vmstate_oas = {
+ .name = "smmuv3/oas",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (const VMStateField[]) {
+ VMSTATE_INT32(oas, SMMUv3State),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static int smmuv3_preload(void *opaque)
+{
+ SMMUv3State *s = opaque;
+
+ /*
+ * In case it wasn't migrated, use the value used
+ * by older QEMU.
+ */
+ s->oas = SMMU_IDR5_OAS_DEF;
+ return 0;
+}
+
static const VMStateDescription vmstate_smmuv3 = {
.name = "smmuv3",
.version_id = 1,
.minimum_version_id = 1,
.priority = MIG_PRI_IOMMU,
+ .pre_load = smmuv3_preload,
.fields = (const VMStateField[]) {
VMSTATE_UINT32(features, SMMUv3State),
VMSTATE_UINT8(sid_size, SMMUv3State),
@@ -1901,6 +1924,7 @@ static const VMStateDescription vmstate_smmuv3 = {
},
.subsections = (const VMStateDescription * const []) {
&vmstate_gbpa,
+ &vmstate_oas,
NULL
}
};
@@ -1913,6 +1937,7 @@ static Property smmuv3_properties[] = {
* Defaults to stage 1
*/
DEFINE_PROP_STRING("stage", SMMUv3State, stage),
+ DEFINE_PROP_INT32("oas", SMMUv3State, oas, SMMU_IDR5_OAS_DEF),
DEFINE_PROP_END_OF_LIST()
};
diff --git a/include/hw/arm/smmuv3.h b/include/hw/arm/smmuv3.h
index d183a62766..00a9eb4467 100644
--- a/include/hw/arm/smmuv3.h
+++ b/include/hw/arm/smmuv3.h
@@ -63,6 +63,7 @@ struct SMMUv3State {
qemu_irq irq[4];
QemuMutex mutex;
char *stage;
+ int32_t oas;
};
typedef enum {
--
2.44.0.396.g6e790dbe36-goog
- [RFC PATCH 03/12] hw/arm/smmu: Add stage to TLB, (continued)
- [RFC PATCH 03/12] hw/arm/smmu: Add stage to TLB, Mostafa Saleh, 2024/03/25
- [RFC PATCH 04/12] hw/arm/smmu: Support nesting in commands, Mostafa Saleh, 2024/03/25
- [RFC PATCH 06/12] hw/arm/smmuv3: Translate CD and TT using stage-2 table, Mostafa Saleh, 2024/03/25
- [RFC PATCH 05/12] hw/arm/smmuv3: Support nested SMMUs in smmuv3_notify_iova(), Mostafa Saleh, 2024/03/25
- [RFC PATCH 07/12] hw/arm/smmu-common: Support nested translation, Mostafa Saleh, 2024/03/25
- [RFC PATCH 08/12] hw/arm/smmuv3: Support and advertise nesting, Mostafa Saleh, 2024/03/25
- [RFC PATCH 09/12] hw/arm/smmuv3: Advertise S2FWB, Mostafa Saleh, 2024/03/25
- [RFC PATCH 10/12] hw/arm/smmu: Refactor SMMU OAS, Mostafa Saleh, 2024/03/25
- [RFC PATCH 11/12] hw/arm/smmuv3: Add property for OAS,
Mostafa Saleh <=
- [RFC PATCH 12/12] hw/arm/virt: Set SMMU OAS based on CPU PARANGE, Mostafa Saleh, 2024/03/25
- Re: [RFC PATCH 00/12] SMMUv3 nested translation support, Marcin Juszkiewicz, 2024/03/25