Commit 5ff81160 authored by Raul E Rangel's avatar Raul E Rangel Committed by Rafael J. Wysocki
Browse files

ACPI: resources: Add wake_capable parameter to acpi_dev_irq_flags 



ACPI IRQ/Interrupt resources contain a bit that describes if the
interrupt should wake the system. This change exposes that bit via
a new IORESOURCE_IRQ_WAKECAPABLE flag. Drivers should check this flag
before arming an IRQ to wake the system.

Signed-off-by: default avatarRaul E Rangel <rrangel@chromium.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 4c992560

drivers/acpi/irq.c

+5 −3
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ struct acpi_irq_parse_one_ctx { 
 * @polarity: polarity attributes of hwirq

 * @polarity: polarity attributes of hwirq

 * @shareable: shareable attributes of hwirq

 * @wake_capable: wake capable attribute of hwirq

 * @ctx: acpi_irq_parse_one_ctx updated by this function

 *

 * Description:
@@ -156,12 +157,13 @@ struct acpi_irq_parse_one_ctx { 
static inline void acpi_irq_parse_one_match(struct fwnode_handle *fwnode,

					    u32 hwirq, u8 triggering,

					    u8 polarity, u8 shareable,

					    u8 wake_capable,

					    struct acpi_irq_parse_one_ctx *ctx)

{

	if (!fwnode)

		return;

	ctx->rc = 0;

	*ctx->res_flags = acpi_dev_irq_flags(triggering, polarity, shareable);

	*ctx->res_flags = acpi_dev_irq_flags(triggering, polarity, shareable, wake_capable);

	ctx->fwspec->fwnode = fwnode;

	ctx->fwspec->param[0] = hwirq;

	ctx->fwspec->param[1] = acpi_dev_get_irq_type(triggering, polarity);
@@ -204,7 +206,7 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, 
		fwnode = acpi_get_gsi_domain_id(irq->interrupts[ctx->index]);

		acpi_irq_parse_one_match(fwnode, irq->interrupts[ctx->index],

					 irq->triggering, irq->polarity,

					 irq->shareable, ctx);

					 irq->shareable, irq->wake_capable, ctx);

		return AE_CTRL_TERMINATE;

	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:

		eirq = &ares->data.extended_irq;
@@ -218,7 +220,7 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, 
						      eirq->interrupts[ctx->index]);

		acpi_irq_parse_one_match(fwnode, eirq->interrupts[ctx->index],

					 eirq->triggering, eirq->polarity,

					 eirq->shareable, ctx);

					 eirq->shareable, eirq->wake_capable, ctx);

		return AE_CTRL_TERMINATE;

	}

drivers/acpi/resource.c

+11 −5
Original line number Diff line number Diff line
@@ -336,8 +336,9 @@ EXPORT_SYMBOL_GPL(acpi_dev_resource_ext_address_space); 
 * @triggering: Triggering type as provided by ACPI.

 * @polarity: Interrupt polarity as provided by ACPI.

 * @shareable: Whether or not the interrupt is shareable.

 * @wake_capable: Wake capability as provided by ACPI.

 */

unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable)

unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable, u8 wake_capable)

{

	unsigned long flags;
@@ -351,6 +352,9 @@ unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable) 
	if (shareable == ACPI_SHARED)

		flags |= IORESOURCE_IRQ_SHAREABLE;



	if (wake_capable == ACPI_WAKE_CAPABLE)

		flags |= IORESOURCE_IRQ_WAKECAPABLE;



	return flags | IORESOURCE_IRQ;

}

EXPORT_SYMBOL_GPL(acpi_dev_irq_flags);
@@ -442,7 +446,7 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, 


static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,

				     u8 triggering, u8 polarity, u8 shareable,

				     bool check_override)

				     u8 wake_capable, bool check_override)

{

	int irq, p, t;
@@ -475,7 +479,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, 
		}

	}



	res->flags = acpi_dev_irq_flags(triggering, polarity, shareable);

	res->flags = acpi_dev_irq_flags(triggering, polarity, shareable, wake_capable);

	irq = acpi_register_gsi(NULL, gsi, triggering, polarity);

	if (irq >= 0) {

		res->start = irq;
@@ -523,7 +527,8 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, 
		}

		acpi_dev_get_irqresource(res, irq->interrupts[index],

					 irq->triggering, irq->polarity,

					 irq->shareable, true);

					 irq->shareable, irq->wake_capable,

					 true);

		break;

	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:

		ext_irq = &ares->data.extended_irq;
@@ -534,7 +539,8 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, 
		if (is_gsi(ext_irq))

			acpi_dev_get_irqresource(res, ext_irq->interrupts[index],

					 ext_irq->triggering, ext_irq->polarity,

					 ext_irq->shareable, false);

					 ext_irq->shareable, ext_irq->wake_capable,

					 false);

		else

			irqresource_disabled(res, 0);

		break;

drivers/pnp/pnpacpi/rsparser.c

+4 −3
Original line number Diff line number Diff line
@@ -206,7 +206,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 
		if (i >= 0) {

			flags = acpi_dev_irq_flags(gpio->triggering,

						   gpio->polarity,

						   gpio->shareable);

						   gpio->shareable,

						   gpio->wake_capable);

		} else {

			flags = IORESOURCE_DISABLED;

		}
@@ -315,7 +316,7 @@ static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev, 
		if (p->interrupts[i])

			__set_bit(p->interrupts[i], map.bits);



	flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->shareable);

	flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->shareable, p->wake_capable);

	pnp_register_irq_resource(dev, option_flags, &map, flags);

}
@@ -339,7 +340,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev, 
		}

	}



	flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->shareable);

	flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->shareable, p->wake_capable);

	pnp_register_irq_resource(dev, option_flags, &map, flags);

}

include/linux/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ bool acpi_dev_resource_address_space(struct acpi_resource *ares, 
				     struct resource_win *win);

bool acpi_dev_resource_ext_address_space(struct acpi_resource *ares,

					 struct resource_win *win);

unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable);

unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable, u8 wake_capable);

unsigned int acpi_dev_get_irq_type(int triggering, int polarity);

bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,

				 struct resource *res);

include/linux/ioport.h

+2 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct resource { 
#define IORESOURCE_IRQ_LOWLEVEL		(1<<3)

#define IORESOURCE_IRQ_SHAREABLE	(1<<4)

#define IORESOURCE_IRQ_OPTIONAL		(1<<5)

#define IORESOURCE_IRQ_WAKECAPABLE	(1<<6)



/* PnP DMA specific bits (IORESOURCE_BITS) */

#define IORESOURCE_DMA_TYPE_MASK	(3<<0)