[PATCH v7 0/2] IMX GPCv2 drivers for wakeup source and suspend

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH v7 0/2] IMX GPCv2 drivers for wakeup source and suspend
@ 2015-07-27 19:29 ` Shenwei Wang
  0 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-27 19:29 UTC (permalink / raw)
  To: shawn.guo, tglx, jason; +Cc: linux-arm-kernel, linux-kernel, b20788

IMX7D contains a new version of GPC IP block (GPCv2). It has two
major functions: power management and wakeup source management.

Two drivers were developed to support these functions:
One irqchip driver (irq-imx-gpcv2.c) is to manage
the interrupt wakeup source. One suspend driver (pm-imx7.c) is used
to manage the system power states.

Patch v7:
	Move most of the macros and definitions into relating source files
	Replace the spinlock_t with the struct raw_spinlock in imx_gpcv2_irq
	Code clean up

Patch V6:
	Clean up the codes (irq-imx-gpcv2.c) according to the review
	feedback of Thomas Glx
	Use raw_spin_lock in the irq_mask and irq_unmask callbacks
	Split the struct definition into two: irqchip and suspend
	Unified coding style

Patch V5:
	Splitted it into two patches per Thomas Gleixner suggestion.
	-- one for irqchip
	-- one for suspend

Patch V4:
	Splitted the driver into two function drivers: one irqchip driver
	for wakeup source management, and one suspend driver for power
	state management.

Patch V3:
	Added the assemble codes (suspend-imx7.S) for SUSPEND_MEM state.
	Supported the SUSPEND_MEM power mode.

Patch V2:
	Added the basic driver APIs for power management.
	Supported the STANDBY power mode.

Patch V1:
	Implemented the driver for IRQ wakeup sources.

Shenwei Wang (2):
  irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
  ARM: imx: Add suspend codes for imx7D

 arch/arm/mach-imx/Kconfig        |   1 +
 arch/arm/mach-imx/Makefile       |   2 +
 arch/arm/mach-imx/pm-imx7.c      | 901 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-imx/suspend-imx7.S | 529 +++++++++++++++++++++++
 drivers/irqchip/Kconfig          |   7 +
 drivers/irqchip/Makefile         |   1 +
 drivers/irqchip/irq-imx-gpcv2.c  | 254 +++++++++++
 include/soc/imx/gpcv2.h          |  25 ++
 8 files changed, 1720 insertions(+)
 create mode 100644 arch/arm/mach-imx/pm-imx7.c
 create mode 100644 arch/arm/mach-imx/suspend-imx7.S
 create mode 100644 drivers/irqchip/irq-imx-gpcv2.c
 create mode 100644 include/soc/imx/gpcv2.h

--
2.5.0.rc2



^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH v7 0/2] IMX GPCv2 drivers for wakeup source and suspend
@ 2015-07-27 19:29 ` Shenwei Wang
  0 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-27 19:29 UTC (permalink / raw)
  To: linux-arm-kernel

IMX7D contains a new version of GPC IP block (GPCv2). It has two
major functions: power management and wakeup source management.

Two drivers were developed to support these functions:
One irqchip driver (irq-imx-gpcv2.c) is to manage
the interrupt wakeup source. One suspend driver (pm-imx7.c) is used
to manage the system power states.

Patch v7:
	Move most of the macros and definitions into relating source files
	Replace the spinlock_t with the struct raw_spinlock in imx_gpcv2_irq
	Code clean up

Patch V6:
	Clean up the codes (irq-imx-gpcv2.c) according to the review
	feedback of Thomas Glx
	Use raw_spin_lock in the irq_mask and irq_unmask callbacks
	Split the struct definition into two: irqchip and suspend
	Unified coding style

Patch V5:
	Splitted it into two patches per Thomas Gleixner suggestion.
	-- one for irqchip
	-- one for suspend

Patch V4:
	Splitted the driver into two function drivers: one irqchip driver
	for wakeup source management, and one suspend driver for power
	state management.

Patch V3:
	Added the assemble codes (suspend-imx7.S) for SUSPEND_MEM state.
	Supported the SUSPEND_MEM power mode.

Patch V2:
	Added the basic driver APIs for power management.
	Supported the STANDBY power mode.

Patch V1:
	Implemented the driver for IRQ wakeup sources.

Shenwei Wang (2):
  irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
  ARM: imx: Add suspend codes for imx7D

 arch/arm/mach-imx/Kconfig        |   1 +
 arch/arm/mach-imx/Makefile       |   2 +
 arch/arm/mach-imx/pm-imx7.c      | 901 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-imx/suspend-imx7.S | 529 +++++++++++++++++++++++
 drivers/irqchip/Kconfig          |   7 +
 drivers/irqchip/Makefile         |   1 +
 drivers/irqchip/irq-imx-gpcv2.c  | 254 +++++++++++
 include/soc/imx/gpcv2.h          |  25 ++
 8 files changed, 1720 insertions(+)
 create mode 100644 arch/arm/mach-imx/pm-imx7.c
 create mode 100644 arch/arm/mach-imx/suspend-imx7.S
 create mode 100644 drivers/irqchip/irq-imx-gpcv2.c
 create mode 100644 include/soc/imx/gpcv2.h

--
2.5.0.rc2

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
  2015-07-27 19:29 ` Shenwei Wang
@ 2015-07-27 19:29   ` Shenwei Wang
  -1 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-27 19:29 UTC (permalink / raw)
  To: shawn.guo, tglx, jason; +Cc: linux-arm-kernel, linux-kernel, b20788

IMX7D contains a new version of GPC IP block (GPCv2). It has two
major functions: power management and wakeup source management.
This patch adds a new irqchip driver to manage the interrupt wakeup
sources on IMX7D.
When the system is in WFI (wait for interrupt) mode, this GPC block
will be the first block on the platform to be activated and signaled.
Under normal wait mode during cpu idle, the system can be woke up
by any enabled interrupts. Under standby or suspend mode, the system
can only be woke up by the pre-defined wakeup sources.

Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
Signed-off-by: Anson Huang <b20788@freescale.com>
---
 drivers/irqchip/Kconfig         |   7 ++
 drivers/irqchip/Makefile        |   1 +
 drivers/irqchip/irq-imx-gpcv2.c | 254 ++++++++++++++++++++++++++++++++++++++++
 include/soc/imx/gpcv2.h         |  25 ++++
 4 files changed, 287 insertions(+)
 create mode 100644 drivers/irqchip/irq-imx-gpcv2.c
 create mode 100644 include/soc/imx/gpcv2.h

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 120d815..3fc0fac 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -177,3 +177,10 @@ config RENESAS_H8300H_INTC
 config RENESAS_H8S_INTC
         bool
 	select IRQ_DOMAIN
+
+config IMX_GPCV2
+	bool
+	select IRQ_DOMAIN
+	help
+	  Enables the wakeup IRQs for IMX platforms with GPCv2 block
+
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index b8d4e96..8eb5f60 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -52,3 +52,4 @@ obj-$(CONFIG_RENESAS_H8300H_INTC)	+= irq-renesas-h8300h.o
 obj-$(CONFIG_RENESAS_H8S_INTC)		+= irq-renesas-h8s.o
 obj-$(CONFIG_ARCH_SA1100)		+= irq-sa11x0.o
 obj-$(CONFIG_INGENIC_IRQ)		+= irq-ingenic.o
+obj-$(CONFIG_IMX_GPCV2)			+= irq-imx-gpcv2.o
diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
new file mode 100644
index 0000000..3084f16
--- /dev/null
+++ b/drivers/irqchip/irq-imx-gpcv2.c
@@ -0,0 +1,254 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/slab.h>
+#include <linux/irqchip.h>
+#include <linux/syscore_ops.h>
+
+#include <soc/imx/gpcv2.h>
+
+#define GPC_MAX_IRQS            		(IMR_NUM * 32)
+
+#define GPC_IMR1_CORE0				0x30
+#define GPC_IMR1_CORE1				0x40
+
+struct imx_gpcv2_irq *gpcv2_irq_instance;
+
+static int gpcv2_wakeup_source_save(void)
+{
+	struct imx_gpcv2_irq *cd;
+	void __iomem *reg;
+	int i;
+
+	cd = gpcv2_irq_instance;
+	if (!cd)
+		return 0;
+
+	for (i = 0; i < IMR_NUM; i++) {
+		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
+		cd->enabled_irqs[i] = readl_relaxed(reg);
+		writel_relaxed(cd->wakeup_sources[i], reg);
+	}
+
+	return 0;
+}
+
+static void gpcv2_wakeup_source_restore(void)
+{
+	struct imx_gpcv2_irq *cd;
+	void __iomem *reg;
+	int i;
+
+	cd = gpcv2_irq_instance;
+	if (!cd)
+		return;
+
+	for (i = 0; i < IMR_NUM; i++) {
+		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
+		writel_relaxed(cd->enabled_irqs[i], reg);
+		cd->wakeup_sources[i] = ~0;
+	}
+}
+
+static struct syscore_ops imx_gpcv2_syscore_ops = {
+	.suspend	= gpcv2_wakeup_source_save,
+	.resume		= gpcv2_wakeup_source_restore,
+};
+
+static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int on)
+{
+	struct imx_gpcv2_irq *cd = d->chip_data;
+	unsigned int idx = d->hwirq / 32;
+	unsigned long flags;
+	void __iomem *reg;
+	u32 mask, val;
+
+	raw_spin_lock_irqsave(&cd->rlock, flags);
+	reg = cd->gpc_base + cd->cpu2wakeup + idx * 4;
+	mask = 1 << d->hwirq % 32;
+	val = cd->wakeup_sources[idx];
+
+	cd->wakeup_sources[idx] = on ? (val & ~mask) : (val | mask);
+	raw_spin_unlock_irqrestore(&cd->rlock, flags);
+
+	/*
+	 * Do *not* call into the parent, as the GIC doesn't have any
+	 * wake-up facility...
+	 */
+
+	return 0;
+}
+
+
+static void imx_gpcv2_irq_unmask(struct irq_data *d)
+{
+	struct imx_gpcv2_irq *cd = d->chip_data;
+	void __iomem *reg;
+	u32 val;
+
+	raw_spin_lock(&cd->rlock);
+	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
+	val = readl_relaxed(reg);
+	val &= ~(1 << d->hwirq % 32);
+	writel_relaxed(val, reg);
+	raw_spin_unlock(&cd->rlock);
+
+	irq_chip_unmask_parent(d);
+}
+
+static void imx_gpcv2_irq_mask(struct irq_data *d)
+{
+	struct imx_gpcv2_irq *cd = d->chip_data;
+	void __iomem *reg;
+	u32 val;
+
+	raw_spin_lock(&cd->rlock);
+	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
+	val = readl_relaxed(reg);
+	val |= 1 << (d->hwirq % 32);
+	writel_relaxed(val, reg);
+	raw_spin_unlock(&cd->rlock);
+
+	irq_chip_mask_parent(d);
+}
+
+
+static struct irq_chip imx_gpcv2_irq_chip = {
+	.name			= "GPCv2",
+	.irq_eoi		= irq_chip_eoi_parent,
+	.irq_mask		= imx_gpcv2_irq_mask,
+	.irq_unmask		= imx_gpcv2_irq_unmask,
+	.irq_set_wake		= imx_gpcv2_irq_set_wake,
+	.irq_retrigger		= irq_chip_retrigger_hierarchy,
+#ifdef CONFIG_SMP
+	.irq_set_affinity	= irq_chip_set_affinity_parent,
+#endif
+};
+
+static int imx_gpcv2_domain_xlate(struct irq_domain *domain,
+				struct device_node *controller,
+				const u32 *intspec,
+				unsigned int intsize,
+				unsigned long *out_hwirq,
+				unsigned int *out_type)
+{
+	/* Shouldn't happen, really... */
+	if (domain->of_node != controller)
+		return -EINVAL;
+
+	/* Not GIC compliant */
+	if (intsize != 3)
+		return -EINVAL;
+
+	/* No PPI should point to this domain */
+	if (intspec[0] != 0)
+		return -EINVAL;
+
+	*out_hwirq = intspec[1];
+	*out_type = intspec[2];
+	return 0;
+}
+
+static int imx_gpcv2_domain_alloc(struct irq_domain *domain,
+				  unsigned int irq, unsigned int nr_irqs,
+				  void *data)
+{
+	struct of_phandle_args *args = data;
+	struct of_phandle_args parent_args;
+	irq_hw_number_t hwirq;
+	int i;
+
+	/* Not GIC compliant */
+	if (args->args_count != 3)
+		return -EINVAL;
+
+	/* No PPI should point to this domain */
+	if (args->args[0] != 0)
+		return -EINVAL;
+
+	/* Can't deal with this */
+	hwirq = args->args[1];
+	if (hwirq >= GPC_MAX_IRQS)
+		return -EINVAL;
+
+	for (i = 0; i < nr_irqs; i++) {
+		irq_domain_set_hwirq_and_chip(domain, irq + i, hwirq + i,
+				&imx_gpcv2_irq_chip, domain->host_data);
+	}
+	parent_args = *args;
+	parent_args.np = domain->parent->of_node;
+	return irq_domain_alloc_irqs_parent(domain, irq, nr_irqs, &parent_args);
+}
+
+static struct irq_domain_ops imx_gpcv2_irq_domain_ops = {
+	.xlate	= imx_gpcv2_domain_xlate,
+	.alloc	= imx_gpcv2_domain_alloc,
+	.free	= irq_domain_free_irqs_common,
+};
+
+
+
+static int __init imx_gpcv2_irqchip_init(struct device_node *node,
+			       struct device_node *parent)
+{
+	struct irq_domain *parent_domain, *domain;
+	struct imx_gpcv2_irq *cd;
+	int i;
+
+	if (!parent) {
+		pr_err("%s: no parent, giving up\n", node->full_name);
+		return -ENODEV;
+	}
+
+	parent_domain = irq_find_host(parent);
+	if (!parent_domain) {
+		pr_err("%s: unable to get parent domain\n", node->full_name);
+		return -ENXIO;
+	}
+
+	cd = kzalloc(sizeof(struct imx_gpcv2_irq), GFP_KERNEL);
+
+	cd->gpc_base = of_iomap(node, 0);
+	if (!cd->gpc_base) {
+		pr_err("fsl-gpcv2: unable to map gpc registers\n");
+		kfree(cd);
+		return -ENOMEM;
+	}
+
+	domain = irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS,
+				node, &imx_gpcv2_irq_domain_ops, cd);
+	if (!domain) {
+		iounmap(cd->gpc_base);
+		kfree(cd);
+		return -ENOMEM;
+	}
+	irq_set_default_host(domain);
+
+	/* Initially mask all interrupts */
+	for (i = 0; i < IMR_NUM; i++) {
+		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE0 + i * 4);
+		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE1 + i * 4);
+		cd->wakeup_sources[i] = ~0;
+	}
+
+	/* Let CORE0 as the default CPU to wake up by GPC */
+	cd->cpu2wakeup = GPC_IMR1_CORE0;
+
+	gpcv2_irq_instance = cd;
+
+	register_syscore_ops(&imx_gpcv2_syscore_ops);
+
+	return 0;
+}
+
+
+IRQCHIP_DECLARE(imx_gpcv2, "fsl,imx7d-gpc", imx_gpcv2_irqchip_init);
+
+
diff --git a/include/soc/imx/gpcv2.h b/include/soc/imx/gpcv2.h
new file mode 100644
index 0000000..7234928
--- /dev/null
+++ b/include/soc/imx/gpcv2.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __SOC_IMX_GPCV2_H__
+#define __SOC_IMX_GPCV2_H__
+
+#define IMR_NUM		4
+
+struct imx_gpcv2_irq {
+	struct raw_spinlock rlock;
+	void __iomem *gpc_base;
+	u32 wakeup_sources[IMR_NUM];
+	u32 enabled_irqs[IMR_NUM];
+	u32 cpu2wakeup;
+};
+
+void ca7_cpu_resume(void);
+void imx7_suspend(void __iomem *ocram_vbase);
+
+#endif  /* __SOC_IMX_GPCV2_H__ */
-- 
2.5.0.rc2



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
@ 2015-07-27 19:29   ` Shenwei Wang
  0 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-27 19:29 UTC (permalink / raw)
  To: linux-arm-kernel

IMX7D contains a new version of GPC IP block (GPCv2). It has two
major functions: power management and wakeup source management.
This patch adds a new irqchip driver to manage the interrupt wakeup
sources on IMX7D.
When the system is in WFI (wait for interrupt) mode, this GPC block
will be the first block on the platform to be activated and signaled.
Under normal wait mode during cpu idle, the system can be woke up
by any enabled interrupts. Under standby or suspend mode, the system
can only be woke up by the pre-defined wakeup sources.

Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
Signed-off-by: Anson Huang <b20788@freescale.com>
---
 drivers/irqchip/Kconfig         |   7 ++
 drivers/irqchip/Makefile        |   1 +
 drivers/irqchip/irq-imx-gpcv2.c | 254 ++++++++++++++++++++++++++++++++++++++++
 include/soc/imx/gpcv2.h         |  25 ++++
 4 files changed, 287 insertions(+)
 create mode 100644 drivers/irqchip/irq-imx-gpcv2.c
 create mode 100644 include/soc/imx/gpcv2.h

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 120d815..3fc0fac 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -177,3 +177,10 @@ config RENESAS_H8300H_INTC
 config RENESAS_H8S_INTC
         bool
 	select IRQ_DOMAIN
+
+config IMX_GPCV2
+	bool
+	select IRQ_DOMAIN
+	help
+	  Enables the wakeup IRQs for IMX platforms with GPCv2 block
+
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index b8d4e96..8eb5f60 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -52,3 +52,4 @@ obj-$(CONFIG_RENESAS_H8300H_INTC)	+= irq-renesas-h8300h.o
 obj-$(CONFIG_RENESAS_H8S_INTC)		+= irq-renesas-h8s.o
 obj-$(CONFIG_ARCH_SA1100)		+= irq-sa11x0.o
 obj-$(CONFIG_INGENIC_IRQ)		+= irq-ingenic.o
+obj-$(CONFIG_IMX_GPCV2)			+= irq-imx-gpcv2.o
diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
new file mode 100644
index 0000000..3084f16
--- /dev/null
+++ b/drivers/irqchip/irq-imx-gpcv2.c
@@ -0,0 +1,254 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/slab.h>
+#include <linux/irqchip.h>
+#include <linux/syscore_ops.h>
+
+#include <soc/imx/gpcv2.h>
+
+#define GPC_MAX_IRQS            		(IMR_NUM * 32)
+
+#define GPC_IMR1_CORE0				0x30
+#define GPC_IMR1_CORE1				0x40
+
+struct imx_gpcv2_irq *gpcv2_irq_instance;
+
+static int gpcv2_wakeup_source_save(void)
+{
+	struct imx_gpcv2_irq *cd;
+	void __iomem *reg;
+	int i;
+
+	cd = gpcv2_irq_instance;
+	if (!cd)
+		return 0;
+
+	for (i = 0; i < IMR_NUM; i++) {
+		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
+		cd->enabled_irqs[i] = readl_relaxed(reg);
+		writel_relaxed(cd->wakeup_sources[i], reg);
+	}
+
+	return 0;
+}
+
+static void gpcv2_wakeup_source_restore(void)
+{
+	struct imx_gpcv2_irq *cd;
+	void __iomem *reg;
+	int i;
+
+	cd = gpcv2_irq_instance;
+	if (!cd)
+		return;
+
+	for (i = 0; i < IMR_NUM; i++) {
+		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
+		writel_relaxed(cd->enabled_irqs[i], reg);
+		cd->wakeup_sources[i] = ~0;
+	}
+}
+
+static struct syscore_ops imx_gpcv2_syscore_ops = {
+	.suspend	= gpcv2_wakeup_source_save,
+	.resume		= gpcv2_wakeup_source_restore,
+};
+
+static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int on)
+{
+	struct imx_gpcv2_irq *cd = d->chip_data;
+	unsigned int idx = d->hwirq / 32;
+	unsigned long flags;
+	void __iomem *reg;
+	u32 mask, val;
+
+	raw_spin_lock_irqsave(&cd->rlock, flags);
+	reg = cd->gpc_base + cd->cpu2wakeup + idx * 4;
+	mask = 1 << d->hwirq % 32;
+	val = cd->wakeup_sources[idx];
+
+	cd->wakeup_sources[idx] = on ? (val & ~mask) : (val | mask);
+	raw_spin_unlock_irqrestore(&cd->rlock, flags);
+
+	/*
+	 * Do *not* call into the parent, as the GIC doesn't have any
+	 * wake-up facility...
+	 */
+
+	return 0;
+}
+
+
+static void imx_gpcv2_irq_unmask(struct irq_data *d)
+{
+	struct imx_gpcv2_irq *cd = d->chip_data;
+	void __iomem *reg;
+	u32 val;
+
+	raw_spin_lock(&cd->rlock);
+	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
+	val = readl_relaxed(reg);
+	val &= ~(1 << d->hwirq % 32);
+	writel_relaxed(val, reg);
+	raw_spin_unlock(&cd->rlock);
+
+	irq_chip_unmask_parent(d);
+}
+
+static void imx_gpcv2_irq_mask(struct irq_data *d)
+{
+	struct imx_gpcv2_irq *cd = d->chip_data;
+	void __iomem *reg;
+	u32 val;
+
+	raw_spin_lock(&cd->rlock);
+	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
+	val = readl_relaxed(reg);
+	val |= 1 << (d->hwirq % 32);
+	writel_relaxed(val, reg);
+	raw_spin_unlock(&cd->rlock);
+
+	irq_chip_mask_parent(d);
+}
+
+
+static struct irq_chip imx_gpcv2_irq_chip = {
+	.name			= "GPCv2",
+	.irq_eoi		= irq_chip_eoi_parent,
+	.irq_mask		= imx_gpcv2_irq_mask,
+	.irq_unmask		= imx_gpcv2_irq_unmask,
+	.irq_set_wake		= imx_gpcv2_irq_set_wake,
+	.irq_retrigger		= irq_chip_retrigger_hierarchy,
+#ifdef CONFIG_SMP
+	.irq_set_affinity	= irq_chip_set_affinity_parent,
+#endif
+};
+
+static int imx_gpcv2_domain_xlate(struct irq_domain *domain,
+				struct device_node *controller,
+				const u32 *intspec,
+				unsigned int intsize,
+				unsigned long *out_hwirq,
+				unsigned int *out_type)
+{
+	/* Shouldn't happen, really... */
+	if (domain->of_node != controller)
+		return -EINVAL;
+
+	/* Not GIC compliant */
+	if (intsize != 3)
+		return -EINVAL;
+
+	/* No PPI should point to this domain */
+	if (intspec[0] != 0)
+		return -EINVAL;
+
+	*out_hwirq = intspec[1];
+	*out_type = intspec[2];
+	return 0;
+}
+
+static int imx_gpcv2_domain_alloc(struct irq_domain *domain,
+				  unsigned int irq, unsigned int nr_irqs,
+				  void *data)
+{
+	struct of_phandle_args *args = data;
+	struct of_phandle_args parent_args;
+	irq_hw_number_t hwirq;
+	int i;
+
+	/* Not GIC compliant */
+	if (args->args_count != 3)
+		return -EINVAL;
+
+	/* No PPI should point to this domain */
+	if (args->args[0] != 0)
+		return -EINVAL;
+
+	/* Can't deal with this */
+	hwirq = args->args[1];
+	if (hwirq >= GPC_MAX_IRQS)
+		return -EINVAL;
+
+	for (i = 0; i < nr_irqs; i++) {
+		irq_domain_set_hwirq_and_chip(domain, irq + i, hwirq + i,
+				&imx_gpcv2_irq_chip, domain->host_data);
+	}
+	parent_args = *args;
+	parent_args.np = domain->parent->of_node;
+	return irq_domain_alloc_irqs_parent(domain, irq, nr_irqs, &parent_args);
+}
+
+static struct irq_domain_ops imx_gpcv2_irq_domain_ops = {
+	.xlate	= imx_gpcv2_domain_xlate,
+	.alloc	= imx_gpcv2_domain_alloc,
+	.free	= irq_domain_free_irqs_common,
+};
+
+
+
+static int __init imx_gpcv2_irqchip_init(struct device_node *node,
+			       struct device_node *parent)
+{
+	struct irq_domain *parent_domain, *domain;
+	struct imx_gpcv2_irq *cd;
+	int i;
+
+	if (!parent) {
+		pr_err("%s: no parent, giving up\n", node->full_name);
+		return -ENODEV;
+	}
+
+	parent_domain = irq_find_host(parent);
+	if (!parent_domain) {
+		pr_err("%s: unable to get parent domain\n", node->full_name);
+		return -ENXIO;
+	}
+
+	cd = kzalloc(sizeof(struct imx_gpcv2_irq), GFP_KERNEL);
+
+	cd->gpc_base = of_iomap(node, 0);
+	if (!cd->gpc_base) {
+		pr_err("fsl-gpcv2: unable to map gpc registers\n");
+		kfree(cd);
+		return -ENOMEM;
+	}
+
+	domain = irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS,
+				node, &imx_gpcv2_irq_domain_ops, cd);
+	if (!domain) {
+		iounmap(cd->gpc_base);
+		kfree(cd);
+		return -ENOMEM;
+	}
+	irq_set_default_host(domain);
+
+	/* Initially mask all interrupts */
+	for (i = 0; i < IMR_NUM; i++) {
+		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE0 + i * 4);
+		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE1 + i * 4);
+		cd->wakeup_sources[i] = ~0;
+	}
+
+	/* Let CORE0 as the default CPU to wake up by GPC */
+	cd->cpu2wakeup = GPC_IMR1_CORE0;
+
+	gpcv2_irq_instance = cd;
+
+	register_syscore_ops(&imx_gpcv2_syscore_ops);
+
+	return 0;
+}
+
+
+IRQCHIP_DECLARE(imx_gpcv2, "fsl,imx7d-gpc", imx_gpcv2_irqchip_init);
+
+
diff --git a/include/soc/imx/gpcv2.h b/include/soc/imx/gpcv2.h
new file mode 100644
index 0000000..7234928
--- /dev/null
+++ b/include/soc/imx/gpcv2.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __SOC_IMX_GPCV2_H__
+#define __SOC_IMX_GPCV2_H__
+
+#define IMR_NUM		4
+
+struct imx_gpcv2_irq {
+	struct raw_spinlock rlock;
+	void __iomem *gpc_base;
+	u32 wakeup_sources[IMR_NUM];
+	u32 enabled_irqs[IMR_NUM];
+	u32 cpu2wakeup;
+};
+
+void ca7_cpu_resume(void);
+void imx7_suspend(void __iomem *ocram_vbase);
+
+#endif  /* __SOC_IMX_GPCV2_H__ */
-- 
2.5.0.rc2

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D
  2015-07-27 19:29 ` Shenwei Wang
@ 2015-07-27 19:30   ` Shenwei Wang
  -1 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-27 19:30 UTC (permalink / raw)
  To: shawn.guo, tglx, jason; +Cc: linux-arm-kernel, linux-kernel, b20788

IMX7D contains a new version of GPC IP block (GPCv2). It has two
major functions: power management and wakeup source management.

GPCv2 provides low power mode control for Cortex-A7 and Cortex-M4
domains. And it can support WAIT, STOP, and DSM(Deep Sleep Mode) modes.
After configuring the GPCv2 module, the platform can enter into a
selected mode either automatically triggered by ARM WFI instruction or
manually by software. The system will exit the low power states
by the predefined wakeup sources which are managed by the gpcv2
irqchip driver.

This patch adds a new suspend driver to manage the power states on IMX7D.
It currently supports "SUSPEND_STANDBY" and "SUSPEND_MEM" states.

Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
Signed-off-by: Anson Huang <b20788@freescale.com>
---
 arch/arm/mach-imx/Kconfig        |   1 +
 arch/arm/mach-imx/Makefile       |   2 +
 arch/arm/mach-imx/pm-imx7.c      | 901 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-imx/suspend-imx7.S | 529 +++++++++++++++++++++++
 4 files changed, 1433 insertions(+)
 create mode 100644 arch/arm/mach-imx/pm-imx7.c
 create mode 100644 arch/arm/mach-imx/suspend-imx7.S

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 8ceda28..54f8553 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -562,6 +562,7 @@ config SOC_IMX7D
 	select ARM_GIC
 	select HAVE_IMX_ANATOP
 	select HAVE_IMX_MMDC
+	select IMX_GPCV2
 	help
 		This enables support for Freescale i.MX7 Dual processor.
 
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index fb689d8..ca4c566 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -88,6 +88,8 @@ obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o
 
 ifeq ($(CONFIG_SUSPEND),y)
 AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
+AFLAGS_suspend-imx7.o :=-Wa,-march=armv7-a
+obj-$(CONFIG_IMX_GPCV2)	+= suspend-imx7.o pm-imx7.o
 obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
 obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
 endif
diff --git a/arch/arm/mach-imx/pm-imx7.c b/arch/arm/mach-imx/pm-imx7.c
new file mode 100644
index 0000000..9035368
--- /dev/null
+++ b/arch/arm/mach-imx/pm-imx7.c
@@ -0,0 +1,901 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/mfd/syscon.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/regmap.h>
+#include <linux/suspend.h>
+#include <linux/slab.h>
+#include <asm/suspend.h>
+#include <asm/fncpy.h>
+
+#include <soc/imx/gpcv2.h>
+
+#define BM_LPCR_A7_AD_L2PGE			0x10000
+#define BM_LPCR_A7_AD_EN_C1_PUP			0x800
+#define BM_LPCR_A7_AD_EN_C1_IRQ_PUP		0x400
+#define BM_LPCR_A7_AD_EN_C0_PUP			0x200
+#define BM_LPCR_A7_AD_EN_C0_IRQ_PUP		0x100
+#define BM_LPCR_A7_AD_EN_PLAT_PDN		0x10
+#define BM_LPCR_A7_AD_EN_C1_PDN			0x8
+#define BM_LPCR_A7_AD_EN_C1_WFI_PDN		0x4
+#define BM_LPCR_A7_AD_EN_C0_PDN			0x2
+#define BM_LPCR_A7_AD_EN_C0_WFI_PDN		0x1
+
+#define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	0x70000000
+#define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		0x4000
+#define BM_LPCR_A7_BSC_LPM1			0xc
+#define BM_LPCR_A7_BSC_LPM0			0x3
+#define BP_LPCR_A7_BSC_LPM1			2
+#define BP_LPCR_A7_BSC_LPM0			0
+
+#define BM_LPCR_M4_MASK_DSM_TRIGGER		0x80000000
+
+#define BM_SLPCR_EN_DSM				0x80000000
+#define BM_SLPCR_RBC_EN				0x40000000
+#define BM_SLPCR_VSTBY				0x4
+#define BM_SLPCR_SBYOS				0x2
+#define BM_SLPCR_BYPASS_PMIC_READY		0x1
+
+#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK	0x80000000
+#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK	0x8000
+
+#define GPC_LPCR_A7_BSC		0x0
+#define GPC_LPCR_A7_AD		0x4
+#define GPC_LPCR_M4		0x8
+
+#define GPC_PGC_CPU_MAPPING	0xec
+#define GPC_PGC_SCU_TIMING	0x890
+
+#define GPC_SLPCR		0x14
+#define GPC_PGC_ACK_SEL_A7	0x24
+
+#define GPC_SLOT0_CFG		0xb0
+
+#define GPC_PGC_C0		0x800
+#define GPC_PGC_SCU_TIMING	0x890
+#define GPC_PGC_C1		0x840
+#define GPC_PGC_SCU		0x880
+#define GPC_PGC_FM		0xa00
+
+#define ANADIG_ARM_PLL		0x60
+#define ANADIG_DDR_PLL		0x70
+#define ANADIG_SYS_PLL		0xb0
+#define ANADIG_ENET_PLL		0xe0
+#define ANADIG_AUDIO_PLL	0xf0
+#define ANADIG_VIDEO_PLL	0x130
+
+#define MAX_SLOT_NUMBER		10
+#define A7_LPM_WAIT		0x5
+#define A7_LPM_STOP		0xa
+
+#define REG_SET			0x4
+#define REG_CLR			0x8
+
+enum gpcv2_mode {
+	WAIT_CLOCKED,
+	WAIT_UNCLOCKED,
+	WAIT_UNCLOCKED_POWER_OFF,
+	STOP_POWER_ON,
+	STOP_POWER_OFF,
+};
+
+/* GPCv2 has the following power domains, and each domain can be power-up
+ * and power-down via GPC settings.
+ *
+ * 	Core 0 of A7 power domain
+ * 	Core1 of A7 power domain
+ * 	SCU/L2 cache RAM of A7 power domain
+ * 	Fastmix and megamix power domain
+ * 	USB OTG1 PHY power domain
+ * 	USB OTG2 PHY power domain
+ * 	PCIE PHY power domain
+ * 	USB HSIC PHY power domain
+ *	Core 0 of M4 power domain
+ */
+enum gpcv2_slot {
+	CORE0_A7,
+	CORE1_A7,
+	SCU_A7,
+	FAST_MEGA_MIX,
+	MIPI_PHY,
+	PCIE_PHY,
+	USB_OTG1_PHY,
+	USB_OTG2_PHY,
+	USB_HSIC_PHY,
+	CORE0_M4,
+};
+
+struct imx_gpcv2;
+
+struct imx_gpcv2_suspend {
+	struct regmap *anatop;
+	struct regmap *imx_src;
+	u32 mfmix_mask[IMR_NUM];
+	u32 wakeupmix_mask[IMR_NUM];
+	u32 lpsrmix_mask[IMR_NUM];
+
+	void (*set_mode)(struct imx_gpcv2 *, enum gpcv2_mode mode);
+	void (*lpm_cpu_power_gate)(struct imx_gpcv2 *, u32, bool);
+	void (*lpm_plat_power_gate)(struct imx_gpcv2 *, bool);
+	void (*lpm_env_setup)(struct imx_gpcv2 *);
+	void (*lpm_env_clean)(struct imx_gpcv2 *);
+
+	void (*set_slot)(struct imx_gpcv2 *cd, u32 index,
+			enum gpcv2_slot m_core, bool mode, bool ack);
+	void (*clear_slots)(struct imx_gpcv2 *);
+	void (*lpm_enable_core)(struct imx_gpcv2 *,
+			bool enable, u32 offset);
+
+	void (*standby)(struct imx_gpcv2 *);
+	void (*suspend)(struct imx_gpcv2 *);
+
+	void (*suspend_fn_in_ocram)(void __iomem *ocram_vbase);
+	void __iomem *ocram_vbase;
+};
+
+struct imx_gpcv2 {
+	spinlock_t lock;
+	struct imx_gpcv2_irq *irqchip;
+	struct imx_gpcv2_suspend *pm;
+};
+
+extern struct imx_gpcv2_irq *gpcv2_irq_instance;
+static struct imx_gpcv2 *gpcv2_instance;
+
+static void imx_gpcv2_lpm_clear_slots(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	int i;
+
+	spin_lock_irqsave(&gpc->lock, flags);
+	for (i = 0; i < MAX_SLOT_NUMBER; i++)
+		writel_relaxed(0x0, cd->gpc_base + GPC_SLOT0_CFG + i * 0x4);
+	writel_relaxed(BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK |
+		BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK,
+		cd->gpc_base + GPC_PGC_ACK_SEL_A7);
+
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_gpcv2_lpm_enable_core(struct imx_gpcv2 *gpc,
+			bool enable, u32 offset)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+
+	spin_lock_irqsave(&gpc->lock, flags);
+	writel_relaxed(enable, cd->gpc_base + offset);
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_gpcv2_lpm_slot_setup(struct imx_gpcv2 *gpc,
+		u32 index, enum gpcv2_slot m_core, bool mode, bool ack)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	u32 val;
+
+	if (index >= MAX_SLOT_NUMBER)
+		pr_err("Invalid slot index!\n");
+
+	spin_lock_irqsave(&gpc->lock, flags);
+	/* set slot */
+	writel_relaxed((mode + 1) << (m_core * 2), cd->gpc_base +
+		GPC_SLOT0_CFG + index * 4);
+
+	if (ack) {
+		/* set ack */
+		val = readl_relaxed(cd->gpc_base + GPC_PGC_ACK_SEL_A7);
+		/* clear dummy ack */
+		val &= ~(1 << (15 + (mode ? 16 : 0)));
+		val |= 1 << (m_core + (mode ? 16 : 0));
+		writel_relaxed(val, cd->gpc_base + GPC_PGC_ACK_SEL_A7);
+	}
+
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_gpcv2_lpm_env_setup(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_suspend *pm = gpc->pm;
+
+	/* PLL and PFDs overwrite set */
+	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_SET, 1 << 20);
+	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_SET, 1 << 19);
+	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_SET, 0x1ff << 17);
+	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_SET, 1 << 13);
+	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_SET, 1 << 24);
+	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_SET, 1 << 24);
+}
+
+static void imx_gpcv2_lpm_env_clean(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_suspend *pm = gpc->pm;
+
+	/* PLL and PFDs overwrite clear */
+	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_CLR, 1 << 20);
+	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_CLR, 1 << 19);
+	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_CLR, 0x1ff << 17);
+	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_CLR, 1 << 13);
+	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_CLR, 1 << 24);
+	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_CLR, 1 << 24);
+}
+
+static void imx_gpcv2_lpm_set_mode(struct imx_gpcv2 *gpc,
+		enum gpcv2_mode mode)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	u32 val1, val2;
+
+	spin_lock_irqsave(&gpc->lock, flags);
+
+	val1 = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
+	val2 = readl_relaxed(cd->gpc_base + GPC_SLPCR);
+
+	/* all cores' LPM settings must be same */
+	val1 &= ~(BM_LPCR_A7_BSC_LPM0 | BM_LPCR_A7_BSC_LPM1);
+
+	val1 |= BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
+
+	val2 &= ~(BM_SLPCR_EN_DSM | BM_SLPCR_VSTBY | BM_SLPCR_RBC_EN |
+		BM_SLPCR_SBYOS | BM_SLPCR_BYPASS_PMIC_READY);
+	/*
+	 * GPCv2: When improper low-power sequence is used,
+	 * the SoC enters low power mode before the ARM core executes WFI.
+	 *
+	 * Software workaround:
+	 * 1) Software should trigger IRQ #32 (IOMUX) to be always pending
+	 *    by setting IOMUX_GPR1_IRQ.
+	 * 2) Software should then unmask IRQ #32 in GPC before setting GPC
+	 *    Low-Power mode.
+	 * 3) Software should mask IRQ #32 right after GPC Low-Power mode
+	 *    is set.
+	 */
+	switch (mode) {
+	case WAIT_CLOCKED:
+		break;
+	case WAIT_UNCLOCKED:
+		val1 |= A7_LPM_WAIT << BP_LPCR_A7_BSC_LPM0;
+		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
+		break;
+	case STOP_POWER_ON:
+		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
+		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
+		val2 |= BM_SLPCR_EN_DSM;
+		val2 |= BM_SLPCR_RBC_EN;
+		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
+		break;
+	case STOP_POWER_OFF:
+		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
+		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
+		val2 |= BM_SLPCR_EN_DSM;
+		val2 |= BM_SLPCR_RBC_EN;
+		val2 |= BM_SLPCR_SBYOS;
+		val2 |= BM_SLPCR_VSTBY;
+		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
+		break;
+	default:
+		return;
+	}
+	writel_relaxed(val1, cd->gpc_base + GPC_LPCR_A7_BSC);
+	writel_relaxed(val2, cd->gpc_base + GPC_SLPCR);
+
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+
+static void imx_gpcv2_lpm_cpu_power_gate(struct imx_gpcv2 *gpc,
+				u32 cpu, bool pdn)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	u32 val;
+
+	const u32 val_pdn[2] = {
+		BM_LPCR_A7_AD_EN_C0_PDN | BM_LPCR_A7_AD_EN_C0_PUP,
+		BM_LPCR_A7_AD_EN_C1_PDN | BM_LPCR_A7_AD_EN_C1_PUP,
+	};
+
+	spin_lock_irqsave(&gpc->lock, flags);
+
+	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
+	if (pdn)
+		val |= val_pdn[cpu];
+	else
+		val &= ~val_pdn[cpu];
+
+	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_lpm_plat_power_gate(struct imx_gpcv2 *gpc, bool pdn)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	u32 val;
+
+	spin_lock_irqsave(&gpc->lock, flags);
+	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
+	val &= ~(BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE);
+	if (pdn)
+		val |= BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE;
+
+	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_gpcv2_lpm_standby(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_suspend *pm = gpc->pm;
+
+	pm->lpm_env_setup(gpc);
+	/* pm->set_mode(gpc, STOP_POWER_OFF); */
+	pm->set_mode(gpc, WAIT_UNCLOCKED);
+
+	pr_debug("[GPCv2] %s %d\r\n", __func__, __LINE__);
+	/* Zzz ... */
+	cpu_do_idle();
+
+	pm->set_mode(gpc, WAIT_CLOCKED);
+	pm->lpm_env_clean(gpc);
+}
+
+
+
+static int gpcv2_suspend_finish(unsigned long val)
+{
+	struct imx_gpcv2_suspend *pm = (struct imx_gpcv2_suspend *)val;
+
+	if (!pm->suspend_fn_in_ocram) {
+		cpu_do_idle();
+	} else {
+		/*
+		 * call low level suspend function in ocram,
+		 * as we need to float DDR IO.
+		 */
+		local_flush_tlb_all();
+		pm->suspend_fn_in_ocram(pm->ocram_vbase);
+	}
+
+	return 0;
+}
+static void imx_gpcv2_lpm_suspend(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_suspend *pm = gpc->pm;
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	int i = 0;
+
+	pm->lpm_env_setup(gpc);
+	pm->set_mode(gpc, STOP_POWER_OFF);
+
+	/* enable core0 power down/up with low power mode */
+	pm->lpm_cpu_power_gate(gpc, 0, true);
+
+	/* enable plat power down with low power mode */
+	pm->lpm_plat_power_gate(gpc, true);
+
+	/*
+	 * To avoid confuse, we use slot 0~4 for power down,
+	 * slot 5~9 for power up.
+	 *
+	 * Power down slot sequence:
+	 * Slot0 -> CORE0
+	 * Slot1 -> Mega/Fast MIX
+	 * Slot2 -> SCU
+	 *
+	 * Power up slot sequence:
+	 * Slot5 -> Mega/Fast MIX
+	 * Slot6 -> SCU
+	 * Slot7 -> CORE0
+	 */
+	pm->set_slot(gpc, 0, CORE0_A7, false, false);
+	pm->set_slot(gpc, 2, SCU_A7, false, true);
+
+	for (i = 0; i < IMR_NUM; i++) {
+		if ((~cd->wakeup_sources[i] & pm->mfmix_mask[i]) != 0)
+			break;
+
+		pm->set_slot(gpc, 1, FAST_MEGA_MIX, false, false);
+		pm->set_slot(gpc, 5, FAST_MEGA_MIX, true, false);
+		pm->lpm_enable_core(gpc, true, GPC_PGC_FM);
+		break;
+	}
+
+	pm->set_slot(gpc, 6, SCU_A7, true, false);
+	pm->set_slot(gpc, 7, CORE0_A7, true, true);
+
+	/* enable core0, scu */
+	pm->lpm_enable_core(gpc, true, GPC_PGC_C0);
+	pm->lpm_enable_core(gpc, true, GPC_PGC_SCU);
+
+	/* Suspend to MEM has not been implemented yet */
+	cpu_suspend((unsigned long)pm, gpcv2_suspend_finish);
+
+	pm->lpm_env_clean(gpc);
+	pm->set_mode(gpc, WAIT_CLOCKED);
+	pm->lpm_cpu_power_gate(gpc, 0, false);
+	pm->lpm_plat_power_gate(gpc, false);
+
+	pm->lpm_enable_core(gpc, false, GPC_PGC_C0);
+	pm->lpm_enable_core(gpc, false, GPC_PGC_SCU);
+	pm->lpm_enable_core(gpc, false, GPC_PGC_FM);
+	pm->clear_slots(gpc);
+}
+
+static int imx_gpcv2_pm_enter(suspend_state_t state)
+{
+	struct imx_gpcv2_suspend *pm;
+
+	BUG_ON(!gpcv2_instance);
+	pm = gpcv2_instance->pm;
+
+	switch (state) {
+	case PM_SUSPEND_STANDBY:
+		pm->standby(gpcv2_instance);
+		break;
+
+	case PM_SUSPEND_MEM:
+		pm->suspend(gpcv2_instance);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int imx_gpcv2_pm_valid(suspend_state_t state)
+{
+	return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;
+}
+
+
+#define MX7_MAX_DDRC_NUM		32
+#define MX7_MAX_DDRC_PHY_NUM		16
+
+#define READ_DATA_FROM_HARDWARE		0
+#define MX7_SUSPEND_OCRAM_SIZE		0x1000
+
+struct imx7_pm_base {
+	phys_addr_t pbase;
+	void __iomem *vbase;
+};
+
+struct imx7_pm_socdata {
+	u32 ddr_type;
+	const char *ddrc_compat;
+	const char *ddrc_phy_compat;
+	const char *src_compat;
+	const char *iomuxc_gpr_compat;
+	const char *ccm_compat;
+	const char *gpc_compat;
+	const char *anatop_compat;
+	const u32 ddrc_num;
+	const u32 (*ddrc_offset)[2];
+	const u32 ddrc_phy_num;
+	const u32 (*ddrc_phy_offset)[2];
+};
+
+/*
+ * This structure is for passing necessary data for low level ocram
+ * suspend code(arch/arm/mach-imx/suspend-imx7.S), if this struct
+ * definition is changed, the offset definition in
+ * arch/arm/mach-imx/suspend-imx7.S must be also changed accordingly,
+ * otherwise, the suspend to ocram function will be broken!
+ */
+struct imx7_cpu_pm_info {
+	u32 m4_reserve0;
+	u32 m4_reserve1;
+	u32 m4_reserve2;
+
+	/* The physical address of pm_info. */
+	phys_addr_t pbase;
+
+	/* The physical resume address for asm code */
+	phys_addr_t resume_addr;
+	u32 ddr_type;
+
+	u32 pm_info_size;
+
+	struct imx7_pm_base ddrc_base;
+	struct imx7_pm_base ddrc_phy_base;
+	struct imx7_pm_base src_base;
+	struct imx7_pm_base iomuxc_gpr_base;
+	struct imx7_pm_base ccm_base;
+	struct imx7_pm_base gpc_base;
+	struct imx7_pm_base l2_base;
+	struct imx7_pm_base anatop_base;
+
+	u32 ttbr1;
+
+	/* Number of DDRC which need saved/restored. */
+	u32 ddrc_num;
+
+	/* To save offset and value */
+	u32 ddrc_val[MX7_MAX_DDRC_NUM][2];
+
+	/* Number of DDRC which need saved/restored. */
+	u32 ddrc_phy_num;
+
+	/* To save offset and value */
+	u32 ddrc_phy_val[MX7_MAX_DDRC_NUM][2];
+} __aligned(8);
+
+static int __init imx_get_base_from_node(struct device_node *node,
+			struct imx7_pm_base *base)
+{
+	struct resource res;
+	int ret = 0;
+
+	ret = of_address_to_resource(node, 0, &res);
+	if (ret)
+		goto put_node;
+
+	base->pbase = res.start;
+	base->vbase = ioremap(res.start, resource_size(&res));
+	if (!base->vbase) {
+		iounmap(base->vbase);
+		ret = -ENOMEM;
+	}
+put_node:
+	of_node_put(node);
+
+	return ret;
+}
+
+static int __init imx_get_base_from_dt(struct imx7_pm_base *base,
+				const char *compat)
+{
+	struct device_node *node;
+	struct resource res;
+	int ret = 0;
+
+	node = of_find_compatible_node(NULL, NULL, compat);
+	if (!node) {
+		ret = -ENODEV;
+		goto out;
+	}
+
+	ret = of_address_to_resource(node, 0, &res);
+	if (ret)
+		goto put_node;
+
+	base->pbase = res.start;
+	base->vbase = ioremap(res.start, resource_size(&res));
+	if (!base->vbase)
+		ret = -ENOMEM;
+
+put_node:
+	of_node_put(node);
+out:
+	return ret;
+}
+
+static int __init imx_get_exec_base_from_dt(struct imx7_pm_base *base,
+				const char *compat)
+{
+	struct device_node *node;
+	struct resource res;
+	int ret = 0;
+
+	node = of_find_compatible_node(NULL, NULL, compat);
+	if (!node) {
+		ret = -ENODEV;
+		goto out;
+	}
+
+	ret = of_address_to_resource(node, 0, &res);
+	if (ret)
+		goto put_node;
+
+	base->pbase = res.start;
+	base->vbase = __arm_ioremap_exec(res.start, resource_size(&res), false);
+
+	if (!base->vbase)
+		ret = -ENOMEM;
+
+put_node:
+	of_node_put(node);
+out:
+	return ret;
+}
+
+static const u32 imx7d_ddrc_ddr3_setting[][2] __initconst = {
+	{ 0x0, READ_DATA_FROM_HARDWARE },
+	{ 0x1a0, READ_DATA_FROM_HARDWARE },
+	{ 0x1a4, READ_DATA_FROM_HARDWARE },
+	{ 0x1a8, READ_DATA_FROM_HARDWARE },
+	{ 0x64, READ_DATA_FROM_HARDWARE },
+	{ 0x490, 0x00000001 },
+	{ 0xd0, 0xc0020001 },
+	{ 0xd4, READ_DATA_FROM_HARDWARE },
+	{ 0xdc, READ_DATA_FROM_HARDWARE },
+	{ 0xe0, READ_DATA_FROM_HARDWARE },
+	{ 0xe4, READ_DATA_FROM_HARDWARE },
+	{ 0xf4, READ_DATA_FROM_HARDWARE },
+	{ 0x100, READ_DATA_FROM_HARDWARE },
+	{ 0x104, READ_DATA_FROM_HARDWARE },
+	{ 0x108, READ_DATA_FROM_HARDWARE },
+	{ 0x10c, READ_DATA_FROM_HARDWARE },
+	{ 0x110, READ_DATA_FROM_HARDWARE },
+	{ 0x114, READ_DATA_FROM_HARDWARE },
+	{ 0x120, 0x03030803 },
+	{ 0x180, READ_DATA_FROM_HARDWARE },
+	{ 0x190, READ_DATA_FROM_HARDWARE },
+	{ 0x194, READ_DATA_FROM_HARDWARE },
+	{ 0x200, READ_DATA_FROM_HARDWARE },
+	{ 0x204, READ_DATA_FROM_HARDWARE },
+	{ 0x214, READ_DATA_FROM_HARDWARE },
+	{ 0x218, READ_DATA_FROM_HARDWARE },
+	{ 0x240, 0x06000601 },
+	{ 0x244, READ_DATA_FROM_HARDWARE },
+};
+
+static const u32 imx7d_ddrc_phy_ddr3_setting[][2] __initconst = {
+	{ 0x0, READ_DATA_FROM_HARDWARE },
+	{ 0x4, READ_DATA_FROM_HARDWARE },
+	{ 0x10, READ_DATA_FROM_HARDWARE },
+	{ 0x9c, READ_DATA_FROM_HARDWARE },
+	{ 0x20, READ_DATA_FROM_HARDWARE },
+	{ 0x30, READ_DATA_FROM_HARDWARE },
+	{ 0x50, 0x01000010 },
+	{ 0x50, 0x00000010 },
+	{ 0xc0, 0x0e407304 },
+	{ 0xc0, 0x0e447304 },
+	{ 0xc0, 0x0e447306 },
+	{ 0xc0, 0x0e447304 },
+	{ 0xc0, 0x0e407306 },
+};
+
+static const struct imx7_pm_socdata imx7d_pm_data_ddr3 __initconst = {
+	.iomuxc_gpr_compat = "fsl,imx7d-iomuxc",
+	.ddrc_phy_compat = "fsl,imx7d-ddrc-phy",
+	.anatop_compat = "fsl,imx7d-anatop",
+	.ddrc_compat = "fsl,imx7d-ddrc",
+	.ccm_compat = "fsl,imx7d-ccm",
+	.src_compat = "fsl,imx7d-src",
+	.gpc_compat = "fsl,imx7d-gpc",
+	.ddrc_phy_num = ARRAY_SIZE(imx7d_ddrc_phy_ddr3_setting),
+	.ddrc_phy_offset = imx7d_ddrc_phy_ddr3_setting,
+	.ddrc_num = ARRAY_SIZE(imx7d_ddrc_ddr3_setting),
+	.ddrc_offset = imx7d_ddrc_ddr3_setting,
+};
+
+static int __init imx_gpcv2_suspend_init(struct imx_gpcv2_suspend *pm,
+			const struct imx7_pm_socdata *socdata)
+{
+	struct imx7_pm_base aips_base[3] = { {0, 0}, {0, 0}, {0, 0} };
+	struct imx7_pm_base sram_base = {0, 0};
+	struct imx7_cpu_pm_info *pm_info;
+	struct device_node *node;
+	int i, ret = 0;
+
+	const u32 (*ddrc_phy_offset_array)[2];
+	const u32 (*ddrc_offset_array)[2];
+
+	if (!socdata || !pm) {
+		pr_warn("%s: invalid argument!\n", __func__);
+		return -EINVAL;
+	}
+
+	node = NULL;
+	for (i = 0; i < 3; i++) {
+		node = of_find_compatible_node(node, NULL, "fsl,aips-bus");
+		if (!node) {
+			pr_warn("%s: failed to find aips %d node!\n",
+					__func__, i);
+			break;
+		}
+		ret = imx_get_base_from_node(node, &aips_base[i]);
+		if (ret) {
+			pr_warn("%s: failed to get aips[%d] base %d!\n",
+					__func__, i, ret);
+		}
+	}
+
+	ret = imx_get_exec_base_from_dt(&sram_base, "fsl,lpm-sram");
+	if (ret) {
+		pr_warn("%s: failed to get lpm-sram base %d!\n",
+				__func__, ret);
+		goto lpm_sram_map_failed;
+	}
+
+	pm_info = sram_base.vbase;
+	pm_info->pbase = sram_base.pbase;
+	pm_info->resume_addr = virt_to_phys(ca7_cpu_resume);
+	pm_info->pm_info_size = sizeof(*pm_info);
+
+	ret = imx_get_base_from_dt(&pm_info->ccm_base, socdata->ccm_compat);
+	if (ret) {
+		pr_warn("%s: failed to get ccm base %d!\n", __func__, ret);
+		goto ccm_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->ddrc_base, socdata->ddrc_compat);
+	if (ret) {
+		pr_warn("%s: failed to get ddrc base %d!\n", __func__, ret);
+		goto ddrc_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->ddrc_phy_base,
+				socdata->ddrc_phy_compat);
+	if (ret) {
+		pr_warn("%s: failed to get ddrc_phy base %d!\n", __func__, ret);
+		goto ddrc_phy_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->src_base, socdata->src_compat);
+	if (ret) {
+		pr_warn("%s: failed to get src base %d!\n", __func__, ret);
+		goto src_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->iomuxc_gpr_base,
+				socdata->iomuxc_gpr_compat);
+	if (ret) {
+		pr_warn("%s: failed to get iomuxc_gpr base %d!\n",
+					__func__, ret);
+		goto iomuxc_gpr_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->gpc_base, socdata->gpc_compat);
+	if (ret) {
+		pr_warn("%s: failed to get gpc base %d!\n", __func__, ret);
+		goto gpc_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->anatop_base,
+				socdata->anatop_compat);
+	if (ret) {
+		pr_warn("%s: failed to get anatop base %d!\n", __func__, ret);
+		goto anatop_map_failed;
+	}
+
+	pm_info->ddrc_num = socdata->ddrc_num;
+	ddrc_offset_array = socdata->ddrc_offset;
+	pm_info->ddrc_phy_num = socdata->ddrc_phy_num;
+	ddrc_phy_offset_array = socdata->ddrc_phy_offset;
+
+	/* initialize DDRC settings */
+	for (i = 0; i < pm_info->ddrc_num; i++) {
+		pm_info->ddrc_val[i][0] = ddrc_offset_array[i][0];
+		if (ddrc_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
+			pm_info->ddrc_val[i][1] =
+				readl_relaxed(pm_info->ddrc_base.vbase +
+				ddrc_offset_array[i][0]);
+		else
+			pm_info->ddrc_val[i][1] = ddrc_offset_array[i][1];
+	}
+
+	/* initialize DDRC PHY settings */
+	for (i = 0; i < pm_info->ddrc_phy_num; i++) {
+		pm_info->ddrc_phy_val[i][0] =
+			ddrc_phy_offset_array[i][0];
+		if (ddrc_phy_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
+			pm_info->ddrc_phy_val[i][1] =
+				readl_relaxed(pm_info->ddrc_phy_base.vbase +
+				ddrc_phy_offset_array[i][0]);
+		else
+			pm_info->ddrc_phy_val[i][1] =
+				ddrc_phy_offset_array[i][1];
+	}
+
+	pm->suspend_fn_in_ocram = fncpy(
+		sram_base.vbase + sizeof(*pm_info),
+		&imx7_suspend,
+		MX7_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));
+	pm->ocram_vbase = sram_base.vbase;
+
+	goto put_node;
+
+anatop_map_failed:
+	iounmap(pm_info->anatop_base.vbase);
+gpc_map_failed:
+	iounmap(pm_info->gpc_base.vbase);
+iomuxc_gpr_map_failed:
+	iounmap(pm_info->iomuxc_gpr_base.vbase);
+src_map_failed:
+	iounmap(pm_info->src_base.vbase);
+ddrc_phy_map_failed:
+	iounmap(pm_info->ddrc_phy_base.vbase);
+ddrc_map_failed:
+	iounmap(pm_info->ddrc_base.vbase);
+ccm_map_failed:
+	iounmap(pm_info->ccm_base.vbase);
+lpm_sram_map_failed:
+	iounmap(sram_base.vbase);
+put_node:
+	of_node_put(node);
+
+	return ret;
+}
+
+static const struct platform_suspend_ops imx_gpcv2_pm_ops = {
+	.enter = imx_gpcv2_pm_enter,
+	.valid = imx_gpcv2_pm_valid,
+};
+
+static int __init imx_gpcv2_pm_init(void)
+{
+	struct imx_gpcv2_suspend *pm;
+	struct imx_gpcv2_irq *cd;
+	struct imx_gpcv2 *gpc;
+	int val;
+
+	pm = kzalloc(sizeof(struct imx_gpcv2_suspend), GFP_KERNEL);
+	gpc = kzalloc(sizeof(struct imx_gpcv2), GFP_KERNEL);
+	cd = gpcv2_irq_instance;
+
+	if (!cd || !pm || !gpc) {
+		pr_debug("[GPCv2] %s init failed\r\n", __func__);
+		return 0;
+	}
+
+	imx_gpcv2_suspend_init(pm, &imx7d_pm_data_ddr3);
+
+	pm->lpm_env_setup = imx_gpcv2_lpm_env_setup;
+	pm->lpm_env_clean = imx_gpcv2_lpm_env_clean;
+
+	pm->lpm_cpu_power_gate = imx_gpcv2_lpm_cpu_power_gate;
+	pm->lpm_plat_power_gate = imx_lpm_plat_power_gate;
+	pm->lpm_enable_core = imx_gpcv2_lpm_enable_core;
+	pm->set_mode = imx_gpcv2_lpm_set_mode;
+
+	pm->clear_slots = imx_gpcv2_lpm_clear_slots;
+	pm->set_slot = imx_gpcv2_lpm_slot_setup;
+
+	pm->standby = imx_gpcv2_lpm_standby;
+	pm->suspend = imx_gpcv2_lpm_suspend;
+
+	pr_debug("[GPCv2] %s \r\n", __func__);
+	pm->anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
+	WARN_ON(!pm->anatop);
+	pm->imx_src = syscon_regmap_lookup_by_compatible("fsl,imx7d-src");
+	WARN_ON(!pm->imx_src);
+
+	/*
+	 * Due to hardware design failure, need to make sure GPR
+	 * interrupt(#32) is unmasked during RUN mode to avoid entering
+	 * DSM by mistake.
+	 */
+	writel_relaxed(~0x1, cd->gpc_base + cd->cpu2wakeup);
+
+	/* only external IRQs to wake up LPM and core 0/1 */
+	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
+	val |= BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP;
+	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_BSC);
+	/* mask m4 dsm trigger */
+	writel_relaxed(readl_relaxed(cd->gpc_base + GPC_LPCR_M4) |
+		BM_LPCR_M4_MASK_DSM_TRIGGER, cd->gpc_base + GPC_LPCR_M4);
+	/* set mega/fast mix in A7 domain */
+	writel_relaxed(0x1, cd->gpc_base + GPC_PGC_CPU_MAPPING);
+	/* set SCU timing */
+	writel_relaxed((0x59 << 10) | 0x5B | (0x51 << 20),
+		cd->gpc_base + GPC_PGC_SCU_TIMING);
+
+	/* Mask the wakeup sources in M/F power domain */
+	pm->mfmix_mask[0] = 0x54010000;
+	pm->mfmix_mask[1] = 0xc00;
+	pm->mfmix_mask[2] = 0x0;
+	pm->mfmix_mask[3] = 0x400010;
+
+	gpc->pm = pm;
+	gpc->irqchip = cd;
+	gpcv2_instance = gpc;
+
+	suspend_set_ops(&imx_gpcv2_pm_ops);
+
+	return 0;
+}
+
+device_initcall(imx_gpcv2_pm_init);
+
diff --git a/arch/arm/mach-imx/suspend-imx7.S b/arch/arm/mach-imx/suspend-imx7.S
new file mode 100644
index 0000000..8c3f516
--- /dev/null
+++ b/arch/arm/mach-imx/suspend-imx7.S
@@ -0,0 +1,529 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/linkage.h>
+#include <asm/asm-offsets.h>
+#include "hardware.h"
+
+/*
+ * ==================== low level suspend ====================
+ *
+ * Better to follow below rules to use ARM registers:
+ * r0: pm_info structure address;
+ * r1 ~ r4: for saving pm_info members;
+ * r5 ~ r10: free registers;
+ * r11: io base address.
+ *
+ * suspend ocram space layout:
+ * ======================== high address ======================
+ *                              .
+ *                              .
+ *                              .
+ *                              ^
+ *                              ^
+ *                              ^
+ *                      imx7_suspend code
+ *              PM_INFO structure(imx7_cpu_pm_info)
+ * ======================== low address =======================
+ */
+
+/*
+ * Below offsets are based on struct imx7_cpu_pm_info
+ * which defined in arch/arm/mach-imx/pm-imx7.c, this
+ * structure contains necessary pm info for low level
+ * suspend related code.
+ */
+#define PM_INFO_M4_RESERVE0_OFFSET		0x0
+#define PM_INFO_M4_RESERVE1_OFFSET		0x4
+#define PM_INFO_M4_RESERVE2_OFFSET		0x8
+#define PM_INFO_PBASE_OFFSET			0xc
+#define PM_INFO_RESUME_ADDR_OFFSET		0x10
+#define PM_INFO_DDR_TYPE_OFFSET			0x14
+#define PM_INFO_PM_INFO_SIZE_OFFSET		0x18
+#define PM_INFO_MX7_DDRC_P_OFFSET		0x1c
+#define PM_INFO_MX7_DDRC_V_OFFSET		0x20
+#define PM_INFO_MX7_DDRC_PHY_P_OFFSET		0x24
+#define PM_INFO_MX7_DDRC_PHY_V_OFFSET		0x28
+#define PM_INFO_MX7_SRC_P_OFFSET		0x2c
+#define PM_INFO_MX7_SRC_V_OFFSET		0x30
+#define PM_INFO_MX7_IOMUXC_GPR_P_OFFSET		0x34
+#define PM_INFO_MX7_IOMUXC_GPR_V_OFFSET		0x38
+#define PM_INFO_MX7_CCM_P_OFFSET		0x3c
+#define PM_INFO_MX7_CCM_V_OFFSET		0x40
+#define PM_INFO_MX7_GPC_P_OFFSET		0x44
+#define PM_INFO_MX7_GPC_V_OFFSET		0x48
+#define PM_INFO_MX7_L2_P_OFFSET			0x4c
+#define PM_INFO_MX7_L2_V_OFFSET			0x50
+#define PM_INFO_MX7_ANATOP_P_OFFSET		0x54
+#define PM_INFO_MX7_ANATOP_V_OFFSET		0x58
+#define PM_INFO_MX7_TTBR1_V_OFFSET		0x5c
+#define PM_INFO_DDRC_REG_NUM_OFFSET		0x60
+#define PM_INFO_DDRC_REG_OFFSET			0x64
+#define PM_INFO_DDRC_VALUE_OFFSET		0x68
+#define PM_INFO_DDRC_PHY_REG_NUM_OFFSET		0x164
+#define PM_INFO_DDRC_PHY_REG_OFFSET		0x168
+#define PM_INFO_DDRC_PHY_VALUE_OFFSET		0x16c
+
+#define MX7_SRC_GPR1	0x74
+#define MX7_SRC_GPR2	0x78
+#define GPC_PGC_FM	0xa00
+#define ANADIG_SNVS_MISC_CTRL	0x380
+#define DDRC_STAT	0x4
+#define DDRC_PWRCTL	0x30
+#define DDRC_PSTAT	0x3fc
+#define DDRC_PCTRL_0	0x490
+#define DDRC_DFIMISC	0x1b0
+#define DDRC_SWCTL	0x320
+#define DDRC_SWSTAT	0x324
+#define DDRPHY_LP_CON0	0x18
+
+	.align 3
+
+	.macro	disable_l1_dcache
+
+	/*
+	 * Flush all data from the L1 data cache before disabling
+	 * SCTLR.C bit.
+	 */
+	push	{r0 - r10, lr}
+	ldr	r7, =v7_flush_dcache_all
+	mov	lr, pc
+	mov	pc, r7
+	pop	{r0 - r10, lr}
+
+	/* disable d-cache */
+	mrc	p15, 0, r7, c1, c0, 0
+	bic	r7, r7, #(1 << 2)
+	mcr	p15, 0, r7, c1, c0, 0
+	dsb
+	isb
+
+	push	{r0 - r10, lr}
+	ldr	r7, =v7_flush_dcache_all
+	mov	lr, pc
+	mov	pc, r7
+	pop	{r0 - r10, lr}
+
+	.endm
+
+
+	.macro enable_l1_dcache
+
+	/* Enable L1 data cache. */
+	mrc	p15, 0, r6, c1, c0, 0
+	orr	r6, r6, #0x4
+	mcr	p15, 0, r6, c1, c0, 0
+
+	dsb
+	isb
+
+	.endm
+
+
+	.macro ddrc_enter_self_refresh
+
+	ldr	r11, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+
+	/* let DDR out of self-refresh */
+	ldr	r7, =0x0
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* wait rw port_busy clear */
+	ldr	r6, =(0x1 << 16)
+	orr	r6, r6, #0x1
+1:
+	ldr	r7, [r11, #DDRC_PSTAT]
+	ands	r7, r7, r6
+	bne	1b
+
+	/* enter self-refresh bit 5 */
+	ldr	r7, =(0x1 << 5)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* wait until self-refresh mode entered */
+2:
+	ldr	r7, [r11, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x3
+	bne	2b
+3:
+	ldr	r7, [r11, #DDRC_STAT]
+	ands	r7, r7, #0x20
+	beq	3b
+
+	/* disable dram clk */
+	ldr	r7, [r11, #DDRC_PWRCTL]
+	orr	r7, r7, #(1 << 3)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	.endm
+
+	.macro ddrc_exit_self_refresh
+
+	cmp	r5, #0x0
+	ldreq	r11, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+	ldrne	r11, [r0, #PM_INFO_MX7_DDRC_P_OFFSET]
+
+	/* let DDR out of self-refresh */
+	ldr	r7, =0x0
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* wait until self-refresh mode entered */
+4:
+	ldr	r7, [r11, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x3
+	beq	4b
+
+	/* enable auto self-refresh */
+	ldr	r7, [r11, #DDRC_PWRCTL]
+	orr	r7, r7, #(1 << 0)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	.endm
+
+	.macro wait_delay
+5:
+	subs	r6, r6, #0x1
+	bne	5b
+
+	.endm
+
+	.macro ddr_enter_retention
+
+	ldr	r11, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+
+	/* let DDR out of self-refresh */
+	ldr	r7, =0x0
+	str	r7, [r11, #DDRC_PCTRL_0]
+
+	/* wait rw port_busy clear */
+	ldr	r6, =(0x1 << 16)
+	orr	r6, r6, #0x1
+6:
+	ldr	r7, [r11, #DDRC_PSTAT]
+	ands	r7, r7, r6
+	bne	6b
+
+	ldr	r11, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+	/* enter self-refresh bit 5 */
+	ldr	r7, =(0x1 << 5)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* wait until self-refresh mode entered */
+7:
+	ldr	r7, [r11, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x3
+	bne	7b
+8:
+	ldr	r7, [r11, #DDRC_STAT]
+	ands	r7, r7, #0x20
+	beq	8b
+
+	/* disable dram clk */
+	ldr	r7, =(0x1 << 5)
+	orr	r7, r7, #(1 << 3)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* reset ddr_phy  */
+	ldr	r11, [r0, #PM_INFO_MX7_ANATOP_V_OFFSET]
+	ldr	r7, =0x0
+	str	r7, [r11, #ANADIG_SNVS_MISC_CTRL]
+
+	/* delay 7 us */
+	ldr	r6, =6000
+	wait_delay
+
+	ldr	r11, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	ldr	r6, =0x1000
+	ldr	r7, [r11, r6]
+	orr	r7, r7, #0x1
+	str	r7, [r11, r6]
+	/* turn off ddr power */
+	ldr	r11, [r0, #PM_INFO_MX7_ANATOP_V_OFFSET]
+	ldr	r7, =(0x1 << 29)
+	str	r7, [r11, #ANADIG_SNVS_MISC_CTRL]
+
+	.endm
+
+	.macro ddr_exit_retention
+
+	cmp	r5, #0x0
+	ldreq	r1, [r0, #PM_INFO_MX7_ANATOP_V_OFFSET]
+	ldrne	r1, [r0, #PM_INFO_MX7_ANATOP_P_OFFSET]
+	ldreq	r2, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	ldrne	r2, [r0, #PM_INFO_MX7_SRC_P_OFFSET]
+	ldreq	r3, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+	ldrne	r3, [r0, #PM_INFO_MX7_DDRC_P_OFFSET]
+	ldreq	r4, [r0, #PM_INFO_MX7_DDRC_PHY_V_OFFSET]
+	ldrne	r4, [r0, #PM_INFO_MX7_DDRC_PHY_P_OFFSET]
+	ldreq	r10, [r0, #PM_INFO_MX7_CCM_V_OFFSET]
+	ldrne	r10, [r0, #PM_INFO_MX7_CCM_P_OFFSET]
+	ldreq	r11, [r0, #PM_INFO_MX7_IOMUXC_GPR_V_OFFSET]
+	ldrne	r11, [r0, #PM_INFO_MX7_IOMUXC_GPR_P_OFFSET]
+
+	/* turn on ddr power */
+	ldr	r7, =(0x1 << 29)
+	str	r7, [r1, #ANADIG_SNVS_MISC_CTRL]
+
+	ldr	r6, =50
+	wait_delay
+
+	ldr	r7, =0x0
+	str	r7, [r1, #ANADIG_SNVS_MISC_CTRL]
+
+	/* clear ddr_phy reset */
+	ldr	r6, =0x1000
+	ldr	r7, [r2, r6]
+	orr	r7, r7, #0x3
+	str	r7, [r2, r6]
+	ldr	r7, [r2, r6]
+	bic	r7, r7, #0x1
+	str	r7, [r2, r6]
+
+	ldr	r6, [r0, #PM_INFO_DDRC_REG_NUM_OFFSET]
+	ldr	r7, =PM_INFO_DDRC_REG_OFFSET
+	add	r7, r7, r0
+9:
+	ldr	r8, [r7], #0x4
+	ldr	r9, [r7], #0x4
+	str	r9, [r3, r8]
+	subs	r6, r6, #0x1
+	bne	9b
+	ldr	r7, =0x20
+	str	r7, [r3, #DDRC_PWRCTL]
+	ldr	r7, =0x0
+	str	r7, [r3, #DDRC_DFIMISC]
+
+	/* do PHY, clear ddr_phy reset */
+	ldr	r6, =0x1000
+	ldr	r7, [r2, r6]
+	bic	r7, r7, #0x2
+	str	r7, [r2, r6]
+
+	ldr	r7, =(0x1 << 30)
+	str	r7, [r1, #ANADIG_SNVS_MISC_CTRL]
+
+	/* need to delay ~5mS */
+	ldr	r6, =0x100000
+	wait_delay
+
+	ldr	r6, [r0, #PM_INFO_DDRC_PHY_REG_NUM_OFFSET]
+	ldr	r7, =PM_INFO_DDRC_PHY_REG_OFFSET
+	add	r7, r7, r0
+
+10:
+	ldr	r8, [r7], #0x4
+	ldr	r9, [r7], #0x4
+	str	r9, [r4, r8]
+	subs	r6, r6, #0x1
+	bne	10b
+
+	ldr	r7, =0x0
+	add	r9, r10, #0x4000
+	str	r7, [r9, #0x130]
+
+	cmp	r5, #0x0
+	beq	101f
+	ldr	r7, =0x170
+	orr	r7, r7, #0x8
+	str	r7, [r11, #0x20]
+
+101:
+	ldr	r7, =0x2
+	add	r9, r10, #0x4000
+	str	r7, [r9, #0x130]
+
+	ldr	r7, =0xf
+	str	r7, [r4, #DDRPHY_LP_CON0]
+
+	/* wait until self-refresh mode entered */
+11:
+	ldr	r7, [r3, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x3
+	bne	11b
+	ldr	r7, =0x0
+	str	r7, [r3, #DDRC_SWCTL]
+	ldr	r7, =0x1
+	str	r7, [r3, #DDRC_DFIMISC]
+	ldr	r7, =0x1
+	str	r7, [r3, #DDRC_SWCTL]
+12:
+	ldr	r7, [r3, #DDRC_SWSTAT]
+	and	r7, r7, #0x1
+	cmp	r7, #0x1
+	bne	12b
+13:
+	ldr	r7, [r3, #DDRC_STAT]
+	and	r7, r7, #0x20
+	cmp	r7, #0x20
+	bne	13b
+
+	/* let DDR out of self-refresh */
+	ldr	r7, =0x0
+	str	r7, [r3, #DDRC_PWRCTL]
+14:
+	ldr	r7, [r3, #DDRC_STAT]
+	and	r7, r7, #0x30
+	cmp	r7, #0x0
+	bne	14b
+
+15:
+	ldr	r7, [r3, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x1
+	bne	15b
+
+	/* enable port */
+	ldr	r7, =0x1
+	str	r7, [r3, #DDRC_PCTRL_0]
+
+	.endm
+
+ENTRY(imx7_suspend)
+	push	{r4-r12}
+
+	/*
+	 * The value of r0 is mapped the same in origin table and IRAM table,
+	 * thus no need to care r0 here.
+	 */
+	ldr	r1, [r0, #PM_INFO_PBASE_OFFSET]
+	ldr	r2, [r0, #PM_INFO_RESUME_ADDR_OFFSET]
+	ldr	r3, [r0, #PM_INFO_DDR_TYPE_OFFSET]
+	ldr	r4, [r0, #PM_INFO_PM_INFO_SIZE_OFFSET]
+
+	/*
+	 * counting the resume address in iram
+	 * to set it in SRC register.
+	 */
+	ldr	r6, =imx7_suspend
+	ldr	r7, =resume
+	sub	r7, r7, r6
+	add	r8, r1, r4
+	add	r9, r8, r7
+
+	ldr	r11, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	/* store physical resume addr and pm_info address. */
+	str	r9, [r11, #MX7_SRC_GPR1]
+	str	r1, [r11, #MX7_SRC_GPR2]
+
+	disable_l1_dcache
+
+	/*
+	 * make sure TLB contain the addr we want,
+	 * as we will access them after DDR is in
+	 * self-refresh mode.
+	 */
+	ldr	r6, [r0, #PM_INFO_MX7_IOMUXC_GPR_V_OFFSET]
+	ldr	r7, [r0, #0x0]
+	ldr	r6, [r0, #PM_INFO_MX7_CCM_V_OFFSET]
+	add	r6, #0x4000
+	ldr	r7, [r6]
+	ldr	r6, [r0, #PM_INFO_MX7_ANATOP_V_OFFSET]
+	ldr	r7, [r6, #0x0]
+	ldr	r6, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	ldr	r7, [r6, #0x0]
+	add	r6, #0x1000
+	ldr	r7, [r6]
+	ldr	r6, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+	ldr	r7, [r6, #0x0]
+	ldr	r7, [r6, #0x490]
+	ldr	r6, [r0, #PM_INFO_MX7_DDRC_PHY_V_OFFSET]
+	ldr	r7, [r6, #0x0]
+
+	ldr	r11, [r0, #PM_INFO_MX7_GPC_V_OFFSET]
+	ldr	r7, [r11, #GPC_PGC_FM]
+	cmp	r7, #0
+	beq	ddr_only_self_refresh
+
+	ddr_enter_retention
+	b	ddr_retention_enter_out
+ddr_only_self_refresh:
+	ddrc_enter_self_refresh
+ddr_retention_enter_out:
+
+	/* Zzz, enter stop mode */
+	wfi
+	nop
+	nop
+	nop
+	nop
+
+	mov	r5, #0x0
+
+	ldr	r11, [r0, #PM_INFO_MX7_GPC_V_OFFSET]
+	ldr	r7, [r11, #GPC_PGC_FM]
+	cmp	r7, #0
+	beq	wfi_ddr_self_refresh_out
+
+	ddr_exit_retention
+	b	wfi_ddr_retention_out
+wfi_ddr_self_refresh_out:
+	ddrc_exit_self_refresh
+wfi_ddr_retention_out:
+
+	ldr	r11, [r0, #PM_INFO_MX7_IOMUXC_GPR_V_OFFSET]
+	ldr	r7, =0x170
+	orr	r7, r7, #0x8
+	str	r7, [r11, #0x20]
+
+	/* clear core0's entry and parameter */
+	ldr	r11, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	mov	r7, #0x0
+	str	r7, [r11, #MX7_SRC_GPR1]
+	str	r7, [r11, #MX7_SRC_GPR2]
+
+	enable_l1_dcache
+
+	pop	{r4-r12}
+	/* return to suspend finish */
+	mov	pc, lr
+
+resume:
+	/* invalidate L1 I-cache first */
+	mov     r6, #0x0
+	mcr     p15, 0, r6, c7, c5, 0
+	mcr     p15, 0, r6, c7, c5, 6
+	/* enable the Icache and branch prediction */
+	mov     r6, #0x1800
+	mcr     p15, 0, r6, c1, c0, 0
+	isb
+
+	/* get physical resume address from pm_info. */
+	ldr	lr, [r0, #PM_INFO_RESUME_ADDR_OFFSET]
+	/* clear core0's entry and parameter */
+	ldr	r11, [r0, #PM_INFO_MX7_SRC_P_OFFSET]
+	mov	r7, #0x0
+	str	r7, [r11, #MX7_SRC_GPR1]
+	str	r7, [r11, #MX7_SRC_GPR2]
+
+	mov	r5, #0x1
+
+	ldr	r11, [r0, #PM_INFO_MX7_GPC_P_OFFSET]
+	ldr	r7, [r11, #GPC_PGC_FM]
+	cmp	r7, #0
+	beq	dsm_ddr_self_refresh_out
+
+	ddr_exit_retention
+	b	dsm_ddr_retention_out
+dsm_ddr_self_refresh_out:
+	ddrc_exit_self_refresh
+dsm_ddr_retention_out:
+
+	mov	pc, lr
+ENDPROC(imx7_suspend)
+
+ENTRY(ca7_cpu_resume)
+	bl	v7_invalidate_l1
+	b	cpu_resume
+ENDPROC(ca7_cpu_resume)
-- 
2.5.0.rc2



^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D
@ 2015-07-27 19:30   ` Shenwei Wang
  0 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-27 19:30 UTC (permalink / raw)
  To: linux-arm-kernel

IMX7D contains a new version of GPC IP block (GPCv2). It has two
major functions: power management and wakeup source management.

GPCv2 provides low power mode control for Cortex-A7 and Cortex-M4
domains. And it can support WAIT, STOP, and DSM(Deep Sleep Mode) modes.
After configuring the GPCv2 module, the platform can enter into a
selected mode either automatically triggered by ARM WFI instruction or
manually by software. The system will exit the low power states
by the predefined wakeup sources which are managed by the gpcv2
irqchip driver.

This patch adds a new suspend driver to manage the power states on IMX7D.
It currently supports "SUSPEND_STANDBY" and "SUSPEND_MEM" states.

Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
Signed-off-by: Anson Huang <b20788@freescale.com>
---
 arch/arm/mach-imx/Kconfig        |   1 +
 arch/arm/mach-imx/Makefile       |   2 +
 arch/arm/mach-imx/pm-imx7.c      | 901 +++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-imx/suspend-imx7.S | 529 +++++++++++++++++++++++
 4 files changed, 1433 insertions(+)
 create mode 100644 arch/arm/mach-imx/pm-imx7.c
 create mode 100644 arch/arm/mach-imx/suspend-imx7.S

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 8ceda28..54f8553 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -562,6 +562,7 @@ config SOC_IMX7D
 	select ARM_GIC
 	select HAVE_IMX_ANATOP
 	select HAVE_IMX_MMDC
+	select IMX_GPCV2
 	help
 		This enables support for Freescale i.MX7 Dual processor.
 
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index fb689d8..ca4c566 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -88,6 +88,8 @@ obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o
 
 ifeq ($(CONFIG_SUSPEND),y)
 AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
+AFLAGS_suspend-imx7.o :=-Wa,-march=armv7-a
+obj-$(CONFIG_IMX_GPCV2)	+= suspend-imx7.o pm-imx7.o
 obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
 obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
 endif
diff --git a/arch/arm/mach-imx/pm-imx7.c b/arch/arm/mach-imx/pm-imx7.c
new file mode 100644
index 0000000..9035368
--- /dev/null
+++ b/arch/arm/mach-imx/pm-imx7.c
@@ -0,0 +1,901 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/mfd/syscon.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/regmap.h>
+#include <linux/suspend.h>
+#include <linux/slab.h>
+#include <asm/suspend.h>
+#include <asm/fncpy.h>
+
+#include <soc/imx/gpcv2.h>
+
+#define BM_LPCR_A7_AD_L2PGE			0x10000
+#define BM_LPCR_A7_AD_EN_C1_PUP			0x800
+#define BM_LPCR_A7_AD_EN_C1_IRQ_PUP		0x400
+#define BM_LPCR_A7_AD_EN_C0_PUP			0x200
+#define BM_LPCR_A7_AD_EN_C0_IRQ_PUP		0x100
+#define BM_LPCR_A7_AD_EN_PLAT_PDN		0x10
+#define BM_LPCR_A7_AD_EN_C1_PDN			0x8
+#define BM_LPCR_A7_AD_EN_C1_WFI_PDN		0x4
+#define BM_LPCR_A7_AD_EN_C0_PDN			0x2
+#define BM_LPCR_A7_AD_EN_C0_WFI_PDN		0x1
+
+#define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	0x70000000
+#define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		0x4000
+#define BM_LPCR_A7_BSC_LPM1			0xc
+#define BM_LPCR_A7_BSC_LPM0			0x3
+#define BP_LPCR_A7_BSC_LPM1			2
+#define BP_LPCR_A7_BSC_LPM0			0
+
+#define BM_LPCR_M4_MASK_DSM_TRIGGER		0x80000000
+
+#define BM_SLPCR_EN_DSM				0x80000000
+#define BM_SLPCR_RBC_EN				0x40000000
+#define BM_SLPCR_VSTBY				0x4
+#define BM_SLPCR_SBYOS				0x2
+#define BM_SLPCR_BYPASS_PMIC_READY		0x1
+
+#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK	0x80000000
+#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK	0x8000
+
+#define GPC_LPCR_A7_BSC		0x0
+#define GPC_LPCR_A7_AD		0x4
+#define GPC_LPCR_M4		0x8
+
+#define GPC_PGC_CPU_MAPPING	0xec
+#define GPC_PGC_SCU_TIMING	0x890
+
+#define GPC_SLPCR		0x14
+#define GPC_PGC_ACK_SEL_A7	0x24
+
+#define GPC_SLOT0_CFG		0xb0
+
+#define GPC_PGC_C0		0x800
+#define GPC_PGC_SCU_TIMING	0x890
+#define GPC_PGC_C1		0x840
+#define GPC_PGC_SCU		0x880
+#define GPC_PGC_FM		0xa00
+
+#define ANADIG_ARM_PLL		0x60
+#define ANADIG_DDR_PLL		0x70
+#define ANADIG_SYS_PLL		0xb0
+#define ANADIG_ENET_PLL		0xe0
+#define ANADIG_AUDIO_PLL	0xf0
+#define ANADIG_VIDEO_PLL	0x130
+
+#define MAX_SLOT_NUMBER		10
+#define A7_LPM_WAIT		0x5
+#define A7_LPM_STOP		0xa
+
+#define REG_SET			0x4
+#define REG_CLR			0x8
+
+enum gpcv2_mode {
+	WAIT_CLOCKED,
+	WAIT_UNCLOCKED,
+	WAIT_UNCLOCKED_POWER_OFF,
+	STOP_POWER_ON,
+	STOP_POWER_OFF,
+};
+
+/* GPCv2 has the following power domains, and each domain can be power-up
+ * and power-down via GPC settings.
+ *
+ * 	Core 0 of A7 power domain
+ * 	Core1 of A7 power domain
+ * 	SCU/L2 cache RAM of A7 power domain
+ * 	Fastmix and megamix power domain
+ * 	USB OTG1 PHY power domain
+ * 	USB OTG2 PHY power domain
+ * 	PCIE PHY power domain
+ * 	USB HSIC PHY power domain
+ *	Core 0 of M4 power domain
+ */
+enum gpcv2_slot {
+	CORE0_A7,
+	CORE1_A7,
+	SCU_A7,
+	FAST_MEGA_MIX,
+	MIPI_PHY,
+	PCIE_PHY,
+	USB_OTG1_PHY,
+	USB_OTG2_PHY,
+	USB_HSIC_PHY,
+	CORE0_M4,
+};
+
+struct imx_gpcv2;
+
+struct imx_gpcv2_suspend {
+	struct regmap *anatop;
+	struct regmap *imx_src;
+	u32 mfmix_mask[IMR_NUM];
+	u32 wakeupmix_mask[IMR_NUM];
+	u32 lpsrmix_mask[IMR_NUM];
+
+	void (*set_mode)(struct imx_gpcv2 *, enum gpcv2_mode mode);
+	void (*lpm_cpu_power_gate)(struct imx_gpcv2 *, u32, bool);
+	void (*lpm_plat_power_gate)(struct imx_gpcv2 *, bool);
+	void (*lpm_env_setup)(struct imx_gpcv2 *);
+	void (*lpm_env_clean)(struct imx_gpcv2 *);
+
+	void (*set_slot)(struct imx_gpcv2 *cd, u32 index,
+			enum gpcv2_slot m_core, bool mode, bool ack);
+	void (*clear_slots)(struct imx_gpcv2 *);
+	void (*lpm_enable_core)(struct imx_gpcv2 *,
+			bool enable, u32 offset);
+
+	void (*standby)(struct imx_gpcv2 *);
+	void (*suspend)(struct imx_gpcv2 *);
+
+	void (*suspend_fn_in_ocram)(void __iomem *ocram_vbase);
+	void __iomem *ocram_vbase;
+};
+
+struct imx_gpcv2 {
+	spinlock_t lock;
+	struct imx_gpcv2_irq *irqchip;
+	struct imx_gpcv2_suspend *pm;
+};
+
+extern struct imx_gpcv2_irq *gpcv2_irq_instance;
+static struct imx_gpcv2 *gpcv2_instance;
+
+static void imx_gpcv2_lpm_clear_slots(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	int i;
+
+	spin_lock_irqsave(&gpc->lock, flags);
+	for (i = 0; i < MAX_SLOT_NUMBER; i++)
+		writel_relaxed(0x0, cd->gpc_base + GPC_SLOT0_CFG + i * 0x4);
+	writel_relaxed(BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK |
+		BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK,
+		cd->gpc_base + GPC_PGC_ACK_SEL_A7);
+
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_gpcv2_lpm_enable_core(struct imx_gpcv2 *gpc,
+			bool enable, u32 offset)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+
+	spin_lock_irqsave(&gpc->lock, flags);
+	writel_relaxed(enable, cd->gpc_base + offset);
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_gpcv2_lpm_slot_setup(struct imx_gpcv2 *gpc,
+		u32 index, enum gpcv2_slot m_core, bool mode, bool ack)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	u32 val;
+
+	if (index >= MAX_SLOT_NUMBER)
+		pr_err("Invalid slot index!\n");
+
+	spin_lock_irqsave(&gpc->lock, flags);
+	/* set slot */
+	writel_relaxed((mode + 1) << (m_core * 2), cd->gpc_base +
+		GPC_SLOT0_CFG + index * 4);
+
+	if (ack) {
+		/* set ack */
+		val = readl_relaxed(cd->gpc_base + GPC_PGC_ACK_SEL_A7);
+		/* clear dummy ack */
+		val &= ~(1 << (15 + (mode ? 16 : 0)));
+		val |= 1 << (m_core + (mode ? 16 : 0));
+		writel_relaxed(val, cd->gpc_base + GPC_PGC_ACK_SEL_A7);
+	}
+
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_gpcv2_lpm_env_setup(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_suspend *pm = gpc->pm;
+
+	/* PLL and PFDs overwrite set */
+	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_SET, 1 << 20);
+	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_SET, 1 << 19);
+	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_SET, 0x1ff << 17);
+	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_SET, 1 << 13);
+	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_SET, 1 << 24);
+	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_SET, 1 << 24);
+}
+
+static void imx_gpcv2_lpm_env_clean(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_suspend *pm = gpc->pm;
+
+	/* PLL and PFDs overwrite clear */
+	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_CLR, 1 << 20);
+	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_CLR, 1 << 19);
+	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_CLR, 0x1ff << 17);
+	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_CLR, 1 << 13);
+	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_CLR, 1 << 24);
+	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_CLR, 1 << 24);
+}
+
+static void imx_gpcv2_lpm_set_mode(struct imx_gpcv2 *gpc,
+		enum gpcv2_mode mode)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	u32 val1, val2;
+
+	spin_lock_irqsave(&gpc->lock, flags);
+
+	val1 = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
+	val2 = readl_relaxed(cd->gpc_base + GPC_SLPCR);
+
+	/* all cores' LPM settings must be same */
+	val1 &= ~(BM_LPCR_A7_BSC_LPM0 | BM_LPCR_A7_BSC_LPM1);
+
+	val1 |= BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
+
+	val2 &= ~(BM_SLPCR_EN_DSM | BM_SLPCR_VSTBY | BM_SLPCR_RBC_EN |
+		BM_SLPCR_SBYOS | BM_SLPCR_BYPASS_PMIC_READY);
+	/*
+	 * GPCv2: When improper low-power sequence is used,
+	 * the SoC enters low power mode before the ARM core executes WFI.
+	 *
+	 * Software workaround:
+	 * 1) Software should trigger IRQ #32 (IOMUX) to be always pending
+	 *    by setting IOMUX_GPR1_IRQ.
+	 * 2) Software should then unmask IRQ #32 in GPC before setting GPC
+	 *    Low-Power mode.
+	 * 3) Software should mask IRQ #32 right after GPC Low-Power mode
+	 *    is set.
+	 */
+	switch (mode) {
+	case WAIT_CLOCKED:
+		break;
+	case WAIT_UNCLOCKED:
+		val1 |= A7_LPM_WAIT << BP_LPCR_A7_BSC_LPM0;
+		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
+		break;
+	case STOP_POWER_ON:
+		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
+		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
+		val2 |= BM_SLPCR_EN_DSM;
+		val2 |= BM_SLPCR_RBC_EN;
+		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
+		break;
+	case STOP_POWER_OFF:
+		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
+		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
+		val2 |= BM_SLPCR_EN_DSM;
+		val2 |= BM_SLPCR_RBC_EN;
+		val2 |= BM_SLPCR_SBYOS;
+		val2 |= BM_SLPCR_VSTBY;
+		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
+		break;
+	default:
+		return;
+	}
+	writel_relaxed(val1, cd->gpc_base + GPC_LPCR_A7_BSC);
+	writel_relaxed(val2, cd->gpc_base + GPC_SLPCR);
+
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+
+static void imx_gpcv2_lpm_cpu_power_gate(struct imx_gpcv2 *gpc,
+				u32 cpu, bool pdn)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	u32 val;
+
+	const u32 val_pdn[2] = {
+		BM_LPCR_A7_AD_EN_C0_PDN | BM_LPCR_A7_AD_EN_C0_PUP,
+		BM_LPCR_A7_AD_EN_C1_PDN | BM_LPCR_A7_AD_EN_C1_PUP,
+	};
+
+	spin_lock_irqsave(&gpc->lock, flags);
+
+	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
+	if (pdn)
+		val |= val_pdn[cpu];
+	else
+		val &= ~val_pdn[cpu];
+
+	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_lpm_plat_power_gate(struct imx_gpcv2 *gpc, bool pdn)
+{
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	unsigned long flags;
+	u32 val;
+
+	spin_lock_irqsave(&gpc->lock, flags);
+	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
+	val &= ~(BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE);
+	if (pdn)
+		val |= BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE;
+
+	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
+	spin_unlock_irqrestore(&gpc->lock, flags);
+}
+
+static void imx_gpcv2_lpm_standby(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_suspend *pm = gpc->pm;
+
+	pm->lpm_env_setup(gpc);
+	/* pm->set_mode(gpc, STOP_POWER_OFF); */
+	pm->set_mode(gpc, WAIT_UNCLOCKED);
+
+	pr_debug("[GPCv2] %s %d\r\n", __func__, __LINE__);
+	/* Zzz ... */
+	cpu_do_idle();
+
+	pm->set_mode(gpc, WAIT_CLOCKED);
+	pm->lpm_env_clean(gpc);
+}
+
+
+
+static int gpcv2_suspend_finish(unsigned long val)
+{
+	struct imx_gpcv2_suspend *pm = (struct imx_gpcv2_suspend *)val;
+
+	if (!pm->suspend_fn_in_ocram) {
+		cpu_do_idle();
+	} else {
+		/*
+		 * call low level suspend function in ocram,
+		 * as we need to float DDR IO.
+		 */
+		local_flush_tlb_all();
+		pm->suspend_fn_in_ocram(pm->ocram_vbase);
+	}
+
+	return 0;
+}
+static void imx_gpcv2_lpm_suspend(struct imx_gpcv2 *gpc)
+{
+	struct imx_gpcv2_suspend *pm = gpc->pm;
+	struct imx_gpcv2_irq *cd = gpc->irqchip;
+	int i = 0;
+
+	pm->lpm_env_setup(gpc);
+	pm->set_mode(gpc, STOP_POWER_OFF);
+
+	/* enable core0 power down/up with low power mode */
+	pm->lpm_cpu_power_gate(gpc, 0, true);
+
+	/* enable plat power down with low power mode */
+	pm->lpm_plat_power_gate(gpc, true);
+
+	/*
+	 * To avoid confuse, we use slot 0~4 for power down,
+	 * slot 5~9 for power up.
+	 *
+	 * Power down slot sequence:
+	 * Slot0 -> CORE0
+	 * Slot1 -> Mega/Fast MIX
+	 * Slot2 -> SCU
+	 *
+	 * Power up slot sequence:
+	 * Slot5 -> Mega/Fast MIX
+	 * Slot6 -> SCU
+	 * Slot7 -> CORE0
+	 */
+	pm->set_slot(gpc, 0, CORE0_A7, false, false);
+	pm->set_slot(gpc, 2, SCU_A7, false, true);
+
+	for (i = 0; i < IMR_NUM; i++) {
+		if ((~cd->wakeup_sources[i] & pm->mfmix_mask[i]) != 0)
+			break;
+
+		pm->set_slot(gpc, 1, FAST_MEGA_MIX, false, false);
+		pm->set_slot(gpc, 5, FAST_MEGA_MIX, true, false);
+		pm->lpm_enable_core(gpc, true, GPC_PGC_FM);
+		break;
+	}
+
+	pm->set_slot(gpc, 6, SCU_A7, true, false);
+	pm->set_slot(gpc, 7, CORE0_A7, true, true);
+
+	/* enable core0, scu */
+	pm->lpm_enable_core(gpc, true, GPC_PGC_C0);
+	pm->lpm_enable_core(gpc, true, GPC_PGC_SCU);
+
+	/* Suspend to MEM has not been implemented yet */
+	cpu_suspend((unsigned long)pm, gpcv2_suspend_finish);
+
+	pm->lpm_env_clean(gpc);
+	pm->set_mode(gpc, WAIT_CLOCKED);
+	pm->lpm_cpu_power_gate(gpc, 0, false);
+	pm->lpm_plat_power_gate(gpc, false);
+
+	pm->lpm_enable_core(gpc, false, GPC_PGC_C0);
+	pm->lpm_enable_core(gpc, false, GPC_PGC_SCU);
+	pm->lpm_enable_core(gpc, false, GPC_PGC_FM);
+	pm->clear_slots(gpc);
+}
+
+static int imx_gpcv2_pm_enter(suspend_state_t state)
+{
+	struct imx_gpcv2_suspend *pm;
+
+	BUG_ON(!gpcv2_instance);
+	pm = gpcv2_instance->pm;
+
+	switch (state) {
+	case PM_SUSPEND_STANDBY:
+		pm->standby(gpcv2_instance);
+		break;
+
+	case PM_SUSPEND_MEM:
+		pm->suspend(gpcv2_instance);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static int imx_gpcv2_pm_valid(suspend_state_t state)
+{
+	return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;
+}
+
+
+#define MX7_MAX_DDRC_NUM		32
+#define MX7_MAX_DDRC_PHY_NUM		16
+
+#define READ_DATA_FROM_HARDWARE		0
+#define MX7_SUSPEND_OCRAM_SIZE		0x1000
+
+struct imx7_pm_base {
+	phys_addr_t pbase;
+	void __iomem *vbase;
+};
+
+struct imx7_pm_socdata {
+	u32 ddr_type;
+	const char *ddrc_compat;
+	const char *ddrc_phy_compat;
+	const char *src_compat;
+	const char *iomuxc_gpr_compat;
+	const char *ccm_compat;
+	const char *gpc_compat;
+	const char *anatop_compat;
+	const u32 ddrc_num;
+	const u32 (*ddrc_offset)[2];
+	const u32 ddrc_phy_num;
+	const u32 (*ddrc_phy_offset)[2];
+};
+
+/*
+ * This structure is for passing necessary data for low level ocram
+ * suspend code(arch/arm/mach-imx/suspend-imx7.S), if this struct
+ * definition is changed, the offset definition in
+ * arch/arm/mach-imx/suspend-imx7.S must be also changed accordingly,
+ * otherwise, the suspend to ocram function will be broken!
+ */
+struct imx7_cpu_pm_info {
+	u32 m4_reserve0;
+	u32 m4_reserve1;
+	u32 m4_reserve2;
+
+	/* The physical address of pm_info. */
+	phys_addr_t pbase;
+
+	/* The physical resume address for asm code */
+	phys_addr_t resume_addr;
+	u32 ddr_type;
+
+	u32 pm_info_size;
+
+	struct imx7_pm_base ddrc_base;
+	struct imx7_pm_base ddrc_phy_base;
+	struct imx7_pm_base src_base;
+	struct imx7_pm_base iomuxc_gpr_base;
+	struct imx7_pm_base ccm_base;
+	struct imx7_pm_base gpc_base;
+	struct imx7_pm_base l2_base;
+	struct imx7_pm_base anatop_base;
+
+	u32 ttbr1;
+
+	/* Number of DDRC which need saved/restored. */
+	u32 ddrc_num;
+
+	/* To save offset and value */
+	u32 ddrc_val[MX7_MAX_DDRC_NUM][2];
+
+	/* Number of DDRC which need saved/restored. */
+	u32 ddrc_phy_num;
+
+	/* To save offset and value */
+	u32 ddrc_phy_val[MX7_MAX_DDRC_NUM][2];
+} __aligned(8);
+
+static int __init imx_get_base_from_node(struct device_node *node,
+			struct imx7_pm_base *base)
+{
+	struct resource res;
+	int ret = 0;
+
+	ret = of_address_to_resource(node, 0, &res);
+	if (ret)
+		goto put_node;
+
+	base->pbase = res.start;
+	base->vbase = ioremap(res.start, resource_size(&res));
+	if (!base->vbase) {
+		iounmap(base->vbase);
+		ret = -ENOMEM;
+	}
+put_node:
+	of_node_put(node);
+
+	return ret;
+}
+
+static int __init imx_get_base_from_dt(struct imx7_pm_base *base,
+				const char *compat)
+{
+	struct device_node *node;
+	struct resource res;
+	int ret = 0;
+
+	node = of_find_compatible_node(NULL, NULL, compat);
+	if (!node) {
+		ret = -ENODEV;
+		goto out;
+	}
+
+	ret = of_address_to_resource(node, 0, &res);
+	if (ret)
+		goto put_node;
+
+	base->pbase = res.start;
+	base->vbase = ioremap(res.start, resource_size(&res));
+	if (!base->vbase)
+		ret = -ENOMEM;
+
+put_node:
+	of_node_put(node);
+out:
+	return ret;
+}
+
+static int __init imx_get_exec_base_from_dt(struct imx7_pm_base *base,
+				const char *compat)
+{
+	struct device_node *node;
+	struct resource res;
+	int ret = 0;
+
+	node = of_find_compatible_node(NULL, NULL, compat);
+	if (!node) {
+		ret = -ENODEV;
+		goto out;
+	}
+
+	ret = of_address_to_resource(node, 0, &res);
+	if (ret)
+		goto put_node;
+
+	base->pbase = res.start;
+	base->vbase = __arm_ioremap_exec(res.start, resource_size(&res), false);
+
+	if (!base->vbase)
+		ret = -ENOMEM;
+
+put_node:
+	of_node_put(node);
+out:
+	return ret;
+}
+
+static const u32 imx7d_ddrc_ddr3_setting[][2] __initconst = {
+	{ 0x0, READ_DATA_FROM_HARDWARE },
+	{ 0x1a0, READ_DATA_FROM_HARDWARE },
+	{ 0x1a4, READ_DATA_FROM_HARDWARE },
+	{ 0x1a8, READ_DATA_FROM_HARDWARE },
+	{ 0x64, READ_DATA_FROM_HARDWARE },
+	{ 0x490, 0x00000001 },
+	{ 0xd0, 0xc0020001 },
+	{ 0xd4, READ_DATA_FROM_HARDWARE },
+	{ 0xdc, READ_DATA_FROM_HARDWARE },
+	{ 0xe0, READ_DATA_FROM_HARDWARE },
+	{ 0xe4, READ_DATA_FROM_HARDWARE },
+	{ 0xf4, READ_DATA_FROM_HARDWARE },
+	{ 0x100, READ_DATA_FROM_HARDWARE },
+	{ 0x104, READ_DATA_FROM_HARDWARE },
+	{ 0x108, READ_DATA_FROM_HARDWARE },
+	{ 0x10c, READ_DATA_FROM_HARDWARE },
+	{ 0x110, READ_DATA_FROM_HARDWARE },
+	{ 0x114, READ_DATA_FROM_HARDWARE },
+	{ 0x120, 0x03030803 },
+	{ 0x180, READ_DATA_FROM_HARDWARE },
+	{ 0x190, READ_DATA_FROM_HARDWARE },
+	{ 0x194, READ_DATA_FROM_HARDWARE },
+	{ 0x200, READ_DATA_FROM_HARDWARE },
+	{ 0x204, READ_DATA_FROM_HARDWARE },
+	{ 0x214, READ_DATA_FROM_HARDWARE },
+	{ 0x218, READ_DATA_FROM_HARDWARE },
+	{ 0x240, 0x06000601 },
+	{ 0x244, READ_DATA_FROM_HARDWARE },
+};
+
+static const u32 imx7d_ddrc_phy_ddr3_setting[][2] __initconst = {
+	{ 0x0, READ_DATA_FROM_HARDWARE },
+	{ 0x4, READ_DATA_FROM_HARDWARE },
+	{ 0x10, READ_DATA_FROM_HARDWARE },
+	{ 0x9c, READ_DATA_FROM_HARDWARE },
+	{ 0x20, READ_DATA_FROM_HARDWARE },
+	{ 0x30, READ_DATA_FROM_HARDWARE },
+	{ 0x50, 0x01000010 },
+	{ 0x50, 0x00000010 },
+	{ 0xc0, 0x0e407304 },
+	{ 0xc0, 0x0e447304 },
+	{ 0xc0, 0x0e447306 },
+	{ 0xc0, 0x0e447304 },
+	{ 0xc0, 0x0e407306 },
+};
+
+static const struct imx7_pm_socdata imx7d_pm_data_ddr3 __initconst = {
+	.iomuxc_gpr_compat = "fsl,imx7d-iomuxc",
+	.ddrc_phy_compat = "fsl,imx7d-ddrc-phy",
+	.anatop_compat = "fsl,imx7d-anatop",
+	.ddrc_compat = "fsl,imx7d-ddrc",
+	.ccm_compat = "fsl,imx7d-ccm",
+	.src_compat = "fsl,imx7d-src",
+	.gpc_compat = "fsl,imx7d-gpc",
+	.ddrc_phy_num = ARRAY_SIZE(imx7d_ddrc_phy_ddr3_setting),
+	.ddrc_phy_offset = imx7d_ddrc_phy_ddr3_setting,
+	.ddrc_num = ARRAY_SIZE(imx7d_ddrc_ddr3_setting),
+	.ddrc_offset = imx7d_ddrc_ddr3_setting,
+};
+
+static int __init imx_gpcv2_suspend_init(struct imx_gpcv2_suspend *pm,
+			const struct imx7_pm_socdata *socdata)
+{
+	struct imx7_pm_base aips_base[3] = { {0, 0}, {0, 0}, {0, 0} };
+	struct imx7_pm_base sram_base = {0, 0};
+	struct imx7_cpu_pm_info *pm_info;
+	struct device_node *node;
+	int i, ret = 0;
+
+	const u32 (*ddrc_phy_offset_array)[2];
+	const u32 (*ddrc_offset_array)[2];
+
+	if (!socdata || !pm) {
+		pr_warn("%s: invalid argument!\n", __func__);
+		return -EINVAL;
+	}
+
+	node = NULL;
+	for (i = 0; i < 3; i++) {
+		node = of_find_compatible_node(node, NULL, "fsl,aips-bus");
+		if (!node) {
+			pr_warn("%s: failed to find aips %d node!\n",
+					__func__, i);
+			break;
+		}
+		ret = imx_get_base_from_node(node, &aips_base[i]);
+		if (ret) {
+			pr_warn("%s: failed to get aips[%d] base %d!\n",
+					__func__, i, ret);
+		}
+	}
+
+	ret = imx_get_exec_base_from_dt(&sram_base, "fsl,lpm-sram");
+	if (ret) {
+		pr_warn("%s: failed to get lpm-sram base %d!\n",
+				__func__, ret);
+		goto lpm_sram_map_failed;
+	}
+
+	pm_info = sram_base.vbase;
+	pm_info->pbase = sram_base.pbase;
+	pm_info->resume_addr = virt_to_phys(ca7_cpu_resume);
+	pm_info->pm_info_size = sizeof(*pm_info);
+
+	ret = imx_get_base_from_dt(&pm_info->ccm_base, socdata->ccm_compat);
+	if (ret) {
+		pr_warn("%s: failed to get ccm base %d!\n", __func__, ret);
+		goto ccm_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->ddrc_base, socdata->ddrc_compat);
+	if (ret) {
+		pr_warn("%s: failed to get ddrc base %d!\n", __func__, ret);
+		goto ddrc_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->ddrc_phy_base,
+				socdata->ddrc_phy_compat);
+	if (ret) {
+		pr_warn("%s: failed to get ddrc_phy base %d!\n", __func__, ret);
+		goto ddrc_phy_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->src_base, socdata->src_compat);
+	if (ret) {
+		pr_warn("%s: failed to get src base %d!\n", __func__, ret);
+		goto src_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->iomuxc_gpr_base,
+				socdata->iomuxc_gpr_compat);
+	if (ret) {
+		pr_warn("%s: failed to get iomuxc_gpr base %d!\n",
+					__func__, ret);
+		goto iomuxc_gpr_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->gpc_base, socdata->gpc_compat);
+	if (ret) {
+		pr_warn("%s: failed to get gpc base %d!\n", __func__, ret);
+		goto gpc_map_failed;
+	}
+
+	ret = imx_get_base_from_dt(&pm_info->anatop_base,
+				socdata->anatop_compat);
+	if (ret) {
+		pr_warn("%s: failed to get anatop base %d!\n", __func__, ret);
+		goto anatop_map_failed;
+	}
+
+	pm_info->ddrc_num = socdata->ddrc_num;
+	ddrc_offset_array = socdata->ddrc_offset;
+	pm_info->ddrc_phy_num = socdata->ddrc_phy_num;
+	ddrc_phy_offset_array = socdata->ddrc_phy_offset;
+
+	/* initialize DDRC settings */
+	for (i = 0; i < pm_info->ddrc_num; i++) {
+		pm_info->ddrc_val[i][0] = ddrc_offset_array[i][0];
+		if (ddrc_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
+			pm_info->ddrc_val[i][1] =
+				readl_relaxed(pm_info->ddrc_base.vbase +
+				ddrc_offset_array[i][0]);
+		else
+			pm_info->ddrc_val[i][1] = ddrc_offset_array[i][1];
+	}
+
+	/* initialize DDRC PHY settings */
+	for (i = 0; i < pm_info->ddrc_phy_num; i++) {
+		pm_info->ddrc_phy_val[i][0] =
+			ddrc_phy_offset_array[i][0];
+		if (ddrc_phy_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
+			pm_info->ddrc_phy_val[i][1] =
+				readl_relaxed(pm_info->ddrc_phy_base.vbase +
+				ddrc_phy_offset_array[i][0]);
+		else
+			pm_info->ddrc_phy_val[i][1] =
+				ddrc_phy_offset_array[i][1];
+	}
+
+	pm->suspend_fn_in_ocram = fncpy(
+		sram_base.vbase + sizeof(*pm_info),
+		&imx7_suspend,
+		MX7_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));
+	pm->ocram_vbase = sram_base.vbase;
+
+	goto put_node;
+
+anatop_map_failed:
+	iounmap(pm_info->anatop_base.vbase);
+gpc_map_failed:
+	iounmap(pm_info->gpc_base.vbase);
+iomuxc_gpr_map_failed:
+	iounmap(pm_info->iomuxc_gpr_base.vbase);
+src_map_failed:
+	iounmap(pm_info->src_base.vbase);
+ddrc_phy_map_failed:
+	iounmap(pm_info->ddrc_phy_base.vbase);
+ddrc_map_failed:
+	iounmap(pm_info->ddrc_base.vbase);
+ccm_map_failed:
+	iounmap(pm_info->ccm_base.vbase);
+lpm_sram_map_failed:
+	iounmap(sram_base.vbase);
+put_node:
+	of_node_put(node);
+
+	return ret;
+}
+
+static const struct platform_suspend_ops imx_gpcv2_pm_ops = {
+	.enter = imx_gpcv2_pm_enter,
+	.valid = imx_gpcv2_pm_valid,
+};
+
+static int __init imx_gpcv2_pm_init(void)
+{
+	struct imx_gpcv2_suspend *pm;
+	struct imx_gpcv2_irq *cd;
+	struct imx_gpcv2 *gpc;
+	int val;
+
+	pm = kzalloc(sizeof(struct imx_gpcv2_suspend), GFP_KERNEL);
+	gpc = kzalloc(sizeof(struct imx_gpcv2), GFP_KERNEL);
+	cd = gpcv2_irq_instance;
+
+	if (!cd || !pm || !gpc) {
+		pr_debug("[GPCv2] %s init failed\r\n", __func__);
+		return 0;
+	}
+
+	imx_gpcv2_suspend_init(pm, &imx7d_pm_data_ddr3);
+
+	pm->lpm_env_setup = imx_gpcv2_lpm_env_setup;
+	pm->lpm_env_clean = imx_gpcv2_lpm_env_clean;
+
+	pm->lpm_cpu_power_gate = imx_gpcv2_lpm_cpu_power_gate;
+	pm->lpm_plat_power_gate = imx_lpm_plat_power_gate;
+	pm->lpm_enable_core = imx_gpcv2_lpm_enable_core;
+	pm->set_mode = imx_gpcv2_lpm_set_mode;
+
+	pm->clear_slots = imx_gpcv2_lpm_clear_slots;
+	pm->set_slot = imx_gpcv2_lpm_slot_setup;
+
+	pm->standby = imx_gpcv2_lpm_standby;
+	pm->suspend = imx_gpcv2_lpm_suspend;
+
+	pr_debug("[GPCv2] %s \r\n", __func__);
+	pm->anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
+	WARN_ON(!pm->anatop);
+	pm->imx_src = syscon_regmap_lookup_by_compatible("fsl,imx7d-src");
+	WARN_ON(!pm->imx_src);
+
+	/*
+	 * Due to hardware design failure, need to make sure GPR
+	 * interrupt(#32) is unmasked during RUN mode to avoid entering
+	 * DSM by mistake.
+	 */
+	writel_relaxed(~0x1, cd->gpc_base + cd->cpu2wakeup);
+
+	/* only external IRQs to wake up LPM and core 0/1 */
+	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
+	val |= BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP;
+	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_BSC);
+	/* mask m4 dsm trigger */
+	writel_relaxed(readl_relaxed(cd->gpc_base + GPC_LPCR_M4) |
+		BM_LPCR_M4_MASK_DSM_TRIGGER, cd->gpc_base + GPC_LPCR_M4);
+	/* set mega/fast mix in A7 domain */
+	writel_relaxed(0x1, cd->gpc_base + GPC_PGC_CPU_MAPPING);
+	/* set SCU timing */
+	writel_relaxed((0x59 << 10) | 0x5B | (0x51 << 20),
+		cd->gpc_base + GPC_PGC_SCU_TIMING);
+
+	/* Mask the wakeup sources in M/F power domain */
+	pm->mfmix_mask[0] = 0x54010000;
+	pm->mfmix_mask[1] = 0xc00;
+	pm->mfmix_mask[2] = 0x0;
+	pm->mfmix_mask[3] = 0x400010;
+
+	gpc->pm = pm;
+	gpc->irqchip = cd;
+	gpcv2_instance = gpc;
+
+	suspend_set_ops(&imx_gpcv2_pm_ops);
+
+	return 0;
+}
+
+device_initcall(imx_gpcv2_pm_init);
+
diff --git a/arch/arm/mach-imx/suspend-imx7.S b/arch/arm/mach-imx/suspend-imx7.S
new file mode 100644
index 0000000..8c3f516
--- /dev/null
+++ b/arch/arm/mach-imx/suspend-imx7.S
@@ -0,0 +1,529 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/linkage.h>
+#include <asm/asm-offsets.h>
+#include "hardware.h"
+
+/*
+ * ==================== low level suspend ====================
+ *
+ * Better to follow below rules to use ARM registers:
+ * r0: pm_info structure address;
+ * r1 ~ r4: for saving pm_info members;
+ * r5 ~ r10: free registers;
+ * r11: io base address.
+ *
+ * suspend ocram space layout:
+ * ======================== high address ======================
+ *                              .
+ *                              .
+ *                              .
+ *                              ^
+ *                              ^
+ *                              ^
+ *                      imx7_suspend code
+ *              PM_INFO structure(imx7_cpu_pm_info)
+ * ======================== low address =======================
+ */
+
+/*
+ * Below offsets are based on struct imx7_cpu_pm_info
+ * which defined in arch/arm/mach-imx/pm-imx7.c, this
+ * structure contains necessary pm info for low level
+ * suspend related code.
+ */
+#define PM_INFO_M4_RESERVE0_OFFSET		0x0
+#define PM_INFO_M4_RESERVE1_OFFSET		0x4
+#define PM_INFO_M4_RESERVE2_OFFSET		0x8
+#define PM_INFO_PBASE_OFFSET			0xc
+#define PM_INFO_RESUME_ADDR_OFFSET		0x10
+#define PM_INFO_DDR_TYPE_OFFSET			0x14
+#define PM_INFO_PM_INFO_SIZE_OFFSET		0x18
+#define PM_INFO_MX7_DDRC_P_OFFSET		0x1c
+#define PM_INFO_MX7_DDRC_V_OFFSET		0x20
+#define PM_INFO_MX7_DDRC_PHY_P_OFFSET		0x24
+#define PM_INFO_MX7_DDRC_PHY_V_OFFSET		0x28
+#define PM_INFO_MX7_SRC_P_OFFSET		0x2c
+#define PM_INFO_MX7_SRC_V_OFFSET		0x30
+#define PM_INFO_MX7_IOMUXC_GPR_P_OFFSET		0x34
+#define PM_INFO_MX7_IOMUXC_GPR_V_OFFSET		0x38
+#define PM_INFO_MX7_CCM_P_OFFSET		0x3c
+#define PM_INFO_MX7_CCM_V_OFFSET		0x40
+#define PM_INFO_MX7_GPC_P_OFFSET		0x44
+#define PM_INFO_MX7_GPC_V_OFFSET		0x48
+#define PM_INFO_MX7_L2_P_OFFSET			0x4c
+#define PM_INFO_MX7_L2_V_OFFSET			0x50
+#define PM_INFO_MX7_ANATOP_P_OFFSET		0x54
+#define PM_INFO_MX7_ANATOP_V_OFFSET		0x58
+#define PM_INFO_MX7_TTBR1_V_OFFSET		0x5c
+#define PM_INFO_DDRC_REG_NUM_OFFSET		0x60
+#define PM_INFO_DDRC_REG_OFFSET			0x64
+#define PM_INFO_DDRC_VALUE_OFFSET		0x68
+#define PM_INFO_DDRC_PHY_REG_NUM_OFFSET		0x164
+#define PM_INFO_DDRC_PHY_REG_OFFSET		0x168
+#define PM_INFO_DDRC_PHY_VALUE_OFFSET		0x16c
+
+#define MX7_SRC_GPR1	0x74
+#define MX7_SRC_GPR2	0x78
+#define GPC_PGC_FM	0xa00
+#define ANADIG_SNVS_MISC_CTRL	0x380
+#define DDRC_STAT	0x4
+#define DDRC_PWRCTL	0x30
+#define DDRC_PSTAT	0x3fc
+#define DDRC_PCTRL_0	0x490
+#define DDRC_DFIMISC	0x1b0
+#define DDRC_SWCTL	0x320
+#define DDRC_SWSTAT	0x324
+#define DDRPHY_LP_CON0	0x18
+
+	.align 3
+
+	.macro	disable_l1_dcache
+
+	/*
+	 * Flush all data from the L1 data cache before disabling
+	 * SCTLR.C bit.
+	 */
+	push	{r0 - r10, lr}
+	ldr	r7, =v7_flush_dcache_all
+	mov	lr, pc
+	mov	pc, r7
+	pop	{r0 - r10, lr}
+
+	/* disable d-cache */
+	mrc	p15, 0, r7, c1, c0, 0
+	bic	r7, r7, #(1 << 2)
+	mcr	p15, 0, r7, c1, c0, 0
+	dsb
+	isb
+
+	push	{r0 - r10, lr}
+	ldr	r7, =v7_flush_dcache_all
+	mov	lr, pc
+	mov	pc, r7
+	pop	{r0 - r10, lr}
+
+	.endm
+
+
+	.macro enable_l1_dcache
+
+	/* Enable L1 data cache. */
+	mrc	p15, 0, r6, c1, c0, 0
+	orr	r6, r6, #0x4
+	mcr	p15, 0, r6, c1, c0, 0
+
+	dsb
+	isb
+
+	.endm
+
+
+	.macro ddrc_enter_self_refresh
+
+	ldr	r11, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+
+	/* let DDR out of self-refresh */
+	ldr	r7, =0x0
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* wait rw port_busy clear */
+	ldr	r6, =(0x1 << 16)
+	orr	r6, r6, #0x1
+1:
+	ldr	r7, [r11, #DDRC_PSTAT]
+	ands	r7, r7, r6
+	bne	1b
+
+	/* enter self-refresh bit 5 */
+	ldr	r7, =(0x1 << 5)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* wait until self-refresh mode entered */
+2:
+	ldr	r7, [r11, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x3
+	bne	2b
+3:
+	ldr	r7, [r11, #DDRC_STAT]
+	ands	r7, r7, #0x20
+	beq	3b
+
+	/* disable dram clk */
+	ldr	r7, [r11, #DDRC_PWRCTL]
+	orr	r7, r7, #(1 << 3)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	.endm
+
+	.macro ddrc_exit_self_refresh
+
+	cmp	r5, #0x0
+	ldreq	r11, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+	ldrne	r11, [r0, #PM_INFO_MX7_DDRC_P_OFFSET]
+
+	/* let DDR out of self-refresh */
+	ldr	r7, =0x0
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* wait until self-refresh mode entered */
+4:
+	ldr	r7, [r11, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x3
+	beq	4b
+
+	/* enable auto self-refresh */
+	ldr	r7, [r11, #DDRC_PWRCTL]
+	orr	r7, r7, #(1 << 0)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	.endm
+
+	.macro wait_delay
+5:
+	subs	r6, r6, #0x1
+	bne	5b
+
+	.endm
+
+	.macro ddr_enter_retention
+
+	ldr	r11, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+
+	/* let DDR out of self-refresh */
+	ldr	r7, =0x0
+	str	r7, [r11, #DDRC_PCTRL_0]
+
+	/* wait rw port_busy clear */
+	ldr	r6, =(0x1 << 16)
+	orr	r6, r6, #0x1
+6:
+	ldr	r7, [r11, #DDRC_PSTAT]
+	ands	r7, r7, r6
+	bne	6b
+
+	ldr	r11, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+	/* enter self-refresh bit 5 */
+	ldr	r7, =(0x1 << 5)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* wait until self-refresh mode entered */
+7:
+	ldr	r7, [r11, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x3
+	bne	7b
+8:
+	ldr	r7, [r11, #DDRC_STAT]
+	ands	r7, r7, #0x20
+	beq	8b
+
+	/* disable dram clk */
+	ldr	r7, =(0x1 << 5)
+	orr	r7, r7, #(1 << 3)
+	str	r7, [r11, #DDRC_PWRCTL]
+
+	/* reset ddr_phy  */
+	ldr	r11, [r0, #PM_INFO_MX7_ANATOP_V_OFFSET]
+	ldr	r7, =0x0
+	str	r7, [r11, #ANADIG_SNVS_MISC_CTRL]
+
+	/* delay 7 us */
+	ldr	r6, =6000
+	wait_delay
+
+	ldr	r11, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	ldr	r6, =0x1000
+	ldr	r7, [r11, r6]
+	orr	r7, r7, #0x1
+	str	r7, [r11, r6]
+	/* turn off ddr power */
+	ldr	r11, [r0, #PM_INFO_MX7_ANATOP_V_OFFSET]
+	ldr	r7, =(0x1 << 29)
+	str	r7, [r11, #ANADIG_SNVS_MISC_CTRL]
+
+	.endm
+
+	.macro ddr_exit_retention
+
+	cmp	r5, #0x0
+	ldreq	r1, [r0, #PM_INFO_MX7_ANATOP_V_OFFSET]
+	ldrne	r1, [r0, #PM_INFO_MX7_ANATOP_P_OFFSET]
+	ldreq	r2, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	ldrne	r2, [r0, #PM_INFO_MX7_SRC_P_OFFSET]
+	ldreq	r3, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+	ldrne	r3, [r0, #PM_INFO_MX7_DDRC_P_OFFSET]
+	ldreq	r4, [r0, #PM_INFO_MX7_DDRC_PHY_V_OFFSET]
+	ldrne	r4, [r0, #PM_INFO_MX7_DDRC_PHY_P_OFFSET]
+	ldreq	r10, [r0, #PM_INFO_MX7_CCM_V_OFFSET]
+	ldrne	r10, [r0, #PM_INFO_MX7_CCM_P_OFFSET]
+	ldreq	r11, [r0, #PM_INFO_MX7_IOMUXC_GPR_V_OFFSET]
+	ldrne	r11, [r0, #PM_INFO_MX7_IOMUXC_GPR_P_OFFSET]
+
+	/* turn on ddr power */
+	ldr	r7, =(0x1 << 29)
+	str	r7, [r1, #ANADIG_SNVS_MISC_CTRL]
+
+	ldr	r6, =50
+	wait_delay
+
+	ldr	r7, =0x0
+	str	r7, [r1, #ANADIG_SNVS_MISC_CTRL]
+
+	/* clear ddr_phy reset */
+	ldr	r6, =0x1000
+	ldr	r7, [r2, r6]
+	orr	r7, r7, #0x3
+	str	r7, [r2, r6]
+	ldr	r7, [r2, r6]
+	bic	r7, r7, #0x1
+	str	r7, [r2, r6]
+
+	ldr	r6, [r0, #PM_INFO_DDRC_REG_NUM_OFFSET]
+	ldr	r7, =PM_INFO_DDRC_REG_OFFSET
+	add	r7, r7, r0
+9:
+	ldr	r8, [r7], #0x4
+	ldr	r9, [r7], #0x4
+	str	r9, [r3, r8]
+	subs	r6, r6, #0x1
+	bne	9b
+	ldr	r7, =0x20
+	str	r7, [r3, #DDRC_PWRCTL]
+	ldr	r7, =0x0
+	str	r7, [r3, #DDRC_DFIMISC]
+
+	/* do PHY, clear ddr_phy reset */
+	ldr	r6, =0x1000
+	ldr	r7, [r2, r6]
+	bic	r7, r7, #0x2
+	str	r7, [r2, r6]
+
+	ldr	r7, =(0x1 << 30)
+	str	r7, [r1, #ANADIG_SNVS_MISC_CTRL]
+
+	/* need to delay ~5mS */
+	ldr	r6, =0x100000
+	wait_delay
+
+	ldr	r6, [r0, #PM_INFO_DDRC_PHY_REG_NUM_OFFSET]
+	ldr	r7, =PM_INFO_DDRC_PHY_REG_OFFSET
+	add	r7, r7, r0
+
+10:
+	ldr	r8, [r7], #0x4
+	ldr	r9, [r7], #0x4
+	str	r9, [r4, r8]
+	subs	r6, r6, #0x1
+	bne	10b
+
+	ldr	r7, =0x0
+	add	r9, r10, #0x4000
+	str	r7, [r9, #0x130]
+
+	cmp	r5, #0x0
+	beq	101f
+	ldr	r7, =0x170
+	orr	r7, r7, #0x8
+	str	r7, [r11, #0x20]
+
+101:
+	ldr	r7, =0x2
+	add	r9, r10, #0x4000
+	str	r7, [r9, #0x130]
+
+	ldr	r7, =0xf
+	str	r7, [r4, #DDRPHY_LP_CON0]
+
+	/* wait until self-refresh mode entered */
+11:
+	ldr	r7, [r3, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x3
+	bne	11b
+	ldr	r7, =0x0
+	str	r7, [r3, #DDRC_SWCTL]
+	ldr	r7, =0x1
+	str	r7, [r3, #DDRC_DFIMISC]
+	ldr	r7, =0x1
+	str	r7, [r3, #DDRC_SWCTL]
+12:
+	ldr	r7, [r3, #DDRC_SWSTAT]
+	and	r7, r7, #0x1
+	cmp	r7, #0x1
+	bne	12b
+13:
+	ldr	r7, [r3, #DDRC_STAT]
+	and	r7, r7, #0x20
+	cmp	r7, #0x20
+	bne	13b
+
+	/* let DDR out of self-refresh */
+	ldr	r7, =0x0
+	str	r7, [r3, #DDRC_PWRCTL]
+14:
+	ldr	r7, [r3, #DDRC_STAT]
+	and	r7, r7, #0x30
+	cmp	r7, #0x0
+	bne	14b
+
+15:
+	ldr	r7, [r3, #DDRC_STAT]
+	and	r7, r7, #0x3
+	cmp	r7, #0x1
+	bne	15b
+
+	/* enable port */
+	ldr	r7, =0x1
+	str	r7, [r3, #DDRC_PCTRL_0]
+
+	.endm
+
+ENTRY(imx7_suspend)
+	push	{r4-r12}
+
+	/*
+	 * The value of r0 is mapped the same in origin table and IRAM table,
+	 * thus no need to care r0 here.
+	 */
+	ldr	r1, [r0, #PM_INFO_PBASE_OFFSET]
+	ldr	r2, [r0, #PM_INFO_RESUME_ADDR_OFFSET]
+	ldr	r3, [r0, #PM_INFO_DDR_TYPE_OFFSET]
+	ldr	r4, [r0, #PM_INFO_PM_INFO_SIZE_OFFSET]
+
+	/*
+	 * counting the resume address in iram
+	 * to set it in SRC register.
+	 */
+	ldr	r6, =imx7_suspend
+	ldr	r7, =resume
+	sub	r7, r7, r6
+	add	r8, r1, r4
+	add	r9, r8, r7
+
+	ldr	r11, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	/* store physical resume addr and pm_info address. */
+	str	r9, [r11, #MX7_SRC_GPR1]
+	str	r1, [r11, #MX7_SRC_GPR2]
+
+	disable_l1_dcache
+
+	/*
+	 * make sure TLB contain the addr we want,
+	 * as we will access them after DDR is in
+	 * self-refresh mode.
+	 */
+	ldr	r6, [r0, #PM_INFO_MX7_IOMUXC_GPR_V_OFFSET]
+	ldr	r7, [r0, #0x0]
+	ldr	r6, [r0, #PM_INFO_MX7_CCM_V_OFFSET]
+	add	r6, #0x4000
+	ldr	r7, [r6]
+	ldr	r6, [r0, #PM_INFO_MX7_ANATOP_V_OFFSET]
+	ldr	r7, [r6, #0x0]
+	ldr	r6, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	ldr	r7, [r6, #0x0]
+	add	r6, #0x1000
+	ldr	r7, [r6]
+	ldr	r6, [r0, #PM_INFO_MX7_DDRC_V_OFFSET]
+	ldr	r7, [r6, #0x0]
+	ldr	r7, [r6, #0x490]
+	ldr	r6, [r0, #PM_INFO_MX7_DDRC_PHY_V_OFFSET]
+	ldr	r7, [r6, #0x0]
+
+	ldr	r11, [r0, #PM_INFO_MX7_GPC_V_OFFSET]
+	ldr	r7, [r11, #GPC_PGC_FM]
+	cmp	r7, #0
+	beq	ddr_only_self_refresh
+
+	ddr_enter_retention
+	b	ddr_retention_enter_out
+ddr_only_self_refresh:
+	ddrc_enter_self_refresh
+ddr_retention_enter_out:
+
+	/* Zzz, enter stop mode */
+	wfi
+	nop
+	nop
+	nop
+	nop
+
+	mov	r5, #0x0
+
+	ldr	r11, [r0, #PM_INFO_MX7_GPC_V_OFFSET]
+	ldr	r7, [r11, #GPC_PGC_FM]
+	cmp	r7, #0
+	beq	wfi_ddr_self_refresh_out
+
+	ddr_exit_retention
+	b	wfi_ddr_retention_out
+wfi_ddr_self_refresh_out:
+	ddrc_exit_self_refresh
+wfi_ddr_retention_out:
+
+	ldr	r11, [r0, #PM_INFO_MX7_IOMUXC_GPR_V_OFFSET]
+	ldr	r7, =0x170
+	orr	r7, r7, #0x8
+	str	r7, [r11, #0x20]
+
+	/* clear core0's entry and parameter */
+	ldr	r11, [r0, #PM_INFO_MX7_SRC_V_OFFSET]
+	mov	r7, #0x0
+	str	r7, [r11, #MX7_SRC_GPR1]
+	str	r7, [r11, #MX7_SRC_GPR2]
+
+	enable_l1_dcache
+
+	pop	{r4-r12}
+	/* return to suspend finish */
+	mov	pc, lr
+
+resume:
+	/* invalidate L1 I-cache first */
+	mov     r6, #0x0
+	mcr     p15, 0, r6, c7, c5, 0
+	mcr     p15, 0, r6, c7, c5, 6
+	/* enable the Icache and branch prediction */
+	mov     r6, #0x1800
+	mcr     p15, 0, r6, c1, c0, 0
+	isb
+
+	/* get physical resume address from pm_info. */
+	ldr	lr, [r0, #PM_INFO_RESUME_ADDR_OFFSET]
+	/* clear core0's entry and parameter */
+	ldr	r11, [r0, #PM_INFO_MX7_SRC_P_OFFSET]
+	mov	r7, #0x0
+	str	r7, [r11, #MX7_SRC_GPR1]
+	str	r7, [r11, #MX7_SRC_GPR2]
+
+	mov	r5, #0x1
+
+	ldr	r11, [r0, #PM_INFO_MX7_GPC_P_OFFSET]
+	ldr	r7, [r11, #GPC_PGC_FM]
+	cmp	r7, #0
+	beq	dsm_ddr_self_refresh_out
+
+	ddr_exit_retention
+	b	dsm_ddr_retention_out
+dsm_ddr_self_refresh_out:
+	ddrc_exit_self_refresh
+dsm_ddr_retention_out:
+
+	mov	pc, lr
+ENDPROC(imx7_suspend)
+
+ENTRY(ca7_cpu_resume)
+	bl	v7_invalidate_l1
+	b	cpu_resume
+ENDPROC(ca7_cpu_resume)
-- 
2.5.0.rc2

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
  2015-07-27 19:29   ` Shenwei Wang
@ 2015-07-28  1:24     ` Shawn Guo
  -1 siblings, 0 replies; 18+ messages in thread
From: Shawn Guo @ 2015-07-28  1:24 UTC (permalink / raw)
  To: Shenwei Wang
  Cc: shawn.guo, tglx, jason, b20788, linux-kernel, linux-arm-kernel

On Mon, Jul 27, 2015 at 02:29:59PM -0500, Shenwei Wang wrote:
> diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
> new file mode 100644
> index 0000000..3084f16
> --- /dev/null
> +++ b/drivers/irqchip/irq-imx-gpcv2.c
> @@ -0,0 +1,254 @@
> +/*
> + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> +#include <linux/slab.h>
> +#include <linux/irqchip.h>
> +#include <linux/syscore_ops.h>
> +
> +#include <soc/imx/gpcv2.h>
> +
> +#define GPC_MAX_IRQS            		(IMR_NUM * 32)

IMR_NUM is a bit generic and should probably have a proper name space.

> +
> +#define GPC_IMR1_CORE0				0x30
> +#define GPC_IMR1_CORE1				0x40
> +
> +struct imx_gpcv2_irq *gpcv2_irq_instance;
> +
> +static int gpcv2_wakeup_source_save(void)
> +{
> +	struct imx_gpcv2_irq *cd;

We generally name variables in an abbrev of the types to make them
intuitive.  I tried hard to map "cd" to "imx_gpcv2_irq" and failed.
Can you help me on that?

> +	void __iomem *reg;
> +	int i;
> +
> +	cd = gpcv2_irq_instance;
> +	if (!cd)
> +		return 0;
> +
> +	for (i = 0; i < IMR_NUM; i++) {
> +		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
> +		cd->enabled_irqs[i] = readl_relaxed(reg);
> +		writel_relaxed(cd->wakeup_sources[i], reg);
> +	}
> +
> +	return 0;
> +}
> +
> +static void gpcv2_wakeup_source_restore(void)
> +{
> +	struct imx_gpcv2_irq *cd;
> +	void __iomem *reg;
> +	int i;
> +
> +	cd = gpcv2_irq_instance;
> +	if (!cd)
> +		return;
> +
> +	for (i = 0; i < IMR_NUM; i++) {
> +		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
> +		writel_relaxed(cd->enabled_irqs[i], reg);
> +		cd->wakeup_sources[i] = ~0;
> +	}
> +}
> +
> +static struct syscore_ops imx_gpcv2_syscore_ops = {
> +	.suspend	= gpcv2_wakeup_source_save,
> +	.resume		= gpcv2_wakeup_source_restore,
> +};
> +
> +static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int on)
> +{
> +	struct imx_gpcv2_irq *cd = d->chip_data;
> +	unsigned int idx = d->hwirq / 32;
> +	unsigned long flags;
> +	void __iomem *reg;
> +	u32 mask, val;
> +
> +	raw_spin_lock_irqsave(&cd->rlock, flags);
> +	reg = cd->gpc_base + cd->cpu2wakeup + idx * 4;
> +	mask = 1 << d->hwirq % 32;
> +	val = cd->wakeup_sources[idx];
> +
> +	cd->wakeup_sources[idx] = on ? (val & ~mask) : (val | mask);
> +	raw_spin_unlock_irqrestore(&cd->rlock, flags);
> +
> +	/*
> +	 * Do *not* call into the parent, as the GIC doesn't have any
> +	 * wake-up facility...
> +	 */
> +
> +	return 0;
> +}
> +
> +
> +static void imx_gpcv2_irq_unmask(struct irq_data *d)
> +{
> +	struct imx_gpcv2_irq *cd = d->chip_data;
> +	void __iomem *reg;
> +	u32 val;
> +
> +	raw_spin_lock(&cd->rlock);
> +	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
> +	val = readl_relaxed(reg);
> +	val &= ~(1 << d->hwirq % 32);
> +	writel_relaxed(val, reg);
> +	raw_spin_unlock(&cd->rlock);
> +
> +	irq_chip_unmask_parent(d);
> +}
> +
> +static void imx_gpcv2_irq_mask(struct irq_data *d)
> +{
> +	struct imx_gpcv2_irq *cd = d->chip_data;
> +	void __iomem *reg;
> +	u32 val;
> +
> +	raw_spin_lock(&cd->rlock);
> +	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
> +	val = readl_relaxed(reg);
> +	val |= 1 << (d->hwirq % 32);
> +	writel_relaxed(val, reg);
> +	raw_spin_unlock(&cd->rlock);
> +
> +	irq_chip_mask_parent(d);
> +}
> +
> +

One new line is enough.

> +static struct irq_chip imx_gpcv2_irq_chip = {
> +	.name			= "GPCv2",
> +	.irq_eoi		= irq_chip_eoi_parent,
> +	.irq_mask		= imx_gpcv2_irq_mask,
> +	.irq_unmask		= imx_gpcv2_irq_unmask,
> +	.irq_set_wake		= imx_gpcv2_irq_set_wake,
> +	.irq_retrigger		= irq_chip_retrigger_hierarchy,
> +#ifdef CONFIG_SMP
> +	.irq_set_affinity	= irq_chip_set_affinity_parent,
> +#endif
> +};
> +
> +static int imx_gpcv2_domain_xlate(struct irq_domain *domain,
> +				struct device_node *controller,
> +				const u32 *intspec,
> +				unsigned int intsize,
> +				unsigned long *out_hwirq,
> +				unsigned int *out_type)
> +{
> +	/* Shouldn't happen, really... */
> +	if (domain->of_node != controller)
> +		return -EINVAL;
> +
> +	/* Not GIC compliant */
> +	if (intsize != 3)
> +		return -EINVAL;
> +
> +	/* No PPI should point to this domain */
> +	if (intspec[0] != 0)
> +		return -EINVAL;
> +
> +	*out_hwirq = intspec[1];
> +	*out_type = intspec[2];
> +	return 0;
> +}
> +
> +static int imx_gpcv2_domain_alloc(struct irq_domain *domain,
> +				  unsigned int irq, unsigned int nr_irqs,
> +				  void *data)
> +{
> +	struct of_phandle_args *args = data;
> +	struct of_phandle_args parent_args;
> +	irq_hw_number_t hwirq;
> +	int i;
> +
> +	/* Not GIC compliant */
> +	if (args->args_count != 3)
> +		return -EINVAL;
> +
> +	/* No PPI should point to this domain */
> +	if (args->args[0] != 0)
> +		return -EINVAL;
> +
> +	/* Can't deal with this */
> +	hwirq = args->args[1];
> +	if (hwirq >= GPC_MAX_IRQS)
> +		return -EINVAL;
> +
> +	for (i = 0; i < nr_irqs; i++) {
> +		irq_domain_set_hwirq_and_chip(domain, irq + i, hwirq + i,
> +				&imx_gpcv2_irq_chip, domain->host_data);
> +	}
> +	parent_args = *args;
> +	parent_args.np = domain->parent->of_node;
> +	return irq_domain_alloc_irqs_parent(domain, irq, nr_irqs, &parent_args);
> +}
> +
> +static struct irq_domain_ops imx_gpcv2_irq_domain_ops = {
> +	.xlate	= imx_gpcv2_domain_xlate,
> +	.alloc	= imx_gpcv2_domain_alloc,
> +	.free	= irq_domain_free_irqs_common,
> +};
> +
> +
> +

The new line is used so arbitrary.  One is enough.

> +static int __init imx_gpcv2_irqchip_init(struct device_node *node,
> +			       struct device_node *parent)
> +{
> +	struct irq_domain *parent_domain, *domain;
> +	struct imx_gpcv2_irq *cd;
> +	int i;
> +
> +	if (!parent) {
> +		pr_err("%s: no parent, giving up\n", node->full_name);
> +		return -ENODEV;
> +	}
> +
> +	parent_domain = irq_find_host(parent);
> +	if (!parent_domain) {
> +		pr_err("%s: unable to get parent domain\n", node->full_name);
> +		return -ENXIO;
> +	}
> +
> +	cd = kzalloc(sizeof(struct imx_gpcv2_irq), GFP_KERNEL);

A null pointer check is needed before it's used.

> +
> +	cd->gpc_base = of_iomap(node, 0);
> +	if (!cd->gpc_base) {
> +		pr_err("fsl-gpcv2: unable to map gpc registers\n");
> +		kfree(cd);
> +		return -ENOMEM;
> +	}
> +
> +	domain = irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS,
> +				node, &imx_gpcv2_irq_domain_ops, cd);
> +	if (!domain) {
> +		iounmap(cd->gpc_base);
> +		kfree(cd);
> +		return -ENOMEM;
> +	}
> +	irq_set_default_host(domain);
> +
> +	/* Initially mask all interrupts */
> +	for (i = 0; i < IMR_NUM; i++) {
> +		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE0 + i * 4);
> +		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE1 + i * 4);
> +		cd->wakeup_sources[i] = ~0;
> +	}
> +
> +	/* Let CORE0 as the default CPU to wake up by GPC */
> +	cd->cpu2wakeup = GPC_IMR1_CORE0;
> +
> +	gpcv2_irq_instance = cd;
> +
> +	register_syscore_ops(&imx_gpcv2_syscore_ops);
> +
> +	return 0;
> +}
> +
> +

One is enough.

> +IRQCHIP_DECLARE(imx_gpcv2, "fsl,imx7d-gpc", imx_gpcv2_irqchip_init);
> +
> +

One new line at end of file.

> diff --git a/include/soc/imx/gpcv2.h b/include/soc/imx/gpcv2.h
> new file mode 100644
> index 0000000..7234928
> --- /dev/null
> +++ b/include/soc/imx/gpcv2.h
> @@ -0,0 +1,25 @@
> +/*
> + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef __SOC_IMX_GPCV2_H__
> +#define __SOC_IMX_GPCV2_H__
> +
> +#define IMR_NUM		4
> +
> +struct imx_gpcv2_irq {
> +	struct raw_spinlock rlock;
> +	void __iomem *gpc_base;
> +	u32 wakeup_sources[IMR_NUM];
> +	u32 enabled_irqs[IMR_NUM];
> +	u32 cpu2wakeup;
> +};

Please try hard to make it an internal data structure of irqchip driver.

> +
> +void ca7_cpu_resume(void);
> +void imx7_suspend(void __iomem *ocram_vbase);

Why do these declarations need to be in this header?

Shawn

> +
> +#endif  /* __SOC_IMX_GPCV2_H__ */
> -- 
> 2.5.0.rc2
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
@ 2015-07-28  1:24     ` Shawn Guo
  0 siblings, 0 replies; 18+ messages in thread
From: Shawn Guo @ 2015-07-28  1:24 UTC (permalink / raw)
  To: linux-arm-kernel

On Mon, Jul 27, 2015 at 02:29:59PM -0500, Shenwei Wang wrote:
> diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
> new file mode 100644
> index 0000000..3084f16
> --- /dev/null
> +++ b/drivers/irqchip/irq-imx-gpcv2.c
> @@ -0,0 +1,254 @@
> +/*
> + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> +#include <linux/slab.h>
> +#include <linux/irqchip.h>
> +#include <linux/syscore_ops.h>
> +
> +#include <soc/imx/gpcv2.h>
> +
> +#define GPC_MAX_IRQS            		(IMR_NUM * 32)

IMR_NUM is a bit generic and should probably have a proper name space.

> +
> +#define GPC_IMR1_CORE0				0x30
> +#define GPC_IMR1_CORE1				0x40
> +
> +struct imx_gpcv2_irq *gpcv2_irq_instance;
> +
> +static int gpcv2_wakeup_source_save(void)
> +{
> +	struct imx_gpcv2_irq *cd;

We generally name variables in an abbrev of the types to make them
intuitive.  I tried hard to map "cd" to "imx_gpcv2_irq" and failed.
Can you help me on that?

> +	void __iomem *reg;
> +	int i;
> +
> +	cd = gpcv2_irq_instance;
> +	if (!cd)
> +		return 0;
> +
> +	for (i = 0; i < IMR_NUM; i++) {
> +		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
> +		cd->enabled_irqs[i] = readl_relaxed(reg);
> +		writel_relaxed(cd->wakeup_sources[i], reg);
> +	}
> +
> +	return 0;
> +}
> +
> +static void gpcv2_wakeup_source_restore(void)
> +{
> +	struct imx_gpcv2_irq *cd;
> +	void __iomem *reg;
> +	int i;
> +
> +	cd = gpcv2_irq_instance;
> +	if (!cd)
> +		return;
> +
> +	for (i = 0; i < IMR_NUM; i++) {
> +		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
> +		writel_relaxed(cd->enabled_irqs[i], reg);
> +		cd->wakeup_sources[i] = ~0;
> +	}
> +}
> +
> +static struct syscore_ops imx_gpcv2_syscore_ops = {
> +	.suspend	= gpcv2_wakeup_source_save,
> +	.resume		= gpcv2_wakeup_source_restore,
> +};
> +
> +static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int on)
> +{
> +	struct imx_gpcv2_irq *cd = d->chip_data;
> +	unsigned int idx = d->hwirq / 32;
> +	unsigned long flags;
> +	void __iomem *reg;
> +	u32 mask, val;
> +
> +	raw_spin_lock_irqsave(&cd->rlock, flags);
> +	reg = cd->gpc_base + cd->cpu2wakeup + idx * 4;
> +	mask = 1 << d->hwirq % 32;
> +	val = cd->wakeup_sources[idx];
> +
> +	cd->wakeup_sources[idx] = on ? (val & ~mask) : (val | mask);
> +	raw_spin_unlock_irqrestore(&cd->rlock, flags);
> +
> +	/*
> +	 * Do *not* call into the parent, as the GIC doesn't have any
> +	 * wake-up facility...
> +	 */
> +
> +	return 0;
> +}
> +
> +
> +static void imx_gpcv2_irq_unmask(struct irq_data *d)
> +{
> +	struct imx_gpcv2_irq *cd = d->chip_data;
> +	void __iomem *reg;
> +	u32 val;
> +
> +	raw_spin_lock(&cd->rlock);
> +	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
> +	val = readl_relaxed(reg);
> +	val &= ~(1 << d->hwirq % 32);
> +	writel_relaxed(val, reg);
> +	raw_spin_unlock(&cd->rlock);
> +
> +	irq_chip_unmask_parent(d);
> +}
> +
> +static void imx_gpcv2_irq_mask(struct irq_data *d)
> +{
> +	struct imx_gpcv2_irq *cd = d->chip_data;
> +	void __iomem *reg;
> +	u32 val;
> +
> +	raw_spin_lock(&cd->rlock);
> +	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
> +	val = readl_relaxed(reg);
> +	val |= 1 << (d->hwirq % 32);
> +	writel_relaxed(val, reg);
> +	raw_spin_unlock(&cd->rlock);
> +
> +	irq_chip_mask_parent(d);
> +}
> +
> +

One new line is enough.

> +static struct irq_chip imx_gpcv2_irq_chip = {
> +	.name			= "GPCv2",
> +	.irq_eoi		= irq_chip_eoi_parent,
> +	.irq_mask		= imx_gpcv2_irq_mask,
> +	.irq_unmask		= imx_gpcv2_irq_unmask,
> +	.irq_set_wake		= imx_gpcv2_irq_set_wake,
> +	.irq_retrigger		= irq_chip_retrigger_hierarchy,
> +#ifdef CONFIG_SMP
> +	.irq_set_affinity	= irq_chip_set_affinity_parent,
> +#endif
> +};
> +
> +static int imx_gpcv2_domain_xlate(struct irq_domain *domain,
> +				struct device_node *controller,
> +				const u32 *intspec,
> +				unsigned int intsize,
> +				unsigned long *out_hwirq,
> +				unsigned int *out_type)
> +{
> +	/* Shouldn't happen, really... */
> +	if (domain->of_node != controller)
> +		return -EINVAL;
> +
> +	/* Not GIC compliant */
> +	if (intsize != 3)
> +		return -EINVAL;
> +
> +	/* No PPI should point to this domain */
> +	if (intspec[0] != 0)
> +		return -EINVAL;
> +
> +	*out_hwirq = intspec[1];
> +	*out_type = intspec[2];
> +	return 0;
> +}
> +
> +static int imx_gpcv2_domain_alloc(struct irq_domain *domain,
> +				  unsigned int irq, unsigned int nr_irqs,
> +				  void *data)
> +{
> +	struct of_phandle_args *args = data;
> +	struct of_phandle_args parent_args;
> +	irq_hw_number_t hwirq;
> +	int i;
> +
> +	/* Not GIC compliant */
> +	if (args->args_count != 3)
> +		return -EINVAL;
> +
> +	/* No PPI should point to this domain */
> +	if (args->args[0] != 0)
> +		return -EINVAL;
> +
> +	/* Can't deal with this */
> +	hwirq = args->args[1];
> +	if (hwirq >= GPC_MAX_IRQS)
> +		return -EINVAL;
> +
> +	for (i = 0; i < nr_irqs; i++) {
> +		irq_domain_set_hwirq_and_chip(domain, irq + i, hwirq + i,
> +				&imx_gpcv2_irq_chip, domain->host_data);
> +	}
> +	parent_args = *args;
> +	parent_args.np = domain->parent->of_node;
> +	return irq_domain_alloc_irqs_parent(domain, irq, nr_irqs, &parent_args);
> +}
> +
> +static struct irq_domain_ops imx_gpcv2_irq_domain_ops = {
> +	.xlate	= imx_gpcv2_domain_xlate,
> +	.alloc	= imx_gpcv2_domain_alloc,
> +	.free	= irq_domain_free_irqs_common,
> +};
> +
> +
> +

The new line is used so arbitrary.  One is enough.

> +static int __init imx_gpcv2_irqchip_init(struct device_node *node,
> +			       struct device_node *parent)
> +{
> +	struct irq_domain *parent_domain, *domain;
> +	struct imx_gpcv2_irq *cd;
> +	int i;
> +
> +	if (!parent) {
> +		pr_err("%s: no parent, giving up\n", node->full_name);
> +		return -ENODEV;
> +	}
> +
> +	parent_domain = irq_find_host(parent);
> +	if (!parent_domain) {
> +		pr_err("%s: unable to get parent domain\n", node->full_name);
> +		return -ENXIO;
> +	}
> +
> +	cd = kzalloc(sizeof(struct imx_gpcv2_irq), GFP_KERNEL);

A null pointer check is needed before it's used.

> +
> +	cd->gpc_base = of_iomap(node, 0);
> +	if (!cd->gpc_base) {
> +		pr_err("fsl-gpcv2: unable to map gpc registers\n");
> +		kfree(cd);
> +		return -ENOMEM;
> +	}
> +
> +	domain = irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS,
> +				node, &imx_gpcv2_irq_domain_ops, cd);
> +	if (!domain) {
> +		iounmap(cd->gpc_base);
> +		kfree(cd);
> +		return -ENOMEM;
> +	}
> +	irq_set_default_host(domain);
> +
> +	/* Initially mask all interrupts */
> +	for (i = 0; i < IMR_NUM; i++) {
> +		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE0 + i * 4);
> +		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE1 + i * 4);
> +		cd->wakeup_sources[i] = ~0;
> +	}
> +
> +	/* Let CORE0 as the default CPU to wake up by GPC */
> +	cd->cpu2wakeup = GPC_IMR1_CORE0;
> +
> +	gpcv2_irq_instance = cd;
> +
> +	register_syscore_ops(&imx_gpcv2_syscore_ops);
> +
> +	return 0;
> +}
> +
> +

One is enough.

> +IRQCHIP_DECLARE(imx_gpcv2, "fsl,imx7d-gpc", imx_gpcv2_irqchip_init);
> +
> +

One new line at end of file.

> diff --git a/include/soc/imx/gpcv2.h b/include/soc/imx/gpcv2.h
> new file mode 100644
> index 0000000..7234928
> --- /dev/null
> +++ b/include/soc/imx/gpcv2.h
> @@ -0,0 +1,25 @@
> +/*
> + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef __SOC_IMX_GPCV2_H__
> +#define __SOC_IMX_GPCV2_H__
> +
> +#define IMR_NUM		4
> +
> +struct imx_gpcv2_irq {
> +	struct raw_spinlock rlock;
> +	void __iomem *gpc_base;
> +	u32 wakeup_sources[IMR_NUM];
> +	u32 enabled_irqs[IMR_NUM];
> +	u32 cpu2wakeup;
> +};

Please try hard to make it an internal data structure of irqchip driver.

> +
> +void ca7_cpu_resume(void);
> +void imx7_suspend(void __iomem *ocram_vbase);

Why do these declarations need to be in this header?

Shawn

> +
> +#endif  /* __SOC_IMX_GPCV2_H__ */
> -- 
> 2.5.0.rc2
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* RE: [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
  2015-07-28  1:24     ` Shawn Guo
@ 2015-07-28 14:27       ` Shenwei Wang
  -1 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-28 14:27 UTC (permalink / raw)
  To: Shawn Guo
  Cc: shawn.guo, tglx, jason, Huang Anson, linux-kernel, linux-arm-kernel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="gb2312", Size: 9710 bytes --]



> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo@kernel.org]
> Sent: 2015Äê7ÔÂ27ÈÕ 20:25
> To: Wang Shenwei-B38339
> Cc: shawn.guo@linaro.org; tglx@linutronix.de; jason@lakedaemon.net; Huang
> Yongcai-B20788; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup
> sources
> 
> On Mon, Jul 27, 2015 at 02:29:59PM -0500, Shenwei Wang wrote:
> > diff --git a/drivers/irqchip/irq-imx-gpcv2.c
> > b/drivers/irqchip/irq-imx-gpcv2.c new file mode 100644 index
> > 0000000..3084f16
> > --- /dev/null
> > +++ b/drivers/irqchip/irq-imx-gpcv2.c
> > @@ -0,0 +1,254 @@
> > +/*
> > + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> > + *
> > + * This program is free software; you can redistribute it and/or
> > +modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + */
> > +
> > +#include <linux/of_address.h>
> > +#include <linux/of_irq.h>
> > +#include <linux/slab.h>
> > +#include <linux/irqchip.h>
> > +#include <linux/syscore_ops.h>
> > +
> > +#include <soc/imx/gpcv2.h>
> > +
> > +#define GPC_MAX_IRQS            		(IMR_NUM * 32)
> 
> IMR_NUM is a bit generic and should probably have a proper name space.
> 
> > +
> > +#define GPC_IMR1_CORE0				0x30
> > +#define GPC_IMR1_CORE1				0x40
> > +
> > +struct imx_gpcv2_irq *gpcv2_irq_instance;
> > +
> > +static int gpcv2_wakeup_source_save(void) {
> > +	struct imx_gpcv2_irq *cd;
> 
> We generally name variables in an abbrev of the types to make them intuitive.  I
> tried hard to map "cd" to "imx_gpcv2_irq" and failed.
> Can you help me on that?

CD is the abbreviation of chip data which is a member of irq_data.
 
> > +	void __iomem *reg;
> > +	int i;
> > +
> > +	cd = gpcv2_irq_instance;
> > +	if (!cd)
> > +		return 0;
> > +
> > +	for (i = 0; i < IMR_NUM; i++) {
> > +		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
> > +		cd->enabled_irqs[i] = readl_relaxed(reg);
> > +		writel_relaxed(cd->wakeup_sources[i], reg);
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +static void gpcv2_wakeup_source_restore(void) {
> > +	struct imx_gpcv2_irq *cd;
> > +	void __iomem *reg;
> > +	int i;
> > +
> > +	cd = gpcv2_irq_instance;
> > +	if (!cd)
> > +		return;
> > +
> > +	for (i = 0; i < IMR_NUM; i++) {
> > +		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
> > +		writel_relaxed(cd->enabled_irqs[i], reg);
> > +		cd->wakeup_sources[i] = ~0;
> > +	}
> > +}
> > +
> > +static struct syscore_ops imx_gpcv2_syscore_ops = {
> > +	.suspend	= gpcv2_wakeup_source_save,
> > +	.resume		= gpcv2_wakeup_source_restore,
> > +};
> > +
> > +static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int
> > +on) {
> > +	struct imx_gpcv2_irq *cd = d->chip_data;
> > +	unsigned int idx = d->hwirq / 32;
> > +	unsigned long flags;
> > +	void __iomem *reg;
> > +	u32 mask, val;
> > +
> > +	raw_spin_lock_irqsave(&cd->rlock, flags);
> > +	reg = cd->gpc_base + cd->cpu2wakeup + idx * 4;
> > +	mask = 1 << d->hwirq % 32;
> > +	val = cd->wakeup_sources[idx];
> > +
> > +	cd->wakeup_sources[idx] = on ? (val & ~mask) : (val | mask);
> > +	raw_spin_unlock_irqrestore(&cd->rlock, flags);
> > +
> > +	/*
> > +	 * Do *not* call into the parent, as the GIC doesn't have any
> > +	 * wake-up facility...
> > +	 */
> > +
> > +	return 0;
> > +}
> > +
> > +
> > +static void imx_gpcv2_irq_unmask(struct irq_data *d) {
> > +	struct imx_gpcv2_irq *cd = d->chip_data;
> > +	void __iomem *reg;
> > +	u32 val;
> > +
> > +	raw_spin_lock(&cd->rlock);
> > +	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
> > +	val = readl_relaxed(reg);
> > +	val &= ~(1 << d->hwirq % 32);
> > +	writel_relaxed(val, reg);
> > +	raw_spin_unlock(&cd->rlock);
> > +
> > +	irq_chip_unmask_parent(d);
> > +}
> > +
> > +static void imx_gpcv2_irq_mask(struct irq_data *d) {
> > +	struct imx_gpcv2_irq *cd = d->chip_data;
> > +	void __iomem *reg;
> > +	u32 val;
> > +
> > +	raw_spin_lock(&cd->rlock);
> > +	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
> > +	val = readl_relaxed(reg);
> > +	val |= 1 << (d->hwirq % 32);
> > +	writel_relaxed(val, reg);
> > +	raw_spin_unlock(&cd->rlock);
> > +
> > +	irq_chip_mask_parent(d);
> > +}
> > +
> > +
> 
> One new line is enough.
> 
> > +static struct irq_chip imx_gpcv2_irq_chip = {
> > +	.name			= "GPCv2",
> > +	.irq_eoi		= irq_chip_eoi_parent,
> > +	.irq_mask		= imx_gpcv2_irq_mask,
> > +	.irq_unmask		= imx_gpcv2_irq_unmask,
> > +	.irq_set_wake		= imx_gpcv2_irq_set_wake,
> > +	.irq_retrigger		= irq_chip_retrigger_hierarchy,
> > +#ifdef CONFIG_SMP
> > +	.irq_set_affinity	= irq_chip_set_affinity_parent,
> > +#endif
> > +};
> > +
> > +static int imx_gpcv2_domain_xlate(struct irq_domain *domain,
> > +				struct device_node *controller,
> > +				const u32 *intspec,
> > +				unsigned int intsize,
> > +				unsigned long *out_hwirq,
> > +				unsigned int *out_type)
> > +{
> > +	/* Shouldn't happen, really... */
> > +	if (domain->of_node != controller)
> > +		return -EINVAL;
> > +
> > +	/* Not GIC compliant */
> > +	if (intsize != 3)
> > +		return -EINVAL;
> > +
> > +	/* No PPI should point to this domain */
> > +	if (intspec[0] != 0)
> > +		return -EINVAL;
> > +
> > +	*out_hwirq = intspec[1];
> > +	*out_type = intspec[2];
> > +	return 0;
> > +}
> > +
> > +static int imx_gpcv2_domain_alloc(struct irq_domain *domain,
> > +				  unsigned int irq, unsigned int nr_irqs,
> > +				  void *data)
> > +{
> > +	struct of_phandle_args *args = data;
> > +	struct of_phandle_args parent_args;
> > +	irq_hw_number_t hwirq;
> > +	int i;
> > +
> > +	/* Not GIC compliant */
> > +	if (args->args_count != 3)
> > +		return -EINVAL;
> > +
> > +	/* No PPI should point to this domain */
> > +	if (args->args[0] != 0)
> > +		return -EINVAL;
> > +
> > +	/* Can't deal with this */
> > +	hwirq = args->args[1];
> > +	if (hwirq >= GPC_MAX_IRQS)
> > +		return -EINVAL;
> > +
> > +	for (i = 0; i < nr_irqs; i++) {
> > +		irq_domain_set_hwirq_and_chip(domain, irq + i, hwirq + i,
> > +				&imx_gpcv2_irq_chip, domain->host_data);
> > +	}
> > +	parent_args = *args;
> > +	parent_args.np = domain->parent->of_node;
> > +	return irq_domain_alloc_irqs_parent(domain, irq, nr_irqs,
> > +&parent_args); }
> > +
> > +static struct irq_domain_ops imx_gpcv2_irq_domain_ops = {
> > +	.xlate	= imx_gpcv2_domain_xlate,
> > +	.alloc	= imx_gpcv2_domain_alloc,
> > +	.free	= irq_domain_free_irqs_common,
> > +};
> > +
> > +
> > +
> 
> The new line is used so arbitrary.  One is enough.
> 
> > +static int __init imx_gpcv2_irqchip_init(struct device_node *node,
> > +			       struct device_node *parent) {
> > +	struct irq_domain *parent_domain, *domain;
> > +	struct imx_gpcv2_irq *cd;
> > +	int i;
> > +
> > +	if (!parent) {
> > +		pr_err("%s: no parent, giving up\n", node->full_name);
> > +		return -ENODEV;
> > +	}
> > +
> > +	parent_domain = irq_find_host(parent);
> > +	if (!parent_domain) {
> > +		pr_err("%s: unable to get parent domain\n", node->full_name);
> > +		return -ENXIO;
> > +	}
> > +
> > +	cd = kzalloc(sizeof(struct imx_gpcv2_irq), GFP_KERNEL);
> 
> A null pointer check is needed before it's used.
> 
> > +
> > +	cd->gpc_base = of_iomap(node, 0);
> > +	if (!cd->gpc_base) {
> > +		pr_err("fsl-gpcv2: unable to map gpc registers\n");
> > +		kfree(cd);
> > +		return -ENOMEM;
> > +	}
> > +
> > +	domain = irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS,
> > +				node, &imx_gpcv2_irq_domain_ops, cd);
> > +	if (!domain) {
> > +		iounmap(cd->gpc_base);
> > +		kfree(cd);
> > +		return -ENOMEM;
> > +	}
> > +	irq_set_default_host(domain);
> > +
> > +	/* Initially mask all interrupts */
> > +	for (i = 0; i < IMR_NUM; i++) {
> > +		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE0 + i * 4);
> > +		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE1 + i * 4);
> > +		cd->wakeup_sources[i] = ~0;
> > +	}
> > +
> > +	/* Let CORE0 as the default CPU to wake up by GPC */
> > +	cd->cpu2wakeup = GPC_IMR1_CORE0;
> > +
> > +	gpcv2_irq_instance = cd;
> > +
> > +	register_syscore_ops(&imx_gpcv2_syscore_ops);
> > +
> > +	return 0;
> > +}
> > +
> > +
> 
> One is enough.
> 
> > +IRQCHIP_DECLARE(imx_gpcv2, "fsl,imx7d-gpc", imx_gpcv2_irqchip_init);
> > +
> > +
> 
> One new line at end of file.
> 
> > diff --git a/include/soc/imx/gpcv2.h b/include/soc/imx/gpcv2.h new
> > file mode 100644 index 0000000..7234928
> > --- /dev/null
> > +++ b/include/soc/imx/gpcv2.h
> > @@ -0,0 +1,25 @@
> > +/*
> > + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> > + *
> > + * This program is free software; you can redistribute it and/or
> > +modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + */
> > +
> > +#ifndef __SOC_IMX_GPCV2_H__
> > +#define __SOC_IMX_GPCV2_H__
> > +
> > +#define IMR_NUM		4
> > +
> > +struct imx_gpcv2_irq {
> > +	struct raw_spinlock rlock;
> > +	void __iomem *gpc_base;
> > +	u32 wakeup_sources[IMR_NUM];
> > +	u32 enabled_irqs[IMR_NUM];
> > +	u32 cpu2wakeup;
> > +};
> 
> Please try hard to make it an internal data structure of irqchip driver.
> 
> > +
> > +void ca7_cpu_resume(void);
> > +void imx7_suspend(void __iomem *ocram_vbase);
> 
> Why do these declarations need to be in this header?

Just to resolve the compile errors.
 

> Shawn
> 
> > +
> > +#endif  /* __SOC_IMX_GPCV2_H__ */
> > --
> > 2.5.0.rc2
> >
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éÝ¶\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dÊ‡Ú™ë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
@ 2015-07-28 14:27       ` Shenwei Wang
  0 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-28 14:27 UTC (permalink / raw)
  To: linux-arm-kernel



> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo at kernel.org]
> Sent: 2015?7?27? 20:25
> To: Wang Shenwei-B38339
> Cc: shawn.guo at linaro.org; tglx at linutronix.de; jason at lakedaemon.net; Huang
> Yongcai-B20788; linux-kernel at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org
> Subject: Re: [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup
> sources
> 
> On Mon, Jul 27, 2015 at 02:29:59PM -0500, Shenwei Wang wrote:
> > diff --git a/drivers/irqchip/irq-imx-gpcv2.c
> > b/drivers/irqchip/irq-imx-gpcv2.c new file mode 100644 index
> > 0000000..3084f16
> > --- /dev/null
> > +++ b/drivers/irqchip/irq-imx-gpcv2.c
> > @@ -0,0 +1,254 @@
> > +/*
> > + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> > + *
> > + * This program is free software; you can redistribute it and/or
> > +modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + */
> > +
> > +#include <linux/of_address.h>
> > +#include <linux/of_irq.h>
> > +#include <linux/slab.h>
> > +#include <linux/irqchip.h>
> > +#include <linux/syscore_ops.h>
> > +
> > +#include <soc/imx/gpcv2.h>
> > +
> > +#define GPC_MAX_IRQS            		(IMR_NUM * 32)
> 
> IMR_NUM is a bit generic and should probably have a proper name space.
> 
> > +
> > +#define GPC_IMR1_CORE0				0x30
> > +#define GPC_IMR1_CORE1				0x40
> > +
> > +struct imx_gpcv2_irq *gpcv2_irq_instance;
> > +
> > +static int gpcv2_wakeup_source_save(void) {
> > +	struct imx_gpcv2_irq *cd;
> 
> We generally name variables in an abbrev of the types to make them intuitive.  I
> tried hard to map "cd" to "imx_gpcv2_irq" and failed.
> Can you help me on that?

CD is the abbreviation of chip data which is a member of irq_data.
 
> > +	void __iomem *reg;
> > +	int i;
> > +
> > +	cd = gpcv2_irq_instance;
> > +	if (!cd)
> > +		return 0;
> > +
> > +	for (i = 0; i < IMR_NUM; i++) {
> > +		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
> > +		cd->enabled_irqs[i] = readl_relaxed(reg);
> > +		writel_relaxed(cd->wakeup_sources[i], reg);
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +static void gpcv2_wakeup_source_restore(void) {
> > +	struct imx_gpcv2_irq *cd;
> > +	void __iomem *reg;
> > +	int i;
> > +
> > +	cd = gpcv2_irq_instance;
> > +	if (!cd)
> > +		return;
> > +
> > +	for (i = 0; i < IMR_NUM; i++) {
> > +		reg = cd->gpc_base + cd->cpu2wakeup + i * 4;
> > +		writel_relaxed(cd->enabled_irqs[i], reg);
> > +		cd->wakeup_sources[i] = ~0;
> > +	}
> > +}
> > +
> > +static struct syscore_ops imx_gpcv2_syscore_ops = {
> > +	.suspend	= gpcv2_wakeup_source_save,
> > +	.resume		= gpcv2_wakeup_source_restore,
> > +};
> > +
> > +static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int
> > +on) {
> > +	struct imx_gpcv2_irq *cd = d->chip_data;
> > +	unsigned int idx = d->hwirq / 32;
> > +	unsigned long flags;
> > +	void __iomem *reg;
> > +	u32 mask, val;
> > +
> > +	raw_spin_lock_irqsave(&cd->rlock, flags);
> > +	reg = cd->gpc_base + cd->cpu2wakeup + idx * 4;
> > +	mask = 1 << d->hwirq % 32;
> > +	val = cd->wakeup_sources[idx];
> > +
> > +	cd->wakeup_sources[idx] = on ? (val & ~mask) : (val | mask);
> > +	raw_spin_unlock_irqrestore(&cd->rlock, flags);
> > +
> > +	/*
> > +	 * Do *not* call into the parent, as the GIC doesn't have any
> > +	 * wake-up facility...
> > +	 */
> > +
> > +	return 0;
> > +}
> > +
> > +
> > +static void imx_gpcv2_irq_unmask(struct irq_data *d) {
> > +	struct imx_gpcv2_irq *cd = d->chip_data;
> > +	void __iomem *reg;
> > +	u32 val;
> > +
> > +	raw_spin_lock(&cd->rlock);
> > +	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
> > +	val = readl_relaxed(reg);
> > +	val &= ~(1 << d->hwirq % 32);
> > +	writel_relaxed(val, reg);
> > +	raw_spin_unlock(&cd->rlock);
> > +
> > +	irq_chip_unmask_parent(d);
> > +}
> > +
> > +static void imx_gpcv2_irq_mask(struct irq_data *d) {
> > +	struct imx_gpcv2_irq *cd = d->chip_data;
> > +	void __iomem *reg;
> > +	u32 val;
> > +
> > +	raw_spin_lock(&cd->rlock);
> > +	reg = cd->gpc_base + cd->cpu2wakeup + d->hwirq / 32 * 4;
> > +	val = readl_relaxed(reg);
> > +	val |= 1 << (d->hwirq % 32);
> > +	writel_relaxed(val, reg);
> > +	raw_spin_unlock(&cd->rlock);
> > +
> > +	irq_chip_mask_parent(d);
> > +}
> > +
> > +
> 
> One new line is enough.
> 
> > +static struct irq_chip imx_gpcv2_irq_chip = {
> > +	.name			= "GPCv2",
> > +	.irq_eoi		= irq_chip_eoi_parent,
> > +	.irq_mask		= imx_gpcv2_irq_mask,
> > +	.irq_unmask		= imx_gpcv2_irq_unmask,
> > +	.irq_set_wake		= imx_gpcv2_irq_set_wake,
> > +	.irq_retrigger		= irq_chip_retrigger_hierarchy,
> > +#ifdef CONFIG_SMP
> > +	.irq_set_affinity	= irq_chip_set_affinity_parent,
> > +#endif
> > +};
> > +
> > +static int imx_gpcv2_domain_xlate(struct irq_domain *domain,
> > +				struct device_node *controller,
> > +				const u32 *intspec,
> > +				unsigned int intsize,
> > +				unsigned long *out_hwirq,
> > +				unsigned int *out_type)
> > +{
> > +	/* Shouldn't happen, really... */
> > +	if (domain->of_node != controller)
> > +		return -EINVAL;
> > +
> > +	/* Not GIC compliant */
> > +	if (intsize != 3)
> > +		return -EINVAL;
> > +
> > +	/* No PPI should point to this domain */
> > +	if (intspec[0] != 0)
> > +		return -EINVAL;
> > +
> > +	*out_hwirq = intspec[1];
> > +	*out_type = intspec[2];
> > +	return 0;
> > +}
> > +
> > +static int imx_gpcv2_domain_alloc(struct irq_domain *domain,
> > +				  unsigned int irq, unsigned int nr_irqs,
> > +				  void *data)
> > +{
> > +	struct of_phandle_args *args = data;
> > +	struct of_phandle_args parent_args;
> > +	irq_hw_number_t hwirq;
> > +	int i;
> > +
> > +	/* Not GIC compliant */
> > +	if (args->args_count != 3)
> > +		return -EINVAL;
> > +
> > +	/* No PPI should point to this domain */
> > +	if (args->args[0] != 0)
> > +		return -EINVAL;
> > +
> > +	/* Can't deal with this */
> > +	hwirq = args->args[1];
> > +	if (hwirq >= GPC_MAX_IRQS)
> > +		return -EINVAL;
> > +
> > +	for (i = 0; i < nr_irqs; i++) {
> > +		irq_domain_set_hwirq_and_chip(domain, irq + i, hwirq + i,
> > +				&imx_gpcv2_irq_chip, domain->host_data);
> > +	}
> > +	parent_args = *args;
> > +	parent_args.np = domain->parent->of_node;
> > +	return irq_domain_alloc_irqs_parent(domain, irq, nr_irqs,
> > +&parent_args); }
> > +
> > +static struct irq_domain_ops imx_gpcv2_irq_domain_ops = {
> > +	.xlate	= imx_gpcv2_domain_xlate,
> > +	.alloc	= imx_gpcv2_domain_alloc,
> > +	.free	= irq_domain_free_irqs_common,
> > +};
> > +
> > +
> > +
> 
> The new line is used so arbitrary.  One is enough.
> 
> > +static int __init imx_gpcv2_irqchip_init(struct device_node *node,
> > +			       struct device_node *parent) {
> > +	struct irq_domain *parent_domain, *domain;
> > +	struct imx_gpcv2_irq *cd;
> > +	int i;
> > +
> > +	if (!parent) {
> > +		pr_err("%s: no parent, giving up\n", node->full_name);
> > +		return -ENODEV;
> > +	}
> > +
> > +	parent_domain = irq_find_host(parent);
> > +	if (!parent_domain) {
> > +		pr_err("%s: unable to get parent domain\n", node->full_name);
> > +		return -ENXIO;
> > +	}
> > +
> > +	cd = kzalloc(sizeof(struct imx_gpcv2_irq), GFP_KERNEL);
> 
> A null pointer check is needed before it's used.
> 
> > +
> > +	cd->gpc_base = of_iomap(node, 0);
> > +	if (!cd->gpc_base) {
> > +		pr_err("fsl-gpcv2: unable to map gpc registers\n");
> > +		kfree(cd);
> > +		return -ENOMEM;
> > +	}
> > +
> > +	domain = irq_domain_add_hierarchy(parent_domain, 0, GPC_MAX_IRQS,
> > +				node, &imx_gpcv2_irq_domain_ops, cd);
> > +	if (!domain) {
> > +		iounmap(cd->gpc_base);
> > +		kfree(cd);
> > +		return -ENOMEM;
> > +	}
> > +	irq_set_default_host(domain);
> > +
> > +	/* Initially mask all interrupts */
> > +	for (i = 0; i < IMR_NUM; i++) {
> > +		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE0 + i * 4);
> > +		writel_relaxed(~0, cd->gpc_base + GPC_IMR1_CORE1 + i * 4);
> > +		cd->wakeup_sources[i] = ~0;
> > +	}
> > +
> > +	/* Let CORE0 as the default CPU to wake up by GPC */
> > +	cd->cpu2wakeup = GPC_IMR1_CORE0;
> > +
> > +	gpcv2_irq_instance = cd;
> > +
> > +	register_syscore_ops(&imx_gpcv2_syscore_ops);
> > +
> > +	return 0;
> > +}
> > +
> > +
> 
> One is enough.
> 
> > +IRQCHIP_DECLARE(imx_gpcv2, "fsl,imx7d-gpc", imx_gpcv2_irqchip_init);
> > +
> > +
> 
> One new line at end of file.
> 
> > diff --git a/include/soc/imx/gpcv2.h b/include/soc/imx/gpcv2.h new
> > file mode 100644 index 0000000..7234928
> > --- /dev/null
> > +++ b/include/soc/imx/gpcv2.h
> > @@ -0,0 +1,25 @@
> > +/*
> > + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> > + *
> > + * This program is free software; you can redistribute it and/or
> > +modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + */
> > +
> > +#ifndef __SOC_IMX_GPCV2_H__
> > +#define __SOC_IMX_GPCV2_H__
> > +
> > +#define IMR_NUM		4
> > +
> > +struct imx_gpcv2_irq {
> > +	struct raw_spinlock rlock;
> > +	void __iomem *gpc_base;
> > +	u32 wakeup_sources[IMR_NUM];
> > +	u32 enabled_irqs[IMR_NUM];
> > +	u32 cpu2wakeup;
> > +};
> 
> Please try hard to make it an internal data structure of irqchip driver.
> 
> > +
> > +void ca7_cpu_resume(void);
> > +void imx7_suspend(void __iomem *ocram_vbase);
> 
> Why do these declarations need to be in this header?

Just to resolve the compile errors.
 

> Shawn
> 
> > +
> > +#endif  /* __SOC_IMX_GPCV2_H__ */
> > --
> > 2.5.0.rc2
> >
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
  2015-07-28 14:27       ` Shenwei Wang
@ 2015-07-28 14:38         ` Shawn Guo
  -1 siblings, 0 replies; 18+ messages in thread
From: Shawn Guo @ 2015-07-28 14:38 UTC (permalink / raw)
  To: Shenwei Wang
  Cc: shawn.guo, tglx, jason, Huang Anson, linux-kernel, linux-arm-kernel

On Tue, Jul 28, 2015 at 02:27:42PM +0000, Shenwei Wang wrote:
> > > +static int gpcv2_wakeup_source_save(void) {
> > > +	struct imx_gpcv2_irq *cd;
> > 
> > We generally name variables in an abbrev of the types to make them intuitive.  I
> > tried hard to map "cd" to "imx_gpcv2_irq" and failed.
> > Can you help me on that?
> 
> CD is the abbreviation of chip data which is a member of irq_data.

You are defining a variable of type imx_gpcv2_irq, neither chip_data nor
irq_data.

> > > +void ca7_cpu_resume(void);
> > > +void imx7_suspend(void __iomem *ocram_vbase);
> > 
> > Why do these declarations need to be in this header?
> 
> Just to resolve the compile errors.

Wrong solution.  They belong to some header in arch/arm/mach-imx not
include/soc/imx, as there is no code outside arch/arm/mach-imx needs
these declaration.

Shawn

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
@ 2015-07-28 14:38         ` Shawn Guo
  0 siblings, 0 replies; 18+ messages in thread
From: Shawn Guo @ 2015-07-28 14:38 UTC (permalink / raw)
  To: linux-arm-kernel

On Tue, Jul 28, 2015 at 02:27:42PM +0000, Shenwei Wang wrote:
> > > +static int gpcv2_wakeup_source_save(void) {
> > > +	struct imx_gpcv2_irq *cd;
> > 
> > We generally name variables in an abbrev of the types to make them intuitive.  I
> > tried hard to map "cd" to "imx_gpcv2_irq" and failed.
> > Can you help me on that?
> 
> CD is the abbreviation of chip data which is a member of irq_data.

You are defining a variable of type imx_gpcv2_irq, neither chip_data nor
irq_data.

> > > +void ca7_cpu_resume(void);
> > > +void imx7_suspend(void __iomem *ocram_vbase);
> > 
> > Why do these declarations need to be in this header?
> 
> Just to resolve the compile errors.

Wrong solution.  They belong to some header in arch/arm/mach-imx not
include/soc/imx, as there is no code outside arch/arm/mach-imx needs
these declaration.

Shawn

^ permalink raw reply	[flat|nested] 18+ messages in thread

* RE: [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
  2015-07-28 14:38         ` Shawn Guo
@ 2015-07-28 14:46           ` Shenwei Wang
  -1 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-28 14:46 UTC (permalink / raw)
  To: Shawn Guo
  Cc: shawn.guo, tglx, jason, Huang Anson, linux-kernel, linux-arm-kernel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="gb2312", Size: 1702 bytes --]

> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo@kernel.org]
> Sent: 2015Äê7ÔÂ28ÈÕ 9:39
> To: Wang Shenwei-B38339
> Cc: shawn.guo@linaro.org; tglx@linutronix.de; jason@lakedaemon.net; Huang
> Yongcai-B20788; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup
> sources
> 
> On Tue, Jul 28, 2015 at 02:27:42PM +0000, Shenwei Wang wrote:
> > > > +static int gpcv2_wakeup_source_save(void) {
> > > > +	struct imx_gpcv2_irq *cd;
> > >
> > > We generally name variables in an abbrev of the types to make them
> > > intuitive.  I tried hard to map "cd" to "imx_gpcv2_irq" and failed.
> > > Can you help me on that?
> >
> > CD is the abbreviation of chip data which is a member of irq_data.
> 
> You are defining a variable of type imx_gpcv2_irq, neither chip_data nor irq_data.

Imx_gpcv2_irq itself is the chip_data of irq_data.

> > > > +void ca7_cpu_resume(void);
> > > > +void imx7_suspend(void __iomem *ocram_vbase);
> > >
> > > Why do these declarations need to be in this header?
> >
> > Just to resolve the compile errors.
> 
> Wrong solution.  They belong to some header in arch/arm/mach-imx not
> include/soc/imx, as there is no code outside arch/arm/mach-imx needs these
> declaration.

It is a little ugly. I was thinking to have a gpcv2.h header file, so put them there. 
But as the header file is going to be removed, I am considering to move it to 
common.h. Although it seems not beautiful too.

Thanks,
Shenwei

> Shawn
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éÝ¶\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dÊ‡Ú™ë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources
@ 2015-07-28 14:46           ` Shenwei Wang
  0 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-28 14:46 UTC (permalink / raw)
  To: linux-arm-kernel

> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo at kernel.org]
> Sent: 2015?7?28? 9:39
> To: Wang Shenwei-B38339
> Cc: shawn.guo at linaro.org; tglx at linutronix.de; jason at lakedaemon.net; Huang
> Yongcai-B20788; linux-kernel at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org
> Subject: Re: [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup
> sources
> 
> On Tue, Jul 28, 2015 at 02:27:42PM +0000, Shenwei Wang wrote:
> > > > +static int gpcv2_wakeup_source_save(void) {
> > > > +	struct imx_gpcv2_irq *cd;
> > >
> > > We generally name variables in an abbrev of the types to make them
> > > intuitive.  I tried hard to map "cd" to "imx_gpcv2_irq" and failed.
> > > Can you help me on that?
> >
> > CD is the abbreviation of chip data which is a member of irq_data.
> 
> You are defining a variable of type imx_gpcv2_irq, neither chip_data nor irq_data.

Imx_gpcv2_irq itself is the chip_data of irq_data.

> > > > +void ca7_cpu_resume(void);
> > > > +void imx7_suspend(void __iomem *ocram_vbase);
> > >
> > > Why do these declarations need to be in this header?
> >
> > Just to resolve the compile errors.
> 
> Wrong solution.  They belong to some header in arch/arm/mach-imx not
> include/soc/imx, as there is no code outside arch/arm/mach-imx needs these
> declaration.

It is a little ugly. I was thinking to have a gpcv2.h header file, so put them there. 
But as the header file is going to be removed, I am considering to move it to 
common.h. Although it seems not beautiful too.

Thanks,
Shenwei

> Shawn

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D
  2015-07-27 19:30   ` Shenwei Wang
@ 2015-07-30 22:44     ` Stefan Agner
  -1 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2015-07-30 22:44 UTC (permalink / raw)
  To: Shenwei Wang
  Cc: shawn.guo, tglx, jason, b20788, linux-kernel, linux-arm-kernel

Hi Shenwei,

The Subject sounds somewhat strange, if you mean your program code, then
you should not use the plural. Or maybe "add suspend states..." or
"support suspend states..."?

On 2015-07-27 21:30, Shenwei Wang wrote:
> IMX7D contains a new version of GPC IP block (GPCv2). It has two
> major functions: power management and wakeup source management.
> 
> GPCv2 provides low power mode control for Cortex-A7 and Cortex-M4
> domains. And it can support WAIT, STOP, and DSM(Deep Sleep Mode) modes.
> After configuring the GPCv2 module, the platform can enter into a
> selected mode either automatically triggered by ARM WFI instruction or
> manually by software. The system will exit the low power states
> by the predefined wakeup sources which are managed by the gpcv2
> irqchip driver.
> 
> This patch adds a new suspend driver to manage the power states on IMX7D.
> It currently supports "SUSPEND_STANDBY" and "SUSPEND_MEM" states.
> 
> Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
> Signed-off-by: Anson Huang <b20788@freescale.com>
> ---
>  arch/arm/mach-imx/Kconfig        |   1 +
>  arch/arm/mach-imx/Makefile       |   2 +
>  arch/arm/mach-imx/pm-imx7.c      | 901 +++++++++++++++++++++++++++++++++++++++
>  arch/arm/mach-imx/suspend-imx7.S | 529 +++++++++++++++++++++++
>  4 files changed, 1433 insertions(+)
>  create mode 100644 arch/arm/mach-imx/pm-imx7.c
>  create mode 100644 arch/arm/mach-imx/suspend-imx7.S
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 8ceda28..54f8553 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -562,6 +562,7 @@ config SOC_IMX7D
>  	select ARM_GIC
>  	select HAVE_IMX_ANATOP
>  	select HAVE_IMX_MMDC
> +	select IMX_GPCV2
>  	help
>  		This enables support for Freescale i.MX7 Dual processor.
>  
> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> index fb689d8..ca4c566 100644
> --- a/arch/arm/mach-imx/Makefile
> +++ b/arch/arm/mach-imx/Makefile
> @@ -88,6 +88,8 @@ obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o
>  
>  ifeq ($(CONFIG_SUSPEND),y)
>  AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
> +AFLAGS_suspend-imx7.o :=-Wa,-march=armv7-a
> +obj-$(CONFIG_IMX_GPCV2)	+= suspend-imx7.o pm-imx7.o
>  obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o

A rather strange ordering, can you keep the AFLAGS near the object file?

>  obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
>  endif
> diff --git a/arch/arm/mach-imx/pm-imx7.c b/arch/arm/mach-imx/pm-imx7.c
> new file mode 100644
> index 0000000..9035368
> --- /dev/null
> +++ b/arch/arm/mach-imx/pm-imx7.c
> @@ -0,0 +1,901 @@
> +/*
> + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/mfd/syscon.h>
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> +#include <linux/regmap.h>
> +#include <linux/suspend.h>
> +#include <linux/slab.h>
> +#include <asm/suspend.h>
> +#include <asm/fncpy.h>
> +
> +#include <soc/imx/gpcv2.h>
> +
> +#define BM_LPCR_A7_AD_L2PGE			0x10000
> +#define BM_LPCR_A7_AD_EN_C1_PUP			0x800
> +#define BM_LPCR_A7_AD_EN_C1_IRQ_PUP		0x400
> +#define BM_LPCR_A7_AD_EN_C0_PUP			0x200
> +#define BM_LPCR_A7_AD_EN_C0_IRQ_PUP		0x100
> +#define BM_LPCR_A7_AD_EN_PLAT_PDN		0x10
> +#define BM_LPCR_A7_AD_EN_C1_PDN			0x8
> +#define BM_LPCR_A7_AD_EN_C1_WFI_PDN		0x4
> +#define BM_LPCR_A7_AD_EN_C0_PDN			0x2
> +#define BM_LPCR_A7_AD_EN_C0_WFI_PDN		0x1
> +
> +#define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	0x70000000
> +#define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		0x4000
> +#define BM_LPCR_A7_BSC_LPM1			0xc
> +#define BM_LPCR_A7_BSC_LPM0			0x3
> +#define BP_LPCR_A7_BSC_LPM1			2
> +#define BP_LPCR_A7_BSC_LPM0			0
> +
> +#define BM_LPCR_M4_MASK_DSM_TRIGGER		0x80000000
> +
> +#define BM_SLPCR_EN_DSM				0x80000000
> +#define BM_SLPCR_RBC_EN				0x40000000
> +#define BM_SLPCR_VSTBY				0x4
> +#define BM_SLPCR_SBYOS				0x2
> +#define BM_SLPCR_BYPASS_PMIC_READY		0x1
> +
> +#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK	0x80000000
> +#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK	0x8000

Typically the bit field size + shifts is used here, e.g.

#define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	(0x7 << 28)
#define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		(0x1 << 14)

This is much easier to verify against the data sheet.

> +
> +#define GPC_LPCR_A7_BSC		0x0
> +#define GPC_LPCR_A7_AD		0x4
> +#define GPC_LPCR_M4		0x8
> +
> +#define GPC_PGC_CPU_MAPPING	0xec
> +#define GPC_PGC_SCU_TIMING	0x890
> +
> +#define GPC_SLPCR		0x14
> +#define GPC_PGC_ACK_SEL_A7	0x24
> +
> +#define GPC_SLOT0_CFG		0xb0
> +
> +#define GPC_PGC_C0		0x800
> +#define GPC_PGC_SCU_TIMING	0x890
> +#define GPC_PGC_C1		0x840
> +#define GPC_PGC_SCU		0x880
> +#define GPC_PGC_FM		0xa00
> +
> +#define ANADIG_ARM_PLL		0x60
> +#define ANADIG_DDR_PLL		0x70
> +#define ANADIG_SYS_PLL		0xb0
> +#define ANADIG_ENET_PLL		0xe0
> +#define ANADIG_AUDIO_PLL	0xf0
> +#define ANADIG_VIDEO_PLL	0x130
> +
> +#define MAX_SLOT_NUMBER		10
> +#define A7_LPM_WAIT		0x5
> +#define A7_LPM_STOP		0xa
> +
> +#define REG_SET			0x4
> +#define REG_CLR			0x8
> +
> +enum gpcv2_mode {
> +	WAIT_CLOCKED,
> +	WAIT_UNCLOCKED,
> +	WAIT_UNCLOCKED_POWER_OFF,
> +	STOP_POWER_ON,
> +	STOP_POWER_OFF,
> +};
> +
> +/* GPCv2 has the following power domains, and each domain can be power-up
> + * and power-down via GPC settings.
> + *
> + * 	Core 0 of A7 power domain
> + * 	Core1 of A7 power domain
> + * 	SCU/L2 cache RAM of A7 power domain
> + * 	Fastmix and megamix power domain
> + * 	USB OTG1 PHY power domain
> + * 	USB OTG2 PHY power domain
> + * 	PCIE PHY power domain
> + * 	USB HSIC PHY power domain
> + *	Core 0 of M4 power domain
> + */

Nit: a empty line is the preferred format in this part of the kernel:

/*
 * Start here...

> +enum gpcv2_slot {
> +	CORE0_A7,
> +	CORE1_A7,
> +	SCU_A7,
> +	FAST_MEGA_MIX,
> +	MIPI_PHY,
> +	PCIE_PHY,
> +	USB_OTG1_PHY,
> +	USB_OTG2_PHY,
> +	USB_HSIC_PHY,
> +	CORE0_M4,
> +};
> +
> +struct imx_gpcv2;
> +
> +struct imx_gpcv2_suspend {
> +	struct regmap *anatop;
> +	struct regmap *imx_src;
> +	u32 mfmix_mask[IMR_NUM];
> +	u32 wakeupmix_mask[IMR_NUM];
> +	u32 lpsrmix_mask[IMR_NUM];
> +
> +	void (*set_mode)(struct imx_gpcv2 *, enum gpcv2_mode mode);
> +	void (*lpm_cpu_power_gate)(struct imx_gpcv2 *, u32, bool);
> +	void (*lpm_plat_power_gate)(struct imx_gpcv2 *, bool);
> +	void (*lpm_env_setup)(struct imx_gpcv2 *);
> +	void (*lpm_env_clean)(struct imx_gpcv2 *);
> +
> +	void (*set_slot)(struct imx_gpcv2 *cd, u32 index,
> +			enum gpcv2_slot m_core, bool mode, bool ack);
> +	void (*clear_slots)(struct imx_gpcv2 *);
> +	void (*lpm_enable_core)(struct imx_gpcv2 *,
> +			bool enable, u32 offset);
> +
> +	void (*standby)(struct imx_gpcv2 *);
> +	void (*suspend)(struct imx_gpcv2 *);
> +
> +	void (*suspend_fn_in_ocram)(void __iomem *ocram_vbase);
> +	void __iomem *ocram_vbase;
> +};
> +
> +struct imx_gpcv2 {
> +	spinlock_t lock;
> +	struct imx_gpcv2_irq *irqchip;
> +	struct imx_gpcv2_suspend *pm;
> +};
> +
> +extern struct imx_gpcv2_irq *gpcv2_irq_instance;
> +static struct imx_gpcv2 *gpcv2_instance;
> +
> +static void imx_gpcv2_lpm_clear_slots(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	int i;
> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +	for (i = 0; i < MAX_SLOT_NUMBER; i++)
> +		writel_relaxed(0x0, cd->gpc_base + GPC_SLOT0_CFG + i * 0x4);
> +	writel_relaxed(BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK |
> +		BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK,
> +		cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> +
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_gpcv2_lpm_enable_core(struct imx_gpcv2 *gpc,
> +			bool enable, u32 offset)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +	writel_relaxed(enable, cd->gpc_base + offset);
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_gpcv2_lpm_slot_setup(struct imx_gpcv2 *gpc,
> +		u32 index, enum gpcv2_slot m_core, bool mode, bool ack)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	u32 val;
> +
> +	if (index >= MAX_SLOT_NUMBER)
> +		pr_err("Invalid slot index!\n");

Is a return missing here? The check seems rather useless otherwise.

> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +	/* set slot */
> +	writel_relaxed((mode + 1) << (m_core * 2), cd->gpc_base +
> +		GPC_SLOT0_CFG + index * 4);

Can you create a preprocessor for the slot register?

#define GPC_SLOTx_CFG(x) (0xb0 + 4 * (x))

The parameter m_core has a unintuitive name, slot sounds much better to
me.

Also boolean and an addition is somewhat strange, I would prefer
something like:
mode ? 0x2 : 0x1 << (slot * 2)

> +
> +	if (ack) {
> +		/* set ack */
> +		val = readl_relaxed(cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> +		/* clear dummy ack */
> +		val &= ~(1 << (15 + (mode ? 16 : 0)));
> +		val |= 1 << (m_core + (mode ? 16 : 0));

Can you come up with macros here too? That is not readable...

For the dummy ack I would suggest to create dedicated defines and for
the power domain acks something which takes the slot as argument...

> +		writel_relaxed(val, cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> +	}
> +
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_gpcv2_lpm_env_setup(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_suspend *pm = gpc->pm;
> +
> +	/* PLL and PFDs overwrite set */
> +	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_SET, 1 << 20);
> +	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_SET, 1 << 19);
> +	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_SET, 0x1ff << 17);
> +	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_SET, 1 << 13);
> +	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_SET, 1 << 24);
> +	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_SET, 1 << 24);
> +}
> +
> +static void imx_gpcv2_lpm_env_clean(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_suspend *pm = gpc->pm;
> +
> +	/* PLL and PFDs overwrite clear */
> +	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_CLR, 1 << 20);
> +	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_CLR, 1 << 19);
> +	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_CLR, 0x1ff << 17);
> +	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_CLR, 1 << 13);
> +	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_CLR, 1 << 24);
> +	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_CLR, 1 << 24);
> +}
> +
> +static void imx_gpcv2_lpm_set_mode(struct imx_gpcv2 *gpc,
> +		enum gpcv2_mode mode)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	u32 val1, val2;

Please use names which say something. tmp and i is ok, if it's a
temporary variable or a counter, but not val1/val2...

> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +
> +	val1 = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
> +	val2 = readl_relaxed(cd->gpc_base + GPC_SLPCR);
> +
> +	/* all cores' LPM settings must be same */
> +	val1 &= ~(BM_LPCR_A7_BSC_LPM0 | BM_LPCR_A7_BSC_LPM1);
> +
> +	val1 |= BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> +
> +	val2 &= ~(BM_SLPCR_EN_DSM | BM_SLPCR_VSTBY | BM_SLPCR_RBC_EN |
> +		BM_SLPCR_SBYOS | BM_SLPCR_BYPASS_PMIC_READY);
> +	/*
> +	 * GPCv2: When improper low-power sequence is used,
> +	 * the SoC enters low power mode before the ARM core executes WFI.
> +	 *
> +	 * Software workaround:
> +	 * 1) Software should trigger IRQ #32 (IOMUX) to be always pending
> +	 *    by setting IOMUX_GPR1_IRQ.
> +	 * 2) Software should then unmask IRQ #32 in GPC before setting GPC
> +	 *    Low-Power mode.
> +	 * 3) Software should mask IRQ #32 right after GPC Low-Power mode
> +	 *    is set.
> +	 */
> +	switch (mode) {
> +	case WAIT_CLOCKED:
> +		break;
> +	case WAIT_UNCLOCKED:
> +		val1 |= A7_LPM_WAIT << BP_LPCR_A7_BSC_LPM0;
> +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> +		break;
> +	case STOP_POWER_ON:
> +		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
> +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> +		val2 |= BM_SLPCR_EN_DSM;
> +		val2 |= BM_SLPCR_RBC_EN;
> +		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
> +		break;
> +	case STOP_POWER_OFF:
> +		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
> +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> +		val2 |= BM_SLPCR_EN_DSM;
> +		val2 |= BM_SLPCR_RBC_EN;
> +		val2 |= BM_SLPCR_SBYOS;
> +		val2 |= BM_SLPCR_VSTBY;
> +		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
> +		break;
> +	default:
> +		return;

What about the spin lock?

> +	}
> +	writel_relaxed(val1, cd->gpc_base + GPC_LPCR_A7_BSC);
> +	writel_relaxed(val2, cd->gpc_base + GPC_SLPCR);
> +
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +
> +static void imx_gpcv2_lpm_cpu_power_gate(struct imx_gpcv2 *gpc,
> +				u32 cpu, bool pdn)

Hm, pdn is somewhat overused here. Your bool pdn says that you want to
power gate a certain core. Below you then set PDN and PUP, that is
somewhat confusing. Maybe bool engate or en_lpm?

> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	u32 val;
> +
> +	const u32 val_pdn[2] = {
> +		BM_LPCR_A7_AD_EN_C0_PDN | BM_LPCR_A7_AD_EN_C0_PUP,
> +		BM_LPCR_A7_AD_EN_C1_PDN | BM_LPCR_A7_AD_EN_C1_PUP,
> +	};
> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +
> +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
> +	if (pdn)
> +		val |= val_pdn[cpu];
> +	else
> +		val &= ~val_pdn[cpu];
> +
> +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_lpm_plat_power_gate(struct imx_gpcv2 *gpc, bool pdn)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	u32 val;
> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
> +	val &= ~(BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE);
> +	if (pdn)
> +		val |= BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE;
> +
> +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_gpcv2_lpm_standby(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_suspend *pm = gpc->pm;
> +
> +	pm->lpm_env_setup(gpc);
> +	/* pm->set_mode(gpc, STOP_POWER_OFF); */
> +	pm->set_mode(gpc, WAIT_UNCLOCKED);
> +
> +	pr_debug("[GPCv2] %s %d\r\n", __func__, __LINE__);
> +	/* Zzz ... */
> +	cpu_do_idle();
> +
> +	pm->set_mode(gpc, WAIT_CLOCKED);
> +	pm->lpm_env_clean(gpc);
> +}
> +
> +
> +
> +static int gpcv2_suspend_finish(unsigned long val)
> +{
> +	struct imx_gpcv2_suspend *pm = (struct imx_gpcv2_suspend *)val;
> +
> +	if (!pm->suspend_fn_in_ocram) {
> +		cpu_do_idle();
> +	} else {
> +		/*
> +		 * call low level suspend function in ocram,
> +		 * as we need to float DDR IO.
> +		 */
> +		local_flush_tlb_all();
> +		pm->suspend_fn_in_ocram(pm->ocram_vbase);
> +	}
> +
> +	return 0;
> +}
> +static void imx_gpcv2_lpm_suspend(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_suspend *pm = gpc->pm;
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	int i = 0;
> +
> +	pm->lpm_env_setup(gpc);
> +	pm->set_mode(gpc, STOP_POWER_OFF);
> +
> +	/* enable core0 power down/up with low power mode */
> +	pm->lpm_cpu_power_gate(gpc, 0, true);
> +
> +	/* enable plat power down with low power mode */
> +	pm->lpm_plat_power_gate(gpc, true);
> +
> +	/*
> +	 * To avoid confuse, we use slot 0~4 for power down,
> +	 * slot 5~9 for power up.
> +	 *
> +	 * Power down slot sequence:
> +	 * Slot0 -> CORE0
> +	 * Slot1 -> Mega/Fast MIX
> +	 * Slot2 -> SCU
> +	 *
> +	 * Power up slot sequence:
> +	 * Slot5 -> Mega/Fast MIX
> +	 * Slot6 -> SCU
> +	 * Slot7 -> CORE0
> +	 */
> +	pm->set_slot(gpc, 0, CORE0_A7, false, false);
> +	pm->set_slot(gpc, 2, SCU_A7, false, true);

Maybe it would be better to introduce a enum for the
power-up/power-down?


> +
> +	for (i = 0; i < IMR_NUM; i++) {
> +		if ((~cd->wakeup_sources[i] & pm->mfmix_mask[i]) != 0)
> +			break;
> +
> +		pm->set_slot(gpc, 1, FAST_MEGA_MIX, false, false);
> +		pm->set_slot(gpc, 5, FAST_MEGA_MIX, true, false);
> +		pm->lpm_enable_core(gpc, true, GPC_PGC_FM);
> +		break;
> +	}

This is somewhat weird. You break either way in the first loop don't
you? Why using a loop then?

> +
> +	pm->set_slot(gpc, 6, SCU_A7, true, false);
> +	pm->set_slot(gpc, 7, CORE0_A7, true, true);
> +
> +	/* enable core0, scu */
> +	pm->lpm_enable_core(gpc, true, GPC_PGC_C0);
> +	pm->lpm_enable_core(gpc, true, GPC_PGC_SCU);
> +
> +	/* Suspend to MEM has not been implemented yet */
> +	cpu_suspend((unsigned long)pm, gpcv2_suspend_finish);

What does that mean?

> +
> +	pm->lpm_env_clean(gpc);
> +	pm->set_mode(gpc, WAIT_CLOCKED);
> +	pm->lpm_cpu_power_gate(gpc, 0, false);
> +	pm->lpm_plat_power_gate(gpc, false);
> +
> +	pm->lpm_enable_core(gpc, false, GPC_PGC_C0);
> +	pm->lpm_enable_core(gpc, false, GPC_PGC_SCU);
> +	pm->lpm_enable_core(gpc, false, GPC_PGC_FM);
> +	pm->clear_slots(gpc);
> +}
> +
> +static int imx_gpcv2_pm_enter(suspend_state_t state)
> +{
> +	struct imx_gpcv2_suspend *pm;
> +
> +	BUG_ON(!gpcv2_instance);
> +	pm = gpcv2_instance->pm;
> +
> +	switch (state) {
> +	case PM_SUSPEND_STANDBY:
> +		pm->standby(gpcv2_instance);
> +		break;
> +
> +	case PM_SUSPEND_MEM:
> +		pm->suspend(gpcv2_instance);
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +static int imx_gpcv2_pm_valid(suspend_state_t state)
> +{
> +	return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;
> +}
> +
> +
> +#define MX7_MAX_DDRC_NUM		32
> +#define MX7_MAX_DDRC_PHY_NUM		16
> +
> +#define READ_DATA_FROM_HARDWARE		0
> +#define MX7_SUSPEND_OCRAM_SIZE		0x1000
> +
> +struct imx7_pm_base {
> +	phys_addr_t pbase;
> +	void __iomem *vbase;
> +};
> +
> +struct imx7_pm_socdata {
> +	u32 ddr_type;
> +	const char *ddrc_compat;
> +	const char *ddrc_phy_compat;
> +	const char *src_compat;
> +	const char *iomuxc_gpr_compat;
> +	const char *ccm_compat;
> +	const char *gpc_compat;
> +	const char *anatop_compat;
> +	const u32 ddrc_num;
> +	const u32 (*ddrc_offset)[2];
> +	const u32 ddrc_phy_num;
> +	const u32 (*ddrc_phy_offset)[2];
> +};
> +
> +/*
> + * This structure is for passing necessary data for low level ocram
> + * suspend code(arch/arm/mach-imx/suspend-imx7.S), if this struct
> + * definition is changed, the offset definition in
> + * arch/arm/mach-imx/suspend-imx7.S must be also changed accordingly,
> + * otherwise, the suspend to ocram function will be broken!
> + */
> +struct imx7_cpu_pm_info {
> +	u32 m4_reserve0;
> +	u32 m4_reserve1;
> +	u32 m4_reserve2;
> +
> +	/* The physical address of pm_info. */
> +	phys_addr_t pbase;
> +
> +	/* The physical resume address for asm code */
> +	phys_addr_t resume_addr;
> +	u32 ddr_type;
> +
> +	u32 pm_info_size;
> +
> +	struct imx7_pm_base ddrc_base;
> +	struct imx7_pm_base ddrc_phy_base;
> +	struct imx7_pm_base src_base;
> +	struct imx7_pm_base iomuxc_gpr_base;
> +	struct imx7_pm_base ccm_base;
> +	struct imx7_pm_base gpc_base;
> +	struct imx7_pm_base l2_base;
> +	struct imx7_pm_base anatop_base;
> +
> +	u32 ttbr1;
> +
> +	/* Number of DDRC which need saved/restored. */
> +	u32 ddrc_num;
> +
> +	/* To save offset and value */
> +	u32 ddrc_val[MX7_MAX_DDRC_NUM][2];
> +
> +	/* Number of DDRC which need saved/restored. */
> +	u32 ddrc_phy_num;
> +
> +	/* To save offset and value */
> +	u32 ddrc_phy_val[MX7_MAX_DDRC_NUM][2];
> +} __aligned(8);
> +
> +static int __init imx_get_base_from_node(struct device_node *node,
> +			struct imx7_pm_base *base)
> +{
> +	struct resource res;
> +	int ret = 0;
> +
> +	ret = of_address_to_resource(node, 0, &res);
> +	if (ret)
> +		goto put_node;
> +
> +	base->pbase = res.start;
> +	base->vbase = ioremap(res.start, resource_size(&res));
> +	if (!base->vbase) {
> +		iounmap(base->vbase);
> +		ret = -ENOMEM;
> +	}
> +put_node:
> +	of_node_put(node);
> +
> +	return ret;
> +}
> +
> +static int __init imx_get_base_from_dt(struct imx7_pm_base *base,
> +				const char *compat)
> +{
> +	struct device_node *node;
> +	struct resource res;
> +	int ret = 0;
> +
> +	node = of_find_compatible_node(NULL, NULL, compat);
> +	if (!node) {
> +		ret = -ENODEV;
> +		goto out;
> +	}
> +
> +	ret = of_address_to_resource(node, 0, &res);
> +	if (ret)
> +		goto put_node;
> +
> +	base->pbase = res.start;
> +	base->vbase = ioremap(res.start, resource_size(&res));
> +	if (!base->vbase)
> +		ret = -ENOMEM;
> +
> +put_node:
> +	of_node_put(node);
> +out:
> +	return ret;
> +}
> +
> +static int __init imx_get_exec_base_from_dt(struct imx7_pm_base *base,
> +				const char *compat)
> +{
> +	struct device_node *node;
> +	struct resource res;
> +	int ret = 0;
> +
> +	node = of_find_compatible_node(NULL, NULL, compat);
> +	if (!node) {
> +		ret = -ENODEV;
> +		goto out;
> +	}
> +
> +	ret = of_address_to_resource(node, 0, &res);
> +	if (ret)
> +		goto put_node;
> +
> +	base->pbase = res.start;
> +	base->vbase = __arm_ioremap_exec(res.start, resource_size(&res), false);
> +
> +	if (!base->vbase)
> +		ret = -ENOMEM;
> +
> +put_node:
> +	of_node_put(node);
> +out:
> +	return ret;
> +}
> +
> +static const u32 imx7d_ddrc_ddr3_setting[][2] __initconst = {
> +	{ 0x0, READ_DATA_FROM_HARDWARE },
> +	{ 0x1a0, READ_DATA_FROM_HARDWARE },
> +	{ 0x1a4, READ_DATA_FROM_HARDWARE },
> +	{ 0x1a8, READ_DATA_FROM_HARDWARE },
> +	{ 0x64, READ_DATA_FROM_HARDWARE },
> +	{ 0x490, 0x00000001 },
> +	{ 0xd0, 0xc0020001 },
> +	{ 0xd4, READ_DATA_FROM_HARDWARE },
> +	{ 0xdc, READ_DATA_FROM_HARDWARE },
> +	{ 0xe0, READ_DATA_FROM_HARDWARE },
> +	{ 0xe4, READ_DATA_FROM_HARDWARE },
> +	{ 0xf4, READ_DATA_FROM_HARDWARE },
> +	{ 0x100, READ_DATA_FROM_HARDWARE },
> +	{ 0x104, READ_DATA_FROM_HARDWARE },
> +	{ 0x108, READ_DATA_FROM_HARDWARE },
> +	{ 0x10c, READ_DATA_FROM_HARDWARE },
> +	{ 0x110, READ_DATA_FROM_HARDWARE },
> +	{ 0x114, READ_DATA_FROM_HARDWARE },
> +	{ 0x120, 0x03030803 },
> +	{ 0x180, READ_DATA_FROM_HARDWARE },
> +	{ 0x190, READ_DATA_FROM_HARDWARE },
> +	{ 0x194, READ_DATA_FROM_HARDWARE },
> +	{ 0x200, READ_DATA_FROM_HARDWARE },
> +	{ 0x204, READ_DATA_FROM_HARDWARE },
> +	{ 0x214, READ_DATA_FROM_HARDWARE },
> +	{ 0x218, READ_DATA_FROM_HARDWARE },
> +	{ 0x240, 0x06000601 },
> +	{ 0x244, READ_DATA_FROM_HARDWARE },
> +};
> +
> +static const u32 imx7d_ddrc_phy_ddr3_setting[][2] __initconst = {
> +	{ 0x0, READ_DATA_FROM_HARDWARE },
> +	{ 0x4, READ_DATA_FROM_HARDWARE },
> +	{ 0x10, READ_DATA_FROM_HARDWARE },
> +	{ 0x9c, READ_DATA_FROM_HARDWARE },
> +	{ 0x20, READ_DATA_FROM_HARDWARE },
> +	{ 0x30, READ_DATA_FROM_HARDWARE },
> +	{ 0x50, 0x01000010 },
> +	{ 0x50, 0x00000010 },
> +	{ 0xc0, 0x0e407304 },
> +	{ 0xc0, 0x0e447304 },
> +	{ 0xc0, 0x0e447306 },
> +	{ 0xc0, 0x0e447304 },
> +	{ 0xc0, 0x0e407306 },
> +};
> +
> +static const struct imx7_pm_socdata imx7d_pm_data_ddr3 __initconst = {
> +	.iomuxc_gpr_compat = "fsl,imx7d-iomuxc",
> +	.ddrc_phy_compat = "fsl,imx7d-ddrc-phy",
> +	.anatop_compat = "fsl,imx7d-anatop",
> +	.ddrc_compat = "fsl,imx7d-ddrc",
> +	.ccm_compat = "fsl,imx7d-ccm",
> +	.src_compat = "fsl,imx7d-src",
> +	.gpc_compat = "fsl,imx7d-gpc",
> +	.ddrc_phy_num = ARRAY_SIZE(imx7d_ddrc_phy_ddr3_setting),
> +	.ddrc_phy_offset = imx7d_ddrc_phy_ddr3_setting,
> +	.ddrc_num = ARRAY_SIZE(imx7d_ddrc_ddr3_setting),
> +	.ddrc_offset = imx7d_ddrc_ddr3_setting,
> +};
> +
> +static int __init imx_gpcv2_suspend_init(struct imx_gpcv2_suspend *pm,
> +			const struct imx7_pm_socdata *socdata)
> +{
> +	struct imx7_pm_base aips_base[3] = { {0, 0}, {0, 0}, {0, 0} };
> +	struct imx7_pm_base sram_base = {0, 0};
> +	struct imx7_cpu_pm_info *pm_info;
> +	struct device_node *node;
> +	int i, ret = 0;
> +
> +	const u32 (*ddrc_phy_offset_array)[2];
> +	const u32 (*ddrc_offset_array)[2];
> +
> +	if (!socdata || !pm) {
> +		pr_warn("%s: invalid argument!\n", __func__);
> +		return -EINVAL;
> +	}
> +
> +	node = NULL;

You can do the initialization on top.

> +	for (i = 0; i < 3; i++) {
> +		node = of_find_compatible_node(node, NULL, "fsl,aips-bus");
> +		if (!node) {
> +			pr_warn("%s: failed to find aips %d node!\n",
> +					__func__, i);
> +			break;
> +		}
> +		ret = imx_get_base_from_node(node, &aips_base[i]);
> +		if (ret) {
> +			pr_warn("%s: failed to get aips[%d] base %d!\n",
> +					__func__, i, ret);
> +		}
> +	}

What are the aips_base used for? You would need to call of_node_put for
each of them.

> +
> +	ret = imx_get_exec_base_from_dt(&sram_base, "fsl,lpm-sram");
> +	if (ret) {
> +		pr_warn("%s: failed to get lpm-sram base %d!\n",
> +				__func__, ret);
> +		goto lpm_sram_map_failed;
> +	}
> +
> +	pm_info = sram_base.vbase;
> +	pm_info->pbase = sram_base.pbase;
> +	pm_info->resume_addr = virt_to_phys(ca7_cpu_resume);
> +	pm_info->pm_info_size = sizeof(*pm_info);
> +
> +	ret = imx_get_base_from_dt(&pm_info->ccm_base, socdata->ccm_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get ccm base %d!\n", __func__, ret);
> +		goto ccm_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->ddrc_base, socdata->ddrc_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get ddrc base %d!\n", __func__, ret);
> +		goto ddrc_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->ddrc_phy_base,
> +				socdata->ddrc_phy_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get ddrc_phy base %d!\n", __func__, ret);
> +		goto ddrc_phy_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->src_base, socdata->src_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get src base %d!\n", __func__, ret);
> +		goto src_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->iomuxc_gpr_base,
> +				socdata->iomuxc_gpr_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get iomuxc_gpr base %d!\n",
> +					__func__, ret);
> +		goto iomuxc_gpr_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->gpc_base, socdata->gpc_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get gpc base %d!\n", __func__, ret);
> +		goto gpc_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->anatop_base,
> +				socdata->anatop_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get anatop base %d!\n", __func__, ret);
> +		goto anatop_map_failed;
> +	}
> +
> +	pm_info->ddrc_num = socdata->ddrc_num;
> +	ddrc_offset_array = socdata->ddrc_offset;
> +	pm_info->ddrc_phy_num = socdata->ddrc_phy_num;
> +	ddrc_phy_offset_array = socdata->ddrc_phy_offset;
> +
> +	/* initialize DDRC settings */
> +	for (i = 0; i < pm_info->ddrc_num; i++) {
> +		pm_info->ddrc_val[i][0] = ddrc_offset_array[i][0];
> +		if (ddrc_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
> +			pm_info->ddrc_val[i][1] =
> +				readl_relaxed(pm_info->ddrc_base.vbase +
> +				ddrc_offset_array[i][0]);
> +		else
> +			pm_info->ddrc_val[i][1] = ddrc_offset_array[i][1];
> +	}
> +
> +	/* initialize DDRC PHY settings */
> +	for (i = 0; i < pm_info->ddrc_phy_num; i++) {
> +		pm_info->ddrc_phy_val[i][0] =
> +			ddrc_phy_offset_array[i][0];
> +		if (ddrc_phy_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
> +			pm_info->ddrc_phy_val[i][1] =
> +				readl_relaxed(pm_info->ddrc_phy_base.vbase +
> +				ddrc_phy_offset_array[i][0]);
> +		else
> +			pm_info->ddrc_phy_val[i][1] =
> +				ddrc_phy_offset_array[i][1];
> +	}
> +
> +	pm->suspend_fn_in_ocram = fncpy(
> +		sram_base.vbase + sizeof(*pm_info),
> +		&imx7_suspend,
> +		MX7_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));
> +	pm->ocram_vbase = sram_base.vbase;
> +
> +	goto put_node;
> +
> +anatop_map_failed:
> +	iounmap(pm_info->anatop_base.vbase);
> +gpc_map_failed:
> +	iounmap(pm_info->gpc_base.vbase);
> +iomuxc_gpr_map_failed:
> +	iounmap(pm_info->iomuxc_gpr_base.vbase);
> +src_map_failed:
> +	iounmap(pm_info->src_base.vbase);
> +ddrc_phy_map_failed:
> +	iounmap(pm_info->ddrc_phy_base.vbase);
> +ddrc_map_failed:
> +	iounmap(pm_info->ddrc_base.vbase);
> +ccm_map_failed:
> +	iounmap(pm_info->ccm_base.vbase);
> +lpm_sram_map_failed:
> +	iounmap(sram_base.vbase);
> +put_node:
> +	of_node_put(node);
> +
> +	return ret;
> +}
> +
> +static const struct platform_suspend_ops imx_gpcv2_pm_ops = {
> +	.enter = imx_gpcv2_pm_enter,
> +	.valid = imx_gpcv2_pm_valid,
> +};
> +
> +static int __init imx_gpcv2_pm_init(void)
> +{
> +	struct imx_gpcv2_suspend *pm;
> +	struct imx_gpcv2_irq *cd;
> +	struct imx_gpcv2 *gpc;
> +	int val;
> +
> +	pm = kzalloc(sizeof(struct imx_gpcv2_suspend), GFP_KERNEL);
> +	gpc = kzalloc(sizeof(struct imx_gpcv2), GFP_KERNEL);
> +	cd = gpcv2_irq_instance;
> +
> +	if (!cd || !pm || !gpc) {
> +		pr_debug("[GPCv2] %s init failed\r\n", __func__);
> +		return 0;
> +	}

This shortcut doesn't work, what if allocating pm succeeds and gpc does
not?

> +
> +	imx_gpcv2_suspend_init(pm, &imx7d_pm_data_ddr3);
> +
> +	pm->lpm_env_setup = imx_gpcv2_lpm_env_setup;
> +	pm->lpm_env_clean = imx_gpcv2_lpm_env_clean;
> +
> +	pm->lpm_cpu_power_gate = imx_gpcv2_lpm_cpu_power_gate;
> +	pm->lpm_plat_power_gate = imx_lpm_plat_power_gate;
> +	pm->lpm_enable_core = imx_gpcv2_lpm_enable_core;
> +	pm->set_mode = imx_gpcv2_lpm_set_mode;
> +
> +	pm->clear_slots = imx_gpcv2_lpm_clear_slots;
> +	pm->set_slot = imx_gpcv2_lpm_slot_setup;
> +
> +	pm->standby = imx_gpcv2_lpm_standby;
> +	pm->suspend = imx_gpcv2_lpm_suspend;
> +
> +	pr_debug("[GPCv2] %s \r\n", __func__);
> +	pm->anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
> +	WARN_ON(!pm->anatop);
> +	pm->imx_src = syscon_regmap_lookup_by_compatible("fsl,imx7d-src");
> +	WARN_ON(!pm->imx_src);
> +
> +	/*
> +	 * Due to hardware design failure, need to make sure GPR
> +	 * interrupt(#32) is unmasked during RUN mode to avoid entering
> +	 * DSM by mistake.
> +	 */
> +	writel_relaxed(~0x1, cd->gpc_base + cd->cpu2wakeup);
> +
> +	/* only external IRQs to wake up LPM and core 0/1 */
> +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
> +	val |= BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP;
> +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_BSC);
> +	/* mask m4 dsm trigger */
> +	writel_relaxed(readl_relaxed(cd->gpc_base + GPC_LPCR_M4) |
> +		BM_LPCR_M4_MASK_DSM_TRIGGER, cd->gpc_base + GPC_LPCR_M4);
> +	/* set mega/fast mix in A7 domain */
> +	writel_relaxed(0x1, cd->gpc_base + GPC_PGC_CPU_MAPPING);
> +	/* set SCU timing */
> +	writel_relaxed((0x59 << 10) | 0x5B | (0x51 << 20),
> +		cd->gpc_base + GPC_PGC_SCU_TIMING);
> +
> +	/* Mask the wakeup sources in M/F power domain */
> +	pm->mfmix_mask[0] = 0x54010000;
> +	pm->mfmix_mask[1] = 0xc00;
> +	pm->mfmix_mask[2] = 0x0;
> +	pm->mfmix_mask[3] = 0x400010;

What is this doing?

I stop here for now, will have a look at the assembly part another time.

--
Stefan

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D
@ 2015-07-30 22:44     ` Stefan Agner
  0 siblings, 0 replies; 18+ messages in thread
From: Stefan Agner @ 2015-07-30 22:44 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Shenwei,

The Subject sounds somewhat strange, if you mean your program code, then
you should not use the plural. Or maybe "add suspend states..." or
"support suspend states..."?

On 2015-07-27 21:30, Shenwei Wang wrote:
> IMX7D contains a new version of GPC IP block (GPCv2). It has two
> major functions: power management and wakeup source management.
> 
> GPCv2 provides low power mode control for Cortex-A7 and Cortex-M4
> domains. And it can support WAIT, STOP, and DSM(Deep Sleep Mode) modes.
> After configuring the GPCv2 module, the platform can enter into a
> selected mode either automatically triggered by ARM WFI instruction or
> manually by software. The system will exit the low power states
> by the predefined wakeup sources which are managed by the gpcv2
> irqchip driver.
> 
> This patch adds a new suspend driver to manage the power states on IMX7D.
> It currently supports "SUSPEND_STANDBY" and "SUSPEND_MEM" states.
> 
> Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
> Signed-off-by: Anson Huang <b20788@freescale.com>
> ---
>  arch/arm/mach-imx/Kconfig        |   1 +
>  arch/arm/mach-imx/Makefile       |   2 +
>  arch/arm/mach-imx/pm-imx7.c      | 901 +++++++++++++++++++++++++++++++++++++++
>  arch/arm/mach-imx/suspend-imx7.S | 529 +++++++++++++++++++++++
>  4 files changed, 1433 insertions(+)
>  create mode 100644 arch/arm/mach-imx/pm-imx7.c
>  create mode 100644 arch/arm/mach-imx/suspend-imx7.S
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 8ceda28..54f8553 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -562,6 +562,7 @@ config SOC_IMX7D
>  	select ARM_GIC
>  	select HAVE_IMX_ANATOP
>  	select HAVE_IMX_MMDC
> +	select IMX_GPCV2
>  	help
>  		This enables support for Freescale i.MX7 Dual processor.
>  
> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> index fb689d8..ca4c566 100644
> --- a/arch/arm/mach-imx/Makefile
> +++ b/arch/arm/mach-imx/Makefile
> @@ -88,6 +88,8 @@ obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o
>  
>  ifeq ($(CONFIG_SUSPEND),y)
>  AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
> +AFLAGS_suspend-imx7.o :=-Wa,-march=armv7-a
> +obj-$(CONFIG_IMX_GPCV2)	+= suspend-imx7.o pm-imx7.o
>  obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o

A rather strange ordering, can you keep the AFLAGS near the object file?

>  obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
>  endif
> diff --git a/arch/arm/mach-imx/pm-imx7.c b/arch/arm/mach-imx/pm-imx7.c
> new file mode 100644
> index 0000000..9035368
> --- /dev/null
> +++ b/arch/arm/mach-imx/pm-imx7.c
> @@ -0,0 +1,901 @@
> +/*
> + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/mfd/syscon.h>
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> +#include <linux/regmap.h>
> +#include <linux/suspend.h>
> +#include <linux/slab.h>
> +#include <asm/suspend.h>
> +#include <asm/fncpy.h>
> +
> +#include <soc/imx/gpcv2.h>
> +
> +#define BM_LPCR_A7_AD_L2PGE			0x10000
> +#define BM_LPCR_A7_AD_EN_C1_PUP			0x800
> +#define BM_LPCR_A7_AD_EN_C1_IRQ_PUP		0x400
> +#define BM_LPCR_A7_AD_EN_C0_PUP			0x200
> +#define BM_LPCR_A7_AD_EN_C0_IRQ_PUP		0x100
> +#define BM_LPCR_A7_AD_EN_PLAT_PDN		0x10
> +#define BM_LPCR_A7_AD_EN_C1_PDN			0x8
> +#define BM_LPCR_A7_AD_EN_C1_WFI_PDN		0x4
> +#define BM_LPCR_A7_AD_EN_C0_PDN			0x2
> +#define BM_LPCR_A7_AD_EN_C0_WFI_PDN		0x1
> +
> +#define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	0x70000000
> +#define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		0x4000
> +#define BM_LPCR_A7_BSC_LPM1			0xc
> +#define BM_LPCR_A7_BSC_LPM0			0x3
> +#define BP_LPCR_A7_BSC_LPM1			2
> +#define BP_LPCR_A7_BSC_LPM0			0
> +
> +#define BM_LPCR_M4_MASK_DSM_TRIGGER		0x80000000
> +
> +#define BM_SLPCR_EN_DSM				0x80000000
> +#define BM_SLPCR_RBC_EN				0x40000000
> +#define BM_SLPCR_VSTBY				0x4
> +#define BM_SLPCR_SBYOS				0x2
> +#define BM_SLPCR_BYPASS_PMIC_READY		0x1
> +
> +#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK	0x80000000
> +#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK	0x8000

Typically the bit field size + shifts is used here, e.g.

#define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	(0x7 << 28)
#define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		(0x1 << 14)

This is much easier to verify against the data sheet.

> +
> +#define GPC_LPCR_A7_BSC		0x0
> +#define GPC_LPCR_A7_AD		0x4
> +#define GPC_LPCR_M4		0x8
> +
> +#define GPC_PGC_CPU_MAPPING	0xec
> +#define GPC_PGC_SCU_TIMING	0x890
> +
> +#define GPC_SLPCR		0x14
> +#define GPC_PGC_ACK_SEL_A7	0x24
> +
> +#define GPC_SLOT0_CFG		0xb0
> +
> +#define GPC_PGC_C0		0x800
> +#define GPC_PGC_SCU_TIMING	0x890
> +#define GPC_PGC_C1		0x840
> +#define GPC_PGC_SCU		0x880
> +#define GPC_PGC_FM		0xa00
> +
> +#define ANADIG_ARM_PLL		0x60
> +#define ANADIG_DDR_PLL		0x70
> +#define ANADIG_SYS_PLL		0xb0
> +#define ANADIG_ENET_PLL		0xe0
> +#define ANADIG_AUDIO_PLL	0xf0
> +#define ANADIG_VIDEO_PLL	0x130
> +
> +#define MAX_SLOT_NUMBER		10
> +#define A7_LPM_WAIT		0x5
> +#define A7_LPM_STOP		0xa
> +
> +#define REG_SET			0x4
> +#define REG_CLR			0x8
> +
> +enum gpcv2_mode {
> +	WAIT_CLOCKED,
> +	WAIT_UNCLOCKED,
> +	WAIT_UNCLOCKED_POWER_OFF,
> +	STOP_POWER_ON,
> +	STOP_POWER_OFF,
> +};
> +
> +/* GPCv2 has the following power domains, and each domain can be power-up
> + * and power-down via GPC settings.
> + *
> + * 	Core 0 of A7 power domain
> + * 	Core1 of A7 power domain
> + * 	SCU/L2 cache RAM of A7 power domain
> + * 	Fastmix and megamix power domain
> + * 	USB OTG1 PHY power domain
> + * 	USB OTG2 PHY power domain
> + * 	PCIE PHY power domain
> + * 	USB HSIC PHY power domain
> + *	Core 0 of M4 power domain
> + */

Nit: a empty line is the preferred format in this part of the kernel:

/*
 * Start here...

> +enum gpcv2_slot {
> +	CORE0_A7,
> +	CORE1_A7,
> +	SCU_A7,
> +	FAST_MEGA_MIX,
> +	MIPI_PHY,
> +	PCIE_PHY,
> +	USB_OTG1_PHY,
> +	USB_OTG2_PHY,
> +	USB_HSIC_PHY,
> +	CORE0_M4,
> +};
> +
> +struct imx_gpcv2;
> +
> +struct imx_gpcv2_suspend {
> +	struct regmap *anatop;
> +	struct regmap *imx_src;
> +	u32 mfmix_mask[IMR_NUM];
> +	u32 wakeupmix_mask[IMR_NUM];
> +	u32 lpsrmix_mask[IMR_NUM];
> +
> +	void (*set_mode)(struct imx_gpcv2 *, enum gpcv2_mode mode);
> +	void (*lpm_cpu_power_gate)(struct imx_gpcv2 *, u32, bool);
> +	void (*lpm_plat_power_gate)(struct imx_gpcv2 *, bool);
> +	void (*lpm_env_setup)(struct imx_gpcv2 *);
> +	void (*lpm_env_clean)(struct imx_gpcv2 *);
> +
> +	void (*set_slot)(struct imx_gpcv2 *cd, u32 index,
> +			enum gpcv2_slot m_core, bool mode, bool ack);
> +	void (*clear_slots)(struct imx_gpcv2 *);
> +	void (*lpm_enable_core)(struct imx_gpcv2 *,
> +			bool enable, u32 offset);
> +
> +	void (*standby)(struct imx_gpcv2 *);
> +	void (*suspend)(struct imx_gpcv2 *);
> +
> +	void (*suspend_fn_in_ocram)(void __iomem *ocram_vbase);
> +	void __iomem *ocram_vbase;
> +};
> +
> +struct imx_gpcv2 {
> +	spinlock_t lock;
> +	struct imx_gpcv2_irq *irqchip;
> +	struct imx_gpcv2_suspend *pm;
> +};
> +
> +extern struct imx_gpcv2_irq *gpcv2_irq_instance;
> +static struct imx_gpcv2 *gpcv2_instance;
> +
> +static void imx_gpcv2_lpm_clear_slots(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	int i;
> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +	for (i = 0; i < MAX_SLOT_NUMBER; i++)
> +		writel_relaxed(0x0, cd->gpc_base + GPC_SLOT0_CFG + i * 0x4);
> +	writel_relaxed(BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK |
> +		BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK,
> +		cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> +
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_gpcv2_lpm_enable_core(struct imx_gpcv2 *gpc,
> +			bool enable, u32 offset)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +	writel_relaxed(enable, cd->gpc_base + offset);
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_gpcv2_lpm_slot_setup(struct imx_gpcv2 *gpc,
> +		u32 index, enum gpcv2_slot m_core, bool mode, bool ack)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	u32 val;
> +
> +	if (index >= MAX_SLOT_NUMBER)
> +		pr_err("Invalid slot index!\n");

Is a return missing here? The check seems rather useless otherwise.

> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +	/* set slot */
> +	writel_relaxed((mode + 1) << (m_core * 2), cd->gpc_base +
> +		GPC_SLOT0_CFG + index * 4);

Can you create a preprocessor for the slot register?

#define GPC_SLOTx_CFG(x) (0xb0 + 4 * (x))

The parameter m_core has a unintuitive name, slot sounds much better to
me.

Also boolean and an addition is somewhat strange, I would prefer
something like:
mode ? 0x2 : 0x1 << (slot * 2)

> +
> +	if (ack) {
> +		/* set ack */
> +		val = readl_relaxed(cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> +		/* clear dummy ack */
> +		val &= ~(1 << (15 + (mode ? 16 : 0)));
> +		val |= 1 << (m_core + (mode ? 16 : 0));

Can you come up with macros here too? That is not readable...

For the dummy ack I would suggest to create dedicated defines and for
the power domain acks something which takes the slot as argument...

> +		writel_relaxed(val, cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> +	}
> +
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_gpcv2_lpm_env_setup(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_suspend *pm = gpc->pm;
> +
> +	/* PLL and PFDs overwrite set */
> +	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_SET, 1 << 20);
> +	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_SET, 1 << 19);
> +	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_SET, 0x1ff << 17);
> +	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_SET, 1 << 13);
> +	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_SET, 1 << 24);
> +	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_SET, 1 << 24);
> +}
> +
> +static void imx_gpcv2_lpm_env_clean(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_suspend *pm = gpc->pm;
> +
> +	/* PLL and PFDs overwrite clear */
> +	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_CLR, 1 << 20);
> +	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_CLR, 1 << 19);
> +	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_CLR, 0x1ff << 17);
> +	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_CLR, 1 << 13);
> +	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_CLR, 1 << 24);
> +	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_CLR, 1 << 24);
> +}
> +
> +static void imx_gpcv2_lpm_set_mode(struct imx_gpcv2 *gpc,
> +		enum gpcv2_mode mode)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	u32 val1, val2;

Please use names which say something. tmp and i is ok, if it's a
temporary variable or a counter, but not val1/val2...

> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +
> +	val1 = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
> +	val2 = readl_relaxed(cd->gpc_base + GPC_SLPCR);
> +
> +	/* all cores' LPM settings must be same */
> +	val1 &= ~(BM_LPCR_A7_BSC_LPM0 | BM_LPCR_A7_BSC_LPM1);
> +
> +	val1 |= BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> +
> +	val2 &= ~(BM_SLPCR_EN_DSM | BM_SLPCR_VSTBY | BM_SLPCR_RBC_EN |
> +		BM_SLPCR_SBYOS | BM_SLPCR_BYPASS_PMIC_READY);
> +	/*
> +	 * GPCv2: When improper low-power sequence is used,
> +	 * the SoC enters low power mode before the ARM core executes WFI.
> +	 *
> +	 * Software workaround:
> +	 * 1) Software should trigger IRQ #32 (IOMUX) to be always pending
> +	 *    by setting IOMUX_GPR1_IRQ.
> +	 * 2) Software should then unmask IRQ #32 in GPC before setting GPC
> +	 *    Low-Power mode.
> +	 * 3) Software should mask IRQ #32 right after GPC Low-Power mode
> +	 *    is set.
> +	 */
> +	switch (mode) {
> +	case WAIT_CLOCKED:
> +		break;
> +	case WAIT_UNCLOCKED:
> +		val1 |= A7_LPM_WAIT << BP_LPCR_A7_BSC_LPM0;
> +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> +		break;
> +	case STOP_POWER_ON:
> +		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
> +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> +		val2 |= BM_SLPCR_EN_DSM;
> +		val2 |= BM_SLPCR_RBC_EN;
> +		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
> +		break;
> +	case STOP_POWER_OFF:
> +		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
> +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> +		val2 |= BM_SLPCR_EN_DSM;
> +		val2 |= BM_SLPCR_RBC_EN;
> +		val2 |= BM_SLPCR_SBYOS;
> +		val2 |= BM_SLPCR_VSTBY;
> +		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
> +		break;
> +	default:
> +		return;

What about the spin lock?

> +	}
> +	writel_relaxed(val1, cd->gpc_base + GPC_LPCR_A7_BSC);
> +	writel_relaxed(val2, cd->gpc_base + GPC_SLPCR);
> +
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +
> +static void imx_gpcv2_lpm_cpu_power_gate(struct imx_gpcv2 *gpc,
> +				u32 cpu, bool pdn)

Hm, pdn is somewhat overused here. Your bool pdn says that you want to
power gate a certain core. Below you then set PDN and PUP, that is
somewhat confusing. Maybe bool engate or en_lpm?

> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	u32 val;
> +
> +	const u32 val_pdn[2] = {
> +		BM_LPCR_A7_AD_EN_C0_PDN | BM_LPCR_A7_AD_EN_C0_PUP,
> +		BM_LPCR_A7_AD_EN_C1_PDN | BM_LPCR_A7_AD_EN_C1_PUP,
> +	};
> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +
> +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
> +	if (pdn)
> +		val |= val_pdn[cpu];
> +	else
> +		val &= ~val_pdn[cpu];
> +
> +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_lpm_plat_power_gate(struct imx_gpcv2 *gpc, bool pdn)
> +{
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	unsigned long flags;
> +	u32 val;
> +
> +	spin_lock_irqsave(&gpc->lock, flags);
> +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
> +	val &= ~(BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE);
> +	if (pdn)
> +		val |= BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE;
> +
> +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
> +	spin_unlock_irqrestore(&gpc->lock, flags);
> +}
> +
> +static void imx_gpcv2_lpm_standby(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_suspend *pm = gpc->pm;
> +
> +	pm->lpm_env_setup(gpc);
> +	/* pm->set_mode(gpc, STOP_POWER_OFF); */
> +	pm->set_mode(gpc, WAIT_UNCLOCKED);
> +
> +	pr_debug("[GPCv2] %s %d\r\n", __func__, __LINE__);
> +	/* Zzz ... */
> +	cpu_do_idle();
> +
> +	pm->set_mode(gpc, WAIT_CLOCKED);
> +	pm->lpm_env_clean(gpc);
> +}
> +
> +
> +
> +static int gpcv2_suspend_finish(unsigned long val)
> +{
> +	struct imx_gpcv2_suspend *pm = (struct imx_gpcv2_suspend *)val;
> +
> +	if (!pm->suspend_fn_in_ocram) {
> +		cpu_do_idle();
> +	} else {
> +		/*
> +		 * call low level suspend function in ocram,
> +		 * as we need to float DDR IO.
> +		 */
> +		local_flush_tlb_all();
> +		pm->suspend_fn_in_ocram(pm->ocram_vbase);
> +	}
> +
> +	return 0;
> +}
> +static void imx_gpcv2_lpm_suspend(struct imx_gpcv2 *gpc)
> +{
> +	struct imx_gpcv2_suspend *pm = gpc->pm;
> +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> +	int i = 0;
> +
> +	pm->lpm_env_setup(gpc);
> +	pm->set_mode(gpc, STOP_POWER_OFF);
> +
> +	/* enable core0 power down/up with low power mode */
> +	pm->lpm_cpu_power_gate(gpc, 0, true);
> +
> +	/* enable plat power down with low power mode */
> +	pm->lpm_plat_power_gate(gpc, true);
> +
> +	/*
> +	 * To avoid confuse, we use slot 0~4 for power down,
> +	 * slot 5~9 for power up.
> +	 *
> +	 * Power down slot sequence:
> +	 * Slot0 -> CORE0
> +	 * Slot1 -> Mega/Fast MIX
> +	 * Slot2 -> SCU
> +	 *
> +	 * Power up slot sequence:
> +	 * Slot5 -> Mega/Fast MIX
> +	 * Slot6 -> SCU
> +	 * Slot7 -> CORE0
> +	 */
> +	pm->set_slot(gpc, 0, CORE0_A7, false, false);
> +	pm->set_slot(gpc, 2, SCU_A7, false, true);

Maybe it would be better to introduce a enum for the
power-up/power-down?


> +
> +	for (i = 0; i < IMR_NUM; i++) {
> +		if ((~cd->wakeup_sources[i] & pm->mfmix_mask[i]) != 0)
> +			break;
> +
> +		pm->set_slot(gpc, 1, FAST_MEGA_MIX, false, false);
> +		pm->set_slot(gpc, 5, FAST_MEGA_MIX, true, false);
> +		pm->lpm_enable_core(gpc, true, GPC_PGC_FM);
> +		break;
> +	}

This is somewhat weird. You break either way in the first loop don't
you? Why using a loop then?

> +
> +	pm->set_slot(gpc, 6, SCU_A7, true, false);
> +	pm->set_slot(gpc, 7, CORE0_A7, true, true);
> +
> +	/* enable core0, scu */
> +	pm->lpm_enable_core(gpc, true, GPC_PGC_C0);
> +	pm->lpm_enable_core(gpc, true, GPC_PGC_SCU);
> +
> +	/* Suspend to MEM has not been implemented yet */
> +	cpu_suspend((unsigned long)pm, gpcv2_suspend_finish);

What does that mean?

> +
> +	pm->lpm_env_clean(gpc);
> +	pm->set_mode(gpc, WAIT_CLOCKED);
> +	pm->lpm_cpu_power_gate(gpc, 0, false);
> +	pm->lpm_plat_power_gate(gpc, false);
> +
> +	pm->lpm_enable_core(gpc, false, GPC_PGC_C0);
> +	pm->lpm_enable_core(gpc, false, GPC_PGC_SCU);
> +	pm->lpm_enable_core(gpc, false, GPC_PGC_FM);
> +	pm->clear_slots(gpc);
> +}
> +
> +static int imx_gpcv2_pm_enter(suspend_state_t state)
> +{
> +	struct imx_gpcv2_suspend *pm;
> +
> +	BUG_ON(!gpcv2_instance);
> +	pm = gpcv2_instance->pm;
> +
> +	switch (state) {
> +	case PM_SUSPEND_STANDBY:
> +		pm->standby(gpcv2_instance);
> +		break;
> +
> +	case PM_SUSPEND_MEM:
> +		pm->suspend(gpcv2_instance);
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +static int imx_gpcv2_pm_valid(suspend_state_t state)
> +{
> +	return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;
> +}
> +
> +
> +#define MX7_MAX_DDRC_NUM		32
> +#define MX7_MAX_DDRC_PHY_NUM		16
> +
> +#define READ_DATA_FROM_HARDWARE		0
> +#define MX7_SUSPEND_OCRAM_SIZE		0x1000
> +
> +struct imx7_pm_base {
> +	phys_addr_t pbase;
> +	void __iomem *vbase;
> +};
> +
> +struct imx7_pm_socdata {
> +	u32 ddr_type;
> +	const char *ddrc_compat;
> +	const char *ddrc_phy_compat;
> +	const char *src_compat;
> +	const char *iomuxc_gpr_compat;
> +	const char *ccm_compat;
> +	const char *gpc_compat;
> +	const char *anatop_compat;
> +	const u32 ddrc_num;
> +	const u32 (*ddrc_offset)[2];
> +	const u32 ddrc_phy_num;
> +	const u32 (*ddrc_phy_offset)[2];
> +};
> +
> +/*
> + * This structure is for passing necessary data for low level ocram
> + * suspend code(arch/arm/mach-imx/suspend-imx7.S), if this struct
> + * definition is changed, the offset definition in
> + * arch/arm/mach-imx/suspend-imx7.S must be also changed accordingly,
> + * otherwise, the suspend to ocram function will be broken!
> + */
> +struct imx7_cpu_pm_info {
> +	u32 m4_reserve0;
> +	u32 m4_reserve1;
> +	u32 m4_reserve2;
> +
> +	/* The physical address of pm_info. */
> +	phys_addr_t pbase;
> +
> +	/* The physical resume address for asm code */
> +	phys_addr_t resume_addr;
> +	u32 ddr_type;
> +
> +	u32 pm_info_size;
> +
> +	struct imx7_pm_base ddrc_base;
> +	struct imx7_pm_base ddrc_phy_base;
> +	struct imx7_pm_base src_base;
> +	struct imx7_pm_base iomuxc_gpr_base;
> +	struct imx7_pm_base ccm_base;
> +	struct imx7_pm_base gpc_base;
> +	struct imx7_pm_base l2_base;
> +	struct imx7_pm_base anatop_base;
> +
> +	u32 ttbr1;
> +
> +	/* Number of DDRC which need saved/restored. */
> +	u32 ddrc_num;
> +
> +	/* To save offset and value */
> +	u32 ddrc_val[MX7_MAX_DDRC_NUM][2];
> +
> +	/* Number of DDRC which need saved/restored. */
> +	u32 ddrc_phy_num;
> +
> +	/* To save offset and value */
> +	u32 ddrc_phy_val[MX7_MAX_DDRC_NUM][2];
> +} __aligned(8);
> +
> +static int __init imx_get_base_from_node(struct device_node *node,
> +			struct imx7_pm_base *base)
> +{
> +	struct resource res;
> +	int ret = 0;
> +
> +	ret = of_address_to_resource(node, 0, &res);
> +	if (ret)
> +		goto put_node;
> +
> +	base->pbase = res.start;
> +	base->vbase = ioremap(res.start, resource_size(&res));
> +	if (!base->vbase) {
> +		iounmap(base->vbase);
> +		ret = -ENOMEM;
> +	}
> +put_node:
> +	of_node_put(node);
> +
> +	return ret;
> +}
> +
> +static int __init imx_get_base_from_dt(struct imx7_pm_base *base,
> +				const char *compat)
> +{
> +	struct device_node *node;
> +	struct resource res;
> +	int ret = 0;
> +
> +	node = of_find_compatible_node(NULL, NULL, compat);
> +	if (!node) {
> +		ret = -ENODEV;
> +		goto out;
> +	}
> +
> +	ret = of_address_to_resource(node, 0, &res);
> +	if (ret)
> +		goto put_node;
> +
> +	base->pbase = res.start;
> +	base->vbase = ioremap(res.start, resource_size(&res));
> +	if (!base->vbase)
> +		ret = -ENOMEM;
> +
> +put_node:
> +	of_node_put(node);
> +out:
> +	return ret;
> +}
> +
> +static int __init imx_get_exec_base_from_dt(struct imx7_pm_base *base,
> +				const char *compat)
> +{
> +	struct device_node *node;
> +	struct resource res;
> +	int ret = 0;
> +
> +	node = of_find_compatible_node(NULL, NULL, compat);
> +	if (!node) {
> +		ret = -ENODEV;
> +		goto out;
> +	}
> +
> +	ret = of_address_to_resource(node, 0, &res);
> +	if (ret)
> +		goto put_node;
> +
> +	base->pbase = res.start;
> +	base->vbase = __arm_ioremap_exec(res.start, resource_size(&res), false);
> +
> +	if (!base->vbase)
> +		ret = -ENOMEM;
> +
> +put_node:
> +	of_node_put(node);
> +out:
> +	return ret;
> +}
> +
> +static const u32 imx7d_ddrc_ddr3_setting[][2] __initconst = {
> +	{ 0x0, READ_DATA_FROM_HARDWARE },
> +	{ 0x1a0, READ_DATA_FROM_HARDWARE },
> +	{ 0x1a4, READ_DATA_FROM_HARDWARE },
> +	{ 0x1a8, READ_DATA_FROM_HARDWARE },
> +	{ 0x64, READ_DATA_FROM_HARDWARE },
> +	{ 0x490, 0x00000001 },
> +	{ 0xd0, 0xc0020001 },
> +	{ 0xd4, READ_DATA_FROM_HARDWARE },
> +	{ 0xdc, READ_DATA_FROM_HARDWARE },
> +	{ 0xe0, READ_DATA_FROM_HARDWARE },
> +	{ 0xe4, READ_DATA_FROM_HARDWARE },
> +	{ 0xf4, READ_DATA_FROM_HARDWARE },
> +	{ 0x100, READ_DATA_FROM_HARDWARE },
> +	{ 0x104, READ_DATA_FROM_HARDWARE },
> +	{ 0x108, READ_DATA_FROM_HARDWARE },
> +	{ 0x10c, READ_DATA_FROM_HARDWARE },
> +	{ 0x110, READ_DATA_FROM_HARDWARE },
> +	{ 0x114, READ_DATA_FROM_HARDWARE },
> +	{ 0x120, 0x03030803 },
> +	{ 0x180, READ_DATA_FROM_HARDWARE },
> +	{ 0x190, READ_DATA_FROM_HARDWARE },
> +	{ 0x194, READ_DATA_FROM_HARDWARE },
> +	{ 0x200, READ_DATA_FROM_HARDWARE },
> +	{ 0x204, READ_DATA_FROM_HARDWARE },
> +	{ 0x214, READ_DATA_FROM_HARDWARE },
> +	{ 0x218, READ_DATA_FROM_HARDWARE },
> +	{ 0x240, 0x06000601 },
> +	{ 0x244, READ_DATA_FROM_HARDWARE },
> +};
> +
> +static const u32 imx7d_ddrc_phy_ddr3_setting[][2] __initconst = {
> +	{ 0x0, READ_DATA_FROM_HARDWARE },
> +	{ 0x4, READ_DATA_FROM_HARDWARE },
> +	{ 0x10, READ_DATA_FROM_HARDWARE },
> +	{ 0x9c, READ_DATA_FROM_HARDWARE },
> +	{ 0x20, READ_DATA_FROM_HARDWARE },
> +	{ 0x30, READ_DATA_FROM_HARDWARE },
> +	{ 0x50, 0x01000010 },
> +	{ 0x50, 0x00000010 },
> +	{ 0xc0, 0x0e407304 },
> +	{ 0xc0, 0x0e447304 },
> +	{ 0xc0, 0x0e447306 },
> +	{ 0xc0, 0x0e447304 },
> +	{ 0xc0, 0x0e407306 },
> +};
> +
> +static const struct imx7_pm_socdata imx7d_pm_data_ddr3 __initconst = {
> +	.iomuxc_gpr_compat = "fsl,imx7d-iomuxc",
> +	.ddrc_phy_compat = "fsl,imx7d-ddrc-phy",
> +	.anatop_compat = "fsl,imx7d-anatop",
> +	.ddrc_compat = "fsl,imx7d-ddrc",
> +	.ccm_compat = "fsl,imx7d-ccm",
> +	.src_compat = "fsl,imx7d-src",
> +	.gpc_compat = "fsl,imx7d-gpc",
> +	.ddrc_phy_num = ARRAY_SIZE(imx7d_ddrc_phy_ddr3_setting),
> +	.ddrc_phy_offset = imx7d_ddrc_phy_ddr3_setting,
> +	.ddrc_num = ARRAY_SIZE(imx7d_ddrc_ddr3_setting),
> +	.ddrc_offset = imx7d_ddrc_ddr3_setting,
> +};
> +
> +static int __init imx_gpcv2_suspend_init(struct imx_gpcv2_suspend *pm,
> +			const struct imx7_pm_socdata *socdata)
> +{
> +	struct imx7_pm_base aips_base[3] = { {0, 0}, {0, 0}, {0, 0} };
> +	struct imx7_pm_base sram_base = {0, 0};
> +	struct imx7_cpu_pm_info *pm_info;
> +	struct device_node *node;
> +	int i, ret = 0;
> +
> +	const u32 (*ddrc_phy_offset_array)[2];
> +	const u32 (*ddrc_offset_array)[2];
> +
> +	if (!socdata || !pm) {
> +		pr_warn("%s: invalid argument!\n", __func__);
> +		return -EINVAL;
> +	}
> +
> +	node = NULL;

You can do the initialization on top.

> +	for (i = 0; i < 3; i++) {
> +		node = of_find_compatible_node(node, NULL, "fsl,aips-bus");
> +		if (!node) {
> +			pr_warn("%s: failed to find aips %d node!\n",
> +					__func__, i);
> +			break;
> +		}
> +		ret = imx_get_base_from_node(node, &aips_base[i]);
> +		if (ret) {
> +			pr_warn("%s: failed to get aips[%d] base %d!\n",
> +					__func__, i, ret);
> +		}
> +	}

What are the aips_base used for? You would need to call of_node_put for
each of them.

> +
> +	ret = imx_get_exec_base_from_dt(&sram_base, "fsl,lpm-sram");
> +	if (ret) {
> +		pr_warn("%s: failed to get lpm-sram base %d!\n",
> +				__func__, ret);
> +		goto lpm_sram_map_failed;
> +	}
> +
> +	pm_info = sram_base.vbase;
> +	pm_info->pbase = sram_base.pbase;
> +	pm_info->resume_addr = virt_to_phys(ca7_cpu_resume);
> +	pm_info->pm_info_size = sizeof(*pm_info);
> +
> +	ret = imx_get_base_from_dt(&pm_info->ccm_base, socdata->ccm_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get ccm base %d!\n", __func__, ret);
> +		goto ccm_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->ddrc_base, socdata->ddrc_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get ddrc base %d!\n", __func__, ret);
> +		goto ddrc_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->ddrc_phy_base,
> +				socdata->ddrc_phy_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get ddrc_phy base %d!\n", __func__, ret);
> +		goto ddrc_phy_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->src_base, socdata->src_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get src base %d!\n", __func__, ret);
> +		goto src_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->iomuxc_gpr_base,
> +				socdata->iomuxc_gpr_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get iomuxc_gpr base %d!\n",
> +					__func__, ret);
> +		goto iomuxc_gpr_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->gpc_base, socdata->gpc_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get gpc base %d!\n", __func__, ret);
> +		goto gpc_map_failed;
> +	}
> +
> +	ret = imx_get_base_from_dt(&pm_info->anatop_base,
> +				socdata->anatop_compat);
> +	if (ret) {
> +		pr_warn("%s: failed to get anatop base %d!\n", __func__, ret);
> +		goto anatop_map_failed;
> +	}
> +
> +	pm_info->ddrc_num = socdata->ddrc_num;
> +	ddrc_offset_array = socdata->ddrc_offset;
> +	pm_info->ddrc_phy_num = socdata->ddrc_phy_num;
> +	ddrc_phy_offset_array = socdata->ddrc_phy_offset;
> +
> +	/* initialize DDRC settings */
> +	for (i = 0; i < pm_info->ddrc_num; i++) {
> +		pm_info->ddrc_val[i][0] = ddrc_offset_array[i][0];
> +		if (ddrc_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
> +			pm_info->ddrc_val[i][1] =
> +				readl_relaxed(pm_info->ddrc_base.vbase +
> +				ddrc_offset_array[i][0]);
> +		else
> +			pm_info->ddrc_val[i][1] = ddrc_offset_array[i][1];
> +	}
> +
> +	/* initialize DDRC PHY settings */
> +	for (i = 0; i < pm_info->ddrc_phy_num; i++) {
> +		pm_info->ddrc_phy_val[i][0] =
> +			ddrc_phy_offset_array[i][0];
> +		if (ddrc_phy_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
> +			pm_info->ddrc_phy_val[i][1] =
> +				readl_relaxed(pm_info->ddrc_phy_base.vbase +
> +				ddrc_phy_offset_array[i][0]);
> +		else
> +			pm_info->ddrc_phy_val[i][1] =
> +				ddrc_phy_offset_array[i][1];
> +	}
> +
> +	pm->suspend_fn_in_ocram = fncpy(
> +		sram_base.vbase + sizeof(*pm_info),
> +		&imx7_suspend,
> +		MX7_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));
> +	pm->ocram_vbase = sram_base.vbase;
> +
> +	goto put_node;
> +
> +anatop_map_failed:
> +	iounmap(pm_info->anatop_base.vbase);
> +gpc_map_failed:
> +	iounmap(pm_info->gpc_base.vbase);
> +iomuxc_gpr_map_failed:
> +	iounmap(pm_info->iomuxc_gpr_base.vbase);
> +src_map_failed:
> +	iounmap(pm_info->src_base.vbase);
> +ddrc_phy_map_failed:
> +	iounmap(pm_info->ddrc_phy_base.vbase);
> +ddrc_map_failed:
> +	iounmap(pm_info->ddrc_base.vbase);
> +ccm_map_failed:
> +	iounmap(pm_info->ccm_base.vbase);
> +lpm_sram_map_failed:
> +	iounmap(sram_base.vbase);
> +put_node:
> +	of_node_put(node);
> +
> +	return ret;
> +}
> +
> +static const struct platform_suspend_ops imx_gpcv2_pm_ops = {
> +	.enter = imx_gpcv2_pm_enter,
> +	.valid = imx_gpcv2_pm_valid,
> +};
> +
> +static int __init imx_gpcv2_pm_init(void)
> +{
> +	struct imx_gpcv2_suspend *pm;
> +	struct imx_gpcv2_irq *cd;
> +	struct imx_gpcv2 *gpc;
> +	int val;
> +
> +	pm = kzalloc(sizeof(struct imx_gpcv2_suspend), GFP_KERNEL);
> +	gpc = kzalloc(sizeof(struct imx_gpcv2), GFP_KERNEL);
> +	cd = gpcv2_irq_instance;
> +
> +	if (!cd || !pm || !gpc) {
> +		pr_debug("[GPCv2] %s init failed\r\n", __func__);
> +		return 0;
> +	}

This shortcut doesn't work, what if allocating pm succeeds and gpc does
not?

> +
> +	imx_gpcv2_suspend_init(pm, &imx7d_pm_data_ddr3);
> +
> +	pm->lpm_env_setup = imx_gpcv2_lpm_env_setup;
> +	pm->lpm_env_clean = imx_gpcv2_lpm_env_clean;
> +
> +	pm->lpm_cpu_power_gate = imx_gpcv2_lpm_cpu_power_gate;
> +	pm->lpm_plat_power_gate = imx_lpm_plat_power_gate;
> +	pm->lpm_enable_core = imx_gpcv2_lpm_enable_core;
> +	pm->set_mode = imx_gpcv2_lpm_set_mode;
> +
> +	pm->clear_slots = imx_gpcv2_lpm_clear_slots;
> +	pm->set_slot = imx_gpcv2_lpm_slot_setup;
> +
> +	pm->standby = imx_gpcv2_lpm_standby;
> +	pm->suspend = imx_gpcv2_lpm_suspend;
> +
> +	pr_debug("[GPCv2] %s \r\n", __func__);
> +	pm->anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
> +	WARN_ON(!pm->anatop);
> +	pm->imx_src = syscon_regmap_lookup_by_compatible("fsl,imx7d-src");
> +	WARN_ON(!pm->imx_src);
> +
> +	/*
> +	 * Due to hardware design failure, need to make sure GPR
> +	 * interrupt(#32) is unmasked during RUN mode to avoid entering
> +	 * DSM by mistake.
> +	 */
> +	writel_relaxed(~0x1, cd->gpc_base + cd->cpu2wakeup);
> +
> +	/* only external IRQs to wake up LPM and core 0/1 */
> +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
> +	val |= BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP;
> +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_BSC);
> +	/* mask m4 dsm trigger */
> +	writel_relaxed(readl_relaxed(cd->gpc_base + GPC_LPCR_M4) |
> +		BM_LPCR_M4_MASK_DSM_TRIGGER, cd->gpc_base + GPC_LPCR_M4);
> +	/* set mega/fast mix in A7 domain */
> +	writel_relaxed(0x1, cd->gpc_base + GPC_PGC_CPU_MAPPING);
> +	/* set SCU timing */
> +	writel_relaxed((0x59 << 10) | 0x5B | (0x51 << 20),
> +		cd->gpc_base + GPC_PGC_SCU_TIMING);
> +
> +	/* Mask the wakeup sources in M/F power domain */
> +	pm->mfmix_mask[0] = 0x54010000;
> +	pm->mfmix_mask[1] = 0xc00;
> +	pm->mfmix_mask[2] = 0x0;
> +	pm->mfmix_mask[3] = 0x400010;

What is this doing?

I stop here for now, will have a look at the assembly part another time.

--
Stefan

^ permalink raw reply	[flat|nested] 18+ messages in thread

* RE: [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D
  2015-07-30 22:44     ` Stefan Agner
@ 2015-07-31 15:26       ` Shenwei Wang
  -1 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-31 15:26 UTC (permalink / raw)
  To: Stefan Agner
  Cc: shawn.guo, tglx, jason, Huang Anson, linux-kernel, linux-arm-kernel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="gb2312", Size: 33586 bytes --]

Hi Stefan,

> -----Original Message-----
> From: Stefan Agner [mailto:stefan@agner.ch]
> Sent: 2015Äê7ÔÂ30ÈÕ 17:44
> To: Wang Shenwei-B38339
> Cc: shawn.guo@linaro.org; tglx@linutronix.de; jason@lakedaemon.net; Huang
> Yongcai-B20788; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D
> 
> Hi Shenwei,
> 
> The Subject sounds somewhat strange, if you mean your program code, then you
> should not use the plural. Or maybe "add suspend states..." or "support suspend
> states..."?

Good suggestion! Will change to support suspend states on imx7d.

> On 2015-07-27 21:30, Shenwei Wang wrote:
> > IMX7D contains a new version of GPC IP block (GPCv2). It has two major
> > functions: power management and wakeup source management.
> >
> > GPCv2 provides low power mode control for Cortex-A7 and Cortex-M4
> > domains. And it can support WAIT, STOP, and DSM(Deep Sleep Mode) modes.
> > After configuring the GPCv2 module, the platform can enter into a
> > selected mode either automatically triggered by ARM WFI instruction or
> > manually by software. The system will exit the low power states by the
> > predefined wakeup sources which are managed by the gpcv2 irqchip
> > driver.
> >
> > This patch adds a new suspend driver to manage the power states on IMX7D.
> > It currently supports "SUSPEND_STANDBY" and "SUSPEND_MEM" states.
> >
> > Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
> > Signed-off-by: Anson Huang <b20788@freescale.com>
> > ---
> >  arch/arm/mach-imx/Kconfig        |   1 +
> >  arch/arm/mach-imx/Makefile       |   2 +
> >  arch/arm/mach-imx/pm-imx7.c      | 901
> +++++++++++++++++++++++++++++++++++++++
> >  arch/arm/mach-imx/suspend-imx7.S | 529 +++++++++++++++++++++++
> >  4 files changed, 1433 insertions(+)
> >  create mode 100644 arch/arm/mach-imx/pm-imx7.c  create mode 100644
> > arch/arm/mach-imx/suspend-imx7.S
> >
> > diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> > index 8ceda28..54f8553 100644
> > --- a/arch/arm/mach-imx/Kconfig
> > +++ b/arch/arm/mach-imx/Kconfig
> > @@ -562,6 +562,7 @@ config SOC_IMX7D
> >  	select ARM_GIC
> >  	select HAVE_IMX_ANATOP
> >  	select HAVE_IMX_MMDC
> > +	select IMX_GPCV2
> >  	help
> >  		This enables support for Freescale i.MX7 Dual processor.
> >
> > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> > index fb689d8..ca4c566 100644
> > --- a/arch/arm/mach-imx/Makefile
> > +++ b/arch/arm/mach-imx/Makefile
> > @@ -88,6 +88,8 @@ obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o
> >
> >  ifeq ($(CONFIG_SUSPEND),y)
> >  AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
> > +AFLAGS_suspend-imx7.o :=-Wa,-march=armv7-a
> > +obj-$(CONFIG_IMX_GPCV2)	+= suspend-imx7.o pm-imx7.o
> >  obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
> 
> A rather strange ordering, can you keep the AFLAGS near the object file?
> 
> >  obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o  endif diff --git
> > a/arch/arm/mach-imx/pm-imx7.c b/arch/arm/mach-imx/pm-imx7.c new file
> > mode 100644 index 0000000..9035368
> > --- /dev/null
> > +++ b/arch/arm/mach-imx/pm-imx7.c
> > @@ -0,0 +1,901 @@
> > +/*
> > + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> > + *
> > + * This program is free software; you can redistribute it and/or
> > +modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + */
> > +
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/of_address.h>
> > +#include <linux/of_irq.h>
> > +#include <linux/regmap.h>
> > +#include <linux/suspend.h>
> > +#include <linux/slab.h>
> > +#include <asm/suspend.h>
> > +#include <asm/fncpy.h>
> > +
> > +#include <soc/imx/gpcv2.h>
> > +
> > +#define BM_LPCR_A7_AD_L2PGE			0x10000
> > +#define BM_LPCR_A7_AD_EN_C1_PUP			0x800
> > +#define BM_LPCR_A7_AD_EN_C1_IRQ_PUP		0x400
> > +#define BM_LPCR_A7_AD_EN_C0_PUP			0x200
> > +#define BM_LPCR_A7_AD_EN_C0_IRQ_PUP		0x100
> > +#define BM_LPCR_A7_AD_EN_PLAT_PDN		0x10
> > +#define BM_LPCR_A7_AD_EN_C1_PDN			0x8
> > +#define BM_LPCR_A7_AD_EN_C1_WFI_PDN		0x4
> > +#define BM_LPCR_A7_AD_EN_C0_PDN			0x2
> > +#define BM_LPCR_A7_AD_EN_C0_WFI_PDN		0x1
> > +
> > +#define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	0x70000000
> > +#define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		0x4000
> > +#define BM_LPCR_A7_BSC_LPM1			0xc
> > +#define BM_LPCR_A7_BSC_LPM0			0x3
> > +#define BP_LPCR_A7_BSC_LPM1			2
> > +#define BP_LPCR_A7_BSC_LPM0			0
> > +
> > +#define BM_LPCR_M4_MASK_DSM_TRIGGER		0x80000000
> > +
> > +#define BM_SLPCR_EN_DSM				0x80000000
> > +#define BM_SLPCR_RBC_EN				0x40000000
> > +#define BM_SLPCR_VSTBY				0x4
> > +#define BM_SLPCR_SBYOS				0x2
> > +#define BM_SLPCR_BYPASS_PMIC_READY		0x1
> > +
> > +#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK	0x80000000
> > +#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK	0x8000
> 
> Typically the bit field size + shifts is used here, e.g.

Okay.

> #define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	(0x7 << 28)
> #define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		(0x1 << 14)
> 
> This is much easier to verify against the data sheet.
> 
> > +
> > +#define GPC_LPCR_A7_BSC		0x0
> > +#define GPC_LPCR_A7_AD		0x4
> > +#define GPC_LPCR_M4		0x8
> > +
> > +#define GPC_PGC_CPU_MAPPING	0xec
> > +#define GPC_PGC_SCU_TIMING	0x890
> > +
> > +#define GPC_SLPCR		0x14
> > +#define GPC_PGC_ACK_SEL_A7	0x24
> > +
> > +#define GPC_SLOT0_CFG		0xb0
> > +
> > +#define GPC_PGC_C0		0x800
> > +#define GPC_PGC_SCU_TIMING	0x890
> > +#define GPC_PGC_C1		0x840
> > +#define GPC_PGC_SCU		0x880
> > +#define GPC_PGC_FM		0xa00
> > +
> > +#define ANADIG_ARM_PLL		0x60
> > +#define ANADIG_DDR_PLL		0x70
> > +#define ANADIG_SYS_PLL		0xb0
> > +#define ANADIG_ENET_PLL		0xe0
> > +#define ANADIG_AUDIO_PLL	0xf0
> > +#define ANADIG_VIDEO_PLL	0x130
> > +
> > +#define MAX_SLOT_NUMBER		10
> > +#define A7_LPM_WAIT		0x5
> > +#define A7_LPM_STOP		0xa
> > +
> > +#define REG_SET			0x4
> > +#define REG_CLR			0x8
> > +
> > +enum gpcv2_mode {
> > +	WAIT_CLOCKED,
> > +	WAIT_UNCLOCKED,
> > +	WAIT_UNCLOCKED_POWER_OFF,
> > +	STOP_POWER_ON,
> > +	STOP_POWER_OFF,
> > +};
> > +
> > +/* GPCv2 has the following power domains, and each domain can be
> > +power-up
> > + * and power-down via GPC settings.
> > + *
> > + * 	Core 0 of A7 power domain
> > + * 	Core1 of A7 power domain
> > + * 	SCU/L2 cache RAM of A7 power domain
> > + * 	Fastmix and megamix power domain
> > + * 	USB OTG1 PHY power domain
> > + * 	USB OTG2 PHY power domain
> > + * 	PCIE PHY power domain
> > + * 	USB HSIC PHY power domain
> > + *	Core 0 of M4 power domain
> > + */
> 
> Nit: a empty line is the preferred format in this part of the kernel:
> 
> /*
>  * Start here...
> 

Okay.

> > +enum gpcv2_slot {
> > +	CORE0_A7,
> > +	CORE1_A7,
> > +	SCU_A7,
> > +	FAST_MEGA_MIX,
> > +	MIPI_PHY,
> > +	PCIE_PHY,
> > +	USB_OTG1_PHY,
> > +	USB_OTG2_PHY,
> > +	USB_HSIC_PHY,
> > +	CORE0_M4,
> > +};
> > +
> > +struct imx_gpcv2;
> > +
> > +struct imx_gpcv2_suspend {
> > +	struct regmap *anatop;
> > +	struct regmap *imx_src;
> > +	u32 mfmix_mask[IMR_NUM];
> > +	u32 wakeupmix_mask[IMR_NUM];
> > +	u32 lpsrmix_mask[IMR_NUM];
> > +
> > +	void (*set_mode)(struct imx_gpcv2 *, enum gpcv2_mode mode);
> > +	void (*lpm_cpu_power_gate)(struct imx_gpcv2 *, u32, bool);
> > +	void (*lpm_plat_power_gate)(struct imx_gpcv2 *, bool);
> > +	void (*lpm_env_setup)(struct imx_gpcv2 *);
> > +	void (*lpm_env_clean)(struct imx_gpcv2 *);
> > +
> > +	void (*set_slot)(struct imx_gpcv2 *cd, u32 index,
> > +			enum gpcv2_slot m_core, bool mode, bool ack);
> > +	void (*clear_slots)(struct imx_gpcv2 *);
> > +	void (*lpm_enable_core)(struct imx_gpcv2 *,
> > +			bool enable, u32 offset);
> > +
> > +	void (*standby)(struct imx_gpcv2 *);
> > +	void (*suspend)(struct imx_gpcv2 *);
> > +
> > +	void (*suspend_fn_in_ocram)(void __iomem *ocram_vbase);
> > +	void __iomem *ocram_vbase;
> > +};
> > +
> > +struct imx_gpcv2 {
> > +	spinlock_t lock;
> > +	struct imx_gpcv2_irq *irqchip;
> > +	struct imx_gpcv2_suspend *pm;
> > +};
> > +
> > +extern struct imx_gpcv2_irq *gpcv2_irq_instance; static struct
> > +imx_gpcv2 *gpcv2_instance;
> > +
> > +static void imx_gpcv2_lpm_clear_slots(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	int i;
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +	for (i = 0; i < MAX_SLOT_NUMBER; i++)
> > +		writel_relaxed(0x0, cd->gpc_base + GPC_SLOT0_CFG + i * 0x4);
> > +	writel_relaxed(BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK |
> > +		BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK,
> > +		cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> > +
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_gpcv2_lpm_enable_core(struct imx_gpcv2 *gpc,
> > +			bool enable, u32 offset)
> > +{
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +	writel_relaxed(enable, cd->gpc_base + offset);
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_gpcv2_lpm_slot_setup(struct imx_gpcv2 *gpc,
> > +		u32 index, enum gpcv2_slot m_core, bool mode, bool ack) {
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	u32 val;
> > +
> > +	if (index >= MAX_SLOT_NUMBER)
> > +		pr_err("Invalid slot index!\n");
> 
> Is a return missing here? The check seems rather useless otherwise.

Yes, should return here.

> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +	/* set slot */
> > +	writel_relaxed((mode + 1) << (m_core * 2), cd->gpc_base +
> > +		GPC_SLOT0_CFG + index * 4);
> 
> Can you create a preprocessor for the slot register?
> 
> #define GPC_SLOTx_CFG(x) (0xb0 + 4 * (x))
> 
> The parameter m_core has a unintuitive name, slot sounds much better to me.
> 
> Also boolean and an addition is somewhat strange, I would prefer something like:
> mode ? 0x2 : 0x1 << (slot * 2)

Yes. Will follow this idea in the new patch.

> > +
> > +	if (ack) {
> > +		/* set ack */
> > +		val = readl_relaxed(cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> > +		/* clear dummy ack */
> > +		val &= ~(1 << (15 + (mode ? 16 : 0)));
> > +		val |= 1 << (m_core + (mode ? 16 : 0));
> 
> Can you come up with macros here too? That is not readable...
> 
> For the dummy ack I would suggest to create dedicated defines and for the power
> domain acks something which takes the slot as argument...

Will consider that in new patch.


> > +		writel_relaxed(val, cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> > +	}
> > +
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_gpcv2_lpm_env_setup(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_suspend *pm = gpc->pm;
> > +
> > +	/* PLL and PFDs overwrite set */
> > +	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_SET, 1 << 20);
> > +	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_SET, 1 << 19);
> > +	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_SET, 0x1ff << 17);
> > +	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_SET, 1 << 13);
> > +	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_SET, 1 << 24);
> > +	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_SET, 1 << 24); }
> > +
> > +static void imx_gpcv2_lpm_env_clean(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_suspend *pm = gpc->pm;
> > +
> > +	/* PLL and PFDs overwrite clear */
> > +	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_CLR, 1 << 20);
> > +	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_CLR, 1 << 19);
> > +	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_CLR, 0x1ff << 17);
> > +	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_CLR, 1 << 13);
> > +	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_CLR, 1 << 24);
> > +	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_CLR, 1 << 24); }
> > +
> > +static void imx_gpcv2_lpm_set_mode(struct imx_gpcv2 *gpc,
> > +		enum gpcv2_mode mode)
> > +{
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	u32 val1, val2;
> 
> Please use names which say something. tmp and i is ok, if it's a temporary
> variable or a counter, but not val1/val2...
> 
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +
> > +	val1 = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
> > +	val2 = readl_relaxed(cd->gpc_base + GPC_SLPCR);
> > +
> > +	/* all cores' LPM settings must be same */
> > +	val1 &= ~(BM_LPCR_A7_BSC_LPM0 | BM_LPCR_A7_BSC_LPM1);
> > +
> > +	val1 |= BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> > +
> > +	val2 &= ~(BM_SLPCR_EN_DSM | BM_SLPCR_VSTBY | BM_SLPCR_RBC_EN |
> > +		BM_SLPCR_SBYOS | BM_SLPCR_BYPASS_PMIC_READY);
> > +	/*
> > +	 * GPCv2: When improper low-power sequence is used,
> > +	 * the SoC enters low power mode before the ARM core executes WFI.
> > +	 *
> > +	 * Software workaround:
> > +	 * 1) Software should trigger IRQ #32 (IOMUX) to be always pending
> > +	 *    by setting IOMUX_GPR1_IRQ.
> > +	 * 2) Software should then unmask IRQ #32 in GPC before setting GPC
> > +	 *    Low-Power mode.
> > +	 * 3) Software should mask IRQ #32 right after GPC Low-Power mode
> > +	 *    is set.
> > +	 */
> > +	switch (mode) {
> > +	case WAIT_CLOCKED:
> > +		break;
> > +	case WAIT_UNCLOCKED:
> > +		val1 |= A7_LPM_WAIT << BP_LPCR_A7_BSC_LPM0;
> > +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> > +		break;
> > +	case STOP_POWER_ON:
> > +		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
> > +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> > +		val2 |= BM_SLPCR_EN_DSM;
> > +		val2 |= BM_SLPCR_RBC_EN;
> > +		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
> > +		break;
> > +	case STOP_POWER_OFF:
> > +		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
> > +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> > +		val2 |= BM_SLPCR_EN_DSM;
> > +		val2 |= BM_SLPCR_RBC_EN;
> > +		val2 |= BM_SLPCR_SBYOS;
> > +		val2 |= BM_SLPCR_VSTBY;
> > +		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
> > +		break;
> > +	default:
> > +		return;
> 
> What about the spin lock?

It is a bug.

> > +	}
> > +	writel_relaxed(val1, cd->gpc_base + GPC_LPCR_A7_BSC);
> > +	writel_relaxed(val2, cd->gpc_base + GPC_SLPCR);
> > +
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +
> > +static void imx_gpcv2_lpm_cpu_power_gate(struct imx_gpcv2 *gpc,
> > +				u32 cpu, bool pdn)
> 
> Hm, pdn is somewhat overused here. Your bool pdn says that you want to power
> gate a certain core. Below you then set PDN and PUP, that is somewhat confusing.
> Maybe bool engate or en_lpm?

Good suggestion!

> > +{
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	u32 val;
> > +
> > +	const u32 val_pdn[2] = {
> > +		BM_LPCR_A7_AD_EN_C0_PDN | BM_LPCR_A7_AD_EN_C0_PUP,
> > +		BM_LPCR_A7_AD_EN_C1_PDN | BM_LPCR_A7_AD_EN_C1_PUP,
> > +	};
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +
> > +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
> > +	if (pdn)
> > +		val |= val_pdn[cpu];
> > +	else
> > +		val &= ~val_pdn[cpu];
> > +
> > +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_lpm_plat_power_gate(struct imx_gpcv2 *gpc, bool pdn)
> > +{
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	u32 val;
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
> > +	val &= ~(BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE);
> > +	if (pdn)
> > +		val |= BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE;
> > +
> > +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_gpcv2_lpm_standby(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_suspend *pm = gpc->pm;
> > +
> > +	pm->lpm_env_setup(gpc);
> > +	/* pm->set_mode(gpc, STOP_POWER_OFF); */
> > +	pm->set_mode(gpc, WAIT_UNCLOCKED);
> > +
> > +	pr_debug("[GPCv2] %s %d\r\n", __func__, __LINE__);
> > +	/* Zzz ... */
> > +	cpu_do_idle();
> > +
> > +	pm->set_mode(gpc, WAIT_CLOCKED);
> > +	pm->lpm_env_clean(gpc);
> > +}
> > +
> > +
> > +
> > +static int gpcv2_suspend_finish(unsigned long val) {
> > +	struct imx_gpcv2_suspend *pm = (struct imx_gpcv2_suspend *)val;
> > +
> > +	if (!pm->suspend_fn_in_ocram) {
> > +		cpu_do_idle();
> > +	} else {
> > +		/*
> > +		 * call low level suspend function in ocram,
> > +		 * as we need to float DDR IO.
> > +		 */
> > +		local_flush_tlb_all();
> > +		pm->suspend_fn_in_ocram(pm->ocram_vbase);
> > +	}
> > +
> > +	return 0;
> > +}
> > +static void imx_gpcv2_lpm_suspend(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_suspend *pm = gpc->pm;
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	int i = 0;
> > +
> > +	pm->lpm_env_setup(gpc);
> > +	pm->set_mode(gpc, STOP_POWER_OFF);
> > +
> > +	/* enable core0 power down/up with low power mode */
> > +	pm->lpm_cpu_power_gate(gpc, 0, true);
> > +
> > +	/* enable plat power down with low power mode */
> > +	pm->lpm_plat_power_gate(gpc, true);
> > +
> > +	/*
> > +	 * To avoid confuse, we use slot 0~4 for power down,
> > +	 * slot 5~9 for power up.
> > +	 *
> > +	 * Power down slot sequence:
> > +	 * Slot0 -> CORE0
> > +	 * Slot1 -> Mega/Fast MIX
> > +	 * Slot2 -> SCU
> > +	 *
> > +	 * Power up slot sequence:
> > +	 * Slot5 -> Mega/Fast MIX
> > +	 * Slot6 -> SCU
> > +	 * Slot7 -> CORE0
> > +	 */
> > +	pm->set_slot(gpc, 0, CORE0_A7, false, false);
> > +	pm->set_slot(gpc, 2, SCU_A7, false, true);
> 
> Maybe it would be better to introduce a enum for the power-up/power-down?
> 
> 
> > +
> > +	for (i = 0; i < IMR_NUM; i++) {
> > +		if ((~cd->wakeup_sources[i] & pm->mfmix_mask[i]) != 0)
> > +			break;
> > +
> > +		pm->set_slot(gpc, 1, FAST_MEGA_MIX, false, false);
> > +		pm->set_slot(gpc, 5, FAST_MEGA_MIX, true, false);
> > +		pm->lpm_enable_core(gpc, true, GPC_PGC_FM);
> > +		break;
> > +	}
> 
> This is somewhat weird. You break either way in the first loop don't you? Why
> using a loop then?

It is a logic bug. Corrected it in the new patch.

> > +
> > +	pm->set_slot(gpc, 6, SCU_A7, true, false);
> > +	pm->set_slot(gpc, 7, CORE0_A7, true, true);
> > +
> > +	/* enable core0, scu */
> > +	pm->lpm_enable_core(gpc, true, GPC_PGC_C0);
> > +	pm->lpm_enable_core(gpc, true, GPC_PGC_SCU);
> > +
> > +	/* Suspend to MEM has not been implemented yet */
> > +	cpu_suspend((unsigned long)pm, gpcv2_suspend_finish);
> 
> What does that mean?

It is an old comment. Will remove it.
 

> > +
> > +	pm->lpm_env_clean(gpc);
> > +	pm->set_mode(gpc, WAIT_CLOCKED);
> > +	pm->lpm_cpu_power_gate(gpc, 0, false);
> > +	pm->lpm_plat_power_gate(gpc, false);
> > +
> > +	pm->lpm_enable_core(gpc, false, GPC_PGC_C0);
> > +	pm->lpm_enable_core(gpc, false, GPC_PGC_SCU);
> > +	pm->lpm_enable_core(gpc, false, GPC_PGC_FM);
> > +	pm->clear_slots(gpc);
> > +}
> > +
> > +static int imx_gpcv2_pm_enter(suspend_state_t state) {
> > +	struct imx_gpcv2_suspend *pm;
> > +
> > +	BUG_ON(!gpcv2_instance);
> > +	pm = gpcv2_instance->pm;
> > +
> > +	switch (state) {
> > +	case PM_SUSPEND_STANDBY:
> > +		pm->standby(gpcv2_instance);
> > +		break;
> > +
> > +	case PM_SUSPEND_MEM:
> > +		pm->suspend(gpcv2_instance);
> > +		break;
> > +	default:
> > +		return -EINVAL;
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +static int imx_gpcv2_pm_valid(suspend_state_t state) {
> > +	return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY; }
> > +
> > +
> > +#define MX7_MAX_DDRC_NUM		32
> > +#define MX7_MAX_DDRC_PHY_NUM		16
> > +
> > +#define READ_DATA_FROM_HARDWARE		0
> > +#define MX7_SUSPEND_OCRAM_SIZE		0x1000
> > +
> > +struct imx7_pm_base {
> > +	phys_addr_t pbase;
> > +	void __iomem *vbase;
> > +};
> > +
> > +struct imx7_pm_socdata {
> > +	u32 ddr_type;
> > +	const char *ddrc_compat;
> > +	const char *ddrc_phy_compat;
> > +	const char *src_compat;
> > +	const char *iomuxc_gpr_compat;
> > +	const char *ccm_compat;
> > +	const char *gpc_compat;
> > +	const char *anatop_compat;
> > +	const u32 ddrc_num;
> > +	const u32 (*ddrc_offset)[2];
> > +	const u32 ddrc_phy_num;
> > +	const u32 (*ddrc_phy_offset)[2];
> > +};
> > +
> > +/*
> > + * This structure is for passing necessary data for low level ocram
> > + * suspend code(arch/arm/mach-imx/suspend-imx7.S), if this struct
> > + * definition is changed, the offset definition in
> > + * arch/arm/mach-imx/suspend-imx7.S must be also changed accordingly,
> > + * otherwise, the suspend to ocram function will be broken!
> > + */
> > +struct imx7_cpu_pm_info {
> > +	u32 m4_reserve0;
> > +	u32 m4_reserve1;
> > +	u32 m4_reserve2;
> > +
> > +	/* The physical address of pm_info. */
> > +	phys_addr_t pbase;
> > +
> > +	/* The physical resume address for asm code */
> > +	phys_addr_t resume_addr;
> > +	u32 ddr_type;
> > +
> > +	u32 pm_info_size;
> > +
> > +	struct imx7_pm_base ddrc_base;
> > +	struct imx7_pm_base ddrc_phy_base;
> > +	struct imx7_pm_base src_base;
> > +	struct imx7_pm_base iomuxc_gpr_base;
> > +	struct imx7_pm_base ccm_base;
> > +	struct imx7_pm_base gpc_base;
> > +	struct imx7_pm_base l2_base;
> > +	struct imx7_pm_base anatop_base;
> > +
> > +	u32 ttbr1;
> > +
> > +	/* Number of DDRC which need saved/restored. */
> > +	u32 ddrc_num;
> > +
> > +	/* To save offset and value */
> > +	u32 ddrc_val[MX7_MAX_DDRC_NUM][2];
> > +
> > +	/* Number of DDRC which need saved/restored. */
> > +	u32 ddrc_phy_num;
> > +
> > +	/* To save offset and value */
> > +	u32 ddrc_phy_val[MX7_MAX_DDRC_NUM][2];
> > +} __aligned(8);
> > +
> > +static int __init imx_get_base_from_node(struct device_node *node,
> > +			struct imx7_pm_base *base)
> > +{
> > +	struct resource res;
> > +	int ret = 0;
> > +
> > +	ret = of_address_to_resource(node, 0, &res);
> > +	if (ret)
> > +		goto put_node;
> > +
> > +	base->pbase = res.start;
> > +	base->vbase = ioremap(res.start, resource_size(&res));
> > +	if (!base->vbase) {
> > +		iounmap(base->vbase);
> > +		ret = -ENOMEM;
> > +	}
> > +put_node:
> > +	of_node_put(node);
> > +
> > +	return ret;
> > +}
> > +
> > +static int __init imx_get_base_from_dt(struct imx7_pm_base *base,
> > +				const char *compat)
> > +{
> > +	struct device_node *node;
> > +	struct resource res;
> > +	int ret = 0;
> > +
> > +	node = of_find_compatible_node(NULL, NULL, compat);
> > +	if (!node) {
> > +		ret = -ENODEV;
> > +		goto out;
> > +	}
> > +
> > +	ret = of_address_to_resource(node, 0, &res);
> > +	if (ret)
> > +		goto put_node;
> > +
> > +	base->pbase = res.start;
> > +	base->vbase = ioremap(res.start, resource_size(&res));
> > +	if (!base->vbase)
> > +		ret = -ENOMEM;
> > +
> > +put_node:
> > +	of_node_put(node);
> > +out:
> > +	return ret;
> > +}
> > +
> > +static int __init imx_get_exec_base_from_dt(struct imx7_pm_base *base,
> > +				const char *compat)
> > +{
> > +	struct device_node *node;
> > +	struct resource res;
> > +	int ret = 0;
> > +
> > +	node = of_find_compatible_node(NULL, NULL, compat);
> > +	if (!node) {
> > +		ret = -ENODEV;
> > +		goto out;
> > +	}
> > +
> > +	ret = of_address_to_resource(node, 0, &res);
> > +	if (ret)
> > +		goto put_node;
> > +
> > +	base->pbase = res.start;
> > +	base->vbase = __arm_ioremap_exec(res.start, resource_size(&res),
> > +false);
> > +
> > +	if (!base->vbase)
> > +		ret = -ENOMEM;
> > +
> > +put_node:
> > +	of_node_put(node);
> > +out:
> > +	return ret;
> > +}
> > +
> > +static const u32 imx7d_ddrc_ddr3_setting[][2] __initconst = {
> > +	{ 0x0, READ_DATA_FROM_HARDWARE },
> > +	{ 0x1a0, READ_DATA_FROM_HARDWARE },
> > +	{ 0x1a4, READ_DATA_FROM_HARDWARE },
> > +	{ 0x1a8, READ_DATA_FROM_HARDWARE },
> > +	{ 0x64, READ_DATA_FROM_HARDWARE },
> > +	{ 0x490, 0x00000001 },
> > +	{ 0xd0, 0xc0020001 },
> > +	{ 0xd4, READ_DATA_FROM_HARDWARE },
> > +	{ 0xdc, READ_DATA_FROM_HARDWARE },
> > +	{ 0xe0, READ_DATA_FROM_HARDWARE },
> > +	{ 0xe4, READ_DATA_FROM_HARDWARE },
> > +	{ 0xf4, READ_DATA_FROM_HARDWARE },
> > +	{ 0x100, READ_DATA_FROM_HARDWARE },
> > +	{ 0x104, READ_DATA_FROM_HARDWARE },
> > +	{ 0x108, READ_DATA_FROM_HARDWARE },
> > +	{ 0x10c, READ_DATA_FROM_HARDWARE },
> > +	{ 0x110, READ_DATA_FROM_HARDWARE },
> > +	{ 0x114, READ_DATA_FROM_HARDWARE },
> > +	{ 0x120, 0x03030803 },
> > +	{ 0x180, READ_DATA_FROM_HARDWARE },
> > +	{ 0x190, READ_DATA_FROM_HARDWARE },
> > +	{ 0x194, READ_DATA_FROM_HARDWARE },
> > +	{ 0x200, READ_DATA_FROM_HARDWARE },
> > +	{ 0x204, READ_DATA_FROM_HARDWARE },
> > +	{ 0x214, READ_DATA_FROM_HARDWARE },
> > +	{ 0x218, READ_DATA_FROM_HARDWARE },
> > +	{ 0x240, 0x06000601 },
> > +	{ 0x244, READ_DATA_FROM_HARDWARE },
> > +};
> > +
> > +static const u32 imx7d_ddrc_phy_ddr3_setting[][2] __initconst = {
> > +	{ 0x0, READ_DATA_FROM_HARDWARE },
> > +	{ 0x4, READ_DATA_FROM_HARDWARE },
> > +	{ 0x10, READ_DATA_FROM_HARDWARE },
> > +	{ 0x9c, READ_DATA_FROM_HARDWARE },
> > +	{ 0x20, READ_DATA_FROM_HARDWARE },
> > +	{ 0x30, READ_DATA_FROM_HARDWARE },
> > +	{ 0x50, 0x01000010 },
> > +	{ 0x50, 0x00000010 },
> > +	{ 0xc0, 0x0e407304 },
> > +	{ 0xc0, 0x0e447304 },
> > +	{ 0xc0, 0x0e447306 },
> > +	{ 0xc0, 0x0e447304 },
> > +	{ 0xc0, 0x0e407306 },
> > +};
> > +
> > +static const struct imx7_pm_socdata imx7d_pm_data_ddr3 __initconst = {
> > +	.iomuxc_gpr_compat = "fsl,imx7d-iomuxc",
> > +	.ddrc_phy_compat = "fsl,imx7d-ddrc-phy",
> > +	.anatop_compat = "fsl,imx7d-anatop",
> > +	.ddrc_compat = "fsl,imx7d-ddrc",
> > +	.ccm_compat = "fsl,imx7d-ccm",
> > +	.src_compat = "fsl,imx7d-src",
> > +	.gpc_compat = "fsl,imx7d-gpc",
> > +	.ddrc_phy_num = ARRAY_SIZE(imx7d_ddrc_phy_ddr3_setting),
> > +	.ddrc_phy_offset = imx7d_ddrc_phy_ddr3_setting,
> > +	.ddrc_num = ARRAY_SIZE(imx7d_ddrc_ddr3_setting),
> > +	.ddrc_offset = imx7d_ddrc_ddr3_setting, };
> > +
> > +static int __init imx_gpcv2_suspend_init(struct imx_gpcv2_suspend *pm,
> > +			const struct imx7_pm_socdata *socdata) {
> > +	struct imx7_pm_base aips_base[3] = { {0, 0}, {0, 0}, {0, 0} };
> > +	struct imx7_pm_base sram_base = {0, 0};
> > +	struct imx7_cpu_pm_info *pm_info;
> > +	struct device_node *node;
> > +	int i, ret = 0;
> > +
> > +	const u32 (*ddrc_phy_offset_array)[2];
> > +	const u32 (*ddrc_offset_array)[2];
> > +
> > +	if (!socdata || !pm) {
> > +		pr_warn("%s: invalid argument!\n", __func__);
> > +		return -EINVAL;
> > +	}
> > +
> > +	node = NULL;
> 
> You can do the initialization on top.
> 
> > +	for (i = 0; i < 3; i++) {
> > +		node = of_find_compatible_node(node, NULL, "fsl,aips-bus");
> > +		if (!node) {
> > +			pr_warn("%s: failed to find aips %d node!\n",
> > +					__func__, i);
> > +			break;
> > +		}
> > +		ret = imx_get_base_from_node(node, &aips_base[i]);
> > +		if (ret) {
> > +			pr_warn("%s: failed to get aips[%d] base %d!\n",
> > +					__func__, i, ret);
> > +		}
> > +	}
> 
> What are the aips_base used for? You would need to call of_node_put for each of
> them.

These addresses will be used in assemble codes.  

> > +
> > +	ret = imx_get_exec_base_from_dt(&sram_base, "fsl,lpm-sram");
> > +	if (ret) {
> > +		pr_warn("%s: failed to get lpm-sram base %d!\n",
> > +				__func__, ret);
> > +		goto lpm_sram_map_failed;
> > +	}
> > +
> > +	pm_info = sram_base.vbase;
> > +	pm_info->pbase = sram_base.pbase;
> > +	pm_info->resume_addr = virt_to_phys(ca7_cpu_resume);
> > +	pm_info->pm_info_size = sizeof(*pm_info);
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->ccm_base,
> socdata->ccm_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get ccm base %d!\n", __func__, ret);
> > +		goto ccm_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->ddrc_base,
> socdata->ddrc_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get ddrc base %d!\n", __func__, ret);
> > +		goto ddrc_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->ddrc_phy_base,
> > +				socdata->ddrc_phy_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get ddrc_phy base %d!\n", __func__, ret);
> > +		goto ddrc_phy_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->src_base, socdata->src_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get src base %d!\n", __func__, ret);
> > +		goto src_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->iomuxc_gpr_base,
> > +				socdata->iomuxc_gpr_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get iomuxc_gpr base %d!\n",
> > +					__func__, ret);
> > +		goto iomuxc_gpr_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->gpc_base, socdata->gpc_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get gpc base %d!\n", __func__, ret);
> > +		goto gpc_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->anatop_base,
> > +				socdata->anatop_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get anatop base %d!\n", __func__, ret);
> > +		goto anatop_map_failed;
> > +	}
> > +
> > +	pm_info->ddrc_num = socdata->ddrc_num;
> > +	ddrc_offset_array = socdata->ddrc_offset;
> > +	pm_info->ddrc_phy_num = socdata->ddrc_phy_num;
> > +	ddrc_phy_offset_array = socdata->ddrc_phy_offset;
> > +
> > +	/* initialize DDRC settings */
> > +	for (i = 0; i < pm_info->ddrc_num; i++) {
> > +		pm_info->ddrc_val[i][0] = ddrc_offset_array[i][0];
> > +		if (ddrc_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
> > +			pm_info->ddrc_val[i][1] =
> > +				readl_relaxed(pm_info->ddrc_base.vbase +
> > +				ddrc_offset_array[i][0]);
> > +		else
> > +			pm_info->ddrc_val[i][1] = ddrc_offset_array[i][1];
> > +	}
> > +
> > +	/* initialize DDRC PHY settings */
> > +	for (i = 0; i < pm_info->ddrc_phy_num; i++) {
> > +		pm_info->ddrc_phy_val[i][0] =
> > +			ddrc_phy_offset_array[i][0];
> > +		if (ddrc_phy_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
> > +			pm_info->ddrc_phy_val[i][1] =
> > +				readl_relaxed(pm_info->ddrc_phy_base.vbase +
> > +				ddrc_phy_offset_array[i][0]);
> > +		else
> > +			pm_info->ddrc_phy_val[i][1] =
> > +				ddrc_phy_offset_array[i][1];
> > +	}
> > +
> > +	pm->suspend_fn_in_ocram = fncpy(
> > +		sram_base.vbase + sizeof(*pm_info),
> > +		&imx7_suspend,
> > +		MX7_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));
> > +	pm->ocram_vbase = sram_base.vbase;
> > +
> > +	goto put_node;
> > +
> > +anatop_map_failed:
> > +	iounmap(pm_info->anatop_base.vbase);
> > +gpc_map_failed:
> > +	iounmap(pm_info->gpc_base.vbase);
> > +iomuxc_gpr_map_failed:
> > +	iounmap(pm_info->iomuxc_gpr_base.vbase);
> > +src_map_failed:
> > +	iounmap(pm_info->src_base.vbase);
> > +ddrc_phy_map_failed:
> > +	iounmap(pm_info->ddrc_phy_base.vbase);
> > +ddrc_map_failed:
> > +	iounmap(pm_info->ddrc_base.vbase);
> > +ccm_map_failed:
> > +	iounmap(pm_info->ccm_base.vbase);
> > +lpm_sram_map_failed:
> > +	iounmap(sram_base.vbase);
> > +put_node:
> > +	of_node_put(node);
> > +
> > +	return ret;
> > +}
> > +
> > +static const struct platform_suspend_ops imx_gpcv2_pm_ops = {
> > +	.enter = imx_gpcv2_pm_enter,
> > +	.valid = imx_gpcv2_pm_valid,
> > +};
> > +
> > +static int __init imx_gpcv2_pm_init(void) {
> > +	struct imx_gpcv2_suspend *pm;
> > +	struct imx_gpcv2_irq *cd;
> > +	struct imx_gpcv2 *gpc;
> > +	int val;
> > +
> > +	pm = kzalloc(sizeof(struct imx_gpcv2_suspend), GFP_KERNEL);
> > +	gpc = kzalloc(sizeof(struct imx_gpcv2), GFP_KERNEL);
> > +	cd = gpcv2_irq_instance;
> > +
> > +	if (!cd || !pm || !gpc) {
> > +		pr_debug("[GPCv2] %s init failed\r\n", __func__);
> > +		return 0;
> > +	}
> 
> This shortcut doesn't work, what if allocating pm succeeds and gpc does not?

Any allocation failures here will cause the initialization to fail. I will have a better solution in new patch.
 
> > +
> > +	imx_gpcv2_suspend_init(pm, &imx7d_pm_data_ddr3);
> > +
> > +	pm->lpm_env_setup = imx_gpcv2_lpm_env_setup;
> > +	pm->lpm_env_clean = imx_gpcv2_lpm_env_clean;
> > +
> > +	pm->lpm_cpu_power_gate = imx_gpcv2_lpm_cpu_power_gate;
> > +	pm->lpm_plat_power_gate = imx_lpm_plat_power_gate;
> > +	pm->lpm_enable_core = imx_gpcv2_lpm_enable_core;
> > +	pm->set_mode = imx_gpcv2_lpm_set_mode;
> > +
> > +	pm->clear_slots = imx_gpcv2_lpm_clear_slots;
> > +	pm->set_slot = imx_gpcv2_lpm_slot_setup;
> > +
> > +	pm->standby = imx_gpcv2_lpm_standby;
> > +	pm->suspend = imx_gpcv2_lpm_suspend;
> > +
> > +	pr_debug("[GPCv2] %s \r\n", __func__);
> > +	pm->anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
> > +	WARN_ON(!pm->anatop);
> > +	pm->imx_src = syscon_regmap_lookup_by_compatible("fsl,imx7d-src");
> > +	WARN_ON(!pm->imx_src);
> > +
> > +	/*
> > +	 * Due to hardware design failure, need to make sure GPR
> > +	 * interrupt(#32) is unmasked during RUN mode to avoid entering
> > +	 * DSM by mistake.
> > +	 */
> > +	writel_relaxed(~0x1, cd->gpc_base + cd->cpu2wakeup);
> > +
> > +	/* only external IRQs to wake up LPM and core 0/1 */
> > +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
> > +	val |= BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP;
> > +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_BSC);
> > +	/* mask m4 dsm trigger */
> > +	writel_relaxed(readl_relaxed(cd->gpc_base + GPC_LPCR_M4) |
> > +		BM_LPCR_M4_MASK_DSM_TRIGGER, cd->gpc_base +
> GPC_LPCR_M4);
> > +	/* set mega/fast mix in A7 domain */
> > +	writel_relaxed(0x1, cd->gpc_base + GPC_PGC_CPU_MAPPING);
> > +	/* set SCU timing */
> > +	writel_relaxed((0x59 << 10) | 0x5B | (0x51 << 20),
> > +		cd->gpc_base + GPC_PGC_SCU_TIMING);
> > +
> > +	/* Mask the wakeup sources in M/F power domain */
> > +	pm->mfmix_mask[0] = 0x54010000;
> > +	pm->mfmix_mask[1] = 0xc00;
> > +	pm->mfmix_mask[2] = 0x0;
> > +	pm->mfmix_mask[3] = 0x400010;
> 
> What is this doing?

The IP blocks which may be the wakeup sources are allocated into several power domains. MFMIX is one
of those power domains. If a bit is '1', it means the IP block is inside MFMIX power domain. We will use it
to decide if a power domain should be power gated or not.

> I stop here for now, will have a look at the assembly part another time.

Thank you very much for the excellent review!

Shenwei

> --
> Stefan
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éÝ¶\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dÊ‡Ú™ë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D
@ 2015-07-31 15:26       ` Shenwei Wang
  0 siblings, 0 replies; 18+ messages in thread
From: Shenwei Wang @ 2015-07-31 15:26 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Stefan,

> -----Original Message-----
> From: Stefan Agner [mailto:stefan at agner.ch]
> Sent: 2015?7?30? 17:44
> To: Wang Shenwei-B38339
> Cc: shawn.guo at linaro.org; tglx at linutronix.de; jason at lakedaemon.net; Huang
> Yongcai-B20788; linux-kernel at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org
> Subject: Re: [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D
> 
> Hi Shenwei,
> 
> The Subject sounds somewhat strange, if you mean your program code, then you
> should not use the plural. Or maybe "add suspend states..." or "support suspend
> states..."?

Good suggestion! Will change to support suspend states on imx7d.

> On 2015-07-27 21:30, Shenwei Wang wrote:
> > IMX7D contains a new version of GPC IP block (GPCv2). It has two major
> > functions: power management and wakeup source management.
> >
> > GPCv2 provides low power mode control for Cortex-A7 and Cortex-M4
> > domains. And it can support WAIT, STOP, and DSM(Deep Sleep Mode) modes.
> > After configuring the GPCv2 module, the platform can enter into a
> > selected mode either automatically triggered by ARM WFI instruction or
> > manually by software. The system will exit the low power states by the
> > predefined wakeup sources which are managed by the gpcv2 irqchip
> > driver.
> >
> > This patch adds a new suspend driver to manage the power states on IMX7D.
> > It currently supports "SUSPEND_STANDBY" and "SUSPEND_MEM" states.
> >
> > Signed-off-by: Shenwei Wang <shenwei.wang@freescale.com>
> > Signed-off-by: Anson Huang <b20788@freescale.com>
> > ---
> >  arch/arm/mach-imx/Kconfig        |   1 +
> >  arch/arm/mach-imx/Makefile       |   2 +
> >  arch/arm/mach-imx/pm-imx7.c      | 901
> +++++++++++++++++++++++++++++++++++++++
> >  arch/arm/mach-imx/suspend-imx7.S | 529 +++++++++++++++++++++++
> >  4 files changed, 1433 insertions(+)
> >  create mode 100644 arch/arm/mach-imx/pm-imx7.c  create mode 100644
> > arch/arm/mach-imx/suspend-imx7.S
> >
> > diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> > index 8ceda28..54f8553 100644
> > --- a/arch/arm/mach-imx/Kconfig
> > +++ b/arch/arm/mach-imx/Kconfig
> > @@ -562,6 +562,7 @@ config SOC_IMX7D
> >  	select ARM_GIC
> >  	select HAVE_IMX_ANATOP
> >  	select HAVE_IMX_MMDC
> > +	select IMX_GPCV2
> >  	help
> >  		This enables support for Freescale i.MX7 Dual processor.
> >
> > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> > index fb689d8..ca4c566 100644
> > --- a/arch/arm/mach-imx/Makefile
> > +++ b/arch/arm/mach-imx/Makefile
> > @@ -88,6 +88,8 @@ obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o
> >
> >  ifeq ($(CONFIG_SUSPEND),y)
> >  AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
> > +AFLAGS_suspend-imx7.o :=-Wa,-march=armv7-a
> > +obj-$(CONFIG_IMX_GPCV2)	+= suspend-imx7.o pm-imx7.o
> >  obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
> 
> A rather strange ordering, can you keep the AFLAGS near the object file?
> 
> >  obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o  endif diff --git
> > a/arch/arm/mach-imx/pm-imx7.c b/arch/arm/mach-imx/pm-imx7.c new file
> > mode 100644 index 0000000..9035368
> > --- /dev/null
> > +++ b/arch/arm/mach-imx/pm-imx7.c
> > @@ -0,0 +1,901 @@
> > +/*
> > + * Copyright (C) 2015 Freescale Semiconductor, Inc.
> > + *
> > + * This program is free software; you can redistribute it and/or
> > +modify
> > + * it under the terms of the GNU General Public License version 2 as
> > + * published by the Free Software Foundation.
> > + */
> > +
> > +#include <linux/mfd/syscon.h>
> > +#include <linux/of_address.h>
> > +#include <linux/of_irq.h>
> > +#include <linux/regmap.h>
> > +#include <linux/suspend.h>
> > +#include <linux/slab.h>
> > +#include <asm/suspend.h>
> > +#include <asm/fncpy.h>
> > +
> > +#include <soc/imx/gpcv2.h>
> > +
> > +#define BM_LPCR_A7_AD_L2PGE			0x10000
> > +#define BM_LPCR_A7_AD_EN_C1_PUP			0x800
> > +#define BM_LPCR_A7_AD_EN_C1_IRQ_PUP		0x400
> > +#define BM_LPCR_A7_AD_EN_C0_PUP			0x200
> > +#define BM_LPCR_A7_AD_EN_C0_IRQ_PUP		0x100
> > +#define BM_LPCR_A7_AD_EN_PLAT_PDN		0x10
> > +#define BM_LPCR_A7_AD_EN_C1_PDN			0x8
> > +#define BM_LPCR_A7_AD_EN_C1_WFI_PDN		0x4
> > +#define BM_LPCR_A7_AD_EN_C0_PDN			0x2
> > +#define BM_LPCR_A7_AD_EN_C0_WFI_PDN		0x1
> > +
> > +#define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	0x70000000
> > +#define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		0x4000
> > +#define BM_LPCR_A7_BSC_LPM1			0xc
> > +#define BM_LPCR_A7_BSC_LPM0			0x3
> > +#define BP_LPCR_A7_BSC_LPM1			2
> > +#define BP_LPCR_A7_BSC_LPM0			0
> > +
> > +#define BM_LPCR_M4_MASK_DSM_TRIGGER		0x80000000
> > +
> > +#define BM_SLPCR_EN_DSM				0x80000000
> > +#define BM_SLPCR_RBC_EN				0x40000000
> > +#define BM_SLPCR_VSTBY				0x4
> > +#define BM_SLPCR_SBYOS				0x2
> > +#define BM_SLPCR_BYPASS_PMIC_READY		0x1
> > +
> > +#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK	0x80000000
> > +#define BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK	0x8000
> 
> Typically the bit field size + shifts is used here, e.g.

Okay.

> #define BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP	(0x7 << 28)
> #define BM_LPCR_A7_BSC_CPU_CLK_ON_LPM		(0x1 << 14)
> 
> This is much easier to verify against the data sheet.
> 
> > +
> > +#define GPC_LPCR_A7_BSC		0x0
> > +#define GPC_LPCR_A7_AD		0x4
> > +#define GPC_LPCR_M4		0x8
> > +
> > +#define GPC_PGC_CPU_MAPPING	0xec
> > +#define GPC_PGC_SCU_TIMING	0x890
> > +
> > +#define GPC_SLPCR		0x14
> > +#define GPC_PGC_ACK_SEL_A7	0x24
> > +
> > +#define GPC_SLOT0_CFG		0xb0
> > +
> > +#define GPC_PGC_C0		0x800
> > +#define GPC_PGC_SCU_TIMING	0x890
> > +#define GPC_PGC_C1		0x840
> > +#define GPC_PGC_SCU		0x880
> > +#define GPC_PGC_FM		0xa00
> > +
> > +#define ANADIG_ARM_PLL		0x60
> > +#define ANADIG_DDR_PLL		0x70
> > +#define ANADIG_SYS_PLL		0xb0
> > +#define ANADIG_ENET_PLL		0xe0
> > +#define ANADIG_AUDIO_PLL	0xf0
> > +#define ANADIG_VIDEO_PLL	0x130
> > +
> > +#define MAX_SLOT_NUMBER		10
> > +#define A7_LPM_WAIT		0x5
> > +#define A7_LPM_STOP		0xa
> > +
> > +#define REG_SET			0x4
> > +#define REG_CLR			0x8
> > +
> > +enum gpcv2_mode {
> > +	WAIT_CLOCKED,
> > +	WAIT_UNCLOCKED,
> > +	WAIT_UNCLOCKED_POWER_OFF,
> > +	STOP_POWER_ON,
> > +	STOP_POWER_OFF,
> > +};
> > +
> > +/* GPCv2 has the following power domains, and each domain can be
> > +power-up
> > + * and power-down via GPC settings.
> > + *
> > + * 	Core 0 of A7 power domain
> > + * 	Core1 of A7 power domain
> > + * 	SCU/L2 cache RAM of A7 power domain
> > + * 	Fastmix and megamix power domain
> > + * 	USB OTG1 PHY power domain
> > + * 	USB OTG2 PHY power domain
> > + * 	PCIE PHY power domain
> > + * 	USB HSIC PHY power domain
> > + *	Core 0 of M4 power domain
> > + */
> 
> Nit: a empty line is the preferred format in this part of the kernel:
> 
> /*
>  * Start here...
> 

Okay.

> > +enum gpcv2_slot {
> > +	CORE0_A7,
> > +	CORE1_A7,
> > +	SCU_A7,
> > +	FAST_MEGA_MIX,
> > +	MIPI_PHY,
> > +	PCIE_PHY,
> > +	USB_OTG1_PHY,
> > +	USB_OTG2_PHY,
> > +	USB_HSIC_PHY,
> > +	CORE0_M4,
> > +};
> > +
> > +struct imx_gpcv2;
> > +
> > +struct imx_gpcv2_suspend {
> > +	struct regmap *anatop;
> > +	struct regmap *imx_src;
> > +	u32 mfmix_mask[IMR_NUM];
> > +	u32 wakeupmix_mask[IMR_NUM];
> > +	u32 lpsrmix_mask[IMR_NUM];
> > +
> > +	void (*set_mode)(struct imx_gpcv2 *, enum gpcv2_mode mode);
> > +	void (*lpm_cpu_power_gate)(struct imx_gpcv2 *, u32, bool);
> > +	void (*lpm_plat_power_gate)(struct imx_gpcv2 *, bool);
> > +	void (*lpm_env_setup)(struct imx_gpcv2 *);
> > +	void (*lpm_env_clean)(struct imx_gpcv2 *);
> > +
> > +	void (*set_slot)(struct imx_gpcv2 *cd, u32 index,
> > +			enum gpcv2_slot m_core, bool mode, bool ack);
> > +	void (*clear_slots)(struct imx_gpcv2 *);
> > +	void (*lpm_enable_core)(struct imx_gpcv2 *,
> > +			bool enable, u32 offset);
> > +
> > +	void (*standby)(struct imx_gpcv2 *);
> > +	void (*suspend)(struct imx_gpcv2 *);
> > +
> > +	void (*suspend_fn_in_ocram)(void __iomem *ocram_vbase);
> > +	void __iomem *ocram_vbase;
> > +};
> > +
> > +struct imx_gpcv2 {
> > +	spinlock_t lock;
> > +	struct imx_gpcv2_irq *irqchip;
> > +	struct imx_gpcv2_suspend *pm;
> > +};
> > +
> > +extern struct imx_gpcv2_irq *gpcv2_irq_instance; static struct
> > +imx_gpcv2 *gpcv2_instance;
> > +
> > +static void imx_gpcv2_lpm_clear_slots(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	int i;
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +	for (i = 0; i < MAX_SLOT_NUMBER; i++)
> > +		writel_relaxed(0x0, cd->gpc_base + GPC_SLOT0_CFG + i * 0x4);
> > +	writel_relaxed(BM_GPC_PGC_ACK_SEL_A7_DUMMY_PUP_ACK |
> > +		BM_GPC_PGC_ACK_SEL_A7_DUMMY_PDN_ACK,
> > +		cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> > +
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_gpcv2_lpm_enable_core(struct imx_gpcv2 *gpc,
> > +			bool enable, u32 offset)
> > +{
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +	writel_relaxed(enable, cd->gpc_base + offset);
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_gpcv2_lpm_slot_setup(struct imx_gpcv2 *gpc,
> > +		u32 index, enum gpcv2_slot m_core, bool mode, bool ack) {
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	u32 val;
> > +
> > +	if (index >= MAX_SLOT_NUMBER)
> > +		pr_err("Invalid slot index!\n");
> 
> Is a return missing here? The check seems rather useless otherwise.

Yes, should return here.

> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +	/* set slot */
> > +	writel_relaxed((mode + 1) << (m_core * 2), cd->gpc_base +
> > +		GPC_SLOT0_CFG + index * 4);
> 
> Can you create a preprocessor for the slot register?
> 
> #define GPC_SLOTx_CFG(x) (0xb0 + 4 * (x))
> 
> The parameter m_core has a unintuitive name, slot sounds much better to me.
> 
> Also boolean and an addition is somewhat strange, I would prefer something like:
> mode ? 0x2 : 0x1 << (slot * 2)

Yes. Will follow this idea in the new patch.

> > +
> > +	if (ack) {
> > +		/* set ack */
> > +		val = readl_relaxed(cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> > +		/* clear dummy ack */
> > +		val &= ~(1 << (15 + (mode ? 16 : 0)));
> > +		val |= 1 << (m_core + (mode ? 16 : 0));
> 
> Can you come up with macros here too? That is not readable...
> 
> For the dummy ack I would suggest to create dedicated defines and for the power
> domain acks something which takes the slot as argument...

Will consider that in new patch.


> > +		writel_relaxed(val, cd->gpc_base + GPC_PGC_ACK_SEL_A7);
> > +	}
> > +
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_gpcv2_lpm_env_setup(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_suspend *pm = gpc->pm;
> > +
> > +	/* PLL and PFDs overwrite set */
> > +	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_SET, 1 << 20);
> > +	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_SET, 1 << 19);
> > +	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_SET, 0x1ff << 17);
> > +	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_SET, 1 << 13);
> > +	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_SET, 1 << 24);
> > +	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_SET, 1 << 24); }
> > +
> > +static void imx_gpcv2_lpm_env_clean(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_suspend *pm = gpc->pm;
> > +
> > +	/* PLL and PFDs overwrite clear */
> > +	regmap_write(pm->anatop, ANADIG_ARM_PLL + REG_CLR, 1 << 20);
> > +	regmap_write(pm->anatop, ANADIG_DDR_PLL + REG_CLR, 1 << 19);
> > +	regmap_write(pm->anatop, ANADIG_SYS_PLL + REG_CLR, 0x1ff << 17);
> > +	regmap_write(pm->anatop, ANADIG_ENET_PLL + REG_CLR, 1 << 13);
> > +	regmap_write(pm->anatop, ANADIG_AUDIO_PLL + REG_CLR, 1 << 24);
> > +	regmap_write(pm->anatop, ANADIG_VIDEO_PLL + REG_CLR, 1 << 24); }
> > +
> > +static void imx_gpcv2_lpm_set_mode(struct imx_gpcv2 *gpc,
> > +		enum gpcv2_mode mode)
> > +{
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	u32 val1, val2;
> 
> Please use names which say something. tmp and i is ok, if it's a temporary
> variable or a counter, but not val1/val2...
> 
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +
> > +	val1 = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
> > +	val2 = readl_relaxed(cd->gpc_base + GPC_SLPCR);
> > +
> > +	/* all cores' LPM settings must be same */
> > +	val1 &= ~(BM_LPCR_A7_BSC_LPM0 | BM_LPCR_A7_BSC_LPM1);
> > +
> > +	val1 |= BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> > +
> > +	val2 &= ~(BM_SLPCR_EN_DSM | BM_SLPCR_VSTBY | BM_SLPCR_RBC_EN |
> > +		BM_SLPCR_SBYOS | BM_SLPCR_BYPASS_PMIC_READY);
> > +	/*
> > +	 * GPCv2: When improper low-power sequence is used,
> > +	 * the SoC enters low power mode before the ARM core executes WFI.
> > +	 *
> > +	 * Software workaround:
> > +	 * 1) Software should trigger IRQ #32 (IOMUX) to be always pending
> > +	 *    by setting IOMUX_GPR1_IRQ.
> > +	 * 2) Software should then unmask IRQ #32 in GPC before setting GPC
> > +	 *    Low-Power mode.
> > +	 * 3) Software should mask IRQ #32 right after GPC Low-Power mode
> > +	 *    is set.
> > +	 */
> > +	switch (mode) {
> > +	case WAIT_CLOCKED:
> > +		break;
> > +	case WAIT_UNCLOCKED:
> > +		val1 |= A7_LPM_WAIT << BP_LPCR_A7_BSC_LPM0;
> > +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> > +		break;
> > +	case STOP_POWER_ON:
> > +		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
> > +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> > +		val2 |= BM_SLPCR_EN_DSM;
> > +		val2 |= BM_SLPCR_RBC_EN;
> > +		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
> > +		break;
> > +	case STOP_POWER_OFF:
> > +		val1 |= A7_LPM_STOP << BP_LPCR_A7_BSC_LPM0;
> > +		val1 &= ~BM_LPCR_A7_BSC_CPU_CLK_ON_LPM;
> > +		val2 |= BM_SLPCR_EN_DSM;
> > +		val2 |= BM_SLPCR_RBC_EN;
> > +		val2 |= BM_SLPCR_SBYOS;
> > +		val2 |= BM_SLPCR_VSTBY;
> > +		val2 |= BM_SLPCR_BYPASS_PMIC_READY;
> > +		break;
> > +	default:
> > +		return;
> 
> What about the spin lock?

It is a bug.

> > +	}
> > +	writel_relaxed(val1, cd->gpc_base + GPC_LPCR_A7_BSC);
> > +	writel_relaxed(val2, cd->gpc_base + GPC_SLPCR);
> > +
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +
> > +static void imx_gpcv2_lpm_cpu_power_gate(struct imx_gpcv2 *gpc,
> > +				u32 cpu, bool pdn)
> 
> Hm, pdn is somewhat overused here. Your bool pdn says that you want to power
> gate a certain core. Below you then set PDN and PUP, that is somewhat confusing.
> Maybe bool engate or en_lpm?

Good suggestion!

> > +{
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	u32 val;
> > +
> > +	const u32 val_pdn[2] = {
> > +		BM_LPCR_A7_AD_EN_C0_PDN | BM_LPCR_A7_AD_EN_C0_PUP,
> > +		BM_LPCR_A7_AD_EN_C1_PDN | BM_LPCR_A7_AD_EN_C1_PUP,
> > +	};
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +
> > +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
> > +	if (pdn)
> > +		val |= val_pdn[cpu];
> > +	else
> > +		val &= ~val_pdn[cpu];
> > +
> > +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_lpm_plat_power_gate(struct imx_gpcv2 *gpc, bool pdn)
> > +{
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	unsigned long flags;
> > +	u32 val;
> > +
> > +	spin_lock_irqsave(&gpc->lock, flags);
> > +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_AD);
> > +	val &= ~(BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE);
> > +	if (pdn)
> > +		val |= BM_LPCR_A7_AD_EN_PLAT_PDN | BM_LPCR_A7_AD_L2PGE;
> > +
> > +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_AD);
> > +	spin_unlock_irqrestore(&gpc->lock, flags); }
> > +
> > +static void imx_gpcv2_lpm_standby(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_suspend *pm = gpc->pm;
> > +
> > +	pm->lpm_env_setup(gpc);
> > +	/* pm->set_mode(gpc, STOP_POWER_OFF); */
> > +	pm->set_mode(gpc, WAIT_UNCLOCKED);
> > +
> > +	pr_debug("[GPCv2] %s %d\r\n", __func__, __LINE__);
> > +	/* Zzz ... */
> > +	cpu_do_idle();
> > +
> > +	pm->set_mode(gpc, WAIT_CLOCKED);
> > +	pm->lpm_env_clean(gpc);
> > +}
> > +
> > +
> > +
> > +static int gpcv2_suspend_finish(unsigned long val) {
> > +	struct imx_gpcv2_suspend *pm = (struct imx_gpcv2_suspend *)val;
> > +
> > +	if (!pm->suspend_fn_in_ocram) {
> > +		cpu_do_idle();
> > +	} else {
> > +		/*
> > +		 * call low level suspend function in ocram,
> > +		 * as we need to float DDR IO.
> > +		 */
> > +		local_flush_tlb_all();
> > +		pm->suspend_fn_in_ocram(pm->ocram_vbase);
> > +	}
> > +
> > +	return 0;
> > +}
> > +static void imx_gpcv2_lpm_suspend(struct imx_gpcv2 *gpc) {
> > +	struct imx_gpcv2_suspend *pm = gpc->pm;
> > +	struct imx_gpcv2_irq *cd = gpc->irqchip;
> > +	int i = 0;
> > +
> > +	pm->lpm_env_setup(gpc);
> > +	pm->set_mode(gpc, STOP_POWER_OFF);
> > +
> > +	/* enable core0 power down/up with low power mode */
> > +	pm->lpm_cpu_power_gate(gpc, 0, true);
> > +
> > +	/* enable plat power down with low power mode */
> > +	pm->lpm_plat_power_gate(gpc, true);
> > +
> > +	/*
> > +	 * To avoid confuse, we use slot 0~4 for power down,
> > +	 * slot 5~9 for power up.
> > +	 *
> > +	 * Power down slot sequence:
> > +	 * Slot0 -> CORE0
> > +	 * Slot1 -> Mega/Fast MIX
> > +	 * Slot2 -> SCU
> > +	 *
> > +	 * Power up slot sequence:
> > +	 * Slot5 -> Mega/Fast MIX
> > +	 * Slot6 -> SCU
> > +	 * Slot7 -> CORE0
> > +	 */
> > +	pm->set_slot(gpc, 0, CORE0_A7, false, false);
> > +	pm->set_slot(gpc, 2, SCU_A7, false, true);
> 
> Maybe it would be better to introduce a enum for the power-up/power-down?
> 
> 
> > +
> > +	for (i = 0; i < IMR_NUM; i++) {
> > +		if ((~cd->wakeup_sources[i] & pm->mfmix_mask[i]) != 0)
> > +			break;
> > +
> > +		pm->set_slot(gpc, 1, FAST_MEGA_MIX, false, false);
> > +		pm->set_slot(gpc, 5, FAST_MEGA_MIX, true, false);
> > +		pm->lpm_enable_core(gpc, true, GPC_PGC_FM);
> > +		break;
> > +	}
> 
> This is somewhat weird. You break either way in the first loop don't you? Why
> using a loop then?

It is a logic bug. Corrected it in the new patch.

> > +
> > +	pm->set_slot(gpc, 6, SCU_A7, true, false);
> > +	pm->set_slot(gpc, 7, CORE0_A7, true, true);
> > +
> > +	/* enable core0, scu */
> > +	pm->lpm_enable_core(gpc, true, GPC_PGC_C0);
> > +	pm->lpm_enable_core(gpc, true, GPC_PGC_SCU);
> > +
> > +	/* Suspend to MEM has not been implemented yet */
> > +	cpu_suspend((unsigned long)pm, gpcv2_suspend_finish);
> 
> What does that mean?

It is an old comment. Will remove it.
 

> > +
> > +	pm->lpm_env_clean(gpc);
> > +	pm->set_mode(gpc, WAIT_CLOCKED);
> > +	pm->lpm_cpu_power_gate(gpc, 0, false);
> > +	pm->lpm_plat_power_gate(gpc, false);
> > +
> > +	pm->lpm_enable_core(gpc, false, GPC_PGC_C0);
> > +	pm->lpm_enable_core(gpc, false, GPC_PGC_SCU);
> > +	pm->lpm_enable_core(gpc, false, GPC_PGC_FM);
> > +	pm->clear_slots(gpc);
> > +}
> > +
> > +static int imx_gpcv2_pm_enter(suspend_state_t state) {
> > +	struct imx_gpcv2_suspend *pm;
> > +
> > +	BUG_ON(!gpcv2_instance);
> > +	pm = gpcv2_instance->pm;
> > +
> > +	switch (state) {
> > +	case PM_SUSPEND_STANDBY:
> > +		pm->standby(gpcv2_instance);
> > +		break;
> > +
> > +	case PM_SUSPEND_MEM:
> > +		pm->suspend(gpcv2_instance);
> > +		break;
> > +	default:
> > +		return -EINVAL;
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +static int imx_gpcv2_pm_valid(suspend_state_t state) {
> > +	return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY; }
> > +
> > +
> > +#define MX7_MAX_DDRC_NUM		32
> > +#define MX7_MAX_DDRC_PHY_NUM		16
> > +
> > +#define READ_DATA_FROM_HARDWARE		0
> > +#define MX7_SUSPEND_OCRAM_SIZE		0x1000
> > +
> > +struct imx7_pm_base {
> > +	phys_addr_t pbase;
> > +	void __iomem *vbase;
> > +};
> > +
> > +struct imx7_pm_socdata {
> > +	u32 ddr_type;
> > +	const char *ddrc_compat;
> > +	const char *ddrc_phy_compat;
> > +	const char *src_compat;
> > +	const char *iomuxc_gpr_compat;
> > +	const char *ccm_compat;
> > +	const char *gpc_compat;
> > +	const char *anatop_compat;
> > +	const u32 ddrc_num;
> > +	const u32 (*ddrc_offset)[2];
> > +	const u32 ddrc_phy_num;
> > +	const u32 (*ddrc_phy_offset)[2];
> > +};
> > +
> > +/*
> > + * This structure is for passing necessary data for low level ocram
> > + * suspend code(arch/arm/mach-imx/suspend-imx7.S), if this struct
> > + * definition is changed, the offset definition in
> > + * arch/arm/mach-imx/suspend-imx7.S must be also changed accordingly,
> > + * otherwise, the suspend to ocram function will be broken!
> > + */
> > +struct imx7_cpu_pm_info {
> > +	u32 m4_reserve0;
> > +	u32 m4_reserve1;
> > +	u32 m4_reserve2;
> > +
> > +	/* The physical address of pm_info. */
> > +	phys_addr_t pbase;
> > +
> > +	/* The physical resume address for asm code */
> > +	phys_addr_t resume_addr;
> > +	u32 ddr_type;
> > +
> > +	u32 pm_info_size;
> > +
> > +	struct imx7_pm_base ddrc_base;
> > +	struct imx7_pm_base ddrc_phy_base;
> > +	struct imx7_pm_base src_base;
> > +	struct imx7_pm_base iomuxc_gpr_base;
> > +	struct imx7_pm_base ccm_base;
> > +	struct imx7_pm_base gpc_base;
> > +	struct imx7_pm_base l2_base;
> > +	struct imx7_pm_base anatop_base;
> > +
> > +	u32 ttbr1;
> > +
> > +	/* Number of DDRC which need saved/restored. */
> > +	u32 ddrc_num;
> > +
> > +	/* To save offset and value */
> > +	u32 ddrc_val[MX7_MAX_DDRC_NUM][2];
> > +
> > +	/* Number of DDRC which need saved/restored. */
> > +	u32 ddrc_phy_num;
> > +
> > +	/* To save offset and value */
> > +	u32 ddrc_phy_val[MX7_MAX_DDRC_NUM][2];
> > +} __aligned(8);
> > +
> > +static int __init imx_get_base_from_node(struct device_node *node,
> > +			struct imx7_pm_base *base)
> > +{
> > +	struct resource res;
> > +	int ret = 0;
> > +
> > +	ret = of_address_to_resource(node, 0, &res);
> > +	if (ret)
> > +		goto put_node;
> > +
> > +	base->pbase = res.start;
> > +	base->vbase = ioremap(res.start, resource_size(&res));
> > +	if (!base->vbase) {
> > +		iounmap(base->vbase);
> > +		ret = -ENOMEM;
> > +	}
> > +put_node:
> > +	of_node_put(node);
> > +
> > +	return ret;
> > +}
> > +
> > +static int __init imx_get_base_from_dt(struct imx7_pm_base *base,
> > +				const char *compat)
> > +{
> > +	struct device_node *node;
> > +	struct resource res;
> > +	int ret = 0;
> > +
> > +	node = of_find_compatible_node(NULL, NULL, compat);
> > +	if (!node) {
> > +		ret = -ENODEV;
> > +		goto out;
> > +	}
> > +
> > +	ret = of_address_to_resource(node, 0, &res);
> > +	if (ret)
> > +		goto put_node;
> > +
> > +	base->pbase = res.start;
> > +	base->vbase = ioremap(res.start, resource_size(&res));
> > +	if (!base->vbase)
> > +		ret = -ENOMEM;
> > +
> > +put_node:
> > +	of_node_put(node);
> > +out:
> > +	return ret;
> > +}
> > +
> > +static int __init imx_get_exec_base_from_dt(struct imx7_pm_base *base,
> > +				const char *compat)
> > +{
> > +	struct device_node *node;
> > +	struct resource res;
> > +	int ret = 0;
> > +
> > +	node = of_find_compatible_node(NULL, NULL, compat);
> > +	if (!node) {
> > +		ret = -ENODEV;
> > +		goto out;
> > +	}
> > +
> > +	ret = of_address_to_resource(node, 0, &res);
> > +	if (ret)
> > +		goto put_node;
> > +
> > +	base->pbase = res.start;
> > +	base->vbase = __arm_ioremap_exec(res.start, resource_size(&res),
> > +false);
> > +
> > +	if (!base->vbase)
> > +		ret = -ENOMEM;
> > +
> > +put_node:
> > +	of_node_put(node);
> > +out:
> > +	return ret;
> > +}
> > +
> > +static const u32 imx7d_ddrc_ddr3_setting[][2] __initconst = {
> > +	{ 0x0, READ_DATA_FROM_HARDWARE },
> > +	{ 0x1a0, READ_DATA_FROM_HARDWARE },
> > +	{ 0x1a4, READ_DATA_FROM_HARDWARE },
> > +	{ 0x1a8, READ_DATA_FROM_HARDWARE },
> > +	{ 0x64, READ_DATA_FROM_HARDWARE },
> > +	{ 0x490, 0x00000001 },
> > +	{ 0xd0, 0xc0020001 },
> > +	{ 0xd4, READ_DATA_FROM_HARDWARE },
> > +	{ 0xdc, READ_DATA_FROM_HARDWARE },
> > +	{ 0xe0, READ_DATA_FROM_HARDWARE },
> > +	{ 0xe4, READ_DATA_FROM_HARDWARE },
> > +	{ 0xf4, READ_DATA_FROM_HARDWARE },
> > +	{ 0x100, READ_DATA_FROM_HARDWARE },
> > +	{ 0x104, READ_DATA_FROM_HARDWARE },
> > +	{ 0x108, READ_DATA_FROM_HARDWARE },
> > +	{ 0x10c, READ_DATA_FROM_HARDWARE },
> > +	{ 0x110, READ_DATA_FROM_HARDWARE },
> > +	{ 0x114, READ_DATA_FROM_HARDWARE },
> > +	{ 0x120, 0x03030803 },
> > +	{ 0x180, READ_DATA_FROM_HARDWARE },
> > +	{ 0x190, READ_DATA_FROM_HARDWARE },
> > +	{ 0x194, READ_DATA_FROM_HARDWARE },
> > +	{ 0x200, READ_DATA_FROM_HARDWARE },
> > +	{ 0x204, READ_DATA_FROM_HARDWARE },
> > +	{ 0x214, READ_DATA_FROM_HARDWARE },
> > +	{ 0x218, READ_DATA_FROM_HARDWARE },
> > +	{ 0x240, 0x06000601 },
> > +	{ 0x244, READ_DATA_FROM_HARDWARE },
> > +};
> > +
> > +static const u32 imx7d_ddrc_phy_ddr3_setting[][2] __initconst = {
> > +	{ 0x0, READ_DATA_FROM_HARDWARE },
> > +	{ 0x4, READ_DATA_FROM_HARDWARE },
> > +	{ 0x10, READ_DATA_FROM_HARDWARE },
> > +	{ 0x9c, READ_DATA_FROM_HARDWARE },
> > +	{ 0x20, READ_DATA_FROM_HARDWARE },
> > +	{ 0x30, READ_DATA_FROM_HARDWARE },
> > +	{ 0x50, 0x01000010 },
> > +	{ 0x50, 0x00000010 },
> > +	{ 0xc0, 0x0e407304 },
> > +	{ 0xc0, 0x0e447304 },
> > +	{ 0xc0, 0x0e447306 },
> > +	{ 0xc0, 0x0e447304 },
> > +	{ 0xc0, 0x0e407306 },
> > +};
> > +
> > +static const struct imx7_pm_socdata imx7d_pm_data_ddr3 __initconst = {
> > +	.iomuxc_gpr_compat = "fsl,imx7d-iomuxc",
> > +	.ddrc_phy_compat = "fsl,imx7d-ddrc-phy",
> > +	.anatop_compat = "fsl,imx7d-anatop",
> > +	.ddrc_compat = "fsl,imx7d-ddrc",
> > +	.ccm_compat = "fsl,imx7d-ccm",
> > +	.src_compat = "fsl,imx7d-src",
> > +	.gpc_compat = "fsl,imx7d-gpc",
> > +	.ddrc_phy_num = ARRAY_SIZE(imx7d_ddrc_phy_ddr3_setting),
> > +	.ddrc_phy_offset = imx7d_ddrc_phy_ddr3_setting,
> > +	.ddrc_num = ARRAY_SIZE(imx7d_ddrc_ddr3_setting),
> > +	.ddrc_offset = imx7d_ddrc_ddr3_setting, };
> > +
> > +static int __init imx_gpcv2_suspend_init(struct imx_gpcv2_suspend *pm,
> > +			const struct imx7_pm_socdata *socdata) {
> > +	struct imx7_pm_base aips_base[3] = { {0, 0}, {0, 0}, {0, 0} };
> > +	struct imx7_pm_base sram_base = {0, 0};
> > +	struct imx7_cpu_pm_info *pm_info;
> > +	struct device_node *node;
> > +	int i, ret = 0;
> > +
> > +	const u32 (*ddrc_phy_offset_array)[2];
> > +	const u32 (*ddrc_offset_array)[2];
> > +
> > +	if (!socdata || !pm) {
> > +		pr_warn("%s: invalid argument!\n", __func__);
> > +		return -EINVAL;
> > +	}
> > +
> > +	node = NULL;
> 
> You can do the initialization on top.
> 
> > +	for (i = 0; i < 3; i++) {
> > +		node = of_find_compatible_node(node, NULL, "fsl,aips-bus");
> > +		if (!node) {
> > +			pr_warn("%s: failed to find aips %d node!\n",
> > +					__func__, i);
> > +			break;
> > +		}
> > +		ret = imx_get_base_from_node(node, &aips_base[i]);
> > +		if (ret) {
> > +			pr_warn("%s: failed to get aips[%d] base %d!\n",
> > +					__func__, i, ret);
> > +		}
> > +	}
> 
> What are the aips_base used for? You would need to call of_node_put for each of
> them.

These addresses will be used in assemble codes.  

> > +
> > +	ret = imx_get_exec_base_from_dt(&sram_base, "fsl,lpm-sram");
> > +	if (ret) {
> > +		pr_warn("%s: failed to get lpm-sram base %d!\n",
> > +				__func__, ret);
> > +		goto lpm_sram_map_failed;
> > +	}
> > +
> > +	pm_info = sram_base.vbase;
> > +	pm_info->pbase = sram_base.pbase;
> > +	pm_info->resume_addr = virt_to_phys(ca7_cpu_resume);
> > +	pm_info->pm_info_size = sizeof(*pm_info);
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->ccm_base,
> socdata->ccm_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get ccm base %d!\n", __func__, ret);
> > +		goto ccm_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->ddrc_base,
> socdata->ddrc_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get ddrc base %d!\n", __func__, ret);
> > +		goto ddrc_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->ddrc_phy_base,
> > +				socdata->ddrc_phy_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get ddrc_phy base %d!\n", __func__, ret);
> > +		goto ddrc_phy_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->src_base, socdata->src_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get src base %d!\n", __func__, ret);
> > +		goto src_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->iomuxc_gpr_base,
> > +				socdata->iomuxc_gpr_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get iomuxc_gpr base %d!\n",
> > +					__func__, ret);
> > +		goto iomuxc_gpr_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->gpc_base, socdata->gpc_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get gpc base %d!\n", __func__, ret);
> > +		goto gpc_map_failed;
> > +	}
> > +
> > +	ret = imx_get_base_from_dt(&pm_info->anatop_base,
> > +				socdata->anatop_compat);
> > +	if (ret) {
> > +		pr_warn("%s: failed to get anatop base %d!\n", __func__, ret);
> > +		goto anatop_map_failed;
> > +	}
> > +
> > +	pm_info->ddrc_num = socdata->ddrc_num;
> > +	ddrc_offset_array = socdata->ddrc_offset;
> > +	pm_info->ddrc_phy_num = socdata->ddrc_phy_num;
> > +	ddrc_phy_offset_array = socdata->ddrc_phy_offset;
> > +
> > +	/* initialize DDRC settings */
> > +	for (i = 0; i < pm_info->ddrc_num; i++) {
> > +		pm_info->ddrc_val[i][0] = ddrc_offset_array[i][0];
> > +		if (ddrc_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
> > +			pm_info->ddrc_val[i][1] =
> > +				readl_relaxed(pm_info->ddrc_base.vbase +
> > +				ddrc_offset_array[i][0]);
> > +		else
> > +			pm_info->ddrc_val[i][1] = ddrc_offset_array[i][1];
> > +	}
> > +
> > +	/* initialize DDRC PHY settings */
> > +	for (i = 0; i < pm_info->ddrc_phy_num; i++) {
> > +		pm_info->ddrc_phy_val[i][0] =
> > +			ddrc_phy_offset_array[i][0];
> > +		if (ddrc_phy_offset_array[i][1] == READ_DATA_FROM_HARDWARE)
> > +			pm_info->ddrc_phy_val[i][1] =
> > +				readl_relaxed(pm_info->ddrc_phy_base.vbase +
> > +				ddrc_phy_offset_array[i][0]);
> > +		else
> > +			pm_info->ddrc_phy_val[i][1] =
> > +				ddrc_phy_offset_array[i][1];
> > +	}
> > +
> > +	pm->suspend_fn_in_ocram = fncpy(
> > +		sram_base.vbase + sizeof(*pm_info),
> > +		&imx7_suspend,
> > +		MX7_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));
> > +	pm->ocram_vbase = sram_base.vbase;
> > +
> > +	goto put_node;
> > +
> > +anatop_map_failed:
> > +	iounmap(pm_info->anatop_base.vbase);
> > +gpc_map_failed:
> > +	iounmap(pm_info->gpc_base.vbase);
> > +iomuxc_gpr_map_failed:
> > +	iounmap(pm_info->iomuxc_gpr_base.vbase);
> > +src_map_failed:
> > +	iounmap(pm_info->src_base.vbase);
> > +ddrc_phy_map_failed:
> > +	iounmap(pm_info->ddrc_phy_base.vbase);
> > +ddrc_map_failed:
> > +	iounmap(pm_info->ddrc_base.vbase);
> > +ccm_map_failed:
> > +	iounmap(pm_info->ccm_base.vbase);
> > +lpm_sram_map_failed:
> > +	iounmap(sram_base.vbase);
> > +put_node:
> > +	of_node_put(node);
> > +
> > +	return ret;
> > +}
> > +
> > +static const struct platform_suspend_ops imx_gpcv2_pm_ops = {
> > +	.enter = imx_gpcv2_pm_enter,
> > +	.valid = imx_gpcv2_pm_valid,
> > +};
> > +
> > +static int __init imx_gpcv2_pm_init(void) {
> > +	struct imx_gpcv2_suspend *pm;
> > +	struct imx_gpcv2_irq *cd;
> > +	struct imx_gpcv2 *gpc;
> > +	int val;
> > +
> > +	pm = kzalloc(sizeof(struct imx_gpcv2_suspend), GFP_KERNEL);
> > +	gpc = kzalloc(sizeof(struct imx_gpcv2), GFP_KERNEL);
> > +	cd = gpcv2_irq_instance;
> > +
> > +	if (!cd || !pm || !gpc) {
> > +		pr_debug("[GPCv2] %s init failed\r\n", __func__);
> > +		return 0;
> > +	}
> 
> This shortcut doesn't work, what if allocating pm succeeds and gpc does not?

Any allocation failures here will cause the initialization to fail. I will have a better solution in new patch.
 
> > +
> > +	imx_gpcv2_suspend_init(pm, &imx7d_pm_data_ddr3);
> > +
> > +	pm->lpm_env_setup = imx_gpcv2_lpm_env_setup;
> > +	pm->lpm_env_clean = imx_gpcv2_lpm_env_clean;
> > +
> > +	pm->lpm_cpu_power_gate = imx_gpcv2_lpm_cpu_power_gate;
> > +	pm->lpm_plat_power_gate = imx_lpm_plat_power_gate;
> > +	pm->lpm_enable_core = imx_gpcv2_lpm_enable_core;
> > +	pm->set_mode = imx_gpcv2_lpm_set_mode;
> > +
> > +	pm->clear_slots = imx_gpcv2_lpm_clear_slots;
> > +	pm->set_slot = imx_gpcv2_lpm_slot_setup;
> > +
> > +	pm->standby = imx_gpcv2_lpm_standby;
> > +	pm->suspend = imx_gpcv2_lpm_suspend;
> > +
> > +	pr_debug("[GPCv2] %s \r\n", __func__);
> > +	pm->anatop = syscon_regmap_lookup_by_compatible("fsl,imx6q-anatop");
> > +	WARN_ON(!pm->anatop);
> > +	pm->imx_src = syscon_regmap_lookup_by_compatible("fsl,imx7d-src");
> > +	WARN_ON(!pm->imx_src);
> > +
> > +	/*
> > +	 * Due to hardware design failure, need to make sure GPR
> > +	 * interrupt(#32) is unmasked during RUN mode to avoid entering
> > +	 * DSM by mistake.
> > +	 */
> > +	writel_relaxed(~0x1, cd->gpc_base + cd->cpu2wakeup);
> > +
> > +	/* only external IRQs to wake up LPM and core 0/1 */
> > +	val = readl_relaxed(cd->gpc_base + GPC_LPCR_A7_BSC);
> > +	val |= BM_LPCR_A7_BSC_IRQ_SRC_A7_WAKEUP;
> > +	writel_relaxed(val, cd->gpc_base + GPC_LPCR_A7_BSC);
> > +	/* mask m4 dsm trigger */
> > +	writel_relaxed(readl_relaxed(cd->gpc_base + GPC_LPCR_M4) |
> > +		BM_LPCR_M4_MASK_DSM_TRIGGER, cd->gpc_base +
> GPC_LPCR_M4);
> > +	/* set mega/fast mix in A7 domain */
> > +	writel_relaxed(0x1, cd->gpc_base + GPC_PGC_CPU_MAPPING);
> > +	/* set SCU timing */
> > +	writel_relaxed((0x59 << 10) | 0x5B | (0x51 << 20),
> > +		cd->gpc_base + GPC_PGC_SCU_TIMING);
> > +
> > +	/* Mask the wakeup sources in M/F power domain */
> > +	pm->mfmix_mask[0] = 0x54010000;
> > +	pm->mfmix_mask[1] = 0xc00;
> > +	pm->mfmix_mask[2] = 0x0;
> > +	pm->mfmix_mask[3] = 0x400010;
> 
> What is this doing?

The IP blocks which may be the wakeup sources are allocated into several power domains. MFMIX is one
of those power domains. If a bit is '1', it means the IP block is inside MFMIX power domain. We will use it
to decide if a power domain should be power gated or not.

> I stop here for now, will have a look at the assembly part another time.

Thank you very much for the excellent review!

Shenwei

> --
> Stefan

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2015-07-31 23:11 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-27 19:29 [PATCH v7 0/2] IMX GPCv2 drivers for wakeup source and suspend Shenwei Wang
2015-07-27 19:29 ` Shenwei Wang
2015-07-27 19:29 ` [PATCH v7 1/2] irqchip: imx-gpcv2: IMX GPCv2 driver for wakeup sources Shenwei Wang
2015-07-27 19:29   ` Shenwei Wang
2015-07-28  1:24   ` Shawn Guo
2015-07-28  1:24     ` Shawn Guo
2015-07-28 14:27     ` Shenwei Wang
2015-07-28 14:27       ` Shenwei Wang
2015-07-28 14:38       ` Shawn Guo
2015-07-28 14:38         ` Shawn Guo
2015-07-28 14:46         ` Shenwei Wang
2015-07-28 14:46           ` Shenwei Wang
2015-07-27 19:30 ` [PATCH v7 2/2] ARM: imx: Add suspend codes for imx7D Shenwei Wang
2015-07-27 19:30   ` Shenwei Wang
2015-07-30 22:44   ` Stefan Agner
2015-07-30 22:44     ` Stefan Agner
2015-07-31 15:26     ` Shenwei Wang
2015-07-31 15:26       ` Shenwei Wang

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.