From nobody Thu May 2 01:53:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1606746197; cv=none; d=zohomail.com; s=zohoarc; b=kWl3CixdnErHnflcMc6h3jt82Mnz72gnt9QuEXkuH19Kwf3o8Rt7V66nVrr7s5M+MJeCAPBa6WuPaCO1Zl5l5K5xv56VW+9zyO0Api1uJiNe37mW7rPfa9KPcjjl7W40iALrzuCdK0w3pT9vRLsoS07torBk25/J7rqzg6Guh5k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606746197; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=sFhHfj376BFjbLoInPewM5apLCFuBqEnqPlZ6i7xsdE=; b=Y4YR6iXkF4mi1jS1HhWnVlw1iqKwKKvfl3LkHSXl4tY0lUDy8EjWKSnNpqu+hjnVFrSdmXVJiSSC8kRZpLi+eQ7zl5TGbuqdM36d0sdTYY2TGrlTwSdhzsKGwEVGYrFSB5itsVKqPWkr9kPISHXjujeeP+EZTBQm2Kezdk4r7W8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1606746197409757.7954122657783; Mon, 30 Nov 2020 06:23:17 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.41177.74297 (Exim 4.92) (envelope-from ) id 1kjk50-00023n-9l; Mon, 30 Nov 2020 14:23:02 +0000 Received: by outflank-mailman (output) from mailman id 41177.74297; Mon, 30 Nov 2020 14:23:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk50-00023g-6d; Mon, 30 Nov 2020 14:23:02 +0000 Received: by outflank-mailman (input) for mailman id 41177; Mon, 30 Nov 2020 14:23:00 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk4y-00022q-Mr for xen-devel@lists.xenproject.org; Mon, 30 Nov 2020 14:23:00 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 89d869bd-b1d7-4bfa-a37c-167f277b97fc; Mon, 30 Nov 2020 14:22:59 +0000 (UTC) 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 BB2A8D6E; Mon, 30 Nov 2020 06:22:59 -0800 (PST) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.199.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F108B3F71F; Mon, 30 Nov 2020 06:22:58 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 89d869bd-b1d7-4bfa-a37c-167f277b97fc From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v2 1/7] xen/arm: Add ID registers and complete cpufinfo Date: Mon, 30 Nov 2020 14:21:37 +0000 Message-Id: <97efd89cccdffc2a7fd987ac8156f5eea191fd3f.1606742184.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add definition and entries in cpuinfo for ID registers introduced in newer Arm Architecture reference manual: - ID_PFR2: processor feature register 2 - ID_DFR1: debug feature register 1 - ID_MMFR4 and ID_MMFR5: Memory model feature registers 4 and 5 - ID_ISA6: ISA Feature register 6 Add more bitfield definitions in PFR fields of cpuinfo. Add MVFR2 register definition for aarch32. Add mvfr values in cpuinfo. Add some registers definition for arm64 in sysregs as some are not always know by compilers. Initialize the new values added in cpuinfo in identify_cpu during init. Signed-off-by: Bertrand Marquis Reviewed-by: Volodymyr Babchuk --- Changes in V2: Fix dbg32 table size and add proper initialisation of the second entry of the table by reading ID_DFR1 register. --- xen/arch/arm/cpufeature.c | 17 ++++++++ xen/include/asm-arm/arm64/sysregs.h | 25 ++++++++++++ xen/include/asm-arm/cpregs.h | 11 +++++ xen/include/asm-arm/cpufeature.h | 63 ++++++++++++++++++++++++----- 4 files changed, 107 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 44126dbf07..204be9b084 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -114,15 +114,20 @@ void identify_cpu(struct cpuinfo_arm *c) =20 c->mm64.bits[0] =3D READ_SYSREG64(ID_AA64MMFR0_EL1); c->mm64.bits[1] =3D READ_SYSREG64(ID_AA64MMFR1_EL1); + c->mm64.bits[2] =3D READ_SYSREG64(ID_AA64MMFR2_EL1); =20 c->isa64.bits[0] =3D READ_SYSREG64(ID_AA64ISAR0_EL1); c->isa64.bits[1] =3D READ_SYSREG64(ID_AA64ISAR1_EL1); + + c->zfr64.bits[0] =3D READ_SYSREG64(ID_AA64ZFR0_EL1); #endif =20 c->pfr32.bits[0] =3D READ_SYSREG32(ID_PFR0_EL1); c->pfr32.bits[1] =3D READ_SYSREG32(ID_PFR1_EL1); + c->pfr32.bits[2] =3D READ_SYSREG32(ID_PFR2_EL1); =20 c->dbg32.bits[0] =3D READ_SYSREG32(ID_DFR0_EL1); + c->dbg32.bits[1] =3D READ_SYSREG32(ID_DFR1_EL1); =20 c->aux32.bits[0] =3D READ_SYSREG32(ID_AFR0_EL1); =20 @@ -130,6 +135,8 @@ void identify_cpu(struct cpuinfo_arm *c) c->mm32.bits[1] =3D READ_SYSREG32(ID_MMFR1_EL1); c->mm32.bits[2] =3D READ_SYSREG32(ID_MMFR2_EL1); c->mm32.bits[3] =3D READ_SYSREG32(ID_MMFR3_EL1); + c->mm32.bits[4] =3D READ_SYSREG32(ID_MMFR4_EL1); + c->mm32.bits[5] =3D READ_SYSREG32(ID_MMFR5_EL1); =20 c->isa32.bits[0] =3D READ_SYSREG32(ID_ISAR0_EL1); c->isa32.bits[1] =3D READ_SYSREG32(ID_ISAR1_EL1); @@ -137,6 +144,16 @@ void identify_cpu(struct cpuinfo_arm *c) c->isa32.bits[3] =3D READ_SYSREG32(ID_ISAR3_EL1); c->isa32.bits[4] =3D READ_SYSREG32(ID_ISAR4_EL1); c->isa32.bits[5] =3D READ_SYSREG32(ID_ISAR5_EL1); + c->isa32.bits[6] =3D READ_SYSREG32(ID_ISAR6_EL1); + +#ifdef CONFIG_ARM_64 + c->mvfr.bits[0] =3D READ_SYSREG64(MVFR0_EL1); + c->mvfr.bits[1] =3D READ_SYSREG64(MVFR1_EL1); + c->mvfr.bits[2] =3D READ_SYSREG64(MVFR2_EL1); +#else + c->mvfr.bits[0] =3D READ_CP32(MVFR0); + c->mvfr.bits[1] =3D READ_CP32(MVFR1); +#endif } =20 /* diff --git a/xen/include/asm-arm/arm64/sysregs.h b/xen/include/asm-arm/arm6= 4/sysregs.h index c60029d38f..5abbeda3fd 100644 --- a/xen/include/asm-arm/arm64/sysregs.h +++ b/xen/include/asm-arm/arm64/sysregs.h @@ -57,6 +57,31 @@ #define ICH_AP1R2_EL2 __AP1Rx_EL2(2) #define ICH_AP1R3_EL2 __AP1Rx_EL2(3) =20 +/* + * Define ID coprocessor registers if they are not + * already defined by the compiler. + * + * Values picked from linux kernel + */ +#ifndef ID_AA64MMFR2_EL1 +#define ID_AA64MMFR2_EL1 S3_0_C0_C7_2 +#endif +#ifndef ID_PFR2_EL1 +#define ID_PFR2_EL1 S3_0_C0_C3_4 +#endif +#ifndef ID_MMFR5_EL1 +#define ID_MMFR5_EL1 S3_0_C0_C3_6 +#endif +#ifndef ID_ISAR6_EL1 +#define ID_ISAR6_EL1 S3_0_C0_C2_7 +#endif +#ifndef ID_AA64ZFR0_EL1 +#define ID_AA64ZFR0_EL1 S3_0_C0_C4_4 +#endif +#ifndef ID_DFR1_EL1 +#define ID_DFR1_EL1 S3_0_C0_C3_5 +#endif + /* Access to system registers */ =20 #define READ_SYSREG32(name) ((uint32_t)READ_SYSREG64(name)) diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index 8fd344146e..58be898891 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -63,6 +63,7 @@ #define FPSID p10,7,c0,c0,0 /* Floating-Point System ID Regist= er */ #define FPSCR p10,7,c1,c0,0 /* Floating-Point Status and Contr= ol Register */ #define MVFR0 p10,7,c7,c0,0 /* Media and VFP Feature Register = 0 */ +#define MVFR1 p10,7,c6,c0,0 /* Media and VFP Feature Register = 1 */ #define FPEXC p10,7,c8,c0,0 /* Floating-Point Exception Contro= l Register */ #define FPINST p10,7,c9,c0,0 /* Floating-Point Instruction Regi= ster */ #define FPINST2 p10,7,c10,c0,0 /* Floating-point Instruction Regi= ster 2 */ @@ -108,18 +109,23 @@ #define MPIDR p15,0,c0,c0,5 /* Multiprocessor Affinity Registe= r */ #define ID_PFR0 p15,0,c0,c1,0 /* Processor Feature Register 0 */ #define ID_PFR1 p15,0,c0,c1,1 /* Processor Feature Register 1 */ +#define ID_PFR2 p15,0,c0,c3,4 /* Processor Feature Register 2 */ #define ID_DFR0 p15,0,c0,c1,2 /* Debug Feature Register 0 */ +#define ID_DFR1 p15,0,c0,c3,5 /* Debug Feature Register 1 */ #define ID_AFR0 p15,0,c0,c1,3 /* Auxiliary Feature Register 0 */ #define ID_MMFR0 p15,0,c0,c1,4 /* Memory Model Feature Register 0= */ #define ID_MMFR1 p15,0,c0,c1,5 /* Memory Model Feature Register 1= */ #define ID_MMFR2 p15,0,c0,c1,6 /* Memory Model Feature Register 2= */ #define ID_MMFR3 p15,0,c0,c1,7 /* Memory Model Feature Register 3= */ +#define ID_MMFR4 p15,0,c0,c2,6 /* Memory Model Feature Register 4= */ +#define ID_MMFR5 p15,0,c0,c3,6 /* Memory Model Feature Register 5= */ #define ID_ISAR0 p15,0,c0,c2,0 /* ISA Feature Register 0 */ #define ID_ISAR1 p15,0,c0,c2,1 /* ISA Feature Register 1 */ #define ID_ISAR2 p15,0,c0,c2,2 /* ISA Feature Register 2 */ #define ID_ISAR3 p15,0,c0,c2,3 /* ISA Feature Register 3 */ #define ID_ISAR4 p15,0,c0,c2,4 /* ISA Feature Register 4 */ #define ID_ISAR5 p15,0,c0,c2,5 /* ISA Feature Register 5 */ +#define ID_ISAR6 p15,0,c0,c2,7 /* ISA Feature Register 6 */ #define CCSIDR p15,1,c0,c0,0 /* Cache Size ID Registers */ #define CLIDR p15,1,c0,c0,1 /* Cache Level ID Register */ #define CSSELR p15,2,c0,c0,0 /* Cache Size Selection Register */ @@ -312,18 +318,23 @@ #define HSTR_EL2 HSTR #define ID_AFR0_EL1 ID_AFR0 #define ID_DFR0_EL1 ID_DFR0 +#define ID_DFR1_EL1 ID_DFR1 #define ID_ISAR0_EL1 ID_ISAR0 #define ID_ISAR1_EL1 ID_ISAR1 #define ID_ISAR2_EL1 ID_ISAR2 #define ID_ISAR3_EL1 ID_ISAR3 #define ID_ISAR4_EL1 ID_ISAR4 #define ID_ISAR5_EL1 ID_ISAR5 +#define ID_ISAR6_EL1 ID_ISAR6 #define ID_MMFR0_EL1 ID_MMFR0 #define ID_MMFR1_EL1 ID_MMFR1 #define ID_MMFR2_EL1 ID_MMFR2 #define ID_MMFR3_EL1 ID_MMFR3 +#define ID_MMFR4_EL1 ID_MMFR4 +#define ID_MMFR5_EL1 ID_MMFR5 #define ID_PFR0_EL1 ID_PFR0 #define ID_PFR1_EL1 ID_PFR1 +#define ID_PFR2_EL1 ID_PFR2 #define IFSR32_EL2 IFSR #define MDCR_EL2 HDCR #define MIDR_EL1 MIDR diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeat= ure.h index c7b5052992..64354c3f19 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -148,6 +148,7 @@ struct cpuinfo_arm { union { uint64_t bits[2]; struct { + /* PFR0 */ unsigned long el0:4; unsigned long el1:4; unsigned long el2:4; @@ -155,9 +156,23 @@ struct cpuinfo_arm { unsigned long fp:4; /* Floating Point */ unsigned long simd:4; /* Advanced SIMD */ unsigned long gic:4; /* GIC support */ - unsigned long __res0:28; + unsigned long ras:4; + unsigned long sve:4; + unsigned long sel2:4; + unsigned long mpam:4; + unsigned long amu:4; + unsigned long dit:4; + unsigned long __res0:4; unsigned long csv2:4; - unsigned long __res1:4; + unsigned long cvs3:4; + + /* PFR1 */ + unsigned long bt:4; + unsigned long ssbs:4; + unsigned long mte:4; + unsigned long ras_frac:4; + unsigned long mpam_frac:4; + unsigned long __res1:44; }; } pfr64; =20 @@ -170,7 +185,7 @@ struct cpuinfo_arm { } aux64; =20 union { - uint64_t bits[2]; + uint64_t bits[3]; struct { unsigned long pa_range:4; unsigned long asid_bits:4; @@ -190,6 +205,8 @@ struct cpuinfo_arm { unsigned long pan:4; unsigned long __res1:8; unsigned long __res2:32; + + unsigned long __res3:64; }; } mm64; =20 @@ -197,6 +214,10 @@ struct cpuinfo_arm { uint64_t bits[2]; } isa64; =20 + struct { + uint64_t bits[1]; + } zfr64; + #endif =20 /* @@ -204,25 +225,38 @@ struct cpuinfo_arm { * when running in 32-bit mode. */ union { - uint32_t bits[2]; + uint32_t bits[3]; struct { + /* PFR0 */ unsigned long arm:4; unsigned long thumb:4; unsigned long jazelle:4; unsigned long thumbee:4; - unsigned long __res0:16; + unsigned long csv2:4; + unsigned long amu:4; + unsigned long dit:4; + unsigned long ras:4; =20 + /* PFR1 */ unsigned long progmodel:4; unsigned long security:4; unsigned long mprofile:4; unsigned long virt:4; unsigned long gentimer:4; - unsigned long __res1:12; + unsigned long sec_frac:4; + unsigned long virt_frac:4; + unsigned long gic:4; + + /* PFR2 */ + unsigned long csv3:4; + unsigned long ssbs:4; + unsigned long ras_frac:4; + unsigned long __res2:20; }; } pfr32; =20 struct { - uint32_t bits[1]; + uint32_t bits[2]; } dbg32; =20 struct { @@ -230,12 +264,23 @@ struct cpuinfo_arm { } aux32; =20 struct { - uint32_t bits[4]; + uint32_t bits[6]; } mm32; =20 struct { - uint32_t bits[6]; + uint32_t bits[7]; } isa32; + +#ifdef CONFIG_ARM_64 + struct { + uint64_t bits[3]; + } mvfr; +#else + /* Only MVFR0 and MVFR1 exist on armv7 */ + struct { + uint32_t bits[2]; + } mvfr; +#endif }; =20 extern struct cpuinfo_arm boot_cpu_data; --=20 2.17.1 From nobody Thu May 2 01:53:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1606746198; cv=none; d=zohomail.com; s=zohoarc; b=bFUgC1xqs1jiqIrHCrXJ35CSdT5l/Azpz0zwlOlIBfeyKThMk45Yeyj8bzMrp8Oo+RaR+7manOPTKwKODABIgKWGEOi7EXd5DrTdQqQr10o7G4eUNz8k6Zb+Ho8F0jCS0kjqrxah77XMfLpV89oLQm/htLw6inLV2j3L7LYHxM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606746198; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UqctKHnRj0M7k/loA5R8IxkUiu8vRCqC3X/yeK8rk/k=; b=cavunu0R0E4UVyxIn+2h+0iKYxYPjDxWaiHER82svSttyNPoEx/ZL+LeJzOxH606CMmKX57YN653LqO/FWGBM6w9MRdKVFa00zX4LFN/lEZ3WIrsOfAuPc+h44Ii7gCNLTlwBiTKjb+AKEr431VevvjHwHLVp5TKUbK1JlP0pC4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1606746197933644.485489437283; Mon, 30 Nov 2020 06:23:17 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.41178.74305 (Exim 4.92) (envelope-from ) id 1kjk50-00024X-Oz; Mon, 30 Nov 2020 14:23:02 +0000 Received: by outflank-mailman (output) from mailman id 41178.74305; Mon, 30 Nov 2020 14:23:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk50-000245-Fa; Mon, 30 Nov 2020 14:23:02 +0000 Received: by outflank-mailman (input) for mailman id 41178; Mon, 30 Nov 2020 14:23:01 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk4z-00022w-IJ for xen-devel@lists.xenproject.org; Mon, 30 Nov 2020 14:23:01 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id e43e7f3b-76e5-4957-8b4f-341920bdde02; Mon, 30 Nov 2020 14:23:00 +0000 (UTC) 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 9E9E31042; Mon, 30 Nov 2020 06:23:00 -0800 (PST) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.199.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EF1573F71F; Mon, 30 Nov 2020 06:22:59 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e43e7f3b-76e5-4957-8b4f-341920bdde02 From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v2 2/7] xen/arm: Add arm64 ID registers definitions Date: Mon, 30 Nov 2020 14:21:38 +0000 Message-Id: <83f4e52dce23d2e83f6118e5ecb3cef22112f9e9.1606742184.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add coprocessor registers definitions for all ID registers trapped through the TID3 bit of HSR. Those are the one that will be emulated in Xen to only publish to guests the features that are supported by Xen and that are accessible to guests. Signed-off-by: Bertrand Marquis Acked-by: Stefano Stabellini Reviewed-by: Volodymyr Babchuk --- Changes in V2: rebase --- xen/include/asm-arm/arm64/hsr.h | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/xen/include/asm-arm/arm64/hsr.h b/xen/include/asm-arm/arm64/hs= r.h index ca931dd2fe..e691d41c17 100644 --- a/xen/include/asm-arm/arm64/hsr.h +++ b/xen/include/asm-arm/arm64/hsr.h @@ -110,6 +110,43 @@ #define HSR_SYSREG_CNTP_CTL_EL0 HSR_SYSREG(3,3,c14,c2,1) #define HSR_SYSREG_CNTP_CVAL_EL0 HSR_SYSREG(3,3,c14,c2,2) =20 +/* Those registers are used when HCR_EL2.TID3 is set */ +#define HSR_SYSREG_ID_PFR0_EL1 HSR_SYSREG(3,0,c0,c1,0) +#define HSR_SYSREG_ID_PFR1_EL1 HSR_SYSREG(3,0,c0,c1,1) +#define HSR_SYSREG_ID_PFR2_EL1 HSR_SYSREG(3,0,c0,c3,4) +#define HSR_SYSREG_ID_DFR0_EL1 HSR_SYSREG(3,0,c0,c1,2) +#define HSR_SYSREG_ID_DFR1_EL1 HSR_SYSREG(3,0,c0,c3,5) +#define HSR_SYSREG_ID_AFR0_EL1 HSR_SYSREG(3,0,c0,c1,3) +#define HSR_SYSREG_ID_MMFR0_EL1 HSR_SYSREG(3,0,c0,c1,4) +#define HSR_SYSREG_ID_MMFR1_EL1 HSR_SYSREG(3,0,c0,c1,5) +#define HSR_SYSREG_ID_MMFR2_EL1 HSR_SYSREG(3,0,c0,c1,6) +#define HSR_SYSREG_ID_MMFR3_EL1 HSR_SYSREG(3,0,c0,c1,7) +#define HSR_SYSREG_ID_MMFR4_EL1 HSR_SYSREG(3,0,c0,c2,6) +#define HSR_SYSREG_ID_MMFR5_EL1 HSR_SYSREG(3,0,c0,c3,6) +#define HSR_SYSREG_ID_ISAR0_EL1 HSR_SYSREG(3,0,c0,c2,0) +#define HSR_SYSREG_ID_ISAR1_EL1 HSR_SYSREG(3,0,c0,c2,1) +#define HSR_SYSREG_ID_ISAR2_EL1 HSR_SYSREG(3,0,c0,c2,2) +#define HSR_SYSREG_ID_ISAR3_EL1 HSR_SYSREG(3,0,c0,c2,3) +#define HSR_SYSREG_ID_ISAR4_EL1 HSR_SYSREG(3,0,c0,c2,4) +#define HSR_SYSREG_ID_ISAR5_EL1 HSR_SYSREG(3,0,c0,c2,5) +#define HSR_SYSREG_ID_ISAR6_EL1 HSR_SYSREG(3,0,c0,c2,7) +#define HSR_SYSREG_MVFR0_EL1 HSR_SYSREG(3,0,c0,c3,0) +#define HSR_SYSREG_MVFR1_EL1 HSR_SYSREG(3,0,c0,c3,1) +#define HSR_SYSREG_MVFR2_EL1 HSR_SYSREG(3,0,c0,c3,2) + +#define HSR_SYSREG_ID_AA64PFR0_EL1 HSR_SYSREG(3,0,c0,c4,0) +#define HSR_SYSREG_ID_AA64PFR1_EL1 HSR_SYSREG(3,0,c0,c4,1) +#define HSR_SYSREG_ID_AA64DFR0_EL1 HSR_SYSREG(3,0,c0,c5,0) +#define HSR_SYSREG_ID_AA64DFR1_EL1 HSR_SYSREG(3,0,c0,c5,1) +#define HSR_SYSREG_ID_AA64ISAR0_EL1 HSR_SYSREG(3,0,c0,c6,0) +#define HSR_SYSREG_ID_AA64ISAR1_EL1 HSR_SYSREG(3,0,c0,c6,1) +#define HSR_SYSREG_ID_AA64MMFR0_EL1 HSR_SYSREG(3,0,c0,c7,0) +#define HSR_SYSREG_ID_AA64MMFR1_EL1 HSR_SYSREG(3,0,c0,c7,1) +#define HSR_SYSREG_ID_AA64MMFR2_EL1 HSR_SYSREG(3,0,c0,c7,2) +#define HSR_SYSREG_ID_AA64AFR0_EL1 HSR_SYSREG(3,0,c0,c5,4) +#define HSR_SYSREG_ID_AA64AFR1_EL1 HSR_SYSREG(3,0,c0,c5,5) +#define HSR_SYSREG_ID_AA64ZFR0_EL1 HSR_SYSREG(3,0,c0,c4,4) + #endif /* __ASM_ARM_ARM64_HSR_H */ =20 /* --=20 2.17.1 From nobody Thu May 2 01:53:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1606746198; cv=none; d=zohomail.com; s=zohoarc; b=O5gk+rKfF3MWRQPLJOXDti37ltX3YlV7ZgjAZ2NlhauRSmtCDMIIyxltbfrV+34NEjGrPHuMJYa1G4ylXDM0SZHK6SvqBeTszsA555au+qm3YWt36oLkQmH1C9yb6CfZnaWF3cvHAxHo3B96s9gWlvXjKbEBiV1TG3FQZCsbYk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606746198; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Zr4/eyU4q+GH7z/YkxHB8wnvFp/x/BQ8VrKWNWz/M78=; b=B5sFvgpBDfM1rZ4tzLRCnVDguNQdq5qEaMErmKYwN5RUpbS21hvOM+aHskJcDsSkKCRiRRi+tQ7q0PqgL81dbYAGl+qiOsWCQzBcPf2gXhqxG2Rf/EsjP5ms0SdDqRqIJxVU2TEBe+znJAgw8hg/icigljqRkPhh+6rI1fyZ2G4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1606746198897632.0193487099466; Mon, 30 Nov 2020 06:23:18 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.41179.74321 (Exim 4.92) (envelope-from ) id 1kjk51-00026w-V6; Mon, 30 Nov 2020 14:23:03 +0000 Received: by outflank-mailman (output) from mailman id 41179.74321; Mon, 30 Nov 2020 14:23:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk51-00026n-RV; Mon, 30 Nov 2020 14:23:03 +0000 Received: by outflank-mailman (input) for mailman id 41179; Mon, 30 Nov 2020 14:23:02 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk50-00022w-AC for xen-devel@lists.xenproject.org; Mon, 30 Nov 2020 14:23:02 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 68dbe204-06ab-4ef6-a8e6-cfc63250b524; Mon, 30 Nov 2020 14:23:01 +0000 (UTC) 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 81EFB1042; Mon, 30 Nov 2020 06:23:01 -0800 (PST) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.199.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D23CF3F71F; Mon, 30 Nov 2020 06:23:00 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 68dbe204-06ab-4ef6-a8e6-cfc63250b524 From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v2 3/7] xen/arm: create a cpuinfo structure for guest Date: Mon, 30 Nov 2020 14:21:39 +0000 Message-Id: <539cc9c817a80e35a2532dba5bc01e9b2533ff56.1606742184.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Create a cpuinfo structure for guest and mask into it the features that we do not support in Xen or that we do not want to publish to guests. Modify some values in the cpuinfo structure for guests to mask some features which we do not want to allow to guests (like AMU) or we do not support (like SVE). The code is trying to group together registers modifications for the same feature to be able in the long term to easily enable/disable a feature depending on user parameters or add other registers modification in the same place (like enabling/disabling HCR bits). Signed-off-by: Bertrand Marquis --- Changes in V2: rebase --- xen/arch/arm/cpufeature.c | 51 ++++++++++++++++++++++++++++++++ xen/include/asm-arm/cpufeature.h | 2 ++ 2 files changed, 53 insertions(+) diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c index 204be9b084..309941ff37 100644 --- a/xen/arch/arm/cpufeature.c +++ b/xen/arch/arm/cpufeature.c @@ -24,6 +24,8 @@ =20 DECLARE_BITMAP(cpu_hwcaps, ARM_NCAPS); =20 +struct cpuinfo_arm __read_mostly guest_cpuinfo; + void update_cpu_capabilities(const struct arm_cpu_capabilities *caps, const char *info) { @@ -156,6 +158,55 @@ void identify_cpu(struct cpuinfo_arm *c) #endif } =20 +/* + * This function is creating a cpuinfo structure with values modified to m= ask + * all cpu features that should not be published to guest. + * The created structure is then used to provide ID registers values to gu= ests. + */ +static int __init create_guest_cpuinfo(void) +{ + /* + * TODO: The code is currently using only the features detected on the= boot + * core. In the long term we should try to compute values containing o= nly + * features supported by all cores. + */ + identify_cpu(&guest_cpuinfo); + +#ifdef CONFIG_ARM_64 + /* Disable MPAM as xen does not support it */ + guest_cpuinfo.pfr64.mpam =3D 0; + guest_cpuinfo.pfr64.mpam_frac =3D 0; + + /* Disable SVE as Xen does not support it */ + guest_cpuinfo.pfr64.sve =3D 0; + guest_cpuinfo.zfr64.bits[0] =3D 0; + + /* Disable MTE as Xen does not support it */ + guest_cpuinfo.pfr64.mte =3D 0; +#endif + + /* Disable AMU */ +#ifdef CONFIG_ARM_64 + guest_cpuinfo.pfr64.amu =3D 0; +#endif + guest_cpuinfo.pfr32.amu =3D 0; + + /* Disable RAS as Xen does not support it */ +#ifdef CONFIG_ARM_64 + guest_cpuinfo.pfr64.ras =3D 0; + guest_cpuinfo.pfr64.ras_frac =3D 0; +#endif + guest_cpuinfo.pfr32.ras =3D 0; + guest_cpuinfo.pfr32.ras_frac =3D 0; + + return 0; +} +/* + * This function needs to be run after all smp are started to have + * cpuinfo structures for all cores. + */ +__initcall(create_guest_cpuinfo); + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeat= ure.h index 64354c3f19..0ab6dd42a0 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -290,6 +290,8 @@ extern void identify_cpu(struct cpuinfo_arm *); extern struct cpuinfo_arm cpu_data[]; #define current_cpu_data cpu_data[smp_processor_id()] =20 +extern struct cpuinfo_arm guest_cpuinfo; + #endif /* __ASSEMBLY__ */ =20 #endif --=20 2.17.1 From nobody Thu May 2 01:53:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1606746200; cv=none; d=zohomail.com; s=zohoarc; b=aMckoBmmWZoLi6GU0l7nt+hdU18+G0JADpGQJkFIu8cft8T9pcn4IhKuN1DEgpTegdd13FuRKKW8/M1uO5Io+nCAdp1ImMTDme/vxCleCoSxoIFpe3OtcpIsla71P8LeObEvHu2VGUtOskKlxx0WCORNnl4zY+WkpPpgHNSaIF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606746200; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UreDikH1dGoloyx3sb+ryiynQteODqyRQs9AppEtHFY=; b=hleg/xxI2oGsseQ06ViZxvEMPL6WsFqYoV/x/snKb2JkKbNxJ8IV2BKjZmzHTkxHFL6zZKXrYn1RV53h0hoPdQTDV2CqwHWxSG/ClR7wgdNSG90gsbEUeET7mykDCUxeFqc7grLNTk3oKt9OudYZdunoqcBo3PEbpwPkrmd9J68= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1606746200733868.73809671022; Mon, 30 Nov 2020 06:23:20 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.41181.74345 (Exim 4.92) (envelope-from ) id 1kjk55-0002Cw-PZ; Mon, 30 Nov 2020 14:23:07 +0000 Received: by outflank-mailman (output) from mailman id 41181.74345; Mon, 30 Nov 2020 14:23:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk55-0002Cl-Lg; Mon, 30 Nov 2020 14:23:07 +0000 Received: by outflank-mailman (input) for mailman id 41181; Mon, 30 Nov 2020 14:23:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk54-00022w-Gt for xen-devel@lists.xenproject.org; Mon, 30 Nov 2020 14:23:06 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 5998b097-c1a0-4e3e-89d9-09df240bb616; Mon, 30 Nov 2020 14:23:02 +0000 (UTC) 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 643A2D6E; Mon, 30 Nov 2020 06:23:02 -0800 (PST) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.199.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B4EEC3F71F; Mon, 30 Nov 2020 06:23:01 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5998b097-c1a0-4e3e-89d9-09df240bb616 From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v2 4/7] xen/arm: Add handler for ID registers on arm64 Date: Mon, 30 Nov 2020 14:21:40 +0000 Message-Id: <6db611491b25591829b9408267bd9bd50e266fe2.1606742184.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add vsysreg emulation for registers trapped when TID3 bit is activated in HSR. The emulation is returning the value stored in cpuinfo_guest structure for most values and the hardware value for registers not stored in the structure (those are mostly registers existing only as a provision for feature use but who have no definition right now). Signed-off-by: Bertrand Marquis --- Changes in V2: rebase --- xen/arch/arm/arm64/vsysreg.c | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/xen/arch/arm/arm64/vsysreg.c b/xen/arch/arm/arm64/vsysreg.c index 8a85507d9d..970ef51603 100644 --- a/xen/arch/arm/arm64/vsysreg.c +++ b/xen/arch/arm/arm64/vsysreg.c @@ -69,6 +69,14 @@ TVM_REG(CONTEXTIDR_EL1) break; \ } =20 +/* Macro to generate easily case for ID co-processor emulation */ +#define GENERATE_TID3_INFO(reg,field,offset) \ + case HSR_SYSREG_##reg: \ + { \ + return handle_ro_read_val(regs, regidx, hsr.sysreg.read, hsr, \ + 1, guest_cpuinfo.field.bits[offset]); \ + } + void do_sysreg(struct cpu_user_regs *regs, const union hsr hsr) { @@ -259,6 +267,47 @@ void do_sysreg(struct cpu_user_regs *regs, */ return handle_raz_wi(regs, regidx, hsr.sysreg.read, hsr, 1); =20 + /* + * HCR_EL2.TID3 + * + * This is trapping most Identification registers used by a guest + * to identify the processor features + */ + GENERATE_TID3_INFO(ID_PFR0_EL1, pfr32, 0) + GENERATE_TID3_INFO(ID_PFR1_EL1, pfr32, 1) + GENERATE_TID3_INFO(ID_PFR2_EL1, pfr32, 2) + GENERATE_TID3_INFO(ID_DFR0_EL1, dbg32, 0) + GENERATE_TID3_INFO(ID_DFR1_EL1, dbg32, 1) + GENERATE_TID3_INFO(ID_AFR0_EL1, aux32, 0) + GENERATE_TID3_INFO(ID_MMFR0_EL1, mm32, 0) + GENERATE_TID3_INFO(ID_MMFR1_EL1, mm32, 1) + GENERATE_TID3_INFO(ID_MMFR2_EL1, mm32, 2) + GENERATE_TID3_INFO(ID_MMFR3_EL1, mm32, 3) + GENERATE_TID3_INFO(ID_MMFR4_EL1, mm32, 4) + GENERATE_TID3_INFO(ID_MMFR5_EL1, mm32, 5) + GENERATE_TID3_INFO(ID_ISAR0_EL1, isa32, 0) + GENERATE_TID3_INFO(ID_ISAR1_EL1, isa32, 1) + GENERATE_TID3_INFO(ID_ISAR2_EL1, isa32, 2) + GENERATE_TID3_INFO(ID_ISAR3_EL1, isa32, 3) + GENERATE_TID3_INFO(ID_ISAR4_EL1, isa32, 4) + GENERATE_TID3_INFO(ID_ISAR5_EL1, isa32, 5) + GENERATE_TID3_INFO(ID_ISAR6_EL1, isa32, 6) + GENERATE_TID3_INFO(MVFR0_EL1, mvfr, 0) + GENERATE_TID3_INFO(MVFR1_EL1, mvfr, 1) + GENERATE_TID3_INFO(MVFR2_EL1, mvfr, 2) + GENERATE_TID3_INFO(ID_AA64PFR0_EL1, pfr64, 0) + GENERATE_TID3_INFO(ID_AA64PFR1_EL1, pfr64, 1) + GENERATE_TID3_INFO(ID_AA64DFR0_EL1, dbg64, 0) + GENERATE_TID3_INFO(ID_AA64DFR1_EL1, dbg64, 1) + GENERATE_TID3_INFO(ID_AA64ISAR0_EL1, isa64, 0) + GENERATE_TID3_INFO(ID_AA64ISAR1_EL1, isa64, 1) + GENERATE_TID3_INFO(ID_AA64MMFR0_EL1, mm64, 0) + GENERATE_TID3_INFO(ID_AA64MMFR1_EL1, mm64, 1) + GENERATE_TID3_INFO(ID_AA64MMFR2_EL1, mm64, 2) + GENERATE_TID3_INFO(ID_AA64AFR0_EL1, aux64, 0) + GENERATE_TID3_INFO(ID_AA64AFR1_EL1, aux64, 1) + GENERATE_TID3_INFO(ID_AA64ZFR0_EL1, zfr64, 0) + /* * HCR_EL2.TIDCP * --=20 2.17.1 From nobody Thu May 2 01:53:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1606746206; cv=none; d=zohomail.com; s=zohoarc; b=LOaypI0KCGgzycTvCgmsysXyDtssKwEQOjqebnPSt74bgR99KMvjteBmM83B9RghnoHFY901lLyTmMkiROYcoEIbrgpuwI2Ikh/tipCdJdcFTNeKGeFbZdA4wMVgXM3gmh9YR6EZtiPYbnnXvSiwDmzFmM4Q4jW6JK6fzjcStZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606746206; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=iIFSeK22N91FxEsYHN1cWOye5p8h91JHrAWIA/kj+vs=; b=ShiN3XCir5epmXzo5FNtd4GWMl4ivxoQntNkCeLASTLQjtLaRnpNYxQSv5kh2FQ40/aQF6FsW8t2GmCUPEsRfI/9VmcOiMW3PJqgVJOko4cjLe4jFDNW682rxU2JmzBUsjP0IUFM0jcH110sAzTO0b4OsHkFbbxyWBO7F2EFF7E= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1606746206649194.55316778435633; Mon, 30 Nov 2020 06:23:26 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.41183.74364 (Exim 4.92) (envelope-from ) id 1kjk5A-0002LX-P2; Mon, 30 Nov 2020 14:23:12 +0000 Received: by outflank-mailman (output) from mailman id 41183.74364; Mon, 30 Nov 2020 14:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk5A-0002L7-Ft; Mon, 30 Nov 2020 14:23:12 +0000 Received: by outflank-mailman (input) for mailman id 41183; Mon, 30 Nov 2020 14:23:11 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk59-00022w-H6 for xen-devel@lists.xenproject.org; Mon, 30 Nov 2020 14:23:11 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 034b4ba2-2386-4ae3-92ee-0b5e1b1f31fc; Mon, 30 Nov 2020 14:23:03 +0000 (UTC) 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 475591042; Mon, 30 Nov 2020 06:23:03 -0800 (PST) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.199.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 97B703F71F; Mon, 30 Nov 2020 06:23:02 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 034b4ba2-2386-4ae3-92ee-0b5e1b1f31fc From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v2 5/7] xen/arm: Add handler for cp15 ID registers Date: Mon, 30 Nov 2020 14:21:41 +0000 Message-Id: <86c96cd3895bf968f94010c0f4ee8dce7f0338e8.1606742184.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add support for emulation of cp15 based ID registers (on arm32 or when running a 32bit guest on arm64). The handlers are returning the values stored in the guest_cpuinfo structure. In the current status the MVFR registers are no supported. Signed-off-by: Bertrand Marquis --- Changes in V2: rebase --- xen/arch/arm/vcpreg.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index cdc91cdf5b..d0c6406f34 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -155,6 +155,14 @@ TVM_REG32(CONTEXTIDR, CONTEXTIDR_EL1) break; \ } =20 +/* Macro to generate easily case for ID co-processor emulation */ +#define GENERATE_TID3_INFO(reg,field,offset) \ + case HSR_CPREG32(reg): \ + { \ + return handle_ro_read_val(regs, regidx, cp32.read, hsr, \ + 1, guest_cpuinfo.field.bits[offset]); \ + } + void do_cp15_32(struct cpu_user_regs *regs, const union hsr hsr) { const struct hsr_cp32 cp32 =3D hsr.cp32; @@ -286,6 +294,33 @@ void do_cp15_32(struct cpu_user_regs *regs, const unio= n hsr hsr) */ return handle_raz_wi(regs, regidx, cp32.read, hsr, 1); =20 + /* + * HCR_EL2.TID3 + * + * This is trapping most Identification registers used by a guest + * to identify the processor features + */ + GENERATE_TID3_INFO(ID_PFR0, pfr32, 0) + GENERATE_TID3_INFO(ID_PFR1, pfr32, 1) + GENERATE_TID3_INFO(ID_PFR2, pfr32, 2) + GENERATE_TID3_INFO(ID_DFR0, dbg32, 0) + GENERATE_TID3_INFO(ID_DFR1, dbg32, 1) + GENERATE_TID3_INFO(ID_AFR0, aux32, 0) + GENERATE_TID3_INFO(ID_MMFR0, mm32, 0) + GENERATE_TID3_INFO(ID_MMFR1, mm32, 1) + GENERATE_TID3_INFO(ID_MMFR2, mm32, 2) + GENERATE_TID3_INFO(ID_MMFR3, mm32, 3) + GENERATE_TID3_INFO(ID_MMFR4, mm32, 4) + GENERATE_TID3_INFO(ID_MMFR5, mm32, 5) + GENERATE_TID3_INFO(ID_ISAR0, isa32, 0) + GENERATE_TID3_INFO(ID_ISAR1, isa32, 1) + GENERATE_TID3_INFO(ID_ISAR2, isa32, 2) + GENERATE_TID3_INFO(ID_ISAR3, isa32, 3) + GENERATE_TID3_INFO(ID_ISAR4, isa32, 4) + GENERATE_TID3_INFO(ID_ISAR5, isa32, 5) + GENERATE_TID3_INFO(ID_ISAR6, isa32, 6) + /* MVFR registers are in cp10 no cp15 */ + /* * HCR_EL2.TIDCP * --=20 2.17.1 From nobody Thu May 2 01:53:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1606746204; cv=none; d=zohomail.com; s=zohoarc; b=TytsbgSqUZfnYWRnlcTY5VQbBDdX6EjBoPLb0BarjI74kIHbRGa6uTvQNFmhxQMg731Oq8dwVn024qmzcJLA/7KVFlhy/rRFY/ZHavpI6KaHQ4ti5cjubmSAWHfmJ+ye7kwf2Zck8CN8+A1YbSNndie3fkTvNHq/oUDXxvtcnac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606746204; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ie5MJb6DKwJuf3xpYrD9XhHKXhnE1eabaJEX0yuMqVA=; b=C739DdzbC/OKyg/l7ErVEGEs0mg04pTmvpR2f9UuFGYlRYXgJaDMBvWvn/cuMCzY6l3pHnM6+swOqsW1ymnaU2MsbEmRKCaUsQpawR8L3ZEw96SyLvByN/2SWRt57teGK7PKuW7YWiS/thUCZkor8m3pDaka5PoK88YfivMpMIY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1606746204374811.4420536877124; Mon, 30 Nov 2020 06:23:24 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.41180.74333 (Exim 4.92) (envelope-from ) id 1kjk54-0002AJ-EH; Mon, 30 Nov 2020 14:23:06 +0000 Received: by outflank-mailman (output) from mailman id 41180.74333; Mon, 30 Nov 2020 14:23:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk54-0002AA-Am; Mon, 30 Nov 2020 14:23:06 +0000 Received: by outflank-mailman (input) for mailman id 41180; Mon, 30 Nov 2020 14:23:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk53-00022q-Ld for xen-devel@lists.xenproject.org; Mon, 30 Nov 2020 14:23:05 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 47a94ad0-42cd-482a-9043-806181c4771d; Mon, 30 Nov 2020 14:23:04 +0000 (UTC) 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 29EBCD6E; Mon, 30 Nov 2020 06:23:04 -0800 (PST) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.199.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7A8183F71F; Mon, 30 Nov 2020 06:23:03 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 47a94ad0-42cd-482a-9043-806181c4771d From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v2 6/7] xen/arm: Add CP10 exception support to handle VMFR Date: Mon, 30 Nov 2020 14:21:42 +0000 Message-Id: <58ff66d0daf610dfe8e09516302cb0c0fe17fc59.1606742184.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add support for cp10 exceptions decoding to be able to emulate the values for VMFR0 and VMFR1 when TID3 bit of HSR is activated. This is required for aarch32 guests accessing VMFR0 and VMFR1 using vmrs and vmsr instructions. Signed-off-by: Bertrand Marquis --- Changes in V2: rebase --- xen/arch/arm/traps.c | 5 +++++ xen/arch/arm/vcpreg.c | 38 ++++++++++++++++++++++++++++++++ xen/include/asm-arm/perfc_defn.h | 1 + xen/include/asm-arm/traps.h | 1 + 4 files changed, 45 insertions(+) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 22bd1bd4c6..28d9d64558 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2097,6 +2097,11 @@ void do_trap_guest_sync(struct cpu_user_regs *regs) perfc_incr(trap_cp14_dbg); do_cp14_dbg(regs, hsr); break; + case HSR_EC_CP10: + GUEST_BUG_ON(!psr_mode_is_32bit(regs)); + perfc_incr(trap_cp10); + do_cp10(regs, hsr); + break; case HSR_EC_CP: GUEST_BUG_ON(!psr_mode_is_32bit(regs)); perfc_incr(trap_cp); diff --git a/xen/arch/arm/vcpreg.c b/xen/arch/arm/vcpreg.c index d0c6406f34..9d6a36ca5d 100644 --- a/xen/arch/arm/vcpreg.c +++ b/xen/arch/arm/vcpreg.c @@ -634,6 +634,44 @@ void do_cp14_dbg(struct cpu_user_regs *regs, const uni= on hsr hsr) inject_undef_exception(regs, hsr); } =20 +void do_cp10(struct cpu_user_regs *regs, const union hsr hsr) +{ + const struct hsr_cp32 cp32 =3D hsr.cp32; + int regidx =3D cp32.reg; + + if ( !check_conditional_instr(regs, hsr) ) + { + advance_pc(regs, hsr); + return; + } + + switch ( hsr.bits & HSR_CP32_REGS_MASK ) + { + /* + * HSR.TID3 is trapping access to MVFR register used to identify the + * VFP/Simd using VMRS/VMSR instructions. + * In this case MVFR2 is not supported as the instruction does not sup= port + * it. + * Exception encoding is using MRC/MCR standard with the reg field in = Crn + * as are declared MVFR0 and MVFR1 in cpregs.h + */ + GENERATE_TID3_INFO(MVFR0, mvfr, 0) + GENERATE_TID3_INFO(MVFR1, mvfr, 1) + + default: + gdprintk(XENLOG_ERR, + "%s p10, %d, r%d, cr%d, cr%d, %d @ 0x%"PRIregister"\n", + cp32.read ? "mrc" : "mcr", + cp32.op1, cp32.reg, cp32.crn, cp32.crm, cp32.op2, regs->p= c); + gdprintk(XENLOG_ERR, "unhandled 32-bit CP10 access %#x\n", + hsr.bits & HSR_CP32_REGS_MASK); + inject_undef_exception(regs, hsr); + return; + } + + advance_pc(regs, hsr); +} + void do_cp(struct cpu_user_regs *regs, const union hsr hsr) { const struct hsr_cp cp =3D hsr.cp; diff --git a/xen/include/asm-arm/perfc_defn.h b/xen/include/asm-arm/perfc_d= efn.h index 6a83185163..31f071222b 100644 --- a/xen/include/asm-arm/perfc_defn.h +++ b/xen/include/asm-arm/perfc_defn.h @@ -11,6 +11,7 @@ PERFCOUNTER(trap_cp15_64, "trap: cp15 64-bit access") PERFCOUNTER(trap_cp14_32, "trap: cp14 32-bit access") PERFCOUNTER(trap_cp14_64, "trap: cp14 64-bit access") PERFCOUNTER(trap_cp14_dbg, "trap: cp14 dbg access") +PERFCOUNTER(trap_cp10, "trap: cp10 access") PERFCOUNTER(trap_cp, "trap: cp access") PERFCOUNTER(trap_smc32, "trap: 32-bit smc") PERFCOUNTER(trap_hvc32, "trap: 32-bit hvc") diff --git a/xen/include/asm-arm/traps.h b/xen/include/asm-arm/traps.h index 997c37884e..c4a3d0fb1b 100644 --- a/xen/include/asm-arm/traps.h +++ b/xen/include/asm-arm/traps.h @@ -62,6 +62,7 @@ void do_cp15_64(struct cpu_user_regs *regs, const union h= sr hsr); void do_cp14_32(struct cpu_user_regs *regs, const union hsr hsr); void do_cp14_64(struct cpu_user_regs *regs, const union hsr hsr); void do_cp14_dbg(struct cpu_user_regs *regs, const union hsr hsr); +void do_cp10(struct cpu_user_regs *regs, const union hsr hsr); void do_cp(struct cpu_user_regs *regs, const union hsr hsr); =20 /* SMCCC handling */ --=20 2.17.1 From nobody Thu May 2 01:53:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1606746208; cv=none; d=zohomail.com; s=zohoarc; b=Yketso0FelGPblxMuHLasjSkvRqfCPbiGCxb6YUmBZvOqX2KU5cQ/MIhkqrZ/QipcprcMV8neok5JIM7BZgibllK8sVVKvNjRtIab0055DHjuSyLg7ws4HEtrPHprpwJ29ypQixJ0AaLBZpCdVAJMeMpBkunjEmuB9CvpaINvrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606746208; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=E5Hl80Xq5JQnB/TGORx7XjCtYeMQxwFUvKIFuLhVBO0=; b=L/rD0Jc8LKrxj11mDYKkkMjKPdF9uqlw5dlsrS9ezSgF76zsGnqJOuY+pvKAvN1Fjc+C3uiFVhsbDEezcPlsfoP7tCpQFT8vd6x1qTsI2VOgXuKuYT66EUqoXmGBkM4jOY9KED6Px0xKVhpx8/e+5DONqSrMqW7p5CucsS9EF+8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 160674620825652.02582688484267; Mon, 30 Nov 2020 06:23:28 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.41182.74357 (Exim 4.92) (envelope-from ) id 1kjk5A-0002KW-6f; Mon, 30 Nov 2020 14:23:12 +0000 Received: by outflank-mailman (output) from mailman id 41182.74357; Mon, 30 Nov 2020 14:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk5A-0002KL-2t; Mon, 30 Nov 2020 14:23:12 +0000 Received: by outflank-mailman (input) for mailman id 41182; Mon, 30 Nov 2020 14:23:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kjk58-00022q-Lr for xen-devel@lists.xenproject.org; Mon, 30 Nov 2020 14:23:10 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id b5323705-a290-4066-97f0-b64bb7f4b256; Mon, 30 Nov 2020 14:23:05 +0000 (UTC) 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 0E6E1D6E; Mon, 30 Nov 2020 06:23:05 -0800 (PST) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.199.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5DB833F71F; Mon, 30 Nov 2020 06:23:04 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b5323705-a290-4066-97f0-b64bb7f4b256 From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v2 7/7] xen/arm: Activate TID3 in HCR_EL2 Date: Mon, 30 Nov 2020 14:21:43 +0000 Message-Id: <592253f7e7f02890a6ca8bab4263ad40d8a7dafc.1606742184.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Activate TID3 bit in HSR register when starting a guest. This will trap all coprecessor ID registers so that we can give to guest values corresponding to what they can actually use and mask some features to guests even though they would be supported by the underlying hardware (like SVE or MPAM). Signed-off-by: Bertrand Marquis --- Changes in V2: rebase --- xen/arch/arm/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 28d9d64558..c1a9ad6056 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -98,7 +98,7 @@ register_t get_default_hcr_flags(void) { return (HCR_PTW|HCR_BSU_INNER|HCR_AMO|HCR_IMO|HCR_FMO|HCR_VM| (vwfi !=3D NATIVE ? (HCR_TWI|HCR_TWE) : 0) | - HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP|HCR_FB|HCR_TSW); + HCR_TID3|HCR_TSC|HCR_TAC|HCR_SWIO|HCR_TIDCP|HCR_FB|HCR_TSW); } =20 static enum { --=20 2.17.1