Skip to contentSkip to conversation

fdt: Fixup only valid memory banks

PATCH New Thierry Reding 2 participants 2 messages Feb 15, 2018 – Feb 23, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 fdt: Fixup only valid memory banks

From: Thierry Reding <[email protected]>

Memory banks with address 0 and size 0 are empty and should not be passed to the OS via device tree.

---
Changes in v2:
- check whether or not any banks need to be fixed up after filtering out invalid ones (Stephen Warren)
- use braces around multiple-line body of for loop, even if not strictly necessary (Stephen Warren)

---
 common/fdt_support.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
common/fdt_support.c +8 -1
index 17623a1728f6..da0c12e9c1bc 100644
@@ -418,7 +418,7 @@ static int fdt_pack_reg(const void *fdt, void *buf, u64 *address, u64 *size,
 int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
 {
 	int err, nodeoffset;
-	int len;
+	int len, i;
 	u8 tmp[MEMORY_BANKS_MAX * 16]; /* Up to 64-bit address + 64-bit size */
 
 	if (banks > MEMORY_BANKS_MAX) {
@@ -447,6 +447,13 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
 		return err;
 	}
 
+	for (i = 0; i < banks; i++) {
+		if (start[i] == 0 && size[i] == 0)
+			break;
+	}
+
+	banks = i;
+
 	if (!banks)
 		return 0;
 
Signature · 1 line
2.15.1
#1 lore raw

PATCH v2 1/1 fdt: Fixup only valid memory banks

Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

Memory banks with address 0 and size 0 are empty and should not be passed to the OS via device tree.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180223/16ee6102/attachment.sig>