From: Grant Likely <grant.likely@secretlab.ca>
To: John Linn <john.linn@xilinx.com>
Cc: linux-serial@vger.kernel.org, jacmet@sunsite.dk,
michal.simek@petalogix.com, john.williams@petalogix.com
Subject: Re: [PATCH] [V3] uartlite: move from byte accesses to word accesses
Date: Wed, 17 Mar 2010 10:21:27 -0600 [thread overview]
Message-ID: <fa686aa41003170921g667edc2pcc2bf4eac592c089@mail.gmail.com> (raw)
In-Reply-To: <e1a95faf-6907-4262-94bf-fa6808f7f098@SG2EHSMHS007.ehs.local>
On Wed, Mar 17, 2010 at 9:40 AM, John Linn <john.linn@xilinx.com> wrote:
> Byte accesses for I/O devices in Xilinx IP is going to be less
> desired in the future such that the driver is being changed to
> use 32 bit accesses.
>
> This change facilitates using the uartlite IP over a PCIe bus
> which only allows 32 bit accesses.
>
> Signed-off-by: John Linn <john.linn@xilinx.com>
>
> ---
>
> V2 - updated the commit message based on Peter's comments
>
> V3 - removed u8 casting based on Peter's comments, cleaned up and
> simplified the change by using raw I/O functions rather than
> using in_be32 & out_be32 functions.
The __raw_{read,write}l() functions aren't the best choice here. User
ioread32be(), iowrite32be() instead if you want them to work
cross-architecture (see include/asm-generic/iomap.h).
g.
> ---
> drivers/serial/uartlite.c | 32 ++++++++++++++++----------------
> 1 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
> index ab2ab3c..bdf08c7 100644
> --- a/drivers/serial/uartlite.c
> +++ b/drivers/serial/uartlite.c
> @@ -86,7 +86,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 = __raw_readl(port->membase + ULITE_RX);
>
> if (stat & ULITE_STATUS_PARITY)
> port->icount.parity++;
> @@ -131,7 +131,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);
> + __raw_writel(port->x_char, port->membase + ULITE_TX);
> port->x_char = 0;
> port->icount.tx++;
> return 1;
> @@ -140,7 +140,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);
> + __raw_writel(xmit->buf[xmit->tail], port->membase + ULITE_TX);
> xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE-1);
> port->icount.tx++;
>
> @@ -157,7 +157,7 @@ static irqreturn_t ulite_isr(int irq, void *dev_id)
> int busy, n = 0;
>
> do {
> - int stat = readb(port->membase + ULITE_STATUS);
> + int stat = __raw_readl(port->membase + ULITE_STATUS);
> busy = ulite_receive(port, stat);
> busy |= ulite_transmit(port, stat);
> n++;
> @@ -178,7 +178,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 = __raw_readl(port->membase + ULITE_STATUS);
> spin_unlock_irqrestore(&port->lock, flags);
>
> return ret & ULITE_STATUS_TXEMPTY ? TIOCSER_TEMT : 0;
> @@ -201,7 +201,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, __raw_readl(port->membase + ULITE_STATUS));
> }
>
> static void ulite_stop_rx(struct uart_port *port)
> @@ -230,17 +230,17 @@ static int ulite_startup(struct uart_port *port)
> if (ret)
> return ret;
>
> - writeb(ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX,
> + __raw_writel(ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX,
> port->membase + ULITE_CONTROL);
> - writeb(ULITE_CONTROL_IE, port->membase + ULITE_CONTROL);
> + __raw_writel(ULITE_CONTROL_IE, port->membase + ULITE_CONTROL);
>
> return 0;
> }
>
> static void ulite_shutdown(struct uart_port *port)
> {
> - writeb(0, port->membase + ULITE_CONTROL);
> - readb(port->membase + ULITE_CONTROL); /* dummy */
> + __raw_writel(0, port->membase + ULITE_CONTROL);
> + __raw_readl(port->membase + ULITE_CONTROL); /* dummy */
> free_irq(port->irq, port);
> }
>
> @@ -352,7 +352,7 @@ static void ulite_console_wait_tx(struct uart_port *port)
>
> /* Spin waiting for TX fifo to have space available */
> for (i = 0; i < 100000; i++) {
> - val = readb(port->membase + ULITE_STATUS);
> + val = __raw_readl(port->membase + ULITE_STATUS);
> if ((val & ULITE_STATUS_TXFULL) == 0)
> break;
> cpu_relax();
> @@ -362,7 +362,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);
> + __raw_writel(ch, port->membase + ULITE_TX);
> }
>
> static void ulite_console_write(struct console *co, const char *s,
> @@ -379,8 +379,8 @@ 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 = __raw_readl(port->membase + ULITE_STATUS) & ULITE_STATUS_IE;
> + __raw_writel(0, port->membase + ULITE_CONTROL);
>
> uart_console_write(port, s, count, ulite_console_putchar);
>
> @@ -388,7 +388,7 @@ static void ulite_console_write(struct console *co, const char *s,
>
> /* restore interrupt state */
> if (ier)
> - writeb(ULITE_CONTROL_IE, port->membase + ULITE_CONTROL);
> + __raw_writel(ULITE_CONTROL_IE, port->membase + ULITE_CONTROL);
>
> if (locked)
> spin_unlock_irqrestore(&port->lock, flags);
> @@ -601,7 +601,7 @@ ulite_of_probe(struct of_device *op, const struct of_device_id *match)
>
> id = of_get_property(op->node, "port-number", NULL);
>
> - return ulite_assign(&op->dev, id ? *id : -1, res.start+3, irq);
> + return ulite_assign(&op->dev, id ? *id : -1, res.start, irq);
> }
>
> static int __devexit ulite_of_remove(struct of_device *op)
> --
> 1.6.2.1
>
>
>
> This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
>
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2010-03-17 16:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-17 15:40 [PATCH] [V3] uartlite: move from byte accesses to word accesses John Linn
2010-03-17 16:21 ` Grant Likely [this message]
2010-03-17 16:26 ` John Linn
2010-03-17 18:04 ` John Linn
2010-03-17 21:26 ` Grant Likely
2010-03-17 23:37 ` John Williams
[not found] ` <1d3f23371003171631x7e854ff6xd4f647b53b2dbe96@mail.gmail.com>
2010-03-18 0:01 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fa686aa41003170921g667edc2pcc2bf4eac592c089@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=jacmet@sunsite.dk \
--cc=john.linn@xilinx.com \
--cc=john.williams@petalogix.com \
--cc=linux-serial@vger.kernel.org \
--cc=michal.simek@petalogix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).