uart-v2: phytium: Fix debug/heartbeat functional

 issue

Since the debug/heartbeat function does not work well in some
circumstances, we update related inferfaces of phytium-uart-v2
driver.

Signed-off-by: xuyan <xuyan1481@phytium.com.cn>
Signed-off-by: Feng Jun <fengjun@phytium.com.cn>
Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

Author: xuyan

drivers/tty/serial/phytium-uart-v2.c

@@ -30,7 +30,7 @@
 #define cmd_id_type     uint8_t
 #define cmd_subid_type  uint8_t
 #define DEFAULT_CLK	10000000
-#define	PHYT_UART_DRV_VER	"1.1.0"
+#define	PHYT_UART_DRV_VER	"1.1.1"
 /*
  * We wrap our port structure around the generic uart_port.
  */
@@ -43,8 +43,8 @@ struct phytium_uart_port {
 	struct clk		*clk;
 	void __iomem		*shmem_base;
 	bool			m_buf_empty;
-	bool			heartbeat_enable_flag;
-	bool			debug_enable_flag;
+	bool			heartbeat_enable;
+	bool			debug_enable;
 	struct			timer_list alive_timer;
 };
 
@@ -1073,51 +1073,49 @@ static int phytium_register_port(struct phytium_uart_port *pup)
 	return rc;
 }
 
-#if defined(SERIAL_PHYTIUM_V2_DEBUG)
+#if defined(CONFIG_SERIAL_PHYTIUM_V2_DEBUG)
 static int phytium_uart_enable_debug(struct phytium_uart_port *pup,
-		bool new_enable_flag)
+		bool enable)
 {
 	u32 dbg_regval;
-	static bool old_enable_flag;
 
-	if (old_enable_flag == new_enable_flag) {
+	if (pup->debug_enable == enable) {
 		pr_warn("PHYUART:set enable debug with repeative operation.\n");
-		return -1;
+		return -EINVAL;
 	}
-	old_enable_flag = new_enable_flag;
+	pup->debug_enable = enable;
 	dbg_regval = phytium_uart_read(pup, PHYUART_DBG_REG);
-	pr_info("PHYUART: %s debug_regval %x\n", __func__, dbg_regval);
-	if (!old_enable_flag && (dbg_regval & PHYUART_DBG_ENABLE_MASK))
+	if (!enable && (dbg_regval & PHYUART_DBG_ENABLE_MASK))
 		dbg_regval &= ~PHYUART_DBG_ENABLE_MASK;
-	else if (dbg_regval && !(dbg_regval & PHYUART_DBG_ENABLE_MASK))
+	else if (enable && !(dbg_regval & PHYUART_DBG_ENABLE_MASK))
 		dbg_regval |= PHYUART_DBG_ENABLE_MASK;
 
-	pr_info("final PHYUART: %s debug_regval %x\n", __func__, dbg_regval);
 	phytium_uart_write(dbg_regval, pup, PHYUART_DBG_REG);
 	return 0;
 }
 
 static int phytium_uart_enable_heartbeat(struct phytium_uart_port *pup,
-		bool new_heartbeat_flag)
+		bool enable)
 {
 	u32 dbg_regval;
-	static bool old_heartbeat_flag;
 
-	if (old_heartbeat_flag == new_heartbeat_flag) {
+	if (pup->heartbeat_enable == enable) {
 		pr_warn("PHYUART:set heartbeat with repeative operation.\n");
-		return -1;
+		return -EINVAL;
 	}
-	old_heartbeat_flag = new_heartbeat_flag;
+	pup->heartbeat_enable = enable;
 	dbg_regval = phytium_uart_read(pup, PHYUART_DBG_REG);
-	pr_info("PHYUART: %s dbg_regval %x\n", __func__, dbg_regval);
-	if (!old_heartbeat_flag && (dbg_regval & PHYUART_DBG_HEARTBEAT_MASK))
+	if (!enable && (dbg_regval & PHYUART_DBG_HEARTBEAT_MASK)) {
 		dbg_regval &= ~PHYUART_DBG_HEARTBEAT_MASK;
-	else if (dbg_regval && !(dbg_regval & PHYUART_DBG_HEARTBEAT_MASK))
+		phytium_uart_write(dbg_regval, pup, PHYUART_DBG_REG);
+		del_timer(&pup->alive_timer);
+	} else if (enable && !(dbg_regval & PHYUART_DBG_HEARTBEAT_MASK)) {
 		dbg_regval |= PHYUART_DBG_HEARTBEAT_MASK
 			| PHYUART_DBG_HEARTBEAT_ENABLE_MASK;
+		phytium_uart_write(dbg_regval, pup, PHYUART_DBG_REG);
+		add_timer(&pup->alive_timer);
+	}
 
-	pr_info("final PHYUART: %s dbg_regval %x\n", __func__, dbg_regval);
-	phytium_uart_write(dbg_regval, pup, PHYUART_DBG_REG);
 	return 0;
 }
 
@@ -1133,7 +1131,6 @@ static void alive_timer_routine(struct timer_list *tlist)
 	}
 
 	dbg_regval = phytium_uart_read(pup, PHYUART_DBG_REG);
-	pr_debug("PHYUART: %s debug_regval 0x%x\n", __func__, dbg_regval);
 	phytium_uart_write(dbg_regval | PHYUART_DBG_HEARTBEAT_MASK,
 			pup, PHYUART_DBG_REG);
 	mod_timer(&pup->alive_timer, jiffies + msecs_to_jiffies(5000));
@@ -1144,7 +1141,7 @@ static ssize_t debug_enable_show(struct device *dev,
 {
 	struct phytium_uart_port *pup = dev_get_drvdata(dev);
 
-	return sprintf(buf, "%d\n", pup->debug_enable_flag);
+	return sprintf(buf, "%d\n", pup->debug_enable);
 }
 
 static ssize_t debug_enable_store(struct device *dev,
@@ -1159,8 +1156,7 @@ static ssize_t debug_enable_store(struct device *dev,
 		ret = -EINVAL;
 		return ret;
 	}
-	pup->debug_enable_flag = enable;
-	phytium_uart_enable_debug(pup, pup->debug_enable_flag);
+	phytium_uart_enable_debug(pup, enable);
 	return count;
 }
 
@@ -1169,7 +1165,7 @@ static ssize_t heartbeat_enable_show(struct device *dev,
 {
 	struct phytium_uart_port *pup = dev_get_drvdata(dev);
 
-	return sprintf(buf, "%d\n", pup->heartbeat_enable_flag);
+	return sprintf(buf, "%d\n", pup->heartbeat_enable);
 }
 
 static ssize_t heartbeat_enable_store(struct device *dev,
@@ -1184,8 +1180,7 @@ static ssize_t heartbeat_enable_store(struct device *dev,
 		ret = -EINVAL;
 		return ret;
 	}
-	pup->heartbeat_enable_flag = heartbeat_enable;
-	phytium_uart_enable_heartbeat(pup, pup->heartbeat_enable_flag);
+	phytium_uart_enable_heartbeat(pup, heartbeat_enable);
 	return count;
 }
 static DEVICE_ATTR_RW(debug_enable);
@@ -1267,9 +1262,9 @@ static int phytium_uart_probe(struct platform_device *pdev)
 	pup->old_cr = 0;
 	pup->m_buf_empty = true;
 	snprintf(pup->type, sizeof(pup->type), "phytium,uart-v2");
-#if defined(SERIAL_PHYTIUM_V2_DEBUG)
-	pup->debug_enable_flag = false;
-	pup->heartbeat_enable_flag = false;
+#if defined(CONFIG_SERIAL_PHYTIUM_V2_DEBUG)
+	pup->debug_enable = false;
+	pup->heartbeat_enable = false;
 
 	phytium_uart_enable_heartbeat(pup, true);
 	phytium_uart_enable_debug(pup, true);
@@ -1293,7 +1288,7 @@ static int phytium_uart_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, pup);
 	return phytium_register_port(pup);
 
-#if defined(SERIAL_PHYTIUM_V2_DEBUG)
+#if defined(CONFIG_SERIAL_PHYTIUM_V2_DEBUG)
 heartbeat_enable_free:
 	device_remove_file(pup->dev, &dev_attr_heartbeat_enable);
 debug_enable_free: