diff options
| author | Cédric Le Goater | 2021-05-01 10:03:51 +0200 |
|---|---|---|
| committer | Cédric Le Goater | 2021-05-01 10:03:51 +0200 |
| commit | 0df2d9a673543c4ab06646d9f6bd21153c632a4c (patch) | |
| tree | 766b7761733709871ebe05077437deefe5223db8 | |
| parent | Update version for v6.0.0 release (diff) | |
| download | qemu-0df2d9a673543c4ab06646d9f6bd21153c632a4c.tar.gz qemu-0df2d9a673543c4ab06646d9f6bd21153c632a4c.tar.xz qemu-0df2d9a673543c4ab06646d9f6bd21153c632a4c.zip | |
aspeed/smc: Use the RAM memory region for DMAs
Instead of passing the memory address space region, simply use the RAM
memory region instead. This simplifies RAM accesses.
This patch breaks migration compatibility.
Fixes: c4e1f0b48322 ("aspeed/smc: Add support for DMAs")
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20210407171637.777743-2-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
| -rw-r--r-- | hw/arm/aspeed.c | 2 | ||||
| -rw-r--r-- | hw/ssi/aspeed_smc.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index a17b75f494..1cf5a15c80 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -327,7 +327,7 @@ static void aspeed_machine_init(MachineState *machine) object_property_set_int(OBJECT(&bmc->soc), "num-cs", amc->num_cs, &error_abort); object_property_set_link(OBJECT(&bmc->soc), "dram", - OBJECT(&bmc->ram_container), &error_abort); + OBJECT(machine->ram), &error_abort); if (machine->kernel_filename) { /* * When booting with a -kernel command line there is no u-boot diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 16addee4dc..6f72fb028e 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -178,8 +178,7 @@ * 0: 4 bytes * 0x7FFFFF: 32M bytes */ -#define DMA_DRAM_ADDR(s, val) ((s)->sdram_base | \ - ((val) & (s)->ctrl->dma_dram_mask)) +#define DMA_DRAM_ADDR(s, val) ((val) & (s)->ctrl->dma_dram_mask) #define DMA_FLASH_ADDR(s, val) ((s)->ctrl->flash_window_base | \ ((val) & (s)->ctrl->dma_flash_mask)) #define DMA_LENGTH(val) ((val) & 0x01FFFFFC) |