| Message ID | 148109493640.193207.4066849658518994363.stgit@powerkvm6.aus.stglabs.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 12/07/2016 01:15 AM, Michael Bringmann wrote: > architecture.vec5 features: The boot-time memory management needs to > know the form of the "ibm,dynamic-memory-v2" property early during > scanning of the flattened device tree. This patch moves execution of > the function pseries_probe_fw_features() early enough to be before > the scanning of the memory properties in the device tree to allow > recognition of the supported properties. > > Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com> Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> > --- > arch/powerpc/kernel/prom.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c > index 2d49887..bd07157 100644 > --- a/arch/powerpc/kernel/prom.c > +++ b/arch/powerpc/kernel/prom.c > @@ -759,6 +759,9 @@ void __init early_init_devtree(void *params) > */ > of_scan_flat_dt(early_init_dt_scan_chosen_ppc, boot_command_line); > > + /* Now try to figure out if we are running on LPAR and so on */ > + pseries_probe_fw_features(); > + > /* Scan memory nodes and rebuild MEMBLOCKs */ > of_scan_flat_dt(early_init_dt_scan_root, NULL); > of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL); > @@ -826,9 +829,6 @@ void __init early_init_devtree(void *params) > #endif > epapr_paravirt_early_init(); > > - /* Now try to figure out if we are running on LPAR and so on */ > - pseries_probe_fw_features(); > - > #ifdef CONFIG_PPC_PS3 > /* Identify PS3 firmware */ > if (of_flat_dt_is_compatible(of_get_flat_dt_root(), "sony,ps3")) >
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 2d49887..bd07157 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -759,6 +759,9 @@ void __init early_init_devtree(void *params) */ of_scan_flat_dt(early_init_dt_scan_chosen_ppc, boot_command_line); + /* Now try to figure out if we are running on LPAR and so on */ + pseries_probe_fw_features(); + /* Scan memory nodes and rebuild MEMBLOCKs */ of_scan_flat_dt(early_init_dt_scan_root, NULL); of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL); @@ -826,9 +829,6 @@ void __init early_init_devtree(void *params) #endif epapr_paravirt_early_init(); - /* Now try to figure out if we are running on LPAR and so on */ - pseries_probe_fw_features(); - #ifdef CONFIG_PPC_PS3 /* Identify PS3 firmware */ if (of_flat_dt_is_compatible(of_get_flat_dt_root(), "sony,ps3"))
architecture.vec5 features: The boot-time memory management needs to know the form of the "ibm,dynamic-memory-v2" property early during scanning of the flattened device tree. This patch moves execution of the function pseries_probe_fw_features() early enough to be before the scanning of the memory properties in the device tree to allow recognition of the supported properties. Signed-off-by: Michael Bringmann <mwb@linux.vnet.ibm.com> --- arch/powerpc/kernel/prom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)