From patchwork Mon Mar 1 16:09:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388671 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3544712jap; Mon, 1 Mar 2021 09:31:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJzM9ug1h04HsbYrbPbvA4rGtj/migexipgGU29zs8EjW+BNoQ8G49b8GY7LvhGWGepSrfUO X-Received: by 2002:a17:906:29c3:: with SMTP id y3mr16341174eje.430.1614619907961; Mon, 01 Mar 2021 09:31:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614619907; cv=none; d=google.com; s=arc-20160816; b=zliK016tox6rC3K0YTIMlTKqmnRtJjSsRMlxffKuonUOCeA3Dll/oX4KFvdr0iQkNf pK5PW//IaknFuP07+a0WjWKnCA8OgMc+3kAViTtgYxiTRLuFo5cmZ/jRMZ4H+qLdi2wA Ug0/VgNfOHypDHLlTat4RVbkS+3p0GkdeiUMfEl5k+/3c4sXBLPgQ4QUkGVoACliWrU6 E36mCQY4sL2CFYxgaL6EavB03H5aFq7w6X1r3EDQiAN69LVQhTkWz7c5jM4HoH4hcvUu UGWrkHU2sUG9V9nCFq5PY0P6oVcIckw/OKtLeZyzqeOnM85Nj+Xvvx9KV/oP4G/N0QmS xK7Q== 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=AGZKEQNY/kZByrln9scNaFCrgyl45gXA6myb1d/4mK8=; b=flOhsNBAk+nUQNOp4lEM11aGKYbDbkbU2jPPe3ettB4RoaRtA8mthuZ99paC0YSnlo ZFyzeQyJyqkk9cUdXDqKmR3twSerlDT8mpxNsV7wVXeST/HzzdLI084jyDJwyMqEok+g d7n+tc1tjV4HPTcR3Pv/pfsDkTG+PTCXhvSrIi44ciaQRb3Hi6Cebwo9Tyrrx/HRCzi/ ozNzLErCG6xj4pc9CO93eGMIePDE5mQnh5xPW9wzeyoqux0UvPyTIrwXYf5ectL/UTx1 1/9JvfF6ks65bdWn3nDvmDrcLeLdocQiB9vq8F+mUUKpSN93gpv4EzV/fe0swuWx6qYg TDJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jMGmgJNV; 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 yd6si8191663ejb.302.2021.03.01.09.31.47; Mon, 01 Mar 2021 09:31:47 -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=jMGmgJNV; 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 S238134AbhCARau (ORCPT + 13 others); Mon, 1 Mar 2021 12:30:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:49370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237732AbhCARYo (ORCPT ); Mon, 1 Mar 2021 12:24:44 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E430F64EF9; Mon, 1 Mar 2021 16:49:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614617372; bh=BBfNZ1P5RmlbMkPtdIjFOHCppAZ6cxJ8xdl/8E0GTk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jMGmgJNVYe9JBv1xnijqhfIHMCYJG3yuNdKHwsgCzb6ZdEIBDeMhh9V+aaUb4KWu4 h1/rFjwCYPGc5VzgdNiFiTyalTGDvAlxdqm/w5wVTfpzO1oBuj4o+2/k/WqbSvjHqd 5i1KMXbeyFOL4JzfOr4Lu2mXsHDlPR4ATnT+4/nk= 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 5.4 050/340] ARM: s3c: fix fiq for clang IAS Date: Mon, 1 Mar 2021 17:09:54 +0100 Message-Id: <20210301161050.786771518@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161048.294656001@linuxfoundation.org> References: <20210301161048.294656001@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 e95d6282109e7..68ea12bead227 100644 --- a/drivers/spi/spi-s3c24xx-fiq.S +++ b/drivers/spi/spi-s3c24xx-fiq.S @@ -33,7 +33,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: @@ -47,7 +46,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 @@ -59,7 +58,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: @@ -74,7 +72,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 ] @@ -86,7 +84,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: @@ -99,7 +96,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 ]