From: Sinan Kaya <okaya@codeaurora.org>
To: linux-pci@vger.kernel.org, timur@codeaurora.org
Cc: linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Sinan Kaya <okaya@codeaurora.org>,
Ariel Elior <ariel.elior@cavium.com>,
everest-linux-l2@cavium.com (supporter:BROADCOM BNX2X 10 GIGABIT
ETHERNET DRIVER),
netdev@vger.kernel.org (open list:BROADCOM BNX2X 10 GIGABIT
ETHERNET DRIVER), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 15/30] bnx2x: deprecate pci_get_bus_and_slot()
Date: Wed, 22 Nov 2017 00:31:00 -0500 [thread overview]
Message-ID: <1511328675-21981-16-git-send-email-okaya@codeaurora.org> (raw)
In-Reply-To: <1511328675-21981-1-git-send-email-okaya@codeaurora.org>
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 <okaya@codeaurora.org>
---
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;
--
1.9.1
next prev parent reply other threads:[~2017-11-22 5:32 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-22 5:30 [PATCH 00/30] PCI: deprecate pci_get_bus_and_slot() Sinan Kaya
2017-11-22 5:30 ` [PATCH 01/30] alpha/PCI: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 02/30] powerpc/PCI: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 03/30] x86/PCI: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 04/30] ata: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 05/30] agp: nvidia: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 06/30] edd: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 07/30] ibft: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 08/30] drm/gma500: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 09/30] drm/i915: " Sinan Kaya
2017-11-22 7:52 ` Joonas Lahtinen
2017-11-22 16:28 ` Sinan Kaya
2017-11-22 19:50 ` Jani Nikula
2017-11-22 19:58 ` Timur Tabi
2017-11-23 7:14 ` Jani Nikula
2017-11-23 7:42 ` Joonas Lahtinen
2017-11-23 18:37 ` Sinan Kaya
2017-11-27 8:56 ` Joonas Lahtinen
2017-11-27 14:05 ` Sinan Kaya
2017-11-22 5:30 ` [PATCH 10/30] drm/nouveau: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 11/30] hwmon: (coretemp) " Sinan Kaya
2017-11-22 15:07 ` [11/30] " Guenter Roeck
2017-11-22 5:30 ` [PATCH 12/30] Drivers: ide: " Sinan Kaya
2017-11-22 7:53 ` Greg KH
2017-11-22 16:24 ` Sinan Kaya
2017-11-22 5:30 ` [PATCH 13/30] iommu/amd: " Sinan Kaya
2017-11-22 5:30 ` [PATCH 14/30] powerpc/powermac: " Sinan Kaya
2017-11-22 5:31 ` Sinan Kaya [this message]
2017-11-22 5:31 ` [PATCH 16/30] pch_gbe: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 17/30] PCI: cpqhp: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 18/30] PCI: ibmphp: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 19/30] PCI/quirks: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 20/30] PCI/syscall: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 21/30] xen: " Sinan Kaya
2017-11-22 12:53 ` Juergen Gross
2017-11-22 5:31 ` [PATCH 22/30] openprom: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 23/30] [media] atomisp: " Sinan Kaya
2017-11-22 12:20 ` Alan Cox
2017-11-22 14:05 ` Sinan Kaya
2017-11-22 14:06 ` Sinan Kaya
2017-11-22 5:31 ` [PATCH 24/30] staging: rts5208: " Sinan Kaya
2017-11-22 7:54 ` Greg Kroah-Hartman
2017-11-22 5:31 ` [PATCH 25/30] backlight: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 26/30] video: fbdev: intelfb: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 27/30] video: fbdev: nvidia: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 28/30] video: fbdev: riva: " Sinan Kaya
2017-11-22 5:31 ` [PATCH 29/30] i7300_idle: " Sinan Kaya
2017-11-22 7:53 ` Greg Kroah-Hartman
2017-11-22 16:15 ` Sinan Kaya
2017-11-22 16:45 ` Greg Kroah-Hartman
2017-11-22 16:50 ` Sinan Kaya
2017-11-22 16:58 ` Greg Kroah-Hartman
2017-11-22 5:31 ` [PATCH 30/30] PCI: remove pci_get_bus_and_slot() function Sinan Kaya
2017-11-22 5:45 ` Timur Tabi
2017-11-22 5:55 ` Sinan Kaya
2017-11-22 6:08 ` Timur Tabi
2017-11-22 7:51 ` Greg KH
2017-11-22 14:42 ` Timur Tabi
2017-11-22 14:49 ` Greg KH
2017-11-22 15:18 ` Sinan Kaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1511328675-21981-16-git-send-email-okaya@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=ariel.elior@cavium.com \
--cc=everest-linux-l2@cavium.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=timur@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).