* [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2)
@ 2009-04-04 8:33 Carlos Corbacho
2009-04-04 8:33 ` [PATCH 1/3] acer-wmi: Blacklist Acer Aspire One Carlos Corbacho
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Carlos Corbacho @ 2009-04-04 8:33 UTC (permalink / raw)
To: linux-acpi; +Cc: lenb
Len,
The following are the patches that really are for 2.6.30-rc0 for acer-wmi.
The first one is quite a nasty one, as it appears the Aspire One's
non-functional ACPI-WMI interface is now causing problems for userspace.
-Carlos
---
Andy Whitcroft (1):
acer-wmi: Cleanup the failure cleanup handling
Carlos Corbacho (2):
acer-wmi: Update copyright notice & documentation
acer-wmi: Blacklist Acer Aspire One
Documentation/laptops/acer-wmi.txt | 10 +++++++---
drivers/platform/x86/acer-wmi.c | 35 +++++++++++++++++++++++++++++++++--
2 files changed, 40 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] acer-wmi: Blacklist Acer Aspire One
2009-04-04 8:33 [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2) Carlos Corbacho
@ 2009-04-04 8:33 ` Carlos Corbacho
2009-04-04 8:33 ` [PATCH 2/3] acer-wmi: Cleanup the failure cleanup handling Carlos Corbacho
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Carlos Corbacho @ 2009-04-04 8:33 UTC (permalink / raw)
To: linux-acpi; +Cc: lenb
The Aspire One's ACPI-WMI interface is a placeholder that does nothing,
and the invalid results that we get from it are now causing userspace
problems as acer-wmi always returns that the rfkill is enabled (i.e. the
radio is off, when it isn't). As it's hardware controlled, acer-wmi
isn't needed on the Aspire One either.
Thanks to Andy Whitcroft at Canonical for tracking down Ubuntu's userspace
issues to this.
Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
Reported-by: Andy Whitcroft <apw@canonical.com>
Cc: stable@kernel.org
---
drivers/platform/x86/acer-wmi.c | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index a6a42e8..60fbef2 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -225,6 +225,25 @@ static struct quirk_entry quirk_fujitsu_amilo_li_1718 = {
.wireless = 2,
};
+/* The Aspire One has a dummy ACPI-WMI interface - disable it */
+static struct dmi_system_id __devinitdata acer_blacklist[] = {
+ {
+ .ident = "Acer Aspire One (SSD)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "AOA110"),
+ },
+ },
+ {
+ .ident = "Acer Aspire One (HDD)",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"),
+ },
+ },
+ {}
+};
+
static struct dmi_system_id acer_quirks[] = {
{
.callback = dmi_matched,
@@ -1254,6 +1273,12 @@ static int __init acer_wmi_init(void)
printk(ACER_INFO "Acer Laptop ACPI-WMI Extras\n");
+ if (dmi_check_system(acer_blacklist)) {
+ printk(ACER_INFO "Blacklisted hardware detected - "
+ "not loading\n");
+ return -ENODEV;
+ }
+
find_quirks();
/*
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] acer-wmi: Cleanup the failure cleanup handling
2009-04-04 8:33 [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2) Carlos Corbacho
2009-04-04 8:33 ` [PATCH 1/3] acer-wmi: Blacklist Acer Aspire One Carlos Corbacho
@ 2009-04-04 8:33 ` Carlos Corbacho
2009-04-04 8:33 ` [PATCH 3/3] acer-wmi: Update copyright notice & documentation Carlos Corbacho
2009-04-04 16:43 ` [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2) Len Brown
3 siblings, 0 replies; 5+ messages in thread
From: Carlos Corbacho @ 2009-04-04 8:33 UTC (permalink / raw)
To: linux-acpi; +Cc: lenb
From: Andy Whitcroft <apw@canonical.com>
Cleanup the failure cleanup handling for brightness and email led.
[cc: Split out from another patch]
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---
drivers/platform/x86/acer-wmi.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 60fbef2..27837e8 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -1136,11 +1136,17 @@ static int __devinit acer_platform_probe(struct platform_device *device)
}
err = acer_rfkill_init(&device->dev);
+ if (err)
+ goto error_rfkill;
return err;
+error_rfkill:
+ if (has_cap(ACER_CAP_BRIGHTNESS))
+ acer_backlight_exit();
error_brightness:
- acer_led_exit();
+ if (has_cap(ACER_CAP_MAILLED))
+ acer_led_exit();
error_mailled:
return err;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] acer-wmi: Update copyright notice & documentation
2009-04-04 8:33 [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2) Carlos Corbacho
2009-04-04 8:33 ` [PATCH 1/3] acer-wmi: Blacklist Acer Aspire One Carlos Corbacho
2009-04-04 8:33 ` [PATCH 2/3] acer-wmi: Cleanup the failure cleanup handling Carlos Corbacho
@ 2009-04-04 8:33 ` Carlos Corbacho
2009-04-04 16:43 ` [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2) Len Brown
3 siblings, 0 replies; 5+ messages in thread
From: Carlos Corbacho @ 2009-04-04 8:33 UTC (permalink / raw)
To: linux-acpi; +Cc: lenb
Explicitly note in the documentation that the Acer Aspire One is not
supported.
Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---
Documentation/laptops/acer-wmi.txt | 10 +++++++---
drivers/platform/x86/acer-wmi.c | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Documentation/laptops/acer-wmi.txt b/Documentation/laptops/acer-wmi.txt
index 2b3a6b5..5ee2a02 100644
--- a/Documentation/laptops/acer-wmi.txt
+++ b/Documentation/laptops/acer-wmi.txt
@@ -1,9 +1,9 @@
Acer Laptop WMI Extras Driver
http://code.google.com/p/aceracpi
-Version 0.2
-18th August 2008
+Version 0.3
+4th April 2009
-Copyright 2007-2008 Carlos Corbacho <carlos@strangeworlds.co.uk>
+Copyright 2007-2009 Carlos Corbacho <carlos@strangeworlds.co.uk>
acer-wmi is a driver to allow you to control various parts of your Acer laptop
hardware under Linux which are exposed via ACPI-WMI.
@@ -36,6 +36,10 @@ not possible in kernel space from a 64 bit OS.
Supported Hardware
******************
+NOTE: The Acer Aspire One is not supported hardware. It cannot work with
+acer-wmi until Acer fix their ACPI-WMI implementation on them, so has been
+blacklisted until that happens.
+
Please see the website for the current list of known working hardare:
http://code.google.com/p/aceracpi/wiki/SupportedHardware
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 27837e8..0f6e43b 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -1,7 +1,7 @@
/*
* Acer WMI Laptop Extras
*
- * Copyright (C) 2007-2008 Carlos Corbacho <carlos@strangeworlds.co.uk>
+ * Copyright (C) 2007-2009 Carlos Corbacho <carlos@strangeworlds.co.uk>
*
* Based on acer_acpi:
* Copyright (C) 2005-2007 E.M. Smith
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2)
2009-04-04 8:33 [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2) Carlos Corbacho
` (2 preceding siblings ...)
2009-04-04 8:33 ` [PATCH 3/3] acer-wmi: Update copyright notice & documentation Carlos Corbacho
@ 2009-04-04 16:43 ` Len Brown
3 siblings, 0 replies; 5+ messages in thread
From: Len Brown @ 2009-04-04 16:43 UTC (permalink / raw)
To: Carlos Corbacho; +Cc: linux-acpi
applied
thanks,
Len Brown, Intel Open Source Technology Center
On Sat, 4 Apr 2009, Carlos Corbacho wrote:
> Len,
>
> The following are the patches that really are for 2.6.30-rc0 for acer-wmi.
>
> The first one is quite a nasty one, as it appears the Aspire One's
> non-functional ACPI-WMI interface is now causing problems for userspace.
>
> -Carlos
> ---
>
> Andy Whitcroft (1):
> acer-wmi: Cleanup the failure cleanup handling
>
> Carlos Corbacho (2):
> acer-wmi: Update copyright notice & documentation
> acer-wmi: Blacklist Acer Aspire One
>
>
> Documentation/laptops/acer-wmi.txt | 10 +++++++---
> drivers/platform/x86/acer-wmi.c | 35 +++++++++++++++++++++++++++++++++--
> 2 files changed, 40 insertions(+), 5 deletions(-)
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-04-04 16:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-04 8:33 [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2) Carlos Corbacho
2009-04-04 8:33 ` [PATCH 1/3] acer-wmi: Blacklist Acer Aspire One Carlos Corbacho
2009-04-04 8:33 ` [PATCH 2/3] acer-wmi: Cleanup the failure cleanup handling Carlos Corbacho
2009-04-04 8:33 ` [PATCH 3/3] acer-wmi: Update copyright notice & documentation Carlos Corbacho
2009-04-04 16:43 ` [PATCH 0/3] acer-wmi patches for 2.6.30 (take 2) Len Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.