diff options
author | bob picco <bpicco@meloft.net> | 2013-06-11 14:54:51 -0400 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2013-08-02 22:14:51 +0200 |
commit | 5d231ecea4c70ae9fc9f44a0fd8ea593e7e98986 (patch) | |
tree | ef1d5d88f93fa025d929a61102b5e6eb091e537e /arch | |
parent | d28828aae0b1de13f4ec6d036276da7f01bd03a7 (diff) |
sparc64 address-congruence property
commit 771a37ff4d80b80db3b0df3e7696f14b298c67b7 upstream.
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 <bob.picco@oracle.com>
CC: sparclinux@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/mm/init_64.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 6ff4d78d8591..b4989f9aed30 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -1071,7 +1071,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); |