fdt: Update CRC check for rng-seed
PATCH 1/1 fdt: Update CRC check for rng-seed
From: Hsin-Yi Wang <[email protected]>
commit dd753d961c4844a39f947be115b3d81e10376ee5 upstream
Commit 428826f5358c ("fdt: add support for rng-seed") moves of_fdt_crc32 from early_init_dt_verify() to early_init_dt_scan() since early_init_dt_scan_chosen() may modify fdt to erase rng-seed.
However, arm and some other arch won't call early_init_dt_scan(), they call early_init_dt_verify() then early_init_dt_scan_nodes().
Restore of_fdt_crc32 to early_init_dt_verify() then update it in early_init_dt_scan_chosen() if fdt if updated.
--- drivers/of/fdt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/of/fdt.c +6 -2
@@ -1110,6 +1110,10 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,/* try to clear seed so it won't be found. */ fdt_nop_property (initial_boot_params, node,"rng-seed" ); + +/* update CRC check value */ + of_fdt_crc32 =crc32_be (~0 , initial_boot_params, +fdt_totalsize (initial_boot_params)); }/* break now */
@@ -1213,6 +1217,8 @@ bool __init early_init_dt_verify(void *params)/* Setup flat device-tree pointer */ initial_boot_params = params; + of_fdt_crc32 =crc32_be (~0 , initial_boot_params, +fdt_totalsize (initial_boot_params));return true; }
@@ -1238,8 +1244,6 @@ bool __init early_init_dt_scan(void *params)return false;early_init_dt_scan_nodes (); - of_fdt_crc32 =crc32_be (~0 , initial_boot_params, -fdt_totalsize (initial_boot_params));return true; }
Signature · 1 line
2.25.1
PATCH 1/1 fdt: Update CRC check for rng-seed
From: Hsin-Yi Wang <[email protected]>
commit dd753d961c4844a39f947be115b3d81e10376ee5 upstream
Commit 428826f5358c ("fdt: add support for rng-seed") moves of_fdt_crc32 from early_init_dt_verify() to early_init_dt_scan() since early_init_dt_scan_chosen() may modify fdt to erase rng-seed.
However, arm and some other arch won't call early_init_dt_scan(), they call early_init_dt_verify() then early_init_dt_scan_nodes().
Restore of_fdt_crc32 to early_init_dt_verify() then update it in early_init_dt_scan_chosen() if fdt if updated.
--- drivers/of/fdt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/of/fdt.c +6 -2
@@ -1159,6 +1159,10 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,/* try to clear seed so it won't be found. */ fdt_nop_property (initial_boot_params, node,"rng-seed" ); + +/* update CRC check value */ + of_fdt_crc32 =crc32_be (~0 , initial_boot_params, +fdt_totalsize (initial_boot_params)); }/* break now */
@@ -1272,6 +1276,8 @@ bool __init early_init_dt_verify(void *params)/* Setup flat device-tree pointer */ initial_boot_params = params; + of_fdt_crc32 =crc32_be (~0 , initial_boot_params, +fdt_totalsize (initial_boot_params));return true; }
@@ -1297,8 +1303,6 @@ bool __init early_init_dt_scan(void *params)return false;early_init_dt_scan_nodes (); - of_fdt_crc32 =crc32_be (~0 , initial_boot_params, -fdt_totalsize (initial_boot_params));return true; }
Signature · 1 line
2.25.1
PATCH 1/1 fdt: Update CRC check for rng-seed
In reply to Florian FainelliFrom: Hsin-Yi Wang <[email protected]>
commit dd753d961c4844a39f947be115b3d81e10376ee5 upstream
Commit 428826f5358c ("fdt: add support for rng-seed") moves of_fdt_crc32 from early_init_dt_verify() to early_init_dt_scan() since early_init_dt_scan_chosen() may modify fdt to erase rng-seed.
However, arm and some other arch won't call early_init_dt_scan(), they call early_init_dt_verify() then early_init_dt_scan_nodes().
Restore of_fdt_crc32 to early_init_dt_verify() then update it in early_init_dt_scan_chosen() if fdt if updated.
--- drivers/of/fdt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/of/fdt.c +6 -2
@@ -1119,6 +1119,10 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,/* try to clear seed so it won't be found. */ fdt_nop_property (initial_boot_params, node,"rng-seed" ); + +/* update CRC check value */ + of_fdt_crc32 =crc32_be (~0 , initial_boot_params, +fdt_totalsize (initial_boot_params)); }/* break now */
@@ -1223,6 +1227,8 @@ bool __init early_init_dt_verify(void *params)/* Setup flat device-tree pointer */ initial_boot_params = params; + of_fdt_crc32 =crc32_be (~0 , initial_boot_params, +fdt_totalsize (initial_boot_params));return true; }
@@ -1248,8 +1254,6 @@ bool __init early_init_dt_scan(void *params)return false;early_init_dt_scan_nodes (); - of_fdt_crc32 =crc32_be (~0 , initial_boot_params, -fdt_totalsize (initial_boot_params));return true; }
Signature · 1 line
2.25.1
Greg Kroah-Hartman
maintainerQuoted 20 lines · Florian Fainelli
From: Hsin-Yi Wang <[email protected]>
commit
dd753d961c4844a39f947be115b3d81e10376ee5upstreamCommit
428826f5358c("fdt: add support for rng-seed") movesof_fdt_crc32fromearly_init_dt_verify()toearly_init_dt_scan()sinceearly_init_dt_scan_chosen()may modify fdt to erase rng-seed.However, arm and some other arch won't call
early_init_dt_scan(), they callearly_init_dt_verify()thenearly_init_dt_scan_nodes().Restore
of_fdt_crc32toearly_init_dt_verify()then update it inearly_init_dt_scan_chosen()if fdt if updated.Fixes 428826f5358c ("fdt: add support for rng-seed")Reported-by Geert Uytterhoeven <[email protected]>Signed-off-by Hsin-Yi Wang <[email protected]>Tested-by Geert Uytterhoeven <[email protected]>Signed-off-by Will Deacon <[email protected]>Signed-off-by Florian Fainelli <[email protected]>
Quoted 3 lines
--- drivers/of/fdt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
All now queued up, thanks.
greg k-h