From patchwork Tue Dec 19 05:37:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10122547 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 2C795603B5 for ; Tue, 19 Dec 2017 06:01:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B61D28CA9 for ; Tue, 19 Dec 2017 06:01:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1008E28DD1; Tue, 19 Dec 2017 06:01:10 +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 8E08228CA9 for ; Tue, 19 Dec 2017 06:01:09 +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=jr7gkBXPWultiGZcD3c/k8t8wGQz66zr/elMxLC9GiI=; b=V48KtodyOQ3zd4JBYllwUNdeIh YLKRpMiaBt9ops21Rd/r/V68LQqeBZ6GqL7Or1DxBciy2HNLIXIHYd4uWH33ZgO3S0iNViZiG/LL8 /T9DwEMVgp+SHzmEq10cL5AJvHK6idE9kO351tbACnoPgf7xkpfpyPSMDnhJy0X9CwMTcMx3JLiTc L9LvIoqaXgM/lOmX5Rf1ii5vAMQMvXbHsMxhOdcaLBCO50c+0jdN6eCJcE75RCdYAmHrXCm3yELHV zRh7pIUYtS4vCetbn/DDgvVRhjBgF4+8PQJ9P96zTAkr94JEypTdjRoj44In+97vofQ2J/p+o8SO6 iTby+tmA==; 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 1eRAxe-0004ot-6f; Tue, 19 Dec 2017 06:01:06 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRAwF-00034m-Hf for linux-arm-kernel@bombadil.infradead.org; Tue, 19 Dec 2017 05:59:39 +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=qReMBQd1j2OAWevspGZ7+KuOzGz8x91/xBjbFt22QjM=; b=zI5gUMEcgzEUl+zsNyULdKE+8 snDdiJOLqzmzHL6cIW0SyeYKTtaRtD21ki/HiLFNGTYHD/MAod40y7RbAJj+HcpnCIeIe2/QxQg1X fEFXRbYjyz8jS9dDMAj1yF6cuN6NUDx/iGAqCQMIcIvXjWe1oVBlmfC1R0lusXmV2PurzUKMmA0GF YZ/xXuKn1aj4h/dBa2NjKMbDqSSb8Na8FXawOzlwEZEYuDPkJSkfDTIrf7NF/CrhzwLZiuY31YguN Q6AHgkRLw3h4TCr6IYjVhj+Al09Cyh9XYstXYHOUZNi4FnM6S7/i3oZbJeF38accUOBB/bsldIAsc BnLp56U0w==; Received: from smtp.codeaurora.org ([198.145.29.96]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eRAcv-0005io-Bc for linux-arm-kernel@lists.infradead.org; Tue, 19 Dec 2017 05:39:42 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 50B9A60B1C; Tue, 19 Dec 2017 05:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661954; bh=Czr5ON9vRWGQbkokXz7xyNAc7BWQ3X4fI/2bgf/e71E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UukWVLm1IejJ+2JKzY4NaFpxatY3vJ41Ry+Yod/X/0ExcxbAGmQyYPJ+e3nnD7Rmy umt9S5nMtPGoZDLxgd5T9IURabgVhZcxXjszcksTWhIDbg/B9IgVKggKoPSK8GpEEG oh3NlMM+IOIAbsupSElMcx7PsJQaWgNxE3nvz8bY= 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 EB6A16024A; Tue, 19 Dec 2017 05:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1513661953; bh=Czr5ON9vRWGQbkokXz7xyNAc7BWQ3X4fI/2bgf/e71E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CfjVoe2fS3HqMXVDPk4p/vmQyUp2eLi/SmEQ3r+A/dSmq7GMynUZ8v9tLyBUDnJJF v1WDjCfx33Lh1PvdOd2o8cG4rWPBwzrLuFJFQ3IrZy95ncRc1bRgLVogO7ZStNTCcX 6rcS/1xh96XXLbMQDBsZD6/bqebKL6mVPMmyPEaU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org EB6A16024A 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 13/26] bnx2x: deprecate pci_get_bus_and_slot() Date: Tue, 19 Dec 2017 00:37:49 -0500 Message-Id: <1513661883-28662-14-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-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: linux-arm-msm@vger.kernel.org, open list , Sinan Kaya , Ariel Elior , "open list:BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER" , "supporter:BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER" , 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(). Introduce bnx2x_vf_domain() function to extract the domain information and save it to VF specific data structure. Use the saved domain value while calling pci_get_domain_bus_and_slot(). Signed-off-by: Sinan Kaya Acked-by: David S. Miller --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 10 +++++++++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c index 3591077..ffa7959 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c @@ -812,7 +812,7 @@ static u8 bnx2x_vf_is_pcie_pending(struct bnx2x *bp, u8 abs_vfid) if (!vf) return false; - dev = pci_get_bus_and_slot(vf->bus, vf->devfn); + dev = pci_get_domain_bus_and_slot(vf->domain, vf->bus, vf->devfn); if (dev) return bnx2x_is_pcie_pending(dev); return false; @@ -1041,6 +1041,13 @@ void bnx2x_iov_init_dmae(struct bnx2x *bp) REG_WR(bp, DMAE_REG_BACKWARD_COMP_EN, 0); } +static int bnx2x_vf_domain(struct bnx2x *bp, int vfid) +{ + struct pci_dev *dev = bp->pdev; + + return pci_domain_nr(dev->bus); +} + static int bnx2x_vf_bus(struct bnx2x *bp, int vfid) { struct pci_dev *dev = bp->pdev; @@ -1606,6 +1613,7 @@ int bnx2x_iov_nic_init(struct bnx2x *bp) struct bnx2x_virtf *vf = BP_VF(bp, vfid); /* fill in the BDF and bars */ + vf->domain = bnx2x_vf_domain(bp, vfid); vf->bus = bnx2x_vf_bus(bp, vfid); vf->devfn = bnx2x_vf_devfn(bp, vfid); bnx2x_vf_set_bars(bp, vf); diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h index 53466f6..eb814c6 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h @@ -182,6 +182,7 @@ struct bnx2x_virtf { u32 error; /* 0 means all's-well */ /* BDF */ + unsigned int domain; unsigned int bus; unsigned int devfn;