From patchwork Tue Dec 15 18:27:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alessandro Temil X-Patchwork-Id: 1416715 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=u43MZDCo; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CwTwV6TNzz9sSn for ; Wed, 16 Dec 2020 07:13:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AFDF682A2D; Tue, 15 Dec 2020 21:13:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="u43MZDCo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8608182A02; Tue, 15 Dec 2020 19:27:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DDE84829EF for ; Tue, 15 Dec 2020 19:27:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=3FADZXwYKBn0bufnjmhpphmf.dpnv-cppumjtut.efoy.ef@flex--atemil.bounces.google.com Received: by mail-yb1-xb4a.google.com with SMTP id g67so26857895ybb.9 for ; Tue, 15 Dec 2020 10:27:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=336NaLqEUbBMlLHFFE36huVMVUW18U/oJN7OWdwAQ60=; b=u43MZDCok3OaZKhochNR+l2029nJiSEOlG13Nd/M6Zd4I3KdVfr5iwbauS4c20eRsl qtM5eViclHzyCZBpgVOPFNxTD14YXTyofZtCbBIlf0JL4V2QP2r/mAB42fb3vDEDWipk wV8jFBPsFM5pVD+Cfan1Wntii0cDxG5TNkmepgPS/MQx8vO4BpY8oKFbnonrzKpT3h/o 9HMZq36PYPrF/i0oeqa7fq3zAz7Sy75A9SLaLLOLNglYUPQwfk+7P84vJEoixxlKoK40 W4kH6CXicReqRbiZErFn59x7SBT2bfGtUXXiCavyECz+sPGDJ9sH2b/kGtXKMHfGByw1 On7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=336NaLqEUbBMlLHFFE36huVMVUW18U/oJN7OWdwAQ60=; b=n5PmFFcm1wM/IwU99k6Di58HdKzAy0iZ0/V3/zziR8F7kfimXl8IVa1ZG0LcPGi58X J6IeH9/Br3SSXS0GF9c+WQ94sI9TIBEwzdu+CCZ2bdLTF2mMhE5uQ+BygOIgrxqEoxw+ 9+XHJMRtGXaB/wJSSl4BILFufcB1/bE+iAgxvmC0WU6W/n+hzdlFgyY+WyBJUN17d6d2 hO5I7Y5oLoqu4jj2vKFnv4pWWUgZhSYHFyb+2GagXAKuzqGNC8hMwvQDdHXr6u8TrDm/ MK2/XUmTYnrUIXM22SngD7nh0hYocAHF7WjcZvwJ7oJJnX91HuJccrrVjzcC7qtQbvR3 GNXg== X-Gm-Message-State: AOAM531uudmBwotosr6VZdB3hv3YfMdUbPnCKF4ze+0T2JXHEQ6Vfzeg 5UiJZ83DVmLt7wIInVi0EYO/0kPGJDwwNj6qSy+yR8Uw7BhrsVLMK8ha371Ui1z/pQiJ6AMnDIG gFZaDS6xaBMigd6BmjKkUoGHchSb/fp9TP+XYU26hmGb+q6DQUNP5LDLdWWI= X-Google-Smtp-Source: ABdhPJzjVJbFebRQvmwMDTvQxKn3HBAIW/G1amN1MJTXCpwnXEM5DulKF3avtkOIm/P2+Z0AIfjUbcD5zYc= X-Received: from radarfpga.mtv.corp.google.com ([2620:15c:280:1:7220:84ff:fe09:a122]) (user=atemil job=sendgmr) by 2002:a25:1407:: with SMTP id 7mr22139587ybu.125.1608056852380; Tue, 15 Dec 2020 10:27:32 -0800 (PST) Date: Tue, 15 Dec 2020 10:27:28 -0800 In-Reply-To: Message-Id: <20201215182728.3836817-1-atemil@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH v2] Add support for 10G Base-R IP core version to xilinx_axi_enet driver From: Alessandro Temil To: u-boot@lists.denx.de Cc: joe.hershberger@ni.com, ashok.reddy.soma@xilinx.com, michal.simek@xilinx.com, rfried.dev@gmail.com, Alessandro Temil X-Mailman-Approved-At: Tue, 15 Dec 2020 21:13:00 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Alessandro Temil Signed-off-by: Alessandro Temil --- drivers/net/xilinx_axi_emac.c | 139 ++++++++++++++++++++++++++++------ 1 file changed, 116 insertions(+), 23 deletions(-) diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 8af3711204..b2f48324ed 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* + * Copyright (C) 2020 Waymo LLC * Copyright (C) 2011 Michal Simek * Copyright (C) 2011 PetaLogix * Copyright (C) 2010 Xilinx, Inc. All rights reserved. @@ -72,10 +73,25 @@ DECLARE_GLOBAL_DATA_PTR; #define XAXIDMA_BD_CTRL_TXSOF_MASK 0x08000000 /* First tx packet */ #define XAXIDMA_BD_CTRL_TXEOF_MASK 0x04000000 /* Last tx packet */ +/* Bitmasks for the XXV Ethernet MAC */ +#define XXV_TC_TX_MASK BIT(0) +#define XXV_TC_FCS_MASK BIT(1) +#define XXV_RCW1_RX_MASK BIT(0) +#define XXV_RCW1_FCS_MASK BIT(1) + #define DMAALIGN 128 +#define XXV_MIN_PKT_SIZE 60 + static u8 rxframe[PKTSIZE_ALIGN] __attribute((aligned(DMAALIGN))); +static u8 txminframe[XXV_MIN_PKT_SIZE] __attribute((aligned(DMAALIGN))); + +enum emac_variant { + EMAC_1G = 0, + EMAC_10G_25G = 1, +}; + /* Reflect dma offsets */ struct axidma_reg { u32 control; /* DMACR */ @@ -97,6 +113,7 @@ struct axidma_priv { struct mii_dev *bus; u8 eth_hasnobuf; int phy_of_handle; + enum emac_variant mactype; }; /* BD descriptors */ @@ -143,6 +160,14 @@ struct axi_regs { u32 uaw1; /* 0x704: Unicast address word 1 */ }; +struct xxv_axi_regs { + u32 gt_reset; /* 0x0 */ + u32 reserved[2]; + u32 tc; /* 0xC: Tx Configuration */ + u32 reserved2; + u32 rcw1; /* 0x14: Rx Configuration Word 1 */ +}; + /* Use MII register 1 (MII status register) to detect PHY */ #define PHY_DETECT_REG 1 @@ -191,6 +216,9 @@ static inline void axienet_dma_write(struct axidma_bd *bd, u32 *desc) static u32 phyread(struct axidma_priv *priv, u32 phyaddress, u32 registernum, u16 *val) { + if (priv->mactype == EMAC_10G_25G) + return 0; + struct axi_regs *regs = priv->iobase; u32 mdioctrlreg = 0; @@ -217,6 +245,9 @@ static u32 phyread(struct axidma_priv *priv, u32 phyaddress, u32 registernum, static u32 phywrite(struct axidma_priv *priv, u32 phyaddress, u32 registernum, u32 data) { + if (priv->mactype == EMAC_10G_25G) + return 0; + struct axi_regs *regs = priv->iobase; u32 mdioctrlreg = 0; @@ -374,6 +405,31 @@ static void axiemac_stop(struct udevice *dev) debug("axiemac: Halted\n"); } +static int xxv_axi_ethernet_init(struct axidma_priv *priv) +{ + struct xxv_axi_regs *regs = priv->iobase; + + int val; + + val = readl(®s->rcw1) & ~XXV_RCW1_FCS_MASK; + val |= XXV_RCW1_FCS_MASK; + writel(val, ®s->rcw1); + + val = readl(®s->tc) & ~XXV_TC_FCS_MASK; + val |= XXV_TC_FCS_MASK; + writel(val, ®s->tc); + + val = readl(®s->tc) & ~XXV_TC_TX_MASK; + val |= XXV_TC_TX_MASK; + writel(val, ®s->tc); + + val = readl(®s->rcw1) & ~XXV_RCW1_RX_MASK; + val |= XXV_RCW1_RX_MASK; + writel(val, ®s->rcw1); + + return 0; +} + static int axi_ethernet_init(struct axidma_priv *priv) { struct axi_regs *regs = priv->iobase; @@ -427,6 +483,10 @@ static int axiemac_write_hwaddr(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); struct axidma_priv *priv = dev_get_priv(dev); + + if (priv->mactype == EMAC_10G_25G) + return 0; + struct axi_regs *regs = priv->iobase; /* Set the MAC address */ @@ -466,7 +526,6 @@ static void axi_dma_init(struct axidma_priv *priv) static int axiemac_start(struct udevice *dev) { struct axidma_priv *priv = dev_get_priv(dev); - struct axi_regs *regs = priv->iobase; u32 temp; debug("axiemac: Init started\n"); @@ -479,8 +538,13 @@ static int axiemac_start(struct udevice *dev) axi_dma_init(priv); /* Initialize AxiEthernet hardware. */ - if (axi_ethernet_init(priv)) - return -1; + if (priv->mactype == EMAC_1G) { + if (axi_ethernet_init(priv)) + return -1; + } else { + if (xxv_axi_ethernet_init(priv)) + return -1; + } /* Disable all RX interrupts before RxBD space setup */ temp = readl(&priv->dmarx->control); @@ -514,15 +578,28 @@ static int axiemac_start(struct udevice *dev) /* Rx BD is ready - start */ axienet_dma_write(&rx_bd, &priv->dmarx->tail); - /* Enable TX */ - writel(XAE_TC_TX_MASK, ®s->tc); - /* Enable RX */ - writel(XAE_RCW1_RX_MASK, ®s->rcw1); - - /* PHY setup */ - if (!setup_phy(dev)) { - axiemac_stop(dev); - return -1; + if (priv->mactype == EMAC_1G) { + struct axi_regs *regs = priv->iobase; + /* Enable TX */ + writel(XAE_TC_TX_MASK, ®s->tc); + /* Enable RX */ + writel(XAE_RCW1_RX_MASK, ®s->rcw1); + + /* PHY setup */ + if (!setup_phy(dev)) { + axiemac_stop(dev); + return -1; + } + } else { + struct xxv_axi_regs *regs = priv->iobase; + /* Enable TX */ + temp = readl(®s->tc) & ~XXV_TC_TX_MASK; + temp |= XXV_TC_TX_MASK; + writel(temp, ®s->tc); + /* Enable RX */ + temp = readl(®s->rcw1) & ~XXV_RCW1_RX_MASK; + temp |= XXV_RCW1_RX_MASK; + writel(temp, ®s->rcw1); } debug("axiemac: Init complete\n"); @@ -537,6 +614,14 @@ static int axiemac_send(struct udevice *dev, void *ptr, int len) if (len > PKTSIZE_ALIGN) len = PKTSIZE_ALIGN; + /* If size is less than min packet size, pad to min size */ + if (priv->mactype == EMAC_10G_25G && len < XXV_MIN_PKT_SIZE) { + memset(txminframe, 0, XXV_MIN_PKT_SIZE); + memcpy(txminframe, ptr, len); + len = XXV_MIN_PKT_SIZE; + ptr = txminframe; + } + /* Flush packet to main memory to be trasfered by DMA */ flush_cache((phys_addr_t)ptr, len); @@ -621,7 +706,7 @@ static int axiemac_recv(struct udevice *dev, int flags, uchar **packetp) temp = readl(&priv->dmarx->control); temp &= ~XAXIDMA_IRQ_ALL_MASK; writel(temp, &priv->dmarx->control); - if (!priv->eth_hasnobuf) + if (!priv->eth_hasnobuf && priv->mactype == EMAC_1G) length = rx_bd.app4 & 0xFFFF; /* max length mask */ else length = rx_bd.status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK; @@ -701,7 +786,8 @@ static int axi_emac_probe(struct udevice *dev) if (ret) return ret; - axiemac_phy_init(dev); + if (priv->interface != -1) + axiemac_phy_init(dev); return 0; } @@ -732,10 +818,10 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev) struct axidma_priv *priv = dev_get_priv(dev); int node = dev_of_offset(dev); int offset = 0; - const char *phy_mode; pdata->iobase = dev_read_addr(dev); priv->iobase = (struct axi_regs *)pdata->iobase; + priv->mactype = dev_get_driver_data(dev); offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "axistream-connected"); @@ -760,14 +846,20 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev) priv->phy_of_handle = offset; } - phy_mode = fdt_getprop(gd->fdt_blob, node, "phy-mode", NULL); - if (phy_mode) - pdata->phy_interface = phy_get_interface_by_name(phy_mode); - if (pdata->phy_interface == -1) { - printf("%s: Invalid PHY interface '%s'\n", __func__, phy_mode); - return -EINVAL; + if (priv->mactype == EMAC_1G) { + const char *phy_mode; + + phy_mode = fdt_getprop(gd->fdt_blob, node, "phy-mode", NULL); + if (phy_mode) + pdata->phy_interface = phy_get_interface_by_name(phy_mode); + if (pdata->phy_interface == -1) { + printf("%s: Invalid PHY interface '%s'\n", __func__, phy_mode); + return -EINVAL; + } + priv->interface = pdata->phy_interface; + } else { + priv->interface = -1; } - priv->interface = pdata->phy_interface; priv->eth_hasnobuf = fdtdec_get_bool(gd->fdt_blob, node, "xlnx,eth-hasnobuf"); @@ -779,7 +871,8 @@ static int axi_emac_ofdata_to_platdata(struct udevice *dev) } static const struct udevice_id axi_emac_ids[] = { - { .compatible = "xlnx,axi-ethernet-1.00.a" }, + { .compatible = "xlnx,axi-ethernet-1.00.a", .data = (uintptr_t)EMAC_1G }, + { .compatible = "xlnx,xxv-ethernet-1.0", .data = (uintptr_t)EMAC_10G_25G }, { } };