From patchwork Sun Oct 24 23:58:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1545467 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=iowtKRyy; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4HcwC82qM8z9s0r for ; Mon, 25 Oct 2021 11:03:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 25E0683458; Mon, 25 Oct 2021 02:03:01 +0200 (CEST) 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="iowtKRyy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3238F83460; Mon, 25 Oct 2021 01:58:27 +0200 (CEST) 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-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 50241834A9 for ; Mon, 25 Oct 2021 01:58:22 +0200 (CEST) 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-qv1-xf2a.google.com with SMTP id t1so6159053qvb.1 for ; Sun, 24 Oct 2021 16:58:22 -0700 (PDT) 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=1beq6z4wThE/rtb21/uJJwK3trL7/j4DU8m0l75BiwU=; b=iowtKRyyUNgzzl/sVEw2pKehoggItbEB4Nml+WFG3YBlVMgIIri4tH+cVEAAOkWR5E diiKBG5/1aavwi3kwB1jKLfwDzBMN20rg/Uxhvo3UFrHW4ms+yPDq/17wjJPOlcsQg1g WV/4lFiuXTgKSfCEBeqygWjy4KgRshQ/PvsnOjLlw63dL5aMtrRG2Lk+CDWarUBhegC9 MYICi2wg7HzenYYgkNXKY9f1xU/RdWxFnXhy4u8PumRGqxbDa1yl+vtFS6gt7BCs9QVc sO6g9GZaYHGcrF2VQHsIvNwJakb0R1FCJhgWRPrVseaXBmTEsvEkLRS1R/zbRd8ljvYT 3PBQ== 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=1beq6z4wThE/rtb21/uJJwK3trL7/j4DU8m0l75BiwU=; b=DUBTVIoUkmIVmMJIHtUeIad1PBRnIlVy9yhl9pXbZAQzDYO/Ta7dBZdmM3SjTgLYuK XKLNul5+1hFN6Hts8sFwvyMamNWxVNPELbeKrWeovgiTy9q0JiymnvFhXXbmSLjgPK2S 3lenWhDHpy8XQgjQhIVTi1CqO4MBLzC6YrNpXvHzQ0BLMogaIO4dWA70Le7XNnHub53r 2B/HqU0JaXyR7y2Lm9UnJ9cSXEZRTqlRr7UHJbz+YOMge+OOL/Qx9fTdDpg6pymBR4bt DgxmTDV8F3Uzn6SnM2CT/DiU0RhMSH3anPlQyOXdi4XoMc+hIWTe3HNf4f6EriUqW+xu eIHg== X-Gm-Message-State: AOAM5318yCWIEWBFiUUVLRl5+GLu7WXt3yAL4STY1fmyepNfuZ6CrxQS baLHoSemLgZoHxo3h7TmaSV33RhgFjc= X-Google-Smtp-Source: ABdhPJw14RalS2VgNRA9SB3iLVrnexybcpeyesXv0aSLCuyikmOvYkSCgiz95ocZq/X+gHAsu6Jtmg== X-Received: by 2002:ad4:5d4b:: with SMTP id jk11mr8011614qvb.11.1635119900852; Sun, 24 Oct 2021 16:58:20 -0700 (PDT) Received: from phantom.myfiosgateway.com ([68.237.40.64]) by smtp.gmail.com with ESMTPSA id c9sm6848573qte.43.2021.10.24.16.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 16:58:20 -0700 (PDT) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen , Minkyu Kang Subject: [RFC PATCH 1/5] Compile for ARMv7-A with virtualization extensions Date: Sun, 24 Oct 2021 19:58:04 -0400 Message-Id: <20211024235808.1926508-2-jim.posen@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211024235808.1926508-1-jim.posen@gmail.com> References: <20211024235808.1926508-1-jim.posen@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 25 Oct 2021 02:02:55 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 In order to assemble instructions that read the ELR_hyp register, which is part of the ARMv7-A virtualization extensions, the assembler target architecture needs to be changed. Signed-off-by: Jim Posen --- arch/arm/Makefile | 4 ++++ arch/arm/mach-bcm283x/Kconfig | 3 +++ arch/arm/mach-exynos/Kconfig | 1 + 3 files changed, 8 insertions(+) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6c9a00c5a4..68c6b06a0e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -14,8 +14,12 @@ arch-$(CONFIG_CPU_SA1100) =-march=armv4 arch-$(CONFIG_CPU_PXA) = arch-$(CONFIG_CPU_ARM1136) =-march=armv5t arch-$(CONFIG_CPU_ARM1176) =-march=armv5t +ifeq ($(CONFIG_CPU_V7_HAS_VIRT),y) +arch-$(CONFIG_CPU_V7A) =-march=armv7ve +else arch-$(CONFIG_CPU_V7A) =$(call cc-option, -march=armv7-a, \ $(call cc-option, -march=armv7)) +endif arch-$(CONFIG_CPU_V7M) =-march=armv7-m arch-$(CONFIG_CPU_V7R) =-march=armv7-r ifeq ($(CONFIG_ARM64_CRC32),y) diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index b3287ce8bc..500a504c35 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -8,6 +8,7 @@ config BCM2836 depends on ARCH_BCM283X select ARMV7_LPAE select CPU_V7A + select CPU_V7_HAS_VIRT config BCM2837 bool "Broadcom BCM2837 SoC support" @@ -19,6 +20,7 @@ config BCM2837_32B select BCM2837 select ARMV7_LPAE select CPU_V7A + select CPU_V7_HAS_VIRT config BCM2837_64B bool "Broadcom BCM2837 SoC 64-bit support" @@ -36,6 +38,7 @@ config BCM2711_32B select BCM2711 select ARMV7_LPAE select CPU_V7A + select CPU_V7_HAS_VIRT select PHYS_64BIT config BCM2711_64B diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 7df0e17617..6d0e95ba44 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -19,6 +19,7 @@ config ARCH_EXYNOS5 bool "Exynos5 SoC family" select BOARD_EARLY_INIT_F select CPU_V7A + select CPU_V7_HAS_VIRT select SHA_HW_ACCEL imply CMD_HASH imply CRC32_VERIFY From patchwork Sun Oct 24 23:58:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1545468 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=mZvfnTXq; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4HcwCM177jz9s0r for ; Mon, 25 Oct 2021 11:03:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 324A2834CD; Mon, 25 Oct 2021 02:03:05 +0200 (CEST) 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="mZvfnTXq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B0E3B834AC; Mon, 25 Oct 2021 01:58:27 +0200 (CEST) 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-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) (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 F2D16815CE for ; Mon, 25 Oct 2021 01:58:23 +0200 (CEST) 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-qt1-x836.google.com with SMTP id t16so8834955qto.5 for ; Sun, 24 Oct 2021 16:58:23 -0700 (PDT) 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=AZUYiaept162TEZzUcOjMKQYh/mQJsUN4JH5Au/jEGQ=; b=mZvfnTXqTHgAo5acqjMjaL1Zg4G9+u+z6fL4NG7gAxuc7iMEKAzECIHrDgfUnkmayY dki8o7A+oCo81P8ttBalauD7OepiSuJShv2DRCQBix+SvCXIZmPyyezBllecXt3AdCxb TF6SGHg9YJh2CngfB0QKTUkyyjQBXd2jQZe+/uD+X28IvivssCfaXjZBWFgIGIBzDrES 0SQg3A2in9Fv/eTHmZwdUGTGZmYGQ+G4a6qy47AugYKRWgffjnKLvG/E0DE0i+nhZGp4 V1DhxJE+6KCaK2lFi4+wcUF6/Y38nniC69m22Ruyr+ED/sPQC5V5EOLlFSisZoDQiErR Ck5w== 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=AZUYiaept162TEZzUcOjMKQYh/mQJsUN4JH5Au/jEGQ=; b=fCvIOX6HctaGCq2mEwaOXkt58mVtKKthEwXmtdWQhotNqQTRWf8tiJ8Ehs1h/kqqUN KItqmQYr8JQNuaKlAF6Teebdw9kNNl1SnfLBgetGGGrFDXJ7MozBj4ENCHKBgxIHj4uE sy7Wvy083kk099NVYAYf8c6Jb+zfuMfqTP4i1JscTpTF92RnIqOZ+MgH54TMmdUEh+dP ciJUnBFLn1kt7ghhXizT7/7qHLFhj7e8cuTLzhHbqXmEBQlO5X4hZ8CekpeII1vSvfLs lzbMhp5D9rYWberkCdfBU93IJnoevF/1ff2baQx4xA/TeGVWPNqIBw6IlO1oQJr6teUm pt6Q== X-Gm-Message-State: AOAM5321oJgfwVl9piD3KR8DW3ifqgsw0QpX9vagkXnhK9BkTzss2FJD 5DQbCmQHJH6aVxL6kWw0nbThEnp4XL4= X-Google-Smtp-Source: ABdhPJwMjRTttajemcrA4CTqscyCPhuxJlwA8HXgKef7CK/M4wNyoQpU9ys8DWgFWQ6XdK5dO4948Q== X-Received: by 2002:ac8:7fd5:: with SMTP id b21mr14573713qtk.101.1635119902434; Sun, 24 Oct 2021 16:58:22 -0700 (PDT) Received: from phantom.myfiosgateway.com ([68.237.40.64]) by smtp.gmail.com with ESMTPSA id c9sm6848573qte.43.2021.10.24.16.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 16:58:22 -0700 (PDT) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen Subject: [RFC PATCH 2/5] Hypervisor mode interrupt vector table Date: Sun, 24 Oct 2021 19:58:05 -0400 Message-Id: <20211024235808.1926508-3-jim.posen@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211024235808.1926508-1-jim.posen@gmail.com> References: <20211024235808.1926508-1-jim.posen@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 25 Oct 2021 02:02:55 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 Create separate vector table for exceptions taken to PL2, which happens when U-Boot is running in hypervisor mode. The handler logic is different enough that a separate vector table is the simplest way to handle it. Signed-off-by: Jim Posen --- arch/arm/lib/vectors.S | 95 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index 56f3681558..89b91b27da 100644 --- a/arch/arm/lib/vectors.S +++ b/arch/arm/lib/vectors.S @@ -117,6 +117,39 @@ _not_used: .word not_used _irq: .word irq _fiq: .word fiq +#ifdef CONFIG_CPU_V7_HAS_VIRT +/* + ************************************************************************* + * + * Hypervisor mode interrupt vectors table + * + ************************************************************************* + */ + + .globl hyp_vector_table + + .align 5 +hyp_vector_table: + ldr pc, _hyp_reset + ldr pc, _hyp_undefined_instruction + ldr pc, _hyp_software_interrupt + ldr pc, _hyp_prefetch_abort + ldr pc, _hyp_data_abort + ldr pc, _hyp_not_used + ldr pc, _hyp_irq + ldr pc, _hyp_fiq + +_hyp_reset: .word reset +_hyp_undefined_instruction: .word hyp_undefined_instruction +_hyp_software_interrupt: .word hyp_software_interrupt +_hyp_prefetch_abort: .word hyp_prefetch_abort +_hyp_data_abort: .word hyp_data_abort +_hyp_not_used: .word hyp_not_used +_hyp_irq: .word hyp_irq +_hyp_fiq: .word hyp_fiq + +#endif /* CONFIG_CPU_V7_HAS_VIR + .balignl 16,0xdeadbeef /* @@ -139,6 +172,15 @@ data_abort: not_used: irq: fiq: +#ifdef CONFIG_CPU_V7_HAS_VIRT +hyp_undefined_instruction: +hyp_software_interrupt: +hyp_prefetch_abort: +hyp_data_abort: +hyp_not_used: +hyp_irq: +hyp_fiq: +#endif /* CONFIG_CPU_V7_HAS_VIRT 1: b 1b /* hang and never return */ @@ -289,4 +331,57 @@ fiq: bad_save_user_regs bl do_fiq +#ifdef CONFIG_CPU_V7_HAS_VIRT + +/** + * Hypervisor mode exception handlers + * + * If exception is taken to EL2, U-Boot must have been running in hypervisor + * mode. Use the existing stack to save register values onto because + * overwriting the stack pointer would leave no way to inspect its value. + */ + + .macro hyp_enter_exception + str sp, [sp, #(-S_FRAME_SIZE + S_SP)] + sub sp, sp, #S_FRAME_SIZE + stmia sp, {r0 - r12} + mrs r1, elr_hyp + mrs r2, spsr + str lr, [sp, #S_LR] + str r1, [sp, #S_PC] + str r2, [sp, #S_PSR] + str r0, [sp, #S_OLD_R0] + mov r0, sp + .endm + +hyp_undefined_instruction: + hyp_enter_exception + bl do_undefined_instruction + +hyp_software_interrupt: + hyp_enter_exception + bl do_software_interrupt + +hyp_prefetch_abort: + hyp_enter_exception + bl do_prefetch_abort + +hyp_data_abort: + hyp_enter_exception + bl do_data_abort + +hyp_not_used: + hyp_enter_exception + bl do_not_used + +hyp_irq: + hyp_enter_exception + bl do_irq + +hyp_fiq: + hyp_enter_exception + bl do_fiq + +#endif /* CONFIG_CPU_V7_HAS_VIRT */ + #endif /* CONFIG_SPL_BUILD */ From patchwork Sun Oct 24 23:58:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1545469 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=HlzGCgBK; 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HcwCb5PgKz9s0r for ; Mon, 25 Oct 2021 11:03:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2976783508; Mon, 25 Oct 2021 02:03:10 +0200 (CEST) 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="HlzGCgBK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE0AF83460; Mon, 25 Oct 2021 01:58:29 +0200 (CEST) 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-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (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 5738282EBB for ; Mon, 25 Oct 2021 01:58:25 +0200 (CEST) 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-qv1-xf2f.google.com with SMTP id v2so6117166qve.11 for ; Sun, 24 Oct 2021 16:58:25 -0700 (PDT) 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=loqFszjUn4v8H/dr2Ab6VPc3ug5KCn69Te/bkRWumT8=; b=HlzGCgBKSiMuwiN/Hg0Uom+jTmE67rnFJ8nXQjRl9kTiO75HrX+UKM/AYf5BKJreXa ZfnZLTKA23ckrouEtIatvBHunChmOWmS9u1gfah+2xopZ1W4ApPd0LJhoGOlbQzkBDjg jVXl+WAiU8o2KHr6W3NJ+G/njwqPO0lokGFZ+z/dBz9Mko30ROF9E5SB6u4vHWEyHH6O MCRnn/b2gAzGdCzrGoxzz5ovFwDPCjUv0tj+DshcGkRlJh5ZLqPem6dO2svsbohizjVT NpLmFBFG0ZGiD//a6661LzFQcE/QW/Z7m13BxACqcT1uqU4n7ZWwKjn/8JAyU+IQ7LBi 6Mxg== 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=loqFszjUn4v8H/dr2Ab6VPc3ug5KCn69Te/bkRWumT8=; b=yBUCfV724qnlTJCWjok/xAlq5zrQ6LEwL8NWeR+uE9IGbtVOmi6fr40n1nYvXFRFDI RJ+GrgCFRSDhFHEQjC90xM8AzKTrIQ3Vo4MSxJ2HTiBRlWngkS/OLAbS0KyX69eehxYH S6F6wZa/HKVr/vdOPRN3kX7lElUXn6lW0b5H3JXHTMqUGfcVrKy3cky1937F1Ka9/huk It35uPHN1CXMW3+Sfv24teS1NnamTJnXOiJJ31wE603Qzn5efPQYTQm7DtjXL6+syh+6 b4rMEeqwe6xwlL6GFc1NG/bUhuRKZLCwIfLcPyInbc8YRTaYM/vqNplJfz7kvg2USFxu fvhw== X-Gm-Message-State: AOAM532ymuwHtkiJ7JoXiU83S6BQx9RR6rU0UaArHyYsXJhsxlcia1Ff jWH8Yi1cipGT4udlbEMLvA4lRtfh7q4= X-Google-Smtp-Source: ABdhPJxPu8Yl2SVqo/YfqS6lHxwNaN36Na/XqFS5AABvDAPXZrZyNGgTHhfyICuXd2T686JHpHojmA== X-Received: by 2002:ad4:568e:: with SMTP id bc14mr9337888qvb.67.1635119903905; Sun, 24 Oct 2021 16:58:23 -0700 (PDT) Received: from phantom.myfiosgateway.com ([68.237.40.64]) by smtp.gmail.com with ESMTPSA id c9sm6848573qte.43.2021.10.24.16.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 16:58:23 -0700 (PDT) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen , Chia-Wei Wang Subject: [RFC PATCH 3/5] Set HVBAR register correctly Date: Sun, 24 Oct 2021 19:58:06 -0400 Message-Id: <20211024235808.1926508-4-jim.posen@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211024235808.1926508-1-jim.posen@gmail.com> References: <20211024235808.1926508-1-jim.posen@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 25 Oct 2021 02:02:55 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 This is the base address register for the vector table when in hypervisor mode. Signed-off-by: Jim Posen --- arch/arm/cpu/armv7/start.S | 5 +++++ arch/arm/lib/relocate.S | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 698e15b8e1..bce8ddb1b0 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -113,6 +113,11 @@ switch_to_hypervisor_ret: ldr r0, =_start mcr p15, 0, r0, c12, c0, 0 @Set VBAR #endif +#ifdef CPU_V7_HAS_VIRT + /* Set vector address in CP15 VBAR register */ + ldr r0, =hyp_vector_table + mcr p15, 0, r0, c12, c0, 0 @Set HVBAR +#endif #endif /* the mask ROM code should have PLL and others stable */ diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S index 14b7f61c1a..3ebf6a519e 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -60,6 +60,14 @@ ENTRY(relocate_vectors) ldmia r0!, {r2-r8,r10} stmia r1!, {r2-r8,r10} #endif +#ifdef CONFIG_CPU_V7_HAS_VIRT + /* + * If the ARM processor has the virtualization extensions, + * use HVBAR to relocate the EL2 exception vectors. + */ + ldr r0, =hyp_vector_table /* load dynamically relocated address */ + mcr p15, 4, r0, c12, c0, 0 /* Set HVBAR */ +#endif #endif bx lr From patchwork Sun Oct 24 23:58:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1545470 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=Z+rxdFZ8; 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 4HcwCn4WGtz9s0r for ; Mon, 25 Oct 2021 11:03:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF99483529; Mon, 25 Oct 2021 02:03:12 +0200 (CEST) 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="Z+rxdFZ8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 44E0D82EBB; Mon, 25 Oct 2021 01:58:31 +0200 (CEST) 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-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 E1ECF83458 for ; Mon, 25 Oct 2021 01:58:26 +0200 (CEST) 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-x736.google.com with SMTP id bj31so10361950qkb.2 for ; Sun, 24 Oct 2021 16:58:26 -0700 (PDT) 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=d5uidU1voiGc9yuw40NYEd8HsBGweNKiQ0os7s//iFg=; b=Z+rxdFZ8+P/6cN35mQNi4kYO7h7kh7wpT16imk1hxdcdr/7XWZK/mb8HKuJtW/Tm7o R4GZ6DEcpJykTI4YhKZQsTZfDHyiJQlYuOCYbWA5RNxacer5BJw3H8+sq3mUaZI49eKe fVLaYN3jMgSb/hcFBr9Am3etk8yYi+bQpa3FN3/NmbjwKm8s26KjVvmAEM0OtE8mtly3 6s2swuk+ICM7RxEzTF7yDRBCUDW4nejy2gpJeFwc6lMllS/CRKJRFq/LjiPPodxIS5cw MFYeJm8hIMp91hvmK5lrBQIhLO5+mjEE3W4UhwtTCKTtDuI7RBjXycvvciAJMrGrxzym kNGw== 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=d5uidU1voiGc9yuw40NYEd8HsBGweNKiQ0os7s//iFg=; b=uzxhcYVuouVt2nScFVcgUiGbI4WiKSxgESNFOM6vLTZPgsrccZICOFb5t5URA2j02w IkxHDwTdA7XZVNOnPUPquyLa20vXFcvqXAFGIAbpldE18z7iWXwvhztM9RrUjykdkWAC aWz/VvLQmdUQEJxOB/d5na1pFWehpjadEmK9NPbtz8j5GgdXIacHjGs8HnEnVkUuRIzB SKaOvz9D2SOD02jTKfaAIinW+KmHnNHGTu5VNeE9D9s378EJHbzu/LTwOLqmr9CfaCau k5hHzURNCIuIQj2F0rIDnYDFkwocpY4h+CNxJCa9q6aNbWyZujLEeeTU/j8Igg6j8kkZ Dlww== X-Gm-Message-State: AOAM532aYwoUJKvSFjuXFPcZ33UoDqi/ZgDHsNEGlHBMDFzOesmICqwC 7DbMcS1/pSOasLVkX33ZjKHEio+E098= X-Google-Smtp-Source: ABdhPJxI69n9Q4IKQaS7iu/oCJFlFtnTy0fyNYb4TBLopGegfXShIlPk5DXf1Tpwp9vhTwA6k68CRA== X-Received: by 2002:a37:f902:: with SMTP id l2mr10716366qkj.511.1635119905449; Sun, 24 Oct 2021 16:58:25 -0700 (PDT) Received: from phantom.myfiosgateway.com ([68.237.40.64]) by smtp.gmail.com with ESMTPSA id c9sm6848573qte.43.2021.10.24.16.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 16:58:25 -0700 (PDT) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen Subject: [RFC PATCH 4/5] Remove dead code Date: Sun, 24 Oct 2021 19:58:07 -0400 Message-Id: <20211024235808.1926508-5-jim.posen@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211024235808.1926508-1-jim.posen@gmail.com> References: <20211024235808.1926508-1-jim.posen@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 25 Oct 2021 02:02:55 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 This code was missed in commit 01abae4d0486 ("Remove various unused interrupt related code") Signed-off-by: Jim Posen --- arch/arm/lib/vectors.S | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index 89b91b27da..a36e3b7a43 100644 --- a/arch/arm/lib/vectors.S +++ b/arch/arm/lib/vectors.S @@ -224,8 +224,7 @@ IRQ_STACK_START_IN: #define I_BIT 0x80 /* - * use bad_save_user_regs for abort/prefetch/undef/swi ... - * use irq_save_user_regs / irq_restore_user_regs for IRQ/FIQ handling + * use bad_save_user_regs for all exception types */ .macro bad_save_user_regs @@ -242,27 +241,6 @@ IRQ_STACK_START_IN: mov r0, sp @ save current stack into r0 (param register) .endm - .macro irq_save_user_regs - sub sp, sp, #S_FRAME_SIZE - stmia sp, {r0 - r12} @ Calling r0-r12 - @ !!!! R8 NEEDS to be saved !!!! a reserved stack spot would be good. - add r8, sp, #S_PC - stmdb r8, {sp, lr}^ @ Calling SP, LR - str lr, [r8, #0] @ Save calling PC - mrs r6, spsr - str r6, [r8, #4] @ Save CPSR - str r0, [r8, #8] @ Save OLD_R0 - mov r0, sp - .endm - - .macro irq_restore_user_regs - ldmia sp, {r0 - lr}^ @ Calling r0 - lr - mov r0, r0 - ldr lr, [sp, #S_PC] @ Get PC - add sp, sp, #S_FRAME_SIZE - subs pc, lr, #4 @ return & move spsr_svc into cpsr - .endm - .macro get_bad_stack ldr r13, IRQ_STACK_START_IN @ setup our mode stack @@ -276,14 +254,6 @@ IRQ_STACK_START_IN: movs pc, lr @ jump to next instruction & switch modes. .endm - .macro get_irq_stack @ setup IRQ stack - ldr sp, IRQ_STACK_START - .endm - - .macro get_fiq_stack @ setup FIQ stack - ldr sp, FIQ_STACK_START - .endm - /* * exception handlers */ From patchwork Sun Oct 24 23:58:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1545471 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=mdL8Vnr6; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4HcwD05MYmz9s0r for ; Mon, 25 Oct 2021 11:04:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8BA083536; Mon, 25 Oct 2021 02:03:15 +0200 (CEST) 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="mdL8Vnr6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E5A3E815CE; Mon, 25 Oct 2021 01:58:33 +0200 (CEST) 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=unavailable autolearn_force=no version=3.4.2 Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) (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 3D35782DF6 for ; Mon, 25 Oct 2021 01:58:28 +0200 (CEST) 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-qv1-xf36.google.com with SMTP id gh1so6131559qvb.8 for ; Sun, 24 Oct 2021 16:58:28 -0700 (PDT) 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=qroMYwoqjgeNjbhAC+xM9XVsr20+fhcsylYCLtO3EpE=; b=mdL8Vnr6wSjGAA20K+mbgE/fNEjelZRRcgeK7eyRKkLUBqoj1k2BhPz+PFQE419LHq HJXMf5/gCcsVgfnvU5CR5/teFwG7cxw8agZUj1JTMDmfxib8h5yJLdgAsghMRBqinpNp WvKWZNMaV1Sx3djDhGb/sfmjwJIgcP4SizuYcNzFzQ55knoEgU+Wu0/evZV/Zv0YAqWx urk/uKqXjRyXgRfI4+rwS5mxqubvm610kT7NgVif6G+Jx51/lL739/9rrVbmvniNGkaQ 7E3eMGauo6RPv528htoYJm9A2E4FtIGlLmKL3ElBCGzSR8EonEUNOEM5HKwTOUHr8+OG geRw== 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=qroMYwoqjgeNjbhAC+xM9XVsr20+fhcsylYCLtO3EpE=; b=SL4xvKQwojSz/0tYGmVafJe4B6auDrZ8VhvQxLU03RUmA7K3NuocryqeOK3rLgOrJN Mupc8e0l4BqO2mLqjFAwlVL2isLdcafzvNL0GqPsvuw6wONWXhwYzrlWYyIqdYuUtvnd BSH3LnPs8K++B3LrmQFLqwqgefV9lBoyRJh2YdnJtcErYDhG6pRkL+8SDPFhF4EMl2Bn gjwWWGhaB9t1tsU2rA5fSu/4PAe9UwF9PFZtWa/Cne4iujPBDVcINsCJaC2/9RZPTs5d 2gzbt+Lm2RKWa7qJsdyFL3uNKp2rgmt0cLHDNkV3fw80La2aPAL84sSkqJ7qvkeMEjPz Lqeg== X-Gm-Message-State: AOAM5322C9iH6pbxxY5gqbO6tqzHtEJPVsF6kC/vzXnVFYqxQ5Hj5FNB c/UxfgkbVBp679zKTMquWO/1Xoq1VdU= X-Google-Smtp-Source: ABdhPJyaeDs/J7FktDo7FEGj2MpS2HmZmGX2j2MWaTH50fR6nt/DHAhJxNh7VxBy9aac4byShbsYow== X-Received: by 2002:a05:6214:2aa9:: with SMTP id js9mr8781711qvb.10.1635119906852; Sun, 24 Oct 2021 16:58:26 -0700 (PDT) Received: from phantom.myfiosgateway.com ([68.237.40.64]) by smtp.gmail.com with ESMTPSA id c9sm6848573qte.43.2021.10.24.16.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 16:58:26 -0700 (PDT) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen , Harald Seiler , Simon Glass Subject: [RFC PATCH 5/5] Fix PC adjustment logic in exception handlers Date: Sun, 24 Oct 2021 19:58:08 -0400 Message-Id: <20211024235808.1926508-6-jim.posen@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211024235808.1926508-1-jim.posen@gmail.com> References: <20211024235808.1926508-1-jim.posen@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 25 Oct 2021 02:02:55 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 --- 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: