From 45fec9f3e4bbb8c4a9042e6daeebadadcc36d5aa Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@parisc-linux.org>
Date: Fri, 16 Jun 2006 18:20:00 -0400
Subject: [PATCH] --- yaml --- r: 31149 b: refs/heads/master c:
 a9d2d386c42b816a81eb1d02dfb7b502ba8cea82 h: refs/heads/master i:   31147:
 f42df1d00be4b5a05b8f591e319dbb68da68c870 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/parisc/kernel/cache.c    | 10 +++++++++-
 trunk/arch/parisc/kernel/firmware.c | 20 ++++++++++++++++++++
 trunk/include/asm-parisc/pdc.h      |  1 +
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index efb70f2d30f9..76c66b07293e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5a2e7fdb53028ce187c0ce0ae0d45ca7546fd5e
+refs/heads/master: a9d2d386c42b816a81eb1d02dfb7b502ba8cea82
diff --git a/trunk/arch/parisc/kernel/cache.c b/trunk/arch/parisc/kernel/cache.c
index 851519cbad6f..bc7c4a4e26a1 100644
--- a/trunk/arch/parisc/kernel/cache.c
+++ b/trunk/arch/parisc/kernel/cache.c
@@ -236,7 +236,8 @@ parisc_cache_init(void)
 
 void disable_sr_hashing(void)
 {
-	int srhash_type;
+	int srhash_type, retval;
+	unsigned long space_bits;
 
 	switch (boot_cpu_data.cpu_type) {
 	case pcx: /* We shouldn't get this far.  setup.c should prevent it. */
@@ -262,6 +263,13 @@ void disable_sr_hashing(void)
 	}
 
 	disable_sr_hashing_asm(srhash_type);
+
+	retval = pdc_spaceid_bits(&space_bits);
+	/* If this procedure isn't implemented, don't panic. */
+	if (retval < 0 && retval != PDC_BAD_OPTION)
+		panic("pdc_spaceid_bits call failed.\n");
+	if (space_bits != 0)
+		panic("SpaceID hashing is still on!\n");
 }
 
 void flush_dcache_page(struct page *page)
diff --git a/trunk/arch/parisc/kernel/firmware.c b/trunk/arch/parisc/kernel/firmware.c
index 0596f27340cc..c80c277454f3 100644
--- a/trunk/arch/parisc/kernel/firmware.c
+++ b/trunk/arch/parisc/kernel/firmware.c
@@ -512,6 +512,26 @@ int pdc_cache_info(struct pdc_cache_info *cache_info)
         return retval;
 }
 
+/**
+ * pdc_spaceid_bits - Return whether Space ID hashing is turned on.
+ * @space_bits: Should be 0, if not, bad mojo!
+ *
+ * Returns information about Space ID hashing.
+ */
+int pdc_spaceid_bits(unsigned long *space_bits)
+{
+	int retval;
+
+	spin_lock_irq(&pdc_lock);
+	pdc_result[0] = 0;
+	retval = mem_pdc_call(PDC_CACHE, PDC_CACHE_RET_SPID, __pa(pdc_result), 0);
+	convert_to_wide(pdc_result);
+	*space_bits = pdc_result[0];
+	spin_unlock_irq(&pdc_lock);
+
+	return retval;
+}
+
 #ifndef CONFIG_PA20
 /**
  * pdc_btlb_info - Return block TLB information.
diff --git a/trunk/include/asm-parisc/pdc.h b/trunk/include/asm-parisc/pdc.h
index 592f13bcc987..3d3446ec207e 100644
--- a/trunk/include/asm-parisc/pdc.h
+++ b/trunk/include/asm-parisc/pdc.h
@@ -733,6 +733,7 @@ int pdc_model_cpuid(unsigned long *cpu_id);
 int pdc_model_versions(unsigned long *versions, int id);
 int pdc_model_capabilities(unsigned long *capabilities);
 int pdc_cache_info(struct pdc_cache_info *cache);
+int pdc_spaceid_bits(unsigned long *space_bits);
 #ifndef CONFIG_PA20
 int pdc_btlb_info(struct pdc_btlb_info *btlb);
 int pdc_mem_map_hpa(struct pdc_memory_map *r_addr, struct pdc_module_path *mod_path);