[PATCH] fix power3 boot

[PATCH] fix power3 boot

[Anton Blanchard]

Hi,

We were calling init_pci_config_tokens too late in eeh_init. POWER3
(which doesnt have EEH) would fall out of eeh_init before calling it.

Signed-off-by: Anton Blanchard <anton@samba.org>

diff -puN arch/ppc64/kernel/eeh.c~fix_power3 arch/ppc64/kernel/eeh.c
--- foobar2/arch/ppc64/kernel/eeh.c~fix_power3	2004-07-04 19:40:57.528231647 +1000
+++ foobar2-anton/arch/ppc64/kernel/eeh.c	2004-07-04 19:42:26.439823930 +1000
@@ -574,6 +574,8 @@ void __init eeh_init(void)
 	struct eeh_early_enable_info info;
 	char *eeh_force_off = strstr(saved_command_line, "eeh-force-off");
 
+	init_pci_config_tokens();
+
 	ibm_set_eeh_option = rtas_token("ibm,set-eeh-option");
 	ibm_set_slot_reset = rtas_token("ibm,set-slot-reset");
 	ibm_read_slot_reset_state = rtas_token("ibm,read-slot-reset-state");
@@ -588,7 +590,6 @@ void __init eeh_init(void)
 	}
 
 	/* Enable EEH for all adapters.  Note that eeh requires buid's */
-	init_pci_config_tokens();
 	for (phb = of_find_node_by_name(NULL, "pci"); phb;
 	     phb = of_find_node_by_name(phb, "pci")) {
 		unsigned long buid;

_

Re: [PATCH] fix power3 boot

[Andrew Morton]

Anton Blanchard <anton@samba.org> wrote:
>
> @@ -588,7 +590,6 @@ void __init eeh_init(void)
>   	}
>   
>   	/* Enable EEH for all adapters.  Note that eeh requires buid's */
>  -	init_pci_config_tokens();
>   	for (phb = of_find_node_by_name(NULL, "pci"); phb;
>   	     phb = of_find_node_by_name(phb, "pci")) {
>   		unsigned long buid;
> 

That line was already deleted by paulus's "EEH fixes for POWER5 machines
(1/2)" patch, so we end up with the below.


diff -puN arch/ppc64/kernel/eeh.c~ppc64-fix-power3-boot arch/ppc64/kernel/eeh.c
--- 25/arch/ppc64/kernel/eeh.c~ppc64-fix-power3-boot	2004-07-04 03:08:52.772504640 -0700
+++ 25-akpm/arch/ppc64/kernel/eeh.c	2004-07-04 03:08:52.778503728 -0700
@@ -587,6 +587,8 @@ void __init eeh_init(void)
 		return;
 	}
 
+	init_pci_config_tokens();
+
 	ibm_set_eeh_option = rtas_token("ibm,set-eeh-option");
 	ibm_set_slot_reset = rtas_token("ibm,set-slot-reset");
 	ibm_read_slot_reset_state = rtas_token("ibm,read-slot-reset-state");
_

Re: [PATCH] fix power3 boot

[Anton Blanchard]

> That line was already deleted by paulus's "EEH fixes for POWER5 machines
> (1/2)" patch, so we end up with the below.1

Oh sorry, I missed that patch. Looks like that patch already added the
required call to init_pci_config_tokens:

 void __init eeh_init(void)
 {
-       struct device_node *phb;
+       struct device_node *phb, *np;
        struct eeh_early_enable_info info;
        char *eeh_force_off = strstr(saved_command_line, "eeh-force-off");

+       init_pci_config_tokens();
+
+       np = of_find_node_by_path("/rtas");
+       if (np == NULL) {
+               printk(KERN_WARNING "EEH: RTAS not found !\n");
+               return;
+       }
+