hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bnx2x: Deprecate pci_get_bus_and_slot() 

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 <okaya@codeaurora.org>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Acked-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sinan Kaya 2017-12-19 00:37:49 -05:00 committed by Bjorn Helgaas
parent 67c8d32692
commit 8307f1a011
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
View File

@ -812,7 +812,7 @@ static u8 bnx2x_vf_is_pcie_pending(struct bnx2x *bp, u8 abs_vfid)
if (!vf) if (!vf)
return false; 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) if (dev)
return bnx2x_is_pcie_pending(dev); return bnx2x_is_pcie_pending(dev);
return false; return false;
@ -1041,6 +1041,13 @@ void bnx2x_iov_init_dmae(struct bnx2x *bp)
REG_WR(bp, DMAE_REG_BACKWARD_COMP_EN, 0); 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) static int bnx2x_vf_bus(struct bnx2x *bp, int vfid)
{ {
struct pci_dev *dev = bp->pdev; 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); struct bnx2x_virtf *vf = BP_VF(bp, vfid);
/* fill in the BDF and bars */ /* fill in the BDF and bars */
vf->domain = bnx2x_vf_domain(bp, vfid);
vf->bus = bnx2x_vf_bus(bp, vfid); vf->bus = bnx2x_vf_bus(bp, vfid);
vf->devfn = bnx2x_vf_devfn(bp, vfid); vf->devfn = bnx2x_vf_devfn(bp, vfid);
bnx2x_vf_set_bars(bp, vf); bnx2x_vf_set_bars(bp, vf);

1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
View File

@ -182,6 +182,7 @@ struct bnx2x_virtf {
u32 error; /* 0 means all's-well */ u32 error; /* 0 means all's-well */
/* BDF */ /* BDF */
unsigned int domain;
unsigned int bus; unsigned int bus;
unsigned int devfn; unsigned int devfn;