From patchwork Wed Apr 4 10:25:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 132806 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp4876162ljb; Wed, 4 Apr 2018 03:26:17 -0700 (PDT) X-Google-Smtp-Source: AIpwx490dJr5bUHaSnppfvxE4cN8nXHLfICP/89Il82aJuaF2btN568ga4n4A62Z2uywSg4q1hl8 X-Received: by 10.101.92.74 with SMTP id v10mr11399955pgr.26.1522837577402; Wed, 04 Apr 2018 03:26:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522837577; cv=none; d=google.com; s=arc-20160816; b=MPzLABuOH2TY7pJ1Xz+nTA5XM8ZTdrLWrSpc/5EyTcHAiqDeHGjst+e51IotFkkc+3 SVcieTZ+KXrPUb23QY7DkRl/PE7E0H54fRfsESNkxMpU51J1zv5YDtQgwwflA4O57qmr Tm1wmghwqD/WjF6xw2aJDsfjJM1SylzC9I/GzHhfH+OgZRtQljbnj4AFkqsGLURR/vdt NXt0JfpRlS8AsWZ9PgubTLOSDiH/AbuHuuJwvuzAiv6dvyWQ9fSB0I3miDQfdnrql1Mx uKaveYoNkaMoIaaBfkbqxoMRnE/Iu/At1p+SnFySuauND2tpfDYE9r2sBjYYNxqfS5+O xfqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=m/yp5dw0oxF5bxJU+hPp/K18+eYZvfMBbzKFCqTN61k=; b=SP95Goprr/2clRzINAuqrSbIqehBnmnQ4Iqu2+SyDVITfAZRJ6r1CM3c1CcycpP8K+ bOSb3SwXTtCt5Z63IVQt754zuBIAfltnXbZg0wCtHezZiB4ybizrUq8BuZjK754yDVu4 vMfwrIQBLHEQVpbBrtlZx8z+Fb6i2xCd3v9MRdOur63sjBHv8Ztr+fVXGBloHRlNTk1K c51qlouNFMFUUzEdA4F4cLqptH8E8CsyRgO+vIx6Eo/XrP8cLIoqP9fGWIaTKgiTvZNh MGueOc4EWjj2R3LnSrhAejHnddgcTU7Dc+myINhqptzju+okY3ZT6vZ2ns9T5xmEt43B EwzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u19si2191851pgv.637.2018.04.04.03.26.16; Wed, 04 Apr 2018 03:26:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751155AbeDDK0P (ORCPT + 5 others); Wed, 4 Apr 2018 06:26:15 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:40965 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751017AbeDDK0O (ORCPT ); Wed, 4 Apr 2018 06:26:14 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ljxmg-1eX4x82kG2-00c6IZ; Wed, 04 Apr 2018 12:25:52 +0200 From: Arnd Bergmann To: Tony Lindgren Cc: Arnd Bergmann , Russell King , Dave Gerlach , Santosh Shilimkar , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: omap2: fix am43xx build without L2X0 Date: Wed, 4 Apr 2018 12:25:36 +0200 Message-Id: <20180404102550.3692501-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:Ia1MykmtMbvZP/wLs6Sd9ssdYZ3pxiscxZCngPaW2B3CFH5mq4/ 1olEehJcr9WJUVh3qXv134HL6FabtqV8FOerujJfexAfUxjL/plRCR9fDmRz8tNUrDrVPnC DdsNovIRvtDSxGG6S9lC8GljRSHp/atM9dSh0OH9OlfpTLfxLXAqD0kbQIFUTeHEXIOl/3X BoKyvZmzAGEN3s0A/IBfg== X-UI-Out-Filterresults: notjunk:1; V01:K0:nwIa0BFn0Zo=:CEB20a2BYcfAxV4NN2egUM 5qdyozyvf4P8pBFiCji+jnxIYfn3puYCoXKPadrZ9URSEbnDCxUF0jFV1JsbyL0KlOVHwZycL MVpzaUe5mZpm9ZUnDvILLWKak8X8c/nWRKPBdPEVeuYGwrrYIR2QkexrEwT2zE9ITEJd2T7Yi 5kSTavUuQCVtIzvfmYY/ixSnpCKYucwqQJfoWHEcsKGK0b+bx8d1BuewAIE0sGjruxNGW/gw3 qE4crYSZOouQ7lN2fQl8NOXpRvwLdtVuvTydo29XZk2mQLx90+VVPOzdZqZXJ9nARkHrJPvuP 9xOCCe6bnjm45eHGVQN7SuirVQZzLJHJ1LaVO+sC3TzUjl6Vz+JBVzgQW8moJoKs6LtvWc6eN jctkb3tUDF2RdgSySQYL7mCjznvcHZnPy/Sv1GdeOkqfsLgOG6uiBwtgPZ6qxvmDgO8p/n5kH p1VfHYzaj9GzWvV0evEh/4MnnJNYPQXjU4PMc/KJnpsuvArtyRCzhUy/DtH48BIs9BE7vCOMR cnE4IkqPHZtQ7GGyCJZlZE8YosW6g8xakMy7xTDnKPjPYiRKBmlCTyhCQHExAgIrfHAKmGmE1 yv30uuX4T7O/ZU0WmmnIoAqqfvW9vi/mFdfl/I8jYVSOiNsvzr06UyXTOGkR31blsed4+qc3k bDSJ+VbmwN0jf0dp0CWLdvggKKaDhEPWm4zmVtYscCKeMVldTE/Plu75dTLzn3dbtsNb8fojJ 65KbpaAfnol6xRmFmbBzUU8E+OW3Gwx/JkrIzg== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org When CONFIG_CACHE_L2X0 is disabled, the am43xx specific suspend implemnentation fails to link: arch/arm/mach-omap2/sleep43xx.o: In function `get_l2cache_base': (.text+0x180): undefined reference to `omap4_get_l2cache_base' This adds an #ifdef protection around the code, like we do for am44xx. Fixes: 41d37e61372f ("ARM: OMAP2+: Introduce low-level suspend code for AM43XX") Signed-off-by: Arnd Bergmann --- arch/arm/mach-omap2/sleep43xx.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S index 59770a69396b..b24be624e8b9 100644 --- a/arch/arm/mach-omap2/sleep43xx.S +++ b/arch/arm/mach-omap2/sleep43xx.S @@ -52,10 +52,12 @@ ENTRY(am43xx_do_wfi) stmfd sp!, {r4 - r11, lr} @ save registers on stack +#ifdef CONFIG_CACHE_L2X0 /* Retrieve l2 cache virt address BEFORE we shut off EMIF */ ldr r1, get_l2cache_base blx r1 mov r8, r0 +#endif /* * Flush all data from the L1 and L2 data cache before disabling @@ -334,8 +336,6 @@ ENDPROC(am43xx_resume_from_deep_sleep) .align resume_addr: .word cpu_resume - PAGE_OFFSET + 0x80000000 -get_l2cache_base: - .word omap4_get_l2cache_base kernel_flush: .word v7_flush_dcache_all ddr_start: @@ -354,7 +354,10 @@ am43xx_phys_emif_clkctrl: .word (AM43XX_CM_BASE + AM43XX_CM_PER_INST + \ AM43XX_CM_PER_EMIF_CLKCTRL_OFFSET) +#ifdef CONFIG_CACHE_L2X0 /* L2 cache related defines for AM437x */ +get_l2cache_base: + .word omap4_get_l2cache_base l2_cache_base: .word OMAP44XX_L2CACHE_BASE l2_smc1: @@ -365,6 +368,7 @@ l2_smc3: .word OMAP4_MON_L2X0_CTRL_INDEX l2_val: .word 0xffff +#endif .align 3 /* DDR related defines */