From patchwork Tue Dec 19 05:37:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10122295 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6E8EA60390 for ; Tue, 19 Dec 2017 05:38:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6027128D01 for ; Tue, 19 Dec 2017 05:38:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54D5628D0C; Tue, 19 Dec 2017 05:38:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2E9128D01 for ; Tue, 19 Dec 2017 05:38:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759518AbdLSFiR (ORCPT ); Tue, 19 Dec 2017 00:38:17 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:52002 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759615AbdLSFiP (ORCPT ); Tue, 19 Dec 2017 00:38:15 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 53E1C60AFE; Tue, 19 Dec 2017 05:38:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661895; bh=nlBLy3aTwEBPERskKV+zwVjUcnEag2XGTrSp7R32tG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O7VwxRFXHp4OT0/nRfHMiXHupRhwRJ4jgaPBN1bLCZJeWiHcdny3RY+KPWYNTAeMY KLHSUlCCgBiwRZhVyD57MTmWo0Og0MLUG9vRP7ZD+lagKIUgJDPfRZc6QgpIc4r5bY K2V9B7NvAQTyKgL2OhfROid9IKBBPResWyBiprwM= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A2B9960858; Tue, 19 Dec 2017 05:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661894; bh=nlBLy3aTwEBPERskKV+zwVjUcnEag2XGTrSp7R32tG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iK8CKcJBrV1svRKED7nDkM4Cnz63ZYXqTmAg8MrJTvKEsVB9dvFDibk7C9JD22ihV 6G3C4Z51P9qjQNY+mqGiB1PZzphbeVCRCtr05RJJP60TEjAIk8JBaZ0DOr4rLkTD+C VJ/5PVfSSBn6SyQcp2K98M/bNIhOU9PO5Hn4GvRg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A2B9960858 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Richard Henderson , Ivan Kokshaysky , Matt Turner , Bjorn Helgaas , Thomas Gleixner , Greg Kroah-Hartman , Lorenzo Pieralisi , Masahiro Yamada , Philippe Ombredanne , Kate Stewart , linux-alpha@vger.kernel.org (open list:ALPHA PORT), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 01/26] alpha/PCI: deprecate pci_get_bus_and_slot() Date: Tue, 19 Dec 2017 00:37:37 -0500 Message-Id: <1513661883-28662-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1513661883-28662-1-git-send-email-okaya@codeaurora.org> References: <1513661883-28662-1-git-send-email-okaya@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Use pci_get_domain_bus_and_slot() with a domain number of 0 where we can't extract the domain number. Other places, use the actual domain number from the device. Signed-off-by: Sinan Kaya --- arch/alpha/kernel/pci.c | 2 +- arch/alpha/kernel/sys_nautilus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 87da005..2e86ebb 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -425,7 +425,7 @@ struct resource * __init if (bus == 0 && dfn == 0) { hose = pci_isa_hose; } else { - dev = pci_get_bus_and_slot(bus, dfn); + dev = pci_get_domain_bus_and_slot(0, bus, dfn); if (!dev) return -ENODEV; hose = dev->sysdata; diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index 239dc0e..ff4f54b 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c @@ -237,7 +237,7 @@ bus = hose->bus = bridge->bus; pcibios_claim_one_bus(bus); - irongate = pci_get_bus_and_slot(0, 0); + irongate = pci_get_domain_bus_and_slot(pci_domain_nr(bus), 0, 0); bus->self = irongate; bus->resource[0] = &irongate_io; bus->resource[1] = &irongate_mem;