From patchwork Tue May 21 15:45:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erwan Le Ray X-Patchwork-Id: 164737 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1768680ili; Tue, 21 May 2019 08:47:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqyo1FOZZdDautPM7TrNSBl4Zw0inoYQBxGjg+viZLMA5zBar9RGNQwlLuPZZzRlgvfv7Im1 X-Received: by 2002:a17:902:8698:: with SMTP id g24mr85783199plo.151.1558453627900; Tue, 21 May 2019 08:47:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558453627; cv=none; d=google.com; s=arc-20160816; b=zS3vLkhNyET0SqEVESRLS53t/jh612LskpLjPYCoenKAdpial38Yn9zerKGgGT26Us CZseRWVdF13wVR3bnkaGyjOaIES7CoBjwhp1RCb1HO8ZkZNdS84PHwyHcJqbyQ/+6rgs R2bVbJlDYqvuObM1EsyIjz17HbctLfE2jWs3YyX3ZnK+ak5GfY60amj4QLoJX2Q3Halw letDRGh+9EJVhXBhZWkZG/wpmluWEPknAHO9B8pgv42t2W5z+jOQPz70k3x5+cr6q+Os Qb6p6TktMvOZS8QEiZ+wYC7riamLrZQeUVsfv9Mnbv86QOblgyObpdtMpzl+lC5UTX4G 0e8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=/OcbG7X/4P3w326sEJsRi0F6w6c2W3c9KT64wC0AeuY=; b=tl1+gxGW6VaHXQYa8E2qVwXh+Mu1xwbdy3gxad9RhGMkWujkpDIoHIRkcHM5/AOIVd jLqI6/v6iIFJzAvUQXvgjjHle0otiKUgwNCm3DqXGYmIz3Dze6soGdOGFz/dL18Sfluy n51fSSMknHNuQjzCdC/5Cqo/yGyFo0RVC5BFDRYAJGeczWstOSO9m4eQvr/t+VWJOp0f fC7DMV+v7HEW2R7Lne2AS+wNpmupr9PT9cPN9a9cJjBnMjysn71AOuvDFWEZ7CPO0/j7 8tyYnPJAc4/1Qy1lxSlefI7aLt/bZ8x0qvwMvPWjmHZ141KXWHMKOUjZkPjZLogj1Fs5 fksw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b=uPzJ62Fc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 f15si22415425pgu.218.2019.05.21.08.47.07; Tue, 21 May 2019 08:47:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b=uPzJ62Fc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728953AbfEUPrD (ORCPT + 30 others); Tue, 21 May 2019 11:47:03 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:20730 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728905AbfEUPrC (ORCPT ); Tue, 21 May 2019 11:47:02 -0400 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4LFjvSE004967; Tue, 21 May 2019 17:46:43 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=/OcbG7X/4P3w326sEJsRi0F6w6c2W3c9KT64wC0AeuY=; b=uPzJ62FcrBpb0lxQBdoL3q7yqp9WRb1GSrBJ0BDvUo3FxxqLGodXE8vj6AEZ+IpskDpI jQsR2hgkTlil5kIFWQpEz6oCb0NjhjzWCdPUtaWqHasJynFZvxflh2bm+An27/7C/DPG stnoWV8uE9urEZADUnLOqS27XL8F2IvOoHzqV+tIDgkRs2BtAS2ePXsuH2N+h9UWcEz+ uzXTjGSY93Sv56v/klN+ube0g7/bceUM8tBJCwCt+NgUaxq0TAaLQeyqj167Mg235Qx9 xvUQ9WkDeAtQ5kZB9DqKCqGh5nim/Aom2gfRjL5yHTVyXmti+pvBmiSyn1a8xtIs4A+A Dw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2sj7tu2h78-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 21 May 2019 17:46:43 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 213A038; Tue, 21 May 2019 15:46:43 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas21.st.com [10.75.90.44]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 09B712CEA; Tue, 21 May 2019 15:46:43 +0000 (GMT) Received: from SAFEX1HUBCAS23.st.com (10.75.90.46) by SAFEX1HUBCAS21.st.com (10.75.90.44) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 May 2019 17:46:42 +0200 Received: from localhost (10.201.23.31) by webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 21 May 2019 17:46:42 +0200 From: Erwan Le Ray To: Greg Kroah-Hartman , Jiri Slaby , Maxime Coquelin , "Alexandre Torgue" CC: , , , , "Erwan Le Ray" , Fabrice Gasnier Subject: [PATCH 6/7] serial: stm32: fix wakeup source initialization Date: Tue, 21 May 2019 17:45:46 +0200 Message-ID: <1558453547-22866-7-git-send-email-erwan.leray@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1558453547-22866-1-git-send-email-erwan.leray@st.com> References: <1558453547-22866-1-git-send-email-erwan.leray@st.com> MIME-Version: 1.0 X-Originating-IP: [10.201.23.31] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-21_03:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixes dedicated_irq_wakeup issue and deactivated uart as wakeup source by default. Fixes: 270e5a74fe4c ("serial: stm32: add wakeup mechanism") Signed-off-by: Erwan Le Ray -- 1.9.1 diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index d603be9..1334e42 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -557,7 +557,6 @@ static int stm32_startup(struct uart_port *port) { struct stm32_port *stm32_port = to_stm32_port(port); struct stm32_usart_offsets *ofs = &stm32_port->info->ofs; - struct stm32_usart_config *cfg = &stm32_port->info->cfg; const char *name = to_platform_device(port->dev)->name; u32 val; int ret; @@ -568,15 +567,6 @@ static int stm32_startup(struct uart_port *port) if (ret) return ret; - if (cfg->has_wakeup && stm32_port->wakeirq >= 0) { - ret = dev_pm_set_dedicated_wake_irq(port->dev, - stm32_port->wakeirq); - if (ret) { - free_irq(port->irq, port); - return ret; - } - } - val = USART_CR1_RXNEIE | USART_CR1_TE | USART_CR1_RE; if (stm32_port->fifoen) val |= USART_CR1_FIFOEN; @@ -607,7 +597,6 @@ static void stm32_shutdown(struct uart_port *port) stm32_clr_bits(port, ofs->cr1, val); - dev_pm_clear_wake_irq(port->dev); free_irq(port->irq, port); } @@ -1079,11 +1068,18 @@ static int stm32_serial_probe(struct platform_device *pdev) ret = device_init_wakeup(&pdev->dev, true); if (ret) goto err_uninit; + + ret = dev_pm_set_dedicated_wake_irq(&pdev->dev, + stm32port->wakeirq); + if (ret) + goto err_nowup; + + device_set_wakeup_enable(&pdev->dev, false); } ret = uart_add_one_port(&stm32_usart_driver, &stm32port->port); if (ret) - goto err_nowup; + goto err_wirq; ret = stm32_of_dma_rx_probe(stm32port, pdev); if (ret) @@ -1097,6 +1093,10 @@ static int stm32_serial_probe(struct platform_device *pdev) return 0; +err_wirq: + if (stm32port->info->cfg.has_wakeup && stm32port->wakeirq >= 0) + dev_pm_clear_wake_irq(&pdev->dev); + err_nowup: if (stm32port->info->cfg.has_wakeup && stm32port->wakeirq >= 0) device_init_wakeup(&pdev->dev, false); @@ -1134,8 +1134,10 @@ static int stm32_serial_remove(struct platform_device *pdev) TX_BUF_L, stm32_port->tx_buf, stm32_port->tx_dma_buf); - if (cfg->has_wakeup && stm32_port->wakeirq >= 0) + if (cfg->has_wakeup && stm32_port->wakeirq >= 0) { + dev_pm_clear_wake_irq(&pdev->dev); device_init_wakeup(&pdev->dev, false); + } clk_disable_unprepare(stm32_port->clk);