From owner-svn-src-user@FreeBSD.ORG Thu Jan 1 22:18:28 2015 Return-Path: Delivered-To: svn-src-user@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 761F8C9E; Thu, 1 Jan 2015 22:18:28 +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 48C4D645C0; Thu, 1 Jan 2015 22:18:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t01MIS85087450; Thu, 1 Jan 2015 22:18:28 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t01MISV8087449; Thu, 1 Jan 2015 22:18:28 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201501012218.t01MISV8087449@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Thu, 1 Jan 2015 22:18:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r276513 - user/nwhitehorn/kboot/powerpc/kboot X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jan 2015 22:18:28 -0000 Author: nwhitehorn Date: Thu Jan 1 22:18:27 2015 New Revision: 276513 URL: https://svnweb.freebsd.org/changeset/base/276513 Log: Add some fixups for what you get out of /proc/device-tree, which is not *quite* a transcription of the FDT as far as phandles are concerned. Modified: user/nwhitehorn/kboot/powerpc/kboot/kbootfdt.c Modified: user/nwhitehorn/kboot/powerpc/kboot/kbootfdt.c ============================================================================== --- user/nwhitehorn/kboot/powerpc/kboot/kbootfdt.c Thu Jan 1 20:53:38 2015 (r276512) +++ user/nwhitehorn/kboot/powerpc/kboot/kbootfdt.c Thu Jan 1 22:18:27 2015 (r276513) @@ -96,19 +96,62 @@ add_node_to_fdt(void *buffer, const char host_close(fd); } +/* Fix up wrong values added to the device tree by prom_init() in Linux */ + +static void +fdt_linux_fixups(void *fdtp) +{ + int offset, len; + const void *prop; + + /* + * Remove /memory/available properties, which reflect long-gone OF + * state + */ + + offset = fdt_path_offset(fdtp, "/memory@0"); + if (offset > 0) { + fdt_delprop(fdtp, offset, "available"); + /* + * XXX: add real available properties to reflect RTAS, etc. + * reservations? + */ + } + + /* + * Patch up /chosen nodes so that the stored handles mean something, + * where possible. + */ + offset = fdt_path_offset(fdtp, "/chosen"); + if (offset > 0) { + fdt_delprop(fdtp, offset, "cpu"); /* This node not meaningful */ + + offset = fdt_path_offset(fdtp, "/chosen"); + prop = fdt_getprop(fdtp, offset, "linux,stdout-package", &len); + if (prop != NULL) { + fdt_setprop(fdtp, offset, "stdout", prop, len); + offset = fdt_path_offset(fdtp, "/chosen"); + fdt_setprop(fdtp, offset, "stdin", prop, len); + } + } +} + int fdt_platform_load_dtb(void) { void *buffer; size_t buflen = 409600; - char path[255] = "/proc/device-tree"; buffer = malloc(buflen); fdt_create_empty_tree(buffer, buflen); - add_node_to_fdt(buffer, path, fdt_path_offset(buffer, "/")); + add_node_to_fdt(buffer, "/proc/device-tree", + fdt_path_offset(buffer, "/")); + fdt_linux_fixups(buffer); + fdt_pack(buffer); fdt_load_dtb_addr(buffer); + free(buffer); return (0); }