commit b3cf257623fabd8f1ee6700a6d328cc1c5da5a1d tree 28b98f21dd108864d2edc11d179cb48c118b2cf8 parent 09075ef0fd585fb093bb9a6cd1240272114f89cf author Stephane Eranian Sun, 09 Jul 2006 21:12:39 -0400 committer Linus Torvalds Sun, 09 Jul 2006 18:47:12 -0700 [PATCH] i386: use thread_info flags for debug regs and IO bitmaps Use thread info flags to track use of debug registers and IO bitmaps. - add TIF_DEBUG to track when debug registers are active - add TIF_IO_BITMAP to track when I/O bitmap is used - modify __switch_to() to use the new TIF flags Performance tested on Pentium II, ten runs of LMbench context switch benchmark (smaller is better:) before after avg 3.65 3.39 min 3.55 3.33 Signed-off-by: Stephane Eranian Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit 09075ef0fd585fb093bb9a6cd1240272114f89cf tree c01d2cc260a18df73f785bea4de1c1cfbcbbd16f parent c87fed1546bd00b42ee75f26c6b45393e4bf7559 parent 1b30dd359ebec22d035e8b145751319f63772ca1 author Linus Torvalds Sun, 09 Jul 2006 15:50:41 -0700 committer Linus Torvalds Sun, 09 Jul 2006 15:50:41 -0700 Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD * HEAD: [AX.25]: Use kzalloc [ATM] net/atm/clip.c: fix PROC_FS=n compile [PKT_SCHED]: act_api: Fix module leak while flushing actions [NET]: Fix IPv4/DECnet routing rule dumping [NET] gso: Fix up GSO packets with broken checksums [NET] gso: Add skb_is_gso [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init() [ATM]: fix possible recursive locking in skb_migrate() [ATM]: Typo in drivers/atm/Kconfig... [TG3]: add amd8131 to "write reorder" chipsets [NET]: Fix network device interface printk message priority commit c87fed1546bd00b42ee75f26c6b45393e4bf7559 tree 2ef383dcd1cb569e1b0da9c26c7e868f114bfd7b parent 84e74f6b770efe7c9beb604118695aa311b969f5 parent 70f05366b71c51c35c25c0b76b4318fbc26c975a author Linus Torvalds Sun, 09 Jul 2006 15:50:06 -0700 committer Linus Torvalds Sun, 09 Jul 2006 15:50:06 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (23 commits) [PATCH] 8139too deadlock fix [netdrvr] 3c59x: snip changelog from source code e1000: increase version to 7.1.9-k2 e1000: add ich8lan device ID's e1000: allow user to disable ich8 lock loss workaround e1000: integrate ich8 support into driver e1000: add ich8lan core functions e1000: disable ERT e1000: check return value of _get_speed_and_duplex e1000: M88 PHY workaround e1000: fix adapter led blinking inconsistency e1000: disable CRC stripping workaround e1000: force register write flushes to circumvent broken platforms e1000: rework module param code with uninitialized values e1000: recycle skb e1000: change printk into DPRINTK e1000: add smart power down code e1000: small performance tweak by removing double code e1000: fix CONFIG_PM blocks e1000: Make PHY powerup/down a function ... commit 84e74f6b770efe7c9beb604118695aa311b969f5 tree a242b29d44b85e510481232b09b2371572570ff8 parent 953969ddf5b049361ed1e8471cc43dc4134d2a6f parent 1959d21232931dfa686769a21161413f10d6652f author Linus Torvalds Sun, 09 Jul 2006 15:49:36 -0700 committer Linus Torvalds Sun, 09 Jul 2006 15:49:36 -0700 Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block * 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] Only the first two bits in bio->bi_rw and rq->flags match [PATCH] blktrace: readahead support [PATCH] blktrace: fix barrier vs sync typo commit 1b30dd359ebec22d035e8b145751319f63772ca1 tree 1efbdc5573940817dac79672357e1c2fa1ed6a28 parent 24781734643ea2e9fd864f58000e47793e2dcb04 author Ralf Baechle Sun, 09 Jul 2006 12:14:22 -0700 committer David S. Miller Sun, 09 Jul 2006 12:14:22 -0700 [AX.25]: Use kzalloc Replace kzalloc instead of kmalloc + memset. Signed-off-by: Ralf Baechle Signed-off-by: David S. Miller commit 24781734643ea2e9fd864f58000e47793e2dcb04 tree 9da1bd808ed3a772620a4b2edd4ebad38eab97eb parent ebbaeab18b1c520054ea70e512ac0db7456ede01 author Adrian Bunk Sun, 09 Jul 2006 12:13:18 -0700 committer David S. Miller Sun, 09 Jul 2006 12:13:18 -0700 [ATM] net/atm/clip.c: fix PROC_FS=n compile This patch fixes the following compile error with CONFIG_PROC_FS=n by reverting commit dcdb02752ff13a64433c36f2937a58d93ae7a19e: <-- snip --> ... CC net/atm/clip.o net/atm/clip.c: In function ‘atm_clip_init’: net/atm/clip.c:975: error: ‘atm_proc_root’ undeclared (first use in this function) net/atm/clip.c:975: error: (Each undeclared identifier is reported only once net/atm/clip.c:975: error: for each function it appears in.) net/atm/clip.c:977: error: ‘arp_seq_fops’ undeclared (first use in this function) make[2]: *** [net/atm/clip.o] Error 1 <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit ebbaeab18b1c520054ea70e512ac0db7456ede01 tree ec988cfac2d90ff4467b61953dccba0f67ed9b48 parent 26e0fd1ce2418b10713b569a195bdb679233066b author Thomas Graf Sun, 09 Jul 2006 11:36:23 -0700 committer David S. Miller Sun, 09 Jul 2006 11:36:23 -0700 [PKT_SCHED]: act_api: Fix module leak while flushing actions Module reference needs to be given back if message header construction fails. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 953969ddf5b049361ed1e8471cc43dc4134d2a6f tree e4b84effa78a7e34d516142ee8ad1441906e33de parent b862f3b099f3ea672c7438c0b282ce8201d39dfc author Linus Torvalds Sun, 09 Jul 2006 08:47:46 -0700 committer Linus Torvalds Sun, 09 Jul 2006 08:47:46 -0700 Revert "ACPI: dock driver" This reverts commit a5e1b94008f2a96abf4a0c0371a55a56b320c13e. Adrian Bunk points out that it has build errors, and apparently no maintenance. Throw it out. Signed-off-by: Linus Torvalds commit b862f3b099f3ea672c7438c0b282ce8201d39dfc tree 62f8cc2dc2b1c9abb6364b16f3b218a04d121f3e parent e2a3d40258fe20d205f8ed592e1e2c0d5529c2e1 author Linus Torvalds Sat, 08 Jul 2006 15:24:18 -0700 committer Linus Torvalds Sat, 08 Jul 2006 15:24:18 -0700 i386: improve and correct inline asm memory constraints Use "+m" rather than a combination of "=m" and "m" for improved clarity and consistency. This also fixes some inlines that incorrectly didn't tell the compiler that they read the old value at all, potentially causing the compiler to generate bogus code. It appear that all of those potential bugs were hidden by the use of extra "volatile" specifiers on the data structures in question, though. Signed-off-by: Linus Torvalds commit e2a3d40258fe20d205f8ed592e1e2c0d5529c2e1 tree b8d778fb559c581e08bfc86831d16ee1cd43c841 parent a496e25dfb25493a57bcee5d66875d6ff80a9093 author Linus Torvalds Sat, 08 Jul 2006 15:00:28 -0700 committer Linus Torvalds Sat, 08 Jul 2006 15:00:28 -0700 power: improve inline asm memory constraints Use "+m" rather than a combination of "=m" and "m" for improved clarity and consistency. Signed-off-by: Linus Torvalds commit 26e0fd1ce2418b10713b569a195bdb679233066b tree afe1e76e4285fe79d291726d55a466f7bdc69305 parent a430a43d087545c96542ee64573237919109d370 author Patrick McHardy Sat, 08 Jul 2006 13:38:55 -0700 committer David S. Miller Sat, 08 Jul 2006 13:38:55 -0700 [NET]: Fix IPv4/DECnet routing rule dumping When more rules are present than fit in a single skb, the remaining rules are incorrectly skipped. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a430a43d087545c96542ee64573237919109d370 tree 653b630298505d5a65e2e094868d83014e4b0dc4 parent 89114afd435a486deb8583e89f490fc274444d18 author Herbert Xu Sat, 08 Jul 2006 13:34:56 -0700 committer David S. Miller Sat, 08 Jul 2006 13:34:56 -0700 [NET] gso: Fix up GSO packets with broken checksums Certain subsystems in the stack (e.g., netfilter) can break the partial checksum on GSO packets. Until they're fixed, this patch allows this to work by recomputing the partial checksums through the GSO mechanism. Once they've all been converted to update the partial checksum instead of clearing it, this workaround can be removed. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 89114afd435a486deb8583e89f490fc274444d18 tree 800e784ba59755f9f3c9926a6992e1d0f5b8eec7 parent 9c6c6795eda34e4dc38ecac912a16b6314082beb author Herbert Xu Sat, 08 Jul 2006 13:34:32 -0700 committer David S. Miller Sat, 08 Jul 2006 13:34:32 -0700 [NET] gso: Add skb_is_gso This patch adds the wrapper function skb_is_gso which can be used instead of directly testing skb_shinfo(skb)->gso_size. This makes things a little nicer and allows us to change the primary key for indicating whether an skb is GSO (if we ever want to do that). Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9c6c6795eda34e4dc38ecac912a16b6314082beb tree ed3dbc45df5794dc229bb2e439875b050ea80ab9 parent 1252ecf63f77ea147bd40f5462c7d9e3d3ae2815 author Adrian Bunk Sat, 08 Jul 2006 13:33:28 -0700 committer David S. Miller Sat, 08 Jul 2006 13:33:28 -0700 [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init() The Coverity checker spotted, that from the changes from commit 898b1d16f8230fb912a0c2248df685735c6ceda3 the if (ret) platform_driver_unregister(&ali_ircc_driver); was dead code. This patch changes this function to what seems to have been the intention. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 1252ecf63f77ea147bd40f5462c7d9e3d3ae2815 tree 15f6fd4d0672ae3c0dc371394aa92874fd619dfd parent 00181fc94648b4bb30d30ef95506055105316051 author Arjan van de Ven Sat, 08 Jul 2006 13:30:52 -0700 committer David S. Miller Sat, 08 Jul 2006 13:30:52 -0700 [ATM]: fix possible recursive locking in skb_migrate() ok this is a real potential deadlock in a way, it takes two locks of 2 skbuffs without doing any kind of lock ordering; I think the following patch should fix it. Just sort the lock taking order by address of the skb.. it's not pretty but it's the best this can do in a minimally invasive way. Signed-off-by: Arjan van de Ven Signed-off-by: Chas Williams Signed-off-by: David S. Miller commit 00181fc94648b4bb30d30ef95506055105316051 tree c7908f569323822bc939cfde6b59f54374135297 parent c165b0040502ef0d2b5751eef3cd96ea8210ae4c author Matt LaPlante Sat, 08 Jul 2006 13:30:09 -0700 committer David S. Miller Sat, 08 Jul 2006 13:30:09 -0700 [ATM]: Typo in drivers/atm/Kconfig... From: Matt LaPlante Signed-off-by: Charles Williams Signed-off-by: David S. Miller commit c165b0040502ef0d2b5751eef3cd96ea8210ae4c tree e552663a164e010f87cfca0b2b398e8cc2e1b560 parent 5a8da02ba59a9f978e2af4c5da9a029ea5f5ee3b author John W. Linville Sat, 08 Jul 2006 13:28:53 -0700 committer David S. Miller Sat, 08 Jul 2006 13:28:53 -0700 [TG3]: add amd8131 to "write reorder" chipsets Add the AMD 8131 bridge to the list of chipsets that reorder writes. Signed-off-by: John W. Linville Acked-by: Michael Chan Signed-off-by: David S. Miller commit 5a8da02ba59a9f978e2af4c5da9a029ea5f5ee3b tree 83d71021f6fd59eb42fa6d3326ab0fb4419b6e25 parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Stephen Hemminger Fri, 07 Jul 2006 16:54:05 -0700 committer David S. Miller Fri, 07 Jul 2006 16:54:05 -0700 [NET]: Fix network device interface printk message priority The printk's in the network device interface code should all be tagged with severity. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a496e25dfb25493a57bcee5d66875d6ff80a9093 tree e0dc7f0f8151f6cf0ddc9ef987a6750e4e4a9ea3 parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Dave Jones Fri, 07 Jul 2006 12:31:27 -0400 committer Linus Torvalds Fri, 07 Jul 2006 09:46:45 -0700 [PATCH] Fix cpufreq vs hotplug lockdep recursion. [ There's some not quite baked bits in cpufreq-git right now so sending this on as a patch instead ] On Thu, 2006-07-06 at 07:58 -0700, Tom London wrote: > After installing .2356 I get this each time I boot: > ======================================================= > [ INFO: possible circular locking dependency detected ] > ------------------------------------------------------- > S06cpuspeed/1620 is trying to acquire lock: > (dbs_mutex){--..}, at: [] mutex_lock+0x21/0x24 > > but task is already holding lock: > (cpucontrol){--..}, at: [] mutex_lock+0x21/0x24 > > which lock already depends on the new lock. > make sure the cpu hotplug recursive mutex (yuck) is taken early in the cpufreq codepaths to avoid a AB-BA deadlock. Signed-off-by: Arjan van de Ven Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 70f05366b71c51c35c25c0b76b4318fbc26c975a tree d31230b93ba7df50d87eb11b1dba091641a9b89e parent c0bc8721b8d0380ec69fa97578c91201201b05a9 parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Jeff Garzik Thu, 06 Jul 2006 13:07:32 -0400 committer Jeff Garzik Thu, 06 Jul 2006 13:07:32 -0400 Merge branch 'master' into upstream commit 1959d21232931dfa686769a21161413f10d6652f tree c311b9fce998ce66665bda261c470a6fb981aa5c parent 40359ccb836866435b03a0cb57345002b587d875 author Jens Axboe Thu, 06 Jul 2006 10:18:05 +0200 committer Jens Axboe Thu, 06 Jul 2006 10:18:05 +0200 [PATCH] Only the first two bits in bio->bi_rw and rq->flags match Not three, as assumed. This causes the barrier bit to be needlessly set for some IO. Signed-off-by: Jens Axboe commit 40359ccb836866435b03a0cb57345002b587d875 tree 4e0530a7759ba9802658901432a89683fbb0965d parent fc0a75ce4835187a3f76d6b35f0644d1b168eef5 author Nathan Scott Thu, 06 Jul 2006 10:03:28 +0200 committer Jens Axboe Thu, 06 Jul 2006 10:03:28 +0200 [PATCH] blktrace: readahead support Provide the needed kernel support for distinguishing readahead from regular read requests when tracing block devices. Signed-off-by: Nathan Scott Signed-off-by: Jens Axboe commit fc0a75ce4835187a3f76d6b35f0644d1b168eef5 tree a474693e464ca847c045b7e29d748adc9fcef4ea parent 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e author Nathan Scott Thu, 06 Jul 2006 09:56:30 +0200 committer Jens Axboe Thu, 06 Jul 2006 09:56:30 +0200 [PATCH] blktrace: fix barrier vs sync typo Signed-off-by: Nathan Scott Signed-off-by: Jens Axboe commit c0bc8721b8d0380ec69fa97578c91201201b05a9 tree b027c9aa8e0d601ebe6c86bddc181c4d4ecc7cda parent bce305f4fe779f29d99d414685243f5da0803254 parent e4ac9773be2ea01b707da0496ab1527ec6cdda4e author Jeff Garzik Wed, 05 Jul 2006 14:32:39 -0400 committer Jeff Garzik Wed, 05 Jul 2006 14:32:39 -0400 Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream Conflicts: drivers/net/e1000/e1000_main.c commit bce305f4fe779f29d99d414685243f5da0803254 tree 67072c37319f3c6b091dec8094d342118fe3fd62 parent 20ed7c094dfe33b0e15e8c60f60012b9278631d3 author Arjan van de Ven Wed, 05 Jul 2006 15:00:40 +0200 committer Jeff Garzik Wed, 05 Jul 2006 14:29:26 -0400 [PATCH] 8139too deadlock fix > stack backtrace: > [] rtl8139_start_xmit+0xd9/0xff [8139too] > [] netpoll_send_skb+0x98/0xea This seems to be a real deadlock... So netpoll_send_skb takes the _xmit_lock, which is all nitty gritty but then rtl8139_start_xmit comes around while that lock is taken, and does spin_unlock_irq(&tp->lock); which.. enables interrupts and softirqs; this is quite bad because the xmit lock is taken in softirq context for the watchdog like this: [] _spin_lock+0x23/0x32 [] dev_watchdog+0x14/0xb1 [] run_timer_softirq+0xf2/0x14a [] __do_softirq+0x55/0xb0 [] do_softirq+0x58/0xbd Which would deadlock now that the spin_unlock_irq() has enabled irqs/softirqs while the _xmit_lock is still held. The patch below turns this into a irqsave/irqrestore pair so that interrupts don't get enabled unconditionally. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Jeff Garzik commit 20ed7c094dfe33b0e15e8c60f60012b9278631d3 tree f2f3eb3cff4c30c71bce509467a404557a744ba0 parent 2c1a108890c5b57cf3f7d7909f55c4fae0f52f19 author Jeff Garzik Wed, 05 Jul 2006 14:28:34 -0400 committer Jeff Garzik Wed, 05 Jul 2006 14:28:34 -0400 [netdrvr] 3c59x: snip changelog from source code Driver source code is not the preferred place to store change history. Acked-by: Andrew Morton Signed-off-by: Jeff Garzik commit e4ac9773be2ea01b707da0496ab1527ec6cdda4e tree aef802a2f232a045602ef658bb1649654ce89172 parent ae2c3860eb18712b71861bb6fc8d7e11e0f79e6d author Auke Kok Tue, 27 Jun 2006 09:08:34 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:34 -0700 e1000: increase version to 7.1.9-k2 Increment the version to 7.1.9-k2 Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ae2c3860eb18712b71861bb6fc8d7e11e0f79e6d tree eb02955cfaf655b92ce028c5e54ae1bc0219b673 parent 1f9e7e3d32f7ff3fd3a936fc9ad59770b3d29774 author Auke Kok Tue, 27 Jun 2006 09:08:30 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:30 -0700 e1000: add ich8lan device ID's Add the device ID's of the supported ICH8 LAN devices. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 1f9e7e3d32f7ff3fd3a936fc9ad59770b3d29774 tree d80adcc2c623935f8e2387dedb066ca8d0c46641 parent cd94dd0b648ceb64ca5e41d9ccfa99c1e30e92ef author Auke Kok Tue, 27 Jun 2006 09:08:26 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:26 -0700 e1000: allow user to disable ich8 lock loss workaround The workaround for the ich8 lock loss problem is only needed for a very small amount of systems. This adds an option for the user to disable the workaround. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit cd94dd0b648ceb64ca5e41d9ccfa99c1e30e92ef tree 48144ae7c119c5cc7e61d42c670609540c3c7e9d parent d37ea5d56293b7a883d2a993df5d8b9fb660ed3b author Auke Kok Tue, 27 Jun 2006 09:08:22 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:22 -0700 e1000: integrate ich8 support into driver This hooks up the ich8 structure into the driver itself. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit d37ea5d56293b7a883d2a993df5d8b9fb660ed3b tree b0b5120c66c8fc44e93cc3e708de52c6eaed98ad parent ab7bc0ad72a12ef8eacc1560c9342aa567f3531d author Auke Kok Tue, 27 Jun 2006 09:08:17 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:17 -0700 e1000: add ich8lan core functions This implements the core new functions needed for ich8's internal NIC. This includes: * ich8 specific read/write code * flash/nvm access code * software semaphore flag functions * 10/100 PHY (fe - no gigabit speed) support for low-end versions * A workaround for a powerdown sequence problem discovered that affects a small number of motherboard. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ab7bc0ad72a12ef8eacc1560c9342aa567f3531d tree 935ea7423189eb59ec9be5c841961ecd6b749309 parent 592600a0536f0d5aab4dc95f19515a37d03430f8 author Auke Kok Tue, 27 Jun 2006 09:08:13 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:13 -0700 e1000: disable ERT Hardware is reported to have problems with ERT. We disable it for all hardware to make sure we are not seeing unexplainable user problems. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 592600a0536f0d5aab4dc95f19515a37d03430f8 tree 94b166da5afa2f5494e5154e6ef7109990d2c112 parent ee04022a21764a12e29eee144b72344ebfe0a55c author Auke Kok Tue, 27 Jun 2006 09:08:09 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:09 -0700 e1000: check return value of _get_speed_and_duplex We were not checking the return value of get_speed_and_duplex properly, whih may contain an error value. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ee04022a21764a12e29eee144b72344ebfe0a55c tree 88744e14d2df93fe287abc39b0d4446ae159a7ae parent f1b3a85354d3877fae45ef448e7e49c2efd692d5 author Auke Kok Tue, 27 Jun 2006 09:08:03 -0700 committer Auke Kok Tue, 27 Jun 2006 09:08:03 -0700 e1000: M88 PHY workaround M88 rev 2 PHY needs a longer downshift to function properly. This adds a much longer downshift counter for this specific device. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit f1b3a85354d3877fae45ef448e7e49c2efd692d5 tree ed0422f71c8c2b68b96ef5ccdfb2d15904e17eaf parent 7dfee0cb1d506897805b663dd95e9651619a4d4d author Auke Kok Tue, 27 Jun 2006 09:07:56 -0700 committer Auke Kok Tue, 27 Jun 2006 09:07:56 -0700 e1000: fix adapter led blinking inconsistency Several e1000 adapters were not blinking correctly or inconsistently. This patch cleans this up and makes them all behave the same as far as possible. Signed-off-by: Jeff Kirsher Signed-off-by: Auke Kok commit 7dfee0cb1d506897805b663dd95e9651619a4d4d tree a678e0e82d0766561c721146e6b0f975a48758ae parent 4ca213a6957318219822c024c8e4c61b3e42a7dc author Auke Kok Tue, 27 Jun 2006 09:07:50 -0700 committer Auke Kok Tue, 27 Jun 2006 09:07:50 -0700 e1000: disable CRC stripping workaround CRC stripping is breaking SMBUS-connected BMC's. We disable this feature to make it work. This fixes related bugs regarding SOL. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 4ca213a6957318219822c024c8e4c61b3e42a7dc tree 9bef34eab2afb685c9e61d0a34bab6ff5c0811f3 parent 17231712ab89fa085bc235ef19c1e6e0c163e4fc author Auke Kok Tue, 27 Jun 2006 09:07:08 -0700 committer Auke Kok Tue, 27 Jun 2006 09:07:08 -0700 e1000: force register write flushes to circumvent broken platforms A certain AMD64 bridge (8132) has an option to turn on write combining which breaks our adapter. To circumvent this we need to flush every write. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 17231712ab89fa085bc235ef19c1e6e0c163e4fc tree 0d1a97d85030591379d8cad0a5dafbf6855b24f6 parent 864c4e45ec6d1bfe16a14d887d5baad201419aba author Auke Kok Tue, 27 Jun 2006 09:06:59 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:59 -0700 e1000: rework module param code with uninitialized values We can take uninitialized values into account which minimizes code and allows us to simplify the parameter checking code greatly. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 864c4e45ec6d1bfe16a14d887d5baad201419aba tree 6908a76df95c8f771ae85842bbf3f9a476bf3690 parent a5eafce2ce2fd3a1956657d85908ca691b870e5d author Auke Kok Tue, 27 Jun 2006 09:06:53 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:53 -0700 e1000: recycle skb Recycle an skb to improve performance a bit. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit a5eafce2ce2fd3a1956657d85908ca691b870e5d tree 36577236b2db39ea25dd38100d8827b0d68339fc parent 9a53a2029885e0088e9149679215b95d04deb57b author Auke Kok Tue, 27 Jun 2006 09:06:49 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:49 -0700 e1000: change printk into DPRINTK Changing a printk message to make clear that this message is originating from e1000. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 9a53a2029885e0088e9149679215b95d04deb57b tree e81f69cb79cc7f43332184b51c1213a14842dad9 parent 0cbabbb0725fa34a37d6b7870b2d2fe17d1a0a94 author Auke Kok Tue, 27 Jun 2006 09:06:45 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:45 -0700 e1000: add smart power down code Smart Power Down is a power saving feature in newer e1000 hardware. We disable it because it causes time to link to be long, but make it a user choice. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 0cbabbb0725fa34a37d6b7870b2d2fe17d1a0a94 tree eba11d71ae8995a3f51a1d0f701ec1fa849d09d4 parent 6fdfef162426766611b1f640138e4720f56e45f8 author Auke Kok Tue, 27 Jun 2006 09:06:41 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:41 -0700 e1000: small performance tweak by removing double code buffer_info is already filled at the end of this while() loop. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 6fdfef162426766611b1f640138e4720f56e45f8 tree b1525d28996ed47b99e53c625bc9cb0d238227fa parent 79f05bf0ba9b41561600f3cdfdf86b5184fc6675 author Auke Kok Tue, 27 Jun 2006 09:06:36 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:36 -0700 e1000: fix CONFIG_PM blocks e1000_suspend is called even when !CONFIG_PM. The non-PM code inside of it is properly #ifdef'd. This fixes the compiler warnings when !CONFIG_PM. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 79f05bf0ba9b41561600f3cdfdf86b5184fc6675 tree 74530615703e52b238ec38c2fac2670a2493113e parent 2db10a081c5c1082d58809a1bcf1a6073f4db160 author Auke Kok Tue, 27 Jun 2006 09:06:32 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:32 -0700 e1000: Make PHY powerup/down a function In relation to the irq work done earlier we also move the PHY powerup and powerdown functions into separate functions and move the calls to _close and _open, making the PHY stay in it's power state as long as the device is _up. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 2db10a081c5c1082d58809a1bcf1a6073f4db160 tree f54772ef60f2c5bf5f8d602a83d6dc508158a0e0 parent acfbc9fde2ec7f304398f6ad7644002e07bf84bc author Auke Kok Tue, 27 Jun 2006 09:06:28 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:28 -0700 e1000: rework driver hardware reset locking After studying the driver mac reset code it was found that there were multiple race conditions possible to reset the unit twice or bring it e1000_up() double. This fixes all occurences where the driver needs to reset the mac. We also remove irq requesting/releasing into _open and _close so that while the device is _up we will never touch the irq's. This fixes the double free irq bug that people saw. To make sure that the watchdog task doesn't cause another race we let it run as a non-scheduled task. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit acfbc9fde2ec7f304398f6ad7644002e07bf84bc tree 346a872fc0624dc2bdbef913cb882a8337c61abf parent 0d204094d15dac2e8a439b993f71eda385b4dccd author Auke Kok Tue, 27 Jun 2006 09:06:24 -0700 committer Auke Kok Tue, 27 Jun 2006 09:06:24 -0700 e1000: fix loopback ethtool test Ethtool was reporting that loopback failed randomly on esb2 systems. Upon study it was found that the phy manual was changed with respect to the loopback mode bits. The new value fixes it. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 0d204094d15dac2e8a439b993f71eda385b4dccd tree 647f0ddec94d0fb4aaf74fa55bcad75946030f8a parent a487a8f7b6947f6445e5a1aa876522916785d5ec parent 612eff0e3715a6faff5ba1b74873b99e036c59fe author Auke Kok Wed, 21 Jun 2006 13:43:50 -0700 committer Auke-jan Kok Wed, 21 Jun 2006 13:43:50 -0700 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit a487a8f7b6947f6445e5a1aa876522916785d5ec tree a64fb0d90dce25095558b89de86a2d9a6d340d21 parent cac925a4aab1b7233d3beb591f53498816058a08 author Auke Kok Fri, 09 Jun 2006 11:29:03 -0700 committer Auke Kok Fri, 09 Jun 2006 11:29:03 -0700 e1000: prevent statistics from garbling during bus resets If a PCI bus error/fault triggers a PCI bus reset, attempts to get the ethernet packet count statistics from the hardware will fail, returning garbage data upstream. This patch skips statistics data collection if the PCI device is not on the bus. Signed-off-by: Linas Vepstas Cc: Jesse Brandeburg Signed-off-by: Andrew Morton Acked-by: Auke Kok