Commit e31a9fed authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

Revert "r8169: disable ASPM during NAPI poll" 

This reverts commit e1ed3e4d.

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/055c6bc2-74fa-8c67-9897-3f658abb5ae7@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent cf2ffdea

drivers/net/ethernet/realtek/r8169_main.c

+1 −10
Original line number Diff line number Diff line
@@ -4523,10 +4523,6 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) 
	}



	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);

		__napi_schedule(&tp->napi);

	}
@@ -4586,14 +4582,9 @@ static int rtl8169_poll(struct napi_struct *napi, int 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_unlock_config_regs(tp);

		rtl_hw_aspm_clkreq_enable(tp, true);

		rtl_lock_config_regs(tp);

	}



	return work_done;

}