From nobody Sat Oct 4 19:16:42 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 016F92F49E0 for ; Thu, 14 Aug 2025 09:26:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755163568; cv=none; b=ebxCIXRx1Sa/vfQqrxqRAZVP14c2YKzOtWTbLhVtFvmN+XivBxwMfhxUJGlK6dKfRobwF3rQWYHI60V63Bk0fWrGuVbu5gukGHygIXGMVsx4B6yGbX4w7/1s8wxvaynCvhOkKa9PBrDE4/AqvvQV0mLaNDjMu91pd5jSckt/nJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755163568; c=relaxed/simple; bh=o5hoKk8PVrb3Jz138QI9+seK1sxidrzo/A/lviEOL3Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Co4f5nLrLK+81ExF5q78NLR4dEvn2IXd1W9GjLt6zqFAkuZ/fsK8vLKPV4OrwSM25gqr2y59EmznhLIROY1/3LAldmmL9dj8gFhqqgLRXAijoNtgIfBuL/JVhU5lBwpKCaupBhUtZXwAiQM8zjX5K1MApkY1thhfgFFQTO7flJE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=M9S641uk; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="M9S641uk" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-45a1ac7c066so4655225e9.1 for ; Thu, 14 Aug 2025 02:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755163564; x=1755768364; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=CHd8HPOm/LFAxhlOS9e+lKUAamxvrPZUbEjnXUTZJIA=; b=M9S641uk7y40vGu/P0qaXAFNhSeXaEKdD9nwGsvVBxT+7rRafrhvvbfrx1e60/JogZ f7jYboych6Ts03qM+FHUL8Fb8cI9U/HIpUVqEmsKMVIndq+xL5Z27mvNwS9w3s8X1XLW t5C5z7/txeF/ZYa3WZcuu+JhEvlM7npiWhdHlg7ec5QXjDe49itGkiLMvl1ZmwTf0qit 1wqy4OPYbahJ6/ODUFv3L085TJjk7uXYQubX9lbhrRO8KN8T7SHDct9xRwaAzEmFSzEH fZTpXDxIuTEVaX0UzZJIw6pbzEBYzSQtGOH1H2Yhfgr2pCrGE/JPZstg3cFa+mt5/S6b ez8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755163564; x=1755768364; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CHd8HPOm/LFAxhlOS9e+lKUAamxvrPZUbEjnXUTZJIA=; b=qH+5TTEAiA72oX63+iQfzHsA7x5cbRXt9n7KRLx6fl7OvzneNdr50J+0ChvjwNl9UT VQMuN+yDWnlRocAuOs4xGVT3CXv7iKLnjb0Ol8KcsY9UbiGEJdyXTrrrzxqFxr6iGfTW 4RGYcFBmDIvNnVLNBssNvxRpan/6sJwiyEQSj7/bFrBQ17qt8TzrS4RjERD8XVkSqR1X HS+X2iZRk5xRFNp9b5FgAAMHwWPfApYIB7XCdiie9KdVuViqj61CEhgrlGop5vuqpWDA Av4CZIquyu6ZmIFyRNWEfSpyyuwh8kpsWPWJ5WiqqeDf4ymY7id93WsX1XWFJ+3H2wf0 ASRQ== X-Forwarded-Encrypted: i=1; AJvYcCVB3lyOSMamoe7OZw3IJfsppUttkKCPQgzQ6rYX+mnrYX+h5G+dR/xlOuP3mwUS+ulgaovwRsrtlVeP1W0=@vger.kernel.org X-Gm-Message-State: AOJu0YxhRaOdctAvKb0RoVYC2sYVwWd7FWx4vAzIoZVWyGgH/mik8EY+ A+iUGLLc7TS5s4OpFxLE97q43rbo0rra45rolB5qEPUR/4yqwghJVwcpSvqbLkO9dRc= X-Gm-Gg: ASbGncvyfAxLi9jY58/LOwlNDWXjAOp5W5YYZBmcAw434MtPaSKzYBTBfXKThbKMNZa uFbJ/t4P/FDxsKUXzM0hRfpCBXOoWOP9tqaDic8265JfyHqzopfakqJSH0tpK93KEPaxiQcVPqQ PxBD7zAnXKamQYaKt3GuIlY4d+8mWSoeJ12Gtq5BpRNnjlFzCEoGxb6XUBa1Uc+544lGhHI6dLX uKPL6ECygf2spH9FzflEOPGpL+8yNd9/wEOL6zwL5wlVqErSO55LZWYmC6+K9QTvJoBbFIFVgQL V2HMsCdEiDv+3r6hnnusw7vrXmFJCfllUpgD53m9jqxPsUq3+NdawePyWdk3/5SfI9jjz+NA9Kn s3kD8+/Wkfip7SG/uJlBmQDgMimXfj+g= X-Google-Smtp-Source: AGHT+IHVbFNevY/X+5Fk3dLFGyCp8s96euJO8o8AaVBD0HLHGypEL/usVLk1GhbMm0uoIXFS5XgajQ== X-Received: by 2002:a05:600c:458a:b0:459:e39e:e5a5 with SMTP id 5b1f17b1804b1-45a1b791232mr17035875e9.5.1755163564130; Thu, 14 Aug 2025 02:26:04 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.76.109]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45a1c76e9basm14536775e9.21.2025.08.14.02.26.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 02:26:03 -0700 (PDT) From: James Clark Date: Thu, 14 Aug 2025 10:25:27 +0100 Subject: [PATCH v7 05/12] arm64/boot: Factor out a macro to check SPE version Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250814-james-perf-feat_spe_eft-v7-5-6a743f7fa259@linaro.org> References: <20250814-james-perf-feat_spe_eft-v7-0-6a743f7fa259@linaro.org> In-Reply-To: <20250814-james-perf-feat_spe_eft-v7-0-6a743f7fa259@linaro.org> To: Catalin Marinas , Will Deacon , Mark Rutland , Jonathan Corbet , Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Leo Yan , Anshuman Khandual Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-doc@vger.kernel.org, kvmarm@lists.linux.dev, James Clark X-Mailer: b4 0.14.0 We check the version of SPE twice, and we'll add one more check in the next commit so factor out a macro to do this. Change the #3 magic number to the actual SPE version define (V1p2) to make it more readable. No functional changes intended. Tested-by: Leo Yan Signed-off-by: James Clark Reviewed-by: Leo Yan --- arch/arm64/include/asm/el2_setup.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el= 2_setup.h index 46033027510c..3a4ca7f9acfb 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -103,8 +103,7 @@ csel x2, xzr, x0, eq // all PMU counters from EL1 =20 /* Statistical profiling */ - ubfx x0, x1, #ID_AA64DFR0_EL1_PMSVer_SHIFT, #4 - cbz x0, .Lskip_spe_\@ // Skip if SPE not present + __spe_vers_imp .Lskip_spe_\@, ID_AA64DFR0_EL1_PMSVer_IMP, x0 // Skip if S= PE not present =20 mrs_s x0, SYS_PMBIDR_EL1 // If SPE available at EL2, and x0, x0, #(1 << PMBIDR_EL1_P_SHIFT) @@ -255,6 +254,14 @@ .Lskip_brbe_\@: .endm =20 +/* Branch to skip_label if SPE version is less than given version */ +.macro __spe_vers_imp skip_label, version, tmp + mrs \tmp, id_aa64dfr0_el1 + ubfx \tmp, \tmp, #ID_AA64DFR0_EL1_PMSVer_SHIFT, #4 + cmp \tmp, \version + b.lt \skip_label +.endm + /* Disable any fine grained traps */ .macro __init_el2_fgt mrs x1, id_aa64mmfr0_el1 @@ -263,10 +270,8 @@ =20 mov x0, xzr mov x2, xzr - mrs x1, id_aa64dfr0_el1 - ubfx x1, x1, #ID_AA64DFR0_EL1_PMSVer_SHIFT, #4 - cmp x1, #3 - b.lt .Lskip_spe_fgt_\@ + /* If SPEv1p2 is implemented, */ + __spe_vers_imp .Lskip_spe_fgt_\@, #ID_AA64DFR0_EL1_PMSVer_V1P2, x1 /* Disable PMSNEVFR_EL1 read and write traps */ orr x0, x0, #HDFGRTR_EL2_nPMSNEVFR_EL1_MASK orr x2, x2, #HDFGWTR_EL2_nPMSNEVFR_EL1_MASK --=20 2.34.1