From patchwork Wed Dec 29 13:53:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Tu X-Patchwork-Id: 12700939 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD0D6C433EF for ; Wed, 29 Dec 2021 13:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=e9nagD4SiTQtWzngttb3MNOXnhxdMF5d6gasy/uGzDw=; b=heZ0ifzDykoNbL Z4P0Wr+YsIYaVnPkpsyhgmi6q2+gyKgEq9z+SHGWtMDs7A7W4yEzZGfGuHznk/lCIXTGCFxEE1gUy iwSAL/oGFK039ZxEM5VQlwIbSp2IFFhFV6qfK6gnDAY7o9zY5/chd5gzTghkBUdITG1IMrUccOkNY Y4UsK7ktcon6HdcE6TVv1ZBNFs7zm9MGA/DiPU+BhvVCqMbS7Ti5NXlZS4ClFnmz4gaYpOk1nPura S7TWktVwCPO2BIoFCCl4te9U5ybJiWtj+Pcb3lY7aV8S+kJbX3YyOoj5DAh9Svcm5Bx10OXJm84Is x9+I+gxX7fGCrJkyV1kQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n2ZR5-002rxT-8Z; Wed, 29 Dec 2021 13:56:11 +0000 Received: from mail-sh.amlogic.com ([58.32.228.43]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n2ZQU-002rXG-SG; Wed, 29 Dec 2021 13:55:36 +0000 Received: from droid06.amlogic.com (10.18.11.248) by mail-sh.amlogic.com (10.18.11.5) with Microsoft SMTP Server id 15.1.2176.14; Wed, 29 Dec 2021 21:55:30 +0800 From: Yu Tu To: , , , CC: Greg Kroah-Hartman , Jiri Slaby , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Yu Tu Subject: [PATCH V2 6/6] tty: serial: meson: Change request_irq to devm_request_irq and move devm_request_irq to meson_uart_probe() Date: Wed, 29 Dec 2021 21:53:50 +0800 Message-ID: <20211229135350.9659-7-yu.tu@amlogic.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211229135350.9659-1-yu.tu@amlogic.com> References: <20211229135350.9659-1-yu.tu@amlogic.com> MIME-Version: 1.0 X-Originating-IP: [10.18.11.248] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211229_055534_951670_FDB79338 X-CRM114-Status: GOOD ( 10.45 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Because an interrupt error occurs when the user opens /dev/ttyAML* but don't close it, and then opens the same port again. This problem is encountered in actual projects. Signed-off-by: Yu Tu --- drivers/tty/serial/meson_uart.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index c17109d6d441..41c2c607e70e 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -135,8 +135,6 @@ static void meson_uart_shutdown(struct uart_port *port) unsigned long flags; u32 val; - free_irq(port->irq, port); - spin_lock_irqsave(&port->lock, flags); val = readl(port->membase + AML_UART_CONTROL); @@ -284,7 +282,6 @@ static void meson_uart_reset(struct uart_port *port) static int meson_uart_startup(struct uart_port *port) { u32 val; - int ret; meson_uart_reset(port); @@ -298,10 +295,7 @@ static int meson_uart_startup(struct uart_port *port) val = (AML_UART_RECV_IRQ(1) | AML_UART_XMIT_IRQ(port->fifosize / 2)); writel(val, port->membase + AML_UART_MISC); - ret = request_irq(port->irq, meson_uart_interrupt, 0, - port->name, port); - - return ret; + return 0; } static void meson_uart_change_speed(struct uart_port *port, unsigned long baud) @@ -908,6 +902,14 @@ static int meson_uart_probe(struct platform_device *pdev) meson_ports[pdev->id] = port; platform_set_drvdata(pdev, port); + ret = devm_request_irq(&pdev->dev, port->irq, meson_uart_interrupt, + 0, dev_name(&pdev->dev), port); + if (ret) { + dev_err(&pdev->dev, "failed to request uart irq: %d\n", + ret); + return ret; + } + /* reset port before registering (and possibly registering console) */ meson_uart_reset(port);