From patchwork Wed Nov 16 14:49:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel L. Somlo" X-Patchwork-Id: 626035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9532C433FE for ; Wed, 16 Nov 2022 14:49:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233207AbiKPOt7 (ORCPT ); Wed, 16 Nov 2022 09:49:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233536AbiKPOth (ORCPT ); Wed, 16 Nov 2022 09:49:37 -0500 Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B16E4326F4; Wed, 16 Nov 2022 06:49:29 -0800 (PST) Received: by mail-qk1-x72a.google.com with SMTP id d8so8516381qki.13; Wed, 16 Nov 2022 06:49:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q079jILUgJW/NMjEmrvfvn4MUn8PyV68OVRL5iIezGU=; b=IS+KjccqnuPoIzcQEkomczag9QgHfGynGlUwJ2nIhaMz4Vdg/WgUqo3cc5tCAVoqr8 TpD7lEv4IQmTALgSSRiE+IPITTJ4yQ/c20a2EsgvjN6sTDDEmsRIHGAYhDFA8gTHPRnZ 8MN4B2iX7ah9wp9/FnPfN9dL0NLD0O0+hV64fkBPIpLltf2J3mdyKYqWWP5M39371em9 4MGauV5FkwJ711919tCxjA38fiPDve4XVxX97yhrGg3/oU/+hB49FLHHUUGPURIX12ZN UMnc8P1/uJZ5V+SOugeSfzJjQfzG6lo8LJdLhsXAB0EWKzrbdYYom1xS5FuGZS1Hqntv dXGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q079jILUgJW/NMjEmrvfvn4MUn8PyV68OVRL5iIezGU=; b=bpqWrzHgn9z6unctevWJJNZVeS0f+m1XZsMIKE60xq1Na++2Izp8Dc13s+cR7B9T/A 7GuORt0+lXv0cIE4jJ598L62qnUZKB0XIOI10ymxjpUtvYCQ2+vjGlF2Nm487NSFNvvn kiL65RjjYU3ax/IQNczv1MNYYDtsi037xiXdzQ6PxnSWDo2F33qjJGF3OMUoMUTswhFC gslkG6ov9sq/loiCwrJv7AdAXGmbNZRscLfCTtLDD6GPGAZhviEUgYUTZX0dgjQCv1WY 22Y90BtSbKC6dwoU6aPytZiLbDHr6RC7BMTQi8syo/jSPkn9Ai6hdtSwOrT9bdsvYtiV fYcw== X-Gm-Message-State: ANoB5plBROUM9OdpuTZvk9JDPLVPV6GOBMRacys6R3vaU3HLxLj1XF4J KeGwpfnQbYkb9y5bLo20W0N1b1CSR/8LXg== X-Google-Smtp-Source: AA0mqf6qSMQiNTTQ7t8aZNss59ZlfbH7b1WPHGr7w43cpwRaAHxUBQgbWcphe+TqOBH35/UCSX9Gjw== X-Received: by 2002:ae9:f718:0:b0:6f9:7535:dedd with SMTP id s24-20020ae9f718000000b006f97535deddmr15549922qkg.635.1668610168518; Wed, 16 Nov 2022 06:49:28 -0800 (PST) Received: from glsvmlin.ini.cmu.edu (GLSVMLIN.INI.CMU.EDU. [128.2.16.9]) by smtp.gmail.com with ESMTPSA id g5-20020ac84805000000b0039a55f78792sm8729624qtq.89.2022.11.16.06.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 06:49:28 -0800 (PST) From: Gabriel Somlo To: linux-kernel@vger.kernel.org Cc: linux-serial@vger.kernel.org, gregkh@linuxfoundation.org, jirislaby@kernel.org, kgugala@antmicro.com, mholenko@antmicro.com, joel@jms.id.au, david.abdurachmanov@gmail.com, florent@enjoy-digital.fr, geert@linux-m68k.org, ilpo.jarvinen@linux.intel.com Subject: [PATCH v4 12/14] serial: liteuart: add IRQ support for the RX path Date: Wed, 16 Nov 2022 09:49:06 -0500 Message-Id: <20221116144908.234154-13-gsomlo@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116144908.234154-1-gsomlo@gmail.com> References: <20221116144908.234154-1-gsomlo@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Add support for IRQ-driven RX. Support for the TX path will be added in a separate commit. Signed-off-by: Gabriel Somlo --- Changes from v3: - add shadow irq register to support polling mode and avoid reading hardware mmio irq register to learn which irq flags are enabled - this also simplifies both liteuart_interrupt() and liteuart_startup() drivers/tty/serial/liteuart.c | 76 +++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c index 8a6e176be08e..fad778578986 100644 --- a/drivers/tty/serial/liteuart.c +++ b/drivers/tty/serial/liteuart.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -46,6 +47,7 @@ struct liteuart_port { struct uart_port port; struct timer_list timer; u32 id; + u8 irq_reg; }; #define to_liteuart_port(port) container_of(port, struct liteuart_port, port) @@ -76,6 +78,19 @@ static void liteuart_putchar(struct uart_port *port, unsigned char ch) litex_write8(port->membase + OFF_RXTX, ch); } +static void liteuart_update_irq_reg(struct uart_port *port, bool set, u8 mask) +{ + struct liteuart_port *uart = to_liteuart_port(port); + + if (set) + uart->irq_reg |= mask; + else + uart->irq_reg &= ~mask; + + if (port->irq) + litex_write8(port->membase + OFF_EV_ENABLE, uart->irq_reg); +} + static void liteuart_stop_tx(struct uart_port *port) { } @@ -129,13 +144,27 @@ static void liteuart_rx_chars(struct uart_port *port) tty_flip_buffer_push(&port->state->port); } +static irqreturn_t liteuart_interrupt(int irq, void *data) +{ + struct liteuart_port *uart = data; + struct uart_port *port = &uart->port; + u8 isr; + + spin_lock(&port->lock); + isr = litex_read8(port->membase + OFF_EV_PENDING) & uart->irq_reg; + if (isr & EV_RX) + liteuart_rx_chars(port); + spin_unlock(&port->lock); + + return IRQ_RETVAL(isr); +} + static void liteuart_timer(struct timer_list *t) { struct liteuart_port *uart = from_timer(uart, t, timer); struct uart_port *port = &uart->port; - liteuart_rx_chars(port); - + liteuart_interrupt(0, port); mod_timer(&uart->timer, jiffies + uart_poll_timeout(port)); } @@ -161,19 +190,45 @@ static unsigned int liteuart_get_mctrl(struct uart_port *port) static int liteuart_startup(struct uart_port *port) { struct liteuart_port *uart = to_liteuart_port(port); + unsigned long flags; + int ret; - /* disable events */ - litex_write8(port->membase + OFF_EV_ENABLE, 0); + if (port->irq) { + ret = request_irq(port->irq, liteuart_interrupt, 0, + KBUILD_MODNAME, uart); + if (ret) { + pr_err(pr_fmt("line %d irq %d failed: using polling\n"), + port->line, port->irq); + port->irq = 0; + } + } - /* prepare timer for polling */ - timer_setup(&uart->timer, liteuart_timer, 0); - mod_timer(&uart->timer, jiffies + uart_poll_timeout(port)); + spin_lock_irqsave(&port->lock, flags); + /* only enabling rx irqs during startup */ + liteuart_update_irq_reg(port, true, EV_RX); + spin_unlock_irqrestore(&port->lock, flags); + + if (!port->irq) { + timer_setup(&uart->timer, liteuart_timer, 0); + mod_timer(&uart->timer, jiffies + uart_poll_timeout(port)); + } return 0; } static void liteuart_shutdown(struct uart_port *port) { + struct liteuart_port *uart = to_liteuart_port(port); + unsigned long flags; + + spin_lock_irqsave(&port->lock, flags); + liteuart_update_irq_reg(port, false, EV_RX | EV_TX); + spin_unlock_irqrestore(&port->lock, flags); + + if (port->irq) + free_irq(port->irq, port); + else + del_timer_sync(&uart->timer); } static void liteuart_set_termios(struct uart_port *port, struct ktermios *new, @@ -262,6 +317,13 @@ static int liteuart_probe(struct platform_device *pdev) goto err_erase_id; } + /* get irq */ + ret = platform_get_irq_optional(pdev, 0); + if (ret < 0 && ret != -ENXIO) + return ret; + if (ret > 0) + port->irq = ret; + /* values not from device tree */ port->dev = &pdev->dev; port->iotype = UPIO_MEM;