From patchwork Sat Jun 15 23:46:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parshuram Raju Thombare X-Patchwork-Id: 1116494 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=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="DWa049fP"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="PpzBLhJt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45RGVL2gSYz9s9y for ; Sun, 16 Jun 2019 11:10:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727044AbfFPBKJ (ORCPT ); Sat, 15 Jun 2019 21:10:09 -0400 Received: from mx0a-0014ca01.pphosted.com ([208.84.65.235]:38688 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726434AbfFPBKI (ORCPT ); Sat, 15 Jun 2019 21:10:08 -0400 Received: from pps.filterd (m0042385.ppops.net [127.0.0.1]) by mx0a-0014ca01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5FNilM8025954; Sat, 15 Jun 2019 16:46:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=N7Eqj6s2lfu9gv2thWZbJ13/QDK2b/oLzQIcZPDvE2A=; b=DWa049fPP2fkTjvpI7TUvax+/t2Fx1ZEQyUdZ139BJhGwndgb7jBuks6S/V9BX1PspWj kHlxgMvhbc3IMJtO7gwIwvrf1gFbl1JS+2FwU5dqTwqICDzZi8EKBMA/eGbqtfqOxjxA jwKHX3hRmOPuPl8nf5k/dBIJmpXdSpBMoZ8IcYROhAFUbIzEMEf160b3wKa3lrzP/6ja hKB6qLiXgkhq+8en+cDLYuf7kaRgdSvubpjKi9SL55Im5IchMlYI2Prm9p2OT3lABBji sLWGB8KUBX8jbzAGVlZX2a+VAvrgsYngSi1zA1/dWbR6uiivYyNP8b4BX3mfcy03TG63 8A== Authentication-Results: cadence.com; spf=pass smtp.mailfrom=pthombar@cadence.com Received: from nam04-co1-obe.outbound.protection.outlook.com (mail-co1nam04lp2054.outbound.protection.outlook.com [104.47.45.54]) by mx0a-0014ca01.pphosted.com with ESMTP id 2t4w7v1r84-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 15 Jun 2019 16:46:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N7Eqj6s2lfu9gv2thWZbJ13/QDK2b/oLzQIcZPDvE2A=; b=PpzBLhJt13BJxsoW9cM/EhdEQpfckmS53j8cORWCN2QIbwLHvOcPevghgas3nrsxSLZQ+9E2Y0SZv4W/9JpB2LUGA0XhdXy8oNgQJ2vMcg0k1zq51CRnmMhXmjf0g51rS347EFf5W3FkSbShwezejkUg5lzE/piEKW7lmF5In1w= Received: from BYAPR07CA0045.namprd07.prod.outlook.com (2603:10b6:a03:60::22) by BYAPR07MB6824.namprd07.prod.outlook.com (2603:10b6:a03:128::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1987.11; Sat, 15 Jun 2019 23:46:18 +0000 Received: from BY2NAM05FT049.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::204) by BYAPR07CA0045.outlook.office365.com (2603:10b6:a03:60::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1987.13 via Frontend Transport; Sat, 15 Jun 2019 23:46:18 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning cadence.com discourages use of 199.43.4.28 as permitted sender) Received: from rmmaillnx1.cadence.com (199.43.4.28) by BY2NAM05FT049.mail.protection.outlook.com (10.152.100.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.7 via Frontend Transport; Sat, 15 Jun 2019 23:46:17 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by rmmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNkBdk024229 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Sat, 15 Jun 2019 19:46:12 -0400 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 16 Jun 2019 01:46:10 +0200 Received: from lvlogina.cadence.com (10.165.176.102) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Sun, 16 Jun 2019 01:46:10 +0200 Received: from lvlogina.cadence.com (localhost.localdomain [127.0.0.1]) by lvlogina.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNkAtQ026482; Sun, 16 Jun 2019 00:46:10 +0100 From: Parshuram Thombare To: , , , CC: , , , , , , Subject: [PATCH 1/6] net: macb: add phylink support Date: Sun, 16 Jun 2019 00:46:07 +0100 Message-ID: <1560642367-26425-1-git-send-email-pthombar@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1560642311-25585-1-git-send-email-pthombar@cadence.com> References: <1560642311-25585-1-git-send-email-pthombar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:199.43.4.28; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(346002)(39850400004)(2980300002)(36092001)(189003)(199004)(2906002)(70586007)(305945005)(336012)(69596002)(70206006)(76130400001)(5660300002)(30864003)(2201001)(4326008)(86362001)(6666004)(356004)(68736007)(478600001)(26826003)(53936002)(107886003)(316002)(110136005)(54906003)(36756003)(16586007)(8676002)(14444005)(81166006)(76176011)(50466002)(81156014)(47776003)(5024004)(8936002)(446003)(48376002)(50226002)(7696005)(51416003)(486006)(7126003)(53416004)(2616005)(11346002)(476003)(186003)(426003)(126002)(77096007)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB6824; H:rmmaillnx1.cadence.com; FPR:; SPF:SoftFail; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33f35b66-6c68-44c5-b5f6-08d6f1eba958 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:BYAPR07MB6824; X-MS-TrafficTypeDiagnostic: BYAPR07MB6824: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:311; X-Forefront-PRVS: 0069246B74 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: MS57IO1wzVNsHMBpVsKiVHWDorKgqbvsTVsOpVT8iydfkSlGDU3s9cQ9ul7ZThO3OWpwfBu8v0G3Kc+NbfbaLhQqoS0+2ZJHWSryPm7qlGA7Ikr9lBwsf8JSTJKn/yVF0X9Q4elsGNOFutBoee3w7ZCO0GKg29Rw6w49BByO/BKzpGwOHSUkUXDF1rv4LAi/AgCVKJMwB5NEsHxwbqlxdnY6ylcNWXCtA2Q6U0cvsOiFbeTlXgD3Yp47RlkyGMdzTaqCkpq1uiYPNVApiHroLNIXm2xiXh9ytrcDcVc3+WzIkZASzhr9DR/71olc8bda6AsKZk/uAwjW76b7LpOHmfBjg0XQ3OMp7ZBbJxsNw5zO/uwnR/QIdswvuSlUctuA0wQ2iuBPqwcoVblASHyDfXy2SnGtG8NQhW2qlTZDdzA= X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2019 23:46:17.7773 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33f35b66-6c68-44c5-b5f6-08d6f1eba958 X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[199.43.4.28]; Helo=[rmmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB6824 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf.smktg.jp include:_spf.salesforce.com include:mktomail.com include:spf-0014ca01.pphosted.com include:spf.protection.outlook.com include:auth.msgapp.com include:spf.mandrillapp.com ~all X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-15_13:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906150225 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch replace phylib API's by phylink API's. Signed-off-by: Parshuram Thombare --- drivers/net/ethernet/cadence/Kconfig | 2 +- drivers/net/ethernet/cadence/macb.h | 3 + drivers/net/ethernet/cadence/macb_main.c | 288 +++++++++++++---------- 3 files changed, 173 insertions(+), 120 deletions(-) diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index 1766697c9c5a..d71411a71587 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/drivers/net/ethernet/cadence/Kconfig @@ -22,7 +22,7 @@ if NET_VENDOR_CADENCE config MACB tristate "Cadence MACB/GEM support" depends on HAS_DMA - select PHYLIB + select PHYLINK ---help--- The Cadence MACB ethernet interface is found on many Atmel AT32 and AT91 parts. This driver also supports the Cadence GEM (Gigabit diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 00ee5e8e0ff0..35ed13236c8b 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -14,6 +14,7 @@ #include #include #include +#include #if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) || defined(CONFIG_MACB_USE_HWSTAMP) #define MACB_EXT_DESC @@ -1227,6 +1228,8 @@ struct macb { u32 rx_intr_mask; struct macb_pm_data pm_data; + struct phylink *pl; + struct phylink_config pl_config; }; #ifdef CONFIG_MACB_USE_HWSTAMP diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index f825e3960540..52d5e5efe2ad 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -38,6 +38,7 @@ #include #include #include +#include #include "macb.h" #define MACB_RX_BUFFER_SIZE 128 @@ -428,115 +429,146 @@ static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev) netdev_err(dev, "adjusting tx_clk failed.\n"); } -static void macb_handle_link_change(struct net_device *dev) +static void gem_phylink_validate(struct phylink_config *pl_config, + unsigned long *supported, + struct phylink_link_state *state) { - struct macb *bp = netdev_priv(dev); - struct phy_device *phydev = dev->phydev; + struct net_device *netdev = to_net_dev(pl_config->dev); + struct macb *bp = netdev_priv(netdev); + __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; + + switch (state->interface) { + case PHY_INTERFACE_MODE_GMII: + case PHY_INTERFACE_MODE_RGMII: + if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) { + phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseX_Full); + if (!(bp->caps & MACB_CAPS_NO_GIGABIT_HALF)) { + phylink_set(mask, 1000baseT_Half); + phylink_set(mask, 1000baseT_Half); + } + } + /* fallthrough */ + case PHY_INTERFACE_MODE_MII: + case PHY_INTERFACE_MODE_RMII: + phylink_set(mask, 10baseT_Half); + phylink_set(mask, 10baseT_Full); + phylink_set(mask, 100baseT_Half); + phylink_set(mask, 100baseT_Full); + break; + default: + break; + } + + bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS); + bitmap_and(state->advertising, state->advertising, mask, + __ETHTOOL_LINK_MODE_MASK_NBITS); +} + +static int gem_phylink_mac_link_state(struct phylink_config *pl_config, + struct phylink_link_state *state) +{ + struct net_device *netdev = to_net_dev(pl_config->dev); + struct macb *bp = netdev_priv(netdev); + + state->speed = bp->speed; + state->duplex = bp->duplex; + state->link = bp->link; + return 1; +} + +static void gem_mac_config(struct phylink_config *pl_config, unsigned int mode, + const struct phylink_link_state *state) +{ + struct net_device *netdev = to_net_dev(pl_config->dev); + struct macb *bp = netdev_priv(netdev); unsigned long flags; - int status_change = 0; spin_lock_irqsave(&bp->lock, flags); - if (phydev->link) { - if ((bp->speed != phydev->speed) || - (bp->duplex != phydev->duplex)) { - u32 reg; - - reg = macb_readl(bp, NCFGR); - reg &= ~(MACB_BIT(SPD) | MACB_BIT(FD)); - if (macb_is_gem(bp)) - reg &= ~GEM_BIT(GBE); + if (bp->speed != state->speed || + bp->duplex != state->duplex) { + u32 reg; - if (phydev->duplex) - reg |= MACB_BIT(FD); - if (phydev->speed == SPEED_100) - reg |= MACB_BIT(SPD); - if (phydev->speed == SPEED_1000 && - bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) - reg |= GEM_BIT(GBE); + reg = macb_readl(bp, NCFGR); + reg &= ~(MACB_BIT(SPD) | MACB_BIT(FD)); + if (macb_is_gem(bp)) + reg &= ~GEM_BIT(GBE); - macb_or_gem_writel(bp, NCFGR, reg); + if (state->duplex) + reg |= MACB_BIT(FD); + if (state->speed == SPEED_100) + reg |= MACB_BIT(SPD); + if (state->speed == SPEED_1000 && + bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) + reg |= GEM_BIT(GBE); - bp->speed = phydev->speed; - bp->duplex = phydev->duplex; - status_change = 1; - } - } + macb_or_gem_writel(bp, NCFGR, reg); - if (phydev->link != bp->link) { - if (!phydev->link) { - bp->speed = 0; - bp->duplex = -1; - } - bp->link = phydev->link; + bp->speed = state->speed; + bp->duplex = state->duplex; - status_change = 1; + if (state->link) + macb_set_tx_clk(bp->tx_clk, state->speed, netdev); } spin_unlock_irqrestore(&bp->lock, flags); +} - if (status_change) { - if (phydev->link) { - /* Update the TX clock rate if and only if the link is - * up and there has been a link change. - */ - macb_set_tx_clk(bp->tx_clk, phydev->speed, dev); +static void gem_mac_link_up(struct phylink_config *pl_config, unsigned int mode, + phy_interface_t interface, struct phy_device *phy) +{ + struct net_device *netdev = to_net_dev(pl_config->dev); + struct macb *bp = netdev_priv(netdev); - netif_carrier_on(dev); - netdev_info(dev, "link up (%d/%s)\n", - phydev->speed, - phydev->duplex == DUPLEX_FULL ? - "Full" : "Half"); - } else { - netif_carrier_off(dev); - netdev_info(dev, "link down\n"); - } - } + bp->link = 1; + /* Enable TX and RX */ + macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE) | MACB_BIT(TE)); +} + +static void gem_mac_link_down(struct phylink_config *pl_config, + unsigned int mode, phy_interface_t interface) +{ + struct net_device *netdev = to_net_dev(pl_config->dev); + struct macb *bp = netdev_priv(netdev); + + bp->link = 0; + /* Disable TX and RX */ + macb_writel(bp, NCR, + macb_readl(bp, NCR) & ~(MACB_BIT(RE) | MACB_BIT(TE))); } +static const struct phylink_mac_ops gem_phylink_ops = { + .validate = gem_phylink_validate, + .mac_link_state = gem_phylink_mac_link_state, + .mac_config = gem_mac_config, + .mac_link_up = gem_mac_link_up, + .mac_link_down = gem_mac_link_down, +}; + /* based on au1000_eth. c*/ static int macb_mii_probe(struct net_device *dev) { struct macb *bp = netdev_priv(dev); struct phy_device *phydev; struct device_node *np; - int ret, i; + int ret; np = bp->pdev->dev.of_node; ret = 0; - if (np) { - if (of_phy_is_fixed_link(np)) { - bp->phy_node = of_node_get(np); - } else { - bp->phy_node = of_parse_phandle(np, "phy-handle", 0); - /* fallback to standard phy registration if no - * phy-handle was found nor any phy found during - * dt phy registration - */ - if (!bp->phy_node && !phy_find_first(bp->mii_bus)) { - for (i = 0; i < PHY_MAX_ADDR; i++) { - phydev = mdiobus_scan(bp->mii_bus, i); - if (IS_ERR(phydev) && - PTR_ERR(phydev) != -ENODEV) { - ret = PTR_ERR(phydev); - break; - } - } - - if (ret) - return -ENODEV; - } - } + bp->pl_config.dev = &dev->dev; + bp->pl_config.type = PHYLINK_NETDEV; + bp->pl = phylink_create(&bp->pl_config, of_fwnode_handle(np), + bp->phy_interface, &gem_phylink_ops); + if (IS_ERR(bp->pl)) { + netdev_err(dev, + "error creating PHYLINK: %ld\n", PTR_ERR(bp->pl)); + return PTR_ERR(bp->pl); } - if (bp->phy_node) { - phydev = of_phy_connect(dev, bp->phy_node, - &macb_handle_link_change, 0, - bp->phy_interface); - if (!phydev) - return -ENODEV; - } else { + ret = phylink_of_phy_connect(bp->pl, np, 0); + if (ret == -ENODEV && bp->mii_bus) { phydev = phy_find_first(bp->mii_bus); if (!phydev) { netdev_err(dev, "no PHY found\n"); @@ -544,29 +576,18 @@ static int macb_mii_probe(struct net_device *dev) } /* attach the mac to the phy */ - ret = phy_connect_direct(dev, phydev, &macb_handle_link_change, - bp->phy_interface); + ret = phylink_connect_phy(bp->pl, phydev); if (ret) { netdev_err(dev, "Could not attach to PHY\n"); return ret; } } - /* mask with MAC supported features */ - if (macb_is_gem(bp) && bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) - phy_set_max_speed(phydev, SPEED_1000); - else - phy_set_max_speed(phydev, SPEED_100); - - if (bp->caps & MACB_CAPS_NO_GIGABIT_HALF) - phy_remove_link_mode(phydev, - ETHTOOL_LINK_MODE_1000baseT_Half_BIT); - bp->link = 0; bp->speed = 0; bp->duplex = -1; - return 0; + return ret; } static int macb_mii_init(struct macb *bp) @@ -2412,7 +2433,7 @@ static int macb_open(struct net_device *dev) netif_carrier_off(dev); /* if the phy is not yet register, retry later*/ - if (!dev->phydev) { + if (!bp->pl) { err = -EAGAIN; goto pm_exit; } @@ -2434,7 +2455,7 @@ static int macb_open(struct net_device *dev) macb_init_hw(bp); /* schedule a link state check */ - phy_start(dev->phydev); + phylink_start(bp->pl); netif_tx_start_all_queues(dev); @@ -2461,8 +2482,8 @@ static int macb_close(struct net_device *dev) for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) napi_disable(&queue->napi); - if (dev->phydev) - phy_stop(dev->phydev); + if (bp->pl) + phylink_stop(bp->pl); spin_lock_irqsave(&bp->lock, flags); macb_reset_hw(bp); @@ -3151,6 +3172,29 @@ static int gem_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd) return ret; } +static int gem_ethtool_get_link_ksettings(struct net_device *netdev, + struct ethtool_link_ksettings *cmd) +{ + struct macb *bp = netdev_priv(netdev); + + if (!bp->pl) + return -ENOTSUPP; + + return phylink_ethtool_ksettings_get(bp->pl, cmd); +} + +static int +gem_ethtool_set_link_ksettings(struct net_device *netdev, + const struct ethtool_link_ksettings *cmd) +{ + struct macb *bp = netdev_priv(netdev); + + if (!bp->pl) + return -ENOTSUPP; + + return phylink_ethtool_ksettings_set(bp->pl, cmd); +} + static const struct ethtool_ops macb_ethtool_ops = { .get_regs_len = macb_get_regs_len, .get_regs = macb_get_regs, @@ -3158,8 +3202,8 @@ static const struct ethtool_ops macb_ethtool_ops = { .get_ts_info = ethtool_op_get_ts_info, .get_wol = macb_get_wol, .set_wol = macb_set_wol, - .get_link_ksettings = phy_ethtool_get_link_ksettings, - .set_link_ksettings = phy_ethtool_set_link_ksettings, + .get_link_ksettings = gem_ethtool_get_link_ksettings, + .set_link_ksettings = gem_ethtool_set_link_ksettings, .get_ringparam = macb_get_ringparam, .set_ringparam = macb_set_ringparam, }; @@ -3172,8 +3216,8 @@ static const struct ethtool_ops gem_ethtool_ops = { .get_ethtool_stats = gem_get_ethtool_stats, .get_strings = gem_get_ethtool_strings, .get_sset_count = gem_get_sset_count, - .get_link_ksettings = phy_ethtool_get_link_ksettings, - .set_link_ksettings = phy_ethtool_set_link_ksettings, + .get_link_ksettings = gem_ethtool_get_link_ksettings, + .set_link_ksettings = gem_ethtool_set_link_ksettings, .get_ringparam = macb_get_ringparam, .set_ringparam = macb_set_ringparam, .get_rxnfc = gem_get_rxnfc, @@ -3182,17 +3226,16 @@ static const struct ethtool_ops gem_ethtool_ops = { static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { - struct phy_device *phydev = dev->phydev; struct macb *bp = netdev_priv(dev); if (!netif_running(dev)) return -EINVAL; - if (!phydev) + if (!bp->pl) return -ENODEV; if (!bp->ptp_info) - return phy_mii_ioctl(phydev, rq, cmd); + return phylink_mii_ioctl(bp->pl, rq, cmd); switch (cmd) { case SIOCSHWTSTAMP: @@ -3200,7 +3243,7 @@ static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) case SIOCGHWTSTAMP: return bp->ptp_info->get_hwtst(dev, rq); default: - return phy_mii_ioctl(phydev, rq, cmd); + return phylink_mii_ioctl(bp->pl, rq, cmd); } } @@ -3700,7 +3743,7 @@ static int at91ether_open(struct net_device *dev) MACB_BIT(HRESP)); /* schedule a link state check */ - phy_start(dev->phydev); + phylink_start(lp->pl); netif_start_queue(dev); @@ -4062,7 +4105,6 @@ static int macb_probe(struct platform_device *pdev) struct clk *tsu_clk = NULL; unsigned int queue_mask, num_queues; bool native_io; - struct phy_device *phydev; struct net_device *dev; struct resource *regs; void __iomem *mem; @@ -4205,8 +4247,6 @@ static int macb_probe(struct platform_device *pdev) if (err) goto err_out_free_netdev; - phydev = dev->phydev; - netif_carrier_off(dev); err = register_netdev(dev); @@ -4217,8 +4257,8 @@ static int macb_probe(struct platform_device *pdev) tasklet_init(&bp->hresp_err_tasklet, macb_hresp_error_task, (unsigned long)bp); - - phy_attached_info(phydev); + if (dev->phydev) + phy_attached_info(dev->phydev); netdev_info(dev, "Cadence %s rev 0x%08x at 0x%08lx irq %d (%pM)\n", macb_is_gem(bp) ? "GEM" : "MACB", macb_readl(bp, MID), @@ -4230,7 +4270,9 @@ static int macb_probe(struct platform_device *pdev) return 0; err_out_unregister_mdio: - phy_disconnect(dev->phydev); + rtnl_lock(); + phylink_disconnect_phy(bp->pl); + rtnl_unlock(); mdiobus_unregister(bp->mii_bus); of_node_put(bp->phy_node); if (np && of_phy_is_fixed_link(np)) @@ -4263,13 +4305,18 @@ static int macb_remove(struct platform_device *pdev) if (dev) { bp = netdev_priv(dev); - if (dev->phydev) - phy_disconnect(dev->phydev); + if (bp->pl) { + rtnl_lock(); + phylink_disconnect_phy(bp->pl); + rtnl_unlock(); + } mdiobus_unregister(bp->mii_bus); if (np && of_phy_is_fixed_link(np)) of_phy_deregister_fixed_link(np); dev->phydev = NULL; mdiobus_free(bp->mii_bus); + if (bp->pl) + phylink_destroy(bp->pl); unregister_netdev(dev); pm_runtime_disable(&pdev->dev); @@ -4311,8 +4358,9 @@ static int __maybe_unused macb_suspend(struct device *dev) for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) napi_disable(&queue->napi); - phy_stop(netdev->phydev); - phy_suspend(netdev->phydev); + phylink_stop(bp->pl); + if (netdev->phydev) + phy_suspend(netdev->phydev); spin_lock_irqsave(&bp->lock, flags); macb_reset_hw(bp); spin_unlock_irqrestore(&bp->lock, flags); @@ -4360,9 +4408,11 @@ static int __maybe_unused macb_resume(struct device *dev) for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) napi_enable(&queue->napi); - phy_resume(netdev->phydev); - phy_init_hw(netdev->phydev); - phy_start(netdev->phydev); + if (netdev->phydev) { + phy_resume(netdev->phydev); + phy_init_hw(netdev->phydev); + } + phylink_start(bp->pl); } bp->macbgem_ops.mog_init_rings(bp); From patchwork Sat Jun 15 23:46:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parshuram Raju Thombare X-Patchwork-Id: 1116489 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=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="rcRSDrlI"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="JN7474+O"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45RDfQ4ZKyz9sBr for ; Sun, 16 Jun 2019 09:47:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727156AbfFOXrG (ORCPT ); Sat, 15 Jun 2019 19:47:06 -0400 Received: from mx0b-0014ca01.pphosted.com ([208.86.201.193]:46472 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726515AbfFOXrG (ORCPT ); Sat, 15 Jun 2019 19:47:06 -0400 Received: from pps.filterd (m0042333.ppops.net [127.0.0.1]) by mx0b-0014ca01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5FNicgM020579; Sat, 15 Jun 2019 16:47:00 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=2/bx3m8FETN51Y5DUPgQ1/H96hRuyHuTG8xY+mj1W9U=; b=rcRSDrlIBryqqocWQEM7VTvE5L39jE96L9J+RD16WrxjlyzKpr3HqgRfCORUBF7hp/Xv fUL2NPqi7zVYQK9aBUJG26ATZ5GF55/N5/EDBHYaCrbbRtFCd3ShVRMYYopjas6+0VUP ji263eM/9R38Hlfkny3gm3GJYh5pZTQCCpx6PbNxlSxiZqbpN+8zwnyyeSQIEijJv7Vd 34hY4iytBTzOWSr3nTV89YEwDKf70oIuPEAfYlkn1fnymQHPNIlDNUl5GNv/OZEcGzkV FfEVrVsUsPbaGA9OH+PPWV7AyaqtPJiI39YWuzI9rxfl0kE3n9sh5c2S8WPTCGSZwBe0 Yg== Authentication-Results: cadence.com; spf=pass smtp.mailfrom=pthombar@cadence.com Received: from nam01-bn3-obe.outbound.protection.outlook.com (mail-bn3nam01lp2058.outbound.protection.outlook.com [104.47.33.58]) by mx0b-0014ca01.pphosted.com with ESMTP id 2t4v8w211y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 15 Jun 2019 16:46:59 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2/bx3m8FETN51Y5DUPgQ1/H96hRuyHuTG8xY+mj1W9U=; b=JN7474+OovSGVfhUymZOZKp5QN3EQJMTbu9bH+p2parvX9iV9k7ElImiOgMlMFRElTcd5Sb3SaZUAxitisM7ZgdlF2RYeVJyvUSnlXVJfpeGgXx58N/uOKLHJvdX0J8NSn3BsdyFqsmasR8dS+KEVoN7IgMLx3HJNRW8JD2lD4s= Received: from DM6PR07CA0003.namprd07.prod.outlook.com (2603:10b6:5:94::16) by DM6PR07MB6825.namprd07.prod.outlook.com (2603:10b6:5:158::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1987.10; Sat, 15 Jun 2019 23:46:56 +0000 Received: from BY2NAM05FT024.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::207) by DM6PR07CA0003.outlook.office365.com (2603:10b6:5:94::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1965.14 via Frontend Transport; Sat, 15 Jun 2019 23:46:56 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning cadence.com discourages use of 158.140.1.28 as permitted sender) Received: from sjmaillnx1.cadence.com (158.140.1.28) by BY2NAM05FT024.mail.protection.outlook.com (10.152.100.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.7 via Frontend Transport; Sat, 15 Jun 2019 23:46:56 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by sjmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNkrpb031759 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Sat, 15 Jun 2019 16:46:54 -0700 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 16 Jun 2019 01:46:52 +0200 Received: from lvlogina.cadence.com (10.165.176.102) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Sun, 16 Jun 2019 01:46:52 +0200 Received: from lvlogina.cadence.com (localhost.localdomain [127.0.0.1]) by lvlogina.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNkqDQ027220; Sun, 16 Jun 2019 00:46:52 +0100 From: Parshuram Thombare To: , , , CC: , , , , , , Subject: [PATCH 2/6] net: macb: add support for sgmii MAC-PHY interface Date: Sun, 16 Jun 2019 00:46:49 +0100 Message-ID: <1560642409-27074-1-git-send-email-pthombar@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1560642367-26425-1-git-send-email-pthombar@cadence.com> References: <1560642367-26425-1-git-send-email-pthombar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:158.140.1.28; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39850400004)(346002)(396003)(376002)(136003)(2980300002)(199004)(189003)(36092001)(2201001)(5660300002)(8676002)(7636002)(51416003)(7696005)(76176011)(246002)(305945005)(53416004)(14444005)(126002)(54906003)(2616005)(7126003)(8936002)(110136005)(86362001)(11346002)(476003)(446003)(486006)(426003)(478600001)(26826003)(50226002)(77096007)(6666004)(70586007)(356004)(70206006)(4326008)(47776003)(16586007)(36756003)(76130400001)(107886003)(186003)(336012)(50466002)(316002)(2906002)(48376002)(26005)(30864003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB6825; H:sjmaillnx1.cadence.com; FPR:; SPF:SoftFail; LANG:en; PTR:corp.Cadence.COM; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d759ec2-6e68-4ae4-f089-08d6f1ebc01a X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:DM6PR07MB6825; X-MS-TrafficTypeDiagnostic: DM6PR07MB6825: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 0069246B74 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 24nacfaPKl6ECFSgPAac1l8M8oMTO5Quxh1SObot8gXjW9dKcM5zMgK1OD1d5DVJBDnrQYfMnDalyhoDDjL2PqKIZ4LXt0puOdjLAsVLyFc6AQRjqjO+ztV2ibUaA4XiB2+FEcxQb0iedqVMmXDtbfve8fMdN3bCxCE+i3oO70EVO5NeRlWWDbKRCYhBdU2ojjrbdYVlaqRJ5YAdwGTVt89ZPUaZfS8me3uV77haMA54XbE5lBL5sdYgavTi4O3sRnqEcUFR7we6FhHzJCoDJMjAbpPAx+NI1FaRaJJJ7hZoR8KhLuB/YxtJ0zJSDS6F74AJL6kOYK1rx5WDImz5AP8L7ZB+EHcfueXULCD+xtbqPDwH28R0Rv3kHYVQcKshENTBUaed6P3JBWWEbOlXq/OMISKLe8Mt0UIza82N3OQ= X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2019 23:46:56.1512 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d759ec2-6e68-4ae4-f089-08d6f1ebc01a X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[158.140.1.28]; Helo=[sjmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB6825 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf.smktg.jp include:_spf.salesforce.com include:mktomail.com include:spf-0014ca01.pphosted.com include:spf.protection.outlook.com include:auth.msgapp.com include:spf.mandrillapp.com ~all X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-15_13:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906150226 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is version 2 of patch to add support for SGMII interface) and 2.5Gbps MAC in Cadence ethernet controller driver. Signed-off-by: Parshuram Thombare --- drivers/net/ethernet/cadence/macb.h | 76 +++++++++-- drivers/net/ethernet/cadence/macb_main.c | 157 ++++++++++++++++++++--- 2 files changed, 202 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 35ed13236c8b..85c7e4cb1057 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -80,6 +80,7 @@ #define MACB_RBQPH 0x04D4 /* GEM register offsets. */ +#define GEM_NCR 0x0000 /* Network Control */ #define GEM_NCFGR 0x0004 /* Network Config */ #define GEM_USRIO 0x000c /* User IO */ #define GEM_DMACFG 0x0010 /* DMA Configuration */ @@ -159,6 +160,9 @@ #define GEM_PEFTN 0x01f4 /* PTP Peer Event Frame Tx Ns */ #define GEM_PEFRSL 0x01f8 /* PTP Peer Event Frame Rx Sec Low */ #define GEM_PEFRN 0x01fc /* PTP Peer Event Frame Rx Ns */ +#define GEM_PCS_CTRL 0x0200 /* PCS Control */ +#define GEM_PCS_STATUS 0x0204 /* PCS Status */ +#define GEM_PCS_AN_LP_BASE 0x0214 /* PCS AN LP BASE*/ #define GEM_DCFG1 0x0280 /* Design Config 1 */ #define GEM_DCFG2 0x0284 /* Design Config 2 */ #define GEM_DCFG3 0x0288 /* Design Config 3 */ @@ -274,6 +278,10 @@ #define MACB_IRXFCS_OFFSET 19 #define MACB_IRXFCS_SIZE 1 +/* GEM specific NCR bitfields. */ +#define GEM_TWO_PT_FIVE_GIG_OFFSET 29 +#define GEM_TWO_PT_FIVE_GIG_SIZE 1 + /* GEM specific NCFGR bitfields. */ #define GEM_GBE_OFFSET 10 /* Gigabit mode enable */ #define GEM_GBE_SIZE 1 @@ -326,6 +334,9 @@ #define MACB_MDIO_SIZE 1 #define MACB_IDLE_OFFSET 2 /* The PHY management logic is idle */ #define MACB_IDLE_SIZE 1 +#define MACB_DUPLEX_OFFSET 3 +#define MACB_DUPLEX_SIZE 1 + /* Bitfields in TSR */ #define MACB_UBR_OFFSET 0 /* Used bit read */ @@ -459,11 +470,37 @@ #define MACB_REV_OFFSET 0 #define MACB_REV_SIZE 16 +/* Bitfields in PCS_CONTROL. */ +#define GEM_PCS_CTRL_RST_OFFSET 15 +#define GEM_PCS_CTRL_RST_SIZE 1 +#define GEM_PCS_CTRL_EN_AN_OFFSET 12 +#define GEM_PCS_CTRL_EN_AN_SIZE 1 +#define GEM_PCS_CTRL_RESTART_AN_OFFSET 9 +#define GEM_PCS_CTRL_RESTART_AN_SIZE 1 + +/* Bitfields in PCS_STATUS. */ +#define GEM_PCS_STATUS_AN_DONE_OFFSET 5 +#define GEM_PCS_STATUS_AN_DONE_SIZE 1 +#define GEM_PCS_STATUS_AN_SUPPORT_OFFSET 3 +#define GEM_PCS_STATUS_AN_SUPPORT_SIZE 1 +#define GEM_PCS_STATUS_LINK_OFFSET 2 +#define GEM_PCS_STATUS_LINK_SIZE 1 + +/* Bitfield in PCS_AN_LP_BASE */ +#define GEM_PCS_AN_LP_BASE_LINK_OFFSET 15 +#define GEM_PCS_AN_LP_BASE_LINK_SIZE 1 +#define GEM_PCS_AN_LP_BASE_DUPLEX_OFFSET 12 +#define GEM_PCS_AN_LP_BASE_DUPLEX_SIZE 1 +#define GEM_PCS_AN_LP_BASE_SPEED_OFFSET 10 +#define GEM_PCS_AN_LP_BASE_SPEED_SIZE 2 + /* Bitfields in DCFG1. */ #define GEM_IRQCOR_OFFSET 23 #define GEM_IRQCOR_SIZE 1 #define GEM_DBWDEF_OFFSET 25 #define GEM_DBWDEF_SIZE 3 +#define GEM_NO_PCS_OFFSET 0 +#define GEM_NO_PCS_SIZE 1 /* Bitfields in DCFG2. */ #define GEM_RX_PKT_BUFF_OFFSET 20 @@ -636,19 +673,32 @@ #define MACB_MAN_CODE 2 /* Capability mask bits */ -#define MACB_CAPS_ISR_CLEAR_ON_WRITE 0x00000001 -#define MACB_CAPS_USRIO_HAS_CLKEN 0x00000002 -#define MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII 0x00000004 -#define MACB_CAPS_NO_GIGABIT_HALF 0x00000008 -#define MACB_CAPS_USRIO_DISABLED 0x00000010 -#define MACB_CAPS_JUMBO 0x00000020 -#define MACB_CAPS_GEM_HAS_PTP 0x00000040 -#define MACB_CAPS_BD_RD_PREFETCH 0x00000080 -#define MACB_CAPS_NEEDS_RSTONUBR 0x00000100 -#define MACB_CAPS_FIFO_MODE 0x10000000 -#define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 -#define MACB_CAPS_SG_DISABLED 0x40000000 -#define MACB_CAPS_MACB_IS_GEM 0x80000000 +#define MACB_CAPS_ISR_CLEAR_ON_WRITE BIT(0) +#define MACB_CAPS_USRIO_HAS_CLKEN BIT(1) +#define MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII BIT(2) +#define MACB_CAPS_NO_GIGABIT_HALF BIT(3) +#define MACB_CAPS_USRIO_DISABLED BIT(4) +#define MACB_CAPS_JUMBO BIT(5) +#define MACB_CAPS_GEM_HAS_PTP BIT(6) +#define MACB_CAPS_BD_RD_PREFETCH BIT(7) +#define MACB_CAPS_NEEDS_RSTONUBR BIT(8) +#define MACB_CAPS_FIFO_MODE BIT(28) +#define MACB_CAPS_GIGABIT_MODE_AVAILABLE BIT(29) +#define MACB_CAPS_SG_DISABLED BIT(30) +#define MACB_CAPS_MACB_IS_GEM BIT(31) +#define MACB_CAPS_PCS BIT(24) +#define MACB_CAPS_MACB_IS_GEM_GXL BIT(25) + +#define MACB_GEM7010_IDNUM 0x009 +#define MACB_GEM7014_IDNUM 0x107 +#define MACB_GEM7014A_IDNUM 0x207 +#define MACB_GEM7016_IDNUM 0x10a +#define MACB_GEM7017_IDNUM 0x00a +#define MACB_GEM7017A_IDNUM 0x20a +#define MACB_GEM7020_IDNUM 0x003 +#define MACB_GEM7021_IDNUM 0x00c +#define MACB_GEM7021A_IDNUM 0x20c +#define MACB_GEM7022_IDNUM 0x00b /* LSO settings */ #define MACB_LSO_UFO_ENABLE 0x01 diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 52d5e5efe2ad..5b3e7d9f4384 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -394,6 +394,7 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum, static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev) { long ferr, rate, rate_rounded; + struct macb *bp = netdev_priv(dev); if (!clk) return; @@ -408,6 +409,12 @@ static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev) case SPEED_1000: rate = 125000000; break; + case SPEED_2500: + if (bp->caps & MACB_CAPS_MACB_IS_GEM_GXL) + rate = 312500000; + else + rate = 125000000; + break; default: return; } @@ -438,15 +445,16 @@ static void gem_phylink_validate(struct phylink_config *pl_config, __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; switch (state->interface) { + case PHY_INTERFACE_MODE_SGMII: + if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) + phylink_set(mask, 2500baseT_Full); + /* fallthrough */ case PHY_INTERFACE_MODE_GMII: case PHY_INTERFACE_MODE_RGMII: if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) { phylink_set(mask, 1000baseT_Full); - phylink_set(mask, 1000baseX_Full); - if (!(bp->caps & MACB_CAPS_NO_GIGABIT_HALF)) { - phylink_set(mask, 1000baseT_Half); + if (!(bp->caps & MACB_CAPS_NO_GIGABIT_HALF)) phylink_set(mask, 1000baseT_Half); - } } /* fallthrough */ case PHY_INTERFACE_MODE_MII: @@ -456,6 +464,16 @@ static void gem_phylink_validate(struct phylink_config *pl_config, phylink_set(mask, 100baseT_Half); phylink_set(mask, 100baseT_Full); break; + + case PHY_INTERFACE_MODE_2500BASEX: + if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) + phylink_set(mask, 2500baseX_Full); + /* fallthrough */ + case PHY_INTERFACE_MODE_1000BASEX: + if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) + phylink_set(mask, 1000baseX_Full); + break; + default: break; } @@ -468,15 +486,54 @@ static void gem_phylink_validate(struct phylink_config *pl_config, static int gem_phylink_mac_link_state(struct phylink_config *pl_config, struct phylink_link_state *state) { + u32 status; struct net_device *netdev = to_net_dev(pl_config->dev); struct macb *bp = netdev_priv(netdev); - state->speed = bp->speed; - state->duplex = bp->duplex; - state->link = bp->link; + if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII) { + status = gem_readl(bp, PCS_STATUS); + state->an_complete = GEM_BFEXT(PCS_STATUS_AN_DONE, status); + status = gem_readl(bp, PCS_AN_LP_BASE); + switch (GEM_BFEXT(PCS_AN_LP_BASE_SPEED, status)) { + case 0: + state->speed = 10; + break; + case 1: + state->speed = 100; + break; + case 2: + state->speed = 1000; + break; + default: + break; + } + state->duplex = MACB_BFEXT(DUPLEX, macb_readl(bp, NSR)); + state->link = MACB_BFEXT(NSR_LINK, macb_readl(bp, NSR)); + } else if (bp->phy_interface == PHY_INTERFACE_MODE_2500BASEX) { + state->speed = SPEED_2500; + state->duplex = MACB_BFEXT(DUPLEX, macb_readl(bp, NSR)); + state->link = MACB_BFEXT(NSR_LINK, macb_readl(bp, NSR)); + } else if (bp->phy_interface == PHY_INTERFACE_MODE_1000BASEX) { + state->speed = SPEED_1000; + state->duplex = MACB_BFEXT(DUPLEX, macb_readl(bp, NSR)); + state->link = MACB_BFEXT(NSR_LINK, macb_readl(bp, NSR)); + } return 1; } +static void gem_mac_an_restart(struct phylink_config *pl_config) +{ + struct net_device *netdev = to_net_dev(pl_config->dev); + struct macb *bp = netdev_priv(netdev); + + if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII || + bp->phy_interface == PHY_INTERFACE_MODE_1000BASEX || + bp->phy_interface == PHY_INTERFACE_MODE_2500BASEX) { + gem_writel(bp, PCS_CTRL, gem_readl(bp, PCS_CTRL) | + GEM_BIT(PCS_CTRL_RESTART_AN)); + } +} + static void gem_mac_config(struct phylink_config *pl_config, unsigned int mode, const struct phylink_link_state *state) { @@ -494,17 +551,23 @@ static void gem_mac_config(struct phylink_config *pl_config, unsigned int mode, reg &= ~(MACB_BIT(SPD) | MACB_BIT(FD)); if (macb_is_gem(bp)) reg &= ~GEM_BIT(GBE); - if (state->duplex) reg |= MACB_BIT(FD); - if (state->speed == SPEED_100) - reg |= MACB_BIT(SPD); - if (state->speed == SPEED_1000 && - bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) - reg |= GEM_BIT(GBE); - macb_or_gem_writel(bp, NCFGR, reg); + if (state->speed == SPEED_2500) { + gem_writel(bp, NCFGR, GEM_BIT(GBE) | + gem_readl(bp, NCFGR)); + gem_writel(bp, NCR, GEM_BIT(TWO_PT_FIVE_GIG) | + gem_readl(bp, NCR)); + } else if (state->speed == SPEED_1000) { + gem_writel(bp, NCFGR, GEM_BIT(GBE) | + gem_readl(bp, NCFGR)); + } else if (state->speed == SPEED_100) { + macb_writel(bp, NCFGR, MACB_BIT(SPD) | + macb_readl(bp, NCFGR)); + } + bp->speed = state->speed; bp->duplex = state->duplex; @@ -541,6 +604,7 @@ static void gem_mac_link_down(struct phylink_config *pl_config, static const struct phylink_mac_ops gem_phylink_ops = { .validate = gem_phylink_validate, .mac_link_state = gem_phylink_mac_link_state, + .mac_an_restart = gem_mac_an_restart, .mac_config = gem_mac_config, .mac_link_up = gem_mac_link_up, .mac_link_down = gem_mac_link_down, @@ -2245,7 +2309,9 @@ static void macb_init_hw(struct macb *bp) macb_set_hwaddr(bp); config = macb_mdc_clk_div(bp); - if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII) + if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII || + bp->phy_interface == PHY_INTERFACE_MODE_1000BASEX || + bp->phy_interface == PHY_INTERFACE_MODE_2500BASEX) config |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL); config |= MACB_BF(RBOF, NET_IP_ALIGN); /* Make eth data aligned */ config |= MACB_BIT(PAE); /* PAuse Enable */ @@ -2270,6 +2336,17 @@ static void macb_init_hw(struct macb *bp) if (bp->caps & MACB_CAPS_JUMBO) bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK; + if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII || + bp->phy_interface == PHY_INTERFACE_MODE_1000BASEX || + bp->phy_interface == PHY_INTERFACE_MODE_2500BASEX) { + //Enable PCS AN + gem_writel(bp, PCS_CTRL, gem_readl(bp, PCS_CTRL) | + GEM_BIT(PCS_CTRL_EN_AN)); + //Reset PCS block + gem_writel(bp, PCS_CTRL, gem_readl(bp, PCS_CTRL) | + GEM_BIT(PCS_CTRL_RST)); + } + macb_configure_dma(bp); /* Initialize TX and RX buffers */ @@ -3361,6 +3438,22 @@ static void macb_configure_caps(struct macb *bp, dcfg = gem_readl(bp, DCFG1); if (GEM_BFEXT(IRQCOR, dcfg) == 0) bp->caps |= MACB_CAPS_ISR_CLEAR_ON_WRITE; + if (GEM_BFEXT(NO_PCS, dcfg) == 0) + bp->caps |= MACB_CAPS_PCS; + switch (MACB_BFEXT(IDNUM, macb_readl(bp, MID))) { + case MACB_GEM7016_IDNUM: + case MACB_GEM7017_IDNUM: + case MACB_GEM7017A_IDNUM: + case MACB_GEM7020_IDNUM: + case MACB_GEM7021_IDNUM: + case MACB_GEM7021A_IDNUM: + case MACB_GEM7022_IDNUM: + bp->caps |= MACB_CAPS_USRIO_DISABLED; + bp->caps |= MACB_CAPS_MACB_IS_GEM_GXL; + break; + default: + break; + } dcfg = gem_readl(bp, DCFG2); if ((dcfg & (GEM_BIT(RX_PKT_BUFF) | GEM_BIT(TX_PKT_BUFF))) == 0) bp->caps |= MACB_CAPS_FIFO_MODE; @@ -3649,7 +3742,9 @@ static int macb_init(struct platform_device *pdev) /* Set MII management clock divider */ val = macb_mdc_clk_div(bp); val |= macb_dbw(bp); - if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII) + if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII || + bp->phy_interface == PHY_INTERFACE_MODE_1000BASEX || + bp->phy_interface == PHY_INTERFACE_MODE_2500BASEX) val |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL); macb_writel(bp, NCFGR, val); @@ -4232,11 +4327,37 @@ static int macb_probe(struct platform_device *pdev) } err = of_get_phy_mode(np); - if (err < 0) + if (err < 0) { /* not found in DT, MII by default */ bp->phy_interface = PHY_INTERFACE_MODE_MII; - else + } else if (bp->caps & MACB_CAPS_MACB_IS_GEM_GXL) { + u32 interface_supported = 1; + + if (err == PHY_INTERFACE_MODE_SGMII || + err == PHY_INTERFACE_MODE_1000BASEX || + err == PHY_INTERFACE_MODE_2500BASEX) { + if (!(bp->caps & MACB_CAPS_PCS)) + interface_supported = 0; + } else if (err == PHY_INTERFACE_MODE_GMII || + err == PHY_INTERFACE_MODE_RGMII) { + if (!macb_is_gem(bp)) + interface_supported = 0; + } else if (err != PHY_INTERFACE_MODE_RMII && + err != PHY_INTERFACE_MODE_MII) { + /* Add new mode before this */ + interface_supported = 0; + } + + if (!interface_supported) { + netdev_err(dev, "Phy mode %s not supported", + phy_modes(err)); + goto err_out_free_netdev; + } + bp->phy_interface = err; + } else { + bp->phy_interface = err; + } /* IP specific init */ err = init(pdev); From patchwork Sat Jun 15 23:47:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parshuram Raju Thombare X-Patchwork-Id: 1116490 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=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="AR3rtNaE"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="ri6swiJ6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45RDg22nR5z9sBr for ; Sun, 16 Jun 2019 09:47:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727174AbfFOXrj (ORCPT ); Sat, 15 Jun 2019 19:47:39 -0400 Received: from mx0b-0014ca01.pphosted.com ([208.86.201.193]:46618 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726434AbfFOXrj (ORCPT ); Sat, 15 Jun 2019 19:47:39 -0400 Received: from pps.filterd (m0042333.ppops.net [127.0.0.1]) by mx0b-0014ca01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5FNhZqw019380; Sat, 15 Jun 2019 16:47:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=2871iQuj6mhD0LeWxbihfTlXitwpwttJ3+TrYK5cMjw=; b=AR3rtNaECIQfXbpJI4MLKRztbRiPROceteTjIKxxhEGnZ/dEfHBAzlMJhiFdmt3hE4LV Vzd1MBOWIPu6YQbaQzl9rnLhEJxueSb8k3+8Y/PuGNqxDVtPL+ck4BmgtfqQ1VkmQXxY 8qP6qzv3gqiYjVyFvSw/2T3Vo1DDCv97fcTGrvg2awLaKB40cBiTc2IjxWuS+wd2EXaO JqSIL9vLhcDWsZYoRvo7Tt4WpCjcoREjAzs2ER2IySUOgyDEO4gHmgw87Cw1luPJHGRp 6DARyHZsuHATSrl7Kvsx+K5liffnOvQx0s3ILjaslIeFIVVAHT/8UirI3XZdSpUhS++e DA== Authentication-Results: cadence.com; spf=pass smtp.mailfrom=pthombar@cadence.com Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2058.outbound.protection.outlook.com [104.47.36.58]) by mx0b-0014ca01.pphosted.com with ESMTP id 2t4v8w212w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sat, 15 Jun 2019 16:47:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2871iQuj6mhD0LeWxbihfTlXitwpwttJ3+TrYK5cMjw=; b=ri6swiJ6qmnyaLsis1+jKrTdGpX0xl3Mq0p8PZ29RHdbOmUkm/RkKensp/eZdEhZmEt3bGcF0mwNcGFigZ9xDQZATyavrFFg0eAPz4SJdqXwsDPBMQAgOX9YBiksFYEkgsDcLMDNE10M2m5fsSa5RCHMzbS00z6MIMCybbd//tY= Received: from DM5PR07CA0065.namprd07.prod.outlook.com (2603:10b6:4:ad::30) by SN2PR07MB2494.namprd07.prod.outlook.com (2603:10b6:804:17::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1987.12; Sat, 15 Jun 2019 23:47:30 +0000 Received: from BY2NAM05FT032.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::208) by DM5PR07CA0065.outlook.office365.com (2603:10b6:4:ad::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1965.17 via Frontend Transport; Sat, 15 Jun 2019 23:47:30 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning cadence.com discourages use of 158.140.1.28 as permitted sender) Received: from sjmaillnx2.cadence.com (158.140.1.28) by BY2NAM05FT032.mail.protection.outlook.com (10.152.100.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.7 via Frontend Transport; Sat, 15 Jun 2019 23:47:29 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by sjmaillnx2.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNlRj3014291 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Sat, 15 Jun 2019 16:47:28 -0700 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 16 Jun 2019 01:47:26 +0200 Received: from lvlogina.cadence.com (10.165.176.102) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Sun, 16 Jun 2019 01:47:26 +0200 Received: from lvlogina.cadence.com (localhost.localdomain [127.0.0.1]) by lvlogina.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNlQ1l027768; Sun, 16 Jun 2019 00:47:26 +0100 From: Parshuram Thombare To: , , , CC: , , , , , , Subject: [PATCH 3/6] net: macb: add PHY configuration in MACB PCI wrapper Date: Sun, 16 Jun 2019 00:47:24 +0100 Message-ID: <1560642444-27704-1-git-send-email-pthombar@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1560642409-27074-1-git-send-email-pthombar@cadence.com> References: <1560642409-27074-1-git-send-email-pthombar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:158.140.1.28; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(136003)(346002)(39850400004)(376002)(2980300002)(199004)(189003)(36092001)(51416003)(7696005)(70586007)(47776003)(316002)(76176011)(16586007)(8936002)(54906003)(110136005)(26005)(77096007)(186003)(50226002)(8676002)(53416004)(50466002)(48376002)(126002)(11346002)(476003)(7636002)(7126003)(2616005)(486006)(107886003)(2906002)(446003)(305945005)(86362001)(5660300002)(76130400001)(70206006)(426003)(356004)(246002)(478600001)(336012)(26826003)(36756003)(2201001)(4326008); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR07MB2494; H:sjmaillnx2.cadence.com; FPR:; SPF:SoftFail; LANG:en; PTR:corp.cadence.com; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f3519cc-9704-43ad-8545-08d6f1ebd42c X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:SN2PR07MB2494; X-MS-TrafficTypeDiagnostic: SN2PR07MB2494: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1227; X-Forefront-PRVS: 0069246B74 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: PiegFhDn0J8ptxmUzY5/6jmw2hsiQHOUqH4e4WRQS3r87IcEOHr6RAOCa0POWnq6jGDWiH/g5OWI8TQ29fah5048ZKUurlf4KNOl7tAgKaMX+ZNObokye1IlTKz8IgBMrqj3LOwuTGm5kF0FTv1mm2hU/TKqjaKBFpd+jBwC20LLlj9TgAA5tPSqf3KGB6xAU3P+F15Hk+WA4J9sXbho1keHNAlmi5KKRAhOeRS5rq2VYU+B02IjUi4qgg+RTPzRj3EhaXEx8RSsIpaX8ckz+uRtPTWgrH8RqyZUVRME5/unFnoFAdCNNjP4dKZtyon9JiqcuBtEe4Km/BhFyiBj5jVwRBYMCuln6ZAw3jHnhxuTScREHpEvkJsr3jY/D+ni/F7k9bfPh7Wojm30uWLmnz12wDC1w9zZxynZ0qcwnso= X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2019 23:47:29.8059 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f3519cc-9704-43ad-8545-08d6f1ebd42c X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[158.140.1.28]; Helo=[sjmaillnx2.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2494 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf.smktg.jp include:_spf.salesforce.com include:mktomail.com include:spf-0014ca01.pphosted.com include:spf.protection.outlook.com include:auth.msgapp.com include:spf.mandrillapp.com ~all X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-15_13:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906150226 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch add TI PHY DP83867 configuration for SGMII link in Cadence MACB PCI wrapper. Signed-off-by: Parshuram Thombare --- drivers/net/ethernet/cadence/macb_pci.c | 225 ++++++++++++++++++++++++ 1 file changed, 225 insertions(+) diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c index 248a8fc45069..1001e03191a1 100644 --- a/drivers/net/ethernet/cadence/macb_pci.c +++ b/drivers/net/ethernet/cadence/macb_pci.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include "macb.h" @@ -37,6 +38,224 @@ #define GEM_PCLK_RATE 50000000 #define GEM_HCLK_RATE 50000000 +#define TI_PHY_DP83867_ID 0x2000a231 +#define TI_PHY_DEVADDR 0x1f +#define PHY_REGCR 0x0D +#define PHY_ADDAR 0x0E + +#define MACB_MDIO_TIMEOUT 1000000 /* in usecs */ + +#define MACB_REGCR_OP_OFFSET 14 +#define MACB_REGCR_OP_SIZE 2 +#define MACB_REGCR_DEVADDR_OFFSET 0 +#define MACB_REGCR_DEVADDR_SIZE 5 + +#define MACB_REGCR_OP_ADDR 0 +#define MACB_REGCR_OP_DATA 1 + +static int macb_mdio_wait_for_idle(void __iomem *macb_base_addr) +{ + u32 val; + + return readx_poll_timeout(readl, macb_base_addr + MACB_NSR, val, + val & MACB_BIT(IDLE), 1, MACB_MDIO_TIMEOUT); +} + +static int macb_mdiobus_read(void __iomem *macb_base_addr, + u32 phy_id, + u32 regnum) +{ + u32 i; + int status; + + if (regnum < 32) { + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_READ) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, regnum) | + MACB_BF(CODE, MACB_MAN_CODE); + + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + } else { + u16 reg; + + reg = MACB_BF(REGCR_OP, MACB_REGCR_OP_ADDR) | + MACB_BF(REGCR_DEVADDR, TI_PHY_DEVADDR); + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_WRITE) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, PHY_REGCR) | + MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(DATA, reg); + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_WRITE) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, PHY_ADDAR) | + MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(DATA, regnum); + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + + reg = MACB_BF(REGCR_OP, MACB_REGCR_OP_DATA) | + MACB_BF(REGCR_DEVADDR, TI_PHY_DEVADDR); + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_WRITE) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, PHY_REGCR) | + MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(DATA, reg); + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_READ) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, PHY_ADDAR) | + MACB_BF(CODE, MACB_MAN_CODE); + + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + } + + return readl(macb_base_addr + MACB_MAN); +} + +static int macb_mdiobus_write(void __iomem *macb_base_addr, u32 phy_id, + u32 regnum, u16 value) +{ + u32 i; + int status; + + if (regnum < 32) { + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_WRITE) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, regnum) | + MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(DATA, value); + + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + } else { + u16 reg; + + reg = MACB_BF(REGCR_OP, MACB_REGCR_OP_ADDR) | + MACB_BF(REGCR_DEVADDR, TI_PHY_DEVADDR); + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_WRITE) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, PHY_REGCR) | + MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(DATA, reg); + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_WRITE) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, PHY_ADDAR) | + MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(DATA, regnum); + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + + reg = MACB_BF(REGCR_OP, MACB_REGCR_OP_DATA) | + MACB_BF(REGCR_DEVADDR, TI_PHY_DEVADDR); + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_WRITE) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, PHY_REGCR) | + MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(DATA, reg); + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + + i = MACB_BF(SOF, MACB_MAN_SOF) | + MACB_BF(RW, MACB_MAN_WRITE) | + MACB_BF(PHYA, phy_id) | + MACB_BF(REGA, PHY_ADDAR) | + MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(DATA, value); + + writel(i, macb_base_addr + MACB_MAN); + status = macb_mdio_wait_for_idle(macb_base_addr); + if (status < 0) + return status; + } + + return 0; +} + +static int macb_scan_mdio(void __iomem *macb_base_addr) +{ + int i; + int phy_reg; + int phy_id; + + for (i = 0; i < PHY_MAX_ADDR; i++) { + phy_reg = macb_mdiobus_read(macb_base_addr, i, MII_PHYSID1); + if (phy_reg < 0) + continue; + + phy_id = (phy_reg & 0xffff) << 16; + phy_reg = macb_mdiobus_read(macb_base_addr, i, MII_PHYSID2); + if (phy_reg < 0) + continue; + + phy_id |= (phy_reg & 0xffff); + if ((phy_id & 0x1fffffff) != 0x1fffffff && + phy_id == TI_PHY_DP83867_ID) + return i; + } + + return -1; +} + +static void macb_setup_phy(void __iomem *macb_base_addr) +{ + int phy_id; + + // Enable MDIO + writel(readl(macb_base_addr + MACB_NCR) | MACB_BIT(MPE), + macb_base_addr + MACB_NCR); + + phy_id = macb_scan_mdio(macb_base_addr); + if (phy_id >= 0) { + if (macb_mdiobus_write(macb_base_addr, phy_id, 0xd3, 0x4000)) + return; + if (macb_mdiobus_write(macb_base_addr, phy_id, 0x14, 0x29c7)) + return; + if (macb_mdiobus_write(macb_base_addr, phy_id, 0x32, 0x0000)) + return; + if (macb_mdiobus_write(macb_base_addr, phy_id, 0x10, 0x0800)) + return; + if (macb_mdiobus_write(macb_base_addr, phy_id, 0x31, 0x1170)) + return; + } +} + static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) { int err; @@ -44,6 +263,7 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) struct platform_device_info plat_info; struct macb_platform_data plat_data; struct resource res[2]; + void __iomem *addr; /* enable pci device */ err = pcim_enable_device(pdev); @@ -66,6 +286,11 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) dev_info(&pdev->dev, "EMAC physical base addr: %pa\n", &res[0].start); + addr = ioremap(res[0].start, resource_size(&res[0])); + if (addr) { + macb_setup_phy(addr); + iounmap(addr); + } /* set up macb platform data */ memset(&plat_data, 0, sizeof(plat_data)); From patchwork Sat Jun 15 23:48:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parshuram Raju Thombare X-Patchwork-Id: 1116491 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=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="IwKlI1qv"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="hltF4DBm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45RDgp4dSpz9sBr for ; Sun, 16 Jun 2019 09:48:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727192AbfFOXsT (ORCPT ); Sat, 15 Jun 2019 19:48:19 -0400 Received: from mx0b-0014ca01.pphosted.com ([208.86.201.193]:46754 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726434AbfFOXsS (ORCPT ); Sat, 15 Jun 2019 19:48:18 -0400 Received: from pps.filterd (m0042333.ppops.net [127.0.0.1]) by mx0b-0014ca01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5FNicgO020579; Sat, 15 Jun 2019 16:48:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=EUA/s9kp85Ft+Mkd8Ea4YAwNh3wR4ZTBeSnJVMCeo2A=; b=IwKlI1qv6iKt1NaOgqQxyCWSkyVKZWi3p89rF9LLlxA5BEQuJzPlKGzKa0atAcJ4+JzD uM7DN6KZs1LNZ/wpW/eH+04Bu4uKWrtYd/zD6clcjmKb0nMfboNT7vxiG02BZOG2cBDZ wQjeo+NXO9MA/MN3C4b51HKeY6OuURpPkOxBV8nTrIaPt8xKQX4Xd3XLuujludM0Wh5W TDWjOADxR+YXXnAjuPsAZywNLqf9lLifUn2hObEGuHVGZbA6EQ0EHreUupSQB3Ybdrfk MMtQ4NbkmfvC2lMXCW/GgeqSk3ope9aTJJboMEC97+WzPnDiR4YxP5Hv7DWPXKpcOIUk 0w== Authentication-Results: cadence.com; spf=pass smtp.mailfrom=pthombar@cadence.com Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp2055.outbound.protection.outlook.com [104.47.41.55]) by mx0b-0014ca01.pphosted.com with ESMTP id 2t4v8w2146-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sat, 15 Jun 2019 16:48:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EUA/s9kp85Ft+Mkd8Ea4YAwNh3wR4ZTBeSnJVMCeo2A=; b=hltF4DBmClZtocoAISpmxnIOi5kwubRk8vo1qWi62gA3aVt+c6jByWF3yJ3RgC6QEtTRyoEkx9QnRDC6M4GpcYx4Yvk/FkR4xVfemnfYjr6Ry0Id5oLs9H7vjyq4+HahPSyxtUrEM99O4SOebxAoOgRoqjOCB1u6Zd2Att0jmG8= Received: from BN8PR07CA0005.namprd07.prod.outlook.com (2603:10b6:408:ac::18) by BYAPR07MB6824.namprd07.prod.outlook.com (2603:10b6:a03:128::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1987.11; Sat, 15 Jun 2019 23:48:10 +0000 Received: from DM3NAM05FT019.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::200) by BN8PR07CA0005.outlook.office365.com (2603:10b6:408:ac::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1987.12 via Frontend Transport; Sat, 15 Jun 2019 23:48:09 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning cadence.com discourages use of 199.43.4.28 as permitted sender) Received: from rmmaillnx1.cadence.com (199.43.4.28) by DM3NAM05FT019.mail.protection.outlook.com (10.152.98.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.7 via Frontend Transport; Sat, 15 Jun 2019 23:48:09 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by rmmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNm445024318 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Sat, 15 Jun 2019 19:48:06 -0400 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 16 Jun 2019 01:48:03 +0200 Received: from lvlogina.cadence.com (10.165.176.102) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Sun, 16 Jun 2019 01:48:03 +0200 Received: from lvlogina.cadence.com (localhost.localdomain [127.0.0.1]) by lvlogina.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNm3mg028430; Sun, 16 Jun 2019 00:48:03 +0100 From: Parshuram Thombare To: , , , CC: , , , , , , Subject: [PATCH 4/6] net: macb: add support for c45 PHY Date: Sun, 16 Jun 2019 00:48:01 +0100 Message-ID: <1560642481-28297-1-git-send-email-pthombar@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1560642444-27704-1-git-send-email-pthombar@cadence.com> References: <1560642444-27704-1-git-send-email-pthombar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:199.43.4.28; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(396003)(376002)(136003)(346002)(39850400004)(2980300002)(36092001)(189003)(199004)(2906002)(70586007)(305945005)(336012)(69596002)(70206006)(76130400001)(5660300002)(2201001)(4326008)(86362001)(356004)(68736007)(478600001)(26826003)(53936002)(107886003)(316002)(110136005)(54906003)(36756003)(16586007)(8676002)(81166006)(76176011)(50466002)(81156014)(47776003)(8936002)(446003)(48376002)(50226002)(7696005)(51416003)(486006)(7126003)(53416004)(2616005)(11346002)(476003)(186003)(426003)(126002)(77096007)(26005)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB6824; H:rmmaillnx1.cadence.com; FPR:; SPF:SoftFail; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a3efa71-87c9-4291-0d82-08d6f1ebebc9 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:BYAPR07MB6824; X-MS-TrafficTypeDiagnostic: BYAPR07MB6824: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1122; X-Forefront-PRVS: 0069246B74 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: Poc8y40t+x/8nAzB03WsFvZY8FueoJ+8tV9clKzL8/1vpCfUNalroCV6/zzGNOJI5IGJc6b8CsTewN8ehC7L8tU7mFIIArjvcbivHR9wihSU1pAvWgzcnYTBoEEI+MISwOBWNLl5IhPJXjVm8XGvfhgYKWwfxk65h992OeRB0a0TB6QhZNgdZ9MwTaLA9zvZvmIm8BZmHPLLHtlJU82r35oHfDwZagPTYyUJyNn6RmjkTtGUeR2NuFP+Bd5oqX3ZPSs4+kZ0sBr89WqJXkRLnmAQSCJsS3/ahwqB9kftyw8E7qpXtBgq2zTO4HZKfQhqXCyzWcdG98dVBKchI7pvjipGI2gF8Zj9hv+cb+oRFrschA0/qPdTfKROTfpaH2B58iXcmQ7QZeKVJG6DIty+nZ7Hi+H/qcfrXQFHoKVQ414= X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2019 23:48:09.0061 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a3efa71-87c9-4291-0d82-08d6f1ebebc9 X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[199.43.4.28]; Helo=[rmmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB6824 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf.smktg.jp include:_spf.salesforce.com include:mktomail.com include:spf-0014ca01.pphosted.com include:spf.protection.outlook.com include:auth.msgapp.com include:spf.mandrillapp.com ~all X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-15_13:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=810 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906150226 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch modify MDIO read/write functions to support communication with C45 PHY. Signed-off-by: Parshuram Thombare --- drivers/net/ethernet/cadence/macb.h | 15 ++++-- drivers/net/ethernet/cadence/macb_main.c | 61 +++++++++++++++++++----- drivers/net/ethernet/cadence/macb_pci.c | 60 +++++++++++------------ 3 files changed, 91 insertions(+), 45 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 85c7e4cb1057..75f093bc52fe 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -667,10 +667,17 @@ #define GEM_CLK_DIV96 5 /* Constants for MAN register */ -#define MACB_MAN_SOF 1 -#define MACB_MAN_WRITE 1 -#define MACB_MAN_READ 2 -#define MACB_MAN_CODE 2 +#define MACB_MAN_C22_SOF 1 +#define MACB_MAN_C22_WRITE 1 +#define MACB_MAN_C22_READ 2 +#define MACB_MAN_C22_CODE 2 + +#define MACB_MAN_C45_SOF 0 +#define MACB_MAN_C45_ADDR 0 +#define MACB_MAN_C45_WRITE 1 +#define MACB_MAN_C45_POST_READ_INCR 2 +#define MACB_MAN_C45_READ 3 +#define MACB_MAN_C45_CODE 2 /* Capability mask bits */ #define MACB_CAPS_ISR_CLEAR_ON_WRITE BIT(0) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 5b3e7d9f4384..57ffc4e9d2b9 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -334,11 +334,30 @@ static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum) if (status < 0) goto mdio_read_exit; - macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF) - | MACB_BF(RW, MACB_MAN_READ) - | MACB_BF(PHYA, mii_id) - | MACB_BF(REGA, regnum) - | MACB_BF(CODE, MACB_MAN_CODE))); + if (regnum & MII_ADDR_C45) { + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF) + | MACB_BF(RW, MACB_MAN_C45_ADDR) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, (regnum >> 16) & 0x1F) + | MACB_BF(DATA, regnum & 0xFFFF) + | MACB_BF(CODE, MACB_MAN_C45_CODE))); + + status = macb_mdio_wait_for_idle(bp); + if (status < 0) + goto mdio_read_exit; + + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF) + | MACB_BF(RW, MACB_MAN_C45_READ) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, (regnum >> 16) & 0x1F) + | MACB_BF(CODE, MACB_MAN_C45_CODE))); + } else { + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C22_SOF) + | MACB_BF(RW, MACB_MAN_C22_READ) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, regnum) + | MACB_BF(CODE, MACB_MAN_C22_CODE))); + } status = macb_mdio_wait_for_idle(bp); if (status < 0) @@ -367,12 +386,32 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum, if (status < 0) goto mdio_write_exit; - macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF) - | MACB_BF(RW, MACB_MAN_WRITE) - | MACB_BF(PHYA, mii_id) - | MACB_BF(REGA, regnum) - | MACB_BF(CODE, MACB_MAN_CODE) - | MACB_BF(DATA, value))); + if (regnum & MII_ADDR_C45) { + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF) + | MACB_BF(RW, MACB_MAN_C45_ADDR) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, (regnum >> 16) & 0x1F) + | MACB_BF(DATA, regnum & 0xFFFF) + | MACB_BF(CODE, MACB_MAN_C45_CODE))); + + status = macb_mdio_wait_for_idle(bp); + if (status < 0) + goto mdio_write_exit; + + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF) + | MACB_BF(RW, MACB_MAN_C45_WRITE) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, (regnum >> 16) & 0x1F) + | MACB_BF(CODE, MACB_MAN_C45_CODE) + | MACB_BF(DATA, value))); + } else { + macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C22_SOF) + | MACB_BF(RW, MACB_MAN_C22_WRITE) + | MACB_BF(PHYA, mii_id) + | MACB_BF(REGA, regnum) + | MACB_BF(CODE, MACB_MAN_C22_CODE) + | MACB_BF(DATA, value))); + } status = macb_mdio_wait_for_idle(bp); if (status < 0) diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c index 1001e03191a1..23ca4557f45c 100644 --- a/drivers/net/ethernet/cadence/macb_pci.c +++ b/drivers/net/ethernet/cadence/macb_pci.c @@ -69,11 +69,11 @@ static int macb_mdiobus_read(void __iomem *macb_base_addr, int status; if (regnum < 32) { - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_READ) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_READ) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, regnum) | - MACB_BF(CODE, MACB_MAN_CODE); + MACB_BF(CODE, MACB_MAN_C22_CODE); writel(i, macb_base_addr + MACB_MAN); status = macb_mdio_wait_for_idle(macb_base_addr); @@ -84,22 +84,22 @@ static int macb_mdiobus_read(void __iomem *macb_base_addr, reg = MACB_BF(REGCR_OP, MACB_REGCR_OP_ADDR) | MACB_BF(REGCR_DEVADDR, TI_PHY_DEVADDR); - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_WRITE) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_WRITE) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, PHY_REGCR) | - MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(CODE, MACB_MAN_C22_CODE) | MACB_BF(DATA, reg); writel(i, macb_base_addr + MACB_MAN); status = macb_mdio_wait_for_idle(macb_base_addr); if (status < 0) return status; - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_WRITE) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_WRITE) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, PHY_ADDAR) | - MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(CODE, MACB_MAN_C22_CODE) | MACB_BF(DATA, regnum); writel(i, macb_base_addr + MACB_MAN); status = macb_mdio_wait_for_idle(macb_base_addr); @@ -108,22 +108,22 @@ static int macb_mdiobus_read(void __iomem *macb_base_addr, reg = MACB_BF(REGCR_OP, MACB_REGCR_OP_DATA) | MACB_BF(REGCR_DEVADDR, TI_PHY_DEVADDR); - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_WRITE) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_WRITE) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, PHY_REGCR) | - MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(CODE, MACB_MAN_C22_CODE) | MACB_BF(DATA, reg); writel(i, macb_base_addr + MACB_MAN); status = macb_mdio_wait_for_idle(macb_base_addr); if (status < 0) return status; - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_READ) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_READ) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, PHY_ADDAR) | - MACB_BF(CODE, MACB_MAN_CODE); + MACB_BF(CODE, MACB_MAN_C22_CODE); writel(i, macb_base_addr + MACB_MAN); status = macb_mdio_wait_for_idle(macb_base_addr); @@ -141,11 +141,11 @@ static int macb_mdiobus_write(void __iomem *macb_base_addr, u32 phy_id, int status; if (regnum < 32) { - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_WRITE) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_WRITE) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, regnum) | - MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(CODE, MACB_MAN_C22_CODE) | MACB_BF(DATA, value); writel(i, macb_base_addr + MACB_MAN); @@ -157,22 +157,22 @@ static int macb_mdiobus_write(void __iomem *macb_base_addr, u32 phy_id, reg = MACB_BF(REGCR_OP, MACB_REGCR_OP_ADDR) | MACB_BF(REGCR_DEVADDR, TI_PHY_DEVADDR); - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_WRITE) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_WRITE) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, PHY_REGCR) | - MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(CODE, MACB_MAN_C22_CODE) | MACB_BF(DATA, reg); writel(i, macb_base_addr + MACB_MAN); status = macb_mdio_wait_for_idle(macb_base_addr); if (status < 0) return status; - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_WRITE) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_WRITE) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, PHY_ADDAR) | - MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(CODE, MACB_MAN_C22_CODE) | MACB_BF(DATA, regnum); writel(i, macb_base_addr + MACB_MAN); status = macb_mdio_wait_for_idle(macb_base_addr); @@ -181,22 +181,22 @@ static int macb_mdiobus_write(void __iomem *macb_base_addr, u32 phy_id, reg = MACB_BF(REGCR_OP, MACB_REGCR_OP_DATA) | MACB_BF(REGCR_DEVADDR, TI_PHY_DEVADDR); - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_WRITE) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_WRITE) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, PHY_REGCR) | - MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(CODE, MACB_MAN_C22_CODE) | MACB_BF(DATA, reg); writel(i, macb_base_addr + MACB_MAN); status = macb_mdio_wait_for_idle(macb_base_addr); if (status < 0) return status; - i = MACB_BF(SOF, MACB_MAN_SOF) | - MACB_BF(RW, MACB_MAN_WRITE) | + i = MACB_BF(SOF, MACB_MAN_C22_SOF) | + MACB_BF(RW, MACB_MAN_C22_WRITE) | MACB_BF(PHYA, phy_id) | MACB_BF(REGA, PHY_ADDAR) | - MACB_BF(CODE, MACB_MAN_CODE) | + MACB_BF(CODE, MACB_MAN_C22_CODE) | MACB_BF(DATA, value); writel(i, macb_base_addr + MACB_MAN); From patchwork Sat Jun 15 23:48:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parshuram Raju Thombare X-Patchwork-Id: 1116493 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=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="XKUGpBn1"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="rm1asMNc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45RG0T1ml3z9s9y for ; Sun, 16 Jun 2019 10:47:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727094AbfFPArq (ORCPT ); Sat, 15 Jun 2019 20:47:46 -0400 Received: from mx0a-0014ca01.pphosted.com ([208.84.65.235]:34018 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726434AbfFPArq (ORCPT ); Sat, 15 Jun 2019 20:47:46 -0400 X-Greylist: delayed 3677 seconds by postgrey-1.27 at vger.kernel.org; Sat, 15 Jun 2019 20:47:44 EDT Received: from pps.filterd (m0042385.ppops.net [127.0.0.1]) by mx0a-0014ca01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5FNm78c028068; Sat, 15 Jun 2019 16:48:40 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=bnTTUA0ptamDuxmRXW/zfAVOXLr0tETAmjdwULWkSrc=; b=XKUGpBn1sLfntPKPyxTrBE9Y++ZUXiKWdPTYjRoyPvOGnmh/lYbSewvBrOr9FHZ9mIgn 75PjPJnCefV0XjgfzIHzN0sjXmHiUsy+OzZQqIU7vAUdkw/ZYZzqGUjeCo/vDD5CogDo xgZkO/10wLMyule7RsvCfqty9TAQLNaFjFPmflMNKGdDwcL4zsbC4LW8OfxR7q3HUN+J MgCRHs8RJm4kBLAPT2ITjGsDzp3gv5aYsHU0yemYMXwokz++Z32o4HGCLbVwsXUSxkcr uYVYNyRLedzZHStEtMGppCFJOFf+1fprQiYDJHgG9vWQCEpzxApZyx+JbnNWEKkHRJgN fg== Authentication-Results: cadence.com; spf=pass smtp.mailfrom=pthombar@cadence.com Received: from nam03-by2-obe.outbound.protection.outlook.com (mail-by2nam03lp2057.outbound.protection.outlook.com [104.47.42.57]) by mx0a-0014ca01.pphosted.com with ESMTP id 2t4w7v1rc1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 15 Jun 2019 16:48:40 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bnTTUA0ptamDuxmRXW/zfAVOXLr0tETAmjdwULWkSrc=; b=rm1asMNclLSslnDBv6M1dN1cVTT2WxijAkDY1Ly69DfGl7nZWkkGCGt7iCuv17VlSlvnsaGIVAb5vIM8ol+Isatzr4x3/7k33d6FiMNMXbtcDKdQsUrxclDHHCI147IhShQLVacrdfyQGZk0Rsa3RLHyETTnAAq6gZAYs8IikaQ= Received: from DM6PR07CA0035.namprd07.prod.outlook.com (20.176.74.48) by DM6PR07MB6828.namprd07.prod.outlook.com (20.179.70.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1987.11; Sat, 15 Jun 2019 23:48:38 +0000 Received: from BY2NAM05FT024.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::207) by DM6PR07CA0035.outlook.office365.com (2603:10b6:5:94::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1965.15 via Frontend Transport; Sat, 15 Jun 2019 23:48:38 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning cadence.com discourages use of 158.140.1.28 as permitted sender) Received: from sjmaillnx1.cadence.com (158.140.1.28) by BY2NAM05FT024.mail.protection.outlook.com (10.152.100.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.7 via Frontend Transport; Sat, 15 Jun 2019 23:48:38 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by sjmaillnx1.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNmaBa031884 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Sat, 15 Jun 2019 16:48:37 -0700 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 16 Jun 2019 01:48:35 +0200 Received: from lvlogina.cadence.com (10.165.176.102) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Sun, 16 Jun 2019 01:48:34 +0200 Received: from lvlogina.cadence.com (localhost.localdomain [127.0.0.1]) by lvlogina.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNmYNO028922; Sun, 16 Jun 2019 00:48:34 +0100 From: Parshuram Thombare To: , , , CC: , , , , , , Subject: [PATCH 5/6] net: macb: add support for high speed interface Date: Sun, 16 Jun 2019 00:48:32 +0100 Message-ID: <1560642512-28765-1-git-send-email-pthombar@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1560642481-28297-1-git-send-email-pthombar@cadence.com> References: <1560642481-28297-1-git-send-email-pthombar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:158.140.1.28; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(376002)(39850400004)(136003)(396003)(2980300002)(199004)(189003)(36092001)(53416004)(478600001)(486006)(126002)(446003)(476003)(76176011)(11346002)(86362001)(5660300002)(7696005)(246002)(48376002)(7126003)(2616005)(107886003)(186003)(2201001)(47776003)(26826003)(426003)(51416003)(336012)(356004)(26005)(14444005)(2906002)(305945005)(50226002)(110136005)(77096007)(316002)(54906003)(16586007)(70586007)(30864003)(8936002)(70206006)(8676002)(76130400001)(4326008)(36756003)(7636002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB6828; H:sjmaillnx1.cadence.com; FPR:; SPF:SoftFail; LANG:en; PTR:corp.Cadence.COM; A:1; MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fabcd084-9f21-49a7-8da5-08d6f1ebfd1b X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:DM6PR07MB6828; X-MS-TrafficTypeDiagnostic: DM6PR07MB6828: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-Forefront-PRVS: 0069246B74 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: LKivYVU301kTM8QQPwohcJ7DvaQK2ElbAnu8xeNc1mfOjBUBzPUdbf9n5ufN2UfGte4f0oEeP3paETykBhG1fV3aqKa76UKTtRoHo2sMsmqJFIbO+HQt7Tw6vBNC3jKE3o1gAiO0nn+GMpneM3HlEoDD+j8tnZl9/rC8kg+mCNsgTBRjcnD7gQVwsKYlwasEy07idyvxVzsehNiucIBU5NC830muLfKgrJSto/E5RHlec2LRB0fvSg3Mnm3pTJ1RSbv8Nwt2uAKBvKjdnx780unbkTMBsPXZ4C49n5kB14Hl9YOcNO1G5nGIezf4gpy2UShbzBehSJNNWnB7zCjb/yV7WXT50oZHULkTOOGfwh6HFhyzhljPixflHoCsL6C+GG1jWK5g45iuwPcwOEwoF/L2EoLqJXHB+mLtvE4jt8E= X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2019 23:48:38.4823 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fabcd084-9f21-49a7-8da5-08d6f1ebfd1b X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[158.140.1.28]; Helo=[sjmaillnx1.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB6828 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf.smktg.jp include:_spf.salesforce.com include:mktomail.com include:spf-0014ca01.pphosted.com include:spf.protection.outlook.com include:auth.msgapp.com include:spf.mandrillapp.com ~all X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-15_13:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906150226 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch add support for high speed USXGMII PCS and 10G speed in Cadence ethernet controller driver. Signed-off-by: Parshuram Thombare --- drivers/net/ethernet/cadence/macb.h | 42 +++++ drivers/net/ethernet/cadence/macb_main.c | 219 +++++++++++++++++++---- 2 files changed, 228 insertions(+), 33 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 75f093bc52fe..e00b9f647757 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -85,6 +85,7 @@ #define GEM_USRIO 0x000c /* User IO */ #define GEM_DMACFG 0x0010 /* DMA Configuration */ #define GEM_JML 0x0048 /* Jumbo Max Length */ +#define GEM_HS_MAC_CONFIG 0x0050 /* GEM high speed config */ #define GEM_HRB 0x0080 /* Hash Bottom */ #define GEM_HRT 0x0084 /* Hash Top */ #define GEM_SA1B 0x0088 /* Specific1 Bottom */ @@ -172,6 +173,9 @@ #define GEM_DCFG7 0x0298 /* Design Config 7 */ #define GEM_DCFG8 0x029C /* Design Config 8 */ #define GEM_DCFG10 0x02A4 /* Design Config 10 */ +#define GEM_DCFG12 0x02AC /* Design Config 12 */ +#define GEM_USX_CONTROL 0x0A80 /* USXGMII control register */ +#define GEM_USX_STATUS 0x0A88 /* USXGMII status register */ #define GEM_TXBDCTRL 0x04cc /* TX Buffer Descriptor control register */ #define GEM_RXBDCTRL 0x04d0 /* RX Buffer Descriptor control register */ @@ -279,6 +283,8 @@ #define MACB_IRXFCS_SIZE 1 /* GEM specific NCR bitfields. */ +#define GEM_ENABLE_HS_MAC_OFFSET 31 +#define GEM_ENABLE_HS_MAC_SIZE 1 #define GEM_TWO_PT_FIVE_GIG_OFFSET 29 #define GEM_TWO_PT_FIVE_GIG_SIZE 1 @@ -470,6 +476,10 @@ #define MACB_REV_OFFSET 0 #define MACB_REV_SIZE 16 +/* Bitfield in HS_MAC_CONFIG */ +#define GEM_HS_MAC_SPEED_OFFSET 0 +#define GEM_HS_MAC_SPEED_SIZE 3 + /* Bitfields in PCS_CONTROL. */ #define GEM_PCS_CTRL_RST_OFFSET 15 #define GEM_PCS_CTRL_RST_SIZE 1 @@ -535,6 +545,34 @@ #define GEM_RXBD_RDBUFF_OFFSET 8 #define GEM_RXBD_RDBUFF_SIZE 4 +/* Bitfields in DCFG12. */ +#define GEM_HIGH_SPEED_OFFSET 26 +#define GEM_HIGH_SPEED_SIZE 1 + +/* Bitfields in USX_CONTROL. */ +#define GEM_USX_CTRL_SPEED_OFFSET 14 +#define GEM_USX_CTRL_SPEED_SIZE 3 +#define GEM_SERDES_RATE_OFFSET 12 +#define GEM_SERDES_RATE_SIZE 2 +#define GEM_RX_SCR_BYPASS_OFFSET 9 +#define GEM_RX_SCR_BYPASS_SIZE 1 +#define GEM_TX_SCR_BYPASS_OFFSET 8 +#define GEM_TX_SCR_BYPASS_SIZE 1 +#define GEM_RX_SYNC_RESET_OFFSET 2 +#define GEM_RX_SYNC_RESET_SIZE 1 +#define GEM_TX_EN_OFFSET 1 +#define GEM_TX_EN_SIZE 1 +#define GEM_SIGNAL_OK_OFFSET 0 +#define GEM_SIGNAL_OK_SIZE 1 + +/* Bitfields in USX_STATUS. */ +#define GEM_USX_TX_FAULT_OFFSET 28 +#define GEM_USX_TX_FAULT_SIZE 1 +#define GEM_USX_RX_FAULT_OFFSET 27 +#define GEM_USX_RX_FAULT_SIZE 1 +#define GEM_USX_BLOCK_LOCK_OFFSET 0 +#define GEM_USX_BLOCK_LOCK_SIZE 1 + /* Bitfields in TISUBN */ #define GEM_SUBNSINCR_OFFSET 0 #define GEM_SUBNSINCR_SIZE 16 @@ -695,6 +733,7 @@ #define MACB_CAPS_MACB_IS_GEM BIT(31) #define MACB_CAPS_PCS BIT(24) #define MACB_CAPS_MACB_IS_GEM_GXL BIT(25) +#define MACB_CAPS_HIGH_SPEED BIT(26) #define MACB_GEM7010_IDNUM 0x009 #define MACB_GEM7014_IDNUM 0x107 @@ -774,6 +813,7 @@ }) #define MACB_READ_NSR(bp) macb_readl(bp, NSR) +#define GEM_READ_USX_STATUS(bp) gem_readl(bp, USX_STATUS) /* struct macb_dma_desc - Hardware DMA descriptor * @addr: DMA address of data buffer @@ -1287,6 +1327,8 @@ struct macb { struct macb_pm_data pm_data; struct phylink *pl; struct phylink_config pl_config; + u32 serdes_rate; + u32 fixed_speed; }; #ifdef CONFIG_MACB_USE_HWSTAMP diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 57ffc4e9d2b9..4af0b434e818 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -77,6 +77,20 @@ #define MACB_WOL_HAS_MAGIC_PACKET (0x1 << 0) #define MACB_WOL_ENABLED (0x1 << 1) +enum { + HS_MAC_SPEED_100M, + HS_MAC_SPEED_1000M, + HS_MAC_SPEED_2500M, + HS_MAC_SPEED_5000M, + HS_MAC_SPEED_10000M, + HS_MAC_SPEED_25000M, +}; + +enum { + MACB_SERDES_RATE_5_PT_15625Gbps, + MACB_SERDES_RATE_10_PT_3125Gbps, +}; + /* Graceful stop timeouts in us. We should allow up to * 1 frame time (10 Mbits/s, full-duplex, ignoring collisions) */ @@ -86,6 +100,8 @@ #define MACB_MDIO_TIMEOUT 1000000 /* in usecs */ +#define MACB_USX_BLOCK_LOCK_TIMEOUT 1000000 /* in usecs */ + /* DMA buffer descriptor might be different size * depends on hardware configuration: * @@ -438,24 +454,37 @@ static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev) if (!clk) return; - switch (speed) { - case SPEED_10: - rate = 2500000; - break; - case SPEED_100: - rate = 25000000; - break; - case SPEED_1000: - rate = 125000000; - break; - case SPEED_2500: - if (bp->caps & MACB_CAPS_MACB_IS_GEM_GXL) - rate = 312500000; - else + if (bp->phy_interface == PHY_INTERFACE_MODE_USXGMII) { + switch (bp->serdes_rate) { + case MACB_SERDES_RATE_5_PT_15625Gbps: + rate = 78125000; + break; + case MACB_SERDES_RATE_10_PT_3125Gbps: + rate = 156250000; + break; + default: + return; + } + } else { + switch (speed) { + case SPEED_10: + rate = 2500000; + break; + case SPEED_100: + rate = 25000000; + break; + case SPEED_1000: rate = 125000000; - break; - default: - return; + break; + case SPEED_2500: + if (bp->caps & MACB_CAPS_MACB_IS_GEM_GXL) + rate = 312500000; + else + return; + break; + default: + return; + } } rate_rounded = clk_round_rate(clk, rate); @@ -484,6 +513,22 @@ static void gem_phylink_validate(struct phylink_config *pl_config, __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, }; switch (state->interface) { + case PHY_INTERFACE_MODE_NA: + case PHY_INTERFACE_MODE_USXGMII: + case PHY_INTERFACE_MODE_10GKR: + if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) { + phylink_set(mask, 10000baseCR_Full); + phylink_set(mask, 10000baseER_Full); + phylink_set(mask, 10000baseKR_Full); + phylink_set(mask, 10000baseLR_Full); + phylink_set(mask, 10000baseLRM_Full); + phylink_set(mask, 10000baseSR_Full); + phylink_set(mask, 10000baseT_Full); + phylink_set(mask, 5000baseT_Full); + phylink_set(mask, 2500baseX_Full); + phylink_set(mask, 1000baseX_Full); + } + /* Fall-through */ case PHY_INTERFACE_MODE_SGMII: if (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE) phylink_set(mask, 2500baseT_Full); @@ -594,17 +639,55 @@ static void gem_mac_config(struct phylink_config *pl_config, unsigned int mode, reg |= MACB_BIT(FD); macb_or_gem_writel(bp, NCFGR, reg); - if (state->speed == SPEED_2500) { - gem_writel(bp, NCFGR, GEM_BIT(GBE) | - gem_readl(bp, NCFGR)); - gem_writel(bp, NCR, GEM_BIT(TWO_PT_FIVE_GIG) | - gem_readl(bp, NCR)); - } else if (state->speed == SPEED_1000) { - gem_writel(bp, NCFGR, GEM_BIT(GBE) | - gem_readl(bp, NCFGR)); - } else if (state->speed == SPEED_100) { - macb_writel(bp, NCFGR, MACB_BIT(SPD) | - macb_readl(bp, NCFGR)); + if (bp->phy_interface == PHY_INTERFACE_MODE_USXGMII) { + u32 speed; + + switch (state->speed) { + case SPEED_10000: + if (bp->serdes_rate == + MACB_SERDES_RATE_10_PT_3125Gbps) { + speed = HS_MAC_SPEED_10000M; + } else { + netdev_warn(netdev, + "10G not supported by HW"); + netdev_warn(netdev, "Setting speed to 1G"); + speed = HS_MAC_SPEED_1000M; + } + break; + case SPEED_5000: + speed = HS_MAC_SPEED_5000M; + break; + case SPEED_2500: + speed = HS_MAC_SPEED_2500M; + break; + case SPEED_1000: + speed = HS_MAC_SPEED_1000M; + break; + default: + case SPEED_100: + speed = HS_MAC_SPEED_100M; + break; + } + + gem_writel(bp, HS_MAC_CONFIG, + GEM_BFINS(HS_MAC_SPEED, speed, + gem_readl(bp, HS_MAC_CONFIG))); + gem_writel(bp, USX_CONTROL, + GEM_BFINS(USX_CTRL_SPEED, speed, + gem_readl(bp, USX_CONTROL))); + } else { + if (state->speed == SPEED_2500) { + gem_writel(bp, NCFGR, GEM_BIT(GBE) | + gem_readl(bp, NCFGR)); + gem_writel(bp, NCR, GEM_BIT(TWO_PT_FIVE_GIG) | + gem_readl(bp, NCR)); + } else if (state->speed == SPEED_1000) { + gem_writel(bp, NCFGR, GEM_BIT(GBE) | + gem_readl(bp, NCFGR)); + } else if (state->speed == SPEED_100) { + macb_writel(bp, NCFGR, MACB_BIT(SPD) | + macb_readl(bp, NCFGR)); + } } bp->speed = state->speed; @@ -649,6 +732,16 @@ static const struct phylink_mac_ops gem_phylink_ops = { .mac_link_down = gem_mac_link_down, }; +void gem_usx_fixed_state(struct net_device *dev, + struct phylink_link_state *state) +{ + struct macb *bp = netdev_priv(dev); + + state->speed = (bp->fixed_speed == SPEED_UNKNOWN) ? SPEED_1000 + : bp->fixed_speed; + state->duplex = 1; +} + /* based on au1000_eth. c*/ static int macb_mii_probe(struct net_device *dev) { @@ -660,6 +753,8 @@ static int macb_mii_probe(struct net_device *dev) np = bp->pdev->dev.of_node; ret = 0; + bp->pl_config.dev = &dev->dev; + bp->pl_config.type = PHYLINK_NETDEV; bp->pl_config.dev = &dev->dev; bp->pl_config.type = PHYLINK_NETDEV; bp->pl = phylink_create(&bp->pl_config, of_fwnode_handle(np), @@ -670,6 +765,9 @@ static int macb_mii_probe(struct net_device *dev) return PTR_ERR(bp->pl); } + if (bp->phy_interface == PHY_INTERFACE_MODE_USXGMII) + phylink_fixed_state_cb(bp->pl, gem_usx_fixed_state); + ret = phylink_of_phy_connect(bp->pl, np, 0); if (ret == -ENODEV && bp->mii_bus) { phydev = phy_find_first(bp->mii_bus); @@ -2337,11 +2435,19 @@ static void macb_configure_dma(struct macb *bp) } } -static void macb_init_hw(struct macb *bp) +static int macb_wait_for_usx_block_lock(struct macb *bp) +{ + u32 val; + + return readx_poll_timeout(GEM_READ_USX_STATUS, bp, val, + val & GEM_BIT(USX_BLOCK_LOCK), + 1, MACB_USX_BLOCK_LOCK_TIMEOUT); +} + +static int macb_init_hw(struct macb *bp) { struct macb_queue *queue; unsigned int q; - u32 config; macb_reset_hw(bp); @@ -2375,6 +2481,25 @@ static void macb_init_hw(struct macb *bp) if (bp->caps & MACB_CAPS_JUMBO) bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK; + if (bp->phy_interface == PHY_INTERFACE_MODE_USXGMII) { + bp->speed = 10000; + bp->duplex = 1; + gem_writel(bp, NCR, gem_readl(bp, NCR) | + GEM_BIT(ENABLE_HS_MAC)); + gem_writel(bp, NCFGR, gem_readl(bp, NCFGR) | + MACB_BIT(FD) | GEM_BIT(PCSSEL)); + config = gem_readl(bp, USX_CONTROL); + config = GEM_BFINS(SERDES_RATE, bp->serdes_rate, config); + config &= ~GEM_BIT(TX_SCR_BYPASS); + config &= ~GEM_BIT(RX_SCR_BYPASS); + gem_writel(bp, USX_CONTROL, config | + GEM_BIT(TX_EN)); + config = gem_readl(bp, USX_CONTROL); + gem_writel(bp, USX_CONTROL, config | GEM_BIT(SIGNAL_OK)); + if (macb_wait_for_usx_block_lock(bp) < 0) + return -ETIMEDOUT; + } + if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII || bp->phy_interface == PHY_INTERFACE_MODE_1000BASEX || bp->phy_interface == PHY_INTERFACE_MODE_2500BASEX) { @@ -2410,6 +2535,7 @@ static void macb_init_hw(struct macb *bp) /* Enable TX and RX */ macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE) | MACB_BIT(TE)); + return 0; } /* The hash address register is 64 bits long and takes up two @@ -2568,7 +2694,9 @@ static int macb_open(struct net_device *dev) napi_enable(&queue->napi); bp->macbgem_ops.mog_init_rings(bp); - macb_init_hw(bp); + err = macb_init_hw(bp); + if (err) + goto init_hw_exit; /* schedule a link state check */ phylink_start(bp->pl); @@ -2578,6 +2706,9 @@ static int macb_open(struct net_device *dev) if (bp->ptp_info) bp->ptp_info->ptp_init(dev); +init_hw_exit: + if (err) + macb_free_consistent(bp); pm_exit: if (err) { pm_runtime_put_sync(&bp->pdev->dev); @@ -3493,6 +3624,9 @@ static void macb_configure_caps(struct macb *bp, default: break; } + dcfg = gem_readl(bp, DCFG12); + if (GEM_BFEXT(HIGH_SPEED, dcfg) == 1) + bp->caps |= MACB_CAPS_HIGH_SPEED; dcfg = gem_readl(bp, DCFG2); if ((dcfg & (GEM_BIT(RX_PKT_BUFF) | GEM_BIT(TX_PKT_BUFF))) == 0) bp->caps |= MACB_CAPS_FIFO_MODE; @@ -3784,7 +3918,12 @@ static int macb_init(struct platform_device *pdev) if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII || bp->phy_interface == PHY_INTERFACE_MODE_1000BASEX || bp->phy_interface == PHY_INTERFACE_MODE_2500BASEX) - val |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL); + val |= GEM_BIT(SGMIIEN); + if (bp->phy_interface == PHY_INTERFACE_MODE_USXGMII || + bp->phy_interface == PHY_INTERFACE_MODE_SGMII || + bp->phy_interface == PHY_INTERFACE_MODE_1000BASEX || + bp->phy_interface == PHY_INTERFACE_MODE_2500BASEX) + val |= GEM_BIT(PCSSEL); macb_writel(bp, NCFGR, val); return 0; @@ -4372,7 +4511,21 @@ static int macb_probe(struct platform_device *pdev) } else if (bp->caps & MACB_CAPS_MACB_IS_GEM_GXL) { u32 interface_supported = 1; - if (err == PHY_INTERFACE_MODE_SGMII || + if (err == PHY_INTERFACE_MODE_USXGMII) { + if (!(bp->caps & MACB_CAPS_HIGH_SPEED && + bp->caps & MACB_CAPS_PCS)) + interface_supported = 0; + + if (of_property_read_u32(np, "serdes-rate", + &bp->serdes_rate)) { + netdev_err(dev, + "GEM serdes_rate not specified"); + interface_supported = 0; + } + if (of_property_read_u32(np, "fixed-speed", + &bp->fixed_speed)) + bp->fixed_speed = SPEED_UNKNOWN; + } else if (err == PHY_INTERFACE_MODE_SGMII || err == PHY_INTERFACE_MODE_1000BASEX || err == PHY_INTERFACE_MODE_2500BASEX) { if (!(bp->caps & MACB_CAPS_PCS)) From patchwork Sat Jun 15 23:49:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parshuram Raju Thombare X-Patchwork-Id: 1116492 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=pass (p=none dis=none) header.from=cadence.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="BRDPx3fe"; dkim=pass (1024-bit key; unprotected) header.d=cadence.com header.i=@cadence.com header.b="AcKFHaJh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45RDjm34qQz9sBr for ; Sun, 16 Jun 2019 09:50:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727132AbfFOXuB (ORCPT ); Sat, 15 Jun 2019 19:50:01 -0400 Received: from mx0b-0014ca01.pphosted.com ([208.86.201.193]:47254 "EHLO mx0a-0014ca01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726434AbfFOXuA (ORCPT ); Sat, 15 Jun 2019 19:50:00 -0400 Received: from pps.filterd (m0042333.ppops.net [127.0.0.1]) by mx0b-0014ca01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x5FNnPZl024308; Sat, 15 Jun 2019 16:49:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=proofpoint; bh=btibZ4CwVccBYDGblYXVjuLjX+4kKoSQLrCMgw/R1lg=; b=BRDPx3feYYD0iyBsosRmzHvucev6jVcGUY9GjC8aNxrUSQGatgs7m3t8xesbTNn3zMvm W9XmZwo/TSVtLeYPGaezHBYnc5oKUFLn7JYqdgHGLa5+77pZEh1uAGDmxEiKCa2VihxN m9WXFCO3Fua9OZz7Cxa0mGleFyHfTB5iXodIT1nhQRRxyF6XiK1QAylNJSKI/c41gPP0 or87MW+khFIBOFy/z/RLC+MRz72A5sKMDISgONYM3HqzFgkFgAWqZOFAP8lfHwcXBl+v 2uKc/ajWvtbXfTbJ5aQbKN6gN/ttE2EcwvSNakLXXePhetDD7RGRTR37R26uPT+QjKPd gg== Authentication-Results: cadence.com; spf=pass smtp.mailfrom=pthombar@cadence.com Received: from nam05-dm3-obe.outbound.protection.outlook.com (mail-dm3nam05lp2050.outbound.protection.outlook.com [104.47.49.50]) by mx0b-0014ca01.pphosted.com with ESMTP id 2t4v8w216m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 15 Jun 2019 16:49:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cadence.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=btibZ4CwVccBYDGblYXVjuLjX+4kKoSQLrCMgw/R1lg=; b=AcKFHaJhfOsbn9iBgc4CnABUCUKq8xelMdDA3Q4vs5y2F6aF47mirLn2RPQKfhOXdzhW03gNRF8DicumEnbf/xtMU1X1Wem+KLepeJ/rqUhTB79z+d2HV4jHin5ID9mMCf+2+2uuXDfrJB4KF8AifGRW3eE++LgrObg3aYqLKiI= Received: from CY1PR07CA0024.namprd07.prod.outlook.com (2a01:111:e400:c60a::34) by MN2PR07MB6832.namprd07.prod.outlook.com (2603:10b6:208:11e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1987.12; Sat, 15 Jun 2019 23:49:52 +0000 Received: from BY2NAM05FT035.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e52::208) by CY1PR07CA0024.outlook.office365.com (2a01:111:e400:c60a::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1965.13 via Frontend Transport; Sat, 15 Jun 2019 23:49:52 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning cadence.com discourages use of 158.140.1.28 as permitted sender) Received: from sjmaillnx2.cadence.com (158.140.1.28) by BY2NAM05FT035.mail.protection.outlook.com (10.152.100.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2008.7 via Frontend Transport; Sat, 15 Jun 2019 23:49:51 +0000 Received: from maileu3.global.cadence.com (maileu3.cadence.com [10.160.88.99]) by sjmaillnx2.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNnnvK014480 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Sat, 15 Jun 2019 16:49:50 -0700 X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com Received: from maileu3.global.cadence.com (10.160.88.99) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Sun, 16 Jun 2019 01:49:48 +0200 Received: from lvlogina.cadence.com (10.165.176.102) by maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Sun, 16 Jun 2019 01:49:47 +0200 Received: from lvlogina.cadence.com (localhost.localdomain [127.0.0.1]) by lvlogina.cadence.com (8.14.4/8.14.4) with ESMTP id x5FNnlwK029946; Sun, 16 Jun 2019 00:49:48 +0100 From: Parshuram Thombare To: , , , CC: , , , , , , Subject: [PATCH 6/6] net: macb: parameter added to cadence ethernet controller DT binding Date: Sun, 16 Jun 2019 00:49:39 +0100 Message-ID: <1560642579-29803-1-git-send-email-pthombar@cadence.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1560642512-28765-1-git-send-email-pthombar@cadence.com> References: <1560642512-28765-1-git-send-email-pthombar@cadence.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: maileu3.global.cadence.com X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:158.140.1.28; IPV:CAL; SCL:-1; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(346002)(376002)(136003)(2980300002)(36092001)(189003)(199004)(305945005)(11346002)(7636002)(50466002)(26005)(6666004)(356004)(48376002)(77096007)(50226002)(246002)(8676002)(53416004)(16586007)(316002)(76130400001)(8936002)(4744005)(5660300002)(2201001)(107886003)(126002)(476003)(86362001)(2906002)(47776003)(70206006)(51416003)(7696005)(76176011)(70586007)(446003)(426003)(26826003)(4326008)(478600001)(186003)(36756003)(336012)(110136005)(7126003)(2616005)(54906003)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR07MB6832; H:sjmaillnx2.cadence.com; FPR:; SPF:SoftFail; LANG:en; PTR:corp.cadence.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9398075-9c8f-4a8c-91a8-08d6f1ec28cb X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328); SRVR:MN2PR07MB6832; X-MS-TrafficTypeDiagnostic: MN2PR07MB6832: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-Forefront-PRVS: 0069246B74 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: lIaG9jACxiG/1uGABr6qO+vG3+frIb4ibuEHNqYTlTl289gKOC+MglMI2koxr4AQYMlAS+2YrGiPVXiCbx+7LWopOcLSzlBPv6CvcdjyGbNJyF3sJpK+JNd4YDhQdIcPZTEGW/mq6C87r0zKwdqpalcQd/+ZqX5X05J4oXbq7JE5wjK0/22lwrsMe9EnDjjsSfp28RUTN8WuiQwF1Sl149UFdd0j6tLXkSj9FT8O3hY2Xf0EiGxTq8QE6cPRaROH2kraoG4FSDqtXT64rL790rVQGHgIfdiSW70uM+3Fl7uvcpXJ524flmv9ga0CJt/xkwNd8YpEuER5kHRE/9YgqvqvUTuK04PFimjGZpAqeBJwk8+ho5CbKgJB7+0Eekes32FFeDZ+iSzTjWLqZCtJKVNjpTGK5TXq6PrA3HgFvig= X-OriginatorOrg: cadence.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2019 23:49:51.7919 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9398075-9c8f-4a8c-91a8-08d6f1ec28cb X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9; Ip=[158.140.1.28]; Helo=[sjmaillnx2.cadence.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR07MB6832 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf.smktg.jp include:_spf.salesforce.com include:mktomail.com include:spf-0014ca01.pphosted.com include:spf.protection.outlook.com include:auth.msgapp.com include:spf.mandrillapp.com ~all X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-06-15_13:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1906150227 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org New parameters added to Cadence ethernet controller DT binding for USXGMII interface. Signed-off-by: Parshuram Thombare --- Documentation/devicetree/bindings/net/macb.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt index 9c5e94482b5f..cd79ec9dddfb 100644 --- a/Documentation/devicetree/bindings/net/macb.txt +++ b/Documentation/devicetree/bindings/net/macb.txt @@ -25,6 +25,10 @@ Required properties: Optional elements: 'rx_clk' applies to cdns,zynqmp-gem Optional elements: 'tsu_clk' - clocks: Phandles to input clocks. +- serdes-rate External serdes rate.Mandatory for USXGMII mode. + 0 - 5G + 1 - 10G +- fixed-speed Speed for fixed mode UXSGMII interface based link The MAC address will be determined using the optional properties defined in ethernet.txt.