OMAP3: PM debug: remove register dumping

Remove OMAP3-specific register dumping feature from PM debug layer.
This is removed because:

- it's ugly
- it's OMAP3-specific, and will obviously not scale to OMAP4+
- userspace /dev/mem-based tools (like omapconf) can do this much better

Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index a8425d653ebdd2c2cd4c890ffa4a124adf0de6c2..3d1cce280e246e6f8d8cf409b9308b17bf388848 100644 (file)
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -63,10 +63,6 @@ void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds)
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 
-static void pm_dbg_regset_store(u32 *ptr);
-
-static struct dentry *pm_dbg_dir;
-
 static int pm_dbg_init_done;
 
 static int pm_dbg_init(void);
@@ -76,160 +72,6 @@ enum {
        DEBUG_FILE_TIMERS,
 };
 
-struct pm_module_def {
-       char name[8]; /* Name of the module */
-       short type; /* CM or PRM */
-       unsigned short offset;
-       int low; /* First register address on this module */
-       int high; /* Last register address on this module */
-};
-
-#define MOD_CM 0
-#define MOD_PRM 1
-
-static const struct pm_module_def *pm_dbg_reg_modules;
-static const struct pm_module_def omap3_pm_reg_modules[] = {
-       { "IVA2", MOD_CM, OMAP3430_IVA2_MOD, 0, 0x4c },
-       { "OCP", MOD_CM, OCP_MOD, 0, 0x10 },
-       { "MPU", MOD_CM, MPU_MOD, 4, 0x4c },
-       { "CORE", MOD_CM, CORE_MOD, 0, 0x4c },
-       { "SGX", MOD_CM, OMAP3430ES2_SGX_MOD, 0, 0x4c },
-       { "WKUP", MOD_CM, WKUP_MOD, 0, 0x40 },
-       { "CCR", MOD_CM, PLL_MOD, 0, 0x70 },
-       { "DSS", MOD_CM, OMAP3430_DSS_MOD, 0, 0x4c },
-       { "CAM", MOD_CM, OMAP3430_CAM_MOD, 0, 0x4c },
-       { "PER", MOD_CM, OMAP3430_PER_MOD, 0, 0x4c },
-       { "EMU", MOD_CM, OMAP3430_EMU_MOD, 0x40, 0x54 },
-       { "NEON", MOD_CM, OMAP3430_NEON_MOD, 0x20, 0x48 },
-       { "USB", MOD_CM, OMAP3430ES2_USBHOST_MOD, 0, 0x4c },
-
-       { "IVA2", MOD_PRM, OMAP3430_IVA2_MOD, 0x50, 0xfc },
-       { "OCP", MOD_PRM, OCP_MOD, 4, 0x1c },
-       { "MPU", MOD_PRM, MPU_MOD, 0x58, 0xe8 },
-       { "CORE", MOD_PRM, CORE_MOD, 0x58, 0xf8 },
-       { "SGX", MOD_PRM, OMAP3430ES2_SGX_MOD, 0x58, 0xe8 },
-       { "WKUP", MOD_PRM, WKUP_MOD, 0xa0, 0xb0 },
-       { "CCR", MOD_PRM, PLL_MOD, 0x40, 0x70 },
-       { "DSS", MOD_PRM, OMAP3430_DSS_MOD, 0x58, 0xe8 },
-       { "CAM", MOD_PRM, OMAP3430_CAM_MOD, 0x58, 0xe8 },
-       { "PER", MOD_PRM, OMAP3430_PER_MOD, 0x58, 0xe8 },
-       { "EMU", MOD_PRM, OMAP3430_EMU_MOD, 0x58, 0xe4 },
-       { "GLBL", MOD_PRM, OMAP3430_GR_MOD, 0x20, 0xe4 },
-       { "NEON", MOD_PRM, OMAP3430_NEON_MOD, 0x58, 0xe8 },
-       { "USB", MOD_PRM, OMAP3430ES2_USBHOST_MOD, 0x58, 0xe8 },
-       { "", 0, 0, 0, 0 },
-};
-
-#define PM_DBG_MAX_REG_SETS 4
-
-static void *pm_dbg_reg_set[PM_DBG_MAX_REG_SETS];
-
-static int pm_dbg_get_regset_size(void)
-{
-       static int regset_size;
-
-       if (regset_size == 0) {
-               int i = 0;
-
-               while (pm_dbg_reg_modules[i].name[0] != 0) {
-                       regset_size += pm_dbg_reg_modules[i].high +
-                               4 - pm_dbg_reg_modules[i].low;
-                       i++;
-               }
-       }
-       return regset_size;
-}
-
-static int pm_dbg_show_regs(struct seq_file *s, void *unused)
-{
-       int i, j;
-       unsigned long val;
-       int reg_set = (int)s->private;
-       u32 *ptr;
-       void *store = NULL;
-       int regs;
-       int linefeed;
-
-       if (reg_set == 0) {
-               store = kmalloc(pm_dbg_get_regset_size(), GFP_KERNEL);
-               ptr = store;
-               pm_dbg_regset_store(ptr);
-       } else {
-               ptr = pm_dbg_reg_set[reg_set - 1];
-       }
-
-       i = 0;
-
-       while (pm_dbg_reg_modules[i].name[0] != 0) {
-               regs = 0;
-               linefeed = 0;
-               if (pm_dbg_reg_modules[i].type == MOD_CM)
-                       seq_printf(s, "MOD: CM_%s (%08x)\n",
-                               pm_dbg_reg_modules[i].name,
-                               (u32)(OMAP3430_CM_BASE +
-                               pm_dbg_reg_modules[i].offset));
-               else
-                       seq_printf(s, "MOD: PRM_%s (%08x)\n",
-                               pm_dbg_reg_modules[i].name,
-                               (u32)(OMAP3430_PRM_BASE +
-                               pm_dbg_reg_modules[i].offset));
-
-               for (j = pm_dbg_reg_modules[i].low;
-                       j <= pm_dbg_reg_modules[i].high; j += 4) {
-                       val = *(ptr++);
-                       if (val != 0) {
-                               regs++;
-                               if (linefeed) {
-                                       seq_printf(s, "\n");
-                                       linefeed = 0;
-                               }
-                               seq_printf(s, "  %02x => %08lx", j, val);
-                               if (regs % 4 == 0)
-                                       linefeed = 1;
-                       }
-               }
-               seq_printf(s, "\n");
-               i++;
-       }
-
-       if (store != NULL)
-               kfree(store);
-
-       return 0;
-}
-
-static void pm_dbg_regset_store(u32 *ptr)
-{
-       int i, j;
-       u32 val;
-
-       i = 0;
-
-       while (pm_dbg_reg_modules[i].name[0] != 0) {
-               for (j = pm_dbg_reg_modules[i].low;
-                       j <= pm_dbg_reg_modules[i].high; j += 4) {
-                       if (pm_dbg_reg_modules[i].type == MOD_CM)
-                               val = omap2_cm_read_mod_reg(
-                                       pm_dbg_reg_modules[i].offset, j);
-                       else
-                               val = omap2_prm_read_mod_reg(
-                                       pm_dbg_reg_modules[i].offset, j);
-                       *(ptr++) = val;
-               }
-               i++;
-       }
-}
-
-int pm_dbg_regset_save(int reg_set)
-{
-       if (pm_dbg_reg_set[reg_set-1] == NULL)
-               return -EINVAL;
-
-       pm_dbg_regset_store(pm_dbg_reg_set[reg_set-1]);
-
-       return 0;
-}
-
 static const char pwrdm_state_names[][PWRDM_MAX_PWRSTS] = {
        "OFF",
        "RET",
@@ -349,11 +191,6 @@ static int pm_dbg_open(struct inode *inode, struct file *file)
        };
 }
 
-static int pm_dbg_reg_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, pm_dbg_show_regs, inode->i_private);
-}
-
 static const struct file_operations debug_fops = {
        .open           = pm_dbg_open,
        .read           = seq_read,
@@ -361,40 +198,6 @@ static const struct file_operations debug_fops = {
        .release        = single_release,
 };
 
-static const struct file_operations debug_reg_fops = {
-       .open           = pm_dbg_reg_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-int pm_dbg_regset_init(int reg_set)
-{
-       char name[2];
-
-       if (!pm_dbg_init_done)
-               pm_dbg_init();
-
-       if (reg_set < 1 || reg_set > PM_DBG_MAX_REG_SETS ||
-               pm_dbg_reg_set[reg_set-1] != NULL)
-               return -EINVAL;
-
-       pm_dbg_reg_set[reg_set-1] =
-               kmalloc(pm_dbg_get_regset_size(), GFP_KERNEL);
-
-       if (pm_dbg_reg_set[reg_set-1] == NULL)
-               return -ENOMEM;
-
-       if (pm_dbg_dir != NULL) {
-               sprintf(name, "%d", reg_set);
-
-               (void) debugfs_create_file(name, S_IRUGO,
-                       pm_dbg_dir, (void *)reg_set, &debug_reg_fops);
-       }
-
-       return 0;
-}
-
 static int pwrdm_suspend_get(void *data, u64 *val)
 {
        int ret = -EINVAL;
@@ -477,20 +280,11 @@ DEFINE_SIMPLE_ATTRIBUTE(pm_dbg_option_fops, option_get, option_set, "%llu\n");
 
 static int pm_dbg_init(void)
 {
-       int i;
        struct dentry *d;
-       char name[2];
 
        if (pm_dbg_init_done)
                return 0;
 
-       if (cpu_is_omap34xx())
-               pm_dbg_reg_modules = omap3_pm_reg_modules;
-       else {
-               printk(KERN_ERR "%s: only OMAP3 supported\n", __func__);
-               return -ENODEV;
-       }
-
        d = debugfs_create_dir("pm_debug", NULL);
        if (IS_ERR(d))
                return PTR_ERR(d);
@@ -502,21 +296,6 @@ static int pm_dbg_init(void)
 
        pwrdm_for_each(pwrdms_setup, (void *)d);
 
-       pm_dbg_dir = debugfs_create_dir("registers", d);
-       if (IS_ERR(pm_dbg_dir))
-               return PTR_ERR(pm_dbg_dir);
-
-       (void) debugfs_create_file("current", S_IRUGO,
-               pm_dbg_dir, (void *)0, &debug_reg_fops);
-
-       for (i = 0; i < PM_DBG_MAX_REG_SETS; i++)
-               if (pm_dbg_reg_set[i] != NULL) {
-                       sprintf(name, "%d", i+1);
-                       (void) debugfs_create_file(name, S_IRUGO,
-                               pm_dbg_dir, (void *)(i+1), &debug_reg_fops);
-
-               }
-
        (void) debugfs_create_file("enable_off_mode", S_IRUGO | S_IWUSR, d,
                                   &enable_off_mode, &pm_dbg_option_fops);
        (void) debugfs_create_file("wakeup_timer_seconds", S_IRUGO | S_IWUSR, d,

diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index acac27501d4e8ab5b5f6560d82a11e090829bf90..ea58f5dd240085e853584e113fe6b4f506969fd7 100644 (file)
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -74,12 +74,8 @@ extern u32 enable_off_mode;
 
 #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
 extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);
-extern int pm_dbg_regset_save(int reg_set);
-extern int pm_dbg_regset_init(int reg_set);
 #else
 #define pm_dbg_update_time(pwrdm, prev) do {} while (0);
-#define pm_dbg_regset_save(reg_set) do {} while (0);
-#define pm_dbg_regset_init(reg_set) do {} while (0);
 #endif /* CONFIG_PM_DEBUG */
 
 extern void omap24xx_idle_loop_suspend(void);