From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B7B2C433F5 for ; Wed, 10 Nov 2021 14:58:54 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0A49E61205 for ; Wed, 10 Nov 2021 14:58:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0A49E61205 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 92A91839D3; Wed, 10 Nov 2021 15:58:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="qsNDm5LJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DA282839C0; Wed, 10 Nov 2021 15:58:48 +0100 (CET) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 BF498839B4 for ; Wed, 10 Nov 2021 15:58:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x734.google.com with SMTP id j2so2700885qkl.7 for ; Wed, 10 Nov 2021 06:58:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ttH3DRjTt93kQxVRcrK5Yq1emL757DsPnXHj6Iq/j64=; b=qsNDm5LJYOj2Xf2IQd6iVXI7UbmxmWELSQMOwc7A8A2buDSNDbUgfSBouLCXy5YQAJ EMnyBEQ2mLPkt3eaWY7TNQl0NdwqNNUqlH/I6+ioZySIyThN7X0kwUBe9wI/jICEs20I ntjE8CQccugD/ELADkbr7Ez2ejCq/Yd7CcZ7w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ttH3DRjTt93kQxVRcrK5Yq1emL757DsPnXHj6Iq/j64=; b=AYratbsAjjbhc8DCKLRfn6SzAieQTz14vFmXwL7frWd8ecGAXYYYyxiRssbpbEkwsK 7EsEaKxnWaYt+T4MHkYryZOx9ZFZFbBD2Wskt9DzWzNnhoHpmQ+gsq0/aBnNx4Efob4K 7gwNLmCV4bsa20kTvBmG4A4A24bnzhGSBNDbLbTEMoMDALQ2Nvw+Hi3gIwmKlVayCz6A 0mwXUnfGLWPJxlDSNcFYgzoCXyAo0UZwPF5N+MrCPEiquPBAGe5QxhMgqCA1DXWIFcdd TjjBa6g5VTCcJRi+/qfZU3D/4L9KN9Rikm0+WIZPdAHenvZ6l9g1mmKhIkQEfJy7OOqU VCLg== X-Gm-Message-State: AOAM533ODAbVEu+htHgxk37gKJ2hlFexiGfafdyZ59fjA5bbZeWkSuyw c8oxs0m3U1DjmUB/XdVcW+YACw== X-Google-Smtp-Source: ABdhPJx98dTckt5kvOPU8JnSKn37KHUnfqkp2hqlv/0o/KRFILQV0Pvi25HTcbbGkpBbVTQ6mT6x5Q== X-Received: by 2002:a05:620a:4081:: with SMTP id f1mr270848qko.165.1636556324374; Wed, 10 Nov 2021 06:58:44 -0800 (PST) Received: from bill-the-cat (2603-6081-7b01-cbda-74ad-b320-81ce-4688.res6.spectrum.com. [2603:6081:7b01:cbda:74ad:b320:81ce:4688]) by smtp.gmail.com with ESMTPSA id c13sm60082qtx.51.2021.11.10.06.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:58:43 -0800 (PST) Date: Wed, 10 Nov 2021 09:58:42 -0500 From: Tom Rini To: =?iso-8859-1?Q?Pierre-Cl=E9ment?= Tosi Cc: u-boot@lists.denx.de, Matthias Weisser Subject: Re: [PATCH] arm: Fix bad memcpy.S str8w macro argument count Message-ID: <20211110145842.GF24579@bill-the-cat> References: <20211110140440.2116503-1-ptosi@google.com> <20211110141414.GE24579@bill-the-cat> <20211110145138.5mdo54smpj4xoaru@google.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="YAdt0d1fPWY/BP3s" Content-Disposition: inline In-Reply-To: <20211110145138.5mdo54smpj4xoaru@google.com> X-Clacks-Overhead: GNU Terry Pratchett X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean --YAdt0d1fPWY/BP3s Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 10, 2021 at 03:51:38PM +0100, Pierre-Cl=E9ment Tosi wrote: > On Wed, Nov 10, 2021 at 09:14:14AM -0500, Tom Rini wrote: > > On Wed, Nov 10, 2021 at 03:04:40PM +0100, Pierre-Cl=E9ment Tosi wrote: > >=20 > > > Remove the extra (empty) argument passed to str8w, causing the follow= ing > > > error: > > >=20 > > > :40:47: error: too many positional arguments > > > str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=3D19f > > > ^ > > > u-boot/arch/arm/lib/memcpy.S:240:5: note: while in macro instantia= tion > > > 17: forward_copy_shift pull=3D16 push=3D16 > > > ^ > > >=20 > > > Note: no functional change intended. > > >=20 > > > Fixes: d8834a1323af ("arm: Use optimized memcpy and memset from linux= ") > > > Signed-off-by: Pierre-Cl=E9ment Tosi > > > --- > > > arch/arm/lib/memcpy.S | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > >=20 > > > diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S > > > index f7fb77235c..eee7a219ce 100644 > > > --- a/arch/arm/lib/memcpy.S > > > +++ b/arch/arm/lib/memcpy.S > > > @@ -210,7 +210,7 @@ ENTRY(memcpy) > > > orr r9, r9, ip, lspush #\push > > > mov ip, ip, lspull #\pull > > > orr ip, ip, lr, lspush #\push > > > - str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=3D19f > > > + str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=3D19f > > > bge 12b > > > PLD( cmn r2, #96 ) > > > PLD( bge 13b ) > >=20 > > Since this code is both taken from Linux, and likely in need of a > > re-sync with Linux, has this issue been addressed upstream? Or no > > longer present? Thanks. > >=20 > > --=20 > > Tom >=20 > In a way, both; it is no longer present in memcpy.S because that file now= uses > the shared implementation from copy_template.S but that particular line w= as > fixed in the same way (and funnily enough with a similar commit message) = more > than 2 years ago in baf2df8e15be22b8bd24bdd6fd4575b6641bcfd1 ("ARM: 8827/= 1: fix > argument count to match macro definition"). >=20 > Therefore, re-syncing would certainly solve the issue. Any chance you have time / interest in a resync? Otherwise, I'll take your patch soon. Thanks! --=20 Tom --YAdt0d1fPWY/BP3s Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmGL3h4ACgkQFHw5/5Y0 tyy3ywv8DVujdVVyg9hWa5mxw51zxlH5B2UV1xyGj6eAAKaUahLeWTexU6DTAkwg UBSRuzwo+C7IL2sC2Z8EbkEOrCPs8XRr0JiUuVIM7L6xeFoPrbHUZOH9Cd73uNYa Gux4nY/f8J5L6GQWThzm0FP2u7gdOKJN2GyDDVdnMwIdH69iXwP1vEIAx0u6UHl6 tJvkybG+uDmYHrxbousbHiRbSNsSWXo4rXyWsdRj4ScY22IEG/ebOl6ECrBmwM4e an+RiUakTu1vM/r+6wJWpTxcImOe99D1F1Iao+iSAsX9zhJDFUOeHJrFRQpOp5kh P994yhrwEhPmAXVf2TcM5qgS10s0C1OL2J0MGBtaluPVwBqnfjt28zhT+BBBX2Wf 3/S2PugRGZ2u4etRdF6SJ4Wwts5zjxWC2KPvIJFk3XyVHGJsVKLvfzjS2aOisumu IxaSDdV2g53gBmAaDa/7qx/AQSpeUiFCbXadcx0xKs2xU2N3LmIaJxEaewpvzTVr ap6gvt97 =pmIZ -----END PGP SIGNATURE----- --YAdt0d1fPWY/BP3s--