[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/18] aspeed/smc: Use the RAM memory region for DMAs
From: |
Cédric Le Goater |
Subject: |
[PULL 01/18] aspeed/smc: Use the RAM memory region for DMAs |
Date: |
Fri, 30 Apr 2021 18:33:01 +0200 |
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>
---
hw/arm/aspeed.c | 2 +-
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 a17b75f4940a..1cf5a15c8098 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 16addee4dc8d..6f72fb028e59 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)
--
2.26.3
- [PULL 00/18] aspeed queue, Cédric Le Goater, 2021/04/30
- [PULL 04/18] aspeed/i2c: Rename DMA address space, Cédric Le Goater, 2021/04/30
- [PULL 03/18] aspeed/i2c: Fix DMA address mask, Cédric Le Goater, 2021/04/30
- [PULL 09/18] tests/acceptance: Test ast2400 and ast2500 machines, Cédric Le Goater, 2021/04/30
- [PULL 08/18] tests/qtest: Add test for Aspeed HACE, Cédric Le Goater, 2021/04/30
- [PULL 01/18] aspeed/smc: Use the RAM memory region for DMAs,
Cédric Le Goater <=
- [PULL 05/18] hw/arm/aspeed: Do not sysbus-map mmio flash region directly, use alias, Cédric Le Goater, 2021/04/30
- [PULL 06/18] hw: Model ASPEED's Hash and Crypto Engine, Cédric Le Goater, 2021/04/30
- [PULL 07/18] aspeed: Integrate HACE, Cédric Le Goater, 2021/04/30
- [PULL 02/18] aspeed/smc: Remove unused "sdram-base" property, Cédric Le Goater, 2021/04/30
- Re: [PULL 00/18] aspeed queue, Cédric Le Goater, 2021/04/30
- Re: [PULL 00/18] aspeed queue, Peter Maydell, 2021/04/30