From patchwork Thu Aug 30 00:40:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 963715 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4213n41zz9z9ryt for ; Thu, 30 Aug 2018 10:50:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727255AbeH3EtZ (ORCPT ); Thu, 30 Aug 2018 00:49:25 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:44602 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727233AbeH3EtY (ORCPT ); Thu, 30 Aug 2018 00:49:24 -0400 Received: by mail-pl1-f195.google.com with SMTP id ba4-v6so3037367plb.11 for ; Wed, 29 Aug 2018 17:49:55 -0700 (PDT) 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=sZdAF1HX9BbdV1yfLCar67yxiHmtRQzQeHqMiNrKbPs=; b=NbRbxnA4tmprtn9CsUyvkjfd0dmxbS2QOKZ6E3ng6+Brdz5r/R93em5AqvpXPDeTjo gw0VXKDwzBBzXMNA7f/oQPGZhsNHbj4j6WHv6IUEh+NL6jnOA3eLSSXz7/yexfAngZ0K Pe7akdQqkuukgwHbHuQRX+aEO4Z36FQqD+EAVSlADo7yaNpHlT8vw8PkMMpZjx6HLFNi afVINf3qmeIl5tByq/jawhtr61tEumsApZRjeQCebgW7Piz9TjAlLmYnTvtFy/CZIkt7 QQ2CJ1cZIHbi1BzYE6FQZjQqPIR6I1k8WJHS82o8y85JEZRRTEQIkHzyxJznWLaF73Nb uXRg== X-Gm-Message-State: APzg51AaqTMbx3lDlQ4hM2ZL4NDAwDSNMxTyiPnpQ6+Ne8+AA0OhJL1V 92ICcX9DMbkpx4hfyco8WLX7Bg== X-Google-Smtp-Source: ANB0VdZzNiZOPPWdii9hE3dkkI694wXXyffNNIdd97RySz8gu7J2FItgi6KavfQEW6qCKObye6GhHA== X-Received: by 2002:a17:902:b7c5:: with SMTP id v5-v6mr8142653plz.49.1535590195049; Wed, 29 Aug 2018 17:49:55 -0700 (PDT) Received: from localhost ([207.114.172.147]) by smtp.gmail.com with ESMTPSA id c68-v6sm8942472pfj.51.2018.08.29.17.49.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Aug 2018 17:49:54 -0700 (PDT) From: Moritz Fischer To: davem@davemloft.net Cc: keescook@chromium.org, f.fainelli@gmail.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, alex.williams@ni.com, Moritz Fischer Subject: [PATCH net-next 1/3] net: nixge: Add support for fixed-link subnodes Date: Wed, 29 Aug 2018 17:40:44 -0700 Message-Id: <20180830004046.9417-2-mdf@kernel.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830004046.9417-1-mdf@kernel.org> References: <20180830004046.9417-1-mdf@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support for fixed-link cases where no MDIO is actually required to run the device. In that case no MDIO bus is instantiated since the actual registers are not available in hardware. Signed-off-by: Moritz Fischer --- drivers/net/ethernet/ni/nixge.c | 72 ++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index 74cf52e3fb09..670249313ff0 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -1189,9 +1189,36 @@ static int nixge_mdio_write(struct mii_bus *bus, int phy_id, int reg, u16 val) return err; } +static int nixge_of_get_phy(struct nixge_priv *priv, struct device_node *np) +{ + priv->phy_mode = of_get_phy_mode(np); + if (priv->phy_mode < 0) { + dev_err(priv->dev, "not find \"phy-mode\" property\n"); + return -EINVAL; + } + + if (of_phy_is_fixed_link(np)) { + if (of_phy_register_fixed_link(np) < 0) { + dev_err(priv->dev, "broken fixed link spec\n"); + return -EINVAL; + } + + priv->phy_node = of_node_get(np); + } else { + priv->phy_node = of_parse_phandle(np, "phy-handle", 0); + if (!priv->phy_node) { + dev_err(priv->dev, "not find \"phy-handle\" property\n"); + return -EINVAL; + } + } + + return 0; +} + static int nixge_mdio_setup(struct nixge_priv *priv, struct device_node *np) { struct mii_bus *bus; + int err; bus = devm_mdiobus_alloc(priv->dev); if (!bus) @@ -1230,6 +1257,7 @@ static int nixge_probe(struct platform_device *pdev) struct nixge_priv *priv; struct net_device *ndev; struct resource *dmares; + struct device_node *np; const u8 *mac_addr; int err; @@ -1237,6 +1265,8 @@ static int nixge_probe(struct platform_device *pdev) if (!ndev) return -ENOMEM; + np = pdev->dev.of_node; + platform_set_drvdata(pdev, ndev); SET_NETDEV_DEV(ndev, &pdev->dev); @@ -1286,24 +1316,19 @@ static int nixge_probe(struct platform_device *pdev) priv->coalesce_count_rx = XAXIDMA_DFT_RX_THRESHOLD; priv->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD; - err = nixge_mdio_setup(priv, pdev->dev.of_node); - if (err) { - netdev_err(ndev, "error registering mdio bus"); - goto free_netdev; - } - - priv->phy_mode = of_get_phy_mode(pdev->dev.of_node); - if (priv->phy_mode < 0) { - netdev_err(ndev, "not find \"phy-mode\" property\n"); - err = -EINVAL; - goto unregister_mdio; + if (np) { + err = nixge_of_get_phy(priv, np); + if (err) + goto free_netdev; } - priv->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0); - if (!priv->phy_node) { - netdev_err(ndev, "not find \"phy-handle\" property\n"); - err = -EINVAL; - goto unregister_mdio; + /* only if it's not a fixed link, do we care about MDIO at all */ + if (priv->phy_node && !of_phy_is_fixed_link(np)) { + err = nixge_mdio_setup(priv, np); + if (err) { + dev_err(&pdev->dev, "error registering mdio bus"); + goto free_phy; + } } err = register_netdev(priv->ndev); @@ -1315,8 +1340,13 @@ static int nixge_probe(struct platform_device *pdev) return 0; unregister_mdio: - mdiobus_unregister(priv->mii_bus); - + if (priv->mii_bus) + mdiobus_unregister(priv->mii_bus); +free_phy: + if (np && of_phy_is_fixed_link(np)) { + of_phy_deregister_fixed_link(np); + of_node_put(np); + } free_netdev: free_netdev(ndev); @@ -1330,7 +1360,11 @@ static int nixge_remove(struct platform_device *pdev) unregister_netdev(ndev); - mdiobus_unregister(priv->mii_bus); + if (priv->mii_bus) + mdiobus_unregister(priv->mii_bus); + + if (np && of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); free_netdev(ndev);