39a0a891d8
- vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement post resume bh - vhost: implement migration state notifier for vdpa device - vhost: implement savevm_hanlder for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - vhost: fix null pointer access - ui/gtk: prevent ui lock up when dpy_gl_update called again before current draw event occurs - hw/usb: dev-mtp: Use g_mkdir() - target/ppc/cpu-models: Remove the "default" CPU alias - hw/intc/arm_gicv3: ICC_PMR_EL1 high bits should be RAZ - Fixed a QEMU hang when guest poweroff in COLO mode - migration/colo: More accurate update checkpoint time - scripts/entitlement.sh: Use backward-compatible cp flags - block/nvme: fix infinite loop in nvme_free_req_queue_cb() - hw/net: npcm7xx_emc fix missing queue_flush - Add dummy Aspeed AST2600 Display Port MCU (DPMCU) - hw/arm: ast2600: Fix address mapping of second SPI controller - vhost-user-blk: reconnect on any error during realize - vhost-user-blk: propagate error return from generic vhost - hw/riscv: boot: Reduce FDT address alignment constraints - Revert "hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus" - Fix STM32F2XX USART data register readout - block: use 'unsigned' for in_flight field on driver state - sphinx: change default language to 'en' - tests/qtest: Fix two format strings - trivial typos: namesapce - hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM) - hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus - hw/display/next-fb: Fix comment typo - xen/pass-through: merge emulated bits correctly mainline inclusion commit be9c61da9fc57eb7d293f380d0805ca6f46c2657 category: bugfix - tests/qtest/migration-test.c: spelling fix: bandwith - target/i386/cpu: Improve error message for property "vendor" - balloon: Fix a misleading error message - target/arm: Don't set syndrome ISS for loads and stores with writeback mainline inclusion commit 53ae2fdef1f5661cbaa2ea571c517f98e6041cb8 category: bugfix - disas/hppa: Show hexcode of instruction along with disassembly - tcg/loongarch64: Fix tcg_out_mov() Aborted - ui/qmp-cmds: Improve two error messages - qga: Improve guest-exec-status error message - hmp: Improve sync-profile error message - spapr/pci: Correct "does not support hotplugging error messages - xen/pass-through: don't create needless register group mainline inclusion commit c0e86b7624cb9d6db03e0d48cf82659e5b89a6a6 category: bugfix Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
85 lines
3.0 KiB
Diff
85 lines
3.0 KiB
Diff
From 48f112e0b8e65fccc3bf66510fafb6e9a8d58e90 Mon Sep 17 00:00:00 2001
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 4 Dec 2023 10:50:04 +0800
|
|
Subject: [PATCH] Add dummy Aspeed AST2600 Display Port MCU (DPMCU)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry picked from commit d9e9cd59df4bc92e4cf7ad1bfa6e2a8429ff31b4
|
|
|
|
AST2600 Display Port MCU introduces 0x18000000~0x1803FFFF as it's memory
|
|
and io address. If guest machine try to access DPMCU memory, it will
|
|
cause a fatal error.
|
|
|
|
Signed-off-by: Troy Lee <troy_lee@aspeedtech.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Reviewed-by: Cédric Le Goater <clg@kaod.org>
|
|
Message-id: 20211210083034.726610-1-troy_lee@aspeedtech.com
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/arm/aspeed_ast2600.c | 8 ++++++++
|
|
include/hw/arm/aspeed_soc.h | 2 ++
|
|
2 files changed, 10 insertions(+)
|
|
|
|
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
|
|
index 0384357a95..e33483fb5d 100644
|
|
--- a/hw/arm/aspeed_ast2600.c
|
|
+++ b/hw/arm/aspeed_ast2600.c
|
|
@@ -19,9 +19,11 @@
|
|
#include "sysemu/sysemu.h"
|
|
|
|
#define ASPEED_SOC_IOMEM_SIZE 0x00200000
|
|
+#define ASPEED_SOC_DPMCU_SIZE 0x00040000
|
|
|
|
static const hwaddr aspeed_soc_ast2600_memmap[] = {
|
|
[ASPEED_DEV_SRAM] = 0x10000000,
|
|
+ [ASPEED_DEV_DPMCU] = 0x18000000,
|
|
/* 0x16000000 0x17FFFFFF : AHB BUS do LPC Bus bridge */
|
|
[ASPEED_DEV_IOMEM] = 0x1E600000,
|
|
[ASPEED_DEV_PWM] = 0x1E610000,
|
|
@@ -44,6 +46,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
|
|
[ASPEED_DEV_SCU] = 0x1E6E2000,
|
|
[ASPEED_DEV_XDMA] = 0x1E6E7000,
|
|
[ASPEED_DEV_ADC] = 0x1E6E9000,
|
|
+ [ASPEED_DEV_DP] = 0x1E6EB000,
|
|
[ASPEED_DEV_VIDEO] = 0x1E700000,
|
|
[ASPEED_DEV_SDHCI] = 0x1E740000,
|
|
[ASPEED_DEV_EMMC] = 0x1E750000,
|
|
@@ -104,6 +107,7 @@ static const int aspeed_soc_ast2600_irqmap[] = {
|
|
[ASPEED_DEV_ETH3] = 32,
|
|
[ASPEED_DEV_ETH4] = 33,
|
|
[ASPEED_DEV_KCS] = 138, /* 138 -> 142 */
|
|
+ [ASPEED_DEV_DP] = 62,
|
|
};
|
|
|
|
static qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int ctrl)
|
|
@@ -298,6 +302,10 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
|
|
memory_region_add_subregion(get_system_memory(),
|
|
sc->memmap[ASPEED_DEV_SRAM], &s->sram);
|
|
|
|
+ /* DPMCU */
|
|
+ create_unimplemented_device("aspeed.dpmcu", sc->memmap[ASPEED_DEV_DPMCU],
|
|
+ ASPEED_SOC_DPMCU_SIZE);
|
|
+
|
|
/* SCU */
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) {
|
|
return;
|
|
diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
|
|
index 8139358549..18fb7eed46 100644
|
|
--- a/include/hw/arm/aspeed_soc.h
|
|
+++ b/include/hw/arm/aspeed_soc.h
|
|
@@ -139,6 +139,8 @@ enum {
|
|
ASPEED_DEV_EMMC,
|
|
ASPEED_DEV_KCS,
|
|
ASPEED_DEV_HACE,
|
|
+ ASPEED_DEV_DPMCU,
|
|
+ ASPEED_DEV_DP,
|
|
};
|
|
|
|
#endif /* ASPEED_SOC_H */
|
|
--
|
|
2.27.0
|
|
|