colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mach-snapdragon: pass fdt to qcom_parse_memory

Browse Source 
commit fc37a73e66 ("fdt: Swap the signature for
board_fdt_blob_setup()") introduced a subtle change to the Snapdragon
implementation, removing the assignment to gd->fdt_blob partway through
the function.

This breaks qcom_parse_memory() which was also called during
board_fdt_blob_setup().

The underlying issue here is that qcom_parse_memory is using the of_ api
to traverse a devicetree, which relies on the fdt_blob in global data.

Rather than relying on this subtle behaviour, explicitly pass the FDT
that should be consulted for a /memory node.

Using the OF API is typically preferable because it's easier to read,
but using the lower level fdt_ methods instead here doesn't add too much
complexity, I think.

Finally, a minor tweak was made to board_fdt_blob_setup to use the
passed fdt blob pointer instead of gd->fdt_blob, which removes the last
of the references to global data in this area.

Fixes: fc37a73e66 (fdt: Swap the signature for board_fdt_blob_setup())
Reviewed-by: Caleb Connolly <caleb.connolly@linaro.org>
Signed-off-by: Sam Day <me@samcday.com>
Link: https://lore.kernel.org/r/20250122-qcom-parse-memory-updates-v2-1-98dfcac821d7@samcday.com
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
This commit is contained in:
Sam Day
2025-01-22 10:26:59 +00:00
committed by Caleb Connolly
parent 3db33a6fd6
commit 782641f872
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/mach-snapdragon/board.c
View File

@@ -88,20 +88,21 @@ int dram_init_banksize(void)
return 0; return 0;
} }
static void qcom_parse_memory(void) static void qcom_parse_memory(const void *fdt)
{ {
ofnode node; int offset;
const fdt64_t *memory; const fdt64_t *memory;
int memsize; int memsize;
phys_addr_t ram_end = 0; phys_addr_t ram_end = 0;
int i, j, banks; int i, j, banks;
node = ofnode_path("/memory"); offset = fdt_path_offset(fdt, "/memory");
if (!ofnode_valid(node)) { if (offset < 0) {
log_err("No memory node found in device tree!\n"); log_err("No memory node found in device tree!\n");
return; return;
} }
memory = ofnode_read_prop(node, "reg", &memsize);
memory = fdt_getprop(fdt, offset, "reg", &memsize);
if (!memory) { if (!memory) {
log_err("No memory configuration was provided by the previous bootloader!\n"); log_err("No memory configuration was provided by the previous bootloader!\n");
return; return;
@@ -158,7 +159,7 @@ int board_fdt_blob_setup(void **fdtp)
fdt = (struct fdt_header *)get_prev_bl_fdt_addr(); fdt = (struct fdt_header *)get_prev_bl_fdt_addr();
external_valid = fdt && !fdt_check_header(fdt); external_valid = fdt && !fdt_check_header(fdt);
internal_valid = !fdt_check_header(gd->fdt_blob); internal_valid = !fdt_check_header(*fdtp);
/* /*
* There is no point returning an error here, U-Boot can't do anything useful in this situation. * There is no point returning an error here, U-Boot can't do anything useful in this situation.
@@ -181,7 +182,7 @@ int board_fdt_blob_setup(void **fdtp)
* Parse the /memory node while we're here, * Parse the /memory node while we're here,
* this makes it easy to do other things early. * this makes it easy to do other things early.
*/ */
qcom_parse_memory(); qcom_parse_memory(*fdtp);
return ret; return ret;
} }