From: Corentin Chary <corentincj@iksaif.net>
To: Matthew Garrett <mjg@redhat.com>
Cc: Corentin Chary <corentincj@iksaif.net>,
acpi4asus-user@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 04/18] eeepc-wmi: serialize access to wmi method
Date: Sun, 6 Feb 2011 13:28:29 +0100 [thread overview]
Message-ID: <1296995324-5462-5-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <1296995324-5462-1-git-send-email-corentincj@iksaif.net>
\AMW0.WMBC, which is the main method that we use,
is not reentrant. When wireless hotpluging is enabled,
toggling the status of the wireless device using WMBC will
trigger a notification and the notification handler need to
call WMBC again to get the new status of the device, this
will trigger the following error:
ACPI Error (dswload-0802): [_T_0] Namespace lookup failure, AE_ALREADY_EXISTS
ACPI Exception: AE_ALREADY_EXISTS, During name lookup/catalog (20100428/psloop-231)
ACPI Error (psparse-0537): Method parse/execution failed [\AMW0.WMBC] (Node f7023b88), AE_ALREADY_EXISTS
ACPI: Marking method WMBC as Serialized because of AE_ALREADY_EXISTS error
Since there is currently no way to tell the acpi subsystem to mark
a method as serialized, we do it in eeepc-wmi.
Of course, we could let the first call fail, and then it would work,
but it doesn't seems really clean, and it will make the first
WMBC call return a random value.
This patch was tested on EeePc 1000H with a RaLink RT2860
wireless card using the rt2800pci driver. rt2860sta driver
seems to deadlock when we remove the pci device...
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-wmi.c | 78 +++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 01bc2b3..eb4c0ce 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -137,6 +137,9 @@ struct eeepc_wmi {
struct hotplug_slot *hotplug_slot;
struct mutex hotplug_lock;
+ struct mutex wmi_lock;
+ struct workqueue_struct *hotplug_workqueue;
+ struct work_struct hotplug_work;
struct eeepc_wmi_debug debug;
};
@@ -370,15 +373,19 @@ static void eeepc_rfkill_hotplug(struct eeepc_wmi *eeepc)
{
struct pci_dev *dev;
struct pci_bus *bus;
- bool blocked = eeepc_wlan_rfkill_blocked(eeepc);
+ bool blocked;
bool absent;
u32 l;
- if (eeepc->wlan_rfkill)
- rfkill_set_sw_state(eeepc->wlan_rfkill, blocked);
+ mutex_lock(&eeepc->wmi_lock);
+ blocked = eeepc_wlan_rfkill_blocked(eeepc);
+ mutex_unlock(&eeepc->wmi_lock);
mutex_lock(&eeepc->hotplug_lock);
+ if (eeepc->wlan_rfkill)
+ rfkill_set_sw_state(eeepc->wlan_rfkill, blocked);
+
if (eeepc->hotplug_slot) {
bus = pci_find_bus(0, 1);
if (!bus) {
@@ -435,7 +442,14 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
if (event != ACPI_NOTIFY_BUS_CHECK)
return;
- eeepc_rfkill_hotplug(eeepc);
+ /*
+ * We can't call directly eeepc_rfkill_hotplug because most
+ * of the time WMBC is still being executed and not reetrant.
+ * There is currently no way to tell ACPICA that we want this
+ * method to be serialized, we schedule a eeepc_rfkill_hotplug
+ * call later, in a safer context.
+ */
+ queue_work(eeepc->hotplug_workqueue, &eeepc->hotplug_work);
}
static int eeepc_register_rfkill_notifier(struct eeepc_wmi *eeepc,
@@ -508,6 +522,14 @@ static struct hotplug_slot_ops eeepc_hotplug_slot_ops = {
.get_power_status = eeepc_get_adapter_status,
};
+static void eeepc_hotplug_work(struct work_struct *work)
+{
+ struct eeepc_wmi *eeepc;
+
+ eeepc = container_of(work, struct eeepc_wmi, hotplug_work);
+ eeepc_rfkill_hotplug(eeepc);
+}
+
static int eeepc_setup_pci_hotplug(struct eeepc_wmi *eeepc)
{
int ret = -ENOMEM;
@@ -518,6 +540,13 @@ static int eeepc_setup_pci_hotplug(struct eeepc_wmi *eeepc)
return -ENODEV;
}
+ eeepc->hotplug_workqueue =
+ create_singlethread_workqueue("hotplug_workqueue");
+ if (!eeepc->hotplug_workqueue)
+ goto error_workqueue;
+
+ INIT_WORK(&eeepc->hotplug_work, eeepc_hotplug_work);
+
eeepc->hotplug_slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
if (!eeepc->hotplug_slot)
goto error_slot;
@@ -547,6 +576,8 @@ error_info:
kfree(eeepc->hotplug_slot);
eeepc->hotplug_slot = NULL;
error_slot:
+ destroy_workqueue(eeepc->hotplug_workqueue);
+error_workqueue:
return ret;
}
@@ -575,6 +606,34 @@ static void eeepc_rfkill_query(struct rfkill *rfkill, void *data)
rfkill_set_sw_state(rfkill, !(retval & 0x1));
}
+static int eeepc_rfkill_wlan_set(void *data, bool blocked)
+{
+ struct eeepc_wmi *eeepc = data;
+ int ret;
+
+ /*
+ * This handler is enabled only if hotplug is enabled.
+ * In this case, the eeepc_wmi_set_devstate() will
+ * trigger a wmi notification and we need to wait
+ * this call to finish before being able to call
+ * any wmi method
+ */
+ mutex_lock(&eeepc->wmi_lock);
+ ret = eeepc_rfkill_set((void *)(long)EEEPC_WMI_DEVID_WLAN, blocked);
+ mutex_unlock(&eeepc->wmi_lock);
+ return ret;
+}
+
+static void eeepc_rfkill_wlan_query(struct rfkill *rfkill, void *data)
+{
+ eeepc_rfkill_query(rfkill, (void *)(long)EEEPC_WMI_DEVID_WLAN);
+}
+
+static const struct rfkill_ops eeepc_rfkill_wlan_ops = {
+ .set_block = eeepc_rfkill_wlan_set,
+ .query = eeepc_rfkill_wlan_query,
+};
+
static const struct rfkill_ops eeepc_rfkill_ops = {
.set_block = eeepc_rfkill_set,
.query = eeepc_rfkill_query,
@@ -603,8 +662,12 @@ static int eeepc_new_rfkill(struct eeepc_wmi *eeepc,
if (!retval || retval == 0x00060000)
return -ENODEV;
- *rfkill = rfkill_alloc(name, &eeepc->platform_device->dev, type,
- &eeepc_rfkill_ops, (void *)(long)dev_id);
+ if (dev_id == EEEPC_WMI_DEVID_WLAN && eeepc->hotplug_wireless)
+ *rfkill = rfkill_alloc(name, &eeepc->platform_device->dev, type,
+ &eeepc_rfkill_wlan_ops, eeepc);
+ else
+ *rfkill = rfkill_alloc(name, &eeepc->platform_device->dev, type,
+ &eeepc_rfkill_ops, (void *)(long)dev_id);
if (!*rfkill)
return -EINVAL;
@@ -636,6 +699,8 @@ static void eeepc_wmi_rfkill_exit(struct eeepc_wmi *eeepc)
eeepc_rfkill_hotplug(eeepc);
if (eeepc->hotplug_slot)
pci_hp_deregister(eeepc->hotplug_slot);
+ if (eeepc->hotplug_workqueue)
+ destroy_workqueue(eeepc->hotplug_workqueue);
if (eeepc->bluetooth_rfkill) {
rfkill_unregister(eeepc->bluetooth_rfkill);
@@ -654,6 +719,7 @@ static int eeepc_wmi_rfkill_init(struct eeepc_wmi *eeepc)
int result = 0;
mutex_init(&eeepc->hotplug_lock);
+ mutex_init(&eeepc->wmi_lock);
result = eeepc_new_rfkill(eeepc, &eeepc->wlan_rfkill,
"eeepc-wlan", RFKILL_TYPE_WLAN,
--
1.7.4.rc3
next prev parent reply other threads:[~2011-02-06 12:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-06 12:28 [PATCH v2 00/18] eeepc-wmi updates Corentin Chary
2011-02-06 12:28 ` [PATCH v2 01/18] eeepc-wmi: reorder keymap Corentin Chary
2011-02-06 12:28 ` [PATCH v2 02/18] eeepc-wmi: add wlan key found on 1015P Corentin Chary
2011-02-06 12:28 ` [PATCH v2 03/18] eeepc-wmi: add hotplug code for Eeepc 1000H Corentin Chary
2011-02-06 12:28 ` Corentin Chary [this message]
2011-02-06 12:28 ` [PATCH v2 05/18] eeepc-wmi: return proper error code in eeepc_rfkill_set() Corentin Chary
2011-02-06 12:28 ` [PATCH v2 06/18] eeepc-wmi: add an helper using simple return codes Corentin Chary
2011-02-06 12:28 ` [PATCH v2 07/18] eeepc-wmi: add hibernate/resume callbacks Corentin Chary
2011-02-06 12:28 ` [PATCH v2 08/18] eeepc-wmi: switch to platform_create_bundle() Corentin Chary
2011-02-06 12:28 ` [PATCH v2 09/18] eeepc-wmi: reorder defines Corentin Chary
2011-02-06 12:28 ` [PATCH v2 10/18] eeepc-wmi: use the presence bit correctly Corentin Chary
2011-02-06 12:28 ` [PATCH v2 11/18] eeepc-wmi: add camera and card reader support Corentin Chary
2011-02-06 12:28 ` [PATCH v2 12/18] eeepc-wmi: add wimax support Corentin Chary
2011-02-06 12:28 ` [PATCH v2 13/18] eeepc-wmi: set the right key code for 0xe9 Corentin Chary
2011-02-06 12:28 ` [PATCH v2 14/18] eeepc-wmi: support backlight power (bl_power) attribute Corentin Chary
2011-02-06 12:28 ` [PATCH v2 15/18] eeepc-wmi: respect wireless_hotplug setting Corentin Chary
2011-02-06 12:28 ` [PATCH v2 16/18] eeepc-wmi: real touchpad led device id is 0x001000012 Corentin Chary
2011-02-06 12:28 ` [PATCH v2 17/18] eeepc-wmi: add touchpad sysfs file Corentin Chary
2011-02-06 12:28 ` [PATCH v2 18/18] eeepc-wmi: reorder device ids Corentin Chary
2011-02-07 19:39 ` [PATCH v2 00/18] eeepc-wmi updates Matthew Garrett
2011-02-07 19:40 ` Matthew Garrett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296995324-5462-5-git-send-email-corentincj@iksaif.net \
--to=corentincj@iksaif.net \
--cc=acpi4asus-user@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®