From patchwork Mon Nov 25 15:27:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 3232941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 57CB6C045B for ; Mon, 25 Nov 2013 15:28:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82D1E20204 for ; Mon, 25 Nov 2013 15:28:49 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9DF17201BF for ; Mon, 25 Nov 2013 15:28:44 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vky59-0006QB-Ux; Mon, 25 Nov 2013 15:28:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vky52-0002CU-1f; Mon, 25 Nov 2013 15:28:08 +0000 Received: from mail-la0-x234.google.com ([2a00:1450:4010:c03::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vky4k-00028E-RK for linux-arm-kernel@lists.infradead.org; Mon, 25 Nov 2013 15:27:52 +0000 Received: by mail-la0-f52.google.com with SMTP id y1so1264325lam.39 for ; Mon, 25 Nov 2013 07:27:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KF5rTuCVtH6GIVFBB9doSJxsW15vyZjJ/JcOfa0aKwk=; b=S9Dsm/1hAE4SxwZ1KaKJWv1CwfV8UsHZEnHNdjRPdVMJTRNi5+BFeMqaZ0Z+u4dixR B8zUejyyJSKTgQSwtX8SXzXjszv5QYelbgcO4TdM/QpdyBuH8ftPcTYKHzTmMg7U7bWB T9At5Eie5ZTTV3gYc8k8sjpzmGHE84OqU+6E9s9QJUNsK3zc24ZTl0baG4qXg3P4QtSs LzkK+RA+WLdhq5JwW/PzuvwpKGKHN7GeixghmJjTYXeHiOFZypTM9Ag+AoYLEOF4M1eU n+/wa1/CLSj8VW1bx8MbKKlTbDwij7DILnGPI97ECYL8Bxt5L2p2I7Fssqll4sUnmi47 7zoQ== X-Received: by 10.112.219.99 with SMTP id pn3mr6061681lbc.24.1385393248531; Mon, 25 Nov 2013 07:27:28 -0800 (PST) Received: from Ildjarn.ath.cx (static-213-115-41-10.sme.bredbandsbolaget.se. [213.115.41.10]) by mx.google.com with ESMTPSA id bo10sm6487292lbb.16.2013.11.25.07.27.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 25 Nov 2013 07:27:27 -0800 (PST) From: Jonas Jensen To: netdev@vger.kernel.org Subject: [PATCH v2 2/6] net: MOXA ART: connect to PHY Date: Mon, 25 Nov 2013 16:27:04 +0100 Message-Id: <1385393228-22416-2-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1385393228-22416-1-git-send-email-jonas.jensen@gmail.com> References: <1385393228-22416-1-git-send-email-jonas.jensen@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131125_102751_186823_F8A1048E X-CRM114-Status: GOOD ( 18.51 ) X-Spam-Score: -2.0 (--) Cc: f.fainelli@gmail.com, linux-kernel@vger.kernel.org, Jonas Jensen , bhutchings@solarflare.com, davem@davemloft.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The kernel now has a MDIO bus driver and a phy_driver (RTL8201CP), connect to this PHY using OF. Signed-off-by: Jonas Jensen Reviewed-by: Florian Fainelli --- Notes: Thanks for reviewing! Changes since v1: 1. split ethtool support to separate patch 2. changes to devicetree binding document 3. add moxart_mac_update_duplex() 4. compare previous link state/speed/duplex on link adjust 5. use of_get_phy_mode() not PHY_INTERFACE_MODE_MII 6. bail on of_parse_phandle() failure 7. remove "if (!priv->phy_dev) return -ENODEV;" moxart_do_ioctl() 8. remove "if (priv->phy_dev)" moxart_mac_open(), moxart_mac_stop() Applies to next-20131125 .../devicetree/bindings/net/moxa,moxart-mac.txt | 47 ++++++++++- drivers/net/ethernet/moxa/moxart_ether.c | 92 +++++++++++++++++++++- drivers/net/ethernet/moxa/moxart_ether.h | 2 + 3 files changed, 138 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt index 583418b..56f0374 100644 --- a/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt +++ b/Documentation/devicetree/bindings/net/moxa,moxart-mac.txt @@ -1,21 +1,64 @@ MOXA ART Ethernet Controller +Integrated MDIO bus node: + +- compatible: "moxa,moxart-mdio" +- Inherets from MDIO bus node binding[1] + +[1] Documentation/devicetree/bindings/net/phy.txt + + +Ethernet node: + Required properties: - compatible : Must be "moxa,moxart-mac" - reg : Should contain register location and length - interrupts : Should contain the mac interrupt number +Optional Properties: + +- phy-handle : the phandle to a PHY node + + Example: + mdio0: mdio@90900090 { + compatible = "moxa,moxart-mdio"; + reg = <0x90900090 0x8>; + #address-cells = <1>; + #size-cells = <0>; + + ethphy0: ethernet-phy@1 { + device_type = "ethernet-phy"; + compatible = "moxa,moxart-rtl8201cp", "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + }; + + mdio1: mdio@92000090 { + compatible = "moxa,moxart-mdio"; + reg = <0x92000090 0x8>; + #address-cells = <1>; + #size-cells = <0>; + + ethphy1: ethernet-phy@1 { + device_type = "ethernet-phy"; + compatible = "moxa,moxart-rtl8201cp", "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + }; + mac0: mac@90900000 { compatible = "moxa,moxart-mac"; - reg = <0x90900000 0x100>; + reg = <0x90900000 0x90>; interrupts = <25 0>; + phy-handle = <ðphy0>; }; mac1: mac@92000000 { compatible = "moxa,moxart-mac"; - reg = <0x92000000 0x100>; + reg = <0x92000000 0x90>; interrupts = <27 0>; + phy-handle = <ðphy1>; }; diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 3c14afd..1b87034 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -26,6 +26,9 @@ #include #include #include +#include +#include +#include #include "moxart_ether.h" @@ -61,6 +64,16 @@ static int moxart_set_mac_address(struct net_device *ndev, void *addr) return 0; } +static int moxart_do_ioctl(struct net_device *ndev, struct ifreq *ir, int cmd) +{ + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + + if (!netif_running(ndev)) + return -EINVAL; + + return phy_mii_ioctl(priv->phy_dev, ir, cmd); +} + static void moxart_mac_free_memory(struct net_device *ndev) { struct moxart_mac_priv_t *priv = netdev_priv(ndev); @@ -110,6 +123,19 @@ static void moxart_mac_enable(struct net_device *ndev) writel(priv->reg_maccr, priv->base + REG_MAC_CTRL); } +static void moxart_mac_update_duplex(struct net_device *ndev) +{ + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + + priv->reg_maccr &= ~(FULLDUP | ENRX_IN_HALFTX); + if (priv->duplex) + priv->reg_maccr |= FULLDUP; + else + priv->reg_maccr |= ENRX_IN_HALFTX; + + writel(priv->reg_maccr, priv->base + REG_MAC_CTRL); +} + static void moxart_mac_setup_desc_ring(struct net_device *ndev) { struct moxart_mac_priv_t *priv = netdev_priv(ndev); @@ -169,6 +195,9 @@ static int moxart_mac_open(struct net_device *ndev) moxart_update_mac_address(ndev); moxart_mac_setup_desc_ring(ndev); moxart_mac_enable(ndev); + + phy_start(priv->phy_dev); + netif_start_queue(ndev); netdev_dbg(ndev, "%s: IMR=0x%x, MACCR=0x%x\n", @@ -184,6 +213,8 @@ static int moxart_mac_stop(struct net_device *ndev) napi_disable(&priv->napi); + phy_stop(priv->phy_dev); + netif_stop_queue(ndev); /* disable all interrupts */ @@ -429,12 +460,49 @@ static struct net_device_ops moxart_netdev_ops = { .ndo_set_mac_address = moxart_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = eth_change_mtu, + .ndo_do_ioctl = moxart_do_ioctl, }; +static void moxart_adjust_link(struct net_device *ndev) +{ + struct moxart_mac_priv_t *priv = netdev_priv(ndev); + unsigned long flags; + int status_change = 0; + + if (priv->phy_dev->link) { + if (priv->speed != priv->phy_dev->speed) { + priv->speed = priv->phy_dev->speed; + status_change = 1; + } + + if (priv->duplex != priv->phy_dev->duplex) { + spin_lock_irqsave(&priv->txlock, flags); + + priv->duplex = priv->phy_dev->duplex; + moxart_mac_update_duplex(ndev); + + spin_unlock_irqrestore(&priv->txlock, flags); + status_change = 1; + } + } + + if (priv->link != priv->phy_dev->link) { + if (!priv->phy_dev->link) { + priv->speed = 0; + priv->duplex = -1; + } + priv->link = priv->phy_dev->link; + status_change = 1; + } + + if (status_change) + phy_print_status(priv->phy_dev); +} + static int moxart_mac_probe(struct platform_device *pdev) { struct device *p_dev = &pdev->dev; - struct device_node *node = p_dev->of_node; + struct device_node *node = p_dev->of_node, *phy_node; struct net_device *ndev; struct moxart_mac_priv_t *priv; struct resource *res; @@ -455,6 +523,28 @@ static int moxart_mac_probe(struct platform_device *pdev) priv = netdev_priv(ndev); priv->ndev = ndev; + priv->link = 0; + priv->speed = 0; + priv->duplex = -1; + + phy_node = of_parse_phandle(node, "phy-handle", 0); + if (!phy_node) { + dev_err(p_dev, "of_parse_phandle failed\n"); + ret = -ENODEV; + goto init_fail; + } + + if (phy_node) { + priv->phy_dev = of_phy_connect(priv->ndev, phy_node, + &moxart_adjust_link, + 0, of_get_phy_mode(node)); + if (!priv->phy_dev) { + dev_err(p_dev, "of_phy_connect failed\n"); + ret = -ENODEV; + goto init_fail; + } + } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ndev->base_addr = res->start; priv->base = devm_ioremap_resource(p_dev, res); diff --git a/drivers/net/ethernet/moxa/moxart_ether.h b/drivers/net/ethernet/moxa/moxart_ether.h index 2be9280..b8877bf 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.h +++ b/drivers/net/ethernet/moxa/moxart_ether.h @@ -297,6 +297,8 @@ struct moxart_mac_priv_t { unsigned int reg_imr; struct napi_struct napi; struct net_device *ndev; + struct phy_device *phy_dev; + int speed, duplex, link; dma_addr_t rx_base; dma_addr_t rx_mapping[RX_DESC_NUM];