From patchwork Mon Mar 17 11:37:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 330903 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 19B952C00B7 for ; Mon, 17 Mar 2014 22:38:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932769AbaCQLiD (ORCPT ); Mon, 17 Mar 2014 07:38:03 -0400 Received: from access.ducie-dc1.codethink.co.uk ([185.25.241.217]:37733 "EHLO rt.codethink.co.uk" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S932732AbaCQLiC (ORCPT ); Mon, 17 Mar 2014 07:38:02 -0400 Received: from rainbowdash.ducie.codethink.co.uk (localhost [127.0.0.1]) by rt.codethink.co.uk (Postfix) with ESMTPS id BDDE01A0B89; Mon, 17 Mar 2014 11:38:00 +0000 (GMT) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.82) (envelope-from ) id 1WPVrj-0001JJ-8M; Mon, 17 Mar 2014 11:37:59 +0000 From: Ben Dooks To: linux-sh@vger.kernel.org, netdev@vger.kernel.org Cc: Ben Dooks Subject: [PATCH] sh_eth: ensure pm_runtime cannot suspend the device during init Date: Mon, 17 Mar 2014 11:37:55 +0000 Message-Id: <1395056275-5005-1-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.9.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Use pm_runtime_get_sync() and pm_runtime_put_sync() to ensure that the pm system does not suspend it during the probe() call and remove the now unnecessary pm_runtime_resume() call. 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 --- drivers/net/ethernet/renesas/sh_eth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 4f76b5e..f1cfd64 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2869,7 +2869,7 @@ 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); + pm_runtime_get_sync(&pdev->dev); if (pdev->dev.of_node) pd = sh_eth_parse_dt(&pdev->dev); @@ -2961,6 +2961,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev) pr_info("Base address at 0x%x, %pM, IRQ %d.\n", (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); + pm_runtime_put_sync(&pdev->dev); platform_set_drvdata(pdev, ndev); return ret;