Skip to content

Commit 5951371

Browse files
Jiawen Wukuba-moo
authored andcommitted
net: wangxun: Fix vector length of interrupt cause
There is 64-bit interrupt cause register for txgbe. Fix to clear upper 32 bits. Fixes: 3f70318 ("net: libwx: Add irq flow functions") Signed-off-by: Jiawen Wu <[email protected]> Reviewed-by: Leon Romanovsky <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 608f1b1 commit 5951371

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
#define WX_PX_INTA 0x110
223223
#define WX_PX_GPIE 0x118
224224
#define WX_PX_GPIE_MODEL BIT(0)
225-
#define WX_PX_IC 0x120
225+
#define WX_PX_IC(_i) (0x120 + (_i) * 4)
226226
#define WX_PX_IMS(_i) (0x140 + (_i) * 4)
227227
#define WX_PX_IMC(_i) (0x150 + (_i) * 4)
228228
#define WX_PX_ISB_ADDR_L 0x160

drivers/net/ethernet/wangxun/ngbe/ngbe_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ static void ngbe_up(struct wx *wx)
352352
netif_tx_start_all_queues(wx->netdev);
353353

354354
/* clear any pending interrupts, may auto mask */
355-
rd32(wx, WX_PX_IC);
355+
rd32(wx, WX_PX_IC(0));
356356
rd32(wx, WX_PX_MISC_IC);
357357
ngbe_irq_enable(wx, true);
358358
if (wx->gpio_ctrl)

drivers/net/ethernet/wangxun/txgbe/txgbe_main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ static void txgbe_up_complete(struct wx *wx)
229229
wx_napi_enable_all(wx);
230230

231231
/* clear any pending interrupts, may auto mask */
232-
rd32(wx, WX_PX_IC);
232+
rd32(wx, WX_PX_IC(0));
233+
rd32(wx, WX_PX_IC(1));
233234
rd32(wx, WX_PX_MISC_IC);
234235
txgbe_irq_enable(wx, true);
235236

0 commit comments

Comments
 (0)