Patchwork silo: Don't touch %tick_cmpr on sun4v cpus.

login
register
mail settings
Submitter David Miller
Date Aug. 15, 2012, 11:43 p.m.
Message ID <20120815.164331.1874494086894024620.davem@davemloft.net>
Download mbox | patch
Permalink /patch/177880/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Aug. 15, 2012, 11:43 p.m.
From: David Miller <davem@davemloft.net>
Date: Wed, 15 Aug 2012 01:14:16 -0700 (PDT)

> 
> This generates an illegal instruction exception.

Unfortunately, after some more testing, this needs a follow-on fix,
included below and also committed to SILO git.

Sorry for the confusion.

Patch

====================
silo: Don't assume P1275 OBP means sun4u.

It could also mean 'sun4v'.

Code this defensively, so that if (for whatever reason)
we can't get at the 'compatible' property in the root
OBP device node we'll still default to sun4u as previous.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 second/misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/second/misc.c b/second/misc.c
index d6bcdb1..d789723 100644
--- a/second/misc.c
+++ b/second/misc.c
@@ -501,7 +501,7 @@  enum arch silo_get_architecture(void)
         if ((i = prom_searchsiblings(i, "MicroSPARC-IIep")) != 0) {
             return sun4p;
         }
-        return sun4u;
+	buffer[4] = 'u';
     }
     i = prom_getproperty (prom_root_node, "compatability", buffer, 8);