From patchwork Tue Jul 17 08:19:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 142121 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3369111ljj; Tue, 17 Jul 2018 01:19:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe4SIZJCPoEykAIlkG7wnCc3mU0NlkHZsDNZ2ZpY5mx2bJfdrnsSnS67u3dW+LlPw1JvP9z X-Received: by 2002:a63:89c7:: with SMTP id v190-v6mr637572pgd.194.1531815578670; Tue, 17 Jul 2018 01:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531815578; cv=none; d=google.com; s=arc-20160816; b=cjibnKs159lcgrlgzBob99uGQ5o0HcUJM709/8lNLBCJfIjq8LCEp15Zra7vcB4HcK PwttP/XfhWULHZ6BXLvNyrUxxep0uPfLJ4TflRtMfnCqG37z4WN4HoIpdHvtKFNxItvq FxiR812CB2YKN01RvKQgD6tk3oxGD7ZMZEmBLXdwOfey01PmxkAunCwDCzD0j1wtmK3Z C/XmPalZ3hx8de/WO8MT5TUGhFr3lSkmPyF7n+/+1tNTnfkk5tB7oklau4xxh2364RYK Kp38MxpxxD7Serolase8GH2dc98fR2odYoNs8c907IKYUkl6mqSLAv/qAVpdKxPMaKcc j43g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=YgTTjyz4zNtZqZ3gKBXLHZrAZxSliPgU/cj6qTUrzZ4=; b=r2fKXE6R4sALiRFHEPYmRCy5PmJetbvpLtIHtKwAcgk8wS3vMKb9L+u4yEd3nWxJgr BXZbbGNn8eE2hst0iFcFmZeEQjQRKmOFIculaqcITHdqShUV1PL87md9gbpKQarA4CoQ p2fLBmPSWICwvUNwVsIxREFPuJa/0niV1jJLzP0NVNw7pWXX4/W8RIeQ0iBm2+Bx4Fsl GdZzKECK3VTOaSAluKMq4jRs+cSMgT51AY2OfqavqU1VifUHh6mc2W7Pvx0U5GTVwNa0 BaHl7wPCo86gzHXYmMwLUZdiVvW9ZzcGq8sehVG/RRNV2lFLAdPquPuGh/eBTvtr0tDJ kwHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K2RvWlKw; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r65-v6si381493pfe.298.2018.07.17.01.19.38; Tue, 17 Jul 2018 01:19:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=@linaro.org header.s=google header.b=K2RvWlKw; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729640AbeGQIvC (ORCPT + 13 others); Tue, 17 Jul 2018 04:51:02 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:46563 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729389AbeGQIvC (ORCPT ); Tue, 17 Jul 2018 04:51:02 -0400 Received: by mail-pl0-f65.google.com with SMTP id 30-v6so125181pld.13 for ; Tue, 17 Jul 2018 01:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YgTTjyz4zNtZqZ3gKBXLHZrAZxSliPgU/cj6qTUrzZ4=; b=K2RvWlKwZk33RSoXUTz9MBHb0EA9FvWm8sEnw9RoFv1YxW1jcOW/iww07VHQGLupvJ +7Imc98OsJHsxA7+clwEt5lyHf+D6HQImCE6sSKVS3zOQXHglILrXcqDeWJW4rfP/0D6 Vs68RtSPSj+u1knFczH6jT6/kfSErR2jTpp/4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YgTTjyz4zNtZqZ3gKBXLHZrAZxSliPgU/cj6qTUrzZ4=; b=mB4kLexWn1uN4cCuDirsjYr00l6JHL4XsXnfkg1kCemF08TuG2JnqxIAS8OpkhefLp okiCUyr55LMMsanfdRCintb+MlcimXYSLWCO8I4wwL1jMALPOS+BeVv/+Pd/yJUk8rtG a/X04R5CrYU5KxOVzhmmysbF9GkM9LPOVoPteW219scFRnba7xqKKneQcFckH7RF1bKr UmoSSHn2s3tEdOihWInTlXzJdFNXKYhdBDwitFJvFM9wUZJ+qPTBA8bUIj0XQEIGxZrI NJfF0en/nDJaA5Eqh6zGAgCEdd4xBUq9/PVgyphIdDDBcbROXFEEIf7U86nblEVNCuW+ HsfQ== X-Gm-Message-State: AOUpUlFOAdMvlbiQuY99Zjq2m1K8fbX73fYO554bDQGt6zp6iA2gL5Jw o25WWMp3dX8bIDf85HkLE+J30g== X-Received: by 2002:a17:902:820a:: with SMTP id x10-v6mr650465pln.261.1531815577318; Tue, 17 Jul 2018 01:19:37 -0700 (PDT) Received: from localhost.localdomain ([106.51.22.240]) by smtp.gmail.com with ESMTPSA id z2-v6sm740263pgv.12.2018.07.17.01.19.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jul 2018 01:19:36 -0700 (PDT) From: Amit Pundir To: Greg KH , Stable Cc: Jonas Gorski , "David S . Miller" Subject: [PATCH for-4.9.y 4/5] bcm63xx_enet: correct clock usage Date: Tue, 17 Jul 2018 13:49:17 +0530 Message-Id: <1531815558-20002-5-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531815558-20002-1-git-send-email-amit.pundir@linaro.org> References: <1531815558-20002-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonas Gorski commit 9c86b846ce02f7e35d7234cf090b80553eba5389 upstream. Check the return code of prepare_enable and change one last instance of enable only to prepare_enable. Also properly disable and release the clock in error paths and on remove for enetsw. Signed-off-by: Jonas Gorski Signed-off-by: David S. Miller Signed-off-by: Amit Pundir --- Cherry-picked from lede tree https://git.lede-project.org/?p=source.git drivers/net/ethernet/broadcom/bcm63xx_enet.c | 31 +++++++++++++++++++++------- 1 file changed, 23 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 08d91efceed0..3760a2be5dbc 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1790,7 +1790,9 @@ static int bcm_enet_probe(struct platform_device *pdev) ret = PTR_ERR(priv->mac_clk); goto out; } - clk_prepare_enable(priv->mac_clk); + ret = clk_prepare_enable(priv->mac_clk); + if (ret) + goto out_put_clk_mac; /* initialize default and fetch platform data */ priv->rx_ring_size = BCMENET_DEF_RX_DESC; @@ -1822,9 +1824,11 @@ static int bcm_enet_probe(struct platform_device *pdev) if (IS_ERR(priv->phy_clk)) { ret = PTR_ERR(priv->phy_clk); priv->phy_clk = NULL; - goto out_put_clk_mac; + goto out_disable_clk_mac; } - clk_prepare_enable(priv->phy_clk); + ret = clk_prepare_enable(priv->phy_clk); + if (ret) + goto out_put_clk_phy; } /* do minimal hardware init to be able to probe mii bus */ @@ -1915,13 +1919,16 @@ static int bcm_enet_probe(struct platform_device *pdev) out_uninit_hw: /* turn off mdc clock */ enet_writel(priv, 0, ENET_MIISC_REG); - if (priv->phy_clk) { + if (priv->phy_clk) clk_disable_unprepare(priv->phy_clk); + +out_put_clk_phy: + if (priv->phy_clk) clk_put(priv->phy_clk); - } -out_put_clk_mac: +out_disable_clk_mac: clk_disable_unprepare(priv->mac_clk); +out_put_clk_mac: clk_put(priv->mac_clk); out: free_netdev(dev); @@ -2766,7 +2773,9 @@ static int bcm_enetsw_probe(struct platform_device *pdev) ret = PTR_ERR(priv->mac_clk); goto out_unmap; } - clk_enable(priv->mac_clk); + ret = clk_prepare_enable(priv->mac_clk); + if (ret) + goto out_put_clk; priv->rx_chan = 0; priv->tx_chan = 1; @@ -2787,7 +2796,7 @@ static int bcm_enetsw_probe(struct platform_device *pdev) ret = register_netdev(dev); if (ret) - goto out_put_clk; + goto out_disable_clk; netif_carrier_off(dev); platform_set_drvdata(pdev, dev); @@ -2796,6 +2805,9 @@ static int bcm_enetsw_probe(struct platform_device *pdev) return 0; +out_disable_clk: + clk_disable_unprepare(priv->mac_clk); + out_put_clk: clk_put(priv->mac_clk); @@ -2827,6 +2839,9 @@ static int bcm_enetsw_remove(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(res->start, resource_size(res)); + clk_disable_unprepare(priv->mac_clk); + clk_put(priv->mac_clk); + free_netdev(dev); return 0; }