From patchwork Fri Dec 7 15:14:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1009508 X-Patchwork-Delegate: marek.vasut@gmail.com 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tOrHDxqJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43BGJZ2rHqz9s1c for ; Sat, 8 Dec 2018 02:16:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1A3DEC22755; Fri, 7 Dec 2018 15:15:16 +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=FREEMAIL_FROM, 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 67319C2277C; Fri, 7 Dec 2018 15:14:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 527F1C22775; Fri, 7 Dec 2018 15:14:44 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id 74608C22756 for ; Fri, 7 Dec 2018 15:14:40 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id c126so4873923wmh.0 for ; Fri, 07 Dec 2018 07:14:40 -0800 (PST) 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=GaytiP/BvGHt8WgGUDk/MV/I+0AdbYk8YD1IgQYuJMQ=; b=tOrHDxqJ95rJh3DufGW/oYbhox6tLzt91TJ4YgimyhGrPnEJu2a2xWj2m+2/UMF1ky bH6SOSpthXMgfE+gakwFh91mNQlUCyAxIMjC4bymSaXoPBK3M8QYaWIXlq15jIpKG3xN fwXjHY+KHZ0uZNVlZW+bs5JBhnsohkVrNG8o3ZzmOruBbaMYd0YCw1pX7jz4ZmuPFsDf 8gyFqFIwQu6Mf/LJ7pCnbGVzNgyZQ+6nAJUxPHmeyc0zxrzyCQuKOwHcA3J6G+foOI4m OBaGpXBQWYBdBF81EoKhmIxVw9hLpNh5SgBLQdbOIVgwpKY0i7Rv0v6Eq+DA6UzlDJnq 57Vw== 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=GaytiP/BvGHt8WgGUDk/MV/I+0AdbYk8YD1IgQYuJMQ=; b=meRVh5P6wQeRMdn9HsRZMSPAI23ft5grluA1XVCxrcSRZYur5K0CPrSqL7B+AVE0AS hJBZnDWnwBDXYKDTCQhQMknv6/H2XeV7ItkQqEFoXcgXf4oj5DOyLDbBTfU0eUAJHmlb 2AKTy7VTpG/f+o2XHYqjyGTIsMgu+2yzgQDztKECiG61GLZf4kRhNFMcimt/IlH/h+B9 97tdmVWyF2Ggvw5zeD3kS/+aeR384rd4j1iO3XnOQMYasUx4P31gJgHBu29+aPDAk6VF Z+NaqiXqm29SFXb0YPUsnNjBvRvWQ860HrB45zOesp9FW0WGIqlamHhevKZZkZtpo3Si b3dA== X-Gm-Message-State: AA+aEWazdRZl/vDPTV5X9hpLsAhKlegi/i4JWaUodI0LDt/hRHBPkGyS CH9zhQQN/hrMBJSmw2CdhFG07tUN X-Google-Smtp-Source: AFSGD/Wv+tLEMWjtS5Kvv+CLTIORX0S2ATk81Krk5ztk2YzoKnXJgkhwKEfUoH0h3PY7K3p3H1vKUA== X-Received: by 2002:a1c:5585:: with SMTP id j127-v6mr2387947wmb.127.1544195679677; Fri, 07 Dec 2018 07:14:39 -0800 (PST) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id o64sm6507772wmo.47.2018.12.07.07.14.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Dec 2018 07:14:38 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Fri, 7 Dec 2018 16:14:29 +0100 Message-Id: <20181207151429.5172-3-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181207151429.5172-1-marek.vasut+renesas@gmail.com> References: <20181207151429.5172-1-marek.vasut+renesas@gmail.com> Cc: Takeshi Kihara , Hiroyuki Yokoyama , Marek Vasut Subject: [U-Boot] [PATCH 3/3] ARM: rmobile: Fix to enable icache early in Gen3 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" From: Takeshi Kihara This patch fixes the problem that u-boot will not start unless icache is enabled early. Signed-off-by: Takeshi Kihara Signed-off-by: Hiroyuki Yokoyama Signed-off-by: Marek Vasut --- arch/arm/mach-rmobile/cpu_info.c | 4 ++-- arch/arm/mach-rmobile/memmap-gen3.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 65a9ca8c01..aa5be52dfd 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -7,8 +7,6 @@ #include #include -/* R-Car Gen3 caches are enabled in memmap-gen3.c */ -#ifndef CONFIG_RCAR_GEN3 #ifdef CONFIG_ARCH_CPU_INIT int arch_cpu_init(void) { @@ -17,6 +15,8 @@ int arch_cpu_init(void) } #endif +/* R-Car Gen3 D-cache is enabled in memmap-gen3.c */ +#ifndef CONFIG_RCAR_GEN3 #ifndef CONFIG_SYS_DCACHE_OFF void enable_caches(void) { diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c index 3c0f3548cb..1a9eb72bb9 100644 --- a/arch/arm/mach-rmobile/memmap-gen3.c +++ b/arch/arm/mach-rmobile/memmap-gen3.c @@ -140,6 +140,8 @@ void enable_caches(void) gen3_mem_map[i].attrs = 0; } - icache_enable(); + if (!icache_status()) + icache_enable(); + dcache_enable(); }