On Thu, May 21, 2015 at 9:26 AM, Andre Przywara <andre.przywara@xxxxxxx> wrote:
> +static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
> +{
> + struct uart_amba_port *uap;
> + struct vendor_data *vendor = id->data;
> + int portnr, ret;
> +
> + portnr = pl011_find_free_port();
> + if (portnr < 0)
> + return portnr;
> +
> + uap = devm_kzalloc(&dev->dev, sizeof(struct uart_amba_port),
> + GFP_KERNEL);
> + if (!uap)
> + return -ENOMEM;
> +
> + uap->clk = devm_clk_get(&dev->dev, NULL);
> + if (IS_ERR(uap->clk))
> + return PTR_ERR(uap->clk);
> +
> + = vendor;
I'm having trouble with this. Specifically, I can't get SBSA early
console to work, because uap->vendor is uninitialized when
pl011_early_write() is called.
I don't have a non-SBSA system to test, but looking at the code, I'm
not sure how early console is supposed to work any more. In both SBSA
and non-SBSA cases, uap->vendor is not initialized until the probe
function is called. Isn't that too late? I thought early console was
supposed to be running before the driver is probed.
If I make this change, then early console works on SBSA systems (with
earlycon=pl011,<address>). But of course, this only works for SBSA
and breaks regular PL011.
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2326,9 +2326,15 @@ static void pl011_early_write(struct console *con, const
static int __init pl011_early_console_setup(struct earlycon_device *device,
const char *opt)
{
+ struct uart_amba_port *uap =
+ container_of(&device->port, struct uart_amba_port, port);
+
if (!device->port.membase)
return -ENODEV;
+ if (!uap->vendor)
+ uap->vendor = &vendor_sbsa;
+
device->con->write = pl011_early_write;
return 0;
}
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
