From patchwork Wed Nov 24 19:40:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1559290 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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=muqHLVnx; 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 4Hzrwl2dDMz9sR4 for ; Thu, 25 Nov 2021 06:41:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 96EF283720; Wed, 24 Nov 2021 20:40:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="muqHLVnx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 467BD8069C; Wed, 24 Nov 2021 20:40:38 +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,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 92B0783434 for ; Wed, 24 Nov 2021 20:40:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jim.posen@gmail.com Received: by mail-qk1-x730.google.com with SMTP id de30so4206630qkb.0 for ; Wed, 24 Nov 2021 11:40:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BNLFkUR5s96Zw+df1EewbjLDX09CLFD0Xfog/1HXCq4=; b=muqHLVnxVId531vqIqtkOcOdWrJR0FKrenXdUsiWAuRYDCF1GS9gKe+Em6dkyUZGSK WXCG0r6FtLAra2GBMvMgJIBjq1kxr5Prw7raaBR8iVagVeq0/Voym3gqw4uyJB1M28B5 WYknZPdDO8Hz8dTdOuWENCEV6MqgOXiGmIWqvvHJ2ukOFV7jUdKQ7x9wNfunVywLOq60 Kv9fQSipMGQOX3aBYhycM8AvZR/cQOHFAdyZp3Y5gn3kmrlI2GMw+c3flkiuXmqBArdk pUzulx1pF1nJwVEb3cDHo0iRr9+vVaclO5h03miE3Mkif3JT9hFhhOct44is/WJRmAhs 5/0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BNLFkUR5s96Zw+df1EewbjLDX09CLFD0Xfog/1HXCq4=; b=Hl5l3BQeyY60OcJ6sxqejj2QVj5T5bHjR1oWaWkYc8CO6lEskHCdPTv+uAmfcvmewN PdBP2uXJHobd0Q0LkVHsp6OzrHDSE7WqfQ7pcOWjVaVPaNnkKW5StGIgCFhPLDz0XGR/ TplBkrQmh4Yv9LK0DLCYWnHr3t5JQV5CSILvJuVORZWfMNTMQ7foDhTmNY7F3M/MUvo/ in/SmSKbtgPIho2K0iF3Q5vuL7r+w7rjph6uMxEbqf5l+Bx+1lSLFdKFr4vVzx6AICnK SDxSfSvZ5z5REzQwclncgj4d+xko0tP83JTVd0+WQTaKcABaK3H+AiT4L1A75CQYRaBo TE8Q== X-Gm-Message-State: AOAM530W6oX1SkLtgAWGKhE9KX6QcVuIdv6PToO6VBTPfSMVflHq2cOn Iw/jCWyJGVcI3pjPEOBciX3rPknNGzI= X-Google-Smtp-Source: ABdhPJyLMgG1+2+qWPdTE/GTHjqMTP8NmbOF9zTSVhwzcFyLmB9fn3TB9gvul0EQDloTKFTzT7PGUg== X-Received: by 2002:a05:620a:4445:: with SMTP id w5mr780022qkp.617.1637782830125; Wed, 24 Nov 2021 11:40:30 -0800 (PST) Received: from localhost.localdomain (cpe-68-175-35-150.nyc.res.rr.com. [68.175.35.150]) by smtp.gmail.com with ESMTPSA id o1sm395201qtw.1.2021.11.24.11.40.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 11:40:29 -0800 (PST) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen , Harald Seiler , Simon Glass Subject: [PATCH v2 5/6] Fix PC adjustment logic in exception handlers Date: Wed, 24 Nov 2021 14:40:00 -0500 Message-Id: <20211124194001.443232-6-jim.posen@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211124194001.443232-1-jim.posen@gmail.com> References: <20211124194001.443232-1-jim.posen@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.2 at phobos.denx.de X-Virus-Status: Clean The link register is at a different offset depending on processor mode, so ensure it applies the correct adjustment. Signed-off-by: Jim Posen --- (no changes since v1) arch/arm/include/asm/u-boot-arm.h | 14 +++++++------- arch/arm/lib/interrupts.c | 26 +++++++++++++------------- arch/arm/lib/vectors.S | 4 +++- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 0b93cc48c5..6ebefa7c86 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -41,17 +41,17 @@ int board_init(void); struct pt_regs; void bad_mode(void); -void do_undefined_instruction(struct pt_regs *pt_regs); -void do_software_interrupt(struct pt_regs *pt_regs); -void do_prefetch_abort(struct pt_regs *pt_regs); -void do_data_abort(struct pt_regs *pt_regs); -void do_not_used(struct pt_regs *pt_regs); +void do_undefined_instruction(struct pt_regs *pt_regs, bool hyp_mode); +void do_software_interrupt(struct pt_regs *pt_regs, bool hyp_mode); +void do_prefetch_abort(struct pt_regs *pt_regs, bool hyp_mode); +void do_data_abort(struct pt_regs *pt_regs, bool hyp_mode); +void do_not_used(struct pt_regs *pt_regs, bool hyp_mode); #ifdef CONFIG_ARM64 void do_fiq(struct pt_regs *pt_regs, unsigned int esr); void do_irq(struct pt_regs *pt_regs, unsigned int esr); #else -void do_fiq(struct pt_regs *pt_regs); -void do_irq(struct pt_regs *pt_regswq); +void do_fiq(struct pt_regs *pt_regs, bool hyp_mode); +void do_irq(struct pt_regs *pt_regswq, bool hyp_mode); #endif void reset_misc(void); diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index 6dc27d1d58..498401cdc5 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -135,17 +135,17 @@ static inline void fixup_pc(struct pt_regs *regs, int offset) regs->ARM_pc = pc | (regs->ARM_pc & PCMASK); } -void do_undefined_instruction (struct pt_regs *pt_regs) +void do_undefined_instruction(struct pt_regs *pt_regs, bool hyp_mode) { efi_restore_gd(); printf ("undefined instruction\n"); - fixup_pc(pt_regs, -4); + fixup_pc(pt_regs, hyp_mode ? 0 : thumb_mode(regs) ? -2 : -4); show_regs (pt_regs); show_efi_loaded_images(pt_regs); bad_mode (); } -void do_software_interrupt (struct pt_regs *pt_regs) +void do_software_interrupt(struct pt_regs *pt_regs, bool _hyp_mode) { efi_restore_gd(); printf ("software interrupt\n"); @@ -155,51 +155,51 @@ void do_software_interrupt (struct pt_regs *pt_regs) bad_mode (); } -void do_prefetch_abort (struct pt_regs *pt_regs) +void do_prefetch_abort(struct pt_regs *pt_regs, bool hyp_mode) { efi_restore_gd(); printf ("prefetch abort\n"); - fixup_pc(pt_regs, -8); + fixup_pc(pt_regs, hyp_mode ? 0 : -4); show_regs (pt_regs); show_efi_loaded_images(pt_regs); bad_mode (); } -void do_data_abort (struct pt_regs *pt_regs) +void do_data_abort(struct pt_regs *pt_regs, bool hyp_mode) { efi_restore_gd(); printf ("data abort\n"); - fixup_pc(pt_regs, -8); + fixup_pc(pt_regs, hyp_mode ? 0 : -8); show_regs (pt_regs); show_efi_loaded_images(pt_regs); bad_mode (); } -void do_not_used (struct pt_regs *pt_regs) +void do_not_used(struct pt_regs *pt_regs, bool hyp_mode) { efi_restore_gd(); printf ("not used\n"); - fixup_pc(pt_regs, -8); + fixup_pc(pt_regs, hyp_mode ? 0 : -8); show_regs (pt_regs); show_efi_loaded_images(pt_regs); bad_mode (); } -void do_fiq (struct pt_regs *pt_regs) +void do_fiq(struct pt_regs *pt_regs, bool hyp_mode) { efi_restore_gd(); printf ("fast interrupt request\n"); - fixup_pc(pt_regs, -8); + fixup_pc(pt_regs, hyp_mode ? 0 : -4); show_regs (pt_regs); show_efi_loaded_images(pt_regs); bad_mode (); } -void do_irq (struct pt_regs *pt_regs) +void do_irq(struct pt_regs *pt_regs, bool hyp_mode) { efi_restore_gd(); printf ("interrupt request\n"); - fixup_pc(pt_regs, -8); + fixup_pc(pt_regs, hyp_mode ? 0 : -4); show_regs (pt_regs); show_efi_loaded_images(pt_regs); bad_mode (); diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index a36e3b7a43..dff2155dad 100644 --- a/arch/arm/lib/vectors.S +++ b/arch/arm/lib/vectors.S @@ -239,6 +239,7 @@ IRQ_STACK_START_IN: mov r1, lr stmia r5, {r0 - r3} @ save sp_SVC, lr_SVC, pc, cpsr mov r0, sp @ save current stack into r0 (param register) + mov r1, #0 @ set r1 param to 0, not hypervisor mode .endm .macro get_bad_stack @@ -321,7 +322,8 @@ fiq: str r1, [sp, #S_PC] str r2, [sp, #S_PSR] str r0, [sp, #S_OLD_R0] - mov r0, sp + mov r0, sp @ set r0 param to struct pt_regs on stack + mov r1, #1 @ set r1 param to 1, hypervisor mode .endm hyp_undefined_instruction: