From patchwork Tue Mar 5 22:18:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 10840161 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ACFA6180E for ; Tue, 5 Mar 2019 22:17:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 981B02C4BF for ; Tue, 5 Mar 2019 22:17:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BECE2CBFF; Tue, 5 Mar 2019 22:17:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 158EC2C504 for ; Tue, 5 Mar 2019 22:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=w0bxWFXw1m4WBI0JEK+9DUZOclKfjqWUMXpZetS8g00=; b=Z32i8CzFzsva5O S0ZMYZZD+68Odpwx/EJ3PG8aAc3HjqOxy2w+HGRElwCxVEEcz333LliihkhM4BnIKo/6ZaydnYzV1 Ka++RbS72A5vkpB3gcev8im8PbtCGLeKdG7kLk/uRzyNRmbyNgwxLW+WlkjLAtT9mSKsgNmt4cV7V M25yRwpXbmr4QQdPuKngdLRf0Hucif5cSS8I1GOD5M7Gv8lO990amE083eClBP3O08zeVcZ7madLE nyyaweZ/c6Qr25U84A7NCGuqOsqBstrhQ5Q7afnonQnfL3HigJfGdMr89LeSgTY7B/ai0CtR/oPoX 9C536+DVa8+3sRlNanKw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1INj-0004bM-Np; Tue, 05 Mar 2019 22:17:51 +0000 Received: from mail.kmu-office.ch ([2a02:418:6a02::a2]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1INZ-0004RG-BY for linux-arm-kernel@lists.infradead.org; Tue, 05 Mar 2019 22:17:43 +0000 Received: from zyt.lan (unknown [IPv6:2a02:169:3465:0:5054:ff:fe4f:85bd]) by mail.kmu-office.ch (Postfix) with ESMTPSA id ACDC85C0089; Tue, 5 Mar 2019 23:17:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1551824256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=BhPOyo0jn/O7Sy5qMeouEojl4oA0Rax7qDdY/h4DGZs=; b=CERV/X502pnbiqwcd5ykIisV7jDSf4TcT94RuftRlotp3Be5P3oq3EJvk9ZCjaEX6gMIjb ZuALtGs1xDEMmJmT4itKKiw1HrBE5SICurjvNqsB/os9yRRWeHCKNJTrOfSPz4ZDSs2gmj e9/zIBEQAowx21hcPUPYdS3v9c2wcSE= From: Stefan Agner To: linux@armlinux.org.uk Subject: [PATCH 1/2] ARM: drop unnecessary WASM Date: Tue, 5 Mar 2019 23:18:26 +0100 Message-Id: <13835555f8ef44b21d1b7ddfe1c4203d0981f77e.1551824161.git.stefan@agner.ch> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190305_141741_541686_2FA1168A X-CRM114-Status: GOOD ( 11.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nicolas.pitre@linaro.org, mark.rutland@arm.com, arnd@arndb.de, ard.biesheuvel@linaro.org, will.deacon@arm.com, julien.thierry@arm.com, ndesaulniers@google.com, linux-kernel@vger.kernel.org, Stefan Agner , thierry.reding@gmail.com, natechancellor@gmail.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The W macro for generating wide instructions when targeting Thumb-2 is not required for the preload data instructions (pld, pldw) since they are only available as wide instructions. The GNU assembler seems to work with or without the .w appended when compiling an Thumb-2 kernel. However, Clang's integrated assembler does not consider the .w variants as valid instructions: ./arch/arm/include/asm/processor.h:133:5: error: invalid instruction "pldw.w\t%a0 \n" ^ :2:1: note: instantiated into assembly here pldw.w [r0] ^ 1 error generated. Drop the macro to make sure non-wide variants of pld and pldw are emitted in all cases. Signed-off-by: Stefan Agner --- arch/arm/include/asm/processor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/processor.h b/arch/arm/include/asm/processor.h index 120f4c9bbfde..042d77cf686d 100644 --- a/arch/arm/include/asm/processor.h +++ b/arch/arm/include/asm/processor.h @@ -131,8 +131,8 @@ static inline void prefetchw(const void *ptr) __asm__ __volatile__( ".arch_extension mp\n" __ALT_SMP_ASM( - WASM(pldw) "\t%a0", - WASM(pld) "\t%a0" + "pldw\t%a0", + "pld\t%a0" ) :: "p" (ptr)); }