hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/net/ethernet/renesas/ravb_main.c
....@@ -736,14 +736,14 @@
736736 ravb_write(ndev, ~(EIS_QFS | EIS_RESERVED), EIS);
737737 if (eis & EIS_QFS) {
738738 ris2 = ravb_read(ndev, RIS2);
739
- ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF | RIS2_RESERVED),
739
+ ravb_write(ndev, ~(RIS2_QFF0 | RIS2_QFF1 | RIS2_RFFF | RIS2_RESERVED),
740740 RIS2);
741741
742742 /* Receive Descriptor Empty int */
743743 if (ris2 & RIS2_QFF0)
744744 priv->stats[RAVB_BE].rx_over_errors++;
745745
746
- /* Receive Descriptor Empty int */
746
+ /* Receive Descriptor Empty int */
747747 if (ris2 & RIS2_QFF1)
748748 priv->stats[RAVB_NC].rx_over_errors++;
749749
....@@ -1706,6 +1706,8 @@
17061706 of_phy_deregister_fixed_link(np);
17071707 }
17081708
1709
+ cancel_work_sync(&priv->work);
1710
+
17091711 if (priv->chip_id != RCAR_GEN2) {
17101712 free_irq(priv->tx_irqs[RAVB_NC], ndev);
17111713 free_irq(priv->rx_irqs[RAVB_NC], ndev);
....@@ -2249,15 +2251,15 @@
22492251 if (priv->chip_id != RCAR_GEN2)
22502252 ravb_ptp_stop(ndev);
22512253
2252
- dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat,
2253
- priv->desc_bat_dma);
22542254 /* Set reset mode */
22552255 ravb_write(ndev, CCC_OPC_RESET, CCC);
2256
- pm_runtime_put_sync(&pdev->dev);
22572256 unregister_netdev(ndev);
22582257 netif_napi_del(&priv->napi[RAVB_NC]);
22592258 netif_napi_del(&priv->napi[RAVB_BE]);
22602259 ravb_mdio_release(priv);
2260
+ dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat,
2261
+ priv->desc_bat_dma);
2262
+ pm_runtime_put_sync(&pdev->dev);
22612263 pm_runtime_disable(&pdev->dev);
22622264 free_netdev(ndev);
22632265 platform_set_drvdata(pdev, NULL);