Re: [PATCH] acer-wmi: does not set persistence state byrfkill_init_sw_state

[Joey Lee]

æ åï2011-03-31 æ 10:30 +0200ïFlorian Mickler æåï
> On Wed, 30 Mar 2011 22:17:57 +0200
> Florian Mickler <florian@xxxxxxxxxxx> wrote:
> 
> > From: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
> > 
> > Acer BIOS keeps devices state when system reboot, but reset to default
> > device states (Wlan on, Bluetooth off, wwan on) if system cold boot.
> > That means BIOS's initial state is not always real persistence.
> > 
> > So, removed rfkill_init_sw_state because it sets initial state to
> > persistence then replicate to other new killswitch when rfkill-input
> > enabled.
> > After removed it, acer-wmi set initial soft-block state after rfkill
> > register, and doesn't allow set_block until rfkill initial finished.
> > 
> > Reference: bko#31002
> > 	https://bugzilla.kernel.org/show_bug.cgi?id=31002
> > 
> > Cc: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
> > Cc: Matthew Garrett <mjg@xxxxxxxxxx>
> > Cc: Dmitry Torokhov <dtor@xxxxxxx>
> > Cc: Corentin Chary <corentincj@xxxxxxxxxx>
> > Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> > Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
> > Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
> > Tested-by: OldÃÂich JedliÃÂka <oldium.pro@xxxxxxxxx>
> > Signed-off-by: Florian Mickler <florian@xxxxxxxxxxx>
> > ---
> > 
> > This fixes a regression, but no stable annotation was given...
> > 
> > Oversight? Matthew/Chun-Yi please take a look. 
> > 
> 
> I forgot: This is upstream
> commit 8215af019040ce9182728afee9642d8fdeb17f59 .
> 
> As for the Tested-by:, I think that's borked in git. At least I can't
> get it out of git correctly. It should be:
> Tested-by: OldÅich JedliÄka <oldium.pro@xxxxxxxxx> 
> 
> Thanks,
> Flo
> 

OldÅich's name is good in my patch, just like the following attached,
but I don't know how to fix it in git tree:


>From 09bb9cac4345b0ca69216fd2cae17f20e145128b Mon Sep 17 00:00:00 2001
From: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Date: Mon, 28 Mar 2011 14:49:15 +0800
Subject: [PATCH] acer-wmi: does not set persistence state by rfkill_init_sw_state

Acer BIOS keeps devices state when system reboot, but reset to default
device states (Wlan on, Bluetooth off, wwan on) if system cold boot.
That means BIOS's initial state is not always real persistence.

So, removed rfkill_init_sw_state because it sets initial state to
persistence then replicate to other new killswitch when rfkill-input
enabled.
After removed it, acer-wmi set initial soft-block state after rfkill
register, and doesn't allow set_block until rfkill initial finished.

Reference: bko#31002
	https://bugzilla.kernel.org/show_bug.cgi?id=31002

Cc: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
Cc: Matthew Garrett <mjg@xxxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Cc: Corentin Chary <corentincj@xxxxxxxxxx>
Cc: OldÅich JedliÄka <oldium.pro@xxxxxxxxx>
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
---
 drivers/platform/x86/acer-wmi.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 5839fac..5b38ae4 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -222,6 +222,7 @@ struct acer_debug {
 static struct rfkill *wireless_rfkill;
 static struct rfkill *bluetooth_rfkill;
 static struct rfkill *threeg_rfkill;
+static bool rfkill_inited;
 
 /* Each low-level interface must define at least some of the following */
 struct wmi_interface {
@@ -1162,9 +1163,13 @@ static int acer_rfkill_set(void *data, bool blocked)
 {
 	acpi_status status;
 	u32 cap = (unsigned long)data;
-	status = set_u32(!blocked, cap);
-	if (ACPI_FAILURE(status))
-		return -ENODEV;
+
+	if (rfkill_inited) {
+		status = set_u32(!blocked, cap);
+		if (ACPI_FAILURE(status))
+			return -ENODEV;
+	}
+
 	return 0;
 }
 
@@ -1188,14 +1193,16 @@ static struct rfkill *acer_rfkill_register(struct device *dev,
 		return ERR_PTR(-ENOMEM);
 
 	status = get_device_status(&state, cap);
-	if (ACPI_SUCCESS(status))
-		rfkill_init_sw_state(rfkill_dev, !state);
 
 	err = rfkill_register(rfkill_dev);
 	if (err) {
 		rfkill_destroy(rfkill_dev);
 		return ERR_PTR(err);
 	}
+
+	if (ACPI_SUCCESS(status))
+		rfkill_set_sw_state(rfkill_dev, !state);
+
 	return rfkill_dev;
 }
 
@@ -1230,6 +1237,8 @@ static int acer_rfkill_init(struct device *dev)
 		}
 	}
 
+	rfkill_inited = true;
+
 	schedule_delayed_work(&acer_rfkill_work, round_jiffies_relative(HZ));
 
 	return 0;
-- 
1.6.0.2




--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/