Skip to contentSkip to conversation

enable CONFIG_NET_MULTI for LAN91C96

PATCH New Nishanth Menon 6 participants 19 messages Oct 16, 2009 – Dec 14, 2009 Network drivers

lore
Share & tools
lore
#0 lore raw

cover enable CONFIG_NET_MULTI for LAN91C96

Based on the discussion[1] here is the patchset

Patchset is based on [2], and tested on SDP3430.
Other platforms would be prefered to be
build/tested/fixed as required

Nishanth Menon (3):
NET: LAN91C96 CONFIG_NET_MULTIify
TI OMAP3: SDP3430 FIX NET_MULTI Warning
LAN91C96: Enable NET_MULTI LAN driver

 board/apollon/apollon.c         |   12 +-
 board/ti/sdp3430/sdp.c          |   12 +-
 drivers/net/Makefile            |    2 +-
 drivers/net/lan91c96.c          |  452 ++++++++++++++++-----------------------
 drivers/net/lan91c96.h          |  110 +++++-----
 include/configs/B2.h            |    2 +-
 include/configs/apollon.h       |    3 +-
 include/configs/assabet.h       |    3 +-
 include/configs/gcplus.h        |    3 +-
 include/configs/lubbock.h       |    3 +-
 include/configs/omap1510inn.h   |    3 +-
 include/configs/omap1610h2.h    |    3 +-
 include/configs/omap1610inn.h   |    3 +-
 include/configs/omap2420h4.h    |    3 +-
 include/configs/omap3_sdp3430.h |    3 +-
 include/configs/omap5912osk.h   |    3 +-
 include/configs/omap730p2.h     |    3 +-
 include/configs/pleb2.h         |    6 +-
 include/netdev.h                |    1 +
 19 files changed, 277 insertions(+), 353 deletions(-)

Regards,
Nishanth Menon

Ref:
[1] http://www.nabble.com/-U-Boot--NET%3A-SDP3430%3A-trouble-with-shifting-from-LAN9C916-to-SMC91XX-driver-td25884700.html
[2] http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-ti.git

#1 lore raw

PATCH 1/3 NET: LAN91C96 CONFIG_NET_MULTIify

Make the lan91c96 driver capable of CONFIG_NET_MULTI to be clean for the new arch, add a a lil detect function Most of the formatting change was done to keep checkpatch silent, but a few functions and #if 0ed code which does not make sense for NET_MULTI have been removed

Now, use the lan91c96_initialize() function to init the driver

Cc Andrea Scian <[email protected]>
Cc Ben Warren <[email protected]>
Cc Dave Peverley <[email protected]>
Cc George G. Davis <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Nishant Kamat <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Rishi Bhattacharya <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 drivers/net/Makefile   |    2 +-
 drivers/net/lan91c96.c |  452 +++++++++++++++++++----------------------------
 drivers/net/lan91c96.h |  110 ++++++-------
 include/netdev.h       |    1 +
 4 files changed, 236 insertions(+), 329 deletions(-)
drivers/net/Makefile +1 -1
index be5c484..a4ab447 100644
@@ -44,7 +44,7 @@ COBJS-$(CONFIG_GRETH) += greth.o
 COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o
 COBJS-$(CONFIG_KIRKWOOD_EGIGA) += kirkwood_egiga.o
 COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o
-COBJS-$(CONFIG_DRIVER_LAN91C96) += lan91c96.o
+COBJS-$(CONFIG_LAN91C96) += lan91c96.o
 COBJS-$(CONFIG_MACB) += macb.o
 COBJS-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
 COBJS-$(CONFIG_MPC5xxx_FEC) += mpc5xxx_fec.o
drivers/net/lan91c96.c +183 -269

812 lines not on this page · raw message

drivers/net/lan91c96.h +51 -59

196 lines not on this page · raw message

include/netdev.h +1 -0
index a50ec67..9baccd4 100644
@@ -57,6 +57,7 @@ int greth_initialize(bd_t *bis);
 void gt6426x_eth_initialize(bd_t *bis);
 int inca_switch_initialize(bd_t *bis);
 int kirkwood_egiga_initialize(bd_t *bis);
+int lan91c96_initialize(u8 dev_num, int base_addr);
 int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
 int mcdmafec_initialize(bd_t *bis);
 int mcffec_initialize(bd_t *bis);
Signature · 1 line
1.6.3.3
#2 lore raw

PATCH 2/3 TI OMAP3: SDP3430 FIX NET_MULTI Warning

Enable the NET MULTI option and remove build warning

Tested: SDP3430

Cc Ben Warren <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 board/ti/sdp3430/sdp.c          |   12 +++++++-----
 include/configs/omap3_sdp3430.h |    3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)
board/ti/sdp3430/sdp.c +7 -5
index 40cf26f..0d8e20d 100644
@@ -22,6 +22,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
+#include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
 #include <asm/arch/mux.h>
@@ -125,12 +126,13 @@ int board_init(void)
 #define ETH_CONTROL_REG		(CONFIG_LAN91C96_BASE + 0x30b)
 
 /**
- * @brief ether_init Take the Ethernet controller out of reset and wait
+ * @brief board_eth_init Take the Ethernet controller out of reset and wait
  * for the EEPROM load to complete.
  */
-static void ether_init(void)
+int board_eth_init(bd_t *bis)
 {
-#ifdef CONFIG_DRIVER_LAN91C96
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
 	int cnt = 20;
 
 	writew(0x0, LAN_RESET_REGISTER);
@@ -155,10 +157,11 @@ static void ether_init(void)
 
 	writeb(readb(ETH_CONTROL_REG) & ~0x1, ETH_CONTROL_REG);
 	udelay(1000);
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
 reset_err_out:
-	return;
 
 #endif
+	return rc;
 }
 
 /**
@@ -187,7 +190,6 @@ int misc_init_r(void)
 	 *   VSIM  - off (init, variable) for MMC1.DAT[3..7], SIM
 	 *   VPLL2 - 1.8V
 	 */
-	ether_init();
 
 	return 0;
 }
include/configs/omap3_sdp3430.h +2 -1
index 229dc5e..7401671 100644
@@ -200,7 +200,8 @@
  */
 #if defined(CONFIG_CMD_NET)
 
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE	DEBUG_BASE
 #define CONFIG_LAN91C96_EXT_PHY
 
Signature · 1 line
1.6.3.3
#3 lore raw

PATCH 3/3 LAN91C96: Enable NET_MULTI LAN driver

This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing

Cc Andrea Scian <[email protected]>
Cc Ben Warren <[email protected]>
Cc Dave Peverley <[email protected]>
Cc George G. Davis <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Nishant Kamat <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Rishi Bhattacharya <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 board/apollon/apollon.c       |   12 +++++++-----
 include/configs/B2.h          |    2 +-
 include/configs/apollon.h     |    3 ++-
 include/configs/assabet.h     |    3 ++-
 include/configs/gcplus.h      |    3 ++-
 include/configs/lubbock.h     |    3 ++-
 include/configs/omap1510inn.h |    3 ++-
 include/configs/omap1610h2.h  |    3 ++-
 include/configs/omap1610inn.h |    3 ++-
 include/configs/omap2420h4.h  |    3 ++-
 include/configs/omap5912osk.h |    3 ++-
 include/configs/omap730p2.h   |    3 ++-
 include/configs/pleb2.h       |    6 ++++--
 13 files changed, 32 insertions(+), 18 deletions(-)
board/apollon/apollon.c +7 -5
index 8964eba..b93e880 100644
@@ -24,6 +24,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
+#include <netdev.h>
 #include <asm/arch/omap2420.h>
 #include <asm/io.h>
 #include <asm/arch/bits.h>
@@ -138,13 +139,14 @@ void wait_for_command_complete(unsigned int wd_base)
 }
 
 /*******************************************************************
- * Routine:ether_init
+ * Routine:board_eth_init
  * Description: take the Ethernet controller out of reset and wait
  *		   for the EEPROM load to complete.
  ******************************************************************/
-void ether_init(void)
+int board_eth_init(bd_t *bis)
 {
-#ifdef CONFIG_DRIVER_LAN91C96
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
 	int cnt = 20;
 
 	__raw_writeb(0x03, OMAP2420_CTRL_BASE + 0x0f2);	/*protect->gpio74 */
@@ -171,10 +173,10 @@ void ether_init(void)
 
 	mask_config_reg(ETH_CONTROL_REG, 0x01);
 	udelay(1000);
-
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
 eth_reset_err_out:
-	return;
 #endif
+	return rc;
 }
 
 /**********************************************
include/configs/B2.h +1 -1
index e5439f3..d7806e9 100644
@@ -58,7 +58,7 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE		0x04000300 /* base address         */
 #define CONFIG_SMC_USE_32_BIT
 #undef  CONFIG_SHOW_ACTIVITY
include/configs/apollon.h +2 -1
index 575f60e..be0dc04 100644
@@ -87,7 +87,8 @@
 /*
  * SMC91c96 Etherent
  */
-#define	CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define	CONFIG_LAN91C96
 #define	CONFIG_LAN91C96_BASE	(APOLLON_CS1_BASE+0x300)
 #define	CONFIG_LAN91C96_EXT_PHY
 
include/configs/assabet.h +2 -1
index 8c5b84c..d17d4bd 100644
@@ -53,7 +53,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96	/* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96	/* we have an SMC9194 on-board */
 #define CONFIG_LAN91C96_BASE	0x18000000
 
 /*
include/configs/gcplus.h +2 -1
index 85db4f5..41294b9 100644
@@ -66,7 +66,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96	/* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96	/* we have an SMC9194 on-board */
 #define CONFIG_LAN91C96_BASE	0x100e0000
 
 /*
include/configs/lubbock.h +2 -1
index 43913ca..0a69210 100644
@@ -58,7 +58,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x0C000000
 
 /*
include/configs/omap1510inn.h +2 -1
index 8408209..b0ebafd 100644
@@ -60,7 +60,8 @@
 #define CONFIG_SMC9196_BASE 0x08000300
 #define CONFIG_SMC9196_EXT_PHY
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x08000300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap1610h2.h +2 -1
index 42e0198..0bbb5b3 100644
@@ -57,7 +57,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap1610inn.h +2 -1
index 22c873e..832dd42 100644
@@ -58,7 +58,8 @@
  */
 /*
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap2420h4.h +2 -1
index 9c18842..6ab4438 100644
@@ -81,7 +81,8 @@
 /*
  * SMC91c96 Etherent
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE     (H4_CS1_BASE+0x300)
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap5912osk.h +2 -1
index d0ce9dc..bc660e3 100644
@@ -61,7 +61,8 @@
  */
 /*
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04800300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap730p2.h +2 -1
index 32a9b23..a6a8a02 100644
@@ -65,7 +65,8 @@
  * Hardware drivers
  */
 
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE	   0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/pleb2.h +4 -2
index 635ef71..9e69411 100644
@@ -56,8 +56,10 @@
  */
 
 /* None - PLEB 2 doesn't have any of this.
-   #define CONFIG_DRIVER_LAN91C96
-   #define CONFIG_LAN91C96_BASE 0x0C000000 */
+	#define CONFIG_NET_MULTI
+	#define CONFIG_LAN91C96
+	#define CONFIG_LAN91C96_BASE 0x0C000000
+ */
 
 /*
  * select serial console configuration
Signature · 1 line
1.6.3.3
#4 lore raw

PATCH 3/3 LAN91C96: Enable NET_MULTI LAN driver

Quoted 3 lines · Nishanth Menon

This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing

On the testing front..
Regression testing on MAKEALL shows

#warning Ethernet driver .. error killing for assabet, gcplus, lubbock, omap1510inn, omap1610h2, omap2420h4, omap3_sdp3430, omap5912osk and omap730p2

There is a regression on B2.

et/libnet.a(net.o): In function `NetSendPacket':
u-boot-ti/net/net.c:623: undefined reference to `eth_send'
net/libnet.a(net.o): In function `NetReceive':
u-boot-ti/net/net.c:1433: undefined reference to `eth_send'

Likely because you missed adding
#define CONFIG_NET_MULTI
to the config file.

apollon, does not configure. Not your fault
but testing on it is going to be hard ;)
Here is the error :

System not configured - see README
make: *** [all] Error 1

No new additions to apollon should be made until the base cause of the apollon failure is fixed.

So
1. Fix B2.
2. Remove apollon changes
3. Wait for runtime testing.

I am not in favor of including this patch in the 2009.11 as we will likely apply the patch after waiting a reasonable amount of time on the runtime testing. Which is not the same as knowing we aren't breaking the old boards.

Tom

Quoted 240 lines
Cc Andrea Scian <[email protected]>
Cc Ben Warren <[email protected]>
Cc Dave Peverley <[email protected]>
Cc George G. Davis <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Nishant Kamat <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Rishi Bhattacharya <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 board/apollon/apollon.c       |   12 +++++++-----
 include/configs/B2.h          |    2 +-
 include/configs/apollon.h     |    3 ++-
 include/configs/assabet.h     |    3 ++-
 include/configs/gcplus.h      |    3 ++-
 include/configs/lubbock.h     |    3 ++-
 include/configs/omap1510inn.h |    3 ++-
 include/configs/omap1610h2.h  |    3 ++-
 include/configs/omap1610inn.h |    3 ++-
 include/configs/omap2420h4.h  |    3 ++-
 include/configs/omap5912osk.h |    3 ++-
 include/configs/omap730p2.h   |    3 ++-
 include/configs/pleb2.h       |    6 ++++--
 13 files changed, 32 insertions(+), 18 deletions(-)
board/apollon/apollon.c +7 -5
index 8964eba..b93e880 100644
@@ -24,6 +24,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
+#include <netdev.h>
 #include <asm/arch/omap2420.h>
 #include <asm/io.h>
 #include <asm/arch/bits.h>
@@ -138,13 +139,14 @@ void wait_for_command_complete(unsigned int wd_base)
 }
 
 /*******************************************************************
- * Routine:ether_init
+ * Routine:board_eth_init
  * Description: take the Ethernet controller out of reset and wait
  *		   for the EEPROM load to complete.
  ******************************************************************/
-void ether_init(void)
+int board_eth_init(bd_t *bis)
 {
-#ifdef CONFIG_DRIVER_LAN91C96
+	int rc = 0;
+#ifdef CONFIG_LAN91C96
 	int cnt = 20;
 
 	__raw_writeb(0x03, OMAP2420_CTRL_BASE + 0x0f2);	/*protect->gpio74 */
@@ -171,10 +173,10 @@ void ether_init(void)
 
 	mask_config_reg(ETH_CONTROL_REG, 0x01);
 	udelay(1000);
-
+	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
 eth_reset_err_out:
-	return;
 #endif
+	return rc;
 }
 
 /**********************************************
include/configs/B2.h +1 -1
index e5439f3..d7806e9 100644
@@ -58,7 +58,7 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE		0x04000300 /* base address         */
 #define CONFIG_SMC_USE_32_BIT
 #undef  CONFIG_SHOW_ACTIVITY
include/configs/apollon.h +2 -1
index 575f60e..be0dc04 100644
@@ -87,7 +87,8 @@
 /*
  * SMC91c96 Etherent
  */
-#define	CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define	CONFIG_LAN91C96
 #define	CONFIG_LAN91C96_BASE	(APOLLON_CS1_BASE+0x300)
 #define	CONFIG_LAN91C96_EXT_PHY
 
include/configs/assabet.h +2 -1
index 8c5b84c..d17d4bd 100644
@@ -53,7 +53,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96	/* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96	/* we have an SMC9194 on-board */
 #define CONFIG_LAN91C96_BASE	0x18000000
 
 /*
include/configs/gcplus.h +2 -1
index 85db4f5..41294b9 100644
@@ -66,7 +66,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96	/* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96	/* we have an SMC9194 on-board */
 #define CONFIG_LAN91C96_BASE	0x100e0000
 
 /*
include/configs/lubbock.h +2 -1
index 43913ca..0a69210 100644
@@ -58,7 +58,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x0C000000
 
 /*
include/configs/omap1510inn.h +2 -1
index 8408209..b0ebafd 100644
@@ -60,7 +60,8 @@
 #define CONFIG_SMC9196_BASE 0x08000300
 #define CONFIG_SMC9196_EXT_PHY
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x08000300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap1610h2.h +2 -1
index 42e0198..0bbb5b3 100644
@@ -57,7 +57,8 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap1610inn.h +2 -1
index 22c873e..832dd42 100644
@@ -58,7 +58,8 @@
  */
 /*
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap2420h4.h +2 -1
index 9c18842..6ab4438 100644
@@ -81,7 +81,8 @@
 /*
  * SMC91c96 Etherent
  */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE     (H4_CS1_BASE+0x300)
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap5912osk.h +2 -1
index d0ce9dc..bc660e3 100644
@@ -61,7 +61,8 @@
  */
 /*
 */
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04800300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/omap730p2.h +2 -1
index 32a9b23..a6a8a02 100644
@@ -65,7 +65,8 @@
  * Hardware drivers
  */
 
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE	   0x04000300
 #define CONFIG_LAN91C96_EXT_PHY
 
include/configs/pleb2.h +4 -2
index 635ef71..9e69411 100644
@@ -56,8 +56,10 @@
  */
 
 /* None - PLEB 2 doesn't have any of this.
-   #define CONFIG_DRIVER_LAN91C96
-   #define CONFIG_LAN91C96_BASE 0x0C000000 */
+	#define CONFIG_NET_MULTI
+	#define CONFIG_LAN91C96
+	#define CONFIG_LAN91C96_BASE 0x0C000000
+ */
 
 /*
  * select serial console configuration
#5 lore raw

PATCH 3/3 LAN91C96: Enable NET_MULTI LAN driver

Tom,

Quoted 16 lines · Tom
Quoted 4 lines · Nishanth Menon

This modification is NOT tested on any of the
platforms modified as I dont have them. please
help by testing+building+fixing

On the testing front..
Regression testing on MAKEALL shows

#warning Ethernet driver .. error killing for assabet, gcplus, lubbock, omap1510inn, omap1610h2, omap2420h4, omap3_sdp3430, omap5912osk and omap730p2

There is a regression on B2.

Quoted 8 lines

<snip>

I am not in favor of including this patch in the 2009.11 as we will likely apply the patch after waiting a reasonable amount of time on the runtime testing. Which is not the same as knowing we aren't breaking the old boards.

This is in no way a candidate for 2009.11. As I mentioned in my initial

review, it will soon be queued up in net/next, which will be merged to main/next soon.

regards,
Ben

#6 lore raw

PATCH 3/3 LAN91C96: Enable NET_MULTI LAN driver

In reply to Nishanth Menon

Nishanth,

Quoted 14 lines · Nishanth Menon

This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing

Cc Andrea Scian <[email protected]>
Cc Ben Warren <[email protected]>
Cc Dave Peverley <[email protected]>
Cc George G. Davis <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Nishant Kamat <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Rishi Bhattacharya <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Quoted 16 lines
---
 board/apollon/apollon.c       |   12 +++++++-----
 include/configs/B2.h          |    2 +-
 include/configs/apollon.h     |    3 ++-
 include/configs/assabet.h     |    3 ++-
 include/configs/gcplus.h      |    3 ++-
 include/configs/lubbock.h     |    3 ++-
 include/configs/omap1510inn.h |    3 ++-
 include/configs/omap1610h2.h  |    3 ++-
 include/configs/omap1610inn.h |    3 ++-
 include/configs/omap2420h4.h  |    3 ++-
 include/configs/omap5912osk.h |    3 ++-
 include/configs/omap730p2.h   |    3 ++-
 include/configs/pleb2.h       |    6 ++++--
 13 files changed, 32 insertions(+), 18 deletions(-)

I expect that all of these boards are now broken, since you haven't provided board_eth_init() functions for them.

Applying to net/next anyway to make it easy to get everything working.

thanks,
Ben

#7 lore raw

PATCH 3/3 LAN91C96: Enable NET_MULTI LAN driver

In reply to Nishanth Menon

Nishanth,

Quoted 14 lines · Nishanth Menon

This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing

Cc Andrea Scian <[email protected]>
Cc Ben Warren <[email protected]>
Cc Dave Peverley <[email protected]>
Cc George G. Davis <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Nishant Kamat <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Rishi Bhattacharya <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Quoted 16 lines
---
 board/apollon/apollon.c       |   12 +++++++-----
 include/configs/B2.h          |    2 +-
 include/configs/apollon.h     |    3 ++-
 include/configs/assabet.h     |    3 ++-
 include/configs/gcplus.h      |    3 ++-
 include/configs/lubbock.h     |    3 ++-
 include/configs/omap1510inn.h |    3 ++-
 include/configs/omap1610h2.h  |    3 ++-
 include/configs/omap1610inn.h |    3 ++-
 include/configs/omap2420h4.h  |    3 ++-
 include/configs/omap5912osk.h |    3 ++-
 include/configs/omap730p2.h   |    3 ++-
 include/configs/pleb2.h       |    6 ++++--
 13 files changed, 32 insertions(+), 18 deletions(-)

You've update the config files for a bunch of boards, but have not added board_eth_init() functions for them. Am I missing something? If this is indeed the case, I can't push these patches upstream from the net tree because the associated boards will break.

regards,
Ben

#8 lore raw

PATCH 3/3 LAN91C96: Enable NET_MULTI LAN driver

Ben Warren had written, on 12/07/2009 03:09 PM, the following:

Quoted 33 lines

Nishanth,

Quoted 14 lines · Nishanth Menon

This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing

Cc Andrea Scian <[email protected]>
Cc Ben Warren <[email protected]>
Cc Dave Peverley <[email protected]>
Cc George G. Davis <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Nishant Kamat <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Rishi Bhattacharya <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Quoted 16 lines
---
 board/apollon/apollon.c       |   12 +++++++-----
 include/configs/B2.h          |    2 +-
 include/configs/apollon.h     |    3 ++-
 include/configs/assabet.h     |    3 ++-
 include/configs/gcplus.h      |    3 ++-
 include/configs/lubbock.h     |    3 ++-
 include/configs/omap1510inn.h |    3 ++-
 include/configs/omap1610h2.h  |    3 ++-
 include/configs/omap1610inn.h |    3 ++-
 include/configs/omap2420h4.h  |    3 ++-
 include/configs/omap5912osk.h |    3 ++-
 include/configs/omap730p2.h   |    3 ++-
 include/configs/pleb2.h       |    6 ++++--
 13 files changed, 32 insertions(+), 18 deletions(-)
Quoted 4 lines

You've update the config files for a bunch of boards, but have not added board_eth_init() functions for them. Am I missing something? If this is indeed the case, I can't push these patches upstream from the net tree because the associated boards will break.

I have added the init where they have been previously used for the old lan91c96 driver. I think the only one which was actively using it was apollon, which means the rest of the platforms probably dont use the old lan driver properly in the first place. I have maintained status quo there instead of introducing a change which may break them.

Signature · 2 lines
Regards,
Nishanth Menon
#9 lore raw

PATCH 3/3 LAN91C96: Enable NET_MULTI LAN driver

<recipient list trimmed>

Nishanth,

Quoted 38 lines · Nishanth Menon

Ben Warren had written, on 12/07/2009 03:09 PM, the following:

Quoted 33 lines

Nishanth,

Quoted 14 lines · Nishanth Menon

This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing

Cc Andrea Scian <[email protected]>
Cc Ben Warren <[email protected]>
Cc Dave Peverley <[email protected]>
Cc George G. Davis <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Nishant Kamat <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Rishi Bhattacharya <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Quoted 16 lines
---
 board/apollon/apollon.c       |   12 +++++++-----
 include/configs/B2.h          |    2 +-
 include/configs/apollon.h     |    3 ++-
 include/configs/assabet.h     |    3 ++-
 include/configs/gcplus.h      |    3 ++-
 include/configs/lubbock.h     |    3 ++-
 include/configs/omap1510inn.h |    3 ++-
 include/configs/omap1610h2.h  |    3 ++-
 include/configs/omap1610inn.h |    3 ++-
 include/configs/omap2420h4.h  |    3 ++-
 include/configs/omap5912osk.h |    3 ++-
 include/configs/omap730p2.h   |    3 ++-
 include/configs/pleb2.h       |    6 ++++--
 13 files changed, 32 insertions(+), 18 deletions(-)
Quoted 4 lines

You've update the config files for a bunch of boards, but have not added board_eth_init() functions for them. Am I missing something? If this is indeed the case, I can't push these patches upstream from the net tree because the associated boards will break.

Quoted 6 lines

I have added the init where they have been previously used for the old lan91c96 driver. I think the only one which was actively using it was apollon, which means the rest of the platforms probably dont use the old lan driver properly in the first place. I have maintained status quo there instead of introducing a change which may break them.

I understand where you're coming from, but having the CONFIG option in the board's header file indicates that this board probably has a LAN chip. Without board_eth_init() support, the CONFIG option is pointless. I'd prefer to add full support, then if the user doesn't want it they can #undef in the header.

If you don't have time to do this, I can take care of it.

regards,
Ben

#10 lore raw

PATCH 2/3 TI OMAP3: SDP3430 FIX NET_MULTI Warning

In reply to Nishanth Menon
Quoted 3 lines · Nishanth Menon

Enable the NET MULTI option and remove build warning

Tested: SDP3430

Great! Thanks!

I'll keep my fingers crossed that it will work on the other boards, too, and will get an ack.

Best regards

Dirk

Applied
#11 lore raw

PATCH 2/3 TI OMAP3: SDP3430 FIX NET_MULTI Warning

In reply to Nishanth Menon

Nishanth,

Quoted 4 lines · Nishanth Menon

Enable the NET MULTI option and remove build warning

Tested: SDP3430

Quoted 8 lines
Cc Ben Warren <[email protected]>
Cc Sandeep Paulraj <[email protected]>
---
 board/ti/sdp3430/sdp.c          |   12 +++++++-----
 include/configs/omap3_sdp3430.h |    3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

Applied to net/next

thanks,
Ben

Applied
#12 lore raw

PATCH 1/3 NET: LAN91C96 CONFIG_NET_MULTIify

In reply to Nishanth Menon

Nishanth,

Quoted 18 lines · Nishanth Menon

Make the lan91c96 driver capable of CONFIG_NET_MULTI to be clean for the new arch, add a a lil detect function Most of the formatting change was done to keep checkpatch silent, but a few functions and #if 0ed code which does not make sense for NET_MULTI have been removed

Now, use the lan91c96_initialize() function to init the driver

Cc Andrea Scian <[email protected]>
Cc Ben Warren <[email protected]>
Cc Dave Peverley <[email protected]>
Cc George G. Davis <[email protected]>
Cc Kyungmin Park <[email protected]>
Cc Nishant Kamat <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Rishi Bhattacharya <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Quoted 7 lines
---
 drivers/net/Makefile   |    2 +-
 drivers/net/lan91c96.c |  452 +++++++++++++++++++----------------------------
 drivers/net/lan91c96.h |  110 ++++++-------
 include/netdev.h       |    1 +
 4 files changed, 236 insertions(+), 329 deletions(-)

applied to net/next

thanks,
Ben

#13 lore raw

PATCH 1/3 NET: LAN91C96 CONFIG_NET_MULTIify

In reply to Nishanth Menon

Dear Nishanth Menon,

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

Make the lan91c96 driver capable of CONFIG_NET_MULTI to be clean for the new arch, add a a lil detect function

--------------^^^^^^^^^^^^^^^^------^^^^^^^

"for the new arch" is not really helpful for the commit message - for example, I don't know what you are referring to here. Also, your keyboard seems to have got stuck at the "add a a lil" part.

Can you please update the commit message?

Eventually Ben accepts just the new commit message and edits it when applying the patch?

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
A memorandum is written not to inform the reader, but to protect  the
writer.                                               -- Dean Acheson
#14 lore raw

PATCH 1/3 NET: LAN91C96 CONFIG_NET_MULTIify

Wolfgang Denk said the following on 11/22/2009 05:01 PM:

Quoted 7 lines

Dear Nishanth Menon,

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

Make the lan91c96 driver capable of CONFIG_NET_MULTI to be clean for the new arch, add a a lil detect function

Quoted 8 lines

--------------^^^^^^^^^^^^^^^^------^^^^^^^

"for the new arch" is not really helpful for the commit message - for example, I don't know what you are referring to here. Also, your keyboard seems to have got stuck at the "add a a lil" part.

Can you please update the commit message?

ok.. here it goes:

Make the lan91c96 driver capable of CONFIG_NET_MULTI to be clean for the new network driver architecture, add a little detect function

Quoted 4 lines

Eventually Ben accepts just the new commit message and edits it when applying the patch?

let me know if you want me to post again.

Quoted 5 lines

Best regards,

Wolfgang Denk

#15 lore raw

cover enable CONFIG_NET_MULTI for LAN91C96

In reply to Nishanth Menon

Hi Nishanth,

Quoted 12 lines · Nishanth Menon

Based on the discussion[1] here is the patchset

Patchset is based on [2], and tested on SDP3430.
Other platforms would be prefered to be
build/tested/fixed as required

Nishanth Menon (3):
NET: LAN91C96 CONFIG_NET_MULTIify
TI OMAP3: SDP3430 FIX NET_MULTI Warning
LAN91C96: Enable NET_MULTI LAN driver

On first pass review, this looks great! There are a few things I'd like to do to improve the driver, but it has nothing to do with converting to NET_MULTI.

I'm going to fire up a net-next branch this weekend and will try to apply it there.

regards,
Ben

#16 lore raw

cover enable CONFIG_NET_MULTI for LAN91C96

Quoted 16 lines

-----Original Message-----
From: Ben Warren [mailto:biggerbadderben at gmail.com]
Sent: Friday, October 16, 2009 11:30 AM

Quoted 12 lines · Nishanth Menon

Based on the discussion[1] here is the patchset

Patchset is based on [2], and tested on SDP3430.
Other platforms would be prefered to be
build/tested/fixed as required

Nishanth Menon (3):
NET: LAN91C96 CONFIG_NET_MULTIify
TI OMAP3: SDP3430 FIX NET_MULTI Warning
LAN91C96: Enable NET_MULTI LAN driver

Quoted 6 lines

On first pass review, this looks great! There are a few things I'd like to do to improve the driver, but it has nothing to do with converting to NET_MULTI.

I'm going to fire up a net-next branch this weekend and will try to apply it there.

Gee thanks..

Having very less knowledge on lan91c96 itself, I can help be the guinea pig for testing on SDP3430 at least :)

Regards,
Nishanth Menon

#17 lore raw

cover enable CONFIG_NET_MULTI for LAN91C96

In reply to Ben Warren
Quoted 16 lines

From: Ben Warren [mailto:biggerbadderben at gmail.com]
Sent: Friday, October 16, 2009 11:30 AM

Quoted 12 lines · Nishanth Menon

Based on the discussion[1] here is the patchset

Patchset is based on [2], and tested on SDP3430.
Other platforms would be prefered to be
build/tested/fixed as required

Nishanth Menon (3):
NET: LAN91C96 CONFIG_NET_MULTIify
TI OMAP3: SDP3430 FIX NET_MULTI Warning
LAN91C96: Enable NET_MULTI LAN driver

Quoted 6 lines

On first pass review, this looks great! There are a few things I'd like to do to improve the driver, but it has nothing to do with converting to NET_MULTI.

I'm going to fire up a net-next branch this weekend and will try to apply it there.

Did this get into the net-next branch? [1] did not seem to have it.

Regards,
Nishanth Menon
Ref:
[1] http://git.denx.de/?p=u-boot/u-boot-net.git;a=shortlog;h=refs/heads/next

#18 lore raw

cover enable CONFIG_NET_MULTI for LAN91C96

Quoted 18 lines · Nishanth
Quoted 18 lines

From: Ben Warren [mailto:biggerbadderben at gmail.com]
Sent: Friday, October 16, 2009 11:30 AM

Quoted 13 lines · Nishanth Menon

Based on the discussion[1] here is the patchset

Patchset is based on [2], and tested on SDP3430.
Other platforms would be prefered to be
build/tested/fixed as required

Nishanth Menon (3):
NET: LAN91C96 CONFIG_NET_MULTIify
TI OMAP3: SDP3430 FIX NET_MULTI Warning
LAN91C96: Enable NET_MULTI LAN driver

Quoted 10 lines
Quoted 7 lines

On first pass review, this looks great! There are a few things I'd like to do to improve the driver, but it has nothing to do with converting to NET_MULTI.

I'm going to fire up a net-next branch this weekend and will try to apply it there.

Did this get into the net-next branch? [1] did not seem to have it.

Unfortunately, for me 'this weekend' quite often leaves 'this' open to interpretation. Bill Clinton would be proud.

Soon...

regards,
Ben