From patchwork Wed May 8 06:38:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 1096765 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="NRbWfTjX"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44zRj62g1Wz9s55 for ; Wed, 8 May 2019 16:42:02 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 139F5C21E49; Wed, 8 May 2019 06:40:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B9195C21E3B; Wed, 8 May 2019 06:39:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 08471C21E34; Wed, 8 May 2019 06:39:31 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id DFE97C21DFD for ; Wed, 8 May 2019 06:39:27 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id d12so5104798wrm.8 for ; Tue, 07 May 2019 23:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RtRB8Pwz+0Nhdxuovfdg8Htx+QiY082BOQJnPaP9wuw=; b=NRbWfTjX2Op6ZTVmpJv5rAfwPnGMruCunQ7AloZpTgf9pCpRm4sPxYgcxJnDpm/2Yw 4oLlPA5b4Nn9S3muUO0tPfpDWnN4Wrs4PNNh5ZEcTMQIPBdfZGJbll5B2qu8LANirZT5 X/zXdgwNMTBsHwoxCY2CTxCSnThvDDWDEUbDW1kh4D2XEv1lACBKxEF74lcR6l7N+heD PUxBoL0m4rp2ySj9f3HIjyw60CgPioUNxNRK9waZDSi1j2UtLMUCWPftqpKwX8ojsej0 366YIb58jSBRkF/WKiE8hJdCRvAmT5C2gdFdyCR192CpHeCrUVaNADl6L+Tg8U+JKTSM sFdw== 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=RtRB8Pwz+0Nhdxuovfdg8Htx+QiY082BOQJnPaP9wuw=; b=LDIdghOHHV4zoZG0FyIIyb2IOcUXZG/llRZ0aYaPSjMtyLALEM7Ix3UoA67fH03hIt 80uk8N9nt2uIV9ji0IEWbvGbls8RlL3hpnbmP/i457x//+eQWaN6YYbIN4Gl2dPHaXyq NrQjyi2zEaatUhioC40Tqts2XaO5hBwBoLWe3nk/ncLglTtZ94NFYAVniI2tBKZk0A1Z db3qmiAq+XJ0X/0F145m/HyDp5jOJrzixyctY/W6R0oMOWgtnL1ckRLz1loVzZO7sr4E DFfNvPwK+BC5Pu41eoMDu+Jc7pzRvDEUi2PEY3cygYlLi1Grgk6lV2Ul44xEcacM3Uos lCYw== X-Gm-Message-State: APjAAAUUUWT/ydkQlUyDmlrK6mOuzruwA0mtH9+O6/pY+EoE6NAKOcg9 nMzPiTanvZH78wWah/0dDr23tQ== X-Google-Smtp-Source: APXvYqx4wXRbPElyyOE2IasL6xDTXXqmpGqtLFt2DeO6dztX31aO5oTYpa43hfuKU/oJn3rj6+c8pg== X-Received: by 2002:adf:9084:: with SMTP id i4mr6111552wri.259.1557297567596; Tue, 07 May 2019 23:39:27 -0700 (PDT) Received: from localhost.localdomain (li1415-253.members.linode.com. [139.162.148.253]) by smtp.gmail.com with ESMTPSA id e8sm1539086wrc.34.2019.05.07.23.39.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 May 2019 23:39:26 -0700 (PDT) From: Jun Nie To: festevam@gmail.com, otavio@ossystems.com.br, peng.fan@nxp.com, vanessa.maegima@nxp.com, bryan.odonoghue@linaro.org, u-boot@lists.denx.de Date: Wed, 8 May 2019 14:38:30 +0800 Message-Id: <1557297516-18616-3-git-send-email-jun.nie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557297516-18616-1-git-send-email-jun.nie@linaro.org> References: <1557297516-18616-1-git-send-email-jun.nie@linaro.org> Subject: [U-Boot] [PATCH v4 2/8] imx: mx7: Skip secure init in arch_cpu_init X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Skip secure related initialization in arch_cpu_init if low level init is skipped. Because these should be done in early stage firmware, such as ARM trusted firmware. Signed-off-by: Jun Nie --- arch/arm/mach-imx/mx7/soc.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 7cfdff0..ccfab82 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -164,15 +164,6 @@ u32 __weak get_board_rev(void) } #endif -#ifndef CONFIG_SKIP_LOWLEVEL_INIT -/* enable all periherial can be accessed in nosec mode */ -static void init_csu(void) -{ - int i = 0; - for (i = 0; i < CSU_NUM_REGS; i++) - writel(CSU_INIT_SEC_LEVEL0, CSU_IPS_BASE_ADDR + i * 4); -} - static void imx_enet_mdio_fixup(void) { struct iomuxc_gpr_base_regs *gpr_regs = @@ -191,6 +182,26 @@ static void imx_enet_mdio_fixup(void) } } +static void init_cpu_basic(void) +{ + imx_enet_mdio_fixup(); + +#ifdef CONFIG_APBH_DMA + /* Start APBH DMA */ + mxs_dma_init(); +#endif +} + +#ifndef CONFIG_SKIP_LOWLEVEL_INIT +/* enable all periherial can be accessed in nosec mode */ +static void init_csu(void) +{ + int i = 0; + + for (i = 0; i < CSU_NUM_REGS; i++) + writel(CSU_INIT_SEC_LEVEL0, CSU_IPS_BASE_ADDR + i * 4); +} + static void imx_gpcv2_init(void) { u32 val, i; @@ -269,12 +280,7 @@ int arch_cpu_init(void) /* Disable PDE bit of WMCR register */ imx_wdog_disable_powerdown(); - imx_enet_mdio_fixup(); - -#ifdef CONFIG_APBH_DMA - /* Start APBH DMA */ - mxs_dma_init(); -#endif + init_cpu_basic(); #if CONFIG_IS_ENABLED(IMX_RDC) isolate_resource(); @@ -286,6 +292,13 @@ int arch_cpu_init(void) return 0; } +#else +int arch_cpu_init(void) +{ + init_cpu_basic(); + + return 0; +} #endif #ifdef CONFIG_ARCH_MISC_INIT