From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8E0F3F23BD for ; Tue, 9 Jun 2026 22:37:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781044662; cv=none; b=khIT3Ww9MzaSXPFWdvj0dPAq3rWgJnLTn/bWrUm/GEPGwqyT+wP1MSTuCiRLrTpTQpRGu8JG4rfNldCO4OFgw4PbQB7sTMYIX8OZX+iKIcNaiYMSKj+otzIgFjkb9IRPzvo3G2xniqXEtY2YWEFHOEAoZ/br7Y+lGUq+iBYlzJ4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781044662; c=relaxed/simple; bh=KHFBKElH1lggN2sZB5oI+hYuA6tBhm4+ZNyZCHF4qaU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AzJOgcRNx/w0Zha55p/7asNb6HigvP3hfHs68kjWWhjSJgqDxkh8zG9HR9dy25hwzh7vGdBHriC+JlJBLDvValENDCheGEVe535YU3/SYFcQyHt/9zKTMoTxlPAM1saU5jKIOTgoF9aVSBP802g7eGsambXXCp3n4hTEKMXmWNQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KhdN96B1; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KhdN96B1" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2bf114b0cf9so55465815ad.2 for ; Tue, 09 Jun 2026 15:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781044660; x=1781649460; darn=vger.kernel.org; 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=Enn6naQw+wLmV0GhfZ0seolUzIj1ObU+9VW8J0DyP44=; b=KhdN96B1CGua831QXzIeO2A0g1nlAW+tIW2NLpZWXsztnyfHyBoetK696neiFXFP3Y xGHNSIX+/3NOD7kZ4OPMMOStlZmrjozZuEo5NpYhM160oCJDTtGf0A8R7QRIfmSLd34U 6h9a2EWHB3I3XqDLwWWV0G8Lte0x8YAPcGrbzocKi9CbtpaUqPK5vOZ3pokc9rgfVhJQ r2IHMZ5O2Vfruj3RtX7TvrARN+z7v5JaElObRqccwQk1iHueXv01Xeofz283MxuGsmS4 Y1hM0VpBy0szldn/wbWUUzuqaAPILY5CC4gW28Nehkq/ZkpvEDR3uzXt6gq/EMUorog5 7YZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781044660; x=1781649460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Enn6naQw+wLmV0GhfZ0seolUzIj1ObU+9VW8J0DyP44=; b=P5DzR3YeEwuG8M4U2EBTeMcoEDwQnxUx5VhpVFu4PzpHuW1YpfR1kQfhypkfHs3tVQ x+swnQcHjgud9jTczIP7asDLOsXQBp066aGg/GpYvDcqV6+fivNd03A9wLDMvqXADb4O MDiZqjKCsYHyaTct/m5Catnvg+GKMYzO9HgQMQ3VzROK1yqqRCwXIKxnIwZc6LeKcZ7C fLa+kk6ilkjPGxJhV2Xh4ilD4u52JKmCTTYI8Pcv3ymzo6BiovdA9aD9HV59Jo1A4dGN 4f++Enb19hl7JJzK/9P2kXqTU9VwkH0V/N+mapjLCfMV6/SfF9oUlIIYiSNgd1lM5gxO iBxw== X-Forwarded-Encrypted: i=1; AFNElJ8+alrw5tckV0BCGjogXaG+Lpv6x0CbwbIVhoK4020z5zB8o6oBpJkAOupeXR7NForDyr8Nobks94vELyU=@vger.kernel.org X-Gm-Message-State: AOJu0YwKXroo4YF64XK2Zd32jdnUWd1ekmzPAsqj0RCL614ji5pdnrGZ ZPGM5KDUaOZVERlPLesl4uG/LISyAqcezr6EGpEl95To1sjlxoN6dp0CuXdEbJT+ X-Gm-Gg: Acq92OH/uFuhIGtLJJHgVP2aU6FL3jMel7bcy0RjqAoh8yVs+IAwUSIU/PoXg/nyswk I/BGbBH0OGpiYtX5nxJ+xLj+4F17HiIel9bf/8iq7Z77HdZeXI9TfVKAClc67JtEpppSCs/JxGu J0RGuAr2Gb+a827GM1r+/U1eLuHn+NJL5P+fSZMyVwsD+GMB8NmJc7jT/3qe9RVU9WnQYyZVX89 r7GA5lkgLr8vERbZwyiz57DhKUAmfjJmtGBE5IogLldnsh3PG3SiXZ2ctPYR4W3XF0eHdsGyQRV eucNAtADbGek2j3PKt25RGkwZ/DD3XkFn8sNR95G3o5aqb5SXdACwwDNS7KQkFuLOplRHz97OE0 HkBz8UsQIfGUDjlcvV554OmeACmeEkCe0FvJpTr02Ns9SYc/6rED8jxw1v/b9syV/wZvctcRT4X NmVwnli4KvLayAxwq9xvi3UQak4Y5o2eLxr1AuC0ZJvQlOLO6Gr5zT9heDmKpHjUdgWxbNrTDLd 8JetB60V/cRraRnlRbosgQdFDTrKVoswza9vfMXFz0KyQ== X-Received: by 2002:a17:903:1aef:b0:2c2:7e17:39f6 with SMTP id d9443c01a7336-2c27e173ecfmr119389525ad.36.1781044659986; Tue, 09 Jun 2026 15:37:39 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f6d37esm293750655ad.9.2026.06.09.15.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 15:37:39 -0700 (PDT) From: Rosen Penev To: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , linux-kernel@vger.kernel.org (open list:TTY LAYER AND SERIAL DRIVERS), imx@lists.linux.dev (open list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCHv2 4/4] serial: mxs-auart: fix IRQ registration ordering and manage console clock Date: Tue, 9 Jun 2026 15:37:17 -0700 Message-ID: <20260609223717.41670-5-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260609223717.41670-1-rosenp@gmail.com> References: <20260609223717.41670-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move the main UART IRQ registration after uart_add_one_port so that s->port.state and s->port.lock are initialized before the interrupt handler can run. Mask all UART interrupts before adding the port to prevent spurious IRQs left by the bootloader. After probe succeeds, disable the module clock for non-console ports since startup will re-enable it on port open. For console ports, keep the clock prepared so auart_console_write() can safely call clk_enable() from atomic context. Guard the IRQ handler and get_mctrl with clk_enable/clk_disable since GPIO IRQs and serial-core status queries can fire while the clock is disabled for non-console ports. In remove, disable the clock for console ports to balance the enable done in probe, preventing a clock leak on unbind. Assisted-by: opencode:big-pickle --- drivers/tty/serial/mxs-auart.c | 49 +++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 4499e3206e85..e2b656638ab3 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -738,9 +738,13 @@ static u32 mxs_auart_modem_status(struct mxs_auart_port *s, u32 mctrl) static u32 mxs_auart_get_mctrl(struct uart_port *u) { struct mxs_auart_port *s = to_auart_port(u); - u32 stat = mxs_read(s, REG_STAT); + u32 stat; u32 mctrl = 0; + clk_enable(s->clk); + stat = mxs_read(s, REG_STAT); + clk_disable(s->clk); + if (stat & AUART_STAT_CTS) mctrl |= TIOCM_CTS; @@ -1079,6 +1083,7 @@ static irqreturn_t mxs_auart_irq_handle(int irq, void *context) struct mxs_auart_port *s = context; u32 mctrl_temp = s->mctrl_prev; + clk_enable(s->clk); uart_port_lock(&s->port); stat = mxs_read(s, REG_STAT); @@ -1118,6 +1123,7 @@ static irqreturn_t mxs_auart_irq_handle(int irq, void *context) } uart_port_unlock(&s->port); + clk_disable(s->clk); return IRQ_HANDLED; } @@ -1603,10 +1609,6 @@ static int mxs_auart_probe(struct platform_device *pdev) } s->port.irq = irq; - ret = devm_request_irq(&pdev->dev, irq, mxs_auart_irq_handle, 0, - dev_name(&pdev->dev), s); - if (ret) - goto out_disable_clk; platform_set_drvdata(pdev, s); @@ -1627,9 +1629,28 @@ static int mxs_auart_probe(struct platform_device *pdev) mxs_auart_reset_deassert(s); + /* Mask all UART interrupts to prevent spurious IRQs from bootloader */ + mxs_write(0, s, REG_INTR); + ret = uart_add_one_port(&auart_driver, &s->port); - if (ret) - goto out_free_qpio_irq; + if (ret) { + auart_port[s->port.line] = NULL; + goto out_disable_clk; + } + + /* + * Request the main IRQ after uart_add_one_port so that + * s->port.state and s->port.lock are initialized before + * the handler can run in response to a bootloader-left + * interrupt. + */ + ret = devm_request_irq(&pdev->dev, irq, mxs_auart_irq_handle, 0, + dev_name(&pdev->dev), s); + if (ret) { + uart_remove_one_port(&auart_driver, &s->port); + auart_port[s->port.line] = NULL; + goto out_disable_clk; + } /* ASM9260 don't have version reg */ if (is_asm9260_auart(s)) { @@ -1641,10 +1662,16 @@ static int mxs_auart_probe(struct platform_device *pdev) (version >> 16) & 0xff, version & 0xffff); } - return 0; + /* + * Disable clock -- startup will re-enable when the port is opened. + * For the console port the clock must stay prepared so that + * auart_console_write() can safely call clk_enable() from + * atomic context. + */ + if (!uart_console(&s->port)) + clk_disable_unprepare(s->clk); -out_free_qpio_irq: - auart_port[s->port.line] = NULL; + return 0; out_disable_clk: clk_disable_unprepare(s->clk); @@ -1657,6 +1684,8 @@ static void mxs_auart_remove(struct platform_device *pdev) uart_remove_one_port(&auart_driver, &s->port); auart_port[s->port.line] = NULL; + if (uart_console(&s->port)) + clk_disable_unprepare(s->clk); } static struct platform_driver mxs_auart_driver = { -- 2.54.0