From patchwork Tue Jun 25 04:15:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1121785 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="SdXo5X+R"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="zGllAmlj"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45XtGp1w1kz9sCJ for ; Tue, 25 Jun 2019 14:19:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EA235C21E0D; Tue, 25 Jun 2019 04:16:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4B19FC21D8A; Tue, 25 Jun 2019 04:15:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A56ECC21DD3; Tue, 25 Jun 2019 04:15:33 +0000 (UTC) Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lists.denx.de (Postfix) with ESMTPS id 62327C21DD9 for ; Tue, 25 Jun 2019 04:15:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1561436129; x=1592972129; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Dm2+Sl2Mx255qTnxiM7hA/LU5PeLfY7GjQMHi9tLnsI=; b=SdXo5X+RczvZ3BIrfez0ZB32Dftf1Ys2DTHzt8M0ZBnidDNLNPiTQAR+ oKwBBNohKEiIrEjGd4ZchagbdK5vAL9TToBpkcCKKwozDdfrTu+uDOone ymbWCvRkdTnoUo4FF7S59Y105c3yMSdZQSalMgGknV6cNLs4xQF4HdYJn VZEl7ii80zUcOCs32ZmtQcLfpMTpCRgYn3YDyt6NJM8t26sx4FRf596tv 8n5aiVAPsKa8nLKmMHiaNi34Pj5UzwdjLwWEgenIbRmV3xQFhscX/Aw7W 438gDSKzL9VEcDz4WiLoubQHF/f+g8+GkPOLbKnOeyScyT8MhE96cxEAW g==; X-IronPort-AV: E=Sophos;i="5.63,413,1557158400"; d="scan'208";a="112660558" Received: from mail-bn3nam01lp2055.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([104.47.33.55]) by ob1.hgst.iphmx.com with ESMTP; 25 Jun 2019 12:15:26 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Dm2+Sl2Mx255qTnxiM7hA/LU5PeLfY7GjQMHi9tLnsI=; b=zGllAmljr82eoO3OtlOBSPgunc0fd+DpIu8DRlPa7eJ50w7EkpoQGxCc6yYp6tX1oYRK9t2Jmy7kIBTP0d8n6EoDFzZTuDrXctFmSMLZQ0JLvftiXmTDdvdudAdWwS5gODGrGMYaCpbszPYQBnvghkr+cEgbU1LhYEGT9q53zbA= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6944.namprd04.prod.outlook.com (10.186.147.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.16; Tue, 25 Jun 2019 04:15:24 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::84da:b4e7:4612:48b]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::84da:b4e7:4612:48b%7]) with mapi id 15.20.2008.014; Tue, 25 Jun 2019 04:15:24 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Lukas Auer , Simon Glass Thread-Topic: [PATCH v8 6/9] net: macb: Extend MACB driver for SiFive Unleashed board Thread-Index: AQHVKwycyRdzFuGKj0evKeHR/OZvWQ== Date: Tue, 25 Jun 2019 04:15:24 +0000 Message-ID: <20190625041429.29929-7-anup.patel@wdc.com> References: <20190625041429.29929-1-anup.patel@wdc.com> In-Reply-To: <20190625041429.29929-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MAXPR0101CA0049.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::11) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3f78a7b5-a003-4ebf-3e4a-08d6f923bf18 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:MN2PR04MB6944; x-ms-traffictypediagnostic: MN2PR04MB6944: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-forefront-prvs: 0079056367 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6029001)(346002)(376002)(136003)(396003)(366004)(39860400002)(199004)(189003)(476003)(7416002)(66476007)(71190400001)(66946007)(71200400001)(64756008)(66446008)(5660300002)(73956011)(2906002)(66556008)(1076003)(50226002)(36756003)(52116002)(66066001)(76176011)(99286004)(305945005)(7736002)(6506007)(386003)(102836004)(68736007)(8676002)(8936002)(81156014)(81166006)(86362001)(6486002)(4326008)(44832011)(6436002)(14454004)(2616005)(110136005)(26005)(256004)(25786009)(446003)(6116002)(3846002)(54906003)(53936002)(486006)(11346002)(478600001)(316002)(72206003)(6512007)(186003); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6944; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 1Kn9AaDIlbnwEDxAacRXWLtfWapEOGX3uM5rAb+/sHDnuZ9j4XiA/qMBvRs8/Q4xlWMo+yHpTz6gXVnT66K/sSSsort6GZiL6+mM3qH7VctIQ1+V5s9mS6P/HUJKXVLQetSNeGUpKExG7KcEG+ttc4NEqMj/Exm+YHj8Rjvhd7uMjm9e14hHHi6x6/f/MGiHDXEKqOuOkgueEDXzLaibydi3eVdVr7FEagD4PN+815SRbpf+JRBm7YAn3qhv+vWX9a8jQZT4sosy45SM6aSCbt6XaIRvCVJ7d6a7yUbZ+r+PT7x74mYhtuyvCpOo/fzf7AiTTUjfPjm+9ITc9XUc728Ba43o+G/P+EgdK4FGixr5Ez2AVcSbctupPlKMx+wNgPe/OMtSO0pZAUZ3JqFKm6KWo1Y54Klq3vSAtVmjzIE= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f78a7b5-a003-4ebf-3e4a-08d6f923bf18 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jun 2019 04:15:24.8220 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Anup.Patel@wdc.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB6944 Cc: U-Boot Mailing List , Palmer Dabbelt , Joe Hershberger , Alistair Francis Subject: [U-Boot] [PATCH v8 6/9] net: macb: Extend MACB driver for SiFive Unleashed board X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The SiFive MACB ethernet has a custom TX_CLK_SEL register to select different TX clock for 1000mbps vs 10/100mbps. This patch adds SiFive MACB compatible string and extends the MACB ethernet driver to change TX clock using TX_CLK_SEL register for SiFive MACB. Signed-off-by: Anup Patel Reviewed-by: Bin Meng --- drivers/net/macb.c | 86 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 17 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index c072f99d8f..7fedb9ae0e 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -83,7 +83,9 @@ struct macb_dma_desc { struct macb_device { void *regs; - unsigned int dma_burst_length; + void *regs1; + + const struct macb_config*config; unsigned int rx_tail; unsigned int tx_head; @@ -123,6 +125,9 @@ struct macb_device { struct macb_config { unsigned int dma_burst_length; + + int (*probe)(struct udevice *dev); + int (*set_tx_clk)(struct udevice *dev, ulong rate); }; #ifndef CONFIG_DM_ETH @@ -483,21 +488,32 @@ static int macb_phy_find(struct macb_device *macb, const char *name) * when operation failed. */ #ifdef CONFIG_DM_ETH +static int macb_sifive_set_tx_clk(struct udevice *dev, ulong rate) +{ + struct macb_device *macb = dev_get_priv(dev); + + if (!macb->regs1) + return -ENODEV; + + /* + * SiFive GEMGXL TX clock operation mode: + * + * 0 = GMII mode. Use 125 MHz gemgxlclk from PRCI in TX logic + * and output clock on GMII output signal GTX_CLK + * 1 = MII mode. Use MII input signal TX_CLK in TX logic + */ + writel(rate != 125000000, macb->regs1); + return 0; +} + int __weak macb_linkspd_cb(struct udevice *dev, unsigned int speed) { #ifdef CONFIG_CLK + struct macb_device *macb = dev_get_priv(dev); struct clk tx_clk; ulong rate; int ret; - /* - * "tx_clk" is an optional clock source for MACB. - * Ignore if it does not exist in DT. - */ - ret = clk_get_by_name(dev, "tx_clk", &tx_clk); - if (ret) - return 0; - switch (speed) { case _10BASET: rate = 2500000; /* 2.5 MHz */ @@ -513,6 +529,17 @@ int __weak macb_linkspd_cb(struct udevice *dev, unsigned int speed) return 0; } + if (macb->config->set_tx_clk) + return macb->config->set_tx_clk(dev, rate); + + /* + * "tx_clk" is an optional clock source for MACB. + * Ignore if it does not exist in DT. + */ + ret = clk_get_by_name(dev, "tx_clk", &tx_clk); + if (ret) + return 0; + if (tx_clk.dev) { ret = clk_set_rate(&tx_clk, rate); if (ret) @@ -705,8 +732,9 @@ static void gmac_configure_dma(struct macb_device *macb) dmacfg = gem_readl(macb, DMACFG) & ~GEM_BF(RXBS, -1L); dmacfg |= GEM_BF(RXBS, buffer_size); - if (macb->dma_burst_length) - dmacfg = GEM_BFINS(FBLDO, macb->dma_burst_length, dmacfg); + if (macb->config->dma_burst_length) + dmacfg = GEM_BFINS(FBLDO, + macb->config->dma_burst_length, dmacfg); dmacfg |= GEM_BIT(TXPBMS) | GEM_BF(RXBMS, -1L); dmacfg &= ~GEM_BIT(ENDIA_PKT); @@ -1171,13 +1199,25 @@ static const struct macb_config default_gem_config = { .dma_burst_length = 16, }; +static int macb_sifive_probe(struct udevice *dev) +{ + struct macb_device *macb = dev_get_priv(dev); + fdt_addr_t addr; + + addr = dev_read_addr_index(dev, 1); + if (addr == FDT_ADDR_T_NONE) + return -ENODEV; + macb->regs1 = (void __iomem *)addr; + + return 0; +} + static int macb_eth_probe(struct udevice *dev) { - const struct macb_config *macb_config; struct eth_pdata *pdata = dev_get_platdata(dev); struct macb_device *macb = dev_get_priv(dev); const char *phy_mode; - __maybe_unused int ret; + int ret; phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode", NULL); @@ -1190,11 +1230,16 @@ static int macb_eth_probe(struct udevice *dev) macb->regs = (void *)pdata->iobase; - macb_config = (struct macb_config *)dev_get_driver_data(dev); - if (!macb_config) - macb_config = &default_gem_config; + macb->config = (struct macb_config *)dev_get_driver_data(dev); + if (!macb->config) + macb->config = &default_gem_config; + + if (macb->config->probe) { + ret = macb->config->probe(dev); + if (ret) + return ret; + } - macb->dma_burst_length = macb_config->dma_burst_length; #ifdef CONFIG_CLK ret = macb_enable_clk(dev); if (ret) @@ -1259,6 +1304,12 @@ static const struct macb_config sama5d4_config = { .dma_burst_length = 4, }; +static const struct macb_config sifive_config = { + .dma_burst_length = 16, + .probe = macb_sifive_probe, + .set_tx_clk = macb_sifive_set_tx_clk, +}; + static const struct udevice_id macb_eth_ids[] = { { .compatible = "cdns,macb" }, { .compatible = "cdns,at91sam9260-macb" }, @@ -1266,6 +1317,7 @@ static const struct udevice_id macb_eth_ids[] = { { .compatible = "atmel,sama5d3-gem" }, { .compatible = "atmel,sama5d4-gem", .data = (ulong)&sama5d4_config }, { .compatible = "cdns,zynq-gem" }, + { .compatible = "sifive,fu540-macb", .data = (ulong)&sifive_config }, { } };