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

Merge branches 'acpi-scan', 'acpi-tables', 'acpi-misc' and 'acpi-pm' 

* acpi-scan:
  ACPI / scan: Add labels for PNP button devices
  ACPI / scan: Simplify acpi_bus_extract_wakeup_device_power_package()

* acpi-tables:
  ACPI / tables: Clean up whitespace

* acpi-misc:
  ACPI / DPTF: Use dev_get_drvdata()
  ACPI: event: replace strcpy() by strscpy()
  ACPI: Fix comment typos

* acpi-pm:
  ACPI: PM: Print debug messages when enabling GPEs for wakeup
parents 317e2cac 5ceb5f05 2e018c59 b0f65b91 fbc9418f

drivers/acpi/acpi_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ again: 
	return size > 0 ? size : ret;

}



static int acpi_aml_thread(void *unsed)

static int acpi_aml_thread(void *unused)

{

	acpi_osd_exec_callback function = NULL;

	void *context;

drivers/acpi/acpi_lpat.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * LPAT conversion table

 *

 * @lpat_table: the temperature_raw mapping table structure

 * @raw: the raw value, used as a key to get the temerature from the

 * @raw: the raw value, used as a key to get the temperature from the

 *       above mapping table

 *

 * A positive converted temperature value will be returned on success,

drivers/acpi/cppc_acpi.c

+17 −17
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ struct cppc_pcc_data { 
	int refcount;

};



/* Array  to represent the PCC channel per subspace id */

/* Array to represent the PCC channel per subspace ID */

static struct cppc_pcc_data *pcc_data[MAX_PCC_SUBSPACES];

/* The cpu_pcc_subspace_idx containsper CPU subspace id */

/* The cpu_pcc_subspace_idx contains per CPU subspace ID */

static DEFINE_PER_CPU(int, cpu_pcc_subspace_idx);



/*
@@ -436,7 +436,7 @@ int acpi_get_psd_map(struct cppc_cpudata **all_cpu_data) 
		return -ENOMEM;



	/*

	 * Now that we have _PSD data from all CPUs, lets setup P-state

	 * Now that we have _PSD data from all CPUs, let's setup P-state

	 * domain info.

	 */

	for_each_possible_cpu(i) {
@@ -588,7 +588,7 @@ static int register_pcc_channel(int pcc_ss_idx) 
			return -ENOMEM;

		}



		/* Set flag so that we dont come here for each CPU. */

		/* Set flag so that we don't come here for each CPU. */

		pcc_data[pcc_ss_idx]->pcc_channel_acquired = true;

	}
@@ -613,7 +613,7 @@ bool __weak cpc_ffh_supported(void) 
 *

 * Check and allocate the cppc_pcc_data memory.

 * In some processor configurations it is possible that same subspace

 * is shared between multiple CPU's. This is seen especially in CPU's

 * is shared between multiple CPUs. This is seen especially in CPUs

 * with hardware multi-threading support.

 *

 * Return: 0 for success, errno for failure
@@ -711,7 +711,7 @@ static bool is_cppc_supported(int revision, int num_ent) 


/**

 * acpi_cppc_processor_probe - Search for per CPU _CPC objects.

 * @pr: Ptr to acpi_processor containing this CPUs logical Id.

 * @pr: Ptr to acpi_processor containing this CPU's logical ID.

 *

 *	Return: 0 for success or negative value for err.

 */
@@ -728,7 +728,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
	acpi_status status;

	int ret = -EFAULT;



	/* Parse the ACPI _CPC table for this cpu. */

	/* Parse the ACPI _CPC table for this CPU. */

	status = acpi_evaluate_object_typed(handle, "_CPC", NULL, &output,

			ACPI_TYPE_PACKAGE);

	if (ACPI_FAILURE(status)) {
@@ -840,7 +840,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
	if (ret)

		goto out_free;



	/* Register PCC channel once for all PCC subspace id. */

	/* Register PCC channel once for all PCC subspace ID. */

	if (pcc_subspace_id >= 0 && !pcc_data[pcc_subspace_id]->pcc_channel_acquired) {

		ret = register_pcc_channel(pcc_subspace_id);

		if (ret)
@@ -860,7 +860,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
		goto out_free;

	}



	/* Plug PSD data into this CPUs CPC descriptor. */

	/* Plug PSD data into this CPU's CPC descriptor. */

	per_cpu(cpc_desc_ptr, pr->id) = cpc_ptr;



	ret = kobject_init_and_add(&cpc_ptr->kobj, &cppc_ktype, &cpu_dev->kobj,
@@ -891,7 +891,7 @@ EXPORT_SYMBOL_GPL(acpi_cppc_processor_probe); 


/**

 * acpi_cppc_processor_exit - Cleanup CPC structs.

 * @pr: Ptr to acpi_processor containing this CPUs logical Id.

 * @pr: Ptr to acpi_processor containing this CPU's logical ID.

 *

 * Return: Void

 */
@@ -931,7 +931,7 @@ EXPORT_SYMBOL_GPL(acpi_cppc_processor_exit); 


/**

 * cpc_read_ffh() - Read FFH register

 * @cpunum:	cpu number to read

 * @cpunum:	CPU number to read

 * @reg:	cppc register information

 * @val:	place holder for return value

 *
@@ -946,7 +946,7 @@ int __weak cpc_read_ffh(int cpunum, struct cpc_reg *reg, u64 *val) 


/**

 * cpc_write_ffh() - Write FFH register

 * @cpunum:	cpu number to write

 * @cpunum:	CPU number to write

 * @reg:	cppc register information

 * @val:	value to write

 *
@@ -1093,7 +1093,7 @@ int cppc_get_desired_perf(int cpunum, u64 *desired_perf) 
EXPORT_SYMBOL_GPL(cppc_get_desired_perf);



/**

 * cppc_get_perf_caps - Get a CPUs performance capabilities.

 * cppc_get_perf_caps - Get a CPU's performance capabilities.

 * @cpunum: CPU from which to get capabilities info.

 * @perf_caps: ptr to cppc_perf_caps. See cppc_acpi.h

 *
@@ -1183,7 +1183,7 @@ out_err: 
EXPORT_SYMBOL_GPL(cppc_get_perf_caps);



/**

 * cppc_get_perf_ctrs - Read a CPUs performance feedback counters.

 * cppc_get_perf_ctrs - Read a CPU's performance feedback counters.

 * @cpunum: CPU from which to read counters.

 * @perf_fb_ctrs: ptr to cppc_perf_fb_ctrs. See cppc_acpi.h

 *
@@ -1210,7 +1210,7 @@ int cppc_get_perf_ctrs(int cpunum, struct cppc_perf_fb_ctrs *perf_fb_ctrs) 
	ctr_wrap_reg = &cpc_desc->cpc_regs[CTR_WRAP_TIME];



	/*

	 * If refernce perf register is not supported then we should

	 * If reference perf register is not supported then we should

	 * use the nominal perf value

	 */

	if (!CPC_SUPPORTED(ref_perf_reg))
@@ -1263,7 +1263,7 @@ out_err: 
EXPORT_SYMBOL_GPL(cppc_get_perf_ctrs);



/**

 * cppc_set_perf - Set a CPUs performance controls.

 * cppc_set_perf - Set a CPU's performance controls.

 * @cpu: CPU for which to set performance controls.

 * @perf_ctrls: ptr to cppc_perf_ctrls. See cppc_acpi.h

 *

drivers/acpi/device_pm.c

+3 −0
Original line number Diff line number Diff line
@@ -728,6 +728,9 @@ static int __acpi_device_wakeup_enable(struct acpi_device *adev, 
		goto out;

	}



	acpi_handle_debug(adev->handle, "GPE%2X enabled for wakeup\n",

			  (unsigned int)wakeup->gpe_number);



inc:

	wakeup->enable_count++;

drivers/acpi/dptf/dptf_power.c

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ static ssize_t name##_show(struct device *dev,\ 
			   struct device_attribute *attr,\

			   char *buf)\

{\

	struct platform_device *pdev = to_platform_device(dev);\

	struct acpi_device *acpi_dev = platform_get_drvdata(pdev);\

	struct acpi_device *acpi_dev = dev_get_drvdata(dev);\

	unsigned long long val;\

	acpi_status status;\

\

CRA Git | Maintained and supported by SUSTech CRA and CCSE