Skip to content

Commit e31a9fe

Browse files
hkallweitkuba-moo
authored andcommitted
Revert "r8169: disable ASPM during NAPI poll"
This reverts commit e1ed3e4. Turned out the change causes a performance regression. Link: https://lore.kernel.org/netdev/20230713124914.GA12924@green245/T/ Cc: [email protected] Signed-off-by: Heiner Kallweit <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent cf2ffde commit e31a9fe

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4523,10 +4523,6 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
45234523
}
45244524

45254525
if (napi_schedule_prep(&tp->napi)) {
4526-
rtl_unlock_config_regs(tp);
4527-
rtl_hw_aspm_clkreq_enable(tp, false);
4528-
rtl_lock_config_regs(tp);
4529-
45304526
rtl_irq_disable(tp);
45314527
__napi_schedule(&tp->napi);
45324528
}
@@ -4586,14 +4582,9 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
45864582

45874583
work_done = rtl_rx(dev, tp, budget);
45884584

4589-
if (work_done < budget && napi_complete_done(napi, work_done)) {
4585+
if (work_done < budget && napi_complete_done(napi, work_done))
45904586
rtl_irq_enable(tp);
45914587

4592-
rtl_unlock_config_regs(tp);
4593-
rtl_hw_aspm_clkreq_enable(tp, true);
4594-
rtl_lock_config_regs(tp);
4595-
}
4596-
45974588
return work_done;
45984589
}
45994590

0 commit comments

Comments
 (0)