|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Ricardo Pardini <ricardo@pardini.net> |
| 3 | +Date: Mon, 12 Jan 2026 18:26:25 +0100 |
| 4 | +Subject: fdt_fixup_ethernet: add logs |
| 5 | + |
| 6 | +--- |
| 7 | + boot/fdt_support.c | 57 +++++++--- |
| 8 | + boot/image-fdt.c | 25 ++++ |
| 9 | + 2 files changed, 67 insertions(+), 15 deletions(-) |
| 10 | + |
| 11 | +diff --git a/boot/fdt_support.c b/boot/fdt_support.c |
| 12 | +index 111111111111..222222222222 100644 |
| 13 | +--- a/boot/fdt_support.c |
| 14 | ++++ b/boot/fdt_support.c |
| 15 | +@@ -630,29 +630,34 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size) |
| 16 | + return fdt_fixup_memory_banks(blob, &start, &size, 1); |
| 17 | + } |
| 18 | + |
| 19 | ++#warning "Compiling fdt_fixup_ethernet() for MAC debugging." |
| 20 | + void fdt_fixup_ethernet(void *fdt) |
| 21 | + { |
| 22 | ++ log_info("[fdt_fixup_ethernet] called\n"); |
| 23 | + int i = 0, j, prop; |
| 24 | + char *tmp, *end; |
| 25 | + char mac[16]; |
| 26 | + const char *path; |
| 27 | + unsigned char mac_addr[ARP_HLEN]; |
| 28 | + int offset; |
| 29 | ++ int total_aliases = 0, total_attempted = 0, total_skipped = 0, total_patched = 0; |
| 30 | + #ifdef FDT_SEQ_MACADDR_FROM_ENV |
| 31 | + int nodeoff; |
| 32 | + const struct fdt_property *fdt_prop; |
| 33 | + #endif |
| 34 | + |
| 35 | +- if (fdt_path_offset(fdt, "/aliases") < 0) |
| 36 | ++ int aliases_off = fdt_path_offset(fdt, "/aliases"); |
| 37 | ++ if (aliases_off < 0) { |
| 38 | ++ log_info("[fdt_fixup_ethernet] /aliases node not found\n"); |
| 39 | + return; |
| 40 | ++ } |
| 41 | + |
| 42 | + /* Cycle through all aliases */ |
| 43 | + for (prop = 0; ; prop++) { |
| 44 | + const char *name; |
| 45 | + |
| 46 | + /* FDT might have been edited, recompute the offset */ |
| 47 | +- offset = fdt_first_property_offset(fdt, |
| 48 | +- fdt_path_offset(fdt, "/aliases")); |
| 49 | ++ offset = fdt_first_property_offset(fdt, aliases_off); |
| 50 | + /* Select property number 'prop' */ |
| 51 | + for (j = 0; j < prop; j++) |
| 52 | + offset = fdt_next_property_offset(fdt, offset); |
| 53 | +@@ -660,7 +665,10 @@ void fdt_fixup_ethernet(void *fdt) |
| 54 | + if (offset < 0) |
| 55 | + break; |
| 56 | + |
| 57 | ++ total_aliases++; |
| 58 | + path = fdt_getprop_by_offset(fdt, offset, &name, NULL); |
| 59 | ++ log_info("[fdt_fixup_ethernet] alias #%d: name='%s', path='%s'\n", prop, name, path ? path : "<null>"); |
| 60 | ++ |
| 61 | + if (!strncmp(name, "ethernet", 8)) { |
| 62 | + /* Treat plain "ethernet" same as "ethernet0". */ |
| 63 | + if (!strcmp(name, "ethernet") |
| 64 | +@@ -679,33 +687,52 @@ void fdt_fixup_ethernet(void *fdt) |
| 65 | + else |
| 66 | + sprintf(mac, "eth%daddr", i); |
| 67 | + } else { |
| 68 | ++ log_info("[fdt_fixup_ethernet] Skipping alias '%s' (invalid index)\n", name); |
| 69 | ++ total_skipped++; |
| 70 | + continue; |
| 71 | + } |
| 72 | + #ifdef FDT_SEQ_MACADDR_FROM_ENV |
| 73 | + nodeoff = fdt_path_offset(fdt, path); |
| 74 | +- fdt_prop = fdt_get_property(fdt, nodeoff, "status", |
| 75 | +- NULL); |
| 76 | +- if (fdt_prop && !strcmp(fdt_prop->data, "disabled")) |
| 77 | ++ fdt_prop = fdt_get_property(fdt, nodeoff, "status", NULL); |
| 78 | ++ if (fdt_prop && !strcmp(fdt_prop->data, "disabled")) { |
| 79 | ++ log_info("[fdt_fixup_ethernet] Node '%s' is disabled, skipping\n", path); |
| 80 | ++ total_skipped++; |
| 81 | + continue; |
| 82 | ++ } |
| 83 | + i++; |
| 84 | + #endif |
| 85 | ++ total_attempted++; |
| 86 | + tmp = env_get(mac); |
| 87 | +- if (!tmp) |
| 88 | ++ log_info("[fdt_fixup_ethernet] env var for alias '%s' is '%s', value='%s'\n", name, mac, tmp ? tmp : "<not set>"); |
| 89 | ++ if (!tmp) { |
| 90 | ++ log_info("[fdt_fixup_ethernet] env var '%s' not set, skipping\n", mac); |
| 91 | ++ total_skipped++; |
| 92 | + continue; |
| 93 | +- |
| 94 | ++ } |
| 95 | ++ int nodeoff = fdt_path_offset(fdt, path); |
| 96 | ++ if (nodeoff < 0) { |
| 97 | ++ log_info("[fdt_fixup_ethernet] Node path '%s' not found, skipping\n", path); |
| 98 | ++ total_skipped++; |
| 99 | ++ continue; |
| 100 | ++ } |
| 101 | ++ const struct fdt_property *status_prop = fdt_get_property(fdt, nodeoff, "status", NULL); |
| 102 | ++ if (status_prop && strcmp((const char *)status_prop->data, "okay")) { |
| 103 | ++ log_info("[fdt_fixup_ethernet] Node '%s' status is '%s', skipping\n", path, (const char *)status_prop->data); |
| 104 | ++ total_skipped++; |
| 105 | ++ continue; |
| 106 | ++ } |
| 107 | + for (j = 0; j < 6; j++) { |
| 108 | +- mac_addr[j] = tmp ? |
| 109 | +- hextoul(tmp, &end) : 0; |
| 110 | ++ mac_addr[j] = tmp ? hextoul(tmp, &end) : 0; |
| 111 | + if (tmp) |
| 112 | + tmp = (*end) ? end + 1 : end; |
| 113 | + } |
| 114 | +- |
| 115 | +- do_fixup_by_path(fdt, path, "mac-address", |
| 116 | +- &mac_addr, 6, 0); |
| 117 | +- do_fixup_by_path(fdt, path, "local-mac-address", |
| 118 | +- &mac_addr, 6, 1); |
| 119 | ++ log_info("[fdt_fixup_ethernet] Patching node '%s' (offset %d) with MAC %02x:%02x:%02x:%02x:%02x:%02x\n", path, nodeoff, mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]); |
| 120 | ++ do_fixup_by_path(fdt, path, "mac-address", &mac_addr, 6, 0); |
| 121 | ++ do_fixup_by_path(fdt, path, "local-mac-address", &mac_addr, 6, 1); |
| 122 | ++ total_patched++; |
| 123 | + } |
| 124 | + } |
| 125 | ++ log_info("[fdt_fixup_ethernet] SUMMARY: aliases found=%d, attempted=%d, skipped=%d, patched=%d\n", total_aliases, total_attempted, total_skipped, total_patched); |
| 126 | + } |
| 127 | + |
| 128 | + int fdt_record_loadable(void *blob, u32 index, const char *name, |
| 129 | +diff --git a/boot/image-fdt.c b/boot/image-fdt.c |
| 130 | +index 111111111111..222222222222 100644 |
| 131 | +--- a/boot/image-fdt.c |
| 132 | ++++ b/boot/image-fdt.c |
| 133 | +@@ -1,3 +1,4 @@ |
| 134 | ++#warning "Building image-fdt.c: fdt fixup call chain instrumented for MAC debugging." |
| 135 | + // SPDX-License-Identifier: GPL-2.0+ |
| 136 | + /* |
| 137 | + * Copyright (c) 2013, Google Inc. |
| 138 | +@@ -578,13 +579,31 @@ __weak int ft_verify_fdt(void *fdt) |
| 139 | + return 1; |
| 140 | + } |
| 141 | + |
| 142 | ++#warning "Compiling arch_fixup_fdt() weak stub for MAC debugging." |
| 143 | + __weak int arch_fixup_fdt(void *blob) |
| 144 | + { |
| 145 | ++ log_info("[arch_fixup_fdt] called (weak stub)\n"); |
| 146 | + return 0; |
| 147 | + } |
| 148 | + |
| 149 | ++#warning "Compiling ft_board_setup() weak stub for MAC debugging." |
| 150 | ++__weak int ft_board_setup(void *blob, struct bd_info *bd) |
| 151 | ++{ |
| 152 | ++ log_info("[ft_board_setup] called (weak stub)\n"); |
| 153 | ++ return 0; |
| 154 | ++} |
| 155 | ++ |
| 156 | ++#warning "Compiling ft_system_setup() weak stub for MAC debugging." |
| 157 | ++__weak int ft_system_setup(void *blob, struct bd_info *bd) |
| 158 | ++{ |
| 159 | ++ log_info("[ft_system_setup] called (weak stub)\n"); |
| 160 | ++ return 0; |
| 161 | ++} |
| 162 | ++ |
| 163 | ++#warning "Compiling image_setup_libfdt()" |
| 164 | + int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb) |
| 165 | + { |
| 166 | ++ log_info("[image_setup_libfdt] called\n"); |
| 167 | + ulong *initrd_start = &images->initrd_start; |
| 168 | + ulong *initrd_end = &images->initrd_end; |
| 169 | + bool skip_board_fixup = false; |
| 170 | +@@ -632,6 +651,8 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb) |
| 171 | + strlen(images->fit_uname_cfg) + 1, 1); |
| 172 | + |
| 173 | + /* Update ethernet nodes */ |
| 174 | ++ #warning "Compiling fdt_fixup_ethernet() call site in image_setup_libfdt()" |
| 175 | ++ log_info("[image_setup_libfdt] calling fdt_fixup_ethernet\n"); |
| 176 | + fdt_fixup_ethernet(blob); |
| 177 | + #if IS_ENABLED(CONFIG_CMD_PSTORE) |
| 178 | + /* Append PStore configuration */ |
| 179 | +@@ -645,6 +666,8 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb) |
| 180 | + } |
| 181 | + |
| 182 | + if (IS_ENABLED(CONFIG_OF_BOARD_SETUP) && !skip_board_fixup) { |
| 183 | ++ #warning "Compiling ft_board_setup() call site in image_setup_libfdt()" |
| 184 | ++ log_info("[image_setup_libfdt] calling ft_board_setup\n"); |
| 185 | + fdt_ret = ft_board_setup(blob, gd->bd); |
| 186 | + if (fdt_ret) { |
| 187 | + printf("ERROR: board-specific fdt fixup failed: %s\n", |
| 188 | +@@ -652,7 +675,9 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb) |
| 189 | + goto err; |
| 190 | + } |
| 191 | + } |
| 192 | ++ #warning "Compiling ft_system_setup() call site in image_setup_libfdt()" |
| 193 | + if (IS_ENABLED(CONFIG_OF_SYSTEM_SETUP)) { |
| 194 | ++ log_info("[image_setup_libfdt] calling ft_system_setup\n"); |
| 195 | + fdt_ret = ft_system_setup(blob, gd->bd); |
| 196 | + if (fdt_ret) { |
| 197 | + printf("ERROR: system-specific fdt fixup failed: %s\n", |
| 198 | +-- |
| 199 | +Armbian |
| 200 | + |
0 commit comments