Skip to content

Commit

Permalink
[POWERPC] Uartlite: Fix reg io to access documented register size
Browse files Browse the repository at this point in the history 
The Uartlite data sheet defines the registers as 32 bit wide.  This
patch changes the register access to use 32 bit transfers and eliminates
the magic +3 offset which is currently required to make the device
work.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: John Williams <jwilliams@itee.uq.edu.au>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
  • Loading branch information
Grant Likely authored and Josh Boyer committed Oct 3, 2007
1 parent 260c02a commit a15da8e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion arch/ppc/syslib/virtex_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
.num_resources = 2, \
.resource = (struct resource[]) { \
{ \
.start = XPAR_UARTLITE_##num##_BASEADDR + 3, \
.start = XPAR_UARTLITE_##num##_BASEADDR, \
.end = XPAR_UARTLITE_##num##_HIGHADDR, \
.flags = IORESOURCE_MEM, \
}, \
Expand Down
32 changes: 16 additions & 16 deletions drivers/serial/uartlite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static int ulite_receive(struct uart_port *port, int stat)
/* stats */
if (stat & ULITE_STATUS_RXVALID) {
port->icount.rx++;
ch = readb(port->membase + ULITE_RX);
ch = in_be32((void*)port->membase + ULITE_RX);

if (stat & ULITE_STATUS_PARITY)
port->icount.parity++;
Expand Down Expand Up @@ -106,7 +106,7 @@ static int ulite_transmit(struct uart_port *port, int stat)
return 0;

if (port->x_char) {
writeb(port->x_char, port->membase + ULITE_TX);
out_be32((void*)port->membase + ULITE_TX, port->x_char);
port->x_char = 0;
port->icount.tx++;
return 1;
Expand All @@ -115,7 +115,7 @@ static int ulite_transmit(struct uart_port *port, int stat)
if (uart_circ_empty(xmit) || uart_tx_stopped(port))
return 0;

writeb(xmit->buf[xmit->tail], port->membase + ULITE_TX);
out_be32((void*)port->membase + ULITE_TX, xmit->buf[xmit->tail]);
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE-1);
port->icount.tx++;

Expand All @@ -132,7 +132,7 @@ static irqreturn_t ulite_isr(int irq, void *dev_id)
int busy;

do {
int stat = readb(port->membase + ULITE_STATUS);
int stat = in_be32((void*)port->membase + ULITE_STATUS);
busy = ulite_receive(port, stat);
busy |= ulite_transmit(port, stat);
} while (busy);
Expand All @@ -148,7 +148,7 @@ static unsigned int ulite_tx_empty(struct uart_port *port)
unsigned int ret;

spin_lock_irqsave(&port->lock, flags);
ret = readb(port->membase + ULITE_STATUS);
ret = in_be32((void*)port->membase + ULITE_STATUS);
spin_unlock_irqrestore(&port->lock, flags);

return ret & ULITE_STATUS_TXEMPTY ? TIOCSER_TEMT : 0;
Expand All @@ -171,7 +171,7 @@ static void ulite_stop_tx(struct uart_port *port)

static void ulite_start_tx(struct uart_port *port)
{
ulite_transmit(port, readb(port->membase + ULITE_STATUS));
ulite_transmit(port, in_be32((void*)port->membase + ULITE_STATUS));
}

static void ulite_stop_rx(struct uart_port *port)
Expand Down Expand Up @@ -200,17 +200,17 @@ static int ulite_startup(struct uart_port *port)
if (ret)
return ret;

writeb(ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX,
port->membase + ULITE_CONTROL);
writeb(ULITE_CONTROL_IE, port->membase + ULITE_CONTROL);
out_be32((void*)port->membase + ULITE_CONTROL,
ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX);
out_be32((void*)port->membase + ULITE_CONTROL, ULITE_CONTROL_IE);

return 0;
}

static void ulite_shutdown(struct uart_port *port)
{
writeb(0, port->membase + ULITE_CONTROL);
readb(port->membase + ULITE_CONTROL); /* dummy */
out_be32((void*)port->membase + ULITE_CONTROL, 0);
in_be32((void*)port->membase + ULITE_CONTROL); /* dummy */
free_irq(port->irq, port);
}

Expand Down Expand Up @@ -314,7 +314,7 @@ static void ulite_console_wait_tx(struct uart_port *port)

/* wait up to 10ms for the character(s) to be sent */
for (i = 0; i < 10000; i++) {
if (readb(port->membase + ULITE_STATUS) & ULITE_STATUS_TXEMPTY)
if (in_be32((void*)port->membase + ULITE_STATUS) & ULITE_STATUS_TXEMPTY)
break;
udelay(1);
}
Expand All @@ -323,7 +323,7 @@ static void ulite_console_wait_tx(struct uart_port *port)
static void ulite_console_putchar(struct uart_port *port, int ch)
{
ulite_console_wait_tx(port);
writeb(ch, port->membase + ULITE_TX);
out_be32((void*)port->membase + ULITE_TX, ch);
}

static void ulite_console_write(struct console *co, const char *s,
Expand All @@ -340,16 +340,16 @@ static void ulite_console_write(struct console *co, const char *s,
spin_lock_irqsave(&port->lock, flags);

/* save and disable interrupt */
ier = readb(port->membase + ULITE_STATUS) & ULITE_STATUS_IE;
writeb(0, port->membase + ULITE_CONTROL);
ier = in_be32((void*)port->membase + ULITE_STATUS) & ULITE_STATUS_IE;
out_be32((void*)port->membase + ULITE_CONTROL, 0);

uart_console_write(port, s, count, ulite_console_putchar);

ulite_console_wait_tx(port);

/* restore interrupt state */
if (ier)
writeb(ULITE_CONTROL_IE, port->membase + ULITE_CONTROL);
out_be32((void*)port->membase + ULITE_CONTROL, ULITE_CONTROL_IE);

if (locked)
spin_unlock_irqrestore(&port->lock, flags);
Expand Down

0 comments on commit a15da8e

Please sign in to comment.