From patchwork Mon Jul 19 14:51:29 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: 479962 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4247507jao; Mon, 19 Jul 2021 08:45:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNDQZCtuPSmNkbIz+2RJEnO+6qpf5SX44olabGM6abu/kWNaLxZRz3Vjt9obaIeSA6kul3 X-Received: by 2002:a05:6602:25da:: with SMTP id d26mr19115009iop.106.1626709392293; Mon, 19 Jul 2021 08:43:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709392; cv=none; d=google.com; s=arc-20160816; b=vveWsezB2cJCY0ozNNUTkZWaS3g82JcUDWqxCLVc0Wq46frmD0XGhpO+Ta2/7lDhQI GX8+sQ7p+FH1mVKro+Ic7oIoF98aSMkYZOD2rr59/sAKHO1kQUXndSrH3Rv+8TSxXaf5 D2Tr0axzfD7hRG9IeDkO+wtA6aebk93FHmnVa1rOQDBr5bUO+xA2vO5qpSJkVtNWDvu7 mF3+aR0Pcoykw7wbu+ITbXqZrQ9CNPBg6awOKHnjRwzcREvvN1G4heCKw+zJGQjLZ2/b xWUVoWRjsJMTwhtvXkLEcCgety6Sgo6D+PdsyWLTQRooHFQsKU3gro16DKnBzc+D2IjH mapw== 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=NrEOVRqghY6V6nBEEn9z3IDCvkoMAgscabk4J240/iQ=; b=xdrA/kys3A30dlJyEf3JcZaMeoJzDsouFjMjrRmY0TUINVEqdOER/GM8194x+gPllW E3W9iRh3LjLbUh5Gn+zY8Icelydd37MD/2ShcOkUJc9zWhxHBtxHHQMm3WpUHIpyuN63 p/zq3k9W+PC1CllRIyklionh4wcw5evyLvU3Q7brHPmFtAi7z4XACc6wOjC7VLjMSeHl FJh4xTT8wXrPB+GSD2zZLGtX/DdXhfTSj/QGoKfUEGU2pKWCIDO0VDXzlKsBwUBaTI07 O3BS1SgqHNhVlFNZCDMdtAph5PrYHBjbetXtYNoy8xQzN5MY88k+cmW5G+mW6LugNjvr BMXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Y8ZuU/c/"; 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 ay16si21406520jab.96.2021.07.19.08.43.12; Mon, 19 Jul 2021 08:43:12 -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="Y8ZuU/c/"; 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 S1344655AbhGSPC3 (ORCPT + 12 others); Mon, 19 Jul 2021 11:02:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:52440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344268AbhGSO7c (ORCPT ); Mon, 19 Jul 2021 10:59:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0662A6120D; Mon, 19 Jul 2021 15:39:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709168; bh=afVzWD8Ab8HPe3thKR/BGsH97KYhSX3SH4IIkde1rt0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y8ZuU/c/tCBKgteWcDq/lbCUcHuFbx3Sm/4EAKtGolOfiDiXn4i81Rr4LmPqQPrEG eFIc9kk5oieGpaHSF2cs4spDXy3YPZ4empzQlYi3tuLfGavGY5gXskPNaMwKdzPcGN ijwlMLJhGI1xzSyXb0PNNo6cXZALXnvnWB6zfeCM= 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 4.19 278/421] MIPS: set mips32r5 for virt extensions Date: Mon, 19 Jul 2021 16:51:29 +0200 Message-Id: <20210719144955.982622762@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 f9a7c137be9f..c8333782a670 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h @@ -1986,7 +1986,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" \ @@ -1999,7 +1999,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" \ @@ -2012,7 +2012,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" \ @@ -2024,7 +2024,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" \