From patchwork Fri Jun 16 16:00:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13282977 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 04B23EB64D7 for ; Fri, 16 Jun 2023 16:16:28 +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: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:In-Reply-To:References: List-Owner; bh=ul2Lc9DAwFWI7KRx6wGt+DOLH8fkqtO/uMdumlpF1gg=; b=IALOS0LGSOnZV7 IDtwaXWw9tm8YQm3lI3jZO2xrth+q3YkUHTxLq4MgZOLQ9kPQ/BAnAlggg87dtIz7nbrlAZWgyPa0 w5X9TxfiPLMmrND2cJZ1shONs1tKqo7HNrk1oldY/gBvDe4K+hijDmiYqy93f4aq+ADKQZSAXC589 5WvZo1W5QbvjS8Krx05iBCmSx/366vuk34U6Uai30XL/hs8wPYW6eV0jd0jdVymy3dQktKDQLC1B5 jzA/U/CnQM57VnnWhQAs8fem5m2+AGlxM9l8K+49Vg7OBRk71wtPIv49wGApMpoa0cAi4QBFOAvbe 36dvVL8Y0zZ4b2GfabXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qAC7I-0014tO-26; Fri, 16 Jun 2023 16:16:04 +0000 Received: from mail-he1eur01on0601.outbound.protection.outlook.com ([2a01:111:f400:fe1e::601] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qAC7F-0014rL-1f for linux-arm-kernel@lists.infradead.org; Fri, 16 Jun 2023 16:16:02 +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=RRLYd7unUqwchNumbFgwu8AdPVA7Ey5M3iHbM8pdH4g=; b=1nYq+fgXm43V7NpXoGK+xpd1tlvzvIVBhJDanbUyLdyEZFyxl9bKBDBkKkxjzFlFcI2OUJFvw/1aiM+QMeM+ekPFYvb9MC6hL8PPfs5vXNRB2nyY5lJcOsP0zd7e1viFw1hwj8+rQKmozTm8lBrcfm+qskh3EkC+R/uK9mgjdr4= Received: from AS9PR06CA0142.eurprd06.prod.outlook.com (2603:10a6:20b:467::35) by AS8PR08MB9791.eurprd08.prod.outlook.com (2603:10a6:20b:614::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.37; Fri, 16 Jun 2023 16:01:04 +0000 Received: from AM7EUR03FT042.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:467:cafe::59) by AS9PR06CA0142.outlook.office365.com (2603:10a6:20b:467::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29 via Frontend Transport; Fri, 16 Jun 2023 16:01: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; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT042.mail.protection.outlook.com (100.127.140.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.25 via Frontend Transport; Fri, 16 Jun 2023 16:01:03 +0000 Received: ("Tessian outbound 5bb4c51d5a1f:v136"); Fri, 16 Jun 2023 16:01:03 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 6468827c43c24f1e X-CR-MTA-TID: 64aa7808 Received: from c21fe2e4a4ae.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id DA772CF8-9F26-47AC-BF5E-3264536A9AB9.1; Fri, 16 Jun 2023 16:00:56 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id c21fe2e4a4ae.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 16 Jun 2023 16:00:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WaQepjnKq7OZ6RJfOdhAtj/3F1QLBxwzvxmJ2ZBVCrQN3bvzhbweC3FJb5URRfkCdgQ/vLGLPcEMEqAaKktQAzHO8WDPcnjhJzkQrJBC5RGdIIlSXZcnx6tCLrGZn0ciImw8Yi45ZQeKPZDhiQmROTReIPdThSADzemlLB7NE2jDBoifpAPlWXGRvm8avVZiRC9loGnxHUHjBCWzgsslRNpuC94tXTsfLIG6/lBg5dgihSG1BFArE53mSAiVW9ejdWvg2IybqkTgMD0me7TSvcQx8IA4QOgHu7W5C33ZquoEch3iy/Va9Q+Fk4Ka1VwOabmORrp8iRlm0PEOUNuHHw== 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=RRLYd7unUqwchNumbFgwu8AdPVA7Ey5M3iHbM8pdH4g=; b=Z8Hwb+w52Js+H786PZfyVCv5YcDEbsygUAmFkVcWYvu7K64ENyR+dDYcwT6c0wPI2qpHoQkkY6T5vNO0okfi7x/AiW6RdNoyqFxuF+9k+0Z2+y1uCEfO0r6tGsgahPmJvxR6kaMr5sBwE6k9pMBIm7yQukb5wskeuIHyKAdtX3ka1E3ACcYVC0Dc90UQvps6vm48P6dvDiXtt+Xj/2YR70CRz552Evc9yHGDQiDc9lDDEyv4xYvvTXOBbsMy6MyV2P2MllRzwxGvp9g6J/1feFIkLSqsT39dQ+jKqeGM8XCl1LehHfMXYxhormdns852ldOR1/Cxdl8UKYBhXiI2gA== 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=RRLYd7unUqwchNumbFgwu8AdPVA7Ey5M3iHbM8pdH4g=; b=1nYq+fgXm43V7NpXoGK+xpd1tlvzvIVBhJDanbUyLdyEZFyxl9bKBDBkKkxjzFlFcI2OUJFvw/1aiM+QMeM+ekPFYvb9MC6hL8PPfs5vXNRB2nyY5lJcOsP0zd7e1viFw1hwj8+rQKmozTm8lBrcfm+qskh3EkC+R/uK9mgjdr4= Received: from DB9PR05CA0006.eurprd05.prod.outlook.com (2603:10a6:10:1da::11) by PA4PR08MB6157.eurprd08.prod.outlook.com (2603:10a6:102:e3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 16:00:54 +0000 Received: from DBAEUR03FT011.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1da:cafe::c9) by DB9PR05CA0006.outlook.office365.com (2603:10a6:10:1da::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.25 via Frontend Transport; Fri, 16 Jun 2023 16:00: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; pr=C Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT011.mail.protection.outlook.com (100.127.142.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.25 via Frontend Transport; Fri, 16 Jun 2023 16:00:54 +0000 Received: from AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) 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.2507.23; Fri, 16 Jun 2023 16:00:53 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 16 Jun 2023 16:00:53 +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.2507.23 via Frontend Transport; Fri, 16 Jun 2023 16:00:52 +0000 From: Joey Gouly To: , Mark Rutland CC: , Joey Gouly Subject: [PATCH v2 1/2] aarch64: enable access to TCR2_ELx Date: Fri, 16 Jun 2023 17:00:35 +0100 Message-ID: <20230616160036.3825473-1-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT011:EE_|PA4PR08MB6157:EE_|AM7EUR03FT042:EE_|AS8PR08MB9791:EE_ X-MS-Office365-Filtering-Correlation-Id: 73b3a857-a0f2-4766-f08e-08db6e82e337 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: ll3obbg5ZbOyIcDnpUeIBu6ak3gHH4wkl+EAIaxou7C0w03J2BdgzI3oUquZN8HSXAOjpCyR+WCapoJY1jJEpqYQr+Jjh5MlJveOlaHBVI8UYwTEd5robypZ/bZumUXDU5T18jTZnJcE/3K6UJcc6wOx3VbJG4ty0m/t8bFfLB2/SSb6I8fMlOqLOPwp2WClTCKtNmd9FNXNT027BK/cNlspaazYxBZsftXvmPUhyoSNFYyOy6e0cP3384+mKkm0oekBjeiL4tdoB9MF5xRxvHbej+jdqb259I2DT4JeiFNkpZjPXD9qzCqArc0A3AVxzxEluLIg2zp3AIYBH11N5dhpr54mDmoxHyTValPLquQS4Qp2BnEQZWYiXTV35h9Lwf+ggg/UKcNdmZZD6lAiur8wFqkrjYskHFv8nEUVa8TweQSJOSMAoNAr0ocEKHSa8QEsAUEyXnFOKr1dQlAsxg/I3BH/nd8R+v5vFvHDKMpZPa1piCbI8t8de4N61N0LYprM2NSgDCWi4CkiEFbTs7+g1E054XL/bbdKTtWnm1J2ntspopezcSr3SId6jgfR8PBo1tw9WTPQwJWVXlp6pkCajoYzh26AnlensiLhLEp65X1w2NUFn/Q9sbt2ovTCW00SUwmM+owmF4LZLhNnZ1jdtZthearC8ypJq5bLd5C2dahxmxlAs2THi2krUJ588k15AwiQteun3UZqUawUWp/B6N5VdWFcGU2Rm3hSVVE58uMQhW8Rbnp8govzYNIs6D7NbsG+2xH0YlgJYc/2Fg== 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:(13230028)(4636009)(396003)(39850400004)(376002)(346002)(136003)(451199021)(40470700004)(46966006)(36840700001)(1076003)(36860700001)(26005)(6636002)(4326008)(316002)(70206006)(70586007)(426003)(2616005)(47076005)(336012)(186003)(83380400001)(6666004)(7696005)(356005)(81166007)(40460700003)(110136005)(478600001)(54906003)(82740400003)(40480700001)(44832011)(8676002)(8936002)(5660300002)(86362001)(41300700001)(2906002)(36756003)(82310400005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6157 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT042.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 7bb52735-38f2-4183-dcdd-08db6e82dd8a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yhJ6uSXLHi3GnWRRyCfvuDfTaauBPGDcb9r9J8I2WfCK8RXTasEgVIpNE+YX5+n4xv2NvessR2y5PGXqo/btEgu64ILm+b3bt84zpQSkrb4qyQggC752eFDms3a3je1dsbMK+2UiDpFQHg/QIrBoDPgmKxJFZLTtQiD6wByBqfwd9oKvSq9+/qG3tcHF2SC0VpWlem4Z1VW0ef/phfsENZy5UGBqdyVHOSibS1wy8A6CmkIMTy4i+WhLa1vY4Lue9eu0af47BIzZ5ilphSHNK4+xwIcdeUpXaEeIeB3tMkB95Hyx3PoKPHYq9kLg09p17LC+BB9KDCAzgVLdmHIRwr41qr90Ai96MBNjguUuMxQVh1u6RfDtlvSVDFTIwZR9GZyFtTgDnPVoDfwXFbqyjX6654/RuV/LXkgNlslDGGUwT8/uT7BnKqw/nmyGbQ15ryK9M1lZjD7V7UXUVnLlWR9osRbldXgd6wPG+ZJuTI8McF8qOhXZe9BMb4smqt0UvLrQ5IbJEJLo+GItDl4Dnnma6A8vz8ncRAYD/sRHwiNaCrFVr/03ljlfnUXqV+eLvPg5rUTbPVdRQX6I46l5rFuvVRpSTTtULmLUGcE7m0g4u4kvmf8Y784+uTReYoMRHH6naOX3JcroSlo3QLchsUcPokkVaZ52bhLMqtKpFwkQyUbXakQpnQ6MXFIoyUZ1X7Gk1LhPXUMeQvRmmk9LaqkbQkD2ncMK+5JkN8pJxfNu6OzNCX7xfDPQ6xKI3LlY 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:(13230028)(4636009)(376002)(39860400002)(396003)(136003)(346002)(451199021)(40470700004)(46966006)(36840700001)(40480700001)(47076005)(40460700003)(82740400003)(110136005)(81166007)(54906003)(8936002)(478600001)(2616005)(41300700001)(8676002)(70586007)(6636002)(4326008)(316002)(70206006)(5660300002)(426003)(7696005)(36860700001)(186003)(336012)(83380400001)(6666004)(26005)(1076003)(44832011)(86362001)(82310400005)(2906002)(36756003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 16:01:03.9330 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 73b3a857-a0f2-4766-f08e-08db6e82e337 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: AM7EUR03FT042.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9791 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230616_091601_601015_FF35DD5B X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. 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 Allow access the TCR2_ELx register which provides extended translation controls similar to TCR_ELx. Initialise these registers to a value of 0. Signed-off-by: Joey Gouly --- arch/aarch64/include/asm/cpu.h | 8 ++++++++ arch/aarch64/init.c | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/arch/aarch64/include/asm/cpu.h b/arch/aarch64/include/asm/cpu.h index 89a8f78..0213d53 100644 --- a/arch/aarch64/include/asm/cpu.h +++ b/arch/aarch64/include/asm/cpu.h @@ -17,6 +17,9 @@ #define CURRENTEL_EL2 (2 << 2) #define CURRENTEL_EL1 (1 << 2) +#define TCR2_EL2 s3_4_c2_c0_3 +#define TCR2_EL1 s3_0_c2_c0_3 + /* * RES1 bit definitions definitions as of ARM DDI 0487G.b * @@ -51,6 +54,7 @@ #define SCR_EL3_TME BIT(34) #define SCR_EL3_HXEn BIT(38) #define SCR_EL3_EnTP2 BIT(41) +#define SCR_EL3_TCR2EN BIT(43) #define HCR_EL2_RES1 BIT(1) @@ -73,6 +77,8 @@ #define ID_AA64MMFR1_EL1_HCX BITS(43, 40) +#define ID_AA64MMFR3_EL1_TCRX BITS(4, 0) + #define ID_AA64PFR1_EL1_MTE BITS(11, 8) #define ID_AA64PFR1_EL1_SME BITS(27, 24) #define ID_AA64PFR0_EL1_SVE BITS(35, 32) @@ -122,6 +128,8 @@ #define ID_AA64ISAR2_EL1 s3_0_c0_c6_2 +#define ID_AA64MMFR3_EL1 s3_0_c0_c7_3 + #define SCTLR_EL1_CP15BEN (1 << 5) #ifdef KERNEL_32 diff --git a/arch/aarch64/init.c b/arch/aarch64/init.c index 471e234..e09e050 100644 --- a/arch/aarch64/init.c +++ b/arch/aarch64/init.c @@ -64,6 +64,12 @@ void cpu_init_el3(void) if (mrs_field(ID_AA64MMFR1_EL1, HCX)) scr |= SCR_EL3_HXEn; + if (mrs_field(ID_AA64MMFR3_EL1, TCRX)) { + scr |= SCR_EL3_TCR2EN; + msr(TCR2_EL2, 0); + msr(TCR2_EL1, 0); + } + if (mrs_field(ID_AA64PFR1_EL1, MTE) >= 2) scr |= SCR_EL3_ATA;