Eric Lee / smarc-uboot | Embedian Git Server

Commit a52cf086ace7e6107f399fcf37059dc9e02916f3

Authored by Lokesh Vutla 2017-04-22 18:27:25 +0800

Committed by Tom Rini 2017-05-12 10:21:27 +0800

Exists in smarc_8mq_lf_v2020.04 and in 17 other branches

serial: omap: Support debug UART

Add debug UART functions to permit omap specific ns16550 to
provide an early debug UART. This is mostly in common with
DEBUG_UART_NS16550 except for Mode definition register which
is required for selecting UART mode(16x auto-baud or 13x mode).

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 3 changed files with 54 additions and 11 deletions Inline Diff

drivers/serial/Kconfig
drivers/serial/ns16550.c
include/debug_uart.h

drivers/serial/Kconfig

Diff comments View file @ a52cf08

 #
 # Serial device configuration
 #
 menu "Serial drivers"
 config BAUDRATE
 	int "Default baudrate"
 	default 115200
 	help
 	  Select a default baudrate, where "default" has a driver-specific
 	  meaning of either setting the baudrate for the early debug UART
 	  in the SPL stage (most drivers) or for choosing a default baudrate
 	  in the absence of an environment setting (serial_mxc.c).
 config REQUIRE_SERIAL_CONSOLE
 	bool "Require a serial port for console"
 	# Running without a serial console is not supported by the
 	# non-dm serial code
 	depends on DM_SERIAL
 	default y
 	help
 	  Require a serial port for the console, and panic if none is found
 	  during serial port initialization (default y). Set this to n on
 	  boards which have no debug serial port whatsoever.
 config SERIAL_PRESENT
 	bool "Provide a serial driver"
 	depends on DM_SERIAL
 	default y
 	help
 	  In very space-constrained devices even the full UART driver is too
 	  large. In this case the debug UART can still be used in some cases.
 	  This option enables the full UART in U-Boot, so if is it disabled,
 	  the full UART driver will be omitted, thus saving space.
 config SPL_SERIAL_PRESENT
 	bool "Provide a serial driver in SPL"
 	depends on DM_SERIAL
 	default y
 	help
 	  In very space-constrained devices even the full UART driver is too
 	  large. In this case the debug UART can still be used in some cases.
 	  This option enables the full UART in SPL, so if is it disabled,
 	  the full UART driver will be omitted, thus saving space.
 config CONS_INDEX
 	int "UART used for console"
 	depends on ARCH_SUNXI
 	default 2 if MACH_SUN5I
 	default 5 if MACH_SUN8I_A23 || MACH_SUN8I_A33
 	default 1
 	help
 	  Configures the console index.
 	  For Allwinner SoC., default values are 2 for SUN5I and 5 for A23/A33.
 	  Otherwise, the index equals 1.
 config DM_SERIAL
 	bool "Enable Driver Model for serial drivers"
 	depends on DM
 	help
 	  Enable driver model for serial. This replaces
 	  drivers/serial/serial.c with the serial uclass, which
 	  implements serial_putc() etc. The uclass interface is
 	  defined in include/serial.h.
 config SPL_DM_SERIAL
 	bool "Enable Driver Model for serial drivers"
 	depends on DM_SERIAL
 	default y if SPL && DM_SERIAL
 	help
 	  Enable driver model for serial in SPL. This replaces
 	  drivers/serial/serial.c with the serial uclass, which
 	  implements serial_putc() etc. The uclass interface is
 	  defined in include/serial.h.
 config TPL_DM_SERIAL
 	bool "Enable Driver Model for serial drivers"
 	depends on DM_SERIAL
 	default y if TPL && DM_SERIAL
 	help
 	  Enable driver model for serial in TPL. This replaces
 	  drivers/serial/serial.c with the serial uclass, which
 	  implements serial_putc() etc. The uclass interface is
 	  defined in include/serial.h.
 config DEBUG_UART
 	bool "Enable an early debug UART for debugging"
 	help
 	  The debug UART is intended for use very early in U-Boot to debug
 	  problems when an ICE or other debug mechanism is not available.
 	  To use it you should:
 	  - Make sure your UART supports this interface
 	  - Enable CONFIG_DEBUG_UART
 	  - Enable the CONFIG for your UART to tell it to provide this interface
 	        (e.g. CONFIG_DEBUG_UART_NS16550)
 	  - Define the required settings as needed (see below)
 	  - Call debug_uart_init() before use
 	  - Call debug_uart_putc() to output a character
 	  Depending on your platform it may be possible to use this UART before
 	  a stack is available.
 	  If your UART does not support this interface you can probably add
 	  support quite easily. Remember that you cannot use driver model and
 	  it is preferred to use no stack.
 	  You must not use this UART once driver model is working and the
 	  serial drivers are up and running (done in serial_init()). Otherwise
 	  the drivers may conflict and you will get strange output.
 choice
 	prompt "Select which UART will provide the debug UART"
 	depends on DEBUG_UART
 	default DEBUG_UART_NS16550
 config DEBUG_UART_ALTERA_JTAGUART
 	bool "Altera JTAG UART"
 	help
 	  Select this to enable a debug UART using the altera_jtag_uart driver.
 	  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_ALTERA_UART
 	bool "Altera UART"
 	help
 	  Select this to enable a debug UART using the altera_uart driver.
 	  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_AR933X
 	bool "QCA/Atheros ar933x"
 	depends on AR933X_UART
 	help
 	  Select this to enable a debug UART using the ar933x uart driver.
 	  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_ATMEL
 	bool "Atmel USART"
 	help
 	  Select this to enable a debug UART using the atmel usart driver. 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_BCM6345
 	bool "BCM6345 UART"
 	depends on BCM6345_SERIAL
 	help
 	  Select this to enable a debug UART on BCM6345 SoCs. 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_NS16550
 	bool "ns16550"
 	help
 	  Select this to enable a debug UART using the ns16550 driver. 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_EFI_CONSOLE
 	bool "EFI"
 	depends on EFI_APP
 	help
 	  Select this to enable a debug console which calls back to EFI to
 	  output to the console. This can be useful for early debugging of
 	  U-Boot when running on top of EFI (Extensive Firmware Interface).
 	  This is a type of BIOS used by PCs.
 config DEBUG_UART_S5P
 	bool "Samsung S5P"
 	help
 	  Select this to enable a debug UART using the serial_s5p driver. 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_MESON
 	bool "Amlogic Meson"
 	depends on MESON_SERIAL
 	help
 	  Select this to enable a debug UART using the serial_meson driver. 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_UARTLITE
 	bool "Xilinx Uartlite"
 	help
 	  Select this to enable a debug UART using the serial_uartlite driver.
 	  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_MVEBU_A3700_UART
 	bool "Marvell Armada 3700"
 	help
 	  Select this to enable a debug UART using the serial_mvebu driver. 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_ZYNQ
 	bool "Xilinx Zynq"
 	help
 	  Select this to enable a debug UART using the serial_zynq driver. 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_APBUART
 	depends on LEON3
 	bool "Gaisler APBUART"
 	help
 	  Select this to enable a debug UART using the serial_leon3 driver. 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_PL010
 	bool "pl010"
 	help
 	  Select this to enable a debug UART using the pl01x driver with the
 	  PL010 UART type. 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_PL011
 	bool "pl011"
 	help
 	  Select this to enable a debug UART using the pl01x driver with the
 	  PL011 UART type. 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_PIC32
 	bool "Microchip PIC32"
 	depends on PIC32_SERIAL
 	help
 	  Select this to enable a debug UART using the serial_pic32 driver. 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_UNIPHIER
 	bool "UniPhier on-chip UART"
 	depends on ARCH_UNIPHIER
 	help
 	  Select this to enable a debug UART using the UniPhier on-chip UART.
 	  You will need to provide DEBUG_UART_BASE to make this work.  The
 	  driver will be available until the real driver-model serial is
 	  running.
+config DEBUG_UART_OMAP
+	bool "OMAP uart"
+	help
+	  Select this to enable a debug UART using the omap ns16550 driver.
+	  You will need to provide parameters to make this work. The driver
+	  will be available until the real driver model serial is running.
 endchoice
 config DEBUG_UART_BASE
 	hex "Base address of UART"
 	depends on DEBUG_UART
 	help
 	  This is the base address of your UART for memory-mapped UARTs.
 	  A default should be provided by your board, but if not you will need
 	  to use the correct value here.
 config DEBUG_UART_CLOCK
 	int "UART input clock"
 	depends on DEBUG_UART
 	help
 	  The UART input clock determines the speed of the internal UART
 	  circuitry. The baud rate is derived from this by dividing the input
 	  clock down.
 	  A default should be provided by your board, but if not you will need
 	  to use the correct value here.
 config DEBUG_UART_SHIFT
 	int "UART register shift"
 	depends on DEBUG_UART
 	default 0 if DEBUG_UART
 	help
 	  Some UARTs (notably ns16550) support different register layouts
 	  where the registers are spaced either as bytes, words or some other
 	  value. Use this value to specify the shift to use, where 0=byte
 	  registers, 2=32-bit word registers, etc.
 config DEBUG_UART_BOARD_INIT
 	bool "Enable board-specific debug UART init"
 	depends on DEBUG_UART
 	help
 	  Some boards need to set things up before the debug UART can be used.
 	  On these boards a call to debug_uart_init() is insufficient. When
 	  this option is enabled, the function board_debug_uart_init() will
 	  be called when debug_uart_init() is called. You can put any code
 	  here that is needed to set up the UART ready for use, such as set
 	  pin multiplexing or enable clocks.
 config DEBUG_UART_ANNOUNCE
 	bool "Show a message when the debug UART starts up"
 	depends on DEBUG_UART
 	help
 	  Enable this option to show a message when the debug UART is ready
 	  for use. You will see a message like "<debug_uart> " as soon as
 	  U-Boot has the UART ready for use (i.e. your code calls
 	  debug_uart_init()). This can be useful just as a check that
 	  everything is working.
 config DEBUG_UART_SKIP_INIT
 	bool "Skip UART initialization"
 	help
 	  Select this if the UART you want to use for debug output is already
 	  initialized by the time U-Boot starts its execution.
 config ALTERA_JTAG_UART
 	bool "Altera JTAG UART support"
 	depends on DM_SERIAL
 	help
 	  Select this to enable an JTAG UART for Altera devices.The JTAG UART
 	  core implements a method to communicate serial character streams
 	  between a host PC and a Qsys system on an Altera FPGA. Please find
 	  details on the "Embedded Peripherals IP User Guide" of Altera.
 config ALTERA_JTAG_UART_BYPASS
 	bool "Bypass output when no connection"
 	depends on ALTERA_JTAG_UART
 	help
 	  Bypass console output and keep going even if there is no JTAG
 	  terminal connection with the host. The console output will resume
 	  once the JTAG terminal is connected. Without the bypass, the console
 	  output will wait forever until a JTAG terminal is connected. If you
 	  not are sure, say Y.
 config ALTERA_UART
 	bool "Altera UART support"
 	depends on DM_SERIAL
 	help
 	  Select this to enable an UART for Altera devices. Please find
 	  details on the "Embedded Peripherals IP User Guide" of Altera.
 config AR933X_UART
 	bool "QCA/Atheros ar933x UART support"
 	depends on DM_SERIAL && SOC_AR933X
 	help
 	  Select this to enable UART support for QCA/Atheros ar933x
 	  devices. This driver uses driver model and requires a device
 	  tree binding to operate, please refer to the document at
 	  doc/device-tree-bindings/serial/qca,ar9330-uart.txt.
 config ATMEL_USART
 	bool "Atmel USART support"
 	help
 	  Select this to enable USART support for Atmel SoCs. It can be
 	  configured in the device tree, and input clock frequency can
 	  be got from the clk node.
 config BCM6345_SERIAL
 	bool "Support for BCM6345 UART"
 	depends on DM_SERIAL && ARCH_BMIPS
 	help
 	  Select this to enable UART on BCM6345 SoCs.
 config FSL_LPUART
 	bool "Freescale LPUART support"
 	help
 	  Select this to enable a Low Power UART for Freescale VF610 and
 	  QorIQ Layerscape devices.
 config MVEBU_A3700_UART
 	bool "UART support for Armada 3700"
 	default n
 	help
 	  Choose this option to add support for UART driver on the Marvell
 	  Armada 3700 SoC. The base address is configured via DT.
 config MXC_UART
 	bool "IMX serial port support"
 	depends on MX5 || MX6
 	help
 	  If you have a machine based on a Motorola IMX CPU you
 	  can enable its onboard serial port by enabling this option.
 config PIC32_SERIAL
 	bool "Support for Microchip PIC32 on-chip UART"
 	depends on DM_SERIAL && MACH_PIC32
 	default y
 	help
 	  Support for the UART found on Microchip PIC32 SoC's.
 config SYS_NS16550
 	bool "NS16550 UART or compatible"
 	help
 	  Support NS16550 UART or compatible. This can be enabled in the
 	  device tree with the correct input clock frequency. If the input
 	  clock frequency is not defined in the device tree, the macro
 	  CONFIG_SYS_NS16550_CLK defined in a legacy board header file will
 	  be used. It can be a constant or a function to get clock, eg,
 	  get_serial_clock().
 config INTEL_MID_SERIAL
 	bool "Intel MID platform UART support"
 	depends on DM_SERIAL && OF_CONTROL
 	depends on INTEL_MID
 	select SYS_NS16550
 	help
 	  Select this to enable a UART for Intel MID platforms.
 	  This uses the ns16550 driver as a library.
 config ROCKCHIP_SERIAL
 	bool "Rockchip on-chip UART support"
 	depends on DM_SERIAL && SPL_OF_PLATDATA
 	help
 	  Select this to enable a debug UART for Rockchip devices when using
 	  CONFIG_SPL_OF_PLATDATA (i.e. a compiled-in device tree replacemenmt).
 	  This uses the ns16550 driver, converting the platdata from of-platdata
 	  to the ns16550 format.
 config SANDBOX_SERIAL
 	bool "Sandbox UART support"
 	depends on SANDBOX
 	help
 	  Select this to enable a seral UART for sandbox. This is required to
 	  operate correctly, otherwise you will see no serial output from
 	  sandbox. The emulated UART will display to the console and console
 	  input will be fed into the UART. This allows you to interact with
 	  U-Boot.
 	  The operation of the console is controlled by the -t command-line
 	  flag. In raw mode, U-Boot sees all characters from the terminal
 	  before they are processed, including Ctrl-C. In cooked mode, Ctrl-C
 	  is processed by the terminal, and terminates U-Boot. Valid options
 	  are:
 	     -t raw-with-sigs	Raw mode, Ctrl-C will terminate U-Boot
 	     -t raw		Raw mode, Ctrl-C is processed by U-Boot
 	     -t cooked		Cooked mode, Ctrl-C terminates
 config UNIPHIER_SERIAL
 	bool "Support for UniPhier on-chip UART"
 	depends on ARCH_UNIPHIER
 	default y
 	help
 	  If you have a UniPhier based board and want to use the on-chip
 	  serial ports, say Y to this option. If unsure, say N.
 config XILINX_UARTLITE
 	bool "Xilinx Uarlite support"
 	depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP || 4xx)
 	help
 	  If you have a Xilinx based board and want to use the uartlite
 	  serial ports, say Y to this option. If unsure, say N.
 config MESON_SERIAL
 	bool "Support for Amlogic Meson UART"
 	depends on DM_SERIAL && ARCH_MESON
 	help
 	  If you have an Amlogic Meson based board and want to use the on-chip
 	  serial ports, say Y to this option. If unsure, say N.
 config MSM_SERIAL
 	bool "Qualcomm on-chip UART"
 	depends on DM_SERIAL
 	help
 	  Support Data Mover UART used on Qualcomm Snapdragon SoCs.
 	  It should support all Qualcomm devices with UARTDM version 1.4,
 	  for example APQ8016 and MSM8916.
 	  Single baudrate is supported in current implementation (115200).
 config PXA_SERIAL
 	bool "PXA serial port support"
 	help
 	  If you have a machine based on a Marvell XScale PXA2xx CPU you
 	  can enable its onboard serial ports by enabling this option.
 config STI_ASC_SERIAL
 	bool "STMicroelectronics on-chip UART"
 	depends on DM_SERIAL && ARCH_STI
 	help
 	  Select this to enable Asynchronous Serial Controller available
 	  on STiH410 SoC. This is a basic implementation,  it supports
 	  following baudrate 9600, 19200, 38400, 57600 and 115200.
 endmenu

drivers/serial/ns16550.c

Diff comments View file @ a52cf08

 /*
  * COM1 NS16550 support
  * originally from linux source (arch/powerpc/boot/ns16550.c)
  * modified to use CONFIG_SYS_ISA_MEM and new defines
  */
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <ns16550.h>
 #include <serial.h>
 #include <watchdog.h>
 #include <linux/types.h>
 #include <asm/io.h>
 DECLARE_GLOBAL_DATA_PTR;
 #define UART_LCRVAL UART_LCR_8N1		/* 8 data, 1 stop, no parity */
 #define UART_MCRVAL (UART_MCR_DTR | \
 		     UART_MCR_RTS)		/* RTS/DTR */
 #ifndef CONFIG_DM_SERIAL
 #ifdef CONFIG_SYS_NS16550_PORT_MAPPED
 #define serial_out(x, y)	outb(x, (ulong)y)
 #define serial_in(y)		inb((ulong)y)
 #elif defined(CONFIG_SYS_NS16550_MEM32) && (CONFIG_SYS_NS16550_REG_SIZE > 0)
 #define serial_out(x, y)	out_be32(y, x)
 #define serial_in(y)		in_be32(y)
 #elif defined(CONFIG_SYS_NS16550_MEM32) && (CONFIG_SYS_NS16550_REG_SIZE < 0)
 #define serial_out(x, y)	out_le32(y, x)
 #define serial_in(y)		in_le32(y)
 #else
 #define serial_out(x, y)	writeb(x, y)
 #define serial_in(y)		readb(y)
 #endif
 #endif /* !CONFIG_DM_SERIAL */
 #if defined(CONFIG_SOC_KEYSTONE)
 #define UART_REG_VAL_PWREMU_MGMT_UART_DISABLE   0
 #define UART_REG_VAL_PWREMU_MGMT_UART_ENABLE ((1 << 14) | (1 << 13) | (1 << 0))
 #undef UART_MCRVAL
 #ifdef CONFIG_SERIAL_HW_FLOW_CONTROL
 #define UART_MCRVAL             (UART_MCR_RTS | UART_MCR_AFE)
 #else
 #define UART_MCRVAL             (UART_MCR_RTS)
 #endif
 #endif
 #ifndef CONFIG_SYS_NS16550_IER
 #define CONFIG_SYS_NS16550_IER  0x00
 #endif /* CONFIG_SYS_NS16550_IER */
 static inline void serial_out_shift(void *addr, int shift, int value)
 {
 #ifdef CONFIG_SYS_NS16550_PORT_MAPPED
 	outb(value, (ulong)addr);
 #elif defined(CONFIG_SYS_NS16550_MEM32) && !defined(CONFIG_SYS_BIG_ENDIAN)
 	out_le32(addr, value);
 #elif defined(CONFIG_SYS_NS16550_MEM32) && defined(CONFIG_SYS_BIG_ENDIAN)
 	out_be32(addr, value);
 #elif defined(CONFIG_SYS_NS16550_MEM32)
 	writel(value, addr);
 #elif defined(CONFIG_SYS_BIG_ENDIAN)
 	writeb(value, addr + (1 << shift) - 1);
 #else
 	writeb(value, addr);
 #endif
 }
 static inline int serial_in_shift(void *addr, int shift)
 {
 #ifdef CONFIG_SYS_NS16550_PORT_MAPPED
 	return inb((ulong)addr);
 #elif defined(CONFIG_SYS_NS16550_MEM32) && !defined(CONFIG_SYS_BIG_ENDIAN)
 	return in_le32(addr);
 #elif defined(CONFIG_SYS_NS16550_MEM32) && defined(CONFIG_SYS_BIG_ENDIAN)
 	return in_be32(addr);
 #elif defined(CONFIG_SYS_NS16550_MEM32)
 	return readl(addr);
 #elif defined(CONFIG_SYS_BIG_ENDIAN)
 	return readb(addr + (1 << shift) - 1);
 #else
 	return readb(addr);
 #endif
 }
 #ifdef CONFIG_DM_SERIAL
 #ifndef CONFIG_SYS_NS16550_CLK
 #define CONFIG_SYS_NS16550_CLK  0
 #endif
 static void ns16550_writeb(NS16550_t port, int offset, int value)
 {
 	struct ns16550_platdata *plat = port->plat;
 	unsigned char *addr;
 	offset *= 1 << plat->reg_shift;
 	addr = (unsigned char *)plat->base + offset;
 	/*
 	 * As far as we know it doesn't make sense to support selection of
 	 * these options at run-time, so use the existing CONFIG options.
 	 */
 	serial_out_shift(addr + plat->reg_offset, plat->reg_shift, value);
 }
 static int ns16550_readb(NS16550_t port, int offset)
 {
 	struct ns16550_platdata *plat = port->plat;
 	unsigned char *addr;
 	offset *= 1 << plat->reg_shift;
 	addr = (unsigned char *)plat->base + offset;
 	return serial_in_shift(addr + plat->reg_offset, plat->reg_shift);
 }
 static u32 ns16550_getfcr(NS16550_t port)
 {
 	struct ns16550_platdata *plat = port->plat;
 	return plat->fcr;
 }
 /* We can clean these up once everything is moved to driver model */
 #define serial_out(value, addr)	\
 	ns16550_writeb(com_port, \
 		(unsigned char *)addr - (unsigned char *)com_port, value)
 #define serial_in(addr) \
 	ns16550_readb(com_port, \
 		(unsigned char *)addr - (unsigned char *)com_port)
 #else
 static u32 ns16550_getfcr(NS16550_t port)
 {
 	return UART_FCR_DEFVAL;
 }
 #endif
 int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate)
 {
 	const unsigned int mode_x_div = 16;
 	return DIV_ROUND_CLOSEST(clock, mode_x_div * baudrate);
 }
 static void NS16550_setbrg(NS16550_t com_port, int baud_divisor)
 {
 	serial_out(UART_LCR_BKSE | UART_LCRVAL, &com_port->lcr);
 	serial_out(baud_divisor & 0xff, &com_port->dll);
 	serial_out((baud_divisor >> 8) & 0xff, &com_port->dlm);
 	serial_out(UART_LCRVAL, &com_port->lcr);
 }
 void NS16550_init(NS16550_t com_port, int baud_divisor)
 {
 #if (defined(CONFIG_SPL_BUILD) && \
 		(defined(CONFIG_OMAP34XX) || defined(CONFIG_OMAP44XX)))
 	/*
 	 * On some OMAP3/OMAP4 devices when UART3 is configured for boot mode
 	 * before SPL starts only THRE bit is set. We have to empty the
 	 * transmitter before initialization starts.
 	 */
 	if ((serial_in(&com_port->lsr) & (UART_LSR_TEMT | UART_LSR_THRE))
 	     == UART_LSR_THRE) {
 		if (baud_divisor != -1)
 			NS16550_setbrg(com_port, baud_divisor);
 		serial_out(0, &com_port->mdr1);
 	}
 #endif
 	while (!(serial_in(&com_port->lsr) & UART_LSR_TEMT))
 		;
 	serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier);
 #if defined(CONFIG_OMAP) || defined(CONFIG_AM33XX) || \
 			defined(CONFIG_TI81XX) || defined(CONFIG_AM43XX)
 	serial_out(0x7, &com_port->mdr1);	/* mode select reset TL16C750*/
 #endif
 	serial_out(UART_MCRVAL, &com_port->mcr);
 	serial_out(ns16550_getfcr(com_port), &com_port->fcr);
 	if (baud_divisor != -1)
 		NS16550_setbrg(com_port, baud_divisor);
 #if defined(CONFIG_OMAP) || \
 	defined(CONFIG_AM33XX) || defined(CONFIG_SOC_DA8XX) || \
 	defined(CONFIG_TI81XX) || defined(CONFIG_AM43XX)
 	/* /16 is proper to hit 115200 with 48MHz */
 	serial_out(0, &com_port->mdr1);
 #endif /* CONFIG_OMAP */
 #if defined(CONFIG_SOC_KEYSTONE)
 	serial_out(UART_REG_VAL_PWREMU_MGMT_UART_ENABLE, &com_port->regC);
 #endif
 }
 #ifndef CONFIG_NS16550_MIN_FUNCTIONS
 void NS16550_reinit(NS16550_t com_port, int baud_divisor)
 {
 	serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier);
 	NS16550_setbrg(com_port, 0);
 	serial_out(UART_MCRVAL, &com_port->mcr);
 	serial_out(ns16550_getfcr(com_port), &com_port->fcr);
 	NS16550_setbrg(com_port, baud_divisor);
 }
 #endif /* CONFIG_NS16550_MIN_FUNCTIONS */
 void NS16550_putc(NS16550_t com_port, char c)
 {
 	while ((serial_in(&com_port->lsr) & UART_LSR_THRE) == 0)
 		;
 	serial_out(c, &com_port->thr);
 	/*
 	 * Call watchdog_reset() upon newline. This is done here in putc
 	 * since the environment code uses a single puts() to print the complete
 	 * environment upon "printenv". So we can't put this watchdog call
 	 * in puts().
 	 */
 	if (c == '\n')
 		WATCHDOG_RESET();
 }
 #ifndef CONFIG_NS16550_MIN_FUNCTIONS
 char NS16550_getc(NS16550_t com_port)
 {
 	while ((serial_in(&com_port->lsr) & UART_LSR_DR) == 0) {
 #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_USB_TTY)
 		extern void usbtty_poll(void);
 		usbtty_poll();
 #endif
 		WATCHDOG_RESET();
 	}
 	return serial_in(&com_port->rbr);
 }
 int NS16550_tstc(NS16550_t com_port)
 {
 	return (serial_in(&com_port->lsr) & UART_LSR_DR) != 0;
 }
 #endif /* CONFIG_NS16550_MIN_FUNCTIONS */
 #ifdef CONFIG_DEBUG_UART_NS16550
 #include <debug_uart.h>
-#define serial_dout(reg, value)	\
-	serial_out_shift((char *)com_port + \
-		((char *)reg - (char *)com_port) * \
-			(1 << CONFIG_DEBUG_UART_SHIFT), \
-		CONFIG_DEBUG_UART_SHIFT, value)
-#define serial_din(reg) \
-	serial_in_shift((char *)com_port + \
-		((char *)reg - (char *)com_port) * \
-			(1 << CONFIG_DEBUG_UART_SHIFT), \
-		CONFIG_DEBUG_UART_SHIFT)
 static inline void _debug_uart_init(void)
 {
 	struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE;
 	int baud_divisor;
 	/*
 	 * We copy the code from above because it is already horribly messy.
 	 * Trying to refactor to nicely remove the duplication doesn't seem
 	 * feasible. The better fix is to move all users of this driver to
 	 * driver model.
 	 */
 	baud_divisor = ns16550_calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK,
 					    CONFIG_BAUDRATE);
 	serial_dout(&com_port->ier, CONFIG_SYS_NS16550_IER);
 	serial_dout(&com_port->mcr, UART_MCRVAL);
 	serial_dout(&com_port->fcr, UART_FCR_DEFVAL);
 	serial_dout(&com_port->lcr, UART_LCR_BKSE | UART_LCRVAL);
 	serial_dout(&com_port->dll, baud_divisor & 0xff);
 	serial_dout(&com_port->dlm, (baud_divisor >> 8) & 0xff);
 	serial_dout(&com_port->lcr, UART_LCRVAL);
+}
+static inline void _debug_uart_putc(int ch)
+{
+	struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE;
+	while (!(serial_din(&com_port->lsr) & UART_LSR_THRE))
+		;
+	serial_dout(&com_port->thr, ch);
+}
+DEBUG_UART_FUNCS
+#endif
+#ifdef CONFIG_DEBUG_UART_OMAP
+#include <debug_uart.h>
+static inline void _debug_uart_init(void)
+{
+	struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE;
+	int baud_divisor;
+	baud_divisor = ns16550_calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK,
+					    CONFIG_BAUDRATE);
+	serial_dout(&com_port->ier, CONFIG_SYS_NS16550_IER);
+	serial_dout(&com_port->mdr1, 0x7);
+	serial_dout(&com_port->mcr, UART_MCRVAL);
+	serial_dout(&com_port->fcr, UART_FCR_DEFVAL);
+	serial_dout(&com_port->lcr, UART_LCR_BKSE | UART_LCRVAL);
+	serial_dout(&com_port->dll, baud_divisor & 0xff);
+	serial_dout(&com_port->dlm, (baud_divisor >> 8) & 0xff);
+	serial_dout(&com_port->lcr, UART_LCRVAL);
+	serial_dout(&com_port->mdr1, 0x0);
 }
 static inline void _debug_uart_putc(int ch)
 {
 	struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE;
 	while (!(serial_din(&com_port->lsr) & UART_LSR_THRE))
 		;
 	serial_dout(&com_port->thr, ch);
 }
 DEBUG_UART_FUNCS
 #endif
 #ifdef CONFIG_DM_SERIAL
 static int ns16550_serial_putc(struct udevice *dev, const char ch)
 {
 	struct NS16550 *const com_port = dev_get_priv(dev);
 	if (!(serial_in(&com_port->lsr) & UART_LSR_THRE))
 		return -EAGAIN;
 	serial_out(ch, &com_port->thr);
 	/*
 	 * Call watchdog_reset() upon newline. This is done here in putc
 	 * since the environment code uses a single puts() to print the complete
 	 * environment upon "printenv". So we can't put this watchdog call
 	 * in puts().
 	 */
 	if (ch == '\n')
 		WATCHDOG_RESET();
 	return 0;
 }
 static int ns16550_serial_pending(struct udevice *dev, bool input)
 {
 	struct NS16550 *const com_port = dev_get_priv(dev);
 	if (input)
 		return serial_in(&com_port->lsr) & UART_LSR_DR ? 1 : 0;
 	else
 		return serial_in(&com_port->lsr) & UART_LSR_THRE ? 0 : 1;
 }
 static int ns16550_serial_getc(struct udevice *dev)
 {
 	struct NS16550 *const com_port = dev_get_priv(dev);
 	if (!(serial_in(&com_port->lsr) & UART_LSR_DR))
 		return -EAGAIN;
 	return serial_in(&com_port->rbr);
 }
 static int ns16550_serial_setbrg(struct udevice *dev, int baudrate)
 {
 	struct NS16550 *const com_port = dev_get_priv(dev);
 	struct ns16550_platdata *plat = com_port->plat;
 	int clock_divisor;
 	clock_divisor = ns16550_calc_divisor(com_port, plat->clock, baudrate);
 	NS16550_setbrg(com_port, clock_divisor);
 	return 0;
 }
 int ns16550_serial_probe(struct udevice *dev)
 {
 	struct NS16550 *const com_port = dev_get_priv(dev);
 	com_port->plat = dev_get_platdata(dev);
 	NS16550_init(com_port, -1);
 	return 0;
 }
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 enum {
 	PORT_NS16550 = 0,
 	PORT_JZ4780,
 };
 #endif
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 {
 	struct ns16550_platdata *plat = dev->platdata;
 	const u32 port_type = dev_get_driver_data(dev);
 	fdt_addr_t addr;
 	struct clk clk;
 	int err;
 	/* try Processor Local Bus device first */
 	addr = dev_get_addr(dev);
 #if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI)
 	if (addr == FDT_ADDR_T_NONE) {
 		/* then try pci device */
 		struct fdt_pci_addr pci_addr;
 		u32 bar;
 		int ret;
 		/* we prefer to use a memory-mapped register */
 		ret = fdtdec_get_pci_addr(gd->fdt_blob, dev_of_offset(dev),
 					  FDT_PCI_SPACE_MEM32, "reg",
 					  &pci_addr);
 		if (ret) {
 			/* try if there is any i/o-mapped register */
 			ret = fdtdec_get_pci_addr(gd->fdt_blob,
 						  dev_of_offset(dev),
 						  FDT_PCI_SPACE_IO,
 						  "reg", &pci_addr);
 			if (ret)
 				return ret;
 		}
 		ret = fdtdec_get_pci_bar32(dev, &pci_addr, &bar);
 		if (ret)
 			return ret;
 		addr = bar;
 	}
 #endif
 	if (addr == FDT_ADDR_T_NONE)
 		return -EINVAL;
 #ifdef CONFIG_SYS_NS16550_PORT_MAPPED
 	plat->base = addr;
 #else
 	plat->base = (unsigned long)map_physmem(addr, 0, MAP_NOCACHE);
 #endif
 	plat->reg_offset = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
 				     "reg-offset", 0);
 	plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
 					 "reg-shift", 0);
 	err = clk_get_by_index(dev, 0, &clk);
 	if (!err) {
 		err = clk_get_rate(&clk);
 		if (!IS_ERR_VALUE(err))
 			plat->clock = err;
 	} else if (err != -ENOENT && err != -ENODEV && err != -ENOSYS) {
 		debug("ns16550 failed to get clock\n");
 		return err;
 	}
 	if (!plat->clock)
 		plat->clock = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
 					     "clock-frequency",
 					     CONFIG_SYS_NS16550_CLK);
 	if (!plat->clock) {
 		debug("ns16550 clock not defined\n");
 		return -EINVAL;
 	}
 	plat->fcr = UART_FCR_DEFVAL;
 	if (port_type == PORT_JZ4780)
 		plat->fcr |= UART_FCR_UME;
 	return 0;
 }
 #endif
 const struct dm_serial_ops ns16550_serial_ops = {
 	.putc = ns16550_serial_putc,
 	.pending = ns16550_serial_pending,
 	.getc = ns16550_serial_getc,
 	.setbrg = ns16550_serial_setbrg,
 };
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 /*
  * Please consider existing compatible strings before adding a new
  * one to keep this table compact. Or you may add a generic "ns16550"
  * compatible string to your dts.
  */
 static const struct udevice_id ns16550_serial_ids[] = {
 	{ .compatible = "ns16550",		.data = PORT_NS16550 },
 	{ .compatible = "ns16550a",		.data = PORT_NS16550 },
 	{ .compatible = "ingenic,jz4780-uart",	.data = PORT_JZ4780  },
 	{ .compatible = "nvidia,tegra20-uart",	.data = PORT_NS16550 },
 	{ .compatible = "snps,dw-apb-uart",	.data = PORT_NS16550 },
 	{ .compatible = "ti,omap2-uart",	.data = PORT_NS16550 },
 	{ .compatible = "ti,omap3-uart",	.data = PORT_NS16550 },
 	{ .compatible = "ti,omap4-uart",	.data = PORT_NS16550 },
 	{ .compatible = "ti,am3352-uart",	.data = PORT_NS16550 },
 	{ .compatible = "ti,am4372-uart",	.data = PORT_NS16550 },
 	{ .compatible = "ti,dra742-uart",	.data = PORT_NS16550 },
 	{}
 };
 #endif /* OF_CONTROL && !OF_PLATDATA */
 #if CONFIG_IS_ENABLED(SERIAL_PRESENT)
 /* TODO(sjg@chromium.org): Integrate this into a macro like CONFIG_IS_ENABLED */
 #if !defined(CONFIG_TPL_BUILD) || defined(CONFIG_TPL_DM_SERIAL)
 U_BOOT_DRIVER(ns16550_serial) = {
 	.name	= "ns16550_serial",
 	.id	= UCLASS_SERIAL,
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.of_match = ns16550_serial_ids,
 	.ofdata_to_platdata = ns16550_serial_ofdata_to_platdata,
 	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),

include/debug_uart.h

Diff comments View file @ a52cf08

 /*
  * Early debug UART support
  *
  * (C) Copyright 2014 Google, Inc
  * Writte by Simon Glass <sjg@chromium.org>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #ifndef _DEBUG_UART_H
 #define _DEBUG_UART_H
 /*
  * The debug UART is intended for use very early in U-Boot to debug problems
  * when an ICE or other debug mechanism is not available.
  *
  * To use it you should:
  * - Make sure your UART supports this interface
  * - Enable CONFIG_DEBUG_UART
  * - Enable the CONFIG for your UART to tell it to provide this interface
  *       (e.g. CONFIG_DEBUG_UART_NS16550)
  * - Define the required settings as needed (see below)
  * - Call debug_uart_init() before use
  * - Call printch() to output a character
  *
  * Depending on your platform it may be possible to use this UART before a
  * stack is available.
  *
  * If your UART does not support this interface you can probably add support
  * quite easily. Remember that you cannot use driver model and it is preferred
  * to use no stack.
  *
  * You must not use this UART once driver model is working and the serial
  * drivers are up and running (done in serial_init()). Otherwise the drivers
  * may conflict and you will get strange output.
  *
  *
  * To enable the debug UART in your serial driver:
  *
  * - #include <debug_uart.h>
  * - Define _debug_uart_init(), trying to avoid using the stack
  * - Define _debug_uart_putc() as static inline (avoiding stack usage)
  * - Immediately afterwards, add DEBUG_UART_FUNCS to define the rest of the
  *     functionality (printch(), etc.)
  *
  * If your board needs additional init for the UART to work, enable
  * CONFIG_DEBUG_UART_BOARD_INIT and write a function called
  * board_debug_uart_init() to perform that init. When debug_uart_init() is
  * called, the init will happen automatically.
  */
 /**
  * debug_uart_init() - Set up the debug UART ready for use
  *
  * This sets up the UART with the correct baud rate, etc.
  *
  * Available CONFIG is:
  *
  *    - CONFIG_DEBUG_UART_BASE: Base address of UART
  *    - CONFIG_BAUDRATE: Requested baud rate
  *    - CONFIG_DEBUG_UART_CLOCK: Input clock for UART
  */
 void debug_uart_init(void);
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT
 void board_debug_uart_init(void);
 #else
 static inline void board_debug_uart_init(void)
 {
 }
 #endif
 /**
  * printch() - Output a character to the debug UART
  *
  * @ch:		Character to output
  */
 void printch(int ch);
 /**
  * printascii() - Output an ASCII string to the debug UART
  *
  * @str:	String to output
  */
 void printascii(const char *str);
 /**
  * printhex2() - Output a 2-digit hex value
  *
  * @value:	Value to output
  */
 void printhex2(uint value);
 /**
  * printhex4() - Output a 4-digit hex value
  *
  * @value:	Value to output
  */
 void printhex4(uint value);
 /**
  * printhex8() - Output a 8-digit hex value
  *
  * @value:	Value to output
  */
 void printhex8(uint value);
 #ifdef CONFIG_DEBUG_UART_ANNOUNCE
 #define _DEBUG_UART_ANNOUNCE	printascii("<debug_uart> ");
 #else
 #define _DEBUG_UART_ANNOUNCE
 #endif
+#define serial_dout(reg, value)	\
+	serial_out_shift((char *)com_port + \
+		((char *)reg - (char *)com_port) * \
+			(1 << CONFIG_DEBUG_UART_SHIFT), \
+		CONFIG_DEBUG_UART_SHIFT, value)
+#define serial_din(reg) \
+	serial_in_shift((char *)com_port + \
+		((char *)reg - (char *)com_port) * \
+			(1 << CONFIG_DEBUG_UART_SHIFT), \
+		CONFIG_DEBUG_UART_SHIFT)
 /*
  * Now define some functions - this should be inserted into the serial driver
  */
 #define DEBUG_UART_FUNCS \
 \
 	static inline void _printch(int ch) \
 	{ \
 		if (ch == '\n') \
 			_debug_uart_putc('\r'); \
 		_debug_uart_putc(ch); \
 	} \
 \
 	void printch(int ch) \
 	{ \
 		_printch(ch); \
 	} \
 \
 	void printascii(const char *str) \
 	{ \
 		while (*str) \
 			_printch(*str++); \
 	} \
 \
 	static inline void printhex1(uint digit) \
 	{ \
 		digit &= 0xf; \
 		_debug_uart_putc(digit > 9 ? digit - 10 + 'a' : digit + '0'); \
 	} \
 \
 	static inline void printhex(uint value, int digits) \
 	{ \
 		while (digits-- > 0) \
 			printhex1(value >> (4 * digits)); \
 	} \
 \
 	void printhex2(uint value) \
 	{ \
 		printhex(value, 2); \
 	} \
 \
 	void printhex4(uint value) \
 	{ \
 		printhex(value, 4); \
 	} \
 \
 	void printhex8(uint value) \
 	{ \
 		printhex(value, 8); \
 	} \
 \
 	void debug_uart_init(void) \
 	{ \
 		board_debug_uart_init(); \
 		_debug_uart_init(); \
 		_DEBUG_UART_ANNOUNCE \
 	} \
 #endif