diff options
| author | bob picco <bpicco@meloft.net> | 2013-06-11 14:54:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-19 02:10:30 -0700 |
| commit | 771a37ff4d80b80db3b0df3e7696f14b298c67b7 (patch) | |
| tree | ca01b271e991cb89fa1ffef4c49331e55f093d2f /arch/sparc | |
| parent | d72ee6be58b7c99a6e8da6584106c5958dae2bf8 (diff) | |
sparc64 address-congruence property
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>
Diffstat (limited to 'arch/sparc')
| -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 a7171997adf..04fd55a6e46 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -1098,7 +1098,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); |