arch/s390/hypfs/inode.c | 2 arch/s390/kvm/interrupt.c | 2 arch/sparc/kernel/irq_64.c | 2 arch/um/drivers/net_kern.c | 2 debian/changelog | 53 ++ drivers/block/DAC960.c | 4 drivers/block/swim3.c | 2 drivers/char/epca.c | 2 drivers/gpu/drm/i915/intel_dp.c | 2 drivers/gpu/drm/radeon/r300.c | 4 drivers/ide/ide-probe.c | 2 drivers/ide/umc8672.c | 4 drivers/isdn/capi/capiutil.c | 2 drivers/macintosh/rack-meter.c | 2 drivers/net/arcnet/arc-rawmode.c | 1 drivers/net/arcnet/capmode.c | 1 drivers/net/gianfar_ethtool.c | 2 drivers/net/ibm_newemac/core.c | 8 drivers/net/igb/igb_main.c | 2 drivers/net/ll_temac_main.c | 2 drivers/net/ni52.c | 4 drivers/net/qlge/qlge_main.c | 4 drivers/net/skfp/pcmplc.c | 2 drivers/net/skfp/pmf.c | 8 drivers/net/skge.c | 18 drivers/net/skge.h | 2 drivers/net/sky2.c | 624 +++++++++++++++++----------------- drivers/net/sky2.h | 36 - drivers/net/vxge/vxge-config.h | 2 drivers/net/vxge/vxge-main.c | 2 drivers/rtc/rtc-omap.c | 2 drivers/s390/block/dasd_eckd.c | 2 drivers/s390/net/netiucv.c | 2 drivers/s390/scsi/zfcp_scsi.c | 2 drivers/scsi/bnx2i/bnx2i_hwi.c | 2 drivers/scsi/lpfc/lpfc_ct.c | 2 drivers/spi/omap_uwire.c | 2 drivers/spi/spi_s3c24xx.c | 2 drivers/usb/class/cdc-wdm.c | 2 drivers/usb/serial/spcp8x5.c | 2 drivers/uwb/i1480/i1480u-wlp/netdev.c | 2 drivers/video/cfbcopyarea.c | 2 drivers/video/imxfb.c | 2 drivers/video/s3c2410fb.c | 2 drivers/xen/balloon.c | 2 fs/autofs/dirhash.c | 2 fs/btrfs/tree-log.c | 2 fs/cifs/cifs_dfs_ref.c | 2 fs/nfs/callback_xdr.c | 2 fs/ocfs2/quota_global.c | 2 include/scsi/fc/fc_fc2.h | 3 kernel/trace/trace_hw_branches.c | 2 net/core/dev.c | 3 net/wireless/wext-compat.c | 2 sound/oss/sys_timer.c | 3 sound/soc/codecs/wm9081.c | 2 sound/soc/pxa/pxa-ssp.c | 2 sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 58 files changed, 462 insertions(+), 400 deletions(-)
New commits: commit c805919d00fb4b660e4e1c76eb6fb62c8445d8f2 Author: Stephen Hemminger <[email protected]> Date: Fri Oct 30 09:17:41 2009 -0700 2.6.31-1+vyatta+10 commit ec5e0302a52e2fe6f58cc3839beb01b862ffe06c Author: Stephen Hemminger <[email protected]> Date: Fri Oct 30 09:13:27 2009 -0700 net: fold name hash To get better dispersion of names into hash buckets, use hash_long to get other bits. commit d6769e4a0bb6163df3b1410ba687b0c7f555fffb Author: Michal Schmidt <[email protected]> Date: Thu Oct 1 08:13:23 2009 +0000 skge: use unique IRQ name Most network drivers request their IRQ when the interface is activated. skge does it in ->probe() instead, because it can work with two-port cards where the two net_devices use the same IRQ. This works fine most of the time, except in some situations when the interface gets renamed. Consider this example: 1. modprobe skge The card is detected as eth0 and requests IRQ 17. Directory /proc/irq/17/eth0 is created. 2. There is an udev rule which says this interface should be called eth1, so udev renames eth0 -> eth1. 3. modprobe 8139too The Realtek card is detected as eth0. It will be using IRQ 17 too. 4. ip link set eth0 up Now 8139too requests IRQ 17. The result is: WARNING: at fs/proc/generic.c:590 proc_register ... proc_dir_entry '17/eth0' already registered ... And "ls /proc/irq/17" shows two subdirectories, both called eth0. Fix it by using a unique name for skge's IRQ, based on the PCI address. The naming from the example then looks like this: $ grep skge /proc/interrupts 17: 169 IO-APIC-fasteoi s...@pci:0000:00:0a.0, eth0 irqbalance daemon will have to be taught to recognize "skge@" as an Ethernet interrupt. This will be a one-liner addition in classify.c. I will send a patch to irqbalance if this change is accepted. Signed-off-by: Michal Schmidt <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 415e69e6574ab740e5db56152055eb899e7ac86e) commit 5e4c1666ad027a6214a0e7d3990e7f4ab9473029 Author: Mike McCormack <[email protected]> Date: Wed Sep 23 03:50:36 2009 +0000 skge: Make sure both ports initialize correctly If allocation of the second ports fails, make sure that hw->ports is not 2 otherwise we'll crash trying to access the second port. This fix is copied from a similar fix in the sky2 driver (ca519274...), but is untested, as I don't have a skge card. Signed-off-by: Mike McCormack <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit f1914226e12044f0cacda59efc91bee972c30341) commit 9c4139a95a725a18d069f40f17d7227cb61a256b Author: Stephen Hemminger <[email protected]> Date: Thu Oct 1 07:11:46 2009 +0000 sky2: irqname based on pci address This is based on Michal Schmidt fix for skge. Most network drivers request their IRQ when the interface is activated. sky2 does it in ->probe() instead, because it can work with two-port cards where the two net_devices use the same IRQ. This works fine most of the time, except in some situations when the interface gets renamed. Consider this example: 1. modprobe sky2 The card is detected as eth0 and requests IRQ 17. Directory /proc/irq/17/eth0 is created. 2. There is an udev rule which says this interface should be called eth1, so udev renames eth0 -> eth1. 3. modprobe 8139too The Realtek card is detected as eth0. It will be using IRQ 17 too. 4. ip link set eth0 up Now 8139too requests IRQ 17. The result is: WARNING: at fs/proc/generic.c:590 proc_register ... proc_dir_entry '17/eth0' already registered The fix is for sky2 to name the irq based on the pci device, as is done by some other devices DRM, infiniband, ... ie. s...@pci:0000:00:00 Signed-off-by: Stephen Hemminger <[email protected]> Reviewed-by: Michal Schmidt <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 66466797c7e2406579724e42eb9cfe05d53a882b) commit d1ad6b3b4d237c21a58d74ac5a8ad282eb38d67a Author: Joe Perches <[email protected]> Date: Tue Aug 18 11:18:35 2009 -0700 trivial: remove unnecessary semicolons Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> (cherry picked from commit a419aef8b858a2bdb98df60336063d28df4b272f) commit 797a693b1a25e1284dc3385d14fd50667183c417 Author: Stephen Hemminger <[email protected]> Date: Mon Sep 14 06:22:29 2009 +0000 sky2: Make sure both ports initialize correctly Sorry Mike, I sent you off the wrong way. The following is simpler and the second port is diffrent enough in setup (because of NAPI), that the following is simpler. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit ca519274d537706b6fb1e3e91238d34a23320584) commit fa7b8bee9d37f0b56587df8974a8b83a1460f41e Author: Stephen Hemminger <[email protected]> Date: Mon Sep 14 06:12:55 2009 +0000 sky2: transmit ring accounting Be more accurate about number of transmit list elements required. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 07e316377458484d95f7624f7af7af99d9bd18cb) commit 857f4443320e3904bbb8ab555ce29c8e74cb005f Author: Stephen Hemminger <[email protected]> Date: Thu Sep 3 06:16:25 2009 +0000 sky2: only enable Vaux if capable of wakeup While perusing vendor driver, I saw that it did not enable the Vaux power unless device was able to wake from lan for D3cold. This might help for Rene's power issue. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit c23ddf8f22fc2c871ce476ff917d1208bbe4f3de) commit 3e1c3d9ac0642f6b9e014b91ac2ddaf8dc3104b5 Author: Mike McCormack <[email protected]> Date: Tue Sep 1 03:54:27 2009 +0000 sky2: Use 32bit read to read Y2_VAUX_AVAIL B0_CTST is a 24bit register according to the vendor driver (sk98lin). A 16bit read on B0_CTST will always return 0 for Y2_VAUX_AVAIL (1<<16), so use a 32bit read when testing Y2_VAUX_AVAIL Signed-off-by: Mike McCormack <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 72c60683282a6cd047db47d605eb96e2a6fac72c) commit d5e888456af536277175bc970868df544d170689 Author: Mike McCormack <[email protected]> Date: Tue Sep 1 03:21:35 2009 +0000 sky2: Create buffer alloc and free helpers Refactor similar two sections of code that free buffers into one. Only call tx_init if all buffer allocations succeed. Signed-off-by: Mike McCormack <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 90bbebb4a8258a398705ecaa2e6b9e177928ee7a) commit 70145d4e3220fd017679cd91a9eab4a60d17a4d6 Author: Stephen Hemminger <[email protected]> Date: Mon Aug 31 07:31:41 2009 +0000 sky2: fix management of driver LED Observed by Mike McCormack. The LED bit here is just a software controlled value used to turn on one of the LED's on some boards. The register value was wrong, which could have been causing some power control issues. Get rid of problematic define use the correct mask. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 10547ae2c01acdace636e23c991b21fef05428b4) commit 6caf5e6fa10414962e4b1ee37e2c11ca39fba826 Author: Stephen Hemminger <[email protected]> Date: Tue Aug 18 15:17:11 2009 +0000 sky2: version 1.25 Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 0c3f450b8b345dafa79f1cc69eda702e0293b0cc) commit 95a736e135c21ddbd29f3c020027515b48c703c6 Author: Stephen Hemminger <[email protected]> Date: Tue Aug 18 15:17:10 2009 +0000 sky2: no recycling Recycling turns out to be a bad idea! For most use cases, the packet can not be reused: TCP packets are cloned. Even for the ideal case of forwarding, it hurts performance because of CPU ping/pong. On a multi-core system forwarding of 64 byte packets is worse much worse: recycling = 24% forwarded vs no recycling = 42% forwarded Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 724b694225e711f95e6265afdbc304c9e7eb3721) commit 1f9503e609f5860e246837dcb9dc2f0d7d42d5ad Author: Stephen Hemminger <[email protected]> Date: Tue Aug 18 15:17:09 2009 +0000 sky2: optimize transmit completion Don't reference the list element in hardware transmit ring on transmit completion. The list element is updated by hardware, therefore it causes a cache miss. Do book keeping in software structure. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 6b84dacadbdc3dab6a5b313d20d5a93b0d998641) commit eac5304ff28ec640dc9c3c1e5a4dc1b881bf0ac7 Author: Stephen Hemminger <[email protected]> Date: Tue Aug 18 15:17:08 2009 +0000 sky2: dynamic size transmit ring Allocate and size transmit ring based on parameters. Saves excess space and allows configuring larger rings for testing. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit ee5f68fea27b53b16c265b1f9ed8aa3bc9024c96) commit 767f1d05e50c108bdff017ad4405f99889a169fb Author: Stephen Hemminger <[email protected]> Date: Tue Aug 18 15:17:07 2009 +0000 sky2: simplify list element error The code for list element error (which should only happen on hardware errors) should be cleaner and safer. Gets rid of unused ring_size argument, which makes next patch easier. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit c119731d6606ae25d787740d60706e2732454637) commit 527b78c160592b1cd8f791bdc20c197193623035 Author: Stephen Hemminger <[email protected]> Date: Tue Aug 18 15:17:06 2009 +0000 sky2: transmit ring 64 bit conservation This patch saves elements on transmit ring by only updating the upper 64 bit address when it changes. With many workloads skb's are located in same region, so it saves space. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 5dce95e5687a5a335202b03d133c1b4411ef7ce3) commit f827b1e7f5543f249c5abe9c4313372928857f3f Author: Stephen Hemminger <[email protected]> Date: Tue Aug 18 15:17:05 2009 +0000 sky2: use upper/lower 32 bits Use the existing macros to show where DMA address is being broken apart. This is cosmetic only. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit d6e74b6b7eda3584a403eebae27f9591a1d9c9ff) commit a7b4ca9508fc631c21b92003ce3ef624fe4198c1 Author: Stephen Hemminger <[email protected]> Date: Fri Aug 14 13:33:17 2009 +0000 sky2: remove restarting workaround flag The whole restarting flag was introduced by Mike McCormack and was a temporary duct tape patch around issues with transmits inflight during restart. The problems it was covering are now fixed and the code should have been reverted. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 49d4b8ba97034469b941d00d5ca1e3b897394e35) commit 62aa44d114dd10b94b2ca78fbe8ed2ee7af558da Author: Stephen Hemminger <[email protected]> Date: Fri Aug 14 05:15:20 2009 +0000 sky2: version 1.24 Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit deeb16dc24b68cbdca72dc717ae82178a6644801) commit 1dc8fb43dacd6e149dbc57844a9128fb2f68d37e Author: Stephen Hemminger <[email protected]> Date: Fri Aug 14 15:36:41 2009 -0700 sky2: fix pause negotiation The sky2 driver combines auto speed negotiation with automatic negotiation of pause parameters; but the ethtool interface expects them to be split. This patch allows autonegotiation to be used for speed, but manually disable flow control. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 0ea065e52eb6a0f029b5fa5ed2f142be1b66a153) commit 2a3839fdc6458c70ea7e7f7be96b6dd4d79d38b6 Author: Stephen Hemminger <[email protected]> Date: Fri Aug 14 15:33:19 2009 -0700 sky2: lock less transmit completion Transmit completion can safely run lockless against transmit start. In the normal case, completion is done from NAPI and only looks at elements that are at the tail of the ring. When doing shutdown or reset, the transmiter should be completely block by NAPI disable and blocking of transmit queue. Based on earlier work by Mike McCormack. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 481cea4a4d72aabe76dbb86b1a64f4e8931eca25) commit 8399cd4cb5ad88af8226908fc2442856871d058e Author: Stephen Hemminger <[email protected]> Date: Fri Aug 14 15:31:25 2009 -0700 sky2: cleanup restart operations This unifies the places that bounce the device (suspend/resume and restart). And makes the operations have the same semantics as normal dev_open/dev_stop. This also avoids setting the multicast addresses twice when device is brought up. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit af18d8b89930aecc742982634adaf97dfb43ed3b) commit f208623f428a60a3a62242b11481bf2aef9777a1 Author: Stephen Hemminger <[email protected]> Date: Fri Aug 14 05:15:16 2009 +0000 sky2: hold RTNL when doing suspend/shutdown operations The suspend and shutdown code plays with shared state. Use consistent locking, for extra protection. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 19720737187aaee006afb20e63be5e9eddc505a8) commit a27e2949174a5fb48bc093bc9985772673e8bde2 Author: Stephen Hemminger <[email protected]> Date: Fri Aug 14 05:15:15 2009 +0000 sky2: hold spinlock around phy_power_down Avoid any possible problems with accessing PHY registers on shutdown. This is a purely theoretical issue and is not related to any of the outstanding bug reports. Since receiver and transmitter are already shutdown and phy interrupts for this device are already disabled, there should already be enough protection. Suggested by Mike McCormack. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 0da6d7b331f391d3c0ce52fb5289f7edeb94e280) commit ac7d2bd46736f4a02008f68f55ed235fa0825ef6 Author: Mike McCormack <[email protected]> Date: Fri Aug 14 05:15:14 2009 +0000 sky2: Reset tx train after interrupts disabled. Reseting the tx chain too soon results in invalid tx queue positions being delivered in the status queue. This also makes sure there's no overlap between the cleanup done by sky2_tx_clean() and sky2_tx_done(). Signed-off-by: Mike McCormack <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit 264bb4fab1a0952b4eef4df5b9e90bc050a2d1e6) commit 23270478accbe88eacd32d109455ee732ce38395 Author: Mike McCormack <[email protected]> Date: Fri Aug 14 05:15:13 2009 +0000 sky2: Move tx reset functionality to sky2_tx_reset() This is pure refactoring. Signed-off-by: Mike McCormack <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit a510996bea68eec2feb7818e9a440bd840613a25) commit fb3579ca1e09b850d8baa02d3d161cdcb8a1edbb Author: Mike McCormack <[email protected]> Date: Fri Aug 14 05:15:12 2009 +0000 sky2: Avoid rewinding sky2->tx_prod Keep sky2->tx_prod consistent since int might be examined by an softirq poll or restart. Signed-off-by: Mike McCormack <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]> http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=c805919d00fb4b660e4e1c76eb6fb62c8445d8f2 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=ec5e0302a52e2fe6f58cc3839beb01b862ffe06c http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=d6769e4a0bb6163df3b1410ba687b0c7f555fffb http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=5e4c1666ad027a6214a0e7d3990e7f4ab9473029 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=9c4139a95a725a18d069f40f17d7227cb61a256b http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=d1ad6b3b4d237c21a58d74ac5a8ad282eb38d67a http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=797a693b1a25e1284dc3385d14fd50667183c417 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=fa7b8bee9d37f0b56587df8974a8b83a1460f41e http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=857f4443320e3904bbb8ab555ce29c8e74cb005f http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=3e1c3d9ac0642f6b9e014b91ac2ddaf8dc3104b5 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=d5e888456af536277175bc970868df544d170689 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=70145d4e3220fd017679cd91a9eab4a60d17a4d6 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=6caf5e6fa10414962e4b1ee37e2c11ca39fba826 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=95a736e135c21ddbd29f3c020027515b48c703c6 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=1f9503e609f5860e246837dcb9dc2f0d7d42d5ad http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=eac5304ff28ec640dc9c3c1e5a4dc1b881bf0ac7 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=767f1d05e50c108bdff017ad4405f99889a169fb http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=527b78c160592b1cd8f791bdc20c197193623035 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=f827b1e7f5543f249c5abe9c4313372928857f3f http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=a7b4ca9508fc631c21b92003ce3ef624fe4198c1 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=62aa44d114dd10b94b2ca78fbe8ed2ee7af558da http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=1dc8fb43dacd6e149dbc57844a9128fb2f68d37e http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=2a3839fdc6458c70ea7e7f7be96b6dd4d79d38b6 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=8399cd4cb5ad88af8226908fc2442856871d058e http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=f208623f428a60a3a62242b11481bf2aef9777a1 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=a27e2949174a5fb48bc093bc9985772673e8bde2 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=ac7d2bd46736f4a02008f68f55ed235fa0825ef6 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=23270478accbe88eacd32d109455ee732ce38395 http://suva.vyatta.com/git/?p=linux-vyatta.git;a=commitdiff;h=fb3579ca1e09b850d8baa02d3d161cdcb8a1edbb _______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
