Revert "uart: pl011: Introduce register accessor"

This reverts commit 7b753f318d1456c8e7740f3bd96d1dbb362d5449 as with
this patch the serial console is broken on lots of platforms.

Reported-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Jun Nie <jun.nie@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 122 insertions, 141 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 29a291d3bf24..ee57e2bee9a1 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -85,26 +85,23 @@ struct vendor_data {
         unsigned int (*get_fifosize)(struct amba_device *dev);
 };
 
-/* Max address offset of register in use is 0x48 */
-#define REG_NR          (0x48 >> 2)
-#define IDX(x)          (x >> 2)
 enum reg_idx {
-        REG_DR          = IDX(UART01x_DR),
-        REG_RSR         = IDX(UART01x_RSR),
-        REG_ST_DMAWM    = IDX(ST_UART011_DMAWM),
-        REG_FR          = IDX(UART01x_FR),
-        REG_ST_LCRH_RX  = IDX(ST_UART011_LCRH_RX),
-        REG_ILPR        = IDX(UART01x_ILPR),
-        REG_IBRD        = IDX(UART011_IBRD),
-        REG_FBRD        = IDX(UART011_FBRD),
-        REG_LCRH        = IDX(UART011_LCRH),
-        REG_CR          = IDX(UART011_CR),
-        REG_IFLS        = IDX(UART011_IFLS),
-        REG_IMSC        = IDX(UART011_IMSC),
-        REG_RIS         = IDX(UART011_RIS),
-        REG_MIS         = IDX(UART011_MIS),
-        REG_ICR         = IDX(UART011_ICR),
-        REG_DMACR       = IDX(UART011_DMACR),
+        REG_DR          = UART01x_DR,
+        REG_RSR         = UART01x_RSR,
+        REG_ST_DMAWM    = ST_UART011_DMAWM,
+        REG_FR          = UART01x_FR,
+        REG_ST_LCRH_RX  = ST_UART011_LCRH_RX,
+        REG_ILPR        = UART01x_ILPR,
+        REG_IBRD        = UART011_IBRD,
+        REG_FBRD        = UART011_FBRD,
+        REG_LCRH        = UART011_LCRH,
+        REG_CR          = UART011_CR,
+        REG_IFLS        = UART011_IFLS,
+        REG_IMSC        = UART011_IMSC,
+        REG_RIS         = UART011_RIS,
+        REG_MIS         = UART011_MIS,
+        REG_ICR         = UART011_ICR,
+        REG_DMACR       = UART011_DMACR,
 };
 
 static unsigned int get_fifosize_arm(struct amba_device *dev)
@@ -206,24 +203,6 @@ struct uart_amba_port {
 #endif
 };
 
-static unsigned int pl011_readw(struct uart_amba_port *uap, int index)
-{
-        WARN_ON(index > REG_NR);
-        return readw_relaxed(uap->port.membase + (index << 2));
-}
-
-static void pl011_writew(struct uart_amba_port *uap, int val, int index)
-{
-        WARN_ON(index > REG_NR);
-        writew_relaxed(val, uap->port.membase + (index << 2));
-}
-
-static void pl011_writeb(struct uart_amba_port *uap, u8 val, int index)
-{
-        WARN_ON(index > REG_NR);
-        writeb_relaxed(val, uap->port.membase + (index << 2));
-}
-
 /*
  * Reads up to 256 characters from the FIFO or until it's empty and
  * inserts them into the TTY layer. Returns the number of characters
@@ -236,12 +215,12 @@ static int pl011_fifo_to_tty(struct uart_amba_port *uap)
         int fifotaken = 0;
 
         while (max_count--) {
-                status = pl011_readw(uap, REG_FR);
+                status = readw(uap->port.membase + REG_FR);
                 if (status & UART01x_FR_RXFE)
                         break;
 
                 /* Take chars from the FIFO and update status */
-                ch = pl011_readw(uap, REG_DR) |
+                ch = readw(uap->port.membase + REG_DR) |
                         UART_DUMMY_DR_RX;
                 flag = TTY_NORMAL;
                 uap->port.icount.rx++;
@@ -478,7 +457,7 @@ static void pl011_dma_tx_callback(void *data)
 
         dmacr = uap->dmacr;
         uap->dmacr = dmacr & ~UART011_TXDMAE;
-        pl011_writew(uap, uap->dmacr, REG_DMACR);
+        writew(uap->dmacr, uap->port.membase + REG_DMACR);
 
         /*
          * If TX DMA was disabled, it means that we've stopped the DMA for
@@ -592,7 +571,7 @@ static int pl011_dma_tx_refill(struct uart_amba_port *uap)
         dma_dev->device_issue_pending(chan);
 
         uap->dmacr |= UART011_TXDMAE;
-        pl011_writew(uap, uap->dmacr, REG_DMACR);
+        writew(uap->dmacr, uap->port.membase + REG_DMACR);
         uap->dmatx.queued = true;
 
         /*
@@ -628,9 +607,9 @@ static bool pl011_dma_tx_irq(struct uart_amba_port *uap)
          */
         if (uap->dmatx.queued) {
                 uap->dmacr |= UART011_TXDMAE;
-                pl011_writew(uap, uap->dmacr, REG_DMACR);
+                writew(uap->dmacr, uap->port.membase + REG_DMACR);
                 uap->im &= ~UART011_TXIM;
-                pl011_writew(uap, uap->im, REG_IMSC);
+                writew(uap->im, uap->port.membase + REG_IMSC);
                 return true;
         }
 
@@ -640,7 +619,7 @@ static bool pl011_dma_tx_irq(struct uart_amba_port *uap)
          */
         if (pl011_dma_tx_refill(uap) > 0) {
                 uap->im &= ~UART011_TXIM;
-                pl011_writew(uap, uap->im, REG_IMSC);
+                writew(uap->im, uap->port.membase + REG_IMSC);
                 return true;
         }
         return false;
@@ -654,7 +633,7 @@ static inline void pl011_dma_tx_stop(struct uart_amba_port *uap)
 {
         if (uap->dmatx.queued) {
                 uap->dmacr &= ~UART011_TXDMAE;
-                pl011_writew(uap, uap->dmacr, REG_DMACR);
+                writew(uap->dmacr, uap->port.membase + REG_DMACR);
         }
 }
 
@@ -680,12 +659,14 @@ static inline bool pl011_dma_tx_start(struct uart_amba_port *uap)
                 if (!uap->dmatx.queued) {
                         if (pl011_dma_tx_refill(uap) > 0) {
                                 uap->im &= ~UART011_TXIM;
-                                pl011_writew(uap, uap->im, REG_IMSC);
+                                writew(uap->im, uap->port.membase +
+                                       REG_IMSC);
                         } else
                                 ret = false;
                 } else if (!(uap->dmacr & UART011_TXDMAE)) {
                         uap->dmacr |= UART011_TXDMAE;
-                        pl011_writew(uap, uap->dmacr, REG_DMACR);
+                        writew(uap->dmacr,
+                                       uap->port.membase + REG_DMACR);
                 }
                 return ret;
         }
@@ -696,9 +677,9 @@ static inline bool pl011_dma_tx_start(struct uart_amba_port *uap)
          */
         dmacr = uap->dmacr;
         uap->dmacr &= ~UART011_TXDMAE;
-        pl011_writew(uap, uap->dmacr, REG_DMACR);
+        writew(uap->dmacr, uap->port.membase + REG_DMACR);
 
-        if (pl011_readw(uap, REG_FR) & UART01x_FR_TXFF) {
+        if (readw(uap->port.membase + REG_FR) & UART01x_FR_TXFF) {
                 /*
                  * No space in the FIFO, so enable the transmit interrupt
                  * so we know when there is space.  Note that once we've
@@ -707,13 +688,13 @@ static inline bool pl011_dma_tx_start(struct uart_amba_port *uap)
                 return false;
         }
 
-        pl011_writew(uap, uap->port.x_char, REG_DR);
+        writew(uap->port.x_char, uap->port.membase + REG_DR);
         uap->port.icount.tx++;
         uap->port.x_char = 0;
 
         /* Success - restore the DMA state */
         uap->dmacr = dmacr;
-        pl011_writew(uap, dmacr, REG_DMACR);
+        writew(dmacr, uap->port.membase + REG_DMACR);
 
         return true;
 }
@@ -741,7 +722,7 @@ __acquires(&uap->port.lock)
                              DMA_TO_DEVICE);
                 uap->dmatx.queued = false;
                 uap->dmacr &= ~UART011_TXDMAE;
-                pl011_writew(uap, uap->dmacr, REG_DMACR);
+                writew(uap->dmacr, uap->port.membase + REG_DMACR);
         }
 }
 
@@ -781,11 +762,11 @@ static int pl011_dma_rx_trigger_dma(struct uart_amba_port *uap)
         dma_async_issue_pending(rxchan);
 
         uap->dmacr |= UART011_RXDMAE;
-        pl011_writew(uap, uap->dmacr, REG_DMACR);
+        writew(uap->dmacr, uap->port.membase + REG_DMACR);
         uap->dmarx.running = true;
 
         uap->im &= ~UART011_RXIM;
-        pl011_writew(uap, uap->im, REG_IMSC);
+        writew(uap->im, uap->port.membase + REG_IMSC);
 
         return 0;
 }
@@ -843,9 +824,8 @@ static void pl011_dma_rx_chars(struct uart_amba_port *uap,
          */
         if (dma_count == pending && readfifo) {
                 /* Clear any error flags */
-                pl011_writew(uap,
-                             UART011_OEIS | UART011_BEIS | UART011_PEIS
-                             | UART011_FEIS, REG_ICR);
+                writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS,
+                       uap->port.membase + REG_ICR);
 
                 /*
                  * If we read all the DMA'd characters, and we had an
@@ -893,7 +873,7 @@ static void pl011_dma_rx_irq(struct uart_amba_port *uap)
 
         /* Disable RX DMA - incoming data will wait in the FIFO */
         uap->dmacr &= ~UART011_RXDMAE;
-        pl011_writew(uap, uap->dmacr, REG_DMACR);
+        writew(uap->dmacr, uap->port.membase + REG_DMACR);
         uap->dmarx.running = false;
 
         pending = sgbuf->sg.length - state.residue;
@@ -913,7 +893,7 @@ static void pl011_dma_rx_irq(struct uart_amba_port *uap)
                 dev_dbg(uap->port.dev, "could not retrigger RX DMA job "
                         "fall back to interrupt mode\n");
                 uap->im |= UART011_RXIM;
-                pl011_writew(uap, uap->im, REG_IMSC);
+                writew(uap->im, uap->port.membase + REG_IMSC);
         }
 }
 
@@ -961,7 +941,7 @@ static void pl011_dma_rx_callback(void *data)
                 dev_dbg(uap->port.dev, "could not retrigger RX DMA job "
                         "fall back to interrupt mode\n");
                 uap->im |= UART011_RXIM;
-                pl011_writew(uap, uap->im, REG_IMSC);
+                writew(uap->im, uap->port.membase + REG_IMSC);
         }
 }
 
@@ -974,7 +954,7 @@ static inline void pl011_dma_rx_stop(struct uart_amba_port *uap)
 {
         /* FIXME.  Just disable the DMA enable */
         uap->dmacr &= ~UART011_RXDMAE;
-        pl011_writew(uap, uap->dmacr, REG_DMACR);
+        writew(uap->dmacr, uap->port.membase + REG_DMACR);
 }
 
 /*
@@ -1018,7 +998,7 @@ static void pl011_dma_rx_poll(unsigned long args)
                 spin_lock_irqsave(&uap->port.lock, flags);
                 pl011_dma_rx_stop(uap);
                 uap->im |= UART011_RXIM;
-                pl011_writew(uap, uap->im, REG_IMSC);
+                writew(uap->im, uap->port.membase + REG_IMSC);
                 spin_unlock_irqrestore(&uap->port.lock, flags);
 
                 uap->dmarx.running = false;
@@ -1080,7 +1060,7 @@ static void pl011_dma_startup(struct uart_amba_port *uap)
 skip_rx:
         /* Turn on DMA error (RX/TX will be enabled on demand) */
         uap->dmacr |= UART011_DMAONERR;
-        pl011_writew(uap, uap->dmacr, REG_DMACR);
+        writew(uap->dmacr, uap->port.membase + REG_DMACR);
 
         /*
          * ST Micro variants has some specific dma burst threshold
@@ -1088,9 +1068,9 @@ skip_rx:
          * be issued above/below 16 bytes.
          */
         if (uap->vendor->dma_threshold)
-                pl011_writew(uap,
-                             ST_UART011_DMAWM_RX_16 | ST_UART011_DMAWM_TX_16,
-                             REG_ST_DMAWM);
+                writew(ST_UART011_DMAWM_RX_16 | ST_UART011_DMAWM_TX_16,
+                                uap->port.membase + REG_ST_DMAWM);
+
 
         if (uap->using_rx_dma) {
                 if (pl011_dma_rx_trigger_dma(uap))
@@ -1115,12 +1095,12 @@ static void pl011_dma_shutdown(struct uart_amba_port *uap)
                 return;
 
         /* Disable RX and TX DMA */
-        while (pl011_readw(uap, REG_FR) & UART01x_FR_BUSY)
+        while (readw(uap->port.membase + REG_FR) & UART01x_FR_BUSY)
                 barrier();
 
         spin_lock_irq(&uap->port.lock);
         uap->dmacr &= ~(UART011_DMAONERR | UART011_RXDMAE | UART011_TXDMAE);
-        pl011_writew(uap, uap->dmacr, REG_DMACR);
+        writew(uap->dmacr, uap->port.membase + REG_DMACR);
         spin_unlock_irq(&uap->port.lock);
 
         if (uap->using_tx_dma) {
@@ -1221,7 +1201,7 @@ static void pl011_stop_tx(struct uart_port *port)
             container_of(port, struct uart_amba_port, port);
 
         uap->im &= ~UART011_TXIM;
-        pl011_writew(uap, uap->im, REG_IMSC);
+        writew(uap->im, uap->port.membase + REG_IMSC);
         pl011_dma_tx_stop(uap);
 }
 
@@ -1231,7 +1211,7 @@ static void pl011_tx_chars(struct uart_amba_port *uap, bool from_irq);
 static void pl011_start_tx_pio(struct uart_amba_port *uap)
 {
         uap->im |= UART011_TXIM;
-        pl011_writew(uap, uap->im, REG_IMSC);
+        writew(uap->im, uap->port.membase + REG_IMSC);
         pl011_tx_chars(uap, false);
 }
 
@@ -1251,7 +1231,7 @@ static void pl011_stop_rx(struct uart_port *port)
 
         uap->im &= ~(UART011_RXIM|UART011_RTIM|UART011_FEIM|
                      UART011_PEIM|UART011_BEIM|UART011_OEIM);
-        pl011_writew(uap, uap->im, REG_IMSC);
+        writew(uap->im, uap->port.membase + REG_IMSC);
 
         pl011_dma_rx_stop(uap);
 }
@@ -1262,7 +1242,7 @@ static void pl011_enable_ms(struct uart_port *port)
             container_of(port, struct uart_amba_port, port);
 
         uap->im |= UART011_RIMIM|UART011_CTSMIM|UART011_DCDMIM|UART011_DSRMIM;
-        pl011_writew(uap, uap->im, REG_IMSC);
+        writew(uap->im, uap->port.membase + REG_IMSC);
 }
 
 static void pl011_rx_chars(struct uart_amba_port *uap)
@@ -1282,7 +1262,7 @@ __acquires(&uap->port.lock)
                         dev_dbg(uap->port.dev, "could not trigger RX DMA job "
                                 "fall back to interrupt mode again\n");
                         uap->im |= UART011_RXIM;
-                        pl011_writew(uap, uap->im, REG_IMSC);
+                        writew(uap->im, uap->port.membase + REG_IMSC);
                 } else {
 #ifdef CONFIG_DMA_ENGINE
                         /* Start Rx DMA poll */
@@ -1303,10 +1283,10 @@ static bool pl011_tx_char(struct uart_amba_port *uap, unsigned char c,
                           bool from_irq)
 {
         if (unlikely(!from_irq) &&
-            pl011_readw(uap, REG_FR) & UART01x_FR_TXFF)
+            readw(uap->port.membase + REG_FR) & UART01x_FR_TXFF)
                 return false; /* unable to transmit character */
 
-        pl011_writew(uap, c, REG_DR);
+        writew(c, uap->port.membase + REG_DR);
         uap->port.icount.tx++;
 
         return true;
@@ -1353,7 +1333,7 @@ static void pl011_modem_status(struct uart_amba_port *uap)
 {
         unsigned int status, delta;
 
-        status = pl011_readw(uap, REG_FR) & UART01x_FR_MODEM_ANY;
+        status = readw(uap->port.membase + REG_FR) & UART01x_FR_MODEM_ANY;
 
         delta = status ^ uap->old_status;
         uap->old_status = status;
@@ -1381,15 +1361,15 @@ static void check_apply_cts_event_workaround(struct uart_amba_port *uap)
                 return;
 
         /* workaround to make sure that all bits are unlocked.. */
-        pl011_writew(uap, 0x00, REG_ICR);
+        writew(0x00, uap->port.membase + REG_ICR);
 
         /*
          * WA: introduce 26ns(1 uart clk) delay before W1C;
          * single apb access will incur 2 pclk(133.12Mhz) delay,
          * so add 2 dummy reads
          */
-        dummy_read = pl011_readw(uap, REG_ICR);
-        dummy_read = pl011_readw(uap, REG_ICR);
+        dummy_read = readw(uap->port.membase + REG_ICR);
+        dummy_read = readw(uap->port.membase + REG_ICR);
 }
 
 static irqreturn_t pl011_int(int irq, void *dev_id)
@@ -1401,13 +1381,15 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
         int handled = 0;
 
         spin_lock_irqsave(&uap->port.lock, flags);
-        imsc = pl011_readw(uap, REG_IMSC);
-        status = pl011_readw(uap, REG_RIS) & imsc;
+        imsc = readw(uap->port.membase + REG_IMSC);
+        status = readw(uap->port.membase + REG_RIS) & imsc;
         if (status) {
                 do {
                         check_apply_cts_event_workaround(uap);
-                        pl011_writew(uap, status & ~(UART011_TXIS|UART011_RTIS|
-                                     UART011_RXIS), REG_ICR);
+
+                        writew(status & ~(UART011_TXIS|UART011_RTIS|
+                                          UART011_RXIS),
+                               uap->port.membase + REG_ICR);
 
                         if (status & (UART011_RTIS|UART011_RXIS)) {
                                 if (pl011_dma_rx_running(uap))
@@ -1424,7 +1406,7 @@ static irqreturn_t pl011_int(int irq, void *dev_id)
                         if (pass_counter-- == 0)
                                 break;
 
-                        status = pl011_readw(uap, REG_RIS) & imsc;
+                        status = readw(uap->port.membase + REG_RIS) & imsc;
                 } while (status != 0);
                 handled = 1;
         }
@@ -1438,7 +1420,7 @@ static unsigned int pl011_tx_empty(struct uart_port *port)
 {
         struct uart_amba_port *uap =
             container_of(port, struct uart_amba_port, port);
-        unsigned int status = pl011_readw(uap, REG_FR);
+        unsigned int status = readw(uap->port.membase + REG_FR);
         return status & (UART01x_FR_BUSY|UART01x_FR_TXFF) ? 0 : TIOCSER_TEMT;
 }
 
@@ -1447,7 +1429,7 @@ static unsigned int pl011_get_mctrl(struct uart_port *port)
         struct uart_amba_port *uap =
             container_of(port, struct uart_amba_port, port);
         unsigned int result = 0;
-        unsigned int status = pl011_readw(uap, REG_FR);
+        unsigned int status = readw(uap->port.membase + REG_FR);
 
 #define TIOCMBIT(uartbit, tiocmbit)     \
         if (status & uartbit)           \
@@ -1467,7 +1449,7 @@ static void pl011_set_mctrl(struct uart_port *port, unsigned int mctrl)
             container_of(port, struct uart_amba_port, port);
         unsigned int cr;
 
-        cr = pl011_readw(uap, REG_CR);
+        cr = readw(uap->port.membase + REG_CR);
 
 #define TIOCMBIT(tiocmbit, uartbit)             \
         if (mctrl & tiocmbit)           \
@@ -1487,7 +1469,7 @@ static void pl011_set_mctrl(struct uart_port *port, unsigned int mctrl)
         }
 #undef TIOCMBIT
 
-        pl011_writew(uap, cr, REG_CR);
+        writew(cr, uap->port.membase + REG_CR);
 }
 
 static void pl011_break_ctl(struct uart_port *port, int break_state)
@@ -1498,12 +1480,12 @@ static void pl011_break_ctl(struct uart_port *port, int break_state)
         unsigned int lcr_h;
 
         spin_lock_irqsave(&uap->port.lock, flags);
-        lcr_h = pl011_readw(uap, uap->lcrh_tx);
+        lcr_h = readw(uap->port.membase + uap->lcrh_tx);
         if (break_state == -1)
                 lcr_h |= UART01x_LCRH_BRK;
         else
                 lcr_h &= ~UART01x_LCRH_BRK;
-        pl011_writew(uap, lcr_h, uap->lcrh_tx);
+        writew(lcr_h, uap->port.membase + uap->lcrh_tx);
         spin_unlock_irqrestore(&uap->port.lock, flags);
 }
 
@@ -1513,8 +1495,9 @@ static void pl011_quiesce_irqs(struct uart_port *port)
 {
         struct uart_amba_port *uap =
             container_of(port, struct uart_amba_port, port);
+        unsigned char __iomem *regs = uap->port.membase;
 
-        pl011_writew(uap, pl011_readw(uap, REG_MIS), REG_ICR);
+        writew(readw(regs + REG_MIS), regs + REG_ICR);
         /*
          * There is no way to clear TXIM as this is "ready to transmit IRQ", so
          * we simply mask it. start_tx() will unmask it.
@@ -1528,7 +1511,7 @@ static void pl011_quiesce_irqs(struct uart_port *port)
          * (including tx queue), so we're also fine with start_tx()'s caller
          * side.
          */
-        pl011_writew(uap, pl011_readw(uap, REG_IMSC) & ~UART011_TXIM, REG_IMSC);
+        writew(readw(regs + REG_IMSC) & ~UART011_TXIM, regs + REG_IMSC);
 }
 
 static int pl011_get_poll_char(struct uart_port *port)
@@ -1543,11 +1526,11 @@ static int pl011_get_poll_char(struct uart_port *port)
          */
         pl011_quiesce_irqs(port);
 
-        status = pl011_readw(uap, REG_FR);
+        status = readw(uap->port.membase + REG_FR);
         if (status & UART01x_FR_RXFE)
                 return NO_POLL_CHAR;
 
-        return pl011_readw(uap, REG_DR);
+        return readw(uap->port.membase + REG_DR);
 }
 
 static void pl011_put_poll_char(struct uart_port *port,
@@ -1556,10 +1539,10 @@ static void pl011_put_poll_char(struct uart_port *port,
         struct uart_amba_port *uap =
             container_of(port, struct uart_amba_port, port);
 
-        while (pl011_readw(uap, REG_FR) & UART01x_FR_TXFF)
+        while (readw(uap->port.membase + REG_FR) & UART01x_FR_TXFF)
                 barrier();
 
-        pl011_writew(uap, ch, REG_DR);
+        writew(ch, uap->port.membase + REG_DR);
 }
 
 #endif /* CONFIG_CONSOLE_POLL */
@@ -1583,15 +1566,15 @@ static int pl011_hwinit(struct uart_port *port)
         uap->port.uartclk = clk_get_rate(uap->clk);
 
         /* Clear pending error and receive interrupts */
-        pl011_writew(uap, UART011_OEIS | UART011_BEIS | UART011_PEIS |
-                     UART011_FEIS | UART011_RTIS | UART011_RXIS, REG_ICR);
+        writew(UART011_OEIS | UART011_BEIS | UART011_PEIS | UART011_FEIS |
+               UART011_RTIS | UART011_RXIS, uap->port.membase + REG_ICR);
 
         /*
          * Save interrupts enable mask, and enable RX interrupts in case if
          * the interrupt is used for NMI entry.
          */
-        uap->im = pl011_readw(uap, REG_IMSC);
-        pl011_writew(uap, UART011_RTIM | UART011_RXIM, REG_IMSC);
+        uap->im = readw(uap->port.membase + REG_IMSC);
+        writew(UART011_RTIM | UART011_RXIM, uap->port.membase + REG_IMSC);
 
         if (dev_get_platdata(uap->port.dev)) {
                 struct amba_pl011_data *plat;
@@ -1605,7 +1588,7 @@ static int pl011_hwinit(struct uart_port *port)
 
 static void pl011_write_lcr_h(struct uart_amba_port *uap, unsigned int lcr_h)
 {
-        pl011_writew(uap, lcr_h, uap->lcrh_rx);
+        writew(lcr_h, uap->port.membase + uap->lcrh_rx);
         if (uap->lcrh_rx != uap->lcrh_tx) {
                 int i;
                 /*
@@ -1613,14 +1596,14 @@ static void pl011_write_lcr_h(struct uart_amba_port *uap, unsigned int lcr_h)
                  * to get this delay write read only register 10 times
                  */
                 for (i = 0; i < 10; ++i)
-                        pl011_writew(uap, 0xff, REG_MIS);
-                pl011_writew(uap, lcr_h, uap->lcrh_tx);
+                        writew(0xff, uap->port.membase + REG_MIS);
+                writew(lcr_h, uap->port.membase + uap->lcrh_tx);
         }
 }
 
 static int pl011_allocate_irq(struct uart_amba_port *uap)
 {
-        pl011_writew(uap, uap->im, REG_IMSC);
+        writew(uap->im, uap->port.membase + REG_IMSC);
 
         return request_irq(uap->port.irq, pl011_int, 0, "uart-pl011", uap);
 }
@@ -1635,11 +1618,12 @@ static void pl011_enable_interrupts(struct uart_amba_port *uap)
         spin_lock_irq(&uap->port.lock);
 
         /* Clear out any spuriously appearing RX interrupts */
-        pl011_writew(uap, UART011_RTIS | UART011_RXIS, REG_ICR);
+        writew(UART011_RTIS | UART011_RXIS,
+               uap->port.membase + REG_ICR);
         uap->im = UART011_RTIM;
         if (!pl011_dma_rx_running(uap))
                 uap->im |= UART011_RXIM;
-        pl011_writew(uap, uap->im, REG_IMSC);
+        writew(uap->im, uap->port.membase + REG_IMSC);
         spin_unlock_irq(&uap->port.lock);
 }
 
@@ -1658,21 +1642,21 @@ static int pl011_startup(struct uart_port *port)
         if (retval)
                 goto clk_dis;
 
-        pl011_writew(uap, uap->vendor->ifls, REG_IFLS);
+        writew(uap->vendor->ifls, uap->port.membase + REG_IFLS);
 
         spin_lock_irq(&uap->port.lock);
 
         /* restore RTS and DTR */
         cr = uap->old_cr & (UART011_CR_RTS | UART011_CR_DTR);
         cr |= UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
-        pl011_writew(uap, cr, REG_CR);
+        writew(cr, uap->port.membase + REG_CR);
 
         spin_unlock_irq(&uap->port.lock);
 
         /*
          * initialise the old status of the modem signals
          */
-        uap->old_status = pl011_readw(uap, REG_FR) &
+        uap->old_status = readw(uap->port.membase + REG_FR) &
                         UART01x_FR_MODEM_ANY;
 
         /* Startup DMA */
@@ -1712,11 +1696,11 @@ static int sbsa_uart_startup(struct uart_port *port)
 static void pl011_shutdown_channel(struct uart_amba_port *uap,
                                         unsigned int lcrh)
 {
-        unsigned long val;
+      unsigned long val;
 
-        val = pl011_readw(uap, lcrh);
-        val &= ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN);
-        pl011_writew(uap, val, lcrh);
+      val = readw(uap->port.membase + lcrh);
+      val &= ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN);
+      writew(val, uap->port.membase + lcrh);
 }
 
 /*
@@ -1730,11 +1714,11 @@ static void pl011_disable_uart(struct uart_amba_port *uap)
 
         uap->autorts = false;
         spin_lock_irq(&uap->port.lock);
-        cr = pl011_readw(uap, REG_CR);
+        cr = readw(uap->port.membase + REG_CR);
         uap->old_cr = cr;
         cr &= UART011_CR_RTS | UART011_CR_DTR;
         cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
-        pl011_writew(uap, cr, REG_CR);
+        writew(cr, uap->port.membase + REG_CR);
         spin_unlock_irq(&uap->port.lock);
 
         /*
@@ -1751,8 +1735,8 @@ static void pl011_disable_interrupts(struct uart_amba_port *uap)
 
         /* mask all interrupts and clear all pending ones */
         uap->im = 0;
-        pl011_writew(uap, uap->im, REG_IMSC);
-        pl011_writew(0xffff, REG_ICR);
+        writew(uap->im, uap->port.membase + REG_IMSC);
+        writew(0xffff, uap->port.membase + REG_ICR);
 
         spin_unlock_irq(&uap->port.lock);
 }
@@ -1904,8 +1888,8 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
                 pl011_enable_ms(port);
 
         /* first, disable everything */
-        old_cr = pl011_readw(uap, REG_CR);
-        pl011_writew(uap, 0, REG_CR);
+        old_cr = readw(port->membase + REG_CR);
+        writew(0, port->membase + REG_CR);
 
         if (termios->c_cflag & CRTSCTS) {
                 if (old_cr & UART011_CR_RTS)
@@ -1938,8 +1922,8 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
                         quot -= 2;
         }
         /* Set baud rate */
-        pl011_writew(uap, quot & 0x3f, REG_FBRD);
-        pl011_writew(uap, quot >> 6, REG_IBRD);
+        writew(quot & 0x3f, port->membase + REG_FBRD);
+        writew(quot >> 6, port->membase + REG_IBRD);
 
         /*
          * ----------v----------v----------v----------v-----
@@ -1948,7 +1932,7 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
          * ----------^----------^----------^----------^-----
          */
         pl011_write_lcr_h(uap, lcr_h);
-        pl011_writew(uap, old_cr, REG_CR);
+        writew(old_cr, port->membase + REG_CR);
 
         spin_unlock_irqrestore(&port->lock, flags);
 }
@@ -2089,9 +2073,9 @@ static void pl011_console_putchar(struct uart_port *port, int ch)
         struct uart_amba_port *uap =
             container_of(port, struct uart_amba_port, port);
 
-        while (pl011_readw(uap, REG_FR) & UART01x_FR_TXFF)
+        while (readw(uap->port.membase + REG_FR) & UART01x_FR_TXFF)
                 barrier();
-        pl011_writew(uap, ch, REG_DR);
+        writew(ch, uap->port.membase + REG_DR);
 }
 
 static void
@@ -2116,10 +2100,10 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
          *      First save the CR then disable the interrupts
          */
         if (!uap->vendor->always_enabled) {
-                old_cr = pl011_readw(uap, REG_CR);
+                old_cr = readw(uap->port.membase + REG_CR);
                 new_cr = old_cr & ~UART011_CR_CTSEN;
                 new_cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
-                pl011_writew(uap, new_cr, REG_CR);
+                writew(new_cr, uap->port.membase + REG_CR);
         }
 
         uart_console_write(&uap->port, s, count, pl011_console_putchar);
@@ -2129,10 +2113,10 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
          *      and restore the TCR
          */
         do {
-                status = pl011_readw(uap, REG_FR);
+                status = readw(uap->port.membase + REG_FR);
         } while (status & UART01x_FR_BUSY);
         if (!uap->vendor->always_enabled)
-                pl011_writew(uap, old_cr, REG_CR);
+                writew(old_cr, uap->port.membase + REG_CR);
 
         if (locked)
                 spin_unlock(&uap->port.lock);
@@ -2145,10 +2129,10 @@ static void __init
 pl011_console_get_options(struct uart_amba_port *uap, int *baud,
                              int *parity, int *bits)
 {
-        if (pl011_readw(uap, REG_CR) & UART01x_CR_UARTEN) {
+        if (readw(uap->port.membase + REG_CR) & UART01x_CR_UARTEN) {
                 unsigned int lcr_h, ibrd, fbrd;
 
-                lcr_h = pl011_readw(uap, uap->lcrh_tx);
+                lcr_h = readw(uap->port.membase + uap->lcrh_tx);
 
                 *parity = 'n';
                 if (lcr_h & UART01x_LCRH_PEN) {
@@ -2163,13 +2147,13 @@ pl011_console_get_options(struct uart_amba_port *uap, int *baud,
                 else
                         *bits = 8;
 
-                ibrd = pl011_readw(uap, REG_IBRD);
-                fbrd = pl011_readw(uap, REG_FBRD);
+                ibrd = readw(uap->port.membase + REG_IBRD);
+                fbrd = readw(uap->port.membase + REG_FBRD);
 
                 *baud = uap->port.uartclk * 4 / (64 * ibrd + fbrd);
 
                 if (uap->vendor->oversampling) {
-                        if (pl011_readw(uap, REG_CR)
+                        if (readw(uap->port.membase + REG_CR)
                                   & ST_UART011_CR_OVSFACT)
                                 *baud *= 2;
                 }
@@ -2241,13 +2225,10 @@ static struct console amba_console = {
 
 static void pl011_putc(struct uart_port *port, int c)
 {
-        struct uart_amba_port *uap =
-            container_of(port, struct uart_amba_port, port);
-
-        while (pl011_readw(uap, REG_FR) & UART01x_FR_TXFF)
+        while (readl(port->membase + REG_FR) & UART01x_FR_TXFF)
                 ;
-        pl011_writeb(uap, c, REG_DR);
-        while (pl011_readw(uap, REG_FR) & UART01x_FR_BUSY)
+        writeb(c, port->membase + REG_DR);
+        while (readl(port->membase + REG_FR) & UART01x_FR_BUSY)
                 ;
 }
 
@@ -2374,8 +2355,8 @@ static int pl011_register_port(struct uart_amba_port *uap)
         int ret;
 
         /* Ensure interrupts from this UART are masked and cleared */
-        pl011_writew(uap, 0, REG_IMSC);
-        pl011_writew(uap, 0xffff, REG_ICR);
+        writew(0, uap->port.membase + REG_IMSC);
+        writew(0xffff, uap->port.membase + REG_ICR);
 
         if (!amba_reg.state) {
                 ret = uart_register_driver(&amba_reg);