From patchwork Mon Mar 1 16:11:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 388662 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3523634jap; Mon, 1 Mar 2021 09:07:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgg2J6xeKJkM03BI/wZLRS1M1txgt8pZtNGxW7M6DHKacIudvjc48SYuO2vLR+jOYywSvx X-Received: by 2002:a17:906:503:: with SMTP id j3mr16670789eja.172.1614618428989; Mon, 01 Mar 2021 09:07:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614618428; cv=none; d=google.com; s=arc-20160816; b=EeImQ8NXTZ7eEy3hw39o1zhoiJIELIoQ5EElQKITDVx8PaTGwl7yYUDV2GCVrZT51k A4/6SMtdH25aFYQH2fTCQ22ll8f2ifjrNWVUfmShjM2hRpUjUmoL7wQY8ESzQfmgynfu nKcKZ9JyA+JjWfd7Qi4kNHEGdx9HjctLIG1LPWaHMfvzJV4nybKTloDO47K94K4Y01Ba 2posfo3GPcjdU05a1tIKjOoa6J7K9+ibjZAnwfS8H2m6Ha2eQMoRaZ0/yuXxh/KecVN7 EkzWgZYUm0ZqDoQVD/zCesQ/l+jbXt4EmDGdk/4Mb076NUfwwTMQZw9rFzWnsnghfgEU Ba4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=edPldVcSB4EYjhma4z8PAxwuwb4JWY+S0+iUFrx6d7g=; b=s4vUx7wFTyqUEgl8rpmUGDYfxekLcMD9oj4qpCDYDjgk031qWXa9yT2JqDgGORxyVQ 0C40ekxPFJH2KCZAsqnadR315PnLDedoPOPZDmzc9L8McgtnNX0hVvHGxQhTuJsDDE9z OVr7aIIN68BdxMW7I5U4mVvCgHuSe8kbMHmhr755mfwGlYGrSoIzdN3TxpU99uQsxPqZ JthU83015kzGbFCbdl9EPd1zdu5KJdK6FmFIrp3BFG7ZZ3wZQOeTspWde9qdM8DGYBN7 ro9eADllgqjeeSAhDH7Bgfyxd9f4u5JReNOK3laoL26Pa0OqW2WLZqCICSfxnhs/1p5e GowA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oNFMh4bz; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k18si6783956ejp.292.2021.03.01.09.07.08; Mon, 01 Mar 2021 09:07:08 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oNFMh4bz; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232611AbhCARGZ (ORCPT + 13 others); Mon, 1 Mar 2021 12:06:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:59162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235205AbhCAQ7T (ORCPT ); Mon, 1 Mar 2021 11:59:19 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3487C64FEA; Mon, 1 Mar 2021 16:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614616671; bh=G+gJdW0zCwsUHqPseCQTPkJVeus4P3sRHtcHXk4VfyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oNFMh4bza8d/0J7snVVP5dW1QLqaSBJ68X9ShOwsSfq5tt2ivYOSSLjqE05SR+y12 30GpP+rRwREDOrRJY5N1RvoRYk1gmgk3C3Bza5nG7LmkUST+mgsszutK4ueTM0ij4O SY8pIqIYao472MILKv72ZifV4pZSn5SEQ28DM09w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Agner , Arnd Bergmann , Nick Desaulniers , Nathan Chancellor , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 4.19 054/247] ARM: s3c: fix fiq for clang IAS Date: Mon, 1 Mar 2021 17:11:14 +0100 Message-Id: <20210301161034.320324601@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161031.684018251@linuxfoundation.org> References: <20210301161031.684018251@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 7f9942c61fa60eda7cc8e42f04bd25b7d175876e ] Building with the clang integrated assembler produces a couple of errors for the s3c24xx fiq support: arch/arm/mach-s3c/irq-s3c24xx-fiq.S:52:2: error: instruction 'subne' can not set flags, but 's' suffix specified subnes pc, lr, #4 @@ return, still have work to do arch/arm/mach-s3c/irq-s3c24xx-fiq.S:64:1: error: invalid symbol redefinition s3c24xx_spi_fiq_txrx: There are apparently two problems: one with extraneous or duplicate labels, and one with old-style opcode mnemonics. Stefan Agner has previously fixed other problems like this, but missed this particular file. Fixes: bec0806cfec6 ("spi_s3c24xx: add FIQ pseudo-DMA support") Cc: Stefan Agner Signed-off-by: Arnd Bergmann Reviewed-by: Nick Desaulniers Reviewed-by: Nathan Chancellor Link: https://lore.kernel.org/r/20210204162416.3030114-1-arnd@kernel.org Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- drivers/spi/spi-s3c24xx-fiq.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.27.0 diff --git a/drivers/spi/spi-s3c24xx-fiq.S b/drivers/spi/spi-s3c24xx-fiq.S index 059f2dc1fda2d..1565c792da079 100644 --- a/drivers/spi/spi-s3c24xx-fiq.S +++ b/drivers/spi/spi-s3c24xx-fiq.S @@ -36,7 +36,6 @@ @ and an offset to the irq acknowledgment word ENTRY(s3c24xx_spi_fiq_rx) -s3c24xx_spi_fix_rx: .word fiq_rx_end - fiq_rx_start .word fiq_rx_irq_ack - fiq_rx_start fiq_rx_start: @@ -50,7 +49,7 @@ fiq_rx_start: strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ] subs fiq_rcount, fiq_rcount, #1 - subnes pc, lr, #4 @@ return, still have work to do + subsne pc, lr, #4 @@ return, still have work to do @@ set IRQ controller so that next op will trigger IRQ mov fiq_rtmp, #0 @@ -62,7 +61,6 @@ fiq_rx_irq_ack: fiq_rx_end: ENTRY(s3c24xx_spi_fiq_txrx) -s3c24xx_spi_fiq_txrx: .word fiq_txrx_end - fiq_txrx_start .word fiq_txrx_irq_ack - fiq_txrx_start fiq_txrx_start: @@ -77,7 +75,7 @@ fiq_txrx_start: strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ] subs fiq_rcount, fiq_rcount, #1 - subnes pc, lr, #4 @@ return, still have work to do + subsne pc, lr, #4 @@ return, still have work to do mov fiq_rtmp, #0 str fiq_rtmp, [ fiq_rirq, # S3C2410_INTMOD - S3C24XX_VA_IRQ ] @@ -89,7 +87,6 @@ fiq_txrx_irq_ack: fiq_txrx_end: ENTRY(s3c24xx_spi_fiq_tx) -s3c24xx_spi_fix_tx: .word fiq_tx_end - fiq_tx_start .word fiq_tx_irq_ack - fiq_tx_start fiq_tx_start: @@ -102,7 +99,7 @@ fiq_tx_start: strb fiq_rtmp, [ fiq_rspi, # S3C2410_SPTDAT ] subs fiq_rcount, fiq_rcount, #1 - subnes pc, lr, #4 @@ return, still have work to do + subsne pc, lr, #4 @@ return, still have work to do mov fiq_rtmp, #0 str fiq_rtmp, [ fiq_rirq, # S3C2410_INTMOD - S3C24XX_VA_IRQ ]