Commit 7564f354 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-cppc' and 'acpi-tables' 

Merge ACPI CPPC library fixes and an ACPI MRRM table parser fix for
6.18-rc6.

* acpi-cppc:
  ACPI: CPPC: Limit perf ctrs in PCC check only to online CPUs
  ACPI: CPPC: Perform fast check switch only for online CPUs
  ACPI: CPPC: Check _CPC validity for only the online CPUs
  ACPI: CPPC: Detect preferred core availability on online CPUs

* acpi-tables:
  ACPI: MRRM: Fix memory leaks and improve error handling
parents e9a6fb0b 0fce7587 4b93d211

arch/x86/kernel/acpi/cppc.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ int amd_detect_prefcore(bool *detected) 
		break;

	}



	for_each_present_cpu(cpu) {

	for_each_online_cpu(cpu) {

		u32 tmp;

		int ret;

drivers/acpi/acpi_mrrm.c

+33 −10
Original line number Diff line number Diff line
@@ -152,26 +152,49 @@ ATTRIBUTE_GROUPS(memory_range); 


static __init int add_boot_memory_ranges(void)

{

	struct kobject *pkobj, *kobj;

	struct kobject *pkobj, *kobj, **kobjs;

	int ret = -EINVAL;

	char *name;

	char name[16];

	int i;



	pkobj = kobject_create_and_add("memory_ranges", acpi_kobj);

	if (!pkobj)

		return -ENOMEM;



	for (int i = 0; i < mrrm_mem_entry_num; i++) {

		name = kasprintf(GFP_KERNEL, "range%d", i);

		if (!name) {

			ret = -ENOMEM;

			break;

	kobjs = kcalloc(mrrm_mem_entry_num, sizeof(*kobjs), GFP_KERNEL);

	if (!kobjs) {

		kobject_put(pkobj);

		return -ENOMEM;

	}



	for (i = 0; i < mrrm_mem_entry_num; i++) {

		scnprintf(name, sizeof(name), "range%d", i);

		kobj = kobject_create_and_add(name, pkobj);

		if (!kobj) {

			ret = -ENOMEM;

			goto cleanup;

		}



		ret = sysfs_create_groups(kobj, memory_range_groups);

		if (ret)

			return ret;

		if (ret) {

			kobject_put(kobj);

			goto cleanup;

		}

		kobjs[i] = kobj;

	}



	kfree(kobjs);

	return 0;



cleanup:

	for (int j = 0; j < i; j++) {

		if (kobjs[j]) {

			sysfs_remove_groups(kobjs[j], memory_range_groups);

			kobject_put(kobjs[j]);

		}

	}

	kfree(kobjs);

	kobject_put(pkobj);

	return ret;

}

drivers/acpi/cppc_acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ bool acpi_cpc_valid(void) 
	if (acpi_disabled)

		return false;



	for_each_present_cpu(cpu) {

	for_each_online_cpu(cpu) {

		cpc_ptr = per_cpu(cpc_desc_ptr, cpu);

		if (!cpc_ptr)

			return false;
@@ -476,7 +476,7 @@ bool cppc_allow_fast_switch(void) 
	struct cpc_desc *cpc_ptr;

	int cpu;



	for_each_present_cpu(cpu) {

	for_each_online_cpu(cpu) {

		cpc_ptr = per_cpu(cpc_desc_ptr, cpu);

		desired_reg = &cpc_ptr->cpc_regs[DESIRED_PERF];

		if (!CPC_IN_SYSTEM_MEMORY(desired_reg) &&
@@ -1435,7 +1435,7 @@ bool cppc_perf_ctrs_in_pcc(void) 
{

	int cpu;



	for_each_present_cpu(cpu) {

	for_each_online_cpu(cpu) {

		struct cpc_register_resource *ref_perf_reg;

		struct cpc_desc *cpc_desc;