From patchwork Mon Nov 28 18:25:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9449997 X-Patchwork-Delegate: geert@linux-m68k.org 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 5F35D60756 for ; Mon, 28 Nov 2016 18:33:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 567BC27D4A for ; Mon, 28 Nov 2016 18:33:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B2B525D97; Mon, 28 Nov 2016 18:33:00 +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 F3CF927D4A for ; Mon, 28 Nov 2016 18:32:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754443AbcK1S2R (ORCPT ); Mon, 28 Nov 2016 13:28:17 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:36335 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753105AbcK1S1e (ORCPT ); Mon, 28 Nov 2016 13:27:34 -0500 Received: by mail-lf0-f67.google.com with SMTP id o20so10330470lfg.3; Mon, 28 Nov 2016 10:27:32 -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=zXERGpsslaXZQzocy+0LTuaLAQ78fmF01MIvNI+Cfdk=; b=Y6OSS/THH/C+n8EjT5yht0odHpVyvxasmPXkj0vobozozKhlhCEfw3/evoIQ/u0ODP 3AJfnVSuTdv4liYzk+zsI3wWQTuac4f78Pr8MT1RPNQ3F+/PKHALiZEwj4vnrdsiCKt5 gcBRvcKp2K9SpaB5XCYs+2Ziv1/LDm5dOgMpsq/pKv6EKjYBUQYAmddSM3dKAqGgju3x UPjxsKpib5FPU/QsI1SL/aaEeTd31yF4yHvLXkpE4HyBgyDJOBt7zK+2Fg8gxsWPkosw qbg/tMYk6yYajH/7fSJBvf1uOy1cKRv42Ee8PAVDA29PTuTe+3rija9FwcHv8ZVGvZ++ uYSA== 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=zXERGpsslaXZQzocy+0LTuaLAQ78fmF01MIvNI+Cfdk=; b=gOufd5Nlc75nGIIeTjzoPUTKN2QvNpH4RwR77udYiEmfXuyoXq1jnjUk58orjJW2Ay Jdn5FPgAQqejkma6ZzljJc0LdWnXfZ+lief6Frrs22+yofMvcnndVopi6fwbtcxmEsoG vIJ0YE16nCTVUgSUe4AtSqApzOIX+nZGVEZdskyCPw9B0gAd9o1uA49ruwZI/3SBN54r Nrj4TcexSVflAzGoVhyvbKwq3mG2Js7BCc/v9bwnzWFLSPx06gEBn6FHMG5kgEmf3McF /Oxwz6Kg0G1h6gkxp2r/iEftDysBRYoSyX3UX4ZGPStMC2ZDj3ZSDrdfelboBqPAbIfr 1Sig== X-Gm-Message-State: AKaTC01XG7kAuaii653tWbgq2iH/BlobEccFYfkeaUqipT5kI6yPSj6mDmJQehKvuG5tnQ== X-Received: by 10.25.22.210 with SMTP id 79mr8654543lfw.170.1480357651912; Mon, 28 Nov 2016 10:27:31 -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 o84sm13210583lfg.49.2016.11.28.10.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 10:27:30 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1cBQeA-0007L0-TG; Mon, 28 Nov 2016 19:27:22 +0100 From: Johan Hovold To: "David S. Miller" Cc: Vince Bridgers , Florian Fainelli , Fugang Duan , Pantelis Antoniou , Vitaly Bordug , Claudiu Manoil , Li Yang , Thomas Petazzoni , Felix Fietkau , John Crispin , Matthias Brugger , Sergei Shtylyov , Lars Persson , Mugunthan V N , Grygorii Strashko , Rob Herring , Frank Rowand , Andrew Lunn , Vivien Didelot , netdev@vger.kernel.org, nios2-dev@lists.rocketboards.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH net 13/16] net: ethernet: renesas: ravb: fix fixed-link phydev leaks Date: Mon, 28 Nov 2016 19:25:06 +0100 Message-Id: <1480357509-28074-14-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1480357509-28074-1-git-send-email-johan@kernel.org> References: <1480357509-28074-1-git-send-email-johan@kernel.org> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure to deregister and free any fixed-link PHY registered using of_phy_register_fixed_link() on initialisation errors and on device close after having disconnected the PHY. Fixes: b4bc88a868ed ("ravb: Add fixed-link support") Signed-off-by: Johan Hovold --- drivers/net/ethernet/renesas/ravb_main.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 630536bc72f9..f1f3be2cfe21 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -1008,7 +1008,8 @@ static int ravb_phy_init(struct net_device *ndev) of_node_put(pn); if (!phydev) { netdev_err(ndev, "failed to connect PHY\n"); - return -ENOENT; + err = -ENOENT; + goto err_deregister_fixed_link; } /* This driver only support 10/100Mbit speeds on Gen3 @@ -1020,8 +1021,7 @@ static int ravb_phy_init(struct net_device *ndev) err = phy_set_max_speed(phydev, SPEED_100); if (err) { netdev_err(ndev, "failed to limit PHY to 100Mbit/s\n"); - phy_disconnect(phydev); - return err; + goto err_phy_disconnect; } netdev_info(ndev, "limited PHY to 100Mbit/s\n"); @@ -1033,6 +1033,14 @@ static int ravb_phy_init(struct net_device *ndev) phy_attached_info(phydev); return 0; + +err_phy_disconnect: + phy_disconnect(phydev); +err_deregister_fixed_link: + if (of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); + + return err; } /* PHY control start function */ @@ -1634,6 +1642,7 @@ static void ravb_set_rx_mode(struct net_device *ndev) /* Device close function for Ethernet AVB */ static int ravb_close(struct net_device *ndev) { + struct device_node *np = ndev->dev.parent->of_node; struct ravb_private *priv = netdev_priv(ndev); struct ravb_tstamp_skb *ts_skb, *ts_skb2; @@ -1663,6 +1672,8 @@ static int ravb_close(struct net_device *ndev) if (ndev->phydev) { phy_stop(ndev->phydev); phy_disconnect(ndev->phydev); + if (of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); } if (priv->chip_id != RCAR_GEN2) {