From patchwork Tue Dec 19 05:37:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10122537 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 EB1AB603B5 for ; Tue, 19 Dec 2017 05:58:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB86C28D01 for ; Tue, 19 Dec 2017 05:58:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE60528DE5; Tue, 19 Dec 2017 05:58:22 +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 7D29A28D01 for ; Tue, 19 Dec 2017 05:58:22 +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=GEjhbcn5UADSygSOqiUF0VsLKRJINuf2uNdXBy1tN08=; b=CqyMrtk804xepVC0T0uUflb/GI 8Zk9Zw6XlzFwZB3AloUpZX05hA/dd3qpzHceUYZc0U+Kuqm5IKwgESJyIoYmYmlMH3knMisx2neYQ tU7gnh8gRkynU+zY5XDxs/Vh2e10aZ+zh5Pon1QzxSH140pOvFcOS2K8/IUTO+SI84yByjJ61QVvq ronUIigdH/yqktoET6RV4rtdcBJJe4+wRieMNyTBdKwM65KPj6kHsHzBlSNmX//oeC2waRxgDAdtZ iRLO/ahXCWEULZa/sy7Ep2xqOZs/Rmls0WKscVqbhYlgH04o36zXX+Gr8mScB02hFOVh4JvO1BjdK lteRdRMw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eRAuv-0002NY-LR; Tue, 19 Dec 2017 05:58:17 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRAsq-0000vO-Va for linux-arm-kernel@bombadil.infradead.org; Tue, 19 Dec 2017 05:56:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=AaTMBbGFFo/eaxPDkCHNkZ4dBmJjvF4liXy5D/g+Prk=; b=OdAIVuqQwK9LBrMvFjaflZedd zT3KPLOkoRTcfjIdY0kP3i8eIfC/dVfwcUTZBHSAGzhy5onjw3feq5XLATQT85Gm5rEi9DpZredb7 NRueH5G41t7xxWUv2PQfzr1Q/0xv5pOEDdXJr9HLlh1mhbVb92km4tikccewnht/AbAUn69mXacED TKNzmS53P2FWaDxFP8agYeMkEl8URhgTomyG9QF77OobySIDARgrqji9yyLm4mpjNQaGgovShPxdu tPcvBS8oDxuuW136iHpXx9ZXFx8rnF4wkY7V5sH8xRZsSv0hI3bvnDd6vKQYZTFQhihPKAVpbhyao X6JrYhmag==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRAcu-0001MZ-1F for linux-arm-kernel@lists.infradead.org; Tue, 19 Dec 2017 05:39:43 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id C244F60710; Tue, 19 Dec 2017 05:39:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661960; bh=qTnktusNN2SxGe39HE57Y+9cfTdIdfBXUeuPqeDErsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c72jtGMaL+Z2bvrieSA7a853W1MjqQps5OGimAXhWXntFdadraAUD9L8Kj6N36EMF tFgECr4JkdMPZR+Wh/M0vv9lK0+7f8MAQK9bpgfzlcjnR5QVkrLLuI55qa18AS4k8X uA9UkGL5N0i4X0+gv7tqFdpcTJevJ1R/WPhidrnU= 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 65B8260710; Tue, 19 Dec 2017 05:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661960; bh=qTnktusNN2SxGe39HE57Y+9cfTdIdfBXUeuPqeDErsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c72jtGMaL+Z2bvrieSA7a853W1MjqQps5OGimAXhWXntFdadraAUD9L8Kj6N36EMF tFgECr4JkdMPZR+Wh/M0vv9lK0+7f8MAQK9bpgfzlcjnR5QVkrLLuI55qa18AS4k8X uA9UkGL5N0i4X0+gv7tqFdpcTJevJ1R/WPhidrnU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 65B8260710 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 V4 15/26] PCI: cpqhp: deprecate pci_get_bus_and_slot() Date: Tue, 19 Dec 2017 00:37:51 -0500 Message-Id: <1513661883-28662-16-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171219_053940_347170_E3CC47E6 X-CRM114-Status: GOOD ( 16.83 ) 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. Getting ready to remove pci_get_bus_and_slot() function in favor of pci_get_domain_bus_and_slot(). Hard-coding the domain number as 0. The code doesn't seem to be ready for multiple domains. 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]));