raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

spi: bcm2835: Use phys addresses for slave DMA config

Browse Source 
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 <phil@raspberrypi.com>
This commit is contained in:
Phil Elwell
2023-05-11 16:27:06 +01:00
committed by Dom Cobley
parent 0cfa290453
commit 759b8a0a02
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/spi/spi-bcm2835.c
View File

@@ -119,6 +119,7 @@ MODULE_PARM_DESC(polling_limit_us,
*/ */
struct bcm2835_spi { struct bcm2835_spi {
void __iomem *regs; void __iomem *regs;
phys_addr_t phys_addr;
struct clk *clk; struct clk *clk;
struct gpio_desc *cs_gpio; struct gpio_desc *cs_gpio;
unsigned long clk_hz; 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 bcm2835_spi *bs)
{ {
struct dma_slave_config slave_config; struct dma_slave_config slave_config;
const __be32 *addr;
dma_addr_t dma_reg_base;
int ret; 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 */ /* get tx/rx dma */
ctlr->dma_tx = dma_request_chan(dev, "tx"); ctlr->dma_tx = dma_request_chan(dev, "tx");
if (IS_ERR(ctlr->dma_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 * or, in case of an RX-only transfer, cyclically copies from the zero
* page to the FIFO using a preallocated, reusable descriptor. * 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; slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
ret = dmaengine_slave_config(ctlr->dma_tx, &slave_config); 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 * RX FIFO or, in case of a TX-only transfer, cyclically writes a
* precalculated value to the CS register to clear the RX FIFO. * 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.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; slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
ret = dmaengine_slave_config(ctlr->dma_rx, &slave_config); ret = dmaengine_slave_config(ctlr->dma_rx, &slave_config);
@@ -1360,6 +1350,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
{ {
struct spi_controller *ctlr; struct spi_controller *ctlr;
struct bcm2835_spi *bs; struct bcm2835_spi *bs;
struct resource *iomem;
int err; int err;
ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*bs)); ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*bs));
@@ -1383,10 +1374,11 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
bs = spi_controller_get_devdata(ctlr); bs = spi_controller_get_devdata(ctlr);
bs->ctlr = 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)) if (IS_ERR(bs->regs))
return PTR_ERR(bs->regs); return PTR_ERR(bs->regs);
bs->phys_addr = iomem->start;
bs->clk = devm_clk_get_enabled(&pdev->dev, NULL); bs->clk = devm_clk_get_enabled(&pdev->dev, NULL);
if (IS_ERR(bs->clk)) if (IS_ERR(bs->clk))
return dev_err_probe(&pdev->dev, PTR_ERR(bs->clk), return dev_err_probe(&pdev->dev, PTR_ERR(bs->clk),