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: 10322401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 659A0602C8 for ; Wed, 4 Apr 2018 10:26:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 609EC28E24 for ; Wed, 4 Apr 2018 10:26:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 548D928E26; Wed, 4 Apr 2018 10:26:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 583D028E24 for ; Wed, 4 Apr 2018 10:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=s3Y5jDtbjvTqfRt+2gY5GaaZhjpkLLhuXQCvVZLh9eU=; b=LMz ok2ZF4mVjKrpfkiAkvclQGPtNExORHCwHVptKpjO20J9OoCVCTfMc/m7hl0sqy+Q8BzFVHPtDftoV 7QsojgwPOwn9+CG8vAj8iYJ/XVyNgQv1jTqSj5u9NG8P4vFEhAOCmdw58H8KJ2nka/IluURi0gjIE AqpvXAhQmub57kEmfFbFv3r7wX9CI62vs+NX+6J4IPgtdfiIgY/Z72bi8l/xOtVZU3rScqC3/yVe9 mIYjKsyFROn3DHC8bJKndgPzmtReYfzHrwwNS5Zjj6aSG7E846sCDVzFOr7/38ZHZXQrtR+TLbfsu VTIlDLPkhhoyVmfFwLnk9yW19jvjckA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3fcJ-0007VN-RK; Wed, 04 Apr 2018 10:26:11 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3fcG-0007SX-3m for linux-arm-kernel@lists.infradead.org; Wed, 04 Apr 2018 10:26:09 +0000 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 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== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180404_032608_461623_1EED1CAA X-CRM114-Status: GOOD ( 11.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Dave Gerlach , Russell King , linux-kernel@vger.kernel.org, Santosh Shilimkar , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Tony Lindgren --- arch/arm/mach-omap2/sleep43xx.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 */