From patchwork Wed Nov 22 05:31:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069835 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 3F39060353 for ; Wed, 22 Nov 2017 06:36:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 358F2209D8 for ; Wed, 22 Nov 2017 06:36:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29DAE29B9F; Wed, 22 Nov 2017 06:36:34 +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=unavailable 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 A500D29BA2 for ; Wed, 22 Nov 2017 06:36:33 +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=AjkDnQ5gc5Qz2BL1rMM4lg9OOdLKbSRecLMIFgMbQOU=; b=VK2GqkeXAV79KzLkij/C58Jckl bekJhNJM1ScRxaHkamzQ9ZiL66+I6GPh5VyUpFT+ITEKaNDbNuG426K05TdQ1mEAUNLuJsXOFJvQn s8w/e7YoQyw6rgsES445+MHoHdlIhEQTw7RqJNuLzIz9SSzbDlVJRcUcgm8GK2+WAk6ta/tg5Ui37 Xk4qiFsezOcHKWSbxaGGcT4qhT0+kagXVxKmwbwY2rCgFK1Kx/FT8q4OaS03aKkTWyRGOkn0c4Mo1 67LkzFA74TUmJRpKQq/s4MNpgwFSn9NEIOoAllbjUk88Pk+hyw2/9IhDZgCj7Xl+nmFXoAUAmKH/H PKpdLPlA==; 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 1eHOe8-0000u6-Oh; Wed, 22 Nov 2017 06:36:32 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHOcI-0006I2-7h for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Nov 2017 06:34:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=juH4lB0AtUPWLFouYKSJWNlD0DxPTF6B7NE1SjmDO7Y=; b=WsbfoWuWLQOHpI1twqjyj7h+f IgG7jeaUJ49rKWrVWo1JGNOnEhV80eGYxTVOWkODspt3Y1AQKWQHoxgtEg2ROov37+cg+NCWDHs3a roFmHtJ7jqfOrHC7LG9KpuvqCjMbCNAD2J9BIB2o6muvzkp47wY/fihmj/ST1/LsWWPRFmoZh4LB6 GmUK2PqagIdqW833FSSkpnrlKrqC2E8yOw6aOej9Y5Ca60ZZgvgYwFG5f0C2sHMDCFeRy8ygzs0Lt CC7dbZ5Dg5GfE3oyZqaqwUNzL/08i6pAJTWoadV7TK+6I1ZiwLiq0EavS8JwvI0toJ80qTNhlcC3I WuANqVPiw==; Received: from smtp.codeaurora.org ([198.145.29.96]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNeH-0000Yq-1f for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 05:32:37 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0A7546084E; Wed, 22 Nov 2017 05:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328733; bh=sEXIKvzVZSDKQGu0y6B/J1bdB+LTamDCecCSQR0afRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=POKXkpNSu9iInvDksuS8171e+NtNZ2xx7Ef63AfK0ocyd09JwVgL0oa4zkzjFjDSC tNzyU2U+7iBVCKjS48F66tgNPvN2kuR1HcCdLGSXaaqvaPnTbm/uTAZednSNCFQQTL D94DCNJBwMXonjIPzreiGFNxpHpcuDyf1i3DHPhE= 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 CFBF46087F; Wed, 22 Nov 2017 05:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328728; bh=sEXIKvzVZSDKQGu0y6B/J1bdB+LTamDCecCSQR0afRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MI3aN8SibpEMeGKZpcS8wQrc6csOkXITPn5q0POe8nE0iT5PXKTD5JVIOl+vE2KlZ ZV82b0L21ee2VPbNCqAgeDbZjic17QMc/aE0nOKDi1ZTz01iH1fVNTIYZATwCT3/yc aW/8l4e1f8HDLeRqFTAUKTOVm1mdS63xnYteGVeA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org CFBF46087F 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 17/30] PCI: cpqhp: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:31:02 -0500 Message-Id: <1511328675-21981-18-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-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, Bjorn Helgaas , 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/pci/hotplug/cpqphp_pci.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c index e220d49..8897a77 100644 --- a/drivers/pci/hotplug/cpqphp_pci.c +++ b/drivers/pci/hotplug/cpqphp_pci.c @@ -89,7 +89,9 @@ int cpqhp_configure_device(struct controller *ctrl, struct pci_func *func) pci_lock_rescan_remove(); if (func->pci_dev == NULL) - func->pci_dev = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, func->function)); + func->pci_dev = pci_get_domain_bus_and_slot(0, func->bus, + PCI_DEVFN(func->device, + func->function)); /* No pci device, we need to create it then */ if (func->pci_dev == NULL) { @@ -99,7 +101,9 @@ int cpqhp_configure_device(struct controller *ctrl, struct pci_func *func) if (num) pci_bus_add_devices(ctrl->pci_dev->bus); - func->pci_dev = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, func->function)); + func->pci_dev = pci_get_domain_bus_and_slot(0, func->bus, + PCI_DEVFN(func->device, + func->function)); if (func->pci_dev == NULL) { dbg("ERROR: pci_dev still null\n"); goto out; @@ -129,7 +133,10 @@ int cpqhp_unconfigure_device(struct pci_func *func) pci_lock_rescan_remove(); for (j = 0; j < 8 ; j++) { - struct pci_dev *temp = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, j)); + struct pci_dev *temp = pci_get_domain_bus_and_slot(0, + func->bus, + PCI_DEVFN(func->device, + j)); if (temp) { pci_dev_put(temp); pci_stop_and_remove_bus_device(temp); @@ -319,6 +326,7 @@ int cpqhp_save_config(struct controller *ctrl, int busnumber, int is_hot_plug) int cloop = 0; int stop_it; int index; + u16 devfn; /* Decide which slots are supported */ @@ -416,7 +424,9 @@ int cpqhp_save_config(struct controller *ctrl, int busnumber, int is_hot_plug) new_slot->switch_save = 0x10; /* In case of unsupported board */ new_slot->status = DevError; - new_slot->pci_dev = pci_get_bus_and_slot(new_slot->bus, (new_slot->device << 3) | new_slot->function); + devfn = (new_slot->device << 3) | new_slot->function; + new_slot->pci_dev = pci_get_domain_bus_and_slot(0, + new_slot->bus, devfn); for (cloop = 0; cloop < 0x20; cloop++) { rc = pci_bus_read_config_dword(ctrl->pci_bus, PCI_DEVFN(device, function), cloop << 2, (u32 *) &(new_slot->config_space[cloop]));