Skip to content

Make bcm2835 DMA address handling less egregious #6658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 2 commits into from
Feb 7, 2025
Merged

Make bcm2835 DMA address handling less egregious #6658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
480c9f0
dma-direct: take dma-ranges/offsets into account in resource mapping
fancer Jun 10, 2022
d26d1a0
dmaengine: bcm2835: Use dma_map_resource
pelwell May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions drivers/dma/bcm2835-dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
* Copyright 2012 Marvell International Ltd.
*/
#include <linux/dmaengine.h>
#include <linux/dma-direct.h>
#include <linux/dma-mapping.h>
#include <linux/dmapool.h>
#include <linux/err.h>
Expand Down Expand Up @@ -1024,12 +1023,14 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg(
if (direction == DMA_DEV_TO_MEM) {
if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
return NULL;
src = phys_to_dma(chan->device->dev, c->cfg.src_addr);
src = dma_map_resource(chan->device->dev, DMA_SLAVE_BUSWIDTH_4_BYTES,
c->cfg.src_addr, DMA_FROM_DEVICE, 0);
info |= BCM2835_DMA_S_DREQ | BCM2835_DMA_D_INC;
} else {
if (c->cfg.dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
return NULL;
dst = phys_to_dma(chan->device->dev, c->cfg.dst_addr);
dst = dma_map_resource(chan->device->dev, DMA_SLAVE_BUSWIDTH_4_BYTES,
c->cfg.dst_addr, DMA_TO_DEVICE, 0);
info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
}

Expand Down Expand Up @@ -1099,13 +1100,15 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
if (direction == DMA_DEV_TO_MEM) {
if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
return NULL;
src = phys_to_dma(chan->device->dev, c->cfg.src_addr);
src = dma_map_resource(chan->device->dev, DMA_SLAVE_BUSWIDTH_4_BYTES,
c->cfg.src_addr, DMA_FROM_DEVICE, 0);
dst = buf_addr;
info |= BCM2835_DMA_S_DREQ | BCM2835_DMA_D_INC;
} else {
if (c->cfg.dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
return NULL;
dst = phys_to_dma(chan->device->dev, c->cfg.dst_addr);
dst = dma_map_resource(chan->device->dev, DMA_SLAVE_BUSWIDTH_4_BYTES,
c->cfg.dst_addr, DMA_TO_DEVICE, 0);
src = buf_addr;
info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;

Expand Down
2 changes: 1 addition & 1 deletion kernel/dma/direct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
size_t size, enum dma_data_direction dir, unsigned long attrs)
{
dma_addr_t dma_addr = paddr;
dma_addr_t dma_addr = phys_to_dma_direct(dev, paddr);

if (unlikely(!dma_capable(dev, dma_addr, size, false))) {
dev_err_once(dev,
Expand Down
Loading