On 05.12.23 09:37, Sascha Hauer wrote:
> On Wed, Nov 29, 2023 at 07:17:55AM +0100, Ahmad Fatoum wrote:
>> In preparation for adding optional debugging code for the DMA mapping
>> API, move the definition out of the header file into a source file.
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
>> ---
>> drivers/dma/Makefile | 1 +
>> drivers/dma/map.c | 32 +++++++++++++++++++++++
>> include/dma.h | 61 ++++++++++++++------------------------------
>> 3 files changed, 52 insertions(+), 42 deletions(-)
>> create mode 100644 drivers/dma/map.c
>>
>> diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
>> index 8e1aac9f6f67..e45476c23f14 100644
>> --- a/drivers/dma/Makefile
>> +++ b/drivers/dma/Makefile
>> @@ -1,2 +1,3 @@
>> # SPDX-License-Identifier: GPL-2.0-only
>> +obj-$(CONFIG_HAS_DMA) += map.o
>> obj-$(CONFIG_MXS_APBH_DMA) += apbh_dma.o
>> diff --git a/drivers/dma/map.c b/drivers/dma/map.c
>> new file mode 100644
>> index 000000000000..270a4899fd05
>> --- /dev/null
>> +++ b/drivers/dma/map.c
>> @@ -0,0 +1,32 @@
>> +/* SPDX-License-Identifier: GPL-2.0-only */
>> +#include <dma.h>
>> +
>> +void dma_sync_single_for_cpu(struct device *dev, dma_addr_t address,
>> + size_t size, enum dma_data_direction dir)
>> +{
>> + void *ptr = dma_to_cpu(dev, address);
>> +
>> + arch_sync_dma_for_cpu(ptr, size, dir);
>> +}
>> +
>> +void dma_sync_single_for_device(struct device *dev, dma_addr_t address,
>> + size_t size, enum dma_data_direction dir)
>> +{
>> + void *ptr = dma_to_cpu(dev, address);
>> +
>> + arch_sync_dma_for_device(ptr, size, dir);
>> +}
>> +
>> +dma_addr_t dma_map_single(struct device *dev, void *ptr,
>> + size_t size, enum dma_data_direction dir)
>> +{
>> + arch_sync_dma_for_device(ptr, size, dir);
>> +
>> + return cpu_to_dma(dev, ptr);
>> +}
>> +
>> +void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,
>> + size_t size, enum dma_data_direction dir)
>> +{
>> + dma_sync_single_for_cpu(dev, dma_addr, size, dir);
>> +}
>> diff --git a/include/dma.h b/include/dma.h
>> index 2a09b747d1e2..6eef55a7325d 100644
>> --- a/include/dma.h
>> +++ b/include/dma.h
>> @@ -68,8 +68,6 @@ static inline void *dma_to_cpu(struct device *dev, dma_addr_t addr)
>> return phys_to_virt(addr);
>> }
>>
>> -#ifndef __PBL__
>> -/* streaming DMA - implement the below calls to support HAS_DMA */
>> #ifndef arch_sync_dma_for_cpu
>> void arch_sync_dma_for_cpu(void *vaddr, size_t size,
>> enum dma_data_direction dir);
>> @@ -79,57 +77,36 @@ void arch_sync_dma_for_cpu(void *vaddr, size_t size,
>> void arch_sync_dma_for_device(void *vaddr, size_t size,
>> enum dma_data_direction dir);
>> #endif
>> +
>> +#ifndef __PBL__
>> +void dma_sync_single_for_cpu(struct device *dev, dma_addr_t address,
>> + size_t size, enum dma_data_direction dir);
>> +
>> +void dma_sync_single_for_device(struct device *dev, dma_addr_t address,
>> + size_t size, enum dma_data_direction dir);
>> #else
>> -#ifndef arch_sync_dma_for_cpu
>> /*
>> * assumes buffers are in coherent/uncached memory, e.g. because
>> * MMU is only enabled in barebox_arm_entry which hasn't run yet.
>> */
>> -static inline void arch_sync_dma_for_cpu(void *vaddr, size_t size,
>> - enum dma_data_direction dir)
>> +static inline void dma_sync_single_for_cpu(void *vaddr, size_t size,
>> + enum dma_data_direction dir)
>> +{
>> + barrier_data(vaddr);
>> +}
>> +
>> +static inline void dma_sync_single_for_device(void *vaddr, size_t size,
>> + enum dma_data_direction dir)
>> {
>> barrier_data(vaddr);
>> }
>
> The prototypes are wrong here. Should be
>
> static inline void dma_sync_single_for_device(struct device *dev, dma_addr_t address,
> size_t size, enum dma_data_direction dir)
>
> Fixed this.
Thanks,
Ahmad
>
> Sascha
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
