Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 117279
b: refs/heads/master
c: 36eec5e
h: refs/heads/master
i:
  117277: be649fa
  117275: 9c0f73a
  117271: dd876f2
  117263: 9d25993
  117247: 296cd3e
v: v3
  • Loading branch information
Thomas Renninger authored and Len Brown committed Oct 22, 2008
1 parent b2ae011 commit 68e3a8e
Show file tree
Hide file tree
Showing 9 changed files with 161 additions and 255 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aa58329fc8ec50b379388fcad55f62c3493730d3
refs/heads/master: 36eec5e29cf31011a7fbe121badfed7efb2a4ebb
47 changes: 33 additions & 14 deletions trunk/Documentation/kernel-parameters.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,20 +217,39 @@ and is between 256 and 4096 characters. It is defined in the file
acpi.debug_level= [HW,ACPI]
Format: <int>
Each bit of the <int> indicates an ACPI debug level,
1: enable, 0: disable. It is useful for boot time
debugging. After system has booted up, it can be set
via /sys/module/acpi/parameters/debug_level.
CONFIG_ACPI_DEBUG must be enabled for this to produce any output.
Available bits (add the numbers together) to enable different
debug output levels of the ACPI subsystem:
0x01 error 0x02 warn 0x04 init 0x08 debug object
0x10 info 0x20 init names 0x40 parse 0x80 load
0x100 dispatch 0x200 execute 0x400 names 0x800 operation region
0x1000 bfield 0x2000 tables 0x4000 values 0x8000 objects
0x10000 resources 0x20000 user requests 0x40000 package.
The number can be in decimal or prefixed with 0x in hex.
Warning: Many of these options can produce a lot of
output and make your system unusable. Be very careful.
which corresponds to the level in an ACPI_DEBUG_PRINT
statement. After system has booted up, this mask
can be set via /sys/module/acpi/parameters/debug_level.

CONFIG_ACPI_DEBUG must be enabled for this to produce
any output. The number can be in decimal or prefixed
with 0x in hex. Some of these options produce so much
output that the system is unusable.

The following global components are defined by the
ACPI CA:
0x01 error
0x02 warn
0x04 init
0x08 debug object
0x10 info
0x20 init names
0x40 parse
0x80 load
0x100 dispatch
0x200 execute
0x400 names
0x800 operation region
0x1000 bfield
0x2000 tables
0x4000 values
0x8000 objects
0x10000 resources
0x20000 user requests
0x40000 package
The number can be in decimal or prefixed with 0x in hex.
Warning: Many of these options can produce a lot of
output and make your system unusable. Be very careful.

acpi_pm_good [X86-32,X86-64]
Override the pmtimer bug detection: force the kernel
Expand Down
28 changes: 24 additions & 4 deletions trunk/Documentation/laptops/acer-wmi.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Acer Laptop WMI Extras Driver
http://code.google.com/p/aceracpi
Version 0.2
18th August 2008
Version 0.1
9th February 2008

Copyright 2007-2008 Carlos Corbacho <carlos@strangeworlds.co.uk>

Expand Down Expand Up @@ -87,7 +87,17 @@ acer-wmi come with built-in wireless. However, should you feel so inclined to
ever wish to remove the card, or swap it out at some point, please get in touch
with me, as we may well be able to gain some data on wireless card detection.

The wireless radio is exposed through rfkill.
To read the status of the wireless radio (0=off, 1=on):
cat /sys/devices/platform/acer-wmi/wireless

To enable the wireless radio:
echo 1 > /sys/devices/platform/acer-wmi/wireless

To disable the wireless radio:
echo 0 > /sys/devices/platform/acer-wmi/wireless

To set the state of the wireless radio when loading acer-wmi, pass:
wireless=X (where X is 0 or 1)

Bluetooth
*********
Expand All @@ -107,7 +117,17 @@ For the adventurously minded - if you want to buy an internal bluetooth
module off the internet that is compatible with your laptop and fit it, then
it will work just fine with acer-wmi.

Bluetooth is exposed through rfkill.
To read the status of the bluetooth module (0=off, 1=on):
cat /sys/devices/platform/acer-wmi/wireless

To enable the bluetooth module:
echo 1 > /sys/devices/platform/acer-wmi/bluetooth

To disable the bluetooth module:
echo 0 > /sys/devices/platform/acer-wmi/bluetooth

To set the state of the bluetooth module when loading acer-wmi, pass:
bluetooth=X (where X is 0 or 1)

3G
**
Expand Down
42 changes: 18 additions & 24 deletions trunk/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#endif

#define PFX "powernow-k8: "
#define BFX PFX "BIOS error: "
#define VERSION "version 2.20.00"
#include "powernow-k8.h"

Expand Down Expand Up @@ -535,40 +536,35 @@ static int check_pst_table(struct powernow_k8_data *data, struct pst_s *pst, u8

for (j = 0; j < data->numps; j++) {
if (pst[j].vid > LEAST_VID) {
printk(KERN_ERR FW_BUG PFX "vid %d invalid : 0x%x\n",
j, pst[j].vid);
printk(KERN_ERR PFX "vid %d invalid : 0x%x\n", j, pst[j].vid);
return -EINVAL;
}
if (pst[j].vid < data->rvo) { /* vid + rvo >= 0 */
printk(KERN_ERR FW_BUG PFX "0 vid exceeded with pstate"
" %d\n", j);
printk(KERN_ERR BFX "0 vid exceeded with pstate %d\n", j);
return -ENODEV;
}
if (pst[j].vid < maxvid + data->rvo) { /* vid + rvo >= maxvid */
printk(KERN_ERR FW_BUG PFX "maxvid exceeded with pstate"
" %d\n", j);
printk(KERN_ERR BFX "maxvid exceeded with pstate %d\n", j);
return -ENODEV;
}
if (pst[j].fid > MAX_FID) {
printk(KERN_ERR FW_BUG PFX "maxfid exceeded with pstate"
" %d\n", j);
printk(KERN_ERR BFX "maxfid exceeded with pstate %d\n", j);
return -ENODEV;
}
if (j && (pst[j].fid < HI_FID_TABLE_BOTTOM)) {
/* Only first fid is allowed to be in "low" range */
printk(KERN_ERR FW_BUG PFX "two low fids - %d : "
"0x%x\n", j, pst[j].fid);
printk(KERN_ERR BFX "two low fids - %d : 0x%x\n", j, pst[j].fid);
return -EINVAL;
}
if (pst[j].fid < lastfid)
lastfid = pst[j].fid;
}
if (lastfid & 1) {
printk(KERN_ERR FW_BUG PFX "lastfid invalid\n");
printk(KERN_ERR BFX "lastfid invalid\n");
return -EINVAL;
}
if (lastfid > LO_FID_TABLE_TOP)
printk(KERN_INFO FW_BUG PFX "first fid not from lo freq table\n");
printk(KERN_INFO BFX "first fid not from lo freq table\n");

return 0;
}
Expand Down Expand Up @@ -676,13 +672,13 @@ static int find_psb_table(struct powernow_k8_data *data)

dprintk("table vers: 0x%x\n", psb->tableversion);
if (psb->tableversion != PSB_VERSION_1_4) {
printk(KERN_ERR FW_BUG PFX "PSB table is not v1.4\n");
printk(KERN_ERR BFX "PSB table is not v1.4\n");
return -ENODEV;
}

dprintk("flags: 0x%x\n", psb->flags1);
if (psb->flags1) {
printk(KERN_ERR FW_BUG PFX "unknown flags\n");
printk(KERN_ERR BFX "unknown flags\n");
return -ENODEV;
}

Expand All @@ -709,7 +705,7 @@ static int find_psb_table(struct powernow_k8_data *data)
}
}
if (cpst != 1) {
printk(KERN_ERR FW_BUG PFX "numpst must be 1\n");
printk(KERN_ERR BFX "numpst must be 1\n");
return -ENODEV;
}

Expand Down Expand Up @@ -1134,19 +1130,17 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
"ACPI Processor module before starting this "
"driver.\n");
#else
printk(KERN_ERR FW_BUG PFX "Your BIOS does not provide"
" ACPI _PSS objects in a way that Linux "
"understands. Please report this to the Linux "
"ACPI maintainers and complain to your BIOS "
"vendor.\n");
printk(KERN_ERR PFX "Your BIOS does not provide ACPI "
"_PSS objects in a way that Linux understands. "
"Please report this to the Linux ACPI maintainers"
" and complain to your BIOS vendor.\n");
#endif
kfree(data);
return -ENODEV;
}
if (pol->cpu != 0) {
printk(KERN_ERR FW_BUG PFX "No ACPI _PSS objects for "
"CPU other than CPU0. Complain to your BIOS "
"vendor.\n");
printk(KERN_ERR PFX "No ACPI _PSS objects for CPU other than "
"CPU0. Complain to your BIOS vendor.\n");
kfree(data);
return -ENODEV;
}
Expand Down Expand Up @@ -1199,7 +1193,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)

/* min/max the cpu is capable of */
if (cpufreq_frequency_table_cpuinfo(pol, data->powernow_table)) {
printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n");
printk(KERN_ERR PFX "invalid powernow_table\n");
powernow_k8_cpu_exit_acpi(data);
kfree(data->powernow_table);
kfree(data);
Expand Down
18 changes: 3 additions & 15 deletions trunk/drivers/acpi/processor_perflib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@

#include <asm/uaccess.h>
#endif
#include <asm/cpufeature.h>

#include <acpi/acpi_bus.h>
#include <acpi/processor.h>
Expand Down Expand Up @@ -335,6 +334,7 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)
acpi_status status = AE_OK;
acpi_handle handle = NULL;


if (!pr || !pr->performance || !pr->handle)
return -EINVAL;

Expand All @@ -347,25 +347,13 @@ static int acpi_processor_get_performance_info(struct acpi_processor *pr)

result = acpi_processor_get_performance_control(pr);
if (result)
goto update_bios;
return result;

result = acpi_processor_get_performance_states(pr);
if (result)
goto update_bios;
return result;

return 0;

/*
* Having _PPC but missing frequencies (_PSS, _PCT) is a very good hint that
* the BIOS is older than the CPU and does not know its frequencies
*/
update_bios:
if (ACPI_SUCCESS(acpi_get_handle(pr->handle, "_PPC", &handle))){
if(boot_cpu_has(X86_FEATURE_EST))
printk(KERN_WARNING FW_BUG "BIOS needs update for CPU "
"frequency support\n");
}
return result;
}

int acpi_processor_notify_smm(struct module *calling_module)
Expand Down
39 changes: 2 additions & 37 deletions trunk/drivers/acpi/wmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,35 +217,6 @@ static bool find_guid(const char *guid_string, struct wmi_block **out)
return 0;
}

static acpi_status wmi_method_enable(struct wmi_block *wblock, int enable)
{
struct guid_block *block = NULL;
char method[5];
struct acpi_object_list input;
union acpi_object params[1];
acpi_status status;
acpi_handle handle;

block = &wblock->gblock;
handle = wblock->handle;

if (!block)
return AE_NOT_EXIST;

input.count = 1;
input.pointer = params;
params[0].type = ACPI_TYPE_INTEGER;
params[0].integer.value = enable;

snprintf(method, 5, "WE%02X", block->notify_id);
status = acpi_evaluate_object(handle, method, &input, NULL);

if (status != AE_OK && status != AE_NOT_FOUND)
return status;
else
return AE_OK;
}

/*
* Exported WMI functions
*/
Expand Down Expand Up @@ -456,7 +427,6 @@ acpi_status wmi_install_notify_handler(const char *guid,
wmi_notify_handler handler, void *data)
{
struct wmi_block *block;
acpi_status status;

if (!guid || !handler)
return AE_BAD_PARAMETER;
Expand All @@ -471,9 +441,7 @@ wmi_notify_handler handler, void *data)
block->handler = handler;
block->handler_data = data;

status = wmi_method_enable(block, 1);

return status;
return AE_OK;
}
EXPORT_SYMBOL_GPL(wmi_install_notify_handler);

Expand All @@ -485,7 +453,6 @@ EXPORT_SYMBOL_GPL(wmi_install_notify_handler);
acpi_status wmi_remove_notify_handler(const char *guid)
{
struct wmi_block *block;
acpi_status status;

if (!guid)
return AE_BAD_PARAMETER;
Expand All @@ -497,12 +464,10 @@ acpi_status wmi_remove_notify_handler(const char *guid)
if (!block->handler)
return AE_NULL_ENTRY;

status = wmi_method_enable(block, 0);

block->handler = NULL;
block->handler_data = NULL;

return status;
return AE_OK;
}
EXPORT_SYMBOL_GPL(wmi_remove_notify_handler);

Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/misc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ config ACER_WMI
depends on NEW_LEDS
depends on BACKLIGHT_CLASS_DEVICE
depends on SERIO_I8042
depends on RFKILL
select ACPI_WMI
---help---
This is a driver for newer Acer (and Wistron) laptops. It adds
Expand Down
Loading

0 comments on commit 68e3a8e

Please sign in to comment.