From patchwork Tue Jul 17 02:35:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengzhou Liu X-Patchwork-Id: 171310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ADC5C2C0160 for ; Tue, 17 Jul 2012 12:57:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753772Ab2GQC5f (ORCPT ); Mon, 16 Jul 2012 22:57:35 -0400 Received: from va3ehsobe005.messaging.microsoft.com ([216.32.180.31]:6722 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753333Ab2GQC5e (ORCPT ); Mon, 16 Jul 2012 22:57:34 -0400 Received: from mail241-va3-R.bigfish.com (10.7.14.248) by VA3EHSOBE007.bigfish.com (10.7.40.11) with Microsoft SMTP Server id 14.1.225.23; Tue, 17 Jul 2012 02:57:33 +0000 Received: from mail241-va3 (localhost [127.0.0.1]) by mail241-va3-R.bigfish.com (Postfix) with ESMTP id 71B594015D; Tue, 17 Jul 2012 02:57:33 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839he5bhf0ah107ah) Received: from mail241-va3 (localhost.localdomain [127.0.0.1]) by mail241-va3 (MessageSwitch) id 134249385124663_11428; Tue, 17 Jul 2012 02:57:31 +0000 (UTC) Received: from VA3EHSMHS044.bigfish.com (unknown [10.7.14.244]) by mail241-va3.bigfish.com (Postfix) with ESMTP id 023CC20046; Tue, 17 Jul 2012 02:57:31 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS044.bigfish.com (10.7.99.54) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 17 Jul 2012 02:57:31 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.298.5; Mon, 16 Jul 2012 21:57:30 -0500 Received: from localhost.localdomain (rock.ap.freescale.net [10.193.20.106]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q6H2vRP7004145; Mon, 16 Jul 2012 19:57:28 -0700 From: Shengzhou Liu To: , CC: , Shengzhou Liu Subject: [PATCH] PCI: use dev->irq instead of dev->pin to enable non MSI/INTx interrupt Date: Tue, 17 Jul 2012 10:35:51 +0800 Message-ID: <1342492551-13766-1-git-send-email-Shengzhou.Liu@freescale.com> X-Mailer: git-send-email 1.6.4 MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On some platforms, root port has neither MSI/MSI-X nor INTx interrupt generated in RC mode. In this case, we have to use other interrupt(i.e. system shared interrupt) for port service irq to have AER, Hot-plug, etc, services to work. Signed-off-by: Shengzhou Liu --- drivers/pci/pcie/portdrv_core.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index 75915b3..a855254 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -212,8 +212,13 @@ static int init_service_irqs(struct pci_dev *dev, int *irqs, int mask) if (!pcie_port_enable_msix(dev, irqs, mask)) return 0; - /* We're not going to use MSI-X, so try MSI and fall back to INTx */ - if (!pci_enable_msi(dev) || dev->pin) + /* + * We're not going to use MSI-X, so try MSI and fall back to INTx. + * If neither MSI/MSI-X nor INTx available, try other interrupt. (On + * some platforms, root port doesn't support generating MSI/MSI-X/INTx + * in RC mode) + */ + if (!pci_enable_msi(dev) || dev->irq) irq = dev->irq; no_msi: