Revert "bnxt_en: Reduce default rings on multi-port cards."

Orabug: 28687746

This reverts commit 143bdb401ce42631af3030f192c8fa6d148b9197.

This commit caused IRQs per dev to be reduced from 8 to 4 which resulted in TPCC throughput dropping by 18%.
Revert this commit so we have 8 IRQs per dev again.

Signed-off-by: Brian Maly <brian.maly@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 6b873b76d9d34c559b20062cea6fdd9068c7c8f2..b5d1d89874d521d34ba04600383903f22f7a19fd 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -6144,8 +6144,6 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)
                link_info->support_auto_speeds =
                        le16_to_cpu(resp->supported_speeds_auto_mode);
 
-       bp->port_count = resp->port_cnt;
-
 hwrm_phy_qcaps_exit:
        mutex_unlock(&bp->hwrm_cmd_lock);
        return rc;
@@ -8247,9 +8245,6 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)
        if (sh)
                bp->flags |= BNXT_FLAG_SHARED_RINGS;
        dflt_rings = netif_get_num_default_rss_queues();
-       /* Reduce default rings to reduce memory usage on multi-port cards */
-       if (bp->port_count > 1)
-               dflt_rings = min_t(int, dflt_rings, 4);
        rc = bnxt_get_dflt_rings(bp, &max_rx_rings, &max_tx_rings, sh);
        if (rc)
                return rc;
@@ -8467,10 +8462,6 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        bnxt_ethtool_init(bp);
        bnxt_dcb_init(bp);
 
-       rc = bnxt_probe_phy(bp);
-       if (rc)
-               goto init_err_pci_clean;
-
        bnxt_set_rx_skb_mode(bp, false);
        bnxt_set_tpa_flags(bp);
        bnxt_set_ring_params(bp);
@@ -8505,6 +8496,10 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (dev->hw_features & NETIF_F_HW_VLAN_CTAG_RX)
                bp->flags |= BNXT_FLAG_STRIP_VLAN;
 
+       rc = bnxt_probe_phy(bp);
+       if (rc)
+               goto init_err_pci_clean;
+
        rc = bnxt_init_int_mode(bp);
        if (rc)
                goto init_err_pci_clean;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 968a70298d18ecedad03b23dfa00383726414e18..875d943510c91524bb54b0488183a5de70eb8e72 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1200,7 +1200,6 @@ struct bnxt {
        u8                      nge_port_cnt;
        __le16                  nge_fw_dst_port_id;
        u8                      port_partition_type;
-       u8                      port_count;
        u16                     br_mode;
 
        struct bnxt_coal        rx_coal;