From owner-svn-src-head@FreeBSD.ORG Tue May 21 03:05:55 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E5731969; Tue, 21 May 2013 03:05:54 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C6B379E9; Tue, 21 May 2013 03:05:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4L35sCG077307; Tue, 21 May 2013 03:05:54 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4L35oOq077272; Tue, 21 May 2013 03:05:50 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201305210305.r4L35oOq077272@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 21 May 2013 03:05:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250840 - in head/sys: amd64/amd64 amd64/include conf dev/fdt dev/uart i386/i386 i386/include x86/include x86/x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 May 2013 03:05:55 -0000 Author: marcel Date: Tue May 21 03:05:49 2013 New Revision: 250840 URL: http://svnweb.freebsd.org/changeset/base/250840 Log: Add basic support for FDT to i386 & amd64. This change includes: 1. Common headers for fdt.h and ofw_machdep.h under x86/include with indirections under i386/include and amd64/include. 2. New modinfo for loader provided FDT blob. 3. Common x86_init_fdt() called from hammer_time() on amd64 and init386() on i386. 4. Split-off FDT specific low-level console functions from FDT bus methods for the uart(4) driver. The low-level console logic has been moved to uart_cpu_fdt.c and is used for arm, mips & powerpc only. The FDT bus methods are shared across all architectures. 5. Add dev/fdt/fdt_x86.c to hold the fdt_fixup_table[] and the fdt_pic_table[] arrays. Both are empty right now. FDT addresses are I/O ports on x86. Since the core FDT code does not handle different address spaces, adding support for both I/O ports and memory addresses requires some thought and discussion. It may be better to use a compile-time option that controls this. Obtained from: Juniper Networks, Inc. Added: head/sys/amd64/include/fdt.h (contents, props changed) head/sys/amd64/include/ofw_machdep.h (contents, props changed) head/sys/dev/fdt/fdt_x86.c (contents, props changed) head/sys/dev/uart/uart_cpu_fdt.c (contents, props changed) head/sys/i386/include/fdt.h (contents, props changed) head/sys/i386/include/ofw_machdep.h (contents, props changed) head/sys/x86/include/fdt.h (contents, props changed) head/sys/x86/include/ofw_machdep.h (contents, props changed) head/sys/x86/x86/fdt_machdep.c (contents, props changed) Modified: head/sys/amd64/amd64/machdep.c head/sys/amd64/include/metadata.h head/sys/conf/Makefile.amd64 head/sys/conf/Makefile.i386 head/sys/conf/files head/sys/conf/files.amd64 head/sys/conf/files.arm head/sys/conf/files.i386 head/sys/conf/files.mips head/sys/conf/files.powerpc head/sys/dev/uart/uart_bus_fdt.c head/sys/i386/i386/machdep.c head/sys/i386/include/metadata.h Modified: head/sys/amd64/amd64/machdep.c ============================================================================== --- head/sys/amd64/amd64/machdep.c Tue May 21 00:41:49 2013 (r250839) +++ head/sys/amd64/amd64/machdep.c Tue May 21 03:05:49 2013 (r250840) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include "opt_maxmem.h" #include "opt_mp_watchdog.h" #include "opt_perfmon.h" +#include "opt_platform.h" #include "opt_sched.h" #include "opt_kdtrace.h" @@ -133,6 +134,9 @@ __FBSDID("$FreeBSD$"); #ifdef SMP #include #endif +#ifdef FDT +#include +#endif #ifdef DEV_ATPIC #include @@ -1886,6 +1890,10 @@ hammer_time(u_int64_t modulep, u_int64_t cpu_probe_amdc1e(); +#ifdef FDT + x86_init_fdt(); +#endif + /* Location of kernel stack for locore */ return ((u_int64_t)thread0.td_pcb); } Added: head/sys/amd64/include/fdt.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/amd64/include/fdt.h Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + */ +/* $FreeBSD$ */ + +#include Modified: head/sys/amd64/include/metadata.h ============================================================================== --- head/sys/amd64/include/metadata.h Tue May 21 00:41:49 2013 (r250839) +++ head/sys/amd64/include/metadata.h Tue May 21 03:05:49 2013 (r250840) @@ -31,5 +31,6 @@ #define MODINFOMD_SMAP 0x1001 #define MODINFOMD_SMAP_XATTR 0x1002 +#define MODINFOMD_DTBP 0x1003 #endif /* !_MACHINE_METADATA_H_ */ Added: head/sys/amd64/include/ofw_machdep.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/amd64/include/ofw_machdep.h Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + */ +/* $FreeBSD$ */ + +#include Modified: head/sys/conf/Makefile.amd64 ============================================================================== --- head/sys/conf/Makefile.amd64 Tue May 21 00:41:49 2013 (r250839) +++ head/sys/conf/Makefile.amd64 Tue May 21 03:05:49 2013 (r250840) @@ -31,6 +31,8 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" +INCLUDES+= -I$S/contrib/libfdt + .if !empty(DDB_ENABLED) || !empty(DTR_ENABLED) || !empty(HWPMC_ENABLED) CFLAGS+= -fno-omit-frame-pointer .endif Modified: head/sys/conf/Makefile.i386 ============================================================================== --- head/sys/conf/Makefile.i386 Tue May 21 00:41:49 2013 (r250839) +++ head/sys/conf/Makefile.i386 Tue May 21 03:05:49 2013 (r250840) @@ -30,6 +30,8 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" +INCLUDES+= -I$S/contrib/libfdt + MACHINE=i386 MKMODULESENV+= MACHINE=${MACHINE} Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue May 21 00:41:49 2013 (r250839) +++ head/sys/conf/files Tue May 21 03:05:49 2013 (r250840) @@ -2903,6 +2903,7 @@ libkern/inet_pton.c standard libkern/jenkins_hash.c standard libkern/mcount.c optional profiling-routine libkern/memcchr.c standard +libkern/memchr.c optional fdt libkern/memcmp.c standard libkern/qsort.c standard libkern/qsort_r.c standard Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Tue May 21 00:41:49 2013 (r250839) +++ head/sys/conf/files.amd64 Tue May 21 03:05:49 2013 (r250840) @@ -189,6 +189,7 @@ dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa dev/fdc/fdc_pccard.c optional fdc pccard +dev/fdt/fdt_x86.c optional fdt dev/hpt27xx/os_bsd.c optional hpt27xx dev/hpt27xx/osm_bsd.c optional hpt27xx dev/hpt27xx/hpt27xx_config.c optional hpt27xx @@ -501,6 +502,7 @@ x86/pci/pci_bus.c optional pci x86/pci/qpi.c optional pci x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard +x86/x86/fdt_machdep.c optional fdt x86/x86/intr_machdep.c standard x86/x86/io_apic.c standard x86/x86/legacy.c standard Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Tue May 21 00:41:49 2013 (r250839) +++ head/sys/conf/files.arm Tue May 21 03:05:49 2013 (r250840) @@ -66,6 +66,8 @@ dev/kbd/kbd.c optional sc dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc +dev/uart/uart_cpu_fdt.c optional uart fdt + font.h optional sc \ compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ @@ -87,7 +89,6 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard -libkern/memchr.c optional fdt libkern/moddi3.c standard libkern/qdivrem.c standard libkern/ucmpdi2.c standard Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Tue May 21 00:41:49 2013 (r250839) +++ head/sys/conf/files.i386 Tue May 21 03:05:49 2013 (r250840) @@ -176,6 +176,7 @@ dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa dev/fdc/fdc_pccard.c optional fdc pccard +dev/fdt/fdt_x86.c optional fdt dev/fe/if_fe_isa.c optional fe isa dev/glxiic/glxiic.c optional glxiic dev/glxsb/glxsb.c optional glxsb @@ -545,6 +546,7 @@ x86/pci/pci_bus.c optional pci x86/pci/qpi.c optional pci x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard +x86/x86/fdt_machdep.c optional fdt x86/x86/intr_machdep.c standard x86/x86/io_apic.c optional apic x86/x86/legacy.c optional native Modified: head/sys/conf/files.mips ============================================================================== --- head/sys/conf/files.mips Tue May 21 00:41:49 2013 (r250839) +++ head/sys/conf/files.mips Tue May 21 03:05:49 2013 (r250840) @@ -53,7 +53,6 @@ kern/subr_dummy_vdso_tc.c standard libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard -libkern/memchr.c optional fdt libkern/memmove.c standard libkern/ucmpdi2.c optional mips | mipsel @@ -72,6 +71,7 @@ mips/mips/sc_machdep.c optional sc # FDT support dev/fdt/fdt_mips.c optional fdt +dev/uart/uart_cpu_fdt.c optional uart fdt # crypto support -- use generic crypto/blowfish/bf_enc.c optional crypto | ipsec Modified: head/sys/conf/files.powerpc ============================================================================== --- head/sys/conf/files.powerpc Tue May 21 00:41:49 2013 (r250839) +++ head/sys/conf/files.powerpc Tue May 21 03:05:49 2013 (r250840) @@ -61,6 +61,7 @@ dev/syscons/scterm-teken.c optional sc dev/syscons/scvtb.c optional sc dev/tsec/if_tsec.c optional tsec dev/tsec/if_tsec_fdt.c optional tsec fdt +dev/uart/uart_cpu_fdt.c optional uart fdt dev/uart/uart_cpu_powerpc.c optional uart aim dev/usb/controller/ehci_fsl.c optional ehci mpc85xx kern/kern_clocksource.c standard @@ -76,7 +77,6 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c optional powerpc -libkern/memchr.c optional fdt libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c optional powerpc Added: head/sys/dev/fdt/fdt_x86.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/fdt/fdt_x86.c Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,51 @@ +/*- + * Copyright (c) 2013 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include "ofw_bus_if.h" +#include "fdt_common.h" + +struct fdt_fixup_entry fdt_fixup_table[] = { + { NULL, NULL } +}; + +fdt_pic_decode_t fdt_pic_table[] = { + NULL +}; Modified: head/sys/dev/uart/uart_bus_fdt.c ============================================================================== --- head/sys/dev/uart/uart_bus_fdt.c Tue May 21 00:41:49 2013 (r250839) +++ head/sys/dev/uart/uart_bus_fdt.c Tue May 21 03:05:49 2013 (r250840) @@ -124,101 +124,3 @@ uart_fdt_probe(device_t dev) } DRIVER_MODULE(uart, simplebus, uart_fdt_driver, uart_devclass, 0, 0); - -/* - * UART console routines. - */ -bus_space_tag_t uart_bus_space_io; -bus_space_tag_t uart_bus_space_mem; - -int -uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) -{ - - return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); -} - -int -uart_cpu_getdev(int devtype, struct uart_devinfo *di) -{ - char buf[64]; - struct uart_class *class; - phandle_t node, chosen; - pcell_t shift, br, rclk; - u_long start, size, pbase, psize; - int err; - - uart_bus_space_mem = fdtbus_bs_tag; - uart_bus_space_io = NULL; - - /* Allow overriding the FDT uning the environment. */ - class = &uart_ns8250_class; - err = uart_getenv(devtype, di, class); - if (!err) - return (0); - - if (devtype != UART_DEV_CONSOLE) - return (ENXIO); - - /* - * Retrieve /chosen/std{in,out}. - */ - if ((chosen = OF_finddevice("/chosen")) == -1) - return (ENXIO); - if (OF_getprop(chosen, "stdin", buf, sizeof(buf)) <= 0) - return (ENXIO); - if ((node = OF_finddevice(buf)) == -1) - return (ENXIO); - if (OF_getprop(chosen, "stdout", buf, sizeof(buf)) <= 0) - return (ENXIO); - if (OF_finddevice(buf) != node) - /* Only stdin == stdout is supported. */ - return (ENXIO); - /* - * Retrieve serial attributes. - */ - uart_fdt_get_shift(node, &shift); - - if (OF_getprop(node, "current-speed", &br, sizeof(br)) <= 0) - br = 0; - br = fdt32_to_cpu(br); - - if ((err = uart_fdt_get_clock(node, &rclk)) != 0) - return (err); - /* - * Finalize configuration. - */ - if (fdt_is_compatible(node, "fsl,imx-uart")) - class = &uart_imx_class; - if (fdt_is_compatible(node, "quicc")) - class = &uart_quicc_class; - if (fdt_is_compatible(node, "lpc")) - class = &uart_lpc_class; - if (fdt_is_compatible(node, "ns16550")) - class = &uart_ns8250_class; - if (fdt_is_compatible(node, "arm,pl011")) - class = &uart_pl011_class; - if (fdt_is_compatible(node, "cadence,uart")) - class = &uart_cdnc_class; - - di->bas.chan = 0; - di->bas.regshft = (u_int)shift; - di->baudrate = br; - di->bas.rclk = (u_int)rclk; - di->ops = uart_getops(class); - di->databits = 8; - di->stopbits = 1; - di->parity = UART_PARITY_NONE; - di->bas.bst = uart_bus_space_mem; - - err = fdt_regsize(node, &start, &size); - if (err) - return (ENXIO); - err = fdt_get_range(OF_parent(node), 0, &pbase, &psize); - if (err) - pbase = 0; - - start += pbase; - - return (bus_space_map(di->bas.bst, start, size, 0, &di->bas.bsh)); -} Added: head/sys/dev/uart/uart_cpu_fdt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/dev/uart/uart_cpu_fdt.c Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,175 @@ +/*- + * Copyright (c) 2009-2010 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Semihalf under sponsorship from + * the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +/* + * UART console routines. + */ +bus_space_tag_t uart_bus_space_io; +bus_space_tag_t uart_bus_space_mem; + +static int +uart_fdt_get_clock(phandle_t node, pcell_t *cell) +{ + pcell_t clock; + + if ((OF_getprop(node, "clock-frequency", &clock, + sizeof(clock))) <= 0) + return (ENXIO); + + if (clock == 0) + /* Try to retrieve parent 'bus-frequency' */ + /* XXX this should go to simple-bus fixup or so */ + if ((OF_getprop(OF_parent(node), "bus-frequency", &clock, + sizeof(clock))) <= 0) + clock = 0; + + *cell = fdt32_to_cpu(clock); + return (0); +} + +static int +uart_fdt_get_shift(phandle_t node, pcell_t *cell) +{ + pcell_t shift; + + if ((OF_getprop(node, "reg-shift", &shift, sizeof(shift))) <= 0) + shift = 0; + *cell = fdt32_to_cpu(shift); + return (0); +} + +int +uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) +{ + + return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); +} + +int +uart_cpu_getdev(int devtype, struct uart_devinfo *di) +{ + char buf[64]; + struct uart_class *class; + phandle_t node, chosen; + pcell_t shift, br, rclk; + u_long start, size, pbase, psize; + int err; + + uart_bus_space_mem = fdtbus_bs_tag; + uart_bus_space_io = NULL; + + /* Allow overriding the FDT uning the environment. */ + class = &uart_ns8250_class; + err = uart_getenv(devtype, di, class); + if (!err) + return (0); + + if (devtype != UART_DEV_CONSOLE) + return (ENXIO); + + /* + * Retrieve /chosen/std{in,out}. + */ + if ((chosen = OF_finddevice("/chosen")) == -1) + return (ENXIO); + if (OF_getprop(chosen, "stdin", buf, sizeof(buf)) <= 0) + return (ENXIO); + if ((node = OF_finddevice(buf)) == -1) + return (ENXIO); + if (OF_getprop(chosen, "stdout", buf, sizeof(buf)) <= 0) + return (ENXIO); + if (OF_finddevice(buf) != node) + /* Only stdin == stdout is supported. */ + return (ENXIO); + /* + * Retrieve serial attributes. + */ + uart_fdt_get_shift(node, &shift); + + if (OF_getprop(node, "current-speed", &br, sizeof(br)) <= 0) + br = 0; + br = fdt32_to_cpu(br); + + if ((err = uart_fdt_get_clock(node, &rclk)) != 0) + return (err); + /* + * Finalize configuration. + */ + if (fdt_is_compatible(node, "fsl,imx-uart")) + class = &uart_imx_class; + if (fdt_is_compatible(node, "quicc")) + class = &uart_quicc_class; + if (fdt_is_compatible(node, "lpc")) + class = &uart_lpc_class; + if (fdt_is_compatible(node, "ns16550")) + class = &uart_ns8250_class; + if (fdt_is_compatible(node, "arm,pl011")) + class = &uart_pl011_class; + if (fdt_is_compatible(node, "cadence,uart")) + class = &uart_cdnc_class; + + di->bas.chan = 0; + di->bas.regshft = (u_int)shift; + di->baudrate = br; + di->bas.rclk = (u_int)rclk; + di->ops = uart_getops(class); + di->databits = 8; + di->stopbits = 1; + di->parity = UART_PARITY_NONE; + di->bas.bst = uart_bus_space_mem; + + err = fdt_regsize(node, &start, &size); + if (err) + return (ENXIO); + err = fdt_get_range(OF_parent(node), 0, &pbase, &psize); + if (err) + pbase = 0; + + start += pbase; + + return (bus_space_map(di->bas.bst, start, size, 0, &di->bas.bsh)); +} Modified: head/sys/i386/i386/machdep.c ============================================================================== --- head/sys/i386/i386/machdep.c Tue May 21 00:41:49 2013 (r250839) +++ head/sys/i386/i386/machdep.c Tue May 21 03:05:49 2013 (r250840) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include "opt_mp_watchdog.h" #include "opt_npx.h" #include "opt_perfmon.h" +#include "opt_platform.h" #include "opt_xbox.h" #include "opt_kdtrace.h" @@ -138,6 +139,9 @@ __FBSDID("$FreeBSD$"); #ifdef SMP #include #endif +#ifdef FDT +#include +#endif #ifdef DEV_APIC #include @@ -3113,6 +3117,10 @@ init386(first) cpu_probe_amdc1e(); cpu_probe_cmpxchg8b(); + +#ifdef FDT + x86_init_fdt(); +#endif } #endif Added: head/sys/i386/include/fdt.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/i386/include/fdt.h Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + */ +/* $FreeBSD$ */ + +#include Modified: head/sys/i386/include/metadata.h ============================================================================== --- head/sys/i386/include/metadata.h Tue May 21 00:41:49 2013 (r250839) +++ head/sys/i386/include/metadata.h Tue May 21 03:05:49 2013 (r250840) @@ -31,5 +31,6 @@ #define MODINFOMD_SMAP 0x1001 #define MODINFOMD_SMAP_XATTR 0x1002 +#define MODINFOMD_DTBP 0x1003 #endif /* !_MACHINE_METADATA_H_ */ Added: head/sys/i386/include/ofw_machdep.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/i386/include/ofw_machdep.h Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,6 @@ +/*- + * This file is in the public domain. + */ +/* $FreeBSD$ */ + +#include Added: head/sys/x86/include/fdt.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/x86/include/fdt.h Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,54 @@ +/*- + * Copyright (c) 2013 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _MACHINE_FDT_H_ +#define _MACHINE_FDT_H_ + +#include +#include + +/* Max interrupt number. */ +#define FDT_INTR_MAX NUM_IO_INTS + +/* Map phandle/intpin pair to global IRQ number */ +#define FDT_MAP_IRQ(node, pin) \ + (panic("%s: FDT_MAP_IRQ(%#x, %#x)", __func__, node, pin), -1) + +/* Bus space tag. XXX we only support I/O port space this way. */ +#define fdtbus_bs_tag X86_BUS_SPACE_IO + +struct mem_region { + vm_offset_t mr_start; + vm_size_t mr_size; +}; + +__BEGIN_DECLS +int x86_init_fdt(void); +__END_DECLS + +#endif /* _MACHINE_FDT_H_ */ Added: head/sys/x86/include/ofw_machdep.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/x86/include/ofw_machdep.h Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2013 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _MACHINE_OFW_MACHDEP_H_ +#define _MACHINE_OFW_MACHDEP_H_ + +#include + +typedef uint32_t cell_t; + +#endif /* _MACHINE_OFW_MACHDEP_H_ */ Added: head/sys/x86/x86/fdt_machdep.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/x86/x86/fdt_machdep.c Tue May 21 03:05:49 2013 (r250840) @@ -0,0 +1,77 @@ +/*- + * Copyright (c) 2013 Juniper Networks, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include "opt_platform.h" + +#include +#include +#include +#include + +#include +#include + +#include +#include + +int +x86_init_fdt(void) +{ + void *dtbp, *mdp; + int error; + + if (OF_install(OFW_FDT, 0) == FALSE) { + error = ENXIO; + goto out; + } + + mdp = preload_search_by_type("elf kernel"); + if (mdp == NULL) + mdp = preload_search_by_type("elf32 kernel"); + dtbp = (mdp != NULL) ? MD_FETCH(mdp, MODINFOMD_DTBP, void *) : NULL; + +#if defined(FDT_DTB_STATIC) + /* + * In case the device tree blob was not retrieved (from metadata) try + * to use the statically embedded one. + */ + if (dtbp == NULL) + dtbp = &fdt_static_dtb; +#endif + + if (dtbp == NULL) { + error = ENOENT; + goto out; + } + + error = OF_init(dtbp) ? ENXIO : 0; + + out: + return (error); +}