From patchwork Sun Oct 1 11:02:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820255 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RNw+A1GN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j6y4cxrz9t2V for ; Sun, 1 Oct 2017 22:02:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751138AbdJALCP (ORCPT ); Sun, 1 Oct 2017 07:02:15 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36720 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbdJALCN (ORCPT ); Sun, 1 Oct 2017 07:02:13 -0400 Received: by mail-wm0-f67.google.com with SMTP id 63so678469wmn.3 for ; Sun, 01 Oct 2017 04:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/+eszXk8aFpWJrxTbJ/QkRiJ0VmXeFFSvgGJJzivwBw=; b=RNw+A1GNPME0UZmAnNxD+LCgQ5VVHuIx66Mpa1EDuj91lOO7lT7DhlD+C1LWnm0NTF xBAkDX30f1P6I619Mpq0znMZQN3GceQhtu0DtJFzUBaAuVGjlZ0W0FuIbvYy5luVVyuY RSE+bBFiJH8o/NLn2bLXz4kco2Uj6ORgWoBR8NYXt2oiLIqVxSq3hy3dH6TDjH5wdSsL 5DgCzZ3NvKoIRXvCvyNUBMqEiRyhVzbDVewwlXFv7ja6cloVWpcwFVUH2KGY9by49QHR VR6YhN8u9lI+n2ddAxDYh0LIRbtPLTcIiBqdUCQw5xPkA3vAM009AJWxUmkiQ2TRXyTL BZQQ== 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=/+eszXk8aFpWJrxTbJ/QkRiJ0VmXeFFSvgGJJzivwBw=; b=QRxsqtEbKxKhDjMpzm87A4dEB6XjgrOPa3lDyIJ1e8kTM5hXYQmTjDDLgrQs0ulMSU KRGbv62zwZjlWYIzS5HwTDQEaumm/hww2oQxwamMhWvoDFl5Y31j+YPborggp59e4zvv ZXpzOu3m4vz/bt2Jl6PUi3386aCTcssCVknOekq4Y3GSPkecmOamUZ4Ekr//Xl44A9jh vxSJXw/fEYp3MToBq9gMc0HOdjykbN1OTDvisaF3SFXDT0ZApmybuaxuMd48ELCKvUxu xAV/QpmywJehAaMvxuNrNSNsmXG33EHF8qDxKsb5PkY5xDgM7MLUVXtygw2/5SMuE44w p75A== X-Gm-Message-State: AHPjjUhq7OvKc2aP41DFX70ev58gqMJ7HjD8Z/d3D6nlAQWgBXSmrFfi l2NhVaofRw/OO9pcnqNCzS51gg== X-Google-Smtp-Source: AOwi7QAxjvryYq7EUUX55fp1WmgL+dPbac8f9m7wPjf24eXuZhdk1xEuwXHdH+1ua5WUyPqzZrKFhg== X-Received: by 10.80.241.92 with SMTP id z28mr16426598edl.294.1506855732060; Sun, 01 Oct 2017 04:02:12 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:11 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 1/6] bcm63xx_enet: correct clock usage Date: Sun, 1 Oct 2017 13:02:15 +0200 Message-Id: <20171001110220.27668-2-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 31 +++++++++++++++++++++------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index c6221f04a748..a45ec97b5b1e 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1773,7 +1773,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; @@ -1805,9 +1807,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 */ @@ -1900,13 +1904,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); @@ -2748,7 +2755,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; @@ -2769,7 +2778,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); @@ -2778,6 +2787,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); @@ -2809,6 +2821,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; } From patchwork Sun Oct 1 11:02:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820260 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jDmg8GP8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j7Q6hlkz9t2V for ; Sun, 1 Oct 2017 22:02:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339AbdJALCl (ORCPT ); Sun, 1 Oct 2017 07:02:41 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36723 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750983AbdJALCO (ORCPT ); Sun, 1 Oct 2017 07:02:14 -0400 Received: by mail-wm0-f66.google.com with SMTP id 63so678488wmn.3 for ; Sun, 01 Oct 2017 04:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fMtTGZPtLfZvaGIYRlnEi9ltVaVqCjAut5cDcthBemM=; b=jDmg8GP8Tu1gElgIphNSz0uCeBBqE/UUmS/8nkzbjSV+DSXaXIGTlnuBS2p5T+cPmC kSIWv2XOzzBt4RJ7ALtZ1iTCxDouer1h48jN8a9/ogE/hyiRdQr1ysa4fCrQKaWORNoa LQ2FVc00lyDDVmjBEFY7IMQaHkbv+X2OGjaBOcG+aUU7STa8HfL52Lc+q0JG8jrWznfP 8225uv9AhDiTQUO3CRNCwuQedhpjEaqiIsuIA5qX8tqhv2lZzt1J/mn/vsm/0/C1hhqg OafsEOviH29jYtjx6/6DNJroGaUpVqnkk7fGkgnED8M3Bv7Kh2JlXp6f6m3RqYtMLBwK 3vRg== 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=fMtTGZPtLfZvaGIYRlnEi9ltVaVqCjAut5cDcthBemM=; b=iDVohJhTBQCTC00ExHS9cr2LrowPFbsFKbnd7Fq7QNmFb9uSt5n0OmlIfHb4OeR330 dq19Bgu+3+mAQMv4z45VefbC5QQlT92YsEXuFPO1nJUyCHKMWwatyFxjEM7W93yH94Nv azfwWRmta5zEUHS4et2YeEdF+PGX7ny+KLJX6MEz0TnCq2YdgXevanOQUTM52fLoO1CZ CQBvPn/p6cEfImKIVxNdQeUEBm8tk9g/csZK4dv6uoHF7pZfuwLM+M79d4VUy9cWrfKj Zs2JneIF7IqN08qM6yZD3bDghJnV+slGY927zMXBukJnwxxydaxmmsD+2PiZt3rbN//m WARg== X-Gm-Message-State: AHPjjUgyiyMfGb6+qbpxpwBl1CWH2+IJqc2Z0M1txMLoJA81kcaLWrIG +ZkMnesEYnFcoWCHvmm1E4cJfw== X-Google-Smtp-Source: AOwi7QAIctEB0fWGWUk3Cc6xi5NElqsrsZz9h0u73gjf5uBegOcx7cqAjEe23ZJ3AgU4O5Zz7p1pDw== X-Received: by 10.80.165.23 with SMTP id y23mr16569732edb.155.1506855733260; Sun, 01 Oct 2017 04:02:13 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:12 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 2/6] bcm63xx_enet: do not write to random DMA channel on BCM6345 Date: Sun, 1 Oct 2017 13:02:16 +0200 Message-Id: <20171001110220.27668-3-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The DMA controller regs actually point to DMA channel 0, so the write to ENETDMA_CFG_REG will actually modify a random DMA channel. Since DMA controller registers do not exist on BCM6345, guard the write with the usual check for dma_has_sram. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index a45ec97b5b1e..a1e1e12e187a 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1062,7 +1062,8 @@ static int bcm_enet_open(struct net_device *dev) val = enet_readl(priv, ENET_CTL_REG); val |= ENET_CTL_ENABLE_MASK; enet_writel(priv, val, ENET_CTL_REG); - enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG); + if (priv->dma_has_sram) + enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG); enet_dmac_writel(priv, priv->dma_chan_en_mask, ENETDMAC_CHANCFG, priv->rx_chan); From patchwork Sun Oct 1 11:02:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820256 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FkjVylYY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j725dgvz9t2f for ; Sun, 1 Oct 2017 22:02:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751281AbdJALCS (ORCPT ); Sun, 1 Oct 2017 07:02:18 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35370 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751005AbdJALCP (ORCPT ); Sun, 1 Oct 2017 07:02:15 -0400 Received: by mail-wm0-f67.google.com with SMTP id b189so1874364wmd.2 for ; Sun, 01 Oct 2017 04:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w2shvzZ+50QHflkjbJliyKDfvnKUNYnWp2VTvE+0OrY=; b=FkjVylYY7T4sWx4ChQZvoy4x+jKl00EbxJsR+npvq+rfPMFDPchLCMIAPAkdrHpDpt FKcj78W722TRaMJ6B1I52Bj9D02FdOwBudu84Eqlt2MHGKzkfAj8WsZoY6idh+ehO/sN uevAvv3HSBbLtA7qcuVUlw3WTGa44P7/JtZiKZG6sdhltAI18C7KwF4O/hyjBVwStqB6 drmwi0pPkhdetx/9ZZm4+qfgIRbXQ5xgDzwg7egDs/PeouNP3d9FzMAiAIigpEoMsoW8 ldsdJxgKYuoRGlP3CS2BKZlUEb3Lh0iAGFah54V2eV0sEeCqu7Kw7QPrOLZJ0MrMrBGG kzMw== 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=w2shvzZ+50QHflkjbJliyKDfvnKUNYnWp2VTvE+0OrY=; b=XlrarlpOEC4nq5sa8Fy8sBQO6qAWOa/Be2/Xxt+3IpFjSQIG+pZ+Iqeu+NC1GaJxFJ ATljDNI3cDFA6U159E6oZH0ssyZF/noA1DdViBaYMMAB+MNKaFerh+G5wm3ZMRHuJ6mt OuQzA1MHngyFQHT1BQ90uzk6vTReyU8BwE0lgxOQjcRVHhugzXwKP44QHClOZnAjObKU 8HPMtLiTKD+r2esE1LCtE/p22rQuEVZf6Hs2QVZbCaMVKTZRVOD2HUseOepND2rk2isG ZA3YdVGVYZ6zuKwOnz9jLU1o6C8KMn/KKJKA2qKvj9saoa7Cpd/ZmoSkj07+wdXSG9id APyw== X-Gm-Message-State: AHPjjUg3VV4E5PXio4fPnaAwu8AV+6nxYkJyBscqWZVWdpafNoOr0r/m eEmbalD9ZSh1LmV+vVK0/9m7xw== X-Google-Smtp-Source: AOwi7QDvB3eiJPMWS1bSPqTqYKdE5QitQlWkwFcAfdacHHfy3Lk4GHBUMgC9lVZKvJ6fzMyUgRQotw== X-Received: by 10.80.181.59 with SMTP id y56mr16653301edd.140.1506855734254; Sun, 01 Oct 2017 04:02:14 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:13 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 3/6] bcm63xx_enet: do not rely on probe order Date: Sun, 1 Oct 2017 13:02:17 +0200 Message-Id: <20171001110220.27668-4-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Do not rely on the shared device being probed before the enet(sw) devices. This makes it easier to eventually move out the shared device as a dma controller driver (what it should be). Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index a1e1e12e187a..8caf6abab3a6 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1722,10 +1722,8 @@ static int bcm_enet_probe(struct platform_device *pdev) const char *clk_name; int i, ret; - /* stop if shared driver failed, assume driver->probe will be - * called in the same order we register devices (correct ?) */ if (!bcm_enet_shared_base[0]) - return -ENODEV; + return -EPROBE_DEFER; res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1); @@ -2696,11 +2694,8 @@ static int bcm_enetsw_probe(struct platform_device *pdev) struct resource *res_mem; int ret, irq_rx, irq_tx; - /* stop if shared driver failed, assume driver->probe will be - * called in the same order we register devices (correct ?) - */ if (!bcm_enet_shared_base[0]) - return -ENODEV; + return -EPROBE_DEFER; res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq_rx = platform_get_irq(pdev, 0); From patchwork Sun Oct 1 11:02:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820259 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y5JNdv/n"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j7G4Nrbz9t2V for ; Sun, 1 Oct 2017 22:02:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751320AbdJALCd (ORCPT ); Sun, 1 Oct 2017 07:02:33 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35372 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbdJALCR (ORCPT ); Sun, 1 Oct 2017 07:02:17 -0400 Received: by mail-wm0-f68.google.com with SMTP id b189so1874376wmd.2 for ; Sun, 01 Oct 2017 04:02:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=76uX2SL5kQZjLEYlb3/Ppc0hH4aT8ng+PKQLsf16azY=; b=Y5JNdv/nmz5zaIfzD4ypJt38r3U91rpE4t/UJn5D7UmdZKgKGo4lvW5gf/KPuPOvJT y1Es19Ak1JDCBZV5eCQkJ9TihXVhWg/V7wAi3T+qHE28IvcNQgW2kJyOIE+c4IW16JPU lCFmodVg27eoaR4G10ylugvx2byPwAp2IVyg70Tky7JrlJMKIbtvelSnRCPc6AuCL1mb jA0Jx7ivON9t7mA9nQCx3Vin285LbhdHEzNUDa7rlYlikJQGf66yzAtanqubnqHtjvQj OVWZhJm2clMPSxgWkgCgf6GVvSMyOVQe2g/fhm69PRqmSg+x960EPzFp6iM8KeIYLE32 0Hcg== 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=76uX2SL5kQZjLEYlb3/Ppc0hH4aT8ng+PKQLsf16azY=; b=bPm7kAZd/iMB3e2/inwfapNMEaVAGeItlo4hF1uIgKMDI5aE55qAiq8aAnZAh7y+uy W3kUIg3Md2wwfslIoyftYGAAAQv0V5fLCnvRpiHrz+0EsXHtelQJ8i47vALNLsjpFJXa g2jEQlikdcGMMpLW9C7iF/I7wrvDlTxlBgRUxMe8fHdAaKhDTmYJuO7Zw8d8Gd/mLHGP tkibgQU8dJcwCECvtjMLfq45KIUFr1R6eh4oGVTmNDy/WaZWvtXTg864TVqNhLrG3I7p TUe+PCduS5yybRFzEM9GaBJNZEVuPAYSRoJKPWwdMq0KPQ0QghVgz0M4J+UQdpvs9ABa WZoQ== X-Gm-Message-State: AHPjjUjnjv0Hux4iPMuBoQP+P/xXx3LGOpZWitT5/jDuHKc9aiUJIDTO iOn1nEp1b0xhePGYkOA2Gxt/hA== X-Google-Smtp-Source: AOwi7QCX2wzv78lkzIhHAiT8PjIgcnuOPd+b1kK/7eSI9x7iH6Rh7s/YjHPMh9Gy3XQh/dNC2pA53g== X-Received: by 10.80.179.120 with SMTP id r53mr16703782edd.174.1506855735499; Sun, 01 Oct 2017 04:02:15 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:15 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 4/6] bcm63xx_enet: use managed functions for clock/ioremap Date: Sun, 1 Oct 2017 13:02:18 +0200 Message-Id: <20171001110220.27668-5-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use managed functions where possible to reduce the amount of resource handling on error and remove paths. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 54 +++++++--------------------- 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 8caf6abab3a6..059ef4f1d137 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1767,14 +1767,14 @@ static int bcm_enet_probe(struct platform_device *pdev) clk_name = "enet1"; } - priv->mac_clk = clk_get(&pdev->dev, clk_name); + priv->mac_clk = devm_clk_get(&pdev->dev, clk_name); if (IS_ERR(priv->mac_clk)) { ret = PTR_ERR(priv->mac_clk); goto out; } ret = clk_prepare_enable(priv->mac_clk); if (ret) - goto out_put_clk_mac; + goto out; /* initialize default and fetch platform data */ priv->rx_ring_size = BCMENET_DEF_RX_DESC; @@ -1802,7 +1802,7 @@ static int bcm_enet_probe(struct platform_device *pdev) if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) { /* using internal PHY, enable clock */ - priv->phy_clk = clk_get(&pdev->dev, "ephy"); + priv->phy_clk = devm_clk_get(&pdev->dev, "ephy"); if (IS_ERR(priv->phy_clk)) { ret = PTR_ERR(priv->phy_clk); priv->phy_clk = NULL; @@ -1810,7 +1810,7 @@ static int bcm_enet_probe(struct platform_device *pdev) } ret = clk_prepare_enable(priv->phy_clk); if (ret) - goto out_put_clk_phy; + goto out_disable_clk_mac; } /* do minimal hardware init to be able to probe mii bus */ @@ -1906,14 +1906,8 @@ static int bcm_enet_probe(struct platform_device *pdev) if (priv->phy_clk) clk_disable_unprepare(priv->phy_clk); -out_put_clk_phy: - if (priv->phy_clk) - clk_put(priv->phy_clk); - out_disable_clk_mac: clk_disable_unprepare(priv->mac_clk); -out_put_clk_mac: - clk_put(priv->mac_clk); out: free_netdev(dev); return ret; @@ -1949,12 +1943,10 @@ static int bcm_enet_remove(struct platform_device *pdev) } /* disable hw block clocks */ - if (priv->phy_clk) { + if (priv->phy_clk) clk_disable_unprepare(priv->phy_clk); - clk_put(priv->phy_clk); - } + clk_disable_unprepare(priv->mac_clk); - clk_put(priv->mac_clk); free_netdev(dev); return 0; @@ -2734,26 +2726,20 @@ static int bcm_enetsw_probe(struct platform_device *pdev) if (ret) goto out; - if (!request_mem_region(res_mem->start, resource_size(res_mem), - "bcm63xx_enetsw")) { - ret = -EBUSY; + priv->base = devm_ioremap_resource(&pdev->dev, res_mem); + if (IS_ERR(priv->base)) { + ret = PTR_ERR(priv->base); goto out; } - priv->base = ioremap(res_mem->start, resource_size(res_mem)); - if (priv->base == NULL) { - ret = -ENOMEM; - goto out_release_mem; - } - - priv->mac_clk = clk_get(&pdev->dev, "enetsw"); + priv->mac_clk = devm_clk_get(&pdev->dev, "enetsw"); if (IS_ERR(priv->mac_clk)) { ret = PTR_ERR(priv->mac_clk); - goto out_unmap; + goto out; } ret = clk_prepare_enable(priv->mac_clk); if (ret) - goto out_put_clk; + goto out; priv->rx_chan = 0; priv->tx_chan = 1; @@ -2785,15 +2771,6 @@ static int bcm_enetsw_probe(struct platform_device *pdev) out_disable_clk: clk_disable_unprepare(priv->mac_clk); - -out_put_clk: - clk_put(priv->mac_clk); - -out_unmap: - iounmap(priv->base); - -out_release_mem: - release_mem_region(res_mem->start, resource_size(res_mem)); out: free_netdev(dev); return ret; @@ -2805,20 +2782,13 @@ static int bcm_enetsw_remove(struct platform_device *pdev) { struct bcm_enet_priv *priv; struct net_device *dev; - struct resource *res; /* stop netdevice */ dev = platform_get_drvdata(pdev); priv = netdev_priv(dev); unregister_netdev(dev); - /* release device resources */ - iounmap(priv->base); - 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; From patchwork Sun Oct 1 11:02:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820257 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lWxRMWQi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j742FV2z9t2f for ; Sun, 1 Oct 2017 22:02:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751312AbdJALCW (ORCPT ); Sun, 1 Oct 2017 07:02:22 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33821 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751089AbdJALCS (ORCPT ); Sun, 1 Oct 2017 07:02:18 -0400 Received: by mail-wm0-f67.google.com with SMTP id i131so1869742wma.1 for ; Sun, 01 Oct 2017 04:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LHSwu0kDoG8CQPwwMaYVEWdpnTLkP9tgb/I9i9hFEgQ=; b=lWxRMWQiOu9idTooLp447+ZhH72RFHwye+3eGFWcCKzmxq/wm/n7SH7Pp8hy+Yzv9W vsfz5pejNJiaCfJ4MbRVS6YsvmThFkBs5g4wzVKQOwBhTZHMye/zhJIzuzv1BDmgvRlc 2PFOOc2LxyoyctQk9rStfVuw6rRIipMZ1btoyvb5aF2eQNjk3u0+VogMKin2MVfN0JR3 doxlIs4rKBvSZMmC1fPr2jCnQPZHcvmUsx3cfcXPU8bK8wDbfIjHrg2q1KnI/IBAloNn AlHmg63vX+XBYF9lsBYY0I6HOCyverTc3tgk6EeatSccXWtmuIZWyqxXxwWHtdGRdzRf ahhg== 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=LHSwu0kDoG8CQPwwMaYVEWdpnTLkP9tgb/I9i9hFEgQ=; b=AocR+mzwinb4GfmnslbAQAGL8HH3FPumgRsFxf2ZJD91f2jiRcc71se+Fg4dWfwUw3 xxMx5XNkw3q2BSv9hRDb/pi+08n+T+6zmPYtsDwBVai38jNeHS3iLRWrVD35IAKPCe2k GgB+I4cXM20WT7jesZq+M6dmR2WOWt5/jVPFdpJUAO22i2qe+XFBDLwsPdBvgMbQw0lB T427aT/PB3+h/fjLhZyeWr779GcIv6QphH3lXl+5Qxqi7W387P58/4PXgfcEk64wDjfC qjY/iX7IAmWjmIlq0E8O7srFRz5SMjhnTq6AgKcOLqnsBgJI2RRH07Yg7hcbFGE9GwaE Wyig== X-Gm-Message-State: AHPjjUiJghH/PQCRRrq5m4MEXsFEGUflMgON5V4S4qQVsLfjmk6I9CbD WpSEw2WBgJs7G8GIiGrHUXAxpw== X-Google-Smtp-Source: AOwi7QDTlHlT4RFAwxj249WTl40CQD1gm2zdewJTaJKSa9LB/hwgNDdf9/8P49nZgaz+SFvyNAc7EQ== X-Received: by 10.80.216.200 with SMTP id y8mr16622060edj.24.1506855736647; Sun, 01 Oct 2017 04:02:16 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:16 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 5/6] bcm63xx_enet: drop unneeded NULL phy_clk check Date: Sun, 1 Oct 2017 13:02:19 +0200 Message-Id: <20171001110220.27668-6-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org clk_disable and clk_unprepare are NULL-safe, so need to duplicate the NULL check of the functions. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 059ef4f1d137..f6bc13fe8a99 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1903,8 +1903,7 @@ 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) - clk_disable_unprepare(priv->phy_clk); + clk_disable_unprepare(priv->phy_clk); out_disable_clk_mac: clk_disable_unprepare(priv->mac_clk); @@ -1943,9 +1942,7 @@ static int bcm_enet_remove(struct platform_device *pdev) } /* disable hw block clocks */ - if (priv->phy_clk) - clk_disable_unprepare(priv->phy_clk); - + clk_disable_unprepare(priv->phy_clk); clk_disable_unprepare(priv->mac_clk); free_netdev(dev); From patchwork Sun Oct 1 11:02:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 820258 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z6JDsIrq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y4j774xTXz9t2f for ; Sun, 1 Oct 2017 22:02:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751292AbdJALCV (ORCPT ); Sun, 1 Oct 2017 07:02:21 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36734 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751005AbdJALCT (ORCPT ); Sun, 1 Oct 2017 07:02:19 -0400 Received: by mail-wm0-f67.google.com with SMTP id 63so678550wmn.3 for ; Sun, 01 Oct 2017 04:02:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZtEUtenDziwogPNZHOBV1IKm/luTEEYVY/ttMeIMH38=; b=Z6JDsIrquQBsaPi1kddFhT/8EDG0TEAePmFFGOP5sV4tBI6USLLz4eoK/6sAXXQ7PC MAINQUFoKOd3v24m9dcHs4TmVVw05cYWf/kKhzTihXyYuiFgaqkPAvWxO46JYrUSvRwh ez4e7T4MnskI6zQKn0MRm3TRAEpRW0i+P0QH1UCXq+dIrQv/eLbXLrJAQ1CKqfBgwD8J 0oWNyRibPV9SKGdxFKKSQIVq3iVgE2pwmlcm7di3ztXU+Z77IUfrNa5lTPl/cwqV2l8b zB2SRu72b+QckqiZTY40XZHZekXnZxVr2dyvQKWmugmfAnvh+TUK3rdVE8flcO55dspx 6P1Q== 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=ZtEUtenDziwogPNZHOBV1IKm/luTEEYVY/ttMeIMH38=; b=UMTuLFTxt86SK1mY9Ck93lstupyyK961LG/r2f7pViNjJnsRzzwIWBeerOwq3m1hC/ O96/vNxk+kKs2ssIsldvwz7Qsfn7OGAXJRz4eEDJtzrD7tTrrhvCtFyHiAmFMoyKQYLu uQ/eL+2x3btHEzCtuEERvfsNbKRvPx9Ngx/jTlFmzizsXqKCvpp0WT0v+K6+2+p7o4QN DNwCKqSN6M8S8DL9oUFOrWYsCLvAChbihTi+P3NzXu+8HaS2PIRUY1JuoplWvGMOcQQ6 lpM4iz/K/Kij7av52Qywuv8b/+uI7yctTnAgrzXDtUIjYal9rN5XQYYdyIuOiQLg4KUe IZ1Q== X-Gm-Message-State: AHPjjUhbmR5grz6rjJpAauIf4y8I5Bu1FdRBXpn3TJRu2I0IeMHuWGAT 3SN5U/NUJeoqs5fWSGTl2JrMrQ== X-Google-Smtp-Source: AOwi7QA3uF77nwK8Pk/35h0lFP/yj1JYJoViizVT0ZaIBfKcYMc9ICTsZABrxuMF1dVt4SztmsfL2g== X-Received: by 10.80.214.87 with SMTP id c23mr15893592edj.271.1506855737943; Sun, 01 Oct 2017 04:02:17 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::48e]) by smtp.gmail.com with ESMTPSA id 26sm7404270eds.5.2017.10.01.04.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 04:02:17 -0700 (PDT) From: Jonas Gorski To: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.or Cc: "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com Subject: [PATCH 6/6] bcm63xx_enet: remove unneeded include Date: Sun, 1 Oct 2017 13:02:20 +0200 Message-Id: <20171001110220.27668-7-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171001110220.27668-1-jonas.gorski@gmail.com> References: <20171001110220.27668-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We don't use anyhing from that file, so drop it. Signed-off-by: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h index 0a1b7b2e55bd..dd6ae3077433 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h @@ -8,7 +8,6 @@ #include #include -#include #include #include