From: Dave Stevenson <dave.stevenson@raspberrypi.com>
To: Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Florian Fainelli <florian.fainelli@broadcom.com>,
Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
Vinod Koul <vkoul@kernel.org>, Maxime Ripard <mripard@kernel.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Ulf Hansson <ulf.hansson@linaro.org>,
Mark Brown <broonie@kernel.org>, Christoph Hellwig <hch@lst.de>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Robin Murphy <robin.murphy@arm.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Vladimir Murzin <vladimir.murzin@arm.com>,
Phil Elwell <phil@raspberrypi.com>,
Stefan Wahren <wahrenst@gmx.net>,
Serge Semin <Sergey.Semin@baikalelectronics.ru>
Cc: devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-mmc@vger.kernel.org,
linux-spi@vger.kernel.org, iommu@lists.linux.dev,
linux-sound@vger.kernel.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>
Subject: [PATCH 13/18] arm: dt: Add dma-ranges to the bcm283x platforms
Date: Fri, 24 May 2024 19:26:57 +0100 [thread overview]
Message-ID: <20240524182702.1317935-14-dave.stevenson@raspberrypi.com> (raw)
In-Reply-To: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com>
In order to use the dma_map_resource for mappings, add the
dma-ranges to the relevant DT files.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
arch/arm/boot/dts/broadcom/bcm2711.dtsi | 12 ++++++++++--
arch/arm/boot/dts/broadcom/bcm2835.dtsi | 3 ++-
arch/arm/boot/dts/broadcom/bcm2836.dtsi | 3 ++-
arch/arm/boot/dts/broadcom/bcm2837.dtsi | 3 ++-
4 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
index d64bf098b697..d6f32d32b456 100644
--- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
@@ -42,7 +42,8 @@ soc {
<0x7c000000 0x0 0xfc000000 0x02000000>,
<0x40000000 0x0 0xff800000 0x00800000>;
/* Emulate a contiguous 30-bit address range for DMA */
- dma-ranges = <0xc0000000 0x0 0x00000000 0x40000000>;
+ dma-ranges = <0xc0000000 0x0 0x00000000 0x40000000>,
+ <0x7c000000 0x0 0xfc000000 0x03800000>;
/*
* This node is the provider for the enable-method for
@@ -550,7 +551,14 @@ scb {
#size-cells = <1>;
ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>,
- <0x6 0x00000000 0x6 0x00000000 0x40000000>;
+ <0x0 0x40000000 0x0 0xff800000 0x00800000>,
+ <0x6 0x00000000 0x6 0x00000000 0x40000000>,
+ <0x0 0x00000000 0x0 0x00000000 0xfc000000>;
+ dma-ranges = <0x4 0x7c000000 0x0 0xfc000000 0x03800000>,
+ <0x0 0x00000000 0x0 0x00000000 0x80000000>,
+ <0x0 0x80000000 0x0 0x80000000 0x80000000>,
+ <0x1 0x00000000 0x1 0x00000000 0x80000000>,
+ <0x1 0x80000000 0x1 0x80000000 0x80000000>;
pcie0: pcie@7d500000 {
compatible = "brcm,bcm2711-pcie";
diff --git a/arch/arm/boot/dts/broadcom/bcm2835.dtsi b/arch/arm/boot/dts/broadcom/bcm2835.dtsi
index 15cb331febbb..480e12fd8a17 100644
--- a/arch/arm/boot/dts/broadcom/bcm2835.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2835.dtsi
@@ -35,7 +35,8 @@ cpu@0 {
soc {
ranges = <0x7e000000 0x20000000 0x02000000>;
- dma-ranges = <0x40000000 0x00000000 0x20000000>;
+ dma-ranges = <0x80000000 0x00000000 0x20000000>,
+ <0x7e000000 0x20000000 0x02000000>;
};
arm-pmu {
diff --git a/arch/arm/boot/dts/broadcom/bcm2836.dtsi b/arch/arm/boot/dts/broadcom/bcm2836.dtsi
index 783fe624ba68..4ab7769c056a 100644
--- a/arch/arm/boot/dts/broadcom/bcm2836.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2836.dtsi
@@ -8,7 +8,8 @@ / {
soc {
ranges = <0x7e000000 0x3f000000 0x1000000>,
<0x40000000 0x40000000 0x00001000>;
- dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
+ dma-ranges = <0xc0000000 0x00000000 0x3f000000>,
+ <0x7e000000 0x3f000000 0x01000000>;
local_intc: interrupt-controller@40000000 {
compatible = "brcm,bcm2836-l1-intc";
diff --git a/arch/arm/boot/dts/broadcom/bcm2837.dtsi b/arch/arm/boot/dts/broadcom/bcm2837.dtsi
index 84c08b46519d..d034d6a8caad 100644
--- a/arch/arm/boot/dts/broadcom/bcm2837.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2837.dtsi
@@ -7,7 +7,8 @@ / {
soc {
ranges = <0x7e000000 0x3f000000 0x1000000>,
<0x40000000 0x40000000 0x00001000>;
- dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
+ dma-ranges = <0xc0000000 0x00000000 0x3f000000>,
+ <0x7e000000 0x3f000000 0x01000000>;
local_intc: local_intc@40000000 {
compatible = "brcm,bcm2836-l1-intc";
--
2.34.1
next prev parent reply other threads:[~2024-05-24 18:28 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-24 18:26 [PATCH 00/18] BCM2835 DMA mapping cleanups and fixes Dave Stevenson
2024-05-24 18:26 ` [PATCH 01/18] dma-direct: take dma-ranges/offsets into account in resource mapping Dave Stevenson
2024-05-28 6:33 ` Christoph Hellwig
2024-06-25 16:21 ` Dave Stevenson
2024-05-24 18:26 ` [PATCH 02/18] dmaengine: bcm2835: Support common dma-channel-mask Dave Stevenson
2024-06-05 15:52 ` Frank Li
2024-05-24 18:26 ` [PATCH 03/18] ARM: dts: bcm283x: Update to use dma-channel-mask Dave Stevenson
2024-06-05 12:22 ` Florian Fainelli
2024-05-24 18:26 ` [PATCH 04/18] dmaengine: bcm2835: move CB info generation into separate function Dave Stevenson
2024-06-05 16:05 ` Frank Li
2024-05-24 18:26 ` [PATCH 05/18] dmaengine: bcm2835: move CB final extra info generation into function Dave Stevenson
2024-06-05 16:18 ` Frank Li
2024-05-24 18:26 ` [PATCH 06/18] dmaengine: bcm2835: make address increment platform independent Dave Stevenson
2024-06-05 17:52 ` Frank Li
2024-06-24 17:47 ` Dave Stevenson
2024-05-24 18:26 ` [PATCH 07/18] dmaengine: bcm2385: drop info parameters Dave Stevenson
2024-06-05 18:00 ` Frank Li
2024-05-24 18:26 ` [PATCH 08/18] dmaengine: bcm2835: pass dma_chan to generic functions Dave Stevenson
2024-06-05 18:05 ` Frank Li
2024-06-24 18:10 ` Dave Stevenson
2024-05-24 18:26 ` [PATCH 09/18] dmaengine: bcm2835: Add function to handle DMA mapping Dave Stevenson
2024-06-05 18:13 ` Frank Li
2024-06-24 18:27 ` Dave Stevenson
2024-05-24 18:26 ` [PATCH 10/18] dmaengine: bcm2835: Add backwards compatible handling until clients updated Dave Stevenson
2024-05-24 18:26 ` [PATCH 11/18] dmaengine: bcm2835: Use dma_map_resource to map addresses Dave Stevenson
2024-06-05 18:22 ` Frank Li
2024-05-24 18:26 ` [PATCH 12/18] dmaengine: bcm2835: Read ranges if dma-ranges aren't mapped Dave Stevenson
2024-05-24 18:26 ` Dave Stevenson [this message]
2024-06-05 12:23 ` [PATCH 13/18] arm: dt: Add dma-ranges to the bcm283x platforms Florian Fainelli
2024-05-24 18:26 ` [PATCH 14/18] mmc: bcm2835: Use phys addresses for slave DMA config Dave Stevenson
2024-05-24 18:26 ` [PATCH 15/18] spi: " Dave Stevenson
2024-05-24 18:27 ` [PATCH 16/18] drm/vc4: " Dave Stevenson
2024-06-05 18:28 ` Frank Li
2024-05-24 18:27 ` [PATCH 17/18] ASoC: bcm2835-i2s: Use phys addresses for DAI DMA Dave Stevenson
2024-05-24 18:27 ` [PATCH 18/18] dmaengine: bcm2835: Revert the workaround for DMA addresses Dave Stevenson
2024-06-05 12:24 ` [PATCH 00/18] BCM2835 DMA mapping cleanups and fixes Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240524182702.1317935-14-dave.stevenson@raspberrypi.com \
--to=dave.stevenson@raspberrypi.com \
--cc=Sergey.Semin@baikalelectronics.ru \
--cc=airlied@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=florian.fainelli@broadcom.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux.dev \
--cc=krzk+dt@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-sound@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=perex@perex.cz \
--cc=phil@raspberrypi.com \
--cc=rjui@broadcom.com \
--cc=robh@kernel.org \
--cc=robin.murphy@arm.com \
--cc=sbranden@broadcom.com \
--cc=tiwai@suse.com \
--cc=tzimmermann@suse.de \
--cc=ulf.hansson@linaro.org \
--cc=vkoul@kernel.org \
--cc=vladimir.murzin@arm.com \
--cc=wahrenst@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).