From owner-svn-src-all@FreeBSD.ORG Wed Dec 17 13:39:53 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D04318B; Wed, 17 Dec 2014 13:39:53 +0000 (UTC) Received: from bsdpad.com (xc1.bsdpad.com [195.154.136.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22FA9D27; Wed, 17 Dec 2014 13:39:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bsdpad.com) by bsdpad.com with smtp (Exim 4.83 (FreeBSD)) (envelope-from ) id 1Y1EmD-0007fG-CV; Wed, 17 Dec 2014 13:36:29 +0000 Received: by bsdpad.com (nbSMTP-1.00) for uid 1001 br@bsdpad.com; Wed, 17 Dec 2014 13:36:29 +0000 (GMT) Date: Wed, 17 Dec 2014 13:36:29 +0000 From: Ruslan Bukin To: Ian Lepore Subject: Re: svn commit: r275858 - head/sys/mips/beri Message-ID: <20141217133629.GA29458@bsdpad.com> References: <201412170934.sBH9Ytqp071808@svn.freebsd.org> <1418820674.1015.14.camel@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1418820674.1015.14.camel@freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2014 13:39:53 -0000 On Wed, Dec 17, 2014 at 05:51:14AM -0700, Ian Lepore wrote: > > Modified: head/sys/mips/beri/beri_machdep.c > > ============================================================================== > > --- head/sys/mips/beri/beri_machdep.c Wed Dec 17 07:47:25 2014 (r275857) > > +++ head/sys/mips/beri/beri_machdep.c Wed Dec 17 09:34:54 2014 (r275858) > > @@ -88,6 +88,11 @@ static void > > mips_init(void) > > { > > int i; > > +#ifdef FDT > > + struct mem_region mr[FDT_MEM_REGIONS]; > > + int mr_cnt, val; > > + int j; > > +#endif > > > > for (i = 0; i < 10; i++) { > > phys_avail[i] = 0; > > @@ -102,6 +107,29 @@ mips_init(void) > > > > physmem = realmem; > > > > +#ifdef FDT > > + if (fdt_get_mem_regions(mr, &mr_cnt, &val) == 0) { > > + > > + physmem = btoc(val); > > + > > + KASSERT((phys_avail[0] >= mr[0].mr_start) && \ > > + (phys_avail[0] < (mr[0].mr_start + mr[0].mr_size)), > > + ("First region is not within FDT memory range")); > > + > > + /* Limit size of the first region */ > > + phys_avail[1] = MIN(mr[0].mr_size, ctob(realmem)); > > + dump_avail[1] = phys_avail[1]; > > + > > + /* Add the rest of regions */ > > + for (i = 1, j = 2; i < mr_cnt; i++, j+=2) { > > + phys_avail[j] = mr[i].mr_start; > > + phys_avail[j+1] = mr[i].mr_size; > > + dump_avail[j] = phys_avail[j]; > > + dump_avail[j+1] = phys_avail[j+1]; > > + } > > + } > > +#endif > > + > > init_param1(); > > init_param2(physmem); > > mips_cpu_init(); > > > > This doesn't look right, the values in the odd-numbered array slots for > phys_avail and dump_avail need to be addresses, not sizes. That is, > avail[j] = start, avail[j+1] = start+size (note: not start+size-1). > > Right, thanks. Sounds like it should be like that Index: sys/mips/beri/beri_machdep.c =================================================================== --- sys/mips/beri/beri_machdep.c (revision 275861) +++ sys/mips/beri/beri_machdep.c (working copy) @@ -117,13 +117,13 @@ ("First region is not within FDT memory range")); /* Limit size of the first region */ - phys_avail[1] = MIN(mr[0].mr_size, ctob(realmem)); + phys_avail[1] = (mr[0].mr_start + MIN(mr[0].mr_size, ctob(realmem))); dump_avail[1] = phys_avail[1]; /* Add the rest of regions */ for (i = 1, j = 2; i < mr_cnt; i++, j+=2) { phys_avail[j] = mr[i].mr_start; - phys_avail[j+1] = mr[i].mr_size; + phys_avail[j+1] = (mr[i].mr_start + mr[i].mr_size); dump_avail[j] = phys_avail[j]; dump_avail[j+1] = phys_avail[j+1]; } Ruslan