From patchwork Wed Aug 5 18:19:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Tolvanen X-Patchwork-Id: 11702127 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86E8F913 for ; Wed, 5 Aug 2020 18:19:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 617F22084D for ; Wed, 5 Aug 2020 18:19:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="J5tIxde/"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="b7usL0VO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 617F22084D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:Mime-Version:Message-Id:Date: 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=vPPkj91nWI63EwXilpTfPIwBhE47MBFIVSzsmo3fPt4=; b=J5tIxde/Dv5CrXTE5VqJMM9X8T 7fe9JadIax8s1GFanYbtRb1TIQdyYbXidD+NWAmNYuwtMRX9g1SD5DP+lPZZpXvGHagpJ158FsaI2 uqUMNIwaQ570wi98PVQcEr0P7XkC8DAOFHFFL58lN8Fna3CaBcm650ej6rf8Sd9ZZilHBr2ktDbLq 2GAX1xJRyi8mA9UFqNYpeVLABdPQPa9Dlw3yNVZGnwsNgxr5FdZk/et12RwQe1dj3ogOFc70+avHX SpbZ5X0m7t4o4ee7BcM4bFPlHZ9wnxAtH6i8ojQyj7orSBhO5k3+o3+CqoKxNMv22uvNL0ZQkohmw zgrXt7sw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3O0g-0000Y6-Dl; Wed, 05 Aug 2020 18:19:30 +0000 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3O0d-0000Xi-R2 for linux-arm-kernel@lists.infradead.org; Wed, 05 Aug 2020 18:19:28 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id v18so26515799qvi.8 for ; Wed, 05 Aug 2020 11:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=uiS4vK1ED9a+VphuuXYAfxefFTXitmOIurQShIFya8E=; b=b7usL0VOL7PPQfXINDo8SSR5TInSgE9RLT/VD3I8RopG0mUBvlQtznYdBEPztuPJ9U 3keS4RjqtSWdqfSbLa4Y7pTcdCA9i9nOJce9Pw45+koPewzc9wEF5vEg5Lz3PCdpsAnl Q+ICX0WmjChTnMC3e3Pajz5ertwDBxhYdq7nEWOKN+rKuQIux6gg9yP6FcSF4EWLjufW mwe5GRvQI8xDDRGsF+1rzmIm/wizRihcSJ+Zb2fzs0wljgsgmaBfu+2tuauQE5+bTLOP 88GoLKesxhmArXOPcwI5XqE1Q0EpSpJnT3WoAHX5/Ll5KOKYAXAuXjjePQ0wDKvb8Cea ommw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=uiS4vK1ED9a+VphuuXYAfxefFTXitmOIurQShIFya8E=; b=knENCBZJLjnme5dYLavNE4SzZlcEXECYLKWjtuLNOYhUoa3eJUGezeoyhxhfjxMidJ jRWl3I9pFc0cccm+5HwKs0gNukkmHpXTHZKukh4I/IQDoDtuzFwKciqP8s3kVSyNP+D/ v9L8MNe7URc1aeQZztR3Fby6FMmU7xpKhuL2Xa3RUKiu3P+tmxuLXwbAffOIUr7N7feX n1iE1E3iPUxmxx/k3jc8mk9bWcR6Klx/Plp24XSawkdPRC3w33lthjh/xeVmRICICh6h cwlVUgbjgB9SVNrspoC6nzs/LoWqknLXWHhn/XCTBNPjJ+zrRsOP2JemNacMIPazzN3m /PEQ== X-Gm-Message-State: AOAM531vWN1GqSOls/N4C1zkouC6WyUeXDs2wcP5hf2Yv40jJw9efEHm mLaeFiIp7lmJyqQGUQd11xaoDfrEtGrqvQUUHqs= X-Google-Smtp-Source: ABdhPJyQlgl//n+4oh/u/DXcrOj6zGvBkKmeLit3yZipK/1vtNk4x1r35x11Qpx6dqyegtQzgfRH5nJ0UHRADBro3FQ= X-Received: by 2002:a05:6214:8a:: with SMTP id n10mr5030949qvr.13.1596651564177; Wed, 05 Aug 2020 11:19:24 -0700 (PDT) Date: Wed, 5 Aug 2020 11:19:20 -0700 Message-Id: <20200805181920.4013059-1-samitolvanen@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6-goog Subject: [PATCH] arm64: tlb: fix ARM64_TLB_RANGE with LLVM's integrated assembler From: Sami Tolvanen To: Catalin Marinas , Will Deacon , Zhenyu Ye X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200805_141927_915407_4D143B10 X-CRM114-Status: GOOD ( 13.93 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:f4a listed in] [list.dnswl.org] -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kees Cook , Marc Zyngier , Nick Desaulniers , linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Sami Tolvanen , Nathan Chancellor , 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 Commit 7c78f67e9bd9 ("arm64: enable tlbi range instructions") breaks LLVM's integrated assembler, because -Wa,-march is only passed to external assemblers and therefore, the new instructions are not enabled when IAS is used. As binutils doesn't support .arch_extension tlb-rmi, this change adds .arch armv8.4-a to __TLBI_0 and __TLBI_1 to fix the issue with both LLVM IAS and binutils. Fixes: 7c78f67e9bd9 ("arm64: enable tlbi range instructions") Link: https://github.com/ClangBuiltLinux/linux/issues/1106 Signed-off-by: Sami Tolvanen --- arch/arm64/include/asm/tlbflush.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) base-commit: 4834ce9d8e074bb7ae197632e0708219b9f389b5 diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h index d493174415db..66c2aab5e9cb 100644 --- a/arch/arm64/include/asm/tlbflush.h +++ b/arch/arm64/include/asm/tlbflush.h @@ -16,6 +16,16 @@ #include #include +/* + * Enable ARMv8.4-TLBI instructions with ARM64_TLB_RANGE. Note that binutils + * doesn't support .arch_extension tlb-rmi, so use .arch armv8.4-a instead. + */ +#ifdef CONFIG_ARM64_TLB_RANGE +#define __TLBI_PREAMBLE ".arch armv8.4-a\n" +#else +#define __TLBI_PREAMBLE +#endif + /* * Raw TLBI operations. * @@ -28,14 +38,16 @@ * not. The macros handles invoking the asm with or without the * register argument as appropriate. */ -#define __TLBI_0(op, arg) asm ("tlbi " #op "\n" \ +#define __TLBI_0(op, arg) asm (__TLBI_PREAMBLE \ + "tlbi " #op "\n" \ ALTERNATIVE("nop\n nop", \ "dsb ish\n tlbi " #op, \ ARM64_WORKAROUND_REPEAT_TLBI, \ CONFIG_ARM64_WORKAROUND_REPEAT_TLBI) \ : : ) -#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0\n" \ +#define __TLBI_1(op, arg) asm (__TLBI_PREAMBLE \ + "tlbi " #op ", %0\n" \ ALTERNATIVE("nop\n nop", \ "dsb ish\n tlbi " #op ", %0", \ ARM64_WORKAROUND_REPEAT_TLBI, \