From nobody Fri May 3 08:23:33 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; dkim=pass; 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=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1623260631; cv=none; d=zohomail.com; s=zohoarc; b=gmLU6wJtg8Z+ztOsl9zN8HhPRFSsaFDRLugKD7D19rgPNteuNWfrQKLmnTTF4eGFQSUfQQm8p7dtopwpBUCIG6ATb0yesuG5oeWNoO+ubCIgSq/wNOJrUvIa/kB7AcVk1QhAmVAgnraJG3a3Jka/Ovb1JB2EHJrMbyj7S0narMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623260631; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=kJ2719QUk6w2eGmuEv2LtU5R29Kw7/GqQM3EoMhI+bA=; b=AB8T+IYk4Vm9uotFgAGiuHVLcFBcXjpQhK5/coXibP/EjYy7u1/CwyRvXBRGlmzm/rj9F6NQXfSZ9mRA0N+zXB/J2eYA5SeMizCpUY/W9MDiG8/igA0g5jhlkFdxxSKs5TY3ln8aBMwxf61EyiRPZ7VOIsyMyu83RdTd91fuH0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1623260631099263.1478995366982; Wed, 9 Jun 2021 10:43:51 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.139504.257934 (Exim 4.92) (envelope-from ) id 1lr2Ej-0008LX-B7; Wed, 09 Jun 2021 17:43:29 +0000 Received: by outflank-mailman (output) from mailman id 139504.257934; Wed, 09 Jun 2021 17:43:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lr2Ej-0008LQ-88; Wed, 09 Jun 2021 17:43:29 +0000 Received: by outflank-mailman (input) for mailman id 139504; Wed, 09 Jun 2021 17:43:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lr2Eh-0008LI-Tw for xen-devel@lists.xenproject.org; Wed, 09 Jun 2021 17:43:27 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e9d25d24-55dd-46d3-935c-dc50d445aae1; Wed, 09 Jun 2021 17:43:27 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 6010F613BD; Wed, 9 Jun 2021 17:43:26 +0000 (UTC) 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: e9d25d24-55dd-46d3-935c-dc50d445aae1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623260606; bh=u29fOyrNfsPeTkxLnkA2fvyZ8AxZ0uuHL+SikhRqxs8=; h=From:To:Cc:Subject:Date:From; b=DbfpUOiJbTIxDrx5DAkmHIJOMG1fPhpMeaufcN0Cy/Ju6n1Q3C0ZWKD8JC5B4BNh5 BgIJyjtNC1K1kTRrfelLHzRG4/5hTUMk1lXvZ8vs/3bKTop+otPmqFdkB4w56qaaYu 6hzg9DqXmz/EgKhCWjFXfs4SxWVbmwMIMQoGSpSVQgiIkgfJTsiheY231VLcMdGoWW PNfd2zAmE2BmKLZ1uceXLt5ZACwytjtyBu1+sUizpVGJzAZGoCDAsO2doBG7nxRMy1 HxpnI6zZR5BZC8CGjVP1kr9G6rQgm/AZ0iapIqmc4ZMPcS3IMkXlRhoUMLiWqJDmpw MMy852tf8i9Rg== From: Stefano Stabellini To: julien@xen.org Cc: Volodymyr_Babchuk@epam.com, xen-devel@lists.xenproject.org, Bertrand.Marquis@arm.com, Michal.Orzel@arm.com, edgar.iglesias@xilinx.com, sstabellini@kernel.org, Stefano Stabellini Subject: [PATCH] xen/arm32: SPSR_hyp/SPSR Date: Wed, 9 Jun 2021 10:43:24 -0700 Message-Id: <20210609174324.6621-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 X-ZohoMail-DKIM: pass (identity @kernel.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" SPSR_hyp is not meant to be accessed from Hyp mode (EL2); accesses trigger UNPREDICTABLE behaviour. Xen should read/write SPSR instead. This fixes booting Xen/arm32 on QEMU. Signed-off-by: Stefano Stabellini Reviewed-by: Edgar E. Iglesias Reviewed-by: Julien Grall Tested-by: Edgar E. Iglesias --- xen/arch/arm/arm32/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S index f2f1bc7a31..4e421109db 100644 --- a/xen/arch/arm/arm32/entry.S +++ b/xen/arch/arm/arm32/entry.S @@ -170,7 +170,7 @@ ENDPROC(prepare_context_from_guest) mrc CP32(r11, HSR) /* Save exception syndrome = */ str r11, [sp, #UREGS_hsr] =20 - mrs r11, SPSR_hyp + mrs r11, SPSR str r11, [sp, #UREGS_cpsr] =20 /* @@ -395,7 +395,7 @@ return_to_hypervisor: ldr r11, [sp, #UREGS_pc] msr ELR_hyp, r11 ldr r11, [sp, #UREGS_cpsr] - msr SPSR_hyp, r11 + msr SPSR, r11 #ifdef CONFIG_ARM32_HARDEN_BRANCH_PREDICTOR /* * Hardening branch predictor may require to setup a different --=20 2.17.1