[PATCH] fixup! dma: give dma_alloc_coherent a device parameter

[PATCH] fixup! dma: give dma_alloc_coherent a device parameter

[Ahmad Fatoum]

Should've been part of the original patch.
This fixes CI failure for ARM64.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/cpu/mmu_64.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c
index 94a19b1aec3c..bc1a44d0a7b8 100644
--- a/arch/arm/cpu/mmu_64.c
+++ b/arch/arm/cpu/mmu_64.c
@@ -390,9 +390,9 @@ void dma_flush_range(void *ptr, size_t size)
 	v8_flush_dcache_range(start, end);
 }
 
-void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle)
+void *dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *dma_handle)
 {
-	return dma_alloc_map(size, dma_handle, ARCH_MAP_WRITECOMBINE);
+	return dma_alloc_map(dev, size, dma_handle, ARCH_MAP_WRITECOMBINE);
 }
 
 static void init_range(size_t total_level0_tables)
-- 
2.39.5

Re: [PATCH] fixup! dma: give dma_alloc_coherent a device parameter

[Sascha Hauer]

On Tue, Oct 15, 2024 at 10:20:29AM +0200, Ahmad Fatoum wrote:
> Should've been part of the original patch.
> This fixes CI failure for ARM64.

The patch you are fixing here doesn't apply on any of my for-next
branches. I'll drop it for now and apply it right after the next release
instead.

Sascha

> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/arm/cpu/mmu_64.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c
> index 94a19b1aec3c..bc1a44d0a7b8 100644
> --- a/arch/arm/cpu/mmu_64.c
> +++ b/arch/arm/cpu/mmu_64.c
> @@ -390,9 +390,9 @@ void dma_flush_range(void *ptr, size_t size)
>  	v8_flush_dcache_range(start, end);
>  }
>  
> -void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle)
> +void *dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *dma_handle)
>  {
> -	return dma_alloc_map(size, dma_handle, ARCH_MAP_WRITECOMBINE);
> +	return dma_alloc_map(dev, size, dma_handle, ARCH_MAP_WRITECOMBINE);
>  }
>  
>  static void init_range(size_t total_level0_tables)
> -- 
> 2.39.5
> 
> 
> 

-- 
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 |

Re: [PATCH] fixup! dma: give dma_alloc_coherent a device parameter

[Ahmad Fatoum]

On 15.10.24 10:31, Sascha Hauer wrote:
> On Tue, Oct 15, 2024 at 10:20:29AM +0200, Ahmad Fatoum wrote:
>> Should've been part of the original patch.
>> This fixes CI failure for ARM64.
> 
> The patch you are fixing here doesn't apply on any of my for-next
> branches. I'll drop it for now and apply it right after the next release
> instead.

Sure, no problem.

Thanks,
Ahmad

> 
> Sascha
> 
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>> ---
>>  arch/arm/cpu/mmu_64.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c
>> index 94a19b1aec3c..bc1a44d0a7b8 100644
>> --- a/arch/arm/cpu/mmu_64.c
>> +++ b/arch/arm/cpu/mmu_64.c
>> @@ -390,9 +390,9 @@ void dma_flush_range(void *ptr, size_t size)
>>  	v8_flush_dcache_range(start, end);
>>  }
>>  
>> -void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle)
>> +void *dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *dma_handle)
>>  {
>> -	return dma_alloc_map(size, dma_handle, ARCH_MAP_WRITECOMBINE);
>> +	return dma_alloc_map(dev, size, dma_handle, ARCH_MAP_WRITECOMBINE);
>>  }
>>  
>>  static void init_range(size_t total_level0_tables)
>> -- 
>> 2.39.5
>>
>>
>>
> 


-- 
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 |

Re: [PATCH] fixup! dma: give dma_alloc_coherent a device parameter

[Ahmad Fatoum]

On 15.10.24 10:37, Ahmad Fatoum wrote:
> On 15.10.24 10:31, Sascha Hauer wrote:
>> On Tue, Oct 15, 2024 at 10:20:29AM +0200, Ahmad Fatoum wrote:
>>> Should've been part of the original patch.
>>> This fixes CI failure for ARM64.
>>
>> The patch you are fixing here doesn't apply on any of my for-next
>> branches. I'll drop it for now and apply it right after the next release
>> instead.
> 
> Sure, no problem.

This is still broken in next (master is fine).
Should I resend the last patch or can you squash this fixup?

Thanks,
Ahmad

> 
> Thanks,
> Ahmad
> 
>>
>> Sascha
>>
>>>
>>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>>> ---
>>>  arch/arm/cpu/mmu_64.c | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c
>>> index 94a19b1aec3c..bc1a44d0a7b8 100644
>>> --- a/arch/arm/cpu/mmu_64.c
>>> +++ b/arch/arm/cpu/mmu_64.c
>>> @@ -390,9 +390,9 @@ void dma_flush_range(void *ptr, size_t size)
>>>  	v8_flush_dcache_range(start, end);
>>>  }
>>>  
>>> -void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle)
>>> +void *dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *dma_handle)
>>>  {
>>> -	return dma_alloc_map(size, dma_handle, ARCH_MAP_WRITECOMBINE);
>>> +	return dma_alloc_map(dev, size, dma_handle, ARCH_MAP_WRITECOMBINE);
>>>  }
>>>  
>>>  static void init_range(size_t total_level0_tables)
>>> -- 
>>> 2.39.5
>>>
>>>
>>>
>>
> 
> 


-- 
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 |

Re: [PATCH] fixup! dma: give dma_alloc_coherent a device parameter

[Sascha Hauer]

On Mon, Oct 21, 2024 at 10:00:50AM +0200, Ahmad Fatoum wrote:
> On 15.10.24 10:37, Ahmad Fatoum wrote:
> > On 15.10.24 10:31, Sascha Hauer wrote:
> >> On Tue, Oct 15, 2024 at 10:20:29AM +0200, Ahmad Fatoum wrote:
> >>> Should've been part of the original patch.
> >>> This fixes CI failure for ARM64.
> >>
> >> The patch you are fixing here doesn't apply on any of my for-next
> >> branches. I'll drop it for now and apply it right after the next release
> >> instead.
> > 
> > Sure, no problem.
> 
> This is still broken in next (master is fine).
> Should I resend the last patch or can you squash this fixup?

master was fine because "dma: give dma_alloc_coherent a device
parameter" was lost. I applied it now including the fixup. Please check
the result.

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 |