From nobody Sun Dec 14 05:51:32 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B0F9E748E9 for ; Sun, 1 Oct 2023 10:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234869AbjJAKqp (ORCPT ); Sun, 1 Oct 2023 06:46:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234850AbjJAKqn (ORCPT ); Sun, 1 Oct 2023 06:46:43 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3339BD8 for ; Sun, 1 Oct 2023 03:46:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87CD2C433C7; Sun, 1 Oct 2023 10:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696157200; bh=qzR32gMwqLa17IpLtlTXacrXoBXks+o3rMWn8BtgPT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oWMkJN6TASGuqSj1ckYx9rlqW8PyzufTainBHUKNuDudf/9J6MqGNc/nnhFRYY6VB sFiPvIg7hp8ixx5AsnFiX9vCoXlQwWcQjD8eegcnSBAEH7+YL1zii4F+YHCdTMQn7m Pgnrzh/SWyow94vQq6hDjKOl4whgjOBgtr8kvAVGnrEyIWHHQMNwUTbOfGPlSUMTBn OASAXWm8fjDenqygce35YaWFaQkunJ7OR7iBX0HjRwLLjC0b+CIg00cgnup9iqrgbA jeOTryhmi2osIN/R6hjNGE+wMdUQSPWzi64R5altT2reUbJCzugsy3j7fPefdQiAZK n0pYF0hK2bE+g== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Guo Ren , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] riscv: errata: thead: use pa based instructions for CMO Date: Sun, 1 Oct 2023 18:34:33 +0800 Message-Id: <20231001103433.3187-3-jszhang@kernel.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20231001103433.3187-1-jszhang@kernel.org> References: <20231001103433.3187-1-jszhang@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" T-HEAD CPUs such as C906/C910/C920 support phy address based CMO, use them so that we don't need to convert to virt address. Signed-off-by: Jisheng Zhang --- arch/riscv/errata/thead/errata.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/err= ata.c index 3fefeb1b456e..632557f36b19 100644 --- a/arch/riscv/errata/thead/errata.c +++ b/arch/riscv/errata/thead/errata.c @@ -58,9 +58,9 @@ static bool errata_probe_pbmt(unsigned int stage, * | 31 - 25 | 24 - 20 | 19 - 15 | 14 - 12 | 11 - 7 | 6 - 0 | * 0000000 11001 00000 000 00000 0001011 */ -#define THEAD_inval_A0 ".long 0x0265000b" -#define THEAD_clean_A0 ".long 0x0255000b" -#define THEAD_flush_A0 ".long 0x0275000b" +#define THEAD_inval_A0 ".long 0x02a5000b" +#define THEAD_clean_A0 ".long 0x0295000b" +#define THEAD_flush_A0 ".long 0x02b5000b" #define THEAD_SYNC_S ".long 0x0190000b" =20 #define THEAD_CMO_OP(_op, _start, _size, _cachesize) \ @@ -79,23 +79,17 @@ asm volatile("mv a0, %1\n\t" \ =20 static void thead_errata_cache_inv(phys_addr_t paddr, size_t size) { - void *vaddr =3D phys_to_virt(paddr); - - THEAD_CMO_OP(inval, vaddr, size, riscv_cbom_block_size); + THEAD_CMO_OP(inval, paddr, size, riscv_cbom_block_size); } =20 static void thead_errata_cache_wback(phys_addr_t paddr, size_t size) { - void *vaddr =3D phys_to_virt(paddr); - - THEAD_CMO_OP(clean, vaddr, size, riscv_cbom_block_size); + THEAD_CMO_OP(clean, paddr, size, riscv_cbom_block_size); } =20 static void thead_errata_cache_wback_inv(phys_addr_t paddr, size_t size) { - void *vaddr =3D phys_to_virt(paddr); - - THEAD_CMO_OP(flush, vaddr, size, riscv_cbom_block_size); + THEAD_CMO_OP(flush, paddr, size, riscv_cbom_block_size); } =20 static const struct riscv_nonstd_cache_ops thead_errata_cmo_ops =3D { --=20 2.40.1