From patchwork Tue Sep 12 07:24:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 138324 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp550969vqx; Tue, 12 Sep 2023 10:04:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG82r3ZHNOParVdVDLCIlOAUiDPIw9e2pixS9JHh0UmD49yUQhs8EGrpp3CJi+eOA2heZUl X-Received: by 2002:a05:6a20:7d85:b0:13a:12c2:359e with SMTP id v5-20020a056a207d8500b0013a12c2359emr38394pzj.2.1694538297178; Tue, 12 Sep 2023 10:04:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694538297; cv=none; d=google.com; s=arc-20160816; b=HEaMJ7ebw8HdpwlzEz7m1AjZwtVNJKo6wRyJPvFCcgQj9wXd7lQJbg4041cYN7f5vy ZuY6srhqbFgg0T6TXnD/kbNNLRWpubaT/vHZojgmbXvH99fBLo6JltiRSAx8pNSq0fph XeTz4LIMsf8ifUKm0xJkF7emtyuYPWL4H84sHfrxNQ/VMOG6t6Nl45CZsRLP7fR6H9px dhzqsTSO8OhztINo/uioS7kAP26tcWvsVQvx4XlQdWvA2tcfrHF25GihNeN7wpBaXDKI sTq/iqNcG4CdOmPoPncmUTIEyJZJNk3YEJA76dzFmSUqAlua1Pncfov5u4rvN4Xo8dwn YdaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=vBFFFPsD4or0r+7wDuJHB7umE43pcDibNr/mThgWsCI=; fh=sAhdzcJrNtfte3dUcVmF/tlpgUgAK/bfoqpMkcN2mo8=; b=CIUBNAtWOJ5pEueflxJnAKNXSWdHjUhSFtiCr/veBr8KnxKkKrefeug0AYWxxCYWGG dgSMOmL7tg4MCb9AMUcOzUgTWIxeIjfCqdmgs3rH5f1WMNawnB+xzKbevIWCVh99ZdUq nZA7voUFYW2l67txrcU9eZD4YDaHdolXv9ebUh70b6xsk+XqYD5r5mODIHBzRGpJb6vf 8RiWA5JFoyqtG+vHqbDYOS8OhRcJFFf8/1g7GQrmtPaD9JmEz6HTVVLuHMbKfBwMmG6h GKjyYeSmADzHHqQltguImI+R3Iv5PCkfVapTlEJkJrXpJKOUSmChGUtbc5QEmOP1Ppsa ibpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g3oyoBfG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id ct12-20020a056a000f8c00b0068e2461991dsi8171070pfb.342.2023.09.12.10.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 10:04:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g3oyoBfG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 546B980CBDC2; Tue, 12 Sep 2023 00:36:23 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231676AbjILHgS (ORCPT + 39 others); Tue, 12 Sep 2023 03:36:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231663AbjILHgR (ORCPT ); Tue, 12 Sep 2023 03:36:17 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84E69E73 for ; Tue, 12 Sep 2023 00:36:13 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AA49C433C7; Tue, 12 Sep 2023 07:36:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694504173; bh=NEBCs0obZ/Zb3TNso8vqG2Frf4fuv/wh7I2pZQ8DKS0=; h=From:To:Cc:Subject:Date:From; b=g3oyoBfGxbLRWsS9qGBEirOD91LnZvsQhdoc/VuVTmra+dcBJaraJ568IV4ZX+bld DKm6qi/sRIKg5T6gMOlfYGfIbZ56gpVO5uBsM2eQ+IA87+jzQFDM0ZBIVT25SJ7s/8 2LLQDs7pVB42q8MXA/9Hsw6VUvkQhNyoy0Y2hPui1eUMl96csq36Xx/8I1kuOcFP8R OF54GqJgjTHkjGPvB9mxPy8oI4s1njA/Epr+hsZx47n5lK6z1svkNEYvedNNkcC6JE j5KKHK1b6xwnoqcEFuEk53QuQXzT78K54NU7jTfCZ5p/4aYhHwEsCcjvv6yfvt+d8q oC4ZedOXBmUAQ== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Icenowy Zheng , Sergey Matyukevich , Heiko Stuebner , Guo Ren , Drew Fustini Subject: [PATCH v3] riscv: errata: fix T-Head dcache.cva encoding Date: Tue, 12 Sep 2023 15:24:10 +0800 Message-Id: <20230912072410.2481-1-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 12 Sep 2023 00:36:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776852189494780072 X-GMAIL-MSGID: 1776852189494780072 From: Icenowy Zheng 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 --- This is a renew of Icenowy patch series[1], patch1 is necessary to make T-Head C910 powered SoCs CMO work correctly. Link: https://lore.kernel.org/linux-riscv/20230103062610.69704-1-uwu@icenowy.me/ [1] Since v2: - rebase on linux 6.6-rc1 - collect Tested-by tag - remove patch2 since I want patch1 to be applied as fix for linux-6.6. patch2 will be sent separately. Since v1: - rebase on linux 6.5-rc7 - collect Reviewed-by tag 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 e2ecd01bfac7..b55b434f0059 100644 --- a/arch/riscv/include/asm/errata_list.h +++ b/arch/riscv/include/asm/errata_list.h @@ -105,7 +105,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 | @@ -118,7 +118,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"