[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/24] aspeed/smc: Use the RAM memory region for DMAs
From: |
Cédric Le Goater |
Subject: |
[PATCH 01/24] aspeed/smc: Use the RAM memory region for DMAs |
Date: |
Wed, 7 Apr 2021 19:16:14 +0200 |
Instead of passing the memory address space region, simply use the RAM
memory region instead. This simplifies RAM accesses.
Fixes: c4e1f0b48322 ("aspeed/smc: Add support for DMAs")
Cc: Philippe Mathieu-Daudé <f4bug@amsat.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
- [PATCH 07/24] aspeed: Integrate HACE, (continued)
- [PATCH 07/24] aspeed: Integrate HACE, Cédric Le Goater, 2021/04/07
- [PATCH 05/24] hw/arm/aspeed: Do not sysbus-map mmio flash region directly, use alias, Cédric Le Goater, 2021/04/07
- [PATCH 10/24] tests: Aspeed HACE Scatter-Gather tests, Cédric Le Goater, 2021/04/07
- [PATCH 20/24] aspeed: Emulate the AST2600A3, Cédric Le Goater, 2021/04/07
- [PATCH 03/24] aspeed/i2c: Fix DMA address mask, Cédric Le Goater, 2021/04/07
- [PATCH 12/24] tests/acceptance: Test ast2600 machine, Cédric Le Goater, 2021/04/07
- [PATCH 01/24] aspeed/smc: Use the RAM memory region for DMAs,
Cédric Le Goater <=
- [PATCH 13/24] hw/misc/aspeed_xdma: Add AST2600 support, Cédric Le Goater, 2021/04/07
- [PATCH 04/24] aspeed/i2c: Rename DMA address space, Cédric Le Goater, 2021/04/07
- [PATCH 02/24] aspeed/smc: Remove unused "sdram-base" property, Cédric Le Goater, 2021/04/07
- [PATCH 14/24] aspeed/smc: Add a 'features' attribute to the object class, Cédric Le Goater, 2021/04/07
- [PATCH 06/24] hw: Model ASPEED's Hash and Crypto Engine, Cédric Le Goater, 2021/04/07