Commit e6a095af authored by Jiawen Wu's avatar Jiawen Wu Committed by Duanqiang Wen
Browse files

net: wangxun: add ethtool_ops for ring parameters 

mainline inclusion
from mainline-v6.8-rc1
commit 883b5984a5d2900468af5ab979cae90547a78da4
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I93QRU
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=883b5984a5d2900468af5ab979cae90547a78da4



---------------------------------------------------------

Support to query RX/TX depth with ethtool -g, and change RX/TX depth
with ethtool -G.

Signed-off-by: default avatarJiawen Wu <jiawenwu@trustnetic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDuanqiang Wen <duanqiangwen@net-swift.com>
parent 601f50f0

drivers/net/ethernet/wangxun/libwx/wx_ethtool.c

+18 −0
Original line number Diff line number Diff line
@@ -229,3 +229,21 @@ int wx_set_pauseparam(struct net_device *netdev, 
	return phylink_ethtool_set_pauseparam(wx->phylink, pause);

}

EXPORT_SYMBOL(wx_set_pauseparam);



void wx_get_ringparam(struct net_device *netdev,

		      struct ethtool_ringparam *ring,

		      struct kernel_ethtool_ringparam *kernel_ring,

		      struct netlink_ext_ack *extack)

{

	struct wx *wx = netdev_priv(netdev);



	ring->rx_max_pending = WX_MAX_RXD;

	ring->tx_max_pending = WX_MAX_TXD;

	ring->rx_mini_max_pending = 0;

	ring->rx_jumbo_max_pending = 0;

	ring->rx_pending = wx->rx_ring_count;

	ring->tx_pending = wx->tx_ring_count;

	ring->rx_mini_pending = 0;

	ring->rx_jumbo_pending = 0;

}

EXPORT_SYMBOL(wx_get_ringparam);

drivers/net/ethernet/wangxun/libwx/wx_ethtool.h

+4 −0
Original line number Diff line number Diff line
@@ -22,4 +22,8 @@ void wx_get_pauseparam(struct net_device *netdev, 
		       struct ethtool_pauseparam *pause);

int wx_set_pauseparam(struct net_device *netdev,

		      struct ethtool_pauseparam *pause);

void wx_get_ringparam(struct net_device *netdev,

		      struct ethtool_ringparam *ring,

		      struct kernel_ethtool_ringparam *kernel_ring,

		      struct netlink_ext_ack *extack);

#endif /* _WX_ETHTOOL_H_ */

drivers/net/ethernet/wangxun/libwx/wx_lib.c

+66 −0
Original line number Diff line number Diff line
@@ -2671,4 +2671,70 @@ int wx_set_features(struct net_device *netdev, netdev_features_t features) 
}

EXPORT_SYMBOL(wx_set_features);



void wx_set_ring(struct wx *wx, u32 new_tx_count,

		 u32 new_rx_count, struct wx_ring *temp_ring)

{

	int i, err = 0;



	/* Setup new Tx resources and free the old Tx resources in that order.

	 * We can then assign the new resources to the rings via a memcpy.

	 * The advantage to this approach is that we are guaranteed to still

	 * have resources even in the case of an allocation failure.

	 */

	if (new_tx_count != wx->tx_ring_count) {

		for (i = 0; i < wx->num_tx_queues; i++) {

			memcpy(&temp_ring[i], wx->tx_ring[i],

			       sizeof(struct wx_ring));



			temp_ring[i].count = new_tx_count;

			err = wx_setup_tx_resources(&temp_ring[i]);

			if (err) {

				wx_err(wx, "setup new tx resources failed, keep using the old config\n");

				while (i) {

					i--;

					wx_free_tx_resources(&temp_ring[i]);

				}

				return;

			}

		}



		for (i = 0; i < wx->num_tx_queues; i++) {

			wx_free_tx_resources(wx->tx_ring[i]);



			memcpy(wx->tx_ring[i], &temp_ring[i],

			       sizeof(struct wx_ring));

		}



		wx->tx_ring_count = new_tx_count;

	}



	/* Repeat the process for the Rx rings if needed */

	if (new_rx_count != wx->rx_ring_count) {

		for (i = 0; i < wx->num_rx_queues; i++) {

			memcpy(&temp_ring[i], wx->rx_ring[i],

			       sizeof(struct wx_ring));



			temp_ring[i].count = new_rx_count;

			err = wx_setup_rx_resources(&temp_ring[i]);

			if (err) {

				wx_err(wx, "setup new rx resources failed, keep using the old config\n");

				while (i) {

					i--;

					wx_free_rx_resources(&temp_ring[i]);

				}

				return;

			}

		}



		for (i = 0; i < wx->num_rx_queues; i++) {

			wx_free_rx_resources(wx->rx_ring[i]);

			memcpy(wx->rx_ring[i], &temp_ring[i],

			       sizeof(struct wx_ring));

		}



		wx->rx_ring_count = new_rx_count;

	}

}

EXPORT_SYMBOL(wx_set_ring);



MODULE_LICENSE("GPL");

drivers/net/ethernet/wangxun/libwx/wx_lib.h

+2 −0
Original line number Diff line number Diff line
@@ -29,5 +29,7 @@ int wx_setup_resources(struct wx *wx); 
void wx_get_stats64(struct net_device *netdev,

		    struct rtnl_link_stats64 *stats);

int wx_set_features(struct net_device *netdev, netdev_features_t features);

void wx_set_ring(struct wx *wx, u32 new_tx_count,

		 u32 new_rx_count, struct wx_ring *temp_ring);



#endif /* _NGBE_LIB_H_ */

drivers/net/ethernet/wangxun/libwx/wx_type.h

+6 −0
Original line number Diff line number Diff line
@@ -412,6 +412,12 @@ enum WX_MSCA_CMD_value { 


#define WX_MAX_RXD                   8192

#define WX_MAX_TXD                   8192

#define WX_MIN_RXD                   128

#define WX_MIN_TXD                   128



/* Number of Transmit and Receive Descriptors must be a multiple of 8 */

#define WX_REQ_RX_DESCRIPTOR_MULTIPLE   8

#define WX_REQ_TX_DESCRIPTOR_MULTIPLE   8



#define WX_MAX_JUMBO_FRAME_SIZE      9432 /* max payload 9414 */

#define VMDQ_P(p)                    p