Commit 5caa3808 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These add a missing PCC check for guaranteed_perf in the ACPI CPPC
  library and fix a static local variable access race condition in
  acpi_pcc_address_space_setup() (Pengjie Zhang)"

* tag 'acpi-6.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: PCC: Fix race condition by removing static qualifier
  ACPI: CPPC: Fix missing PCC check for guaranteed_perf
parents eb23a119 f103fa12

drivers/acpi/acpi_pcc.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ acpi_pcc_address_space_setup(acpi_handle region_handle, u32 function, 
	struct pcc_data *data;

	struct acpi_pcc_info *ctx = handler_context;

	struct pcc_mbox_chan *pcc_chan;

	static acpi_status ret;

	acpi_status ret;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

drivers/acpi/cppc_acpi.c

+2 −1
Original line number Diff line number Diff line
@@ -1366,7 +1366,8 @@ int cppc_get_perf_caps(int cpunum, struct cppc_perf_caps *perf_caps) 
	/* Are any of the regs PCC ?*/

	if (CPC_IN_PCC(highest_reg) || CPC_IN_PCC(lowest_reg) ||

		CPC_IN_PCC(lowest_non_linear_reg) || CPC_IN_PCC(nominal_reg) ||

		CPC_IN_PCC(low_freq_reg) || CPC_IN_PCC(nom_freq_reg)) {

		CPC_IN_PCC(low_freq_reg) || CPC_IN_PCC(nom_freq_reg) ||

		CPC_IN_PCC(guaranteed_reg)) {

		if (pcc_ss_id < 0) {

			pr_debug("Invalid pcc_ss_id\n");

			return -ENODEV;