mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
Revert "r8169: disable ASPM during NAPI poll"
commite31a9fedc7
upstream. This reverts commite1ed3e4d91
. Turned out the change causes a performance regression. Link: https://lore.kernel.org/netdev/20230713124914.GA12924@green245/T/ Cc: stable@vger.kernel.org Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/055c6bc2-74fa-8c67-9897-3f658abb5ae7@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
210a8cffc9
commit
93e9a67757
1 changed files with 1 additions and 10 deletions
|
@ -4514,10 +4514,6 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (napi_schedule_prep(&tp->napi)) {
|
if (napi_schedule_prep(&tp->napi)) {
|
||||||
rtl_unlock_config_regs(tp);
|
|
||||||
rtl_hw_aspm_clkreq_enable(tp, false);
|
|
||||||
rtl_lock_config_regs(tp);
|
|
||||||
|
|
||||||
rtl_irq_disable(tp);
|
rtl_irq_disable(tp);
|
||||||
__napi_schedule(&tp->napi);
|
__napi_schedule(&tp->napi);
|
||||||
}
|
}
|
||||||
|
@ -4577,14 +4573,9 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
|
||||||
|
|
||||||
work_done = rtl_rx(dev, tp, budget);
|
work_done = rtl_rx(dev, tp, budget);
|
||||||
|
|
||||||
if (work_done < budget && napi_complete_done(napi, work_done)) {
|
if (work_done < budget && napi_complete_done(napi, work_done))
|
||||||
rtl_irq_enable(tp);
|
rtl_irq_enable(tp);
|
||||||
|
|
||||||
rtl_unlock_config_regs(tp);
|
|
||||||
rtl_hw_aspm_clkreq_enable(tp, true);
|
|
||||||
rtl_lock_config_regs(tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
return work_done;
|
return work_done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue