From patchwork Mon Apr 15 20:24:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162268 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3370970jan; Mon, 15 Apr 2019 13:28:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoB3HqYfLSJ7lvugAg3Y7dqolzM1YfSIGyM+EUSKCPo8o1TSxik4g+njJwrmVYWIaSZg3x X-Received: by 2002:a65:4689:: with SMTP id h9mr73666918pgr.295.1555360092262; Mon, 15 Apr 2019 13:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555360092; cv=none; d=google.com; s=arc-20160816; b=NbsZhoLYH4rXBH6ww8lFPeYzJ/jPHWJFSm6fpMq6q9TNJyzkaZSxaSY6mpfrUKCGvA wTFFtCCtB0iEscWQ4b1BpWSaY/I553si2DnVVjmQrQFe/40LpfNq00606XOihsnL4E5u QkwxY2KozMTpFrEOkRSYfG2lNHtUPiX325oh4L42Z63qRK/Xren7pu+eeRdkdieH1gJT Dx6bkjl6h8EP4zHlCNNm03G+kemS1+ku5Nu15NSfqqdw4PX0ltumGFnB0yasaJqdG3/Q aCIajQHwnWDQ2q6wph4v6P98QBIqNhsBXVJN4Ct8fGEFhNVoOSCQ7wOqAWmOixJKzr7Z t9eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=VlpKk+wltTauLPpHD0HRuf072EP9pkiRNmQy/8SgpX4=; b=HnZCvJg2O07domhMWT5SH0g23oC/XCRASqKrdMDz5GJj1C5o7HUYBwpxn7ILZq8wHv NPqAbqgbNOCjNZ3OVmKJ9/WWuw1kiCyrdTpPXs8PpteaKPhIOcMrThLsn/AHMU5KvaoN zsK6/oU2OpABhyo442ej2WjrRx/RLuSVnvLLV8N/PG5zaTZIDFYxWLCzjQaGiG7fn4MW dPSkEadBdmqeQ53r4RAVnNugKaS1Oc1pv0pcQDWDv2daxsbvHdzXGBI8A0W8bxjd3/ft v+BA1DKdHWfISz+6AMBJwQ75Ljb64wJ5ZnoM3E9V+anHExyO5JEAJ90SXyCgt2IsAxVP 5VnA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x6si45403916pga.310.2019.04.15.13.28.12; Mon, 15 Apr 2019 13:28:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-serial-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-serial-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727913AbfDOU2L (ORCPT + 1 other); Mon, 15 Apr 2019 16:28:11 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:49801 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726182AbfDOU2L (ORCPT ); Mon, 15 Apr 2019 16:28:11 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1N2lv2-1gqaYG3eI8-0133p3; Mon, 15 Apr 2019 22:28:00 +0200 From: Arnd Bergmann To: Greg Ungerer Cc: Linus Walleij , arm@kernel.org, Arnd Bergmann , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] ARM: ks8695, serial: skip manual tx IRQ ack Date: Mon, 15 Apr 2019 22:24:17 +0200 Message-Id: <20190415202501.941196-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190415202501.941196-1-arnd@arndb.de> References: <20190415202501.941196-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:fEwh5/IPHWOscGE54ScL7hGHn8WgdBcrjrH0vEu6XJJU5jU6x09 arQS3T+kqphfbWD9RyZq5xcWC84Df5vj/PtVzPPnjiSxR5RFTFivpoQJgGj5I7To3nszDES fje9eP5M3lRHm3MGKMIZUyuc3C4x5WPcQoc0AcAQfGQoQIq5h5Z4ByzsEqBxwhM62vwfLTt E5G2O2HjGZYXtHPGu41KQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:XEW0CJHj1Lw=:QOVt6hMFCo3Y1RyVLtmzuO r8RtNtuy7qnoXWN5A0UEl8mVlahrAxQnSDV7+3NifjLNIZUsvPmtU8IY2N2eQPfmWQoLBgjKx G+sCfNF7c0kDsUnmwvVluee0ScFzuXXQWXMhb6fGHe/7IVhDVoZo1SEPCv7w8xOTGfmVh+S6M VH8EHalWipmnbFmJfkOWS/OM+MeRogHYtXo7AcCZx6lOzHjG6OtYtQUNt48A8ksEJYAi4/4YR 8zs2tcDC+2bVI11tQpgNBGe8HoJeMUvZI6szzFs7KUBXy7KwDk09BH1g/Xgg8/lNsgk1ql9y2 AzZRCQ3H+UBIvE9T6QFUCLactN/7aBsN/Gmlvg5GXXpWfmiOtDh+GTFZUdNMP0JKl/S8xeeG+ Fu57+dYEJi1bhbku3O8qRg2V8wG59Fo2yYSx8ZLcEpNhbXqkAqto+Xej6zG54pUqvFIhQOsg/ UBZNrDSvtzowWaCEeFGlg2xRifCSrCL00mVudY++XHC4DsAFn6/Eq+04S+GCdz+MGkzN22qw+ ztybp5fu0vgotxjgoTOgECC/KYX1x6KAFtIFKZu2o5WevOyo6ByRxkjo84obT2lWY8WheMftB mVDTB+qsOCZSP2WDtWPvRNXAUdLEhZtB+cntllFg1dQQn+HxoP9ijpvTKzVAAgfuq7cyoA6Ef oXHyyWoGbXFp36Y6vfWkjkefOOQ9P/KbCTSjmL2V9LiGrY1y7k4F6KmBGZ/lMe/gnsl/9sGZn 8cSaMQEkDxQFLS51y30UyGraIplEtq6123J2eg== Sender: linux-serial-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org The TX interrupt is marked as edge triggered, so it will already be acked by the top-level irq code, and does not need the ack in the driver. Removing this avoids a nasty dependency on the regs-irq.h file that is otherwise reserved for the interrupt controller driver. Signed-off-by: Arnd Bergmann --- drivers/tty/serial/serial_ks8695.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.20.0 diff --git a/drivers/tty/serial/serial_ks8695.c b/drivers/tty/serial/serial_ks8695.c index b461d791188c..6c5e9900e69d 100644 --- a/drivers/tty/serial/serial_ks8695.c +++ b/drivers/tty/serial/serial_ks8695.c @@ -21,7 +21,6 @@ #include #include -#include #if defined(CONFIG_SERIAL_KS8695_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #define SUPPORT_SYSRQ @@ -52,8 +51,6 @@ #define UART_GET_BRDR(p) __raw_readl((p)->membase + KS8695_URBD) #define UART_PUT_BRDR(p, c) __raw_writel((c), (p)->membase + KS8695_URBD) -#define KS8695_CLR_TX_INT() __raw_writel(1 << KS8695_IRQ_UART_TX, KS8695_IRQ_VA + KS8695_INTST) - #define UART_DUMMY_LSR_RX 0x100 #define UART_PORT_SIZE (KS8695_USR - KS8695_URRB + 4) @@ -207,7 +204,6 @@ static irqreturn_t ks8695uart_tx_chars(int irq, void *dev_id) unsigned int count; if (port->x_char) { - KS8695_CLR_TX_INT(); UART_PUT_CHAR(port, port->x_char); port->icount.tx++; port->x_char = 0; @@ -221,7 +217,6 @@ static irqreturn_t ks8695uart_tx_chars(int irq, void *dev_id) count = 16; /* fifo size */ while (!uart_circ_empty(xmit) && (count-- > 0)) { - KS8695_CLR_TX_INT(); UART_PUT_CHAR(port, xmit->buf[xmit->tail]); xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);