From patchwork Wed Aug 15 23:43:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 177880 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 443A72C008F for ; Thu, 16 Aug 2012 09:43:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754054Ab2HOXne (ORCPT ); Wed, 15 Aug 2012 19:43:34 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:53195 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753609Ab2HOXne (ORCPT ); Wed, 15 Aug 2012 19:43:34 -0400 Received: from localhost (74-93-104-98-Washington.hfc.comcastbusiness.net [74.93.104.98]) by shards.monkeyblade.net (Postfix) with ESMTPSA id B727D5852B6; Wed, 15 Aug 2012 16:43:35 -0700 (PDT) Date: Wed, 15 Aug 2012 16:43:31 -0700 (PDT) Message-Id: <20120815.164331.1874494086894024620.davem@davemloft.net> To: sparclinux@vger.kernel.org Cc: debian-sparc@lists.debian.org Subject: Re: [PATCH] silo: Don't touch %tick_cmpr on sun4v cpus. From: David Miller In-Reply-To: <20120815.011416.353619816610212386.davem@davemloft.net> References: <20120815.011416.353619816610212386.davem@davemloft.net> X-Mailer: Mew version 6.5 on Emacs 24.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: David Miller 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. ==================== 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 --- 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);