*** Initial Wiznet W5500 support ***
v3 cover *** Initial Wiznet W5500 support ***
From: Jean-Marie Verdun <[email protected]>
v3
Remove Global definition
Replace polling by read_poll_timeout
Remove unused function
Add empty lines before returns statement
Remove declaration and code mix
Switch to dev_dbg
Relocate read/write helpers to top of file
Remove include and incorporate it into the code
v2
Rebase source tree to create patch against top of tree and avoid issues with Kconfig and Makefile
Recheck checkpatch.pl output as to minimize issues to CHECK state
CHECK issues reported are coming from copy/paste section from the linux kernel driver, and aren't processed as being strong issues.
command ran scripts/checkpatch.pl --no-tree v2-0001-Initial-support-for-Wiznet-W5500.patch
Jean-Marie Verdun (1):
Initial support for Wiznet W5500
drivers/net/Kconfig | 9 + drivers/net/Makefile | 1 + drivers/net/w5500.c | 618 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 628 insertions(+) create mode 100644 drivers/net/w5500.c
Signature · 1 line
2.43.0
PATCH v3 1/1 Initial support for Wiznet W5500
From: Jean-Marie Verdun <[email protected]>
Add support for the Wiznet W5500 spi to ethernet controller
--- drivers/net/Kconfig | 9 + drivers/net/Makefile | 1 + drivers/net/w5500.c | 618 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 628 insertions(+) create mode 100644 drivers/net/w5500.c
drivers/net/Kconfig +9 -0
@@ -19,6 +19,15 @@ config SPL_DM_ETH depends on SPL_NET def_bool y +config W5500 + bool "W5500 device driver" + depends on SPI + help + Enable w5500 driver + + Adds support for Wiznet W5500 device. The device must be attached + to a SPI bus. + config DM_MDIO bool "Enable Driver Model for MDIO devices" depends on PHYLIB
drivers/net/Makefile +1 -0
@@ -103,6 +103,7 @@ obj-$(CONFIG_SUN8I_EMAC) += sun8i_emac.o obj-$(CONFIG_TSEC_ENET) += tsec.o fsl_mdio.o obj-$(CONFIG_TULIP) += dc2114x.o obj-$(CONFIG_VSC7385_ENET) += vsc7385.o +obj-$(CONFIG_W5500) += w5500.o obj-$(CONFIG_XILINX_AXIEMAC) += xilinx_axi_emac.o obj-$(CONFIG_XILINX_AXIMRMAC) += xilinx_axi_mrmac.o obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
drivers/net/w5500.c new file +618 -0
618 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v3 1/1] Initial support for Wiznet W5500
Hi,
Quoted 50 lines · On 05/05/2025 19:58, [email protected] wrote:
From: Jean-Marie Verdun <[email protected]>
Add support for the Wiznet W5500 spi to ethernet controller
Signed-off-by Jean-Marie Verdun <[email protected]>--- drivers/net/Kconfig | 9 + drivers/net/Makefile | 1 + drivers/net/w5500.c | 618 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 628 insertions(+)create mode 100644
drivers/net/w5500.cdrivers/net/Kconfig +9
-0@@ -19,6 +19,15 @@ config SPL_DM_ETH depends on SPL_NET def_bool y +config W5500 + bool "W5500 device driver" + depends on SPI + help + Enable w5500 driver + + Adds support for Wiznet W5500 device. The device must be attached + to a SPI bus. + config DM_MDIO bool "Enable Driver Model for MDIO devices" depends on PHYLIBdrivers/net/Makefile +1
-0@@ -103,6 +103,7 @@ obj-$(CONFIG_SUN8I_EMAC) += sun8i_emac.o obj-$(CONFIG_TSEC_ENET) += tsec.o fsl_mdio.o obj-$(CONFIG_TULIP) += dc2114x.o obj-$(CONFIG_VSC7385_ENET) += vsc7385.o +obj-$(CONFIG_W5500) += w5500.o obj-$(CONFIG_XILINX_AXIEMAC) += xilinx_axi_emac.o obj-$(CONFIG_XILINX_AXIMRMAC) += xilinx_axi_mrmac.o obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.odrivers/net/w5500.c new file +0
-0
drivers/net/w5500.c line 7
Quoted 7 lines
drivers/net/w5500.c new file +7
-0@@ -0,0 +1,618 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright Hewlett Packard Enterprise Development LP. +* +* Jean-Marie Verdun <[email protected]> +* +* inspired from the linux kernel driver from
s/inspired/Inspired/
add ":" at the end of the line
drivers/net/w5500.c line 9
Quoted 2 lines
drivers/net/w5500.c new file +2
-0+* Copyright (C) 2006-2008 WIZnet Co.,Ltd. +* Copyright (C) 2012 Mike Sinkovsky <[email protected]>
Add " - " for each item
drivers/net/w5500.c line 12
Quoted 3 lines
drivers/net/w5500.c new file +3
-0+* +* available at +*
Drop empty line
drivers/net/w5500.c line 13
Quoted 1 line
drivers/net/w5500.c new file +1
-0+* https://github.com/torvalds/linux/blob/master/drivers/net/ethernet/wiznet/w5100.c
Add " - " to itemize
drivers/net/w5500.c line 18
Quoted 5 lines
drivers/net/w5500.c new file +5
-0+* +* Datasheet: +* http://www.wiznet.co.kr/wp-content/uploads/wiznethome/Chip/W5100/Document/W5100_Datasheet_v1.2.6.pdf +* http://wiznethome.cafe24.com/wp-content/uploads/wiznethome/Chip/W5200/Documents/W5200_DS_V140E.pdf +* http://wizwiki.net/wiki/lib/exe/fetch.php?media=products:w5500:w5500_ds_v106e_141230.pdf
Same here
Quoted 5 lines
drivers/net/w5500.c new file +5
-0+* +*/ + +#include <dm.h> +#include <log.h>
drivers/net/w5500.c line 33
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+#include <malloc.h> +#include <spi.h> +#include <net.h> +#include <asm/global_data.h> +#include <dm/device_compat.h> +#include <linux/delay.h> +#include <linux/iopoll.h> + +#ifndef __ETH_H +#define __ETH_H
Drop those and the #endif, and move the include with the other ones
Quoted 69 lines
drivers/net/w5500.c new file +69
-0+ +#include <net.h> + +#define BUFFER_SZ 16384 +#define W5100_SPI_WRITE_OPCODE 0xf0 +#define W5100_SPI_READ_OPCODE 0x0f +#define W5100_SHAR 0x0009/* Source MAC address */ +#define W5500_S0_REGS 0x10000 +#define S0_REGS (priv) ((priv)->s0_regs) +#define W5100_MR 0x0000/* Mode Register */ +#define MR_RST 0x80/* S/W reset */ +#define MR_PB 0x10/* Ping block */ + +#define W5100_Sn_MR 0x0000/* Sn Mode Register */ +#define W5100_Sn_CR 0x0001/* Sn Command Register */ +#define W5100_Sn_IR 0x0002/* Sn Interrupt Register */ +#define W5100_Sn_SR 0x0003/* Sn Status Register */ +#define W5100_Sn_TX_FSR 0x0020/* Sn Transmit free memory size */ +#define W5100_Sn_TX_RD 0x0022/* Sn Transmit memory read pointer */ +#define W5100_Sn_TX_WR 0x0024/* Sn Transmit memory write pointer */ +#define W5100_Sn_RX_RSR 0x0026/* Sn Receive free memory size */ +#define W5100_Sn_RX_RD 0x0028/* Sn Receive memory read pointer */ + +#define W5100_S0_MR (priv) (S0_REGS(priv) + W5100_Sn_MR) + +#define S0_MR_MACRAW 0x04/* MAC RAW mode */ +#define S0_MR_MF 0x40/* MAC Filter for W5100 and W5200 */ +#define W5500_S0_MR_MF 0x80/* MAC Filter for W5500 */ +#define W5100_S0_MR (priv) (S0_REGS(priv) + W5100_Sn_MR) + +#define S0_MR_MACRAW 0x04/* MAC RAW mode */ +#define S0_MR_MF 0x40/* MAC Filter for W5100 and W5200 */ +#define W5500_S0_MR_MF 0x80/* MAC Filter for W5500 */ + +/* +* W5100 and W5200 common registers about the same with the W5500 +*/ +#define W5100_IMR 0x0016/* Interrupt Mask Register */ +#define IR_S0 0x01/* S0 interrupt */ +#define W5100_RTR 0x0017/* Retry Time-value Register */ +#define RTR_DEFAULT 2000/* =0x07d0 (2000) */ +#define W5500_SIMR 0x0018/* Socket Interrupt Mask Register */ +#define W5500_RTR 0x0019/* Retry Time-value Register */ + +#define W5100_S0_CR (priv) (S0_REGS(priv) + W5100_Sn_CR) +#define S0_CR_OPEN 0x01/* OPEN command */ +#define S0_CR_CLOSE 0x10/* CLOSE command */ +#define S0_CR_SEND 0x20/* SEND command */ +#define S0_CR_RECV 0x40/* RECV command */ +#define W5100_S0_IR (priv) (S0_REGS(priv) + W5100_Sn_IR) +#define S0_IR_SENDOK 0x10/* complete sending */ +#define S0_IR_RECV 0x04/* receiving data */ +#define W5100_S0_SR (priv) (S0_REGS(priv) + W5100_Sn_SR) +#define S0_SR_MACRAW 0x42/* mac raw mode */ +#define W5100_S0_TX_FSR (priv) (S0_REGS(priv) + W5100_Sn_TX_FSR) +#define W5100_S0_TX_RD (priv) (S0_REGS(priv) + W5100_Sn_TX_RD) +#define W5100_S0_TX_WR (priv) (S0_REGS(priv) + W5100_Sn_TX_WR) +#define W5100_S0_RX_RSR (priv) (S0_REGS(priv) + W5100_Sn_RX_RSR) +#define W5100_S0_RX_RD (priv) (S0_REGS(priv) + W5100_Sn_RX_RD) + +#define W5500_TX_MEM_START 0x20000 +#define W5500_TX_MEM_SIZE 0x04000 +#define W5500_RX_MEM_START 0x30000 +#define W5500_RX_MEM_SIZE 0x04000 + +#define W5500_Sn_RXMEM_SIZE (n) \ + (0x1001e + (n) * 0x40000)/* Sn RX Memory Size */ +#define W5500_Sn_TXMEM_SIZE (n) \ + (0x1001f + (n) * 0x40000)/* Sn TX Memory Size */
drivers/net/w5500.c line 112
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+ +/** +* A packet handler +* +* dev - device pointer +* pkt - pointer to the "sent" packet +* len - packet length +*/ +typedef int w5500_eth_tx_hand_f (struct udevice *dev,void *pkt, +unsigned int len);
This is unused, drop
drivers/net/w5500.c line 123
Quoted 11 lines
drivers/net/w5500.c new file +11
-0+ +/** +* struct eth_w5500_priv - memory for w5500 driver +* +* host_hwaddr - MAC address of mocked machine +* disabled - Will not respond +* recv_packet_buffer - buffers of the packet returned as received +* recv_packet_length - lengths of the packet returned as received +* recv_packets - number of packets returned +* tx_handler - function to generate responses to sent packets +* priv - a pointer to some structure a test may want to keep track of
Either document none or all the fields
drivers/net/w5500.c line 131
Quoted 8 lines
drivers/net/w5500.c new file +8
-0+*/ +struct eth_w5500_priv { +uchar host_hwaddr[ARP_HLEN ]; +bool disabled; +uchar *recv_packet_buffer[PKTBUFSRX ]; +int recv_packet_length[PKTBUFSRX ]; +int recv_packets; +w5500_eth_tx_hand_f *tx_handler;
This is unused, drop, and check the other fields
Quoted 18 lines
drivers/net/w5500.c new file +18
-0+const struct dm_spi_ops *spi_ops; +struct udevice **spi_dev; +/* Socket 0 register offset address */ +u32 s0_regs; +/* Socket 0 TX buffer offset address and size */ +u32 s0_tx_buf; +u16 s0_tx_buf_size; +/* Socket 0 RX buffer offset address and size */ +u32 s0_rx_buf; +u16 s0_rx_buf_size; +bool promisc; +u32 msg_enable; +u16 offset; +void *priv; +}; + +static int w5500_spi_write (struct udevice *dev,u32 addr,u8 data); +static int w5500_spi_read (struct udevice *dev,u32 addr);
drivers/net/w5500.c line 159
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+static void w5500_enable_intr (struct udevice *dev); +static int w5500_spi_read16 (struct udevice *dev,u32 addr); +static int w5500_spi_write16 (struct udevice *dev,u32 addr,u16 data); +static int w5500_writebuf (struct udevice *dev,u16 offset,const u8 *buf, +int len); +static int w5500_readbuf (struct udevice *dev,u16 offset,u8 *buf,int len); +static int w5500_writebulk (struct udevice *dev,u32 addr,const u8 *buf, +int len); +static int xfer (struct udevice *dev,void *dout,unsigned int bout,void *din, +unsigned int bin);
I thing you can drop all those definitions, move "xfer" first.
drivers/net/w5500.c line 161
Quoted 2 lines
drivers/net/w5500.c new file +2
-0+ +#endif /* __ETH_H */
Drop
drivers/net/w5500.c line 168
Quoted 7 lines
drivers/net/w5500.c new file +7
-0+ +static int w5500_spi_read (struct udevice *dev,u32 addr) +{ +u8 bank; +u8 cmd[3 ]; +u8 data; +int ret;
Reorder variables, from longest to shortest
drivers/net/w5500.c line 179
Quoted 11 lines
drivers/net/w5500.c new file +11
-0+ + bank = (addr >>16 ); + +if (bank >0 ) + bank = bank <<3 ; + + cmd[0 ] = addr >>8 ; + cmd[1 ] = addr &0xff ; + cmd[2 ] = bank; + + ret =xfer (dev, cmd,sizeof (cmd), &data,1 );
return ret on error
drivers/net/w5500.c line 188
Quoted 9 lines
drivers/net/w5500.c new file +9
-0+ +return data; +} + +static int w5500_spi_write (struct udevice *dev,u32 addr,u8 data) +{ +u8 bank; +u8 din =0 ; +u8 cmd[4 ];
Reorder variables, from longest to shortest
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+ + bank = (addr >>16 ); + +if (bank >0 ) + bank = bank <<3 ; + + cmd[0 ] = (addr >>8 ) &0xff ; + cmd[1 ] = addr &0xff ; + cmd[2 ] = bank |0x4 ; + cmd[3 ] = data;
drivers/net/w5500.c line 208
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+ +return xfer (dev, cmd,sizeof (cmd), &din,0 ); +} + +static int w5500_spi_read16 (struct udevice *dev,u32 addr) +{ +u16 data; +int ret; +u8 bank; +u8 cmd[3 ];
Reorder variables, from longest to shortest
drivers/net/w5500.c line 219
Quoted 11 lines
drivers/net/w5500.c new file +11
-0+ + bank = (addr >>16 ); + +if (bank >0 ) + bank = bank <<3 ; + + cmd[0 ] = addr >>8 ; + cmd[1 ] = addr &0xff ; + cmd[2 ] = bank; + + ret =xfer (dev, cmd,sizeof (cmd), &data,2 );
return ret on error
drivers/net/w5500.c line 227
Quoted 8 lines
drivers/net/w5500.c new file +8
-0+ +return data; +} + +static int w5500_spi_write16 (struct udevice *dev,u32 addr,u16 data) +{ +int ret; +u8 buf[2 ];
Reorder variables, from longest to shortest
drivers/net/w5500.c line 234
Quoted 7 lines
drivers/net/w5500.c new file +7
-0+ + buf[0 ] = data >>8 ; + buf[1 ] = data &0xff ; + + ret =w5500_writebulk (dev, addr, &buf[0 ],2 ); + +return ret;
=> return w5500_writebulk(dev, addr, &buf[0], 2);
and drop ret
drivers/net/w5500.c line 240
Quoted 6 lines
drivers/net/w5500.c new file +6
-0+} + +static int w5500_readbulk (struct udevice *dev,u32 addr,u8 *buf,int len) +{ +int i; +u8 data[9000 ];
9000 ???? allocate dynamically
drivers/net/w5500.c line 168
Quoted 3 lines
drivers/net/w5500.c new file +3
-0+u8 bank; +u8 cmd[3 ]; +int ret;
Reorder variables, from longest to shortest
drivers/net/w5500.c line 254
Quoted 11 lines
drivers/net/w5500.c new file +11
-0+ + bank = (addr >>16 ); + +if (bank >0 ) + bank = bank <<3 ; + + cmd[0 ] = addr >>8 ; + cmd[1 ] = addr &0xff ; + cmd[2 ] = bank; + + ret =xfer (dev, cmd,sizeof (cmd), &data, len);
return ret on error
drivers/net/w5500.c line 267
Quoted 13 lines
drivers/net/w5500.c new file +13
-0+ +for (i =0 ; i < len; i++) + buf[(len -1 ) - i] = data[i]; + +return 0 ; +} + +static int w5500_writebulk (struct udevice *dev,u32 addr,const u8 *buf, +int len) +{ +int i; +u8 bank; +u8 cmd[9000 ];
9000 ???? allocate dynamically
drivers/net/w5500.c line 268
Quoted 1 line
drivers/net/w5500.c new file +1
-0+u8 din =0 ;
Reorder variables, from longest to shortest
Quoted 13 lines
drivers/net/w5500.c new file +13
-0+ + bank = (addr >>16 ); +if (bank >0 ) + bank = bank <<3 ; + + cmd[0 ] = (addr >>8 ) &0xff ; + cmd[1 ] = addr &0xff ; + cmd[2 ] = bank |0x4 ; + +for (i =0 ; i < len; i++) + cmd[i +3 ] = buf[i]; + +return xfer (dev, cmd, len +3 , &din,0 );
drivers/net/w5500.c line 291
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+} + +static int w5500_readbuf (struct udevice *dev,u16 offset,u8 *buf,int len) +{ +u32 addr; +int remain =0 ; +int ret; +struct eth_w5500_priv *priv =dev_get_priv (dev); +const u32 mem_start = priv->s0_rx_buf; +const u16 mem_size = priv->s0_rx_buf_size;
Reorder variables, from longest to shortest
Quoted 15 lines
drivers/net/w5500.c new file +15
-0+ + offset %= mem_size; + addr = mem_start + offset; + +if (offset + len > mem_size) { + remain = (offset + len) % mem_size; + len = mem_size - offset; + } + + ret =w5500_readbulk (dev, addr, buf, len); +if (ret || !remain) +return ret; + +return w5500_readbulk (dev, mem_start, buf + len, remain); +}
drivers/net/w5500.c line 316
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+ +static int w5500_writebuf (struct udevice *dev,u16 offset,const u8 *buf, +int len) +{ +u32 addr; +int ret; +int remain =0 ; +struct eth_w5500_priv *priv =dev_get_priv (dev); +const u32 mem_start = priv->s0_tx_buf; +const u16 mem_size = priv->s0_tx_buf_size;
Reorder variables, from longest to shortest
drivers/net/w5500.c line 327
Quoted 11 lines
drivers/net/w5500.c new file +11
-0+ + offset %= mem_size; + addr = mem_start + offset; + +if (offset + len > mem_size) { + remain = (offset + len) % mem_size; + len = mem_size - offset; + } + + ret =w5500_writebulk (dev, addr, buf, len); +
Drop emptly line
Quoted 6 lines
drivers/net/w5500.c new file +6
-0+if (ret || !remain) +return ret; + +return w5500_writebulk (dev, mem_start, buf + len, remain); +} +
drivers/net/w5500.c line 343
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+static int w5500_command (struct udevice *dev,u8 cmd) +{ +struct eth_w5500_priv *priv =dev_get_priv (dev); +u8 val; +u16 check; + +w5500_spi_write (dev,W5100_S0_CR (priv), cmd); + check = +read_poll_timeout (w5500_spi_read, val, val !=0 ,10 ,5000 , dev, +W5100_S0_CR (priv));
check = read_poll_timeout(w5500_spi_read, val, val != 0,
10, 5000, dev, W5100_S0_CR(priv));
Quoted 44 lines
drivers/net/w5500.c new file +44
-0+if (check !=0 ) +return -EIO ; + +return 0 ; +} + +static int w5500_eth_start (struct udevice *dev) +{ +struct eth_w5500_priv *priv =dev_get_priv (dev); + +debug ("eth_w5500: Start\n" ); + +u8 mode =S0_MR_MACRAW ; + +if (!priv->promisc) + mode |=W5500_S0_MR_MF ; + +w5500_spi_write (dev,W5100_S0_MR (priv), mode); +w5500_command (dev,S0_CR_OPEN ); + priv->offset =0 ; + +return 0 ; +} + +static int w5500_eth_send (struct udevice *dev,void *packet,int length) +{ +struct eth_w5500_priv *priv =dev_get_priv (dev); +u16 offset; + +if (priv->disabled) +return 0 ; + + offset =w5500_spi_read16 (dev,W5100_S0_TX_WR (priv)); +w5500_writebuf (dev, offset, packet, length); +w5500_spi_write16 (dev,W5100_S0_TX_WR (priv), offset + length); +w5500_command (dev,S0_CR_SEND ); + +return 0 ; +} + +static int w5500_eth_recv (struct udevice *dev,int flags,u8 **packetp) +{ +struct eth_w5500_priv *priv =dev_get_priv (dev); +u16 rx_len;
drivers/net/w5500.c line 397
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+u16 offset; +u8 data[9000 ]; +u16 tmp; +u16 rx_buf_len; + + rx_buf_len =w5500_spi_read16 (dev,W5100_S0_RX_RSR (priv)); + +while ((tmp = +w5500_spi_read16 (dev,W5100_S0_RX_RSR (priv))) != rx_buf_len) + rx_buf_len = tmp;
What's the point of this loop ??
Quoted 62 lines
drivers/net/w5500.c new file +62
-0+ +if (rx_buf_len ==0 ) +return 0 ; + + offset =w5500_spi_read16 (dev,W5100_S0_RX_RD (priv)); + rx_len = rx_buf_len -2 ; +w5500_readbuf (dev, offset +2 , data, rx_len); +w5500_spi_write16 (dev,W5100_S0_RX_RD (priv), offset +2 + rx_len); +w5500_command (dev,S0_CR_RECV ); + *packetp = data; + + priv->offset += rx_buf_len; + +return rx_len; +} + +static int w5500_eth_free_pkt (struct udevice *dev,u8 *packet,int length) +{ +struct eth_w5500_priv *priv =dev_get_priv (dev); +int i; + +if (!priv->recv_packets) +return 0 ; + + --priv->recv_packets; +for (i =0 ; i < priv->recv_packets; i++) { + priv->recv_packet_length[i] = priv->recv_packet_length[i +1 ]; +memcpy (priv->recv_packet_buffer[i], + priv->recv_packet_buffer[i +1 ], + priv->recv_packet_length[i +1 ]); + } + priv->recv_packet_length[priv->recv_packets] =0 ; + +return 0 ; +} + +static void w5500_eth_stop (struct udevice *dev) +{ +dev_dbg (dev,"eth_w5500: Stop\n" ); +} + +static int xfer (struct udevice *dev,void *dout,unsigned int bout,void *din, +unsigned int bin) +{ +/* Ok the xfer function in uboot is symmetrical +* (write and read operation happens at the same time) +* w5500 requires bytes send followed by receive operation on the MISO line +* So we need to create a buffer which contain bout+bin bytes and pass the various +* pointer to the xfer function +*/ + +struct udevice *bus =dev_get_parent (dev); +u8 buffin[BUFFER_SZ ]; +u8 buffout[BUFFER_SZ ]; + +if ((bout + bin) <BUFFER_SZ ) { +for (int i =0 ; i < bout; i++) { + buffout[i] = ((u8 *)(dout))[i]; + buffin[i] =0 ; + } +for (int i = bout; i < (bin + bout); i++) { + buffin[i] =0 ;
drivers/net/w5500.c line 469
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+ buffout[i] =0 ; + } +if (bus) { +dm_spi_xfer (dev,8 * (bout + bin), buffout, buffin, +SPI_XFER_BEGIN |SPI_XFER_END ); +for (int i = bout; i < (bin + bout); i++) + ((u8 *)(din))[bin + bout - i -1 ] = buffin[i]; + }else { +return -1 ; + }
Do the reverse :
if (!bus)
return -1;
dm_spi...
Quoted 11 lines
drivers/net/w5500.c new file +11
-0+ } + +return 0 ; +} + +static int w5500_eth_write_hwaddr (struct udevice *dev) +{ +struct eth_pdata *pdata =dev_get_plat (dev); +struct eth_w5500_priv *priv =dev_get_priv (dev); +u8 eth[6 ]; +u8 mode;
drivers/net/w5500.c line 490
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+ +if (memcmp (priv->host_hwaddr, pdata->enetaddr,ARP_HLEN ) !=0 ) { +memcpy (priv->host_hwaddr, pdata->enetaddr,ARP_HLEN ); +w5500_writebulk (dev,W5100_SHAR , priv->host_hwaddr,ARP_HLEN ); + } + +w5500_readbulk (dev,W5100_SHAR , eth,6 ); + + mode =0x84 ; +w5500_spi_write (dev,W5100_S0_MR (priv), mode);
w5500_spi_write(dev, W5100_S0_MR(priv), 0x84);
and drop mode
Quoted 13 lines
drivers/net/w5500.c new file +13
-0+w5500_command (dev,S0_CR_OPEN ); +w5500_enable_intr (dev); + +return 0 ; +} + +static const struct eth_ops w5500_eth_ops = { + .start = w5500_eth_start, + .send = w5500_eth_send, + .recv = w5500_eth_recv, + .free_pkt = w5500_eth_free_pkt, + .stop = w5500_eth_stop, + .write_hwaddr = w5500_eth_write_hwaddr,
drivers/net/w5500.c line 513
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+}; + +int w5500_eth_of_to_plat (struct udevice *dev) +{ +struct eth_pdata *pdata =dev_get_plat (dev); +struct eth_w5500_priv *priv =dev_get_priv (dev); +u8 mac[8 ]; +ofnode remote; +const void *ptr; +int size;
int size = 0;
Reorder variables, from longest to shortest
drivers/net/w5500.c line 526
Quoted 13 lines
drivers/net/w5500.c new file +13
-0+ + size =0 ; + ptr =ofnode_read_prop (remote,"local-mac-address" , &size); +if (size ==6 ) { + mac[0 ] = ((u8 *)ptr)[0 ]; + mac[1 ] = ((u8 *)ptr)[1 ]; + mac[2 ] = ((u8 *)ptr)[2 ]; + mac[3 ] = ((u8 *)ptr)[4 ]; + mac[4 ] = ((u8 *)ptr)[5 ]; + mac[5 ] = ((u8 *)ptr)[5 ]; + }else { +return -1 ; + }
Do the reverse :
if (size != 6)
return -1;
mac[0] =...
Quoted 5 lines
drivers/net/w5500.c new file +5
-0+ +memcpy (pdata->enetaddr, (void *)mac,ARP_HLEN ); + + priv->disabled = false; +
drivers/net/w5500.c line 541
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+return 0 ; +} + +static void w5500_socket_intr_mask (struct udevice *dev,u8 mask) +{ +u32 imr; + + imr =W5500_SIMR ; + +w5500_spi_write (dev, imr, mask);
w5500_spi_write(dev, W5500_SIMR, mask);
& drop imr
Quoted 8 lines
drivers/net/w5500.c new file +8
-0+} + +static void w5500_disable_intr (struct udevice *dev) +{ +w5500_socket_intr_mask (dev,0 ); +} + +static void w5500_enable_intr (struct udevice *dev)
drivers/net/w5500.c line 559
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+{ +w5500_socket_intr_mask (dev,IR_S0 ); +} + +int w5500_eth_probe (struct udevice *dev) +{ +struct eth_w5500_priv *priv =dev_get_priv (dev); +int i; +u16 rtr; +u8 cmd[3 ];
Reorder variables, from longest to shortest
Quoted 5 lines
drivers/net/w5500.c new file +5
-0+ +if (device_get_uclass_id (dev->parent) !=UCLASS_SPI ) { +debug ("Error device not attached to a SPI controlled\n" ); +return -ENODEV ; + }
drivers/net/w5500.c line 574
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+ + cmd[0 ] =0x00 ; + cmd[1 ] =0x19 ; + cmd[2 ] =0 ; + +w5500_spi_write (dev,W5100_MR ,MR_RST ); +w5500_spi_write (dev,W5100_MR ,MR_PB ); + + rtr =W5500_RTR ; +if (w5500_spi_read16 (dev, rtr) !=RTR_DEFAULT ) {
if (w5500_spi_read16(dev, W5500_RTR) != RTR_DEFAULT) {
and drop rtr
Quoted 34 lines
drivers/net/w5500.c new file +34
-0+debug ("RTR issue in probe .... %x\n" , +w5500_spi_read16 (dev, rtr)); +return -ENODEV ; + } + +w5500_disable_intr (dev); + +/* Configure internal RX memory as 16K RX buffer and +* internal TX memory as 16K TX buffer +*/ + +w5500_spi_write (dev,W5500_Sn_RXMEM_SIZE (0 ),0x10 ); +w5500_spi_write (dev,W5500_Sn_TXMEM_SIZE (0 ),0x10 ); + +for (i =1 ; i <8 ; i++) { +w5500_spi_write (dev,W5500_Sn_RXMEM_SIZE (i),0 ); +w5500_spi_write (dev,W5500_Sn_TXMEM_SIZE (i),0 ); + } + + priv->s0_regs =W5500_S0_REGS ; + priv->s0_tx_buf =W5500_TX_MEM_START ; + priv->s0_tx_buf_size =W5500_TX_MEM_SIZE ; + priv->s0_rx_buf =W5500_RX_MEM_START ; + priv->s0_rx_buf_size =W5500_RX_MEM_SIZE ; + priv->offset =0 ; + +return 0 ; +} + +static const struct udevice_id w5500_eth_ids[] = { + {.compatible ="wiznet,w5500" }, + { } +}; +
drivers/net/w5500.c line 618
Quoted 10 lines
drivers/net/w5500.c new file +10
-0+U_BOOT_DRIVER (eth_w5500) = { + .name ="eth_w5500" , + .id =UCLASS_ETH , + .of_match = w5500_eth_ids, + .of_to_plat = w5500_eth_of_to_plat, + .probe = w5500_eth_probe, + .ops = &w5500_eth_ops, + .priv_auto =sizeof (struct eth_w5500_priv ), + .plat_auto =sizeof (struct eth_pdata ), +};
Thanks,
Neil