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=-7.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 BCB90C433E2 for ; Thu, 10 Sep 2020 14:30:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 838432076C for ; Thu, 10 Sep 2020 14:30:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599748232; bh=o6jITo9j0vlFOqdHWJ8IKz1ixVrEwcsvWX82SkJ2Mio=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=gPyXNttewetKd8O4ivAJkA9hAJf/2TAGKBzwwT7eJ5FM/Lcwl4dfz38wLA9J1Hh/7 86YyREQUxh2AQcq6Xjdj6J/vJpb5LDFgIV9B4ZMY1x47pts0u05u2SknOj5C0i2c0S /AP+nr9Fbd5xF5GTdyGyVL7gh0oTQ1OaEtREsdZ4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730633AbgIJO3m (ORCPT ); Thu, 10 Sep 2020 10:29:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:47060 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730919AbgIJO0R (ORCPT ); Thu, 10 Sep 2020 10:26:17 -0400 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9155D221E7 for ; Thu, 10 Sep 2020 14:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599746899; bh=o6jITo9j0vlFOqdHWJ8IKz1ixVrEwcsvWX82SkJ2Mio=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=Af4hZ6iXRJR6UWmS8YgahEzDy0d/BEwyXSnXjq+IOLYt9e6F8Eed+8ZQwnGp9sK3z bHZyJhS/sijfaFY7XaKSM3nBOL1C0NCxOys97rDWatBVHU/N2IGdLbLiMiOeaUAUYN QFaHivAq59TSr2Ke6vxpYB232XZcy1xJxlKuuwJQ= Received: by mail-ot1-f43.google.com with SMTP id c10so5414456otm.13 for ; Thu, 10 Sep 2020 07:08:19 -0700 (PDT) X-Gm-Message-State: AOAM530CefwX+LXmgBzhp2h4JVLv2ICfXj+6N4bEX1sQPyARhNbJoaPN flEJd6Goi+Dam90MSVY04v0FK8a0sEb8SzQWU60= X-Google-Smtp-Source: ABdhPJx0cMK97/bkYQbVJyvEXgLm1S+9JAQSfVADRfPqk+E+nBa//idLydW3G0/+IobK1wc+vHKeuYp155RaiwzL87A= X-Received: by 2002:a9d:69c9:: with SMTP id v9mr3846378oto.90.1599746898795; Thu, 10 Sep 2020 07:08:18 -0700 (PDT) MIME-Version: 1.0 References: <20200909151623.16153-1-ardb@kernel.org> In-Reply-To: From: Ard Biesheuvel Date: Thu, 10 Sep 2020 17:08:07 +0300 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH RFC/RFT 0/3] efi/libstub: arm32: Remove dependency on dram_base To: Atish Patra Cc: Palmer Dabbelt , 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 , AKASHI Takahiro , Patrice CHOTARD , Sumit Garg , Grant Likely , Ilias Apalodimas , Christophe Priouzeau , Rouven Czerwinski , 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 Thu, 10 Sep 2020 at 13:04, Ard Biesheuvel wrote: > > On Thu, 10 Sep 2020 at 04:34, Atish Patra wrote: > > > > 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; > > } > > > > Ah yes, we need this change as well - this is a bit unfortunate since > that creates a conflict with the RISC-V tree. > > > --- 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 > > Thanks for confirming. OK, So, just to annoy Palmer and you more than I already have up to this point: any chance we could do a final respin of the RISC-V code on top of these changes? They are important for ARM, and I would prefer these to be merged in a way that makes it easy to backport them to -stable if needed. So what I would suggest is: - I will create a new 'shared-efi' tag/stable branch containing the existing two patches, as well as these changes (in a slightly updated form) - Palmer creates a new topic branch in the riscv repo based on this shared tag, and applies the [updated] RISC-V patches on top - Palmer drops the current version of the riscv patches from riscv/for-next, and merges the topic branch into it instead. Again, sorry to be a pain, but I think this is the cleanest way to get these changes queued up for v5.10 without painting ourselves into a corner too much when it comes to future follow-up changes. 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=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 84A05C433E2 for ; Thu, 10 Sep 2020 14:09:47 +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 38DB921D6C for ; Thu, 10 Sep 2020 14:09:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="aLmv5p4F"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Af4hZ6iX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38DB921D6C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.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=Cy8cx6Ls7NC7T/13htEJoz99TykrBNscV6gEd+6lAXs=; b=aLmv5p4Fv/rba/nr/UsMpt5px w0+7YaSeKacX/nBYczUMelep7Sc9jWUsHpGJpbOqvwVANT1N5sYaF85nNeMNjd/yvuRg6Wg7TbYVw w9mYEVkBlaGTYN+uS/+SxpFk25E7F+GtbIWvLPkVKNZZ8BKuPmVc1Z0wn9oWnTzl6Or1PAGPwYZ6O 2b2ccOpGGWkOFEwVQaCSXMsZ3lNZkHuwhcV3/BJNLL/bOc5gYPsQbaxNdIIk6j7moYGp1bGTTHv6H lwEoXYmpbiRIx6h+pzoaHHrBjGkKYMRdQ1/C8Gh8o3DLPVnzzAe5eJIDNtWwK3p0DG91Wd64sT2wC Uuhp3voaA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGNFQ-0004Pr-9D; Thu, 10 Sep 2020 14:08:24 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGNFM-0004OO-Oj for linux-arm-kernel@lists.infradead.org; Thu, 10 Sep 2020 14:08:22 +0000 Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8ACE9221E2 for ; Thu, 10 Sep 2020 14:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599746899; bh=o6jITo9j0vlFOqdHWJ8IKz1ixVrEwcsvWX82SkJ2Mio=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=Af4hZ6iXRJR6UWmS8YgahEzDy0d/BEwyXSnXjq+IOLYt9e6F8Eed+8ZQwnGp9sK3z bHZyJhS/sijfaFY7XaKSM3nBOL1C0NCxOys97rDWatBVHU/N2IGdLbLiMiOeaUAUYN QFaHivAq59TSr2Ke6vxpYB232XZcy1xJxlKuuwJQ= Received: by mail-ot1-f44.google.com with SMTP id m12so5484343otr.0 for ; Thu, 10 Sep 2020 07:08:19 -0700 (PDT) X-Gm-Message-State: AOAM5313jnq7OKFvSSHd+MXmgbA/5U4jDqi/hHiZWt62tfYDi9YpErq9 FmcCa+yHUJlE5/KjKC58ZiZ36H77LP2MBbZkcTA= X-Google-Smtp-Source: ABdhPJx0cMK97/bkYQbVJyvEXgLm1S+9JAQSfVADRfPqk+E+nBa//idLydW3G0/+IobK1wc+vHKeuYp155RaiwzL87A= X-Received: by 2002:a9d:69c9:: with SMTP id v9mr3846378oto.90.1599746898795; Thu, 10 Sep 2020 07:08:18 -0700 (PDT) MIME-Version: 1.0 References: <20200909151623.16153-1-ardb@kernel.org> In-Reply-To: From: Ard Biesheuvel Date: Thu, 10 Sep 2020 17:08:07 +0300 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH RFC/RFT 0/3] efi/libstub: arm32: Remove dependency on dram_base To: Atish Patra X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200910_100820_981218_95CE5859 X-CRM114-Status: GOOD ( 45.66 ) 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 , =?UTF-8?Q?Fran=C3=A7ois_Ozog?= , Maxim Uvarov , Grant Likely , AKASHI Takahiro , Rouven Czerwinski , Heinrich Schuchardt , Ilias Apalodimas , Patrice CHOTARD , Patrick Delaunay , Atish Patra , linux-efi , Palmer Dabbelt , Christophe Priouzeau , Jens Wiklander , "linux-arm-kernel@lists.infradead.org" , Sumit Garg 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 Thu, 10 Sep 2020 at 13:04, Ard Biesheuvel wrote: > > On Thu, 10 Sep 2020 at 04:34, Atish Patra wrote: > > > > 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; > > } > > > > Ah yes, we need this change as well - this is a bit unfortunate since > that creates a conflict with the RISC-V tree. > > > --- 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 > > Thanks for confirming. OK, So, just to annoy Palmer and you more than I already have up to this point: any chance we could do a final respin of the RISC-V code on top of these changes? They are important for ARM, and I would prefer these to be merged in a way that makes it easy to backport them to -stable if needed. So what I would suggest is: - I will create a new 'shared-efi' tag/stable branch containing the existing two patches, as well as these changes (in a slightly updated form) - Palmer creates a new topic branch in the riscv repo based on this shared tag, and applies the [updated] RISC-V patches on top - Palmer drops the current version of the riscv patches from riscv/for-next, and merges the topic branch into it instead. Again, sorry to be a pain, but I think this is the cleanest way to get these changes queued up for v5.10 without painting ourselves into a corner too much when it comes to future follow-up changes. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel