From patchwork Mon Jun 6 20:12:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12870837 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 14B5FC43334 for ; Mon, 6 Jun 2022 20:18:22 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UDyU4OzcXF66zrBgo7WMyiyy0UMWHq4zd4ER/t9r5vU=; b=aGfDOB1CUyDL6S ZTX4rjF5ZF7NW7rlJM9R0vo9c2RBOoyFUVRgDUMGw8j/TESD68WyvBfBd5jtCKJ8qTRh48wNKg1D7 X6Ut8J016kg7LA7LUI2ij4jx2zQA1txM9GY+Gr3KBsl5bv9Mr4srMU8kcyqwzICFiiT/f8viXPXpY tJ+eXAGZuJ6h4i6TeVbrw+u+wKUrYCG8PzJXqMTEyTZAW8GgHMCo/V0Ypv3d6I3Fl7FkUDx24qpO4 SXKjsTs/ZYtvo5nD34gaN/EHM9+LCJ3rcTdPHmsXHefS+RP29QMXRRyX0c2cx/lAVhSO+oNRK3cp3 KtzXrov0y2iDxjgI263g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJA4-002Yqn-2H; Mon, 06 Jun 2022 20:17:16 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJ9j-002Yip-5q for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2022 20:16:56 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1617C61531; Mon, 6 Jun 2022 20:16:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47E52C3411E; Mon, 6 Jun 2022 20:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654546612; bh=kVcx0oMi/9UA9Y1LqtbyPlhPfARQ1gi/WEOcGd6vzIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rGAGnfvZ7gRgD586nO9lQqHcY3NBVQOwbBrhdkTRKUeSuhQYul+j08PwzAHhyeBkq k7pGJIFrfwaIT8ZKp0RtJr59w9b522MhmPCS7F1KnUEQVYcmcjN+y26DQ8IAJ09N/W uJ5/xKXlAh5t3/Qk622BjlfgI7UZqZ+v9Se0EG6f5U4hvVm0AFv9Lzjo8DpNLPw2ui ZwdGuQ/MPJE2niygeiMFZG6gQqEKYB/iW/u8GZGkDhGgrrnG0Ps6YAc+clfBSd/Sw9 NKfkVbqGBJNQol51FLNr6lqnDuFnTOXS1W1yKZC6eegQC3+PiZR1iUEO0v/R38BAaF KW2t5OZg6TKSw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 01/17] arm64/cpuinfo: Decode AIVIVT L1 cache policy Date: Mon, 6 Jun 2022 21:12:38 +0100 Message-Id: <20220606201254.104659-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606201254.104659-1-broonie@kernel.org> References: <20220606201254.104659-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1784; h=from:subject; bh=kVcx0oMi/9UA9Y1LqtbyPlhPfARQ1gi/WEOcGd6vzIU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBinl+41rQPx5eo3/xxzWibIOZ2MD1lo74pJP3oh1eb UP0C096JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYp5fuAAKCRAk1otyXVSH0D4KCA CAOhLDoyncxduu1ToLG1PgajzfVlAJYhStMIAauRNfEq27eSpboV4ZXwbARzkpe2DqNqom1GIR3soK 3UMvcmhBlChOtmtY1CkaSzAqPbGL+F23HPGsjpwaGWN/LB9ZgGws85yNirgQsivNMYhrMm5xZ2JTIJ qoYqDYiP9NN57qQSKI0svDd6oRjcuuEkWBKD5u0nzxpfQFzDhjhqokiZZ//YKalxR8XvKYOz+onoR6 xjKjAIpVnKMxROOcg5rq1AlQyb1VitGsAjSLwcCi4bOGp+XLZXlpYG7EwO1ey+DQx7a+q+F0HOfK8b NOlMM8t6aXGQ8cjKFILBrTru3q6171 X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220606_131655_314381_20973763 X-CRM114-Status: GOOD ( 15.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since the code was originally written the architecture has documented a level 1 instruction cache policy AIVIVT (ASID-tagged, Virtual Index, Virtual Tag) for the previously reserved CTR_EL0.L1Ip value 0b01. Update the define and the string printed at boot reporting the cache type to AIVIVT. Signed-off-by: Mark Brown --- arch/arm64/include/asm/cache.h | 2 +- arch/arm64/kernel/cpuinfo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index 7c2181c72116..23bfcd92f6ca 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -25,7 +25,7 @@ #define CTR_L1IP(ctr) (((ctr) >> CTR_L1IP_SHIFT) & CTR_L1IP_MASK) #define ICACHE_POLICY_VPIPT 0 -#define ICACHE_POLICY_RESERVED 1 +#define ICACHE_POLICY_AIVIVT 1 #define ICACHE_POLICY_VIPT 2 #define ICACHE_POLICY_PIPT 3 diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 8eff0a34ffd4..f4a6ddb69385 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -35,7 +35,7 @@ static struct cpuinfo_arm64 boot_cpu_data; static const char *icache_policy_str[] = { [ICACHE_POLICY_VPIPT] = "VPIPT", - [ICACHE_POLICY_RESERVED] = "RESERVED/UNKNOWN", + [ICACHE_POLICY_AIVIVT] = "AIVIVT", [ICACHE_POLICY_VIPT] = "VIPT", [ICACHE_POLICY_PIPT] = "PIPT", }; @@ -347,7 +347,7 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info) case ICACHE_POLICY_VPIPT: set_bit(ICACHEF_VPIPT, &__icache_flags); break; - case ICACHE_POLICY_RESERVED: + case ICACHE_POLICY_AIVIVT: case ICACHE_POLICY_VIPT: /* Assume aliasing */ set_bit(ICACHEF_ALIASING, &__icache_flags);