[PATCH] platform/x86: ideapad-laptop: Fix rfkill invert

[PATCH] platform/x86: ideapad-laptop: Fix rfkill invert

[Oleg Keri]

There are a lot of reports on the Internet about rfkill lock on
modern Yoga Ideapad laptops while loading ideapad_laptop platform module.
This patch offers the fix. Obviously it's impossible for me
to test this patch on all ideapad laptops, so i've made an module
parameter init_rfkill_inverted to keep old behavior. Comments are
welcome.

Signed-off-by: Oleg Keri <ezhi99@gmail.com>
---
 drivers/platform/x86/ideapad-laptop.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 535199c9e6bc..1eeda7bc74a3 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -110,6 +110,10 @@ static bool no_bt_rfkill;
 module_param(no_bt_rfkill, bool, 0444);
 MODULE_PARM_DESC(no_bt_rfkill, "No rfkill for bluetooth.");
 
+static bool init_rfkill_inverted;
+module_param(init_rfkill_inverted, bool, 0444);
+MODULE_PARM_DESC(init_rfkill_inverted, "Invert rfkill on initialization");
+
 /*
  * ACPI Helpers
  */
@@ -604,7 +608,9 @@ static int ideapad_register_rfkill(struct ideapad_private *priv, int dev)
 			 &sw_blocked)) {
 		rfkill_init_sw_state(priv->rfk[dev], 0);
 	} else {
-		sw_blocked = !sw_blocked;
+		/* Do not apply invert for ideapads which haven't hw switch */
+		if (priv->has_hw_rfkill_switch || init_rfkill_inverted)
+			sw_blocked = !sw_blocked;
 		rfkill_init_sw_state(priv->rfk[dev], sw_blocked);
 	}
 
-- 
2.17.0

Re: [PATCH] platform/x86: ideapad-laptop: Fix rfkill invert

[Andy Shevchenko]

On Thu, May 24, 2018 at 4:32 PM, Oleg Keri <ezhi99@gmail.com> wrote:
> There are a lot of reports on the Internet about rfkill lock on
> modern Yoga Ideapad laptops while loading ideapad_laptop platform module.
> This patch offers the fix. Obviously it's impossible for me
> to test this patch on all ideapad laptops, so i've made an module
> parameter init_rfkill_inverted to keep old behavior.

> Comments are
> welcome.

So, it should have RFC in the Subject.

> +static bool init_rfkill_inverted;
> +module_param(init_rfkill_inverted, bool, 0444);
> +MODULE_PARM_DESC(init_rfkill_inverted, "Invert rfkill on initialization");

Module parameters are subject to not being added anymore (yes, there
are some significantly rare cases when it makes sense).

> +               /* Do not apply invert for ideapads which haven't hw switch */
> +               if (priv->has_hw_rfkill_switch || init_rfkill_inverted)
> +                       sw_blocked = !sw_blocked;

Since this is under else branch of reading value from Embedded
Controller, we need to understand what and why it returns.

For me a solution rather would be not to read EC value at all in case
of no hw switch, but I also can't test that on many possible laptops.

Would be good to get a comment from Ike.

-- 
With Best Regards,
Andy Shevchenko