From patchwork Thu Nov 10 11:38:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sherry Sun X-Patchwork-Id: 624183 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 C7772C4332F for ; Thu, 10 Nov 2022 12:09:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230087AbiKJMJ4 (ORCPT ); Thu, 10 Nov 2022 07:09:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230034AbiKJMJy (ORCPT ); Thu, 10 Nov 2022 07:09:54 -0500 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2072.outbound.protection.outlook.com [40.107.247.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38F105F57; Thu, 10 Nov 2022 04:09:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j0G75KE3ecpyYCfxvxeMa93D9criOC4I0EUbyuyeXPMb6lZw7D5L/pVgzRxDYsOR9oBR1kHJGWfEcqlBkRQC2xuE/OYPuhJLENam+i2OVfK32r1W2AQwjPiQ6TmphcvLSjeDo1S/7KPANHM4GVF5RCP23RTqqwCFToGqJY427tgfGb0nBAyXthj+TQy2EnM7vBMju1a4dA9P+bKJhU0eH/S5Icg29asC16/GqOLracrwWhVHagK2wv4LuYId+mM0+rme1SXSYYNcbMujnEHFNiWrHNxSiZyGdp4er02UdPRPGrTiJAs/PUJPQxsYDuiQuKW0bgsaJ3qXlDEXlf3IiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jIpt47kPPYoxgkCj5/ylsWolAtZd0zZBIjJDtcvg/x8=; b=aq9fPXpxjrOr9fnsm7Lauwg3J2mX4zii18BMhmNwUuvcH6nRkP7ycytmHcQgWiEDGILmz5DZFA1b8dTKBqHsJJTi375dn75zi5TXYkcFIzBmDB64HPb2KEytcn6V51rzzog2bzB3caFCpTo7oy++8nGCx2+xNPpWOcDg30kL3BLHXjw/v8mBrl//Wg3+39UxhwDeFxYcoS/HeBkk9v8W1yE1wBmDlkIXE8o6ypJhx5XVFMfhEq5AcSCLNTlz7WNSunSVnpW9a43UV/u0bIAjvTP57RwoxPBywlZvpK81yVXq2/av8WTm/MLPvniNpuO+xO3cvHBcB7Ox2JXwHni0Dg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jIpt47kPPYoxgkCj5/ylsWolAtZd0zZBIjJDtcvg/x8=; b=NDBHTvY053D26bQ3P3yCnQrA/FAqfu7T5+cBUEwTk54w+uE/sutkOP+uwYWI8pijAPZVnkbJiMHYNCDUYXs62KZS92nke8P/9Hatvu8JJeGP7EvdyA7Xei4ondFWzQiM8ba+cmy0Y2YQBFUIY+2dYTiJiX1LbhkUad4qsCRkSMI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8404.eurprd04.prod.outlook.com (2603:10a6:20b:3f8::7) by DB8PR04MB7097.eurprd04.prod.outlook.com (2603:10a6:10:12a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Thu, 10 Nov 2022 12:09:49 +0000 Received: from AS8PR04MB8404.eurprd04.prod.outlook.com ([fe80::71f1:f7bb:5039:e55d]) by AS8PR04MB8404.eurprd04.prod.outlook.com ([fe80::71f1:f7bb:5039:e55d%3]) with mapi id 15.20.5791.027; Thu, 10 Nov 2022 12:09:49 +0000 From: Sherry Sun To: gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com Subject: [PATCH V2 1/3] tty: serial: fsl_lpuart: enable wakeup source for lpuart Date: Thu, 10 Nov 2022 19:38:57 +0800 Message-Id: <20221110113859.8485-2-sherry.sun@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221110113859.8485-1-sherry.sun@nxp.com> References: <20221110113859.8485-1-sherry.sun@nxp.com> X-ClientProxiedBy: SG3P274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::28) To AS8PR04MB8404.eurprd04.prod.outlook.com (2603:10a6:20b:3f8::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8404:EE_|DB8PR04MB7097:EE_ X-MS-Office365-Filtering-Correlation-Id: dfc4ec52-c21b-4d89-e556-08dac314773a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AkM5/eceH4un1BOQAV12da/kOwodPJsUUuUxhfcY5sy04ydF+9osa6ORSbB2nawdabIjCBfOv/hjbtcD6MVfW8yJ/00mpGnikuxCvWxdusM6TqMveTSF5b6JvP8MxD+e6JmqadgueLcFlDIeb0WeROgW5mpmRRu1JQrugT5PFcwAi2VNLrDb/9VoJoCn2MAtqsDjhEaVBAZvjilAIAXRoMwtq8lJ42DembttyHch2G/vSnqeula1tcLG9+YwJxHwk0AUT/JEqD4UlPvcRxnyXgh/+0EDqItf9Ma2brxeKqhZjRcpHalhOW2D6O2yn7mMaiF45EUCr5LfaGmNtAwPiYiUpNUTROk2fxeXfkorPjKIi6TfT3lcZ4CDKKbHOJA1bMQIVt5kHiQV+dwO3iBY9EHeC4AeY5/FuaEdMA/t+eRVkvw0PAshoDbyNa1Gv2YzGCNebzvCRQmugvxMxX3ep4GV+6VlwpWeF2dwj1cMJSxYXaSyWLVlVUImQx9FlwrjPeCdYhMHyYIQtki9kkjxeVRRTJHWtk2MjDEYSeITM+hodpwXRWXQY6L9bbtSLwHePRxZ3vrYjGzH9suJubIOigRVVRdBmK8D+yXQvKxNa3V5t+FX4HFMqlkQ26BxvFddT/B0z4fElJW0BjgCIwqBggSzMwqdBkvO5CeTyHI6UsF5spv/Zl2XCsi+X+pxDrVknxe/NnpqIrYuZh7U+eE7QUJHpZvXuB/bjNDRx0jY0YNW2KS6+cosn7UfqaEMnVSd82+zUyaNMk3tTXUvEfk6y4aZJhHO5/1GO1truI+3ABc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8404.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(136003)(366004)(346002)(376002)(39860400002)(396003)(451199015)(38100700002)(38350700002)(6486002)(478600001)(6666004)(8936002)(2616005)(316002)(52116002)(6506007)(66476007)(6512007)(41300700001)(66556008)(66946007)(86362001)(36756003)(26005)(30864003)(83380400001)(44832011)(8676002)(4326008)(186003)(1076003)(2906002)(5660300002)(309714004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B6R/kCmzjMbIvkm+z/D4vUfJfa/Wzogr44U+gxmqK2i4DrSQ+ALgdhThI44Dp6t+ZtRE7xQZXib4FW746jmORwqT94/IaDrdiiPIFi53LW3Yp8gtO0v5tKijygRHtuqAOGRILdCpH0Ev5txZfittFQzEAv+1yo86fzChzOJ7/CjpJg6LNbRjj1JMwkp4CL1JTIyUveev0oAZ+slA847ndCK9DeuzjjdjomJBX+dZE2vAFlPsLtEKeGzBwYFhvenVg79+RwmOLoyAXWakly0/pv+8RoXyGXinW0sujU2QuEHLDi0r7oLJ8rMed+rsNc28iJ+6u7prHSVAKkULIZddvUorkkvgFFpZeREC673QFrFq29H7VxcgmbYyAdNWKT30ALdw+5CvoG9P83Ou0sSId3M92omqmh+JaUi1R9MjUP1esi0Eto4ORWhjKf760DeBC3aXUIYtPnJnch0F6MiFag5bfV3a5RBpoyYL8gNHyhgPywWmb6WOJI7QuejhbYT1vUCdYpBnq+vdWYKcvapnI49cMgHg3NC9Gj+kEKzhQxFTlYO1i8850CFzpoHAmfMfbvrDaIJTaXIR9xpZ1P3aegcAVfHVZENBHwcJEbrt7uxru/6uRf1hdo+aeegCI/SkTnLbc1XlYAGWPCseuNN1/QPYq8yOA6zB0UUSaDpuhaqqf188aPIWRQYhzDkgnXO/22nXglgG6iRZAyW2FVx+I3uKzDZBDVX/CyAPP5CKElEnyQln39GVG84N8rk/6ZBZTh+Lff441ochIpGMBYc0fN8lLY4Qzt7umO7N8aiYxomhYLhWtmQiqYrh2M47P+j40EjZ0PSVKhuvUZvm5sIWzkO8RFwnccsUkYVt7FaZBNntaMoEcbnWLYaeyODJD53DNgAn/TAqDgbG+EGlG5O5FSG7vWxAeJPST9sPSeObdOmNb//uChHsI12ivEZHR4smxfkwMCgKs31O96vz4VCU7ShqqM1KOZgnHJWP469vQGt+xjNuNPRhKSrX4BBfvM91pX4hD6byeno1swfDLSYfYCM/8JH04Af2q3e24sEtV6f03aen2Q/de5ESI+5qPb2YXnmuwR/4vkC5UjenPWdUgMeEU3nAhF4sxAHA09fAxj1sZMpNqx5d+SlgENvFiV4RgWJZxolHSyxSrmLmhroDVKLECk9IaOd7rQE6rmpoj8lOinXy3Ae99O4efPaWP9zryTTCNiFYUhnI0nUHKb+sxfLdvRWT7pOPBNG6RcGZe/rrrPzm8gVhoOxp6KoiSVRxZXaMRCkXb4dy2+HyeLSAQWn6149qTEt48XChshToUKBgQ1HMmoYTdBzJCwXU0hOaWddNa2nKodVbsDdCs1h9qbMWzdmSh7fMlhi+zAb/c3zdHJs7CjzzOBP49zI6EK3JQRmzbycOVZQxCdyOhyWaJheUUOd0oYMewG47geenvG4s/KNXTr7xyo/zvOXpkcutsyQQD6gQFlQbUlTaM3rseKPoupNZD5wn7QeIfcr9BEIdEqg372dKPazAQT2HhbLdPDOsUf7YA9xnDxpFuSpmE/18644xQ5Y9+97csOwzEKaPNS3MabmjFbAFRATJePfN X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfc4ec52-c21b-4d89-e556-08dac314773a X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2022 12:09:49.5813 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: q5LSEdUV81HZAqZOoBaH8yhQsF7Eh6NALB+MCP8ZpBDGpqrCuTR145UHLlshInaaxmzxh2R0druLG4e9vm51uQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7097 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org LPUART supports both synchronous wakeup and asynchronous wakeup(wakeup the system when the UART clocks are shut-off), the synchronous wakeup is configured by UARTCTRL_RIE interrupt, and the asynchronous wakeup is configured by UARTBAUD_RXEDGIE interrupt. Add lpuart_uport_is_active() to determine if the uart port needs to get into the suspend states, also add lpuart_suspend_noirq() and lpuart_resume_noirq() to enable and disable the wakeup irq bits if the uart port needs to be set as wakeup source. When use lpuart with DMA mode, it still needs to switch to the cpu mode in .suspend() that enable cpu interrupts RIE and RXEDGIE as wakeup source, after system resume back, needs to setup DMA again, .resume() will share the HW setup code with .startup(), so abstract the same code to the api like lpuart32_hw_setup(). Signed-off-by: Sherry Sun --- No change in V2. --- drivers/tty/serial/fsl_lpuart.c | 281 +++++++++++++++++++++++--------- 1 file changed, 200 insertions(+), 81 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index ebbc0539c56e..2654d86f52a4 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -1628,10 +1629,23 @@ static void lpuart_rx_dma_startup(struct lpuart_port *sport) sport->lpuart_dma_rx_use = false; } +static void lpuart_hw_setup(struct lpuart_port *sport) +{ + unsigned long flags; + + spin_lock_irqsave(&sport->port.lock, flags); + + lpuart_setup_watermark_enable(sport); + + lpuart_rx_dma_startup(sport); + lpuart_tx_dma_startup(sport); + + spin_unlock_irqrestore(&sport->port.lock, flags); +} + static int lpuart_startup(struct uart_port *port) { struct lpuart_port *sport = container_of(port, struct lpuart_port, port); - unsigned long flags; unsigned char temp; /* determine FIFO size and enable FIFO mode */ @@ -1645,15 +1659,7 @@ static int lpuart_startup(struct uart_port *port) UARTPFIFO_FIFOSIZE_MASK); lpuart_request_dma(sport); - - spin_lock_irqsave(&sport->port.lock, flags); - - lpuart_setup_watermark_enable(sport); - - lpuart_rx_dma_startup(sport); - lpuart_tx_dma_startup(sport); - - spin_unlock_irqrestore(&sport->port.lock, flags); + lpuart_hw_setup(sport); return 0; } @@ -1676,10 +1682,25 @@ static void lpuart32_configure(struct lpuart_port *sport) lpuart32_write(&sport->port, temp, UARTCTRL); } +static void lpuart32_hw_setup(struct lpuart_port *sport) +{ + unsigned long flags; + + spin_lock_irqsave(&sport->port.lock, flags); + + lpuart32_setup_watermark_enable(sport); + + lpuart_rx_dma_startup(sport); + lpuart_tx_dma_startup(sport); + + lpuart32_configure(sport); + + spin_unlock_irqrestore(&sport->port.lock, flags); +} + static int lpuart32_startup(struct uart_port *port) { struct lpuart_port *sport = container_of(port, struct lpuart_port, port); - unsigned long flags; unsigned long temp; /* determine FIFO size */ @@ -1704,17 +1725,8 @@ static int lpuart32_startup(struct uart_port *port) } lpuart_request_dma(sport); + lpuart32_hw_setup(sport); - spin_lock_irqsave(&sport->port.lock, flags); - - lpuart32_setup_watermark_enable(sport); - - lpuart_rx_dma_startup(sport); - lpuart_tx_dma_startup(sport); - - lpuart32_configure(sport); - - spin_unlock_irqrestore(&sport->port.lock, flags); return 0; } @@ -2778,97 +2790,204 @@ static int lpuart_remove(struct platform_device *pdev) return 0; } -static int __maybe_unused lpuart_suspend(struct device *dev) +static void serial_lpuart_enable_wakeup(struct lpuart_port *sport, bool on) { - struct lpuart_port *sport = dev_get_drvdata(dev); - unsigned long temp; - bool irq_wake; + unsigned int val, baud; if (lpuart_is_32(sport)) { - /* disable Rx/Tx and interrupts */ - temp = lpuart32_read(&sport->port, UARTCTRL); - temp &= ~(UARTCTRL_TE | UARTCTRL_TIE | UARTCTRL_TCIE); - lpuart32_write(&sport->port, temp, UARTCTRL); + val = lpuart32_read(&sport->port, UARTCTRL); + baud = lpuart32_read(&sport->port, UARTBAUD); + if (on) { + /* set rx_watermark to 0 in wakeup source mode */ + lpuart32_write(&sport->port, 0, UARTWATER); + val |= UARTCTRL_RIE; + /* clear RXEDGIF flag before enable RXEDGIE interrupt */ + lpuart32_write(&sport->port, UARTSTAT_RXEDGIF, UARTSTAT); + baud |= UARTBAUD_RXEDGIE; + } else { + val &= ~UARTCTRL_RIE; + baud &= ~UARTBAUD_RXEDGIE; + } + lpuart32_write(&sport->port, val, UARTCTRL); + lpuart32_write(&sport->port, baud, UARTBAUD); } else { - /* disable Rx/Tx and interrupts */ - temp = readb(sport->port.membase + UARTCR2); - temp &= ~(UARTCR2_TE | UARTCR2_TIE | UARTCR2_TCIE); - writeb(temp, sport->port.membase + UARTCR2); + val = readb(sport->port.membase + UARTCR2); + if (on) + val |= UARTCR2_RIE; + else + val &= ~UARTCR2_RIE; + writeb(val, sport->port.membase + UARTCR2); } +} - uart_suspend_port(&lpuart_reg, &sport->port); +static bool lpuart_uport_is_active(struct lpuart_port *sport) +{ + struct tty_port *port = &sport->port.state->port; + struct tty_struct *tty; + struct device *tty_dev; + int may_wake = 0; - /* uart_suspend_port() might set wakeup flag */ - irq_wake = irqd_is_wakeup_set(irq_get_irq_data(sport->port.irq)); + tty = tty_port_tty_get(port); + if (tty) { + tty_dev = tty->dev; + may_wake = device_may_wakeup(tty_dev); + tty_kref_put(tty); + } - if (sport->lpuart_dma_rx_use) { - /* - * EDMA driver during suspend will forcefully release any - * non-idle DMA channels. If port wakeup is enabled or if port - * is console port or 'no_console_suspend' is set the Rx DMA - * cannot resume as expected, hence gracefully release the - * Rx DMA path before suspend and start Rx DMA path on resume. - */ - if (irq_wake) { - del_timer_sync(&sport->lpuart_timer); - lpuart_dma_rx_free(&sport->port); - } + if ((tty_port_initialized(port) && may_wake) || + (!console_suspend_enabled && uart_console(&sport->port))) + return true; + + return false; +} + +static int __maybe_unused lpuart_suspend_noirq(struct device *dev) +{ + struct lpuart_port *sport = dev_get_drvdata(dev); + bool irq_wake = irqd_is_wakeup_set(irq_get_irq_data(sport->port.irq)); + + if (lpuart_uport_is_active(sport)) + serial_lpuart_enable_wakeup(sport, !!irq_wake); + + pinctrl_pm_select_sleep_state(dev); + + return 0; +} + +static int __maybe_unused lpuart_resume_noirq(struct device *dev) +{ + struct lpuart_port *sport = dev_get_drvdata(dev); + unsigned int val; + + pinctrl_pm_select_default_state(dev); + + if (lpuart_uport_is_active(sport)) { + serial_lpuart_enable_wakeup(sport, false); - /* Disable Rx DMA to use UART port as wakeup source */ + /* clear the wakeup flags */ if (lpuart_is_32(sport)) { - temp = lpuart32_read(&sport->port, UARTBAUD); - lpuart32_write(&sport->port, temp & ~UARTBAUD_RDMAE, - UARTBAUD); - } else { - writeb(readb(sport->port.membase + UARTCR5) & - ~UARTCR5_RDMAS, sport->port.membase + UARTCR5); + val = lpuart32_read(&sport->port, UARTSTAT); + lpuart32_write(&sport->port, val, UARTSTAT); } } - if (sport->lpuart_dma_tx_use) { - sport->dma_tx_in_progress = false; - dmaengine_terminate_all(sport->dma_tx_chan); - } - - if (sport->port.suspended && !irq_wake) - lpuart_disable_clks(sport); - return 0; } -static int __maybe_unused lpuart_resume(struct device *dev) +static int __maybe_unused lpuart_suspend(struct device *dev) { struct lpuart_port *sport = dev_get_drvdata(dev); - bool irq_wake = irqd_is_wakeup_set(irq_get_irq_data(sport->port.irq)); + unsigned long temp, flags; - if (sport->port.suspended && !irq_wake) - lpuart_enable_clks(sport); + uart_suspend_port(&lpuart_reg, &sport->port); - if (lpuart_is_32(sport)) - lpuart32_setup_watermark_enable(sport); - else - lpuart_setup_watermark_enable(sport); + if (lpuart_uport_is_active(sport)) { + spin_lock_irqsave(&sport->port.lock, flags); + if (lpuart_is_32(sport)) { + /* disable Rx/Tx and interrupts */ + temp = lpuart32_read(&sport->port, UARTCTRL); + temp &= ~(UARTCTRL_TE | UARTCTRL_TIE | UARTCTRL_TCIE); + lpuart32_write(&sport->port, temp, UARTCTRL); + } else { + /* disable Rx/Tx and interrupts */ + temp = readb(sport->port.membase + UARTCR2); + temp &= ~(UARTCR2_TE | UARTCR2_TIE | UARTCR2_TCIE); + writeb(temp, sport->port.membase + UARTCR2); + } + spin_unlock_irqrestore(&sport->port.lock, flags); - if (sport->lpuart_dma_rx_use) { - if (irq_wake) { - if (!lpuart_start_rx_dma(sport)) - rx_dma_timer_init(sport); - else - sport->lpuart_dma_rx_use = false; + if (sport->lpuart_dma_rx_use) { + /* + * EDMA driver during suspend will forcefully release any + * non-idle DMA channels. If port wakeup is enabled or if port + * is console port or 'no_console_suspend' is set the Rx DMA + * cannot resume as expected, hence gracefully release the + * Rx DMA path before suspend and start Rx DMA path on resume. + */ + del_timer_sync(&sport->lpuart_timer); + lpuart_dma_rx_free(&sport->port); + + /* Disable Rx DMA to use UART port as wakeup source */ + spin_lock_irqsave(&sport->port.lock, flags); + if (lpuart_is_32(sport)) { + temp = lpuart32_read(&sport->port, UARTBAUD); + lpuart32_write(&sport->port, temp & ~UARTBAUD_RDMAE, + UARTBAUD); + } else { + writeb(readb(sport->port.membase + UARTCR5) & + ~UARTCR5_RDMAS, sport->port.membase + UARTCR5); + } + spin_unlock_irqrestore(&sport->port.lock, flags); + } + + if (sport->lpuart_dma_tx_use) { + spin_lock_irqsave(&sport->port.lock, flags); + if (lpuart_is_32(sport)) { + temp = lpuart32_read(&sport->port, UARTBAUD); + temp &= ~UARTBAUD_TDMAE; + lpuart32_write(&sport->port, temp, UARTBAUD); + } else { + temp = readb(sport->port.membase + UARTCR5); + temp &= ~UARTCR5_TDMAS; + writeb(temp, sport->port.membase + UARTCR5); + } + spin_unlock_irqrestore(&sport->port.lock, flags); + sport->dma_tx_in_progress = false; + dmaengine_terminate_all(sport->dma_tx_chan); } } - lpuart_tx_dma_startup(sport); + return 0; +} - if (lpuart_is_32(sport)) - lpuart32_configure(sport); +static void lpuart_console_fixup(struct lpuart_port *sport) +{ + struct tty_port *port = &sport->port.state->port; + struct uart_port *uport = &sport->port; + struct ktermios termios; + + /* i.MX7ULP enter VLLS mode that lpuart module power off and registers + * all lost no matter the port is wakeup source. + * For console port, console baud rate setting lost and print messy + * log when enable the console port as wakeup source. To avoid the + * issue happen, user should not enable uart port as wakeup source + * in VLLS mode, or restore console setting here. + */ + if (is_imx7ulp_lpuart(sport) && lpuart_uport_is_active(sport) && + console_suspend_enabled && uart_console(&sport->port)) { + + mutex_lock(&port->mutex); + memset(&termios, 0, sizeof(struct ktermios)); + termios.c_cflag = uport->cons->cflag; + if (port->tty && termios.c_cflag == 0) + termios = port->tty->termios; + uport->ops->set_termios(uport, &termios, NULL); + mutex_unlock(&port->mutex); + } +} + +static int __maybe_unused lpuart_resume(struct device *dev) +{ + struct lpuart_port *sport = dev_get_drvdata(dev); + + if (lpuart_uport_is_active(sport)) { + if (lpuart_is_32(sport)) + lpuart32_hw_setup(sport); + else + lpuart_hw_setup(sport); + } + lpuart_console_fixup(sport); uart_resume_port(&lpuart_reg, &sport->port); return 0; } -static SIMPLE_DEV_PM_OPS(lpuart_pm_ops, lpuart_suspend, lpuart_resume); +static const struct dev_pm_ops lpuart_pm_ops = { + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(lpuart_suspend_noirq, + lpuart_resume_noirq) + SET_SYSTEM_SLEEP_PM_OPS(lpuart_suspend, lpuart_resume) +}; static struct platform_driver lpuart_driver = { .probe = lpuart_probe, From patchwork Thu Nov 10 11:38:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sherry Sun X-Patchwork-Id: 624182 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 EB5C4C4332F for ; Thu, 10 Nov 2022 12:10:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbiKJMKO (ORCPT ); Thu, 10 Nov 2022 07:10:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230241AbiKJMKA (ORCPT ); Thu, 10 Nov 2022 07:10:00 -0500 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2064.outbound.protection.outlook.com [40.107.247.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2343E6AECE; Thu, 10 Nov 2022 04:09:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D617CfwiVf+szqbjSKtqnOKwRtZn+YFXShmI/e68kkTd2gwoI72J2LQoZ1Ax6BfRepvg2fw1Z+3en+xG1Okt/vFvFDWaBxhvyqhqygvY+5E1X5KrGYnepExe9rdSmsLSNU8xjqpwGJFs/cv4AdxyfuD9ZrfwLiDjUdbVB1PUMxuTl9fuE6p4T8++rMzgrncLegrG4PDMhacoUD4gTWN+Dh0uD8IZqCQQVhBqqiAfHkos84Zv9ZKA2iCRclHXq/fq+6t99EWt6UtZsU8Ura1GBxKrLvF6iHsvOjtIZh4YU214UwBwol6s3RDmDpZ8xUfqG4FyevJC+WDC3n5qwmgU6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+2Re8Y9COKv4Xe3HECOet3HjC9ciO9Ls/P7GyxfLjyo=; b=NDVkavFceioKbAHXbbj7Hk0ZnFVipfpmdtyAJrlWasJ+BcT7/4AkU2ML+yR/mcqI5WUhbl88itfyIlV8sntTsSBcFrSb9JBUtynj7gRIxvFuEoIGNGf72/K1dhWwy3s3Ly74N9Edh9p1PUoVG6bPrKnD2j+HQBUbZycn0qHWoZmkfFY9jVOcOZBA6d4WWLNFqRvYUV3QrpX+kAP95njkXTyP5jMvlaaQ98m89qkjhvtBGGy0PZiXOklWVVGAc4Bmn9YqQmQA0NmIy1nFlpV1tDStLxcnqRP2G+kOlylw+6n0yk9L3Ec1+GWdSC+baU2bhUm9CC4dCUQKfbXEuDKpCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+2Re8Y9COKv4Xe3HECOet3HjC9ciO9Ls/P7GyxfLjyo=; b=E1B7aL5/tImUUeyaIhK9753NCv9kAGatiw6WioyTfDmDat9sAdcuZmLps+abGn3eipTMCT42fsJqy3dAnZVSb/A7PxBlOjQkH+BueYLwFNZwWRDw5GLmg3GUmOOL/EXrHgyTsPuj9VKebQO2Lx0dtnwzLVqBqvDpfF+WSSMSUqA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8404.eurprd04.prod.outlook.com (2603:10a6:20b:3f8::7) by DB8PR04MB7097.eurprd04.prod.outlook.com (2603:10a6:10:12a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.13; Thu, 10 Nov 2022 12:09:56 +0000 Received: from AS8PR04MB8404.eurprd04.prod.outlook.com ([fe80::71f1:f7bb:5039:e55d]) by AS8PR04MB8404.eurprd04.prod.outlook.com ([fe80::71f1:f7bb:5039:e55d%3]) with mapi id 15.20.5791.027; Thu, 10 Nov 2022 12:09:56 +0000 From: Sherry Sun To: gregkh@linuxfoundation.org, jirislaby@kernel.org, ilpo.jarvinen@linux.intel.com Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com Subject: [PATCH V2 3/3] tty: serial: fsl_lpuart: Use pm_ptr() to avoid need to make pm __maybe_unused Date: Thu, 10 Nov 2022 19:38:59 +0800 Message-Id: <20221110113859.8485-4-sherry.sun@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221110113859.8485-1-sherry.sun@nxp.com> References: <20221110113859.8485-1-sherry.sun@nxp.com> X-ClientProxiedBy: SG3P274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::28) To AS8PR04MB8404.eurprd04.prod.outlook.com (2603:10a6:20b:3f8::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8404:EE_|DB8PR04MB7097:EE_ X-MS-Office365-Filtering-Correlation-Id: 308a4a0f-2d37-48ed-1e01-08dac3147b0d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t7dYKwxhlKvPq0EW8av8QxDu4kIDlaUJHcvclTnhXw4g5Pp4nHPEnSWhwwI1Uwbmf1XVG39QkJ6d4Yrhi1XN3Sc5Hd7z+FqrY3ZUKkkU5lSXAQLXdAG+JqOodbXfgM2x2MXkLyaZvRamSlb+OXmt38acHAaXlbk1InrJWpVa7qV0aIOkI+GdPxg5cY1k7pPMV74qhfNuhRPnQLN9W9UZyEkDB4sKThC1BVWD4WH22bp9vsNgwA5lM2xDdTLUaYuSHP3jz3P3wduNIJVAHvj0BDmqoJ/alxvmnjQAaJDKNyQ6PIWyy3mCtk81f2ZaU9M3lKJG7Abh3hR5a8L3gb0ATIzs47s1JbQSnUF/N9FvLG4VSJGk9eG9YsSYhN8ujvCx8QRt+Sg4mlqueMCAVn6uk1gRVMywxk9MBdy2nmajbA5dnVQgd6VDK9buVcGOTFdLEMAw9v7AVILItcWtE4cWr3AEIGr8snYUeaL5iOX1kb1I5u22Ug7y7p1w0jbL8aoNUeExFUWMFwzG+9s7x2A4SUonoMoLlxXT8LKk+MzQqUjDctpb1PjS2LVWJCZ/HNeRoBiSPolyb6JCUVM67MVks7eWlsYkW+i9sfyULsIcng9plhPVm15E5Z+NBzQuMt0pdyBT8gwgqVk03wBExeCu+cQ0wHEv56sQ1PKDCSBuUnrZnrbuWZpPk62lCm9SCQqw6lZ3FALUDyGDtMQBTo+CJCh2WbkKW/CVoXATV7NhB5pv5hVb/q/if84jYTq1KwEg1bAekAXzHkyCnNO7d7It6g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8404.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(136003)(366004)(346002)(376002)(39860400002)(396003)(451199015)(38100700002)(38350700002)(6486002)(478600001)(8936002)(2616005)(316002)(52116002)(6506007)(66476007)(6512007)(41300700001)(66556008)(66946007)(86362001)(36756003)(26005)(83380400001)(44832011)(8676002)(4326008)(186003)(1076003)(2906002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q/OlPs83pw3+h65Af608pw4PQR6vlBF/Ev35O94VlP0XjiJvDk48k+oz1TQdxusw70FJiUEtsQGdRH8dRpjdn1t+iLIEZH0kS0uBeWRv6Pn7xMT2GPAn2+flHUj1TswhmcZIyqkbdfqyvEX2AqJw1Wh6BlSaeSoV++wcOn/+D3vxKPGhEXiAnsnyEVdk2hVGGiVJAnvjnFTPMcFjDBHbr3giCckhQmdo+O1NfZYQ4bnEur+bn11qYq47U5h2AuiX1eirF6M9UjWWmru1rEMMzwxhjveXcBROgfJ1D676Zn2WHrJp1BU5G4RX/qTNYHGmRQJURw+1e0tzJWLid596mSdPLDygQJOXNdPEGe/6ekEZJKCoxKq9ILjXzz3eDJ3h0u2/VHDT64mHxiObbxF9/i/+hJqSYxjRqBBpo1I82AO6H/yu24bTD299ZPrkAHw7lAhe6TFTRmOvSd4SI8QS7dBzSh0m+Tt5EClvphE/hkxwliDQaB7Iq8WThQnII8rT1/fZI5LNIfXKF4ot7tQYAAEch8sswY6akBphhsrtvbd+bfcDRLuB/yvHAxSZLOYf5G/td8ZgnvtgEDq2bH2ohMKrjIi097UinnbwMX28TczwSHpDO7gNi1du4WZQ7zL96lS/7eGjLAmtubsxwercb2zK301+JeiVlrZiCvxC9Gy9l1HXs9ME7ytl1jBzPhUGBs06nhUjiGciuQSfdPNvPFhmQaED1C525wOaPxayx6/9aNCHdJeb4WLhyfHDNh0XE3hLObJu5lKQFIfVtMRqQuHO4GDHic2U6QC+3mHWHU6vWDCs6dJNCaDJAeD/7ZFrWl7yfFoQCvZk25i/fXpXfuokXWrCKcvVFS6khG2h0PXkW+zj/iJt0YL8fHLhinyCBDHiQTPE3iKI+5mEBNLXrkVOuehpeFPnEc3EMYCOfvDPaZ52hVok2V+WPDG2E56pfWiEZkOciEn6M0w6czKm2JU7kn33abQAvgXfDBHdJfOJi3G11BHjlB6TOxz+aZqDMKcn0mh+rcZq13Th1YT84RgzEOF8ioFQlThSLjkH5cVOuKyvbrJmPrukAm0FrIH/OLfhtA0wDG4SiUdLwkLCBstwgFHgT/d8UjEjmgLeKQWtLAKpBAKzRJymQ3ZCHbuNO1YaJ2aImJwxaU2Ndy/E/TqVcZXmpHZZIyzmr6yCaEUvvS87CdJQogNjdAXer/B+AyRqUiQwYi/RF62tgkVHvcZWwL4RAbTtqQilQQIasxVtw+B0rqX67KilGUbCu/uQx/UiJtJ5p+gzLS3qK43vTM5d0ktZCParJJlET/G7tFQb4SniMOC8xdzyC4A+jV+nlCS/pPoKIKi+/H0CP54yeUxh8XnDD3SL2xcvHt3xkoAJaM/orR4D5CVdGmQKJ73L0vidAoz1QcU2+LbFkXKs07MUkYy4yMrG0W1ZkDuu0kc6GyF3iFdfvvaFhcfJh8MXRZFbrsIp54bLts9ZRXQmEjuKQoGXsrZ0861DFwNnU/r+f2RB0cCy5llLoZOvxVaLSCDcpwU672Ot5a4RiLNvood2j7DODLXF9ogQQfUw6juwN6OQ+bNZQG7DWWHpZuwj X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 308a4a0f-2d37-48ed-1e01-08dac3147b0d X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2022 12:09:55.9128 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Xl6OAsw+7/qGX11zwBMBXK1UMjIgpLFTrFNa9njx1Nb8eR2yMx7pgKFi/IRdbZCjdZCAGC2aBIU6pdAsDO1Nww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7097 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org Use pm_ptr() to remove the need to mark the pm functions as __maybe_unused when the kernel is built without CONFIG_PM support. Signed-off-by: Sherry Sun --- Changes in V2: 1. This patch is new added, remove the __maybe_unused as Ilpo suggested. --- drivers/tty/serial/fsl_lpuart.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 5b3962bb0de2..20e3027c1a55 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -2819,7 +2819,7 @@ static int lpuart_remove(struct platform_device *pdev) return 0; } -static int __maybe_unused lpuart_runtime_suspend(struct device *dev) +static int lpuart_runtime_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct lpuart_port *sport = platform_get_drvdata(pdev); @@ -2829,7 +2829,7 @@ static int __maybe_unused lpuart_runtime_suspend(struct device *dev) return 0; }; -static int __maybe_unused lpuart_runtime_resume(struct device *dev) +static int lpuart_runtime_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct lpuart_port *sport = platform_get_drvdata(pdev); @@ -2888,7 +2888,7 @@ static bool lpuart_uport_is_active(struct lpuart_port *sport) return false; } -static int __maybe_unused lpuart_suspend_noirq(struct device *dev) +static int lpuart_suspend_noirq(struct device *dev) { struct lpuart_port *sport = dev_get_drvdata(dev); bool irq_wake = irqd_is_wakeup_set(irq_get_irq_data(sport->port.irq)); @@ -2901,7 +2901,7 @@ static int __maybe_unused lpuart_suspend_noirq(struct device *dev) return 0; } -static int __maybe_unused lpuart_resume_noirq(struct device *dev) +static int lpuart_resume_noirq(struct device *dev) { struct lpuart_port *sport = dev_get_drvdata(dev); unsigned int val; @@ -2921,7 +2921,7 @@ static int __maybe_unused lpuart_resume_noirq(struct device *dev) return 0; } -static int __maybe_unused lpuart_suspend(struct device *dev) +static int lpuart_suspend(struct device *dev) { struct lpuart_port *sport = dev_get_drvdata(dev); unsigned long temp, flags; @@ -3017,7 +3017,7 @@ static void lpuart_console_fixup(struct lpuart_port *sport) } } -static int __maybe_unused lpuart_resume(struct device *dev) +static int lpuart_resume(struct device *dev) { struct lpuart_port *sport = dev_get_drvdata(dev); int ret; @@ -3042,11 +3042,11 @@ static int __maybe_unused lpuart_resume(struct device *dev) } static const struct dev_pm_ops lpuart_pm_ops = { - SET_RUNTIME_PM_OPS(lpuart_runtime_suspend, + RUNTIME_PM_OPS(lpuart_runtime_suspend, lpuart_runtime_resume, NULL) - SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(lpuart_suspend_noirq, + NOIRQ_SYSTEM_SLEEP_PM_OPS(lpuart_suspend_noirq, lpuart_resume_noirq) - SET_SYSTEM_SLEEP_PM_OPS(lpuart_suspend, lpuart_resume) + SYSTEM_SLEEP_PM_OPS(lpuart_suspend, lpuart_resume) }; static struct platform_driver lpuart_driver = { @@ -3055,7 +3055,7 @@ static struct platform_driver lpuart_driver = { .driver = { .name = "fsl-lpuart", .of_match_table = lpuart_dt_ids, - .pm = &lpuart_pm_ops, + .pm = pm_ptr(&lpuart_pm_ops), }, };