From patchwork Tue Jul 18 19:45:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 122212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1991943vqt; Tue, 18 Jul 2023 13:29:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlHKy1SjErPemsS8t7QBR8U81xOzFH87NkJCWEkpeQLuiqTOfZN07QCOvKT/FqqwkUdepOCY X-Received: by 2002:a05:6a00:3a26:b0:66f:fa65:483 with SMTP id fj38-20020a056a003a2600b0066ffa650483mr14904621pfb.0.1689712167783; Tue, 18 Jul 2023 13:29:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689712167; cv=none; d=google.com; s=arc-20160816; b=RwpXa+bKyDzxaPlt83d+ENYRFjC/Jr6O/8t4Xv1iWGUBORT+VipeONqPJ23fA3aMf5 T9yGj0lJ4TBabGDezhbAphYECi3/dYvEM1W6nAQn6md9hs/4a0cHWdtQD5GedVjssJSG g5BxX7Qaq+RBwwRMrKzBUlHYfKXgtH1Kzr8byRhstnXoj0ZgC4+DcrWk0JHdi9J8Ig95 negrsL8QbbbBJJqD4/S3znRGmJM7tMwSaMTSkCSYC5L0Clfe7pzZbx4Nw6GPBgtE2bM0 lz/V8XT+GT38EZv64Rva+MaJSygaMOC1luB+GluRIJIlpDuJMLHcVEYxRpolCFY2SsLM WSmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=Pfumda0O/Bn5ccrEjf4dGkDMbkBF0wgdiykq9dtlQeM=; fh=mmnYMrzza9qIhc2+Z15/1GoW7mAEAg13yyzBwpaiwtk=; b=GSJgK34+jcw04Eop+F5JXV0FR+SIJEzJXIby2Yi3A5mINbOaF4e/f9PsVwlv2UB7Qn GjN9EzceLLEGGl9YDhVhCgNx9Wv/+L/ycZhfsPqF8HNB9zKcTp3rLGWdigMR3Dpeot6/ ZnHvTc1Bl0fr05Okf1nXwxyt0XKa7B/j/EZk5fuaqVyGvR/6uZnyeZXahAirypj02PPE 0gBXCH8sKBvtYtFhbChC4V7fNfkooko2yLuyJOg0s4Tv9WHzTTNssz454DJvYrmwG69W 8+iAxrJa7Uv8HXBo3ltDE07WSqAcmrhVD6TQ1o19TgonvMHIvOFI3MjzZxnFuLQLy12l kl5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Dd1v3n+a; 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 bd44-20020a056a0027ac00b0067f03c85d73si1958067pfb.115.2023.07.18.13.29.11; Tue, 18 Jul 2023 13:29:27 -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=Dd1v3n+a; 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 S230013AbjGRTp4 (ORCPT + 99 others); Tue, 18 Jul 2023 15:45:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229506AbjGRTpy (ORCPT ); Tue, 18 Jul 2023 15:45:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C1EC198D for ; Tue, 18 Jul 2023 12:45:53 -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 191C360B99 for ; Tue, 18 Jul 2023 19:45:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7117BC433C9; Tue, 18 Jul 2023 19:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689709552; bh=0rN5CSxJDnCuMqJvHrYdXsQ52WEJJPMcuK7y/yvyczU=; h=From:Date:Subject:To:Cc:From; b=Dd1v3n+a46acUabS0xtg5DS8Lg8HgQOsArtsn8JEgsgIJTTY+kgTrzj0lhTD1feQu 1FdCLetRzF6IRtLXMtEab928tNwrda5BgJ3yznq8IxZwUAckrtBTIbwMxjXWw7CMOv TI08ZdJEpNTEm8LfJ4xU0PG57/1RUbi/zB6aNmTvthIx5HlpIFl8a1gIMx63v5vSWO U8qwuyOweh7ErMpAaBAaD+zPbiLLKlVF5sQOq5D/l+q16eqJr189JLMUMeXitHOR81 jpVdjeTzONIj/aDsJVEBTJuw3iwQgKvTCDjCFLZF51XJyfLnSomLklxnP8dRojqCSy jDLCx1fNUaU+w== From: Mark Brown Date: Tue, 18 Jul 2023 20:45:44 +0100 Subject: [PATCH] arm64/cpufeature: Use ARM64_CPUID_FIELD() to match EVT MIME-Version: 1.0 Message-Id: <20230718-arm64-evt-cpuid-helper-v1-1-68375d1e6b92@kernel.org> X-B4-Tracking: v=1; b=H4sIAOjrtmQC/x3MSQqAMAxA0atI1gYcqkGvIi5KjRpwKKmKIN7d4 vIt/n8gsAoHaJMHlC8Jsm8ReZqAm+02McoQDUVWlBnlhFbX2iBfBzp/yoAzL54VK0NkyZm6GUu IsVce5f7HXf++H5lI1PVoAAAA To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1160; i=broonie@kernel.org; h=from:subject:message-id; bh=0rN5CSxJDnCuMqJvHrYdXsQ52WEJJPMcuK7y/yvyczU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBktuvuoNn0zPzmd2bZeawg85F4MyZ+ktLaO8JSzmO1 0Vm0WUOJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZLbr7gAKCRAk1otyXVSH0KsUB/ 9vRmOUHdOjFGPbQF4xn07mtjEXbTQTNFiHnKkF3H3l7z/XcoL9l5ijeFM96zxJXgypi08YhoNuX0cj dae1/zPklYnFMF/5rS3sxDmCueojaLPUhWUw9oMyemzE2aOxACVcro+xaN7J6cox1Pg0YWrGPs3QD/ JLMpMoQ+u+lPpmqBrF+79IBOtCGQfmEMtjRHZM9Iw9mSdRlDyZPaRTc10JODu/kBAa91fKThOJr9O5 v2zBDuCY3JABS55z7Ro2iUD9zMBDYR5fy3QgcnF/8DRJ5QG7DwQvCAnEHktjuKYXY9vwwdxx0EDDr+ obguEajiLzs1MWGVTAM9mofa7y2Vdg X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: 1771791626130713582 X-GMAIL-MSGID: 1771791626130713582 The recently added Enhanced Virtualization Traps cpufeature does not use the ARM64_CPUID_FIELDS() helper, convert it to do so. No functional change. Signed-off-by: Mark Brown Reviewed-by: Zenghui Yu --- arch/arm64/kernel/cpufeature.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c change-id: 20230717-arm64-evt-cpuid-helper-5477a7c469f3 Best regards, diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index f9d456fe132d..bcb006390e55 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2708,12 +2708,8 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .desc = "Enhanced Virtualization Traps", .capability = ARM64_HAS_EVT, .type = ARM64_CPUCAP_SYSTEM_FEATURE, - .sys_reg = SYS_ID_AA64MMFR2_EL1, - .sign = FTR_UNSIGNED, - .field_pos = ID_AA64MMFR2_EL1_EVT_SHIFT, - .field_width = 4, - .min_field_value = ID_AA64MMFR2_EL1_EVT_IMP, .matches = has_cpuid_feature, + ARM64_CPUID_FIELDS(ID_AA64MMFR2_EL1, EVT, IMP) }, {}, };