Commit 0a0c5168 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM: Introduce functions for suspending and resuming device interrupts 



Introduce helper functions allowing us to prevent device drivers from
getting any interrupts (without disabling interrupts on the CPU)
during suspend (or hibernation) and to make them start to receive
interrupts again during the subsequent resume.  These functions make it
possible to keep timer interrupts enabled while the "late" suspend and
"early" resume callbacks provided by device drivers are being
executed.  In turn, this allows device drivers' "late" suspend and
"early" resume callbacks to sleep, execute ACPI callbacks etc.

The functions introduced here will be used to rework the handling of
interrupts during suspend (hibernation) and resume.  Namely,
interrupts will only be disabled on the CPU right before suspending
sysdevs, while device drivers will be prevented from receiving
interrupts, with the help of the new helper function, before their
"late" suspend callbacks run (and analogously during resume).

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent 019abbc8

include/linux/interrupt.h

+9 −0
Original line number Diff line number Diff line
@@ -117,6 +117,15 @@ extern void disable_irq_nosync(unsigned int irq); 
extern void disable_irq(unsigned int irq);

extern void enable_irq(unsigned int irq);



/* The following three functions are for the core kernel use only. */

extern void suspend_device_irqs(void);

extern void resume_device_irqs(void);

#ifdef CONFIG_PM_SLEEP

extern int check_wakeup_irqs(void);

#else

static inline int check_wakeup_irqs(void) { return 0; }

#endif



#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)



extern cpumask_var_t irq_default_affinity;

include/linux/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, 
#define IRQ_SPURIOUS_DISABLED	0x00800000	/* IRQ was disabled by the spurious trap */

#define IRQ_MOVE_PCNTXT		0x01000000	/* IRQ migration from process context */

#define IRQ_AFFINITY_SET	0x02000000	/* IRQ affinity was set from userspace*/

#define IRQ_SUSPENDED		0x04000000	/* IRQ has gone through suspend sequence */



#ifdef CONFIG_IRQ_PER_CPU

# define CHECK_IRQ_PER_CPU(var) ((var) & IRQ_PER_CPU)

kernel/irq/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o 
obj-$(CONFIG_PROC_FS) += proc.o

obj-$(CONFIG_GENERIC_PENDING_IRQ) += migration.o

obj-$(CONFIG_NUMA_MIGRATE_IRQ_DESC) += numa_migrate.o

obj-$(CONFIG_PM_SLEEP) += pm.o

kernel/irq/internals.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ extern void compat_irq_chip_set_default_handler(struct irq_desc *desc); 


extern int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,

		unsigned long flags);

extern void __disable_irq(struct irq_desc *desc, unsigned int irq, bool susp);

extern void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume);



extern struct lock_class_key irq_desc_lock_class;

extern void init_kstat_irqs(struct irq_desc *desc, int cpu, int nr);

kernel/irq/manage.c

+24 −7
Original line number Diff line number Diff line
@@ -162,6 +162,20 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc) 
}

#endif



void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)

{

	if (suspend) {

		if (!desc->action || (desc->action->flags & IRQF_TIMER))

			return;

		desc->status |= IRQ_SUSPENDED;

	}



	if (!desc->depth++) {

		desc->status |= IRQ_DISABLED;

		desc->chip->disable(irq);

	}

}



/**

 *	disable_irq_nosync - disable an irq without waiting

 *	@irq: Interrupt to disable
@@ -182,10 +196,7 @@ void disable_irq_nosync(unsigned int irq) 
		return;



	spin_lock_irqsave(&desc->lock, flags);

	if (!desc->depth++) {

		desc->status |= IRQ_DISABLED;

		desc->chip->disable(irq);

	}

	__disable_irq(desc, irq, false);

	spin_unlock_irqrestore(&desc->lock, flags);

}

EXPORT_SYMBOL(disable_irq_nosync);
@@ -215,15 +226,21 @@ void disable_irq(unsigned int irq) 
}

EXPORT_SYMBOL(disable_irq);



static void __enable_irq(struct irq_desc *desc, unsigned int irq)

void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume)

{

	if (resume)

		desc->status &= ~IRQ_SUSPENDED;



	switch (desc->depth) {

	case 0:

 err_out:

		WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);

		break;

	case 1: {

		unsigned int status = desc->status & ~IRQ_DISABLED;



		if (desc->status & IRQ_SUSPENDED)

			goto err_out;

		/* Prevent probing on this irq: */

		desc->status = status | IRQ_NOPROBE;

		check_irq_resend(desc, irq);
@@ -253,7 +270,7 @@ void enable_irq(unsigned int irq) 
		return;



	spin_lock_irqsave(&desc->lock, flags);

	__enable_irq(desc, irq);

	__enable_irq(desc, irq, false);

	spin_unlock_irqrestore(&desc->lock, flags);

}

EXPORT_SYMBOL(enable_irq);
@@ -511,7 +528,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
	 */

	if (shared && (desc->status & IRQ_SPURIOUS_DISABLED)) {

		desc->status &= ~IRQ_SPURIOUS_DISABLED;

		__enable_irq(desc, irq);

		__enable_irq(desc, irq, false);

	}



	spin_unlock_irqrestore(&desc->lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE