From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/21] ARM: gic: Add functions to save and restore gic state
Date: Sun, 5 Dec 2010 23:30:21 +0000 [thread overview]
Message-ID: <20101205233021.GA22824@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1291590548-7341-3-git-send-email-ccross@android.com>
On Sun, Dec 05, 2010 at 03:08:49PM -0800, Colin Cross wrote:
> on systems with idle states which power-gate the logic including
> the gic, such as tegra, the gic distributor needs to be shut down
> and restored on entry and exit from the architecture idle code
This clashes with the GIC cleanups I've previously posted.
> Original-author: Gary King <gking@nvidia.com>
> Signed-off-by: Gary King <gking@nvidia.com>
> Signed-off-by: Colin Cross <ccross@android.com>
> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
> ---
> arch/arm/common/gic.c | 136 ++++++++++++++++++++++++++++++++--
> arch/arm/include/asm/hardware/gic.h | 4 +
> 2 files changed, 132 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
> index 772f95f..9deb34f 100644
> --- a/arch/arm/common/gic.c
> +++ b/arch/arm/common/gic.c
> @@ -39,6 +39,13 @@ struct gic_chip_data {
> unsigned int irq_offset;
> void __iomem *dist_base;
> void __iomem *cpu_base;
> +#ifdef CONFIG_PM
> + u32 saved_enable[DIV_ROUND_UP(1020, 32)];
> + u32 saved_conf[DIV_ROUND_UP(1020, 16)];
> + u32 saved_pri[DIV_ROUND_UP(1020, 4)];
> + u32 saved_target[DIV_ROUND_UP(1020, 4)];
> +#endif
> + unsigned int max_irq;
> };
>
> #ifndef MAX_GIC_NR
> @@ -207,21 +214,15 @@ void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)
> set_irq_chained_handler(irq, gic_handle_cascade_irq);
> }
>
> -void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,
> - unsigned int irq_start)
> +static unsigned int _gic_dist_init(unsigned int gic_nr)
> {
> unsigned int max_irq, i;
> + void __iomem *base = gic_data[gic_nr].dist_base;
> u32 cpumask = 1 << smp_processor_id();
>
> - if (gic_nr >= MAX_GIC_NR)
> - BUG();
> -
> cpumask |= cpumask << 8;
> cpumask |= cpumask << 16;
>
> - gic_data[gic_nr].dist_base = base;
> - gic_data[gic_nr].irq_offset = (irq_start - 1) & ~31;
> -
> writel(0, base + GIC_DIST_CTRL);
>
> /*
> @@ -263,6 +264,109 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,
> for (i = 32; i < max_irq; i += 32)
> writel(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4 / 32);
>
> + return max_irq;
> +}
> +
> +static void _gic_dist_exit(unsigned int gic_nr)
> +{
> + writel(0, gic_data[gic_nr].dist_base + GIC_DIST_CTRL);
> +}
> +
> +#ifdef CONFIG_PM
> +/*
> + * Saves the GIC distributor registers during suspend or idle. Must be called
> + * with interrupts disabled but before powering down the GIC. After calling
> + * this function, no interrupts will be delivered by the GIC, and another
> + * platform-specific wakeup source must be enabled.
> + */
> +void gic_dist_save(unsigned int gic_nr)
> +{
> + unsigned int max_irq = gic_data[gic_nr].max_irq;
> + void __iomem *dist_base = gic_data[gic_nr].dist_base;
> + int i;
> +
> + if (gic_nr >= MAX_GIC_NR)
> + BUG();
> +
> + _gic_dist_exit(gic_nr);
> +
> + for (i = 0; i < DIV_ROUND_UP(max_irq, 16); i++)
> + gic_data[gic_nr].saved_conf[i] =
> + readl(dist_base + GIC_DIST_CONFIG + i * 4);
> +
> + for (i = 0; i < DIV_ROUND_UP(max_irq, 4); i++)
> + gic_data[gic_nr].saved_pri[i] =
> + readl(dist_base + GIC_DIST_PRI + i * 4);
> +
> + for (i = 0; i < DIV_ROUND_UP(max_irq, 4); i++)
> + gic_data[gic_nr].saved_target[i] =
> + readl(dist_base + GIC_DIST_TARGET + i * 4);
> +
> + for (i = 0; i < DIV_ROUND_UP(max_irq, 32); i++)
> + gic_data[gic_nr].saved_enable[i] =
> + readl(dist_base + GIC_DIST_ENABLE_SET + i * 4);
> +}
> +
> +/*
> + * Restores the GIC distributor registers during resume or when coming out of
> + * idle. Must be called before enabling interrupts. If a level interrupt
> + * that occured while the GIC was suspended is still present, it will be
> + * handled normally, but any edge interrupts that occured will not be seen by
> + * the GIC and need to be handled by the platform-specific wakeup source.
> + */
> +void gic_dist_restore(unsigned int gic_nr)
> +{
> + unsigned int max_irq;
> + unsigned int i;
> + void __iomem *dist_base;
> + void __iomem *cpu_base;
> +
> + if (gic_nr >= MAX_GIC_NR)
> + BUG();
> +
> + _gic_dist_init(gic_nr);
> +
> + max_irq = gic_data[gic_nr].max_irq;
> + dist_base = gic_data[gic_nr].dist_base;
> + cpu_base = gic_data[gic_nr].cpu_base;
> +
> + for (i = 0; i < DIV_ROUND_UP(max_irq, 16); i++)
> + writel(gic_data[gic_nr].saved_conf[i],
> + dist_base + GIC_DIST_CONFIG + i * 4);
> +
> + for (i = 0; i < DIV_ROUND_UP(max_irq, 4); i++)
> + writel(gic_data[gic_nr].saved_pri[i],
> + dist_base + GIC_DIST_PRI + i * 4);
> +
> + for (i = 0; i < DIV_ROUND_UP(max_irq, 4); i++)
> + writel(gic_data[gic_nr].saved_target[i],
> + dist_base + GIC_DIST_TARGET + i * 4);
> +
> + for (i = 0; i < DIV_ROUND_UP(max_irq, 32); i++)
> + writel(gic_data[gic_nr].saved_enable[i],
> + dist_base + GIC_DIST_ENABLE_SET + i * 4);
> +
> + writel(1, dist_base + GIC_DIST_CTRL);
> + writel(0xf0, cpu_base + GIC_CPU_PRIMASK);
> + writel(1, cpu_base + GIC_CPU_CTRL);
> +}
> +#endif
> +
> +void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,
> + unsigned int irq_start)
> +{
> + unsigned int max_irq;
> + unsigned int i;
> +
> + if (gic_nr >= MAX_GIC_NR)
> + BUG();
> +
> + gic_data[gic_nr].dist_base = base;
> + gic_data[gic_nr].irq_offset = (irq_start - 1) & ~31;
> +
> + max_irq = _gic_dist_init(gic_nr);
> + gic_data[gic_nr].max_irq = max_irq;
> +
> /*
> * Setup the Linux IRQ subsystem.
> */
> @@ -276,6 +380,14 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,
> writel(1, base + GIC_DIST_CTRL);
> }
>
> +void gic_dist_exit(unsigned int gic_nr)
> +{
> + if (gic_nr >= MAX_GIC_NR)
> + BUG();
> +
> + _gic_dist_exit(gic_nr);
> +}
> +
> void __cpuinit gic_cpu_init(unsigned int gic_nr, void __iomem *base)
> {
> void __iomem *dist_base;
> @@ -306,6 +418,14 @@ void __cpuinit gic_cpu_init(unsigned int gic_nr, void __iomem *base)
> writel(1, base + GIC_CPU_CTRL);
> }
>
> +void gic_cpu_exit(unsigned int gic_nr)
> +{
> + if (gic_nr >= MAX_GIC_NR)
> + BUG();
> +
> + writel(0, gic_data[gic_nr].cpu_base + GIC_CPU_CTRL);
> +}
> +
> #ifdef CONFIG_SMP
> void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
> {
> diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h
> index 7f34333..0a198b0 100644
> --- a/arch/arm/include/asm/hardware/gic.h
> +++ b/arch/arm/include/asm/hardware/gic.h
> @@ -34,7 +34,11 @@
>
> #ifndef __ASSEMBLY__
> void gic_dist_init(unsigned int gic_nr, void __iomem *base, unsigned int irq_start);
> +void gic_dist_save(unsigned int gic_nr);
> +void gic_dist_restore(unsigned int gic_nr);
> +void gic_dist_exit(unsigned int gic_nr);
> void gic_cpu_init(unsigned int gic_nr, void __iomem *base);
> +void gic_cpu_exit(unsigned int gic_nr);
> void gic_cascade_irq(unsigned int gic_nr, unsigned int irq);
> void gic_raise_softirq(const struct cpumask *mask, unsigned int irq);
> #endif
> --
> 1.7.3.1
>
next prev parent reply other threads:[~2010-12-05 23:30 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-05 23:08 [PATCH 00/21] Updates for Tegra support in 2.6.38 Colin Cross
2010-12-05 23:08 ` [PATCH 01/21] ARM: tegra: irq: Rename gic pointers to avoid conflicts Colin Cross
2010-12-05 23:08 ` [PATCH 02/21] ARM: gic: Add functions to save and restore gic state Colin Cross
2010-12-05 23:30 ` Russell King - ARM Linux [this message]
2010-12-05 23:52 ` Colin Cross
2010-12-05 23:08 ` [PATCH 03/21] ARM: gic: Export irq chip functions Colin Cross
2010-12-05 23:08 ` [PATCH 04/21] ARM: tegra: Centralize macros to define debug uart base Colin Cross
2010-12-05 23:08 ` [PATCH 05/21] ARM: tegra: Add api to control internal powergating Colin Cross
2010-12-05 23:08 ` [PATCH 06/21] ARM: tegra: irqs: Update irq list Colin Cross
2010-12-05 23:08 ` [PATCH 07/21] ARM: tegra: Add prototypes for subsystem suspend functions Colin Cross
2010-12-05 23:08 ` [PATCH 08/21] ARM: tegra: clock: Suspend fixes, and add new clocks Colin Cross
2010-12-05 23:08 ` [PATCH 09/21] ARM: tegra: pinmux: Add missing drive pingroups and fix suspend Colin Cross
2010-12-05 23:08 ` [PATCH 10/21] ARM: tegra: timer: Add idle and suspend support to timers Colin Cross
2010-12-05 23:08 ` [PATCH 11/21] ARM: tegra: irq: Add support for suspend wake sources Colin Cross
2010-12-05 23:08 ` [PATCH 12/21] ARM: tegra: Add suspend and hotplug support Colin Cross
2010-12-06 0:01 ` Russell King - ARM Linux
2010-12-05 23:09 ` [PATCH 13/21] ARM: tegra: irq: Add set_wake and set_type support for suspend Colin Cross
2010-12-05 23:09 ` [PATCH 14/21] ARM: tegra: irq: Add debugfs file to show wake irqs Colin Cross
2010-12-06 21:07 ` Stephen Boyd
2010-12-05 23:09 ` [PATCH 15/21] ARM: tegra: irq: Implement retrigger Colin Cross
2010-12-05 23:09 ` [PATCH 16/21] ARM: tegra: gpio: Add support for waking from suspend Colin Cross
2010-12-05 23:09 ` [PATCH 17/21] ARM: tegra: add CPU_IDLE driver Colin Cross
2010-12-05 23:09 ` [PATCH 18/21] ARM: tegra: iomap: Add missing devices, fix use of SZ_8, SZ_64 Colin Cross
2010-12-05 23:09 ` [PATCH 19/21] ARM: tegra: cpufreq: Disable cpufreq during suspend Colin Cross
2010-12-05 23:09 ` [PATCH 20/21] ARM: tegra: Allow overriding arch_reset Colin Cross
2010-12-05 23:39 ` Russell King - ARM Linux
2010-12-05 23:09 ` [PATCH 21/21] ARM: tegra: dma: Fix critical data corruption bugs Colin Cross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101205233021.GA22824@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).