Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp109068ybg; Mon, 8 Jun 2020 17:51:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwN6nysCa26SxkgXOLIDNxk51PxsOIcbEqIhrC0Q4G752Mvvwl0x7WEgrugfVcDzo7ZthaX X-Received: by 2002:aa7:d6d0:: with SMTP id x16mr25184281edr.175.1591663874851; Mon, 08 Jun 2020 17:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591663874; cv=none; d=google.com; s=arc-20160816; b=AAKMUU5o3JICySeze6ZEo/ERYfbD+ef3HoN7KStNhSaT2Z234uQsaJ49GkkHFcq5tb M387Zi6rG8AU4wmF9tol507iej8jSyQOebleOeQrG9OlmfMKoB1XWkIe3uml7Ocazt3i 15coYyLIKp7wE+YCSpAq2yqMu9+iif9ZPZ94aPEzZR44fQfypsspmBwqf8DidTm2vvu4 h0qKFQZb3HFSYHJZaBmI1bi69WTGbwCGLEk3oTiB4BbK/2YmMHDTSFI0TavdgwIQQzAU LHheZBAfhwo0Wh5NFGMl6ev2Njs8lTvKi/9ZEBe5utC/QUK+EkgNgkq5tb7zqA4Uhuc9 d1mQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tmeZ/5GWPd0onxU9tkSXAoEMt6AMWRF0yRyyf0AsXFc=; b=YuMPXYyYOWPrSdAN41Jf9Uwk5edbecjjKHe61KVwZN3QGJtk+A+8b3CTN40IoKfL+l Dbm22D9CSe9MTs3n/wFXA533rpdytHgDJl2uKd3SJOO2X2vev9sJYJuFAha6oEUtYhrH PCUJKlxH3xDmMSH0W3wZ3NBovTafWIspV0Dt1gaXzxv/qY9Nk00mjGdN76ywh7sv+rOz 27JXdRbxDRmAbvBDKRTfsXfuSywj640pokLZ643qG8cv05ue53lW4xzjoYQAV/l5fuLO 4MBuvmxt8aoKmavLwpZP8sj5NbO97MLEL8Yz2bv4ziJjROa+ZqIe7mJkc/ApUQsriIPQ 2+bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LvZ7esLR; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e6si11075846edm.54.2020.06.08.17.50.52; Mon, 08 Jun 2020 17:51:14 -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=LvZ7esLR; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731928AbgFIArO (ORCPT + 99 others); Mon, 8 Jun 2020 20:47:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:58208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728096AbgFHXLY (ORCPT ); Mon, 8 Jun 2020 19:11:24 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 410C420C56; Mon, 8 Jun 2020 23:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657883; bh=P1M0F4EwizQ1m+WCRYB0aMIiqJbtW9nMEnIEncHeqtk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LvZ7esLRCXr4ILoyVJxsL+cdTVU/F5Wf1KtoyBGc3c16hhShSf3qNi9cBCqvHN6Pk OrtLUH/RHHswptxRbfYE5MzaCxMMbZfualLceUwgtq63Gnl50goe50mlgJXmbX8TSk /8TmwfT1yENvqNQnaT0l5O3bB4QbnS6pzj73xX9M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: YuanJunQing , Thomas Bogendoerfer , Sasha Levin , linux-mips@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 240/274] MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe() Date: Mon, 8 Jun 2020 19:05:33 -0400 Message-Id: <20200608230607.3361041-240-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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