Commit 8e0ddc04 authored May 05, 2016 by Sudarsana Reddy Kalluru Committed by David S. Miller May 06, 2016

qede: prevent chip hang when increasing channels



qede requires qed to provide enough resources to accommodate 16 combined
channels, but that upper-bound isn't actually being enforced by it.
Instead, qed inform back to qede how many channels can be opened based on
available resources - but that calculation doesn't really take into account
the resources requested by qede; Instead it considers other FW/HW available
resources.

As a result, if a user would increase the number of channels to more than
16 [e.g., using ethtool] the chip would hang.

This change increments the resources requested by qede to 64 combined
channels instead of 16; This value is an upper bound on the possible
available channels [due to other FW/HW resources].

Signed-off-by: Sudarsana Reddy Kalluru <sudarsana.kalluru@qlogic.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1d2f7b2d

drivers/net/ethernet/qlogic/qede/qede_main.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1938,8 +1938,6 @@ static struct qede_dev qede_alloc_etherdev(struct qed_dev cdev,
		edev->q_num_rx_buffers = NUM_RX_BDS_DEF;
		edev->q_num_tx_buffers = NUM_TX_BDS_DEF;

		DP_INFO(edev, "Allocated netdev with 64 tx queues and 64 rx queues\n");

		SET_NETDEV_DEV(ndev, &pdev->dev);

		memset(&edev->stats, 0, sizeof(edev->stats));
		@@ -2090,9 +2088,9 @@ static void qede_update_pf_params(struct qed_dev *cdev)
		{
		struct qed_pf_params pf_params;

		/* 16 rx + 16 tx */
		/* 64 rx + 64 tx */
		memset(&pf_params, 0, sizeof(struct qed_pf_params));
		pf_params.eth_pf_params.num_cons = 32;
		pf_params.eth_pf_params.num_cons = 128;
		qed_ops->common->update_pf_params(cdev, &pf_params);
		}

Admin message