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 557E0E937FD for ; Sun, 12 Apr 2026 19:42: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:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XD/ljFySFfmZNiIsFKRxVadRxXtQx+lyF0l5TMHVRgQ=; b=OIxtqP5pi6YLs6 qUGql+ry+w/+lcxVaJBZTDNo2xsMmoTngbGXdS9mS9ucIGTcpLOVt/+n+IZhv61QTajX/+o5oJtqb WqQII10Q8I8ZMS+m3DD2r80IbaTGSzoa0rZXqnkWMHVRRRVgrizJnb66S5qWQhvSIFWFpLT9hPc5+ SK+wRomqeBsE0lCdttSed5TVafEPuyR1acff7ht+I2b+81Zr2qIejCpBUWGc3e3VBdAg5WaE5+C5v QV5fWbby66PmqKFSaMuA8x5BUEf+bRgdI835lGieaqA6cIPTjTDxva+OLxNGW8240mKW6QthDo+af fkisSUBB4VTzFx4sPQ9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wC0hn-0000000Edni-2Ifa; Sun, 12 Apr 2026 19:42:51 +0000 Received: from out-173.mta0.migadu.com ([2001:41d0:1004:224b::ad]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wC0hl-0000000Edmy-0lKn for linux-riscv@lists.infradead.org; Sun, 12 Apr 2026 19:42:50 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1776022966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nQkYNSGrXU327YT/AkU4IhOfysgSoF6ODaYcCM0x4bw=; b=UQf7nYuKEHEhyXU0uZz6AHhjA8TRxuq+S2/UpMXv45bejv2Z2RyxzWLk3IZGF5G1xlyS1z rJX6uhr44KICewJZnBJM8yYtG9P8ECAaH9BQbx2trfpyB0JeIFHqbbqpqRKPoCnAmKPu70 VK0AvkqQ3AnVYn2GiJuA1WmVMsbLNe0= From: Thorsten Blum To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Eric Biggers , Ard Biesheuvel Cc: Thorsten Blum , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] riscv/purgatory: add asm/purgatory.h Date: Sun, 12 Apr 2026 21:41:16 +0200 Message-ID: <20260412194113.228703-6-thorsten.blum@linux.dev> In-Reply-To: <20260412194113.228703-4-thorsten.blum@linux.dev> References: <20260412194113.228703-4-thorsten.blum@linux.dev> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1694; i=thorsten.blum@linux.dev; h=from:subject; bh=HB+vajFVtEoIDbr3Y2w6LEv93VTwKtHpJs0r8RrScho=; b=owGbwMvMwCUWt7pQ4caZUj3G02pJDJm3v2adUjZS+uqZ2PGRgdtL8cxNmwcmnC+y1mr+9LHpj kln4ZjcUcrCIMbFICumyPJg1o8ZvqU1lZtMInbCzGFlAhnCwMUpABN5kcbw3z+358XcKO/i9tP+ 77dK6G7x0Hjh/1KbZfrPqw7TrblnT2ZkeGvEwnPiiMAqhtwFdlrTeDwzpn1ZKyQhupS7d9N684Q ofgA= X-Developer-Key: i=thorsten.blum@linux.dev; a=openpgp; fpr=1D60735E8AEF3BE473B69D84733678FD8DFEEAD4 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260412_124249_360679_D039687F X-CRM114-Status: GOOD ( 10.27 ) 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 Add arch/riscv/include/asm/purgatory.h and provide the purgatory() prototype via the architecture header, mirroring the x86 layout. Remove the workaround from arch/riscv/purgatory/purgatory.c. Signed-off-by: Thorsten Blum --- arch/riscv/include/asm/purgatory.h | 11 +++++++++++ arch/riscv/purgatory/purgatory.c | 5 +---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 arch/riscv/include/asm/purgatory.h diff --git a/arch/riscv/include/asm/purgatory.h b/arch/riscv/include/asm/purgatory.h new file mode 100644 index 000000000000..a63687be2517 --- /dev/null +++ b/arch/riscv/include/asm/purgatory.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RISCV_PURGATORY_H +#define _ASM_RISCV_PURGATORY_H + +#ifndef __ASSEMBLER__ +#include + +extern void purgatory(void); +#endif /* __ASSEMBLER__ */ + +#endif /* _ASM_RISCV_PURGATORY_H */ diff --git a/arch/riscv/purgatory/purgatory.c b/arch/riscv/purgatory/purgatory.c index 15c72dafa3d8..6a6e6f611a56 100644 --- a/arch/riscv/purgatory/purgatory.c +++ b/arch/riscv/purgatory/purgatory.c @@ -8,9 +8,9 @@ * */ -#include #include #include +#include #include u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE] __section(".kexec-purgatory"); @@ -32,9 +32,6 @@ static bool verify_sha256_digest(void) return memcmp(digest, purgatory_sha256_digest, sizeof(digest)); } -/* workaround for a warning with -Wmissing-prototypes */ -void purgatory(void); - void purgatory(void) { if (verify_sha256_digest()) _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv