From owner-svn-src-all@freebsd.org Mon Dec 18 20:17:56 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E58EE83E47; Mon, 18 Dec 2017 20:17:56 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D98C56DBFC; Mon, 18 Dec 2017 20:17:55 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBIKHsmc086002; Mon, 18 Dec 2017 20:17:54 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBIKHsp9085998; Mon, 18 Dec 2017 20:17:54 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201712182017.vBIKHsp9085998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Mon, 18 Dec 2017 20:17:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r326951 - in stable/11/sys: boot/fdt/dts/arm conf modules/dtb/rpi X-SVN-Group: stable-11 X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in stable/11/sys: boot/fdt/dts/arm conf modules/dtb/rpi X-SVN-Commit-Revision: 326951 X-SVN-Commit-Repository: base 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.25 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: Mon, 18 Dec 2017 20:17:56 -0000 Author: manu Date: Mon Dec 18 20:17:54 2017 New Revision: 326951 URL: https://svnweb.freebsd.org/changeset/base/326951 Log: MFC r312914, r322694 r312914 by imp: Honor LINKS=x y in dtb modules. We need this for compatibility links for old, FreeBSD names. r322694: RPI DTS: Add value previously set by VideoCore and DTB links Using latest U-Boot for RPI 1 or 2 the DTB loaded by the firmware is discarded. The DTB was previously patched by the firmware to contain the DMA channel mask. DTB provided by the rpi firmware or DTS in the Linux tree contain the raw value directly. Do the same for our DTS as we cannot switch to the upstream ones yet. Not having the DMA channel mask setup properly cause mmc not to be detected (and probably other problems on driver using DMA). Also, add links for rpi dtb to the name used by u-boot. This way the dtb can be loaded by ubldr using the U-Boot env variable fdtfile. Tested On: RPI B Rev2, RPI Zero, RPI 2 v1.1 RPI 2 v1.2 Thanks to Sylvain Garrigues for the help. PR: 218344 Modified: stable/11/sys/boot/fdt/dts/arm/bcm2835.dtsi stable/11/sys/boot/fdt/dts/arm/bcm2836.dtsi stable/11/sys/conf/dtb.mk stable/11/sys/modules/dtb/rpi/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/boot/fdt/dts/arm/bcm2835.dtsi ============================================================================== --- stable/11/sys/boot/fdt/dts/arm/bcm2835.dtsi Mon Dec 18 20:12:43 2017 (r326950) +++ stable/11/sys/boot/fdt/dts/arm/bcm2835.dtsi Mon Dec 18 20:17:54 2017 (r326951) @@ -431,7 +431,7 @@ interrupts = <24 25 26 27 28 29 30 31 32 33 34 35 36>; interrupt-parent = <&intc>; - broadcom,channels = <0>; /* Set by VideoCore */ + broadcom,channels = <0x7f35>; }; vc_mbox: mbox { Modified: stable/11/sys/boot/fdt/dts/arm/bcm2836.dtsi ============================================================================== --- stable/11/sys/boot/fdt/dts/arm/bcm2836.dtsi Mon Dec 18 20:12:43 2017 (r326950) +++ stable/11/sys/boot/fdt/dts/arm/bcm2836.dtsi Mon Dec 18 20:17:54 2017 (r326951) @@ -424,7 +424,7 @@ interrupts = <24 25 26 27 28 29 30 31 32 33 34 35 36>; interrupt-parent = <&intc>; - broadcom,channels = <0>; /* Set by VideoCore */ + broadcom,channels = <0x7f35>; }; vc_mbox: mbox { Modified: stable/11/sys/conf/dtb.mk ============================================================================== --- stable/11/sys/conf/dtb.mk Mon Dec 18 20:12:43 2017 (r326950) +++ stable/11/sys/conf/dtb.mk Mon Dec 18 20:17:54 2017 (r326951) @@ -76,3 +76,4 @@ _dtbinstall: .include .include +.include Modified: stable/11/sys/modules/dtb/rpi/Makefile ============================================================================== --- stable/11/sys/modules/dtb/rpi/Makefile Mon Dec 18 20:12:43 2017 (r326950) +++ stable/11/sys/modules/dtb/rpi/Makefile Mon Dec 18 20:17:54 2017 (r326951) @@ -2,4 +2,11 @@ # DTS files for the Raspberry Pi-B DTS=rpi.dts rpi2.dts +LINKS= \ + ${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-b.dtb \ + ${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-b-rev2.dtb \ + ${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-b-plus.dtb \ + ${DTBDIR}/rpi.dtb ${DTBDIR}/bcm2835-rpi-zero.dtb \ + ${DTBDIR}/rpi2.dtb ${DTBDIR}/bcm2836-rpi-2-b.dtb + .include