05fcc90d20
- hw/misc/mos6522: Fix bad class definition of the MOS6522 device - target/i386: Fix minor typo in NO_NESTED_DATA_BP feature bit - cpu: ensure we don't call start_exclusive from cpu_exec - Avoid unaligned fetch in ladr_match() - audio/audio.c: remove trailing newline in error_setg - acpi/tests/avocado/bits: wait for 200 seconds for SHUTDOWN event from bits VM - linux-user: Tolerate CONFIG_LSM_MMAP_MIN_ADDR - accel/tcg: Fix user-only probe_access_internal plugin - linux-user: Honor elf alignment when placing images - Reserve address for MSI mapping in the CVM scenario. Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 3ab56c27fe6b593be9a24f27b52b2730efa05304)
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From e698238a5fa6e78fdffc8269d59884df69da3434 Mon Sep 17 00:00:00 2001
|
|
From: chenzheng <chenzheng71@huawei.com>
|
|
Date: Thu, 5 Dec 2024 11:06:57 +0000
|
|
Subject: [PATCH] Reserve address for MSI mapping in the CVM scenario.
|
|
|
|
Signed-off-by: yangxiangkai@huawei.com
|
|
---
|
|
hw/arm/virt.c | 3 ++-
|
|
include/hw/arm/virt.h | 1 +
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index a9efcec85e..8823f2ed1c 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -162,8 +162,9 @@ static const MemMapEntry base_memmap[] = {
|
|
[VIRT_PVTIME] = { 0x090a0000, 0x00010000 },
|
|
[VIRT_SECURE_GPIO] = { 0x090b0000, 0x00001000 },
|
|
[VIRT_CPUHP_ACPI] = { 0x090c0000, ACPI_CPU_HOTPLUG_REG_LEN},
|
|
- /* In the virtCCA scenario, this space is used for MSI interrupt mapping */
|
|
[VIRT_MMIO] = { 0x0a000000, 0x00000200 },
|
|
+ /* In the virtCCA scenario, this space is used for MSI interrupt mapping */
|
|
+ [VIRT_CVM_MSI] = { 0x0a001000, 0x00fff000 },
|
|
[VIRT_CPUFREQ] = { 0x0b000000, 0x00010000 },
|
|
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
|
|
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
|
|
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
|
|
index 4b7dc61c24..345b2d5594 100644
|
|
--- a/include/hw/arm/virt.h
|
|
+++ b/include/hw/arm/virt.h
|
|
@@ -121,6 +121,7 @@ enum {
|
|
VIRT_UART,
|
|
VIRT_CPUFREQ,
|
|
VIRT_MMIO,
|
|
+ VIRT_CVM_MSI,
|
|
VIRT_RTC,
|
|
VIRT_FW_CFG,
|
|
VIRT_PCIE,
|
|
--
|
|
2.41.0.windows.1
|
|
|