From patchwork Wed Nov 22 05:31:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10069805 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 ED92460353 for ; Wed, 22 Nov 2017 05:50:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E66DF2994B for ; Wed, 22 Nov 2017 05:50:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D932529ABA; Wed, 22 Nov 2017 05:50:17 +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 3687F2994B for ; Wed, 22 Nov 2017 05:50:17 +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=gvnGfs5fQhZIvOzOZlrH6OCuNqT9jeR+0flNGcUqY5Q=; b=E038H3PGGse+Oc3LDtuqvY4wwN o4n+7moGWTa0bc+ZTyP4CguU9fEa0ZWoteXW7Bd75jHxlvzv1CpWzln1j0JmIl3JyvQErqe3lpSP0 8hxWIZobhgbnaDIl0miL/tNCzg33Fi6VKU9Gs+oi20gV1kV1zET61L2MnLwkmeMqeid+c6E4xGFrS qmc7j+aCXXNbzXafdy3gJ0DOKSIe3TWVbRS4gNBhugAyrjcnS0KdYgsrwIiR/dXP8Ko8AX9tw4Bi+ nvdxp58hvdApwOedTiQ/JiKJpoNUHgdGiJG597L3JI28fMZY8DHZzeDzAzPLgvUG0kQGOju6SC6V6 F3Ku3Uvw==; 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 1eHNvM-0004Bo-DU; Wed, 22 Nov 2017 05:50:16 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNuH-0002Ls-6Q for linux-arm-kernel@bombadil.infradead.org; Wed, 22 Nov 2017 05:49:09 +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=ThYcLlX0NsF1jwqWS0swqS7ck9Rnp3Ymdseo6zJoH4k=; b=AidsMe4khUbAEUrC1/PYiNtCk 97nouSUjclYzY0WS+aaTzPLZbcVSfFiPXj+xJNCzc8+ogysk2t1BSq9DhYR6BOPdnxxseEzUwmANx coG/A5mUmaoFW6k5mitrU3OhWFFLV/q2zZDoXF2SOExGpuU2d27iJUVwknM3LfVL8fAIkOVlhn7cI Qo/sURtMnXmXn5S56fKNvlBAOXKeyIA/IwrN8m9FpvwYxOuKdx5vKiP2+dUGeyuwby8kl5IKIW71m qXXjepmLBfuDfOL4qpPHhYPWAB1JUCAmWrOgfe27c5YIe8UPawKlEUfXCJTHFQZ2BGPbDzfiZu7SJ gDnqPJYbw==; Received: from smtp.codeaurora.org ([198.145.29.96]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eHNeD-00082w-Mj 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 8841860A19; Wed, 22 Nov 2017 05:32:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328735; bh=PrQsEt8oOAhrvdba+2y5k6Sms571MzDPQ8LRH+0x8lk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fMNNtk8lRQDYMc3snoWXR2SKOJWDR4jO7rLpN916BMl9D9rb2Vg+CLgr//UI1owlJ AGf5qfsqHOamj52VuTGBcv/H5RGyBEeBUJprVFoWY7N9kJRbWabUrvUOlh68NP3y/7 vK2TGb2DdIOfZQM+qzzOPBKHgfVnqwYhLbVCh3eU= 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 AEAE560A00; Wed, 22 Nov 2017 05:32:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1511328722; bh=PrQsEt8oOAhrvdba+2y5k6Sms571MzDPQ8LRH+0x8lk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JXWmXiLSQmomm65q2079wMFm3JO0Z4YJtKy4qt4YU3sA5JArRF5uOEn7YGvRtQe2K LZTmzGIZkuJQNRUdeIXOyEbJdX3A+x/AwuoFE6Wdy05gJNLTWd5P64uLaQsHdubeIw RhAcNc+fcQMvnMrkBN5LjD8xpwTkxAzjg2SN98SU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AEAE560A00 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 15/30] bnx2x: deprecate pci_get_bus_and_slot() Date: Wed, 22 Nov 2017 00:31:00 -0500 Message-Id: <1511328675-21981-16-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-20171122_053234_101378_C8393B99 X-CRM114-Status: GOOD ( 16.17 ) 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. 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/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 9ca994d..9f40c23 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; @@ -1611,6 +1618,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;