hp-wmi: improved rfkill support for wifi

From 9446bad909bf4c6b3d6d57d2f364ac18616f9baa Mon Sep 17 00:00:00 2001

I borrowed a HP G7000 last week. The hp-wmi driver seemed a bit confused about hard v.s. soft blocks on the wifi, so I fixed it based on acpidump output [1]. I hope this will work on other HP model numbers, but it would benefit from testing. Any volunteers?

I borrowed a HP G7000 last week.  The hp-wmi driver seemed a bit confused about hard v.s. soft blocks on the wifi, so I fixed it based on acpidump output [1].  I hope this will work on other HP model numbers, but it would benefit from testing.  Any volunteers?

2009/7/18 Alan Jenkins <[email protected]>:

Quoted 5 lines

I borrowed a HP G7000 last week. The hp-wmi driver seemed a bit confused about hard v.s. soft blocks on the wifi, so I fixed it based on acpidump output [1]. I hope this will work on other HP model numbers, but it would benefit from testing. Any volunteers?

HP/Compaq nx6310
2.6.31-rc3+patch

When is enabled by button:

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill1  rfkill2  rfkill3
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hci0
hp-wifi
hp-bluetooth
root@gumis:/sys/class/rfkill# cat rfkill*/state
1
1
1
1

When disabled by button:

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill2  rfkill3
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hp-wifi
hp-bluetooth
root@gumis:/sys/class/rfkill# cat rfkill*/state
2
1
0

I enable again by button:

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill2  rfkill3  rfkill4
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hp-wifi
hp-bluetooth
hci0
root@gumis:/sys/class/rfkill# cat rfkill*/state
1
1
1
1

I disable "by software" in Windows XP (bluetooth and wireless):

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill1  rfkill2  rfkill3
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hp-wifi
hp-bluetooth
hci0
root@gumis:/sys/class/rfkill# cat rfkill*/state
2
0
1
1

Bluetooth works fine when I back to Linux, it seems be enabled during boot. Wireless is disabled. I cannot connect to network. So I re-enable it in Windows:

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill1  rfkill2  rfkill3
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hci0
hp-wifi
hp-bluetooth
root@gumis:/sys/class/rfkill# cat rfkill*/state
1
1
1
1

Regards

Quoted 81 lines · Maciej Rutecki

2009/7/18 Alan Jenkins <[email protected]>:

Quoted 5 lines

I borrowed a HP G7000 last week.  The hp-wmi driver seemed a bit confused about hard v.s. soft blocks on the wifi, so I fixed it based on acpidump output [1].  I hope this will work on other HP model numbers, but it would benefit from testing.  Any volunteers?

HP/Compaq nx6310
2.6.31-rc3+patch

When is enabled by button:

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill1  rfkill2  rfkill3
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hci0
hp-wifi
hp-bluetooth
root@gumis:/sys/class/rfkill# cat rfkill*/state
1
1
1
1

When disabled by button:

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill2  rfkill3
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hp-wifi
hp-bluetooth
root@gumis:/sys/class/rfkill# cat rfkill*/state
2
1
0

I enable again by button:

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill2  rfkill3  rfkill4
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hp-wifi
hp-bluetooth
hci0
root@gumis:/sys/class/rfkill# cat rfkill*/state
1
1
1
1

I disable "by software" in Windows XP (bluetooth and wireless):

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill1  rfkill2  rfkill3
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hp-wifi
hp-bluetooth
hci0
root@gumis:/sys/class/rfkill# cat rfkill*/state
2
0
1
1

Bluetooth works fine when I back to Linux, it seems be enabled during boot. Wireless is disabled. I cannot connect to network. So I re-enable it in Windows:

root@gumis:/sys/class/rfkill# ls
rfkill0  rfkill1  rfkill2  rfkill3
root@gumis:/sys/class/rfkill# cat rfkill*/name
phy0
hci0
hp-wifi
hp-bluetooth
root@gumis:/sys/class/rfkill# cat rfkill*/state
1
1
1
1

Quoted 2 lines

Regards

Great detail!  That all fits with what I was expecting.

Linux can also do enabling "by software".  At the moment, you need to download and compile a utility to poke /dev/rfkill.  I wouldn't bother testing it, because I didn't change that bit :-).

I'll try extending this to bluetooth and wwan as Matthew suggested.  If you have time to run "acpidump" and send me the output, that would help me check the details.

Quoted 3 lines

Linux can also do enabling "by software".  At the moment, you need to download and compile a utility to poke /dev/rfkill.  I wouldn't bother testing it, because I didn't change that bit :-).

Utility is here
http://git.sipsolutions.net/?p=rfkill.git
And a patch to restore write access to /sys/class/rfkill/*/state file is here
http://lkml.org/lkml/2009/7/10/339

I'll try extending this to bluetooth and wwan as Matthew suggested.  If you have time to run "acpidump" and send me the output, that would help

2009/7/18 Alan Jenkins <[email protected]>:
[...]

Quoted 3 lines

I'll try extending this to bluetooth and wwan as Matthew suggested. If you have time to run "acpidump" and send me the output, that would help

acpidump in attachment.

Quoted 9 lines · Maciej Rutecki

2009/7/18 Alan Jenkins <[email protected]>:
[...]

Quoted 3 lines

I'll try extending this to bluetooth and wwan as Matthew suggested.  If you have time to run "acpidump" and send me the output, that would help

acpidump in attachment.

Heh, I got lucky borrowing the G7000.  Your acpidump is much less human readable, and Matthews lot is the same.  I gave up looking for the right bits.

So I had to guess :-).  The interface seems nicely structured, so I generalized my changes and applied them to the other rfkill devices. Patch follows - apply on top of the first one.

Now if you disable bluetooth in the Windows driver and reboot to linux, you should find it stays disabled.

2009/7/19 Alan Jenkins <[email protected]>:

Quoted 17 lines

Quoted 11 lines · Maciej Rutecki

2009/7/18 Alan Jenkins <[email protected]>:
[...]

Quoted 4 lines

I'll try extending this to bluetooth and wwan as Matthew suggested. If you have time to run "acpidump" and send me the output, that would help

acpidump in attachment.

Heh, I got lucky borrowing the G7000. Your acpidump is much less human readable, and Matthews lot is the same. I gave up looking for the right bits.

Quoted 8 lines

So I had to guess :-). The interface seems nicely structured, so I generalized my changes and applied them to the other rfkill devices. Patch follows - apply on top of the first one.

Now if you disable bluetooth in the Windows driver and reboot to linux, you should find it stays disabled.

2.6.31-rc3+ patches:
http://lkml.org/lkml/2009/7/18/131
http://lkml.org/lkml/2009/7/10/339
http://lkml.org/lkml/2009/7/19/57

Disable bluetooth and wireless in Windows XP
When modprobe hp-wmi during boot:

[    9.648259] input: HP WMI hotkeys as /class/input/input8
[    9.664468] Platform driver 'hp-wmi' needs updating - please use dev_pm_ops
[    9.707352] ------------[ cut here ]------------
[    9.708007] Kernel BUG at f80763b7 [verbose debug info unavailable

[    9.708007] EIP is at rfkill_init_sw_state+0x57/0x70 [rfkill

[    9.708007]  [<f8efa18f>] ? hp_wmi_bios_setup+0x18f/0x211 [hp_wmi

LED from wifi/bluetooth button sometimes flashing(!)

Sorry, that was a dumb copy+paste error.  Here's a fixed version.

2009/7/19 Alan Jenkins <[email protected]>:

Quoted 3 lines

Sorry, that was a dumb copy+paste error. Here's a fixed version.

No errors during boot, but still bluetooth is disabled:

root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill list
0: phy0: Wireless LAN
        Soft blocked: yes
        Hard blocked: yes
1: hp-wifi: Wireless LAN
        Soft blocked: yes
        Hard blocked: no
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill unblock 0

...and here's the version that remembers to register the bluetooth.  I reviewed the patch again; hopefully that's the last dumb error.

drivers/platform/x86/hp-wmi.c +11 -4

index 517ac47..adb26d3 100644
@@ -51,6 +51,12 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");
  #define HPWMI_WIRELESS_QUERY 0x5
  #define HPWMI_HOTKEY_QUERY 0xc
 
+enum hp_wmi_radio {
+       HPWMI_WIFI = 0,
+       HPWMI_BLUETOOTH = 1,
+       HPWMI_WWAN = 2,
+};
+
  static int __init hp_wmi_bios_setup(struct platform_device *device);
  static int __exit hp_wmi_bios_remove(struct platform_device *device);
  static int hp_wmi_resume_handler(struct platform_device *device);

@@ -170,8 +176,8 @@ static int hp_wmi_tablet_state(void)
 
  static int hp_wmi_set_block(void *data, bool blocked)
  {
-       unsigned long b = (unsigned long) data;
-       int query = BIT(b + 8) | ((!blocked) << b);
+       enum hp_wmi_radio r = (enum hp_wmi_radio) data;
+       int query = BIT(r + 8) | ((!blocked) << r);
 
        return hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, query);
  }

@@ -180,41 +186,23 @@ static const struct rfkill_ops hp_wmi_rfkill_ops = {
        .set_block = hp_wmi_set_block,
  };
 
-static bool hp_wmi_wifi_sw_state(void)
+static bool hp_wmi_get_sw_state(enum hp_wmi_radio r)
  {
        int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
+       int mask = 0x200 << (r * 8);
 
-       if (wireless & 0x200)
+       if (wireless & mask)
                return false;

       else
               return true;
 }

drivers/platform/x86/hp-wmi.c +1 -1

-static bool hp_wmi_wifi_hw_state(void)
+static bool hp_wmi_get_hw_state(enum hp_wmi_radio r)

 {
       int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
+       int mask = 0x800 << (r * 8);

-       if (wireless & 0x800)
-               return false;
-       else
-               return true;

drivers/platform/x86/hp-wmi.c +1 -17

-}
-
-static bool hp_wmi_bluetooth_state(void)
-{
-       int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
-
-       if (wireless & 0x10000)
-               return false;
-       else
-               return true;
-}
-
-static bool hp_wmi_wwan_state(void)
-{
-       int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
-
-       if (wireless & 0x1000000)
+       if (wireless & mask)

               return false;
       else
               return true;

drivers/platform/x86/hp-wmi.c +60 -45

@@ -339,50 +327,55 @@ static void hp_wmi_notify(u32 value, void *context)
        struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
        static struct key_entry *key;
        union acpi_object *obj;
+       int eventcode;
 
        wmi_get_event_data(value, &response);
 
        obj = (union acpi_object *)response.pointer;
 
-       if (obj && obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 8) {
-               int eventcode = *((u8 *) obj->buffer.pointer);
-               if (eventcode == 0x4)
-                       eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0,
-                                                        0);
-               key = hp_wmi_get_entry_by_scancode(eventcode);
-               if (key) {
-                       switch (key->type) {
-                       case KE_KEY:
-                               input_report_key(hp_wmi_input_dev,
-                                                key->keycode, 1);
-                               input_sync(hp_wmi_input_dev);
-                               input_report_key(hp_wmi_input_dev,
-                                                key->keycode, 0);
-                               input_sync(hp_wmi_input_dev);
-                               break;
-                       }
-               } else if (eventcode == 0x1) {
-                       input_report_switch(hp_wmi_input_dev, SW_DOCK,
-                                           hp_wmi_dock_state());
-                       input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
-                                           hp_wmi_tablet_state());
+       if (!obj || obj->type != ACPI_TYPE_BUFFER || obj->buffer.length != 8) {
+               printk(KERN_INFO "HP WMI: Unknown response received\n");
+               return;
+       }
+
+       eventcode = *((u8 *) obj->buffer.pointer);
+       if (eventcode == 0x4)
+               eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0,
+                                               0);
+       key = hp_wmi_get_entry_by_scancode(eventcode);
+       if (key) {
+               switch (key->type) {
+               case KE_KEY:
+                       input_report_key(hp_wmi_input_dev,
+                                        key->keycode, 1);
+                       input_sync(hp_wmi_input_dev);
+                       input_report_key(hp_wmi_input_dev,
+                                        key->keycode, 0);
                        input_sync(hp_wmi_input_dev);
-               } else if (eventcode == 0x5) {
-                       if (wifi_rfkill)
-                               rfkill_set_states(wifi_rfkill,
-                                                 hp_wmi_wifi_sw_state(),
-                                                 hp_wmi_wifi_hw_state());
-                       if (bluetooth_rfkill)
-                               rfkill_set_sw_state(bluetooth_rfkill,
-                                                   hp_wmi_bluetooth_state());
-                       if (wwan_rfkill)
-                               rfkill_set_sw_state(wwan_rfkill,
-                                                   hp_wmi_wwan_state());
-               } else
-                       printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
-                              eventcode);
+                       break;
+               }
+       } else if (eventcode == 0x1) {
+               input_report_switch(hp_wmi_input_dev, SW_DOCK,
+                                   hp_wmi_dock_state());
+               input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
+                                   hp_wmi_tablet_state());
+               input_sync(hp_wmi_input_dev);
+       } else if (eventcode == 0x5) {
+               if (wifi_rfkill)
+                       rfkill_set_states(wifi_rfkill,
+                                         hp_wmi_get_sw_state(HPWMI_WIFI),
+                                         hp_wmi_get_hw_state(HPWMI_WIFI));
+               if (bluetooth_rfkill)
+                       rfkill_set_states(bluetooth_rfkill,
+                                         hp_wmi_get_sw_state(HPWMI_BLUETOOTH),
+                                         hp_wmi_get_hw_state(HPWMI_BLUETOOTH));
+               if (wwan_rfkill)
+                       rfkill_set_states(wwan_rfkill,
+                                         hp_wmi_get_sw_state(HPWMI_WWAN),
+                                         hp_wmi_get_hw_state(HPWMI_WWAN));
        } else
-               printk(KERN_INFO "HP WMI: Unknown response received\n");
+               printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
+                       eventcode);
  }
 
  static int __init hp_wmi_input_setup(void)

@@ -461,11 +454,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                wifi_rfkill = rfkill_alloc("hp-wifi", &device->dev,
                                           RFKILL_TYPE_WLAN,
                                           &hp_wmi_rfkill_ops,
-                                          (void *) 0);
+                                          (void *) HPWMI_WIFI);
                rfkill_init_sw_state(wifi_rfkill,
-                                    hp_wmi_wifi_sw_state());
+                                    hp_wmi_get_sw_state(HPWMI_WIFI));
                rfkill_set_hw_state(wifi_rfkill,
-                                   hp_wmi_wifi_hw_state());
+                                   hp_wmi_get_hw_state(HPWMI_WIFI));
                err = rfkill_register(wifi_rfkill);
                if (err)
                        goto register_wifi_error;

@@ -475,7 +468,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                bluetooth_rfkill = rfkill_alloc("hp-bluetooth", &device->dev,
                                                RFKILL_TYPE_BLUETOOTH,
                                                &hp_wmi_rfkill_ops,
-                                               (void *) 1);
+                                               (void *) HPWMI_BLUETOOTH);
+               rfkill_init_sw_state(bluetooth_rfkill,
+                                    hp_wmi_get_sw_state(HPWMI_BLUETOOTH));
+               rfkill_set_hw_state(bluetooth_rfkill,
+                                   hp_wmi_get_hw_state(HPWMI_BLUETOOTH));
                err = rfkill_register(bluetooth_rfkill);
                if (err)
                        goto register_bluetooth_error;

@@ -485,7 +482,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                wwan_rfkill = rfkill_alloc("hp-wwan", &device->dev,
                                           RFKILL_TYPE_WWAN,
                                           &hp_wmi_rfkill_ops,
-                                          (void *) 2);
+                                          (void *) HPWMI_WWAN);
+               rfkill_init_sw_state(wwan_rfkill,
+                                    hp_wmi_get_sw_state(HPWMI_WWAN));
+               rfkill_set_hw_state(wwan_rfkill,
+                                   hp_wmi_get_hw_state(HPWMI_WWAN));
                err = rfkill_register(wwan_rfkill);
                if (err)
                        goto register_wwan_err;

@@ -541,9 +542,18 @@ static int hp_wmi_resume_handler(struct platform_device *device)
                            hp_wmi_tablet_state());
        input_sync(hp_wmi_input_dev);
 
-       rfkill_set_states(wifi_rfkill,
-                         hp_wmi_wifi_sw_state(),
-                         hp_wmi_wifi_hw_state());
+       if (wifi_rfkill)
+               rfkill_set_states(wifi_rfkill,
+                                 hp_wmi_get_sw_state(HPWMI_WIFI),
+                                 hp_wmi_get_hw_state(HPWMI_WIFI));
+       if (bluetooth_rfkill)

2009/7/20 Alan Jenkins <[email protected]>:

Quoted 3 lines

...and here's the version that remembers to register the bluetooth. I reviewed the patch again; hopefully that's the last dumb error.

[...]

2.6.31-rc3+ patches:
http://lkml.org/lkml/2009/7/18/131
http://lkml.org/lkml/2009/7/10/339
+ patch below:

Quoted 226 lines

drivers/platform/x86/hp-wmi.c +74 -71

index 517ac47..adb26d3 100644
@@ -51,6 +51,12 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");
 #define HPWMI_WIRELESS_QUERY 0x5
 #define HPWMI_HOTKEY_QUERY 0xc
 
+enum hp_wmi_radio {
+       HPWMI_WIFI = 0,
+       HPWMI_BLUETOOTH = 1,
+       HPWMI_WWAN = 2,
+};
+
 static int __init hp_wmi_bios_setup(struct platform_device *device);
 static int __exit hp_wmi_bios_remove(struct platform_device *device);
 static int hp_wmi_resume_handler(struct platform_device *device);

@@ -170,8 +176,8 @@ static int hp_wmi_tablet_state(void)
 
 static int hp_wmi_set_block(void *data, bool blocked)
 {
-       unsigned long b = (unsigned long) data;
-       int query = BIT(b + 8) | ((!blocked) << b);
+       enum hp_wmi_radio r = (enum hp_wmi_radio) data;
+       int query = BIT(r + 8) | ((!blocked) << r);
 
       return hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, query);
 }

@@ -180,41 +186,23 @@ static const struct rfkill_ops hp_wmi_rfkill_ops = {
       .set_block = hp_wmi_set_block,
 };
 
-static bool hp_wmi_wifi_sw_state(void)
+static bool hp_wmi_get_sw_state(enum hp_wmi_radio r)
 {
       int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
+       int mask = 0x200 << (r * 8);
 
-       if (wireless & 0x200)
+       if (wireless & mask)
               return false;
       else
               return true;
 }
 
-static bool hp_wmi_wifi_hw_state(void)
+static bool hp_wmi_get_hw_state(enum hp_wmi_radio r)
 {
       int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
+       int mask = 0x800 << (r * 8);
 
-       if (wireless & 0x800)
-               return false;
-       else
-               return true;
-}
-
-static bool hp_wmi_bluetooth_state(void)
-{
-       int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
-
-       if (wireless & 0x10000)
-               return false;
-       else
-               return true;
-}
-
-static bool hp_wmi_wwan_state(void)
-{
-       int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
-
-       if (wireless & 0x1000000)
+       if (wireless & mask)
               return false;
       else
               return true;

@@ -339,50 +327,55 @@ static void hp_wmi_notify(u32 value, void *context)
       struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
       static struct key_entry *key;
       union acpi_object *obj;
+       int eventcode;
 
       wmi_get_event_data(value, &response);
 
       obj = (union acpi_object *)response.pointer;
 
-       if (obj && obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 8) {
-               int eventcode = *((u8 *) obj->buffer.pointer);
-               if (eventcode == 0x4)
-                       eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0,
-                                                        0);
-               key = hp_wmi_get_entry_by_scancode(eventcode);
-               if (key) {
-                       switch (key->type) {
-                       case KE_KEY:
-                               input_report_key(hp_wmi_input_dev,
-                                                key->keycode, 1);
-                               input_sync(hp_wmi_input_dev);
-                               input_report_key(hp_wmi_input_dev,
-                                                key->keycode, 0);
-                               input_sync(hp_wmi_input_dev);
-                               break;
-                       }
-               } else if (eventcode == 0x1) {
-                       input_report_switch(hp_wmi_input_dev, SW_DOCK,
-                                           hp_wmi_dock_state());
-                       input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
-                                           hp_wmi_tablet_state());
+       if (!obj || obj->type != ACPI_TYPE_BUFFER || obj->buffer.length != 8) {
+               printk(KERN_INFO "HP WMI: Unknown response received\n");
+               return;
+       }
+
+       eventcode = *((u8 *) obj->buffer.pointer);
+       if (eventcode == 0x4)
+               eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0,
+                                               0);
+       key = hp_wmi_get_entry_by_scancode(eventcode);
+       if (key) {
+               switch (key->type) {
+               case KE_KEY:
+                       input_report_key(hp_wmi_input_dev,
+                                        key->keycode, 1);
+                       input_sync(hp_wmi_input_dev);
+                       input_report_key(hp_wmi_input_dev,
+                                        key->keycode, 0);
                       input_sync(hp_wmi_input_dev);
-               } else if (eventcode == 0x5) {
-                       if (wifi_rfkill)
-                               rfkill_set_states(wifi_rfkill,
-                                                 hp_wmi_wifi_sw_state(),
-                                                 hp_wmi_wifi_hw_state());
-                       if (bluetooth_rfkill)
-                               rfkill_set_sw_state(bluetooth_rfkill,
-                                                   hp_wmi_bluetooth_state());
-                       if (wwan_rfkill)
-                               rfkill_set_sw_state(wwan_rfkill,
-                                                   hp_wmi_wwan_state());
-               } else
-                       printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
-                              eventcode);
+                       break;
+               }
+       } else if (eventcode == 0x1) {
+               input_report_switch(hp_wmi_input_dev, SW_DOCK,
+                                   hp_wmi_dock_state());
+               input_report_switch(hp_wmi_input_dev, SW_TABLET_MODE,
+                                   hp_wmi_tablet_state());
+               input_sync(hp_wmi_input_dev);
+       } else if (eventcode == 0x5) {
+               if (wifi_rfkill)
+                       rfkill_set_states(wifi_rfkill,
+                                         hp_wmi_get_sw_state(HPWMI_WIFI),
+                                         hp_wmi_get_hw_state(HPWMI_WIFI));
+               if (bluetooth_rfkill)
+                       rfkill_set_states(bluetooth_rfkill,
+                                         hp_wmi_get_sw_state(HPWMI_BLUETOOTH),
+                                         hp_wmi_get_hw_state(HPWMI_BLUETOOTH));
+               if (wwan_rfkill)
+                       rfkill_set_states(wwan_rfkill,
+                                         hp_wmi_get_sw_state(HPWMI_WWAN),
+                                         hp_wmi_get_hw_state(HPWMI_WWAN));
       } else
-               printk(KERN_INFO "HP WMI: Unknown response received\n");
+               printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
+                       eventcode);
 }
 
 static int __init hp_wmi_input_setup(void)

@@ -461,11 +454,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
               wifi_rfkill = rfkill_alloc("hp-wifi", &device->dev,
                                          RFKILL_TYPE_WLAN,
                                          &hp_wmi_rfkill_ops,
-                                          (void *) 0);
+                                          (void *) HPWMI_WIFI);
               rfkill_init_sw_state(wifi_rfkill,
-                                    hp_wmi_wifi_sw_state());
+                                    hp_wmi_get_sw_state(HPWMI_WIFI));
               rfkill_set_hw_state(wifi_rfkill,
-                                   hp_wmi_wifi_hw_state());
+                                   hp_wmi_get_hw_state(HPWMI_WIFI));
               err = rfkill_register(wifi_rfkill);
               if (err)
                       goto register_wifi_error;

@@ -475,7 +468,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
               bluetooth_rfkill = rfkill_alloc("hp-bluetooth", &device->dev,
                                               RFKILL_TYPE_BLUETOOTH,
                                               &hp_wmi_rfkill_ops,
-                                               (void *) 1);
+                                               (void *) HPWMI_BLUETOOTH);
+               rfkill_init_sw_state(bluetooth_rfkill,
+                                    hp_wmi_get_sw_state(HPWMI_BLUETOOTH));
+               rfkill_set_hw_state(bluetooth_rfkill,
+                                   hp_wmi_get_hw_state(HPWMI_BLUETOOTH));
               err = rfkill_register(bluetooth_rfkill);
               if (err)
                       goto register_bluetooth_error;

@@ -485,7 +482,11 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
               wwan_rfkill = rfkill_alloc("hp-wwan", &device->dev,
                                          RFKILL_TYPE_WWAN,
                                          &hp_wmi_rfkill_ops,
-                                          (void *) 2);
+                                          (void *) HPWMI_WWAN);
+               rfkill_init_sw_state(wwan_rfkill,
+                                    hp_wmi_get_sw_state(HPWMI_WWAN));
+               rfkill_set_hw_state(wwan_rfkill,
+                                   hp_wmi_get_hw_state(HPWMI_WWAN));
               err = rfkill_register(wwan_rfkill);
               if (err)
                       goto register_wwan_err;

@@ -541,9 +542,18 @@ static int hp_wmi_resume_handler(struct platform_device *device)
                           hp_wmi_tablet_state());
       input_sync(hp_wmi_input_dev);
 
-       rfkill_set_states(wifi_rfkill,
-                         hp_wmi_wifi_sw_state(),
-                         hp_wmi_wifi_hw_state());
+       if (wifi_rfkill)
+               rfkill_set_states(wifi_rfkill,
+                                 hp_wmi_get_sw_state(HPWMI_WIFI),
+                                 hp_wmi_get_hw_state(HPWMI_WIFI));
+       if (bluetooth_rfkill)

drivers/platform/x86/hp-wmi.c static int hp_wmi_resume_handler(struct platform_device *device) · line 559

Quoted 10 lines

drivers/platform/x86/hp-wmi.c +7 -0

+               rfkill_set_states(bluetooth_rfkill,
+                                 hp_wmi_get_sw_state(HPWMI_BLUETOOTH),
+                                 hp_wmi_get_hw_state(HPWMI_BLUETOOTH));
+       if (wwan_rfkill)
+               rfkill_set_states(wwan_rfkill,
+                                 hp_wmi_get_sw_state(HPWMI_WWAN),
+                                 hp_wmi_get_hw_state(HPWMI_WWAN));
 
       return 0;
 }

root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill list
0: phy0: Wireless LAN
        Soft blocked: yes
        Hard blocked: yes
1: hp-wifi: Wireless LAN
        Soft blocked: yes
        Hard blocked: no
2: hp-bluetooth: Bluetooth
        Soft blocked: yes
        Hard blocked: no
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill unblock 0
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill list
0: phy0: Wireless LAN
        Soft blocked: no
        Hard blocked: yes
1: hp-wifi: Wireless LAN
        Soft blocked: yes
        Hard blocked: no
2: hp-bluetooth: Bluetooth
        Soft blocked: yes
        Hard blocked: no
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill unblock 1
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill list
0: phy0: Wireless LAN
        Soft blocked: no
        Hard blocked: no
1: hp-wifi: Wireless LAN
        Soft blocked: no
        Hard blocked: no
2: hp-bluetooth: Bluetooth
        Soft blocked: yes
        Hard blocked: no
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill unblock 2
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill list
0: phy0: Wireless LAN
        Soft blocked: no
        Hard blocked: no
1: hp-wifi: Wireless LAN
        Soft blocked: no
        Hard blocked: no
2: hp-bluetooth: Bluetooth
        Soft blocked: no
        Hard blocked: no
3: hci0: Bluetooth
        Soft blocked: yes
        Hard blocked: no
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill unblock 3
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# ./rfkill list
0: phy0: Wireless LAN
        Soft blocked: no
        Hard blocked: no
1: hp-wifi: Wireless LAN
        Soft blocked: no
        Hard blocked: no
2: hp-bluetooth: Bluetooth
        Soft blocked: no
        Hard blocked: no
3: hci0: Bluetooth
        Soft blocked: no
        Hard blocked: no
root@gumis:/home/maciek/zrodelka/rfkill/rfkill# hciconfig
hci0:   Type: USB
        BD Address: 00:16:41:88:A0:1B ACL MTU: 1017:8 SCO MTU: 64:8
        DOWN
        RX bytes:318 acl:0 sco:0 events:6 errors:0
        TX bytes:27 acl:0 sco:0 commands:9 errors:0

Works OK. Thanks :-)

During compile I have got:
CC [M] drivers/platform/x86/hp-wmi.o drivers/platform/x86/hp-wmi.c: In function ‘hp_wmi_bios_setup’:
drivers/platform/x86/hp-wmi.c:460: warning: ignoring return value of ‘rfkill_set_hw_state’, declared with attribute warn_unused_result drivers/platform/x86/hp-wmi.c:474: warning: ignoring return value of ‘rfkill_set_hw_state’, declared with attribute warn_unused_result drivers/platform/x86/hp-wmi.c:488: warning: ignoring return value of ‘rfkill_set_hw_state’, declared with attribute warn_unused_result

LED from wifi/bluetooth button sometimes flashing(!)

Quoted 2 lines

LED from wifi/bluetooth button sometimes flashing(!)

The LED will flash if wifi is enabled and bluetooth isn't.