pass-hal: tm2: Modify the sysfs path for BUS/GPU resource

This patches modifes the default sysfs path for bus/gpu resource as following:
Because TM2 uses the devfreq subsystem in Linux Kernel for memory bus and gpu.
- /sys/class/devfreq/(devfreq device name)

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/src/bus/bus.c b/src/bus/bus.c
index b9d8c95..e4c7bbf 100644 (file)
--- a/src/bus/bus.c
+++ b/src/bus/bus.c
@@ -12,8 +12,7 @@
 #define HAL_VERSION    MAKE_2B_CODE_4(VER_MAJOR,VER_MINOR,VER_REVISION,VER_RELEASE)
 #define DEV_VERSION_BUS        MAKE_2B_CODE_2(1,0)
 
-#define DEVFREQ_BUS_PATH_PREFIX                        "/sys/devices/platform/soc/"
-#define DEVFREQ_BUS_PATH_INFIX                 "/devfreq/"
+#define DEVFREQ_BUS_PATH_PREFIX                        "/sys/class/devfreq/"
 #define DEVFREQ_BUS_CURR_GOVERNOR_PATH_SUFFIX  "/governor"
 #define DEVFREQ_BUS_CURR_FREQ_PATH_SUFFIX      "/cur_freq"
 #define DEVFREQ_BUS_MIN_FREQ_PATH_SUFFIX       "/min_freq"
@@ -27,11 +26,9 @@ static int tm2_dvfs_get_curr_governor(char *res_name, char *governor)
        if ((!res_name) || (!governor))
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_BUS_PATH_PREFIX,
                res_name,
-               DEVFREQ_BUS_PATH_INFIX,
-               res_name,
                DEVFREQ_BUS_CURR_GOVERNOR_PATH_SUFFIX);
 
        ret = sysfs_read_str(path, governor, BUFF_MAX);
@@ -49,11 +46,9 @@ static int tm2_dvfs_set_curr_governor(char *res_name, char *governor)
        if ((!res_name) || (!governor))
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_BUS_PATH_PREFIX,
                res_name,
-               DEVFREQ_BUS_PATH_INFIX,
-               res_name,
                DEVFREQ_BUS_CURR_GOVERNOR_PATH_SUFFIX);
 
        ret = sysfs_write_str(path, governor);
@@ -71,11 +66,9 @@ static int tm2_dvfs_get_curr_freq(char *res_name)
        if (!res_name)
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_BUS_PATH_PREFIX,
                res_name,
-               DEVFREQ_BUS_PATH_INFIX,
-               res_name,
                DEVFREQ_BUS_CURR_FREQ_PATH_SUFFIX);
 
        ret = sysfs_read_int(path, &freq);
@@ -93,11 +86,9 @@ static int tm2_dvfs_get_min_freq(char *res_name)
        if (!res_name)
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_BUS_PATH_PREFIX,
                res_name,
-               DEVFREQ_BUS_PATH_INFIX,
-               res_name,
                DEVFREQ_BUS_MIN_FREQ_PATH_SUFFIX);
 
        ret = sysfs_read_int(path, &freq);
@@ -115,11 +106,9 @@ static int tm2_dvfs_set_min_freq(char *res_name, int freq)
        if ((!res_name) || (freq < 0))
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_BUS_PATH_PREFIX,
                res_name,
-               DEVFREQ_BUS_PATH_INFIX,
-               res_name,
                DEVFREQ_BUS_MIN_FREQ_PATH_SUFFIX);
 
        ret = sysfs_write_int(path, freq);
@@ -137,11 +126,9 @@ static int tm2_dvfs_get_max_freq(char *res_name)
        if (!res_name)
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_BUS_PATH_PREFIX,
                res_name,
-               DEVFREQ_BUS_PATH_INFIX,
-               res_name,
                DEVFREQ_BUS_MAX_FREQ_PATH_SUFFIX);
 
        ret = sysfs_read_int(path, &freq);
@@ -159,11 +146,9 @@ static int tm2_dvfs_set_max_freq(char *res_name, int freq)
        if ((!res_name) || (freq < 0))
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_BUS_PATH_PREFIX,
                res_name,
-               DEVFREQ_BUS_PATH_INFIX,
-               res_name,
                DEVFREQ_BUS_MAX_FREQ_PATH_SUFFIX);
 
        ret = sysfs_write_int(path, freq);

diff --git a/src/gpu/gpu.c b/src/gpu/gpu.c
index 28a8ffd..3ef3c10 100644 (file)
--- a/src/gpu/gpu.c
+++ b/src/gpu/gpu.c
@@ -12,8 +12,7 @@
 #define HAL_VERSION    MAKE_2B_CODE_4(VER_MAJOR,VER_MINOR,VER_REVISION,VER_RELEASE)
 #define DEV_VERSION_GPU        MAKE_2B_CODE_2(1,0)
 
-#define DEVFREQ_GPU_PATH_PREFIX                        "/sys/devices/platform/soc/"
-#define DEVFREQ_GPU_PATH_INFIX                 "/devfreq/"
+#define DEVFREQ_GPU_PATH_PREFIX                        "/sys/class/devfreq/"
 #define DEVFREQ_GPU_CURR_GOVERNOR_PATH_SUFFIX  "/governor"
 #define DEVFREQ_GPU_CURR_FREQ_PATH_SUFFIX      "/cur_freq"
 #define DEVFREQ_GPU_MIN_FREQ_PATH_SUFFIX       "/min_freq"
@@ -33,11 +32,9 @@ static int tm2_dvfs_get_curr_governor(char *res_name, char *governor)
        if ((!res_name) || (!governor))
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_GPU_PATH_PREFIX,
                res_name,
-               DEVFREQ_GPU_PATH_INFIX,
-               res_name,
                DEVFREQ_GPU_CURR_GOVERNOR_PATH_SUFFIX);
 
        ret = sysfs_read_str(path, governor, BUFF_MAX);
@@ -55,11 +52,9 @@ static int tm2_dvfs_set_curr_governor(char *res_name, char *governor)
        if ((!res_name) || (!governor))
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_GPU_PATH_PREFIX,
                res_name,
-               DEVFREQ_GPU_PATH_INFIX,
-               res_name,
                DEVFREQ_GPU_CURR_GOVERNOR_PATH_SUFFIX);
 
        ret = sysfs_write_str(path, governor);
@@ -77,11 +72,9 @@ static int tm2_dvfs_get_curr_freq(char *res_name)
        if (!res_name)
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_GPU_PATH_PREFIX,
                res_name,
-               DEVFREQ_GPU_PATH_INFIX,
-               res_name,
                DEVFREQ_GPU_CURR_FREQ_PATH_SUFFIX);
 
        ret = sysfs_read_int(path, &freq);
@@ -99,11 +92,9 @@ static int tm2_dvfs_get_min_freq(char *res_name)
        if (!res_name)
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_GPU_PATH_PREFIX,
                res_name,
-               DEVFREQ_GPU_PATH_INFIX,
-               res_name,
                DEVFREQ_GPU_MIN_FREQ_PATH_SUFFIX);
 
        ret = sysfs_read_int(path, &freq);
@@ -121,11 +112,9 @@ static int tm2_dvfs_set_min_freq(char *res_name, int freq)
        if ((!res_name) || (freq < 0))
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_GPU_PATH_PREFIX,
                res_name,
-               DEVFREQ_GPU_PATH_INFIX,
-               res_name,
                DEVFREQ_GPU_MIN_FREQ_PATH_SUFFIX);
 
        ret = sysfs_write_int(path, freq);
@@ -143,11 +132,9 @@ static int tm2_dvfs_get_max_freq(char *res_name)
        if (!res_name)
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_GPU_PATH_PREFIX,
                res_name,
-               DEVFREQ_GPU_PATH_INFIX,
-               res_name,
                DEVFREQ_GPU_MAX_FREQ_PATH_SUFFIX);
 
        ret = sysfs_read_int(path, &freq);
@@ -165,11 +152,9 @@ static int tm2_dvfs_set_max_freq(char *res_name, int freq)
        if ((!res_name) || (freq < 0))
                return -EINVAL;
 
-       snprintf(path, PATH_MAX, "%s%s%s%s%s",
+       snprintf(path, PATH_MAX, "%s%s%s",
                DEVFREQ_GPU_PATH_PREFIX,
                res_name,
-               DEVFREQ_GPU_PATH_INFIX,
-               res_name,
                DEVFREQ_GPU_MAX_FREQ_PATH_SUFFIX);
 
        ret = sysfs_write_int(path, freq);