From patchwork Fri Mar 21 11:09:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 3872781 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2F5389F382 for ; Fri, 21 Mar 2014 11:09:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3160F201E4 for ; Fri, 21 Mar 2014 11:09:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42A1A20213 for ; Fri, 21 Mar 2014 11:09:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965333AbaCULJ2 (ORCPT ); Fri, 21 Mar 2014 07:09:28 -0400 Received: from access.ducie-dc1.codethink.co.uk ([185.25.241.217]:59154 "EHLO rt.codethink.co.uk" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S965328AbaCULJ2 (ORCPT ); Fri, 21 Mar 2014 07:09:28 -0400 Received: from rainbowdash.ducie.codethink.co.uk (localhost [127.0.0.1]) by rt.codethink.co.uk (Postfix) with ESMTPS id C876F1A0BDC; Fri, 21 Mar 2014 11:09:26 +0000 (GMT) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.82) (envelope-from ) id 1WQxKH-0006hG-DQ; Fri, 21 Mar 2014 12:09:25 +0100 From: Ben Dooks To: linux-kernel@lists.codethink.co.uk, netdev@vger.kernel.org Cc: linux-sh@vger.kernel.org, davem@davemloft.net, Ben Dooks , sergei.shtylyov@cogentembedded.com, laurent.pinchart+renesas@ideasonboard.com Subject: [PATCH v5] sh_eth: ensure pm_runtime cannot suspend the device during init Date: Fri, 21 Mar 2014 12:09:14 +0100 Message-Id: <1395400154-25710-1-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.9.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The pm_rumtime work queue is causing the device to be suspended during initialisation, thus the initialisation may not be able to access registers properly. As the code is called from a work queue, it is possible that this is not seen from certain configurations/builds due to the asynchronos nature of the code. Another issue has also been found where the network device registration calls back into the driver thus causing further pm_runtime calls that also caused issues with the MDIO bus code. This has now been checked and is the only place the MDIO can be called without the device open. Use pm_runtime_get_sync() and pm_runtime_put() to ensure that the pm system does not suspend it during the probe() call and remove the now unnecessary pm_runtime_resume() call. Also add a call in the error path to call pm_runtime_disable(). This fixes the external abort that can cause /sbin/init or other such init processed to die. Signed-off-by: Ben Dooks Tested-by: Geert Uytterhoeven Acked-by: Laurent Pinchart --- Cc: sergei.shtylyov@cogentembedded.com Cc: laurent.pinchart+renesas@ideasonboard.com cc: netdev@vger.kernel.org Note, Laurent this should probably be applied before your current series as it may require changes to the exit sequence. Fixes from v1: - use pm_runtime_put() over pm_runtime_put_sync() as we do not need to guaranteed the device has powered off after probe. Fixed from v2: - call pm_runtime_put() in error path Fixed from v3: - call pm_runtime_disable() in error path Conflicts: drivers/net/ethernet/renesas/sh_eth.c --- drivers/net/ethernet/renesas/sh_eth.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index e4bff18..6a9509c 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2772,6 +2772,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev) if (!ndev) return -ENOMEM; + pm_runtime_enable(&pdev->dev); + pm_runtime_get_sync(&pdev->dev); + /* The sh Ether-specific entries in the device structure. */ ndev->base_addr = res->start; devno = pdev->id; @@ -2799,8 +2802,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) spin_lock_init(&mdp->lock); mdp->pdev = pdev; - pm_runtime_enable(&pdev->dev); - pm_runtime_resume(&pdev->dev); if (pdev->dev.of_node) pd = sh_eth_parse_dt(&pdev->dev); @@ -2898,6 +2899,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev) netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n", (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); + pm_runtime_put(&pdev->dev); platform_set_drvdata(pdev, ndev); return ret; @@ -2911,6 +2913,8 @@ out_release: if (ndev) free_netdev(ndev); + pm_runtime_put(&pdev->dev); + pm_runtime_disable(&pdev->dev); return ret; }