From owner-svn-src-all@freebsd.org Sat Aug 19 17:00:54 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 821D7DD4836; Sat, 19 Aug 2017 17:00:54 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.blih.net", Issuer "mail.blih.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id BC66B81778; Sat, 19 Aug 2017 17:00:53 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) by mail.blih.net (OpenSMTPD) with ESMTP id 94f204b5; Sat, 19 Aug 2017 19:00:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bidouilliste.com; h=date :from:to:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=mail; bh=lWHP3hnZTgLM vwfEHY72uO0r1zE=; b=K5wzMMeMWkN4aMACymE9eP7J0ICCRq/f2Ok9PxySsFC9 vBumhZ7U7ONhfBLZb0oqo8o5P5zSt34o+92MAWb8G82flDjwoJzRuqfg6PNdLCLj VJuAKTS+r/5uOMnzyumcYTWrM4l23/sqJfVZsNLGnNukyy5EnkN7Pp0Xp132q3A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=bidouilliste.com; h=date :from:to:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=mail; b=alTRPv JC1GzxdSJHZyIfOQM0bnibNl+Kp6vCpogKI2/MIe59OV2xSDLiVwFQPxl2SaKVEJ leFyLFDMZrj2QlKSsVXVUy6Xra+XXv+YZF9Y1NIIvZfjKZx5dVA+gLGbhKcz2cFl NjBZ23KjfH/UFRRARaD6YRfSnm5vF57nzKKx4= Received: from knuckles.blih.net (ip-54.net-82-216-203.roubaix.rev.numericable.fr [82.216.203.54]) by mail.blih.net (OpenSMTPD) with ESMTPSA id 6b90dd84 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 19 Aug 2017 19:00:44 +0200 (CEST) Date: Sat, 19 Aug 2017 19:00:40 +0200 From: Emmanuel Vadot To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r322694 - in head/sys: boot/fdt/dts/arm modules/dtb/rpi Message-Id: <20170819190040.e9b7e90fd5a158ed439ff952@bidouilliste.com> In-Reply-To: <201708191427.v7JERBvn057518@repo.freebsd.org> References: <201708191427.v7JERBvn057518@repo.freebsd.org> X-Mailer: Sylpheed 3.6.0 (GTK+ 2.24.31; amd64-portbld-freebsd12.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 19 Aug 2017 17:00:54 -0000 On Sat, 19 Aug 2017 14:27:11 +0000 (UTC) Emmanuel Vadot wrote: > Author: manu > Date: Sat Aug 19 14:27:11 2017 > New Revision: 322694 > URL: https://svnweb.freebsd.org/changeset/base/322694 > > Log: > 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 MFC after: 3 days > Modified: > head/sys/boot/fdt/dts/arm/bcm2835.dtsi > head/sys/boot/fdt/dts/arm/bcm2836.dtsi > head/sys/modules/dtb/rpi/Makefile > > Modified: head/sys/boot/fdt/dts/arm/bcm2835.dtsi > ============================================================================== > --- head/sys/boot/fdt/dts/arm/bcm2835.dtsi Sat Aug 19 12:14:46 2017 (r322693) > +++ head/sys/boot/fdt/dts/arm/bcm2835.dtsi Sat Aug 19 14:27:11 2017 (r322694) > @@ -439,7 +439,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: head/sys/boot/fdt/dts/arm/bcm2836.dtsi > ============================================================================== > --- head/sys/boot/fdt/dts/arm/bcm2836.dtsi Sat Aug 19 12:14:46 2017 (r322693) > +++ head/sys/boot/fdt/dts/arm/bcm2836.dtsi Sat Aug 19 14:27:11 2017 (r322694) > @@ -432,7 +432,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: head/sys/modules/dtb/rpi/Makefile > ============================================================================== > --- head/sys/modules/dtb/rpi/Makefile Sat Aug 19 12:14:46 2017 (r322693) > +++ head/sys/modules/dtb/rpi/Makefile Sat Aug 19 14:27:11 2017 (r322694) > @@ -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 -- Emmanuel Vadot