From patchwork Thu Jul 31 00:33:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 4652461 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 877B29F36A for ; Thu, 31 Jul 2014 00:30:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C29C32018E for ; Thu, 31 Jul 2014 00:30:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE438201B4 for ; Thu, 31 Jul 2014 00:30:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753569AbaGaAad (ORCPT ); Wed, 30 Jul 2014 20:30:33 -0400 Received: from mga02.intel.com ([134.134.136.20]:22679 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751605AbaGaAac (ORCPT ); Wed, 30 Jul 2014 20:30:32 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 30 Jul 2014 17:30:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,768,1400050800"; d="scan'208";a="551585295" Received: from gerry-dev.bj.intel.com ([10.238.158.74]) by orsmga001.jf.intel.com with ESMTP; 30 Jul 2014 17:30:29 -0700 From: Jiang Liu To: Borislav Petkov , "Rafael J . Wysocki" , Thomas Gleixner , Bjorn Helgaas , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Cc: Jiang Liu , linux-pci@vger.kernel.org, lkml Subject: [PATCH] x86, irq: Keep IRQ assignment for PCI devices during suspend/hibernation Date: Thu, 31 Jul 2014 08:33:26 +0800 Message-Id: <1406766807-5745-1-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20140730175836.GC10213@pd.tnic> References: <20140730175836.GC10213@pd.tnic> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Function pci_disable_device() may be called for PCI devices during suspend/hibernation, which in turn may release IRQ assigned for PCI interrupt. Later when pci_enable_device() is called during resume, a different IRQ may be assigned and thus break the driver. So keep IRQ assignment for PCI devices during suspend/hibernation. We check pci_dev.dev.power.is_prepared to detect that pci_disable_device() and pci_enable_device() is called during suspend/hibernation. Signed-off-by: Jiang Liu --- Hi Borilav, Sorry for the incovenience, something is wrong when synchronizing the patch. I have found that "pm" should be "power" when building and testing this patch on my test machine. And I have also fixed it on my development machine, but forgot to do "stg refresh" before "git format-patch", so caused the inconvenience. Regards! Gerry --- arch/x86/pci/common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 059a76c29739..9115e7ae564b 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -662,14 +662,15 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) if ((err = pci_enable_resources(dev, mask)) < 0) return err; - if (!pci_dev_msi_enabled(dev)) + if (!pci_dev_msi_enabled(dev) && !dev->dev.power.is_prepared) return pcibios_enable_irq(dev); return 0; } void pcibios_disable_device (struct pci_dev *dev) { - if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq) + if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq && + !dev->dev.power.is_prepared) pcibios_disable_irq(dev); }