From patchwork Wed Dec 12 12:33:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 1011907 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=infinera.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43FGSY71F1z9s0n for ; Wed, 12 Dec 2018 23:33:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727308AbeLLMdc (ORCPT ); Wed, 12 Dec 2018 07:33:32 -0500 Received: from smtp.transmode.se ([31.15.61.139]:57714 "EHLO smtp.transmode.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727155AbeLLMdb (ORCPT ); Wed, 12 Dec 2018 07:33:31 -0500 Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [10.210.73.31]) by smtp.transmode.se (Postfix) with ESMTP id 2172F1187072; Wed, 12 Dec 2018 13:33:28 +0100 (CET) Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [127.0.0.1]) by gentoo-jocke.infinera.com (8.14.9/8.14.9) with ESMTP id wBCCXSln020158; Wed, 12 Dec 2018 13:33:28 +0100 Received: (from jocke@localhost) by gentoo-jocke.infinera.com (8.14.9/8.14.9/Submit) id wBCCXQ4G020156; Wed, 12 Dec 2018 13:33:26 +0100 From: Joakim Tjernlund To: "netdev @ vger . kernel . org" , "claudiu . manoil @ nxp . com" , Florian Fainelli , Andrew Lunn Cc: Joakim Tjernlund Subject: [PATCHv2] gianfar: Add gfar_change_carrier() for Fixed PHYs Date: Wed, 12 Dec 2018 13:33:08 +0100 Message-Id: <20181212123308.20100-1-joakim.tjernlund@infinera.com> X-Mailer: git-send-email 2.18.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This allows to control carrier from /sys/class/net/ethX/carrier for Fixed PHYs. Signed-off-by: Joakim Tjernlund --- v2 - Only allow carrier changes for Fixed PHYs Florian: I have reimpl. this as I think you meant by registering a Fixed PHY callback. Andrew: Are happy with this as well? If this is OK I will sent the other 2 drivers. drivers/net/ethernet/freescale/gianfar.c | 26 ++++++++++++++++++++++++ drivers/net/ethernet/freescale/gianfar.h | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 63daae120b2d..49971093e10f 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -491,7 +491,28 @@ static int gfar_set_mac_addr(struct net_device *dev, void *p) return 0; } +static int gfar_fixed_phy_link_update(struct net_device *dev, + struct fixed_phy_status *status) +{ + struct gfar_private *priv; + + if (dev && dev->phydev && status) { + priv = netdev_priv(dev); + status->link = !priv->no_carrier; + } + return 0; +} +static int gfar_change_carrier(struct net_device *dev, bool new_carrier) +{ + struct phy_device *phydev = dev->phydev; + struct gfar_private *priv; + if (!phy_is_pseudo_fixed_link(phydev)) + return -EINVAL; + priv = netdev_priv(dev); + priv->no_carrier = !new_carrier; + return 0; +} static const struct net_device_ops gfar_netdev_ops = { .ndo_open = gfar_enet_open, .ndo_start_xmit = gfar_start_xmit, @@ -502,6 +523,7 @@ static const struct net_device_ops gfar_netdev_ops = { .ndo_tx_timeout = gfar_timeout, .ndo_do_ioctl = gfar_ioctl, .ndo_get_stats = gfar_get_stats, + .ndo_change_carrier = gfar_change_carrier, .ndo_set_mac_address = gfar_set_mac_addr, .ndo_validate_addr = eth_validate_addr, #ifdef CONFIG_NET_POLL_CONTROLLER @@ -1807,6 +1829,10 @@ static int init_phy(struct net_device *dev) return -ENODEV; } + if (phy_is_pseudo_fixed_link(phydev)) + fixed_phy_set_link_update(phydev, + gfar_fixed_phy_link_update); + if (interface == PHY_INTERFACE_MODE_SGMII) gfar_configure_serdes(dev); diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h index 5aa814799d70..94a64d2dcc6f 100644 --- a/drivers/net/ethernet/freescale/gianfar.h +++ b/drivers/net/ethernet/freescale/gianfar.h @@ -1158,7 +1158,7 @@ struct gfar_private { int oldspeed; int oldduplex; int oldlink; - + bool no_carrier; uint32_t msg_enable; struct work_struct reset_task;