Skip to content

Commit a9e9b78

Browse files
committed
Merge branch 'ravb-fixes'
Yoshihiro Shimoda says: ==================== net: ravb: Fix potential issues Fix potentiall issues on the ravb driver. Changes from v2: https://lore.kernel.org/all/[email protected]/ - Add Reviewed-by in the patch [2/2]. - Add a commit description in the patch [2/2]. Changes from v1: https://lore.kernel.org/all/[email protected]/ - Fix typo in the patch [1/2]. - Add Reviewed-by in the patch [1/2]. - Fix "Fixed" tag in the patch [2/2]. - Fix a comment indentation of the code in the patch [2/2]. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents f2b0b52 + f3c0775 commit a9e9b78

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/net/ethernet/renesas/ravb_main.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,14 +1101,14 @@ static void ravb_error_interrupt(struct net_device *ndev)
11011101
ravb_write(ndev, ~(EIS_QFS | EIS_RESERVED), EIS);
11021102
if (eis & EIS_QFS) {
11031103
ris2 = ravb_read(ndev, RIS2);
1104-
ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF | RIS2_RESERVED),
1104+
ravb_write(ndev, ~(RIS2_QFF0 | RIS2_QFF1 | RIS2_RFFF | RIS2_RESERVED),
11051105
RIS2);
11061106

11071107
/* Receive Descriptor Empty int */
11081108
if (ris2 & RIS2_QFF0)
11091109
priv->stats[RAVB_BE].rx_over_errors++;
11101110

1111-
/* Receive Descriptor Empty int */
1111+
/* Receive Descriptor Empty int */
11121112
if (ris2 & RIS2_QFF1)
11131113
priv->stats[RAVB_NC].rx_over_errors++;
11141114

@@ -2973,6 +2973,9 @@ static int __maybe_unused ravb_suspend(struct device *dev)
29732973
else
29742974
ret = ravb_close(ndev);
29752975

2976+
if (priv->info->ccc_gac)
2977+
ravb_ptp_stop(ndev);
2978+
29762979
return ret;
29772980
}
29782981

@@ -3011,6 +3014,9 @@ static int __maybe_unused ravb_resume(struct device *dev)
30113014
/* Restore descriptor base address table */
30123015
ravb_write(ndev, priv->desc_bat_dma, DBAT);
30133016

3017+
if (priv->info->ccc_gac)
3018+
ravb_ptp_init(ndev, priv->pdev);
3019+
30143020
if (netif_running(ndev)) {
30153021
if (priv->wol_enabled) {
30163022
ret = ravb_wol_restore(ndev);

0 commit comments

Comments
 (0)