Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp589209ybt; Fri, 19 Jun 2020 08:49:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw54cINpuHncbUkhMDkBz4SYx9Mw2QEDm2erCGeD4uCbuFoSx95PNiIJ+S5b8qH1Wx8AqB+ X-Received: by 2002:a17:906:4d13:: with SMTP id r19mr4220211eju.45.1592581792611; Fri, 19 Jun 2020 08:49:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592581792; cv=none; d=google.com; s=arc-20160816; b=HYvYPm4z71vhBRDr2NvJKxHudN7cslV+OEQ6ZFVZjtylI7pIquXJVIAeIW6WaAMAg6 BNrceyo/Jelw+Rb+QTAk18UbIEVrkJBP2XjPDVkmeZJk0K8oiCaBsFF2gSxPx+0T/UUF t3vKM8Uyi4uYAlb5Vn9TkOyhzXAxqTpDse4vJH33HQni4Aed/oAKUtiqX7Yd1pm/XyG8 u6Fl6YtrXjJVuWqwdJSRwUQJTIDeYmZVNPZQ0MJHEh4L3cdZwEYyMDpSuEmjl1WA3zQz SCZdYdsWY/M6YaYGk0gcD37rCbzufhlOd06tA6Bmvu7LEwVrywNfTA9pyuQ8woFXdDe7 TZrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tmeZ/5GWPd0onxU9tkSXAoEMt6AMWRF0yRyyf0AsXFc=; b=bxEDPDZ3v0Mcv1zRf5bIuF/an7w4h2EKYXl3DNs/uApr1yWPYvnHHn7Lsd0PP0TiDS 0lK0xkB/4B1qTeNuSFNmvcwV+Ln2sA+6LO5kftGo4QETntVa0Vp9AAqtf/37yHY/OicW /WJ2kpUym0CqHGxF4huB2LpyyZ9+1EVL6zDwmLaoTr6G+M9xP3xJV5Zj9WnYrrCwqNyT KYYza6PnNhGAkJGR/3DNUbfEyGVr1/5XZzuiQXDQgBXyYPPdAsFquyEoCiigePbT3R0n g0k34xf8AnSNxvQtlHMGki0/nmtPCEjADYemt9MbofuJWH5mcaUiwzEkmlT6+8GlRySK 8jfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AK1cg4zj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y2si4118269edp.396.2020.06.19.08.49.30; Fri, 19 Jun 2020 08:49:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=default header.b=AK1cg4zj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392740AbgFSPrA (ORCPT + 99 others); Fri, 19 Jun 2020 11:47:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:57982 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393076AbgFSP0Q (ORCPT ); Fri, 19 Jun 2020 11:26:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 79CAD21556; Fri, 19 Jun 2020 15:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592580376; bh=P1M0F4EwizQ1m+WCRYB0aMIiqJbtW9nMEnIEncHeqtk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AK1cg4zj15lEzHUEYvcFrJCBLbpWxTIQ0ODsnFEGYpqJ2kxP9mks1B3B9eGWtJox0 B8DOTfxnq+xbaVEMig9p6dwnV7vnEqUXfQZ2oOL1IZdRKwFV8Ta5U6GYixov0raope 8asF7aHOSY52aNiHmsldXq3hVK9mWCqdBT52dhuM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YuanJunQing , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 5.7 226/376] MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe() Date: Fri, 19 Jun 2020 16:32:24 +0200 Message-Id: <20200619141721.016261672@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: YuanJunQing [ Upstream commit 31e1b3efa802f97a17628dde280006c4cee4ce5e ] Register "a1" is unsaved in this function, when CONFIG_TRACE_IRQFLAGS is enabled, the TRACE_IRQS_OFF macro will call trace_hardirqs_off(), and this may change register "a1". The changed register "a1" as argument will be send to do_fpe() and do_msa_fpe(). Signed-off-by: YuanJunQing Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/kernel/genex.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 0a43c9125267..5b7c67a3f78f 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -476,20 +476,20 @@ NESTED(nmi_handler, PT_SIZE, sp) .endm .macro __build_clear_fpe + CLI + TRACE_IRQS_OFF .set push /* gas fails to assemble cfc1 for some archs (octeon).*/ \ .set mips1 SET_HARDFLOAT cfc1 a1, fcr31 .set pop - CLI - TRACE_IRQS_OFF .endm .macro __build_clear_msa_fpe - _cfcmsa a1, MSA_CSR CLI TRACE_IRQS_OFF + _cfcmsa a1, MSA_CSR .endm .macro __build_clear_ade -- 2.25.1