Skip to content

Commit

Permalink
Merge branches 'acpica-release-fixes', 'ec-fix', 'dock', 'irq-bounds'…
Browse files Browse the repository at this point in the history
…, 'thermal-fix', 'wmi' and 'acpi-cleanups' into release-2.6.27
  • Loading branch information
Andi Kleen committed Aug 15, 2008
7 parents 3c7db22 + 9d699ed + afd7301 + fa46d35 + 9f497bc + 5c742b4 + d005741 commit 0f24562
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 12 deletions.
11 changes: 8 additions & 3 deletions drivers/acpi/dock.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,18 +563,23 @@ EXPORT_SYMBOL_GPL(unregister_hotplug_dock_device);
*/
static int handle_eject_request(struct dock_station *ds, u32 event)
{
if (!dock_present(ds))
return -ENODEV;

if (dock_in_progress(ds))
return -EBUSY;

/*
* here we need to generate the undock
* event prior to actually doing the undock
* so that the device struct still exists.
* Also, even send the dock event if the
* device is not present anymore
*/
dock_event(ds, event, UNDOCK_EVENT);

if (!dock_present(ds)) {
complete_undock(ds);
return -ENODEV;
}

hotplug_dock_devices(ds, ACPI_NOTIFY_EJECT_REQUEST);
undock(ds);
eject_dock(ds);
Expand Down
36 changes: 36 additions & 0 deletions drivers/acpi/ec.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,31 @@ static struct acpi_ec {
u8 handlers_installed;
} *boot_ec, *first_ec;

/*
* Some Asus system have exchanged ECDT data/command IO addresses.
*/
static int print_ecdt_error(const struct dmi_system_id *id)
{
printk(KERN_NOTICE PREFIX "%s detected - "
"ECDT has exchanged control/data I/O address\n",
id->ident);
return 0;
}

static struct dmi_system_id __cpuinitdata ec_dmi_table[] = {
{
print_ecdt_error, "Asus L4R", {
DMI_MATCH(DMI_BIOS_VERSION, "1008.006"),
DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),
DMI_MATCH(DMI_BOARD_NAME, "L4R") }, NULL},
{
print_ecdt_error, "Asus M6R", {
DMI_MATCH(DMI_BIOS_VERSION, "0207"),
DMI_MATCH(DMI_PRODUCT_NAME, "M6R"),
DMI_MATCH(DMI_BOARD_NAME, "M6R") }, NULL},
{},
};

/* --------------------------------------------------------------------------
Transaction Management
-------------------------------------------------------------------------- */
Expand Down Expand Up @@ -196,6 +221,8 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
return 0;
msleep(1);
}
if (acpi_ec_check_status(ec,event))
return 0;
}
pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n",
acpi_ec_read_status(ec),
Expand Down Expand Up @@ -911,6 +938,15 @@ int __init acpi_ec_ecdt_probe(void)
pr_info(PREFIX "EC description table is found, configuring boot EC\n");
boot_ec->command_addr = ecdt_ptr->control.address;
boot_ec->data_addr = ecdt_ptr->data.address;
if (dmi_check_system(ec_dmi_table)) {
/*
* If the board falls into ec_dmi_table, it means
* that ECDT table gives the incorrect command/status
* & data I/O address. Just fix it.
*/
boot_ec->data_addr = ecdt_ptr->control.address;
boot_ec->command_addr = ecdt_ptr->data.address;
}
boot_ec->gpe = ecdt_ptr->gpe;
boot_ec->handle = ACPI_ROOT_OBJECT;
acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);
Expand Down
12 changes: 7 additions & 5 deletions drivers/acpi/pci_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ static int __init acpi_irq_penalty_update(char *str, int used)
if (irq < 0)
continue;

if (irq >= ACPI_MAX_IRQS)
if (irq >= ARRAY_SIZE(acpi_irq_penalty))
continue;

if (used)
Expand All @@ -872,10 +872,12 @@ static int __init acpi_irq_penalty_update(char *str, int used)
*/
void acpi_penalize_isa_irq(int irq, int active)
{
if (active)
acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
else
acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
if (irq >= 0 && irq < ARRAY_SIZE(acpi_irq_penalty)) {
if (active)
acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
else
acpi_irq_penalty[irq] += PIRQ_PENALTY_PCI_USING;
}
}

/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/processor_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ struct acpi_processor_errata errata __read_mostly;
static int set_no_mwait(const struct dmi_system_id *id)
{
printk(KERN_NOTICE PREFIX "%s detected - "
"disable mwait for CPU C-stetes\n", id->ident);
"disabling mwait for CPU C-states\n", id->ident);
idle_nomwait = 1;
return 0;
}
Expand Down
1 change: 0 additions & 1 deletion drivers/acpi/processor_idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <linux/pm_qos_params.h>
#include <linux/clockchips.h>
#include <linux/cpuidle.h>
#include <linux/cpuidle.h>

/*
* Include the apic definitions for x86 to have the APIC timer related defines
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/processor_perflib.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static DEFINE_MUTEX(performance_mutex);
* 0 -> cpufreq low level drivers initialized -> consider _PPC values
* 1 -> ignore _PPC totally -> forced by user through boot param
*/
static unsigned int ignore_ppc = -1;
static int ignore_ppc = -1;
module_param(ignore_ppc, uint, 0644);
MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \
"limited by BIOS, this should help");
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ struct acpi_buffer *out)
strcpy(method, "WQ");
strncat(method, block->object_id, 2);

status = acpi_evaluate_object(handle, method, NULL, out);
status = acpi_evaluate_object(handle, method, &input, out);

/*
* If ACPI_WMI_EXPENSIVE, call the relevant WCxx method, even if
Expand Down
19 changes: 19 additions & 0 deletions drivers/misc/acer-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -803,11 +803,30 @@ static acpi_status get_u32(u32 *value, u32 cap)

static acpi_status set_u32(u32 value, u32 cap)
{
acpi_status status;

if (interface->capability & cap) {
switch (interface->type) {
case ACER_AMW0:
return AMW0_set_u32(value, cap, interface);
case ACER_AMW0_V2:
if (cap == ACER_CAP_MAILLED)
return AMW0_set_u32(value, cap, interface);

/*
* On some models, some WMID methods don't toggle
* properly. For those cases, we want to run the AMW0
* method afterwards to be certain we've really toggled
* the device state.
*/
if (cap == ACER_CAP_WIRELESS ||
cap == ACER_CAP_BLUETOOTH) {
status = WMID_set_u32(value, cap, interface);
if (ACPI_FAILURE(status))
return status;

return AMW0_set_u32(value, cap, interface);
}
case ACER_WMID:
return WMID_set_u32(value, cap, interface);
default:
Expand Down

0 comments on commit 0f24562

Please sign in to comment.