* [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM
@ 2016-02-23 9:02 Michal Simek
2016-02-23 9:02 ` [U-Boot] [PATCH v2 2/2] ARM: zynq: zynqmp: Enable DCC serial driver by default Michal Simek
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Michal Simek @ 2016-02-23 9:02 UTC (permalink / raw
To: u-boot
Enabling this driver requires some DT changes.
Adding DCC to root or main bus:
dcc: dcc {
compatible = "arm,dcc";
u-boot,dm-pre-reloc;
};
Extend alias list to link DCC:
serial0 = &uart0;
serial1 = &uart1;
serial2 = &dcc;
Change stdout-path to point to dcc port.
stdout-path = "serial2:115200n8";
Also add support for debug uart to help with early debug.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2:
- Extend Kconfig entry description
drivers/serial/Kconfig | 11 +++++++++
drivers/serial/arm_dcc.c | 63 +++++++++++++++++++++++++++++-------------------
2 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index fac317610e2a..92d4212123d2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -119,6 +119,17 @@ config DEBUG_UART_UARTLITE
You will need to provide parameters to make this work. The driver will
be available until the real driver-model serial is running.
+config DEBUG_UART_ARM_DCC
+ bool "ARM DCC"
+ help
+ Select this to enable a debug UART using the ARM JTAG DCC port.
+ The DCC port can be used for very early debugging and doesn't require
+ any additional setting like address/baudrate/clock. On systems without
+ any serial interface this is the easiest way how to get console.
+ Every ARM core has own DCC port which is the part of debug interface.
+ This port is available at least on ARMv6, ARMv7, ARMv8 and XScale
+ architectures.
+
config DEBUG_UART_ZYNQ
bool "Xilinx Zynq"
help
diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index 4624666e8a2c..07981e18ee49 100644
--- a/drivers/serial/arm_dcc.c
+++ b/drivers/serial/arm_dcc.c
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2004-2007 ARM Limited.
* Copyright (C) 2008 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ * Copyright (C) 2015 - 2016 Xilinx, Inc, Michal Simek
*
* SPDX-License-Identifier: GPL-2.0
*
@@ -16,6 +17,7 @@
*/
#include <common.h>
+#include <dm.h>
#include <serial.h>
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7)
@@ -94,12 +96,7 @@
#define TIMEOUT_COUNT 0x4000000
-static int arm_dcc_init(void)
-{
- return 0;
-}
-
-static int arm_dcc_getc(void)
+static int arm_dcc_getc(struct udevice *dev)
{
int ch;
register unsigned int reg;
@@ -112,7 +109,7 @@ static int arm_dcc_getc(void)
return ch;
}
-static void arm_dcc_putc(char ch)
+static int arm_dcc_putc(struct udevice *dev, char ch)
{
register unsigned int reg;
unsigned int timeout_count = TIMEOUT_COUNT;
@@ -123,41 +120,57 @@ static void arm_dcc_putc(char ch)
break;
}
if (timeout_count == 0)
- return;
+ return -EAGAIN;
else
write_dcc(ch);
+
+ return 0;
}
-static int arm_dcc_tstc(void)
+static int arm_dcc_pending(struct udevice *dev, bool input)
{
register unsigned int reg;
- can_read_dcc(reg);
+ if (input) {
+ can_read_dcc(reg);
+ } else {
+ can_write_dcc(reg);
+ }
return reg;
}
-static void arm_dcc_setbrg(void)
-{
-}
+static const struct dm_serial_ops arm_dcc_ops = {
+ .putc = arm_dcc_putc,
+ .pending = arm_dcc_pending,
+ .getc = arm_dcc_getc,
+};
+
+static const struct udevice_id arm_dcc_ids[] = {
+ { .compatible = "arm,dcc", },
+ { }
+};
-static struct serial_device arm_dcc_drv = {
+U_BOOT_DRIVER(serial_dcc) = {
.name = "arm_dcc",
- .start = arm_dcc_init,
- .stop = NULL,
- .setbrg = arm_dcc_setbrg,
- .putc = arm_dcc_putc,
- .puts = default_serial_puts,
- .getc = arm_dcc_getc,
- .tstc = arm_dcc_tstc,
+ .id = UCLASS_SERIAL,
+ .of_match = arm_dcc_ids,
+ .ops = &arm_dcc_ops,
+ .flags = DM_FLAG_PRE_RELOC,
};
-void arm_dcc_initialize(void)
+#ifdef CONFIG_DEBUG_UART_ARM_DCC
+
+#include <debug_uart.h>
+
+static inline void _debug_uart_init(void)
{
- serial_register(&arm_dcc_drv);
}
-__weak struct serial_device *default_serial_console(void)
+static inline void _debug_uart_putc(int ch)
{
- return &arm_dcc_drv;
+ arm_dcc_putc(NULL, ch);
}
+
+DEBUG_UART_FUNCS
+#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v2 2/2] ARM: zynq: zynqmp: Enable DCC serial driver by default
2016-02-23 9:02 [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM Michal Simek
@ 2016-02-23 9:02 ` Michal Simek
2016-02-26 2:22 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-02-23 13:17 ` [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM Simon Glass
2016-02-26 2:22 ` [U-Boot] [U-Boot,v2,1/2] " Tom Rini
2 siblings, 1 reply; 5+ messages in thread
From: Michal Simek @ 2016-02-23 9:02 UTC (permalink / raw
To: u-boot
Compile DCC serial driver by default.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2: None
include/configs/xilinx_zynqmp.h | 9 +++------
include/configs/zynq-common.h | 8 ++------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 28622dec1882..8a9ad03cb102 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -53,12 +53,9 @@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 0x2000000)
/* Serial setup */
-#if defined(CONFIG_ZYNQMP_DCC)
-# define CONFIG_ARM_DCC
-# define CONFIG_CPU_ARMV8
-#else
-# define CONFIG_ZYNQ_SERIAL
-#endif
+#define CONFIG_ARM_DCC
+#define CONFIG_CPU_ARMV8
+#define CONFIG_ZYNQ_SERIAL
#define CONFIG_CONS_INDEX 0
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index e8c3ef0c3872..ec4884878165 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -36,12 +36,8 @@
#define CONFIG_SYS_BAUDRATE_TABLE \
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
-/* DCC driver */
-#if defined(CONFIG_ZYNQ_DCC)
-# define CONFIG_ARM_DCC
-#else
-# define CONFIG_ZYNQ_SERIAL
-#endif
+#define CONFIG_ARM_DCC
+#define CONFIG_ZYNQ_SERIAL
#define CONFIG_ZYNQ_GPIO
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM
2016-02-23 9:02 [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM Michal Simek
2016-02-23 9:02 ` [U-Boot] [PATCH v2 2/2] ARM: zynq: zynqmp: Enable DCC serial driver by default Michal Simek
@ 2016-02-23 13:17 ` Simon Glass
2016-02-26 2:22 ` [U-Boot] [U-Boot,v2,1/2] " Tom Rini
2 siblings, 0 replies; 5+ messages in thread
From: Simon Glass @ 2016-02-23 13:17 UTC (permalink / raw
To: u-boot
On 23 February 2016 at 02:02, Michal Simek <michal.simek@xilinx.com> wrote:
> Enabling this driver requires some DT changes.
> Adding DCC to root or main bus:
> dcc: dcc {
> compatible = "arm,dcc";
> u-boot,dm-pre-reloc;
> };
>
> Extend alias list to link DCC:
> serial0 = &uart0;
> serial1 = &uart1;
> serial2 = &dcc;
>
> Change stdout-path to point to dcc port.
> stdout-path = "serial2:115200n8";
>
> Also add support for debug uart to help with early debug.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> Changes in v2:
> - Extend Kconfig entry description
>
> drivers/serial/Kconfig | 11 +++++++++
> drivers/serial/arm_dcc.c | 63 +++++++++++++++++++++++++++++-------------------
> 2 files changed, 49 insertions(+), 25 deletions(-)
Reviewed-by: Simon Glass <sjg@chromium.org>
Great Kconfig help, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [U-Boot,v2,1/2] serial: dcc: Move driver to DM
2016-02-23 9:02 [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM Michal Simek
2016-02-23 9:02 ` [U-Boot] [PATCH v2 2/2] ARM: zynq: zynqmp: Enable DCC serial driver by default Michal Simek
2016-02-23 13:17 ` [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM Simon Glass
@ 2016-02-26 2:22 ` Tom Rini
2 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2016-02-26 2:22 UTC (permalink / raw
To: u-boot
On Tue, Feb 23, 2016 at 10:02:28AM +0100, Michal Simek wrote:
> Enabling this driver requires some DT changes.
> Adding DCC to root or main bus:
> dcc: dcc {
> compatible = "arm,dcc";
> u-boot,dm-pre-reloc;
> };
>
> Extend alias list to link DCC:
> serial0 = &uart0;
> serial1 = &uart1;
> serial2 = &dcc;
>
> Change stdout-path to point to dcc port.
> stdout-path = "serial2:115200n8";
>
> Also add support for debug uart to help with early debug.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160225/ff095115/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [U-Boot, v2, 2/2] ARM: zynq: zynqmp: Enable DCC serial driver by default
2016-02-23 9:02 ` [U-Boot] [PATCH v2 2/2] ARM: zynq: zynqmp: Enable DCC serial driver by default Michal Simek
@ 2016-02-26 2:22 ` Tom Rini
0 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2016-02-26 2:22 UTC (permalink / raw
To: u-boot
On Tue, Feb 23, 2016 at 10:02:29AM +0100, Michal Simek wrote:
> Compile DCC serial driver by default.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160225/02c69b7c/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-26 2:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-23 9:02 [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM Michal Simek
2016-02-23 9:02 ` [U-Boot] [PATCH v2 2/2] ARM: zynq: zynqmp: Enable DCC serial driver by default Michal Simek
2016-02-26 2:22 ` [U-Boot] [U-Boot, v2, " Tom Rini
2016-02-23 13:17 ` [U-Boot] [PATCH v2 1/2] serial: dcc: Move driver to DM Simon Glass
2016-02-26 2:22 ` [U-Boot] [U-Boot,v2,1/2] " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.