Re: linux-next: Tree for May 3

Christoph Hellwig
2022-05-11T06:48:49Z

On Wed, May 11, 2022 at 06:44:22AM +0000, Conor.Dooley@microchip.com wrote:
> On 11/05/2022 07:22, Christoph Hellwig wrote:
> > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> >
> > Can you try this patch?
>
> Hey Christoph, gave it a try but nfortunately, no joy!

Yes, while it is a real fix, the problem it fixes can only happen
with Xen, which is not relevant to riscv. The only other thing I
can think off is that the allocations were always failing on your
board, and the patch makes that failure fatal. For that try the
patch below. I'd also be really curious by now about the kernel
logs from a successful boot.

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index e2ef0864eb1e5..3e992a308c8a1 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -254,8 +254,10 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
tlb = memblock_alloc(bytes, PAGE_SIZE);
else
tlb = memblock_alloc_low(bytes, PAGE_SIZE);
- if (!tlb)
- panic("%s: failed to allocate tlb structure\n", __func__);
+ if (!tlb) {
+ pr_warn("%s: failed to allocate tlb structure\n", __func__);
+ return;
+ }

if (remap && remap(tlb, nslabs) < 0) {
memblock_free(tlb, PAGE_ALIGN(bytes));