From patchwork Sat Apr 4 11:04:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Bj=C3=B8rn_Mork?= X-Patchwork-Id: 1266369 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mork.no Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=oWO3HFxB; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=mork.no header.i=@mork.no header.a=rsa-sha256 header.s=b header.b=Kp6dvRFA; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48vYqX2bFJz9sPF for ; Sat, 4 Apr 2020 22:05:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=hWv+tFLIDCwy7Yjyz25mP4cuO01+tkTCP7cdEARqSAs=; b=oWO3HFxB6SDadh DqgqVwVoeBzBPyEStgT+SEp38dTx9pHdyZbh5Cc9+GsLZE19BYTcGNvsE+OIRtCzucJIv/V+WG1nv PTD1U7EgWX1xxKkc8quEMvIzIZ3pgdtXuRrVGxDjZwdJsziy/q1SwCMUs0yExICZkSnh9KltOzOJG sRsi4s8WnU+bY/h0EsnTCVHQgWSwQ+afWZrbwGYdort626XYB3QPRC6Tq1c/BL6N+kfRO5gpxliJl mwJGufUClm4ZqTn/4cyzkJNA7FeecoYvAwCPxRHyeQ6esDrTW/w17FutVA16esAZRodOOVtV6IVKG WEJz5MNpr3Xv+1/2N7jg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jKgbs-0002ua-Bq; Sat, 04 Apr 2020 11:05:08 +0000 Received: from canardo.mork.no ([2001:4641::1]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jKgbo-0001Kk-7n for openwrt-devel@lists.openwrt.org; Sat, 04 Apr 2020 11:05:06 +0000 Received: from canardo.mork.no (ip6-localhost [IPv6:0:0:0:0:0:0:0:1]) by canardo.mork.no (8.15.2/8.15.2) with ESMTPS id 034B4to9017281 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK); Sat, 4 Apr 2020 13:04:56 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mork.no; s=b; t=1585998296; bh=IcLmuxacHtxFpr7AvXuUoPR0TkVOMAYzvLjIvD74LpE=; h=From:To:Cc:Subject:Date:Message-Id:From; b=Kp6dvRFA/9G8/o4nLAe+q/TG5aA+nOtvis0A4/tBRheqFu8biCJqbk9Yl/GArueIw dgK/zqxrSB0dS2qMR0/lYoV9slwdnR5wpj1Td9I4+gvc553LSCWS2LA/JsGhzNWW/u 5Z492k+jd0pgXQ9MZ9ZHrO7/8wD4Q9jd/SuR/CXY= Received: (from bjorn@localhost) by canardo.mork.no (8.15.2/8.15.2/Submit) id 034B4tfD017222; Sat, 4 Apr 2020 13:04:55 +0200 From: =?utf-8?q?Bj=C3=B8rn_Mork?= To: openwrt-devel@lists.openwrt.org Date: Sat, 4 Apr 2020 13:04:51 +0200 Message-Id: <20200404110451.15445-1-bjorn@mork.no> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on canardo.mork.no X-Virus-Scanned: clamav-milter 0.102.1 at canardo X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200404_040504_801648_921228E6 X-CRM114-Status: UNSURE ( 7.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [2001:4641:0:0:0:0:0:1 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [OpenWrt-Devel] [PATCH] kernel: generic: 5.4: fix mips command line parameter patch X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Bj=C3=B8rn_Mork?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Fixing a build error when CONFIG_KERNEL_KEXEC is enabled: make[5]: Entering directory '/home/bjorn/tmp/tmp-lede/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7621/linux-5.4.28' CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh CHK include/generated/compile.h CC arch/mips/kernel/machine_kexec.o arch/mips/kernel/machine_kexec.c: In function 'kexec_nonboot_cpu_jump': arch/mips/kernel/machine_kexec.c:268:27: error: 'relocate_new_kernel_size' undeclared (first use in this function); did you mean 'kexec_relocate_new_kernel_end'? reboot_code_buffer + relocate_new_kernel_size); ^~~~~~~~~~~~~~~~~~~~~~~~ kexec_relocate_new_kernel_end arch/mips/kernel/machine_kexec.c:268:27: note: each undeclared identifier is reported only once for each function it appears in arch/mips/kernel/machine_kexec.c: In function 'kexec_reboot': arch/mips/kernel/machine_kexec.c:306:27: error: 'relocate_new_kernel_size' undeclared (first use in this function); did you mean 'kexec_relocate_new_kernel_end'? reboot_code_buffer + relocate_new_kernel_size); ^~~~~~~~~~~~~~~~~~~~~~~~ kexec_relocate_new_kernel_end make[7]: *** [scripts/Makefile.build:266: arch/mips/kernel/machine_kexec.o] Error 1 Signed-off-by: Bjørn Mork --- ...pt-command-line-parameters-from-users.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/target/linux/generic/pending-5.4/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-5.4/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch index a182684c16e3..2808c9532296 100644 --- a/target/linux/generic/pending-5.4/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch +++ b/target/linux/generic/pending-5.4/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch @@ -150,6 +150,24 @@ Signed-off-by: Yousong Zhou if (_machine_kexec_prepare) return _machine_kexec_prepare(kimage); +@@ -161,7 +265,7 @@ machine_crash_shutdown(struct pt_regs *r + void kexec_nonboot_cpu_jump(void) + { + local_flush_icache_range((unsigned long)relocated_kexec_smp_wait, +- reboot_code_buffer + relocate_new_kernel_size); ++ reboot_code_buffer + KEXEC_RELOCATE_NEW_KERNEL_SIZE); + + relocated_kexec_smp_wait(NULL); + } +@@ -199,7 +303,7 @@ void kexec_reboot(void) + * machine_kexec() CPU. + */ + local_flush_icache_range(reboot_code_buffer, +- reboot_code_buffer + relocate_new_kernel_size); ++ reboot_code_buffer + KEXEC_RELOCATE_NEW_KERNEL_SIZE); + + do_kexec = (void *)reboot_code_buffer; + do_kexec(); @@ -212,10 +316,12 @@ machine_kexec(struct kimage *image) unsigned long *ptr;