Fix from Rahul Karnik and Donald Becker - some new 3c566B mini-PCI NICs
refuse to power up the transceiver unless we tickle an undocumented bit
in an undocumented register. They worked this out by before-and-after
diffing of the register contents when it was set up by the Windows
driver.
3c59x.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
--- 2.5.24/drivers/net/3c59x.c~3c59x Thu Jul 4 16:17:06 2002
+++ 2.5.24-akpm/drivers/net/3c59x.c Thu Jul 4 16:17:06 2002
@@ -174,6 +174,10 @@
- Add `global_options' as default for options[]. Ditto global_enable_wol,
global_full_duplex.
+ LK1.1.18 01Jul02 akpm
+ - Fix for undocumented transceiver power-up bit on some 3c566B's
+ (Donald Becker, Rahul Karnik)
+
- See http://www.zip.com.au/~akpm/linux/#3c59x-2.3 for more details.
- Also see Documentation/networking/vortex.txt
*/
@@ -189,8 +193,8 @@
#define DRV_NAME "3c59x"
-#define DRV_VERSION "LK1.1.17"
-#define DRV_RELDATE "18 Dec 2001"
+#define DRV_VERSION "LK1.1.18"
+#define DRV_RELDATE "1 Jul 2002"
@@ -414,7 +418,7 @@ enum { IS_VORTEX=1, IS_BOOMERANG=2, IS_C
EEPROM_8BIT=0x10, /* AKPM: Uses 0x230 as the base bitmaps for EEPROM reads */
HAS_PWR_CTRL=0x20, HAS_MII=0x40, HAS_NWAY=0x80, HAS_CB_FNS=0x100,
INVERT_MII_PWR=0x200, INVERT_LED_PWR=0x400, MAX_COLLISION_RESET=0x800,
- EEPROM_OFFSET=0x1000, HAS_HWCKSM=0x2000 };
+ EEPROM_OFFSET=0x1000, HAS_HWCKSM=0x2000, WNO_XCVR_PWR=0x4000 };
enum vortex_chips {
CH_3C590 = 0,
@@ -522,7 +526,7 @@ static struct vortex_chip_info {
HAS_HWCKSM, 128, },
{"3c556B Laptop Hurricane",
PCI_USES_IO|PCI_USES_MASTER, IS_TORNADO|HAS_NWAY|EEPROM_OFFSET|HAS_CB_FNS|INVERT_MII_PWR|
- HAS_HWCKSM, 128, },
+ WNO_XCVR_PWR|HAS_HWCKSM, 128, },
{"3c575 [Megahertz] 10/100 LAN CardBus",
PCI_USES_IO|PCI_USES_MASTER, IS_BOOMERANG|HAS_MII|EEPROM_8BIT, 128, },
@@ -1222,6 +1226,10 @@ static int __devinit vortex_probe1(struc
if (vp->drv_flags & INVERT_MII_PWR)
n |= 0x4000;
outw(n, ioaddr + Wn2_ResetOptions);
+ if (vp->drv_flags & WNO_XCVR_PWR) {
+ EL3WINDOW(0);
+ outw(0x0800, ioaddr);
+ }
}
/* Extract our information from the EEPROM data. */
-
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Jul 07 2002 - 22:00:13 EST