From patchwork Thu Feb 16 16:00:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristina Martsenko X-Patchwork-Id: 58151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp381501wrn; Thu, 16 Feb 2023 08:03:12 -0800 (PST) X-Google-Smtp-Source: AK7set9fv0HwPA/73JM3bQcBLJlDZOZ4BZzGvJ/HqgwfXe+wofGDJdlyynYq+BnBcI8yZKPTIg3s X-Received: by 2002:a17:906:9f25:b0:8b1:4d5f:fb83 with SMTP id fy37-20020a1709069f2500b008b14d5ffb83mr1953409ejc.15.1676563392316; Thu, 16 Feb 2023 08:03:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676563392; cv=none; d=google.com; s=arc-20160816; b=cLDrpZqWbkQa1jZKAJiuQPw5SGQJ0kZSslZMMpzr7oEDqlJYuiBFeLZdD0adtwZyjm WRLRZOqU4OcCVWH0AQ1z9gsPQ0U22yVcpJaxwL6mVpsYrsg2CIEYe6tJWg8HzXfAic+X MrjrsYbUUuKqMUjn3n+U+nrENRpUGKfe4Uml4giK/eveuLK6wpvuQOWyEZKl/TCeW2os G3woRDl6oPBOaQa/ZvJB1NnCNDjjtEGQeZjeWXWh9mh8+B9srJ671W3REAMxAXO6FewM 17WKmDDbxEf4rmeLLJpfwMU9x0Z2VBwL4pEYP2aE2ZnLJ59TchXSzmEXBswfcdigl1ie AlFg== 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; bh=qhvBf50uPp7fJSNgWcC/TLVMF6iX6DfnouHB1iSfZSY=; b=hYt7JYtnBQFYVaF02Subugr8jOqQGs1oux8PvOA5b22HMnj0V+nCUpEs4tlfBA+r2N xQEb6PC4sMRf2dyGyuytjN+tnN+YVYUq+A1wxH35ef+hV2nE5/9J6e4SK/M68B4VWlRF Y/FPPHlzizTtZqY6jxIM+K/bN6tHUgfhjtXOCXXa9P4c1PfGOsyzM2AXuM60xV65PrnJ WUa/toanJr0OXGk2g5d6FpmP5c/jraxK4+WFoDDxR3oZLUYsgiOHleaavdsBBnWDRBm1 ACBo4OmLQvZ0XzM5ySaxktsdicKVlxWUIaTRJ4Sigm39fGBwj4QHL/f0rU7W8HHlPI9U yoUw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l4-20020a056402124400b004acbe0c6ffbsi2461914edw.482.2023.02.16.08.02.48; Thu, 16 Feb 2023 08:03:12 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229709AbjBPQBn (ORCPT + 99 others); Thu, 16 Feb 2023 11:01:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229630AbjBPQBg (ORCPT ); Thu, 16 Feb 2023 11:01:36 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5CD5C5355B for ; Thu, 16 Feb 2023 08:01:34 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D68F1168F; Thu, 16 Feb 2023 08:02:16 -0800 (PST) Received: from e126864.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 14FAD3F881; Thu, 16 Feb 2023 08:01:30 -0800 (PST) From: Kristina Martsenko To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Cc: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Mark Rutland , Mark Brown , Luis Machado , Vladimir Murzin , linux-kernel@vger.kernel.org Subject: [PATCH 02/10] arm64: cpufeature: detect FEAT_HCX Date: Thu, 16 Feb 2023 16:00:04 +0000 Message-Id: <20230216160012.272345-3-kristina.martsenko@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216160012.272345-1-kristina.martsenko@arm.com> References: <20230216160012.272345-1-kristina.martsenko@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758004135777118074?= X-GMAIL-MSGID: =?utf-8?q?1758004135777118074?= Detect if the system has the new HCRX_EL2 register added in ARMv8.7/9.2, so that subsequent patches can check for its presence. Signed-off-by: Kristina Martsenko Reviewed-by: Catalin Marinas --- arch/arm64/kernel/cpufeature.c | 12 ++++++++++++ arch/arm64/tools/cpucaps | 1 + 2 files changed, 13 insertions(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 45a42cf2191c..1b0a71541381 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -357,6 +357,7 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = { static const struct arm64_ftr_bits ftr_id_aa64mmfr1[] = { ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_TIDCP1_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_AFP_SHIFT, 4, 0), + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_HCX_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_ETS_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_TWED_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_XNX_SHIFT, 4, 0), @@ -2290,6 +2291,17 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .type = ARM64_CPUCAP_SYSTEM_FEATURE, .matches = is_kvm_protected_mode, }, + { + .desc = "HCRX_EL2 register", + .capability = ARM64_HAS_HCX, + .type = ARM64_CPUCAP_SYSTEM_FEATURE, + .sys_reg = SYS_ID_AA64MMFR1_EL1, + .sign = FTR_UNSIGNED, + .field_pos = ID_AA64MMFR1_EL1_HCX_SHIFT, + .field_width = 4, + .min_field_value = ID_AA64MMFR1_EL1_HCX_IMP, + .matches = has_cpuid_feature, + }, #endif { .desc = "Kernel page table isolation (KPTI)", diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index 10dcfa13390a..bf32a1122c04 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -31,6 +31,7 @@ HAS_GENERIC_AUTH_IMP_DEF HAS_GIC_CPUIF_SYSREGS HAS_GIC_PRIO_MASKING HAS_GIC_PRIO_RELAXED_SYNC +HAS_HCX HAS_LDAPR HAS_LSE_ATOMICS HAS_NO_FPSIMD