From patchwork Thu Jul 7 00:35:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 9217475 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 19F22607D9 for ; Thu, 7 Jul 2016 00:38:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AE5428578 for ; Thu, 7 Jul 2016 00:38:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3AA028590; Thu, 7 Jul 2016 00:38:19 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A2F7A28578 for ; Thu, 7 Jul 2016 00:38:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKxJF-0000xF-1z; Thu, 07 Jul 2016 00:36:53 +0000 Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKxIC-0008Ej-3b for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2016 00:35:51 +0000 Received: by mail-pf0-x22f.google.com with SMTP id c2so875608pfa.2 for ; Wed, 06 Jul 2016 17:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3x2jriQjqd/Nl4SeS2SISp7tPu8UdRThS0F1a6U37p4=; b=brOvIhsIL+DCEwAE60OpcoHuQg2BTKAG31aJuVfsiZdOwYiYjwoHgqDiRAXr4HYhek Ex0DCzr6IeWVn7T0vgjdDZaykjKo0YQzJ7wUxosBEjFuMm6lQgZXDdD3So5eRsjY83xB g5GcJlg5DIZlpL2eiEFQ2AvIRPZmWIev9I5Rg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3x2jriQjqd/Nl4SeS2SISp7tPu8UdRThS0F1a6U37p4=; b=UrbRM2CXDSq0Bk4FkJcbvVnRRI5pvl5ltrCoDSJ2rXk7sBw0FRuNCcisRj5xG2IhNj uktpjcV1HU+W1FgQaYGXDuNDldJgorzMMeeHpuqGoRsenMLc/dPOGcNA+6ZdYzDYsToj S/OsKYdZUGWxOG9EUD8MNituBWUyBu/DINET6sKPJqgwggpiWe9apcglumJYDMOuAS7h U8K1NHPVWvm8NZa0rsyfverecfFKGjAvAk3BDxaITFzuY/Ci+op3IymN5/8uCiFY2Y14 KA+4rEqBLYZT/0tr6GLJj7zv0I9PbPb7/mo7IoJDy3yW3fqIS8ftPR5IfPHxCrdz89Iv pX8w== X-Gm-Message-State: ALyK8tKkPSGAAxVz6wNxXBqSY/JW7rCw6x1GGMGN0bOeQQs0gjlNqjGuSRnQmroBC+c1BNlx X-Received: by 10.98.71.15 with SMTP id u15mr310472pfa.69.1467851727267; Wed, 06 Jul 2016 17:35:27 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id p63sm6769956pfp.65.2016.07.06.17.35.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 17:35:26 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 07/11] drivers: net: xgene: Enable MDIO driver Date: Wed, 6 Jul 2016 17:35:08 -0700 Message-Id: <1467851712-24780-8-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467851712-24780-1-git-send-email-isubramanian@apm.com> References: <1467851712-24780-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160706_173548_573223_112BD16D X-CRM114-Status: GOOD ( 15.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthias.bgg@gmail.com, andrew@lunn.ch, patches@apm.com, linux-arm-kernel@lists.infradead.org, Iyappan Subramanian MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch enables MDIO driver by, - Selecting MDIO_XGENE - Changed open and close to use phy_start and phy_stop - Changed to use mac_ops->tx(rx)_enable and tx(rx)_disable Signed-off-by: Iyappan Subramanian Tested-by: Fushen Chen Tested-by: Toan Le Tested-by: Matthias Brugger --- drivers/net/ethernet/apm/xgene/Kconfig | 1 + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 8 ++++---- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig index 19e38af..300e3b5 100644 --- a/drivers/net/ethernet/apm/xgene/Kconfig +++ b/drivers/net/ethernet/apm/xgene/Kconfig @@ -3,6 +3,7 @@ config NET_XGENE depends on HAS_DMA depends on ARCH_XGENE || COMPILE_TEST select PHYLIB + select MDIO_XGENE help This is the Ethernet driver for the on-chip ethernet interface on the APM X-Gene SoC. diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c index 96f8de7..37d0c14 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c @@ -788,13 +788,13 @@ static void xgene_enet_adjust_link(struct net_device *ndev) if (pdata->phy_speed != phydev->speed) { pdata->phy_speed = phydev->speed; mac_ops->set_speed(pdata); - xgene_gmac_rx_enable(pdata); - xgene_gmac_tx_enable(pdata); + mac_ops->rx_enable(pdata); + mac_ops->tx_enable(pdata); phy_print_status(phydev); } } else { - xgene_gmac_rx_disable(pdata); - xgene_gmac_tx_disable(pdata); + mac_ops->rx_disable(pdata); + mac_ops->tx_disable(pdata); pdata->phy_speed = SPEED_UNKNOWN; phy_print_status(phydev); } diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index a8693de..ed30b51 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -739,9 +739,9 @@ static int xgene_enet_open(struct net_device *ndev) if (ret) return ret; - if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) + if (pdata->phy_dev) { phy_start(pdata->phy_dev); - else { + } else { schedule_delayed_work(&pdata->link_work, PHY_POLL_LINK_OFF); netif_carrier_off(ndev); } @@ -756,12 +756,12 @@ static int xgene_enet_open(struct net_device *ndev) static int xgene_enet_close(struct net_device *ndev) { struct xgene_enet_pdata *pdata = netdev_priv(ndev); - const struct xgene_mac_ops *mac_ops = pdata->mac_ops; int i; - netif_tx_stop_all_queues(ndev); - mac_ops->tx_disable(pdata); - mac_ops->rx_disable(pdata); + if (pdata->phy_dev) + phy_stop(pdata->phy_dev); + else + cancel_delayed_work_sync(&pdata->link_work); if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) phy_stop(pdata->phy_dev);