Message ID | 1370976891-11648-1-git-send-email-bpicco@meloft.net |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
From: Bob Picco <bpicco@meloft.net> Date: Tue, 11 Jun 2013 14:54:51 -0400 > From: bob picco <bpicco@meloft.net> > > 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> Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);