提交 6389b76d 编写于 作者: M Manish Chopra 提交者: David S. Miller

qlcnic: Enhance channel configuration logs

o Add logs for various failure conditions during channel configuration.
Signed-off-by: NManish Chopra <manish.chopra@qlogic.com>
Signed-off-by: NShahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: NJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 01f27fc0
...@@ -1474,7 +1474,7 @@ void qlcnic_diag_free_res(struct net_device *netdev, int max_sds_rings); ...@@ -1474,7 +1474,7 @@ void qlcnic_diag_free_res(struct net_device *netdev, int max_sds_rings);
int qlcnic_diag_alloc_res(struct net_device *netdev, int test); int qlcnic_diag_alloc_res(struct net_device *netdev, int test);
netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev); netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev);
int qlcnic_set_max_rss(struct qlcnic_adapter *, u8, size_t); int qlcnic_set_max_rss(struct qlcnic_adapter *, u8, size_t);
int qlcnic_validate_max_rss(u8, u8); int qlcnic_validate_max_rss(struct qlcnic_adapter *, __u32);
void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter); void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter);
int qlcnic_enable_msix(struct qlcnic_adapter *, u32); int qlcnic_enable_msix(struct qlcnic_adapter *, u32);
......
...@@ -635,7 +635,7 @@ static int qlcnic_set_channels(struct net_device *dev, ...@@ -635,7 +635,7 @@ static int qlcnic_set_channels(struct net_device *dev,
channel->tx_count != channel->max_tx) channel->tx_count != channel->max_tx)
return -EINVAL; return -EINVAL;
err = qlcnic_validate_max_rss(channel->max_rx, channel->rx_count); err = qlcnic_validate_max_rss(adapter, channel->rx_count);
if (err) if (err)
return err; return err;
......
...@@ -3273,20 +3273,40 @@ qlcnicvf_start_firmware(struct qlcnic_adapter *adapter) ...@@ -3273,20 +3273,40 @@ qlcnicvf_start_firmware(struct qlcnic_adapter *adapter)
return err; return err;
} }
int qlcnic_validate_max_rss(u8 max_hw, u8 val) int qlcnic_validate_max_rss(struct qlcnic_adapter *adapter,
__u32 val)
{ {
struct net_device *netdev = adapter->netdev;
u8 max_hw = adapter->ahw->max_rx_ques;
u32 max_allowed; u32 max_allowed;
if (max_hw > QLC_MAX_SDS_RINGS) { if (val > QLC_MAX_SDS_RINGS) {
max_hw = QLC_MAX_SDS_RINGS; netdev_err(netdev, "RSS value should not be higher than %u\n",
pr_info("max rss reset to %d\n", QLC_MAX_SDS_RINGS); QLC_MAX_SDS_RINGS);
return -EINVAL;
} }
max_allowed = rounddown_pow_of_two(min_t(int, max_hw, max_allowed = rounddown_pow_of_two(min_t(int, max_hw,
num_online_cpus())); num_online_cpus()));
if ((val > max_allowed) || (val < 2) || !is_power_of_2(val)) { if ((val > max_allowed) || (val < 2) || !is_power_of_2(val)) {
pr_info("rss_ring valid range [2 - %x] in powers of 2\n", if (!is_power_of_2(val))
max_allowed); netdev_err(netdev, "RSS value should be a power of 2\n");
if (val < 2)
netdev_err(netdev, "RSS value should not be lower than 2\n");
if (val > max_hw)
netdev_err(netdev,
"RSS value should not be higher than[%u], the max RSS rings supported by the adapter\n",
max_hw);
if (val > num_online_cpus())
netdev_err(netdev,
"RSS value should not be higher than[%u], number of online CPUs in the system\n",
num_online_cpus());
netdev_err(netdev, "Unable to configure %u RSS rings\n", val);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册