From: Soren Brinkmann <soren.brinkmann@xilinx.com>
To: Russell King <linux@arm.linux.org.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.cz>, Arnd Bergmann <arnd@arndb.de>,
One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk>
Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>,
Michal Simek <michal.simek@xilinx.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-serial@vger.kernel.org,
Soren Brinkmann <soren.brinkmann@xilinx.com>
Subject: [PATCH RFC v2 03/11] tty: xuartps: Refactor read-modify-writes
Date: Fri, 7 Mar 2014 11:13:26 -0800 [thread overview]
Message-ID: <1394219614-3197-4-git-send-email-soren.brinkmann@xilinx.com> (raw)
In-Reply-To: <1394219614-3197-1-git-send-email-soren.brinkmann@xilinx.com>
A lot of read-modify-write sequences used a one-line statement which
nests a readl() within a writel(). Convert this into code sequences that
make the three steps more obvious.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
drivers/tty/serial/xilinx_uartps.c | 52 ++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 28 deletions(-)
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index b00060052316..a4bd6242e72d 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -437,9 +437,9 @@ static int xuartps_clk_notifier_cb(struct notifier_block *nb,
spin_lock_irqsave(&xuartps->port->lock, flags);
/* Disable the TX and RX to set baud rate */
- xuartps_writel(xuartps_readl(XUARTPS_CR_OFFSET) |
- (XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS),
- XUARTPS_CR_OFFSET);
+ ctrl_reg = xuartps_readl(XUARTPS_CR_OFFSET);
+ ctrl_reg |= XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS;
+ xuartps_writel(ctrl_reg, XUARTPS_CR_OFFSET);
spin_unlock_irqrestore(&xuartps->port->lock, flags);
@@ -464,9 +464,9 @@ static int xuartps_clk_notifier_cb(struct notifier_block *nb,
spin_lock_irqsave(&xuartps->port->lock, flags);
/* Set TX/RX Reset */
- xuartps_writel(xuartps_readl(XUARTPS_CR_OFFSET) |
- (XUARTPS_CR_TXRST | XUARTPS_CR_RXRST),
- XUARTPS_CR_OFFSET);
+ ctrl_reg = xuartps_readl(XUARTPS_CR_OFFSET);
+ ctrl_reg |= XUARTPS_CR_TXRST | XUARTPS_CR_RXRST;
+ xuartps_writel(ctrl_reg, XUARTPS_CR_OFFSET);
while (xuartps_readl(XUARTPS_CR_OFFSET) &
(XUARTPS_CR_TXRST | XUARTPS_CR_RXRST))
@@ -479,10 +479,9 @@ static int xuartps_clk_notifier_cb(struct notifier_block *nb,
*/
xuartps_writel(rx_timeout, XUARTPS_RXTOUT_OFFSET);
ctrl_reg = xuartps_readl(XUARTPS_CR_OFFSET);
- xuartps_writel(
- (ctrl_reg & ~(XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS)) |
- (XUARTPS_CR_TX_EN | XUARTPS_CR_RX_EN),
- XUARTPS_CR_OFFSET);
+ ctrl_reg &= ~(XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS);
+ ctrl_reg |= XUARTPS_CR_TX_EN | XUARTPS_CR_RX_EN;
+ xuartps_writel(ctrl_reg, XUARTPS_CR_OFFSET);
spin_unlock_irqrestore(&xuartps->port->lock, flags);
@@ -631,9 +630,9 @@ static void xuartps_set_termios(struct uart_port *port,
}
/* Disable the TX and RX to set baud rate */
- xuartps_writel(xuartps_readl(XUARTPS_CR_OFFSET) |
- (XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS),
- XUARTPS_CR_OFFSET);
+ ctrl_reg = xuartps_readl(XUARTPS_CR_OFFSET);
+ ctrl_reg |= XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS;
+ xuartps_writel(ctrl_reg, XUARTPS_CR_OFFSET);
/*
* Min baud rate = 6bps and Max Baud Rate is 10Mbps for 100Mhz clk
@@ -651,20 +650,18 @@ static void xuartps_set_termios(struct uart_port *port,
uart_update_timeout(port, termios->c_cflag, baud);
/* Set TX/RX Reset */
- xuartps_writel(xuartps_readl(XUARTPS_CR_OFFSET) |
- (XUARTPS_CR_TXRST | XUARTPS_CR_RXRST),
- XUARTPS_CR_OFFSET);
-
ctrl_reg = xuartps_readl(XUARTPS_CR_OFFSET);
+ ctrl_reg |= XUARTPS_CR_TXRST | XUARTPS_CR_RXRST;
+ xuartps_writel(ctrl_reg, XUARTPS_CR_OFFSET);
/*
* Clear the RX disable and TX disable bits and then set the TX enable
* bit and RX enable bit to enable the transmitter and receiver.
*/
- xuartps_writel(
- (ctrl_reg & ~(XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS))
- | (XUARTPS_CR_TX_EN | XUARTPS_CR_RX_EN),
- XUARTPS_CR_OFFSET);
+ ctrl_reg = xuartps_readl(XUARTPS_CR_OFFSET);
+ ctrl_reg &= ~(XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS);
+ ctrl_reg |= XUARTPS_CR_TX_EN | XUARTPS_CR_RX_EN;
+ xuartps_writel(ctrl_reg, XUARTPS_CR_OFFSET);
xuartps_writel(rx_timeout, XUARTPS_RXTOUT_OFFSET);
@@ -1245,9 +1242,9 @@ static int xuartps_resume(struct device *device)
spin_lock_irqsave(&port->lock, flags);
/* Set TX/RX Reset */
- xuartps_writel(xuartps_readl(XUARTPS_CR_OFFSET) |
- (XUARTPS_CR_TXRST | XUARTPS_CR_RXRST),
- XUARTPS_CR_OFFSET);
+ ctrl_reg = xuartps_readl(XUARTPS_CR_OFFSET);
+ ctrl_reg |= XUARTPS_CR_TXRST | XUARTPS_CR_RXRST;
+ xuartps_writel(ctrl_reg, XUARTPS_CR_OFFSET);
while (xuartps_readl(XUARTPS_CR_OFFSET) &
(XUARTPS_CR_TXRST | XUARTPS_CR_RXRST))
cpu_relax();
@@ -1256,10 +1253,9 @@ static int xuartps_resume(struct device *device)
xuartps_writel(rx_timeout, XUARTPS_RXTOUT_OFFSET);
/* Enable Tx/Rx */
ctrl_reg = xuartps_readl(XUARTPS_CR_OFFSET);
- xuartps_writel(
- (ctrl_reg & ~(XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS)) |
- (XUARTPS_CR_TX_EN | XUARTPS_CR_RX_EN),
- XUARTPS_CR_OFFSET);
+ ctrl_reg &= ~(XUARTPS_CR_TX_DIS | XUARTPS_CR_RX_DIS);
+ ctrl_reg |= XUARTPS_CR_TX_EN | XUARTPS_CR_RX_EN;
+ xuartps_writel(ctrl_reg, XUARTPS_CR_OFFSET);
spin_unlock_irqrestore(&port->lock, flags);
} else {
--
1.9.0.1.g4196000
next prev parent reply other threads:[~2014-03-07 19:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-07 19:13 [PATCH RFC v2 00/11] tty: xuartps: Rebranding Soren Brinkmann
2014-03-07 19:13 ` [PATCH RFC v2 01/11] tty: xuartps: Clean up Soren Brinkmann
2014-03-07 19:13 ` [PATCH RFC v2 02/11] tty: xuartps: Print warning in clock notifier Soren Brinkmann
2014-03-07 19:13 ` Soren Brinkmann [this message]
2014-03-07 19:13 ` [PATCH RFC v2 04/11] tty: xuartps: Remove bogus comment and register write Soren Brinkmann
2014-03-07 21:28 ` One Thousand Gnomes
2014-03-07 23:08 ` Sören Brinkmann
2014-03-08 21:57 ` One Thousand Gnomes
2014-03-07 19:13 ` [PATCH RFC v2 05/11] tty: xuartps: Rebrand driver as Cadence UART Soren Brinkmann
2014-03-07 19:13 ` [PATCH RFC v2 06/11] tty: xuartps: Change driver name to 'cdns-uart' Soren Brinkmann
2014-03-07 21:29 ` One Thousand Gnomes
2014-03-07 22:58 ` Sören Brinkmann
2014-03-07 19:13 ` [PATCH RFC v2 07/11] tty: xuartps: Replace function and symbol prefix Soren Brinkmann
2014-03-07 23:53 ` Sören Brinkmann
2014-03-07 19:13 ` [PATCH RFC v2 08/11] tty: xuartps: Rename Kconfig symbols Soren Brinkmann
2014-03-07 21:30 ` One Thousand Gnomes
2014-03-07 22:59 ` Sören Brinkmann
2014-03-07 19:13 ` [PATCH RFC v2 09/11] ARM: multi_v7_defconfig: Adopt to UART driver renaming Soren Brinkmann
2014-03-07 23:16 ` Sören Brinkmann
2014-03-07 19:13 ` [PATCH RFC v2 10/11] tty: cadence: Document DT binding Soren Brinkmann
2014-03-08 19:34 ` Rob Herring
2014-03-07 19:13 ` [PATCH RFC v2 11/11] ARM: zynq: DT: Migrate UART to Cadence binding Soren Brinkmann
2014-03-08 19:35 ` Rob Herring
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=1394219614-3197-4-git-send-email-soren.brinkmann@xilinx.com \
--to=soren.brinkmann@xilinx.com \
--cc=arnd@arndb.de \
--cc=gnomes@lxorguk.ukuu.org.uk \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=michal.simek@xilinx.com \
--cc=peter.crosthwaite@xilinx.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).