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>
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 13a37e4130fbdfcd9a5027b4339eee592ee76889 Mon Sep 17 00:00:00 2001
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 4 Dec 2023 11:01:29 +0800
|
|
Subject: [PATCH] hw/arm: ast2600: Fix address mapping of second SPI controller
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry picked from commit 08048cbd5e7dc0a0359ccb8c7968e4d011174801
|
|
|
|
Address should be 0x1E631000 and not 0x1E641000 as initially introduced.
|
|
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/838
|
|
Fixes: f25c0ae1079d ("aspeed/soc: Add AST2600 support")
|
|
Suggested-by: Troy Lee <troy_lee@aspeedtech.com>
|
|
Signed-off-by: Cédric Le Goater <clg@kaod.org>
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Message-id: 20220126083520.4135713-1-clg@kaod.org
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/arm/aspeed_ast2600.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
|
|
index 0384357a95..d83a70300e 100644
|
|
--- a/hw/arm/aspeed_ast2600.c
|
|
+++ b/hw/arm/aspeed_ast2600.c
|
|
@@ -27,7 +27,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
|
|
[ASPEED_DEV_PWM] = 0x1E610000,
|
|
[ASPEED_DEV_FMC] = 0x1E620000,
|
|
[ASPEED_DEV_SPI1] = 0x1E630000,
|
|
- [ASPEED_DEV_SPI2] = 0x1E641000,
|
|
+ [ASPEED_DEV_SPI2] = 0x1E631000,
|
|
[ASPEED_DEV_EHCI1] = 0x1E6A1000,
|
|
[ASPEED_DEV_EHCI2] = 0x1E6A3000,
|
|
[ASPEED_DEV_MII1] = 0x1E650000,
|
|
--
|
|
2.27.0
|
|
|