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 3B728C433EF for ; Wed, 10 Nov 2021 14:52:00 +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 4646C60EDF for ; Wed, 10 Nov 2021 14:51:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4646C60EDF Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.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 BCECA839BC; Wed, 10 Nov 2021 15:51:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.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=google.com header.i=@google.com header.b="h5JWd/Va"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 36D43839C0; Wed, 10 Nov 2021 15:51:55 +0100 (CET) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (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 1033C839B5 for ; Wed, 10 Nov 2021 15:51:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ptosi@google.com Received: by mail-wr1-x434.google.com with SMTP id w29so4448950wra.12 for ; Wed, 10 Nov 2021 06:51:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=7VorgOdy70oNhp4ND949nrtrw5LYnsub5GE4ZmSzfuk=; b=h5JWd/VazFv7jUDxGII5Y3qJrTeeOrytwSGjoGX9Osuhk8YGvE1Dr+g4EvG5wCJq/1 BmyY+IyA072RWwxgrko78cdk5LZFbWffkAEYfLNDA2X9JzYz5qhhaCrwzl9tcBUWYMX+ 1J6C4gQX3cNUpbHKFiqC4ZnjQ5NdtVnMF0155E3l5OCh72HN19x4pdqhjEvu359ZXcQ7 ucz+Tgbp9nIBn6XImVARGfOqQfn5oM25CgK8tcgyTWFF7KgD9LK2uDWlhV1tLu8dfzba xBGpJK2UFO/l/3JvM/o6YRX2yWCU52Jg17x0Npjv7ZHjcgOD/GHwxQXV9xUMwGk4Enwp Wlfw== 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:content-transfer-encoding :in-reply-to; bh=7VorgOdy70oNhp4ND949nrtrw5LYnsub5GE4ZmSzfuk=; b=IlhO7zAZZ+4yQjhzrbyuNjRY7aVDl8E1HpK13PuwzU3fP3AVASl3qWixzghceumbC5 GE2NYfBvDXnfIbC7cakmRBWJ3PMZLbmuO8tFrZERdYLv047W+tJARNcR0fLGy3WYGn3W AIjEOfvPY0usURWjOHDMQ4XyR5HkZQOZWbZg18dLwroXPzJdFZCwHHcrdKCueSNX5DR4 LCWUG5sqM+VQL/qV648Boxv/6CETtKU2a9qtZrqmrsa8ARZzpS7aNd9jqT+l0FSmSLlg d7JuT/B4m9HIEb9kFrCK9WpJgC90wSuhWRAiSmEMKtywjHiVJ4UnvWhOZRSxfPxHZVzl jrmA== X-Gm-Message-State: AOAM532B4MLvHwOnpWglSG7etdjhAD33ODMrfTIAkITpIpFFmlgplO45 TaLZOoNi3HJsZt5bqfir3ZuZbw== X-Google-Smtp-Source: ABdhPJxhgB3gh3FlxnFGQYw/dwJBHe/4CHMPlXky+BmebipDYCIivFo/t70iZN2Q1Hnni/NXXp2RMw== X-Received: by 2002:adf:fc88:: with SMTP id g8mr382683wrr.334.1636555911527; Wed, 10 Nov 2021 06:51:51 -0800 (PST) Received: from google.com (203.75.199.104.bc.googleusercontent.com. [104.199.75.203]) by smtp.gmail.com with ESMTPSA id f19sm7981933wmq.34.2021.11.10.06.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:51:51 -0800 (PST) Date: Wed, 10 Nov 2021 15:51:38 +0100 From: =?utf-8?Q?Pierre-Cl=C3=A9ment?= Tosi To: Tom Rini Cc: u-boot@lists.denx.de, Matthias Weisser Subject: Re: [PATCH] arm: Fix bad memcpy.S str8w macro argument count Message-ID: <20211110145138.5mdo54smpj4xoaru@google.com> References: <20211110140440.2116503-1-ptosi@google.com> <20211110141414.GE24579@bill-the-cat> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211110141414.GE24579@bill-the-cat> 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 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ément Tosi wrote: > > > Remove the extra (empty) argument passed to str8w, causing the following > > error: > > > > :40:47: error: too many positional arguments > > str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f > > ^ > > u-boot/arch/arm/lib/memcpy.S:240:5: note: while in macro instantiation > > 17: forward_copy_shift pull=16 push=16 > > ^ > > > > Note: no functional change intended. > > > > Fixes: d8834a1323af ("arm: Use optimized memcpy and memset from linux") > > Signed-off-by: Pierre-Clément Tosi > > --- > > arch/arm/lib/memcpy.S | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > 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=19f > > + str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=19f > > bge 12b > > PLD( cmn r2, #96 ) > > PLD( bge 13b ) > > 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. > > -- > Tom 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 was 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"). Therefore, re-syncing would certainly solve the issue. -- Pierre