From patchwork Tue Aug 4 21:54:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6944851 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 893269F358 for ; Tue, 4 Aug 2015 22:48:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B007D2040F for ; Tue, 4 Aug 2015 22:48:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D4DDF203C4 for ; Tue, 4 Aug 2015 22:48:23 +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 1ZMkyU-0007sc-8M; Tue, 04 Aug 2015 22:46:22 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZMkyL-0007qv-2a for linux-arm-kernel@bombadil.infradead.org; Tue, 04 Aug 2015 22:46:13 +0000 Received: from mail-io0-x236.google.com ([2607:f8b0:4001:c06::236]) by merlin.infradead.org with esmtps (Exim 4.85 #2 (Red Hat Linux)) id 1ZMkAz-0006TI-Aw for linux-arm-kernel@lists.infradead.org; Tue, 04 Aug 2015 21:55:13 +0000 Received: by iodd187 with SMTP id d187so31173787iod.2 for ; Tue, 04 Aug 2015 14:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=G6STArvRh0S4HxWRfUSNm9M4QeC0SEdHDHSMXWatjDI=; b=Mqx2TpdPyR2dxHkwLLXQanzgxZlAyxwx6CwIGWBExcZcGQ4+IgBWMeiL6rSbfYP2L1 fUAXcdvtq11TrNFbc8kkpmaXL6w8eqYUWnxka083WoPbFKdUoeC3X3WaOMegAiw360qa tH94stISN1c3lqCdMcq4SW0/gPdQSdOG7IkTJJM4EvUSCJ/Lpsq8TxllDNhSUTcEQwj0 HjwUSOgpwfBllx7J9hxJQm6y7ZiB6uThClj8DzMK2uhGnwbEdV3c/8xkjZaa7n7o8YqT nrQuEKDjV3kgYtENppokaSjeGD5sXxWc9ioploAEcSePSPUs/icaVpdxDneYvNu6Q8CT iUwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=G6STArvRh0S4HxWRfUSNm9M4QeC0SEdHDHSMXWatjDI=; b=GV7dQQYPkMc5YkLRdWaVeGOmvj0llBjLnfNywDgjjXsL/O/c8MSOSwEJDAtDP5DED8 bhvXsgZv1zbLhmPsXSV8t5ljLk4wDJETe9ee9zMR5AwYuuWMsz7+0LN+Hwxpd3w94B2v qkh4BITyv2fiCu87wQW/plGyUIltW5t26BRnBjtI0M3OsVipnIgE4Ae8kD/wT1XCvryq SSGNgxTOrzhF2Z4iJv9Qo5R6UmgzLBY/a2M6FMkQpO8nmCVhmoRoBSlA6rP3k6V7gyxC jH5WkHOX7T5W/Siv1YoYftBYLOGgAGuFhAuM8SqYYb3FvDKC0QKf0fNrHVhTj4QnMXMi vVdg== X-Gm-Message-State: ALoCoQmWNKTdzS/Grb41FS8inCSuK8J3mkB3+qwnGD9uKlUSyxtsq+VlyHUuBTvBWe6dxXFG+FK8 X-Received: by 10.107.11.83 with SMTP id v80mr6715518ioi.95.1438725292326; Tue, 04 Aug 2015 14:54:52 -0700 (PDT) Received: from localhost ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id m134sm498225ioe.42.2015.08.04.14.54.51 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Aug 2015 14:54:51 -0700 (PDT) Subject: [PATCH v5 8/9] PCI: xgene: Look for OF "msi-parent" in host controller, not root bus To: Lorenzo Pieralisi From: Bjorn Helgaas Date: Tue, 04 Aug 2015 16:54:50 -0500 Message-ID: <20150804215450.9189.61176.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150804214234.9189.42548.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150804214234.9189.42548.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150804_175513_438689_BC246F73 X-CRM114-Status: GOOD ( 13.09 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Duc Dang , Russell King , Arnd Bergmann , Gabriele Paoloni , Marc Zyngier , linux-pci@vger.kernel.org, Pratyush Anand , Michal Simek , Simon Horman , James Morse , Tanmay Inamdar , Jingoo Han , Thierry Reding , Jayachandran C , linux-arm-kernel@lists.infradead.org, Jason Cooper Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID, 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 Look for the "msi-parent" in the PCI host controller OF node, not the root bus OF node. This makes it the same as MVEBU. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pci-xgene.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c index 5e0d6de..3cb58a3 100644 --- a/drivers/pci/host/pci-xgene.c +++ b/drivers/pci/host/pci-xgene.c @@ -506,8 +506,7 @@ static int xgene_pcie_msi_enable(struct xgene_pcie_port *port, { struct device_node *msi_node; - msi_node = of_parse_phandle(bus->dev.of_node, - "msi-parent", 0); + msi_node = of_parse_phandle(port->dev.of_node, "msi-parent", 0); if (!msi_node) return -ENODEV;