Skip to content

Commit

Permalink
net: txgbe: fix to control VLAN strip
Browse files Browse the repository at this point in the history 
When VLAN tag strip is changed to enable or disable, the hardware requires
the Rx ring to be in a disabled state, otherwise the feature cannot be
changed.

Fixes: f3b03c6 ("net: wangxun: Implement vlan add and kill functions")
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
@davem330
Jiawen Wu authored and davem330 committed May 17, 2024
1 parent ac71ab7 commit 1d3c641
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 13 deletions.
2 changes: 2 additions & 0 deletions drivers/net/ethernet/wangxun/libwx/wx_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1958,6 +1958,8 @@ int wx_sw_init(struct wx *wx)
return -ENOMEM;
}

bitmap_zero(wx->state, WX_STATE_NBITS);

return 0;
}
EXPORT_SYMBOL(wx_sw_init);
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/wangxun/libwx/wx_lib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2692,9 +2692,9 @@ int wx_set_features(struct net_device *netdev, netdev_features_t features)

netdev->features = features;

if (changed &
(NETIF_F_HW_VLAN_CTAG_RX |
NETIF_F_HW_VLAN_STAG_RX))
if (wx->mac.type == wx_mac_sp && changed & NETIF_F_HW_VLAN_CTAG_RX)
wx->do_reset(netdev);
else if (changed & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER))
wx_set_rx_mode(netdev);

return 0;
Expand Down
22 changes: 22 additions & 0 deletions drivers/net/ethernet/wangxun/libwx/wx_type.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -982,8 +982,13 @@ struct wx_hw_stats {
u64 qmprc;
};

enum wx_state {
WX_STATE_RESETTING,
WX_STATE_NBITS, /* must be last */
};
struct wx {
unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
DECLARE_BITMAP(state, WX_STATE_NBITS);

void *priv;
u8 __iomem *hw_addr;
Expand Down Expand Up @@ -1071,6 +1076,8 @@ struct wx {
u64 hw_csum_rx_good;
u64 hw_csum_rx_error;
u64 alloc_rx_buff_failed;

void (*do_reset)(struct net_device *netdev);
};

#define WX_INTR_ALL (~0ULL)
Expand Down Expand Up @@ -1131,4 +1138,19 @@ static inline struct wx *phylink_to_wx(struct phylink_config *config)
return container_of(config, struct wx, phylink_config);
}

static inline int wx_set_state_reset(struct wx *wx)
{
u8 timeout = 50;

while (test_and_set_bit(WX_STATE_RESETTING, wx->state)) {
timeout--;
if (!timeout)
return -EBUSY;

usleep_range(1000, 2000);
}

return 0;
}

#endif /* _WX_TYPE_H_ */
18 changes: 13 additions & 5 deletions drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static int ngbe_set_ringparam(struct net_device *netdev,
struct wx *wx = netdev_priv(netdev);
u32 new_rx_count, new_tx_count;
struct wx_ring *temp_ring;
int i;
int i, err = 0;

new_tx_count = clamp_t(u32, ring->tx_pending, WX_MIN_TXD, WX_MAX_TXD);
new_tx_count = ALIGN(new_tx_count, WX_REQ_TX_DESCRIPTOR_MULTIPLE);
Expand All @@ -64,6 +64,10 @@ static int ngbe_set_ringparam(struct net_device *netdev,
new_rx_count == wx->rx_ring_count)
return 0;

err = wx_set_state_reset(wx);
if (err)
return err;

if (!netif_running(wx->netdev)) {
for (i = 0; i < wx->num_tx_queues; i++)
wx->tx_ring[i]->count = new_tx_count;
Expand All @@ -72,14 +76,16 @@ static int ngbe_set_ringparam(struct net_device *netdev,
wx->tx_ring_count = new_tx_count;
wx->rx_ring_count = new_rx_count;

return 0;
goto clear_reset;
}

/* allocate temporary buffer to store rings in */
i = max_t(int, wx->num_tx_queues, wx->num_rx_queues);
temp_ring = kvmalloc_array(i, sizeof(struct wx_ring), GFP_KERNEL);
if (!temp_ring)
return -ENOMEM;
if (!temp_ring) {
err = -ENOMEM;
goto clear_reset;
}

ngbe_down(wx);

Expand All @@ -89,7 +95,9 @@ static int ngbe_set_ringparam(struct net_device *netdev,
wx_configure(wx);
ngbe_up(wx);

return 0;
clear_reset:
clear_bit(WX_STATE_RESETTING, wx->state);
return err;
}

static int ngbe_set_channels(struct net_device *dev,
Expand Down
18 changes: 13 additions & 5 deletions drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static int txgbe_set_ringparam(struct net_device *netdev,
struct wx *wx = netdev_priv(netdev);
u32 new_rx_count, new_tx_count;
struct wx_ring *temp_ring;
int i;
int i, err = 0;

new_tx_count = clamp_t(u32, ring->tx_pending, WX_MIN_TXD, WX_MAX_TXD);
new_tx_count = ALIGN(new_tx_count, WX_REQ_TX_DESCRIPTOR_MULTIPLE);
Expand All @@ -31,6 +31,10 @@ static int txgbe_set_ringparam(struct net_device *netdev,
new_rx_count == wx->rx_ring_count)
return 0;

err = wx_set_state_reset(wx);
if (err)
return err;

if (!netif_running(wx->netdev)) {
for (i = 0; i < wx->num_tx_queues; i++)
wx->tx_ring[i]->count = new_tx_count;
Expand All @@ -39,14 +43,16 @@ static int txgbe_set_ringparam(struct net_device *netdev,
wx->tx_ring_count = new_tx_count;
wx->rx_ring_count = new_rx_count;

return 0;
goto clear_reset;
}

/* allocate temporary buffer to store rings in */
i = max_t(int, wx->num_tx_queues, wx->num_rx_queues);
temp_ring = kvmalloc_array(i, sizeof(struct wx_ring), GFP_KERNEL);
if (!temp_ring)
return -ENOMEM;
if (!temp_ring) {
err = -ENOMEM;
goto clear_reset;
}

txgbe_down(wx);

Expand All @@ -55,7 +61,9 @@ static int txgbe_set_ringparam(struct net_device *netdev,

txgbe_up(wx);

return 0;
clear_reset:
clear_bit(WX_STATE_RESETTING, wx->state);
return err;
}

static int txgbe_set_channels(struct net_device *dev,
Expand Down
30 changes: 30 additions & 0 deletions drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ static int txgbe_sw_init(struct wx *wx)
wx->tx_work_limit = TXGBE_DEFAULT_TX_WORK;
wx->rx_work_limit = TXGBE_DEFAULT_RX_WORK;

wx->do_reset = txgbe_do_reset;

return 0;
}

Expand Down Expand Up @@ -421,6 +423,34 @@ int txgbe_setup_tc(struct net_device *dev, u8 tc)
return 0;
}

static void txgbe_reinit_locked(struct wx *wx)
{
int err = 0;

netif_trans_update(wx->netdev);

err = wx_set_state_reset(wx);
if (err) {
wx_err(wx, "wait device reset timeout\n");
return;
}

txgbe_down(wx);
txgbe_up(wx);

clear_bit(WX_STATE_RESETTING, wx->state);
}

void txgbe_do_reset(struct net_device *netdev)
{
struct wx *wx = netdev_priv(netdev);

if (netif_running(netdev))
txgbe_reinit_locked(wx);
else
txgbe_reset(wx);
}

static const struct net_device_ops txgbe_netdev_ops = {
.ndo_open = txgbe_open,
.ndo_stop = txgbe_close,
Expand Down
1 change: 1 addition & 0 deletions drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ extern char txgbe_driver_name[];
void txgbe_down(struct wx *wx);
void txgbe_up(struct wx *wx);
int txgbe_setup_tc(struct net_device *dev, u8 tc);
void txgbe_do_reset(struct net_device *netdev);

#define NODE_PROP(_NAME, _PROP) \
(const struct software_node) { \
Expand Down

0 comments on commit 1d3c641

Please sign in to comment.