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 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 684C9C433EF for ; Wed, 1 Dec 2021 12:12:33 +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=NCEaTrPm2pL7bfVts3P6GnT4bD6CQ/0hH+HRzmt4KXM=; b=JghvexOzUs5R1X Vh8bo2f9vAn1Dhthtli1cEmAgliBNeoBNngnYN0w9qk/Xd/29n/1kbMMsso9EHOEuhHxpupsgLA4U uqVvjWJQbBr7jBevZQRAbfQp/ws3kspW07nXbEtNX//nob7D0dSA2G9alMm03t2+DBYE7miGfeqpd baRIBEnrRCvM9xY/Tkadzj/Ipi57C3WWoHj3c7SPS3wJkWW80bBWeYrGGT4F9cWkgIGjvWzQ4ax+G UyHznLaJXHo7UZryRwipes1kS1lotWwm8ajTjCz5Srd4txKyf1dXxdXmfSpcYfK3WKTCalQgWEn8m w2fw1rRj/9pP36KQHquA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1msOQY-008LVM-CQ; Wed, 01 Dec 2021 12:09:37 +0000 Received: from mail-eopbgr10072.outbound.protection.outlook.com ([40.107.1.72] helo=EUR02-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1msONk-008K0J-6L for linux-arm-kernel@lists.infradead.org; Wed, 01 Dec 2021 12:06:42 +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=C9k2Rje2uA3UV4oGMlD+UxIh7YF6nitSKT+TSjmI5xg=; b=1J0+yMb9R2CK2sYa+IREiUPSnQwgFW1tupekyile6ABaEKgPhIBk/i3CxWy4beYxi8q6uNKCs3YVMFEAbJTFg/hlnDlKd+Ycs9JVoFI9TGxGz0f660etH3syEnfg6oD/peuox1ak9bDT8MdhGcB8h5v5HTHxmgAtmnGb3ml/gm4= Received: from AM6PR05CA0007.eurprd05.prod.outlook.com (2603:10a6:20b:2e::20) by VI1PR08MB2910.eurprd08.prod.outlook.com (2603:10a6:802:25::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Wed, 1 Dec 2021 12:06:31 +0000 Received: from AM5EUR03FT021.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2e:cafe::d6) by AM6PR05CA0007.outlook.office365.com (2603:10a6:20b:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Wed, 1 Dec 2021 12:06:31 +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 AM5EUR03FT021.mail.protection.outlook.com (10.152.16.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 1 Dec 2021 12:06:30 +0000 Received: ("Tessian outbound f493ab4f1fb8:v110"); Wed, 01 Dec 2021 12:06:30 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4a2bf5e5839a00b8 X-CR-MTA-TID: 64aa7808 Received: from 4c96fd11e062.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 71F8C8F7-2ED5-4188-8307-A0B9C94E8C17.1; Wed, 01 Dec 2021 12:06:23 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4c96fd11e062.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 01 Dec 2021 12:06:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PJvd8zhmgUSqE+6npfwi+LaLKU8KaoH5PN7IJKyRvgEL3ZMur0Ixh6gFx4fQE7yx33EUQpSA0JbJw7aloPBWCG+HS9/3JLR1/a5kv+MLZTlBHycgU4vPpfQJLGnF5l/wSPRdXRIXxtwDO3Eu/UbqyC1UyQoPa8juNw0HPVJYhGkk31eM7dz1xyJBr3pb2zEKTjdMEvfDUI1tKEfYqYLpWG/tyyYZ0wWxtIjn1pAUIt7iWS3I9XRbKvkDMQ1/bBq2L3elIrBgnOqmGTlxF3fkwOQcFH6b3hIW146bdh61ntygSWpjkUHvP5Kp9LOwR1PToSRWko8H6FBJe4JHtzYLiA== 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=C9k2Rje2uA3UV4oGMlD+UxIh7YF6nitSKT+TSjmI5xg=; b=dwwYFX+n9/ddiT0Sh05WWAKTfwgPinSOfFs20ZW3ZrhsQiFzGUlS2KuKPI1yP61thgIsSY6PvFMHHEw6KUpl6pvuQuyrMVNi+FEmQB+Gv5r2sbAhAOPJDL+8ZOU9mlvHm2JMgiJI5CvGhE7zDrh7QAuWbte2HutsabBypsT1SengJmj++835mQ2Iq4Vb2GgJZ3VzoUtAqcQkLRZfxty6EuQlrDmB/tjGiFQUq+0eE+ybZBgUeIJ2D2CB5LaoMxW3r8BEnJfrkKRWLwn0T1IP5j8LPcoBMkjK/WuYKhO4BH1B2XoX8SjMeyAAxYcvTg+H96q2YU0gvvZvcDKyTvSZmA== 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=C9k2Rje2uA3UV4oGMlD+UxIh7YF6nitSKT+TSjmI5xg=; b=1J0+yMb9R2CK2sYa+IREiUPSnQwgFW1tupekyile6ABaEKgPhIBk/i3CxWy4beYxi8q6uNKCs3YVMFEAbJTFg/hlnDlKd+Ycs9JVoFI9TGxGz0f660etH3syEnfg6oD/peuox1ak9bDT8MdhGcB8h5v5HTHxmgAtmnGb3ml/gm4= Received: from AS8PR04CA0070.eurprd04.prod.outlook.com (2603:10a6:20b:313::15) by AM0PR08MB3140.eurprd08.prod.outlook.com (2603:10a6:208:61::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20; Wed, 1 Dec 2021 12:06:20 +0000 Received: from VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:313:cafe::ed) by AS8PR04CA0070.outlook.office365.com (2603:10a6:20b:313::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Wed, 1 Dec 2021 12:06:20 +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 VE1EUR03FT007.mail.protection.outlook.com (10.152.18.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 1 Dec 2021 12:06:20 +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; Wed, 1 Dec 2021 12:06:15 +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; Wed, 1 Dec 2021 12:06:10 +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; Wed, 1 Dec 2021 12:06:14 +0000 From: Joey Gouly To: CC: , , , , , , , , , Subject: [PATCH v1 2/3] arm64: add ID_AA64ISAR2_EL1 sys register Date: Wed, 1 Dec 2021 12:05:57 +0000 Message-ID: <20211201120558.9140-3-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211201120558.9140-1-joey.gouly@arm.com> References: <20211201120558.9140-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b13916c6-48d6-4706-704e-08d9b4c302e4 X-MS-TrafficTypeDiagnostic: AM0PR08MB3140:|VI1PR08MB2910: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:1051;OLM:1051; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: xUKb3Z1StjgvYp3l3aCyB/vBYwcIePz9iT5++n0Z9oehTrItVgZO+wR7tBBp857pz4WGYZqpf0O6+SpxKfxx1cyApYQ30se7BgYckgRX3gJ9IooQLAmg41glrGPRSY0AbZ1nvq1/Uj0MHuXoP5tJNNFyBCKkOA9lvBXZxsCYSpehdpmyM/stN6SpRd+Q65uAMq2OyYQ42jf0HIJh/gZCUbeyF7ZAVXH3SY8uOi5/M2qyfFyBhIPGFCvmcmIEz8ew2dZ9EMBiSTk2Zn6sj0ct3veTAp3cf2hXB10WmYvtmapXIWPQjgqG5rNesfTMF0L+jeUdSqXQWAfInM6dYXQ502nQto7jVlMe7pgS/lue5zmX5Kx93IAjkeUGPu8yFpKy3wUDIqvocqNvOFkCDah1x0AjEzn42vuiheqpIA3JBw4PWn8UwodayvRoPef/eKgOuNS1CKT2hWSHOyEI9OCNghv76aTkyl+64CwzmXAW/EpHk7waMfNn6wStudyjW+V38NkTRvTV1aa1DV8PqGYV+pw3pT0KzMzEFjNnQsY6bjgX4Pk9BY7V9QuHet8NjbqS6yWJRu2S1/cyPVO2St6dK3d6amaRSIBSd6roTsdpgXAywfCTE9CV1NiCWo1uRxdefsYoz2cCYKlKk79uzdpvltfR/vKshKzJjeVdF8zwBYWIXSZ4U+rEFfM4VdoB+sne77kEB7HON90J/5K+PsEIv40VbNJa/WU5u5sq1hwsSFSxCqOWCZz4BasSClEp0L0CfkybxXMrAl1L6FUsC0vxB+8rD/7TUN7lCpH0fmRgsvA= 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)(186003)(36756003)(8676002)(83380400001)(8936002)(6666004)(47076005)(508600001)(356005)(4326008)(86362001)(82310400004)(36860700001)(44832011)(26005)(7696005)(81166007)(54906003)(426003)(336012)(40460700001)(2906002)(5660300002)(2616005)(6916009)(316002)(70206006)(1076003)(70586007)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3140 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT021.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 0acc6e79-642c-48bc-8489-08d9b4c2fccd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XqYau91o0BATEEISX8UmKI6B0FxAlMKrIeWUtuIkjjEpQwDfVZj9ZagzWfrtKgXcsf2TnZDb4BFVpCqFLTLiy/D+/Hcd1YGhVbnkv1hhYpss/5cmoScqdNu+RE3CKInMldoTwoLGG+ssXGyG6GcAjnmSjLaVpsGVJIn9ylH8SFn0qT3sBPnfirrkTavBj/bfrDwJvHfIttdd+gkJMBkU5wRhCdCcz847qRq/g/xmUguq5J3hvIIL2raxjf8hcGmRsxELC144osip1zK6FcV7TuSipkp9flwtSnYIBbgf3b/TBudq1xwyE0Y47fXU/G3cxGM/NBi2wIyHWrKjIq0n/PGOL6B9GZhnVz0NwhBZ1zfW9T/ZKFvkPff3kYZC4fwy1aExWdFDmVs4AcO2GhKODa89aknD6Tfifah2CSEpmETQPFGQNOS7UezZcGrogoWneTzUZ1TgOdt8UCyQEkBCpf1QSjhTK3UX0L6c62Nur2nmb2UIYq9SMRRnH5VEz3m3VJm6CENJrtgMpXgfi45qoFY1lUpgSWm/IHxChGSvjonrKUpC7c0x9ULHyHgxQM6gkDHUxSHefBCz4U3rFJz+jJ3D6IcFP70DO5jPXeMdsB7Q36GbwSj0fF1qruoShMbKeBss0cfdmfECHldYSJKA4e5pRClYczrIcwmcoDEhznAdhxQDOV3BvW5tODb+yc+5/luxHFSisUJXOOZ7BNYkUQ== 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)(336012)(186003)(107886003)(26005)(81166007)(8676002)(47076005)(4326008)(36756003)(70206006)(86362001)(8936002)(2906002)(508600001)(36860700001)(426003)(82310400004)(5660300002)(83380400001)(316002)(1076003)(6916009)(2616005)(6666004)(70586007)(44832011)(54906003)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 12:06:30.9069 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b13916c6-48d6-4706-704e-08d9b4c302e4 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: AM5EUR03FT021.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB2910 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211201_040640_470098_7A60F46E X-CRM114-Status: GOOD ( 13.88 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a new ID register, introduced in 8.7. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Cc: Marc Zyngier Cc: James Morse Cc: Alexandru Elisei Cc: Suzuki K Poulose Cc: Reiji Watanabe --- arch/arm64/include/asm/cpu.h | 1 + arch/arm64/include/asm/sysreg.h | 10 ++++++++++ arch/arm64/kernel/cpufeature.c | 9 +++++++++ arch/arm64/kernel/cpuinfo.c | 1 + arch/arm64/kvm/sys_regs.c | 2 +- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/cpu.h b/arch/arm64/include/asm/cpu.h index 0f6d16faa540..a58e366f0b07 100644 --- a/arch/arm64/include/asm/cpu.h +++ b/arch/arm64/include/asm/cpu.h @@ -51,6 +51,7 @@ struct cpuinfo_arm64 { u64 reg_id_aa64dfr1; u64 reg_id_aa64isar0; u64 reg_id_aa64isar1; + u64 reg_id_aa64isar2; u64 reg_id_aa64mmfr0; u64 reg_id_aa64mmfr1; u64 reg_id_aa64mmfr2; diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index adcab9009f9d..b4470b0eba69 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -182,6 +182,7 @@ #define SYS_ID_AA64ISAR0_EL1 sys_reg(3, 0, 0, 6, 0) #define SYS_ID_AA64ISAR1_EL1 sys_reg(3, 0, 0, 6, 1) +#define SYS_ID_AA64ISAR2_EL1 sys_reg(3, 0, 0, 6, 2) #define SYS_ID_AA64MMFR0_EL1 sys_reg(3, 0, 0, 7, 0) #define SYS_ID_AA64MMFR1_EL1 sys_reg(3, 0, 0, 7, 1) @@ -771,6 +772,15 @@ #define ID_AA64ISAR1_GPI_NI 0x0 #define ID_AA64ISAR1_GPI_IMP_DEF 0x1 +/* id_aa64isar2 */ +#define ID_AA64ISAR2_RPRES_SHIFT 4 +#define ID_AA64ISAR2_WFXT_SHIFT 0 + +#define ID_AA64ISAR2_RPRES_8BIT 0x0 +#define ID_AA64ISAR2_RPRES_12BIT 0x1 +#define ID_AA64ISAR2_WFXT_NI 0x0 +#define ID_AA64ISAR2_WFXT_SUPPORTED 0x1 + /* id_aa64pfr0 */ #define ID_AA64PFR0_CSV3_SHIFT 60 #define ID_AA64PFR0_CSV2_SHIFT 56 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 71ff5a4afb0f..c36018310da5 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -225,6 +225,10 @@ static const struct arm64_ftr_bits ftr_id_aa64isar1[] = { ARM64_FTR_END, }; +static const struct arm64_ftr_bits ftr_id_aa64isar2[] = { + ARM64_FTR_END, +}; + static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = { ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_CSV3_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_CSV2_SHIFT, 4, 0), @@ -638,6 +642,7 @@ static const struct __ftr_reg_entry { ARM64_FTR_REG(SYS_ID_AA64ISAR0_EL1, ftr_id_aa64isar0), ARM64_FTR_REG_OVERRIDE(SYS_ID_AA64ISAR1_EL1, ftr_id_aa64isar1, &id_aa64isar1_override), + ARM64_FTR_REG(SYS_ID_AA64ISAR2_EL1, ftr_id_aa64isar2), /* Op1 = 0, CRn = 0, CRm = 7 */ ARM64_FTR_REG(SYS_ID_AA64MMFR0_EL1, ftr_id_aa64mmfr0), @@ -934,6 +939,7 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info) init_cpu_ftr_reg(SYS_ID_AA64DFR1_EL1, info->reg_id_aa64dfr1); init_cpu_ftr_reg(SYS_ID_AA64ISAR0_EL1, info->reg_id_aa64isar0); init_cpu_ftr_reg(SYS_ID_AA64ISAR1_EL1, info->reg_id_aa64isar1); + init_cpu_ftr_reg(SYS_ID_AA64ISAR2_EL1, info->reg_id_aa64isar2); init_cpu_ftr_reg(SYS_ID_AA64MMFR0_EL1, info->reg_id_aa64mmfr0); init_cpu_ftr_reg(SYS_ID_AA64MMFR1_EL1, info->reg_id_aa64mmfr1); init_cpu_ftr_reg(SYS_ID_AA64MMFR2_EL1, info->reg_id_aa64mmfr2); @@ -1152,6 +1158,8 @@ void update_cpu_features(int cpu, info->reg_id_aa64isar0, boot->reg_id_aa64isar0); taint |= check_update_ftr_reg(SYS_ID_AA64ISAR1_EL1, cpu, info->reg_id_aa64isar1, boot->reg_id_aa64isar1); + taint |= check_update_ftr_reg(SYS_ID_AA64ISAR2_EL1, cpu, + info->reg_id_aa64isar2, boot->reg_id_aa64isar2); /* * Differing PARange support is fine as long as all peripherals and @@ -1273,6 +1281,7 @@ u64 __read_sysreg_by_encoding(u32 sys_id) read_sysreg_case(SYS_ID_AA64MMFR2_EL1); read_sysreg_case(SYS_ID_AA64ISAR0_EL1); read_sysreg_case(SYS_ID_AA64ISAR1_EL1); + read_sysreg_case(SYS_ID_AA64ISAR2_EL1); read_sysreg_case(SYS_CNTFRQ_EL0); read_sysreg_case(SYS_CTR_EL0); diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index 0e52014019f6..f2f8fe02f39c 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -392,6 +392,7 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) info->reg_id_aa64dfr1 = read_cpuid(ID_AA64DFR1_EL1); info->reg_id_aa64isar0 = read_cpuid(ID_AA64ISAR0_EL1); info->reg_id_aa64isar1 = read_cpuid(ID_AA64ISAR1_EL1); + info->reg_id_aa64isar2 = read_cpuid(ID_AA64ISAR2_EL1); info->reg_id_aa64mmfr0 = read_cpuid(ID_AA64MMFR0_EL1); info->reg_id_aa64mmfr1 = read_cpuid(ID_AA64MMFR1_EL1); info->reg_id_aa64mmfr2 = read_cpuid(ID_AA64MMFR2_EL1); diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index e3ec1a44f94d..4dc2fba316ff 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1525,7 +1525,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { /* CRm=6 */ ID_SANITISED(ID_AA64ISAR0_EL1), ID_SANITISED(ID_AA64ISAR1_EL1), - ID_UNALLOCATED(6,2), + ID_SANITISED(ID_AA64ISAR2_EL1), ID_UNALLOCATED(6,3), ID_UNALLOCATED(6,4), ID_UNALLOCATED(6,5), -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel