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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EFFFEC433EF for ; Tue, 26 Jul 2022 04:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc: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=kVg1a4TD6lHSucJK5ZNCZxteth39Hp/oUBUIHDIpCLY=; b=0bzwtQMNM/cpbo X5slCVpJYCJPS/zthn/+MiPFPEnvfCa4OMXfLjNSmWaWSZPh4VcsdrZRQNAQ7kdKUDqSFAh9kFNo+ Hak0bJEphYxkTVKHhlrXE/lcwFMbfnD5lwfbR9DpYnrXJP44Wta3LVjVlJo1aWs/dicd1RwuAZGqu 2Pr8G/y9RPXEwsuYPALiPUw9e6Mecb9bsIOWpEgz1f9FooCqn/l4SiQkLUpGkh8Z/+YfEzziMoLGV hrxy+/CzpGgR32qsJx9efR/AJBksS3JUUL+pIPN9A3s2YdP2wexV9/RQ8KGAKMaXw73y5Yxt9sgaw m/UBAgJPrv9za0C7fUQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGCWt-007bxt-Q3; Tue, 26 Jul 2022 04:50:47 +0000 Received: from conssluserg-06.nifty.com ([210.131.2.91]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGCWr-007bsy-2L for linux-riscv@lists.infradead.org; Tue, 26 Jul 2022 04:50:47 +0000 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (authenticated) by conssluserg-06.nifty.com with ESMTP id 26Q4oM6u007471 for ; Tue, 26 Jul 2022 13:50:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com 26Q4oM6u007471 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1658811023; bh=bOZAcieAa1N62XoVyvfG8Oy27JGkm1s/9RXmx1fJRrE=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=YFXXmjnh4y69aiFbk1PaKHs8novfu+w/+HV72S6gaUA6ucdcfLLqRRRN1j0vtprQR hKjTZ/SMbOMtO9Y+nXZ4y4rVW/UHyJ7d4+sLxhd8Pad2lS6tpHKvoUDtDXEFs39soL yY2NjwgV3hSQQ+BAg8MqIHkNovH5apZUtorE4PnOZbYaRvkD0L02oko+OzmLoZ1NwU 4SBRmoiSNOiuesnahy8+4JKI71/ZYaM0PsfQ3B6horB/06ZnjCeYlemWdp5DIA76qP Q4hLLvfwDir/ihC36vSTSKGgT/IV7DyZ9orjaO7tlSEvLf17EqwsZkHsZibHgAIX3w 4y6XlJQGLYLcw== X-Nifty-SrcIP: [209.85.221.45] Received: by mail-wr1-f45.google.com with SMTP id v13so10767605wru.12 for ; Mon, 25 Jul 2022 21:50:23 -0700 (PDT) X-Gm-Message-State: AJIora+OEbyfJcqYbokiB5Ces7847Kj8OXEkq7CKQWBuu0todOrwlSPN lEBoT7en19gzn+Z+kq1HECOH2YLxfaggerjMABY= X-Google-Smtp-Source: AGRyM1sO8PExZzNIZki1jcl13eLZDRM1AI4QIG7u52VwXSdJRXz/qSXJJkT3pU0lrlNFDIea9wgV568q9eiXejuFAdM= X-Received: by 2002:adf:979b:0:b0:21d:868a:7f2f with SMTP id s27-20020adf979b000000b0021d868a7f2fmr9419101wrb.409.1658811021682; Mon, 25 Jul 2022 21:50:21 -0700 (PDT) MIME-Version: 1.0 References: <20220725021902.625630-1-masahiroy@kernel.org> <20220725021902.625630-2-masahiroy@kernel.org> In-Reply-To: From: Masahiro Yamada Date: Tue, 26 Jul 2022 13:49:21 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 2/2] riscv/purgatory: Omit use of bin2c To: Nick Desaulniers Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , "open list:SIFIVE DRIVERS" , Borislav Petkov , Helge Deller , Li Zhengyu , "Russell King (Oracle)" , Thomas Bogendoerfer , Linux Kernel Mailing List X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220725_215045_341298_EBE98F7A X-CRM114-Status: GOOD ( 25.20 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Tue, Jul 26, 2022 at 2:52 AM Nick Desaulniers wrote: > > On Sun, Jul 24, 2022 at 7:22 PM Masahiro Yamada wrote: > > > > The .incbin assembler directive is much faster than bin2c + $(CC). > > > > Do similar refactoring as in commit 4c0f032d4963 ("s390/purgatory: > > Omit use of bin2c"). > > > > Please note the .quad directive matches to size_t in C (both 8 byte) > > because the purgatory is compiled only for the 64-bit kernel. > > (KEXEC_FILE depends on 64BIT). > > > > Signed-off-by: Masahiro Yamada > > Seems fine. Is the overall goal working towards removing scripts/bin2c? Yes. I want to remove bin2c. > Acked-by: Nick Desaulniers > > > --- > > > > Changes in v2: > > - Fix a typo (kexec_purgatroy_end -> kexec_purgatory_end) > > > > arch/riscv/Kconfig | 1 - > > arch/riscv/purgatory/.gitignore | 1 - > > arch/riscv/purgatory/Makefile | 8 +------- > > arch/riscv/purgatory/kexec-purgatory.S | 14 ++++++++++++++ > > scripts/remove-stale-files | 2 ++ > > 5 files changed, 17 insertions(+), 9 deletions(-) > > create mode 100644 arch/riscv/purgatory/kexec-purgatory.S > > > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > > index 32ffef9f6e5b..218c2f12b3ef 100644 > > --- a/arch/riscv/Kconfig > > +++ b/arch/riscv/Kconfig > > @@ -447,7 +447,6 @@ config KEXEC_FILE > > > > config ARCH_HAS_KEXEC_PURGATORY > > def_bool KEXEC_FILE > > - select BUILD_BIN2C > > depends on CRYPTO=y > > depends on CRYPTO_SHA256=y > > > > diff --git a/arch/riscv/purgatory/.gitignore b/arch/riscv/purgatory/.gitignore > > index 38d7d1bda4d7..6e4dfb024ad2 100644 > > --- a/arch/riscv/purgatory/.gitignore > > +++ b/arch/riscv/purgatory/.gitignore > > @@ -1,4 +1,3 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > purgatory.chk > > purgatory.ro > > -kexec-purgatory.c > > diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile > > index c2d14e2f345d..dd58e1d99397 100644 > > --- a/arch/riscv/purgatory/Makefile > > +++ b/arch/riscv/purgatory/Makefile > > @@ -84,12 +84,6 @@ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE > > $(obj)/purgatory.chk: $(obj)/purgatory.ro FORCE > > $(call if_changed,ld) > > > > -targets += kexec-purgatory.c > > - > > -quiet_cmd_bin2c = BIN2C $@ > > - cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@ > > - > > -$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE > > - $(call if_changed,bin2c) > > +$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro $(obj)/purgatory.chk > > > > obj-y += kexec-purgatory.o > > diff --git a/arch/riscv/purgatory/kexec-purgatory.S b/arch/riscv/purgatory/kexec-purgatory.S > > new file mode 100644 > > index 000000000000..32c53581b8f2 > > --- /dev/null > > +++ b/arch/riscv/purgatory/kexec-purgatory.S > > @@ -0,0 +1,14 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > + > > + .section .rodata, "a" > > + > > + .align 8 > > +kexec_purgatory: > > + .globl kexec_purgatory > > + .incbin "arch/riscv/purgatory/purgatory.ro" > > +.Lkexec_purgatory_end: > > + > > + .align 8 > > +kexec_purgatory_size: > > + .globl kexec_purgatory_size > > + .quad .Lkexec_purgatory_end - kexec_purgatory > > diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files > > index 7adab4618035..d75a52199a38 100755 > > --- a/scripts/remove-stale-files > > +++ b/scripts/remove-stale-files > > @@ -40,4 +40,6 @@ if [ -n "${building_out_of_srctree}" ]; then > > done > > fi > > > > +rm -f arch/riscv/purgatory/kexec-purgatory.c > > + > > rm -f scripts/extract-cert > > -- > > 2.34.1 > > > > > -- > Thanks, > ~Nick Desaulniers -- Best Regards Masahiro Yamada _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv