patch "tty: serial: fsl_lpuart: free IDs allocated by IDA" added to tty-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
tty: serial: fsl_lpuart: free IDs allocated by IDA
to my tty git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
in the tty-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From 2b2e71fe657510a6f71aa16ef0309fa6bc20ab3d Mon Sep 17 00:00:00 2001
From: Michael Walle <[email protected]>
Date: Tue, 3 Mar 2020 18:42:59 +0100
Subject: tty: serial: fsl_lpuart: free IDs allocated by IDA
Since commit 3bc3206e1c0f ("serial: fsl_lpuart: Remove the alias node dependence") the port line number can also be allocated by IDA, but in case of an error the ID will no be removed again. More importantly, any ID will be freed in remove(), even if it wasn't allocated but instead fetched by of_alias_get_id(). If it was not allocated by IDA there will be a warning:
WARN(1, "ida_free called for id=%d which is not allocated.\n", id);
Move the ID allocation more to the end of the probe() so that we still can use plain return in the first error cases.
--- drivers/tty/serial/fsl_lpuart.c | 39 ++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 15 deletions(-)
drivers/tty/serial/fsl_lpuart.c +24 -15
@@ -264,6 +264,7 @@ struct lpuart_port {int rx_dma_rng_buf_len;unsigned int dma_tx_nents;wait_queue_head_t dma_wait; +bool id_allocated; };struct lpuart_soc_data {
@@ -2422,19 +2423,6 @@ static int lpuart_probe(struct platform_device *pdev)if (!sport)return -ENOMEM ; - ret =of_alias_get_id (np,"serial" ); -if (ret <0 ) { - ret =ida_simple_get (&fsl_lpuart_ida,0 ,UART_NR ,GFP_KERNEL ); -if (ret <0 ) { -dev_err (&pdev->dev,"port line is full, add device failed\n" ); -return ret; - } - } -if (ret >=ARRAY_SIZE (lpuart_ports)) { -dev_err (&pdev->dev,"serial%d out of range\n" , ret); -return -EINVAL ; - } - sport->port.line = ret; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); sport->port.membase =devm_ioremap_resource (&pdev->dev, res);if (IS_ERR (sport->port.membase))
@@ -2479,9 +2467,25 @@ static int lpuart_probe(struct platform_device *pdev) } } + ret =of_alias_get_id (np,"serial" ); +if (ret <0 ) { + ret =ida_simple_get (&fsl_lpuart_ida,0 ,UART_NR ,GFP_KERNEL ); +if (ret <0 ) { +dev_err (&pdev->dev,"port line is full, add device failed\n" ); +return ret; + } + sport->id_allocated = true; + } +if (ret >=ARRAY_SIZE (lpuart_ports)) { +dev_err (&pdev->dev,"serial%d out of range\n" , ret); + ret = -EINVAL ; + goto failed_out_of_range; + } + sport->port.line = ret; + ret =lpuart_enable_clks (sport);if (ret) -return ret; + goto failed_clock_enable; sport->port.uartclk =lpuart_get_baud_clk_rate (sport); lpuart_ports[sport->port.line] = sport;
@@ -2531,6 +2535,10 @@ static int lpuart_probe(struct platform_device *pdev) failed_attach_port: failed_irq_request:lpuart_disable_clks (sport); +failed_clock_enable: +failed_out_of_range: +if (sport->id_allocated) +ida_simple_remove (&fsl_lpuart_ida, sport->port.line);return ret; }
@@ -2540,7 +2548,8 @@ static int lpuart_remove(struct platform_device *pdev)uart_remove_one_port (&lpuart_reg, &sport->port); -ida_simple_remove (&fsl_lpuart_ida, sport->port.line); +if (sport->id_allocated) +ida_simple_remove (&fsl_lpuart_ida, sport->port.line);lpuart_disable_clks (sport);
Signature · 1 line
2.25.1