From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752158AbdEELsi (ORCPT ); Fri, 5 May 2017 07:48:38 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:57628 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751180AbdEELsg (ORCPT ); Fri, 5 May 2017 07:48:36 -0400 From: Quentin Schulz To: wg@grandegger.com, mkl@pengutronix.de, mario.huettel@gmx.net, socketcan@hartkopp.net Cc: Quentin Schulz , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexandre.belloni@free-electrons.com, thomas.petazzoni@free-electrons.com Subject: [PATCH v3 2/2] can: m_can: add deep Suspend/Resume support Date: Fri, 5 May 2017 13:46:46 +0200 Message-Id: <20170505114646.1278-2-quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170505114646.1278-1-quentin.schulz@free-electrons.com> References: <20170505114646.1278-1-quentin.schulz@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds Power Management deep Suspend/Resume support for Bosch M_CAN chip. When entering deep sleep, the clocks are gated, the interrupts are disabled. When resuming from deep sleep, the chip needs to be reinitialized, the clocks ungated and the interrupts enabled. Signed-off-by: Quentin Schulz --- v3: - do not close/reopen the can interface (which was previously done when calling m_can_close), basically do the same routine as in probe but it does not close/open the can device, - update commit log, v2: - fix erroneous commit log, drivers/net/can/m_can/m_can.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index 3f0445440146..0a06690febe2 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -1672,10 +1672,9 @@ static __maybe_unused int m_can_suspend(struct device *dev) if (netif_running(ndev)) { netif_stop_queue(ndev); netif_device_detach(ndev); + m_can_stop(ndev); } - /* TODO: enter low power */ - priv->can.state = CAN_STATE_SLEEPING; return 0; @@ -1686,11 +1685,23 @@ static __maybe_unused int m_can_resume(struct device *dev) struct net_device *ndev = dev_get_drvdata(dev); struct m_can_priv *priv = netdev_priv(ndev); - /* TODO: exit low power */ + m_can_init_ram(priv); priv->can.state = CAN_STATE_ERROR_ACTIVE; if (netif_running(ndev)) { + int ret = clk_prepare_enable(priv->hclk); + + if (ret) + return ret; + + ret = clk_prepare_enable(priv->cclk); + if (ret) { + clk_disable_unprepare(priv->hclk); + return ret; + } + + m_can_start(ndev); netif_device_attach(ndev); netif_start_queue(ndev); } -- 2.11.0