提交 04c9a3a0 编写于 作者: H Hans de Goede 提交者: Matthew Garrett

dell-laptop: Sync current block state to BIOS on hw switch change

This is necessary for 3 reasons:
1) To apply sw_state changes made while hw-blocked
2) To set all the blocked bits for hw-switch controlled radios to 1 when the
   switch gets changed to off, this is necessary on some models to actually
   turn the radio status LEDs off.
3) On some models non hw-switch controlled radios will have their block bit
   cleared (potentially undoing a soft-block) on hw-switch toggle, this
   restores the sw-block in this case.
Signed-off-by: NHans de Goede <hdegoede@redhat.com>
Signed-off-by: NMatthew Garrett <matthew.garrett@nebula.com>
上级 4d39d88c
...@@ -422,10 +422,16 @@ static int dell_rfkill_set(void *data, bool blocked) ...@@ -422,10 +422,16 @@ static int dell_rfkill_set(void *data, bool blocked)
return 0; return 0;
} }
/* Must be called with the buffer held */
static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio, static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio,
int status) int status)
{ {
if (!(status & BIT(0))) { if (status & BIT(0)) {
/* Has hw-switch, sync sw_state to BIOS */
int block = rfkill_blocked(rfkill);
buffer->input[0] = (1 | (radio << 8) | (block << 16));
dell_send_request(buffer, 17, 11);
} else {
/* No hw-switch, sync BIOS state to sw_state */ /* No hw-switch, sync BIOS state to sw_state */
rfkill_set_sw_state(rfkill, !!(status & BIT(radio + 16))); rfkill_set_sw_state(rfkill, !!(status & BIT(radio + 16)));
} }
...@@ -445,9 +451,10 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) ...@@ -445,9 +451,10 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
get_buffer(); get_buffer();
dell_send_request(buffer, 17, 11); dell_send_request(buffer, 17, 11);
status = buffer->output[1]; status = buffer->output[1];
release_buffer();
dell_rfkill_update_hw_state(rfkill, (unsigned long)data, status); dell_rfkill_update_hw_state(rfkill, (unsigned long)data, status);
release_buffer();
} }
static const struct rfkill_ops dell_rfkill_ops = { static const struct rfkill_ops dell_rfkill_ops = {
...@@ -531,7 +538,6 @@ static void dell_update_rfkill(struct work_struct *ignored) ...@@ -531,7 +538,6 @@ static void dell_update_rfkill(struct work_struct *ignored)
get_buffer(); get_buffer();
dell_send_request(buffer, 17, 11); dell_send_request(buffer, 17, 11);
status = buffer->output[1]; status = buffer->output[1];
release_buffer();
if (wifi_rfkill) { if (wifi_rfkill) {
dell_rfkill_update_hw_state(wifi_rfkill, 1, status); dell_rfkill_update_hw_state(wifi_rfkill, 1, status);
...@@ -545,6 +551,8 @@ static void dell_update_rfkill(struct work_struct *ignored) ...@@ -545,6 +551,8 @@ static void dell_update_rfkill(struct work_struct *ignored)
dell_rfkill_update_hw_state(wwan_rfkill, 3, status); dell_rfkill_update_hw_state(wwan_rfkill, 3, status);
dell_rfkill_update_sw_state(wwan_rfkill, 3, status); dell_rfkill_update_sw_state(wwan_rfkill, 3, status);
} }
release_buffer();
} }
static DECLARE_DELAYED_WORK(dell_rfkill_work, dell_update_rfkill); static DECLARE_DELAYED_WORK(dell_rfkill_work, dell_update_rfkill);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册