From patchwork Mon Nov 10 19:24:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suravee Suthikulpanit X-Patchwork-Id: 5268831 Return-Path: X-Original-To: patchwork-linux-arm@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 5DF6BC11AC for ; Mon, 10 Nov 2014 19:27:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8BC302011D for ; Mon, 10 Nov 2014 19:27:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AFB492010E for ; Mon, 10 Nov 2014 19:27:33 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xnuac-0003so-Jf; Mon, 10 Nov 2014 19:25:26 +0000 Received: from mail-bn1bn0102.outbound.protection.outlook.com ([157.56.110.102] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XnuaX-0002iC-1e for linux-arm-kernel@lists.infradead.org; Mon, 10 Nov 2014 19:25:21 +0000 Received: from BY1PR0201CA0013.namprd02.prod.outlook.com (25.160.191.151) by BY2PR02MB203.namprd02.prod.outlook.com (10.242.232.25) with Microsoft SMTP Server (TLS) id 15.1.11.14; Mon, 10 Nov 2014 19:24:57 +0000 Received: from BN1BFFO11FD026.protection.gbl (2a01:111:f400:7c10::1:105) by BY1PR0201CA0013.outlook.office365.com (2a01:111:e400:4814::23) with Microsoft SMTP Server (TLS) id 15.1.16.15 via Frontend Transport; Mon, 10 Nov 2014 19:24:57 +0000 Received: from atltwp02.amd.com (165.204.84.222) by BN1BFFO11FD026.mail.protection.outlook.com (10.58.144.89) with Microsoft SMTP Server id 15.1.6.13 via Frontend Transport; Mon, 10 Nov 2014 19:24:56 +0000 X-WSS-ID: 0NEU8LG-08-XPX-02 X-M-MSG: Received: from satlvexedge01.amd.com (satlvexedge01.amd.com [10.177.96.28]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp02.amd.com (Axway MailGate 5.3.1) with ESMTPS id 22164D16006; Mon, 10 Nov 2014 13:24:51 -0600 (CST) Received: from SATLEXDAG06.amd.com (10.181.40.13) by satlvexedge01.amd.com (10.177.96.28) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 10 Nov 2014 13:25:06 -0600 Received: from ssuthiku-fedora-lt.amd.com (10.180.168.240) by satlexdag06.amd.com (10.181.40.13) with Microsoft SMTP Server id 14.3.195.1; Mon, 10 Nov 2014 14:24:54 -0500 From: To: Subject: [PATCH 1/2] PCI: Add new pci_ops for setting MSI parent for PCI bus Date: Mon, 10 Nov 2014 13:24:39 -0600 Message-ID: <1415647480-3320-2-git-send-email-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415647480-3320-1-git-send-email-suravee.suthikulpanit@amd.com> References: <1415647480-3320-1-git-send-email-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(428002)(199003)(189002)(4396001)(50226001)(95666004)(36756003)(120916001)(77096003)(33646002)(62966003)(46102003)(77156002)(105586002)(20776003)(47776003)(64706001)(97736003)(21056001)(110136001)(99396003)(106466001)(229853001)(92726001)(104166001)(2351001)(53416004)(107046002)(84676001)(92566001)(86152002)(68736004)(86362001)(89996001)(93916002)(19580395003)(19580405001)(87936001)(44976005)(88136002)(87286001)(101416001)(48376002)(31966008)(102836001)(50466002)(76176999)(50986999); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR02MB203; H:atltwp02.amd.com; FPR:; MLV:sfv; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BY2PR02MB203; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA: BCL:0;PCL:0;RULEID:;SRVR:BY2PR02MB203; X-Forefront-PRVS: 039178EF4A Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; X-Exchange-Antispam-Report-CFA: BCL:0;PCL:0;RULEID:;SRVR:BY2PR02MB203; X-OriginatorOrg: amd4.onmicrosoft.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141110_112521_296089_B2065320 X-CRM114-Status: GOOD ( 13.44 ) X-Spam-Score: -0.0 (/) Cc: lorenzo.pieralisi@arm.com, liviu.dudau@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, Suravee Suthikulpanit , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, 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 From: Suravee Suthikulpanit In the pci_scan_root_bus, pci_bus is created and passed down to: pci_scan_child_bus pci_scan_bridge pci_add_new_bus pci_alloc_child_bus In pci_alloc_child_bus, the parent's msi_chip is propagated to child, and the referenced by PCI devices when calling arch_setup_msi_irq(). However, in the current implementation of pci_scan_root_bus, the msi_chip of the root_bus is not set before handing off to pci_scan_child_bus. This patch proposes a new callback function in the struct pci_ops to allow host controller to provide a call back for specifying msi_chip to be used. Cc: Bjorn Helgass Cc: Liviu Dudau Cc: Lorenzo Pieralisi Signed-off-by: Suravee Suthikulpanit --- drivers/pci/probe.c | 3 +++ include/linux/pci.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5ed9930..cf7114d 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2081,6 +2081,9 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int bus, if (!b) return NULL; + if (ops->set_msi_parent) + ops->set_msi_parent(b); + if (!found) { dev_info(&b->dev, "No busn resource found for root bus, will use [bus %02x-ff]\n", diff --git a/include/linux/pci.h b/include/linux/pci.h index 5be8db4..6093544 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -560,6 +560,7 @@ static inline int pcibios_err_to_errno(int err) struct pci_ops { int (*read)(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val); int (*write)(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val); + int (*set_msi_parent)(struct pci_bus *bus); }; /*