Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2281687imm; Thu, 7 Jun 2018 08:08:50 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIb4uhGorAd0FIo8wE/ezOD1HqsTBi7f8N5qrdyKMxKQCEyayxE6SCMpPop0zLaVl5uTxWH X-Received: by 2002:a63:ab05:: with SMTP id p5-v6mr1917702pgf.280.1528384129893; Thu, 07 Jun 2018 08:08:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528384129; cv=none; d=google.com; s=arc-20160816; b=W1bkuINl7n2PrFylhYlRWuciJP9s7VU6Ki1mHGzxtP8o4vbbyrEQRL59I0BXx8lTNC unpoNuOHPft0MQHJLRBFrAI/vd2tAyfEWXs5KyVc4h5hDpT8IRYZ43G/LGJCI6OnTH/j SSKRgTQgkhIhrwxeY/z2kSnX5C/0Hxut4dUAZbkYIMYY1u1Gdsvueoc/POvj7bWgdiZe gDdUyLnTZS3q9Gj21mG9GadgOpGMG8wjhbPhS6+gvHm1PAK+KKI4vjF3B/5vJcWDezDH DunCyQvkLQhyHCFcD2bCbK8t+C2mt6D0Tj8z69ITg+lrhs+Y1i+HNQWImOi4TRmN2FnI jWRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=lUjwK3O/lbvU6ApGaZjsyz2OtwFO7DRslfdbhMeKQtw=; b=D7aDxbdYLpnHPmDyHZrrF3nWBDdKGcsj6RUHftFUTBRwLygyYu3Gc+YIt9RmNABIA/ FMGonyVyKNP+Rm/ft9jAKvthQb/X+XA4ELTC9wwxKZ4eBhSgYrj3fxCkKR5TXtg1BRoL 6zVz6lSgL9giHev4dDYRusomcDyQp9SPYmM/UGIToiDFohZnqBBNcHvZ735tL2YJDPxQ cQWNj0AvgCgrbE/iKe+xPjb5oxhVx17gfJz+7RWJAW2jbfs9p+XQ3fL3p5frrEmvMx1s D5xXTgPsizoygjyECY9knhKKTOCTY61VVO+Jnjnke9phNAXsjJp19cbT/3jpbIVdT3go ZyEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x65-v6si16883512pgb.598.2018.06.07.08.08.35; Thu, 07 Jun 2018 08:08:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935782AbeFGPGf (ORCPT + 99 others); Thu, 7 Jun 2018 11:06:35 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:41558 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935962AbeFGPEA (ORCPT ); Thu, 7 Jun 2018 11:04:00 -0400 Received: from [148.252.241.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1fQvbT-0005Zk-LJ; Thu, 07 Jun 2018 15:09:28 +0100 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1fQvbB-0003Bh-LT; Thu, 07 Jun 2018 15:09:09 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Justin Chen" , "Florian Fainelli" , linux-mips@linux-mips.org, "James Hogan" Date: Thu, 07 Jun 2018 15:05:21 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 325/410] MIPS: BMIPS: Do not mask IPIs during suspend In-Reply-To: X-SA-Exim-Connect-IP: 148.252.241.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.57-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Justin Chen commit 06a3f0c9f2725f5d7c63c4203839373c9bd00c28 upstream. Commit a3e6c1eff548 ("MIPS: IRQ: Fix disable_irq on CPU IRQs") fixes an issue where disable_irq did not actually disable the irq. The bug caused our IPIs to not be disabled, which actually is the correct behavior. With the addition of commit a3e6c1eff548 ("MIPS: IRQ: Fix disable_irq on CPU IRQs"), the IPIs were getting disabled going into suspend, thus schedule_ipi() was not being called. This caused deadlocks where schedulable task were not being scheduled and other cpus were waiting for them to do something. Add the IRQF_NO_SUSPEND flag so an irq_disable will not be called on the IPIs during suspend. Signed-off-by: Justin Chen Fixes: a3e6c1eff548 ("MIPS: IRQ: Fix disabled_irq on CPU IRQs") Cc: Florian Fainelli Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/17385/ [jhogan@kernel.org: checkpatch: wrap long lines and fix commit refs] Signed-off-by: James Hogan Signed-off-by: Ben Hutchings --- arch/mips/kernel/smp-bmips.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/arch/mips/kernel/smp-bmips.c +++ b/arch/mips/kernel/smp-bmips.c @@ -159,11 +159,11 @@ static void bmips_prepare_cpus(unsigned return; } - if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU, - "smp_ipi0", NULL)) + if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, + IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi0", NULL)) panic("Can't request IPI0 interrupt"); - if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU, - "smp_ipi1", NULL)) + if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, + IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi1", NULL)) panic("Can't request IPI1 interrupt"); }