From patchwork Wed Jul 1 16:29:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nastya Vicodin X-Patchwork-Id: 1321266 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=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JzCyboXu; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49yFpT5D2hz9sPF for ; Thu, 2 Jul 2020 21:13:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EC3A081C23; Thu, 2 Jul 2020 13:13:07 +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="JzCyboXu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4E9818006D; Wed, 1 Jul 2020 18:30:09 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (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 C21A48006D for ; Wed, 1 Jul 2020 18:30:04 +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=vicooodin@gmail.com Received: by mail-lj1-x242.google.com with SMTP id d17so13179775ljl.3 for ; Wed, 01 Jul 2020 09:30:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9hlYMswV2DrtKVnXYYxW6dS1O8xPXGIld8jgFuPL7tU=; b=JzCyboXuuxraunt/l1IAn3SOcbRn57sWWP4u8Q/0K+uUTYKa/gg4U0Hp1mllIltuWY 4dY85QunvQzJ0vJXrdYm2qzx4ELpHZzj27EF70YalL9YJyBtNda2SX+LBiIz8GBPrO2G pejfMXYmCF8X29x5lusnpbIwMBu4KRmPBywWu2KnlFkn73jJ/Q+6O/HenxZxoJGjrNiC vZ9ztQG94mlQ7OdXlmyXRUEw8fQUs1Vc/DFD3J1E/ybCtfk+qa/aodEn5iwG7QSc2Fwd CwWjNwtCmaEOqVMvjex1a8d2TkERH4oJqBd2aX2T67Ld36lWEz2XnmsD73mtwV5phjJk SOTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9hlYMswV2DrtKVnXYYxW6dS1O8xPXGIld8jgFuPL7tU=; b=ujI1GeuKadmBdPRpTC5V8sssRmrmxBLeDgfI5ag08oteDYBKI6ozq4x/R3qS8oG7ON EnuTlSJAE7gr4xmE+lpW9TKSe6Jbf+4Kzun+CBIDOFTqRfXPYK2nSCx1zmzs1rwP++8x HjxSROLt2lISBfbHsAxThrC/oeD2cqNQHClSAGgNddAIKTu1P2ya14x10dwo+Y3m0r3S 3zr3skvoeMMcGEcw7CQGQKM8GCRRbLvkX2Dcg93ifaUh2XSASq3XBLJKR8l/Os4Jimdb Rp7IuoW85g9AlxSJ5eQOXTSwsiGIH1tg8gCRZ7V/ftSN+KFUOvWDDPJZYz770kAeK5e0 rxrQ== X-Gm-Message-State: AOAM532mY8XsZ/AA5xWH+0XV/P8GZBgzcOtx8Yf1Em/HJzSjotbg+Rfw oZHroPV+aWkOwU+Bl6BVE9F0XRHLx73Lkg== X-Google-Smtp-Source: ABdhPJwj0aQZNX3EQia0T8a2qSShtNL6zQ9WjMOqF7kyAivBHELrT9j13M00z3wDnOkFT+vNejd5kA== X-Received: by 2002:a2e:9a04:: with SMTP id o4mr13726427lji.133.1593621003749; Wed, 01 Jul 2020 09:30:03 -0700 (PDT) Received: from localhost.localdomain (host-176-36-213-80.la.net.ua. [176.36.213.80]) by smtp.gmail.com with ESMTPSA id v20sm1943322lfr.74.2020.07.01.09.30.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 09:30:02 -0700 (PDT) From: Anastasiia Lukianenko To: u-boot@lists.denx.de, sjg@chromium.org, ye.li@nxp.com, bmeng.cn@gmail.com, xypron.glpk@gmx.de Cc: julien@xen.org, sstabellini@kernel.org, peng.fan@nxp.com, roman@zededa.com, volodymyr_babchuk@epam.com, Oleksandr Andrushchenko , Anastasiia Lukianenko Subject: [PATCH 01/17] armv8: Fix SMCC and ARM_PSCI_FW dependencies Date: Wed, 1 Jul 2020 19:29:43 +0300 Message-Id: <20200701162959.9814-2-vicooodin@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200701162959.9814-1-vicooodin@gmail.com> References: <20200701162959.9814-1-vicooodin@gmail.com> X-Mailman-Approved-At: Thu, 02 Jul 2020 13:12:53 +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.102.3 at phobos.denx.de X-Virus-Status: Clean From: Oleksandr Andrushchenko Currently SMCC selects ARM_PSCI_FW if enabled which is not correct as there are cases that PSCI can function without firmware at all. ARM_PSCI_FW itself is built with driver model approach, so it cannot be enabled if DM is off. Fix this by making PSCI reset functionality depend on ARM_PSCI_FW and only in case if DM is enabled. Signed-off-by: Oleksandr Andrushchenko Signed-off-by: Anastasiia Lukianenko Suggested-by: Volodymyr Babchuk --- arch/arm/Kconfig | 1 - arch/arm/cpu/armv8/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 54d65f8488..e9ad716aaa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -387,7 +387,6 @@ config SYS_ARCH_TIMER config ARM_SMCCC bool "Support for ARM SMC Calling Convention (SMCCC)" depends on CPU_V7A || ARM64 - select ARM_PSCI_FW help Say Y here if you want to enable ARM SMC Calling Convention. This should be enabled if U-Boot needs to communicate with system diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 3655990772..c8727f4175 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -103,6 +103,8 @@ config PSCI_RESET bool "Use PSCI for reset and shutdown" default y select ARM_SMCCC if OF_CONTROL + select ARM_PSCI_FW if DM + depends on !ARCH_EXYNOS7 && !ARCH_BCM283X && \ !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \ !TARGET_LS2080ARDB && !TARGET_LS2080A_EMU && \