iavf: Fix reporting when setting descriptor count
iavf_set_ringparams doesn't communicate to the user that
1. The user requested descriptor count is out of range. Instead it
just quietly sets descriptors to the "clamped" value and calls it
done. This makes it look an invalid value was successfully set as
the descriptor count when this isn't actually true.
2. The user provided descriptor count needs to be inflated for alignment
reasons.
This behavior is confusing. The ice driver has already addressed this
by rejecting invalid values for descriptor count and
messaging for alignment adjustments.
Do the same thing here by adding the error and info messages.
Fixes: fbb7ddfef2
("i40evf: core ethtool functionality")
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Signed-off-by: Michal Maloszewski <michal.maloszewski@intel.com>
Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
parent
7e4dcc1396
commit
1a1aa356dd
|
@ -615,23 +615,44 @@ static int iavf_set_ringparam(struct net_device *netdev,
|
||||||
if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
|
if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
new_tx_count = clamp_t(u32, ring->tx_pending,
|
if (ring->tx_pending > IAVF_MAX_TXD ||
|
||||||
IAVF_MIN_TXD,
|
ring->tx_pending < IAVF_MIN_TXD ||
|
||||||
IAVF_MAX_TXD);
|
ring->rx_pending > IAVF_MAX_RXD ||
|
||||||
new_tx_count = ALIGN(new_tx_count, IAVF_REQ_DESCRIPTOR_MULTIPLE);
|
ring->rx_pending < IAVF_MIN_RXD) {
|
||||||
|
netdev_err(netdev, "Descriptors requested (Tx: %d / Rx: %d) out of range [%d-%d] (increment %d)\n",
|
||||||
|
ring->tx_pending, ring->rx_pending, IAVF_MIN_TXD,
|
||||||
|
IAVF_MAX_RXD, IAVF_REQ_DESCRIPTOR_MULTIPLE);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
new_rx_count = clamp_t(u32, ring->rx_pending,
|
new_tx_count = ALIGN(ring->tx_pending, IAVF_REQ_DESCRIPTOR_MULTIPLE);
|
||||||
IAVF_MIN_RXD,
|
if (new_tx_count != ring->tx_pending)
|
||||||
IAVF_MAX_RXD);
|
netdev_info(netdev, "Requested Tx descriptor count rounded up to %d\n",
|
||||||
new_rx_count = ALIGN(new_rx_count, IAVF_REQ_DESCRIPTOR_MULTIPLE);
|
new_tx_count);
|
||||||
|
|
||||||
|
new_rx_count = ALIGN(ring->rx_pending, IAVF_REQ_DESCRIPTOR_MULTIPLE);
|
||||||
|
if (new_rx_count != ring->rx_pending)
|
||||||
|
netdev_info(netdev, "Requested Rx descriptor count rounded up to %d\n",
|
||||||
|
new_rx_count);
|
||||||
|
|
||||||
/* if nothing to do return success */
|
/* if nothing to do return success */
|
||||||
if ((new_tx_count == adapter->tx_desc_count) &&
|
if ((new_tx_count == adapter->tx_desc_count) &&
|
||||||
(new_rx_count == adapter->rx_desc_count))
|
(new_rx_count == adapter->rx_desc_count)) {
|
||||||
|
netdev_dbg(netdev, "Nothing to change, descriptor count is same as requested\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
adapter->tx_desc_count = new_tx_count;
|
if (new_tx_count != adapter->tx_desc_count) {
|
||||||
adapter->rx_desc_count = new_rx_count;
|
netdev_dbg(netdev, "Changing Tx descriptor count from %d to %d\n",
|
||||||
|
adapter->tx_desc_count, new_tx_count);
|
||||||
|
adapter->tx_desc_count = new_tx_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (new_rx_count != adapter->rx_desc_count) {
|
||||||
|
netdev_dbg(netdev, "Changing Rx descriptor count from %d to %d\n",
|
||||||
|
adapter->rx_desc_count, new_rx_count);
|
||||||
|
adapter->rx_desc_count = new_rx_count;
|
||||||
|
}
|
||||||
|
|
||||||
if (netif_running(netdev)) {
|
if (netif_running(netdev)) {
|
||||||
adapter->flags |= IAVF_FLAG_RESET_NEEDED;
|
adapter->flags |= IAVF_FLAG_RESET_NEEDED;
|
||||||
|
|
Loading…
Reference in New Issue