From patchwork Fri Dec 10 16:54:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12695616 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DB158C433FE for ; Fri, 10 Dec 2021 16:57:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5UjX0HXwVk3ihMMTJquAkahFtKITN1+PI5FvU4iIiR8=; b=R+gotet0AFnBxc TVFtqvTQBjCmkBQRNz7YCEdJrTRWmQjYHG89MrrnbXWEqHlXOSfSBMVdBKAOxw+lEWrtLHkTddzLp KauFOoXbIMhI63/o7z/p0RvacbJCLnMUzCTSpOXC1bBI9c+SX0YQATZqy7UKXyPsO9H65jUf4/dNP Ol098/oXiL2luaEFRu+Fk43j+RYodPa8M5Q+Uf+pELVvhUPUYC1IpR0v0Zs67vVIEaQjImS1McrNy 4fY+itexlG0oUBTDhyI/Ks2oFxEhTS86j4skYz0EYeZ9GoX9tLjYydi4MUvU+H2OZZpUIKs54khwf vz0eatkRMf2qxEU59yrQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mvjAv-002etr-0g; Fri, 10 Dec 2021 16:55:13 +0000 Received: from mail-eopbgr30056.outbound.protection.outlook.com ([40.107.3.56] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mvjAc-002eob-F6 for linux-arm-kernel@lists.infradead.org; Fri, 10 Dec 2021 16:54:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9lDkNEFk8RQdcEB82yprqZKvXxhkFrSDtH499VMxWy4=; b=BgPU2s+sJEPm0EdP+KXFySHuFoVCrsf0S72NgIQvCTuQZuQuSDYDZRRquBsF9cZ+VSwJmmAYCCEj7ZtJFBSUE+vjfTTsCdpb1Vd841a0Y0/V84FxpFPOhMCxYAgVnReEMsZuqFn+q5dyYJp8WxqdAAEvKBedVL7Qo2KZOlEUgHE= Received: from AS8P189CA0013.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:31f::22) by DU2PR08MB7376.eurprd08.prod.outlook.com (2603:10a6:10:2f4::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Fri, 10 Dec 2021 16:54:49 +0000 Received: from VE1EUR03FT058.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:31f:cafe::a5) by AS8P189CA0013.outlook.office365.com (2603:10a6:20b:31f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.14 via Frontend Transport; Fri, 10 Dec 2021 16:54:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT058.mail.protection.outlook.com (10.152.19.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Fri, 10 Dec 2021 16:54:48 +0000 Received: ("Tessian outbound f493ab4f1fb8:v110"); Fri, 10 Dec 2021 16:54:48 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 21248d9cc4fa16ec X-CR-MTA-TID: 64aa7808 Received: from 900cefba5978.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E75E0A84-DCF8-4F3B-A5C8-DD1D7B355D68.1; Fri, 10 Dec 2021 16:54:42 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 900cefba5978.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 10 Dec 2021 16:54:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wan0sL3JXcwGkrAvn9QXGjNOInIapX1eIJ1xgRnxtlKga7VKZ/fuYwRow4qQ/ZKzq2a0Jq45yDUFM9zaODs1xWV1DSIQyXCodpxtv8v7mOvkwqfdb7VGi67eCl41/x8ocbXebGgwM3mQXK4u9Y9K29s8Sl8HS1DVyiSxi6v63JQ3hRSq9GJiGKSwq0aNjWC1ga2GyWzaICUBAUcb53vL0WvYRAT6YYIa/zlVMzWVnwmuuPdMCFElAv2YmQhJYmLI51bHoLO4wahOQH8tNlMOirfiw7NxQr0ZFdBHvd8WllgyIOlemMVDLAtl3bzazCcMcUg7Db2UZevgcMyGSAacUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9lDkNEFk8RQdcEB82yprqZKvXxhkFrSDtH499VMxWy4=; b=L26yZhfhyNawPDX0AM3gaR6xt6+z8zY364UkmyxwBwu1h9JHnPjlIxlQ1hb4bb/QZNYw4hmSdC+3tcbQdmb/90TZaMxvhuaEsuH7E5Xaqm+UoTb6H1EXLJN+IPSOrF0xabacAgsBBzdCnPauFXwH1YTxTMEp+14HIc24NYEcdrztg2ADfkbhqWYVv3xkgwk3/P11aCvUA8CrtW42cQZeijzbgfWkez6br0A/tvrbnYIpxz4k852Y8ne0+ZH3AMtVR4MmQjAFJTjC25nAyYFXhNL4DWAOYjkyI5/2mqttknnbE6GNRfgVZux9SsRnDxcJnCS9a3dXJTa4OltpXUNecQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9lDkNEFk8RQdcEB82yprqZKvXxhkFrSDtH499VMxWy4=; b=BgPU2s+sJEPm0EdP+KXFySHuFoVCrsf0S72NgIQvCTuQZuQuSDYDZRRquBsF9cZ+VSwJmmAYCCEj7ZtJFBSUE+vjfTTsCdpb1Vd841a0Y0/V84FxpFPOhMCxYAgVnReEMsZuqFn+q5dyYJp8WxqdAAEvKBedVL7Qo2KZOlEUgHE= Received: from AM7PR03CA0029.eurprd03.prod.outlook.com (2603:10a6:20b:130::39) by PAXPR08MB6464.eurprd08.prod.outlook.com (2603:10a6:102:df::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.13; Fri, 10 Dec 2021 16:54:40 +0000 Received: from VE1EUR03FT014.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:130:cafe::4b) by AM7PR03CA0029.outlook.office365.com (2603:10a6:20b:130::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Fri, 10 Dec 2021 16:54:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT014.mail.protection.outlook.com (10.152.19.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Fri, 10 Dec 2021 16:54:40 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Fri, 10 Dec 2021 16:54:38 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Fri, 10 Dec 2021 16:54:37 +0000 From: Joey Gouly To: CC: , , , , , , , , , Subject: [PATCH v3 1/3] arm64: cpufeature: add HWCAP for FEAT_AFP Date: Fri, 10 Dec 2021 16:54:30 +0000 Message-ID: <20211210165432.8106-2-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211210165432.8106-1-joey.gouly@arm.com> References: <20211210165432.8106-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 9dd41f85-8385-4cbc-3452-08d9bbfdc6e4 X-MS-TrafficTypeDiagnostic: PAXPR08MB6464:EE_|VE1EUR03FT058:EE_|DU2PR08MB7376:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:6108;OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: MfQQ+TEmhube+EeOfGBQ1g8PSPPqrxuM6fDdsm60n6NTXuxmcIWmpVVvPzkXWQRPn99To622MF0uJ0lygYw+TwaU0pK38+Jr82S3rVnca/mQxm/hpONVPSmOMOvgnNQVjABRdpuC8VeG1LEoZpY3I8LoTFgB7VoI4OUTJ6xZOQTI5Itjf0vLJCJ42XJte2nTqmQfunXRQ+WXsD5F2L2qXZPuCLEY1+1WPVwQb35aszPVE/6KSQ+K3sQuNgaoDk41kZX/1mb29yoQOEiBkBMJGr8+oA9x3qqPAII1SvOIybEKIdESv29i+Cxsh1b1L/vd/YKK9wXTn5sOUYFvhyP8Gb0t459tOBqVBX1qRc09S7El2J0Tb293PaIVMxx/pgUm8YYTcIDulrUwgXdrxRT/YUtT1H42Bn1UPpgUkQUiSFAfUNt5W4Y2dk5cNW9PO2pMMePZIPS3pcnETF6dTkg/BvyaoSM+0WKY7cxWX3pd3KSJSjbli0lcoXAz+Uqd91Tf/+JaqjfbtLWnZvbZrGSbYC8dvQaOPUKv+mYEwaozS2dIqlKvGaJtcmYxOGl8Ej5dSZFto9slG/nosxCGEKa3KcnWU72WPZ2Y1Ih3zTYfixJ0KPS1RYUqz90HAguPDHD8wQEv3/XBRqKuHqRL1kE4dX7qYPoAKnm+Set0aaaO3WmZU0jpNtEkUI6ULXk3xFGotZ0/wnj8n7GFWIWF2zV3nmKjgQk0602hKmb3JtZEcSMa0Fw7xC3SzDM4Pi2tCdGP/u9KuEllashcogQBG8x1JNkYuEDk0vFfHzImt1rcBxE= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:nebula.arm.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(40470700001)(1076003)(54906003)(4326008)(186003)(83380400001)(36860700001)(8936002)(316002)(26005)(6916009)(81166007)(86362001)(47076005)(70586007)(70206006)(44832011)(508600001)(2906002)(5660300002)(356005)(7696005)(336012)(36756003)(2616005)(8676002)(82310400004)(426003)(6666004)(40460700001)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6464 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT058.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: d357f2d5-ec90-4f14-f61f-08d9bbfdc1d8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6vWPCGSNrYSu8eRiPoTVOnVw02tYq3M3+IaC5ilvqxxh/CiAREjtvkjSrP4zsSYb5gRV1mSniORHgSLaALIKBgKl8F0KFdWnJeN8IiqUuw02VSzRq3VHU8wFvLPFYrt/qeua6k2mQktX4yUPdtP2r3+qTcllDCeD4L4gbke/FMV1X5bSYhbpXQ4Zkm7VT5s+202vsD7D4pxylf6RhXGyF+zZdXpZ5VptbdHInyLjUn7TB/zHUjJTrxXClPXWQvlkFv0smkvfCVTmcHuNvAOHy5rWzmzE+Pz8zuq1biEhw7fWhVRu8iKTZAiGNjA8qJ1DWN6XUf8ZNfQqUdYoPdgS/x0NZFmNDyB4DBQrLuqWFTwzveeGE6sj7YaRd4ZeBnjJ+vmqf/O0sYCkfCsBSEe4bHqHc2Vcn+zRhzZjFgsSacEdtY/T4Tj9+3oydKVfsoxLnvE95SB2Iethij/NzqSGnjzKJ0OmVBzLNHo1m/RXtkWJLQGyNQdSaYD78EWG3qPofQPYjMuVw9WPWhcImn/jglRLDxGYxCsht8ziiR2VoyCfltBCGXYk1RzbEipQrDJIyEkU6kEsBHbGrWxdiEZqn8lFn+/8/J0kClgcA0gcnIPa0IPOsRwYqQmu2qpwIhFqOUiF8duWSGnWSx5MJtcFuF8nL+Jmo2t+0eeGWDmsBvv0rVRgGPGX+hq7pR8ZN7Z/l/Fmp1OT/3cDeqt3ZMi79IGyMef3zaFzqYLcVmpw7KkbDJzX529thsIDWItcUFc5a1bJAxb/VC5wbwoIdD13zw== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(40470700001)(47076005)(81166007)(86362001)(70586007)(44832011)(36860700001)(186003)(54906003)(336012)(70206006)(508600001)(4326008)(5660300002)(40460700001)(6916009)(26005)(2906002)(8936002)(8676002)(7696005)(426003)(2616005)(1076003)(107886003)(6666004)(82310400004)(83380400001)(316002)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2021 16:54:48.6506 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9dd41f85-8385-4cbc-3452-08d9bbfdc6e4 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT058.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB7376 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211210_085454_710024_ECF562D1 X-CRM114-Status: GOOD ( 13.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a new HWCAP to detect the Alternate Floating-point Behaviour feature (FEAT_AFP), introduced in Armv8.7. Also expose this to userspace in the ID_AA64MMFR1_EL1 feature register. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon --- Documentation/arm64/cpu-feature-registers.rst | 9 +++++++++ Documentation/arm64/elf_hwcaps.rst | 4 ++++ arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/asm/sysreg.h | 1 + arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/kernel/cpufeature.c | 2 ++ arch/arm64/kernel/cpuinfo.c | 1 + 7 files changed, 19 insertions(+) diff --git a/Documentation/arm64/cpu-feature-registers.rst b/Documentation/arm64/cpu-feature-registers.rst index 9f9b8fd06089..1b19d20c2dbd 100644 --- a/Documentation/arm64/cpu-feature-registers.rst +++ b/Documentation/arm64/cpu-feature-registers.rst @@ -275,6 +275,15 @@ infrastructure: | SVEVer | [3-0] | y | +------------------------------+---------+---------+ + 8) ID_AA64MMFR1_EL1 - Memory model feature register 1 + + +------------------------------+---------+---------+ + | Name | bits | visible | + +------------------------------+---------+---------+ + | AFP | [47-44] | y | + +------------------------------+---------+---------+ + + Appendix I: Example ------------------- diff --git a/Documentation/arm64/elf_hwcaps.rst b/Documentation/arm64/elf_hwcaps.rst index af106af8e1c0..247728d37911 100644 --- a/Documentation/arm64/elf_hwcaps.rst +++ b/Documentation/arm64/elf_hwcaps.rst @@ -251,6 +251,10 @@ HWCAP2_ECV Functionality implied by ID_AA64MMFR0_EL1.ECV == 0b0001. +HWCAP2_AFP + + Functionality implied by ID_AA64MFR1_EL1.AFP == 0b0001. + 4. Unused AT_HWCAP bits ----------------------- diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index b100e0055eab..2809df2fdd63 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -106,6 +106,7 @@ #define KERNEL_HWCAP_BTI __khwcap2_feature(BTI) #define KERNEL_HWCAP_MTE __khwcap2_feature(MTE) #define KERNEL_HWCAP_ECV __khwcap2_feature(ECV) +#define KERNEL_HWCAP_AFP __khwcap2_feature(AFP) /* * This yields a mask that user programs can use to figure out what diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 16b3f1a1d468..adcab9009f9d 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -889,6 +889,7 @@ #endif /* id_aa64mmfr1 */ +#define ID_AA64MMFR1_AFP_SHIFT 44 #define ID_AA64MMFR1_ETS_SHIFT 36 #define ID_AA64MMFR1_TWED_SHIFT 32 #define ID_AA64MMFR1_XNX_SHIFT 28 diff --git a/arch/arm64/include/uapi/asm/hwcap.h b/arch/arm64/include/uapi/asm/hwcap.h index 7b23b16f21ce..180da7396549 100644 --- a/arch/arm64/include/uapi/asm/hwcap.h +++ b/arch/arm64/include/uapi/asm/hwcap.h @@ -76,5 +76,6 @@ #define HWCAP2_BTI (1 << 17) #define HWCAP2_MTE (1 << 18) #define HWCAP2_ECV (1 << 19) +#define HWCAP2_AFP (1 << 20) #endif /* _UAPI__ASM_HWCAP_H */ diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 6f3e677d88f1..71ff5a4afb0f 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -325,6 +325,7 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = { }; static const struct arm64_ftr_bits ftr_id_aa64mmfr1[] = { + ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_AFP_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_ETS_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_TWED_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_XNX_SHIFT, 4, 0), @@ -2476,6 +2477,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_MTE_SHIFT, FTR_UNSIGNED, ID_AA64PFR1_MTE, CAP_HWCAP, KERNEL_HWCAP_MTE), #endif /* CONFIG_ARM64_MTE */ HWCAP_CAP(SYS_ID_AA64MMFR0_EL1, ID_AA64MMFR0_ECV_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_ECV), + HWCAP_CAP(SYS_ID_AA64MMFR1_EL1, ID_AA64MMFR1_AFP_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, KERNEL_HWCAP_AFP), {}, }; diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 6e27b759056a..0e52014019f6 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -95,6 +95,7 @@ static const char *const hwcap_str[] = { [KERNEL_HWCAP_BTI] = "bti", [KERNEL_HWCAP_MTE] = "mte", [KERNEL_HWCAP_ECV] = "ecv", + [KERNEL_HWCAP_AFP] = "afp", }; #ifdef CONFIG_COMPAT