Skip to contentSkip to conversation

powerpc: enable NAP only on cpus who support it to avoid memory corruption

PATCH In review Olaf Hering 2 participants 4 messages Mar 11, 2006 – Mar 12, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: enable NAP only on cpus who support it to avoid memory corruption

commit 51d3082fe6e55aecfa17113dbe98077c749f724c enabled NAP unconditinally on all powermacs. Early G3 cpus can not use it, the result is memory corruption.

Only enable powersave_nap in one place: probe_motherboard() ppc32 gets nap if the cpu supports it
ppc32 smp gets no nap
ppc64 gets nap unconditionally

---
 arch/powerpc/platforms/powermac/feature.c |    8 +++++++-
 arch/powerpc/platforms/powermac/setup.c   |    4 ----
 arch/powerpc/platforms/powermac/smp.c     |    4 ----
 3 files changed, 7 insertions(+), 9 deletions(-)
arch/powerpc/platforms/powermac/feature.c +7 -1
Index: linux-2.6.16-rc5-olh/arch/powerpc/platforms/powermac/feature.c
===================================================================
@@ -2513,8 +2513,11 @@ found:
 		/* Nap mode not supported if flush-on-lock property is present */
 		if (get_property(np, "flush-on-lock", NULL))
 			break;
+
+#ifndef CONFIG_SMP
+		/* 32 bits SMP can't NAP */
 		powersave_nap = 1;
-		printk(KERN_INFO "Processor NAP mode on idle enabled.\n");
+#endif
 		break;
 	}
 
@@ -2526,6 +2529,9 @@ found:
 #ifdef CONFIG_POWER4
 	powersave_nap = 1;
 #endif
+	if (powersave_nap)
+		printk(KERN_INFO "Using native/NAP idle loop\n");
+
 	/* Check for "mobile" machine */
 	if (model && (strncmp(model, "PowerBook", 9) == 0
 		   || strncmp(model, "iBook", 5) == 0))
arch/powerpc/platforms/powermac/setup.c +0 -4
Index: linux-2.6.16-rc5-olh/arch/powerpc/platforms/powermac/setup.c
===================================================================
@@ -621,10 +621,6 @@ static void __init pmac_init_early(void)
 	/* Probe motherboard chipset */
 	pmac_feature_init();
 
-	/* We can NAP */
-	powersave_nap = 1;
-	printk(KERN_INFO "Using native/NAP idle loop\n");
-
 	/* Initialize debug stuff */
 	udbg_scc_init(!!strstr(cmd_line, "sccdbg"));
 	udbg_adb_init(!!strstr(cmd_line, "btextdbg"));
arch/powerpc/platforms/powermac/smp.c +0 -4
Index: linux-2.6.16-rc5-olh/arch/powerpc/platforms/powermac/smp.c
===================================================================
@@ -739,10 +739,6 @@ static void __init smp_core99_setup(int 
 			smp_hw_index[i] = i;
 	}
 #endif
-
-	/* 32 bits SMP can't NAP */
-	if (!machine_is_compatible("MacRISC4"))
-		powersave_nap = 0;
 }
 
 static int __init smp_core99_probe(void)
#1 lore raw
Quoted 7 lines · Olaf Hering

commit 51d3082fe6e55aecfa17113dbe98077c749f724c enabled NAP unconditinally on all powermacs. Early G3 cpus can not use it, the result is memory corruption.

Only enable powersave_nap in one place: probe_motherboard() ppc32 gets nap if the cpu supports it
ppc32 smp gets no nap
ppc64 gets nap unconditionally

CONFIG_SMP is certainly not the way to do it though... I wonder how we got that wrong, I'll have a look.

Ben.

Quoted 68 lines
---
 arch/powerpc/platforms/powermac/feature.c |    8 +++++++-
 arch/powerpc/platforms/powermac/setup.c   |    4 ----
 arch/powerpc/platforms/powermac/smp.c     |    4 ----
 3 files changed, 7 insertions(+), 9 deletions(-)

Index: linux-2.6.16-rc5-olh/arch/powerpc/platforms/powermac/feature.c
===================================================================

arch/powerpc/platforms/powermac/feature.c +7 -1
@@ -2513,8 +2513,11 @@ found:
 		/* Nap mode not supported if flush-on-lock property is present */
 		if (get_property(np, "flush-on-lock", NULL))
 			break;
+
+#ifndef CONFIG_SMP
+		/* 32 bits SMP can't NAP */
 		powersave_nap = 1;
-		printk(KERN_INFO "Processor NAP mode on idle enabled.\n");
+#endif
 		break;
 	}
 
@@ -2526,6 +2529,9 @@ found:
 #ifdef CONFIG_POWER4
 	powersave_nap = 1;
 #endif
+	if (powersave_nap)
+		printk(KERN_INFO "Using native/NAP idle loop\n");
+
 	/* Check for "mobile" machine */
 	if (model && (strncmp(model, "PowerBook", 9) == 0
 		   || strncmp(model, "iBook", 5) == 0))

Index: linux-2.6.16-rc5-olh/arch/powerpc/platforms/powermac/setup.c
===================================================================

arch/powerpc/platforms/powermac/setup.c +0 -4
@@ -621,10 +621,6 @@ static void __init pmac_init_early(void)
 	/* Probe motherboard chipset */
 	pmac_feature_init();
 
-	/* We can NAP */
-	powersave_nap = 1;
-	printk(KERN_INFO "Using native/NAP idle loop\n");
-
 	/* Initialize debug stuff */
 	udbg_scc_init(!!strstr(cmd_line, "sccdbg"));
 	udbg_adb_init(!!strstr(cmd_line, "btextdbg"));

Index: linux-2.6.16-rc5-olh/arch/powerpc/platforms/powermac/smp.c
===================================================================

arch/powerpc/platforms/powermac/smp.c +0 -5
@@ -739,10 +739,6 @@ static void __init smp_core99_setup(int 
 			smp_hw_index[i] = i;
 	}
 #endif
-
-	/* 32 bits SMP can't NAP */
-	if (!machine_is_compatible("MacRISC4"))
-		powersave_nap = 0;
 }
 
 static int __init smp_core99_probe(void)
-

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw
In reply to Olaf Hering
Quoted 2 lines · Olaf Hering

commit 51d3082fe6e55aecfa17113dbe98077c749f724c enabled NAP unconditinally on all powermacs. Early G3 cpus can not use it, the result is memory corruption.

Ok, here is what I think is a proper fix: Just remove the code from setup.c since feature.c will already set powersave_nap when needed.

Can you test asap please ? If it fixes the problem for you, I'll send the patch to Linus/Andrew with hopes that it will make it in 2.6.16

---

This patch fixes incorrect setting of powersave_nap to 1 on all PowerMac's potentially causing memory corruption on some models. This bug was introuced by me during the 32/64 bits merge.

arch/powerpc/platforms/powermac/setup.c +0 -4
Index: linux-work/arch/powerpc/platforms/powermac/setup.c
===================================================================
@@ -621,10 +621,6 @@
 	/* Probe motherboard chipset */
 	pmac_feature_init();
 
-	/* We can NAP */
-	powersave_nap = 1;
-	printk(KERN_INFO "Using native/NAP idle loop\n");
-
 	/* Initialize debug stuff */
 	udbg_scc_init(!!strstr(cmd_line, "sccdbg"));
 	udbg_adb_init(!!strstr(cmd_line, "btextdbg"));
arch/powerpc/platforms/powermac/feature.c +4 -5
Index: linux-work/arch/powerpc/platforms/powermac/feature.c
===================================================================
@@ -2491,9 +2491,7 @@
 			pmac_mb.model_id = PMAC_TYPE_COMET;
 		iounmap(mach_id_ptr);
 	}
-#endif /* CONFIG_POWER4 */
 
-#ifdef CONFIG_6xx
 	/* Set default value of powersave_nap on machines that support it.
 	 * It appears that uninorth rev 3 has a problem with it, we don't
 	 * enable it on those. In theory, the flush-on-lock property is
@@ -2522,10 +2520,11 @@
 	 * NAP mode
 	 */
 	powersave_lowspeed = 1;
-#endif /* CONFIG_6xx */
-#ifdef CONFIG_POWER4
+
+#else /* CONFIG_POWER4 */
 	powersave_nap = 1;
-#endif
+#endif  /* CONFIG_POWER4 */
+
 	/* Check for "mobile" machine */
 	if (model && (strncmp(model, "PowerBook", 9) == 0
 		   || strncmp(model, "iBook", 5) == 0))
#3 lore raw
Quoted 9 lines · Benjamin Herrenschmidt
Quoted 2 lines · Olaf Hering

commit 51d3082fe6e55aecfa17113dbe98077c749f724c enabled NAP unconditinally on all powermacs. Early G3 cpus can not use it, the result is memory corruption.

Ok, here is what I think is a proper fix: Just remove the code from setup.c since feature.c will already set powersave_nap when needed.

Can you test asap please ? If it fixes the problem for you, I'll send the patch to Linus/Andrew with hopes that it will make it in 2.6.16

Yes, this helps.