From patchwork Wed Nov 22 22:49:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10071905 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 C1D9D6038F for ; Wed, 22 Nov 2017 23:09:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2C6F288FA for ; Wed, 22 Nov 2017 23:09:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A626B2988F; Wed, 22 Nov 2017 23:09:02 +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 2A453288FA for ; Wed, 22 Nov 2017 23:09:02 +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=dcvNiNZ1jJhstI5+EEXh5MVYJq hcdBFaijtXYhY+BLo/SYPy57LNbI9Ppn0PqurJ2bEGEohTqjZkGd1WmUR7XNjdhJynEnDLhTklnie s7mpCoqoN6PPHU6Xk+uFL0A7RD2T4nKmJFhW3LxlNAQZJLryD9ev8l0hwmZvn92Y0UFUpYWN/+9GL jxpQ1ch0Sl3SHUwinww8epfuVp8oVgkneYGBLqzMIuqmIr5JHR5UMo1kOtdBywZ34zw8owGW0ZF5S om10J5V1Or0956VaJ5SbahlM7pIm3neGNuBUpN0onHpKDcjdHbf5JvFopWggOARpJ4hgR+wwzOodu YBon5Wdg==; 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 1eHe8b-0004sW-Hp; Wed, 22 Nov 2017 23:09:01 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHe6H-0002Ta-95 for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Nov 2017 23:06:37 +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=cPn/Tg9zYC9ZzuC/gnZoFgaV+ kgWN63M32nsyTYqFprJpI6RsC3x3LoKXI5KZKjq7NXiEplgC8fXPKqO2HI0FHxwDTG98l8LV4CbvI dCIOBN1jF4z25WHRFGmIlqKwTuecOZcmYivr7cNDtHQ9zamAKH9IuMiqQB8PdJaeg9Ug1ktudzBaD o6IFiQay1c1uhUVMDa2jzsvCncHio4zMN7T4a/yq8VCb7nVPgaPTwiA1AmlCiHr4eFMSASNDiNiru 53AIJG49pB5CeJh3SNmhRYVgueLYerWxNXtS6v8VP2z6ozQKuddBcJxjXl9nfSKO7OVKhY3kdNXqW MtUyyKJKg==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHdr5-00024j-TY for linux-arm-kernel@lists.infradead.org; Wed, 22 Nov 2017 22:50:57 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id F078A60ACD; Wed, 22 Nov 2017 22:50:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511391035; bh=qTnktusNN2SxGe39HE57Y+9cfTdIdfBXUeuPqeDErsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cXnuVZy3A5Pvj/m3GAonZUD+OXp3wkfXD0tMbthdgPeL67ZS+zW4CuesLKnHfn+3i T3aiIs9sIZ+IBcEeEpp5XJShPNsC1bf7Aia6xR5PelohZjXsDc1OdQuYr3ixRT5gdK HnWNrIHpi+BX3cS6USs0I+lTET2/+qN+LJN0z5qs= 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 6266F60A36; Wed, 22 Nov 2017 22:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511391015; bh=qTnktusNN2SxGe39HE57Y+9cfTdIdfBXUeuPqeDErsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kKG21r7qCt2Zy2udjH4efT/oYLhjx9d8O0Zw6ELcEDnN4gtDJL25KgVtPy3XG1Hcj F+EZYmw8Oj14uKscTs1qIz5OhQuo5zIQnJMRcwgVjh9I0UQX2UpoKfAR/aH34LIllS dWlLG82KvQjFVWifK51T17SvJlkN8U7ppLr+JTrk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6266F60A36 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 V2 16/29] PCI: cpqhp: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 17:49:11 -0500 Message-Id: <1511390964-9979-17-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511390964-9979-1-git-send-email-okaya@codeaurora.org> References: <1511390964-9979-1-git-send-email-okaya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171122_225056_280177_BC4D48F1 X-CRM114-Status: GOOD ( 16.79 ) 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]));