* [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1
@ 2015-12-11 11:43 Michal Simek
2015-12-11 11:43 ` [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv Michal Simek
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Michal Simek @ 2015-12-11 11:43 UTC (permalink / raw)
To: u-boot
Undefined phy address is -1 not 0.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/net/zynq_gem.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 0a41281e901d..b0755f5e3b48 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -666,11 +666,12 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
priv->iobase = (struct zynq_gem_regs *)pdata->iobase;
/* Hardcode for now */
priv->emio = 0;
+ priv->phyaddr = -1;
offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset,
"phy-handle");
if (offset > 0)
- priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", 0);
+ priv->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, "reg", -1);
phy_mode = fdt_getprop(gd->fdt_blob, dev->of_offset, "phy-mode", NULL);
if (phy_mode)
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv
2015-12-11 11:43 [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Michal Simek
@ 2015-12-11 11:43 ` Michal Simek
2015-12-15 17:47 ` Joe Hershberger
2015-12-11 11:43 ` [U-Boot] [PATCH 3/5] net: gem: Separate recv and free_pkt functions Michal Simek
` (3 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2015-12-11 11:43 UTC (permalink / raw)
To: u-boot
recv function should return 0 instead of frame_len not to
proceed the same packet again in core.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/net/zynq_gem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index b0755f5e3b48..5f0f2005ceb3 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -569,7 +569,7 @@ static int zynq_gem_recv(struct udevice *dev, int flags, uchar **packetp)
priv->rxbd_current = 0;
}
- return frame_len;
+ return 0;
}
static void zynq_gem_halt(struct udevice *dev)
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 3/5] net: gem: Separate recv and free_pkt functions
2015-12-11 11:43 [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Michal Simek
2015-12-11 11:43 ` [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv Michal Simek
@ 2015-12-11 11:43 ` Michal Simek
2015-12-15 17:49 ` Joe Hershberger
2015-12-11 11:43 ` [U-Boot] [PATCH 4/5] net: gem: Fix typo in Kconfig entry Michal Simek
` (2 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2015-12-11 11:43 UTC (permalink / raw)
To: u-boot
Use core to call net_process_received_packet() instead of call inside
the driver.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/net/zynq_gem.c | 52 +++++++++++++++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 20 deletions(-)
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 5f0f2005ceb3..f7c20dc9cd54 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -532,43 +532,54 @@ static int zynq_gem_send(struct udevice *dev, void *ptr, int len)
static int zynq_gem_recv(struct udevice *dev, int flags, uchar **packetp)
{
int frame_len;
+ u32 addr;
struct zynq_gem_priv *priv = dev_get_priv(dev);
struct emac_bd *current_bd = &priv->rx_bd[priv->rxbd_current];
- struct emac_bd *first_bd;
if (!(current_bd->addr & ZYNQ_GEM_RXBUF_NEW_MASK))
- return 0;
+ return -1;
if (!(current_bd->status &
(ZYNQ_GEM_RXBUF_SOF_MASK | ZYNQ_GEM_RXBUF_EOF_MASK))) {
printf("GEM: SOF or EOF not set for last buffer received!\n");
- return 0;
+ return -1;
}
frame_len = current_bd->status & ZYNQ_GEM_RXBUF_LEN_MASK;
- if (frame_len) {
- u32 addr = current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK;
- addr &= ~(ARCH_DMA_MINALIGN - 1);
+ if (!frame_len) {
+ printf("%s: Zero size packet?\n", __func__);
+ return -1;
+ }
- net_process_received_packet((u8 *)(ulong)addr, frame_len);
+ addr = current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK;
+ addr &= ~(ARCH_DMA_MINALIGN - 1);
+ *packetp = (uchar *)(uintptr_t)addr;
- if (current_bd->status & ZYNQ_GEM_RXBUF_SOF_MASK)
- priv->rx_first_buf = priv->rxbd_current;
- else {
- current_bd->addr &= ~ZYNQ_GEM_RXBUF_NEW_MASK;
- current_bd->status = 0xF0000000; /* FIXME */
- }
+ return frame_len;
+}
- if (current_bd->status & ZYNQ_GEM_RXBUF_EOF_MASK) {
- first_bd = &priv->rx_bd[priv->rx_first_buf];
- first_bd->addr &= ~ZYNQ_GEM_RXBUF_NEW_MASK;
- first_bd->status = 0xF0000000;
- }
+static int zynq_gem_free_pkt(struct udevice *dev, uchar *packet, int length)
+{
+ struct zynq_gem_priv *priv = dev_get_priv(dev);
+ struct emac_bd *current_bd = &priv->rx_bd[priv->rxbd_current];
+ struct emac_bd *first_bd;
+
+ if (current_bd->status & ZYNQ_GEM_RXBUF_SOF_MASK) {
+ priv->rx_first_buf = priv->rxbd_current;
+ } else {
+ current_bd->addr &= ~ZYNQ_GEM_RXBUF_NEW_MASK;
+ current_bd->status = 0xF0000000; /* FIXME */
+ }
- if ((++priv->rxbd_current) >= RX_BUF)
- priv->rxbd_current = 0;
+ if (current_bd->status & ZYNQ_GEM_RXBUF_EOF_MASK) {
+ first_bd = &priv->rx_bd[priv->rx_first_buf];
+ first_bd->addr &= ~ZYNQ_GEM_RXBUF_NEW_MASK;
+ first_bd->status = 0xF0000000;
}
+ if ((++priv->rxbd_current) >= RX_BUF)
+ priv->rxbd_current = 0;
+
return 0;
}
@@ -651,6 +662,7 @@ static const struct eth_ops zynq_gem_ops = {
.start = zynq_gem_init,
.send = zynq_gem_send,
.recv = zynq_gem_recv,
+ .free_pkt = zynq_gem_free_pkt,
.stop = zynq_gem_halt,
.write_hwaddr = zynq_gem_setup_mac,
};
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 4/5] net: gem: Fix typo in Kconfig entry
2015-12-11 11:43 [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Michal Simek
2015-12-11 11:43 ` [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv Michal Simek
2015-12-11 11:43 ` [U-Boot] [PATCH 3/5] net: gem: Separate recv and free_pkt functions Michal Simek
@ 2015-12-11 11:43 ` Michal Simek
2015-12-15 17:50 ` Joe Hershberger
2015-12-11 11:43 ` [U-Boot] [PATCH 5/5] net: gem: Add driver dependencies to PHYLIB and MII Michal Simek
2015-12-15 17:47 ` [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Joe Hershberger
4 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2015-12-11 11:43 UTC (permalink / raw)
To: u-boot
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/net/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6905cc02e392..e77797ab286f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -105,6 +105,6 @@ config ZYNQ_GEM
depends on DM_ETH && (ARCH_ZYNQ || ARCH_ZYNQMP)
bool "Xilinx Ethernet GEM"
help
- This MAC is presetn in Xilinx Zynq and ZynqMP SoCs.
+ This MAC is present in Xilinx Zynq and ZynqMP SoCs.
endif # NETDEVICES
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 5/5] net: gem: Add driver dependencies to PHYLIB and MII
2015-12-11 11:43 [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Michal Simek
` (2 preceding siblings ...)
2015-12-11 11:43 ` [U-Boot] [PATCH 4/5] net: gem: Fix typo in Kconfig entry Michal Simek
@ 2015-12-11 11:43 ` Michal Simek
2015-12-15 17:52 ` Joe Hershberger
2015-12-15 17:47 ` [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Joe Hershberger
4 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2015-12-11 11:43 UTC (permalink / raw)
To: u-boot
Clear driver dependecies via Kconfig. Remove PHYLIB dependency from
the driver.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
configs/zynq_microzed_defconfig | 1 -
configs/zynq_picozed_defconfig | 1 -
configs/zynq_zc702_defconfig | 1 -
configs/zynq_zc706_defconfig | 1 -
configs/zynq_zc770_xm010_defconfig | 1 -
configs/zynq_zc770_xm011_defconfig | 1 -
configs/zynq_zc770_xm012_defconfig | 1 -
configs/zynq_zc770_xm013_defconfig | 1 -
configs/zynq_zed_defconfig | 1 -
configs/zynq_zybo_defconfig | 1 -
drivers/net/Kconfig | 2 ++
drivers/net/zynq_gem.c | 4 ----
include/configs/xilinx_zynqmp.h | 2 --
13 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index c68efc8f41af..e577c931735e 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -15,6 +15,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index 62eb79f630e3..7d52d8e941b7 100644
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -8,5 +8,4 @@ CONFIG_SPL=y
CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 5261b73e18ba..9d1b40d76ef6 100644
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -14,7 +14,6 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_ZYNQ=y
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 2e525b42d42a..bba91dfdfa78 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -15,6 +15,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index 6f2ad17985e1..96f0a794a382 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -17,7 +17,6 @@ CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_SST=y
CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_SPI=y
CONFIG_ZYNQ_QSPI=y
diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
index d20b3edf5cb3..b0c535e88e19 100644
--- a/configs/zynq_zc770_xm011_defconfig
+++ b/configs/zynq_zc770_xm011_defconfig
@@ -12,5 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 4e963a45e2cf..7fb03eb0491b 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -10,5 +10,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index f2d8f14f8784..67665127b5ba 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -12,5 +12,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 2e7c68d6a49e..058bb05ba658 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -15,6 +15,5 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 6f0bd0b79c5e..eb66b87d6bbe 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -11,7 +11,6 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_NET_RANDOM_ETHADDR=y
-CONFIG_PHYLIB=y
CONFIG_ZYNQ_GEM=y
CONFIG_DEBUG_UART=y
CONFIG_DEBUG_UART_ZYNQ=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e77797ab286f..13e0269a30b0 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -103,6 +103,8 @@ config PCH_GBE
config ZYNQ_GEM
depends on DM_ETH && (ARCH_ZYNQ || ARCH_ZYNQMP)
+ select PHYLIB
+ select MII
bool "Xilinx Ethernet GEM"
help
This MAC is present in Xilinx Zynq and ZynqMP SoCs.
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index f7c20dc9cd54..7059c8432a34 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -27,10 +27,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#if !defined(CONFIG_PHYLIB)
-# error XILINX_GEM_ETHERNET requires PHYLIB
-#endif
-
/* Bit/mask specification */
#define ZYNQ_GEM_PHYMNTNC_OP_MASK 0x40020000 /* operation mask bits */
#define ZYNQ_GEM_PHYMNTNC_OP_R_MASK 0x20000000 /* read operation */
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 50ac5f531c49..757ab3ac3aa4 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -186,9 +186,7 @@
/* Ethernet driver */
#if defined(CONFIG_ZYNQ_GEM)
# define CONFIG_NET_MULTI
-# define CONFIG_MII
# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-# define CONFIG_PHYLIB
# define CONFIG_PHY_MARVELL
# define CONFIG_PHY_TI
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1
2015-12-11 11:43 [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Michal Simek
` (3 preceding siblings ...)
2015-12-11 11:43 ` [U-Boot] [PATCH 5/5] net: gem: Add driver dependencies to PHYLIB and MII Michal Simek
@ 2015-12-15 17:47 ` Joe Hershberger
4 siblings, 0 replies; 14+ messages in thread
From: Joe Hershberger @ 2015-12-15 17:47 UTC (permalink / raw)
To: u-boot
On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> Undefined phy address is -1 not 0.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv
2015-12-11 11:43 ` [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv Michal Simek
@ 2015-12-15 17:47 ` Joe Hershberger
2015-12-15 19:51 ` Joe Hershberger
0 siblings, 1 reply; 14+ messages in thread
From: Joe Hershberger @ 2015-12-15 17:47 UTC (permalink / raw)
To: u-boot
On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> recv function should return 0 instead of frame_len not to
> proceed the same packet again in core.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 3/5] net: gem: Separate recv and free_pkt functions
2015-12-11 11:43 ` [U-Boot] [PATCH 3/5] net: gem: Separate recv and free_pkt functions Michal Simek
@ 2015-12-15 17:49 ` Joe Hershberger
0 siblings, 0 replies; 14+ messages in thread
From: Joe Hershberger @ 2015-12-15 17:49 UTC (permalink / raw)
To: u-boot
On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> Use core to call net_process_received_packet() instead of call inside
> the driver.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 4/5] net: gem: Fix typo in Kconfig entry
2015-12-11 11:43 ` [U-Boot] [PATCH 4/5] net: gem: Fix typo in Kconfig entry Michal Simek
@ 2015-12-15 17:50 ` Joe Hershberger
0 siblings, 0 replies; 14+ messages in thread
From: Joe Hershberger @ 2015-12-15 17:50 UTC (permalink / raw)
To: u-boot
On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 5/5] net: gem: Add driver dependencies to PHYLIB and MII
2015-12-11 11:43 ` [U-Boot] [PATCH 5/5] net: gem: Add driver dependencies to PHYLIB and MII Michal Simek
@ 2015-12-15 17:52 ` Joe Hershberger
2015-12-16 8:07 ` Michal Simek
0 siblings, 1 reply; 14+ messages in thread
From: Joe Hershberger @ 2015-12-15 17:52 UTC (permalink / raw)
To: u-boot
On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> Clear driver dependecies via Kconfig. Remove PHYLIB dependency from
> the driver.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
<snip>
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index 50ac5f531c49..757ab3ac3aa4 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -186,9 +186,7 @@
> /* Ethernet driver */
> #if defined(CONFIG_ZYNQ_GEM)
> # define CONFIG_NET_MULTI
> -# define CONFIG_MII
I guess this was already moved out from other zynq targets, right?
> # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
> -# define CONFIG_PHYLIB
> # define CONFIG_PHY_MARVELL
> # define CONFIG_PHY_TI
> #endif
> --
> 1.9.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv
2015-12-15 17:47 ` Joe Hershberger
@ 2015-12-15 19:51 ` Joe Hershberger
2015-12-16 8:05 ` Michal Simek
0 siblings, 1 reply; 14+ messages in thread
From: Joe Hershberger @ 2015-12-15 19:51 UTC (permalink / raw)
To: u-boot
Hi Michal,
On Tue, Dec 15, 2015 at 11:47 AM, Joe Hershberger
<joe.hershberger@gmail.com> wrote:
> On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
>> recv function should return 0 instead of frame_len not to
>> proceed the same packet again in core.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Oops. NAK. Didn't realize this was the top-level recv function being
passed to the eth layer.
-Joe
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv
2015-12-15 19:51 ` Joe Hershberger
@ 2015-12-16 8:05 ` Michal Simek
2015-12-16 8:23 ` Joe Hershberger
0 siblings, 1 reply; 14+ messages in thread
From: Michal Simek @ 2015-12-16 8:05 UTC (permalink / raw)
To: u-boot
Hi Joe,
On 15.12.2015 20:51, Joe Hershberger wrote:
> Hi Michal,
>
> On Tue, Dec 15, 2015 at 11:47 AM, Joe Hershberger
> <joe.hershberger@gmail.com> wrote:
>> On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
>>> recv function should return 0 instead of frame_len not to
>>> proceed the same packet again in core.
>>>
>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>
>> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>
> Oops. NAK. Didn't realize this was the top-level recv function being
> passed to the eth layer.
I expect that origin ACK was valid and you realized like for other
driver that here should be return 0 because separation with free_pkt is
done in 3/5.
Thanks,
Michal
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 5/5] net: gem: Add driver dependencies to PHYLIB and MII
2015-12-15 17:52 ` Joe Hershberger
@ 2015-12-16 8:07 ` Michal Simek
0 siblings, 0 replies; 14+ messages in thread
From: Michal Simek @ 2015-12-16 8:07 UTC (permalink / raw)
To: u-boot
On 15.12.2015 18:52, Joe Hershberger wrote:
> On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
>> Clear driver dependecies via Kconfig. Remove PHYLIB dependency from
>> the driver.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>
> <snip>
>
>> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
>> index 50ac5f531c49..757ab3ac3aa4 100644
>> --- a/include/configs/xilinx_zynqmp.h
>> +++ b/include/configs/xilinx_zynqmp.h
>> @@ -186,9 +186,7 @@
>> /* Ethernet driver */
>> #if defined(CONFIG_ZYNQ_GEM)
>> # define CONFIG_NET_MULTI
>> -# define CONFIG_MII
>
> I guess this was already moved out from other zynq targets, right?
This line has to stay there. The reason is that MII is not in Kconfig
yet. I found it a little bit later.
I will send v2 of this patch to fix it.
Thanks,
Michal
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv
2015-12-16 8:05 ` Michal Simek
@ 2015-12-16 8:23 ` Joe Hershberger
0 siblings, 0 replies; 14+ messages in thread
From: Joe Hershberger @ 2015-12-16 8:23 UTC (permalink / raw)
To: u-boot
On Wed, Dec 16, 2015 at 2:05 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> Hi Joe,
>
> On 15.12.2015 20:51, Joe Hershberger wrote:
>> Hi Michal,
>>
>> On Tue, Dec 15, 2015 at 11:47 AM, Joe Hershberger
>> <joe.hershberger@gmail.com> wrote:
>>> On Fri, Dec 11, 2015 at 5:43 AM, Michal Simek <michal.simek@xilinx.com> wrote:
>>>> recv function should return 0 instead of frame_len not to
>>>> proceed the same packet again in core.
>>>>
>>>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>>>
>>> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>>
>> Oops. NAK. Didn't realize this was the top-level recv function being
>> passed to the eth layer.
>
> I expect that origin ACK was valid and you realized like for other
> driver that here should be return 0 because separation with free_pkt is
> done in 3/5.
Yes!
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2015-12-16 8:23 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-11 11:43 [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Michal Simek
2015-12-11 11:43 ` [U-Boot] [PATCH 2/5] net: gem: Fix return value from recv Michal Simek
2015-12-15 17:47 ` Joe Hershberger
2015-12-15 19:51 ` Joe Hershberger
2015-12-16 8:05 ` Michal Simek
2015-12-16 8:23 ` Joe Hershberger
2015-12-11 11:43 ` [U-Boot] [PATCH 3/5] net: gem: Separate recv and free_pkt functions Michal Simek
2015-12-15 17:49 ` Joe Hershberger
2015-12-11 11:43 ` [U-Boot] [PATCH 4/5] net: gem: Fix typo in Kconfig entry Michal Simek
2015-12-15 17:50 ` Joe Hershberger
2015-12-11 11:43 ` [U-Boot] [PATCH 5/5] net: gem: Add driver dependencies to PHYLIB and MII Michal Simek
2015-12-15 17:52 ` Joe Hershberger
2015-12-16 8:07 ` Michal Simek
2015-12-15 17:47 ` [U-Boot] [PATCH 1/5] net: gem: Setup default phy address to -1 Joe Hershberger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.