Commit fd88c59e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fix from Rafael Wysocki:
 "Fix an Intel RAPL power capping driver regression introduced during
  the 6.5 development cycle (Srinivas Pandruvada)"

* tag 'pm-6.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  powercap: intel_rapl: Fix invalid setting of Power Limit 4
parents d30c0d32 081690e9

drivers/powercap/intel_rapl_common.c

+1 −3
Original line number Diff line number Diff line
@@ -658,8 +658,6 @@ static struct rapl_primitive_info rpi_msr[NR_RAPL_PRIMITIVES] = { 
			    RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),

	[PL2_CLAMP] = PRIMITIVE_INFO_INIT(PL2_CLAMP, POWER_LIMIT2_CLAMP, 48,

			    RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),

	[PL4_ENABLE] = PRIMITIVE_INFO_INIT(PL4_ENABLE, POWER_LIMIT4_MASK, 0,

				RAPL_DOMAIN_REG_PL4, ARBITRARY_UNIT, 0),

	[TIME_WINDOW1] = PRIMITIVE_INFO_INIT(TIME_WINDOW1, TIME_WINDOW1_MASK, 17,

			    RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),

	[TIME_WINDOW2] = PRIMITIVE_INFO_INIT(TIME_WINDOW2, TIME_WINDOW2_MASK, 49,
@@ -1458,7 +1456,7 @@ static void rapl_detect_powerlimit(struct rapl_domain *rd) 
			}

		}



		if (rapl_read_pl_data(rd, i, PL_ENABLE, false, &val64))

		if (rapl_read_pl_data(rd, i, PL_LIMIT, false, &val64))

			rd->rpl[i].name = NULL;

	}

}