GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rockchip/rk*: replace UART special snowflake with standard driver

Browse source 
The standard uart8250mem_32 driver is now usable on ARM, so use it.

BUG=none
BRANCH=none
TEST=see that serial firmware builds still log on serial in all stages
on veyron_minnie. Also verified that a 9600 baud console is functional.

Change-Id: I653b70a0d51a8d136e1da17537988f5b33c7a160
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: fa27c60fd38002775072d11fca431d4788b4d1d7
Original-Change-Id: I047d74ac2d5c311f303955e62391114e16ec087a
Original-Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/337551
Original-Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Original-Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://review.coreboot.org/14319
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Patrick Georgi 2016-04-07 20:16:21 +02:00
parent 53e78539de
commit d3ae4f1364
3 changed files with 6 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
src/soc/rockchip/common/uart.c
View file

@ -13,151 +13,15 @@
* GNU General Public License for more details.
*/
#include <arch/io.h>
#include <boot/coreboot_tables.h>
#include <console/console.h> /* for __console definition */
#include <console/uart.h>
#include <drivers/uart/uart8250reg.h>
#include <stdint.h>
/*
* TODO: Use DRIVERS_UART_8250MEM driver instead.
* There is an issue in the IO call functions where x86 and ARM
* ordering is reversed. This 8250MEM driver uses the x86 convention.
* This driver can be replaced once the IO calls are sorted.
*/
struct rk_uart {
union {
uint32_t thr; /* Transmit holding register. */
uint32_t rbr; /* Receive buffer register. */
uint32_t dll; /* Divisor latch lsb. */
};
union {
uint32_t ier; /* Interrupt enable register. */
uint32_t dlm; /* Divisor latch msb. */
};
union {
uint32_t iir; /* Interrupt identification register. */
uint32_t fcr; /* FIFO control register. */
};
uint32_t lcr; /* Line control register. */
uint32_t mcr; /* Modem control register. */
uint32_t lsr; /* Line status register. */
uint32_t msr; /* Modem status register. */
uint32_t scr;
uint32_t reserved1[(0x30 - 0x20) / 4];
uint32_t srbr[(0x70 - 0x30) / 4];
uint32_t far;
uint32_t tfr;
uint32_t rfw;
uint32_t usr;
uint32_t tfl;
uint32_t rfl;
uint32_t srr;
uint32_t srts;
uint32_t sbcr;
uint32_t sdmam;
uint32_t sfe;
uint32_t srt;
uint32_t stet;
uint32_t htx;
uint32_t dmasa;
uint32_t reserver2[(0xf4 - 0xac) / 4];
uint32_t cpr;
uint32_t ucv;
uint32_t ctr;
} __attribute__ ((packed));
static struct rk_uart * const uart_ptr =
(void *)CONFIG_CONSOLE_SERIAL_UART_ADDRESS;
static void rk_uart_tx_flush(void);
static int rk_uart_tst_byte(void);
static void rk_uart_init(void)
unsigned int uart_platform_refclk(void)
{
/* FIXME: Use a hardcoded divisor for now.
* uint16_t divisor = (u16) uart_baudrate_divisor(default_baudrate(),
* uart_platform_refclk(), 16)
*/
const unsigned divisor = 13;
const uint8_t line_config = UART8250_LCR_WLS_8; // 8n1
rk_uart_tx_flush();
// Disable interrupts.
write32(&uart_ptr->ier, 0);
// Force DTR and RTS to high.
write32(&uart_ptr->mcr, UART8250_MCR_DTR | UART8250_MCR_RTS);
// Set line configuration, access divisor latches.
write32(&uart_ptr->lcr, UART8250_LCR_DLAB | line_config);
// Set the divisor.
write32(&uart_ptr->dll, divisor & 0xff);
write32(&uart_ptr->dlm, (divisor >> 8) & 0xff);
// Hide the divisor latches.
write32(&uart_ptr->lcr, line_config);
// Enable FIFOs, and clear receive and transmit.
write32(&uart_ptr->fcr, UART8250_FCR_FIFO_EN |
UART8250_FCR_CLEAR_RCVR | UART8250_FCR_CLEAR_XMIT);
return 23040000;
}
static void rk_uart_tx_byte(unsigned char data)
uintptr_t uart_platform_base(int idx)
{
while (!(read32(&uart_ptr->lsr) & UART8250_LSR_THRE));
write32(&uart_ptr->thr, data);
return CONFIG_CONSOLE_SERIAL_UART_ADDRESS;
}
static void rk_uart_tx_flush(void)
{
while (!(read32(&uart_ptr->lsr) & UART8250_LSR_TEMT));
}
static unsigned char rk_uart_rx_byte(void)
{
if (!rk_uart_tst_byte())
return 0;
return read32(&uart_ptr->rbr);
}
static int rk_uart_tst_byte(void)
{
return (read32(&uart_ptr->lsr) & UART8250_LSR_DR) == UART8250_LSR_DR;
}
void uart_init(int idx)
{
rk_uart_init();
}
unsigned char uart_rx_byte(int idx)
{
return rk_uart_rx_byte();
}
void uart_tx_byte(int idx, unsigned char data)
{
rk_uart_tx_byte(data);
}
void uart_tx_flush(int idx)
{
rk_uart_tx_flush();
}
#ifndef __PRE_RAM__
void uart_fill_lb(void *data)
{
struct lb_serial serial;
serial.type = LB_SERIAL_TYPE_MEMORY_MAPPED;
serial.baseaddr = CONFIG_CONSOLE_SERIAL_UART_ADDRESS;
serial.baud = default_baudrate();
serial.regwidth = 4;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
}
#endif

2
src/soc/rockchip/rk3288/Kconfig
View file

@ -20,9 +20,9 @@ config SOC_ROCKCHIP_RK3288
select ARCH_VERSTAGE_ARMV7
select ARCH_ROMSTAGE_ARMV7
select ARCH_RAMSTAGE_ARMV7
select DRIVERS_UART_8250MEM_32
select HAVE_MONOTONIC_TIMER
select GENERIC_UDELAY
select HAVE_UART_SPECIAL
select BOOTBLOCK_CONSOLE
select UNCOMPRESSED_RAMSTAGE
select GENERIC_GPIO_LIB

2
src/soc/rockchip/rk3399/Kconfig
View file

@ -7,9 +7,9 @@ config SOC_ROCKCHIP_RK3399
select ARCH_VERSTAGE_ARMV8_64
select ARM64_A53_ERRATUM_843419
select BOOTBLOCK_CONSOLE
select DRIVERS_UART_8250MEM_32
select GENERIC_UDELAY
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
select UNCOMPRESSED_RAMSTAGE
if SOC_ROCKCHIP_RK3399