Re: [PATCH net-next] liquidio: fix wrong info about vf rx/tx ring parameters reported to ethtool

[David Miller]

From: Felix Manlunas 
Date: Mon, 7 Aug 2017 10:39:00 -0700

> From: Intiyaz Basha 
> 
> Information reported to ethtool about vf rx/tx ring parameters is wrong.
> Fix it by adding the missing initializations.
> 
> Signed-off-by: Intiyaz Basha 
> Signed-off-by: Felix Manlunas 

Applied.

[PATCH net-next] liquidio: fix wrong info about vf rx/tx ring parameters reported to ethtool

[Felix Manlunas]

From: Intiyaz Basha 

Information reported to ethtool about vf rx/tx ring parameters is wrong.
Fix it by adding the missing initializations.

Signed-off-by: Intiyaz Basha 
Signed-off-by: Felix Manlunas 
---
 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 30 +++---
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c 
b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index 09e2875..b78e296 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
@@ -649,33 +649,21 @@ lio_ethtool_get_ringparam(struct net_device *netdev,
rx_max_pending = CN6XXX_MAX_OQ_DESCRIPTORS;
rx_pending = CFG_GET_NUM_RX_DESCS_NIC_IF(conf6x, lio->ifidx);
tx_pending = CFG_GET_NUM_TX_DESCS_NIC_IF(conf6x, lio->ifidx);
-   } else if (OCTEON_CN23XX_PF(oct)) {
-   struct octeon_config *conf23 = CHIP_CONF(oct, cn23xx_pf);
-
+   } else if (OCTEON_CN23XX_PF(oct) || OCTEON_CN23XX_VF(oct)) {
tx_max_pending = CN23XX_MAX_IQ_DESCRIPTORS;
rx_max_pending = CN23XX_MAX_OQ_DESCRIPTORS;
-   rx_pending = CFG_GET_NUM_RX_DESCS_NIC_IF(conf23, lio->ifidx);
-   tx_pending = CFG_GET_NUM_TX_DESCS_NIC_IF(conf23, lio->ifidx);
-   }
-
-   if (lio->mtu > OCTNET_DEFAULT_FRM_SIZE - OCTNET_FRM_HEADER_SIZE) {
-   ering->rx_pending = 0;
-   ering->rx_max_pending = 0;
-   ering->rx_mini_pending = 0;
-   ering->rx_jumbo_pending = rx_pending;
-   ering->rx_mini_max_pending = 0;
-   ering->rx_jumbo_max_pending = rx_max_pending;
-   } else {
-   ering->rx_pending = rx_pending;
-   ering->rx_max_pending = rx_max_pending;
-   ering->rx_mini_pending = 0;
-   ering->rx_jumbo_pending = 0;
-   ering->rx_mini_max_pending = 0;
-   ering->rx_jumbo_max_pending = 0;
+   rx_pending = oct->droq[0]->max_count;
+   tx_pending = oct->instr_queue[0]->max_count;
}
 
ering->tx_pending = tx_pending;
ering->tx_max_pending = tx_max_pending;
+   ering->rx_pending = rx_pending;
+   ering->rx_max_pending = rx_max_pending;
+   ering->rx_mini_pending = 0;
+   ering->rx_jumbo_pending = 0;
+   ering->rx_mini_max_pending = 0;
+   ering->rx_jumbo_max_pending = 0;
 }
 
 static u32 lio_get_msglevel(struct net_device *netdev)