Merge tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux into fixes

olofj · olofj · commit 4dbd2b429a2c · 2018-07-14T15:11:41.000-07:00
This is the fixes set for v4.18 cycle. This is a fix for suspending all pxa3xx platforms, where high number interrupts are not reenabled. * tag 'pxa-fixes-4.18' of https://github.com/rjarzmik/linux: ARM: pxa: irq: fix handling of ICMR registers in suspend/resume Signed-off-by: Olof Johansson <olof@lixom.net>
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
@@ -185,7 +185,7 @@ static int pxa_irq_suspend(void)
 {
 	int i;
 
-	for (i = 0; i < pxa_internal_irq_nr / 32; i++) {
+	for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) {
 		void __iomem *base = irq_base(i);
 
 		saved_icmr[i] = __raw_readl(base + ICMR);
@@ -204,7 +204,7 @@ static void pxa_irq_resume(void)
 {
 	int i;
 
-	for (i = 0; i < pxa_internal_irq_nr / 32; i++) {
+	for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) {
 		void __iomem *base = irq_base(i);
 
 		__raw_writel(saved_icmr[i], base + ICMR);

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ static int pxa_irq_suspend(void)`
`185`	`185`	`{`
`186`	`186`	`int i;`
`187`	`187`
`188`		`- for (i = 0; i < pxa_internal_irq_nr / 32; i++) {`
	`188`	`+ for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) {`
`189`	`189`	`void __iomem *base = irq_base(i);`
`190`	`190`
`191`	`191`	`saved_icmr[i] = __raw_readl(base + ICMR);`
`@@ -204,7 +204,7 @@ static void pxa_irq_resume(void)`
`204`	`204`	`{`
`205`	`205`	`int i;`
`206`	`206`
`207`		`- for (i = 0; i < pxa_internal_irq_nr / 32; i++) {`
	`207`	`+ for (i = 0; i < DIV_ROUND_UP(pxa_internal_irq_nr, 32); i++) {`
`208`	`208`	`void __iomem *base = irq_base(i);`
`209`	`209`
`210`	`210`	`__raw_writel(saved_icmr[i], base + ICMR);`