Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

bnxt_en: Modify bnxt_get_max_rings() to support shared or non shared rings.

Browse Source 
Add logic to calculate how many shared or non shared rings can be
supported.  Default is to use shared rings.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2016-01-02 23:45:02 -05:00 committed by David S. Miller
parent b81a90d302
commit 6e6c5a57fb
3 changed files with 79 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View File

@ -4038,6 +4038,30 @@ static int bnxt_set_real_num_queues(struct bnxt *bp)
return rc; return rc;
} }
static int bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,
bool shared)
{
int _rx = *rx, _tx = *tx;
if (shared) {
*rx = min_t(int, _rx, max);
*tx = min_t(int, _tx, max);
} else {
if (max < 2)
return -ENOMEM;
while (_rx + _tx > max) {
if (_rx > _tx && _rx > 1)
_rx--;
else if (_tx > 1)
_tx--;
}
*rx = _rx;
*tx = _tx;
}
return 0;
}
static int bnxt_setup_msix(struct bnxt *bp) static int bnxt_setup_msix(struct bnxt *bp)
{ {
struct msix_entry *msix_ent; struct msix_entry *msix_ent;
@ -4068,8 +4092,11 @@ static int bnxt_setup_msix(struct bnxt *bp)
int tcs; int tcs;
/* Trim rings based upon num of vectors allocated */ /* Trim rings based upon num of vectors allocated */
bp->rx_nr_rings = min_t(int, total_vecs, bp->rx_nr_rings); rc = bnxt_trim_rings(bp, &bp->rx_nr_rings, &bp->tx_nr_rings,
bp->tx_nr_rings = min_t(int, total_vecs, bp->tx_nr_rings); total_vecs, true);
if (rc)
goto msix_setup_exit;
bp->tx_nr_rings_per_tc = bp->tx_nr_rings; bp->tx_nr_rings_per_tc = bp->tx_nr_rings;
tcs = netdev_get_num_tc(dev); tcs = netdev_get_num_tc(dev);
if (tcs > 1) { if (tcs > 1) {
@ -5337,10 +5364,10 @@ static int bnxt_setup_tc(struct net_device *dev, u8 tc)
return 0; return 0;
if (tc) { if (tc) {
int max_rx_rings, max_tx_rings; int max_rx_rings, max_tx_rings, rc;
bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings); rc = bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, true);
if (bp->tx_nr_rings_per_tc * tc > max_tx_rings) if (rc || bp->tx_nr_rings_per_tc * tc > max_tx_rings)
return -ENOMEM; return -ENOMEM;
} }
@ -5654,31 +5681,62 @@ static int bnxt_get_max_irq(struct pci_dev *pdev)
return (ctrl & PCI_MSIX_FLAGS_QSIZE) + 1; return (ctrl & PCI_MSIX_FLAGS_QSIZE) + 1;
} }
void bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx) static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx,
int *max_cp)
{ {
int max_rings = 0, max_ring_grps = 0; int max_ring_grps = 0;
if (BNXT_PF(bp)) { if (BNXT_PF(bp)) {
*max_tx = bp->pf.max_tx_rings; *max_tx = bp->pf.max_tx_rings;
*max_rx = bp->pf.max_rx_rings; *max_rx = bp->pf.max_rx_rings;
max_rings = min_t(int, bp->pf.max_irqs, bp->pf.max_cp_rings); *max_cp = min_t(int, bp->pf.max_irqs, bp->pf.max_cp_rings);
max_rings = min_t(int, max_rings, bp->pf.max_stat_ctxs); *max_cp = min_t(int, *max_cp, bp->pf.max_stat_ctxs);
max_ring_grps = bp->pf.max_hw_ring_grps; max_ring_grps = bp->pf.max_hw_ring_grps;
} else { } else {
#ifdef CONFIG_BNXT_SRIOV #ifdef CONFIG_BNXT_SRIOV
*max_tx = bp->vf.max_tx_rings; *max_tx = bp->vf.max_tx_rings;
*max_rx = bp->vf.max_rx_rings; *max_rx = bp->vf.max_rx_rings;
max_rings = min_t(int, bp->vf.max_irqs, bp->vf.max_cp_rings); *max_cp = min_t(int, bp->vf.max_irqs, bp->vf.max_cp_rings);
max_rings = min_t(int, max_rings, bp->vf.max_stat_ctxs); *max_cp = min_t(int, *max_cp, bp->vf.max_stat_ctxs);
max_ring_grps = bp->vf.max_hw_ring_grps; max_ring_grps = bp->vf.max_hw_ring_grps;
#endif #endif
} }
if (bp->flags & BNXT_FLAG_AGG_RINGS) if (bp->flags & BNXT_FLAG_AGG_RINGS)
*max_rx >>= 1; *max_rx >>= 1;
*max_rx = min_t(int, *max_rx, max_rings);
*max_rx = min_t(int, *max_rx, max_ring_grps); *max_rx = min_t(int, *max_rx, max_ring_grps);
*max_tx = min_t(int, *max_tx, max_rings); }
int bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx, bool shared)
{
int rx, tx, cp;
_bnxt_get_max_rings(bp, &rx, &tx, &cp);
if (!rx || !tx || !cp)
return -ENOMEM;
*max_rx = rx;
*max_tx = tx;
return bnxt_trim_rings(bp, max_rx, max_tx, cp, shared);
}
static int bnxt_set_dflt_rings(struct bnxt *bp)
{
int dflt_rings, max_rx_rings, max_tx_rings, rc;
bool sh = true;
if (sh)
bp->flags |= BNXT_FLAG_SHARED_RINGS;
dflt_rings = netif_get_num_default_rss_queues();
rc = bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, sh);
if (rc)
return rc;
bp->rx_nr_rings = min_t(int, dflt_rings, max_rx_rings);
bp->tx_nr_rings_per_tc = min_t(int, dflt_rings, max_tx_rings);
bp->tx_nr_rings = bp->tx_nr_rings_per_tc;
bp->cp_nr_rings = sh ? max_t(int, bp->tx_nr_rings, bp->rx_nr_rings) :
bp->tx_nr_rings + bp->rx_nr_rings;
bp->num_stat_ctxs = bp->cp_nr_rings;
return rc;
} }
static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
@ -5686,7 +5744,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
static int version_printed; static int version_printed;
struct net_device *dev; struct net_device *dev;
struct bnxt *bp; struct bnxt *bp;
int rc, max_rx_rings, max_tx_rings, max_irqs, dflt_rings; int rc, max_irqs;
if (version_printed++ == 0) if (version_printed++ == 0)
pr_info("%s", version); pr_info("%s", version);
@ -5765,19 +5823,13 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
bnxt_set_tpa_flags(bp); bnxt_set_tpa_flags(bp);
bnxt_set_ring_params(bp); bnxt_set_ring_params(bp);
dflt_rings = netif_get_num_default_rss_queues();
if (BNXT_PF(bp)) if (BNXT_PF(bp))
bp->pf.max_irqs = max_irqs; bp->pf.max_irqs = max_irqs;
#if defined(CONFIG_BNXT_SRIOV) #if defined(CONFIG_BNXT_SRIOV)
else else
bp->vf.max_irqs = max_irqs; bp->vf.max_irqs = max_irqs;
#endif #endif
bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings); bnxt_set_dflt_rings(bp);
bp->rx_nr_rings = min_t(int, dflt_rings, max_rx_rings);
bp->tx_nr_rings_per_tc = min_t(int, dflt_rings, max_tx_rings);
bp->tx_nr_rings = bp->tx_nr_rings_per_tc;
bp->cp_nr_rings = max_t(int, bp->rx_nr_rings, bp->tx_nr_rings);
bp->num_stat_ctxs = bp->cp_nr_rings;
if (BNXT_PF(bp)) { if (BNXT_PF(bp)) {
dev->hw_features |= NETIF_F_NTUPLE; dev->hw_features |= NETIF_F_NTUPLE;

4
drivers/net/ethernet/broadcom/bnxt/bnxt.h
View File

@ -877,6 +877,8 @@ struct bnxt {
#define BNXT_FLAG_USING_MSIX 0x40 #define BNXT_FLAG_USING_MSIX 0x40
#define BNXT_FLAG_MSIX_CAP 0x80 #define BNXT_FLAG_MSIX_CAP 0x80
#define BNXT_FLAG_RFS 0x100 #define BNXT_FLAG_RFS 0x100
#define BNXT_FLAG_SHARED_RINGS 0x200
#define BNXT_FLAG_ALL_CONFIG_FEATS (BNXT_FLAG_TPA | \ #define BNXT_FLAG_ALL_CONFIG_FEATS (BNXT_FLAG_TPA | \
BNXT_FLAG_RFS | \ BNXT_FLAG_RFS | \
BNXT_FLAG_STRIP_VLAN) BNXT_FLAG_STRIP_VLAN)
@ -1096,5 +1098,5 @@ int bnxt_hwrm_set_pause(struct bnxt *);
int bnxt_hwrm_set_link_setting(struct bnxt *, bool); int bnxt_hwrm_set_link_setting(struct bnxt *, bool);
int bnxt_open_nic(struct bnxt *, bool, bool); int bnxt_open_nic(struct bnxt *, bool, bool);
int bnxt_close_nic(struct bnxt *, bool, bool); int bnxt_close_nic(struct bnxt *, bool, bool);
void bnxt_get_max_rings(struct bnxt *, int *, int *); int bnxt_get_max_rings(struct bnxt *, int *, int *, bool);
#endif #endif

4
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
View File

@ -211,7 +211,7 @@ static void bnxt_get_channels(struct net_device *dev,
struct bnxt *bp = netdev_priv(dev); struct bnxt *bp = netdev_priv(dev);
int max_rx_rings, max_tx_rings, tcs; int max_rx_rings, max_tx_rings, tcs;
bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings); bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, true);
tcs = netdev_get_num_tc(dev); tcs = netdev_get_num_tc(dev);
if (tcs > 1) if (tcs > 1)
max_tx_rings /= tcs; max_tx_rings /= tcs;
@ -235,7 +235,7 @@ static int bnxt_set_channels(struct net_device *dev,
!channel->rx_count || !channel->tx_count) !channel->rx_count || !channel->tx_count)
return -EINVAL; return -EINVAL;
bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings); bnxt_get_max_rings(bp, &max_rx_rings, &max_tx_rings, true);
tcs = netdev_get_num_tc(dev); tcs = netdev_get_num_tc(dev);
if (tcs > 1) if (tcs > 1)
max_tx_rings /= tcs; max_tx_rings /= tcs;