From patchwork Sun Aug 27 09:08:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 136980 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp2740862vqm; Sun, 27 Aug 2023 02:33:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHij/7iFuFnr4WfRuMDtYx2B5MiEZPjFbmbBMypM38v5rgx5BEG6bMaOgLWM1xuWO452rzC X-Received: by 2002:a05:6a20:dc94:b0:137:5a89:daf5 with SMTP id ky20-20020a056a20dc9400b001375a89daf5mr19134065pzb.28.1693128802188; Sun, 27 Aug 2023 02:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693128802; cv=none; d=google.com; s=arc-20160816; b=kbsIP7U+8kEWfXfFHvti5cFoyl6gqxhP593deEcY10cbJOtb7N4qlrzdQQkHPzs4Jo pZjzjIt2xREacJb3kKw0/q1+PGZjsGYjFT2MkNoJXeyeSIyWiN9feE8HtJHzhjabR0eg 7TDzwzBB885ezqRmqUHO1MOS8bYLXMdN+VX03rYL/mq67iHLDdC9l5Ic+rOM8BYxCxRQ kMfgQM1mJTjPQMJbjD8k3FBao+LZdqJKEooF/cnm2gRxA7evac3V2evZcotEtCH74Vug Ni5H2VvN0T7MGSaIkSSHtFz6j48+rZE4DpGKJGM8PD6xLjrYyZs/LH3Y5EDSFVfSnQMX BWvw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QwjAZSXX2cKitmgJdEGVIrEZhezbWIG5s+64Q9fXgh0=; fh=vKw113UNC0xr8RrcKtmeWj9ozsZHz0YK2hoMuPC84dM=; b=aLphn4fXP531xUxSRnl+IJZc+E/MF1vbS/2y9bz7W4huCMk5bt027abpjWhyclXluX OL7bgz1h//wC/laR4KYjq26d3ufo7vAv7OAmjkGFHA3o3e7JpPd+Hj3446yvFyWbC7Am +57a7bDfT1nDnYhu22gLazIjBlrxgg3y6DFrEvYrszeIjrMnYJsR4Ax6NmmLnU/BP2pH qb3rsfnqrkSrM/GsqUir1pSou6XbPc02e9iKoSy+4N45i5JFra79grHf+LMKkg4mbB+m foPs7Ft+rEa/I9N8HVV7JiMowoWzXs5TnjigL4pSJPevmKAcCQw/rPPBrafTpzfExylv dddA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=usLvamgE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k15-20020aa788cf000000b0066733d71d01si5497149pff.317.2023.08.27.02.32.57; Sun, 27 Aug 2023 02:33:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=usLvamgE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230450AbjH0JUw (ORCPT + 99 others); Sun, 27 Aug 2023 05:20:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230456AbjH0JUS (ORCPT ); Sun, 27 Aug 2023 05:20:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFDC3109 for ; Sun, 27 Aug 2023 02:20:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 75FCA60F16 for ; Sun, 27 Aug 2023 09:20:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6044C433C8; Sun, 27 Aug 2023 09:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693128014; bh=wVJEp+DWxjAP9hqubYfmJYRid/a/jKOOXMXkMs86vv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=usLvamgE7qx33BKjeqfkpc4BxoEL/KXx5jq76XtCseuMSLbZmPX2d/m1jxn/t2SDE eSqzYV0Lv7kQYuB4o7blMl4YnZH+q6ZlSjOFwBqHLC1l79YIToF2CKAlt70qQEraG9 crQZzSLltAjbiTxmVXZ6KSqLOSDoBQz4k7jBoLydhEj9oKPen6mgqggmTvCS/6c1y3 yXWoj+jSrtZRh6HB+IvSE6jbaCA2aBxqL518aT5zRkB9U9GBD3Wh4PKHSFZtIZHskZ q8QRtI7g/Bx0m3tr0Nhe10L5O630jEXbxR1wp8+M3EoBARB/+Wrgu6uZEmDUmsxlPQ tbQ0wJERV9RXg== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Icenowy Zheng , Sergey Matyukevich , Heiko Stuebner Subject: [PATCH v2 1/2] riscv: errata: fix T-Head dcache.cva encoding Date: Sun, 27 Aug 2023 17:08:12 +0800 Message-Id: <20230827090813.1353-2-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230827090813.1353-1-jszhang@kernel.org> References: <20230827090813.1353-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775374226999544687 X-GMAIL-MSGID: 1775374226999544687 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 --- 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 fb1a810f3d8c..feab334dd832 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" From patchwork Sun Aug 27 09:08:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 136979 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp2740110vqm; Sun, 27 Aug 2023 02:30:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgTnolKYfQHcw7QHxssUcmvaMnHfyeGhBJftcCc6NCAmghODOanz26gR+Qg5wTPb8/3NSs X-Received: by 2002:a05:6808:60a:b0:3a3:6f20:39b4 with SMTP id y10-20020a056808060a00b003a36f2039b4mr6599115oih.29.1693128645920; Sun, 27 Aug 2023 02:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693128645; cv=none; d=google.com; s=arc-20160816; b=tI1tJXmlPnJR9j/2BdG8imtbe+08jVSpPUVFX20s8/OZkNO2UL+Xppa64g/ZC5fk9e Gwt7wiSxxe9pmV4JhyxrfWiYKWMFTzmzqquX332n89vZSdJTWxffsnL7d3S+rx+6gay/ 4g2WnyQbY6vG6EROWJOCaV2JSyy8QD1i/Evo0uxTydFdpDryjDdhP5vpesdBN8MdK9eC rR4hgt6vZCkZcT7ifA4qahri9N9EHUlNiqNo4AFjx4LLlutoqvo96pfya9PU7/tsc+DM rP7CcUD8Z4t45ipv5ufVonvogRSiTq+BHIEJQU54CZI4AVMa4f7JtLPth/vJr0VpAZRY 0ctA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=I+FvR5iYorvqz9NyaUUhvh8ZXzZWkBefz4Q19GZLS9Q=; fh=WFoMS+dHeDpILTonRsvvMAQlc3NQ/efWDc5eQhKKncI=; b=CmXGfXoQ+sd7CF28Sic9h/+btGffpUoaiAQoxwDIS1+Lu2LrjTDCXvZgFpC/LqoxMR LWgMxHU2SW4Dk8beTdDJJAmHkWRm+1kJNJ/EwemD0MJyO8MT/mxqTi0YP+K/q/fniWXs nnX7Uyz1L/5h8uRVWKUqitd8O8CxZOisyUhcjsZ8mguRxbaGPFlsztkGjmNYa+Sk0uOx 7t643erNM1WhtGGtNSy8o8i/zhCIPXzPfUpIYZyE7w5LVeKIHewTgfMnTujAEsb9cbDC CqYgIcfqiWquwYwDxfnPniI24Etj4rdbLELeKsCNnHqhonDjS3AndTv1uk9vSnOOZzY2 x22g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OeCRgMOd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k23-20020a63ba17000000b00565f0087a6bsi4970536pgf.427.2023.08.27.02.30.13; Sun, 27 Aug 2023 02:30:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OeCRgMOd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230467AbjH0JUz (ORCPT + 99 others); Sun, 27 Aug 2023 05:20:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbjH0JU0 (ORCPT ); Sun, 27 Aug 2023 05:20:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07397E1 for ; Sun, 27 Aug 2023 02:20:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 90F7660F16 for ; Sun, 27 Aug 2023 09:20:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4964DC433C9; Sun, 27 Aug 2023 09:20:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1693128018; bh=Ibu7OZXmFF1/tmfUzC1QszDkKdxJxutlMYfydtDtkvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OeCRgMOdogG7W1AW/VS6qgIe7qwaMx9kWoBCGgkEbH6+sxJl8X216MNKabS6Bw+vg UM97X5t7yxV+PrryitqcAJSBbZF5tia9snUfPZ/EC9iDXw59v+qZXOkUbdWWj/KWSt 5FtcgclCDM2u75WzRMVuRI8AbBZST+F6t4LrokgnV2kaztAvDy4vl4Q9pizUVj83D8 3M6QKXbwoo4wwe8DJCjAZuW2lQsN5lGDuLnUY0U6lL9Gt29EhMOQLS2C8iSNuTqSNn 6BHfcMh6tjszCuBuD65E9KXdGDfQvJzh3xFDQYJ156Pmgdk4rPkKc4RC+m+IA+G91+ 3+bwOzkQ5tJRA== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Icenowy Zheng Subject: [PATCH v2 2/2] riscv: errata: prefix T-Head mnemonics with th. Date: Sun, 27 Aug 2023 17:08:13 +0800 Message-Id: <20230827090813.1353-3-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230827090813.1353-1-jszhang@kernel.org> References: <20230827090813.1353-1-jszhang@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775374062725738658 X-GMAIL-MSGID: 1775374062725738658 From: Icenowy Zheng T-Head now maintains some specification for their extended instructions at [1], in which all instructions are prefixed "th.". Follow this practice in the kernel comments. Link: https://github.com/T-head-Semi/thead-extension-spec [1] Signed-off-by: Icenowy Zheng --- arch/riscv/include/asm/errata_list.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/riscv/include/asm/errata_list.h b/arch/riscv/include/asm/errata_list.h index feab334dd832..98ecab053dd2 100644 --- a/arch/riscv/include/asm/errata_list.h +++ b/arch/riscv/include/asm/errata_list.h @@ -90,25 +90,25 @@ asm volatile(ALTERNATIVE( \ #endif /* - * dcache.ipa rs1 (invalidate, physical address) + * th.dcache.ipa rs1 (invalidate, physical address) * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 | * 0000001 01010 rs1 000 00000 0001011 - * dache.iva rs1 (invalida, virtual address) + * th.dache.iva rs1 (invalida, virtual address) * 0000001 00110 rs1 000 00000 0001011 * - * dcache.cpa rs1 (clean, physical address) + * th.dcache.cpa rs1 (clean, physical address) * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 | * 0000001 01001 rs1 000 00000 0001011 - * dcache.cva rs1 (clean, virtual address) + * th.dcache.cva rs1 (clean, virtual address) * 0000001 00101 rs1 000 00000 0001011 * - * dcache.cipa rs1 (clean then invalidate, physical address) + * th.dcache.cipa rs1 (clean then invalidate, physical address) * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 | * 0000001 01011 rs1 000 00000 0001011 - * dcache.civa rs1 (... virtual address) + * th.dcache.civa rs1 (... virtual address) * 0000001 00111 rs1 000 00000 0001011 * - * sync.s (make sure all cache operations finished) + * th.sync.s (make sure all cache operations finished) * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 | * 0000000 11001 00000 000 00000 0001011 */