Commit 959bfe49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI updates from Rafael Wysocki:
 "These add Microsoft fan extensions support to the ACPI fan driver, fix
  a bug in ACPICA, update other ACPI drivers (processor, time and alarm
  device), update ACPI power management code and ACPI device properties
  management, and fix an ACPI utility:

   - Avoid walking the ACPI namespace in the AML interpreter if the
     starting node cannot be determined (Cryolitia PukNgae)

   - Use min() instead of min_t() in the ACPI device properties handling
     code to avoid discarding significant bits (David Laight)

   - Fix potential fwnode refcount leak in
     acpi_fwnode_graph_parse_endpoint() that may prevent the parent
     fwnode from being released (Haotian Zhang)

   - Rework acpi_graph_get_next_endpoint() to use ACPI functions only,
     remove unnecessary conditionals from it to make it easier to
     follow, and make acpi_get_next_subnode() static (Sakari Ailus)

   - Drop unused function acpi_get_lps0_constraint(), make some
     Low-Power S0 callback functions for suspend-to-idle static, and
     rearrange the code retrieving Low-Power S0 constraints so it only
     runs when the constraints are actually used (Rafael Wysocki)

   - Drop redundant locking from the ACPI battery driver (Rafael
     Wysocki)

   - Improve runtime PM in the ACPI time and alarm device (TAD) driver
     using guard macros and rearrange code related to runtime PM in
     acpi_tad_remove() (Rafael Wysocki)

   - Add support for Microsoft fan extensions to the ACPI fan driver
     along with notification support and work around a 64-bit firmware
     bug in that driver (Armin Wolf)

   - Use ACPI_FREE() to free ACPI buffer in the ACPI DPTF code
     (Kaushlendra Kumar)

   - Fix a memory leak and a resource leak in the ACPI pfrut utility
     (Malaya Kumar Rout)

   - Replace `core::mem::zeroed` with `pin_init::zeroed` in the ACPI
     Rust code (Siyuan Huang)

   - Update the ACPI code to use the new style of allocating workqueues
     and new global workqueues (Marco Crivellari)

   - Fix two spelling mistakes in the ACPI code (Chu Guangqing)

   - Fix ISAPNP to generate uevents to auto-load modules (René Rebe)

   - Relocate the state flags initialization in the ACPI processor idle
     driver and drop redundant C-state count checks from it (Huisong Li)

   - Fix map_x2apic_id() in the ACPI processor core driver for
     amd-pstate on am4 (René Rebe)"

* tag 'acpi-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (30 commits)
  ACPI: PM: Fix a spelling mistake
  ACPI: LPSS: Fix a spelling mistake
  ACPI: processor_core: fix map_x2apic_id for amd-pstate on am4
  ACPICA: Avoid walking the Namespace if start_node is NULL
  ACPI: tools: pfrut: fix memory leak and resource leak in pfrut.c
  ACPI: property: use min() instead of min_t()
  PNP: Fix ISAPNP to generate uevents to auto-load modules
  ACPI: property: Fix fwnode refcount leak in acpi_fwnode_graph_parse_endpoint()
  ACPI: DPTF: Use ACPI_FREE() for ACPI buffer deallocation
  ACPI: processor: idle: Drop redundant C-state count checks
  ACPI: thermal: Add WQ_PERCPU to alloc_workqueue() users
  ACPI: OSL: Add WQ_PERCPU to alloc_workqueue() users
  ACPI: EC: Add WQ_PERCPU to alloc_workqueue() users
  ACPI: OSL: replace use of system_wq with system_percpu_wq
  ACPI: scan: replace use of system_unbound_wq with system_dfl_wq
  ACPI: fan: Add support for Microsoft fan extensions
  ACPI: fan: Add hwmon notification support
  ACPI: fan: Add basic notification support
  ACPI: TAD: Improve runtime PM using guard macros
  ACPI: TAD: Rearrange runtime PM operations in acpi_tad_remove()
  ...
parents 44fc8433 af47d980

drivers/acpi/acpi_tad.c

+39 −34
Original line number Diff line number Diff line
@@ -90,19 +90,18 @@ static int acpi_tad_set_real_time(struct device *dev, struct acpi_tad_rt *rt) 
	args[0].buffer.pointer = (u8 *)rt;

	args[0].buffer.length = sizeof(*rt);



	pm_runtime_get_sync(dev);

	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

		return -ENXIO;



	status = acpi_evaluate_integer(handle, "_SRT", &arg_list, &retval);



	pm_runtime_put_sync(dev);



	if (ACPI_FAILURE(status) || retval)

		return -EIO;



	return 0;

}



static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)

static int acpi_tad_evaluate_grt(struct device *dev, struct acpi_tad_rt *rt)

{

	acpi_handle handle = ACPI_HANDLE(dev);

	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER };
@@ -111,12 +110,7 @@ static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt) 
	acpi_status status;

	int ret = -EIO;



	pm_runtime_get_sync(dev);



	status = acpi_evaluate_object(handle, "_GRT", NULL, &output);



	pm_runtime_put_sync(dev);



	if (ACPI_FAILURE(status))

		goto out_free;
@@ -139,6 +133,21 @@ static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt) 
	return ret;

}



static int acpi_tad_get_real_time(struct device *dev, struct acpi_tad_rt *rt)

{

	int ret;



	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

		return -ENXIO;



	ret = acpi_tad_evaluate_grt(dev, rt);

	if (ret)

		return ret;



	return 0;

}



static char *acpi_tad_rt_next_field(char *s, int *val)

{

	char *p;
@@ -266,12 +275,11 @@ static int acpi_tad_wake_set(struct device *dev, char *method, u32 timer_id, 
	args[0].integer.value = timer_id;

	args[1].integer.value = value;



	pm_runtime_get_sync(dev);

	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

		return -ENXIO;



	status = acpi_evaluate_integer(handle, method, &arg_list, &retval);



	pm_runtime_put_sync(dev);



	if (ACPI_FAILURE(status) || retval)

		return -EIO;
@@ -314,12 +322,11 @@ static ssize_t acpi_tad_wake_read(struct device *dev, char *buf, char *method, 


	args[0].integer.value = timer_id;



	pm_runtime_get_sync(dev);

	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

		return -ENXIO;



	status = acpi_evaluate_integer(handle, method, &arg_list, &retval);



	pm_runtime_put_sync(dev);



	if (ACPI_FAILURE(status))

		return -EIO;
@@ -370,12 +377,11 @@ static int acpi_tad_clear_status(struct device *dev, u32 timer_id) 


	args[0].integer.value = timer_id;



	pm_runtime_get_sync(dev);

	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

		return -ENXIO;



	status = acpi_evaluate_integer(handle, "_CWS", &arg_list, &retval);



	pm_runtime_put_sync(dev);



	if (ACPI_FAILURE(status) || retval)

		return -EIO;
@@ -411,12 +417,11 @@ static ssize_t acpi_tad_status_read(struct device *dev, char *buf, u32 timer_id) 


	args[0].integer.value = timer_id;



	pm_runtime_get_sync(dev);

	ACQUIRE(pm_runtime_active_try, pm)(dev);

	if (ACQUIRE_ERR(pm_runtime_active_try, &pm))

		return -ENXIO;



	status = acpi_evaluate_integer(handle, "_GWS", &arg_list, &retval);



	pm_runtime_put_sync(dev);



	if (ACPI_FAILURE(status))

		return -EIO;
@@ -563,8 +568,6 @@ static void acpi_tad_remove(struct platform_device *pdev) 


	device_init_wakeup(dev, false);



	pm_runtime_get_sync(dev);



	if (dd->capabilities & ACPI_TAD_RT)

		sysfs_remove_group(&dev->kobj, &acpi_tad_time_attr_group);
@@ -573,14 +576,16 @@ static void acpi_tad_remove(struct platform_device *pdev) 


	sysfs_remove_group(&dev->kobj, &acpi_tad_attr_group);



	scoped_guard(pm_runtime_noresume, dev) {

		acpi_tad_disable_timer(dev, ACPI_TAD_AC_TIMER);

		acpi_tad_clear_status(dev, ACPI_TAD_AC_TIMER);

		if (dd->capabilities & ACPI_TAD_DC_WAKE) {

			acpi_tad_disable_timer(dev, ACPI_TAD_DC_TIMER);

			acpi_tad_clear_status(dev, ACPI_TAD_DC_TIMER);

		}

	}



	pm_runtime_put_sync(dev);

	pm_runtime_suspend(dev);

	pm_runtime_disable(dev);

	acpi_remove_cmos_rtc_space_handler(handle);

}

drivers/acpi/acpica/nswalk.c

+6 −3
Original line number Diff line number Diff line
@@ -169,10 +169,13 @@ acpi_ns_walk_namespace(acpi_object_type type, 


	if (start_node == ACPI_ROOT_OBJECT) {

		start_node = acpi_gbl_root_node;

	}



	/* Avoid walking the namespace if the StartNode is NULL */



	if (!start_node) {

		return_ACPI_STATUS(AE_NO_NAMESPACE);

	}

	}



	/* Null child means "get first node" */

drivers/acpi/battery.c

+0 −12
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ enum { 
};



struct acpi_battery {

	struct mutex lock;

	struct mutex update_lock;

	struct power_supply *bat;

	struct power_supply_desc bat_desc;
@@ -535,11 +534,9 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 
		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

		acpi_status status = AE_ERROR;



		mutex_lock(&battery->lock);

		status = acpi_evaluate_object(battery->device->handle,

					      use_bix ? "_BIX":"_BIF",

					      NULL, &buffer);

		mutex_unlock(&battery->lock);



		if (ACPI_FAILURE(status)) {

			acpi_handle_info(battery->device->handle,
@@ -576,11 +573,8 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
			msecs_to_jiffies(cache_time)))

		return 0;



	mutex_lock(&battery->lock);

	status = acpi_evaluate_object(battery->device->handle, "_BST",

				      NULL, &buffer);

	mutex_unlock(&battery->lock);



	if (ACPI_FAILURE(status)) {

		acpi_handle_info(battery->device->handle,

				 "_BST evaluation failed: %s",
@@ -628,11 +622,8 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery) 
	    !test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags))

		return -ENODEV;



	mutex_lock(&battery->lock);

	status = acpi_execute_simple_method(battery->device->handle, "_BTP",

					    battery->alarm);

	mutex_unlock(&battery->lock);



	if (ACPI_FAILURE(status))

		return -ENODEV;
@@ -1235,9 +1226,6 @@ static int acpi_battery_add(struct acpi_device *device) 
	strscpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);

	strscpy(acpi_device_class(device), ACPI_BATTERY_CLASS);

	device->driver_data = battery;

	result = devm_mutex_init(&device->dev, &battery->lock);

	if (result)

		return result;



	result = devm_mutex_init(&device->dev, &battery->update_lock);

	if (result)

drivers/acpi/dptf/dptf_pch_fivr.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static int pch_fivr_read(acpi_handle handle, char *method, struct pch_fivr_resp 
	ret = 0;



release_buffer:

	kfree(buffer.pointer);

	ACPI_FREE(buffer.pointer);

	return ret;

}

drivers/acpi/ec.c

+2 −1
Original line number Diff line number Diff line
@@ -2294,7 +2294,8 @@ static int acpi_ec_init_workqueues(void) 
		ec_wq = alloc_ordered_workqueue("kec", 0);



	if (!ec_query_wq)

		ec_query_wq = alloc_workqueue("kec_query", 0, ec_max_queries);

		ec_query_wq = alloc_workqueue("kec_query", WQ_PERCPU,

					      ec_max_queries);



	if (!ec_wq || !ec_query_wq) {

		acpi_ec_destroy_workqueues();