f54b5d4a1a
commit dc76697d7e933d5e299116f219c890568785ea15 upstream.
Unbinding the bcm2835aux UART driver raises the following error if the
maximum number of 8250 UARTs is set to 1 (via the 8250.nr_uarts module
parameter or CONFIG_SERIAL_8250_RUNTIME_UARTS):
(NULL device *): Removing wrong port: a6f80333 != fa20408b
That's because bcm2835aux_serial_probe() retrieves UART line number 1
from the devicetree and stores it in data->uart.port.line, while
serial8250_register_8250_port() instead uses UART line number 0,
which is stored in data->line.
On driver unbind, bcm2835aux_serial_remove() uses data->uart.port.line,
which contains the wrong number. Fix it.
The issue does not occur if the maximum number of 8250 UARTs is >= 2.
Fixes: bdc5f30095 ("serial: bcm2835: add driver for bcm2835-aux-uart")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: stable@vger.kernel.org # v4.6+
Cc: Martin Sperl <kernel@martin.sperl.org>
Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/912ccf553c5258135c6d7e8f404a101ef320f0f4.1579175223.git.lukas@wunner.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
141 lines
3.3 KiB
C
141 lines
3.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Serial port driver for BCM2835AUX UART
|
|
*
|
|
* Copyright (C) 2016 Martin Sperl <kernel@martin.sperl.org>
|
|
*
|
|
* Based on 8250_lpc18xx.c:
|
|
* Copyright (C) 2015 Joachim Eastwood <manabian@gmail.com>
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include "8250.h"
|
|
|
|
struct bcm2835aux_data {
|
|
struct uart_8250_port uart;
|
|
struct clk *clk;
|
|
int line;
|
|
};
|
|
|
|
static int bcm2835aux_serial_probe(struct platform_device *pdev)
|
|
{
|
|
struct bcm2835aux_data *data;
|
|
struct resource *res;
|
|
int ret;
|
|
|
|
/* allocate the custom structure */
|
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
if (!data)
|
|
return -ENOMEM;
|
|
|
|
/* initialize data */
|
|
spin_lock_init(&data->uart.port.lock);
|
|
data->uart.capabilities = UART_CAP_FIFO | UART_CAP_MINI;
|
|
data->uart.port.dev = &pdev->dev;
|
|
data->uart.port.regshift = 2;
|
|
data->uart.port.type = PORT_16550;
|
|
data->uart.port.iotype = UPIO_MEM;
|
|
data->uart.port.fifosize = 8;
|
|
data->uart.port.flags = UPF_SHARE_IRQ |
|
|
UPF_FIXED_PORT |
|
|
UPF_FIXED_TYPE |
|
|
UPF_SKIP_TEST;
|
|
|
|
/* get the clock - this also enables the HW */
|
|
data->clk = devm_clk_get(&pdev->dev, NULL);
|
|
ret = PTR_ERR_OR_ZERO(data->clk);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "could not get clk: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
/* get the interrupt */
|
|
ret = platform_get_irq(pdev, 0);
|
|
if (ret < 0)
|
|
return ret;
|
|
data->uart.port.irq = ret;
|
|
|
|
/* map the main registers */
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res) {
|
|
dev_err(&pdev->dev, "memory resource not found");
|
|
return -EINVAL;
|
|
}
|
|
data->uart.port.membase = devm_ioremap_resource(&pdev->dev, res);
|
|
ret = PTR_ERR_OR_ZERO(data->uart.port.membase);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/* Check for a fixed line number */
|
|
ret = of_alias_get_id(pdev->dev.of_node, "serial");
|
|
if (ret >= 0)
|
|
data->uart.port.line = ret;
|
|
|
|
/* enable the clock as a last step */
|
|
ret = clk_prepare_enable(data->clk);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "unable to enable uart clock - %d\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
/* the HW-clock divider for bcm2835aux is 8,
|
|
* but 8250 expects a divider of 16,
|
|
* so we have to multiply the actual clock by 2
|
|
* to get identical baudrates.
|
|
*/
|
|
data->uart.port.uartclk = clk_get_rate(data->clk) * 2;
|
|
|
|
/* register the port */
|
|
ret = serial8250_register_8250_port(&data->uart);
|
|
if (ret < 0) {
|
|
dev_err(&pdev->dev, "unable to register 8250 port - %d\n",
|
|
ret);
|
|
goto dis_clk;
|
|
}
|
|
data->line = ret;
|
|
|
|
platform_set_drvdata(pdev, data);
|
|
|
|
return 0;
|
|
|
|
dis_clk:
|
|
clk_disable_unprepare(data->clk);
|
|
return ret;
|
|
}
|
|
|
|
static int bcm2835aux_serial_remove(struct platform_device *pdev)
|
|
{
|
|
struct bcm2835aux_data *data = platform_get_drvdata(pdev);
|
|
|
|
serial8250_unregister_port(data->line);
|
|
clk_disable_unprepare(data->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id bcm2835aux_serial_match[] = {
|
|
{ .compatible = "brcm,bcm2835-aux-uart" },
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, bcm2835aux_serial_match);
|
|
|
|
static struct platform_driver bcm2835aux_serial_driver = {
|
|
.driver = {
|
|
.name = "bcm2835-aux-uart",
|
|
.of_match_table = bcm2835aux_serial_match,
|
|
},
|
|
.probe = bcm2835aux_serial_probe,
|
|
.remove = bcm2835aux_serial_remove,
|
|
};
|
|
module_platform_driver(bcm2835aux_serial_driver);
|
|
|
|
MODULE_DESCRIPTION("BCM2835 auxiliar UART driver");
|
|
MODULE_AUTHOR("Martin Sperl <kernel@martin.sperl.org>");
|
|
MODULE_LICENSE("GPL v2");
|