PATCH 2.4.4.ac8: Tulip net driver fixes
Attached is a patch against 2.4.4-ac8 which includes several fixes to the Tulip driver. This should fix the reported PNIC problems, as well as problems with forcing media on MII phys and several other bugs.
After a bit more testing this will go to Alan, and get posted on the Tulip driver web page (http://sourceforge.net/projects/tulip/), and go to Linus when he returns. (Actually, Alan already has part of this patch)
Signature · 3 lines
Jeff Garzik | Game called on account of naked chick Building 1024 | MandrakeSoft |
drivers/net/tulip/ChangeLog renamed from spare/tmp/linux_2_4/drivers/net/tulip/ChangeLog +53 -7
@@ -1,3 +1,49 @@ +2001-05-12 Jeff Garzik <[email protected]> + + * tulip_core (tulip_init_one): Do not call + unregister_netdev in error cleanup. Remnant of old + usage of init_etherdev. + +2001-05-12 Jeff Garzik <[email protected]> + + * media.c (tulip_find_mii): Simple write the updated BMCR + twice, as it seems the best thing to do for both broken and + sane chips. + If the mii_advert value, as read from MII_ADVERTISE, is zero, + then generate a value we should advertise from the capability + bits in BMSR. + Fill in tp->advertising for all cases. + Just to be safe, clear all unwanted bits. + +2001-05-12 Jeff Garzik <[email protected]> + + * tulip_core.c (private_ioctl): Fill in tp->advertising + when advertising value is changed by the user. + +2001-05-12 Jeff Garzik <[email protected]> + + * tulip_core.c: Mark Comet chips as needed the updated MWI + csr0 configuration. + +2001-05-12 Jeff Garzik <[email protected]> + + * media.c, tulip_core.c: Move MII scan into + from inlined inside tulip_init_one to new function + tulip_find_mii in media.c. + +2001-05-12 Jeff Garzik <[email protected]> + + * media.c (tulip_check_duplex): + Only restart Rx/Tx engines if they are active + (and csr6 changes) + +2001-05-12 Jeff Garzik <[email protected]> + + * tulip_core.c (tulip_mwi_config): + Clamp values read from PCI cache line size register to + values acceptable to tulip chip. Done for safety and + -almost- certainly unneeded. + 2001-05-11 Jeff Garzik <[email protected]> * tulip_core.c (tulip_init_one):
@@ -93,15 +139,15 @@ 2001-05-09 Jeff Garzik <[email protected]> - * 21142.c (t21142_lnk_change): Pass arg startup==1 - to tulip_select_media, in order to force csr13 to be - zeroed out prior to going to full duplex mode. Fixes - autonegotiation on a quad-port Znyx card. - (from Stephen Dengler) + * 21142.c (t21142_lnk_change): Pass arg startup==1 + to tulip_select_media, in order to force csr13 to be + zeroed out prior to going to full duplex mode. Fixes + autonegotiation on a quad-port Znyx card. + (from Stephen Dengler) 2001-05-09 Russell King <[email protected]> - * interrupt.c: Better PCI bus error reporting. + * interrupt.c: Better PCI bus error reporting. 2001-04-03 Jeff Garzik <[email protected]>
@@ -134,7 +180,7 @@ the following defines existed. These defines were never used by normal users in practice: TULIP_FULL_DUPLEX, TULIP_DEFAULT_MEDIA, and TULIP_NO_MEDIA_SWITCH. - + * tulip.h, eeprom.c: Move EE_* constants from tulip.h to eeprom.c. * tulip.h, media.c: Move MDIO_* constants from tulip.h to media.c.
drivers/net/tulip/media.c renamed from spare/tmp/linux_2_4/drivers/net/tulip/media.c +114 -1
137 lines not on this page · raw message
drivers/net/tulip/tulip.h renamed from spare/tmp/linux_2_4/drivers/net/tulip/tulip.h +1 -0
@@ -404,6 +404,7 @@void tulip_mdio_write (struct net_device *dev,int phy_id,int location,int value);void tulip_select_media (struct net_device *dev,int startup);int tulip_check_duplex (struct net_device *dev); +void tulip_find_mii (struct net_device *dev,int board_idx);/* pnic.c */ void pnic_do_nway (struct net_device *dev);
drivers/net/tulip/tulip_core.c renamed from spare/tmp/linux_2_4/drivers/net/tulip/tulip_core.c +25 -68
142 lines not on this page · raw message
Quoted 4 lines · Jeff Garzik
Attached is a patch against 2.4.4-ac8 which includes several fixes to the Tulip driver. This should fix the reported PNIC problems, as well as problems with forcing media on MII phys and several other bugs.
Your patch doesn't apply to 2.4.4-ac8 cleanly:
patching file drivers/net/tulip/ChangeLog
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 104 (offset -35 lines).
1 out of 3 hunks FAILED -- saving rejects to filedrivers/net/tulip/ChangeLog.rej
patching file drivers/net/tulip/media.c
Hunk #2 succeeded at 409 (offset -2 lines).
Hunk #3 succeeded at 444 (offset 2 lines).
Hunk #4 succeeded at 455 (offset -2 lines).
patching file drivers/net/tulip/tulip.h
Hunk #1 succeeded at 382 (offset -22 lines).
patching file drivers/net/tulip/tulip_core.c
Hunk #1 FAILED at 24.
Hunk #2 succeeded at 160 (offset -2 lines).
Hunk #4 succeeded at 885 (offset -2 lines).
Hunk #5 FAILED at 1169.
Hunk #6 succeeded at 1432 (offset -82 lines).
Hunk #7 FAILED at 1442.
Hunk #8 succeeded at 1612 (offset -22 lines).
3 out of 8 hunks FAILED -- saving rejects to filedrivers/net/tulip/tulip_core.c.rej
I tried 2.4.4-ac9. It has the same problem. The kernel IP config still doesn't work. But the user space DHCP works fine.
H.J.
Quoted 6 lines · H . J . Lu
Quoted 3 lines · Jeff Garzik
Attached is a patch against 2.4.4-ac8 which includes several fixes to the Tulip driver. This should fix the reported PNIC problems, as well as problems with forcing media on MII phys and several other bugs.
Your patch doesn't apply to 2.4.4-ac8 cleanly:
No, I noticed that too. But the 1.1.6 from
http://sourceforge.net/projects/tulip/ works fine here.
Signature · 4 lines
Mads Martin Joergensen, http://mmj.dk
"Why make things difficult, when it is possible to make them cryptic and
totally illogic, with just a little bit more effort."
-- A. P. J.PATCH 2.4.4.ac9: Tulip net driver fixes
In reply to Jeff GarzikQuoted 11 lines · Mads Martin Jørgensen
Quoted 6 lines · H . J . Lu
Quoted 3 lines · Jeff Garzik
Attached is a patch against 2.4.4-ac8 which includes several fixes to the Tulip driver. This should fix the reported PNIC problems, as well as problems with forcing media on MII phys and several other bugs.
Your patch doesn't apply to 2.4.4-ac8 cleanly:
No, I noticed that too. But the 1.1.6 from
http://sourceforge.net/projects/tulip/ works fine here.
Attached is a patch against 2.4.4-ac9 which includes the changes found
in tulip-devel 1.1.6... (tulip-devel is sort of a misnomer; right now
it's really just a staging and testing point for fixes which go straight into the tulip-stable series)
I just checked against ac9 and it applies cleanly here.
Note after I re-test with a bunch of net cards, tulip-devel 1.1.7 should be out today or tomorrow.
Signature · 3 lines
Jeff Garzik | Game called on account of naked chick Building 1024 | MandrakeSoft |
drivers/net/tulip/ChangeLog +53 -7
@@ -1,3 +1,49 @@ +2001-05-12 Jeff Garzik <[email protected]> + + * tulip_core (tulip_init_one): Do not call + unregister_netdev in error cleanup. Remnant of old + usage of init_etherdev. + +2001-05-12 Jeff Garzik <[email protected]> + + * media.c (tulip_find_mii): Simple write the updated BMCR + twice, as it seems the best thing to do for both broken and + sane chips. + If the mii_advert value, as read from MII_ADVERTISE, is zero, + then generate a value we should advertise from the capability + bits in BMSR. + Fill in tp->advertising for all cases. + Just to be safe, clear all unwanted bits. + +2001-05-12 Jeff Garzik <[email protected]> + + * tulip_core.c (private_ioctl): Fill in tp->advertising + when advertising value is changed by the user. + +2001-05-12 Jeff Garzik <[email protected]> + + * tulip_core.c: Mark Comet chips as needed the updated MWI + csr0 configuration. + +2001-05-12 Jeff Garzik <[email protected]> + + * media.c, tulip_core.c: Move MII scan into + from inlined inside tulip_init_one to new function + tulip_find_mii in media.c. + +2001-05-12 Jeff Garzik <[email protected]> + + * media.c (tulip_check_duplex): + Only restart Rx/Tx engines if they are active + (and csr6 changes) + +2001-05-12 Jeff Garzik <[email protected]> + + * tulip_core.c (tulip_mwi_config): + Clamp values read from PCI cache line size register to + values acceptable to tulip chip. Done for safety and + -almost- certainly unneeded. + 2001-05-11 Jeff Garzik <[email protected]> * tulip_core.c (tulip_init_one):
@@ -93,15 +139,15 @@ 2001-05-09 Jeff Garzik <[email protected]> - * 21142.c (t21142_lnk_change): Pass arg startup==1 - to tulip_select_media, in order to force csr13 to be - zeroed out prior to going to full duplex mode. Fixes - autonegotiation on a quad-port Znyx card. - (from Stephen Dengler) + * 21142.c (t21142_lnk_change): Pass arg startup==1 + to tulip_select_media, in order to force csr13 to be + zeroed out prior to going to full duplex mode. Fixes + autonegotiation on a quad-port Znyx card. + (from Stephen Dengler) 2001-05-09 Russell King <[email protected]> - * interrupt.c: Better PCI bus error reporting. + * interrupt.c: Better PCI bus error reporting. 2001-04-03 Jeff Garzik <[email protected]>
@@ -134,7 +180,7 @@ the following defines existed. These defines were never used by normal users in practice: TULIP_FULL_DUPLEX, TULIP_DEFAULT_MEDIA, and TULIP_NO_MEDIA_SWITCH. - + * tulip.h, eeprom.c: Move EE_* constants from tulip.h to eeprom.c. * tulip.h, media.c: Move MDIO_* constants from tulip.h to media.c.
drivers/net/tulip/media.c +114 -1
137 lines not on this page · raw message
drivers/net/tulip/tulip.h +1 -0
@@ -404,6 +417,7 @@void tulip_mdio_write (struct net_device *dev,int phy_id,int location,int value);void tulip_select_media (struct net_device *dev,int startup);int tulip_check_duplex (struct net_device *dev); +void tulip_find_mii (struct net_device *dev,int board_idx);/* pnic.c */ void pnic_do_nway (struct net_device *dev);
drivers/net/tulip/tulip_core.c +24 -66
127 lines not on this page · raw message
Re: PATCH 2.4.4.ac9: Tulip net driver fixes
In reply to Jeff GarzikQuoted 10 lines · Jeff Garzik
Quoted 9 lines · Mads Martin Jørgensen
Quoted 6 lines · H . J . Lu
Quoted 3 lines · Jeff Garzik
Attached is a patch against 2.4.4-ac8 which includes several fixes to the Tulip driver. This should fix the reported PNIC problems, as well as problems with forcing media on MII phys and several other bugs.
Your patch doesn't apply to 2.4.4-ac8 cleanly:
Quoted 8 lines
Quoted 2 lines
No, I noticed that too. But the 1.1.6 from
http://sourceforge.net/projects/tulip/ works fine here.Attached is a patch against 2.4.4-ac9 which includes the changes found
in tulip-devel 1.1.6... (tulip-devel is sort of a misnomer; right now
it's really just a staging and testing point for fixes which go straight into the tulip-stable series)
THANKS. It works!
BTW, I cannot select both CONFIG_IP_PNP_DHCP and CONFIG_IP_PNP_BOOTP. BOOTP doesn' work even if I pass "ip=bootp" to kernel. I will take a look.
H.J.
Re: PATCH 2.4.4.ac9: Tulip net driver fixes
In reply to Jeff GarzikQuoted 8 lines · Jeff Garzik
Mads Martin Jørgensen wrote:
Attached is a patch against 2.4.4-ac9 which includes the changes found
in tulip-devel 1.1.6... (tulip-devel is sort of a misnomer; right now
it's really just a staging and testing point for fixes which go straight into the tulip-stable series)I just checked against ac9 and it applies cleanly here.
Still the same issue here : On a quad port card, if only 1 port is up, all is fine. This can be eth0, eth1, eth2 or eth3, it doesn't matter.
As soon as more than 1 port is up, the machine freeze. no oops, not event CTRL-Scrollback, nothing.
As the use I made of the 4 port eth is bridging, you can imagine the freeze appears very shortly after boot ;-)
Anyway. using the de4x5 driver for now.
Yann.
Signature · 4 lines
\|/ ____ \|/ Fac. des sciences de Nantes-Linux-Python-IPv6-ATM-BONOM.... "@'/ ,. \@" Tel :(+33) [0]251125865(AM)[0]251125857(PM)[0]251125868(Fax) /_| \__/ |_\ [email protected] \__U_/ http://www.unantes.univ-nantes.fr/~dupont
Re: PATCH 2.4.4.ac9: Tulip net driver fixes
In reply to Jeff GarzikQuoted 8 lines · Jeff Garzik
Mads Martin Jørgensen wrote:
Attached is a patch against 2.4.4-ac9 which includes the changes found
in tulip-devel 1.1.6... (tulip-devel is sort of a misnomer; right now
it's really just a staging and testing point for fixes which go straight into the tulip-stable series)I just checked against ac9 and it applies cleanly here.
Still the same issue here : On a quad port card, if only 1 port is up, all is fine. This can be eth0, eth1, eth2 or eth3, it doesn't matter.
As soon as more than 1 port is up, the machine freeze. no oops, not event CTRL-Scrollback, nothing.
As the use I made of the 4 port eth is bridging, you can imagine the freeze appears very shortly after boot ;-)
Anyway. using the de4x5 driver for now.
Yann.
Signature · 4 lines
\|/ ____ \|/ Fac. des sciences de Nantes-Linux-Python-IPv6-ATM-BONOM.... "@'/ ,. \@" Tel :(+33) [0]251125865(AM)[0]251125857(PM)[0]251125868(Fax) /_| \__/ |_\ [email protected] \__U_/ http://www.unantes.univ-nantes.fr/~dupont