Subject: Re: linux-next: boot failure after merge of the dma-mapping tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 10 Jul 2025 10:10:15 +1000

Hi Leon,

On Wed, 9 Jul 2025 21:16:31 +0300 Leon Romanovsky <[email-masked]> wrote:
>
> I assume that this will fix the issue:
> 
> diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
> index 29e8594a725a..cb8936e4ffab 100644
> --- a/kernel/dma/mapping.c
> +++ b/kernel/dma/mapping.c
> @@ -157,7 +157,7 @@ dma_addr_t dma_map_phys(struct device *dev, phys_addr_t phys, size_t size,
>  {
>  	const struct dma_map_ops *ops = get_dma_ops(dev);
>  	struct page *page = phys_to_page(phys);
> -	size_t offset = offset_in_page(page);
> +	size_t offset = offset_in_page(phys);
>  	bool is_pfn_valid = true;
>  	dma_addr_t addr;

I found time to test the above on top of yesterday's linux-next and it
fixes the problem for me.  Thanks again.

Tested-by: Stephen Rothwell <[email-masked]>

-- 
Cheers,
Stephen Rothwell