From f02a48ea00637025dc13d86d1ff024b6aec071d7 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Sat, 17 Dec 2011 16:57:40 +0100 Subject: [PATCH 1/2] commands: really print BAREBOX_CMD_HELP_TEXT Signed-off-by: Wolfram Sang Signed-off-by: Sascha Hauer --- include/command.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/command.h b/include/command.h index e22154609..9a90e0b06 100644 --- a/include/command.h +++ b/include/command.h @@ -95,7 +95,7 @@ static const __maybe_unused char cmd_##_name##_help[] = #define BAREBOX_CMD_HELP_USAGE(_name) "Usage: " _name #define BAREBOX_CMD_HELP_SHORT(_text) _text #define BAREBOX_CMD_HELP_OPT(_opt, _desc) _opt "\t" _desc -#define BAREBOX_CMD_HELP_TEXT(_text) +#define BAREBOX_CMD_HELP_TEXT(_text) _text #define BAREBOX_CMD_HELP_END ; #ifdef CONFIG_LONGHELP From 4b8750c95610f601ac7e8571713eab268877d224 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 22 Dec 2011 23:11:06 +0100 Subject: [PATCH 2/2] uart drivers: use xzalloc instead of xmalloc The flags in struct console_device have to be initialized to zero. Otherwise the following can happen: - console_register sets the initial baudrate of a new console before we set the global console init state to CONSOLE_INIT_FULL. - In console_baudrate_set we test whether the current console is active which may be true because of unitialized flags. - we then call getc() to wait for the user to accept the new settings and we are stuck because of the CONSOLE_UNINITIALIZED state we will never get anything from getc(). Looking back this explains some cases for me when barebox refused to start and I really wonder why this did not become a more visible problem before. Signed-off-by: Sascha Hauer --- drivers/serial/amba-pl011.c | 2 +- drivers/serial/atmel.c | 2 +- drivers/serial/serial_altera.c | 2 +- drivers/serial/serial_altera_jtag.c | 2 +- drivers/serial/serial_blackfin.c | 2 +- drivers/serial/serial_imx.c | 2 +- drivers/serial/serial_netx.c | 2 +- drivers/serial/serial_pl010.c | 2 +- drivers/serial/serial_s3c24x0.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 148bdbf57..56f6f1582 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -159,7 +159,7 @@ static int pl011_probe(struct device_d *dev) struct amba_uart_port *uart; struct console_device *cdev; - uart = xmalloc(sizeof(struct amba_uart_port)); + uart = xzalloc(sizeof(struct amba_uart_port)); uart->clk = clk_get(dev, NULL); if (IS_ERR(uart->clk)) diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 9ba4ca9da..de58465ba 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -399,7 +399,7 @@ static int atmel_serial_probe(struct device_d *dev) struct atmel_uart_port *uart; struct console_device *cdev; - uart = xmalloc(sizeof(struct atmel_uart_port)); + uart = xzalloc(sizeof(struct atmel_uart_port)); cdev = &uart->uart; dev->type_data = cdev; cdev->dev = dev; diff --git a/drivers/serial/serial_altera.c b/drivers/serial/serial_altera.c index 8fd5d8a1a..e4d3c4095 100644 --- a/drivers/serial/serial_altera.c +++ b/drivers/serial/serial_altera.c @@ -85,7 +85,7 @@ static int altera_serial_probe(struct device_d *dev) struct console_device *cdev; struct altera_serial_priv *priv; - priv = xmalloc(sizeof(*priv)); + priv = xzalloc(sizeof(*priv)); cdev = &priv->cdev; priv->regs = dev_request_mem_region(dev, 0); diff --git a/drivers/serial/serial_altera_jtag.c b/drivers/serial/serial_altera_jtag.c index 3e1b0cf6e..140ca265f 100644 --- a/drivers/serial/serial_altera_jtag.c +++ b/drivers/serial/serial_altera_jtag.c @@ -90,7 +90,7 @@ static int altera_serial_jtag_probe(struct device_d *dev) { struct console_device *cdev; struct altera_serial_jtag_priv *priv; - priv = xmalloc(sizeof(*priv)); + priv = xzalloc(sizeof(*priv)); cdev = &priv->cdev; priv->regs = dev_request_mem_region(dev, 0); diff --git a/drivers/serial/serial_blackfin.c b/drivers/serial/serial_blackfin.c index 9ad55792a..d38a06c7f 100644 --- a/drivers/serial/serial_blackfin.c +++ b/drivers/serial/serial_blackfin.c @@ -115,7 +115,7 @@ static int blackfin_serial_probe(struct device_d *dev) { struct console_device *cdev; - cdev = xmalloc(sizeof(struct console_device)); + cdev = xzalloc(sizeof(struct console_device)); dev->type_data = cdev; cdev->dev = dev; cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 4923dcbd9..8547f3617 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -320,7 +320,7 @@ static int imx_serial_probe(struct device_d *dev) struct imx_serial_priv *priv; uint32_t val; - priv = xmalloc(sizeof(*priv)); + priv = xzalloc(sizeof(*priv)); cdev = &priv->cdev; priv->regs = dev_request_mem_region(dev, 0); diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c index a3273e960..4f4fb2dab 100644 --- a/drivers/serial/serial_netx.c +++ b/drivers/serial/serial_netx.c @@ -140,7 +140,7 @@ static int netx_serial_probe(struct device_d *dev) { struct console_device *cdev; - cdev = xmalloc(sizeof(struct console_device)); + cdev = xzalloc(sizeof(struct console_device)); dev->type_data = cdev; dev->priv = dev_request_mem_region(dev, 0); cdev->dev = dev; diff --git a/drivers/serial/serial_pl010.c b/drivers/serial/serial_pl010.c index cb875410e..e11406d9d 100644 --- a/drivers/serial/serial_pl010.c +++ b/drivers/serial/serial_pl010.c @@ -141,7 +141,7 @@ static int pl010_probe(struct device_d *dev) { struct console_device *cdev; - cdev = xmalloc(sizeof(struct console_device)); + cdev = xzalloc(sizeof(struct console_device)); dev->type_data = cdev; dev->priv = dev_request_mem_region(dev, 0); cdev->dev = dev; diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c index abc08e0e4..1e27d48bf 100644 --- a/drivers/serial/serial_s3c24x0.c +++ b/drivers/serial/serial_s3c24x0.c @@ -129,7 +129,7 @@ static int s3c24x0_serial_probe(struct device_d *dev) { struct console_device *cdev; - cdev = xmalloc(sizeof(struct console_device)); + cdev = xzalloc(sizeof(struct console_device)); dev->type_data = cdev; dev->priv = dev_request_mem_region(dev, 0); cdev->dev = dev;