Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b6b34df authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Fix bug in ethtool -L. 



When changing channels from combined to rx/tx or vice versa, the code
uses the wrong "sh" parameter to determine if we are reserving rings
for shared or non-shared mode.  It should be using the ethtool requested
"sh" parameter instead of the current "sh" parameter.

Fix it by passing the "sh" parameter to bnxt_reserve_rings().  For
ethtool, we will pass in the requested "sh" parameter.

Fixes: 391be5c2 ("bnxt_en: Implement new scheme to reserve tx rings.")
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f9b76ebd

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+3 −6
Original line number Diff line number Diff line
@@ -6918,16 +6918,13 @@ static void bnxt_sp_task(struct work_struct *work) 
}



/* Under rtnl_lock */

int bnxt_reserve_rings(struct bnxt *bp, int tx, int rx, int tcs, int tx_xdp)

int bnxt_reserve_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,

		       int tx_xdp)

{

	int max_rx, max_tx, tx_sets = 1;

	int tx_rings_needed;

	bool sh = true;

	int rc;



	if (!(bp->flags & BNXT_FLAG_SHARED_RINGS))

		sh = false;



	if (tcs)

		tx_sets = tcs;
@@ -7135,7 +7132,7 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc) 
		sh = true;



	rc = bnxt_reserve_rings(bp, bp->tx_nr_rings_per_tc, bp->rx_nr_rings,

				tc, bp->tx_nr_rings_xdp);

				sh, tc, bp->tx_nr_rings_xdp);

	if (rc)

		return rc;

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+2 −1
Original line number Diff line number Diff line
@@ -1301,7 +1301,8 @@ int bnxt_open_nic(struct bnxt *, bool, bool); 
int bnxt_half_open_nic(struct bnxt *bp);

void bnxt_half_close_nic(struct bnxt *bp);

int bnxt_close_nic(struct bnxt *, bool, bool);

int bnxt_reserve_rings(struct bnxt *bp, int tx, int rx, int tcs, int tx_xdp);

int bnxt_reserve_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,

		       int tx_xdp);

int bnxt_setup_mq_tc(struct net_device *dev, u8 tc);

int bnxt_get_max_rings(struct bnxt *, int *, int *, bool);

void bnxt_restore_pf_fw_resources(struct bnxt *bp);

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+2 −1
Original line number Diff line number Diff line
@@ -432,7 +432,8 @@ static int bnxt_set_channels(struct net_device *dev, 
		}

		tx_xdp = req_rx_rings;

	}

	rc = bnxt_reserve_rings(bp, req_tx_rings, req_rx_rings, tcs, tx_xdp);

	rc = bnxt_reserve_rings(bp, req_tx_rings, req_rx_rings, sh, tcs,

				tx_xdp);

	if (rc) {

		netdev_warn(dev, "Unable to allocate the requested rings\n");

		return rc;

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) 
	if (!tc)

		tc = 1;

	rc = bnxt_reserve_rings(bp, bp->tx_nr_rings_per_tc, bp->rx_nr_rings,

				tc, tx_xdp);

				true, tc, tx_xdp);

	if (rc) {

		netdev_warn(dev, "Unable to reserve enough TX rings to support XDP.\n");

		return rc;