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 1BB52CE7A88 for ; Sun, 24 Sep 2023 13:18:58 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0g1sW/ltLwwY93uwzvEq8oyM8kEKta/2MWO6pQJf/Ik=; b=r/rUx7v98uX7tx Poh7kxUJ5iEV3HXbDA98HLM2HVm5AaH3GKVcWpx6lPJlUidZGTa9flRbMslhG/Q/45r8JcWCZGyl9 opGFKO+3acvRbQQ3g/WMpxxEmNdDvES7R7ZPPchBudX9jfeb5sBwEa1J13B5O05JuHxTyJP8cK27M QuEDy/m4FclCkpr8NdAlBjDRLClca8HnB7udc35OD70XTJ5ixS0ta52i+WUcr3xBpDcuxvLj2+8Gw okxY7/ljMjvZoibLWSnLonlhx+ZeoDCZZmVwoW7j8goUIMMtIPAe9jU+lcARZe9khQNx5UcneWmvc fYjVkrszF8A+WPCV6AvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qkP0g-00CIRZ-2i; Sun, 24 Sep 2023 13:18:54 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qkP0d-00CIQ9-2D for linux-riscv@lists.infradead.org; Sun, 24 Sep 2023 13:18:53 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 0C3BECE01CE; Sun, 24 Sep 2023 13:18:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7774BC433CC; Sun, 24 Sep 2023 13:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695561529; bh=2HOUejfb/rlXadP7F07f20zKEiFCnWDEqIcFesFF1iA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vGaVm6Y2y84DUkDOHjpfHcdquZxRHT37aec+v0mcZ5ajsti6GpNvFczuEzWBuU6qk iCzmNowZfUT3r4KrNBYnq1/g833kLe4poOelYHHO9oPZmrO7CaaCAgxboeHQp5fd9h 3BOQlG71ndQZNI2jOTY986w4Vz6Ob4i8nzvCEP9amj5cGlHAjv7Naj7adSodLAvuum 2/CQQafmaWW4Ojt//vVtxaj86QP2gYVjNemBwMHRr9ZiJ3uucoclEwhpcY5Oa758Jf 3pKC0zMIhZxVw8AMaV5lx//9v4ZwKer84j4cj1TG5+afwDY/a1TcYimJRkZwisxji3 VDN151y5UkAZQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 24/28] riscv: errata: fix T-Head dcache.cva encoding Date: Sun, 24 Sep 2023 09:17:41 -0400 Message-Id: <20230924131745.1275960-24-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230924131745.1275960-1-sashal@kernel.org> References: <20230924131745.1275960-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.55 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230924_061851_891052_7978CC79 X-CRM114-Status: GOOD ( 10.37 ) 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: , Cc: Sergey Matyukevich , Sasha Levin , aou@eecs.berkeley.edu, Drew Fustini , samuel@sholland.org, prabhakar.mahadev-lad.rj@bp.renesas.com, Palmer Dabbelt , conor.dooley@microchip.com, Guo Ren , jszhang@kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, linux-riscv@lists.infradead.org, ajones@ventanamicro.com, Heiko Stuebner 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 From: Icenowy Zheng [ Upstream commit 8eb8fe67e2c84324398f5983c41b4f831d0705b3 ] The dcache.cva encoding shown in the comments are wrong, it's for dcache.cval1 (which is restricted to L1) instead. Fix this in the comment and in the hardcoded instruction. Signed-off-by: Icenowy Zheng Tested-by: Sergey Matyukevich Reviewed-by: Heiko Stuebner Reviewed-by: Guo Ren Tested-by: Drew Fustini Link: https://lore.kernel.org/r/20230912072410.2481-1-jszhang@kernel.org Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/include/asm/errata_list.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h index 19a771085781a..7d2675bb71611 100644 --- a/arch/riscv/include/asm/errata_list.h +++ b/arch/riscv/include/asm/errata_list.h @@ -100,7 +100,7 @@ asm volatile(ALTERNATIVE( \ * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 | * 0000001 01001 rs1 000 00000 0001011 * dcache.cva rs1 (clean, virtual address) - * 0000001 00100 rs1 000 00000 0001011 + * 0000001 00101 rs1 000 00000 0001011 * * dcache.cipa rs1 (clean then invalidate, physical address) * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 | @@ -113,7 +113,7 @@ asm volatile(ALTERNATIVE( \ * 0000000 11001 00000 000 00000 0001011 */ #define THEAD_inval_A0 ".long 0x0265000b" -#define THEAD_clean_A0 ".long 0x0245000b" +#define THEAD_clean_A0 ".long 0x0255000b" #define THEAD_flush_A0 ".long 0x0275000b" #define THEAD_SYNC_S ".long 0x0190000b" -- 2.40.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv