From: Evoke Zhang <evoke.zhang@amlogic.com>
Date: Mon, 4 Sep 2017 07:49:24 +0000 (+0800)
Subject: vpu: driver defect clean up
X-Git-Tag: khadas-vims-v0.9.6-release~2861
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78e0532bf69a31ecaf86ae826e435f5f5e1fdf1d;p=platform%2Fkernel%2Flinux-amlogic.git

vpu: driver defect clean up

PD#150097: driver defect clean up:
#35
#39
#54
#55
#83
#94
#96
#102
#649
#690
#695

Change-Id: I1b9a9384100f4e39da246c5242de8e506671454d
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
---

diff --git a/drivers/amlogic/media/common/vpu/vpu.c b/drivers/amlogic/media/common/vpu/vpu.c
index 165d3c2..c80e236 100644
--- a/drivers/amlogic/media/common/vpu/vpu.c
+++ b/drivers/amlogic/media/common/vpu/vpu.c
@@ -521,7 +521,7 @@ static ssize_t vpu_debug_help(struct class *class,
 static ssize_t vpu_clk_debug(struct class *class, struct class_attribute *attr,
 		const char *buf, size_t count)
 {
-	unsigned int ret;
+	unsigned int ret = 0;
 	unsigned int tmp[2], n;
 	unsigned int fclk_type;
 
@@ -533,36 +533,46 @@ static ssize_t vpu_clk_debug(struct class *class, struct class_attribute *attr,
 	case 's': /* set */
 		tmp[0] = 4;
 		ret = sscanf(buf, "set %u", &tmp[0]);
-		if (tmp[0] > 100)
-			VPUPR("set clk frequency: %uHz\n", tmp[0]);
-		else
-			VPUPR("set clk level: %u\n", tmp[0]);
-		set_vpu_clk(tmp[0]);
+		if (ret == 1) {
+			if (tmp[0] > 100)
+				VPUPR("set clk frequency: %uHz\n", tmp[0]);
+			else
+				VPUPR("set clk level: %u\n", tmp[0]);
+			set_vpu_clk(tmp[0]);
+		} else {
+			VPUERR("invalid parameters\n");
+		}
 		break;
 	case 'r':
 		if (buf[2] == 'q') { /* request */
 			tmp[0] = 0;
 			tmp[1] = VPU_MAX;
 			ret = sscanf(buf, "request %u %u", &tmp[0], &tmp[1]);
-			request_vpu_clk_vmod(tmp[0], tmp[1]);
+			if (ret == 2)
+				request_vpu_clk_vmod(tmp[0], tmp[1]);
+			else
+				VPUERR("invalid parameters\n");
 		} else if (buf[2] == 'l') { /* release */
 			tmp[0] = VPU_MAX;
 			ret = sscanf(buf, "release %u", &tmp[0]);
-			release_vpu_clk_vmod(tmp[0]);
+			if (ret == 1)
+				release_vpu_clk_vmod(tmp[0]);
+			else
+				VPUERR("invalid parameters\n");
 		}
 		break;
 	case 'd':
 		tmp[0] = VPU_MAX;
 		ret = sscanf(buf, "dump %u", &tmp[0]);
-		if (tmp[0] == VPU_MAX) {
+		if (ret == 1) {
+			VPUPR("clk holdings:\n");
+			pr_info("%s:  %uHz(%u)\n", vpu_mod_table[tmp[0]],
+				vpu_clk_table[clk_vmod[tmp[0]]][0],
+				clk_vmod[tmp[0]]);
+		} else {
 			n = get_vpu_clk_level_max_vmod();
 			VPUPR("clk max holdings: %uHz(%u)\n",
 				vpu_clk_table[n][0], n);
-		} else {
-			VPUPR("clk holdings:\n");
-			pr_info("%s:  %uHz(%u)\n", vpu_mod_table[tmp[0]],
-			vpu_clk_table[clk_vmod[tmp[0]]][0],
-			clk_vmod[tmp[0]]);
 		}
 		break;
 	default:
@@ -570,17 +580,13 @@ static ssize_t vpu_clk_debug(struct class *class, struct class_attribute *attr,
 		break;
 	}
 
-	if (ret != 1 || ret != 2)
-		return -EINVAL;
-
 	return count;
-	/* return 0; */
 }
 
 static ssize_t vpu_mem_debug(struct class *class, struct class_attribute *attr,
 				const char *buf, size_t count)
 {
-	unsigned int ret;
+	unsigned int ret = 0;
 	unsigned int tmp[2];
 	unsigned int _reg0, _reg1, _reg2;
 
@@ -603,28 +609,29 @@ static ssize_t vpu_mem_debug(struct class *class, struct class_attribute *attr,
 		break;
 	case 'w':
 		ret = sscanf(buf, "w %u %u", &tmp[0], &tmp[1]);
-		tmp[0] = (tmp[0] > VPU_MAX) ? VPU_MAX : tmp[0];
-		tmp[1] = (tmp[1] == VPU_MEM_POWER_ON) ? 0 : 1;
-		VPUPR("switch_vpu_mem_pd: %s %s\n",
-			vpu_mod_table[tmp[0]], (tmp[1] ? "DOWN" : "ON"));
-		switch_vpu_mem_pd_vmod(tmp[0], tmp[1]);
+		if (ret == 2) {
+			tmp[0] = (tmp[0] > VPU_MAX) ? VPU_MAX : tmp[0];
+			tmp[1] = (tmp[1] == VPU_MEM_POWER_ON) ? 0 : 1;
+			VPUPR("switch_vpu_mem_pd: %s %s\n",
+				vpu_mod_table[tmp[0]],
+				(tmp[1] ? "DOWN" : "ON"));
+			switch_vpu_mem_pd_vmod(tmp[0], tmp[1]);
+		} else {
+			VPUERR("invalid parameters\n");
+		}
 		break;
 	default:
 		VPUERR("wrong mem_pd command\n");
 		break;
 	}
 
-	if (ret != 1 || ret != 2)
-		return -EINVAL;
-
 	return count;
-	/* return 0; */
 }
 
 static ssize_t vpu_clk_gate_debug(struct class *class,
 		struct class_attribute *attr, const char *buf, size_t count)
 {
-	unsigned int ret;
+	unsigned int ret = 0;
 	unsigned int tmp[2];
 
 	switch (buf[0]) {
@@ -652,22 +659,22 @@ static ssize_t vpu_clk_gate_debug(struct class *class,
 		break;
 	case 'w':
 		ret = sscanf(buf, "w %u %u", &tmp[0], &tmp[1]);
-		tmp[0] = (tmp[0] > VPU_MAX) ? VPU_MAX : tmp[0];
-		tmp[1] = (tmp[1] == VPU_CLK_GATE_ON) ? 1 : 0;
-		VPUPR("switch_vpu_clk_gate: %s %s\n",
-			vpu_mod_table[tmp[0]], (tmp[1] ? "ON" : "OFF"));
-		switch_vpu_clk_gate_vmod(tmp[0], tmp[1]);
+		if (ret == 2) {
+			tmp[0] = (tmp[0] > VPU_MAX) ? VPU_MAX : tmp[0];
+			tmp[1] = (tmp[1] == VPU_CLK_GATE_ON) ? 1 : 0;
+			VPUPR("switch_vpu_clk_gate: %s %s\n",
+				vpu_mod_table[tmp[0]], (tmp[1] ? "ON" : "OFF"));
+			switch_vpu_clk_gate_vmod(tmp[0], tmp[1]);
+		} else {
+			VPUERR("invalid parameters\n");
+		}
 		break;
 	default:
 		VPUERR("wrong clk_gate command\n");
 		break;
 	}
 
-	if (ret != 1 || ret != 2)
-		return -EINVAL;
-
 	return count;
-	/* return 0; */
 }
 
 static unsigned int vcbus_reg[] = {
@@ -712,15 +719,9 @@ static void vcbus_test(void)
 static ssize_t vpu_test_debug(struct class *class, struct class_attribute *attr,
 		const char *buf, size_t count)
 {
-	unsigned int ret;
-
 	vcbus_test();
 
-	if (ret != 1 || ret != 2)
-		return -EINVAL;
-
 	return count;
-	/* return 0; */
 }
 
 static ssize_t vpu_print_debug(struct class *class,
@@ -741,7 +742,7 @@ static struct class_attribute vpu_debug_class_attrs[] = {
 	__ATTR(gate, 0644, vpu_debug_help, vpu_clk_gate_debug),
 	__ATTR(test, 0644, vpu_debug_help, vpu_test_debug),
 	__ATTR(print, 0644, vpu_debug_help, vpu_print_debug),
-	__ATTR(help, 0644, vpu_debug_help, NULL),
+	__ATTR(help, 0444, vpu_debug_help, NULL),
 };
 
 static struct class *vpu_debug_class;
diff --git a/drivers/amlogic/media/common/vpu/vpu_reg.h b/drivers/amlogic/media/common/vpu/vpu_reg.h
index aa88a6f..10be919 100644
--- a/drivers/amlogic/media/common/vpu/vpu_reg.h
+++ b/drivers/amlogic/media/common/vpu/vpu_reg.h
@@ -96,10 +96,10 @@
 #define VDIN1_OFFSET                 0x80
 #define VDIN_COM_GCLK_CTRL           0x121b
 #define VDIN_COM_GCLK_CTRL2          0x1270
-#define VDIN0_COM_GCLK_CTRL          ((VDIN0_OFFSET << 2) + VDIN_COM_GCLK_CTRL)
-#define VDIN0_COM_GCLK_CTRL2         ((VDIN0_OFFSET << 2) + VDIN_COM_GCLK_CTRL2)
-#define VDIN1_COM_GCLK_CTRL          ((VDIN1_OFFSET << 2) + VDIN_COM_GCLK_CTRL)
-#define VDIN1_COM_GCLK_CTRL2         ((VDIN1_OFFSET << 2) + VDIN_COM_GCLK_CTRL2)
+#define VDIN0_COM_GCLK_CTRL          (VDIN0_OFFSET + VDIN_COM_GCLK_CTRL)
+#define VDIN0_COM_GCLK_CTRL2         (VDIN0_OFFSET + VDIN_COM_GCLK_CTRL2)
+#define VDIN1_COM_GCLK_CTRL          (VDIN1_OFFSET + VDIN_COM_GCLK_CTRL)
+#define VDIN1_COM_GCLK_CTRL2         (VDIN1_OFFSET + VDIN_COM_GCLK_CTRL2)
 
 #define DI_CLKG_CTRL                 0x1718