From patchwork Wed Nov 24 19:39:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1559283 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=le/qdPIS; 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 4Hzrvx71VCz9sR4 for ; Thu, 25 Nov 2021 06:40:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B9620836E2; Wed, 24 Nov 2021 20:40:36 +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="le/qdPIS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B9A4382FB3; Wed, 24 Nov 2021 20:40:29 +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-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 717CE80735 for ; Wed, 24 Nov 2021 20:40:25 +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-qt1-x829.google.com with SMTP id a2so3803512qtx.11 for ; Wed, 24 Nov 2021 11:40:25 -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=gxhTjEnhro30/024dYMObNKNdeydg4z1GGQxV2eikDE=; b=le/qdPISKnvswDR10r9cAfZYXkIqUpeeCd5162BGeUNW4kGkT64TMVO6DKvnL7KCl3 FRR4NkAa6whcxFP5GZ46pWJlKoNK1Gd+L2HYHubOUSRYf/tkW5GZ3zOwug7LCeqncJoH nPPJkyHvYyiM9kBhGeG/wXoo5+QhK/5LHDF9vckNuoLXBqX1Ew5Ua7ndmkdijO16a+NU zgfjnE0xt8LqabvLHtMOGblTOByjVLIk+uk6OXdSH2v4FxbtBbbf1vC6tCpaumXxPKLj Fmb2OkECXXMBU6d9Q6uZGiFdmRapc8WOpQaTI7cmTTf/MOgfO1rf1ArVwL33CyiJyLvh iu7g== 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=gxhTjEnhro30/024dYMObNKNdeydg4z1GGQxV2eikDE=; b=dwmp+M1MaFQVEDeVphzrG52fpfC6Ko8iamzYjUDYIKKBHkYHYFPSeSV/r/Zj+3X5HI k1F9KEMqjPTOYC0KZbk89FpqAi4Nztx5EnXI0o7knxJCfIzG/Rru1K6bdC+Ihqj2vl05 uYAcbxuO0RzjXls7YVQzdfk6PutqFv824oEoXLUNTn3yZ1jEMgP917uz7QRO2Tnd4rkW hK2ToRPe2z1TNNFhpBg5tiDFL/lJEvZbauI2IZ2o6RvQ09OouhWhcF5ckmV2XNEojwSh PykOysGpG3gzcNXzL1kBiMt+WOOo2gQgkZmPWqiGfQn8kkUNHwImEIqSI91n2tB8Sg1T q/BQ== X-Gm-Message-State: AOAM533HH41kBlzTao/hmx047pEQSruZtKqc7+lO1gLnx8khSmANbbm6 92ZX6D6nCF9NUrYu2Na5fQoMGBN/kFw= X-Google-Smtp-Source: ABdhPJwaQgW7lsbgxEhNMkgwuZHAIo2kEMxM4YVSzkhXjkB8ERJf57gwzh9AoVifwfnEm/erCo6A3Q== X-Received: by 2002:a05:622a:551:: with SMTP id m17mr10481419qtx.98.1637782823859; Wed, 24 Nov 2021 11:40:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 11:40:23 -0800 (PST) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen , Minkyu Kang Subject: [PATCH v2 1/6] Compile for ARMv7-A with virtualization extensions Date: Wed, 24 Nov 2021 14:39:56 -0500 Message-Id: <20211124194001.443232-2-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 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 --- (no changes since v1) 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 Wed Nov 24 19:39:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1559284 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=HuRDcq69; 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 4Hzrw91NmXz9sR4 for ; Thu, 25 Nov 2021 06:40:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8E4DB82FDC; Wed, 24 Nov 2021 20:40:43 +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="HuRDcq69"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6F33E830E7; Wed, 24 Nov 2021 20:40:32 +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-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 E8DA282F8D for ; Wed, 24 Nov 2021 20:40:26 +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-x72e.google.com with SMTP id 193so4129255qkh.10 for ; Wed, 24 Nov 2021 11:40:26 -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=DX80CR5ShJUAfaNqtmxdpIOfVqePTZn9Un6RK6XMt0U=; b=HuRDcq69zVmwdJpqB5r6VKy1Qgtx55Wzsi4XQnVviYuyw9lhEHRA7E6Ln8niPGqBo1 D/h5OqCllitAR7ltRfxcEVPpW0yhOUAVKJekUdkRjH7kfCkhhWETU55hXwayh5npohav 4kVtGtLBAopK2bPiGT6BbF58bqYidHBDA273a//IpcAX44dWxqwR1Qp0n/PJ7fWd3sRt a8v6NBcvIA3riQfQGYuYpF2ZLtt/rjAwYYuS+Ffyc0UsEh2+RbY4s3cBwIpAiG3G6kZH WhgaLG4igEp5kH3uRLhnV9r4ffFIsxOSOtr4Tg6/dhKXW/QcZWNjLTTYQfIsHKiHdHk8 xr4w== 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=DX80CR5ShJUAfaNqtmxdpIOfVqePTZn9Un6RK6XMt0U=; b=wrHqQp5DsVi48FBqEZ2lB9MqbzyyKsn71c/5qF137179s7/EYrW7cmux7DhlPX5Ea0 ZWezaGfHQogzm8pAxDjGgNmUks6X9Bk1HVynBpTpuYthCxIZOP15TLPxHWEFOHl1lLsm xI3ZIsX6m1xnMgo3ddqwtHNy59Jdvf02NR9QtzaHJEGmE6BXTfrMPMFklsdAbDrY9SNs CHGXbIgY4hHPw8+URDbwNFOTc3v6kJlx/WjsbNvmpazeFcRuE6YPaP3uJ4xSoiZKTTNb Zce8fjRMDoe5z48bzOMtFx5Q8Adoq8ctDvImb1lBcrHiyHL1GEoee+Wmttax2/iNHlZj UlHQ== X-Gm-Message-State: AOAM532nHdK6CLusKFAGfuuG60fMag0yIhp6RF1sU9QQtgiAFaY+DxyR kDmcFOp3F/W28Rc7kVY3OHibYR25Plw= X-Google-Smtp-Source: ABdhPJy55rmiQ7GFuTTft2TIl0masAgqW3SjVC83ARqL5EjkNIR82Impgx9W6bBD92SyQSukElbvAw== X-Received: by 2002:a37:813:: with SMTP id 19mr768985qki.729.1637782825511; Wed, 24 Nov 2021 11:40:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 11:40:25 -0800 (PST) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen Subject: [PATCH v2 2/6] Hypervisor mode interrupt vector table Date: Wed, 24 Nov 2021 14:39:57 -0500 Message-Id: <20211124194001.443232-3-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 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 --- (no changes since v1) 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 Wed Nov 24 19:39:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1559289 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=B0qVZUov; 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hzrwj4Gzbz9sR4 for ; Thu, 25 Nov 2021 06:41:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4D98383434; Wed, 24 Nov 2021 20:40:55 +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="B0qVZUov"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 76AC980735; Wed, 24 Nov 2021 20:40:37 +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-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 BED6C83003 for ; Wed, 24 Nov 2021 20:40:28 +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-qv1-xf2a.google.com with SMTP id b11so2502077qvm.7 for ; Wed, 24 Nov 2021 11:40:28 -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=UHaH0/Mrk9sxLDT6200494z4CJQC8eqp9K973DkVSC0=; b=B0qVZUov/wiGLsbpWXYJhumLHBVqU6DitlZ3yd++oJDqqMkx1F5elzUBXExetmbQQQ /kHWtS4sX3nj22oiSRZ2vOA9dSrrBGEUeNdpWscWAlEsGcfWtWpflEIqAyAynGQdVPFt X+7WDecaqGbgO7sYcyFDHcCERaRvV5MyfKOm80/rCM2JPirYmFZWh04e9ZvA5zFwNrk0 JMN+oCk9LWUS+q7xhZC+bysMOn+j0dC8+hiX1CiZ7qLLu3PtGTOKieyGd4TH0dDOkk5P 9QnPz+D4Ws2+4z73UnGYgUOCi4iOSwBptBq13+hDZ1ssX0ylDqW0IiehDWtShFowZVis VNIw== 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=UHaH0/Mrk9sxLDT6200494z4CJQC8eqp9K973DkVSC0=; b=gjj9+F7MqbesEYo+6C+dxYo2rXUk5UsoJJKP1sNK0Km0jU3taRdrgsRvAaNJGWJ5mP vmfeakZZmortehGq+FGnMOkj06CB0OXTaBqKSuDvae1d7VP726IZe1egisC+zx/Uc1Q+ aZhyXhq4AJk2bSvooXlUsPczyu0tMnsKQVP7UoL36wxlsxrnbcDRUwuZEC49QlikVyeL laXGNkX4r8T1eYnDpZ4MsQVUmRtE39nP4quC7uXzSOObL3qKLSoAzYgL6NHHlgmjRO/c RAbwAcvqLNdpj2VYviJgt7SI4/Ugq8+TxOkhLS4Bbx0JPszWnYtvD2pcmvAkIqsKcT9D oc/A== X-Gm-Message-State: AOAM532h1sm0UlkdnKAoNzZDwgXb1AYR0aALSaVfx4fRWYVKXCa94E4d +I4tri+EnHDkVHzJHAy7cD53q6OXuzw= X-Google-Smtp-Source: ABdhPJxg+GUlEStaWCSWSbYMOygWjc+O5yRT3CrvS+gCT/wXTEnf8AQ/RirEsG6Az786H1QdUxV5dw== X-Received: by 2002:a05:6214:e47:: with SMTP id o7mr10796383qvc.61.1637782827211; Wed, 24 Nov 2021 11:40:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 11:40:26 -0800 (PST) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen , Chia-Wei Wang Subject: [PATCH v2 3/6] Set HVBAR register correctly Date: Wed, 24 Nov 2021 14:39:58 -0500 Message-Id: <20211124194001.443232-4-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 This is the base address register for the vector table when in hypervisor mode. Signed-off-by: Jim Posen --- Changes in v2: - Fix CP15 register written to in start.S - Check processor mode as HVBAR register is only accessible in HYP mode arch/arm/cpu/armv7/start.S | 8 ++++++++ arch/arm/lib/relocate.S | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 698e15b8e1..dc66f592d9 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -113,6 +113,14 @@ switch_to_hypervisor_ret: ldr r0, =_start mcr p15, 0, r0, c12, c0, 0 @Set VBAR #endif +#ifdef CONFIG_CPU_V7_HAS_VIRT + /* Z flag is still set from HYP mode test */ + bne skip_set_hvbar + /* Set hyp vector address in CP15 HVBAR register */ + ldr r0, =hyp_vector_table + mcr p15, 4, r0, c12, c0, 0 @Set HVBAR +skip_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..b8db36795d 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -60,6 +60,19 @@ 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 and running in HYP + * mode, use HVBAR to relocate the EL2 exception vectors. + */ + mrs r1, cpsr + and r1, r1, #0x1f @ mask mode bits + teq r1, #0x1a @ test for HYP mode + bne skip_relocate_hvbar + ldr r0, =hyp_vector_table /* load dynamically relocated address */ + mcr p15, 4, r0, c12, c0, 0 /* Set HVBAR */ +skip_relocate_hvbar: +#endif #endif bx lr From patchwork Wed Nov 24 19:39:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1559285 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=Fz5GC6j4; 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 4HzrwM3gNhz9sR4 for ; Thu, 25 Nov 2021 06:41:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5D8D3836C5; Wed, 24 Nov 2021 20:40:49 +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="Fz5GC6j4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5889830E7; Wed, 24 Nov 2021 20:40:36 +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-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 101128069C for ; Wed, 24 Nov 2021 20:40:30 +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-qv1-xf2c.google.com with SMTP id s9so2488271qvk.12 for ; Wed, 24 Nov 2021 11:40:30 -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=XO+31nn+WXxEilg68c4HDK19zhPFKBadhAYi0/hyDLA=; b=Fz5GC6j4XfSIU5cQ8ZwoCVbgd3yKZsu5bgL0eakzgXRoDkhdTKc2slVLmkJKRwKkH5 86q5/BSl1bdmumb5rVAZmTHkVnMGRPCaAjvV2VD2ObEVSEMKDGTPbtju5/6VyzFiXxwl Efs/ecbKBL/zAx7jP+B+wdPjIa7GEY6ZlpSqwlHgWbB6Y8rxZXH+dpPjhHDjq4fvdasu t0eelhKe6YQNAdijCXFEKO218pteq3250pFxiG9v2wFMyqVyMcegcCGkSiQEPawDZJFs TT8jOGYksdbxg9gH5LvHYwrWYOKHqnOqZyUG4BBKMxsnIj7HcSEqZi/bsBoRIhvGC71H XoFg== 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=XO+31nn+WXxEilg68c4HDK19zhPFKBadhAYi0/hyDLA=; b=BNpeKBQIuI1haE89mtOR1Vr2yF5T8txx3XZbpxdNTy2XcirwxnUb1WHjk/w2akKG2x rXTegT8JMi4pf+/Wzo61PEOPsVFlmVYgwHGQggSJQdnFzAyhEjJqyGblA+yea/RM/bkc tF6k+DImydL8ox+0aOx3s6RGoN5Ay9ibdZy/fJLT2s1/ERkOTwrAPCr1XQMq4yc7GZKm 6mvghNiFXwfabBN5rWBSHQu6ffh8jX8WVwhjNx1yNrewRh35kjX3lcqsgDwZv8xIVU5b x+VVVJIQozQ8w78ACFFEQJF3Lb5x1rAFLcscfo32ZU0apLGZ6EktW6jBbxym0V+HDcin d0EQ== X-Gm-Message-State: AOAM530I7uXir57eFQ9JuWsP3m7VB3Jb2w3dLdO85q/vWunPFRN27rnm xwriMXlpGxfkY8LCnWOELjpEs284hT8= X-Google-Smtp-Source: ABdhPJwRUlGk9Ac5SjDHLr2LpI0SnNsGsV2BvwWOEtqKlvavYltNE6px4eysGGbhwVRmxXiY2C/ZOg== X-Received: by 2002:ad4:5e8b:: with SMTP id jl11mr10766542qvb.18.1637782828619; Wed, 24 Nov 2021 11:40:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 11:40:28 -0800 (PST) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen Subject: [PATCH v2 4/6] Remove dead code Date: Wed, 24 Nov 2021 14:39:59 -0500 Message-Id: <20211124194001.443232-5-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 This code was missed in commit 01abae4d0486 ("Remove various unused interrupt related code") Signed-off-by: Jim Posen --- (no changes since v1) 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 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: From patchwork Wed Nov 24 19:40:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Posen X-Patchwork-Id: 1559291 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=VwBGAWo5; 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 4Hzrwx3drSz9sR4 for ; Thu, 25 Nov 2021 06:41:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F75283737; Wed, 24 Nov 2021 20:41:05 +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="VwBGAWo5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1187480735; Wed, 24 Nov 2021 20:40:42 +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-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 0D0C382F8D for ; Wed, 24 Nov 2021 20:40:33 +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-x736.google.com with SMTP id p4so4144545qkm.7 for ; Wed, 24 Nov 2021 11:40:32 -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=unvZS48g8bnABkAXNLk5FZO3T1eGNl2oyiDwIGKk3rA=; b=VwBGAWo5ZZpAb5aL1nFdl6g6Mj9VwD4ghKOySFrijJMiBU7uXxAjIZqdsp++3OuKUS UR9qdCLlf4zCkMkAZIkebY3JkigKzjacZ722w+j3CiMRJDgoVEsOwTnPfWh2LDJmCQxQ S5YORqxyW58aY4sKadpZSzBpUVNAikvYwv74Es45OniEixcPuULpEEH9ZLTbq2DRxVDQ vABN3tJVYDhX29scS7Gu5SJWzrXL6MYNRgh47m3iuJTZciY7+SgQDBJCyjFtRwQesVi3 mJRghc3qyUbYz/mCzNjJTC57a31nXf0iidGM1YgO35G2n6c15kYKFsWjFiTlVzZBlj1v rR9w== 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=unvZS48g8bnABkAXNLk5FZO3T1eGNl2oyiDwIGKk3rA=; b=vXTLhT9q6X0MTgkqg6o4x9Nt/icIjGv6nQ3jNxTFUgL67aB5xrooN3Yk0GsazsK7Um okLCJ/7IJFaPqNOB4iXUVPuS/iKdRo/HZFrT1TzB605nh0HyV4dSSfnp+P3nl5BDaSNJ dWIzmS9u9VMviQGMrpyi1z39Cc5v4itQaYbRiUCgZipFabKE5/8xHzSwGl6EhgOYDETu y3/iuTpfIHHj4KXHt0FzA6BEeu2Hmoy6y71nnWP7y7NpbUCjOyBSkU4aewGiuWysBypl 30QwPUbxMm81b2mZfTqfM+tgqV4R7JBJKDs4jBORZZBwp1uWfdTbVDAoTjpo1tLnpzWP 8rEA== X-Gm-Message-State: AOAM530bKG5/WkAOkJukLzfHzcFlgYgEaHPZ+I/eHCbqPJh591qdxEHO +vvtYfV2TvTJV/LFx+JmsMp0pJmbU6M= X-Google-Smtp-Source: ABdhPJzdl8lsKqEcQxEd0SZLrDYq8kjAsUC9c6CqdRX4EaR1wNqRhdV2OdHs4fqgu4+gWSRFqPzZdQ== X-Received: by 2002:a05:620a:24ca:: with SMTP id m10mr875766qkn.649.1637782831570; Wed, 24 Nov 2021 11:40:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 11:40:31 -0800 (PST) From: Jim Posen To: u-boot@lists.denx.de Cc: trini@konsulko.com, mbrugger@suse.com, Jim Posen , Sughosh Ganu Subject: [PATCH v2 6/6] Config to target QEMU virt machine with virtualization Date: Wed, 24 Nov 2021 14:40:01 -0500 Message-Id: <20211124194001.443232-7-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 This machine is run with "qemu-system-arm -M virt,virtualization". Signed-off-by: Jim Posen --- Changes in v2: - Add QEMU config option for ARM32 with virtualization extensions arch/arm/mach-qemu/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig index 186c3582eb..92f7d33f48 100644 --- a/arch/arm/mach-qemu/Kconfig +++ b/arch/arm/mach-qemu/Kconfig @@ -27,4 +27,10 @@ config TARGET_QEMU_ARM_64BIT endchoice +config QEMU_ARM_32BIT_HAS_VIRT + bool "Virtualization Extensions for ARMv7-A" + depends on TARGET_QEMU_ARM_32BIT + select CPU_V7_HAS_VIRT + select ARMV7_LPAE + endif