From patchwork Tue Jul 16 19:04:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1132908 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tXE2d1JR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p91f3Ksfz9sLt for ; Wed, 17 Jul 2019 05:09:26 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 22D19C21E49; Tue, 16 Jul 2019 19:06:44 +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=FREEMAIL_FROM, 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 695DDC21E6C; Tue, 16 Jul 2019 19:06:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0C2B4C21CB1; Tue, 16 Jul 2019 19:04:57 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id 333D1C21E7F for ; Tue, 16 Jul 2019 19:04:54 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id c2so18918180wrm.8 for ; Tue, 16 Jul 2019 12:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=20MPxLaDvcWaMP+Q/z4qG3nKUBDjdAnUXrLFV2vK3vg=; b=tXE2d1JR8GtOuRwxnhAovOCp3NqHZAhFpsEmHRbLKpnZi35Evwlhf/Zr7ub9UGKmfU iRoBxitdpJQHdKonPW8Ve985ytHmiR4c0/wUO+p54jEQFDDiEQSRcsc1RnXKB53sHZpw bch3bioU76ygbBjFIYA3kHhXqhK5Cf7G1wQqf3b4sMZaTK5ZGfMOvhQ7ff97W7KM052m h3PMNFxEhlchR2Lt3jvuwXWH0iUmZEO/KGlcpmfIPWjHrX3EMmBUuu2tVA4AT0bJtrvb ISADeyCyLX096gZNZhdIZP066imrPjvtkWb1FW/XPC490oWTsDlihYOu03NsIGJEY1d3 Y8KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=20MPxLaDvcWaMP+Q/z4qG3nKUBDjdAnUXrLFV2vK3vg=; b=pn+FBZjvMqtN7vDw7vhBtYZjkwLRhl4FrPxcn/ipxlZyxXPnCeXBwtdgLB5iCLm8mC KvrDgq+plyL41ynbwaZD13/oVGGUmBdz0uMTp9RMjOLmKRvBu/gurzIYvTO32AKKn3Yf uiC+Kgp6Sl2d6v5ZQHkKlWX7YawFPMmX9JbNu8N12OocvYG3f/Vu/LArxraSmaiskSXM DiqvwoXuF17Nl3OMtjud7gb/UeJo1SlRRdOlc4iS32XuYoX+IiKK6Q/5Dws8+DrpDfs+ dJQDC+VHge1S7w0jlePeqns1yyeYK6ROD9X5GMEp8NvZIbmTqOekwQYZil0VILGEyJgN 02Aw== X-Gm-Message-State: APjAAAXzU6keYOfbKRDypMJxyiRubfKkWpdlucmeyA56btqQdgVejXy7 5/EpPrf9BlgNpCvrmViflkmdlnr1mwI= X-Google-Smtp-Source: APXvYqyWkT8hM0IVM5eJS7dD0eWrYmnTHI++Ban0toRgyicUI0dx/5wAFU+ywhWORfkFc7m5hXnFbQ== X-Received: by 2002:adf:cf02:: with SMTP id o2mr18355691wrj.352.1563303893717; Tue, 16 Jul 2019 12:04:53 -0700 (PDT) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id t1sm30608347wra.74.2019.07.16.12.04.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 12:04:53 -0700 (PDT) From: Ramon Fried To: u-boot@lists.denx.de, joe.hershberger@ni.com Date: Tue, 16 Jul 2019 22:04:32 +0300 Message-Id: <20190716190436.21251-2-rfried.dev@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 2/6] net: macb: add support for faster clk rates 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" add support for clock rates higher than 2.4Mhz Signed-off-by: Ramon Fried Reviewed-by: Anup Patel Tested-by: Anup Patel Acked-by: Joe Hershberger --- v2: nothing. drivers/net/macb.c | 6 +++++- drivers/net/macb.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 0032d4e000..0fed43bbe2 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -903,8 +903,12 @@ static u32 gem_mdc_clk_div(int id, struct macb_device *macb) config = GEM_BF(CLK, GEM_CLK_DIV48); else if (macb_hz < 160000000) config = GEM_BF(CLK, GEM_CLK_DIV64); - else + else if (macb_hz < 240000000) config = GEM_BF(CLK, GEM_CLK_DIV96); + else if (macb_hz < 320000000) + config = GEM_BF(CLK, GEM_CLK_DIV128); + else + config = GEM_BF(CLK, GEM_CLK_DIV224); return config; } diff --git a/drivers/net/macb.h b/drivers/net/macb.h index 8966c793a7..9b16383eba 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h @@ -613,6 +613,8 @@ #define GEM_CLK_DIV48 3 #define GEM_CLK_DIV64 4 #define GEM_CLK_DIV96 5 +#define GEM_CLK_DIV128 6 +#define GEM_CLK_DIV224 7 /* Constants for MAN register */ #define MACB_MAN_SOF 1 From patchwork Tue Jul 16 19:04:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1132905 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H/cPMaLs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p90P0s6rz9sDB for ; Wed, 17 Jul 2019 05:08:21 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D64A4C21E8A; Tue, 16 Jul 2019 19:06:59 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 9ED9AC21E49; Tue, 16 Jul 2019 19:06:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A04EBC21E7F; Tue, 16 Jul 2019 19:05:00 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 21D19C21E0B for ; Tue, 16 Jul 2019 19:04:57 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id 207so19753119wma.1 for ; Tue, 16 Jul 2019 12:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MpiK84GK0T9Y7T3fvzc3NNnjZwjy0i2EV0iwagyCzgY=; b=H/cPMaLsJ5UfX4dnxIjziHGocUdM4vXJRH79+omblSsG4IlNyAzqkL3R8rgFSpsCG3 IUJJMZbz9uIDBSvkZ8XQ8injPy2NI77E5/kU2A+ZB1CCLsKa/+By44dmU3HtDVT9GxT8 MNTOGovcRw7LAPMsTD8GwNqBAx+yTJfKBfk3+UOg9PzH4hJns0eoH/8ugXK9eXh3evVb w3sJX03UUMY18XnaGz6C/rUl/gNmrOC1rusltZ0Y9tO+Gp/bPoz6C1byx3YArR9bChyW BWjmR7o3d9wiX0RR/P70VP8POcxogvESEMEkFl50URAoxt1QMKspBzpfqZIiRlue9jpw g78A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MpiK84GK0T9Y7T3fvzc3NNnjZwjy0i2EV0iwagyCzgY=; b=Kk87HA2cF6g8hMQcW+gdfW1BZp4uwphP9Fcx/2oFVPD42yT43sGlWc6c0RIseEwuDb Anlbzpsvdun0ZKUFzH3AiBe4FeEX1gidZPneiUnUxvRE8miuEg1Vuxr9oiQwATOh5uPF H9e+BOG7yFv8rp3RsmftQT3AEzYMM7G4wXUAYfLzpDWS7WUFfcz+PgxYtwu78jhmlMde CvX3tGIYdjEDtKtMIK84kMGgAW0e9zQ36cZeQjmAXpIYmTqLGCwt+wWGcl+gB2fNDa+i 1wmxiNj4aE8784Uy02PIxZzSkKAGKUddSc7fhAO3T3NWCza1aq/KQqdu7ZGeFC4+uhBl hGgw== X-Gm-Message-State: APjAAAVmine0iJuK5npdGyP5Yc6XjcMpWvSTkB0frPSux/0rqQe89zDv +eEmLZKubfMxCbe+4qjhBqH97mW98Tc= X-Google-Smtp-Source: APXvYqxb6vH7COvXTFlJBUVuenRehe545WezpXPF+5t0Cm7kX5XOHj8BfYeVrzRLRjwJcRLLhM4ZDw== X-Received: by 2002:a7b:c455:: with SMTP id l21mr32375555wmi.114.1563303896577; Tue, 16 Jul 2019 12:04:56 -0700 (PDT) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id t1sm30608347wra.74.2019.07.16.12.04.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 12:04:56 -0700 (PDT) From: Ramon Fried To: u-boot@lists.denx.de, joe.hershberger@ni.com Date: Tue, 16 Jul 2019 22:04:33 +0300 Message-Id: <20190716190436.21251-3-rfried.dev@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716190436.21251-2-rfried.dev@gmail.com> References: <20190716190436.21251-2-rfried.dev@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 3/6] net: macb: use bit access macro from header file 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" macb.h provides macros for reading/setting bitfields, in macb registers and descriptors. use that instead of redefining them in the source file. Signed-off-by: Ramon Fried Reviewed-by: Anup Patel Tested-by: Anup Patel Acked-by: Joe Hershberger --- v2: nothing. drivers/net/macb.c | 48 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 0fed43bbe2..a968a4bd06 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -77,27 +77,8 @@ struct macb_dma_desc { #define MACB_RX_DMA_DESC_SIZE (DMA_DESC_BYTES(MACB_RX_RING_SIZE)) #define MACB_TX_DUMMY_DMA_DESC_SIZE (DMA_DESC_BYTES(1)) -#define RXADDR_USED 0x00000001 -#define RXADDR_WRAP 0x00000002 - #define RXBUF_FRMLEN_MASK 0x00000fff -#define RXBUF_FRAME_START 0x00004000 -#define RXBUF_FRAME_END 0x00008000 -#define RXBUF_TYPEID_MATCH 0x00400000 -#define RXBUF_ADDR4_MATCH 0x00800000 -#define RXBUF_ADDR3_MATCH 0x01000000 -#define RXBUF_ADDR2_MATCH 0x02000000 -#define RXBUF_ADDR1_MATCH 0x04000000 -#define RXBUF_BROADCAST 0x80000000 - #define TXBUF_FRMLEN_MASK 0x000007ff -#define TXBUF_FRAME_END 0x00008000 -#define TXBUF_NOCRC 0x00010000 -#define TXBUF_EXHAUSTED 0x08000000 -#define TXBUF_UNDERRUN 0x10000000 -#define TXBUF_MAXRETRY 0x20000000 -#define TXBUF_WRAP 0x40000000 -#define TXBUF_USED 0x80000000 struct macb_device { void *regs; @@ -316,9 +297,9 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet, paddr = dma_map_single(packet, length, DMA_TO_DEVICE); ctrl = length & TXBUF_FRMLEN_MASK; - ctrl |= TXBUF_FRAME_END; + ctrl |= MACB_BIT(TX_LAST); if (tx_head == (MACB_TX_RING_SIZE - 1)) { - ctrl |= TXBUF_WRAP; + ctrl |= MACB_BIT(TX_WRAP); macb->tx_head = 0; } else { macb->tx_head++; @@ -340,7 +321,7 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet, barrier(); macb_invalidate_ring_desc(macb, TX); ctrl = macb->tx_ring[tx_head].ctrl; - if (ctrl & TXBUF_USED) + if (ctrl & MACB_BIT(TX_USED)) break; udelay(1); } @@ -348,9 +329,9 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet, dma_unmap_single(packet, length, paddr); if (i <= MACB_TX_TIMEOUT) { - if (ctrl & TXBUF_UNDERRUN) + if (ctrl & MACB_BIT(TX_UNDERRUN)) printf("%s: TX underrun\n", name); - if (ctrl & TXBUF_EXHAUSTED) + if (ctrl & MACB_BIT(TX_BUF_EXHAUSTED)) printf("%s: TX buffers exhausted in mid frame\n", name); } else { printf("%s: TX timeout\n", name); @@ -369,14 +350,14 @@ static void reclaim_rx_buffers(struct macb_device *macb, macb_invalidate_ring_desc(macb, RX); while (i > new_tail) { - macb->rx_ring[i].addr &= ~RXADDR_USED; + macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED); i++; if (i > MACB_RX_RING_SIZE) i = 0; } while (i < new_tail) { - macb->rx_ring[i].addr &= ~RXADDR_USED; + macb->rx_ring[i].addr &= ~MACB_BIT(RX_USED); i++; } @@ -396,17 +377,17 @@ static int _macb_recv(struct macb_device *macb, uchar **packetp) for (;;) { macb_invalidate_ring_desc(macb, RX); - if (!(macb->rx_ring[next_rx_tail].addr & RXADDR_USED)) + if (!(macb->rx_ring[next_rx_tail].addr & MACB_BIT(RX_USED))) return -EAGAIN; status = macb->rx_ring[next_rx_tail].ctrl; - if (status & RXBUF_FRAME_START) { + if (status & MACB_BIT(RX_SOF)) { if (next_rx_tail != macb->rx_tail) reclaim_rx_buffers(macb, next_rx_tail); macb->wrapped = false; } - if (status & RXBUF_FRAME_END) { + if (status & MACB_BIT(RX_EOF)) { buffer = macb->rx_buffer + 128 * macb->rx_tail; length = status & RXBUF_FRMLEN_MASK; @@ -699,7 +680,7 @@ static int gmac_init_multi_queues(struct macb_device *macb) if (queue_mask & (1 << i)) num_queues++; - macb->dummy_desc->ctrl = TXBUF_USED; + macb->dummy_desc->ctrl = MACB_BIT(TX_USED); macb->dummy_desc->addr = 0; flush_dcache_range(macb->dummy_desc_dma, macb->dummy_desc_dma + ALIGN(MACB_TX_DUMMY_DMA_DESC_SIZE, PKTALIGN)); @@ -732,7 +713,7 @@ static int _macb_init(struct macb_device *macb, const char *name) paddr = macb->rx_buffer_dma; for (i = 0; i < MACB_RX_RING_SIZE; i++) { if (i == (MACB_RX_RING_SIZE - 1)) - paddr |= RXADDR_WRAP; + paddr |= MACB_BIT(RX_WRAP); macb->rx_ring[i].addr = paddr; macb->rx_ring[i].ctrl = 0; paddr += 128; @@ -743,9 +724,10 @@ static int _macb_init(struct macb_device *macb, const char *name) for (i = 0; i < MACB_TX_RING_SIZE; i++) { macb->tx_ring[i].addr = 0; if (i == (MACB_TX_RING_SIZE - 1)) - macb->tx_ring[i].ctrl = TXBUF_USED | TXBUF_WRAP; + macb->tx_ring[i].ctrl = MACB_BIT(TX_USED) | + MACB_BIT(TX_WRAP); else - macb->tx_ring[i].ctrl = TXBUF_USED; + macb->tx_ring[i].ctrl = MACB_BIT(TX_USED); } macb_flush_ring_desc(macb, TX); From patchwork Tue Jul 16 19:04:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1132906 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ABmjjRYx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p90k4tGnz9s8m for ; Wed, 17 Jul 2019 05:08:38 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5DC96C21E47; Tue, 16 Jul 2019 19:05:31 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 0A843C21EA7; Tue, 16 Jul 2019 19:05:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4B13AC21DEC; Tue, 16 Jul 2019 19:05:03 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 32A93C21D83 for ; Tue, 16 Jul 2019 19:05:00 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id n4so22157963wrs.3 for ; Tue, 16 Jul 2019 12:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BWO16Kbon8UEqpSKZiGZxKpWclC4xtQHUq9KrRInTsM=; b=ABmjjRYxgY4S78UQJIQ0dqXnlQICbvX3sPpcwjejhrveBTH7y2MnOCTmcLHPUKI75q f8E1WOqJSXMPCI9+Dzh/Ras9YpydOMDIH0bQ7LIkZ/cL99ftJZ3Fg8es6IVte7j/Wzdp Y987803fJevzbAhbi+MThRdg7P2QmhQR/svToUS5OhP1CBFY+5FZ7bBmG08dHSmJAmgP 0sPJLWtYcvinbqAJ3dJ+jHQvSSEI5gGVdbATtK9HthK1+QXzzFEHraKRXp8yxmN3DLn8 a9CL3+DoU7YQMaMuBJxKYhydC68Wj6YlZyRWOWge+AZRX8ZPXPfyR3hh0D9S2/nryOOg CozQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BWO16Kbon8UEqpSKZiGZxKpWclC4xtQHUq9KrRInTsM=; b=G71bs3P2egCkL/ppe8QhscDw8qxlMUer39/c0QxRXX9qvumAnzbjId7XAHDNQSY32c Dd0eDeu1BMGFOJHVwLILu0aR0qWo/VDVj7SV0asSPLA6kuO18QNq49AKUrcR0wdOvc8+ /vcpJk8jvnlomD61lbd72dz7o6Y11Wu7rFviy5J5G05DCDVBpJUGA0+mhQIJzRyMYLI7 BB1k3pkU8CzspAwlOcF0TgLCfxYXFviYHYYHQnMRma/NjKmvBUxRQNSxnq5JUzrkmZ5N zaKPy2H1LtUkGpLPt+loTCTZpEG4EsPtAAShmGXlzlPYVsOOIASJ3AVjURVSgtsJZ0JM sE/g== X-Gm-Message-State: APjAAAX/HPq+vXTgenbus9wRuVLDFw7wek7hTMwfDUmqsPyv6s7LKfiL SI17uOrtyP3QJeIKzTBjWh9MZdtV1ts= X-Google-Smtp-Source: APXvYqz5Bf1Kr4IRomJ1KNMUOS8HDoA7u0Qmjb6zleGvHWmbA4ThvdKQim+gqTwDyKulwqf6797e8Q== X-Received: by 2002:a5d:6a90:: with SMTP id s16mr28129880wru.288.1563303899761; Tue, 16 Jul 2019 12:04:59 -0700 (PDT) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id t1sm30608347wra.74.2019.07.16.12.04.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 12:04:59 -0700 (PDT) From: Ramon Fried To: u-boot@lists.denx.de, joe.hershberger@ni.com Date: Tue, 16 Jul 2019 22:04:34 +0300 Message-Id: <20190716190436.21251-4-rfried.dev@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716190436.21251-2-rfried.dev@gmail.com> References: <20190716190436.21251-2-rfried.dev@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 4/6] net: macb: add support for SGMII phy interface 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" This patch adds support for the sgmii phy interface, available only to DM users, dictated by current driver design. Signed-off-by: Ramon Fried Reviewed-by: Anup Patel Tested-by: Anup Patel Acked-by: Joe Hershberger --- v2: nothing. drivers/net/macb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index a968a4bd06..cf76270ad8 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -759,6 +759,13 @@ static int _macb_init(struct macb_device *macb, const char *name) gem_writel(macb, USRIO, GEM_BIT(RGMII)); else gem_writel(macb, USRIO, 0); + + if (macb->phy_interface == PHY_INTERFACE_MODE_SGMII) { + unsigned int ncfgr = macb_readl(macb, NCFGR); + + ncfgr |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL); + macb_writel(macb, NCFGR, ncfgr); + } #else #if defined(CONFIG_RGMII) || defined(CONFIG_RMII) gem_writel(macb, USRIO, GEM_BIT(RGMII)); From patchwork Tue Jul 16 19:04:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1132904 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="K/tg/CZW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p9051c9jz9sDB for ; Wed, 17 Jul 2019 05:08:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D34FCC21E31; Tue, 16 Jul 2019 19:05:53 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 11F11C21D72; Tue, 16 Jul 2019 19:05:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A8EE2C21E96; Tue, 16 Jul 2019 19:05:07 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 1D782C21E47 for ; Tue, 16 Jul 2019 19:05:03 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id z1so22075153wru.13 for ; Tue, 16 Jul 2019 12:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GI1mZrjoQgkRAPzMcq8ewxALaake8bCxZigo3PJY9pU=; b=K/tg/CZWRc+5zMmwuiwT6hqrtccizPaIuhzgpAwSniSAvd9Jn5YR8Nw5kPySRLlGEu dnLLqv5djieOWVDUhqJ9WI5IvSlGs6iG2X79onxj8FBDPebuJ6vzWY1O3WZSAZBhJhYB RDJdRPZ0M9A2zfmD7tcGEzdEEzE+mItHzb1q5pilJK/SwpyjWpCwkIFypZThxdD/3cQK utUckA820sOEuDR+YksVNds39bD9u78maPq7Z0bbuOB3oVfh0Vr2fitNC+0MybQymbIu EbpKc4L3Ke9EG5ljDWZVxCCxbAAeWWkLShxDbwKwN/F18G2pfhJhO2O0F4Xmv8gQ5wS+ VbLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GI1mZrjoQgkRAPzMcq8ewxALaake8bCxZigo3PJY9pU=; b=Wlw/cLdB5vB8Kfq4yA4sTk/WrYW8sM7Zxf0OnrzrZpm7zuK190pug6oXhJtsUgK8T0 u5o0P1HYK/mznBB3Z5HvgN+JWNptPk8ypB+uzbcDjlEe3sioloJB5V/0sDqJvPhfdHv1 RV53biPoI4utGp0guR82siVei6BEsbeHo3A1RS3dAOaPPPfv5+gspit8rXhp/f4rpl1k VPbWSl4a3Ks6x7W/Wbi6TRDUEE6h2mLtnaR5i+zTqPjv7dSc6QFlKqgohZ3GuunvCIBi w6jnTtJPsl2LE51ZiU6Q9OG4Jcard4s0JsURtpVgO1VP8Jld45Q4u1OcXvN5mDnILqBz N6HQ== X-Gm-Message-State: APjAAAVG5nVOABOnB+sJjkKAAY8vbpT4bkswqgnPSXf0AY5L7I5yO6qh tLxkEpJ8wVIS+l2TdtRd9C6FXgeD8oE= X-Google-Smtp-Source: APXvYqw6Rwfk5pT5VrNWo7ojWroxskVNivSw6RTZO23kjawAApjxJRtzzex/RYf2XQDxNmYEqYwaBQ== X-Received: by 2002:a5d:4e02:: with SMTP id p2mr10610850wrt.182.1563303902662; Tue, 16 Jul 2019 12:05:02 -0700 (PDT) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id t1sm30608347wra.74.2019.07.16.12.05.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 12:05:02 -0700 (PDT) From: Ramon Fried To: u-boot@lists.denx.de, joe.hershberger@ni.com Date: Tue, 16 Jul 2019 22:04:35 +0300 Message-Id: <20190716190436.21251-5-rfried.dev@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716190436.21251-2-rfried.dev@gmail.com> References: <20190716190436.21251-2-rfried.dev@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 5/6] net: macb: add dma_burst_length config 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" GEM support higher DMA burst writes/reads than the default (4). add configuration structure with dma burst length so it could be applied later to DMA configuration. Signed-off-by: Ramon Fried Reviewed-by: Anup Patel Tested-by: Anup Patel Acked-by: Joe Hershberger --- v2: nothing. drivers/net/macb.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index cf76270ad8..dc6aa6deda 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -82,6 +82,7 @@ struct macb_dma_desc { struct macb_device { void *regs; + unsigned int dma_burst_length; unsigned int rx_tail; unsigned int tx_head; @@ -118,6 +119,11 @@ struct macb_device { phy_interface_t phy_interface; #endif }; + +struct macb_config { + unsigned int dma_burst_length; +}; + #ifndef CONFIG_DM_ETH #define to_macb(_nd) container_of(_nd, struct macb_device, netdev) #endif @@ -1135,8 +1141,13 @@ static int macb_enable_clk(struct udevice *dev) } #endif +static const struct macb_config default_gem_config = { + .dma_burst_length = 16, +}; + 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; @@ -1153,6 +1164,11 @@ 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->dma_burst_length = macb_config->dma_burst_length; #ifdef CONFIG_CLK ret = macb_enable_clk(dev); if (ret) @@ -1213,12 +1229,16 @@ static int macb_eth_ofdata_to_platdata(struct udevice *dev) return macb_late_eth_ofdata_to_platdata(dev); } +static const struct macb_config sama5d4_config = { + .dma_burst_length = 4, +}; + static const struct udevice_id macb_eth_ids[] = { { .compatible = "cdns,macb" }, { .compatible = "cdns,at91sam9260-macb" }, { .compatible = "atmel,sama5d2-gem" }, { .compatible = "atmel,sama5d3-gem" }, - { .compatible = "atmel,sama5d4-gem" }, + { .compatible = "atmel,sama5d4-gem", .data = (ulong)&sama5d4_config }, { .compatible = "cdns,zynq-gem" }, { } }; From patchwork Tue Jul 16 19:04:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramon Fried X-Patchwork-Id: 1132907 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hvYHF0BV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p9153Zvcz9sDQ for ; Wed, 17 Jul 2019 05:08:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 2E9B6C21EE8; Tue, 16 Jul 2019 19:06:26 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 A423FC21E7F; Tue, 16 Jul 2019 19:06:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 514EFC21EC2; Tue, 16 Jul 2019 19:05:09 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id BDFEBC21E49 for ; Tue, 16 Jul 2019 19:05:05 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id y4so22135705wrm.2 for ; Tue, 16 Jul 2019 12:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PiJdf2nyJW3gQ3bVSiU2Ca6F+402JomIb31ft8rg27w=; b=hvYHF0BVuKZNdSglmgfybkBkX/rHwHKBQyWJNZmRb8+W/Xh88ZQ/5S+4zomHvV0lPm wPe4C52ibdbYH3ND3X5d1Icp6w5LcAp37HEaVY4QbjaNgkOpiAt0kPr5Y0suvxfOFjj6 6wD+B3pOGNlF+H2QPOAWAZ5FbotClm7twqlibC2ob7oAN/RlXMB3yuFqt6O1jzoKumtV tTpSomfxfAhp2tPGKMWRh0zWZd6hxAi7+49w/dQG1wF26XYzkR/gDu6iPxU4Ag1cheFN BAYx4zWZYJoWAmSDpWrGswgS7SSJX0Qq2ZYR6oCI+Q6YzZmUuEsi0snO45yVrcucflaq SlCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PiJdf2nyJW3gQ3bVSiU2Ca6F+402JomIb31ft8rg27w=; b=sMd2SI28HXhBEX7rqHLWYOxDNiHejv+vT+HlDijBt42gZIhmD4NDc7suScD5l9/tV1 ltW6gn1b//vbXyQ18ibIgTk0PRaTYtPJC2y/c2BEQpJnR07fvISzZlUuPsZPTX74EDvy sJ9uxt239Ugrbi+vYTTTVtDoL6TAJu5qmbn5F3S5SA3ZNbdV0BDkqOG9I4TT2ncc2FXT YVuYzVtCmkQGFOR2d333gzX+/UNS3m7NWJqAo9pjEjkC89j8ZRWN3Brb763XTY/YfRl9 vqZ99HCf2bAAzBRU0Uaz801wdfiY5mnSGe1D3kZBIaY+yN9ZfK9D98byV8GQ8YFVDwDd pouw== X-Gm-Message-State: APjAAAW1bCSyXdk8xxNpfwkm5mGq9U0eYCDsjKfSzBD9vDkGBe5cBuJP LUpxr80X0mioCRwzmxFja/+dYGkdc2o= X-Google-Smtp-Source: APXvYqzrguY2zshe66fPA+2lww+z4g8lTw/c3eTnQvcHrSflI+Xd0qR+9syTUqWDo3yuEzXHY2KstQ== X-Received: by 2002:adf:dc51:: with SMTP id m17mr12022095wrj.256.1563303905188; Tue, 16 Jul 2019 12:05:05 -0700 (PDT) Received: from localhost.localdomain ([141.226.31.91]) by smtp.gmail.com with ESMTPSA id t1sm30608347wra.74.2019.07.16.12.05.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 12:05:04 -0700 (PDT) From: Ramon Fried To: u-boot@lists.denx.de, joe.hershberger@ni.com Date: Tue, 16 Jul 2019 22:04:36 +0300 Message-Id: <20190716190436.21251-6-rfried.dev@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716190436.21251-2-rfried.dev@gmail.com> References: <20190716190436.21251-2-rfried.dev@gmail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v2 6/6] net: macb: apply sane DMA configuration 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" DMA configuration was heavily dependent on the HW defaults, add function to properly set the required fields, including the new dma_burst_length. Signed-off-by: Ramon Fried Reviewed-by: Anup Patel Tested-by: Anup Patel Acked-by: Joe Hershberger --- v2: nothing. drivers/net/macb.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index dc6aa6deda..035109dc43 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -47,6 +47,7 @@ DECLARE_GLOBAL_DATA_PTR; #define MACB_RX_BUFFER_SIZE 4096 #define MACB_RX_RING_SIZE (MACB_RX_BUFFER_SIZE / 128) +#define RX_BUFFER_MULTIPLE 64 #define MACB_TX_RING_SIZE 16 #define MACB_TX_TIMEOUT 1000 #define MACB_AUTONEG_TIMEOUT 5000000 @@ -697,6 +698,31 @@ static int gmac_init_multi_queues(struct macb_device *macb) return 0; } +static void gmac_configure_dma(struct macb_device *macb) +{ + u32 buffer_size; + u32 dmacfg; + + buffer_size = 128 / RX_BUFFER_MULTIPLE; + 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); + + dmacfg |= GEM_BIT(TXPBMS) | GEM_BF(RXBMS, -1L); + dmacfg &= ~GEM_BIT(ENDIA_PKT); + +#ifdef CONFIG_SYS_LITTLE_ENDIAN + dmacfg &= ~GEM_BIT(ENDIA_DESC); +#else + dmacfg |= GEM_BIT(ENDIA_DESC); /* CPU in big endian */ +#endif + + dmacfg &= ~GEM_BIT(ADDR64); + gem_writel(macb, DMACFG, dmacfg); +} + #ifdef CONFIG_DM_ETH static int _macb_init(struct udevice *dev, const char *name) #else @@ -750,6 +776,8 @@ static int _macb_init(struct macb_device *macb, const char *name) macb_writel(macb, TBQP, macb->tx_ring_dma); if (macb_is_gem(macb)) { + /* Initialize DMA properties */ + gmac_configure_dma(macb); /* Check the multi queue and initialize the queue for tx */ gmac_init_multi_queues(macb);