From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F001C47247 for ; Tue, 5 May 2020 07:02:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8106A2064A for ; Tue, 5 May 2020 07:02:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728268AbgEEHCb (ORCPT ); Tue, 5 May 2020 03:02:31 -0400 Received: from foss.arm.com ([217.140.110.172]:60978 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725320AbgEEHC3 (ORCPT ); Tue, 5 May 2020 03:02:29 -0400 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 599271FB; Tue, 5 May 2020 00:02:28 -0700 (PDT) Received: from [10.163.71.248] (unknown [10.163.71.248]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 467B53F68F; Tue, 5 May 2020 00:02:24 -0700 (PDT) Subject: Re: [PATCH V3 06/16] arm64/cpufeature: Introduce ID_MMFR5 CPU register To: Will Deacon Cc: linux-arm-kernel@lists.infradead.org, Catalin Marinas , Marc Zyngier , Mark Rutland , James Morse , Suzuki K Poulose , kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org References: <1588426445-24344-1-git-send-email-anshuman.khandual@arm.com> <1588426445-24344-7-git-send-email-anshuman.khandual@arm.com> <20200504203313.GB5012@willie-the-truck> From: Anshuman Khandual Message-ID: <97cd9ba9-d5de-2a85-5eac-0cb460061617@arm.com> Date: Tue, 5 May 2020 12:31:54 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200504203313.GB5012@willie-the-truck> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/05/2020 02:03 AM, Will Deacon wrote: > On Sat, May 02, 2020 at 07:03:55PM +0530, Anshuman Khandual wrote: >> This adds basic building blocks required for ID_MMFR5 CPU register which >> provides information about the implemented memory model and memory >> management support in AArch32 state. This is added per ARM DDI 0487F.a >> specification. >> >> Cc: Catalin Marinas >> Cc: Will Deacon >> Cc: Marc Zyngier >> Cc: Mark Rutland >> Cc: James Morse >> Cc: Suzuki K Poulose >> Cc: kvmarm@lists.cs.columbia.edu >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-kernel@vger.kernel.org >> >> Suggested-by: Will Deacon >> Signed-off-by: Anshuman Khandual >> --- >> arch/arm64/include/asm/cpu.h | 1 + >> arch/arm64/include/asm/sysreg.h | 3 +++ >> arch/arm64/kernel/cpufeature.c | 10 ++++++++++ >> arch/arm64/kernel/cpuinfo.c | 1 + >> arch/arm64/kvm/sys_regs.c | 2 +- >> 5 files changed, 16 insertions(+), 1 deletion(-) > > [...] > >> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c >> index 2ce952d9668d..c790cc200bb1 100644 >> --- a/arch/arm64/kernel/cpufeature.c >> +++ b/arch/arm64/kernel/cpufeature.c >> @@ -403,6 +403,11 @@ static const struct arm64_ftr_bits ftr_id_isar4[] = { >> ARM64_FTR_END, >> }; >> >> +static const struct arm64_ftr_bits ftr_id_mmfr5[] = { >> + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR5_ETS_SHIFT, 4, 0), >> + ARM64_FTR_END, >> +}; >> + >> static const struct arm64_ftr_bits ftr_id_isar6[] = { >> ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_I8MM_SHIFT, 4, 0), >> ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_BF16_SHIFT, 4, 0), >> @@ -527,6 +532,7 @@ static const struct __ftr_reg_entry { >> ARM64_FTR_REG(SYS_MVFR2_EL1, ftr_mvfr2), >> ARM64_FTR_REG(SYS_ID_PFR2_EL1, ftr_id_pfr2), >> ARM64_FTR_REG(SYS_ID_DFR1_EL1, ftr_id_dfr1), >> + ARM64_FTR_REG(SYS_ID_MMFR5_EL1, ftr_id_mmfr5), >> >> /* Op1 = 0, CRn = 0, CRm = 4 */ >> ARM64_FTR_REG(SYS_ID_AA64PFR0_EL1, ftr_id_aa64pfr0), >> @@ -732,6 +738,7 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info) >> init_cpu_ftr_reg(SYS_ID_MMFR1_EL1, info->reg_id_mmfr1); >> init_cpu_ftr_reg(SYS_ID_MMFR2_EL1, info->reg_id_mmfr2); >> init_cpu_ftr_reg(SYS_ID_MMFR3_EL1, info->reg_id_mmfr3); >> + init_cpu_ftr_reg(SYS_ID_MMFR5_EL1, info->reg_id_mmfr5); >> init_cpu_ftr_reg(SYS_ID_PFR0_EL1, info->reg_id_pfr0); >> init_cpu_ftr_reg(SYS_ID_PFR1_EL1, info->reg_id_pfr1); >> init_cpu_ftr_reg(SYS_ID_PFR2_EL1, info->reg_id_pfr2); >> @@ -866,6 +873,8 @@ static int update_32bit_cpu_features(int cpu, struct cpuinfo_arm64 *info, >> info->reg_id_mmfr2, boot->reg_id_mmfr2); >> taint |= check_update_ftr_reg(SYS_ID_MMFR3_EL1, cpu, >> info->reg_id_mmfr3, boot->reg_id_mmfr3); > > Looks like MMFR4 is missing here? ID_MMFR4 is missing from cpuinfo_arm64 itself, hence from init_cpu_features() and update_cpu_features() as well. But it is defined in arm64_ftr_regs[]. I was wondering about it but left as it is (due to lack of complete context). Unless there is any other concern, will add it up in cpuinfo_arm64 and make it a part of the CPU context. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9E6BC47247 for ; Tue, 5 May 2020 07:02:36 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 9045820721 for ; Tue, 5 May 2020 07:02:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9045820721 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id CFD184B319; Tue, 5 May 2020 03:02:35 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QMkuULRjz9cp; Tue, 5 May 2020 03:02:34 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 9A5974B30E; Tue, 5 May 2020 03:02:34 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B14654B2CC for ; Tue, 5 May 2020 03:02:32 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tEwAtC88W4oe for ; Tue, 5 May 2020 03:02:29 -0400 (EDT) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id EFB984B2A2 for ; Tue, 5 May 2020 03:02:28 -0400 (EDT) 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 599271FB; Tue, 5 May 2020 00:02:28 -0700 (PDT) Received: from [10.163.71.248] (unknown [10.163.71.248]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 467B53F68F; Tue, 5 May 2020 00:02:24 -0700 (PDT) Subject: Re: [PATCH V3 06/16] arm64/cpufeature: Introduce ID_MMFR5 CPU register To: Will Deacon References: <1588426445-24344-1-git-send-email-anshuman.khandual@arm.com> <1588426445-24344-7-git-send-email-anshuman.khandual@arm.com> <20200504203313.GB5012@willie-the-truck> From: Anshuman Khandual Message-ID: <97cd9ba9-d5de-2a85-5eac-0cb460061617@arm.com> Date: Tue, 5 May 2020 12:31:54 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200504203313.GB5012@willie-the-truck> Content-Language: en-US Cc: Catalin Marinas , linux-kernel@vger.kernel.org, Marc Zyngier , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On 05/05/2020 02:03 AM, Will Deacon wrote: > On Sat, May 02, 2020 at 07:03:55PM +0530, Anshuman Khandual wrote: >> This adds basic building blocks required for ID_MMFR5 CPU register which >> provides information about the implemented memory model and memory >> management support in AArch32 state. This is added per ARM DDI 0487F.a >> specification. >> >> Cc: Catalin Marinas >> Cc: Will Deacon >> Cc: Marc Zyngier >> Cc: Mark Rutland >> Cc: James Morse >> Cc: Suzuki K Poulose >> Cc: kvmarm@lists.cs.columbia.edu >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-kernel@vger.kernel.org >> >> Suggested-by: Will Deacon >> Signed-off-by: Anshuman Khandual >> --- >> arch/arm64/include/asm/cpu.h | 1 + >> arch/arm64/include/asm/sysreg.h | 3 +++ >> arch/arm64/kernel/cpufeature.c | 10 ++++++++++ >> arch/arm64/kernel/cpuinfo.c | 1 + >> arch/arm64/kvm/sys_regs.c | 2 +- >> 5 files changed, 16 insertions(+), 1 deletion(-) > > [...] > >> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c >> index 2ce952d9668d..c790cc200bb1 100644 >> --- a/arch/arm64/kernel/cpufeature.c >> +++ b/arch/arm64/kernel/cpufeature.c >> @@ -403,6 +403,11 @@ static const struct arm64_ftr_bits ftr_id_isar4[] = { >> ARM64_FTR_END, >> }; >> >> +static const struct arm64_ftr_bits ftr_id_mmfr5[] = { >> + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR5_ETS_SHIFT, 4, 0), >> + ARM64_FTR_END, >> +}; >> + >> static const struct arm64_ftr_bits ftr_id_isar6[] = { >> ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_I8MM_SHIFT, 4, 0), >> ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_BF16_SHIFT, 4, 0), >> @@ -527,6 +532,7 @@ static const struct __ftr_reg_entry { >> ARM64_FTR_REG(SYS_MVFR2_EL1, ftr_mvfr2), >> ARM64_FTR_REG(SYS_ID_PFR2_EL1, ftr_id_pfr2), >> ARM64_FTR_REG(SYS_ID_DFR1_EL1, ftr_id_dfr1), >> + ARM64_FTR_REG(SYS_ID_MMFR5_EL1, ftr_id_mmfr5), >> >> /* Op1 = 0, CRn = 0, CRm = 4 */ >> ARM64_FTR_REG(SYS_ID_AA64PFR0_EL1, ftr_id_aa64pfr0), >> @@ -732,6 +738,7 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info) >> init_cpu_ftr_reg(SYS_ID_MMFR1_EL1, info->reg_id_mmfr1); >> init_cpu_ftr_reg(SYS_ID_MMFR2_EL1, info->reg_id_mmfr2); >> init_cpu_ftr_reg(SYS_ID_MMFR3_EL1, info->reg_id_mmfr3); >> + init_cpu_ftr_reg(SYS_ID_MMFR5_EL1, info->reg_id_mmfr5); >> init_cpu_ftr_reg(SYS_ID_PFR0_EL1, info->reg_id_pfr0); >> init_cpu_ftr_reg(SYS_ID_PFR1_EL1, info->reg_id_pfr1); >> init_cpu_ftr_reg(SYS_ID_PFR2_EL1, info->reg_id_pfr2); >> @@ -866,6 +873,8 @@ static int update_32bit_cpu_features(int cpu, struct cpuinfo_arm64 *info, >> info->reg_id_mmfr2, boot->reg_id_mmfr2); >> taint |= check_update_ftr_reg(SYS_ID_MMFR3_EL1, cpu, >> info->reg_id_mmfr3, boot->reg_id_mmfr3); > > Looks like MMFR4 is missing here? ID_MMFR4 is missing from cpuinfo_arm64 itself, hence from init_cpu_features() and update_cpu_features() as well. But it is defined in arm64_ftr_regs[]. I was wondering about it but left as it is (due to lack of complete context). Unless there is any other concern, will add it up in cpuinfo_arm64 and make it a part of the CPU context. _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79A81C47257 for ; Tue, 5 May 2020 07:02:33 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4B9F120721 for ; Tue, 5 May 2020 07:02:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="C7q60pQx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B9F120721 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=U/+osn9lFNPGgRtj4vB1RzFgmI8abKZDVhfeZMsTDf8=; b=C7q60pQxqdfD8g vxnI2XMspz+c1Zu1guaKPNCL+wga5lvyrwcCxlUnBxqgr6QImjpnJlreQKZj2DRFavw3mjOD5Y31H r9zYvQpYyOLlm/nRk9HGd8n5LwPfj6qAuM96RO+mUovYjHYfY8vnzMqASCYRQZgBe2UcpDvkvZrOP gxWmbVVRFOeCiv34C072OSfBFErhlv5q3GISj6KvrhuxH23jSD1a0MF4nfpoBIgIQup0fL7S6ogO4 SC/2TH4cmRoYIjuqC63N9IC1rCcDR3cxWilwybGfIsEZEr5nTg1xmvyKsdNdF4ZvAb+8K06mRsVXp TgrKFMO7e1Ux+2AEDcxw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jVrb6-0006md-VO; Tue, 05 May 2020 07:02:32 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jVrb4-0006lO-04 for linux-arm-kernel@lists.infradead.org; Tue, 05 May 2020 07:02:31 +0000 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 599271FB; Tue, 5 May 2020 00:02:28 -0700 (PDT) Received: from [10.163.71.248] (unknown [10.163.71.248]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 467B53F68F; Tue, 5 May 2020 00:02:24 -0700 (PDT) Subject: Re: [PATCH V3 06/16] arm64/cpufeature: Introduce ID_MMFR5 CPU register To: Will Deacon References: <1588426445-24344-1-git-send-email-anshuman.khandual@arm.com> <1588426445-24344-7-git-send-email-anshuman.khandual@arm.com> <20200504203313.GB5012@willie-the-truck> From: Anshuman Khandual Message-ID: <97cd9ba9-d5de-2a85-5eac-0cb460061617@arm.com> Date: Tue, 5 May 2020 12:31:54 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200504203313.GB5012@willie-the-truck> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200505_000230_126963_578E79DC X-CRM114-Status: GOOD ( 18.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Suzuki K Poulose , Catalin Marinas , linux-kernel@vger.kernel.org, James Morse , Marc Zyngier , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 05/05/2020 02:03 AM, Will Deacon wrote: > On Sat, May 02, 2020 at 07:03:55PM +0530, Anshuman Khandual wrote: >> This adds basic building blocks required for ID_MMFR5 CPU register which >> provides information about the implemented memory model and memory >> management support in AArch32 state. This is added per ARM DDI 0487F.a >> specification. >> >> Cc: Catalin Marinas >> Cc: Will Deacon >> Cc: Marc Zyngier >> Cc: Mark Rutland >> Cc: James Morse >> Cc: Suzuki K Poulose >> Cc: kvmarm@lists.cs.columbia.edu >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-kernel@vger.kernel.org >> >> Suggested-by: Will Deacon >> Signed-off-by: Anshuman Khandual >> --- >> arch/arm64/include/asm/cpu.h | 1 + >> arch/arm64/include/asm/sysreg.h | 3 +++ >> arch/arm64/kernel/cpufeature.c | 10 ++++++++++ >> arch/arm64/kernel/cpuinfo.c | 1 + >> arch/arm64/kvm/sys_regs.c | 2 +- >> 5 files changed, 16 insertions(+), 1 deletion(-) > > [...] > >> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c >> index 2ce952d9668d..c790cc200bb1 100644 >> --- a/arch/arm64/kernel/cpufeature.c >> +++ b/arch/arm64/kernel/cpufeature.c >> @@ -403,6 +403,11 @@ static const struct arm64_ftr_bits ftr_id_isar4[] = { >> ARM64_FTR_END, >> }; >> >> +static const struct arm64_ftr_bits ftr_id_mmfr5[] = { >> + ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_MMFR5_ETS_SHIFT, 4, 0), >> + ARM64_FTR_END, >> +}; >> + >> static const struct arm64_ftr_bits ftr_id_isar6[] = { >> ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_I8MM_SHIFT, 4, 0), >> ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_ISAR6_BF16_SHIFT, 4, 0), >> @@ -527,6 +532,7 @@ static const struct __ftr_reg_entry { >> ARM64_FTR_REG(SYS_MVFR2_EL1, ftr_mvfr2), >> ARM64_FTR_REG(SYS_ID_PFR2_EL1, ftr_id_pfr2), >> ARM64_FTR_REG(SYS_ID_DFR1_EL1, ftr_id_dfr1), >> + ARM64_FTR_REG(SYS_ID_MMFR5_EL1, ftr_id_mmfr5), >> >> /* Op1 = 0, CRn = 0, CRm = 4 */ >> ARM64_FTR_REG(SYS_ID_AA64PFR0_EL1, ftr_id_aa64pfr0), >> @@ -732,6 +738,7 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info) >> init_cpu_ftr_reg(SYS_ID_MMFR1_EL1, info->reg_id_mmfr1); >> init_cpu_ftr_reg(SYS_ID_MMFR2_EL1, info->reg_id_mmfr2); >> init_cpu_ftr_reg(SYS_ID_MMFR3_EL1, info->reg_id_mmfr3); >> + init_cpu_ftr_reg(SYS_ID_MMFR5_EL1, info->reg_id_mmfr5); >> init_cpu_ftr_reg(SYS_ID_PFR0_EL1, info->reg_id_pfr0); >> init_cpu_ftr_reg(SYS_ID_PFR1_EL1, info->reg_id_pfr1); >> init_cpu_ftr_reg(SYS_ID_PFR2_EL1, info->reg_id_pfr2); >> @@ -866,6 +873,8 @@ static int update_32bit_cpu_features(int cpu, struct cpuinfo_arm64 *info, >> info->reg_id_mmfr2, boot->reg_id_mmfr2); >> taint |= check_update_ftr_reg(SYS_ID_MMFR3_EL1, cpu, >> info->reg_id_mmfr3, boot->reg_id_mmfr3); > > Looks like MMFR4 is missing here? ID_MMFR4 is missing from cpuinfo_arm64 itself, hence from init_cpu_features() and update_cpu_features() as well. But it is defined in arm64_ftr_regs[]. I was wondering about it but left as it is (due to lack of complete context). Unless there is any other concern, will add it up in cpuinfo_arm64 and make it a part of the CPU context. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel