Skip to content

Commit 4914a7d

Browse files
author
yy150190
committed
6480448 Sunvts netlbtest external loopback failed on 82546 chipset
6521984 Sunvts netlbtest failed on Northstar QGE cards 6531842 e1000g link goes down and up frequently on T2000 systems 6540535 Sunvts netlbtest internal loopback failed on ophir devices 6579605 Sunvts netlbtest internal loopback failed on Northstar fiber card 6595668 e1000g postinstall script missed 5 device ids which had been supported by shared code
1 parent 047ba61 commit 4914a7d

File tree

9 files changed

+713
-216
lines changed

9 files changed

+713
-216
lines changed

usr/src/pkgdefs/SUNWintgige/postinstall

+8
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ check_add_drv()
132132
"pci8086,1004"
133133
"pci8086,1008"
134134
"pci8086,1009"
135+
"pci8086,100c"
135136
"pci8086,100d"
136137
"pci8086,100e"
137138
"pci8086,100f"
@@ -168,6 +169,7 @@ check_add_drv()
168169
"pci8086,1075"
169170
"pci8086,1076"
170171
"pci8086,1077"
172+
"pci8086,1078"
171173
"pci8086,1079"
172174
"pci8086,107a"
173175
"pci8086,107b"
@@ -183,6 +185,7 @@ check_add_drv()
183185
"pci8086,1099"
184186
"pci8086,109a"
185187
"pci8086,10a4"
188+
"pci8086,10a5"
186189
"pci8086,10b5"
187190
"pci8086,10b9"
188191
"pci8086,10ba"
@@ -197,6 +200,8 @@ check_add_drv()
197200
"pci8086,10c4"
198201
"pci8086,10c5"
199202
"pci8086,10d5"
203+
"pci8086,10d9"
204+
"pci8086,10da"
200205
"pci8086,294c"
201206
"pciex8086,1049"
202207
"pciex8086,104a"
@@ -215,6 +220,7 @@ check_add_drv()
215220
"pciex8086,1098"
216221
"pciex8086,109a"
217222
"pciex8086,10a4"
223+
"pciex8086,10a5"
218224
"pciex8086,10b9"
219225
"pciex8086,10ba"
220226
"pciex8086,10bb"
@@ -228,5 +234,7 @@ check_add_drv()
228234
"pciex8086,10c4"
229235
"pciex8086,10c5"
230236
"pciex8086,10d5"
237+
"pciex8086,10d9"
238+
"pciex8086,10da"
231239
"pciex8086,294c"' \
232240
-m '* 0666 root root' e1000g

usr/src/uts/common/io/e1000g/README

+10
Original file line numberDiff line numberDiff line change
@@ -533,3 +533,13 @@ Notes on packaging:
533533
This version has the following fix:
534534
6594676 e1000g should free private dips while no rx buffers are held by upper layer
535535

536+
5.2.2
537+
======
538+
This version has the following fix:
539+
6480448 Sunvts netlbtest external loopback failed on 82546 chipset
540+
6521984 Sunvts netlbtest failed on Northstar QGE cards
541+
6531842 e1000g link goes down and up frequently on T2000 systems
542+
6540535 Sunvts netlbtest internal loopback failed on ophir devices
543+
6579605 Sunvts netlbtest internal loopback failed on Northstar fiber card
544+
6595668 e1000g postinstall script missed 5 device ids which had been supported by shared code
545+

usr/src/uts/common/io/e1000g/e1000_osdep.c

+30
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,33 @@ e1000_enable_pciex_master(struct e1000_hw *hw)
151151
ctrl &= ~E1000_CTRL_GIO_MASTER_DISABLE;
152152
E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
153153
}
154+
155+
/*
156+
* e1000g_get_driver_control - tell manageability firmware that the driver
157+
* has control.
158+
*/
159+
void
160+
e1000g_get_driver_control(struct e1000_hw *hw)
161+
{
162+
uint32_t ctrl_ext;
163+
uint32_t swsm;
164+
165+
/* tell manageability firmware the driver has taken over */
166+
switch (hw->mac.type) {
167+
case e1000_82573:
168+
swsm = E1000_READ_REG(hw, E1000_SWSM);
169+
E1000_WRITE_REG(hw, E1000_SWSM, swsm | E1000_SWSM_DRV_LOAD);
170+
break;
171+
case e1000_82571:
172+
case e1000_82572:
173+
case e1000_80003es2lan:
174+
case e1000_ich8lan:
175+
case e1000_ich9lan:
176+
ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
177+
E1000_WRITE_REG(hw, E1000_CTRL_EXT,
178+
ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);
179+
break;
180+
default:
181+
break;
182+
}
183+
}

0 commit comments

Comments
 (0)