From patchwork Mon Nov 28 18:25:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 700116 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tSG7H73LKz9vF6 for ; Tue, 29 Nov 2016 05:54:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lUKNhT1y"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tSG7H35WhzDvsF for ; Tue, 29 Nov 2016 05:54:19 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lUKNhT1y"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tSFXR1s5kzDvjk for ; Tue, 29 Nov 2016 05:27:35 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lUKNhT1y"; dkim-atps=neutral Received: by mail-lf0-x243.google.com with SMTP id p100so10340874lfg.2 for ; Mon, 28 Nov 2016 10:27:35 -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=jgBzppJ2b1iVgujwim8DYluu7EvGPja0B4IGDjLjpVM=; b=lUKNhT1yNqERMPiH3P+oecCU5dsIhsciTcH9Dxq2DwFFz8S92VHPwVSykULA+G+4al zOpJI+jr/CfzvGkRN3uA2KuIuaf1Ce4NyDB1ZsC/gL6chkH/X/ymh71zaue8nx+ui0nq KMer0IitsEIFpXRhQcJ4HxC0CDDQQT8R5ytnSLsBi8sgKPZXCaXrZu2n/QATmU87ILHJ pGk528UrVii6TPeIjvpaeujGztIsmSPOzf3hfdk6Tfgx8GnDvHhtJBrDCasgm7Y2K4Ah Ns8TV6t5ki+LSORgWLYdvLce1i9L8SGwWEl/OFBatJJx385feewIWZJ/mQvyRw6Mqrpu jJ2g== 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=jgBzppJ2b1iVgujwim8DYluu7EvGPja0B4IGDjLjpVM=; b=MhNIsOmIvCjfOcuUpuCfYGLPS9Lz4JClghbnFx1Lr/aRTFC+SBcSrZkoF3O9NL23W/ JwSOtefOuJRUMqa0KQ7L0GaUu7sSz2tULIyF9kLBtO53vF7OKZeiiEz05OR9YisbMzu9 9RpzO7xxOSdvZEOS1PK0Rw3az8X668ce3UE8JE55gH5cRsDN/vXWW64Ve4I0cr3p57E7 ZOdUNKCZuR08xJWfyHcmTJ2wr7rtXPBHbTth+xr7UvrkK4VUgBo5boBrJsZqjui5NCnO czGoms03fATbdkLaCau9RGNA93EKnt5U9NjPb5vaTETN90HO7NsZqF5n5BwqVc5nL3ul OO8g== X-Gm-Message-State: AKaTC02gUplqRtpe7fRpvRejF+9wXAFUvK/txj3uMdBYC/HrhMdGsSlNOmfClheaHwz/xw== X-Received: by 10.25.44.66 with SMTP id s63mr8707158lfs.159.1480357652345; Mon, 28 Nov 2016 10:27:32 -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 a9sm12831857ljb.9.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 1cBQeB-0007LF-4v; Mon, 28 Nov 2016 19:27:23 +0100 From: Johan Hovold To: "David S. Miller" Subject: [PATCH net 16/16] net: dsa: slave: fix fixed-link phydev leaks Date: Mon, 28 Nov 2016 19:25:09 +0100 Message-Id: <1480357509-28074-17-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> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , devicetree@vger.kernel.org, Frank Rowand , Felix Fietkau , Florian Fainelli , Claudiu Manoil , Mugunthan V N , Grygorii Strashko , linuxppc-dev@lists.ozlabs.org, Johan Hovold , Rob Herring , linux-mediatek@lists.infradead.org, Lars Persson , Matthias Brugger , linux-omap@vger.kernel.org, John Crispin , Thomas Petazzoni , Fugang Duan , Sergei Shtylyov , Vivien Didelot , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Vitaly Bordug , nios2-dev@lists.rocketboards.org, Vince Bridgers Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Make sure to deregister and free any fixed-link PHY registered using of_phy_register_fixed_link() on slave-setup errors and on slave destroy. Fixes: 0d8bcdd383b8 ("net: dsa: allow for more complex PHY setups") Signed-off-by: Johan Hovold --- net/dsa/slave.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 2a5c20a13fe4..30e2e21d7619 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1177,6 +1177,8 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p, ret = dsa_slave_phy_connect(p, slave_dev, p->port); if (ret) { netdev_err(slave_dev, "failed to connect to port %d: %d\n", p->port, ret); + if (phy_is_fixed) + of_phy_deregister_fixed_link(port_dn); return ret; } } @@ -1292,10 +1294,18 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent, void dsa_slave_destroy(struct net_device *slave_dev) { struct dsa_slave_priv *p = netdev_priv(slave_dev); + struct dsa_switch *ds = p->parent; + struct device_node *port_dn; + + port_dn = ds->ports[p->port].dn; netif_carrier_off(slave_dev); - if (p->phy) + if (p->phy) { phy_disconnect(p->phy); + + if (of_phy_is_fixed_link(port_dn)) + of_phy_deregister_fixed_link(port_dn); + } unregister_netdev(slave_dev); free_netdev(slave_dev); }