fw upgrade filter fixes
Subsystems (3)
cover fw upgrade filter fixes
With further testing of the fw-upgrade operations we found a couple of issues that needed to be cleaned up:
- the filters other than the base MAC address need to be reinstated into the device
- we don't need to remove the station MAC filter if it isn't changing from a previous MAC filter
Shannon Nelson (2):
ionic: replay filters after fw upgrade
ionic: set station addr only if needed
.../net/ethernet/pensando/ionic/ionic_lif.c | 44 ++++++++++------ .../ethernet/pensando/ionic/ionic_rx_filter.c | 52 +++++++++++++++---- .../ethernet/pensando/ionic/ionic_rx_filter.h | 2 +- 3 files changed, 70 insertions(+), 28 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 ionic: replay filters after fw upgrade
The NIC's filters are lost in the midst of the fw-upgrade so we need to replay them into the FW. We also remove the unused ionic_rx_filter_del() function.
--- .../net/ethernet/pensando/ionic/ionic_lif.c | 12 +++-- .../ethernet/pensando/ionic/ionic_rx_filter.c | 52 +++++++++++++++---- .../ethernet/pensando/ionic/ionic_rx_filter.h | 2 +- 3 files changed, 51 insertions(+), 15 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +8 -4
@@ -2127,6 +2127,8 @@ static void ionic_lif_handle_fw_up(struct ionic_lif *lif)if (lif->registered)ionic_lif_set_netdev_info (lif); +ionic_rx_filter_replay (lif); +if (netif_running (lif->netdev)) { err =ionic_txrx_alloc (lif);if (err)
@@ -2206,9 +2208,9 @@ static void ionic_lif_deinit(struct ionic_lif *lif)if (!test_bit (IONIC_LIF_F_FW_RESET , lif->state)) {cancel_work_sync (&lif->deferred.work);cancel_work_sync (&lif->tx_timeout_work); +ionic_rx_filters_deinit (lif); } -ionic_rx_filters_deinit (lif);if (lif->netdev->features &NETIF_F_RXHASH )ionic_lif_rss_deinit (lif);
@@ -2421,9 +2423,11 @@ static int ionic_lif_init(struct ionic_lif *lif)if (err) goto err_out_notifyq_deinit; - err =ionic_rx_filters_init (lif); -if (err) - goto err_out_notifyq_deinit; +if (!test_bit (IONIC_LIF_F_FW_RESET , lif->state)) { + err =ionic_rx_filters_init (lif); +if (err) + goto err_out_notifyq_deinit; + } err =ionic_station_set (lif);if (err)
drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c +42 -10
59 lines not on this page · raw message
drivers/net/ethernet/pensando/ionic/ionic_rx_filter.h +1 -1
@@ -24,7 +24,7 @@ struct ionic_rx_filters { };void ionic_rx_filter_free (struct ionic_lif *lif,struct ionic_rx_filter *f); -int ionic_rx_filter_del (struct ionic_lif *lif,struct ionic_rx_filter *f); +void ionic_rx_filter_replay (struct ionic_lif *lif);int ionic_rx_filters_init (struct ionic_lif *lif);void ionic_rx_filters_deinit (struct ionic_lif *lif); int ionic_rx_filter_save(struct ionic_lif *lif, u32 flow_id, u16 rxq_index,
Signature · 1 line
2.17.1
PATCH 2/2 ionic: set station addr only if needed
In reply to Shannon NelsonThe code was working too hard and in some cases was trying to delete filters that weren't there, generating a potentially misleading error message.
IONIC_CMD_RX_FILTER_DEL (32) failed: IONIC_RC_ENOENT (-2)
--- .../net/ethernet/pensando/ionic/ionic_lif.c | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +19 -13
@@ -2341,24 +2341,30 @@ static int ionic_station_set(struct ionic_lif *lif) err =ionic_adminq_post_wait (lif, &ctx);if (err)return err; - +netdev_dbg (lif->netdev,"found initial MAC addr %pM\n" , + ctx.comp.lif_getattr.mac);if (is_zero_ether_addr (ctx.comp.lif_getattr.mac))return 0 ; -memcpy (addr.sa_data, ctx.comp.lif_getattr.mac, netdev->addr_len); - addr.sa_family =AF_INET ; - err =eth_prepare_mac_addr_change (netdev, &addr); -if (err) { -netdev_warn (lif->netdev,"ignoring bad MAC addr from NIC %pM - err %d\n" , - addr.sa_data, err); -return 0 ; - } +if (!ether_addr_equal (ctx.comp.lif_getattr.mac, netdev->dev_addr)) { +memcpy (addr.sa_data, ctx.comp.lif_getattr.mac, netdev->addr_len); + addr.sa_family =AF_INET ; + err =eth_prepare_mac_addr_change (netdev, &addr); +if (err) { +netdev_warn (lif->netdev,"ignoring bad MAC addr from NIC %pM - err %d\n" , + addr.sa_data, err); +return 0 ; + } -netdev_dbg (lif->netdev,"deleting station MAC addr %pM\n" , - netdev->dev_addr); -ionic_lif_addr (lif, netdev->dev_addr, false); +if (!is_zero_ether_addr (netdev->dev_addr)) { +netdev_dbg (lif->netdev,"deleting station MAC addr %pM\n" , + netdev->dev_addr); +ionic_lif_addr (lif, netdev->dev_addr, false); + } + +eth_commit_mac_addr_change (netdev, &addr); + } -eth_commit_mac_addr_change (netdev, &addr);netdev_dbg (lif->netdev,"adding station MAC addr %pM\n" , netdev->dev_addr);ionic_lif_addr (lif, netdev->dev_addr, true);
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Shannon Nelson <[email protected]>
Date: Wed, 8 Apr 2020 09:19:10 -0700
Quoted 6 lines
With further testing of the fw-upgrade operations we found a couple of issues that needed to be cleaned up:
- the filters other than the base MAC address need to be reinstated into the device
- we don't need to remove the station MAC filter if it isn't changing from a previous MAC filter
Series applied, thank you.