From patchwork Tue Jun 25 06:31:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1121812 X-Patchwork-Delegate: joe.hershberger@gmail.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="cAVDxd2s"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="EKhZmbnN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45XxFm1bpnz9s7h for ; Tue, 25 Jun 2019 16:34:04 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E17B4C21C93; Tue, 25 Jun 2019 06:33:27 +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 66795C21E08; Tue, 25 Jun 2019 06:32:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 42AB7C21E08; Tue, 25 Jun 2019 06:31:53 +0000 (UTC) Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lists.denx.de (Postfix) with ESMTPS id C4276C21E1A for ; Tue, 25 Jun 2019 06:31:44 +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=1561444304; x=1592980304; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=sjJztM6YfFJVHKaqjbiDShEPXeSCZIgodIjsHXj4cYk=; b=cAVDxd2sl0hgkgfGOyhLvGEHPW0LT2LH0AuB7SMGb1MO9zj+FkopEyjd ULSIexzJL1z99vLiq/3ETIoSDm7qh4AMkHkhyRQ2o4s0qZgKS25YijOKL y2LSB/3W1gwywkf5ATg2N0jYodvTTZz17tMrEY0g1yJP3Ee3GquF/2vAD TXk3CZ0A+MrmWXnGIrx79lb4FffX12ciqtVeaTBPpvMVJ/cNxIvI9iIA6 bk80cD+flMGr81++5F3DzvujlusRVkFlGj7EDcxbaV2VVi90lDwe9eSVl 9Ku2hV1r/Bxr0XQPq7z0hckFDXrdHHkwJZBKN/+0TfwPi4uNmqm+qg/Du Q==; X-IronPort-AV: E=Sophos;i="5.63,415,1557158400"; d="scan'208";a="217829276" Received: from mail-sn1nam02lp2059.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.59]) by ob1.hgst.iphmx.com with ESMTP; 25 Jun 2019 14:31:43 +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=sjJztM6YfFJVHKaqjbiDShEPXeSCZIgodIjsHXj4cYk=; b=EKhZmbnNC5mATYfYuCvCXG3hYTbVHqEujU8Dyxzt++zixL/hjB5WpHvKAzPtO9SBjvU9EUBdKbTT5DVVWI1D5GB6BmOndT4xVnB05wpi+rpS1JXiuWn9yGWru6juZI8Hu9exu6hlMOBlx/fhmTwWayfkmVb4u9CsQeo4c5MichM= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB6959.namprd04.prod.outlook.com (10.186.146.201) 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 06:31:38 +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 06:31:38 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Lukas Auer , Simon Glass Thread-Topic: [PATCH v9 6/9] net: macb: Extend MACB driver for SiFive Unleashed board Thread-Index: AQHVKx+klcT9VJD4TkOnHNTo80dD6Q== Date: Tue, 25 Jun 2019 06:31:38 +0000 Message-ID: <20190625063030.6200-7-anup.patel@wdc.com> References: <20190625063030.6200-1-anup.patel@wdc.com> In-Reply-To: <20190625063030.6200-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0165.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::35) 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: 30244273-5ed9-49d3-b09b-08d6f936c6d5 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:MN2PR04MB6959; x-ms-traffictypediagnostic: MN2PR04MB6959: 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)(366004)(396003)(39860400002)(376002)(346002)(136003)(199004)(189003)(4326008)(14454004)(6436002)(53936002)(7736002)(25786009)(5660300002)(72206003)(6486002)(3846002)(486006)(256004)(76176011)(478600001)(54906003)(316002)(110136005)(6512007)(476003)(446003)(11346002)(2616005)(44832011)(36756003)(86362001)(66066001)(81166006)(186003)(6116002)(66946007)(73956011)(81156014)(7416002)(2906002)(66476007)(8676002)(8936002)(66446008)(64756008)(66556008)(26005)(52116002)(6506007)(71200400001)(71190400001)(386003)(305945005)(102836004)(1076003)(50226002)(99286004)(68736007); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6959; 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: 8ef9fNK/u7XytrMAsJsK3ulxxtyQGBP/vKF/hqddOOLIdeGX4repsYfa1kjz1hnZ7ES43SnBb3j2IIgyd5P2A64g+nTUutv20l0MjSYtQp1KR/IQNU1woyLmIccPp5NdT7G6iWIbaYwpzbkmnwcf9Gd+c/q0tm5/VmDD8R7rzwztRgL9zedlR5X5DktE9pi8lKVOs7JNmsppNDXE+IYwLS0agdIYV2DkAMBdgNOPDfCPg5lWhafhTJU5PxcKtqV3Zzncu9Q0/0VPFuj4MSHNs85W25AeekoEbOaZZmcUHl09YUGzGBxYBzMuQswPWE+/MsWx8vXveNg2LFHJatn2kuJ5J5OidMyp/hw1Omj1vQApK0MRXdog5ZzKT5M85Q6PBR4LGD8xM911EMD5l/OICDMMS0chqK8ChXFB1zefTyA= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30244273-5ed9-49d3-b09b-08d6f936c6d5 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jun 2019 06:31:38.2135 (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: MN2PR04MB6959 Cc: U-Boot Mailing List , Palmer Dabbelt , Joe Hershberger , Alistair Francis Subject: [U-Boot] [PATCH v9 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 Reviewed-By: Ramon Fried --- drivers/net/macb.c | 70 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 17 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index c072f99d8f..322302762a 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -83,7 +83,8 @@ struct macb_dma_desc { struct macb_device { void *regs; - unsigned int dma_burst_length; + + const struct macb_config*config; unsigned int rx_tail; unsigned int tx_head; @@ -123,6 +124,8 @@ struct macb_device { struct macb_config { unsigned int dma_burst_length; + + int (*clk_init)(struct udevice *dev, ulong rate); }; #ifndef CONFIG_DM_ETH @@ -483,21 +486,38 @@ static int macb_phy_find(struct macb_device *macb, const char *name) * when operation failed. */ #ifdef CONFIG_DM_ETH +static int macb_sifive_clk_init(struct udevice *dev, ulong rate) +{ + fdt_addr_t addr; + void *gemgxl_regs; + + addr = dev_read_addr_index(dev, 1); + if (addr == FDT_ADDR_T_NONE) + return -ENODEV; + + gemgxl_regs = (void __iomem *)addr; + if (!gemgxl_regs) + 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, gemgxl_regs); + 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 +533,17 @@ int __weak macb_linkspd_cb(struct udevice *dev, unsigned int speed) return 0; } + if (macb->config->clk_init) + return macb->config->clk_init(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 +736,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); @@ -1173,11 +1205,10 @@ static const struct macb_config default_gem_config = { 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 +1221,10 @@ 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; - macb->dma_burst_length = macb_config->dma_burst_length; #ifdef CONFIG_CLK ret = macb_enable_clk(dev); if (ret) @@ -1259,6 +1289,11 @@ static const struct macb_config sama5d4_config = { .dma_burst_length = 4, }; +static const struct macb_config sifive_config = { + .dma_burst_length = 16, + .clk_init = macb_sifive_clk_init, +}; + static const struct udevice_id macb_eth_ids[] = { { .compatible = "cdns,macb" }, { .compatible = "cdns,at91sam9260-macb" }, @@ -1266,6 +1301,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 }, { } };