mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aspeed/smc: Use the RAM memory region for DMAs

Browse Source 
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: c4e1f0b483 ("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>
This commit is contained in:
Cédric Le Goater 2021-05-01 10:03:51 +02:00
parent 609d759652
commit 0df2d9a673
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/aspeed.c
View File

@ -327,7 +327,7 @@ static void aspeed_machine_init(MachineState *machine)
object_property_set_int(OBJECT(&bmc->soc), "num-cs", amc->num_cs, object_property_set_int(OBJECT(&bmc->soc), "num-cs", amc->num_cs,
&error_abort); &error_abort);
object_property_set_link(OBJECT(&bmc->soc), "dram", object_property_set_link(OBJECT(&bmc->soc), "dram",
OBJECT(&bmc->ram_container), &error_abort); OBJECT(machine->ram), &error_abort);
if (machine->kernel_filename) { if (machine->kernel_filename) {
/* /*
* When booting with a -kernel command line there is no u-boot * When booting with a -kernel command line there is no u-boot

3
hw/ssi/aspeed_smc.c
View File

@ -178,8 +178,7 @@
* 0: 4 bytes * 0: 4 bytes
* 0x7FFFFF: 32M bytes * 0x7FFFFF: 32M bytes
*/ */
#define DMA_DRAM_ADDR(s, val) ((s)->sdram_base | \ #define DMA_DRAM_ADDR(s, val) ((val) & (s)->ctrl->dma_dram_mask)
((val) & (s)->ctrl->dma_dram_mask))
#define DMA_FLASH_ADDR(s, val) ((s)->ctrl->flash_window_base | \ #define DMA_FLASH_ADDR(s, val) ((s)->ctrl->flash_window_base | \
((val) & (s)->ctrl->dma_flash_mask)) ((val) & (s)->ctrl->dma_flash_mask))
#define DMA_LENGTH(val) ((val) & 0x01FFFFFC) #define DMA_LENGTH(val) ((val) & 0x01FFFFFC)