src-test2/sys/dev/em, branch release/6.1.0_cvs

This commit was manufactured by cvs2svn to create tag

2006-05-06T19:24:14Z

'RELENG_6_1_0_RELEASE'. This commit was manufactured to restore the state of the 6.1-RELEASE image.

MFC 1.111:

2006-03-18T21:48:08Z

Set ifp->if_baudrate according to current speed. Approved by: re (mux)

MFC 1.107:

2006-02-16T12:45:12Z

Fix two important typos in watchdog handling: - Restart watchdog if we *did* processed any descriptors. [1] - Log the watchdog event if the link is *up*. [2] PR: kern/92948 [1] Submitted by: Mihail Balikov [1] PR: kern/92895 [2] Submitted by: Vladimir Ivanov [2] Approved by: re (kensmith)

MFC: PCIR_CARDBUSCIS -> PCIR_CIS

2006-01-29T21:14:28Z

- Restore VLAN_INPUT_TAG() macro to preserve API compatibility for

2006-01-13T19:21:45Z

third party drivers. - Fix bugs destribed in previous revision using macro with another name.

MFC:

2006-01-13T11:51:11Z

- Use VLAN_TAG_VALUE() not only to read a dot1q tag value from an m_tag, but also to set it. This reduces complex code duplication and improves its readability. - Fix VLAN_INPUT_TAG() macro, so that it doesn't touch mtag in case if memory allocation failed. - Remove fourth argument from VLAN_INPUT_TAG(), that was used incorrectly in almost all drivers. Indicate failure with mbuf value of NULL.

MFC 1.93 - 1.97, fixing suspend/resume on some laptops.

2006-01-10T10:09:03Z

PR: kern/89825

MFC 1.91:

2005-12-08T14:06:12Z

On the 82571 and newer chipset the ICR register is meaningful only if the E1000_ICR_INT_ASSERTED bit is set. Submitted by: Jack Vogel

Sync em(4) driver with HEAD, merging the following changes:

2005-11-25T14:11:59Z

revision 1.83 date: 2005/11/09 08:43:18; author: yongari; state: Exp; lines: +41 -38 Make em(4) work on big-endian architectures. - disable jumbo frame support on strict alignment architectures due to the limitation of hardware. The driver needs a fix-up code for RX side. The fix will show up in near future. - fix endian issue for 82544 on PCI-X bus. I couldn't test this as I don't have the NIC/hardware. - prefer PCIR_BAR to hardcoded EM_MMBA. - Properly checks for for 64bit BAR [1] - replace inl/outl with bus_space(9) [1] - fix endian issue on VLAN handling. - reorder header files and remove unnecessary one. Reviewed by: cognet No response from: pdeuskar, tackerman Obtained from: OpenBSD [1] revision 1.84 date: 2005/11/09 15:23:54; author: glebius; state: Exp; lines: +7 -3 - Introduce two more stat counters, counting number of RX overruns and number of watchdog timeouts. - Do not log(9) RX overrun events, since this pessimizes things under load [1]. - Do not increase if->if_oerrors in em_watchdog(), since this leads to counter slipping back, when if->if_oerrors is recalculated in em_update_stats_counters(). Instead increase watchdog counter in em_watchdog() and take it into account in em_update_stats_counters(). revision 1.86 date: 2005/11/11 16:04:51; author: ru; state: Exp; lines: +1 -1 - Store pointer to the link-level address right in "struct ifnet" rather than in ifindex_table[]; all (except one) accesses are through ifp anyway. IF_LLADDR() works faster, and all (except one) ifaddr_byindex() users were converted to use ifp->if_addr. - Stop storing a (pointer to) Ethernet address in "struct arpcom", and drop the IFP2ENADDR() macro; all users have been converted to use IF_LLADDR() instead. revisions 1.85, 1.87 - Introduce tunables em.hw.txd and em.hw.rxd, which allow administrator to configure number of transmit and receive descriptors. - Check em.hw.txd and em.hw.rxd against hardware limits [*] and require them to be multiple of 128. revision 1.88 date: 2005/11/21 04:17:43; author: yongari; state: Exp; lines: +121 -83 busdma cleanup for em(4). - don't force busdma to pre-allocate bounce pages for parent tag. - use system supplied roundup2 macro instead of rolling its own version. - TX/RX decriptor length should be multiple of 128. There is no no need to expand the size with the multiple of 4096. - don't create/destroy DMA maps in TX/RX handlers. Use pre-allocated DMA maps. Since creating DMA maps on sparc64 is time consuming operations(resource mananger overhead), this change should boost performance on sparc64. I could get > 2x speedup on Ultra60. - TX/RX descriptors could be aligned on 128 boundary. Aligning them on PAGE_SIZE is waste of resource. - don't blindly create TX DMA tag with size of MCLBYTES * 8. The size is only valid under jumbo frame environments. Instead of using the hardcoded value, re-compute necessary size on the fly. - RX side bus_dmamap_load_mbuf_sg(9) support. - remove unused macro EM_ROUNDUP and constant EM_MMBA. Reviewed by: scottl Tested by: glebius revision 1.89 date: 2005/11/24 01:44:48; author: glebius; state: Exp; lines: +131 -77 Merge in new driver version from Intel - 3.2.18. The most important change is support for adapters based on 82571 and 82572 chips. Tested on: 82547EI on i386 Tested on: 82540EM on sparc64 revision 1.90 date: 2005/11/24 15:13:47; author: cognet; state: Exp; lines: +3 -1 Remember the bus_dmamap_t where we loaded the mbuf, and sync this map instead of tx_buffer->map, or we could end up syncing the wrong map.

Merge if_em.c:1.82 from HEAD to RELENG_6:

2005-11-14T10:40:10Z

Put probe-time printf of adapter speed and duplex behind bootverbose: since the link takes a bit to negotiate, the information is pretty much never available during the probe. As such, the boot output pretty much always prints N/A for speed and duplex. Since we print out the output of ifconfig during the user space boot, this early boot information is also generally redundant, and added to the noise.