From patchwork Thu Nov 17 16:39:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9434913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9385A6047D for ; Thu, 17 Nov 2016 17:43:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86DA72939E for ; Thu, 17 Nov 2016 17:43:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B97E29689; Thu, 17 Nov 2016 17:43:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32EFE2939E for ; Thu, 17 Nov 2016 17:43:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964938AbcKQRmg (ORCPT ); Thu, 17 Nov 2016 12:42:36 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35138 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941731AbcKQRmb (ORCPT ); Thu, 17 Nov 2016 12:42:31 -0500 Received: by mail-wm0-f67.google.com with SMTP id a20so23485225wme.2; Thu, 17 Nov 2016 09:42:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BYyPE4HYWOtonVhJJHU+51UVwi8uqxQOZ/2Ftfb/GKI=; b=zqGneGHuX5gpmvVj3yo+13BK+OSuQGv5B1rOJoXLAZEmSWMl1jTqvrA5CYlDDrWuPP lgUYX647gBbtWb/rvTiRGqlJom4AElan8fcu7W+bSVn7E+/tx1hx63uLQhMv542xZst2 YKC1oiyUvXnLXf0NMBWZfmTMCZUA7E5RtVFGNaNO0WSR/Zlr1mxkVvy7pJtRRjIxsMn3 EdLiiKTK9OIi8wJvV9AeG4MsfUBxTfAWQS4PBIOpkZzl9+zPDGmxirB3NMye2/ZRj8ET TnTcwH9BOupln7diPhSbvq6GzPMS8KebKRAQ5tmMILzH73mxbnbkALrpFI0WKZU0tfn+ 7j8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BYyPE4HYWOtonVhJJHU+51UVwi8uqxQOZ/2Ftfb/GKI=; b=F6uw/B4rTPwauuDT6WcBrxGIlCtEEKW95FrHioFNEjxV1UL3SceAogrF5w39QLnHCV ngS36E9OP3HBTr9tbgIF9V0838HThlT02k8dSbdUFePmfLbNvZjhje5ZT3JnkbYrdlGx mXMlkTbA4LbLAuxu11R+90565Rj20YB56wLC/VD2SQvjRGNF+UpF4up16B+ybHr640X/ CvEJ49X2EqgKtl+wFH50xK7n9Ajvj0ys+IGmNGMgCevBGbQH6XMaDoS0HBAAcgOWRJ5g EN2GmsrkLupzXLA4K6oC9M+GA4xdBcVwJDx3V80leMdpqOlUofeXey33H3byQxHLyIWI mBwg== X-Gm-Message-State: ABUngvf/AeGzGj4FlzGxEHV3BJCeBWQOUf1NI3EyQ3XZZLkgtTqUZfgGFhjXfo1jpmOoVA== X-Received: by 10.25.215.199 with SMTP id q68mr696461lfi.47.1479400819087; Thu, 17 Nov 2016 08:40:19 -0800 (PST) Received: from xi.terra (c-04aadb54.07-184-6d6c6d4.cust.bredbandsbolaget.se. [84.219.170.4]) by smtp.gmail.com with ESMTPSA id 31sm969049lfv.21.2016.11.17.08.40.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 08:40:17 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1c7PjU-0002Zf-Ah; Thu, 17 Nov 2016 17:40:16 +0100 From: Johan Hovold To: Mugunthan V N Cc: Grygorii Strashko , linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH net v2 1/7] net: ethernet: ti: cpsw: fix bad register access in probe error path Date: Thu, 17 Nov 2016 17:39:58 +0100 Message-Id: <1479400804-9847-2-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1479400804-9847-1-git-send-email-johan@kernel.org> References: <1479400804-9847-1-git-send-email-johan@kernel.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure to keep the platform device runtime-resumed throughout probe to avoid accessing the CPSW registers in the error path (e.g. for deferred probe) with clocks disabled: Unhandled fault: external abort on non-linefetch (0x1008) at 0xd0872d08 ... [] (cpsw_ale_control_set) from [] (cpsw_ale_destroy+0x2c/0x44) [] (cpsw_ale_destroy) from [] (cpsw_probe+0xbd0/0x10c4) [] (cpsw_probe) from [] (platform_drv_probe+0x5c/0xc0) Fixes: df828598a755 ("netdev: driver: ethernet: Add TI CPSW driver") Signed-off-by: Johan Hovold --- drivers/net/ethernet/ti/cpsw.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index c6cff3d2ff05..f60f8ab7c1e3 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2641,13 +2641,12 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_runtime_disable_ret; } cpsw->version = readl(&cpsw->regs->id_ver); - pm_runtime_put_sync(&pdev->dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 1); cpsw->wr_regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(cpsw->wr_regs)) { ret = PTR_ERR(cpsw->wr_regs); - goto clean_runtime_disable_ret; + goto clean_pm_runtime_put_ret; } memset(&dma_params, 0, sizeof(dma_params)); @@ -2684,7 +2683,7 @@ static int cpsw_probe(struct platform_device *pdev) default: dev_err(priv->dev, "unknown version 0x%08x\n", cpsw->version); ret = -ENODEV; - goto clean_runtime_disable_ret; + goto clean_pm_runtime_put_ret; } for (i = 0; i < cpsw->data.slaves; i++) { struct cpsw_slave *slave = &cpsw->slaves[i]; @@ -2713,7 +2712,7 @@ static int cpsw_probe(struct platform_device *pdev) if (!cpsw->dma) { dev_err(priv->dev, "error initializing dma\n"); ret = -ENOMEM; - goto clean_runtime_disable_ret; + goto clean_pm_runtime_put_ret; } cpsw->txch[0] = cpdma_chan_create(cpsw->dma, 0, cpsw_tx_handler, 0); @@ -2815,12 +2814,16 @@ static int cpsw_probe(struct platform_device *pdev) } } + pm_runtime_put(&pdev->dev); + return 0; clean_ale_ret: cpsw_ale_destroy(cpsw->ale); clean_dma_ret: cpdma_ctlr_destroy(cpsw->dma); +clean_pm_runtime_put_ret: + pm_runtime_put_sync(&pdev->dev); clean_runtime_disable_ret: pm_runtime_disable(&pdev->dev); clean_ndev_ret: