Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cae06e6 authored by AceLan Kao's avatar AceLan Kao Committed by Matthew Garrett
Browse files

asus-wmi: update wlan LED through rfkill led trigger 

For those machines with wapf=4, BIOS won't update the wireless LED,
since wapf=4 means user application will take in chage of the wifi and bt.
So, we have to update wlan LED status explicitly.

But I found there is another wireless LED bug in launchpad and which is
not in the wapf=4 quirk.
So, it might be better to set wireless LED status explicitly for all
machines.

BugLink: https://launchpad.net/bugs/901105



Signed-off-by: default avatarAceLan Kao <acelan.kao@canonical.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 9e2d59ad

drivers/platform/x86/asus-wmi.c

+76 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ struct asus_wmi { 
	struct device *hwmon_device;

	struct platform_device *platform_device;



	struct led_classdev wlan_led;

	int wlan_led_wk;

	struct led_classdev tpd_led;

	int tpd_led_wk;

	struct led_classdev kbd_led;
@@ -194,6 +196,7 @@ struct asus_wmi { 
	struct workqueue_struct *led_workqueue;

	struct work_struct tpd_led_work;

	struct work_struct kbd_led_work;

	struct work_struct wlan_led_work;



	struct asus_rfkill wlan;

	struct asus_rfkill bluetooth;
@@ -456,12 +459,65 @@ static enum led_brightness kbd_led_get(struct led_classdev *led_cdev) 
	return value;

}



static int wlan_led_unknown_state(struct asus_wmi *asus)

{

	u32 result;



	asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_WIRELESS_LED, &result);



	return result & ASUS_WMI_DSTS_UNKNOWN_BIT;

}



static int wlan_led_presence(struct asus_wmi *asus)

{

	u32 result;



	asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_WIRELESS_LED, &result);



	return result & ASUS_WMI_DSTS_PRESENCE_BIT;

}



static void wlan_led_update(struct work_struct *work)

{

	int ctrl_param;

	struct asus_wmi *asus;



	asus = container_of(work, struct asus_wmi, wlan_led_work);



	ctrl_param = asus->wlan_led_wk;

	asus_wmi_set_devstate(ASUS_WMI_DEVID_WIRELESS_LED, ctrl_param, NULL);

}



static void wlan_led_set(struct led_classdev *led_cdev,

			 enum led_brightness value)

{

	struct asus_wmi *asus;



	asus = container_of(led_cdev, struct asus_wmi, wlan_led);



	asus->wlan_led_wk = !!value;

	queue_work(asus->led_workqueue, &asus->wlan_led_work);

}



static enum led_brightness wlan_led_get(struct led_classdev *led_cdev)

{

	struct asus_wmi *asus;

	u32 result;



	asus = container_of(led_cdev, struct asus_wmi, wlan_led);

	asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_WIRELESS_LED, &result);



	return result & ASUS_WMI_DSTS_BRIGHTNESS_MASK;

}



static void asus_wmi_led_exit(struct asus_wmi *asus)

{

	if (!IS_ERR_OR_NULL(asus->kbd_led.dev))

		led_classdev_unregister(&asus->kbd_led);

	if (!IS_ERR_OR_NULL(asus->tpd_led.dev))

		led_classdev_unregister(&asus->tpd_led);

	if (!IS_ERR_OR_NULL(asus->wlan_led.dev))

		led_classdev_unregister(&asus->wlan_led);

	if (asus->led_workqueue)

		destroy_workqueue(asus->led_workqueue);

}
@@ -498,6 +554,23 @@ static int asus_wmi_led_init(struct asus_wmi *asus) 


		rv = led_classdev_register(&asus->platform_device->dev,

					   &asus->kbd_led);

		if (rv)

			goto error;

	}



	if (wlan_led_presence(asus)) {

		INIT_WORK(&asus->wlan_led_work, wlan_led_update);



		asus->wlan_led.name = "asus::wlan";

		asus->wlan_led.brightness_set = wlan_led_set;

		if (!wlan_led_unknown_state(asus))

			asus->wlan_led.brightness_get = wlan_led_get;

		asus->wlan_led.flags = LED_CORE_SUSPENDRESUME;

		asus->wlan_led.max_brightness = 1;

		asus->wlan_led.default_trigger = "asus-wlan";



		rv = led_classdev_register(&asus->platform_device->dev,

					   &asus->wlan_led);

	}



error:
@@ -813,6 +886,9 @@ static int asus_new_rfkill(struct asus_wmi *asus, 
	if (!*rfkill)

		return -EINVAL;



	if (dev_id == ASUS_WMI_DEVID_WLAN)

		rfkill_set_led_trigger_name(*rfkill, "asus-wlan");



	rfkill_init_sw_state(*rfkill, !result);

	result = rfkill_register(*rfkill);

	if (result) {