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

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

Pull ACPI fix from Rafael Wysocki:
 "Make the ACPI CPPC library use a raw spinlock for operations carried
  out in scheduler context via the schedutil governor and the ACPI CPPC
  cpufreq driver (Pierre Gondois)"

* tag 'acpi-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: CPPC: Make rmw_lock a raw_spin_lock
parents edf0227a 1c10941e

drivers/acpi/cppc_acpi.c

+5 −4
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 


	/* Store CPU Logical ID */

	cpc_ptr->cpu_id = pr->id;

	spin_lock_init(&cpc_ptr->rmw_lock);

	raw_spin_lock_init(&cpc_ptr->rmw_lock);



	/* Parse PSD data for this CPU */

	ret = acpi_get_psd(cpc_ptr, handle);
@@ -1087,6 +1087,7 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val) 
	int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);

	struct cpc_reg *reg = &reg_res->cpc_entry.reg;

	struct cpc_desc *cpc_desc;

	unsigned long flags;



	size = GET_BIT_WIDTH(reg);
@@ -1126,7 +1127,7 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val) 
			return -ENODEV;

		}



		spin_lock(&cpc_desc->rmw_lock);

		raw_spin_lock_irqsave(&cpc_desc->rmw_lock, flags);

		switch (size) {

		case 8:

			prev_val = readb_relaxed(vaddr);
@@ -1141,7 +1142,7 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val) 
			prev_val = readq_relaxed(vaddr);

			break;

		default:

			spin_unlock(&cpc_desc->rmw_lock);

			raw_spin_unlock_irqrestore(&cpc_desc->rmw_lock, flags);

			return -EFAULT;

		}

		val = MASK_VAL_WRITE(reg, prev_val, val);
@@ -1174,7 +1175,7 @@ static int cpc_write(int cpu, struct cpc_register_resource *reg_res, u64 val) 
	}



	if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)

		spin_unlock(&cpc_desc->rmw_lock);

		raw_spin_unlock_irqrestore(&cpc_desc->rmw_lock, flags);



	return ret_val;

}

include/acpi/cppc_acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct cpc_desc { 
	int write_cmd_status;

	int write_cmd_id;

	/* Lock used for RMW operations in cpc_write() */

	spinlock_t rmw_lock;

	raw_spinlock_t rmw_lock;

	struct cpc_register_resource cpc_regs[MAX_CPC_REG_ENT];

	struct acpi_psd_package domain_info;

	struct kobject kobj;