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 4DAC3C433E2 for ; Thu, 10 Sep 2020 23:32:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E987D208CA for ; Thu, 10 Sep 2020 23:32:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=atishpatra.org header.i=@atishpatra.org header.b="CGhHrr58" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725283AbgIJXcw (ORCPT ); Thu, 10 Sep 2020 19:32:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgIJXcu (ORCPT ); Thu, 10 Sep 2020 19:32:50 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7CEAC061573 for ; Thu, 10 Sep 2020 16:32:49 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id b79so2750177wmb.4 for ; Thu, 10 Sep 2020 16:32:49 -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=DabXq9SVZDjwZa+l1FpZzzKL0MxaY7Q5O1e9MtFLhek=; b=CGhHrr58+cfvUdh9ONFVjqf3rVQaBsfGJIA/tYvYvlM7Vl2upawIcAdbphopgICxNF hlFRD0xOQarRqgQ0KTUncfuyL5z1TB+4BntzOs3U/fqvVNy5Sa68rX4m5kO0+jdOP52H JDNHVcrfuG8oSRqzsF/oW80HipWXyx5h+fazs= 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=DabXq9SVZDjwZa+l1FpZzzKL0MxaY7Q5O1e9MtFLhek=; b=Ght4AsJslJooBMAnKRQvqxHHhVk0rGUtGcI+LW5BGziEjgHK0WGjF3hiwr0ulEaeSV Fd2DWbp7gWmTM8A0c/Nrz8UYKkHKaF/hmj+nb2/wi42ZMJCkrbXmHXUm27zCzcOzWtwQ WSmAHKzI56bAz/w3R8uoCfh6PTLjU0kRHYSvurzRiNAMhLNoFEsA4y3h4Nlv+eg8sP1F U8gc0vSlDUl5ORUCEIQFgOOHXIALX9CQrw7+56WH40vnEvrxYa7hVQrcBHN+f82N7TsG Q69HBBiQ95mrIilMzeVa1Bju9GfyWGV6DBoH0OGdzVafLvmTQUHRQQwjfmNOIlx2s/HF HERw== X-Gm-Message-State: AOAM532uviq+bbz/AgycJPMbJ1YUmkHU/qCqsfp+CvSfMjhErrv74OaB xZZGoL3H1n0nXdqzck8Qg94PqRbdUuediRkXQiL/ X-Google-Smtp-Source: ABdhPJw3qooTXn4kHxmiFBENFTdiX04hggqkAbLOzXEJiVoYALtzBgb8/LMX0jxWpyI5pRF5kLpCVhpwvKUEAerlQvk= X-Received: by 2002:a1c:c20a:: with SMTP id s10mr2376664wmf.55.1599780768233; Thu, 10 Sep 2020 16:32:48 -0700 (PDT) MIME-Version: 1.0 References: <20200909151623.16153-1-ardb@kernel.org> In-Reply-To: From: Atish Patra Date: Thu, 10 Sep 2020 16:32:37 -0700 Message-ID: Subject: Re: [PATCH RFC/RFT 0/3] efi/libstub: arm32: Remove dependency on dram_base To: Ard Biesheuvel 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, Sep 10, 2020 at 7:08 AM Ard Biesheuvel wrote: > > 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. > No worries. It's better to address these issues now rather than patching it after the code is merged. I will rebase and update the RISC-V patch series on top of this series as per above discussion. Should I also add a patch to remove get_dram_base() completely or are you planning to do that ? > 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. Sounds good to me. I will try to send a v8 early next week and let palmer decide how he wants to proceed. -- 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 A92AFC43461 for ; Thu, 10 Sep 2020 23:34:11 +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 600DD208A9 for ; Thu, 10 Sep 2020 23:34:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rZ0hbvUc"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=atishpatra.org header.i=@atishpatra.org header.b="CGhHrr58" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 600DD208A9 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=wPLerD2npQph3NrwPR2B5rdFXjZIFHRYdUHB2RJ8itY=; b=rZ0hbvUcEkZvcYaTUyPLIhmGX tRNPhrR2bVilqZwPjsYGilqzk9FLdUXk+JNjlbXw/dmtLiu6L8701Rfz0cFuO2jJAPcrWIUM3GR8j tW5s7PB81a9hPUl8xmtj0w1lPd2JeIgWAFzDX7s443FnjMNQdMp30h+kWno8L/vW91fRm78gfKIXk mwYYl43nasBPi/NWlx3K7/MAVOFs5xzVAGDD3xohcBtVOysSNK2XkM3QuQtIzqq/lXpTjOUPlTDU3 OAIFJpg267dS56P2iKzA+cHp8sZTUN1+U4O3PEbjdw+d2Fct0h6J/6JBiXbcqCjhvMQyC/6x3rUIw 7Ro8xlbxA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGW3h-0003aU-QN; Thu, 10 Sep 2020 23:32:53 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGW3e-0003a5-DK for linux-arm-kernel@lists.infradead.org; Thu, 10 Sep 2020 23:32:51 +0000 Received: by mail-wm1-x343.google.com with SMTP id e11so2874946wme.0 for ; Thu, 10 Sep 2020 16:32:49 -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=DabXq9SVZDjwZa+l1FpZzzKL0MxaY7Q5O1e9MtFLhek=; b=CGhHrr58+cfvUdh9ONFVjqf3rVQaBsfGJIA/tYvYvlM7Vl2upawIcAdbphopgICxNF hlFRD0xOQarRqgQ0KTUncfuyL5z1TB+4BntzOs3U/fqvVNy5Sa68rX4m5kO0+jdOP52H JDNHVcrfuG8oSRqzsF/oW80HipWXyx5h+fazs= 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=DabXq9SVZDjwZa+l1FpZzzKL0MxaY7Q5O1e9MtFLhek=; b=H5tkRULjEcmMVPe1totkDU8edwfATUATOhq/KVM9klJ0qXa93w/uvf+UtRLJHFSKug ahrYU8hAQF/OMPsu1mkpehyrMd4FPuQ8/cQThc1MATKbWVc6iPcka5MRq1oQici39gE3 rtbuHJcdkTTeWblEIBJ9UEUui8A59UmGwc6+Nhyn6yEL3iebu3O5TAhhTDOiA6kZGkBX UB3e0POvm1qS9/7NdEgttBKNog4nYQjam/WOmHRQ4/lr1w4h2VCiBAR2WUWj4ibabk8p Wy83X432BQavYOV9aOv8YZEbVoeUdkONam4qSoopEsO3id1qpy1fM9pPe6Dz40p0D+lR Butg== X-Gm-Message-State: AOAM533Bfc0GwIK/1VY5ltARTDe9VyXDdLZE7vaOX4TXz1f9WvRpXG57 kPV/5vYpvTKVzQnBZiaFHhKLXPG1Wb5YQuwWH/5z X-Google-Smtp-Source: ABdhPJw3qooTXn4kHxmiFBENFTdiX04hggqkAbLOzXEJiVoYALtzBgb8/LMX0jxWpyI5pRF5kLpCVhpwvKUEAerlQvk= X-Received: by 2002:a1c:c20a:: with SMTP id s10mr2376664wmf.55.1599780768233; Thu, 10 Sep 2020 16:32:48 -0700 (PDT) MIME-Version: 1.0 References: <20200909151623.16153-1-ardb@kernel.org> In-Reply-To: From: Atish Patra Date: Thu, 10 Sep 2020 16:32:37 -0700 Message-ID: Subject: Re: [PATCH RFC/RFT 0/3] efi/libstub: arm32: Remove dependency on dram_base To: Ard Biesheuvel X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200910_193250_551774_68A3C51E X-CRM114-Status: GOOD ( 50.91 ) 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, Sep 10, 2020 at 7:08 AM Ard Biesheuvel wrote: > > 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. > No worries. It's better to address these issues now rather than patching it after the code is merged. I will rebase and update the RISC-V patch series on top of this series as per above discussion. Should I also add a patch to remove get_dram_base() completely or are you planning to do that ? > 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. Sounds good to me. I will try to send a v8 early next week and let palmer decide how he wants to proceed. -- Regards, Atish _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel