Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2AF3BC00140 for ; Wed, 10 Aug 2022 09:05:16 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0546383C5E; Wed, 10 Aug 2022 11:05:13 +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="dx/jwHkX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5B9A583F36; Wed, 10 Aug 2022 11:05:11 +0200 (CEST) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (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 EC11C81FC7 for ; Wed, 10 Aug 2022 11:05: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=saproj@gmail.com Received: by mail-ed1-x533.google.com with SMTP id z2so18255987edc.1 for ; Wed, 10 Aug 2022 02:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=KCOLDnQCgMAGnQk22qw6MkUuk3OpXxqrTZxfLMWWDWo=; b=dx/jwHkX+aO3/4KPnKLikdMgrL8rIkzDAhzcjJYiq0vmfVtScJYWXMoZEW0+ZmjzNF Umg/FfUoYd1l/MO5a45KLMpTcm0CxOqsMVvtnV2Eza8I6071cFyismnVNJ4ku4wQAA2E o+vGGMJS8BELF6SWFVth7ngCjWYN7vMfGVmM7SW/hETPa059bRPucOrJMC5s8ptFGXbD erLSub4NbAX4FwL0TjEFe6Wif6JOfXqAR8bDKLGFfNTRDGr+WjWI/AlK0mt+tWit/fml GtteIDcsFW4ydzjm9N/6TIHqpAN/QGens+zFUMePF5enu0uC7o6cuAFQdAtdEP+2Pl4+ 478w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=KCOLDnQCgMAGnQk22qw6MkUuk3OpXxqrTZxfLMWWDWo=; b=Qqjej0mhKehPiZd6CCEzJS5ggAq/ViwEKQ4DH3msZvfmxFDbTZuXAdyCRYQUDmnhiA o7/o//q6pQ1PZMU9xFPwNMOpofi5nH2zSEnYzm4++e1yNqeq0vekb/+ZrjR86dtJ2vaU LsjGVKrtTEEuW+ZrenvvfpVxV7MCeYGdnroH/lGqpvTZ2F3eeVmUaaO2+KWZ1mrWUVoi C3I+XX7pIdRFNNrkYJrtA9cdCv1VF9UPAzRZe9PEvW2TV4TzzlqlVoyXJ+5X+WUKH3Ui KcTFoKcgLkQN4I5YdUMxwwiQjaBTEbliKYo3bA4GDssVlMgugdExc2nQQ1txkVGcgAX0 8lHA== X-Gm-Message-State: ACgBeo1KLXtKdTsVpN1YmJE9gnKWM+p1Ek3xI0GiAB8vJ3QJ8uMcH0/d mfLzzRIOeYg+58e9/S55N6ffJcMEJC1uAQCS X-Google-Smtp-Source: AA6agR77oepKEZv3Q0puSZJXpXtxz7+5CbB3EcyINf4kpuAUYWqNgEY5TzM1TU51a/F4fUq7anB5cg== X-Received: by 2002:a05:6402:2804:b0:439:83c2:8be2 with SMTP id h4-20020a056402280400b0043983c28be2mr25713231ede.292.1660122307481; Wed, 10 Aug 2022 02:05:07 -0700 (PDT) Received: from saproj-Latitude-5501.yandex.net ([2a02:6b8:0:40c:f682:a160:7363:c1c9]) by smtp.gmail.com with ESMTPSA id kz22-20020a17090777d600b0072b2ffc662esm2071146ejc.156.2022.08.10.02.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 02:05:07 -0700 (PDT) From: Sergei Antonov To: u-boot@lists.denx.de Cc: Sergei Antonov , Samuel Holland , Ye Li , Simon Glass , Andre Przywara , Marek Vasut , Sean Anderson , Tom Rini , Wolfgang Denk Subject: [PATCH] arm: ARMv4 assembly compatibility Date: Wed, 10 Aug 2022 12:04:46 +0300 Message-Id: <20220810090446.1469742-1-saproj@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean There is currently a problem that U-Boot can not work on ARMv4 because assembly imlementations of memcpy() and some other functions use "bx lr" instruction that is not available on ARMv4 ("mov pc, lr" should be used instead). A working preprocessor-based solution to this problem is found in arch/arm/lib/relocate.S. Move it to the "ret" macro in arch/arm/include/asm/assembler.h and change all "bx lr" code to "ret lr" in functions that may run on ARMv4. Linux source code deals with this problem in the same manner. Signed-off-by: Sergei Antonov CC: Samuel Holland CC: Ye Li CC: Simon Glass CC: Andre Przywara CC: Marek Vasut CC: Sean Anderson CC: Tom Rini CC: Wolfgang Denk --- arch/arm/include/asm/assembler.h | 6 ++++++ arch/arm/lib/lib1funcs.S | 8 ++++---- arch/arm/lib/memcpy.S | 6 +++--- arch/arm/lib/relocate.S | 10 ++-------- arch/arm/lib/setjmp.S | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index b146918586..911f7a1b49 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -63,11 +63,17 @@ */ .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo .macro ret\c, reg + + /* ARMv4- don't know bx lr but the assembler fails to see that */ +#ifdef __ARM_ARCH_4__ + mov\c pc, \reg +#else .ifeqs "\reg", "lr" bx\c \reg .else mov\c pc, \reg .endif +#endif .endm .endr diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index 700eee5fbb..7ff4446dd6 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S @@ -377,7 +377,7 @@ ENTRY(__gnu_thumb1_case_sqi) lsls r1, r1, #1 add lr, lr, r1 pop {r1} - bx lr + ret lr ENDPROC(__gnu_thumb1_case_sqi) .popsection @@ -391,7 +391,7 @@ ENTRY(__gnu_thumb1_case_uqi) lsls r1, r1, #1 add lr, lr, r1 pop {r1} - bx lr + ret lr ENDPROC(__gnu_thumb1_case_uqi) .popsection @@ -406,7 +406,7 @@ ENTRY(__gnu_thumb1_case_shi) lsls r1, r1, #1 add lr, lr, r1 pop {r0, r1} - bx lr + ret lr ENDPROC(__gnu_thumb1_case_shi) .popsection @@ -421,7 +421,7 @@ ENTRY(__gnu_thumb1_case_uhi) lsls r1, r1, #1 add lr, lr, r1 pop {r0, r1} - bx lr + ret lr ENDPROC(__gnu_thumb1_case_uhi) .popsection #endif diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index eee7a219ce..a1c996f94e 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -59,7 +59,7 @@ #endif ENTRY(memcpy) cmp r0, r1 - bxeq lr + reteq lr enter r4, lr @@ -148,7 +148,7 @@ ENTRY(memcpy) str1b r0, ip, cs, abort=21f exit r4, lr - bx lr + ret lr 9: rsb ip, ip, #4 cmp ip, #2 @@ -258,7 +258,7 @@ ENTRY(memcpy) .macro copy_abort_end ldmfd sp!, {r4, lr} - bx lr + ret lr .endm ENDPROC(memcpy) diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S index 5102bfabde..dd6f2e3bd5 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -61,7 +61,7 @@ ENTRY(relocate_vectors) stmia r1!, {r2-r8,r10} #endif #endif - bx lr + ret lr ENDPROC(relocate_vectors) @@ -127,13 +127,7 @@ relocate_done: mcr p15, 0, r0, c7, c10, 4 /* drain write buffer */ #endif - /* ARMv4- don't know bx lr but the assembler fails to see that */ - -#ifdef __ARM_ARCH_4__ - mov pc, lr -#else - bx lr -#endif + ret lr ENDPROC(relocate_code) diff --git a/arch/arm/lib/setjmp.S b/arch/arm/lib/setjmp.S index 176a1d5315..2f041aeef0 100644 --- a/arch/arm/lib/setjmp.S +++ b/arch/arm/lib/setjmp.S @@ -17,7 +17,7 @@ ENTRY(setjmp) mov ip, sp stm a1, {v1-v8, ip, lr} mov a1, #0 - bx lr + ret lr ENDPROC(setjmp) .popsection @@ -31,6 +31,6 @@ ENTRY(longjmp) bne 1f mov a1, #1 1: - bx lr + ret lr ENDPROC(longjmp) .popsection -- 2.32.0