Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3451ab3e authored by Jan Beulich's avatar Jan Beulich Committed by Rafael J. Wysocki
Browse files

intel_idle: re-work bxt_idle_state_table_update() and its helper 



Since irtl_ns_units[] has itself zero entries, make sure the caller
recognized those cases along with the MSR read returning zero, as zero
is not a valid value for exit_latency and target_residency.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b55a0262

drivers/idle/intel_idle.c

+14 −15
Original line number Diff line number Diff line
@@ -1187,6 +1187,9 @@ static unsigned long long irtl_2_usec(unsigned long long irtl) 
{

	unsigned long long ns;



	if (!irtl)

		return 0;



	ns = irtl_ns_units[(irtl >> 10) & 0x3];



	return div64_u64((irtl & 0x3FF) * ns, 1000);
@@ -1200,43 +1203,39 @@ static unsigned long long irtl_2_usec(unsigned long long irtl) 
static void bxt_idle_state_table_update(void)

{

	unsigned long long msr;

	unsigned int usec;



	rdmsrl(MSR_PKGC6_IRTL, msr);

	if (msr) {

		unsigned int usec = irtl_2_usec(msr);



	usec = irtl_2_usec(msr);

	if (usec) {

		bxt_cstates[2].exit_latency = usec;

		bxt_cstates[2].target_residency = usec;

	}



	rdmsrl(MSR_PKGC7_IRTL, msr);

	if (msr) {

		unsigned int usec = irtl_2_usec(msr);



	usec = irtl_2_usec(msr);

	if (usec) {

		bxt_cstates[3].exit_latency = usec;

		bxt_cstates[3].target_residency = usec;

	}



	rdmsrl(MSR_PKGC8_IRTL, msr);

	if (msr) {

		unsigned int usec = irtl_2_usec(msr);



	usec = irtl_2_usec(msr);

	if (usec) {

		bxt_cstates[4].exit_latency = usec;

		bxt_cstates[4].target_residency = usec;

	}



	rdmsrl(MSR_PKGC9_IRTL, msr);

	if (msr) {

		unsigned int usec = irtl_2_usec(msr);



	usec = irtl_2_usec(msr);

	if (usec) {

		bxt_cstates[5].exit_latency = usec;

		bxt_cstates[5].target_residency = usec;

	}



	rdmsrl(MSR_PKGC10_IRTL, msr);

	if (msr) {

		unsigned int usec = irtl_2_usec(msr);



	usec = irtl_2_usec(msr);

	if (usec) {

		bxt_cstates[6].exit_latency = usec;

		bxt_cstates[6].target_residency = usec;

	}