Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fd4899a authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Thomas Gleixner
Browse files

irqchip: exynos-combiner: Save IRQ enable set on suspend 



The Exynos interrupt combiner IP loses its state when the SoC enters
into a low power state during a Suspend-to-RAM. This means that if a
IRQ is used as a source, the interrupts for the devices are disabled
when the system is resumed from a sleep state so are not triggered.

Save the interrupt enable set register for each combiner group and
restore it after resume to make sure that the interrupts are enabled.

Signed-off-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Doug Anderson <dianders@chromium.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Peter Chubb <peter.chubb@nicta.com.au>
Cc: Shuah Khan <shuahkhan@gmail.com>
Cc: Chanho Park <parkch98@gmail.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Link: http://lkml.kernel.org/r/1434087795-13990-1-git-send-email-javier.martinez@collabora.co.uk


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 55963c9f

drivers/irqchip/exynos-combiner.c

+59 −5
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/syscore_ops.h>

#include <linux/irqdomain.h>

#include <linux/irqdomain.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>
@@ -34,9 +35,14 @@ struct combiner_chip_data { 
	unsigned int irq_mask;

	unsigned int irq_mask;

	void __iomem *base;

	void __iomem *base;

	unsigned int parent_irq;

	unsigned int parent_irq;

#ifdef CONFIG_PM

	u32 pm_save;

#endif

};

};





static struct combiner_chip_data *combiner_data;

static struct irq_domain *combiner_irq_domain;

static struct irq_domain *combiner_irq_domain;

static unsigned int max_nr = 20;





static inline void __iomem *combiner_base(struct irq_data *data)

static inline void __iomem *combiner_base(struct irq_data *data)

{

{
@@ -170,12 +176,10 @@ static const struct irq_domain_ops combiner_irq_domain_ops = { 
};

};





static void __init combiner_init(void __iomem *combiner_base,

static void __init combiner_init(void __iomem *combiner_base,

				 struct device_node *np,

				 struct device_node *np)

				 unsigned int max_nr)

{

{

	int i, irq;

	int i, irq;

	unsigned int nr_irq;

	unsigned int nr_irq;

	struct combiner_chip_data *combiner_data;





	nr_irq = max_nr * IRQ_IN_COMBINER;

	nr_irq = max_nr * IRQ_IN_COMBINER;
@@ -201,11 +205,59 @@ static void __init combiner_init(void __iomem *combiner_base, 
	}

	}

}

}





#ifdef CONFIG_PM



/**

 * combiner_suspend - save interrupt combiner state before suspend

 *

 * Save the interrupt enable set register for all combiner groups since

 * the state is lost when the system enters into a sleep state.

 *

 */

static int combiner_suspend(void)

{

	int i;



	for (i = 0; i < max_nr; i++)

		combiner_data[i].pm_save =

			__raw_readl(combiner_data[i].base + COMBINER_ENABLE_SET);



	return 0;

}



/**

 * combiner_resume - restore interrupt combiner state after resume

 *

 * Restore the interrupt enable set register for all combiner groups since

 * the state is lost when the system enters into a sleep state on suspend.

 *

 */

static void combiner_resume(void)

{

	int i;



	for (i = 0; i < max_nr; i++) {

		__raw_writel(combiner_data[i].irq_mask,

			     combiner_data[i].base + COMBINER_ENABLE_CLEAR);

		__raw_writel(combiner_data[i].pm_save,

			     combiner_data[i].base + COMBINER_ENABLE_SET);

	}

}



#else

#define combiner_suspend	NULL

#define combiner_resume		NULL

#endif



static struct syscore_ops combiner_syscore_ops = {

	.suspend	= combiner_suspend,

	.resume		= combiner_resume,

};



static int __init combiner_of_init(struct device_node *np,

static int __init combiner_of_init(struct device_node *np,

				   struct device_node *parent)

				   struct device_node *parent)

{

{

	void __iomem *combiner_base;

	void __iomem *combiner_base;

	unsigned int max_nr = 20;





	combiner_base = of_iomap(np, 0);

	combiner_base = of_iomap(np, 0);

	if (!combiner_base) {

	if (!combiner_base) {
@@ -219,7 +271,9 @@ static int __init combiner_of_init(struct device_node *np, 
			__func__, max_nr);

			__func__, max_nr);

	}

	}





	combiner_init(combiner_base, np, max_nr);

	combiner_init(combiner_base, np);



	register_syscore_ops(&combiner_syscore_ops);





	return 0;

	return 0;

}

}