From: Christoph Hellwig <hch@lst.de>
To: Conor.Dooley@microchip.com
Cc: hch@lst.de, sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org
Subject: Re: linux-next: Tree for May 3
Date: Wed, 11 May 2022 08:22:32 +0200 [thread overview]
Message-ID: <20220511062232.GA32524@lst.de> (raw)
In-Reply-To: <505d41d1-1bc8-c8bc-5ebb-8a2b7934f3de@microchip.com>
Can you try this patch?
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index e2ef0864eb1e5..856179f27f608 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -234,7 +234,7 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
{
struct io_tlb_mem *mem = &io_tlb_default_mem;
unsigned long nslabs = default_nslabs;
- size_t alloc_size = PAGE_ALIGN(array_size(sizeof(*mem->slots), nslabs));
+ size_t alloc_size;
size_t bytes;
void *tlb;
@@ -267,12 +267,13 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
goto retry;
}
+ alloc_size = PAGE_ALIGN(array_size(sizeof(*mem->slots), nslabs));
mem->slots = memblock_alloc(alloc_size, PAGE_SIZE);
if (!mem->slots)
panic("%s: Failed to allocate %zu bytes align=0x%lx\n",
__func__, alloc_size, PAGE_SIZE);
- swiotlb_init_io_tlb_mem(mem, __pa(tlb), default_nslabs, false);
+ swiotlb_init_io_tlb_mem(mem, __pa(tlb), nslabs, false);
mem->force_bounce = flags & SWIOTLB_FORCE;
if (flags & SWIOTLB_VERBOSE)
next prev parent reply other threads:[~2022-05-11 6:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-03 7:29 linux-next: Tree for May 3 Stephen Rothwell
2022-05-04 8:32 ` Conor.Dooley
2022-05-09 13:33 ` Conor.Dooley
2022-05-09 14:11 ` Christoph Hellwig
2022-05-09 14:39 ` Conor.Dooley
2022-05-10 11:20 ` Conor.Dooley
2022-05-11 6:22 ` Christoph Hellwig [this message]
2022-05-11 6:44 ` Conor.Dooley
2022-05-11 6:48 ` Christoph Hellwig
2022-05-11 10:10 ` Conor.Dooley
2022-05-11 12:37 ` Christoph Hellwig
2022-05-11 14:08 ` Mike Rapoport
2022-05-11 14:10 ` Christoph Hellwig
2022-05-11 14:37 ` Mike Rapoport
2022-05-11 14:40 ` Christoph Hellwig
2022-05-13 7:55 ` Conor.Dooley
2022-05-14 12:18 ` Geert Uytterhoeven
2022-05-16 9:47 ` Conor.Dooley
-- strict thread matches above, loose matches on Subject: below --
2024-05-03 7:17 Stephen Rothwell
2021-05-03 2:59 Stephen Rothwell
2019-05-03 10:00 Stephen Rothwell
2018-05-03 5:13 Stephen Rothwell
2017-05-03 5:54 Stephen Rothwell
2016-05-03 9:37 Stephen Rothwell
2013-05-03 4:10 Stephen Rothwell
2012-05-03 6:38 Stephen Rothwell
2011-05-03 5:47 Stephen Rothwell
2010-05-03 5:16 Stephen Rothwell
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=20220511062232.GA32524@lst.de \
--to=hch@lst.de \
--cc=Conor.Dooley@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).