From patchwork Sat Jun 28 00:04:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Basehore X-Patchwork-Id: 4438821 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E53CFBEEAA for ; Sat, 28 Jun 2014 00:05:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09BC1203AB for ; Sat, 28 Jun 2014 00:05:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30C202028D for ; Sat, 28 Jun 2014 00:05:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754302AbaF1AEu (ORCPT ); Fri, 27 Jun 2014 20:04:50 -0400 Received: from mail-qc0-f202.google.com ([209.85.216.202]:46031 "EHLO mail-qc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754281AbaF1AEs (ORCPT ); Fri, 27 Jun 2014 20:04:48 -0400 Received: by mail-qc0-f202.google.com with SMTP id x13so531461qcv.1 for ; Fri, 27 Jun 2014 17:04:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4vhnwBtJIFivYYbji03wl8QZtCNkQM25v89+SbiYjik=; b=i8yhUU4ht39xHSaTIKwTBQ7Vi4GZZspQIF0RriUdTNoq1UXr11FokZFWorOcUHnr/a +uZpNcZLXkJaoFC8Jz/FebmRuC/4xw7GCJXDs2J/eK2b0TZWu1fnxRgLQmaLutLjx7rG 4aR0lCLHOCtmYzhuzYjvDsHV2dYKqBoUseZHOolHLMwK7/JWVJsJ/JoecUG7mv0blRMf 9G2jPYuDCwwlhFO3YKuaO2IfMSss1y/ZJLjWbdlzUOETGiTwpQZhVmLCvEXVxnePghD6 nH40nYx7jvfXptDMjftFdisunrrZvlC1IbF8r1Cxv1ZDTGXGHepUS/rwInGcxNBgLNhS RE8Q== X-Gm-Message-State: ALoCoQnO8H1paBhOHQM28bIRlcgOA5A9pL9TV8v5LvslBRoFCFe4ZJIJ7gHirtTPku5tSt9rjnCD X-Received: by 10.58.99.2 with SMTP id em2mr14244378veb.33.1403913887149; Fri, 27 Jun 2014 17:04:47 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id b39si305706yhj.0.2014.06.27.17.04.47 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jun 2014 17:04:47 -0700 (PDT) Received: from ketosis.mtv.corp.google.com (ketosis.mtv.corp.google.com [172.22.73.143]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id EFE4D31CA03; Fri, 27 Jun 2014 17:04:46 -0700 (PDT) Received: by ketosis.mtv.corp.google.com (Postfix, from userid 171518) id B186580550; Fri, 27 Jun 2014 17:04:46 -0700 (PDT) From: Derek Basehore To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, Laxman Dewangan , Ian Campbell , xen-devel@lists.xenproject.org, Derek Basehore Subject: [PATCH v1 2/2] Revert "irq: Enable all irqs unconditionally in irq_resume" Date: Fri, 27 Jun 2014 17:04:25 -0700 Message-Id: <1403913865-31614-2-git-send-email-dbasehore@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 In-Reply-To: <1403913865-31614-1-git-send-email-dbasehore@chromium.org> References: <1403913865-31614-1-git-send-email-dbasehore@chromium.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts the fix to IRQF_EARLY_RESUME irqs staying disabled after a suspend failure. It incorrectly stated that Xen is the only platform that uses this feature. Some rtc drivers such as rtc-as3722.c use the feature and can have its irq permanently enabled with the change. The driver does disable/enable the irq for the rtc alarm, so it needs a different fix which is in "genirq: Fix error path for resuming irqs" We should also keep correct enable/disable parity for irqs. This reverts commit ac01810c9d2814238f08a227062e66a35a0e1ea2. Signed-off-by: Derek Basehore --- kernel/irq/pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index b07dc9c..a5eaf1f 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -50,7 +50,7 @@ static void resume_irqs(bool want_early) bool is_early = desc->action && desc->action->flags & IRQF_EARLY_RESUME; - if (!is_early && want_early) + if (is_early != want_early) continue; raw_spin_lock_irqsave(&desc->lock, flags);