48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
|
From a6c7b16107b506f85e6643604c923291e41f70d1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nicolin Chen <nicolinc@nvidia.com>
|
||
|
|
Date: Wed, 19 Jun 2024 04:42:33 +0000
|
||
|
|
Subject: [PATCH] hw/arm/virt: Add an SMMU_IO_LEN macro
|
||
|
|
|
||
|
|
A following patch will add a new MMIO region for nested SMMU instances.
|
||
|
|
|
||
|
|
This macro will be repeatedly used to set offsets and MMIO sizes in both
|
||
|
|
virt and virt-acpi-build.
|
||
|
|
|
||
|
|
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
|
||
|
|
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
|
||
|
|
---
|
||
|
|
hw/arm/virt.c | 2 +-
|
||
|
|
include/hw/arm/virt.h | 3 +++
|
||
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
||
|
|
index 8823f2ed1c..08c40c314b 100644
|
||
|
|
--- a/hw/arm/virt.c
|
||
|
|
+++ b/hw/arm/virt.c
|
||
|
|
@@ -155,7 +155,7 @@ static const MemMapEntry base_memmap[] = {
|
||
|
|
[VIRT_FW_CFG] = { 0x09020000, 0x00000018 },
|
||
|
|
[VIRT_GPIO] = { 0x09030000, 0x00001000 },
|
||
|
|
[VIRT_SECURE_UART] = { 0x09040000, 0x00001000 },
|
||
|
|
- [VIRT_SMMU] = { 0x09050000, 0x00020000 },
|
||
|
|
+ [VIRT_SMMU] = { 0x09050000, SMMU_IO_LEN },
|
||
|
|
[VIRT_PCDIMM_ACPI] = { 0x09070000, MEMORY_HOTPLUG_IO_LEN },
|
||
|
|
[VIRT_ACPI_GED] = { 0x09080000, ACPI_GED_EVT_SEL_LEN },
|
||
|
|
[VIRT_NVDIMM_ACPI] = { 0x09090000, NVDIMM_ACPI_IO_LEN},
|
||
|
|
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
|
||
|
|
index 345b2d5594..e6a449becd 100644
|
||
|
|
--- a/include/hw/arm/virt.h
|
||
|
|
+++ b/include/hw/arm/virt.h
|
||
|
|
@@ -106,6 +106,9 @@ typedef enum {
|
||
|
|
ARM_L3_CACHE
|
||
|
|
} ArmCacheType;
|
||
|
|
|
||
|
|
+/* MMIO region size for SMMUv3 */
|
||
|
|
+#define SMMU_IO_LEN 0x20000
|
||
|
|
+
|
||
|
|
enum {
|
||
|
|
VIRT_FLASH,
|
||
|
|
VIRT_MEM,
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|