From patchwork Thu Jul 15 18:38:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 477448 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp569331jao; Thu, 15 Jul 2021 12:02:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyynsnYOiaq8DgT4jp6up/IuLp/ukwKm0BNLSVQWlOGypbrs8BSaxrmAyKHEm4e0n7vatfO X-Received: by 2002:a02:6946:: with SMTP id e67mr5374828jac.4.1626375758755; Thu, 15 Jul 2021 12:02:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626375758; cv=none; d=google.com; s=arc-20160816; b=ZGorlgL828Xoq8ADIbOv7tw0qC2Yj0hWu2uYpJYsXXIpX1cSAZWrA6AgPt5+xcz6eO +4oqW1NdHoYx8khDrrUBjGL4YnabKXlR3P6kSn6E3oW6XtZQvDDZfhonneG1Tune8kVM mrqH5Xzx+KminGady/Y5NO2eLME/XewtJQ5I8TgSdZIJ9UT1Fb9KEf1svMFAMPFq+1E9 HJFwasPRJq2EZyTJnTun5Tel0KbP9qls0+qsThtbk6APNRdiHErcHzU1hYK0oxN+pE/Y vClh0lcu/SifcU/pg0cukWLJo1yq9sxJQQUCTrnJCI4EnDZ8uYg+rfkIs3OQBAqBVWU1 Cq5w== 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=pJv5n/xs84eq4+wD5qtgAGv4UNmSoGT098yLryF+cH4=; b=S5tCAOowLMtZ4oENOn6iFUMTUtmi4NFJ0MwONL7EKLHJRAWUzzRRyTkNGnJDmaaJ3r 81oT2pS1SEuLNN6P8SpTtIaQ6VLyCebk+/4C99ygsxEQ1KLF05eWCvHVyIV7ygLtBTZn cDg7eQmQaCtmk+0rLuUZW9YkSnxNx4qriCGFcy1pDaRzO230VFmytMS3bCaAVAKa8qLd LhQzYksGh5F7nwrRzkkcwnDtJIDTjp4VD9XvM1LVHRK9k/FWsCxwd9Sbb0kTNO9iToZa COehvu5Fiu3r/bOZXVZ7oMBzlfUbMtAPnHspNUvI+AJnzbRUEAs3lgtSFKFkTwWpQxnd 8gNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=L51Josaa; 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 y16si7882559jat.56.2021.07.15.12.02.38; Thu, 15 Jul 2021 12:02:38 -0700 (PDT) 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=L51Josaa; 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 S242619AbhGOTF0 (ORCPT + 12 others); Thu, 15 Jul 2021 15:05:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:38832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243371AbhGOTEU (ORCPT ); Thu, 15 Jul 2021 15:04:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6BAFA61402; Thu, 15 Jul 2021 18:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626375595; bh=gHjxUE6q5q2kLdGweCLT5/Xb1aBBzr5wP0DdDKZxUEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L51JosaaAplxxQbZ0F44V47yGY2yyrBsPWnJxbeaRtJYZqglJv3AtnGqum5giaQTo EF23Yn0SvDt9vY3t7CtBtaxmKHph/BRrKLvqpzhNdgRzO835+kwiELXCBqNO5m8zU0 NObg4f2PAkylgK5fng97StxHV0zeLGUlDrDLvFcU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Golovin , Nick Desaulniers , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 5.12 152/242] MIPS: set mips32r5 for virt extensions Date: Thu, 15 Jul 2021 20:38:34 +0200 Message-Id: <20210715182620.017148023@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182551.731989182@linuxfoundation.org> References: <20210715182551.731989182@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nick Desaulniers [ Upstream commit c994a3ec7ecc8bd2a837b2061e8a76eb8efc082b ] Clang's integrated assembler only accepts these instructions when the cpu is set to mips32r5. With this change, we can assemble malta_defconfig with Clang via `make LLVM_IAS=1`. Link: https://github.com/ClangBuiltLinux/linux/issues/763 Reported-by: Dmitry Golovin Signed-off-by: Nick Desaulniers Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/include/asm/mipsregs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index 9c8099a6ffed..acdf8c69220b 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h @@ -2077,7 +2077,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c) ({ int __res; \ __asm__ __volatile__( \ ".set\tpush\n\t" \ - ".set\tmips32r2\n\t" \ + ".set\tmips32r5\n\t" \ _ASM_SET_VIRT \ "mfgc0\t%0, " #source ", %1\n\t" \ ".set\tpop" \ @@ -2090,7 +2090,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c) ({ unsigned long long __res; \ __asm__ __volatile__( \ ".set\tpush\n\t" \ - ".set\tmips64r2\n\t" \ + ".set\tmips64r5\n\t" \ _ASM_SET_VIRT \ "dmfgc0\t%0, " #source ", %1\n\t" \ ".set\tpop" \ @@ -2103,7 +2103,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c) do { \ __asm__ __volatile__( \ ".set\tpush\n\t" \ - ".set\tmips32r2\n\t" \ + ".set\tmips32r5\n\t" \ _ASM_SET_VIRT \ "mtgc0\t%z0, " #register ", %1\n\t" \ ".set\tpop" \ @@ -2115,7 +2115,7 @@ do { \ do { \ __asm__ __volatile__( \ ".set\tpush\n\t" \ - ".set\tmips64r2\n\t" \ + ".set\tmips64r5\n\t" \ _ASM_SET_VIRT \ "dmtgc0\t%z0, " #register ", %1\n\t" \ ".set\tpop" \