From patchwork Mon Mar 1 16:05:27 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: 388688 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3585405jap; Mon, 1 Mar 2021 10:25:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJyg6Ti9DuDFidhoCKXHwwpIdQb/MGFc0thX982jBT/vvMRXVJ5JVVLLlK8K44TmV/GeFYnv X-Received: by 2002:a17:906:3409:: with SMTP id c9mr17080984ejb.314.1614623100119; Mon, 01 Mar 2021 10:25:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614623100; cv=none; d=google.com; s=arc-20160816; b=WHfrtRD2yaMDYh53Q2BIntGOfOZWA06J/mw/5OvIJ5l/9v3oNIVdkbbKq2l7auSWGU cLJB95QRNbau5G2ffO/RUMeJDB/QfPitCNm6ziFDQ/OP6fc2+BJPU6QWXB4nmB/eEHdb DShM8fD8NAJv4J/pdQrATNzs1wYJSAPzkbT2mqrxuiGKmJUeq8K3sZp8HSC06qOjJAxC nf3liopsYnOzBPaP82j4hUlTk+tviEHnh3ElPNBW2tQVpw2vEIbU1WYvMw4mZTg6gfJp vNZSBb2ihnEMOC37xx/f4PS+f5KEMdDlcXyU5lfH8o9R4TgrDw2Q67N0CJ+bFANaB9L3 NnuA== 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=/rgVdU4k7ye0yABK6BbaKBQzO8QXxDhLxAF48PTKKyY=; b=Vkqgg48J6nCRp6VMKcTuzz3n2ism94lfJrIboXhEOmZd0153DMyqHOIx4fUMlOQqjX wev8a0caBB8HOd/6WqnJQm5zwY4vh5VHJIf/xx3rDDqopoxCaLrj2E4ragDnawPLvN90 IIQASwrIJP5Y/ubuHfQdrq8YI8o2NfqJl52uwT7jpjBziS+wPgpQJj2wtbxkSzJxT0Rf dSJXYwuym1Bt8Q63VfQ5K06H8pFiCHq+CZMw1F0R0prKaCRxLi501yO6jWBXaOtV6pry nN58aIz/+dn1W6mpNNjFZYS8jBWpah2zVCnyy3RjLD9xyhqlPVTF6h6J4OJ99ERQtFTN 3O7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ren5QXXS; 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 c24si11569609edt.244.2021.03.01.10.24.59; Mon, 01 Mar 2021 10:25:00 -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=Ren5QXXS; 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 S239571AbhCASXm (ORCPT + 13 others); Mon, 1 Mar 2021 13:23:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:39440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239701AbhCASS1 (ORCPT ); Mon, 1 Mar 2021 13:18:27 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id EC54465165; Mon, 1 Mar 2021 17:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614618414; bh=/7pT0kEh99FHUtwTb6He+rcjg5tNt++0dodBOJTVDCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ren5QXXSnqZkBk5elCGueaXTuTO5tiODzZ90JXcBjuokVGeQN9xXEwaNKaNEarYXF nk5kCattC2CF7gwsgEeZ/LP1PeAxa6yiS0UvZyINN81hrBC1T8B2pcJIHUZk3FS5Uo r9CCV+2+jxKEwbunF3nNgA1PglIqTYJY7gsQGKsw= 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.10 079/663] ARM: s3c: fix fiq for clang IAS Date: Mon, 1 Mar 2021 17:05:27 +0100 Message-Id: <20210301161145.641805807@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161141.760350206@linuxfoundation.org> References: <20210301161141.760350206@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 --- arch/arm/mach-s3c/irq-s3c24xx-fiq.S | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.27.0 diff --git a/arch/arm/mach-s3c/irq-s3c24xx-fiq.S b/arch/arm/mach-s3c/irq-s3c24xx-fiq.S index b54cbd0122413..5d238d9a798e1 100644 --- a/arch/arm/mach-s3c/irq-s3c24xx-fiq.S +++ b/arch/arm/mach-s3c/irq-s3c24xx-fiq.S @@ -35,7 +35,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: @@ -49,7 +48,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 @@ -61,7 +60,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: @@ -76,7 +74,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 ] @@ -88,7 +86,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: @@ -101,7 +98,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 ]