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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 840B4C433E2 for ; Thu, 10 Sep 2020 01:58:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C585206DB for ; Thu, 10 Sep 2020 01:58:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=atishpatra.org header.i=@atishpatra.org header.b="rZmdQJaC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730245AbgIJB60 (ORCPT ); Wed, 9 Sep 2020 21:58:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726714AbgIJBfV (ORCPT ); Wed, 9 Sep 2020 21:35:21 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18114C061374 for ; Wed, 9 Sep 2020 18:34:58 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id x23so4013852wmi.3 for ; Wed, 09 Sep 2020 18:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atishpatra.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=GrPqY5T/J8rFLZPU1SZ+TN9A67zhzaFO1L8J/pur38w=; b=rZmdQJaC1gYBHG2YMMZ1DTjmUef9K8e2HDxn7aojLvseKBjLjYR8hrK3Ej81O0x363 1USedyZeB03aFe+dooEu26IFKY6Myr0m/jXnruC0bRazZOqTx2/eFNSWaZeh1E/xk+Wl l6bZ3aKz++n0jw72edqsT6hOeQMcUuYY3WC1I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GrPqY5T/J8rFLZPU1SZ+TN9A67zhzaFO1L8J/pur38w=; b=Fht3sk/UKv1Fj5btLKrbR4xASonij1l1Jz6nlN2JsESa8DZzw1GV8YZhhcn8Rf49oN u85/XCS8bGmxr8Gq1/Nx7SarQttzo+O1hk8cJE5tla8sOXbetpjuribaAY2+86yUcZiZ s/3mDR6T9l9MrqEg7YO/G5Cq+gD1fBxD/1adT0irK3yMi0s1RpacPbK3LW8gOyDuE5Jd 9/MAsaFTduCoGYE5aRZHSmOQFyuDqlknwHsdzMhlB5xGpJFcLY6ClezsxlEOQBYjojc1 F5v6WcenZl7zfyvkrJ5/8umQ8L3MTyvwClljjxwOqTxU4rNUm9t9eDDrSqT3tIQtWfC1 PFCQ== X-Gm-Message-State: AOAM532IyAETqrqkp0bUCRw3QkhsPBJ3F8ZgleF5PgEtmSxYOEZV6iAs 7ypM9mucyJB9+REQBMTINgP4XCuM8Z6zRizH8u/k X-Google-Smtp-Source: ABdhPJwKXlPDQeLzoE66dc6qojgB7mFpYwMUAHE0Ux6W0acKIPST7Q5fYuM7DC+vIr4bQbctJMC1nPrG1VJ3gA/UMIg= X-Received: by 2002:a05:600c:2215:: with SMTP id z21mr5919874wml.176.1599701697148; Wed, 09 Sep 2020 18:34:57 -0700 (PDT) MIME-Version: 1.0 References: <20200909151623.16153-1-ardb@kernel.org> In-Reply-To: From: Atish Patra Date: Wed, 9 Sep 2020 18:34:46 -0700 Message-ID: Subject: Re: [PATCH RFC/RFT 0/3] efi/libstub: arm32: Remove dependency on dram_base To: Palmer Dabbelt Cc: Ard Biesheuvel , linux-efi , "linux-arm-kernel@lists.infradead.org" , Maxim Uvarov , Heinrich Schuchardt , Atish Patra , Jens Wiklander , =?UTF-8?Q?Fran=C3=A7ois_Ozog?= , etienne.carriere@st.com, AKASHI Takahiro , patrice.chotard@st.com, sumit.garg@linaro.org, Grant Likely , Ilias Apalodimas , christophe.priouzeau@linaro.org, r.czerwinski@pengutronix.de, Patrick Delaunay Content-Type: text/plain; charset="UTF-8" Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org On Wed, Sep 9, 2020 at 2:44 PM Atish Patra wrote: > > On Wed, Sep 9, 2020 at 1:52 PM Palmer Dabbelt wrote: > > > > On Wed, 09 Sep 2020 08:16:20 PDT (-0700), ardb@kernel.org wrote: > > > Maxim reports boot failures on platforms that describe reserved memory > > > regions in DT that are disjoint from system DRAM, and which are converted > > > to EfiReservedMemory regions by the EFI subsystem in u-boot. > > > > > > As it turns out, the whole notion of discovering the base of DRAM is > > > problematic, and it would be better to simply rely on the EFI memory > > > allocation routines instead, and derive the FDT and initrd allocation > > > limits from the actual placement of the kernel (which is what defines > > > the start of the linear region anyway) > > > > > > Finally, we should be able to get rid of get_dram_base() entirely. > > > However, as RISC-V only just started using it, we will need to address > > > that at a later time. > > > > Looks like we're using dram_base to derive two argumets to > > efi_relocate_kernel(): the preferred load address and the minimum load address. > > I don't see any reason why we can't use the same PAGE_OFFSET-like logic that > > x86 uses for the minimum load address, but I don't think we have any mechanism > > like "struct boot_params" so we'd need to come up with something. > > > > As discussed in the other thread > (https://www.spinics.net/lists/linux-efi/msg20262.html), > we don't need to do anything special. efi_relocate_kernel can just > take preferred address as 0 > so that efi_bs_alloc will fail and efi_low_alloc_above will be used to > allocate 2MB/4MB aligned address as per requirement. > > I don't think the other changes in this series will cause any issue > for RISC-V. I will test it and update anyways. > > > > Cc: Maxim Uvarov > > > Cc: Heinrich Schuchardt > > > Cc: Atish Patra > > > Cc: Palmer Dabbelt > > > Cc: Jens Wiklander > > > Cc: Francois Ozog > > > Cc: Etienne CARRIERE > > > Cc: Takahiro Akashi > > > Cc: Patrice CHOTARD > > > Cc: Sumit Garg > > > Cc: Grant Likely > > > Cc: Ilias Apalodimas > > > Cc: Christophe Priouzeau > > > Cc: Rouven Czerwinski > > > Cc: Patrick DELAUNAY > > > > > > Ard Biesheuvel (3): > > > efi/libstub: Export efi_low_alloc_above() to other units > > > efi/libstub: Use low allocation for the uncompressed kernel > > > efi/libstub: base FDT and initrd placement on image address not DRAM > > > base > > > > > > arch/arm/include/asm/efi.h | 6 +- > > > arch/arm64/include/asm/efi.h | 2 +- > > > drivers/firmware/efi/libstub/arm32-stub.c | 177 ++++---------------- > > > drivers/firmware/efi/libstub/efi-stub.c | 2 +- > > > drivers/firmware/efi/libstub/efistub.h | 3 + > > > drivers/firmware/efi/libstub/relocate.c | 4 +- > > > 6 files changed, 47 insertions(+), 147 deletions(-) > I verified the above patches along with the following RISC-V specific changes. diff --git a/arch/riscv/include/asm/efi.h b/arch/riscv/include/asm/efi.h index 93c305a638f4..dd6ceea9d548 100644 --- a/arch/riscv/include/asm/efi.h +++ b/arch/riscv/include/asm/efi.h @@ -37,7 +37,7 @@ static inline unsigned long efi_get_max_fdt_addr(unsigned long dram_base) static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, unsigned long image_addr) { - return dram_base + SZ_256M; + return image_addr + SZ_256M; } --- a/drivers/firmware/efi/libstub/riscv-stub.c +++ b/drivers/firmware/efi/libstub/riscv-stub.c @@ -100,7 +100,7 @@ efi_status_t handle_kernel_image(unsigned long *image_addr, */ preferred_addr = round_up(dram_base, MIN_KIMG_ALIGN) + MIN_KIMG_ALIGN; status = efi_relocate_kernel(image_addr, kernel_size, *image_size, - preferred_addr, MIN_KIMG_ALIGN, dram_base); + 0, MIN_KIMG_ALIGN, 0); FWIW: Tested-by: Atish Patra > > > -- > Regards, > Atish Do -- Regards, Atish 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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC173C433E2 for ; Thu, 10 Sep 2020 01:36:44 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B59D2222B for ; Thu, 10 Sep 2020 01:36:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Yt4PugIy"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=atishpatra.org header.i=@atishpatra.org header.b="rZmdQJaC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B59D2222B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atishpatra.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uxRcEid7Cgu1VzoCWpftN5b0m466K1FF98oZZcYxDPw=; b=Yt4PugIyOcNoGaPme5m0+OluV SA0QaZWbJTOQiVbAhXEPfQCFAlEMPhyXhwdy9cifpaNHEQDvFQkEad1l9+jjj5iueblDPnou5Z/O3 VJvC6OssW2SsOQg/1o4CXwYwxDNPwc1HBUvpGyrRh5Pe2Donx4zGwAuD+v9yullIr2ZeYdkL4kLFA yQ9YSHuqmK/fJpA7z7r3HEUcWkCFLM9vunmquJKDcPK4+lqcHkUQQsk6CaCrmaGyIR/DGdffWxc/8 LnSrLtxWiBjYVVh51IqrrmoWrmBvxj2lwXOYo3dcWcEHmbjVX22tltIU25INvHtakSfaaCys79UBZ IUYK7DNXQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGBUM-00064g-N9; Thu, 10 Sep 2020 01:35:02 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGBUJ-000649-Di for linux-arm-kernel@lists.infradead.org; Thu, 10 Sep 2020 01:35:00 +0000 Received: by mail-wm1-x341.google.com with SMTP id q9so4026329wmj.2 for ; Wed, 09 Sep 2020 18:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atishpatra.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=GrPqY5T/J8rFLZPU1SZ+TN9A67zhzaFO1L8J/pur38w=; b=rZmdQJaC1gYBHG2YMMZ1DTjmUef9K8e2HDxn7aojLvseKBjLjYR8hrK3Ej81O0x363 1USedyZeB03aFe+dooEu26IFKY6Myr0m/jXnruC0bRazZOqTx2/eFNSWaZeh1E/xk+Wl l6bZ3aKz++n0jw72edqsT6hOeQMcUuYY3WC1I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GrPqY5T/J8rFLZPU1SZ+TN9A67zhzaFO1L8J/pur38w=; b=DVFc6ASwphbEJ2Y6uHlrkDdnBcxe5Z/2PuMGKsM7yRZqpWNbDgouqRKUlB1b3x62QM DJd3LFzKyeWZn63mY1HbRFg4WZcqkrD3XqvSwEbIPPcpyu4ebqEonCcuELTnVrTmB21X 37kdF4+Z9W4DLKLvBJCfTvAUrp2DPJjLCC9p0EYSkg/Nm2Bzc3pNU06TxFDG5f3hiO4f 4ndPKDRXoDKJpthftedyCdDICPozre6Vq+063m9f/m4tdwC1KKwlMN/vGsS4/FPghcju VkvH5iO8rJ47fUv1GxmtnjvWxsd2NjC5cD2vm9VK2hLb8HPD3XdQz0mPY2zR3vA3qciv N2Cw== X-Gm-Message-State: AOAM530sxLCYi0ukC5/zUmBcByfEVJ1CVC36AovVwSiZqfyv4LATYgwe hbnDCJqcsB3dgIu/eY8YjUpzmSguSheuOot7rpoj X-Google-Smtp-Source: ABdhPJwKXlPDQeLzoE66dc6qojgB7mFpYwMUAHE0Ux6W0acKIPST7Q5fYuM7DC+vIr4bQbctJMC1nPrG1VJ3gA/UMIg= X-Received: by 2002:a05:600c:2215:: with SMTP id z21mr5919874wml.176.1599701697148; Wed, 09 Sep 2020 18:34:57 -0700 (PDT) MIME-Version: 1.0 References: <20200909151623.16153-1-ardb@kernel.org> In-Reply-To: From: Atish Patra Date: Wed, 9 Sep 2020 18:34:46 -0700 Message-ID: Subject: Re: [PATCH RFC/RFT 0/3] efi/libstub: arm32: Remove dependency on dram_base To: Palmer Dabbelt X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200909_213459_594023_1AFD5686 X-CRM114-Status: GOOD ( 33.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: etienne.carriere@st.com, =?UTF-8?Q?Fran=C3=A7ois_Ozog?= , Maxim Uvarov , Grant Likely , AKASHI Takahiro , r.czerwinski@pengutronix.de, Heinrich Schuchardt , Ilias Apalodimas , patrice.chotard@st.com, Patrick Delaunay , Jens Wiklander , Atish Patra , linux-efi , christophe.priouzeau@linaro.org, Ard Biesheuvel , "linux-arm-kernel@lists.infradead.org" , sumit.garg@linaro.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Sep 9, 2020 at 2:44 PM Atish Patra wrote: > > On Wed, Sep 9, 2020 at 1:52 PM Palmer Dabbelt wrote: > > > > On Wed, 09 Sep 2020 08:16:20 PDT (-0700), ardb@kernel.org wrote: > > > Maxim reports boot failures on platforms that describe reserved memory > > > regions in DT that are disjoint from system DRAM, and which are converted > > > to EfiReservedMemory regions by the EFI subsystem in u-boot. > > > > > > As it turns out, the whole notion of discovering the base of DRAM is > > > problematic, and it would be better to simply rely on the EFI memory > > > allocation routines instead, and derive the FDT and initrd allocation > > > limits from the actual placement of the kernel (which is what defines > > > the start of the linear region anyway) > > > > > > Finally, we should be able to get rid of get_dram_base() entirely. > > > However, as RISC-V only just started using it, we will need to address > > > that at a later time. > > > > Looks like we're using dram_base to derive two argumets to > > efi_relocate_kernel(): the preferred load address and the minimum load address. > > I don't see any reason why we can't use the same PAGE_OFFSET-like logic that > > x86 uses for the minimum load address, but I don't think we have any mechanism > > like "struct boot_params" so we'd need to come up with something. > > > > As discussed in the other thread > (https://www.spinics.net/lists/linux-efi/msg20262.html), > we don't need to do anything special. efi_relocate_kernel can just > take preferred address as 0 > so that efi_bs_alloc will fail and efi_low_alloc_above will be used to > allocate 2MB/4MB aligned address as per requirement. > > I don't think the other changes in this series will cause any issue > for RISC-V. I will test it and update anyways. > > > > Cc: Maxim Uvarov > > > Cc: Heinrich Schuchardt > > > Cc: Atish Patra > > > Cc: Palmer Dabbelt > > > Cc: Jens Wiklander > > > Cc: Francois Ozog > > > Cc: Etienne CARRIERE > > > Cc: Takahiro Akashi > > > Cc: Patrice CHOTARD > > > Cc: Sumit Garg > > > Cc: Grant Likely > > > Cc: Ilias Apalodimas > > > Cc: Christophe Priouzeau > > > Cc: Rouven Czerwinski > > > Cc: Patrick DELAUNAY > > > > > > Ard Biesheuvel (3): > > > efi/libstub: Export efi_low_alloc_above() to other units > > > efi/libstub: Use low allocation for the uncompressed kernel > > > efi/libstub: base FDT and initrd placement on image address not DRAM > > > base > > > > > > arch/arm/include/asm/efi.h | 6 +- > > > arch/arm64/include/asm/efi.h | 2 +- > > > drivers/firmware/efi/libstub/arm32-stub.c | 177 ++++---------------- > > > drivers/firmware/efi/libstub/efi-stub.c | 2 +- > > > drivers/firmware/efi/libstub/efistub.h | 3 + > > > drivers/firmware/efi/libstub/relocate.c | 4 +- > > > 6 files changed, 47 insertions(+), 147 deletions(-) > I verified the above patches along with the following RISC-V specific changes. diff --git a/arch/riscv/include/asm/efi.h b/arch/riscv/include/asm/efi.h index 93c305a638f4..dd6ceea9d548 100644 --- a/arch/riscv/include/asm/efi.h +++ b/arch/riscv/include/asm/efi.h @@ -37,7 +37,7 @@ static inline unsigned long efi_get_max_fdt_addr(unsigned long dram_base) static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, unsigned long image_addr) { - return dram_base + SZ_256M; + return image_addr + SZ_256M; } --- a/drivers/firmware/efi/libstub/riscv-stub.c +++ b/drivers/firmware/efi/libstub/riscv-stub.c @@ -100,7 +100,7 @@ efi_status_t handle_kernel_image(unsigned long *image_addr, */ preferred_addr = round_up(dram_base, MIN_KIMG_ALIGN) + MIN_KIMG_ALIGN; status = efi_relocate_kernel(image_addr, kernel_size, *image_size, - preferred_addr, MIN_KIMG_ALIGN, dram_base); + 0, MIN_KIMG_ALIGN, 0); FWIW: Tested-by: Atish Patra > > > -- > Regards, > Atish Do -- Regards, Atish _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel