From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D2DB3C73DE for ; Fri, 8 May 2026 14:36:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778250978; cv=none; b=s0br5f7szQy1UwAlzCaU+KT+f68sEhZj9qVCedisZS/7Rdobe0gTkL8EIh4lOZa/nO/ZZhu2Ik3Z1bzljxbbVYCLAjhM2gHy+rcDrioz+lHOkf6AaUlh0sflmYnqrD3gmcskcfZmdcK0la2r6bzUS66UAeyfAKwUPnbyRUXFwXo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778250978; c=relaxed/simple; bh=HB+vajFVtEoIDbr3Y2w6LEv93VTwKtHpJs0r8RrScho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R6i18zE7409JZJOxrXo/m1sF0dKJ+agcVjEwPgSu9Wa+kB00LSUwPTztT3H8xeGiFMKwV70N/RcS5WF0EHHkaldvEbEscZRSM3LRyqcpYfUXI2V+ceOkyePbgRljnXu2gK35bdGUI1aciiRpsEMHCYlWw8lxR3AQWvi80TZw/yo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=soQfuRXQ; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="soQfuRXQ" 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=1778250974; 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=soQfuRXQPsq3NZ8fW78iQpsJ/ZZyhBNJHxGsTJY9/bNXmFfNJNQ5WqgyJM8+IVyFArJc92 HCEqg8scVy4U/vg7bYgL4Wd1RQS7tBa1WUMjj0XQKDUsxFIK2h3pdPc5L5ZZJOppjarXva okv7hUBz4Sk5WpeFnjR8DjR6K0T1a+4= From: Thorsten Blum To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Ard Biesheuvel , Eric Biggers Cc: Thorsten Blum , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 2/2] riscv/purgatory: add asm/purgatory.h Date: Fri, 8 May 2026 16:35:45 +0200 Message-ID: <20260508143544.2484-4-thorsten.blum@linux.dev> In-Reply-To: <20260508143544.2484-3-thorsten.blum@linux.dev> References: <20260508143544.2484-3-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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=owGbwMvMwCUWt7pQ4caZUj3G02pJDJl/v5w9pWyk9NUzseMjA7eX4pmbNg9MOF9krdX86WPTH ZPOwjG5o5SFQYyLQVZMkeXBrB8zfEtrKjeZROyEmcPKBDKEgYtTACbivJ+R4fuvny1hFkJ3sxIk /K0rObbUtDDW33V1nLv+RNAfn2fvkxn+Ck65tEKXMeCvn+eRbyUfuYM3dB6QuTPp6j5B6Q7umMM hfAA= X-Developer-Key: i=thorsten.blum@linux.dev; a=openpgp; fpr=1D60735E8AEF3BE473B69D84733678FD8DFEEAD4 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 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())