RE: [RFC 2/6] omap: introduce OMAP3 remoteproc module
-Original Message-
From: linux-omap-ow...@vger.kernel.org
[mailto:linux-omap-ow...@vger.kernel.org] On Behalf Of Ohad Ben-Cohen
Sent: Friday, July 02, 2010 3:53 AM
To: linux-omap@vger.kernel.org
Cc: Kanigeri, Hari; Ben-cohen, Ohad
Subject: [RFC 2/6] omap: introduce OMAP3 remoteproc module
From: Ohad Ben-Cohen oh...@ti.com
Introduce OMAP3 remoteproc module which takes care of
machine-specific code required to start and stop
the DSP remote processor.
Signed-off-by: Ohad Ben-Cohen oh...@ti.com
Signed-off-by: Hari Kanigeri h-kanige...@ti.com
---
arch/arm/mach-omap2/remoteproc3xxx.c | 226
++
1 files changed, 226 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-omap2/remoteproc3xxx.c
diff --git a/arch/arm/mach-omap2/remoteproc3xxx.c
b/arch/arm/mach-omap2/remoteproc3xxx.c
new file mode 100644
index 000..f86a333
--- /dev/null
+++ b/arch/arm/mach-omap2/remoteproc3xxx.c
@@ -0,0 +1,226 @@
+/*
+ * Remote Processor machine-specific module for OMAP3
+ *
+ * Copyright (C) 2010 Texas Instruments 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.
+ *
+ * This program is distributed in the hope that it will be
useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+/* this is needed for multi-omap support */
+#ifdef CONFIG_ARCH_OMAP3
[sp] If ARCH_OMAP3 is not defined this file shouldn't be compiled.
I do see that we are achieving the multi-omap support - a
concern I had in my comment on another patch in the series -
but this appears to be a hack.
+#include linux/kernel.h
+#include linux/delay.h
+#include linux/clk.h
+#include linux/err.h
+#include linux/platform_device.h
+#include linux/io.h
+#include linux/pm_runtime.h
+#include plat/remoteproc.h
+#include mach/irqs.h
+#include plat/omap_device.h
+#include plat/control.h
+#include plat/common.h
+#include plat/powerdomain.h
+#include plat/clockdomain.h
+#include asm/uaccess.h
+
+#include cm-regbits-34xx.h
+#include prm-regbits-34xx.h
+
+#define OMAP3_IVA2_BOOTADDR_MASK 0xFC00
+
+#define PRCM_PM_PWSTCTRL_IVA2_POWER_STATE_MASK (u32)(3)
+#define PRCM_PM_PWSTCTRL_IVA2_POWER_STATE_OFFSET (u32)(0)
[sp] We should either use the definitions in prm-regbits-34xx.h/prm.h
or make sure appropriate headers are updated with these definitions.
The naming conventions here seem to be very differen from the ones
used in prm-regbits-34xx.h and prm.h
+
+#define PRCM_PM_PWSTST_IVA2_InTransition_MASK
(u32)(0x10)
+#define PRCM_PM_PWSTST_IVA2_InTransition_OFFSET
(u32)(20)
[sp] Is InTransition delibrately put in CamelCase?
+
+#define CM_CLKSTCTRL_IVA2_OFFSET (0)
+#define CM_CLKSTCTRL_IVA2_MASK (3)
[sp] Same somment as before. See corresponding definition(s) in
cm-regbits-34xx.h for existing definitions, instead of
defining new ones.
+
+#define DSP_SYSC_DIRECTBOOT (0)
+#define DSP_SYSC_IDLEBOOT(1)
+#define DSP_SYSC_SELFLOOPBOOT(2)
+#define DSP_SYSC_USRBOOTSTRAP(3)
+#define DSP_SYSC_DEFAULTRESTORE (4)
+
+#ifdef CONFIG_BRIDGE_DEBUG
+static void omap3_rproc_dump_regs(struct device *dev)
+{
+ u32 temp;
+
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_FCLKEN);
+ dev_info(dev, CM_FCLKEN_IVA2 = 0x%x \n, temp);
[sp] Shouldn't we be using dev_dbg() here?
Also, same information is available in debugfs in base linux.
Is this function really needed here?
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_ICLKEN1);
+ dev_info(dev, CM_ICLKEN1_IVA2 = 0x%x \n, temp);
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_IDLEST);
+ dev_info(dev, CM_IDLEST_IVA2 = 0x%x \n, temp);
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSTCTRL);
+ dev_info(dev, CM_CLKSTCTRL_IVA2 = 0x%x \n, temp);
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSTST);
+ dev_info(dev, CM_CLKSTST_IVA2 = 0x%x \n, temp);
+ temp = prm_read_mod_reg(OMAP3430_IVA2_MOD, RM_RSTCTRL);
+ dev_info(dev, RM_RSTCTRL_IVA2 = 0x%x \n, temp);
+ temp = prm_read_mod_reg(OMAP3430_IVA2_MOD, RM_RSTST);
+ dev_info(dev, RM_RSTST_IVA2 = 0x%x \n, temp);
+ temp = prm_read_mod_reg(OMAP3430_IVA2_MOD, PM_PWSTCTRL);
+ dev_info(dev, PM_PWSTCTRL_IVA2 = 0x%x \n, temp);
+ temp = prm_read_mod_reg(OMAP3430_IVA2_MOD, PM_PWSTST
[RFC 2/6] omap: introduce OMAP3 remoteproc module
From: Ohad Ben-Cohen oh...@ti.com
Introduce OMAP3 remoteproc module which takes care of
machine-specific code required to start and stop
the DSP remote processor.
Signed-off-by: Ohad Ben-Cohen oh...@ti.com
Signed-off-by: Hari Kanigeri h-kanige...@ti.com
---
arch/arm/mach-omap2/remoteproc3xxx.c | 226 ++
1 files changed, 226 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-omap2/remoteproc3xxx.c
diff --git a/arch/arm/mach-omap2/remoteproc3xxx.c
b/arch/arm/mach-omap2/remoteproc3xxx.c
new file mode 100644
index 000..f86a333
--- /dev/null
+++ b/arch/arm/mach-omap2/remoteproc3xxx.c
@@ -0,0 +1,226 @@
+/*
+ * Remote Processor machine-specific module for OMAP3
+ *
+ * Copyright (C) 2010 Texas Instruments 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+/* this is needed for multi-omap support */
+#ifdef CONFIG_ARCH_OMAP3
+#include linux/kernel.h
+#include linux/delay.h
+#include linux/clk.h
+#include linux/err.h
+#include linux/platform_device.h
+#include linux/io.h
+#include linux/pm_runtime.h
+#include plat/remoteproc.h
+#include mach/irqs.h
+#include plat/omap_device.h
+#include plat/control.h
+#include plat/common.h
+#include plat/powerdomain.h
+#include plat/clockdomain.h
+#include asm/uaccess.h
+
+#include cm-regbits-34xx.h
+#include prm-regbits-34xx.h
+
+#define OMAP3_IVA2_BOOTADDR_MASK 0xFC00
+
+#define PRCM_PM_PWSTCTRL_IVA2_POWER_STATE_MASK (u32)(3)
+#define PRCM_PM_PWSTCTRL_IVA2_POWER_STATE_OFFSET (u32)(0)
+
+#define PRCM_PM_PWSTST_IVA2_InTransition_MASK (u32)(0x10)
+#define PRCM_PM_PWSTST_IVA2_InTransition_OFFSET(u32)(20)
+
+#define CM_CLKSTCTRL_IVA2_OFFSET (0)
+#define CM_CLKSTCTRL_IVA2_MASK (3)
+
+#define DSP_SYSC_DIRECTBOOT(0)
+#define DSP_SYSC_IDLEBOOT (1)
+#define DSP_SYSC_SELFLOOPBOOT (2)
+#define DSP_SYSC_USRBOOTSTRAP (3)
+#define DSP_SYSC_DEFAULTRESTORE(4)
+
+#ifdef CONFIG_BRIDGE_DEBUG
+static void omap3_rproc_dump_regs(struct device *dev)
+{
+ u32 temp;
+
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_FCLKEN);
+ dev_info(dev, CM_FCLKEN_IVA2 = 0x%x \n, temp);
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_ICLKEN1);
+ dev_info(dev, CM_ICLKEN1_IVA2 = 0x%x \n, temp);
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_IDLEST);
+ dev_info(dev, CM_IDLEST_IVA2 = 0x%x \n, temp);
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSTCTRL);
+ dev_info(dev, CM_CLKSTCTRL_IVA2 = 0x%x \n, temp);
+ temp = cm_read_mod_reg(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSTST);
+ dev_info(dev, CM_CLKSTST_IVA2 = 0x%x \n, temp);
+ temp = prm_read_mod_reg(OMAP3430_IVA2_MOD, RM_RSTCTRL);
+ dev_info(dev, RM_RSTCTRL_IVA2 = 0x%x \n, temp);
+ temp = prm_read_mod_reg(OMAP3430_IVA2_MOD, RM_RSTST);
+ dev_info(dev, RM_RSTST_IVA2 = 0x%x \n, temp);
+ temp = prm_read_mod_reg(OMAP3430_IVA2_MOD, PM_PWSTCTRL);
+ dev_info(dev, PM_PWSTCTRL_IVA2 = 0x%x \n, temp);
+ temp = prm_read_mod_reg(OMAP3430_IVA2_MOD, PM_PWSTST);
+ dev_info(dev, PM_PWSTST_IVA2 = 0x%x \n, temp);
+ temp = cm_read_mod_reg(CORE_MOD, CM_ICLKEN1);
+ dev_info(dev, CM_ICLKEN1_CORE = 0x%x \n, temp);
+}
+#else
+static void omap3_rproc_dump_regs(struct device *dev) { }
+#endif
+
+static int omap3_rproc_get_state(struct device *dev)
+{
+ u32 dsp_pwr_state;
+
+ dsp_pwr_state = prm_read_mod_reg(OMAP3430_IVA2_MOD, PM_PWSTST);
+
+ return dsp_pwr_state OMAP_POWERSTATEST_MASK;
+}
+
+static int omap3_rproc_start(struct device *dev, u32 start_addr)
+{
+ dev_info(dev, %s: set boot mode, addr: 0x%x\n, __func__, start_addr);
+
+ omap3_rproc_dump_regs(dev);
+
+ if (PWRDM_POWER_ON != omap3_rproc_get_state(dev)) {
+ /* IVA2 is not in ON state */
+ /* Read and set PM_PWSTCTRL_IVA2 to ON */
+ prm_rmw_mod_reg_bits(OMAP_POWERSTATEST_MASK, PWRDM_POWER_ON,
+ OMAP3430_IVA2_MOD, PM_PWSTCTRL);
+
+ /* Set the SW supervised state transition */
+ cm_write_mod_reg(OMAP34XX_CLKSTCTRL_FORCE_WAKEUP,
+ OMAP3430_IVA2_MOD, CM_CLKSTCTRL);
+
+ /* Wait until the state has moved to ON */
+ while
