From patchwork Tue Jun 11 18:54:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Picco X-Patchwork-Id: 250609 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 5BEFA2C0040 for ; Wed, 12 Jun 2013 04:57:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754922Ab3FKS5G (ORCPT ); Tue, 11 Jun 2013 14:57:06 -0400 Received: from hapkido.dreamhost.com ([66.33.216.122]:42398 "EHLO hapkido.dreamhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750792Ab3FKS5F (ORCPT ); Tue, 11 Jun 2013 14:57:05 -0400 Received: from homiemail-a88.g.dreamhost.com (caiajhbdccac.dreamhost.com [208.97.132.202]) by hapkido.dreamhost.com (Postfix) with ESMTP id 5C9A4DEEF7 for ; Tue, 11 Jun 2013 11:57:04 -0700 (PDT) Received: from homiemail-a88.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a88.g.dreamhost.com (Postfix) with ESMTP id 812B526406A; Tue, 11 Jun 2013 11:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=meloft.net; h=from:to:cc :subject:date:message-id; s=meloft.net; bh=1MLUnDYdPQHfRaw6F2gIa MyCNl4=; b=u4e/73/7O5JILafe/p4hfYqjvFMS5YFNhvigntqT00S+kio8fxosK 3RO7wD6Ur41RsWsyIWNZ2zHyHuOYS6V8DmgTeB7ElN+rrSOYS0cpUeI57LspX3Is 1l9YOqGSMI5+YntcQidTYLUkuOR/Z/EfZASHyW2dTqyUcFjnRvAO/Y= Received: from meloft.net (c-50-136-7-79.hsd1.nh.comcast.net [50.136.7.79]) (Authenticated sender: bpicco@meloft.net) by homiemail-a88.g.dreamhost.com (Postfix) with ESMTPA id C107A26405D; Tue, 11 Jun 2013 11:56:23 -0700 (PDT) From: Bob Picco To: davem@davemloft.net Cc: bpicco@meloft.net, Bob Picco , sparclinux@vger.kernel.org Subject: [PATCH 1/1] sparc64 address-congruence property Date: Tue, 11 Jun 2013 14:54:51 -0400 Message-Id: <1370976891-11648-1-git-send-email-bpicco@meloft.net> X-Mailer: git-send-email 1.8.1.2 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: bob picco The Machine Description (MD) property "address-congruence-offset" is optional. According to the MD specification the value is assumed 0UL when not present. This caused early boot failure on T5. Signed-off-by: Bob Picco CC: sparclinux@vger.kernel.org --- arch/sparc/mm/init_64.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 64be39c..61530f3 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -1099,7 +1099,14 @@ static int __init grab_mblocks(struct mdesc_handle *md) m->size = *val; val = mdesc_get_property(md, node, "address-congruence-offset", NULL); - m->offset = *val; + + /* The address-congruence-offset property is optional. + * Explicity zero it be identifty this. + */ + if (val) + m->offset = *val; + else + m->offset = 0UL; numadbg("MBLOCK[%d]: base[%llx] size[%llx] offset[%llx]\n", count - 1, m->base, m->size, m->offset);