From owner-svn-src-all@FreeBSD.ORG Sun May 24 15:29:57 2015 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 55D5C8D5; Sun, 24 May 2015 15:29:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 29D501D15; Sun, 24 May 2015 15:29:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4OFTvvG051927; Sun, 24 May 2015 15:29:57 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4OFTuXV051925; Sun, 24 May 2015 15:29:56 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201505241529.t4OFTuXV051925@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Sun, 24 May 2015 15:29:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r283409 - in stable/10/sys/boot/uboot: fdt lib X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Sun, 24 May 2015 15:29:57 -0000 Author: ian Date: Sun May 24 15:29:56 2015 New Revision: 283409 URL: https://svnweb.freebsd.org/changeset/base/283409 Log: MFC r280194: Fix fdt_platform_fixups() mem region handling. Modified: stable/10/sys/boot/uboot/fdt/uboot_fdt.c stable/10/sys/boot/uboot/lib/glue.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/boot/uboot/fdt/uboot_fdt.c ============================================================================== --- stable/10/sys/boot/uboot/fdt/uboot_fdt.c Sun May 24 15:29:20 2015 (r283408) +++ stable/10/sys/boot/uboot/fdt/uboot_fdt.c Sun May 24 15:29:56 2015 (r283409) @@ -88,7 +88,7 @@ fdt_platform_load_dtb(void) void fdt_platform_fixups(void) { - struct fdt_mem_region regions[3]; + static struct fdt_mem_region regions[UB_MAX_MR]; const char *env, *str; char *end, *ethstr; int eth_no, i, len, n; @@ -165,17 +165,15 @@ fdt_platform_fixups(void) /* Modify cpu(s) and bus clock frequenties in /cpus node [Hz] */ fdt_fixup_cpubusfreqs(si->clk_cpu, si->clk_bus); - /* Copy the data into a useful form */ - for (i = 0; i < si->mr_no; i++) { - if (i > nitems(regions)) { - i = nitems(regions); - break; + /* Extract the DRAM regions into fdt_mem_region format. */ + for (i = 0, n = 0; i < si->mr_no && n < nitems(regions); i++) { + if (si->mr[i].flags == MR_ATTR_DRAM) { + regions[n].start = si->mr[i].start; + regions[n].size = si->mr[i].size; + n++; } - - regions[i].start = si->mr[i].start; - regions[i].size = si->mr[i].size; } /* Fixup memory regions */ - fdt_fixup_memory(regions, i); + fdt_fixup_memory(regions, n); } Modified: stable/10/sys/boot/uboot/lib/glue.h ============================================================================== --- stable/10/sys/boot/uboot/lib/glue.h Sun May 24 15:29:20 2015 (r283408) +++ stable/10/sys/boot/uboot/lib/glue.h Sun May 24 15:29:56 2015 (r283409) @@ -40,7 +40,7 @@ void *syscall_ptr; int api_search_sig(struct api_signature **sig); -#define UB_MAX_MR 5 /* max mem regions number */ +#define UB_MAX_MR 16 /* max mem regions number */ #define UB_MAX_DEV 6 /* max devices number */ /*