public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Leon Romanovsky <leon@kernel•org>
Cc: Marek Szyprowski <m.szyprowski@samsung•com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: boot failure after merge of the dma-mapping tree
Date: Thu, 10 Jul 2025 10:10:15 +1000	[thread overview]
Message-ID: <20250710101015.3033ca44@canb.auug.org.au> (raw)
In-Reply-To: <20250709181631.GI592765@unreal>

[-- Attachment #1: Type: text/plain, Size: 847 bytes --]

Hi Leon,

On Wed, 9 Jul 2025 21:16:31 +0300 Leon Romanovsky <leon@kernel•org> 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 <sfr@canb•auug.org.au>

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2025-07-10  0:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-09 13:39 linux-next: boot failure after merge of the dma-mapping tree Stephen Rothwell
2025-07-09 17:41 ` Leon Romanovsky
2025-07-09 23:46   ` Stephen Rothwell
2025-07-09 18:16 ` Leon Romanovsky
2025-07-10  0:10   ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-08-20  5:51 Stephen Rothwell
2020-08-20  8:36 ` Nicolin Chen
2020-08-20 15:49   ` Christoph Hellwig
2020-08-20 20:31     ` Nicolin Chen

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=20250710101015.3033ca44@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=leon@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=m.szyprowski@samsung$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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