From patchwork Mon Dec 18 09:18:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 849912 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=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b="JUPDIbXl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z0b8F1DS5z9rxm for ; Mon, 18 Dec 2017 20:19:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932843AbdLRJTW (ORCPT ); Mon, 18 Dec 2017 04:19:22 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:44063 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933335AbdLRJSY (ORCPT ); Mon, 18 Dec 2017 04:18:24 -0500 Received: by mail-lf0-f67.google.com with SMTP id x204so16905494lfa.11 for ; Mon, 18 Dec 2017 01:18:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yFKH4iPXd/4r5YtctdJLRHkSGyeJeMMi1Ybj5jbDS+g=; b=JUPDIbXlni0Dw/OMZG+R96hQ34syUnY/gIdLkTboRQCLPzbir8BCduuvvXy2+Dxx25 0L/TblUUygRB4sXKxS1lN4pJXXU5PNHw8zH507hnpWRc8Pu/b0YoIdRzL+YGYQw9hSGP X2Na0+4i57S+ujL0vAMjzUMPExtud5FiwlIYxjCyg9cPcdZJH8gP+sxOD/iaBiD9m668 k/RFEIN51ClCi6H9rBBsLdmkriFOmnFHWO9I1+quytwqsCMwX5ZrX6/s18HQzGa9gulX EjfPb6L+QA/29rcVF/OhHzZtXvtJbblyEPtmDlPTcHvu3MmzLS+XMW5RgkaqODJBCee+ TN/w== 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=yFKH4iPXd/4r5YtctdJLRHkSGyeJeMMi1Ybj5jbDS+g=; b=cYalK555JE6rqB//3yl1dJ/JpXlJ4fpXBKywAiGNRySuTJjC4jJ3Q/5BKpMa5Y3JkM uvumeEWXEUx/6dN7KhUxND4zeBq8zJfjsxSeKGuhm5TyymifIm/yHdqS7WvSwDsc78jm O/yHKi05RuuCR3yy2/5DajwvlVzXIWdr95gIgA0fkff97KnrW7GGHo7t+XwHJbc92v7R pHBWYvFy2bNUx2b3ukeaT3NoCjWEW2gaQFBFFkvcjjxSjZkwhiXsUzGlq5EsLejuoMjB APUSno0+6NFa2ULBesQVZMQ0cKHsFUdboJcpifUvnTPxptlbZnRx9faNfaJalNUfGfmG 42FA== X-Gm-Message-State: AKGB3mLYfhqhWHRI7jO7OVhwOXkHdru8h6/xoRGWDZL8UkVg6PsUnyW2 xMeqB/5eVzPtBOfg5GTFGIQgDA== X-Google-Smtp-Source: ACJfBov9JYL1Vmvwvg2Z3RvapYhNemVaMw+cnPzfvXcUpKCuLFAVfMOQ7seUhF5LvrIbXjNUmFbL+w== X-Received: by 10.25.21.11 with SMTP id l11mr9296634lfi.142.1513588703151; Mon, 18 Dec 2017 01:18:23 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id r16sm2407186ljd.18.2017.12.18.01.18.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Dec 2017 01:18:22 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Cc: davem@davemloft.net, linux@arm.linux.org.uk, rafael.j.wysocki@intel.com, andrew@lunn.ch, f.fainelli@gmail.com, antoine.tenart@free-electrons.com, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, ezequiel.garcia@free-electrons.com, nadavh@marvell.com, neta@marvell.com, ard.biesheuvel@linaro.org, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com Subject: [net-next: PATCH 7/8] net: mvpp2: handle PHY with its fwnode Date: Mon, 18 Dec 2017 10:18:03 +0100 Message-Id: <1513588684-15647-8-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513588684-15647-1-git-send-email-mw@semihalf.com> References: <1513588684-15647-1-git-send-email-mw@semihalf.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Newly introduced mvmdio driver ACPI support and also fwnode MDIO helpers allow for switching to PHY handling with its fwnode. This patch replaces of_* related PHY handling function with the fwnode_* equivalent and updates mvpp2_port structure accordingly. Signed-off-by: Marcin Wojtas --- drivers/net/ethernet/marvell/mvpp2.c | 41 ++++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 537474f..4e61ce7 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -963,7 +963,7 @@ struct mvpp2_port { struct delayed_work stats_work; phy_interface_t phy_interface; - struct device_node *phy_node; + struct fwnode_handle *phy_fwnode; struct phy *comphy; unsigned int link; unsigned int duplex; @@ -6890,14 +6890,22 @@ static void mvpp21_get_mac_address(struct mvpp2_port *port, unsigned char *addr) static int mvpp2_phy_connect(struct mvpp2_port *port) { struct phy_device *phy_dev; + int ret; /* No PHY is attached */ - if (!port->phy_node) + if (!port->phy_fwnode) return 0; - phy_dev = of_phy_connect(port->dev, port->phy_node, mvpp2_link_event, 0, + phy_dev = fwnode_phy_find_device(port->phy_fwnode); + phy_dev->dev_flags = 0; + + ret = phy_connect_direct(port->dev, phy_dev, mvpp2_link_event, port->phy_interface); - if (!phy_dev) { + + /* Refcount is held by phy_connect_direct() on success */ + put_device(&phy_dev->mdio.dev); + + if (ret) { netdev_err(port->dev, "cannot connect to phy\n"); return -ENODEV; } @@ -7047,7 +7055,7 @@ static int mvpp2_open(struct net_device *dev) goto err_cleanup_txqs; } - if (priv->hw_version == MVPP22 && !port->phy_node && port->link_irq) { + if (priv->hw_version == MVPP22 && !port->phy_fwnode && port->link_irq) { err = request_irq(port->link_irq, mvpp2_link_status_isr, 0, dev->name, port); if (err) { @@ -7082,7 +7090,7 @@ static int mvpp2_open(struct net_device *dev) return 0; err_free_link_irq: - if (priv->hw_version == MVPP22 && !port->phy_node && port->link_irq) + if (priv->hw_version == MVPP22 && !port->phy_fwnode && port->link_irq) free_irq(port->link_irq, port); err_free_irq: mvpp2_irqs_deinit(port); @@ -7107,7 +7115,7 @@ static int mvpp2_stop(struct net_device *dev) on_each_cpu(mvpp2_interrupts_mask, port, 1); mvpp2_shared_interrupt_mask_unmask(port, true); - if (priv->hw_version == MVPP22 && !port->phy_node && port->link_irq) + if (priv->hw_version == MVPP22 && !port->phy_fwnode && port->link_irq) free_irq(port->link_irq, port); mvpp2_irqs_deinit(port); @@ -7745,11 +7753,11 @@ static int mvpp2_port_probe(struct platform_device *pdev, struct fwnode_handle *port_fwnode, struct mvpp2 *priv) { - struct device_node *phy_node; struct phy *comphy; struct mvpp2_port *port; struct mvpp2_port_pcpu *port_pcpu; struct device_node *port_node = to_of_node(port_fwnode); + struct fwnode_reference_args args; struct net_device *dev; struct resource *res; char *mac_from = ""; @@ -7779,7 +7787,6 @@ static int mvpp2_port_probe(struct platform_device *pdev, if (!dev) return -ENOMEM; - phy_node = of_parse_phandle(port_node, "phy", 0); phy_mode = fwnode_get_phy_mode(port_fwnode); if (phy_mode < 0) { dev_err(&pdev->dev, "incorrect phy mode\n"); @@ -7814,6 +7821,17 @@ static int mvpp2_port_probe(struct platform_device *pdev, port->priv = priv; port->has_tx_irqs = has_tx_irqs; + err = fwnode_property_get_reference_args(port_fwnode, "phy", NULL, + 0, 0, &args); + if (!err) { + port->phy_fwnode = args.fwnode; + } else if (err == -ENOENT) { + port->phy_fwnode = NULL; + } else { + dev_err(&pdev->dev, "unable to parse \"phy\" node\n"); + goto err_free_netdev; + } + err = mvpp2_queue_vectors_init(port, port_node); if (err) goto err_free_netdev; @@ -7836,7 +7854,6 @@ static int mvpp2_port_probe(struct platform_device *pdev, else port->first_rxq = port->id * priv->max_port_rxqs; - port->phy_node = phy_node; port->phy_interface = phy_mode; port->comphy = comphy; @@ -7958,7 +7975,7 @@ static int mvpp2_port_probe(struct platform_device *pdev, err_deinit_qvecs: mvpp2_queue_vectors_deinit(port); err_free_netdev: - of_node_put(phy_node); + fwnode_handle_put(args.fwnode); free_netdev(dev); return err; } @@ -7969,7 +7986,7 @@ static void mvpp2_port_remove(struct mvpp2_port *port) int i; unregister_netdev(port->dev); - of_node_put(port->phy_node); + fwnode_handle_put(port->phy_fwnode); free_percpu(port->pcpu); free_percpu(port->stats); for (i = 0; i < port->ntxqs; i++)