linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 18/18] dmaengine: bcm2835: Revert the workaround for DMA addresses
Date: Fri, 24 May 2024 19:27:02 +0100	[thread overview]
Message-ID: <20240524182702.1317935-19-dave.stevenson@raspberrypi.com> (raw)
In-Reply-To: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com>

Now that all DMA clients are passing in CPU addresses, drop
the workaround that would accept those and not try mapping
them.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
 drivers/dma/bcm2835-dma.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 06407691ef28..181f2c291109 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -405,17 +405,6 @@ static int bcm2835_dma_map_slave_addr(struct dma_chan *chan,
 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
 	struct bcm2835_dma_chan_map *map = &c->map;
 
-	if ((dev_addr & 0xfe000000ULL) == 0x7e000000ULL) {
-		/*
-		 * Address is already in the 0x7e... peripherals range.
-		 * Assume this is an old client that hasn't been updated to
-		 * correctly pass a cpu phys_addr to the DMA subsystem.
-		 */
-		map->addr = dev_addr;
-
-		return 0;
-	}
-
 	if (dev_size != DMA_SLAVE_BUSWIDTH_4_BYTES)
 		return -EIO;
 
-- 
2.34.1


  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 ` [PATCH 13/18] arm: dt: Add dma-ranges to the bcm283x platforms Dave Stevenson
2024-06-05 12:23   ` 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 ` Dave Stevenson [this message]
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-19-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).