diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2005-07-30 07:11:43 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-30 18:21:00 -0400 |
commit | 188f23ba94a618b12cc205306f02b4f5036c4fa7 (patch) | |
tree | 6797141c149c05c09d8997c859a675c8bd555eb4 | |
parent | 92aab3c08eca4770228715d26c8234cca4fae9af (diff) |
[PATCH] sis190: merge some register related information from SiS driver.
Merge some register related information from SiS driver.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r-- | drivers/net/sis190.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index ff4f24e5f59c..e67a5753882e 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -98,27 +98,36 @@ | |||
98 | enum sis190_registers { | 98 | enum sis190_registers { |
99 | TxControl = 0x00, | 99 | TxControl = 0x00, |
100 | TxDescStartAddr = 0x04, | 100 | TxDescStartAddr = 0x04, |
101 | TxNextDescAddr = 0x0c, // unused | 101 | rsv0 = 0x08, // reserved |
102 | TxSts = 0x0c, // unused (Control/Status) | ||
102 | RxControl = 0x10, | 103 | RxControl = 0x10, |
103 | RxDescStartAddr = 0x14, | 104 | RxDescStartAddr = 0x14, |
104 | RxNextDescAddr = 0x1c, // unused | 105 | rsv1 = 0x18, // reserved |
106 | RxSts = 0x1c, // unused | ||
105 | IntrStatus = 0x20, | 107 | IntrStatus = 0x20, |
106 | IntrMask = 0x24, | 108 | IntrMask = 0x24, |
107 | IntrControl = 0x28, | 109 | IntrControl = 0x28, |
108 | IntrTimer = 0x2c, // unused | 110 | IntrTimer = 0x2c, // unused (Interupt Timer) |
109 | PMControl = 0x30, // unused | 111 | PMControl = 0x30, // unused (Power Mgmt Control/Status) |
112 | rsv2 = 0x34, // reserved | ||
110 | ROMControl = 0x38, | 113 | ROMControl = 0x38, |
111 | ROMInterface = 0x3c, | 114 | ROMInterface = 0x3c, |
112 | StationControl = 0x40, | 115 | StationControl = 0x40, |
113 | GMIIControl = 0x44, | 116 | GMIIControl = 0x44, |
117 | GIoCR = 0x48, // unused (GMAC IO Compensation) | ||
118 | GIoCtrl = 0x4c, // unused (GMAC IO Control) | ||
114 | TxMacControl = 0x50, | 119 | TxMacControl = 0x50, |
120 | TxLimit = 0x54, // unused (Tx MAC Timer/TryLimit) | ||
121 | RGDelay = 0x58, // unused (RGMII Tx Internal Delay) | ||
122 | rsv3 = 0x5c, // reserved | ||
115 | RxMacControl = 0x60, | 123 | RxMacControl = 0x60, |
116 | RxMacAddr = 0x62, | 124 | RxMacAddr = 0x62, |
117 | RxHashTable = 0x68, | 125 | RxHashTable = 0x68, |
118 | // Undocumented = 0x6c, | 126 | // Undocumented = 0x6c, |
119 | RxWakeOnLan = 0x70, | 127 | RxWolCtrl = 0x70, |
120 | // Undocumented = 0x74, | 128 | RxWolData = 0x74, // unused (Rx WOL Data Access) |
121 | RxMPSControl = 0x78, // unused | 129 | RxMPSControl = 0x78, // unused (Rx MPS Control) |
130 | rsv4 = 0x7c, // reserved | ||
122 | }; | 131 | }; |
123 | 132 | ||
124 | enum sis190_register_content { | 133 | enum sis190_register_content { |
@@ -783,8 +792,8 @@ static void sis190_hw_start(struct net_device *dev) | |||
783 | SIS_W16(RxMacControl, 0x02); | 792 | SIS_W16(RxMacControl, 0x02); |
784 | SIS_W32(RxHashTable, 0x0); | 793 | SIS_W32(RxHashTable, 0x0); |
785 | SIS_W32(0x6c, 0x0); | 794 | SIS_W32(0x6c, 0x0); |
786 | SIS_W32(RxWakeOnLan, 0x0); | 795 | SIS_W32(RxWolCtrl, 0x0); |
787 | SIS_W32(0x74, 0x0); | 796 | SIS_W32(RxWolData, 0x0); |
788 | 797 | ||
789 | SIS_PCI_COMMIT(); | 798 | SIS_PCI_COMMIT(); |
790 | 799 | ||
@@ -1205,6 +1214,10 @@ static void sis190_tx_timeout(struct net_device *dev) | |||
1205 | if (tmp8 & CmdTxEnb) | 1214 | if (tmp8 & CmdTxEnb) |
1206 | SIS_W8(TxControl, tmp8 & ~CmdTxEnb); | 1215 | SIS_W8(TxControl, tmp8 & ~CmdTxEnb); |
1207 | 1216 | ||
1217 | |||
1218 | net_tx_err(tp, KERN_INFO "%s: Transmit timeout, status %08x %08x.\n", | ||
1219 | dev->name, SIS_R32(TxControl), SIS_R32(TxSts)); | ||
1220 | |||
1208 | /* Disable interrupts by clearing the interrupt mask. */ | 1221 | /* Disable interrupts by clearing the interrupt mask. */ |
1209 | SIS_W32(IntrMask, 0x0000); | 1222 | SIS_W32(IntrMask, 0x0000); |
1210 | 1223 | ||