From nobody Mon Feb 9 21:19:30 2026 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA84A36137 for ; Tue, 9 Apr 2024 01:30:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712626205; cv=none; b=NKnqZMgGc4pk2HvLnCQcVX41ReHQC9QET4gyVr5rP2cMipQF4qiuiOjoZ3/p+T4plH3lDMryMkL6tJokjvE9xECR98DEsGWmLzceRQkI3VLZ4fsH5zhgOsrQwe7YFwdulA6y+iANIVv80dEJ9Cs9EBwUvaQBU2wVNSJ0y3xGUDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712626205; c=relaxed/simple; bh=OjZmqpTC2ehTHN8Sd68worBXYXZg9Jpv/26xY6sXNS0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XpO9XhhBAteBkZj08tLNvtmNZf+bqPmhOOqrgi1DBJ+B0LCiBecTRXpm4/BTJ4J/9tpHDSsu4tr3YwvhUJa9m9Z7/oLpAONmSfUbbtBkrVpOzkSoUlnPFI/YIorPczAOwss8X4ph2N/IVVnjhexmj8IbnGbfmGC4u8UpDua5N00= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4VD7cf02b2zNn6P; Tue, 9 Apr 2024 09:27:46 +0800 (CST) Received: from kwepemd200013.china.huawei.com (unknown [7.221.188.133]) by mail.maildlp.com (Postfix) with ESMTPS id 8CEAC18007D; Tue, 9 Apr 2024 09:30:00 +0800 (CST) Received: from huawei.com (10.67.174.28) by kwepemd200013.china.huawei.com (7.221.188.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 9 Apr 2024 09:29:59 +0800 From: Liao Chang To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: , , Subject: [PATCH 4/9] arm64/cpufeature: Simplify detect PE support for FEAT_NMI Date: Tue, 9 Apr 2024 01:23:39 +0000 Message-ID: <20240409012344.3194724-5-liaochang1@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240409012344.3194724-1-liaochang1@huawei.com> References: <20240409012344.3194724-1-liaochang1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd200013.china.huawei.com (7.221.188.133) Content-Type: text/plain; charset="utf-8" From: Jinjie Ruan Simplify the Non-maskable Interrupts feature implementation with ARM64_CPUID_FIELDS macro. Signed-off-by: Jinjie Ruan --- arch/arm64/kernel/cpufeature.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index fb9e52c84fda..99c3bc74008d 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2905,24 +2905,16 @@ static const struct arm64_cpu_capabilities arm64_fe= atures[] =3D { .desc =3D "Non-maskable Interrupts present", .capability =3D ARM64_HAS_NMI, .type =3D ARM64_CPUCAP_BOOT_CPU_FEATURE, - .sys_reg =3D SYS_ID_AA64PFR1_EL1, - .sign =3D FTR_UNSIGNED, - .field_pos =3D ID_AA64PFR1_EL1_NMI_SHIFT, - .field_width =3D 4, - .min_field_value =3D ID_AA64PFR1_EL1_NMI_IMP, .matches =3D has_cpuid_feature, + ARM64_CPUID_FIELDS(ID_AA64PFR1_EL1, NMI, IMP) }, { .desc =3D "Non-maskable Interrupts enabled", .capability =3D ARM64_USES_NMI, .type =3D ARM64_CPUCAP_BOOT_CPU_FEATURE, - .sys_reg =3D SYS_ID_AA64PFR1_EL1, - .sign =3D FTR_UNSIGNED, - .field_pos =3D ID_AA64PFR1_EL1_NMI_SHIFT, - .field_width =3D 4, - .min_field_value =3D ID_AA64PFR1_EL1_NMI_IMP, .matches =3D use_nmi, .cpu_enable =3D nmi_enable, + ARM64_CPUID_FIELDS(ID_AA64PFR1_EL1, NMI, IMP) }, #endif {}, --=20 2.34.1