mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-20 15:58:37 +07:00
bnxt_en: Do not modify max_stat_ctxs after RDMA driver requests/frees stat_ctxs
Calling bnxt_set_max_func_stat_ctxs() to modify max stat_ctxs requested or freed by the RDMA driver is wrong. After introducing reservation of resources recently, the driver has to keep track of all stat_ctxs including the ones used by the RDMA driver. This will provide a better foundation for accurate accounting of the stat_ctxs. Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c027c6b4e9
commit
f4e896142d
@ -7035,11 +7035,6 @@ unsigned int bnxt_get_max_func_stat_ctxs(struct bnxt *bp)
|
||||
return bp->hw_resc.max_stat_ctxs;
|
||||
}
|
||||
|
||||
void bnxt_set_max_func_stat_ctxs(struct bnxt *bp, unsigned int max)
|
||||
{
|
||||
bp->hw_resc.max_stat_ctxs = max;
|
||||
}
|
||||
|
||||
unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp)
|
||||
{
|
||||
return bp->hw_resc.max_cp_rings;
|
||||
|
@ -1687,7 +1687,6 @@ int bnxt_hwrm_vnic_cfg(struct bnxt *bp, u16 vnic_id);
|
||||
int __bnxt_hwrm_get_tx_rings(struct bnxt *bp, u16 fid, int *tx_rings);
|
||||
int bnxt_hwrm_set_coal(struct bnxt *);
|
||||
unsigned int bnxt_get_max_func_stat_ctxs(struct bnxt *bp);
|
||||
void bnxt_set_max_func_stat_ctxs(struct bnxt *bp, unsigned int max);
|
||||
unsigned int bnxt_get_avail_stat_ctxs_for_en(struct bnxt *bp);
|
||||
unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp);
|
||||
unsigned int bnxt_get_avail_cp_rings_for_en(struct bnxt *bp);
|
||||
|
@ -50,8 +50,6 @@ static int bnxt_register_dev(struct bnxt_en_dev *edev, int ulp_id,
|
||||
if (max_stat_ctxs <= BNXT_MIN_ROCE_STAT_CTXS ||
|
||||
bp->cp_nr_rings == max_stat_ctxs)
|
||||
return -ENOMEM;
|
||||
bnxt_set_max_func_stat_ctxs(bp, max_stat_ctxs -
|
||||
BNXT_MIN_ROCE_STAT_CTXS);
|
||||
}
|
||||
|
||||
atomic_set(&ulp->ref_count, 0);
|
||||
@ -82,14 +80,9 @@ static int bnxt_unregister_dev(struct bnxt_en_dev *edev, int ulp_id)
|
||||
netdev_err(bp->dev, "ulp id %d not registered\n", ulp_id);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (ulp_id == BNXT_ROCE_ULP) {
|
||||
unsigned int max_stat_ctxs;
|
||||
if (ulp_id == BNXT_ROCE_ULP && ulp->msix_requested)
|
||||
edev->en_ops->bnxt_free_msix(edev, ulp_id);
|
||||
|
||||
max_stat_ctxs = bnxt_get_max_func_stat_ctxs(bp);
|
||||
bnxt_set_max_func_stat_ctxs(bp, max_stat_ctxs + 1);
|
||||
if (ulp->msix_requested)
|
||||
edev->en_ops->bnxt_free_msix(edev, ulp_id);
|
||||
}
|
||||
if (ulp->max_async_event_id)
|
||||
bnxt_hwrm_func_rgtr_async_events(bp, NULL, 0);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user