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

Merge branches 'acpi-misc' and 'pnp' 

Merge miscellaneous ACPI support updates and a PNP update for 6.19-rc1:

 - 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)

* acpi-misc:
  ACPI: PM: Fix a spelling mistake
  ACPI: LPSS: Fix a spelling mistake
  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
  rust: acpi: replace `core::mem::zeroed` with `pin_init::zeroed`

* pnp:
  PNP: Fix ISAPNP to generate uevents to auto-load modules
parents ba9aeba0 a508939e e96190da

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();

drivers/acpi/osl.c

+3 −3
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static void acpi_os_drop_map_ref(struct acpi_ioremap *map) 
	list_del_rcu(&map->list);



	INIT_RCU_WORK(&map->track.rwork, acpi_os_map_remove);

	queue_rcu_work(system_wq, &map->track.rwork);

	queue_rcu_work(system_percpu_wq, &map->track.rwork);

}



/**
@@ -1694,8 +1694,8 @@ acpi_status __init acpi_os_initialize(void) 


acpi_status __init acpi_os_initialize1(void)

{

	kacpid_wq = alloc_workqueue("kacpid", 0, 1);

	kacpi_notify_wq = alloc_workqueue("kacpi_notify", 0, 0);

	kacpid_wq = alloc_workqueue("kacpid", WQ_PERCPU, 1);

	kacpi_notify_wq = alloc_workqueue("kacpi_notify", WQ_PERCPU, 0);

	kacpi_hotplug_wq = alloc_ordered_workqueue("kacpi_hotplug", 0);

	BUG_ON(!kacpid_wq);

	BUG_ON(!kacpi_notify_wq);

drivers/acpi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -2397,7 +2397,7 @@ static bool acpi_scan_clear_dep_queue(struct acpi_device *adev) 
	 * initial enumeration of devices is complete, put it into the unbound

	 * workqueue.

	 */

	queue_work(system_unbound_wq, &cdw->work);

	queue_work(system_dfl_wq, &cdw->work);



	return true;

}

drivers/acpi/sleep.c

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state) 
	/*

	 * Disable all GPE and clear their status bits before interrupts are

	 * enabled. Some GPEs (like wakeup GPEs) have no handlers and this can

	 * prevent them from producing spurious interrups.

	 * prevent them from producing spurious interrupts.

	 *

	 * acpi_leave_sleep_state() will reenable specific GPEs later.

	 *

drivers/acpi/thermal.c

+2 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,8 @@ static int __init acpi_thermal_init(void) 
	}



	acpi_thermal_pm_queue = alloc_workqueue("acpi_thermal_pm",

						WQ_HIGHPRI | WQ_MEM_RECLAIM, 0);

						WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_PERCPU,

						0);

	if (!acpi_thermal_pm_queue)

		return -ENODEV;