Skip to content

drivers/dma: dw-axi-dmac-starfive: Remove calls specific to ARM64 ACPI #27

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

Closed
wants to merge 1 commit into from
Closed

drivers/dma: dw-axi-dmac-starfive: Remove calls specific to ARM64 ACPI #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 2 additions & 14 deletions drivers/dma/dw-axi-dmac-starfive/starfive_dmaengine_memcpy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ int dw_dma_async_do_memcpy(void *src, void *dst, size_t size)
dma_addr_t src_dma, dst_dma;
struct dma_async_tx_descriptor *desc;

const struct iommu_ops *iommu;
u64 dma_addr = 0, dma_size = 0;

dma_dev = kzalloc(sizeof(*dma_dev), GFP_KERNEL);
Expand All @@ -149,12 +148,7 @@ int dw_dma_async_do_memcpy(void *src, void *dst, size_t size)
dma_dev->bus = NULL;
dma_dev->coherent_dma_mask = 0xffffffff;

iort_dma_setup(dma_dev, &dma_addr, &dma_size);
iommu = iort_iommu_configure_id(dma_dev, NULL);
if (PTR_ERR(iommu) == -EPROBE_DEFER)
return -EPROBE_DEFER;

arch_setup_dma_ops(dma_dev, dst_dma, dma_size, iommu, true);
arch_setup_dma_ops(dma_dev, dst_dma, dma_size, NULL, true);

if(_dma_async_alloc_buf(dma_dev, &src, &dst, size, &src_dma, &dst_dma)) {
dev_err(dma_dev, "Err alloc.\n");
Expand Down Expand Up @@ -207,7 +201,6 @@ int dw_dma_memcpy_raw(dma_addr_t src_dma, dma_addr_t dst_dma, size_t size)
struct device *dma_dev;
struct dma_async_tx_descriptor *desc;

const struct iommu_ops *iommu;
u64 dma_addr = 0, dma_size = 0;

dma_dev = kzalloc(sizeof(*dma_dev), GFP_KERNEL);
Expand All @@ -219,12 +212,7 @@ int dw_dma_memcpy_raw(dma_addr_t src_dma, dma_addr_t dst_dma, size_t size)
dma_dev->bus = NULL;
dma_dev->coherent_dma_mask = 0xffffffff;

iort_dma_setup(dma_dev, &dma_addr, &dma_size);
iommu = iort_iommu_configure_id(dma_dev, NULL);
if (PTR_ERR(iommu) == -EPROBE_DEFER)
return -EPROBE_DEFER;

arch_setup_dma_ops(dma_dev, dst_dma, dma_size, iommu, true);
arch_setup_dma_ops(dma_dev, dst_dma, dma_size, NULL, true);

chan = _dma_get_channel(DMA_MEMCPY);
if(!chan){
Expand Down