From patchwork Thu Jul 15 18:38:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 477443 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp560429jao; Thu, 15 Jul 2021 11:52:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZKKKWqgF/nJKjAlEvchz5q01lr+8hEgWpyCx5Au3IsK5iM2DQ339ED3GPuxCuL22Pdo+D X-Received: by 2002:a02:774a:: with SMTP id g71mr5285185jac.137.1626375148292; Thu, 15 Jul 2021 11:52:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626375148; cv=none; d=google.com; s=arc-20160816; b=G5M+H2yhivBEwBOUN3Vufjn62fQcBEhKr191eUUy2CyIuq7SXqREKRfXc8V7Io7zHD JqqQATYty+KJuXHa/G3QiO23s39nXzMyXSulZqDIi2BC0/fVfvsKez/sH969Qi0ETr4P 2al5f30eM+BZW+gY31o5FHViG/Mr7B0E36eN4B+NzWod6vdoRXrGWNGdxWIm4dwK1XHD 5Tnypt6ZYz76kfzx3cahwG3ZyA9ZV8P5xxRmqultyLmIVFSaf4cXD4EjP9mRxrWqK0HG /8nHhQcSPB9hYPHByLf4xNna5C7L16TjD/E0DduQY2a4fyjP9ZwmwFehYKPkly6ztDZ8 KP8Q== 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=sBUZUd8T+ux6/VRJwrNccov4Jho+J72Nk+b1uMDMWUs=; b=yoBBbJZQTYSnIDFnP2tWGa116OLovsN8LHMWPsI7dvMX6f+dBZp3dZ5yTAshj2gDNm JEELuZAZbnjaASEez5P7LfX+V1oW/eK9o9qSh1bMMZALYqSEpn7VNSyJTo1ndKqcIs12 5Xwwv0MzJ8IKOJlWCKkmag3a3dUp2f6VeNQ5GfiyfFpcpJBlEnkeSK+Tu55hjXp9GmP5 h0i1zKALTo+jrxUw9MspGkn49sguiS/9YxaoTtXgmObEmwiYQWxAkdohfcIdNVnYJLwH yhJkgC2s/1ZwqLrgy47JFmvNpkBHpm+nUf0pz/CY2QsGqY2PpsBNccpSqMeIBb2f/YwA STsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=F3XUeXK+; 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 j12si7491614jar.85.2021.07.15.11.52.28; Thu, 15 Jul 2021 11:52:28 -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=F3XUeXK+; 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 S231529AbhGOSzK (ORCPT + 12 others); Thu, 15 Jul 2021 14:55:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:57908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240014AbhGOSxd (ORCPT ); Thu, 15 Jul 2021 14:53:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9EA6A613DF; Thu, 15 Jul 2021 18:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626375039; bh=9c2JIj6xueS2OZOZlldhpzxQfU+qd+QvnqSeXlRzGBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F3XUeXK+ANurOm24TeIorocMROLuNYJwglbOxymRv7Ivi35R4t9SeQL0W+VDuLXk0 uJwbh09UYlA+imDDosQ/o4Z/fHsoGVFmT7og3OTrqWVOJKXqP3opzTUQiywWMFAJfr +zQ9GfYeN6db+8mcY44J6XE6AJdLIQIRmncNpeX8= 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.10 132/215] MIPS: set mips32r5 for virt extensions Date: Thu, 15 Jul 2021 20:38:24 +0200 Message-Id: <20210715182622.922893994@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210715182558.381078833@linuxfoundation.org> References: <20210715182558.381078833@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 a0e8ae5497b6..7a7467d3f7f0 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h @@ -2073,7 +2073,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" \ @@ -2086,7 +2086,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" \ @@ -2099,7 +2099,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" \ @@ -2111,7 +2111,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" \