Skip to content

L
linux
Commit 9e06d55f authored by Ryan Case's avatar Ryan Case Committed by Greg Kroah-Hartman
Browse files
Options

tty: serial: qcom_geni_serial: Remove use of *_relaxed() and mb() 

A frequent side comment has been to remove the use of writel_relaxed,
readl_relaxed, and mb. This reduces driver complexity and the _relaxed
variants were not known to provide any noticeable performance benefit.
Signed-off-by: default avatarRyan Case <ryandcase@chromium.org>
Reviewed-by: default avatarEvan Green <evgreen@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8fcf7a65
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 111 deletions
drivers/tty/serial/qcom_geni_serial.c
View file @ 9e06d55f
...@@ -228,7 +228,7 @@ static unsigned int qcom_geni_serial_get_mctrl(struct uart_port *uport) ...@@ -228,7 +228,7 @@ static unsigned int qcom_geni_serial_get_mctrl(struct uart_port *uport)
if (uart_console(uport) || !uart_cts_enabled(uport)) { if (uart_console(uport) || !uart_cts_enabled(uport)) {
mctrl |= TIOCM_CTS; mctrl |= TIOCM_CTS;
} else { } else {
geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS); geni_ios = readl(uport->membase + SE_GENI_IOS);
if (!(geni_ios & IO2_DATA_IN)) if (!(geni_ios & IO2_DATA_IN))
mctrl |= TIOCM_CTS; mctrl |= TIOCM_CTS;
} }
...@@ -246,7 +246,7 @@ static void qcom_geni_serial_set_mctrl(struct uart_port *uport, ...@@ -246,7 +246,7 @@ static void qcom_geni_serial_set_mctrl(struct uart_port *uport,
if (!(mctrl & TIOCM_RTS)) if (!(mctrl & TIOCM_RTS))
uart_manual_rfr = UART_MANUAL_RFR_EN | UART_RFR_NOT_READY; uart_manual_rfr = UART_MANUAL_RFR_EN | UART_RFR_NOT_READY;
writel_relaxed(uart_manual_rfr, uport->membase + SE_UART_MANUAL_RFR); writel(uart_manual_rfr, uport->membase + SE_UART_MANUAL_RFR);
} }
static const char *qcom_geni_serial_get_type(struct uart_port *uport) static const char *qcom_geni_serial_get_type(struct uart_port *uport)
...@@ -275,9 +275,6 @@ static bool qcom_geni_serial_poll_bit(struct uart_port *uport, ...@@ -275,9 +275,6 @@ static bool qcom_geni_serial_poll_bit(struct uart_port *uport,
unsigned int fifo_bits; unsigned int fifo_bits;
unsigned long timeout_us = 20000; unsigned long timeout_us = 20000;
/* Ensure polling is not re-ordered before the prior writes/reads */
mb();
if (uport->private_data) { if (uport->private_data) {
port = to_dev_port(uport, uport); port = to_dev_port(uport, uport);
baud = port->baud; baud = port->baud;
...@@ -297,7 +294,7 @@ static bool qcom_geni_serial_poll_bit(struct uart_port *uport, ...@@ -297,7 +294,7 @@ static bool qcom_geni_serial_poll_bit(struct uart_port *uport,
*/ */
timeout_us = DIV_ROUND_UP(timeout_us, 10) * 10; timeout_us = DIV_ROUND_UP(timeout_us, 10) * 10;
while (timeout_us) { while (timeout_us) {
reg = readl_relaxed(uport->membase + offset); reg = readl(uport->membase + offset);
if ((bool)(reg & field) == set) if ((bool)(reg & field) == set)
return true; return true;
udelay(10); udelay(10);
...@@ -310,7 +307,7 @@ static void qcom_geni_serial_setup_tx(struct uart_port *uport, u32 xmit_size) ...@@ -310,7 +307,7 @@ static void qcom_geni_serial_setup_tx(struct uart_port *uport, u32 xmit_size)
{ {
u32 m_cmd; u32 m_cmd;
writel_relaxed(xmit_size, uport->membase + SE_UART_TX_TRANS_LEN); writel(xmit_size, uport->membase + SE_UART_TX_TRANS_LEN);
m_cmd = UART_START_TX << M_OPCODE_SHFT; m_cmd = UART_START_TX << M_OPCODE_SHFT;
writel(m_cmd, uport->membase + SE_GENI_M_CMD0); writel(m_cmd, uport->membase + SE_GENI_M_CMD0);
} }
...@@ -323,13 +320,13 @@ static void qcom_geni_serial_poll_tx_done(struct uart_port *uport) ...@@ -323,13 +320,13 @@ static void qcom_geni_serial_poll_tx_done(struct uart_port *uport)
done = qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS, done = qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
M_CMD_DONE_EN, true); M_CMD_DONE_EN, true);
if (!done) { if (!done) {
writel_relaxed(M_GENI_CMD_ABORT, uport->membase + writel(M_GENI_CMD_ABORT, uport->membase +
SE_GENI_M_CMD_CTRL_REG); SE_GENI_M_CMD_CTRL_REG);
irq_clear |= M_CMD_ABORT_EN; irq_clear |= M_CMD_ABORT_EN;
qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS, qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
M_CMD_ABORT_EN, true); M_CMD_ABORT_EN, true);
} }
writel_relaxed(irq_clear, uport->membase + SE_GENI_M_IRQ_CLEAR); writel(irq_clear, uport->membase + SE_GENI_M_IRQ_CLEAR);
} }
static void qcom_geni_serial_abort_rx(struct uart_port *uport) static void qcom_geni_serial_abort_rx(struct uart_port *uport)
...@@ -339,8 +336,8 @@ static void qcom_geni_serial_abort_rx(struct uart_port *uport) ...@@ -339,8 +336,8 @@ static void qcom_geni_serial_abort_rx(struct uart_port *uport)
writel(S_GENI_CMD_ABORT, uport->membase + SE_GENI_S_CMD_CTRL_REG); writel(S_GENI_CMD_ABORT, uport->membase + SE_GENI_S_CMD_CTRL_REG);
qcom_geni_serial_poll_bit(uport, SE_GENI_S_CMD_CTRL_REG, qcom_geni_serial_poll_bit(uport, SE_GENI_S_CMD_CTRL_REG,
S_GENI_CMD_ABORT, false); S_GENI_CMD_ABORT, false);
writel_relaxed(irq_clear, uport->membase + SE_GENI_S_IRQ_CLEAR); writel(irq_clear, uport->membase + SE_GENI_S_IRQ_CLEAR);
writel_relaxed(FORCE_DEFAULT, uport->membase + GENI_FORCE_DEFAULT_REG); writel(FORCE_DEFAULT, uport->membase + GENI_FORCE_DEFAULT_REG);
} }
#ifdef CONFIG_CONSOLE_POLL #ifdef CONFIG_CONSOLE_POLL
...@@ -349,19 +346,13 @@ static int qcom_geni_serial_get_char(struct uart_port *uport) ...@@ -349,19 +346,13 @@ static int qcom_geni_serial_get_char(struct uart_port *uport)
u32 rx_fifo; u32 rx_fifo;
u32 status; u32 status;
status = readl_relaxed(uport->membase + SE_GENI_M_IRQ_STATUS); status = readl(uport->membase + SE_GENI_M_IRQ_STATUS);
writel_relaxed(status, uport->membase + SE_GENI_M_IRQ_CLEAR); writel(status, uport->membase + SE_GENI_M_IRQ_CLEAR);
status = readl_relaxed(uport->membase + SE_GENI_S_IRQ_STATUS); status = readl(uport->membase + SE_GENI_S_IRQ_STATUS);
writel_relaxed(status, uport->membase + SE_GENI_S_IRQ_CLEAR); writel(status, uport->membase + SE_GENI_S_IRQ_CLEAR);
/* status = readl(uport->membase + SE_GENI_RX_FIFO_STATUS);
* Ensure the writes to clear interrupts is not re-ordered after
* reading the data.
*/
mb();
status = readl_relaxed(uport->membase + SE_GENI_RX_FIFO_STATUS);
if (!(status & RX_FIFO_WC_MSK)) if (!(status & RX_FIFO_WC_MSK))
return NO_POLL_CHAR; return NO_POLL_CHAR;
...@@ -374,13 +365,12 @@ static void qcom_geni_serial_poll_put_char(struct uart_port *uport, ...@@ -374,13 +365,12 @@ static void qcom_geni_serial_poll_put_char(struct uart_port *uport,
{ {
struct qcom_geni_serial_port *port = to_dev_port(uport, uport); struct qcom_geni_serial_port *port = to_dev_port(uport, uport);
writel_relaxed(port->tx_wm, uport->membase + SE_GENI_TX_WATERMARK_REG); writel(port->tx_wm, uport->membase + SE_GENI_TX_WATERMARK_REG);
qcom_geni_serial_setup_tx(uport, 1); qcom_geni_serial_setup_tx(uport, 1);
WARN_ON(!qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS, WARN_ON(!qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
M_TX_FIFO_WATERMARK_EN, true)); M_TX_FIFO_WATERMARK_EN, true));
writel_relaxed(c, uport->membase + SE_GENI_TX_FIFOn); writel(c, uport->membase + SE_GENI_TX_FIFOn);
writel_relaxed(M_TX_FIFO_WATERMARK_EN, uport->membase + writel(M_TX_FIFO_WATERMARK_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
SE_GENI_M_IRQ_CLEAR);
qcom_geni_serial_poll_tx_done(uport); qcom_geni_serial_poll_tx_done(uport);
} }
#endif #endif
...@@ -388,7 +378,7 @@ static void qcom_geni_serial_poll_put_char(struct uart_port *uport, ...@@ -388,7 +378,7 @@ static void qcom_geni_serial_poll_put_char(struct uart_port *uport,
#ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE #ifdef CONFIG_SERIAL_QCOM_GENI_CONSOLE
static void qcom_geni_serial_wr_char(struct uart_port *uport, int ch) static void qcom_geni_serial_wr_char(struct uart_port *uport, int ch)
{ {
writel_relaxed(ch, uport->membase + SE_GENI_TX_FIFOn); writel(ch, uport->membase + SE_GENI_TX_FIFOn);
} }
static void static void
...@@ -407,7 +397,7 @@ __qcom_geni_serial_console_write(struct uart_port *uport, const char *s, ...@@ -407,7 +397,7 @@ __qcom_geni_serial_console_write(struct uart_port *uport, const char *s,
bytes_to_send++; bytes_to_send++;
} }
writel_relaxed(DEF_TX_WM, uport->membase + SE_GENI_TX_WATERMARK_REG); writel(DEF_TX_WM, uport->membase + SE_GENI_TX_WATERMARK_REG);
qcom_geni_serial_setup_tx(uport, bytes_to_send); qcom_geni_serial_setup_tx(uport, bytes_to_send);
for (i = 0; i < count; ) { for (i = 0; i < count; ) {
size_t chars_to_write = 0; size_t chars_to_write = 0;
...@@ -425,7 +415,7 @@ __qcom_geni_serial_console_write(struct uart_port *uport, const char *s, ...@@ -425,7 +415,7 @@ __qcom_geni_serial_console_write(struct uart_port *uport, const char *s,
chars_to_write = min_t(size_t, count - i, avail / 2); chars_to_write = min_t(size_t, count - i, avail / 2);
uart_console_write(uport, s + i, chars_to_write, uart_console_write(uport, s + i, chars_to_write,
qcom_geni_serial_wr_char); qcom_geni_serial_wr_char);
writel_relaxed(M_TX_FIFO_WATERMARK_EN, uport->membase + writel(M_TX_FIFO_WATERMARK_EN, uport->membase +
SE_GENI_M_IRQ_CLEAR); SE_GENI_M_IRQ_CLEAR);
i += chars_to_write; i += chars_to_write;
} }
...@@ -454,7 +444,7 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s, ...@@ -454,7 +444,7 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s,
else else
spin_lock_irqsave(&uport->lock, flags); spin_lock_irqsave(&uport->lock, flags);
geni_status = readl_relaxed(uport->membase + SE_GENI_STATUS); geni_status = readl(uport->membase + SE_GENI_STATUS);
/* Cancel the current write to log the fault */ /* Cancel the current write to log the fault */
if (!locked) { if (!locked) {
...@@ -464,11 +454,10 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s, ...@@ -464,11 +454,10 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s,
geni_se_abort_m_cmd(&port->se); geni_se_abort_m_cmd(&port->se);
qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS, qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
M_CMD_ABORT_EN, true); M_CMD_ABORT_EN, true);
writel_relaxed(M_CMD_ABORT_EN, uport->membase + writel(M_CMD_ABORT_EN, uport->membase +
SE_GENI_M_IRQ_CLEAR); SE_GENI_M_IRQ_CLEAR);
} }
writel_relaxed(M_CMD_CANCEL_EN, uport->membase + writel(M_CMD_CANCEL_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
SE_GENI_M_IRQ_CLEAR);
} else if ((geni_status & M_GENI_CMD_ACTIVE) && !port->tx_remaining) { } else if ((geni_status & M_GENI_CMD_ACTIVE) && !port->tx_remaining) {
/* /*
* It seems we can't interrupt existing transfers if all data * It seems we can't interrupt existing transfers if all data
...@@ -477,9 +466,8 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s, ...@@ -477,9 +466,8 @@ static void qcom_geni_serial_console_write(struct console *co, const char *s,
qcom_geni_serial_poll_tx_done(uport); qcom_geni_serial_poll_tx_done(uport);
if (uart_circ_chars_pending(&uport->state->xmit)) { if (uart_circ_chars_pending(&uport->state->xmit)) {
irq_en = readl_relaxed(uport->membase + irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
SE_GENI_M_IRQ_EN); writel(irq_en | M_TX_FIFO_WATERMARK_EN,
writel_relaxed(irq_en | M_TX_FIFO_WATERMARK_EN,
uport->membase + SE_GENI_M_IRQ_EN); uport->membase + SE_GENI_M_IRQ_EN);
} }
} }
...@@ -583,12 +571,12 @@ static void qcom_geni_serial_start_tx(struct uart_port *uport) ...@@ -583,12 +571,12 @@ static void qcom_geni_serial_start_tx(struct uart_port *uport)
if (!qcom_geni_serial_tx_empty(uport)) if (!qcom_geni_serial_tx_empty(uport))
return; return;
irq_en = readl_relaxed(uport->membase + SE_GENI_M_IRQ_EN); irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
irq_en |= M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN; irq_en |= M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN;
writel_relaxed(port->tx_wm, uport->membase + writel(port->tx_wm, uport->membase +
SE_GENI_TX_WATERMARK_REG); SE_GENI_TX_WATERMARK_REG);
writel_relaxed(irq_en, uport->membase + SE_GENI_M_IRQ_EN); writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);
} }
} }
...@@ -598,35 +586,28 @@ static void qcom_geni_serial_stop_tx(struct uart_port *uport) ...@@ -598,35 +586,28 @@ static void qcom_geni_serial_stop_tx(struct uart_port *uport)
u32 status; u32 status;
struct qcom_geni_serial_port *port = to_dev_port(uport, uport); struct qcom_geni_serial_port *port = to_dev_port(uport, uport);
irq_en = readl_relaxed(uport->membase + SE_GENI_M_IRQ_EN); irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
irq_en &= ~M_CMD_DONE_EN; irq_en &= ~M_CMD_DONE_EN;
if (port->xfer_mode == GENI_SE_FIFO) { if (port->xfer_mode == GENI_SE_FIFO) {
irq_en &= ~M_TX_FIFO_WATERMARK_EN; irq_en &= ~M_TX_FIFO_WATERMARK_EN;
writel_relaxed(0, uport->membase + writel(0, uport->membase +
SE_GENI_TX_WATERMARK_REG); SE_GENI_TX_WATERMARK_REG);
} }
writel_relaxed(irq_en, uport->membase + SE_GENI_M_IRQ_EN); writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);
status = readl_relaxed(uport->membase + SE_GENI_STATUS); status = readl(uport->membase + SE_GENI_STATUS);
/* Possible stop tx is called multiple times. */ /* Possible stop tx is called multiple times. */
if (!(status & M_GENI_CMD_ACTIVE)) if (!(status & M_GENI_CMD_ACTIVE))
return; return;
/*
* Ensure cancel command write is not re-ordered before checking
* the status of the Primary Sequencer.
*/
mb();
geni_se_cancel_m_cmd(&port->se); geni_se_cancel_m_cmd(&port->se);
if (!qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS, if (!qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
M_CMD_CANCEL_EN, true)) { M_CMD_CANCEL_EN, true)) {
geni_se_abort_m_cmd(&port->se); geni_se_abort_m_cmd(&port->se);
qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS, qcom_geni_serial_poll_bit(uport, SE_GENI_M_IRQ_STATUS,
M_CMD_ABORT_EN, true); M_CMD_ABORT_EN, true);
writel_relaxed(M_CMD_ABORT_EN, uport->membase + writel(M_CMD_ABORT_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
SE_GENI_M_IRQ_CLEAR);
} }
writel_relaxed(M_CMD_CANCEL_EN, uport->membase + SE_GENI_M_IRQ_CLEAR); writel(M_CMD_CANCEL_EN, uport->membase + SE_GENI_M_IRQ_CLEAR);
} }
static void qcom_geni_serial_start_rx(struct uart_port *uport) static void qcom_geni_serial_start_rx(struct uart_port *uport)
...@@ -635,26 +616,20 @@ static void qcom_geni_serial_start_rx(struct uart_port *uport) ...@@ -635,26 +616,20 @@ static void qcom_geni_serial_start_rx(struct uart_port *uport)
u32 status; u32 status;
struct qcom_geni_serial_port *port = to_dev_port(uport, uport); struct qcom_geni_serial_port *port = to_dev_port(uport, uport);
status = readl_relaxed(uport->membase + SE_GENI_STATUS); status = readl(uport->membase + SE_GENI_STATUS);
if (status & S_GENI_CMD_ACTIVE) if (status & S_GENI_CMD_ACTIVE)
qcom_geni_serial_stop_rx(uport); qcom_geni_serial_stop_rx(uport);
/*
* Ensure setup command write is not re-ordered before checking
* the status of the Secondary Sequencer.
*/
mb();
geni_se_setup_s_cmd(&port->se, UART_START_READ, 0); geni_se_setup_s_cmd(&port->se, UART_START_READ, 0);
if (port->xfer_mode == GENI_SE_FIFO) { if (port->xfer_mode == GENI_SE_FIFO) {
irq_en = readl_relaxed(uport->membase + SE_GENI_S_IRQ_EN); irq_en = readl(uport->membase + SE_GENI_S_IRQ_EN);
irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN; irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN;
writel_relaxed(irq_en, uport->membase + SE_GENI_S_IRQ_EN); writel(irq_en, uport->membase + SE_GENI_S_IRQ_EN);
irq_en = readl_relaxed(uport->membase + SE_GENI_M_IRQ_EN); irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN; irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;
writel_relaxed(irq_en, uport->membase + SE_GENI_M_IRQ_EN); writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);
} }
} }
...@@ -666,31 +641,25 @@ static void qcom_geni_serial_stop_rx(struct uart_port *uport) ...@@ -666,31 +641,25 @@ static void qcom_geni_serial_stop_rx(struct uart_port *uport)
u32 irq_clear = S_CMD_DONE_EN; u32 irq_clear = S_CMD_DONE_EN;
if (port->xfer_mode == GENI_SE_FIFO) { if (port->xfer_mode == GENI_SE_FIFO) {
irq_en = readl_relaxed(uport->membase + SE_GENI_S_IRQ_EN); irq_en = readl(uport->membase + SE_GENI_S_IRQ_EN);
irq_en &= ~(S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN); irq_en &= ~(S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN);
writel_relaxed(irq_en, uport->membase + SE_GENI_S_IRQ_EN); writel(irq_en, uport->membase + SE_GENI_S_IRQ_EN);
irq_en = readl_relaxed(uport->membase + SE_GENI_M_IRQ_EN); irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
irq_en &= ~(M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN); irq_en &= ~(M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN);
writel_relaxed(irq_en, uport->membase + SE_GENI_M_IRQ_EN); writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);
} }
status = readl_relaxed(uport->membase + SE_GENI_STATUS); status = readl(uport->membase + SE_GENI_STATUS);
/* Possible stop rx is called multiple times. */ /* Possible stop rx is called multiple times. */
if (!(status & S_GENI_CMD_ACTIVE)) if (!(status & S_GENI_CMD_ACTIVE))
return; return;
/*
* Ensure cancel command write is not re-ordered before checking
* the status of the Secondary Sequencer.
*/
mb();
geni_se_cancel_s_cmd(&port->se); geni_se_cancel_s_cmd(&port->se);
qcom_geni_serial_poll_bit(uport, SE_GENI_S_CMD_CTRL_REG, qcom_geni_serial_poll_bit(uport, SE_GENI_S_CMD_CTRL_REG,
S_GENI_CMD_CANCEL, false); S_GENI_CMD_CANCEL, false);
status = readl_relaxed(uport->membase + SE_GENI_STATUS); status = readl(uport->membase + SE_GENI_STATUS);
writel_relaxed(irq_clear, uport->membase + SE_GENI_S_IRQ_CLEAR); writel(irq_clear, uport->membase + SE_GENI_S_IRQ_CLEAR);
if (status & S_GENI_CMD_ACTIVE) if (status & S_GENI_CMD_ACTIVE)
qcom_geni_serial_abort_rx(uport); qcom_geni_serial_abort_rx(uport);
} }
...@@ -704,7 +673,7 @@ static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop) ...@@ -704,7 +673,7 @@ static void qcom_geni_serial_handle_rx(struct uart_port *uport, bool drop)
u32 total_bytes; u32 total_bytes;
struct qcom_geni_serial_port *port = to_dev_port(uport, uport); struct qcom_geni_serial_port *port = to_dev_port(uport, uport);
status = readl_relaxed(uport->membase + SE_GENI_RX_FIFO_STATUS); status = readl(uport->membase + SE_GENI_RX_FIFO_STATUS);
word_cnt = status & RX_FIFO_WC_MSK; word_cnt = status & RX_FIFO_WC_MSK;
last_word_partial = status & RX_LAST; last_word_partial = status & RX_LAST;
last_word_byte_cnt = (status & RX_LAST_BYTE_VALID_MSK) >> last_word_byte_cnt = (status & RX_LAST_BYTE_VALID_MSK) >>
...@@ -734,7 +703,7 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, ...@@ -734,7 +703,7 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done,
unsigned int chunk; unsigned int chunk;
int tail; int tail;
status = readl_relaxed(uport->membase + SE_GENI_TX_FIFO_STATUS); status = readl(uport->membase + SE_GENI_TX_FIFO_STATUS);
/* Complete the current tx command before taking newly added data */ /* Complete the current tx command before taking newly added data */
if (active) if (active)
...@@ -760,9 +729,9 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, ...@@ -760,9 +729,9 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done,
qcom_geni_serial_setup_tx(uport, pending); qcom_geni_serial_setup_tx(uport, pending);
port->tx_remaining = pending; port->tx_remaining = pending;
irq_en = readl_relaxed(uport->membase + SE_GENI_M_IRQ_EN); irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
if (!(irq_en & M_TX_FIFO_WATERMARK_EN)) if (!(irq_en & M_TX_FIFO_WATERMARK_EN))
writel_relaxed(irq_en | M_TX_FIFO_WATERMARK_EN, writel(irq_en | M_TX_FIFO_WATERMARK_EN,
uport->membase + SE_GENI_M_IRQ_EN); uport->membase + SE_GENI_M_IRQ_EN);
} }
...@@ -795,14 +764,14 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, ...@@ -795,14 +764,14 @@ static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done,
* cleared it in qcom_geni_serial_isr it will have already reasserted * cleared it in qcom_geni_serial_isr it will have already reasserted
* so we must clear it again here after our writes. * so we must clear it again here after our writes.
*/ */
writel_relaxed(M_TX_FIFO_WATERMARK_EN, writel(M_TX_FIFO_WATERMARK_EN,
uport->membase + SE_GENI_M_IRQ_CLEAR); uport->membase + SE_GENI_M_IRQ_CLEAR);
out_write_wakeup: out_write_wakeup:
if (!port->tx_remaining) { if (!port->tx_remaining) {
irq_en = readl_relaxed(uport->membase + SE_GENI_M_IRQ_EN); irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
if (irq_en & M_TX_FIFO_WATERMARK_EN) if (irq_en & M_TX_FIFO_WATERMARK_EN)
writel_relaxed(irq_en & ~M_TX_FIFO_WATERMARK_EN, writel(irq_en & ~M_TX_FIFO_WATERMARK_EN,
uport->membase + SE_GENI_M_IRQ_EN); uport->membase + SE_GENI_M_IRQ_EN);
} }
...@@ -826,12 +795,12 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void *dev) ...@@ -826,12 +795,12 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void *dev)
return IRQ_NONE; return IRQ_NONE;
spin_lock_irqsave(&uport->lock, flags); spin_lock_irqsave(&uport->lock, flags);
m_irq_status = readl_relaxed(uport->membase + SE_GENI_M_IRQ_STATUS); m_irq_status = readl(uport->membase + SE_GENI_M_IRQ_STATUS);
s_irq_status = readl_relaxed(uport->membase + SE_GENI_S_IRQ_STATUS); s_irq_status = readl(uport->membase + SE_GENI_S_IRQ_STATUS);
geni_status = readl_relaxed(uport->membase + SE_GENI_STATUS); geni_status = readl(uport->membase + SE_GENI_STATUS);
m_irq_en = readl_relaxed(uport->membase + SE_GENI_M_IRQ_EN); m_irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);
writel_relaxed(m_irq_status, uport->membase + SE_GENI_M_IRQ_CLEAR); writel(m_irq_status, uport->membase + SE_GENI_M_IRQ_CLEAR);
writel_relaxed(s_irq_status, uport->membase + SE_GENI_S_IRQ_CLEAR); writel(s_irq_status, uport->membase + SE_GENI_S_IRQ_CLEAR);
if (WARN_ON(m_irq_status & M_ILLEGAL_CMD_EN)) if (WARN_ON(m_irq_status & M_ILLEGAL_CMD_EN))
goto out_unlock; goto out_unlock;
...@@ -929,7 +898,7 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport) ...@@ -929,7 +898,7 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport)
get_tx_fifo_size(port); get_tx_fifo_size(port);
set_rfr_wm(port); set_rfr_wm(port);
writel_relaxed(rxstale, uport->membase + SE_UART_RX_STALE_CNT); writel(rxstale, uport->membase + SE_UART_RX_STALE_CNT);
/* /*
* Make an unconditional cancel on the main sequencer to reset * Make an unconditional cancel on the main sequencer to reset
* it else we could end up in data loss scenarios. * it else we could end up in data loss scenarios.
...@@ -1033,10 +1002,10 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, ...@@ -1033,10 +1002,10 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
ser_clk_cfg |= clk_div << CLK_DIV_SHFT; ser_clk_cfg |= clk_div << CLK_DIV_SHFT;
/* parity */ /* parity */
tx_trans_cfg = readl_relaxed(uport->membase + SE_UART_TX_TRANS_CFG); tx_trans_cfg = readl(uport->membase + SE_UART_TX_TRANS_CFG);
tx_parity_cfg = readl_relaxed(uport->membase + SE_UART_TX_PARITY_CFG); tx_parity_cfg = readl(uport->membase + SE_UART_TX_PARITY_CFG);
rx_trans_cfg = readl_relaxed(uport->membase + SE_UART_RX_TRANS_CFG); rx_trans_cfg = readl(uport->membase + SE_UART_RX_TRANS_CFG);
rx_parity_cfg = readl_relaxed(uport->membase + SE_UART_RX_PARITY_CFG); rx_parity_cfg = readl(uport->membase + SE_UART_RX_PARITY_CFG);
if (termios->c_cflag & PARENB) { if (termios->c_cflag & PARENB) {
tx_trans_cfg |= UART_TX_PAR_EN; tx_trans_cfg |= UART_TX_PAR_EN;
rx_trans_cfg |= UART_RX_PAR_EN; rx_trans_cfg |= UART_RX_PAR_EN;
...@@ -1092,17 +1061,17 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, ...@@ -1092,17 +1061,17 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
uart_update_timeout(uport, termios->c_cflag, baud); uart_update_timeout(uport, termios->c_cflag, baud);
if (!uart_console(uport)) if (!uart_console(uport))
writel_relaxed(port->loopback, writel(port->loopback,
uport->membase + SE_UART_LOOPBACK_CFG); uport->membase + SE_UART_LOOPBACK_CFG);
writel_relaxed(tx_trans_cfg, uport->membase + SE_UART_TX_TRANS_CFG); writel(tx_trans_cfg, uport->membase + SE_UART_TX_TRANS_CFG);
writel_relaxed(tx_parity_cfg, uport->membase + SE_UART_TX_PARITY_CFG); writel(tx_parity_cfg, uport->membase + SE_UART_TX_PARITY_CFG);
writel_relaxed(rx_trans_cfg, uport->membase + SE_UART_RX_TRANS_CFG); writel(rx_trans_cfg, uport->membase + SE_UART_RX_TRANS_CFG);
writel_relaxed(rx_parity_cfg, uport->membase + SE_UART_RX_PARITY_CFG); writel(rx_parity_cfg, uport->membase + SE_UART_RX_PARITY_CFG);
writel_relaxed(bits_per_char, uport->membase + SE_UART_TX_WORD_LEN); writel(bits_per_char, uport->membase + SE_UART_TX_WORD_LEN);
writel_relaxed(bits_per_char, uport->membase + SE_UART_RX_WORD_LEN); writel(bits_per_char, uport->membase + SE_UART_RX_WORD_LEN);
writel_relaxed(stop_bit_len, uport->membase + SE_UART_TX_STOP_BIT_LEN); writel(stop_bit_len, uport->membase + SE_UART_TX_STOP_BIT_LEN);
writel_relaxed(ser_clk_cfg, uport->membase + GENI_SER_M_CLK_CFG); writel(ser_clk_cfg, uport->membase + GENI_SER_M_CLK_CFG);
writel_relaxed(ser_clk_cfg, uport->membase + GENI_SER_S_CLK_CFG); writel(ser_clk_cfg, uport->membase + GENI_SER_S_CLK_CFG);
out_restart_rx: out_restart_rx:
qcom_geni_serial_start_rx(uport); qcom_geni_serial_start_rx(uport);
} }
...@@ -1193,13 +1162,13 @@ static int __init qcom_geni_serial_earlycon_setup(struct earlycon_device *dev, ...@@ -1193,13 +1162,13 @@ static int __init qcom_geni_serial_earlycon_setup(struct earlycon_device *dev,
geni_se_init(&se, DEF_FIFO_DEPTH_WORDS / 2, DEF_FIFO_DEPTH_WORDS - 2); geni_se_init(&se, DEF_FIFO_DEPTH_WORDS / 2, DEF_FIFO_DEPTH_WORDS - 2);
geni_se_select_mode(&se, GENI_SE_FIFO); geni_se_select_mode(&se, GENI_SE_FIFO);
writel_relaxed(tx_trans_cfg, uport->membase + SE_UART_TX_TRANS_CFG); writel(tx_trans_cfg, uport->membase + SE_UART_TX_TRANS_CFG);
writel_relaxed(tx_parity_cfg, uport->membase + SE_UART_TX_PARITY_CFG); writel(tx_parity_cfg, uport->membase + SE_UART_TX_PARITY_CFG);
writel_relaxed(rx_trans_cfg, uport->membase + SE_UART_RX_TRANS_CFG); writel(rx_trans_cfg, uport->membase + SE_UART_RX_TRANS_CFG);
writel_relaxed(rx_parity_cfg, uport->membase + SE_UART_RX_PARITY_CFG); writel(rx_parity_cfg, uport->membase + SE_UART_RX_PARITY_CFG);
writel_relaxed(bits_per_char, uport->membase + SE_UART_TX_WORD_LEN); writel(bits_per_char, uport->membase + SE_UART_TX_WORD_LEN);
writel_relaxed(bits_per_char, uport->membase + SE_UART_RX_WORD_LEN); writel(bits_per_char, uport->membase + SE_UART_RX_WORD_LEN);
writel_relaxed(stop_bit_len, uport->membase + SE_UART_TX_STOP_BIT_LEN); writel(stop_bit_len, uport->membase + SE_UART_TX_STOP_BIT_LEN);
dev->con->write = qcom_geni_serial_earlycon_write; dev->con->write = qcom_geni_serial_earlycon_write;
dev->con->setup = NULL; dev->con->setup = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7