Commit dd51cabb authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds

[PATCH] ppc64: Setup fw_features before init_early calls on pSeries

To be able to use the cur_cpu_spec->firmware_features values in early
setup, the function initializing them has to be moved up to before the
early init calls.
Signed-off-by: default avatarOlof Johansson <olof@austin.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7319a99b
......@@ -229,10 +229,6 @@ void __init
chrp_init(unsigned long r3, unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7)
{
struct device_node * dn;
char * hypertas;
unsigned int len;
ppc_md.setup_arch = chrp_setup_arch;
ppc_md.get_cpuinfo = chrp_get_cpuinfo;
if (naca->interrupt_controller == IC_OPEN_PIC) {
......@@ -261,10 +257,18 @@ chrp_init(unsigned long r3, unsigned long r4, unsigned long r5,
ppc_md.progress = chrp_progress;
/* Build up the firmware_features bitmask field
}
/* Build up the firmware_features bitmask field
* using contents of device-tree/ibm,hypertas-functions.
* Ultimately this functionality may be moved into prom.c prom_init().
*/
void __init fw_feature_init(void)
{
struct device_node * dn;
char * hypertas;
unsigned int len;
cur_cpu_spec->firmware_features = 0;
dn = of_find_node_by_path("/rtas");
if (dn == NULL) {
......
......@@ -67,6 +67,7 @@ extern void pmac_init(unsigned long r3,
unsigned long r6,
unsigned long r7);
extern void fw_feature_init(void);
extern void iSeries_init( void );
extern void iSeries_init_early( void );
extern void pSeries_init_early( void );
......@@ -279,11 +280,13 @@ void setup_system(unsigned long r3, unsigned long r4, unsigned long r5,
#ifdef CONFIG_PPC_PSERIES
case PLATFORM_PSERIES:
fw_feature_init();
pSeries_init_early();
parse_bootinfo();
break;
case PLATFORM_PSERIES_LPAR:
fw_feature_init();
pSeriesLP_init_early();
parse_bootinfo();
break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment