mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] fixup! dma: give dma_alloc_coherent a device parameter
Date: Mon, 21 Oct 2024 10:00:50 +0200	[thread overview]
Message-ID: <30c81aa5-68fe-4872-8091-d0c253d4edc3@pengutronix.de> (raw)
In-Reply-To: <ac45db07-1ad7-4b15-ab57-56c6fdea82ff@pengutronix.de>

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 |



  reply	other threads:[~2024-10-21  8:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-15  8:20 Ahmad Fatoum
2024-10-15  8:31 ` Sascha Hauer
2024-10-15  8:37   ` Ahmad Fatoum
2024-10-21  8:00     ` Ahmad Fatoum [this message]
2024-10-22  8:06       ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=30c81aa5-68fe-4872-8091-d0c253d4edc3@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox