Skip to contentSkip to conversation

two fixes on sprd serial driver

PATCH In review Chunyan Zhang 2 participants 5 messages Mar 18, 2020

Subsystems (2)
lore
Share & tools
lore

Chunyan Zhang

author reviewer
#0 lore raw

v3 cover two fixes on sprd serial driver

From: Chunyan Zhang <[email protected]>

Changes from v2:
* Return -EINVAL for both kinds of errors for calling of_alias_get_id(), to avoid return a positive value as error number if index is larger than the array size;
* removed cleanup for sprd_port.

Chunyan Zhang (2):
serial: sprd: getting port index via serial alias only
serial: sprd: remove redundant sprd_port cleanup

 drivers/tty/serial/sprd_serial.c | 40 +++++---------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)
Signature · 1 line
2.20.1
author reviewer
#1 lore raw

PATCH v3 1/2 serial: sprd: getting port index via serial aliases only

From: Chunyan Zhang <[email protected]>

This patch simplifies the process of getting serial port number, with this patch, serial devices must have aliases configured in devicetree.

The serial port searched out via sprd_port array maybe wrong if we don't have serial alias defined in devicetree, and specify console with command line, we would get the wrong port number if other serial ports probe failed before console's. So using aliases is mandatory.

---
 drivers/tty/serial/sprd_serial.c | 36 +++++---------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)
drivers/tty/serial/sprd_serial.c +5 -31
index 914862844790..e9d148d47bec 100644
@@ -1102,29 +1102,6 @@ static struct uart_driver sprd_uart_driver = {
 	.cons = SPRD_CONSOLE,
 };
 
-static int sprd_probe_dt_alias(int index, struct device *dev)
-{
-	struct device_node *np;
-	int ret = index;
-
-	if (!IS_ENABLED(CONFIG_OF))
-		return ret;
-
-	np = dev->of_node;
-	if (!np)
-		return ret;
-
-	ret = of_alias_get_id(np, "serial");
-	if (ret < 0)
-		ret = index;
-	else if (ret >= ARRAY_SIZE(sprd_port) || sprd_port[ret] != NULL) {
-		dev_warn(dev, "requested serial port %d not available.\n", ret);
-		ret = index;
-	}
-
-	return ret;
-}
-
 static int sprd_remove(struct platform_device *dev)
 {
 	struct sprd_uart_port *sup = platform_get_drvdata(dev);
@@ -1204,14 +1181,11 @@ static int sprd_probe(struct platform_device *pdev)
 	int index;
 	int ret;
 
-	for (index = 0; index < ARRAY_SIZE(sprd_port); index++)
-		if (sprd_port[index] == NULL)
-			break;
-
-	if (index == ARRAY_SIZE(sprd_port))
-		return -EBUSY;
-
-	index = sprd_probe_dt_alias(index, &pdev->dev);
+	index = of_alias_get_id(pdev->dev.of_node, "serial");
+	if (index < 0 || index >= ARRAY_SIZE(sprd_port)) {
+		dev_err(&pdev->dev, "got a wrong serial alias id %d\n", index);
+		return -EINVAL;
+	}
 
 	sprd_port[index] = devm_kzalloc(&pdev->dev, sizeof(*sprd_port[index]),
 					GFP_KERNEL);
Signature · 1 line
2.20.1
maintainer Reviewed-by on v3 1/2
#2 lore raw

Re: [PATCH v3 1/2] serial: sprd: getting port index via serial aliases only

Quoted 6 lines · Chunyan Zhang

From: Chunyan Zhang <[email protected]>

This patch simplifies the process of getting serial port number, with this patch, serial devices must have aliases configured in devicetree.

Quoted 6 lines

The serial port searched out via sprd_port array maybe wrong if we don't have serial alias defined in devicetree, and specify console with command line, we would get the wrong port number if other serial ports probe failed before console's. So using aliases is mandatory.

Looks good to me.

Quoted 61 lines
---
 drivers/tty/serial/sprd_serial.c | 36 +++++---------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)
drivers/tty/serial/sprd_serial.c +5 -32
index 914862844790..e9d148d47bec 100644
@@ -1102,29 +1102,6 @@ static struct uart_driver sprd_uart_driver = {
        .cons = SPRD_CONSOLE,
 };
 
-static int sprd_probe_dt_alias(int index, struct device *dev)
-{
-       struct device_node *np;
-       int ret = index;
-
-       if (!IS_ENABLED(CONFIG_OF))
-               return ret;
-
-       np = dev->of_node;
-       if (!np)
-               return ret;
-
-       ret = of_alias_get_id(np, "serial");
-       if (ret < 0)
-               ret = index;
-       else if (ret >= ARRAY_SIZE(sprd_port) || sprd_port[ret] != NULL) {
-               dev_warn(dev, "requested serial port %d not available.\n", ret);
-               ret = index;
-       }
-
-       return ret;
-}
-
 static int sprd_remove(struct platform_device *dev)
 {
        struct sprd_uart_port *sup = platform_get_drvdata(dev);
@@ -1204,14 +1181,11 @@ static int sprd_probe(struct platform_device *pdev)
        int index;
        int ret;
 
-       for (index = 0; index < ARRAY_SIZE(sprd_port); index++)
-               if (sprd_port[index] == NULL)
-                       break;
-
-       if (index == ARRAY_SIZE(sprd_port))
-               return -EBUSY;
-
-       index = sprd_probe_dt_alias(index, &pdev->dev);
+       index = of_alias_get_id(pdev->dev.of_node, "serial");
+       if (index < 0 || index >= ARRAY_SIZE(sprd_port)) {
+               dev_err(&pdev->dev, "got a wrong serial alias id %d\n", index);
+               return -EINVAL;
+       }
 
        sprd_port[index] = devm_kzalloc(&pdev->dev, sizeof(*sprd_port[index]),
                                        GFP_KERNEL);
--

2.20.1

Signature · 1 line
Baolin Wang
author reviewer
#3 lore raw

PATCH v3 2/2 serial: sprd: remove redundant sprd_port cleanup

In reply to Chunyan Zhang

From: Chunyan Zhang <[email protected]>

We don't need to cleanup sprd_port anymore, since we've dropped the way of using the sprd_port[] array to get port index.

---
 drivers/tty/serial/sprd_serial.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/tty/serial/sprd_serial.c +1 -3
index e9d148d47bec..cefdd051b2d0 100644
@@ -1237,10 +1237,8 @@ static int sprd_probe(struct platform_device *pdev)
 	sprd_ports_num++;
 
 	ret = uart_add_one_port(&sprd_uart_driver, up);
-	if (ret) {
-		sprd_port[index] = NULL;
+	if (ret)
 		sprd_remove(pdev);
-	}
 
 	platform_set_drvdata(pdev, up);
 
Signature · 1 line
2.20.1
maintainer Reviewed-by on v3 2/2
#4 lore raw

Re: [PATCH v3 2/2] serial: sprd: remove redundant sprd_port cleanup

Quoted 7 lines · Chunyan Zhang

From: Chunyan Zhang <[email protected]>

We don't need to cleanup sprd_port anymore, since we've dropped the way of using the sprd_port[] array to get port index.

Looks good to me.

Quoted 23 lines
---
 drivers/tty/serial/sprd_serial.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/tty/serial/sprd_serial.c +1 -4
index e9d148d47bec..cefdd051b2d0 100644
@@ -1237,10 +1237,8 @@ static int sprd_probe(struct platform_device *pdev)
        sprd_ports_num++;
 
        ret = uart_add_one_port(&sprd_uart_driver, up);
-       if (ret) {
-               sprd_port[index] = NULL;
+       if (ret)
                sprd_remove(pdev);
-       }
 
        platform_set_drvdata(pdev, up);
 
--

2.20.1

Signature · 1 line
Baolin Wang