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