From patchwork Thu Mar 10 20:50:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1604145 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=ieD7Fa+k; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KF1Y20BlFz9sGB for ; Fri, 11 Mar 2022 07:55:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 11B6383BBB; Thu, 10 Mar 2022 21:53:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="ieD7Fa+k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3AA6283B00; Thu, 10 Mar 2022 21:52:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0619.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::619]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DBA2783B1C for ; Thu, 10 Mar 2022 21:51:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MKLDfJOnPQR8sMB/doo6v9MxIEfGqiwENVhAj3e8ogGAs2t9QbApVLclSCqXVY5+Hfvk3C+g8qOmzyD+v56YI54K/R9vKxAVWdPNvVS/nhqyNhYp0U7NOkUTFMhHoK0TOd7g4XpPiD0xzG8Y19iW0fILe6elgfZmFJQWHMEQHFhlIkEORPTgVNO5Szcp4N0wvvkAuR7VZReIIklsVPWWoH6DAgE/wK0GAunqra+zcDTTg/mAh/fWUkaxBkD2b7neSascoea4KueSGPdsbQ/pujnyykJn+fm37M7rQkguijeF/fKS7114o0T7DMyvHleouGe2VevS4bSsknWASeCH6w== 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=LzkSD38sKezx4WolABxuEDmBsJRmBLX14rXVFP/hhDg=; b=iO79EGMN/e8URvngmiU+xRDrl6U2ELpbOdgLpuiNQPs1+DXXYVwdpwDVIJtPiYxlwV3YKkqjENz6QpIlQq3VVyQkgRHkkwZO8c4zup8yq6kN8Sf/bMRyteAQAxjYtbFD5sQ7gSVKTKTkzymqnwmvyDBqDuNkS1XU0fI3Rk8cS+im4mI511N1r9OX1q6O/R4wxKVHLvER86MfAPHZ4ZSXua8pV/blgealxTxJE/cvA80tFE+GmMJhNodQvu/5oopQZUvQ+jPxRsjWgZVDGj03l7TZSIr/t/6aha4Iko5TMjXEu4tkkXsYPgv9lqQisFng14QPbXWsAFyrDDkqDWLB7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LzkSD38sKezx4WolABxuEDmBsJRmBLX14rXVFP/hhDg=; b=ieD7Fa+kzf/WbwP/bEsgjnoDAfoSc2prxYEmKSdYw9aP0wuLBrozCLfIwN8KTvDBCjQb+VNhD4K3et8uW1bCSBVwugF9V+wTvYftKDq/+l1e2afi5qgLI94hl0qgOCvLFLrW7CL3UIDKRvyUYjzSAJbiYoM9BGs5lhQn9CtQehRfmncVgyKasbTg0J4oiHkGW6a+PEqFrSiy1d7WvkYbp4Csn8Yn1XwCJ5SEbbxU+Z8o5u6+EfH+fa07UZ6C/u0R4xlGYHc0EtaixsrHqLDoonOzfvBcNElS9zLSqCWhuH3d+SvRcQwbqs6GiAhAQ54am59qDxqRzvLsMXPYn/Yl2w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0301MB2439.eurprd03.prod.outlook.com (2603:10a6:4:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 10 Mar 2022 20:51:44 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9860:b15b:f166:5896]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9860:b15b:f166:5896%3]) with mapi id 15.20.5061.022; Thu, 10 Mar 2022 20:51:44 +0000 From: Sean Anderson To: Tom Rini Cc: Liviu Dudau , u-boot@lists.denx.de, Simon Glass , Linus Walleij , Andre Przywara , Sean Anderson Subject: [PATCH v2 20/28] arm64: Save spsr in pt_regs Date: Thu, 10 Mar 2022 15:50:50 -0500 Message-Id: <20220310205059.499269-21-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220310205059.499269-1-sean.anderson@seco.com> References: <20220310205059.499269-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1PR13CA0433.namprd13.prod.outlook.com (2603:10b6:208:2c3::18) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35a65715-7db7-4223-beda-08da02d7c925 X-MS-TrafficTypeDiagnostic: DB6PR0301MB2439:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qj5/Z3qkz53IJjYXQl+Eakay+5KxMv8edpq+2lhMVJ0tQFdDWXtpGyhOBzwdJXQ1Z5QSXdK38ptgIpILcazANkUApCfEqT9OV6HoP4HOkF73P945dgSKs2M/4n1Y6bIiOsK0kquduGAgu/BW0RtcCY4tF3XOiQpOAL6HIQ2NXmsugVYjJIYfuBMSRtHoHFCXKUcMwDq4Vg1KF5m87LLJsFSKxmEEvTQ+vMqWy7dvtOm0f7ef7IcC9CFefhTknOEGO3WeaFu/ZvGBMtIx+nHlS0vvfotsNPdFiHHByqcbDwq1L2XvYH7xyYhxcD0ZGZSVwPJWCqCjDmJs63w6HAuvE+87E32XldJyVS/PtzSLd3YXVWbHtU7IQ2zrjBmfQM3QrwWCptdl/WGIvsSFKG5wSvSzC6dIl0R44w0dV1KLugK2NL5jKltw5YtpIXEbUCf5DyDXmRlqEN7uU/FRVKel2k/pkQEaKwuKDuWh60eid5NsAjQQxa2fQX0ikSFuZsKo8+g+j68lREVS82yNvSWhCQqBP5Rb/6Y2X1cH+AWcHYZdCgiZ4VzqF+gFsD7iDxuW+WkMC/FbpCpRWGMhOvMi+ULrxxXNciLfRAN60w3vxeYwvwCgmacpRnds5P3w3D4e0vADHEH8v2HGV4T2tE4umWFsA47kv4VynN5dvzMAJhfym0+76PgZgBbK2Wvd8oiifYAxgltiqFPlh64emSDnjg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(54906003)(66476007)(316002)(4326008)(66556008)(6916009)(8676002)(66946007)(44832011)(36756003)(86362001)(2906002)(38350700002)(38100700002)(5660300002)(8936002)(6512007)(52116002)(6666004)(6486002)(6506007)(508600001)(186003)(26005)(2616005)(107886003)(1076003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yp23QnpG7a/D2phB63TjyT0ENqsHVX7Zar3IMaYU4MrdUPud9J5ZkSzo8KShp33kuvwa0+Nh/afv45DzIl946+ga6COCOQ4YURhC11lhSt7bBUM0gd21jPYzcZOoHdgvtSj7/FEUGAcw3gGNAxRscR5UfjI5wKQ/AbT9jbXBaW341owCr4RAPGAOLsQARXr6aQnwhIp7wMxnZOfqe6qBPpVXW1J4mJ5RXUGVe8C1S+ZXcU27aeWHDn1nYbsICkfEK9eGlUBdvMSTMBRjRrrsaOfEXAvyQ+c4/W5B2b2Mn/1fvb9Hbsrg5gXbNwiooJHpQvmJEbOn9Tah28H87mRiy3SAOkQt0WjpamIDcpwohwks8tlMOjZsxdKf96wEKMoTOl7tB5sAQ+VHiIwMdv+4SRUdnScgjBsg6OfgQrAWTwolcVLdQgd0xZRKth2BmtCSdNtbwOEUSVm+Vt18TeLGSSghI8e1m8L6Ch+hHbqgh5ZtBrAvYoHPsOCdnz+wj0Wbnash/UvarSkGCu0n/rbohD0PTCcqIu21DK8SRIwZ1k4b8XWIE4bKV5fo24HQQVwHDkmlYSLo5y5wbK/Wl/2lUt9Aey4Agy7CexkAIvHl3fEI7qLw/+KDus8x9LtiF+2RqaOtZuwKU8Z3XFu3xj7XbvRDQ3BQY8Xp6FjzS74FuU1RJO/Uo5Atz1RI54lj3sKhEpfils7FrTb+KD+K/8MyeVlz8OldF1Mf5eAEuhjT7BeYOIB+JU8Bt5qjjMXFwa0EB6DWUlzFyDYO1saE32IcgPU6km7PDNOVghVmpWL1xdV4/38Y0LU9U80Cxu372UDnA3kZPSSuzhrra9UGXcCH9HFVDh3wpXICLOknG6c76OWW/YeqIlJJkyghMRgxZvu6WD+PHrZ0N/ys5CTjlU0KtRUZNGqgmf3CsgbiWaS9x1xeIxqX95adJinu21ExBTEJRZEjWhntMgkid38wYOLpMxglsKMUY4alWuiN/5S+N5yp6+duZiI6TrnK7eVK2T1VvEoT2AH880hQO4V0e1KYuxXd70RPG19Q403sCEYI6BU31XeRt98rSrhCQVeFhu5YOG7X7ocIAKZdnufPMRXHAjHhMS2zuK4kc3KerXU1gQPXC2fEIEX+Iqb6G912VRLMgqOwj45Oeu8XnpVvqMprVtuACZVsYt7q3UTmNd8lZU6shfYvh3jAG9QHTilcjc9IlMKV8Rk/YMbYRkO1dNVQJ8IJYUdJf4AR3IPVRbs2HZEVyLmaoV2aCJyh+Y55syEw1otfLdQHk3kgIS0XhnEA2dhDsxihzBKSE4Ix/Sdz9oyUQsCwIaZgcgwVVoDJ4AiVgA/aSCa49JceJ4oKtr1g708aAD5k1nfAjdg1SnaI9gTjFR2ZQ+9MlEsI4l0DbemraZW3SEprk6TzgZmjfhoX17RymYVQXvD4Z/5TzioSaV61Q1kVvVRdRJqdC1iCkZg3lchMIoRtf5ueB/wDO4VCR706lvzLWr6ryt8atYxvVFO1PlpfFsP/hdTkwvalEhU4NKFJh3q2lPXW8nko4phJV8djlZ9kOZCMxDhs1/zEv5kl8kZisQgCi80+T/BGn8tCh6HGicWKBs5XLCOh1S5AAbzfTr+LVSLxcwg4SbA9TNo= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35a65715-7db7-4223-beda-08da02d7c925 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 20:51:44.3045 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: P/Qow4cZvqeW974rirEGJ/EkbKcbnNXurU4y1WiOfbLAa1DboOlNAVYS/m4LCO9iF95gHZSLErYXiPvFXBsYvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0301MB2439 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This register holds "pstate" which includes (among other things) the instruction mode the CPU was in when the exception was taken. This is necessary to correctly interpret instructions at elr. Signed-off-by: Sean Anderson --- Changes in v2: - New arch/arm/cpu/armv8/exceptions.S | 5 ++++- arch/arm/include/asm/proc-armv/ptrace.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/exceptions.S b/arch/arm/cpu/armv8/exceptions.S index 001913f429..270d9df518 100644 --- a/arch/arm/cpu/armv8/exceptions.S +++ b/arch/arm/cpu/armv8/exceptions.S @@ -77,15 +77,18 @@ _save_el_regs: switch_el x11, 3f, 2f, 1f 3: mrs x1, esr_el3 mrs x2, elr_el3 + mrs x3, spsr_el3 b 0f 2: mrs x1, esr_el2 mrs x2, elr_el2 + mrs x3, spsr_el3 b 0f 1: mrs x1, esr_el1 mrs x2, elr_el1 + mrs x3, spsr_el3 0: stp x1, x0, [sp, #-16]! - stp xzr, x2, [sp, #-16]! + stp x3, x2, [sp, #-16]! mov x0, sp ret diff --git a/arch/arm/include/asm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h index bebcaf6e33..3b8fe7aac0 100644 --- a/arch/arm/include/asm/proc-armv/ptrace.h +++ b/arch/arm/include/asm/proc-armv/ptrace.h @@ -21,7 +21,7 @@ * on the stack during an exception. */ struct pt_regs { - unsigned long unused; + unsigned long spsr; unsigned long elr; unsigned long esr; unsigned long regs[31];