mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
bnxt_en: Fix compile errors when CONFIG_BNXT_SRIOV is not set.
struct bnxt_pf_info needs to be always defined. Move bnxt_update_vf_mac() to bnxt_sriov.c and add some missing #ifdef CONFIG_BNXT_SRIOV. Reported-by: Jim Hull <jim.hull@hpe.com> Tested-by: Jim Hull <jim.hull@hpe.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
bf7958607d
commit
379a80a1d0
4 changed files with 40 additions and 28 deletions
|
@ -3645,6 +3645,7 @@ static int bnxt_hwrm_func_qcaps(struct bnxt *bp)
|
|||
pf->max_rx_em_flows = le32_to_cpu(resp->max_rx_em_flows);
|
||||
pf->max_rx_wm_flows = le32_to_cpu(resp->max_rx_wm_flows);
|
||||
} else {
|
||||
#ifdef CONFIG_BNXT_SRIOV
|
||||
struct bnxt_vf_info *vf = &bp->vf;
|
||||
|
||||
vf->fw_fid = le16_to_cpu(resp->fid);
|
||||
|
@ -3659,6 +3660,7 @@ static int bnxt_hwrm_func_qcaps(struct bnxt *bp)
|
|||
vf->max_l2_ctxs = le16_to_cpu(resp->max_l2_ctxs);
|
||||
vf->max_vnics = le16_to_cpu(resp->max_vnics);
|
||||
vf->max_stat_ctxs = le16_to_cpu(resp->max_stat_ctx);
|
||||
#endif
|
||||
}
|
||||
|
||||
bp->tx_push_thresh = 0;
|
||||
|
@ -3880,30 +3882,6 @@ static int bnxt_alloc_rfs_vnics(struct bnxt *bp)
|
|||
#endif
|
||||
}
|
||||
|
||||
static void bnxt_update_vf_mac(struct bnxt *bp)
|
||||
{
|
||||
struct hwrm_func_qcaps_input req = {0};
|
||||
struct hwrm_func_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
|
||||
|
||||
bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_QCAPS, -1, -1);
|
||||
req.fid = cpu_to_le16(0xffff);
|
||||
|
||||
mutex_lock(&bp->hwrm_cmd_lock);
|
||||
if (_hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT))
|
||||
goto update_vf_mac_exit;
|
||||
|
||||
if (!is_valid_ether_addr(resp->perm_mac_address))
|
||||
goto update_vf_mac_exit;
|
||||
|
||||
if (ether_addr_equal(resp->perm_mac_address, bp->vf.mac_addr))
|
||||
goto update_vf_mac_exit;
|
||||
|
||||
memcpy(bp->vf.mac_addr, resp->perm_mac_address, ETH_ALEN);
|
||||
memcpy(bp->dev->dev_addr, bp->vf.mac_addr, ETH_ALEN);
|
||||
update_vf_mac_exit:
|
||||
mutex_unlock(&bp->hwrm_cmd_lock);
|
||||
}
|
||||
|
||||
static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)
|
||||
{
|
||||
int rc = 0;
|
||||
|
@ -5581,7 +5559,7 @@ static int bnxt_get_max_irq(struct pci_dev *pdev)
|
|||
|
||||
void bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx)
|
||||
{
|
||||
int max_rings;
|
||||
int max_rings = 0;
|
||||
|
||||
if (BNXT_PF(bp)) {
|
||||
*max_tx = bp->pf.max_pf_tx_rings;
|
||||
|
@ -5589,10 +5567,12 @@ void bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx)
|
|||
max_rings = min_t(int, bp->pf.max_irqs, bp->pf.max_cp_rings);
|
||||
max_rings = min_t(int, max_rings, bp->pf.max_stat_ctxs);
|
||||
} else {
|
||||
#ifdef CONFIG_BNXT_SRIOV
|
||||
*max_tx = bp->vf.max_tx_rings;
|
||||
*max_rx = bp->vf.max_rx_rings;
|
||||
max_rings = min_t(int, bp->vf.max_irqs, bp->vf.max_cp_rings);
|
||||
max_rings = min_t(int, max_rings, bp->vf.max_stat_ctxs);
|
||||
#endif
|
||||
}
|
||||
if (bp->flags & BNXT_FLAG_AGG_RINGS)
|
||||
*max_rx >>= 1;
|
||||
|
@ -5696,8 +5676,10 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
memcpy(dev->dev_addr, bp->pf.mac_addr, ETH_ALEN);
|
||||
bp->pf.max_irqs = max_irqs;
|
||||
} else {
|
||||
#if defined(CONFIG_BNXT_SRIOV)
|
||||
memcpy(dev->dev_addr, bp->vf.mac_addr, ETH_ALEN);
|
||||
bp->vf.max_irqs = max_irqs;
|
||||
#endif
|
||||
}
|
||||
bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings);
|
||||
bp->rx_nr_rings = min_t(int, dflt_rings, max_rx_rings);
|
||||
|
|
|
@ -709,6 +709,7 @@ struct bnxt_vf_info {
|
|||
void *hwrm_cmd_req_addr;
|
||||
dma_addr_t hwrm_cmd_req_dma_addr;
|
||||
};
|
||||
#endif
|
||||
|
||||
struct bnxt_pf_info {
|
||||
#define BNXT_FIRST_PF_FID 1
|
||||
|
@ -741,7 +742,6 @@ struct bnxt_pf_info {
|
|||
dma_addr_t hwrm_cmd_req_dma_addr[4];
|
||||
struct bnxt_vf_info *vf;
|
||||
};
|
||||
#endif
|
||||
|
||||
struct bnxt_ntuple_filter {
|
||||
struct hlist_node hash;
|
||||
|
@ -960,9 +960,9 @@ struct bnxt {
|
|||
#define BNXT_RESET_TASK_SP_EVENT 32
|
||||
#define BNXT_RST_RING_SP_EVENT 64
|
||||
|
||||
struct bnxt_pf_info pf;
|
||||
#ifdef CONFIG_BNXT_SRIOV
|
||||
int nr_vfs;
|
||||
struct bnxt_pf_info pf;
|
||||
struct bnxt_vf_info vf;
|
||||
wait_queue_head_t sriov_cfg_wait;
|
||||
bool sriov_cfg;
|
||||
|
|
|
@ -774,6 +774,31 @@ void bnxt_hwrm_exec_fwd_req(struct bnxt *bp)
|
|||
i = vf_id + 1;
|
||||
}
|
||||
}
|
||||
|
||||
void bnxt_update_vf_mac(struct bnxt *bp)
|
||||
{
|
||||
struct hwrm_func_qcaps_input req = {0};
|
||||
struct hwrm_func_qcaps_output *resp = bp->hwrm_cmd_resp_addr;
|
||||
|
||||
bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_QCAPS, -1, -1);
|
||||
req.fid = cpu_to_le16(0xffff);
|
||||
|
||||
mutex_lock(&bp->hwrm_cmd_lock);
|
||||
if (_hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT))
|
||||
goto update_vf_mac_exit;
|
||||
|
||||
if (!is_valid_ether_addr(resp->perm_mac_address))
|
||||
goto update_vf_mac_exit;
|
||||
|
||||
if (ether_addr_equal(resp->perm_mac_address, bp->vf.mac_addr))
|
||||
goto update_vf_mac_exit;
|
||||
|
||||
memcpy(bp->vf.mac_addr, resp->perm_mac_address, ETH_ALEN);
|
||||
memcpy(bp->dev->dev_addr, bp->vf.mac_addr, ETH_ALEN);
|
||||
update_vf_mac_exit:
|
||||
mutex_unlock(&bp->hwrm_cmd_lock);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
void bnxt_sriov_disable(struct bnxt *bp)
|
||||
|
@ -782,6 +807,10 @@ void bnxt_sriov_disable(struct bnxt *bp)
|
|||
|
||||
void bnxt_hwrm_exec_fwd_req(struct bnxt *bp)
|
||||
{
|
||||
netdev_err(dev, "Invalid VF message received when SRIOV is not enable\n");
|
||||
netdev_err(bp->dev, "Invalid VF message received when SRIOV is not enable\n");
|
||||
}
|
||||
|
||||
void bnxt_update_vf_mac(struct bnxt *bp)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -19,4 +19,5 @@ int bnxt_set_vf_spoofchk(struct net_device *, int, bool);
|
|||
int bnxt_sriov_configure(struct pci_dev *pdev, int num_vfs);
|
||||
void bnxt_sriov_disable(struct bnxt *);
|
||||
void bnxt_hwrm_exec_fwd_req(struct bnxt *);
|
||||
void bnxt_update_vf_mac(struct bnxt *);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue