From patchwork Wed Nov 4 00:20:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 7547711 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BDBDEBEEA4 for ; Wed, 4 Nov 2015 00:25:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EAA4120785 for ; Wed, 4 Nov 2015 00:25:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 07CB52061E for ; Wed, 4 Nov 2015 00:25:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtlrB-0002S5-Dd; Wed, 04 Nov 2015 00:23:17 +0000 Received: from mail-bl2on0062.outbound.protection.outlook.com ([65.55.169.62] helo=na01-bl2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtlpU-0001I5-G2 for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2015 00:21:36 +0000 Received: from BL2FFO11OLC016.protection.gbl (10.173.160.33) by BL2FFO11HUB038.protection.gbl (10.173.160.242) with Microsoft SMTP Server (TLS) id 15.1.318.9; Wed, 4 Nov 2015 00:21:10 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; linuxfoundation.org; dkim=none (message not signed) header.d=none;linuxfoundation.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by BL2FFO11OLC016.mail.protection.outlook.com (10.173.160.82) with Microsoft SMTP Server (TLS) id 15.1.318.9 via Frontend Transport; Wed, 4 Nov 2015 00:21:10 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1Ztlp7-0006Pl-NH; Tue, 03 Nov 2015 16:21:09 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1Ztlp7-0006aj-AV; Tue, 03 Nov 2015 16:21:09 -0800 Received: from [172.19.74.49] (helo=localhost) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1Ztlox-0006UG-Bl; Tue, 03 Nov 2015 16:20:59 -0800 From: Soren Brinkmann To: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH 1/9] tty: xuartps: Beautify read-modify writes Date: Tue, 3 Nov 2015 16:20:42 -0800 Message-ID: <1446596450-20918-2-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 2.6.2.3.ga463a5b In-Reply-To: <1446596450-20918-1-git-send-email-soren.brinkmann@xilinx.com> References: <1446596450-20918-1-git-send-email-soren.brinkmann@xilinx.com> X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.0.0.1202-21918.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC016; 1:BOzRGjrwvz/IlNhZD363faOAc0p2wNMAWJUE2KY/92Oqz52+4rNDh7ZTaqY1zSVv8PkSS1nKVhv/mmltXkAQVsv0PZ4rZEtqLZdZxjVzXG7H8JGuZhqtH//ZXpqoPCtqFNSaHD2XaBKVcwV+HBvd4TJnTV9tdRXQnElaCKJmsk6XHUWjBcIP1k4ZKaXnr86/8JC8ryPbCCofIwoZVPeNW6eTlxyS5SBW7cR+VaIDwaAC2Tv1FKh7pQJXinFH1D4C1jjoeS9HYwWsqvHKKwL384pM0u7hBoyorEntrwHjV4AlvWc0RvycrRMQjhjaphmY61cYPqRwO5mmwUuQrZHYA9w9MS108//VfDg4+5Rql7s= X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(76506005)(19580395003)(57986006)(92566002)(107886002)(50466002)(33646002)(48376002)(47776003)(63266004)(19580405001)(189998001)(2950100001)(76176999)(16796002)(50986999)(77096005)(50226001)(6806005)(575784001)(229853001)(5001960100002)(5003940100001)(5007970100001)(81156007)(87936001)(4001430100002)(11100500001)(36756003)(5008740100001)(36386004)(86362001)(106466001)(5001770100001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BL2FFO11HUB038; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB038; 2:i2dUqiVhZnOiSXLDF+A54+D5vwA5QInJf1NcR610v8F87sgIu9G52vpQAUA4Ej+ZgdFhHwWfJ6wwk163JRVEvjhSb/K9KaGx2n7bZYujPzJKyuV7l8Z5W3nAI4hfExTaGlJLpY1gDSo5r0+FwWu/3V6i1GHYr5l4qm1fNttO81M=; 3:ywieaYSYCF1UizVbw+iTCYK6xHINusrHuHNUGUA9kvEHt6jzFpuO/BtDFl3UaPj72xEhOJiQ8zJ+QXeIxYCZu5nMtEvM3xFbFA2JwULDANgQLUiFAocgxePWtnnPW0srhgAx08DsTSliUFvO30e48gHl6vfo3KLVqMCmmcp+Ngn6oXTTH3Fu4S/rIq3VTrghC9wGyBoW4XrdGrQiyfmdgxgXr9LrFZbPIHLmTBZBzuotNoTsbmGjDe1WyxGaQxzK7eLsVY7ZF5hpFO2nwfMklQ==; 25:jRxR9IsrSNOkOw8MLr8mwj7sfv26aQxfbVGm0KCUmtnDZ05F7jCsiNP5ivkrJjCVA/1x1xx4cfbhuT3sdB07O6IC+8Xh/RCrcHq1qOOgjk08C4DOzmYk36xuYO1X+f9bv00nCfQLhHccjOAORuo7nm4NhB2zhxE0oWuEj/CpvplGI4CFapNCMHacq9RHDyy4cxMkLMzZSU0eyyh5qPS1wv3ee1ASX3O8pxJdOIhXyn+gIGcJVv+rYT3u4mxExR4z X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501001); SRVR:BL2FFO11HUB038; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB038; 20:n1+WFff4RudvKm2giplqEhEcPzuYq/WkyPIDHa8Speu2exft5fgo2uj36opORU8PF5xqlAoCIqDflImXwxPunmI1WoyfILz60clHcH+VAGXXutjr7+wklnnOd/5QZY0a4em3sUYiyeJLjXc4HFKTQl6YwCGD3ivp++2Leq3Gk5t1eMneEREBtYkM4jHtZGANGCLqDWGP+eyTOUcjxsVXRNPkCuGbSfphO54+kkD+v7jgRPd11IIY23LwVqMejnlw1zV6s+dFQ96sFXhsK6jlqGAMyFqMO4pG/8uUya9dNxXt0qhobFXUqcIl7rwBmsgyUbG9IlXe5MhCNSkHDW0lNeeuv+9YR9MjDLd7IAHs1TJw1Gtp0RSG2Jg4ZhTzf8pCCyuY4lyCD6D1td+Hb2UohxT8G5oshb2xCttsDSauUwjSikD5jnL33dXU1IsZZHInHsTTZZV9PEy/pwbh5CRVtX103qpU0YnBwxR3ZtVF17AC1bHmd7HGpgFCDU0k/rAM; 4:KVD/cIlEK/V6lS3uafw6SRfVEzor+tTB9+3K4H8aCYzQU6Ayj2qUZuCC2hyPgcUQde0A6N0VrUDVpKPXTScGcehVISfIs4RPNcyxZmb1SbaXdLyTo2FwTOrDYlAscMKeeeRD8aEfPZHpt/FhM7iFAgkrbMSLDLmX62RAL+JuWqzDeGFt5qwmq/KguCNE30C8ZocYq/u7E9Vkr/80Sr4VW/jYDjxCmfh404BFc6bP21aCgp+IyNtBgVg4cPdCj1mnoij1LMJxTFhOcGUc38OBTxQVqykCr9I8K8MheG3A05Pf7R6h4AP5EQV0U1lFRn/Js2fJwFMQzATO6wIZmgXY3eQTdliGzl2tcTMCCqBOAg+XEOwJ8rcvwsm0g2J5h/Eq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001); SRVR:BL2FFO11HUB038; BCL:0; PCL:0; RULEID:; SRVR:BL2FFO11HUB038; X-Forefront-PRVS: 0750463DC9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2FFO11HUB038; 23:fUZu0P5lnpG/yzELY4IL4N237iY8cBQ+phSgrqdc?= =?us-ascii?Q?pY9NUhcVz9ArwASsK4SncVUG+j/UHpTZJhqOlTALs2D7hr9wlBg1ozBp/Pne?= =?us-ascii?Q?7GWT2POo9TCyWbMBGZi5xHBbh6wEgAjW21HE3org1Zl80lIGins8AUN2uTXh?= =?us-ascii?Q?prAbPMZRiGa2+c51U2Fi7OrSGW9ukmXEMQmzItsBZd7Eq9/Wt8muJ9vW/qub?= =?us-ascii?Q?NH9IVekwoZUqn/cOHIqJmMA8xhq2ZneMim9Q5DmMrW/6fYQsIU4pU3f+7/X5?= =?us-ascii?Q?Ew+8xheD/iCK7jj3eaUc8/1EwHsCtgz+qR6mduduUwa9ZmxROBCEriK5W3jK?= =?us-ascii?Q?a2Smvefh1gdS1zzJVJiTdM+ZZ8giGp6igl6uLaW6iH2ppggETwQcEjqybahz?= =?us-ascii?Q?eL7DSXvzcr3Kervp7LK3cJD13jBPILios1A4ZIIcOz/De7LhxO4611tENr9S?= =?us-ascii?Q?HrgKxpaHC77+lynfduZN4cCRQu8Psf1VsTk0ZYMTovue9aaAS1O56o0DTLxi?= =?us-ascii?Q?qf2gF3djWch2kRU1llrR+MPxdRmkyjdT9k05meio4n4tWQgcfuD3HyM8A2P2?= =?us-ascii?Q?rRNOmEcF/Ie4guawnOka5ceghngxrAK75mKhIF6JwrfriDgwWG9bf8qY8SO6?= =?us-ascii?Q?95v0H+nlbS9FeugLEV3rgC6LHbpdNQTPG2XB4yJ//kAo1kRzobFWVlm0kbeJ?= =?us-ascii?Q?jymq3Il1Hi/GLRyVgQeWbLyGJq7a6nLUZaFwq2EPlzSzSRNfQz7+jw1aSg13?= =?us-ascii?Q?7WKihWqUD+nq7wlvXJgp6yuZn8t57NzgFDYXejjc+dE1qEHsMF+j9RpR5zzI?= =?us-ascii?Q?pHoyeBYquvwRBISL1+Egq+UmbBaJUWexcm5hrI1K8SpMM0fjvZlIn1LOMcn9?= =?us-ascii?Q?3kjK+QbJDWw4+rD4oOBnBfPPbk3xM3keBkH944cu0JA8uV81chZCPqAQGjxA?= =?us-ascii?Q?uW9SFC6nhW2g487iDY48ZrO/zuupRvobboRNBF/Yf31lrRYCMwU3G0rSh5HB?= =?us-ascii?Q?SvMOlEg9mIyT+fONkycEHvCHNPn1KmCpbbL/eim6yiriSkShL82HkKMVGG5s?= =?us-ascii?Q?LhDE0lJPcVYW/p5KBaEQzsaUlCYqbwFBnWmz5fhZVn9bQid3rA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11HUB038; 5:y84dLlgIkC3/3a5Qh7uqEtu7FIUia1Lr97SCF0n2Izxs5GSJ/Ruw2HE45kGJ6CGJOHFp42iVJBSNN5W1DJGsdEbct/V9k+ZjaiYJLojR5uqOlPr2EDReZelcCWWjGOT80IKIRN5zapRXZEDB0K5kbA==; 24:fBO3/VsU4RviWk6842SMvLWlza62bNZonn2Rd/omjZQp2wfaYHICA50rW0qkUmf8vWOO0OD66fYzdP9ETS236+vc16ijXPearbA4xPO/ptI= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2015 00:21:10.8988 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2FFO11HUB038 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151103_162132_952463_1924A576 X-CRM114-Status: GOOD ( 12.35 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Soren Brinkmann , Michal Simek , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Non-functional, formatting changes to ease reading the code. Signed-off-by: Soren Brinkmann --- drivers/tty/serial/xilinx_uartps.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 009e0dbc12d2..50d4082d2354 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -515,12 +515,14 @@ static void cdns_uart_start_tx(struct uart_port *port) if (uart_circ_empty(&port->state->xmit) || uart_tx_stopped(port)) return; - status = readl(port->membase + CDNS_UART_CR_OFFSET); - /* Set the TX enable bit and clear the TX disable bit to enable the + /* + * Set the TX enable bit and clear the TX disable bit to enable the * transmitter. */ - writel((status & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN, - port->membase + CDNS_UART_CR_OFFSET); + status = readl(port->membase + CDNS_UART_CR_OFFSET); + status &= ~CDNS_UART_CR_TX_DIS; + status |= CDNS_UART_CR_TX_EN; + writel(status, port->membase + CDNS_UART_CR_OFFSET); while (numbytes-- && ((readl(port->membase + CDNS_UART_SR_OFFSET) & CDNS_UART_SR_TXFULL)) != CDNS_UART_SR_TXFULL) { @@ -1123,8 +1125,9 @@ static void cdns_uart_console_write(struct console *co, const char *s, * clear the TX disable bit to enable the transmitter. */ ctrl = readl(port->membase + CDNS_UART_CR_OFFSET); - writel((ctrl & ~CDNS_UART_CR_TX_DIS) | CDNS_UART_CR_TX_EN, - port->membase + CDNS_UART_CR_OFFSET); + ctrl &= ~CDNS_UART_CR_TX_DIS; + ctrl |= CDNS_UART_CR_TX_EN; + writel(ctrl, port->membase + CDNS_UART_CR_OFFSET); uart_console_write(port, s, count, cdns_uart_console_putchar); cdns_uart_console_wait_tx(port);