Re: [PATCH 04/16] OMAP3: PM: Move smartreflex autocompensation enable disable hooks to PM debugfs.

Kevin Hilman
2010-03-02T18:29:55Z

Thara Gopinath <thara@ti.com> writes:

> This patch moves the hooks to enable disable smartreflex
> autocompensation to pm debugfs from the /sys/power/.
>
> To enable autocompensation for smartreflex SR<n> do
> echo 1 > <path>/pm_debug/sr<n>_autocomp
> To disable autocompensation for smartreflex SR<n> do
> echo 0 > <path>/pm_debug/sr<n>_autocomp
>
> Signed-off-by: Thara Gopinath <thara@ti.com>

Looks good.

Kevin

> ---
> arch/arm/mach-omap2/pm-debug.c | 4 +-
> arch/arm/mach-omap2/smartreflex.c | 114 ++++++++++--------------------------
> arch/arm/mach-omap2/smartreflex.h | 2 +
> 3 files changed, 36 insertions(+), 84 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
> index ec76f3b..7931bad 100644
> --- a/arch/arm/mach-omap2/pm-debug.c
> +++ b/arch/arm/mach-omap2/pm-debug.c
> @@ -162,7 +162,7 @@ void omap2_pm_dump(int mode, int resume, unsigned int us)
>
> static void pm_dbg_regset_store(u32 *ptr);
>
> -struct dentry *pm_dbg_dir;
> +struct dentry *pm_dbg_dir, *pm_dbg_main_dir;
>
> static int pm_dbg_init_done;
>
> @@ -608,7 +608,7 @@ static int __init pm_dbg_init(void)
> S_IRUGO | S_IWUGO, d,
> &voltage_off_while_idle,
> &pm_dbg_option_fops);
> -
> + pm_dbg_main_dir = d;
> pm_dbg_init_done = 1;
>
> return 0;
> diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
> index 05c72b2..db2e9bf 100644
> --- a/arch/arm/mach-omap2/smartreflex.c
> +++ b/arch/arm/mach-omap2/smartreflex.c
> @@ -21,11 +21,11 @@
> #include <linux/delay.h>
> #include <linux/err.h>
> #include <linux/clk.h>
> -#include <linux/sysfs.h>
> #include <linux/kobject.h>
> #include <linux/i2c/twl.h>
> #include <linux/io.h>
> #include <linux/list.h>
> +#include <linux/debugfs.h>
>
> #include <plat/omap34xx.h>
> #include <plat/control.h>
> @@ -40,6 +40,7 @@
> #include "prm-regbits-34xx.h"
>
> #define MAX_TRIES 100
> +#define SMARTREFLEX_NAME_LEN 16
>
> struct omap_sr {
> int srid;
> @@ -797,103 +798,53 @@ int sr_voltagescale_vcbypass(u32 target_opp, u32 current_opp,
> return 0;
> }
>
> -/* Sysfs interface to select SR VDD1 auto compensation */
> -static ssize_t omap_sr_vdd1_autocomp_show(struct kobject *kobj,
> - struct kobj_attribute *attr, char *buf)
> +/* PM Debug Fs enteries to enable disable smartreflex.*/
> +
> +static int omap_sr_autocomp_show(void *data, u64 *val)
> {
> - struct omap_sr *sr_info = _sr_lookup(SR1);
> + struct omap_sr *sr_info = (struct omap_sr *) data;
>
> if (!sr_info) {
> - pr_warning("omap_sr struct corresponding to SR1 not found\n");
> + pr_warning("omap_sr struct corresponding to SR%d not found\n",
> + sr_info->srid);
> return 0;
> }
> - return sprintf(buf, "%d\n", sr_info->is_autocomp_active);
> -}
> -
> -static ssize_t omap_sr_vdd1_autocomp_store(struct kobject *kobj,
> - struct kobj_attribute *attr,
> - const char *buf, size_t n)
> -{
> - unsigned short value;
> -
> - if (sscanf(buf, "%hu", &value) != 1 || (value > 1)) {
> - pr_err("sr_vdd1_autocomp: Invalid value\n");
> - return -EINVAL;
> - }
> -
> - if (value == 0) {
> - sr_stop_vddautocomap(SR1);
> - } else {
> - u32 current_vdd1opp_no = get_vdd1_opp();
> - if (!current_vdd1opp_no) {
> - pr_err("sr_vdd1_autocomp: Current VDD1 opp unknown\n");
> - return -EINVAL;
> - }
> - sr_start_vddautocomap(SR1, current_vdd1opp_no);
> - }
> - return n;
> + *val = sr_info->is_autocomp_active;
> + return 0;
> }
>
> -static struct kobj_attribute sr_vdd1_autocomp = {
> - .attr = {
> - .name = __stringify(sr_vdd1_autocomp),
> - .mode = 0644,
> - },
> - .show = omap_sr_vdd1_autocomp_show,
> - .store = omap_sr_vdd1_autocomp_store,
> -};
> -
> -/* Sysfs interface to select SR VDD2 auto compensation */
> -static ssize_t omap_sr_vdd2_autocomp_show(struct kobject *kobj,
> - struct kobj_attribute *attr, char *buf)
> +static int omap_sr_autocomp_store(void *data, u64 val)
> {
> - struct omap_sr *sr_info = _sr_lookup(SR2);
> + struct omap_sr *sr_info = (struct omap_sr *) data;
>
> if (!sr_info) {
> - pr_warning("omap_sr struct corresponding to SR2 not found\n");
> + pr_warning("omap_sr struct corresponding to SR%d not found\n",
> + sr_info->srid);
> return 0;
> }
> - return sprintf(buf, "%d\n", sr_info->is_autocomp_active);
> -}
> -
> -static ssize_t omap_sr_vdd2_autocomp_store(struct kobject *kobj,
> - struct kobj_attribute *attr,
> - const char *buf, size_t n)
> -{
> - unsigned short value;
> -
> - if (sscanf(buf, "%hu", &value) != 1 || (value > 1)) {
> - pr_err("sr_vdd2_autocomp: Invalid value\n");
> - return -EINVAL;
> - }
> -
> - if (value == 0) {
> - sr_stop_vddautocomap(SR2);
> + if (val == 0) {
> + sr_stop_vddautocomap(sr_info->srid);
> } else {
> - u32 current_vdd2opp_no = get_vdd2_opp();
> - if (!current_vdd2opp_no) {
> - pr_err("sr_vdd2_autocomp: Current VDD2 opp unknown\n");
> - return -EINVAL;
> - }
> - sr_start_vddautocomap(SR2, current_vdd2opp_no);
> + u32 current_opp;
> +
> + if (sr_info->srid == SR1)
> + current_opp = get_vdd1_opp();
> + else
> + current_opp = get_vdd2_opp();
> + sr_start_vddautocomap(sr_info->srid, current_opp);
> }
> - return n;
> + return 0;
> }
>
> -static struct kobj_attribute sr_vdd2_autocomp = {
> - .attr = {
> - .name = __stringify(sr_vdd2_autocomp),
> - .mode = 0644,
> - },
> - .show = omap_sr_vdd2_autocomp_show,
> - .store = omap_sr_vdd2_autocomp_store,
> -};
> +DEFINE_SIMPLE_ATTRIBUTE(pm_sr_fops, omap_sr_autocomp_show,
> + omap_sr_autocomp_store, "%llu\n");
>
> static int __devinit omap_smartreflex_probe(struct platform_device *pdev)
> {
> struct omap_sr *sr_info = kzalloc(sizeof(struct omap_sr), GFP_KERNEL);
> struct omap_device *odev = to_omap_device(pdev);
> int ret = 0;
> + char name[SMARTREFLEX_NAME_LEN];
>
> if (WARN_ON(!sr_info))
> return -ENOMEM;
> @@ -909,16 +860,15 @@ static int __devinit omap_smartreflex_probe(struct platform_device *pdev)
>
> if (sr_info->srid == SR1) {
> sr_info->vdd_opp_clk = clk_get(NULL, "dpll1_ck");
> - ret = sysfs_create_file(power_kobj, &sr_vdd1_autocomp.attr);
> - if (ret)
> - pr_err("sysfs_create_file failed: %d\n", ret);
> } else {
> sr_info->vdd_opp_clk = clk_get(NULL, "l3_ick");
> - ret = sysfs_create_file(power_kobj, &sr_vdd2_autocomp.attr);
> - if (ret)
> - pr_err("sysfs_create_file failed: %d\n", ret);
> }
>
> + /* Create the debug fs enteries */
> + sprintf(name, "sr%d_autocomp", sr_info->srid);
> + (void) debugfs_create_file(name, S_IRUGO | S_IWUGO, pm_dbg_main_dir,
> + (void *)sr_info, &pm_sr_fops);
> +
> /* Call the VPConfig */
> sr_configure_vp(sr_info->srid);
> odev->hwmods[0]->dev_attr = sr_info;
> diff --git a/arch/arm/mach-omap2/smartreflex.h b/arch/arm/mach-omap2/smartreflex.h
> index f1e8676..20fc128 100644
> --- a/arch/arm/mach-omap2/smartreflex.h
> +++ b/arch/arm/mach-omap2/smartreflex.h
> @@ -16,6 +16,8 @@
>
> #include <linux/platform_device.h>
>
> +extern struct dentry *pm_dbg_main_dir;
> +
> #define PHY_TO_OFF_PM_MASTER(p) (p - 0x36)
> #define PHY_TO_OFF_PM_RECIEVER(p) (p - 0x5b)
> #define PHY_TO_OFF_PM_INT(p) (p - 0x2e)
> --
> 1.7.0.rc1.33.g07cf0f