From patchwork Wed Nov 22 05:30:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069643 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 5FE9E6038F for ; Wed, 22 Nov 2017 05:34:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 582F829B45 for ; Wed, 22 Nov 2017 05:34:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DAF729B54; Wed, 22 Nov 2017 05:34:21 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 76C2429B45 for ; Wed, 22 Nov 2017 05:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oC1dimK0eZ3qRXo3apt3Drd6wc26FWs2eynx7aZ4Hww=; b=DXgcqf5TTQolbZt2D08SDytpNC HADzeZ0v95cGRRSJBhuXmGFsToeONf9Aqvml0KGGU3nXSM0XcHEmlZ6xgigOsiIhqnc6lshwxKTLS xxOsv4xabeMiTnBl837BCeWTTceJsmn19MseRp7TYhQp+7K/qXNBqeilwMGxryTMDVLLGccv09D4f jevobcEGCGKz1UOj+iExy/a/Z5YLAip3aChYNK/zlCo0q5Z3wMjdouSfvru4XsbXkWhn3T2YTqSID DAVA9cdlEuYMauP4ZofHAbNBb2RLI39XNFVmc2Nzy7bXRUdAko9nvm9/apXUIUygeP7uDuGy/9/+P ymtJ03RQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eHNfv-0007vA-Ri; Wed, 22 Nov 2017 05:34:19 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNdh-0005Ys-PD for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 05:32:09 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id BFF846084D; Wed, 22 Nov 2017 05:31:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328692; bh=MGUJXI3thfO7PJv5/6eBU8XyAxFQULUjfRBu3LsEj8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TbqEcNl6bYvaaQh2hE8HFgd9ev4SpTV61A4McW8wG/g2mi+8A+o3f6ppGx1K8wXlU IBbbKty9f3nS6KmRWdAdfN9QxuYiZk8VNwYzqe2r5Pe3Dzvf6fLSQ7dc5+ekwfjeyR WJyGfg6PHlHGIiirHwBXNxRcfypoWoe1h8uuDvoQ= 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 AB3DF6087A; Wed, 22 Nov 2017 05:31:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328692; bh=MGUJXI3thfO7PJv5/6eBU8XyAxFQULUjfRBu3LsEj8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TbqEcNl6bYvaaQh2hE8HFgd9ev4SpTV61A4McW8wG/g2mi+8A+o3f6ppGx1K8wXlU IBbbKty9f3nS6KmRWdAdfN9QxuYiZk8VNwYzqe2r5Pe3Dzvf6fLSQ7dc5+ekwfjeyR WJyGfg6PHlHGIiirHwBXNxRcfypoWoe1h8uuDvoQ= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AB3DF6087A 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 Subject: [PATCH 05/30] agp: nvidia: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:30:50 -0500 Message-Id: <1511328675-21981-6-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511328675-21981-1-git-send-email-okaya@codeaurora.org> References: <1511328675-21981-1-git-send-email-okaya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171121_213202_349408_4E9E30D0 X-CRM114-Status: GOOD ( 10.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sinan Kaya , linux-arm-msm@vger.kernel.org, David Airlie , open list , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 --- drivers/char/agp/nvidia-agp.c | 12 +++++++++--- drivers/char/agp/sworks-agp.c | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c index 828b344..623205b 100644 --- a/drivers/char/agp/nvidia-agp.c +++ b/drivers/char/agp/nvidia-agp.c @@ -340,11 +340,17 @@ static int agp_nvidia_probe(struct pci_dev *pdev, u8 cap_ptr; nvidia_private.dev_1 = - pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 1)); + pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus), + (unsigned int)pdev->bus->number, + PCI_DEVFN(0, 1)); nvidia_private.dev_2 = - pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 2)); + pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus), + (unsigned int)pdev->bus->number, + PCI_DEVFN(0, 2)); nvidia_private.dev_3 = - pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(30, 0)); + pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus), + (unsigned int)pdev->bus->number, + PCI_DEVFN(30, 0)); if (!nvidia_private.dev_1 || !nvidia_private.dev_2 || !nvidia_private.dev_3) { printk(KERN_INFO PFX "Detected an NVIDIA nForce/nForce2 " diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c index 03be4ac..4dbdd3b 100644 --- a/drivers/char/agp/sworks-agp.c +++ b/drivers/char/agp/sworks-agp.c @@ -474,7 +474,8 @@ static int agp_serverworks_probe(struct pci_dev *pdev, } /* Everything is on func 1 here so we are hardcoding function one */ - bridge_dev = pci_get_bus_and_slot((unsigned int)pdev->bus->number, + bridge_dev = pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus), + (unsigned int)pdev->bus->number, PCI_DEVFN(0, 1)); if (!bridge_dev) { dev_info(&pdev->dev, "can't find secondary device\n");