Patchwork powerpc: get the number of SLBs from "slb-size" property

login
register
mail settings
Submitter Michael Neuling
Date Jan. 14, 2009, 11:42 p.m.
Message ID <26961.1231976561@neuling.org>
Download mbox | patch
Permalink /patch/18556/
State Accepted
Commit b60c31d85a2a2f1a9c8623f1fb56e2688aa1e2b1
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Michael Neuling - Jan. 14, 2009, 11:42 p.m.
The PAPR says that the property for specifying the number of SLBs should
be called "slb-size".  We currently only look for "ibm,slb-size" because
this is what firmware actually presents.

This patch makes us look for the "slb-size" property as well and in
preference to the "ibm,slb-size".  This should future proof us if
firmware changes to match PAPR.  

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
 arch/powerpc/kernel/prom.c |    5 +++++
 1 file changed, 5 insertions(+)

Patch

Index: linux-2.6-ozlabs/arch/powerpc/kernel/prom.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/prom.c
+++ linux-2.6-ozlabs/arch/powerpc/kernel/prom.c
@@ -590,6 +590,11 @@  static void __init check_cpu_slb_size(un
 {
 	u32 *slb_size_ptr;
 
+	slb_size_ptr = of_get_flat_dt_prop(node, "slb-size", NULL);
+	if (slb_size_ptr != NULL) {
+		mmu_slb_size = *slb_size_ptr;
+		return;
+	}
 	slb_size_ptr = of_get_flat_dt_prop(node, "ibm,slb-size", NULL);
 	if (slb_size_ptr != NULL) {
 		mmu_slb_size = *slb_size_ptr;