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

Merge branches 'acpi-video' and 'acpi-battery' 

Merge an ACPI backlight (video) quirk and ACPI battery driver fix and
cleanup for 6.12-rc2:

 - Add a quirk for Dell OptiPlex 5480 AIO to the ACPI backlight (video)
   driver (Hans de Goede).

 - Prevent the ACPI battery driver from crashing when unregistering a
   battery hook and simplify battery hook locking in it (Armin Wolf).

* acpi-video:
  ACPI: video: Add backlight=native quirk for Dell OptiPlex 5480 AIO

* acpi-battery:
  ACPI: battery: Fix possible crash when unregistering a battery hook
  ACPI: battery: Simplify battery hook locking
parents 056301e7 ac78288f 76959aff

drivers/acpi/battery.c

+17 −11
Original line number Diff line number Diff line
@@ -703,28 +703,35 @@ static LIST_HEAD(acpi_battery_list); 
static LIST_HEAD(battery_hook_list);

static DEFINE_MUTEX(hook_mutex);



static void __battery_hook_unregister(struct acpi_battery_hook *hook, int lock)

static void battery_hook_unregister_unlocked(struct acpi_battery_hook *hook)

{

	struct acpi_battery *battery;



	/*

	 * In order to remove a hook, we first need to

	 * de-register all the batteries that are registered.

	 */

	if (lock)

		mutex_lock(&hook_mutex);

	list_for_each_entry(battery, &acpi_battery_list, list) {

		if (!hook->remove_battery(battery->bat, hook))

			power_supply_changed(battery->bat);

	}

	list_del(&hook->list);

	if (lock)

		mutex_unlock(&hook_mutex);

	list_del_init(&hook->list);



	pr_info("extension unregistered: %s\n", hook->name);

}



void battery_hook_unregister(struct acpi_battery_hook *hook)

{

	__battery_hook_unregister(hook, 1);

	mutex_lock(&hook_mutex);

	/*

	 * Ignore already unregistered battery hooks. This might happen

	 * if a battery hook was previously unloaded due to an error when

	 * adding a new battery.

	 */

	if (!list_empty(&hook->list))

		battery_hook_unregister_unlocked(hook);



	mutex_unlock(&hook_mutex);

}

EXPORT_SYMBOL_GPL(battery_hook_unregister);
@@ -733,7 +740,6 @@ void battery_hook_register(struct acpi_battery_hook *hook) 
	struct acpi_battery *battery;



	mutex_lock(&hook_mutex);

	INIT_LIST_HEAD(&hook->list);

	list_add(&hook->list, &battery_hook_list);

	/*

	 * Now that the driver is registered, we need
@@ -750,7 +756,7 @@ void battery_hook_register(struct acpi_battery_hook *hook) 
			 * hooks.

			 */

			pr_err("extension failed to load: %s", hook->name);

			__battery_hook_unregister(hook, 0);

			battery_hook_unregister_unlocked(hook);

			goto end;

		}
@@ -804,7 +810,7 @@ static void battery_hook_add_battery(struct acpi_battery *battery) 
			 */

			pr_err("error in extension, unloading: %s",

					hook_node->name);

			__battery_hook_unregister(hook_node, 0);

			battery_hook_unregister_unlocked(hook_node);

		}

	}

	mutex_unlock(&hook_mutex);
@@ -837,7 +843,7 @@ static void __exit battery_hook_exit(void) 
	 * need to remove the hooks.

	 */

	list_for_each_entry_safe(hook, ptr, &battery_hook_list, list) {

		__battery_hook_unregister(hook, 1);

		battery_hook_unregister(hook);

	}

	mutex_destroy(&hook_mutex);

}

drivers/acpi/video_detect.c

+9 −0
Original line number Diff line number Diff line
@@ -844,6 +844,15 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
	 * controller board in their ACPI tables (and may even have one), but

	 * which need native backlight control nevertheless.

	 */

	{

	 /* https://github.com/zabbly/linux/issues/26 */

	 .callback = video_detect_force_native,

	 /* Dell OptiPlex 5480 AIO */

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 5480 AIO"),

		},

	},

	{

	 /* https://bugzilla.redhat.com/show_bug.cgi?id=2303936 */

	 .callback = video_detect_force_native,