From patchwork Tue Dec 7 12:42:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12695139 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 9F4EDC433EF for ; Tue, 7 Dec 2021 12:45:55 +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=foGeBGY92Le8zh zF4BXyhVfx6im3aa3OQofpd0tywUx01GiMf0IoCoqer99iQT/BsdzPBDVeCuiHHExdbQIpmJzhXd/ oNu5Y1iAvfQJzjvY7v5QRCdkzOQOmNSMm0ZnXjt3YhRik/S5wFsN1kopqOTeefJrGtnoEXJUhifr8 haWZteEpfKKUCaf2ZjbLroE1uXVoD5dzSUqLwEbClilV0BQ1DjjGrOHMl2MUv85mGlSo0w8xARCNP 8lMohcm+hhwMgf5cI0sM5SKNAUj5NqGGMD+PMb0T9M+zV4CWZSFZ6G1kuVhqq4RQk7hQMZBkXHHCU gQAVDlegWC+4e2KHqgyA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muZoe-008Uc2-Pw; Tue, 07 Dec 2021 12:43:29 +0000 Received: from mail-am6eur05on2085.outbound.protection.outlook.com ([40.107.22.85] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muZoN-008UXI-7Q for linux-arm-kernel@lists.infradead.org; Tue, 07 Dec 2021 12:43:13 +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=KwaUrlUowKcGpnnMyJsT6CJRJ9NwAN+38WIZ8C8hzUxivn7FD+DG8Jfgr6FFFYwQM+7JQc71a5g9VjtxhONaZg1mtyvKlHw0dQMxAlf+3phNLYiiFqBtD8JFlgmH0JU3OQe93uxphYFagYKPVfWKAG4zZwWRxJ0RRlXOfKfuRzI= Received: from AM5PR0202CA0009.eurprd02.prod.outlook.com (2603:10a6:203:69::19) by AS8PR08MB7026.eurprd08.prod.outlook.com (2603:10a6:20b:34d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Tue, 7 Dec 2021 12:43:04 +0000 Received: from VE1EUR03FT023.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:69:cafe::f4) by AM5PR0202CA0009.outlook.office365.com (2603:10a6:203:69::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.11 via Frontend Transport; Tue, 7 Dec 2021 12:43:04 +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 VE1EUR03FT023.mail.protection.outlook.com (10.152.18.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Tue, 7 Dec 2021 12:43:04 +0000 Received: ("Tessian outbound de6049708a0a:v110"); Tue, 07 Dec 2021 12:43:04 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ce9b00823f8779e4 X-CR-MTA-TID: 64aa7808 Received: from 629cfa6c54f4.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A36E5385-AC48-4157-9706-CAB9A4E44585.1; Tue, 07 Dec 2021 12:42:57 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 629cfa6c54f4.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 07 Dec 2021 12:42:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kiYG8SB8gD8O3Q1/hJoEEdTz475mHtNzKVvCcPyIx15e+pZs9QTcBBWNzC1Sl7AwoVHspE+zFIGT0v3QR/GoL4ADd/fAwgH+qT3pP7VPHuc8bWYeYBMMhKfqpGfRHZSgzOQQ13pEd+Ww2ieFxtaYGJN1o05iOgd4yM9oixBUhASmudKKYp3NOq2V3J0guVFy/nOEDoP2a4jquE/QUyQN6O8dFbNS1DPSgLVmSwDZy+yFmWpT4/x5L80R8fDiXXANlqQX38tJ+a+mrTuxxLrP0x4Xv+/12WoqA0uZQrmXsVZ5v0XPPzcSl0Ufm88mttHT7Ker8ZjMgPnE2Le90KWqqw== 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=IiJjIdStUUlzIHG54l16F9tg2s1i4QshY0qIjdMjbsFhfRzLFuOwoCAYElX70K4uxHhQ8FQj+cYiBbRblr2aui6ifdFLixfbAYqDSvEAGXqPO4xMaAReGR922KgxFJEKj0QwzwfKhoc2Tob0Qrlz54cy2XOsDDqz3o9X9T3EonQNAreR1FDON+TpUZ+v5Jacjyz4blVDtlGdezDHH6kKr8EQTeTB9IiPv5FDH78LlYjskRb5JLmVIsam79lmOlTfphRzo9g7DcmiqQROzGnik22cZ06VlQVEXOA1qnrzK2VLpH11gmj3vr5JXlZG1v5we+ovJlmRXotNFdvmJkFKfA== 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=KwaUrlUowKcGpnnMyJsT6CJRJ9NwAN+38WIZ8C8hzUxivn7FD+DG8Jfgr6FFFYwQM+7JQc71a5g9VjtxhONaZg1mtyvKlHw0dQMxAlf+3phNLYiiFqBtD8JFlgmH0JU3OQe93uxphYFagYKPVfWKAG4zZwWRxJ0RRlXOfKfuRzI= Received: from DB6PR1001CA0045.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::31) by VE1PR08MB4957.eurprd08.prod.outlook.com (2603:10a6:803:109::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Tue, 7 Dec 2021 12:42:54 +0000 Received: from DB5EUR03FT019.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:55:cafe::f9) by DB6PR1001CA0045.outlook.office365.com (2603:10a6:4:55::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Tue, 7 Dec 2021 12:42:54 +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 DB5EUR03FT019.mail.protection.outlook.com (10.152.20.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Tue, 7 Dec 2021 12:42:54 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Tue, 7 Dec 2021 12:42:45 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.20; Tue, 7 Dec 2021 12:42: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; Tue, 7 Dec 2021 12:42:44 +0000 From: Joey Gouly To: CC: , , , , , , , , , Subject: [PATCH v2 1/3] arm64: cpufeature: add HWCAP for FEAT_AFP Date: Tue, 7 Dec 2021 12:42:24 +0000 Message-ID: <20211207124226.50095-2-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207124226.50095-1-joey.gouly@arm.com> References: <20211207124226.50095-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: b5b587ff-cac3-497b-514a-08d9b97f1cd2 X-MS-TrafficTypeDiagnostic: VE1PR08MB4957:EE_|VE1EUR03FT023:EE_|AS8PR08MB7026: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: IEjRogi3/2UDU0xyRnhxRPEhXneeQAk04wu7053zSnz/3JZUfBC4aABcTpn69lDSh51Ajm7QbA9bgiuPiDlkGZQWbcSbGEa7mN7OnOZCJkzoUwhRM1Q+MW+MvNbFk8q8mGMDZSM5cS4w87y1SnX6gvbDnl8/BnaYC7IIqjrfuUAs4uz9VUZXvo2xDEIiKN/N3J7hFuyS9eGKrdx7CyewPjznvphG4AwzMN6XjyOncnPrfh0CQ42H21Fh2BCNngYMCnJ8REY/hDad8c5mwt+FIKSHhHqn3HcMnEm2oE7WXNzhDlwfFaC7BHWJnPesGUQF1+auVhoqxTi62EOcIpjv7Xe9tznzZjQ4Dw+C+hq6BP1835+B3YdO49ZgS5CsVtsASI5dGiL3u763/vcoFa2pXLO8euZ3PnE7QB6GsJHXb1uxqr3Yx68i78snPsCISNIDbQJsHIkyrmkS1Mvw1ch7xmA+LvRiO31CwAkY/oOhX2/EZjCJjpjE8NMhVrcH8y5gu0EHvnyL00DAoueQOW9c+rK5rFRQHPuuYQpAIOwI8N4J1HnEWZKJUplpffCI9MYmFBhMBOGZjjWrUDj+uUp/GAlFBiWUJZKCH+RW/mf67e6RHrcdt9c493f2g8ZnnWUouaIo8Hj15SoxrQD9jDxuPCHmm/ipQeTdh2a3VcM9Nwzq1FFNH6Zjcc9ysaBpuABfP4i1kylNgvk3hGjn8tT228OA0r3TfsAgNndxtBzzDD2nDuZ2TMN/xW7fkbZTExO+RXyy+FPfkSUhnNJpw4HlCIrkIUyBp6CECHuD/UBl2QU= 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)(36840700001)(46966006)(40470700001)(336012)(5660300002)(426003)(6916009)(82310400004)(8676002)(7696005)(40460700001)(70586007)(1076003)(70206006)(26005)(44832011)(8936002)(2616005)(4326008)(508600001)(36860700001)(316002)(6666004)(36756003)(186003)(81166007)(47076005)(2906002)(83380400001)(54906003)(356005)(86362001)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4957 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 36f5e38d-dd8b-4173-283e-08d9b97f170b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T1RWCXbB077lk+Hgvqo18Kp2J6vin3dzRcngEasKdeXDw0xjOTrjrLp5CuQpgifCMP/qDaq10zRnxKqSlk9ORPL84uVoE6SFtsuqNd4pXpczvJ8z0vNOy/5QltWmPROmoMubTEONGtIx2TWvXZA0hG7oGmU+mkfkqTNMfEPt+/bngF+sWbSMtEhUKRaDpFzpNKNxe7u4lkBw3Ki6xrD2w5b4VekXf+HiF+kHoMFcF6Xm8cLrL+a71ad5ujG7c23mVMCNTrJBP0KbB+qIllksbx9KXFmGYPms/1tpaK1I3GV7NeTg9RT79B43cvm7gJuK2j5Op1rvqBSKMS7KWYAzMRGjmRTTyows/Mb+n8sCYX1C8obCXdf9+AdZelXPzBviw76CJpAeL+Df4m/2eCgyUyd4F0V3rk5cC+wMMO/viN4ZgfJSsJjcGzFn4ANAOCGN1WcPK2m3Si4IbojSOhlpCqN6zEgRmNEJsPnJA+5WJSpmdxufWgpvmlZBl5Ybnc/PVxYxP79QxsnzF5vhhfHGVWeTTzxOTGM02bumLui9RI+Py/9BWCf63tRyG0wEe8zK2k3VhV8gLBQKj34M8tsNXgYPq2SGQTaww2aE65EKg4Sl7SsCFrJKxkiyEPxCGPt3+ZEnMEXeq3jZVeywg+JOzGFSxwElHHl697p5SJO9fNUSLBW4oEa6Rwsua0W0FQOlmoB4m02/ZnJ5QyOKL91VvA== 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)(46966006)(36840700001)(8936002)(81166007)(336012)(36860700001)(316002)(8676002)(47076005)(426003)(508600001)(82310400004)(6916009)(54906003)(26005)(6666004)(44832011)(2906002)(5660300002)(2616005)(4326008)(107886003)(1076003)(70206006)(7696005)(83380400001)(86362001)(186003)(36756003)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 12:43:04.4072 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b5b587ff-cac3-497b-514a-08d9b97f1cd2 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: VE1EUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB7026 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211207_044311_468633_FF39867C X-CRM114-Status: GOOD ( 13.49 ) 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