sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/qualcomm: Do resource transition

Browse Source 
For ipq806x this fixes two resources getting declared
with same index. The latter previously overwrote former.

Change-Id: Ifee321d930d5433c824e2e977f1bb455766582f0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55914
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Kyösti Mälkki
2021-06-26 14:12:54 +03:00
committed by Felix Held
parent b20a714bfa
commit f35c074ad4
4 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/soc/qualcomm/ipq806x/soc.c
View File

@@ -5,14 +5,16 @@
#include <symbols.h> #include <symbols.h>
#include <soc/ipq_uart.h> #include <soc/ipq_uart.h>
#define RESERVED_SIZE_KB (0x01500000 / KiB) #define RESERVED_SIZE 0x01500000 /* 21 MiB */
static void soc_read_resources(struct device *dev) static void soc_read_resources(struct device *dev)
{ {
/* Reserve bottom 0x150_0000 bytes for NSS, SMEM, etc. */ /* Reserve bottom 21 MiB for NSS, SMEM, etc. */
reserved_ram_resource_kb(dev, 0, (uintptr_t)_dram / KiB, RESERVED_SIZE_KB); uintptr_t reserve_ram_end = (uintptr_t)_dram + RESERVED_SIZE;
ram_resource_kb(dev, 0, (uintptr_t)_dram / KiB + RESERVED_SIZE_KB, uint64_t ram_end = CONFIG_DRAM_SIZE_MB * (uint64_t)MiB;
(CONFIG_DRAM_SIZE_MB * KiB) - RESERVED_SIZE_KB);
reserved_ram_from_to(dev, 0, (uintptr_t)_dram, reserve_ram_end);
ram_from_to(dev, 1, reserve_ram_end, ram_end);
} }
static void soc_init(struct device *dev) static void soc_init(struct device *dev)

5
src/soc/qualcomm/qcs405/soc.c
View File

@@ -7,9 +7,8 @@
static void soc_read_resources(struct device *dev) static void soc_read_resources(struct device *dev)
{ {
ram_resource_kb(dev, 0, (uintptr_t)_dram / KiB, (1 * GiB) / KiB); ram_range(dev, 0, (uintptr_t)_dram, 1 * GiB);
reserved_ram_resource_kb(dev, 1, (uintptr_t)_dram_reserved / KiB, reserved_ram_range(dev, 1, (uintptr_t)_dram_reserved, REGION_SIZE(dram_reserved));
REGION_SIZE(dram_reserved) / KiB);
} }
static void soc_init(struct device *dev) static void soc_init(struct device *dev)

11
src/soc/qualcomm/sc7180/soc.c
View File

@@ -12,14 +12,11 @@ static void soc_read_resources(struct device *dev)
void *start = NULL; void *start = NULL;
void *end = NULL; void *end = NULL;
ram_resource_kb(dev, 0, (uintptr_t)ddr_region->offset / KiB, ram_range(dev, 0, (uintptr_t)ddr_region->offset, ddr_region->size);
ddr_region->size / KiB); reserved_ram_range(dev, 1, (uintptr_t)_dram_aop, REGION_SIZE(dram_aop));
reserved_ram_resource_kb(dev, 1, (uintptr_t)_dram_aop / KiB, reserved_ram_range(dev, 2, (uintptr_t)_dram_soc, REGION_SIZE(dram_soc));
REGION_SIZE(dram_aop) / KiB);
reserved_ram_resource_kb(dev, 2, (uintptr_t)_dram_soc / KiB,
REGION_SIZE(dram_soc) / KiB);
if (soc_modem_carve_out(&start, &end)) if (soc_modem_carve_out(&start, &end))
reserved_ram_resource_kb(dev, 3, (uintptr_t)start / KiB, (end - start) / KiB); reserved_ram_range(dev, 3, (uintptr_t)start, end - start);
} }
static void soc_init(struct device *dev) static void soc_init(struct device *dev)

20
src/soc/qualcomm/sc7280/soc.c
View File

@@ -12,20 +12,14 @@ static void soc_read_resources(struct device *dev)
void *start = NULL; void *start = NULL;
void *end = NULL; void *end = NULL;
ram_resource_kb(dev, 0, (uintptr_t)ddr_region->offset / KiB, ram_range(dev, 0, (uintptr_t)ddr_region->offset, ddr_region->size);
ddr_region->size / KiB); reserved_ram_range(dev, 1, (uintptr_t)_dram_soc, REGION_SIZE(dram_soc));
reserved_ram_resource_kb(dev, 1, (uintptr_t)_dram_soc / KiB, reserved_ram_range(dev, 2, (uintptr_t)_dram_wlan, REGION_SIZE(dram_wlan));
REGION_SIZE(dram_soc) / KiB); reserved_ram_range(dev, 3, (uintptr_t)_dram_wpss, REGION_SIZE(dram_wpss));
reserved_ram_resource_kb(dev, 2, (uintptr_t)_dram_wlan / KiB, reserved_ram_range(dev, 4, (uintptr_t)_dram_aop, REGION_SIZE(dram_aop));
REGION_SIZE(dram_wlan) / KiB); reserved_ram_range(dev, 5, (uintptr_t)_dram_cpucp, REGION_SIZE(dram_cpucp));
reserved_ram_resource_kb(dev, 3, (uintptr_t)_dram_wpss / KiB,
REGION_SIZE(dram_wpss) / KiB);
reserved_ram_resource_kb(dev, 4, (uintptr_t)_dram_aop / KiB,
REGION_SIZE(dram_aop) / KiB);
reserved_ram_resource_kb(dev, 5, (uintptr_t)_dram_cpucp / KiB,
REGION_SIZE(dram_cpucp) / KiB);
if (soc_modem_carve_out(&start, &end)) if (soc_modem_carve_out(&start, &end))
reserved_ram_resource_kb(dev, 6, (uintptr_t)start / KiB, (end - start) / KiB); reserved_ram_range(dev, 6, (uintptr_t)start, end - start);
} }
static void soc_init(struct device *dev) static void soc_init(struct device *dev)