From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B55C8C433EF for ; Fri, 6 May 2022 23:17:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351693AbiEFXVj (ORCPT ); Fri, 6 May 2022 19:21:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356111AbiEFXVi (ORCPT ); Fri, 6 May 2022 19:21:38 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 609A5703E5 for ; Fri, 6 May 2022 16:17:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651879073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wslZBJewjz4hJp3e76dVIXzGvwXKoz3kxZZ5099+eDo=; b=VmlSAAgMx/TvLnE50b3C5wWKZ1Jyq6VPr78DDJvsv95VeCeXS/P2MypkW2E95x6WI3bkLV i1UmIJAyzMxkSFqdSCwCf+h7Cj9onDjJ61FJSxkbFqGybp7St85IYxOxY1zemOIhrgbWY2 Xy7WDI2sHcwIHPEN8ephZWFT/NfCr1I= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-106-RR9lHokKPZuzyx5pu4Jd9Q-1; Fri, 06 May 2022 19:17:46 -0400 X-MC-Unique: RR9lHokKPZuzyx5pu4Jd9Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 342FF101AA45; Fri, 6 May 2022 23:17:45 +0000 (UTC) Received: from localhost (ovpn-12-33.pek2.redhat.com [10.72.12.33]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A3BE2026614; Fri, 6 May 2022 23:17:41 +0000 (UTC) Date: Sat, 7 May 2022 07:17:37 +0800 From: Baoquan He To: Zhen Lei Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H . Peter Anvin" , linux-kernel@vger.kernel.org, Dave Young , Vivek Goyal , Eric Biederman , kexec@lists.infradead.org, Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, Rob Herring , Frank Rowand , devicetree@vger.kernel.org, Jonathan Corbet , linux-doc@vger.kernel.org, Randy Dunlap , Feng Zhou , Kefeng Wang , Chen Zhou , John Donnelly , Dave Kleikamp Subject: Re: [PATCH v24 5/6] of: Support more than one crash kernel regions for kexec -s Message-ID: <20220506231737.GD122876@MiWiFi-R3L-srv> References: <20220506114402.365-1-thunder.leizhen@huawei.com> <20220506114402.365-6-thunder.leizhen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220506114402.365-6-thunder.leizhen@huawei.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org On 05/06/22 at 07:44pm, Zhen Lei wrote: > When "crashkernel=X,high" is used, there may be two crash regions: > high=crashk_res and low=crashk_low_res. But now the syscall > kexec_file_load() only add crashk_res into "linux,usable-memory-range", > this may cause the second kernel to have no available dma memory. > > Fix it like kexec tool do for option -c, add both 'high' and 'low' regions ~~~~~~~~~~~~ kexec-tools does Other than this, LGTM, Acked-by: Baoquan He > into the dtb. > > Signed-off-by: Zhen Lei > Acked-by: Rob Herring > --- > drivers/of/kexec.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c > index b9bd1cff179388c..8d374cc552be5f2 100644 > --- a/drivers/of/kexec.c > +++ b/drivers/of/kexec.c > @@ -386,6 +386,15 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, > crashk_res.end - crashk_res.start + 1); > if (ret) > goto out; > + > + if (crashk_low_res.end) { > + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, > + "linux,usable-memory-range", > + crashk_low_res.start, > + crashk_low_res.end - crashk_low_res.start + 1); > + if (ret) > + goto out; > + } > } > > /* add bootargs */ > -- > 2.25.1 >