leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/64: Move 64-bit probe_machine() to later in the boot process

Browse Source 
We no long need the machine type that early, so we can move probe_machine()
to after the device-tree has been expanded. This will allow further
consolidation.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Benjamin Herrenschmidt 2016-07-05 15:04:00 +10:00 committed by Michael Ellerman
parent 84b62c72fa
commit 406b0b6ae3
8 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/setup_64.c
View File

@ -301,9 +301,6 @@ void __init early_setup(unsigned long dt_ptr)
setup_paca(&paca[boot_cpuid]);
fixup_boot_paca();
/* Probe the machine type */
probe_machine();
/*
* Configure exception handlers. This include setting up trampolines
* if needed, setting exception endian mode, etc...
@ -511,6 +508,9 @@ void __init setup_system(void)
*/
check_for_initrd();
/* Probe the machine type */
probe_machine();
/*
* Do some platform specific early initializations, that includes
* setting up the hash table pointers. It also sets up some interrupt-mapping

6
arch/powerpc/platforms/cell/setup.c
View File

@ -255,10 +255,8 @@ static void __init cell_setup_arch(void)
static int __init cell_probe(void)
{
unsigned long root = of_get_flat_dt_root();
if (!of_flat_dt_is_compatible(root, "IBM,CBEA") &&
!of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
if (!of_machine_is_compatible("IBM,CBEA") &&
!of_machine_is_compatible("IBM,CPBW-1.0"))
return 0;
pm_power_off = rtas_power_off;

6
arch/powerpc/platforms/maple/setup.c
View File

@ -300,10 +300,8 @@ static void __init maple_progress(char *s, unsigned short hex)
*/
static int __init maple_probe(void)
{
unsigned long root = of_get_flat_dt_root();
if (!of_flat_dt_is_compatible(root, "Momentum,Maple") &&
!of_flat_dt_is_compatible(root, "Momentum,Apache"))
if (!of_machine_is_compatible("Momentum,Maple") &&
!of_machine_is_compatible("Momentum,Apache"))
return 0;
pm_power_off = maple_power_off;

6
arch/powerpc/platforms/pasemi/setup.c
View File

@ -420,10 +420,8 @@ machine_device_initcall(pasemi, pasemi_publish_devices);
*/
static int __init pas_probe(void)
{
unsigned long root = of_get_flat_dt_root();
if (!of_flat_dt_is_compatible(root, "PA6T-1682M") &&
!of_flat_dt_is_compatible(root, "pasemi,pwrficient"))
if (!of_machine_is_compatible("PA6T-1682M") &&
!of_machine_is_compatible("pasemi,pwrficient"))
return 0;
return 1;

6
arch/powerpc/platforms/powermac/setup.c
View File

@ -590,11 +590,17 @@ console_initcall(check_pmac_serial_console);
*/
static int __init pmac_probe(void)
{
#ifdef CONFIG_PPC32
unsigned long root = of_get_flat_dt_root();
if (!of_flat_dt_is_compatible(root, "Power Macintosh") &&
!of_flat_dt_is_compatible(root, "MacRISC"))
return 0;
#else
if (!of_machine_is_compatible("Power Macintosh") &&
!of_machine_is_compatible("MacRISC"))
return 0;
#endif
#ifdef CONFIG_PPC32
/* isa_io_base gets set in pmac_pci_init */

4
arch/powerpc/platforms/powernv/setup.c
View File

@ -268,9 +268,7 @@ static void __init pnv_setup_machdep_opal(void)
static int __init pnv_probe(void)
{
unsigned long root = of_get_flat_dt_root();
if (!of_flat_dt_is_compatible(root, "ibm,powernv"))
if (!of_machine_is_compatible("ibm,powernv"))
return 0;
if (firmware_has_feature(FW_FEATURE_OPAL))

6
arch/powerpc/platforms/ps3/setup.c
View File

@ -237,15 +237,13 @@ void __init ps3_early_mm_init(void)
static int __init ps3_probe(void)
{
unsigned long dt_root;
DBG(" -> %s:%d\n", __func__, __LINE__);
dt_root = of_get_flat_dt_root();
if (!of_flat_dt_is_compatible(dt_root, "sony,ps3"))
if (!of_machine_is_compatible("sony,ps3"))
return 0;
ps3_os_area_save_params();
pm_power_off = ps3_power_off;
DBG(" <- %s:%d\n", __func__, __LINE__);

7
arch/powerpc/platforms/pseries/setup.c
View File

@ -672,8 +672,7 @@ static void pseries_power_off(void)
static int __init pSeries_probe(void)
{
unsigned long root = of_get_flat_dt_root();
const char *dtype = of_get_flat_dt_prop(root, "device_type", NULL);
const char *dtype = of_get_property(of_root, "device_type", NULL);
if (dtype == NULL)
return 0;
@ -683,8 +682,8 @@ static int __init pSeries_probe(void)
/* Cell blades firmware claims to be chrp while it's not. Until this
* is fixed, we need to avoid those here.
*/
if (of_flat_dt_is_compatible(root, "IBM,CPBW-1.0") ||
of_flat_dt_is_compatible(root, "IBM,CBEA"))
if (of_machine_is_compatible("IBM,CPBW-1.0") ||
of_machine_is_compatible("IBM,CBEA"))
return 0;
pm_power_off = pseries_power_off;