From patchwork Tue Nov 11 19:17:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suravee Suthikulpanit X-Patchwork-Id: 5276901 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 9C1DCC11AC for ; Tue, 11 Nov 2014 19:20:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6C5520114 for ; Tue, 11 Nov 2014 19:20:49 +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 06C1F2010F for ; Tue, 11 Nov 2014 19:20:49 +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 1XoGxB-0003Ax-HT; Tue, 11 Nov 2014 19:18:13 +0000 Received: from mail-by2on0123.outbound.protection.outlook.com ([207.46.100.123] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XoGx8-00038j-U1 for linux-arm-kernel@lists.infradead.org; Tue, 11 Nov 2014 19:18:11 +0000 Received: from BLUPR02CA025.namprd02.prod.outlook.com (25.160.23.143) by BN1PR02MB197.namprd02.prod.outlook.com (10.242.214.146) with Microsoft SMTP Server (TLS) id 15.1.16.15; Tue, 11 Nov 2014 19:17:49 +0000 Received: from BN1AFFO11FD028.protection.gbl (2a01:111:f400:7c10::162) by BLUPR02CA025.outlook.office365.com (2a01:111:e400:8ad::15) with Microsoft SMTP Server (TLS) id 15.1.16.15 via Frontend Transport; Tue, 11 Nov 2014 19:17:49 +0000 Received: from atltwp02.amd.com (165.204.84.222) by BN1AFFO11FD028.mail.protection.outlook.com (10.58.52.88) with Microsoft SMTP Server id 15.1.6.13 via Frontend Transport; Tue, 11 Nov 2014 19:17:48 +0000 X-WSS-ID: 0NEW2XN-08-FA6-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (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 23810D16004; Tue, 11 Nov 2014 13:17:47 -0600 (CST) Received: from SATLEXDAG01.amd.com (10.181.40.3) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Tue, 11 Nov 2014 13:18:01 -0600 Received: from ssuthiku-fedora-lt.amd.com (10.180.168.240) by SATLEXDAG01.amd.com (10.181.40.3) with Microsoft SMTP Server id 14.3.195.1; Tue, 11 Nov 2014 14:17:46 -0500 From: To: Subject: [PATCH V2 1/2] PCI: Add new pci_ops for setting MSI parent for PCI bus Date: Tue, 11 Nov 2014 13:17:33 -0600 Message-ID: <1415733454-24322-2-git-send-email-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415733454-24322-1-git-send-email-suravee.suthikulpanit@amd.com> References: <1415733454-24322-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)(102836001)(101416001)(120916001)(31966008)(33646002)(53416004)(97736003)(87936001)(87286001)(88136002)(36756003)(89996001)(76176999)(99396003)(44976005)(19580395003)(19580405001)(229853001)(2351001)(106466001)(105586002)(62966003)(77156002)(77096003)(64706001)(84676001)(47776003)(50986999)(110136001)(68736004)(20776003)(107046002)(4396001)(50226001)(92566001)(95666004)(50466002)(86152002)(92726001)(86362001)(104166001)(46102003)(21056001)(48376002)(93916002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN1PR02MB197; 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:BN1PR02MB197; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA: BCL:0;PCL:0;RULEID:;SRVR:BN1PR02MB197; X-Forefront-PRVS: 0392679D18 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:BN1PR02MB197; X-OriginatorOrg: amd4.onmicrosoft.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141111_111811_058071_A1A329E2 X-CRM114-Status: GOOD ( 12.52 ) 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.1 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: Will Deacon 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); }; /*