Skip to contentSkip to conversation

net: axi_ethernet: Add driver to u-boot

PATCH Superseded Michal Simek 2 participants 5 messages Sep 15, 2011 – Oct 7, 2011

Subsystems (2)
Network drivers Arm/Zynq architecture

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Michal Simek

author
#0 lore raw

PATCH v3 1/1 net: axi_ethernet: Add driver to u-boot

Add axi_ethernet driver for little-endian Microblaze.

RX/TX BDs and rxframe buffer are shared among all axi_ethernet MACs. Only one MAC can work in one time.

Signed-off-by Michal Simek <[email protected]>

---

v2: Fix cammelcase weirdness
Create mdio_wait function with timeouts Synchronize debug messages
Remove base address + offset notation -> use struct instead

v3: Fix comments
Add timeouts/delays to waiting loops
Use in/out_be32 for dma accesses
Setup return values for phy functions

---
 drivers/net/Makefile          |    1 +
 drivers/net/xilinx_axi_emac.c |  664 +++++++++++++++++++++++++++++++++++++++++
 include/netdev.h              |    2 +
 3 files changed, 667 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/xilinx_axi_emac.c
drivers/net/Makefile +1 -0
index 819b197..0489ffa 100644
@@ -83,6 +83,7 @@ COBJS-$(CONFIG_TSEC_ENET) += tsec.o fsl_mdio.o
 COBJS-$(CONFIG_TSI108_ETH) += tsi108_eth.o
 COBJS-$(CONFIG_ULI526X) += uli526x.o
 COBJS-$(CONFIG_VSC7385_ENET) += vsc7385.o
+COBJS-$(CONFIG_XILINX_AXIEMAC) += xilinx_axi_emac.o
 COBJS-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
 
 COBJS	:= $(sort $(COBJS-y))
drivers/net/xilinx_axi_emac.c new file +664 -0

664 lines not on this page · raw message

include/netdev.h +2 -0
index 8b71011..f9bbe65 100644
@@ -94,6 +94,8 @@ int smc911x_initialize(u8 dev_num, int base_addr);
 int tsi108_eth_initialize(bd_t *bis);
 int uec_standard_init(bd_t *bis);
 int uli526x_initialize(bd_t *bis);
+int xilinx_axiemac_initialize(bd_t *bis, unsigned long base_addr,
+							unsigned long dma_addr);
 int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
 							int txpp, int rxpp);
Signature · 1 line
1.5.5.6
author
#1 lore raw

PATCH v3 1/1 net: axi_ethernet: Add driver to u-boot

Quoted 18 lines · Michal Simek

Add axi_ethernet driver for little-endian Microblaze.

RX/TX BDs and rxframe buffer are shared among all axi_ethernet MACs. Only one MAC can work in one time.

Signed-off-by Michal Simek <[email protected]>

---

v2: Fix cammelcase weirdness
Create mdio_wait function with timeouts Synchronize debug messages
Remove base address + offset notation -> use struct instead

v3: Fix comments
Add timeouts/delays to waiting loops
Use in/out_be32 for dma accesses
Setup return values for phy functions

Quoted 6 lines
---
 drivers/net/Makefile          |    1 +
 drivers/net/xilinx_axi_emac.c |  664 +++++++++++++++++++++++++++++++++++++++++
 include/netdev.h              |    2 +
 3 files changed, 667 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/xilinx_axi_emac.c

Any comment?

Thanks,
Michal

Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
author
#2 lore raw

PATCH v3 1/1 net: axi_ethernet: Add driver to u-boot

In reply to Michal Simek
Quoted 18 lines · Michal Simek

Add axi_ethernet driver for little-endian Microblaze.

RX/TX BDs and rxframe buffer are shared among all axi_ethernet MACs. Only one MAC can work in one time.

Signed-off-by Michal Simek <[email protected]>

---

v2: Fix cammelcase weirdness
Create mdio_wait function with timeouts Synchronize debug messages
Remove base address + offset notation -> use struct instead

v3: Fix comments
Add timeouts/delays to waiting loops
Use in/out_be32 for dma accesses
Setup return values for phy functions

Quoted 6 lines
---
 drivers/net/Makefile          |    1 +
 drivers/net/xilinx_axi_emac.c |  664 +++++++++++++++++++++++++++++++++++++++++
 include/netdev.h              |    2 +
 3 files changed, 667 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/xilinx_axi_emac.c

Wolfgang: Can you please comment it or applied?

Thanks,
Michal

Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
#3 lore raw

PATCH v3 1/1 net: axi_ethernet: Add driver to u-boot

In reply to Michal Simek

Dear Michal Simek,

Quoted 18 lines · In message <[email protected]> you wrote:

Add axi_ethernet driver for little-endian Microblaze.

RX/TX BDs and rxframe buffer are shared among all axi_ethernet MACs. Only one MAC can work in one time.

Signed-off-by Michal Simek <[email protected]>

---

v2: Fix cammelcase weirdness
Create mdio_wait function with timeouts Synchronize debug messages
Remove base address + offset notation -> use struct instead

v3: Fix comments
Add timeouts/delays to waiting loops
Use in/out_be32 for dma accesses
Setup return values for phy functions

Quoted 6 lines
---
 drivers/net/Makefile          |    1 +
 drivers/net/xilinx_axi_emac.c |  664 +++++++++++++++++++++++++++++++++++++++++
 include/netdev.h              |    2 +
 3 files changed, 667 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/xilinx_axi_emac.c

This fails to apply:

Applying: net: axi_ethernet: Add driver to u-boot
fatal: sha1 information is lacking or useless (include/netdev.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001 net: axi_ethernet: Add driver to u-boot When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".

Please fix and resubmit.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
If a group of N persons implements a COBOL compiler,  there  will  be
N-1 passes. Someone in the group has to be the manager. - T. Cheatham
author
#4 lore raw

PATCH v3 1/1 net: axi_ethernet: Add driver to u-boot

Dear Wolfgang Denk,

Quoted 38 lines
Quoted 18 lines · In message <[email protected]> you wrote:

Add axi_ethernet driver for little-endian Microblaze.

RX/TX BDs and rxframe buffer are shared among all axi_ethernet MACs. Only one MAC can work in one time.

Signed-off-by Michal Simek <[email protected]>

---

v2: Fix cammelcase weirdness
Create mdio_wait function with timeouts Synchronize debug messages
Remove base address + offset notation -> use struct instead

v3: Fix comments
Add timeouts/delays to waiting loops
Use in/out_be32 for dma accesses
Setup return values for phy functions

Quoted 6 lines
---
 drivers/net/Makefile          |    1 +
 drivers/net/xilinx_axi_emac.c |  664 +++++++++++++++++++++++++++++++++++++++++
 include/netdev.h              |    2 +
 3 files changed, 667 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/xilinx_axi_emac.c

This fails to apply:

Applying: net: axi_ethernet: Add driver to u-boot
fatal: sha1 information is lacking or useless (include/netdev.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001 net: axi_ethernet: Add driver to u-boot When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".

Quoted 1 line

Please fix and resubmit.

Have resent v4.

Thanks,
Michal

Signature · 4 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian