From patchwork Fri May 24 18:26:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13673533 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80258C25B79 for ; Fri, 24 May 2024 18:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=niGdAxzITfPdNsiqyrJnwmUcVTLeOVv83V/7sovdHkI=; b=csNJ9AFpP7Ssl1 bxlRrXlyhQgK/PQgy6MaEEVSqnIwrWc8pPKjjDScC9nA2Bo+EEBQQV6OywtLd5P6oaF3SXg0TAWW7 X6rpWNdp/h/uHOxXOmjiznH4LcFJYePjW81YkguM77tTQEQ9mHRPQYR/XzOLKeLG5cK/qERtWbi5W bHcvruW3C6aQbqId8OF7Kz41Lx5OvuZEzFsWMchojg5JmYwFVOLhby2/I2xgMcdCJmhjNAzfC45CZ gkH9uMGkCiazPLdwI904wact4NpiPV6COqAMWQmsz5GXYk0BxTi6jniftJ7T7RrtSJGf1yybcy12I e95+yroAoX57YoVOI+Pg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZgX-00000009avo-3n3L; Fri, 24 May 2024 18:30:33 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZeF-00000009ZKM-0mim for linux-arm-kernel@bombadil.infradead.org; Fri, 24 May 2024 18:28:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=FGCf1ir0ewKxnfYL+8Y6zr0drR+R4O1jhqT1oluTBL8=; b=N9IPDPYsOy3/TKnNqXyjbOi7FH QqTE52y2vI8F7t9RS4gLHQA9ofDgNvWL9XbUoawAZ1dI1T42XrE51qRh5butLxlEx2/VlU1F0xw7j j6l+Q3oQTVuAXPEpp87b4kuZE2WrwP03bckhg7JBbXnEu92H7adZ/hy6yxUH/izCdTMd/BccRDTE3 YhmIFjbRaBSIlDqrsjUv8Xwl+EhuSySbwXgnuSFddeMcp8VdQt9jn+4Y+Xh6KVtEg6Y9AqUzxBSBZ 63GBQ7ogdM1xJwbtIsadZKzTwEbtjqT6a9NbWutLwd03Nck8vEO2wbdm2FClVm1s+IoIeW2tBt4B3 AFn58XVQ==; Received: from mail-wm1-x361.google.com ([2a00:1450:4864:20::361]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZe5-00000009vJx-3J0P for linux-arm-kernel@lists.infradead.org; Fri, 24 May 2024 18:28:09 +0000 Received: by mail-wm1-x361.google.com with SMTP id 5b1f17b1804b1-42011507a57so70353245e9.1 for ; Fri, 24 May 2024 11:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1716575280; x=1717180080; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FGCf1ir0ewKxnfYL+8Y6zr0drR+R4O1jhqT1oluTBL8=; b=HbRWp3kgZ2Vxh7s0OOlNFHITeruU4bQ8woUbhwTr1V97EHUGCzA+zt3ikhf6KZPrzM 6VDOVVrEMY80LtTpP7BEeGhIxDUGdJxOh50FFDpHrj7Xk6TGVGn6EiLp8lIGJm61Hqfh N4aR8I/IyB41iOWFHVcHVZore/IFdGnX8spqJYOirp2ECseiZp7ohRw6sjjmT1pyjs3d gqexrcb2F/17GyokqyyBa36GxAvxhE4fXcGjkf3xQmSFI8Glxc7DKqZxDzp9ErmBfXjv AxEZx2miMPyd37ZoQE00ge07fJKMHID7jeiBny+o5MC4iGJ4vabiKamS+Fopv1/iDKUg HL0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716575280; x=1717180080; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FGCf1ir0ewKxnfYL+8Y6zr0drR+R4O1jhqT1oluTBL8=; b=FcrsiobLSUoHWFD4iDU2NHmMU+rh9+5XR5a8cD/tcX3VTJCt4ZxasxAcZTqrxzbusU QoqBG71DR/3H4ZDVl/VGeW9v2C9uhEnXJMWO3FoTH3TykLz3SbAGY7nnoMAZImHWS3+p xi7gtCHNU8XpjGKyJm7j4PtYFwQN4ihS0GOQMCi8oar4Vpdk57yIzFBpZdGPNJkik6zt 2r0HhiPvrsxzL4dkNduJ4jJv1k7G2wVBa0ltmLwPNBOVflyCP2fkxqkm2PZqO+YEDWOx DRKet/bVyLMv5PeL1nYPn0b4WwlcwL7XQD+D6LE9UPlC7Dg1o+tGScP30GKcljz5/Ugl pC0w== X-Forwarded-Encrypted: i=1; AJvYcCVduGGd4bAhdIIk2jZqL2N+TinXKsp2aw4KjO3xbUAU7VJ9MvjPoI6xLBjX5JeqqIkoLXBYKkkpoQqz/LBsE80xJrExMP0ORnn7FfnKgDajLsIzclA= X-Gm-Message-State: AOJu0Yzw4Gf4UcrMPL0Nkkq6MvZCZYQFpRYXKov23DpscaMaLA4QU+tI sPIEr2ojSwsPLgXHfn3t72IHrlM1+XRcDEdeuNWCMNsGMXfDhcdSjTnnn7rX7EszYD67g1Pvvf1 qWqHLItJGPrBYK2ibLVmQ1MPIlmvgj2Xb X-Google-Smtp-Source: AGHT+IHAQFzXjWnTl+TwMEnEF3wypw9s7LeiM71e7MxN0zWKYR44rUnrOPV4U43jDFBiNTbbJuux8HJQ65dC X-Received: by 2002:a05:600c:1381:b0:41f:b0e7:f299 with SMTP id 5b1f17b1804b1-42108a59292mr20514315e9.9.1716575280074; Fri, 24 May 2024 11:28:00 -0700 (PDT) Received: from raspberrypi.com ([188.39.149.98]) by smtp-relay.gmail.com with ESMTPS id 5b1f17b1804b1-42100fa9eb7sm5393305e9.34.2024.05.24.11.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 11:28:00 -0700 (PDT) X-Relaying-Domain: raspberrypi.com From: Dave Stevenson To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Vinod Koul , Maxime Ripard , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Ulf Hansson , Mark Brown , Christoph Hellwig , Marek Szyprowski , Robin Murphy , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Vladimir Murzin , Phil Elwell , Stefan Wahren , Serge Semin 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 Subject: [PATCH 15/18] spi: bcm2835: Use phys addresses for slave DMA config Date: Fri, 24 May 2024 19:26:59 +0100 Message-Id: <20240524182702.1317935-16-dave.stevenson@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> References: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240524_192802_236051_387630DD X-CRM114-Status: GOOD ( 17.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Phil Elwell Contrary to what struct snd_dmaengine_dai_dma_data suggests, the configuration of addresses of DMA slave interfaces should be done in CPU physical addresses. Signed-off-by: Phil Elwell Signed-off-by: Dave Stevenson --- drivers/spi/spi-bcm2835.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index e1b9b1235787..e8242e0c4246 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -119,6 +119,7 @@ MODULE_PARM_DESC(polling_limit_us, */ struct bcm2835_spi { void __iomem *regs; + phys_addr_t phys_addr; struct clk *clk; struct gpio_desc *cs_gpio; unsigned long clk_hz; @@ -891,19 +892,8 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev, struct bcm2835_spi *bs) { struct dma_slave_config slave_config; - const __be32 *addr; - dma_addr_t dma_reg_base; int ret; - /* base address in dma-space */ - addr = of_get_address(ctlr->dev.of_node, 0, NULL, NULL); - if (!addr) { - dev_err(dev, "could not get DMA-register address - not using dma mode\n"); - /* Fall back to interrupt mode */ - return 0; - } - dma_reg_base = be32_to_cpup(addr); - /* get tx/rx dma */ ctlr->dma_tx = dma_request_chan(dev, "tx"); if (IS_ERR(ctlr->dma_tx)) { @@ -925,7 +915,7 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev, * or, in case of an RX-only transfer, cyclically copies from the zero * page to the FIFO using a preallocated, reusable descriptor. */ - slave_config.dst_addr = (u32)(dma_reg_base + BCM2835_SPI_FIFO); + slave_config.dst_addr = bs->phys_addr + BCM2835_SPI_FIFO; slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ret = dmaengine_slave_config(ctlr->dma_tx, &slave_config); @@ -964,9 +954,9 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev, * RX FIFO or, in case of a TX-only transfer, cyclically writes a * precalculated value to the CS register to clear the RX FIFO. */ - slave_config.src_addr = (u32)(dma_reg_base + BCM2835_SPI_FIFO); + slave_config.src_addr = bs->phys_addr + BCM2835_SPI_FIFO; slave_config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; - slave_config.dst_addr = (u32)(dma_reg_base + BCM2835_SPI_CS); + slave_config.dst_addr = bs->phys_addr + BCM2835_SPI_CS; slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; ret = dmaengine_slave_config(ctlr->dma_rx, &slave_config); @@ -1336,6 +1326,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) { struct spi_controller *ctlr; struct bcm2835_spi *bs; + struct resource *iomem; int err; ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*bs)); @@ -1359,10 +1350,12 @@ static int bcm2835_spi_probe(struct platform_device *pdev) bs = spi_controller_get_devdata(ctlr); bs->ctlr = ctlr; - bs->regs = devm_platform_ioremap_resource(pdev, 0); + bs->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &iomem); if (IS_ERR(bs->regs)) return PTR_ERR(bs->regs); + bs->phys_addr = iomem->start; + bs->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(bs->clk)) return dev_err_probe(&pdev->dev, PTR_ERR(bs->clk),