Skip to content

Commit

Permalink
ACPICA: Resource manager: Add support for ACPI 5 wake bit in IRQ desc…
Browse files Browse the repository at this point in the history
…riptor.

Add support to both get and set the extended share flags for the
IRQ() resource descriptor. Reported by Aaron Lu.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Aaron Lu authored and Rafael J. Wysocki committed Jan 10, 2013
1 parent 78d025e commit e3ab8e4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/acpi/acpica/rsirq.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct acpi_rsconvert_info acpi_rs_get_irq[8] = {

{ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_AML_LENGTH, 0, 3},

/* Get flags: Triggering[0], Polarity[3], Sharing[4] */
/* Get flags: Triggering[0], Polarity[3], sharing_and_wake[4:5] */

{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering),
AML_OFFSET(irq.flags),
Expand All @@ -90,7 +90,7 @@ struct acpi_rsconvert_info acpi_rs_get_irq[8] = {
AML_OFFSET(irq.flags),
3},

{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
{ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
AML_OFFSET(irq.flags),
4}
};
Expand All @@ -114,7 +114,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[13] = {
AML_OFFSET(irq.irq_mask),
ACPI_RS_OFFSET(data.irq.interrupt_count)},

/* Set the flags byte */
/* Set flags: Triggering[0], Polarity[3], sharing_and_wake[4:5] */

{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.triggering),
AML_OFFSET(irq.flags),
Expand All @@ -124,7 +124,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[13] = {
AML_OFFSET(irq.flags),
3},

{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
{ACPI_RSC_2BITFLAG, ACPI_RS_OFFSET(data.irq.sharable),
AML_OFFSET(irq.flags),
4},

Expand Down

0 comments on commit e3ab8e4

Please sign in to comment.