linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] do firmware feature fixups after features are initialised
@ 2007-06-08  4:00 Michael Neuling
  2007-07-11 10:28 ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 12+ messages in thread
From: Michael Neuling @ 2007-06-08  4:00 UTC (permalink / raw)
  To: paulus; +Cc: linuxppc-dev

On pSeries the firmware features are not setup until ppc_md.init_early,
so we can't do the firmware feature sections fixups till after this.

Currently firmware feature sections is only used on iSeries which inits
the firmware features much earlier.  This is a bug in waiting on
pSeries. 

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
paulus: since we aren't hitting this currently, it can wait for 2.6.23. 

 arch/powerpc/kernel/setup_64.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Index: linux-2.6-ozlabs/arch/powerpc/kernel/setup_64.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/setup_64.c
+++ linux-2.6-ozlabs/arch/powerpc/kernel/setup_64.c
@@ -350,13 +350,11 @@ void __init setup_system(void)
 {
 	DBG(" -> setup_system()\n");
 
-	/* Apply the CPUs-specific and firmware specific fixups to kernel
-	 * text (nop out sections not relevant to this CPU or this firmware)
+	/* Apply CPUs-specific fixups to kernel text (nop out sections
+	 * not relevant to this CPU)
 	 */
 	do_feature_fixups(cur_cpu_spec->cpu_features,
 			  &__start___ftr_fixup, &__stop___ftr_fixup);
-	do_feature_fixups(powerpc_firmware_features,
-			  &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
 
 	/*
 	 * Unflatten the device-tree passed by prom_init or kexec
@@ -394,6 +392,12 @@ void __init setup_system(void)
 	if (ppc_md.init_early)
 		ppc_md.init_early();
 
+	/* Apply firmware specific fixups to kernel text (nop out
+	 * sections not relevant to this firmware)
+	 */
+	do_feature_fixups(powerpc_firmware_features,
+			  &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
+
  	/*
 	 * We can discover serial ports now since the above did setup the
 	 * hash table management for us, thus ioremap works. We do that early

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2007-07-19  2:55 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-08  4:00 [PATCH] do firmware feature fixups after features are initialised Michael Neuling
2007-07-11 10:28 ` Benjamin Herrenschmidt
2007-07-11 11:06   ` Segher Boessenkool
2007-07-11 11:27     ` Benjamin Herrenschmidt
2007-07-11 11:41       ` Segher Boessenkool
2007-07-11 11:29   ` Arnd Bergmann
2007-07-11 23:23     ` Michael Neuling
2007-07-12  9:36       ` Arnd Bergmann
2007-07-12 15:15         ` Michael Neuling
2007-07-18 21:56     ` [PATCH] fix future firmware feature fixups function failure Michael Neuling
2007-07-18 22:54       ` Arnd Bergmann
2007-07-19  2:55         ` Michael Neuling

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).