FreeBSD source tree https://cgit-dev.freebsd.org/src-test2/atom?h=release%2F7.2.0_cvs 2009-05-01T02:51:58Z 2009-05-01T02:51:58Z Ken Smith kensmith@FreeBSD.org 2009-05-01T02:51:58Z urn:sha1:b205d83df7763ca1f099bce5ac12a05862a626c4 Approved by: re (implicit) This commit was manufactured to restore the state of the 7.2-RELEASE image. 2008-08-26T18:11:25Z Marius Strobl marius@FreeBSD.org 2008-08-26T18:11:25Z urn:sha1:1b711ca7f36d73000e81619763bb86d4c1f5f80f PHY only and not also in the case of an external PHY currently doing full duplex, which accidentally got broken in r172334. It's still not clear to me why we need to enable the buffer for an internal PHY though. - Count excess and late collisions as output errors. [1] - Count receive errors as input errors. [1] Obtained from: NetBSD [1] 2008-07-13T17:09:22Z Marius Strobl marius@FreeBSD.org 2008-07-13T17:09:22Z urn:sha1:c0d075cbebad83f8a946dbd4547f4d13954387d2 o The FreeBSD bus_dmamap_sync(9) supports ored together flags for quite some time now so collapse calls accordingly. o Given that gem_load_txmbuf() is allowed to fail resulting in a packet drop also for quite some time now implement the functionality of gem_txcksum() by means of m_pullup(9), which de-obfuscates the code and allows to always retrieve the correct length of the IP header. o Add missing BUS_DMASYNC_PREREAD when syncing the control DMA maps in gem_rint() and gem_start_locked(). o Correct some bus_barrier(9) calls to do a read/write barrier as we do a read after a write. Add some missing ones in gem_mii_readreg() and gem_mii_writereg(). o According to the Apple GMAC driver, the GEM ASIC specification and the OpenSolaris eri(7D) the TX FIFO threshold has to be set to 0x4ff for the Gigabit variants and 0x100 for the ERI in order do avoid TX underruns. o In gem_init_locked(): - be conservative and enable the RX and TX MACs, - don't clear GEM_LINK otherwise we don't ever mark the link as up again if gem_init_locked() is called from gem_watchdog(), - remove superfluous setting of sc_ifflags. o Don't bother to check whether the interface is running or whether its queue is empty before calling gem_start_locked() in gem_tint(), the former will check these anyway. o Call gem_start_locked() in gem_watchdog() in order to try to get some more packets going. o In gem_mii_writereg() after reseting the PCS restore its configuration. GMAC testing: grehan, marcel 2008-06-11T21:10:06Z Marius Strobl marius@FreeBSD.org 2008-06-11T21:10:06Z urn:sha1:1df8356ce4a964d6e73cc2afb6498760a791a456 - Fix some style bugs and remove another banal comment missed in rev. 1.46. - Move the KASSERT on gem_add_rxbuf() to the right spot and add an equivalent one to gem_disable_tx(). - Split the registers into two halves in preparation for SBus support. [1] Obtained from: NetBSD (loosely) [1] 2008-03-18T00:42:26Z Pyun YongHyeon yongari@FreeBSD.org 2008-03-18T00:42:26Z urn:sha1:743c5088cb092582852ab1cb473dca5751e0e1f9 - Retire npe_defrag(), gem_defrag(), msk_defrag(), nfe_defrag(), and re_defrag() and use m_collapse() instead. - Replace a reference to ath_defrag() in a comment in if_wpi.c with m_collapse(). 2008-03-17T20:52:10Z Marius Strobl marius@FreeBSD.org 2008-03-17T20:52:10Z urn:sha1:1bc737ccddef6d4be3a5d1cd421fdc7b3f76ac4f o In preparation for basing a new driver on this one: - ANSIfy - try to bring closer to style(9) - remove banal comments. o Add my copyright for having done lots of fixes and improvements. 2007-10-18T05:12:20Z Pyun YongHyeon yongari@FreeBSD.org 2007-10-18T05:12:20Z urn:sha1:3d805ce70ec8bb55cbfe5268ad768dcb3b1e9ab2 Fix a NULL pointer dereference in Tx checksum calculation. Approved by: re (kensmith) 2007-09-26T21:14:18Z Marius Strobl marius@FreeBSD.org 2007-09-26T21:14:18Z urn:sha1:1ed3fed743ab7aa6d690d731f716d962f16faec1 to gem_attach() as the former access softc members not yet initialized at that time and gem_reset() actually is enough to stop the chip. [1] o Revise the use of gem_bitwait(); add bus_barrier() calls before calling gem_bitwait() to ensure the respective bit has been written before we starting polling on it and poll for the right bits to change, f.e. even though we only reset RX we have to actually wait for both GEM_RESET_RX and GEM_RESET_TX to clear. Add some additional gem_bitwait() calls in places we've been missing them according to the GEM documentation. Along with this some excessive DELAYs, which probably only were added because of bugs in gem_bitwait() and its use in the first place, as well as as have of an gem_bitwait() reimplementation in gem_reset_tx() were removed. o Add gem_reset_rxdma() and use it to deal with GEM_MAC_RX_OVERFLOW errors more gracefully as unlike gem_init_locked() it resets the RX DMA engine only, causing no link loss and the FIFOs not to be cleared. Also use it deal with GEM_INTR_RX_TAG_ERR errors, with previously were unhandled. This was based on information obtained from the Linux GEM and OpenSolaris ERI drivers. o Turn on workarounds for silicon bugs in the Apple GMAC variants. This was based on information obtained from the Darwin GMAC and Linux GEM drivers. o Turn on "infinite" (i.e. maximum 31 * 64 bytes in length) DMA bursts. This greatly improves especially RX performance. o Optimize the RX path, this consists of: - kicking the receiver as soon as we've a spare descriptor in gem_rint() again instead of just once after all the ready ones have been handled; - kicking the receiver the right way, i.e. as outlined in the GEM documentation in batches of 4 and by pointing it to the descriptor after the last valid one; - calling gem_rint() before gem_tint() in gem_intr() as gem_tint() may take quite a while; - doubling the size of the RX ring to 256 descriptors. Overall the RX performance of a GEM in a 1GHz Sun Fire V210 was improved from ~100Mbit/s to ~850Mbit/s. o In gem_add_rxbuf() don't assign the newly allocated mbuf to rxs_mbuf before calling bus_dmamap_load_mbuf_sg(), if bus_dmamap_load_mbuf_sg() fails we'll free the newly allocated mbuf, unable to recycle the previous one but a NULL pointer dereference instead. o In gem_init_locked() honor the return value of gem_meminit(). o Simplify gem_ringsize() and dont' return garbage in the default case. Based on OpenBSD. o Don't turn on MAC control, MIF and PCS interrupts unless GEM_DEBUG is defined as we don't need/use these interrupts for operation. o In gem_start_locked() sync the DMA maps of the descriptor rings before every kick of the transmitter and not just once after enqueuing all packets as the NIC might instantly start transmitting after we kicked it the first time. o Keep state of the link state and use it to enable or disable the MAC in gem_mii_statchg() accordingly as well as to return early from gem_start_locked() in case the link is down. [3] o Initialize the maximum frame size to a sane value. o In gem_mii_statchg() enable carrier extension if appropriate. o Increment if_ierrors in case of an GEM_MAC_RX_OVERFLOW error and in gem_eint(). [3] o Handle IFF_ALLMULTI correctly; don't set it if we've turned promiscuous group mode on and don't clear the flag if we've disabled promiscuous group mode (these were mostly NOPs though). [2] o Let gem_eint() also report GEM_INTR_PERR errors. o Move setting sc_variant from gem_pci_probe() to gem_pci_attach() as device probe methods are not supposed to touch the softc. o Collapse sc_inited and sc_pci into bits for sc_flags. o Add CTASSERTs ensuring that GEM_NRXDESC and GEM_NTXDESC are set to legal values. o Correctly set up for 802.3x flow control, though #ifdef out the code that actually enables it as this needs more testing and mainly a proper framework to support it. o Correct and add some conversions from hard-coded functions names to __func__ which were borked or forgotten in if_gem.c rev. 1.42. o Use PCIR_BAR instead of a homegrown macro. o Replace sc_enaddr[6] with sc_enaddr[ETHER_ADDR_LEN]. o In gem_pci_attach() in case attaching fails release the resources in the opposite order they were allocated. o Make gem_reset() static to if_gem.c as it's not needed outside that module. o Remove the GEM_GIGABIT flag and the associated code; GEM_GIGABIT was never set and the associated code was in the wrong place. o Remove sc_mif_config; it was only used to cache the contents of the respective register within gem_attach(). o Remove the #ifdef'ed out NetBSD/OpenBSD code for establishing a suspend hook as it will never be used on FreeBSD. o Also probe Apple Intrepid 2 GMAC and Apple Shasta GMAC, add support for Apple K2 GMAC. Based on OpenBSD. o Add support for Sun GBE/P cards, or in other words actually add support for cards based on GEM to gem(4). This mainly consists of adding support for the TBI of these chips. Along with this the PHY selection code was rewritten to hardcode the PHY number for certain configurations as for example the PHY of the on-board ERI of Blade 1000 shows up twice causing no link as the second incarnation is isolated. These changes were ported from OpenBSD with some additional improvements and modulo some bugs. o Add code to if_gem_pci.c allowing to read the MAC-address from the VPD on systems without Open Firmware. This is an improved version of my variant of the respective code in if_hme_pci.c o Now that gem(4) is MI enable it for all archs. Pointed out by: yongari [1] Suggested by: rwatson [2], yongari [3] Tested on: i386 (GEM), powerpc (GMACs by marcel and yongari), sparc64 (ERI and GEM) Reviewed by: yongari Approved by: re (kensmith) 2007-06-16T23:27:59Z Marius Strobl marius@FreeBSD.org 2007-06-16T23:27:59Z urn:sha1:e87137e1337501e1858be85f3c4b9bdb8cdd9fa4 of the register rather than in the offset describing the register. - In gem_reset_rx() let gem_bitwait() check for the Rx reset bit rather than the Tx reset bit to clear. Obtained from: OpenBSD (same/similar bugs being fixed) 2007-06-04T06:01:04Z Pyun YongHyeon yongari@FreeBSD.org 2007-06-04T06:01:04Z urn:sha1:12fb0330d84956c67ec94d6f4800df6c85f62fd2 GEMs is unable to discriminate UDP from TCP packets such that it can generate 0x0000 checksum value for the UDP datagram. So the UDP checksum offload was disabled by default. You can enable it by setting link0 flag with ifconfig(8). o bus_dma(9) clean up. It now correctly set number of required DMA segments/size and removed incorrect use of BUS_DMA_ALLOCNOW flag in static allocations done via bus_dmamem_alloc(9). o Implemented ALTQ(9) support. o Implemented Tx side bus_dmamap_load_mbuf_sg(9) which can remove several book keeping chores orginated from call-back mechanism. Therefore gem_txdma_callback() was removed and its functionality was reimplemented in gem_load_txmbuf(). o Don't set GEM_TD_START_OF_PACKET flag until all remaining mbuf chains are set. I think it was a long standing bug and it caused fluctuating interrupts/CPU usage patterns while netperf test is in progress. Previously it seems that we race with the device. Because I don't have a documentation for GEM I'm not sure this is correct but almost all other documentations I have stated this implications on setting SOP mark in descriptor ring(e.g. hme(4)). o Borrowed gem_defrag() from ath(4) which is supposed to be much faster than m_defrag(9) since it's not need to defrag all mbuf chains. o gem_load_txmbuf() was changed to allow passed mbuf chains to free. Caller of gem_load_txmbuf() correctly handles freed mbuf chains. o In gem_start_locked(), added checks for availability of Tx descriptors before trying to load DMA maps which could save CPU cycles when number of available descriptors are low. Also, simplyfy IFF_DRV_OACTIVE detection logic. o Removed hard-coded function names in CTR macros and replaced it with __func__. o Moved statistics counter register access to gem_tick() to reduce number of PCI bus accesses. There is no reason to update statistics counters in interrupt handler. o Removed unnecessary call of gem_start_locked() in gem_ioctl(). Reviewed by: grehan (initial version), marius (with improvements and suggestions) Tested by: grehan (ppc), marius(sparc64)