From patchwork Thu Mar 10 01:43:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1603618 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 4KDX281F85z9sFv for ; Thu, 10 Mar 2022 12:45:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3A5D8839DF; Thu, 10 Mar 2022 02:44:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 48C5C839D3; Thu, 10 Mar 2022 02:44:22 +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=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (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 03042839BB for ; Thu, 10 Mar 2022 02:44:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f41.google.com with SMTP id gm1so3460734qvb.7 for ; Wed, 09 Mar 2022 17:44:11 -0800 (PST) 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=eSsM8EUSIbeAVBTEOAODrsreBKa7LLAWF/ONCdLLRPg=; b=kjAQRYrwgC+A3JDKVN5ohtZyB+wQc0jD8gfJX62mKJR+stMO3kLACbFKPrjDJ6U6ng PTUwrPoaUFSjvN3YHx7iJuMoGTBTR3GZMwm8awzosZBczLUQRNu6m4gpPixw2cQqf9dQ lnhVKvk0ND1x/9MR35klMZduBhu5UTRjmI7pB35ICng2f4PQdPmTQnKCaUS69pA5IlZx 3/M2emoAkqsE4EpkB6VwX5PGnmqFStWAOYi9PxRiO6gXXnI+ZZxO/GEiMDkirguDKLi4 MFHZIF+6/B+T8zUjKjeAn8apTFfKCOEvIDZvJRJmb1nSv6B2QsgPwimmek/a3Ge4n5nU LpiA== X-Gm-Message-State: AOAM5303g2cMVC3iaG9uLpkDCASuHR8trH++0lDfbc2yjupxWe0Ybcfc kvGkrQAbwfcu6gy3GzC+lLLlN3EYWQ== X-Google-Smtp-Source: ABdhPJxYB+NoQTjXa5Pi0HP1i6kTkwxGey8tcOju/S9zt3x9S6Y4uPKIWID6XDNF8vgCmrHYtmiowA== X-Received: by 2002:a05:6214:e87:b0:435:c1d2:6922 with SMTP id hf7-20020a0562140e8700b00435c1d26922mr2160993qvb.17.1646876650616; Wed, 09 Mar 2022 17:44:10 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id t7-20020a05622a180700b002e0ccf0aa49sm2486328qtc.62.2022.03.09.17.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 17:44:10 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Alex Nemirovsky , Marek Vasut , Michal Simek , Nobuhiro Iwamatsu , Simon Goldschmidt , Tien Fong Chee Subject: [PATCH 03/15] Convert CONFIG_ARMV8_SWITCH_TO_EL1 to Kconfig Date: Wed, 9 Mar 2022 20:43:52 -0500 Message-Id: <20220310014404.1251636-3-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220310014404.1251636-1-trini@konsulko.com> References: <20220310014404.1251636-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_ARMV8_SWITCH_TO_EL1 As this option isn't enabled anywhere and is for very specific circumstances, it's not an asked Kconfig option and instead noted as something to select. Cc: Alex Nemirovsky Cc: Marek Vasut Cc: Michal Simek Cc: Nobuhiro Iwamatsu Cc: Simon Goldschmidt Cc: Tien Fong Chee Signed-off-by: Tom Rini --- arch/arm/cpu/armv8/Kconfig | 6 ++++++ include/configs/xilinx_versal.h | 2 -- include/configs/xilinx_zynqmp.h | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 9967376ecab9..8d29393bc0e9 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -31,6 +31,12 @@ config ARMV8_SET_SMPEN it can be safely enabled when EL2/EL3 initialized SMPEN bit or when CPU implementation doesn't include that register. +config ARMV8_SWITCH_TO_EL1 + bool + help + In some circumstances we need to switch to running in EL1. In + that case, select this option from your target Kconfig entry. + config ARMV8_SPIN_TABLE bool "Support spin-table enable method" depends on ARMV8_MULTIENTRY && OF_LIBFDT diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 20f5a7271a20..a8009f236937 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -10,8 +10,6 @@ #ifndef __XILINX_VERSAL_H #define __XILINX_VERSAL_H -/* #define CONFIG_ARMV8_SWITCH_TO_EL1 */ - /* Generic Interrupt Controller Definitions */ #define GICD_BASE 0xF9000000 #define GICR_BASE 0xF9080000 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 1f0da1a4b3e4..27ec3e06270e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -10,8 +10,6 @@ #ifndef __XILINX_ZYNQMP_H #define __XILINX_ZYNQMP_H -/* #define CONFIG_ARMV8_SWITCH_TO_EL1 */ - /* Generic Interrupt Controller Definitions */ #define GICD_BASE 0xF9010000 #define GICC_BASE 0xF9020000