Skip to content

Commit

Permalink
irq: support irq suspend and resume
Browse files Browse the repository at this point in the history 
U-Boot will support cpu suspend/resume, cpu and logic may
lose power, this patch guarantees gic works normally.

Change-Id: I8ebee881fa27fea075502f962f9faabaa8264f67
Signed-off-by: Joseph Chen <[email protected]>
  • Loading branch information
@JosephChen2017 @keveryang
JosephChen2017 authored and keveryang committed Dec 5, 2017
1 parent e917b03 commit ed837ed
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 0 deletions.
26 changes: 26 additions & 0 deletions drivers/irq/irq-generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,32 @@ void irq_free_handler(int irq)
irqs_desc[irq].data = NULL;
}

int irqs_suspend(void)
{
int err;

err = gic_irq_chip->irq_suspend();
if (err) {
printf("ERROR: irqs suspend failed\n");
return err;
}

return 0;
}

int irqs_resume(void)
{
int err;

err = gic_irq_chip->irq_resume();
if (err) {
printf("ERROR: irqs resume failed\n");
return err;
}

return 0;
}

#ifdef CONFIG_ARM64
static void cpu_local_irq_enable(void)
{
Expand Down
113 changes: 113 additions & 0 deletions drivers/irq/irq-gic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
#include <irq-generic.h>
#include "irq-gic.h"

#define gicd_readl(offset) readl(GICD_BASE + (offset))
#define gicc_readl(offset) readl(GICC_BASE + (offset))
#define gicd_writel(v, offset) writel(v, GICD_BASE + (offset))
#define gicc_writel(v, offset) writel(v, GICC_BASE + (offset))

typedef enum INT_TRIG {
INT_LEVEL_TRIGGER,
INT_EDGE_TRIGGER
Expand Down Expand Up @@ -243,6 +248,112 @@ static int gic_irq_get(void)
#endif
}

struct gic_dist_data {
uint32_t ctlr;
uint32_t icfgr[DIV_ROUND_UP(1020, 16)];
uint32_t itargetsr[DIV_ROUND_UP(1020, 4)];
uint32_t ipriorityr[DIV_ROUND_UP(1020, 4)];
uint32_t igroupr[DIV_ROUND_UP(1020, 32)];
uint32_t ispendr[DIV_ROUND_UP(1020, 32)];
uint32_t isenabler[DIV_ROUND_UP(1020, 32)];
};

struct gic_cpu_data {
uint32_t ctlr;
uint32_t pmr;
};

static struct gic_dist_data gicd_save;
static struct gic_cpu_data gicc_save;

#define IRQ_REG_X4(irq) (4 * ((irq) / 4))
#define IRQ_REG_X16(irq) (4 * ((irq) / 16))
#define IRQ_REG_X32(irq) (4 * ((irq) / 32))

static int gic_irq_suspend(void)
{
int irq_nr, i, irq;

/* irq nr */
irq_nr = ((gicd_readl(GICD_TYPER) & 0x1f) + 1) * 32;
if (irq_nr > 1020)
irq_nr = 1020;

/* GICC save */
gicc_save.ctlr = gicc_readl(GICC_CTLR);
gicc_save.pmr = gicc_readl(GICC_PMR);

/* GICD save */
gicd_save.ctlr = gicd_readl(GICD_CTLR);

for (i = 0, irq = 0; irq < irq_nr; irq += 16)
gicd_save.icfgr[i++] = gicd_readl(GICD_ICFGR + IRQ_REG_X16(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 4)
gicd_save.itargetsr[i++] = gicd_readl(GICD_ITARGETSRn + IRQ_REG_X4(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 4)
gicd_save.ipriorityr[i++] = gicd_readl(GICD_IPRIORITYRn + IRQ_REG_X4(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 32)
gicd_save.igroupr[i++] = gicd_readl(GICD_IGROUPRn + IRQ_REG_X32(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 32)
gicd_save.ispendr[i++] = gicd_readl(GICD_ISPENDRn + IRQ_REG_X32(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 32)
gicd_save.isenabler[i++] = gicd_readl(GICD_ISENABLERn + IRQ_REG_X32(irq));

dsb();

return 0;
}

static int gic_irq_resume(void)
{
int irq_nr, i, irq;

irq_nr = ((gicd_readl(GICD_TYPER) & 0x1f) + 1) * 32;
if (irq_nr > 1020)
irq_nr = 1020;

/* Disable ctrl register */
gicc_writel(0, GICC_CTLR);
gicd_writel(0, GICD_CTLR);
dsb();

/* Clear all interrupt */
for (i = 0, irq = 0; irq < irq_nr; irq += 32)
gicd_writel(0xffffffff, GICD_ICENABLERn + IRQ_REG_X32(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 16)
gicd_writel(gicd_save.icfgr[i++], GICD_ICFGR + IRQ_REG_X16(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 4)
gicd_writel(gicd_save.itargetsr[i++], GICD_ITARGETSRn + IRQ_REG_X4(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 4)
gicd_writel(gicd_save.ipriorityr[i++], GICD_IPRIORITYRn + IRQ_REG_X4(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 32)
gicd_writel(gicd_save.igroupr[i++], GICD_IGROUPRn + IRQ_REG_X32(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 32)
gicd_writel(gicd_save.isenabler[i++], GICD_ISENABLERn + IRQ_REG_X32(irq));

for (i = 0, irq = 0; irq < irq_nr; irq += 32)
gicd_writel(gicd_save.ispendr[i++], GICD_ISPENDRn + IRQ_REG_X32(irq));
dsb();

gicc_writel(gicc_save.pmr, GICC_PMR);
gicc_writel(gicc_save.ctlr, GICC_CTLR);
gicd_writel(gicd_save.ctlr, GICD_CTLR);
dsb();

return 0;
}

/**************************************regs save and resume**************************/
static int gic_irq_init(void)
{
/* GICV3 done in: arch/arm/cpu/armv8/start.S */
Expand Down Expand Up @@ -276,6 +387,8 @@ static int gic_irq_init(void)
static struct irq_chip gic_irq_chip = {
.name = "gic-irq-chip",
.irq_init = gic_irq_init,
.irq_suspend = gic_irq_suspend,
.irq_resume = gic_irq_resume,
.irq_get = gic_irq_get,
.irq_enable = gic_irq_enable,
.irq_disable = gic_irq_disable,
Expand Down
4 changes: 4 additions & 0 deletions include/irq-generic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ enum {
struct irq_chip {
const char *name;
int (*irq_init)(void);
int (*irq_suspend)(void);
int (*irq_resume)(void);
int (*irq_get)(void);
int (*irq_enable)(int irq);
int (*irq_disable)(int irq);
Expand All @@ -61,6 +63,8 @@ void irq_free_handler(int irq);
int irq_set_irq_type(int irq, unsigned int type);
int irq_handler_enable(int irq);
int irq_handler_disable(int irq);
int irqs_suspend(void);
int irqs_resume(void);
int gpio_to_irq(struct gpio_desc *gpio);

/*
Expand Down

0 comments on commit ed837ed

Please sign in to comment.