From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795138054; b=4FrUTFmLlM1MwGARYzTZDT9aM0usOA5R9wcZDoO5y7pncMfk4kqKz0gGNjW6pskv3VJ8 AtLJacmmaeNNdSLzPUEm3QEQPk3SJ60URyxIv4J8RRwDe2eygoASEFiAVH/0+4rjFBN5s ZH5S1HhVhsuMAWISGAXeX0PV4d1ebi29sSP9PdG8j+6kDxysGA7eWCLCECF+5lQtS1CJl 2FVPr9cGLZAsuvNjxvHfM+a9XKab6xhkUOT32r/ZfDx1gxQTy1jCAVM0nKeMEpFDX5ry4 5iCztehxHW7ytD+/hmoVMI2ex3gwLcqSoXUPtQD1uFeysRLPkpD85nqiHSuxsL3Tpzw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795138054; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-Id:X-Mailer: MIME-Version:Content-Transfer-Encoding; bh=uP51RJdgbbJaC7Ut67HTzDX7rHk2rGZZvFLYY2qw35k=; b=LoPVYrEEp+7DOkaME755SMk3zfGcMRQbLX7qteOeSmeR6wvXTxjvbs7ddiOFE1bJwcub rM0H2y0NXxrBlGn1NSwXpUduwWGPbyw3ilbb5Ql4NRh4uqcrWZ0x6rlxUCEN0kAXfAP/w f/tVWi4gsNTzKRB9jDnjFq+++POlB55rYPUC/sDNnH7BOGEMmb161vFbDAqnp/SPk5+4f hBcsAGv3xxt+kW+JrA/zGT2iXW6Y8S2TxFn6GgZjXY1OM2h1RhLPpW1r1z8O5Mm4SA6fK 5bVAtYFyY0lz/yRM42tCwGkW8lIFSX4ydWxFjtocZpZRb04UPildSBBRbxmcR0DE/bA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=mliWifsE; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C80A9606A320; Fri, 20 Nov 2026 01:27:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=mliWifsE Received: by smtp.kernel.org (Postfix) with ESMTPSA id F16211F000C4; Fri, 20 Nov 2026 01:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795138054; bh=uP51RJdgbbJaC7Ut67HTzDX7rHk2rGZZvFLYY2qw35k=; h=From:To:Cc:Subject:Date; b=mliWifsEoWZE1zqpx1Vu6OK+OXeR4QCj7U+ybaknK6U6MJaApyMqlQYXo2O1fi5E5 vaiykFvTNEQcvzoV+B5yUYF4zPCQM/yny41BWJoW6X/wUmp4Uvia910Z34LEQcQtTD 6Gwa9V2ROSE2xvRhMpLIEFyUAEQI3CrjOmk8Ve5zkz0t9ry6EEu8BJBacSaTg0ihPO 9f1gCJF0SxplACtA6HAj+3IsBG1g+1GkV0BlNzCP/H13y+25eZdpqCyNu/R14b++YX q+MgkmoYa0q+6O+z5nysAE/bEjC4OGR1rKBEh6uEO5CUcVPqJHgDQhUGvN9Z2gL3Iu Mr66+NFO9AJDA== From: guoren@kernel.org To: paul.walmsley@sifive.com, palmer@dabbelt.com, guoren@kernel.org, arnd@arndb.de, fustini@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Alexandre Ghiti , Leonardo Bras , Inochi Amaoto , Han Gao , Yao Zi , Chen Wang , Xiaoguang Xing , Paul Walmsley Subject: [PATCH V6] riscv: errata: Add ERRATA WRITE_ONCE fixup Date: Thu, 19 Nov 2026 20:27:12 -0500 Message-Id: <20261120012712.1957564-1-guoren@kernel.org> X-Mailer: git-send-email 2.40.1 X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "GUO Ren (XuanTie)" The early version of XuanTie C910 core has a store merge buffer delay problem. The store merge buffer could improve the store queue performance by merging multi-store requests, but when there are not continued store requests, the prior single store request would be waiting in the store queue for a long time. That would cause significant problems for communication between multi-cores. This problem was found on sg2042 platform with the qspinlock lock torture test. So appending a fence w.o could immediately flush the store merge buffer and let other cores see the write result. This will apply the WRITE_ONCE errata to handle the non-standard behavior via appending a fence w.o instruction for WRITE_ONCE(). This problem is only observed on the sg2042 hardware platform by running the lock_torture test program for half an hour. The problem was not found in the user space application, because interrupt can break the livelock. Acked-by: Arnd Bergmann Reviewed-by: Alexandre Ghiti Reviewed-by: Leonardo Bras Reviewed-by: Inochi Amaoto Tested-by: Han Gao Tested-by: Yao Zi Cc: Chen Wang Cc: Xiaoguang Xing Cc: Paul Walmsley Signed-off-by: GUO Ren (XuanTie) --- Changelog v6: - Refine the title - Focus on SG2042 fixup - Rebase on v7.4-rc3 v5: https://lore.kernel.org/linux-riscv/20260421143154.1590156-1-guoren@kernel.org/ - Add Acked-by: Arnd Bergmann for asm/generic - Add Reviewed-by: Inochi Amaoto - Rebase on v7.0 v4: https://lore.kernel.org/linux-riscv/20260412143116.1445893-1-guoren@kernel.org/ - Add Reviewed-by: Alexandre Ghiti (https://lore.kernel.org/linux-riscv/1cfdf6c1-a384-43ad-9588-284335d073f7@ghiti.fr/) - Add Tested-by: Yao Zi - Rebase on v7.0-rc7 v3: https://lore.kernel.org/linux-riscv/20260125063941.443777-1-guoren@kernel.org/ - Rebase on 6.19-rc6. - Remove errata_list_vendors patch which has been merged. - Add Tested-by tag. v2: https://lore.kernel.org/linux-riscv/20250713155321.2064856-1-guoren@kernel.org/ - Add new header file for errata_list_vendors. - Rebase newest kernel version. v1: https://lore.kernel.org/all/20241214143039.4139398-1-guoren@kernel.org/ Signed-off-by: GUO Ren (XuanTie) --- arch/riscv/Kconfig.errata | 17 ++++++++++ arch/riscv/errata/thead/errata.c | 20 ++++++++++++ arch/riscv/include/asm/errata_list_vendors.h | 3 +- arch/riscv/include/asm/rwonce.h | 34 ++++++++++++++++++++ include/asm-generic/rwonce.h | 2 ++ 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/include/asm/rwonce.h diff --git a/arch/riscv/Kconfig.errata b/arch/riscv/Kconfig.errata index 4f77b3c6d7fd..331438bb5e0a 100644 --- a/arch/riscv/Kconfig.errata +++ b/arch/riscv/Kconfig.errata @@ -179,4 +179,21 @@ config ERRATA_THEAD_GHOSTWRITE If you don't know what to do here, say "Y". +config ERRATA_THEAD_WRITE_ONCE + bool "Apply T-Head WRITE_ONCE errata" + depends on ERRATA_THEAD + default y + help + The early version of T-Head C9xx cores of sg2042 & th1520 have a store + merge buffer delay problem. The store merge buffer could improve the + store queue performance by merging multi-store requests, but when there + are no continued store requests, the prior single store request would be + waiting in the store queue for a long time. That would cause signifi- + cant problems for communication between multi-cores. Appending a + fence w.o could immediately flush the store merge buffer and let other + cores see the write result. + + This will apply the WRITE_ONCE errata to handle the non-standard beh- + avior via appending a fence w.o instruction for WRITE_ONCE(). + endmenu # "CPU errata selection" diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c index 6f1c683f0ec0..64683882d50b 100644 --- a/arch/riscv/errata/thead/errata.c +++ b/arch/riscv/errata/thead/errata.c @@ -168,6 +168,23 @@ static bool errata_probe_ghostwrite(unsigned int stage, return true; } +static bool errata_probe_write_once(unsigned int stage, + unsigned long arch_id, unsigned long impid) +{ + if (!IS_ENABLED(CONFIG_ERRATA_THEAD_WRITE_ONCE)) + return false; + + /* target-c9xx cores report arch_id and impid as 0 */ + if (arch_id != 0 || impid != 0) + return false; + + if (stage == RISCV_ALTERNATIVES_BOOT || + stage == RISCV_ALTERNATIVES_MODULE) + return true; + + return false; +} + static u32 thead_errata_probe(unsigned int stage, unsigned long archid, unsigned long impid) { @@ -183,6 +200,9 @@ static u32 thead_errata_probe(unsigned int stage, errata_probe_ghostwrite(stage, archid, impid); + if (errata_probe_write_once(stage, archid, impid)) + cpu_req_errata |= BIT(ERRATA_THEAD_WRITE_ONCE); + return cpu_req_errata; } diff --git a/arch/riscv/include/asm/errata_list_vendors.h b/arch/riscv/include/asm/errata_list_vendors.h index 02b5ab0d23a8..678cd0d42b42 100644 --- a/arch/riscv/include/asm/errata_list_vendors.h +++ b/arch/riscv/include/asm/errata_list_vendors.h @@ -19,7 +19,8 @@ #define ERRATA_THEAD_MAE 0 #define ERRATA_THEAD_PMU 1 #define ERRATA_THEAD_GHOSTWRITE 2 -#define ERRATA_THEAD_NUMBER 3 +#define ERRATA_THEAD_WRITE_ONCE 3 +#define ERRATA_THEAD_NUMBER 4 #endif #ifdef CONFIG_ERRATA_MIPS diff --git a/arch/riscv/include/asm/rwonce.h b/arch/riscv/include/asm/rwonce.h new file mode 100644 index 000000000000..081793d4d772 --- /dev/null +++ b/arch/riscv/include/asm/rwonce.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_RWONCE_H +#define __ASM_RWONCE_H + +#include +#include +#include +#include + +#if defined(CONFIG_ERRATA_THEAD_WRITE_ONCE) && !defined(NO_ALTERNATIVE) + +#define write_once_fence() \ +do { \ + asm volatile(ALTERNATIVE( \ + "nop", \ + "fence w, o", \ + THEAD_VENDOR_ID, \ + ERRATA_THEAD_WRITE_ONCE, \ + CONFIG_ERRATA_THEAD_WRITE_ONCE) \ + : : : "memory"); \ +} while (0) + +#define __WRITE_ONCE(x, val) \ +do { \ + *(volatile typeof(x) *)&(x) = (val); \ + write_once_fence(); \ +} while (0) + +#endif /* defined(CONFIG_ERRATA_THEAD_WRITE_ONCE) && !defined(NO_ALTERNATIVE) */ + +#include + +#endif /* __ASM_RWONCE_H */ diff --git a/include/asm-generic/rwonce.h b/include/asm-generic/rwonce.h index 52b969c7cef9..4e2d941f15a1 100644 --- a/include/asm-generic/rwonce.h +++ b/include/asm-generic/rwonce.h @@ -50,10 +50,12 @@ __READ_ONCE(x); \ }) +#ifndef __WRITE_ONCE #define __WRITE_ONCE(x, val) \ do { \ *(volatile typeof(x) *)&(x) = (val); \ } while (0) +#endif #define WRITE_ONCE(x, val) \ do { \ -- 2.40.1