commit 71780f59e127bb281a9302d430495ca9586c14e7 Merge: 36b7741... 7aa4848... Author: Linus Torvalds Date: Mon Jul 9 15:50:56 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (31 commits) firewire: fw-sbp2: fix DMA mapping of management ORBs firewire: fw-sbp2: fix DMA mapping of command ORBs firewire: fw-sbp2: fix DMA mapping of S/G tables firewire: fw-sbp2: add a boundary check firewire: fw-sbp2: correctly align page tables firewire: fw-sbp2: memset wants string.h firewire: fw-sbp2: use correct speed in sbp2_agent_reset firewire: fw-sbp2: correctly dereference by container_of firewire: Document userspace ioctl interface. firewire: fw-sbp2: implement nonexclusive login firewire: fw-sbp2: let SCSI shutdown commands through before logout firewire: fw-sbp2: implement max sectors limit for some old bridges firewire: simplify a struct type firewire: support S100B...S400B and link slower than PHY firewire: optimize gap count with 1394b leaf nodes firewire: remove unused macro firewire: missing newline in printk firewire: fw-sbp2: remove unused struct member ieee1394: remove old isochronous ABI ieee1394: sbp2: change some module parameters from int to bool ... commit 36b774102e5ede8d0384684bd394c8285dce5a53 Merge: 71ba22f... feb485d... Author: Linus Torvalds Date: Mon Jul 9 15:50:31 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: handle cases of volume knobs generating relative values HID: Logitech keyboard 0xc311 needs reset leds quirk HID: support for logitech cordless desktop LX500 special mapping HID: fix autocentering of PID devices HID: separate quirks for report descriptor fixup HID: Add NOGET quirk for all NCR devices HID: support for Petalynx Maxter remote control HID: fix mismatch between hid-input HUT find/search mapping and the HUT HID: support for Gameron dual psx adaptor USB HID: avoid flush_scheduled_work() HID: Use menuconfig objects HID: force hid-input for Microsoft SideWinder GameVoice device HID: input mapping for Chicony KU-0418 tactical pad HID: make debugging output runtime-configurable commit 71ba22fa739029bb158144813b9e82c00326497c Merge: 27a278a... f2ec803... Author: Linus Torvalds Date: Mon Jul 9 15:26:43 2007 -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: (75 commits) Ethernet driver for EISA only SNI RM200/RM400 machines Extract chip specific code out of lasi_82596.c ehea: Whitespace cleanup pasemi_mac: Fix TX interrupt threshold spidernet: Replace literal with const r8169: perform RX config change after mac filtering r8169: mac address change support r8169: display some extra debug information during startup r8169: add endianess annotations to [RT]xDesc r8169: align the IP header when there is no DMA constraint r8169: add bit description for the TxPoll register r8169: cleanup r8169: remove the media option r8169: small 8101 comment r8169: confusion between hardware and IP header alignment r8169: merge with version 8.001.00 of Realtek's r8168 driver r8169: merge with version 6.001.00 of Realtek's r8169 driver r8169: prettify mac_version r8169: populate the hw_start handler for the 8110 r8169: populate the hw_start handler for the 8168 ... commit 7aa484815f8c4defd01366f239b71da5e6b8a791 Author: Stefan Richter Date: Mon Jul 2 21:04:44 2007 +0200 firewire: fw-sbp2: fix DMA mapping of management ORBs The CPU must not touch the buffer after it was DMA-mapped. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 8526392ae816a2c69f57097ba032865523019caa Author: Stefan Richter Date: Mon Jul 2 21:04:08 2007 +0200 firewire: fw-sbp2: fix DMA mapping of command ORBs The CPU must not touch the buffer after it was DMA-mapped. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit b4be016ad81af5a83f0be820edf106de883e6ade Author: Stefan Richter Date: Mon Jul 2 22:07:34 2007 +0200 firewire: fw-sbp2: fix DMA mapping of S/G tables - The CPU must not touch the buffer after it was DMA-mapped. - The size argument of dma_unmap_single(...page_table...) was bogus. - Move a comment closer to the code to which it refers to. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 332ef3310bc37ff29fd4382d6dfb38a787078091 Author: Stefan Richter Date: Sun Jul 1 13:56:03 2007 +0200 firewire: fw-sbp2: add a boundary check Add rudimentary check for the case that the page table overflows due to merging of s/g elements by the IOMMU. This would have lead to overwriting of arbitrary memory. After this change I expect that an offending command will be unsuccessfully retried until the scsi_device is taken offline by SCSI core. It's a border case and not worth to implement a recovery strategy. Signed-off-by: Stefan Richter Acked-by: Kristian Høgsberg commit 9fb2dd12c019965ffd15e5a0727af14488b3a772 Author: Stefan Richter Date: Sun Jul 1 13:55:31 2007 +0200 firewire: fw-sbp2: correctly align page tables This is required per SBP-2 clause 5.2. Signed-off-by: Stefan Richter Acked-by: Kristian Høgsberg commit e7cdf237b2a8b4b566721cfb08e448b454c74ada Author: Stefan Richter Date: Sun Jul 1 13:54:57 2007 +0200 firewire: fw-sbp2: memset wants string.h Signed-off-by: Stefan Richter Acked-by: Kristian Høgsberg commit ffd0db26ddc32cd87097ece9725921f43ad487ee Author: Stefan Richter Date: Sun Jul 1 13:54:24 2007 +0200 firewire: fw-sbp2: use correct speed in sbp2_agent_reset noticed by Jay Fenlason Signed-off-by: Stefan Richter Acked-by: Kristian Høgsberg commit 6f061487f7d31427d7e8f420f366e5537ae16f43 Author: Jay Fenlason Date: Wed Jun 27 16:04:33 2007 -0400 firewire: fw-sbp2: correctly dereference by container_of Replace a cast with a container_of(). As long as nobody reorders the structure elements, they do the same thing, but container_of() is more readable. Signed-off-by: Stefan Richter (added complete_command_orb) Acked-by: Kristian Høgsberg commit 7ada60e367640fa8a4a349d9b105f235f346238b Author: Kristian Høgsberg Date: Fri Jun 22 00:20:34 2007 +0200 firewire: Document userspace ioctl interface. The isochronous packet format is still not documented, but this is a good first step. Signed-off-by: Kristian Høgsberg Signed-off-by: Stefan Richter (format, wording) commit 5cd54c94b0ba45033c126237d3d70c6e7ab52c3f Author: Stefan Richter Date: Sun Jun 17 23:55:41 2007 +0200 firewire: fw-sbp2: implement nonexclusive login Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 79352e9f94cff4078f2ffefac4a41b7f14046fb6 Author: Stefan Richter Date: Mon Jun 18 18:46:49 2007 +0200 firewire: fw-sbp2: let SCSI shutdown commands through before logout This affects of course only the "soft shutdown" case, e.g. "modprobe -r firewire-sbp2", while it doesn't matter for hot unplug. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit cf47c7a26ca13b944900dce208890c5b6d5f3a14 Author: Stefan Richter Date: Sun Jun 17 23:52:08 2007 +0200 firewire: fw-sbp2: implement max sectors limit for some old bridges This currently only affects one bridge in the hardwired blacklist. I don't own one of those, hence haven't tested it. Signed-off-by: Stefan Richter commit dae1a3aa8ebdd30fbba56a8d4e22f92455fb0861 Author: Stefan Richter Date: Sun Jun 17 23:39:58 2007 +0200 firewire: simplify a struct type cleanup after "firewire: support S100B...S400B and link slower than PHY" Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit f1397490017e337446c6a8b0562b584679a604a6 Author: Stefan Richter Date: Sun Jun 10 21:31:36 2007 +0200 firewire: support S100B...S400B and link slower than PHY Use a speed probe to determine the speed over 1394b buses and of nodes which report a link speed less than their PHY speed. Log the effective maximum speed of newly created nodes in dmesg. Also, read the config ROM (except bus info block) at the maximum speed rather than S100. This isn't a real optimization though because we still only use quadlet read requests for the entire ROM. The patch also adds support for S1600 and S3200, although such hardware does not exist yet. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 24d40125f1f59a6de9d9e6e046676bd60532596c Author: Stefan Richter Date: Mon Jun 18 19:44:12 2007 +0200 firewire: optimize gap count with 1394b leaf nodes Table-based gap count optimization cannot be used if 1394b repeater PHYs are present. But it does work with 1394b leaf nodes. Signed-off-by: Stefan Richter Signed-off-by: Kristian Høgsberg commit 25d83f583b334ac671fbb905c97c374ba34a597a Author: Stefan Richter Date: Sat Jun 9 19:27:07 2007 +0200 firewire: remove unused macro Signed-off-by: Stefan Richter commit 8a8cea2734808522f02941ea16125810ee42c9c7 Author: Stefan Richter Date: Sat Jun 9 19:26:22 2007 +0200 firewire: missing newline in printk Also remove some errno printouts which will be shown by infrastructure code anyway. Signed-off-by: Stefan Richter commit b8f106570f20a7a98a18a14c2d11d65f581c2808 Author: Stefan Richter Date: Fri May 11 23:04:08 2007 +0200 firewire: fw-sbp2: remove unused struct member cleanup after support of single-buffer requests was dropped Signed-off-by: Stefan Richter Signed-off-by: Kristian Hoegsberg commit 53c96b41742a2dadd14e65c23fc119f2a2fd9f05 Author: Stefan Richter Date: Sun Jun 24 15:31:54 2007 +0200 ieee1394: remove old isochronous ABI Based on patch "the scheduled removal of RAW1394_REQ_ISO_{SEND,LISTEN}" from Adrian Bunk, November 20 2006. This patch also removes the underlying facilities in ohci1394 and disables them in pcilynx. That is, hpsb_host_driver.devctl() and hpsb_host_driver.transmit_packet() are no longer used for iso reception and transmission. Since video1394 and dv1394 only work with ohci1394 and raw1394's rawiso interface has never been implemented in pcilynx, pcilynx is now no longer useful for isochronous applications. raw1394 will still handle the request types but will complete the requests with errors that indicate API version conflicts. Signed-off-by: Stefan Richter commit 77bba7aea7dc833caa34761fa7ce081a40a14493 Author: Stefan Richter Date: Sun Jun 17 23:54:52 2007 +0200 ieee1394: sbp2: change some module parameters from int to bool This is upwards compatible, except that integer values other than 0 or 1 are no longer accepted. But values like "Y", "N", "no", "nnoooh!" work now. Also, improve a comment on the serialize_io parameter and make the ORB_SET_EXCLUSIVE macro ultra-safe. Signed-off-by: Stefan Richter commit 93f2e0259a76ceb9c598d5af382aecbb2df01c51 Author: Stefan Richter Date: Sun Jul 8 13:34:21 2007 +0200 ieee1394: first minimal NUMA awareness Association of a host device with a node on NUMA machines optimizes allocations of skbs given from the networking stack to eth1394. Signed-off-by: Stefan Richter commit 8e4dc400b7659691abdd92b3fc01ef094fc8a1e7 Author: Stefan Richter Date: Sun May 27 23:14:05 2007 +0200 ieee1394: eth1394: revert parent device to that in 2.6.20 After ieee1394 was converted away from class_device like the networking subsystem was already in 2.6.21, eth1394's device may point to the fw-host device as its parent again like in 2.6.20. This affects userspace tools which examine the sysfs representation of eth1394's device. Signed-off-by: Stefan Richter commit a0e857eeffba8976be6bdb9f4bb011c18eb2aff7 Author: Stefan Richter Date: Sun Jun 17 23:47:45 2007 +0200 ieee1394: nodemgr: parallelize between several hosts Remove the global nodemgr_serialize mutex which enclosed most of the host thread event loop. This allows for parallelism between several host adapter cards. Properly serialize the driver hooks .update(), .suspend(), .resume(), and .remove() by means of device->sem. These hooks can be called from outside the host threads' contexts. Get() and put() the device.driver when calling its hooks. Signed-off-by: Stefan Richter commit dd7f2928d834f7ac67202bcdf24a44ba9b138f08 Author: Kay Sievers Date: Fri May 25 11:50:53 2007 +0200 ieee1394: convert ieee1394 from "struct class_device" to "struct device" Here is a straightforward conversion to "struct device". The "struct class_device" will be removed from the kernel. It seems to work fine for me with and without CONFIG_SYSFS_DEPRECATED set. Signed-off-by: Stefan Richter commit 59337087cb33db58aa0d4463892b4475cf66a50b Author: Stefan Richter Date: Wed Jul 4 23:13:53 2007 +0200 ieee1394: raw1394: fix a 32/64-bits compat fix I was told that only i386 aligns 64 bit integers at 4 bytes boundaries while all other architectures (32 bit architectures with 64 bit siblings) align it on 8 bytes boundaries. Signed-off-by: Stefan Richter commit 19f00e66f8aa7ee581c6d003fd68ee9f9dee4057 Author: Stefan Richter Date: Mon May 21 18:52:06 2007 +0200 ieee1394: raw1394: Add ioctl() for 32bit userland on 64bit kernel, amendment Pointed out by Arnd Bergmann: PPC32 aligns this at 64bit, IA32 packs it. A kernel-wide available __compat_u64 which is 4-byte aligned on AMD64 and IA64 would be nicer though. Signed-off-by: Stefan Richter commit 650c12c528d3e0ac69405dd35d3bc8a7228e49f2 Author: Petr Vandrovec Date: Mon May 7 04:14:47 2007 +0200 ieee1394: raw1394: Add ioctl() for 32bit userland on 64bit kernel Add compat_ioctl. Although all structures are more or less same, raw1394_iso_packets got pointer inside, and raw1394_cycle_timer got unwanted padding in the middle. I did not add any translation for ioctls passing array of integers around as integers seem to have same size (32 bits) on all architectures supported by Linux. Signed-off-by: Petr Vandrovec Acked-by: Dan Dennedy Signed-off-by: Stefan Richter (split into 3 patches) commit 883b97eaf2a3fba7628f9f78ca7dc422aaf9728b Author: Petr Vandrovec Date: Mon May 7 04:14:47 2007 +0200 ieee1394: raw1394: Fix write() for 32bit userland on 64bit kernel * write(fd, buf, 52) from 32bit app was returning 56. Most of callers did not care, but some (arm registration) did, and anyway it looks bad if request for writing 52 bytes returns 56. And returning sizeof anything in 'int' is not good as well. So all functions now return '0' instead of sizeof(struct raw1394_request) on success, and write() itself provides correct return value (it just returns value it was asked to write on success as raw1394 does not do any partial writes at all). * Related to this was problem that write() could have returned 0 when kernel state would become corrupted and moved to different state than opened/initialized/connected. Now it returns -EBADFD which seemed appropriate. Signed-off-by: Petr Vandrovec Acked-by: Dan Dennedy Signed-off-by: Stefan Richter (split into 3 patches) commit ee9be425961c3ccf75553c83a73bf1f707e66d91 Author: Petr Vandrovec Date: Mon May 7 04:14:47 2007 +0200 ieee1394: raw1394: Fix read() for 32bit userland on 64bit kernel read() always failed with -EFAULT. This was happening due to raw1394_compat_read copying data to wrong location - access_ok always failed as 'r' is kernel address, not user. Whole function just tried to copy data from 'r' to 'r', which is not good. Signed-off-by: Petr Vandrovec Acked-by: Dan Dennedy Signed-off-by: Stefan Richter (split into 3 patches) commit 6552731a058a4facefd921b0b45a9a5392baa5ea Author: Stefan Richter Date: Sat May 19 12:29:37 2007 +0200 ieee1394: add comments in struct hpsb_packet to clarify who is supposed to set what Signed-off-by: Stefan Richter commit 17a624869ea470e33c708871978223c3d9a4c417 Author: Stefan Richter Date: Thu May 3 20:24:19 2007 +0200 ieee1394: ohci1394: remove dead CONFIG variable spotted by Robert P. J. Day Signed-off-by: Stefan Richter commit 27a278aa4309df244a2619f47031acce00ca1b7c Author: Adrian Bunk Date: Mon Jul 9 23:17:59 2007 +0200 drivers/ide/ide-dma.c: unexport ide_set_dma ide_set_dma no longer has any modular user. Signed-off-by: Adrian Bunk Signed-off-by: Bartlomiej Zolnierkiewicz commit bdab00b73d2f77075a3c73556e2692bf06849c17 Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 9 23:17:58 2007 +0200 via82cxxx: backport short cables support from pata_via.c Backport short cables support from pata_via.c. This patch should allow UDMA > 2 modes on Acer Ferrari 3400. Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Sergei Shtylyov commit f2befd9e80b39a5aa54d65cf59b6a5feb9a8117e Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 9 23:17:58 2007 +0200 sis5513: backport short cables support from pata_sis.c Backport short cables support from pata_sis.c. This patch allows UDMA > 2 modes on ASUS A6K. Thanks to testing this patch goes out to Jiri Stavinoha. Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Sergei Shtylyov commit 95ba8c17bc57bf4666e9de2be715b69d9a1ba211 Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 9 23:17:58 2007 +0200 alim15x3: backport short cables support from pata_ali.c Backport short cables support from pata_ali.c and while at it cleanup existing cable detection code. This patch should allow UDMA > 2 modes on HP Pavilion N5430 and Fujitsu P2000. Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Sergei Shtylyov commit 7207626f47a3d66ce361bad197eefca4b8a6fa17 Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 9 23:17:58 2007 +0200 piix: backport short cables support from ata_piix.c Backport short cables support from ata_piix.c. This patch should allow UDMA > 2 modes on: - Acer 5602WLMi - Acer 3682WLMi - Asus W5F - Acer Aspire 2023WLMi Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Sergei Shtylyov commit 49521f97ccd3c2bf6e71a91cea8fe65d170fa4fb Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 9 23:17:58 2007 +0200 ide: add short cables support This patch allows users to override both host and device side cable detection with "ideX=ata66" kernel parameter. Thanks to this it should be now possible to use UDMA > 2 modes on systems (laptops mainly) which use short 40-pin cable instead of 80-pin one. Next patches add automatic detection of some systems using short cables. Changes: * Rename hwif->udma_four to hwif->cbl and make it u8. * Convert all existing users accordingly (use ATA_CBL_* defines while at it). * Add ATA_CBL_PATA40_SHORT support to ide-iops.c:eighty_ninty_three(). * Use ATA_CBL_PATA40_SHORT for "ideX=ata66" kernel parameter. Signed-off-by: Bartlomiej Zolnierkiewicz Reviewed-by: Sergei Shtylyov commit 75b1d97535327d0428c6bffd9d5407e65546fd5d Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 9 23:17:57 2007 +0200 ide: convert ide_find_best_mode() users to use ide_max_dma_mode() ide-timing.h: * remove handling of DMA modes from ide_find_best_mode() and rename it to ide_find_best_pio_mode() * drop no longer needed "map" argument from ide_find_best_pio_mode() and delete needless ->id check * remove no longer needed XFER_SWDMA and XFER_UDMA* defines au1xxx-ide.c: * use ide_max_dma_mode() instead of ide_find_best_mode() * remove needless CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA #ifdef amd74xx.c: * store UDMA masks in amd_ide_chip[] and while at it make "base" field to be u8 instead of unsigned long * convert the driver to use UDMA masks from amd_ide_chip[] * use ide_max_dma_mode() and ide_find_best_pio_mode() instead of ide_find_best_mode() * delete stale comment from amd74xx_ide_dma_check() * remove no longer needed AMD_UDMA* defines via82cxxx.c: * remove unused DISPLAY_VIA_TIMINGS define * store UDMA masks in via_isa_bridges[] and while at it make "flags" field to be u8 instead of u16 * convert the driver to use UDMA masks from via_isa_bridges[] * use ide_max_dma_mode() and ide_find_best_pio_mode() instead of ide_find_best_mode() * remove no longer needed VIA_UDMA* defines pmac.c: * use ide_max_dma_mode() instead of ide_find_best_mode() There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz Reviewed-by: Sergei Shtylyov commit 15a4f943e729d8ba215ee551df6d7988ba14ac00 Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 9 23:17:57 2007 +0200 ide: fix pre-EIDE SWDMA support If the word 62 is not defined use the word 52 to get SWDMA mask in ide_get_mode_mask(). Signed-off-by: Bartlomiej Zolnierkiewicz commit ecea57309e826c8aed020e4dae92b368f2eda2a5 Author: Andi Drebes Date: Mon Jul 9 23:17:57 2007 +0200 drivers/ide/legacy/hd.c: Array size calculation using sizeof replaced with ARRAY_SIZE This patch replaces an array size calculation in drivers/ide/legacy/hd.c that was done using sizeof with the ARRAY_SIZE macro. Tested by compilation on an i386 box using "allyesconfig". Diffed against Linus' git-tree. Signed-off-by: Andi Drebes Signed-off-by: Bartlomiej Zolnierkiewicz commit f50f9d8867b95925078ba0fa450e3a5736629d28 Author: Robert P. J. Day Date: Mon Jul 9 23:17:57 2007 +0200 ide: remove content related to dead CONFIG_BLK_DEV_MAC_MEDIABAY config variable Signed-off-by: Robert P. J. Day Signed-off-by: Bartlomiej Zolnierkiewicz commit e71bc140c013dfaff0369ebcc9802a798e358473 Author: Robert P. J. Day Date: Mon Jul 9 23:17:57 2007 +0200 ide: remove references to the non-existent CONFIG_SCSI_EATA_DMA Signed-off-by: Robert P. J. Day Signed-off-by: Bartlomiej Zolnierkiewicz commit 74c8f97a6c2d12fb144ad34076e969e8a01dc4b3 Author: Robert P. J. Day Date: Mon Jul 9 23:17:57 2007 +0200 ide-cd: replace C code with call to ARRAY_SIZE() macro Delete the unnecessary macro ARY_LEN and use ARRAY_SIZE directly. Signed-off-by: Robert P. J. Day Signed-off-by: Bartlomiej Zolnierkiewicz commit f3577db0c294ab4ce8460a8003312474b509e95f Author: Junio C Hamano Date: Mon Jul 9 23:17:57 2007 +0200 ide_in_drive_list(): "ALL" is not a wildcard anymore This removes the support to treat "ALL" as a wildcard for firmware revision. This is made a separate patch, as it will break out-of-tree ide drivers that feed its own table that uses "ALL" as the wildcard to ide_in_drive_list(). Signed-off-by: Junio C Hamano Cc: Alan Cox Cc: Dave Jones Signed-off-by: Bartlomiej Zolnierkiewicz commit bb53cfe9fa21c4f875d5c9470865fbbd0657804e Author: Junio C Hamano Date: Mon Jul 9 23:17:56 2007 +0200 mips au1xxx_ide.h: use NULL as firmware-revision wildcard This updates the DMA whitelist in MIPS specific au1xxx ide driver to use NULL instead of "ALL" as the wildcard. Signed-off-by: Junio C Hamano Cc: Alan Cox Cc: Dave Jones Signed-off-by: Bartlomiej Zolnierkiewicz commit c2d3ce8c39cb17dfc8d0426a98bd79f5d7b21e36 Author: Junio C Hamano Date: Mon Jul 9 23:17:56 2007 +0200 ide_in_drive_list(): accept NULL as the wildcard for firmware revision Earlier, the matching of (model,rev) in ide-dma black/white list handling was to consider "ALL" in the table to match any revision. This makes NULL to be also an accepted wildcard, and changes the entries of tables in ide-dma.c to use NULL. The code still accepts "ALL" as the wildcard, in order to keep any out-of-tree ide driver that feeds its own table that uses "ALL" as the wildcard to ide_in_drive_list() function from breaking. Signed-off-by: Junio C Hamano Cc: Alan Cox Cc: Dave Jones Signed-off-by: Bartlomiej Zolnierkiewicz commit 6d78013bfc20b8579827fc8f214c6f85d469c051 Author: Sergei Shtylyov Date: Mon Jul 9 23:17:56 2007 +0200 aec62xx: kill speedproc() method wrapper (take 2) There's no reason to have the speedproc() method wrapper for the two quite different chip families, so just get rid of it. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit f9383c4269d264c3cf563bd2de365891f6592ebd Author: Matthias Kaehlcke Date: Mon Jul 9 23:17:56 2007 +0200 ide: use mutex instead of ide_setting_sem semaphore in IDE driver The IDE driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Signed-off-by: Bartlomiej Zolnierkiewicz -- commit 1b9da32a2855afa3c5f27690e03a33dc97410c42 Author: Sergei Shtylyov Date: Mon Jul 9 23:17:56 2007 +0200 aec62xx: remove init_dma() method (take 2) Get rid of the init_dma() method (which had no particular reason to exist) by folding it into the init_hwif() method. While at it, also perform some cleanup in the latter method: - get rid of the useless clearing of hwif->autodma; - fold the serialization code into one 'if' statement; - fold setting the drives' 'autotune' and 'autodma' fields into the single statements... Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit b1d19db4e770a752ec032971388fa69a73c84919 Author: Sergei Shtylyov Date: Mon Jul 9 23:17:56 2007 +0200 aec62xx: rework init_setup_aec6x80() Rework init_setup_aec6x80() so that it won't rewrite the constant name strings anymore -- in order to do this: - in aec62xx_init_one(), pass a local copy of 'struct pci_device_id' down the call chain; - change the names for in aec62xx_chipsets[] to default to AEC-6280[R]; - override the 'name' field in init_setup_aec6x80() only if bit 4 of the DMA status register is set. While at it, also change the 'udma_mask' field for AEC-6x80R chips in this function and remove the code doing the same from the init_hwif() method... Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 83a6d4ab3b09c0c1921b657bbaac5ada3c9c3623 Author: Sergei Shtylyov Date: Mon Jul 9 23:17:55 2007 +0200 cmd64x: init. code cleanup Fix two minor issues with PCI0646 chip reporting in the init_chipset() method: "IRQ workaround enabled" message printed out not only for revision 0x01 and "CMD646: chipset revision" printed twice (by IDE core and the driver itself). Also, remove empty/pointless switch cases for the chips other than PCI0646, duplicate write to the MRDMODE register when enabling interrupts and MEMORY READ LINE cycles, and needless/misplaced initialization of the timing registers in this method. Switch to reading only the PCI revision ID register itself, not the whole 32 bits at its address in init_chipset() and init_hwif() methods; in addition, get rid of the useless clearing of hwif->autodma and perform some cosmetic style changes in the latter method. Refactor ata66_cmd64x() by moving all the code into the 'switch' statement, renaming/adding variables, and fixing the coding style. While at it, finally get rid of the meaningless aliasing register #define's... Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 2648e5d9a80d8a020feb343c52a8704e978e60c6 Author: Sergei Shtylyov Date: Mon Jul 9 23:17:55 2007 +0200 hpt366: simplify UltraDMA filtering (take 4) Simplify UltraDMA mode filtering in the driver: - make use of the newly introduced 'udma_mask' field of 'ide_pci_device_t' to set the correct hwif->ultra_mask, modifying init_setup_hpt366() to select the correct mask based on the chip revision; - replace 'max_mode' field of the 'struct hpt_info' with 'max_ultra' specifying the maximum UltraDMA mode allowed; - rewrite hpt3xx_udma_filter() to differ the filters based on the 'chip_type' field, and only use it for HPT366 and HPT370[A] where it's really necessary. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit ef29888ea8e1fdc499e995260195b66fc91d2728 Author: Matthias Kaehlcke Date: Mon Jul 9 23:17:55 2007 +0200 ide: use mutex instead of ide_cfg_sem semaphore in IDE driver The IDE driver uses a semaphore as mutex. Use the mutex API instead of the (binary) semaphore. Signed-off-by: Matthias Kaehlcke Signed-off-by: Bartlomiej Zolnierkiewicz commit c283f5dbe31920ca70b80a594a97bfaa2a28be13 Author: Sergei Shtylyov Date: Mon Jul 9 23:17:54 2007 +0200 ide: make void and rename ide_dma_timeout() method Since ide_dma_timeout() method's result is discarded, make it return 'void'. While at it, drop 'ide_' from the method's name, drop the '__' prefix from the default method's name, and do some cleanups in this method driver-wise: - in ide-dma.c, au1xxx-ide.c, and pdc202xx_old.c, define/use 'hwif' variable; - in au1xxx-ide.c, get rid of commented out printk(); - in sl82c105.c, get rid of unnecessary variables. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 841d2a9bf16471716ba3a5172d24aa40a2ea9398 Author: Sergei Shtylyov Date: Mon Jul 9 23:17:54 2007 +0200 ide: make void and rename ide_dma_lostirq() method Since ide_dma_lostirq() method's result is discarded, make it return 'void'. While at it, rename the method to dma_lost_irq(), drop the '__' prefix from the default method's name, and do some cleanups in this method driver-wise: - in aec62xx.c, rename the method in accordance with other drivers, and get rid of unnecessary variables there; - in pdc202xx_old.c, define/use 'hwif' variable; - in sgiioc4.c, rearrange the code to call the resetproc() method directly. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit b740d8846e2e184909e9f74d4ad9d67ae0e084ea Author: Bartlomiej Zolnierkiewicz Date: Mon Jul 9 23:17:53 2007 +0200 serverworks: always tune CSB6 Switch the driver to always program DMA/PIO timings and set device transfer mode instead of trusting BIOS on CSB6 controllers (libata pata_serverworks.c driver is also doing things this way and there were no problems reported so far). While doing conversion I noticed that the old code had many issues: * the code was assuming that hwif->dma_status is always valid (which obviously isn't true if hwif->dma_base == NULL) * value of "(ultra_timing >> (4*unit)) & ~(0xF0)" expression wasn't checked to fit into udma_modes[5] * code validating DMA timings didn't validate corresponding PIO timings * extra CSB5 PIO register wasn't validated et all * hwif->ide_dma_off_quietly() is always called before ide_set_dma() (which in turn calls hwif->speedproc() method - svwks_tune_chipset() in this case) so the code depending on DMA capable bit of DMA status to be set was never executed (=> the code was never validating DMA timings despite actually enabling DMA if the PIO timings were OK!) * on resume driver dependend entirely on BIOS to restore timings and set transfer mode on the device While at it: There is no need to read PIO/MWDMA timings now so don't do it. Signed-off-by: Bartlomiej Zolnierkiewicz Acked-by: Alan Cox commit 71d441ddb51941d9d8279bdc858f965711b85c14 Merge: c31f2e8... 288e4d8... Author: Linus Torvalds Date: Mon Jul 9 13:09:16 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Update print_hex_dump() syntax JFS: use print_hex_dump() rather than private dump_mem() function JFS: Whitespace cleanup and remove some dead code commit c31f2e8a42c41efa46397732656ddf48cc77593e Author: Ingo Molnar Date: Mon Jul 9 18:52:01 2007 +0200 sched: add CFS credits add credits for recent major scheduler contributions: Con Kolivas, for pioneering the fair-scheduling approach Peter Williams, for smpnice Mike Galbraith, for interactivity tuning of CFS Srivatsa Vaddagiri, for group scheduling enhancements Signed-off-by: Ingo Molnar commit 6fb43d7b50e49a36f8be3199141bec473e5ecb00 Author: Ingo Molnar Date: Mon Jul 9 18:52:01 2007 +0200 sched: micro-optimize mmdrop() micro-optimize mmdrop(). Improves schedule()'s assembly a bit. Signed-off-by: Ingo Molnar commit 9c4801cebc2add1fe514bc8eb201b16372eee11a Author: Ingo Molnar Date: Mon Jul 9 18:52:01 2007 +0200 sched: more agressive idle balancing the Linux scheduler is starving a number of workloads. So default to more agressive idle-balancing. This hurts lmbench context-switching numbers (which was the main reason we sucked at idle-balancing for such a long time) but the lmbench numbers are fine once the system is minimally utilized. Signed-off-by: Ingo Molnar commit 0fec171cdbd7763ef86cbaccb91f3708de6a9003 Author: Ingo Molnar Date: Mon Jul 9 18:52:01 2007 +0200 sched: clean up sleep_on() APIs clean up the sleep_on() APIs: - do not use fastcall - replace fragile macro magic with proper inline functions Signed-off-by: Ingo Molnar commit 9761eea8516d1ff2c7b185e283c5d81cfc307acb Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: style cleanups 4 small style cleanups to sched.c: checkpatch.pl is now happy about the totality of sched.c [ignoring false positives] - yay! ;-) Signed-off-by: Ingo Molnar commit 23bdd703a585a869f2eb32fb9f66749d0476d71e Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: do not set softirqs to nice +19 do not set softirqs to nice +19. _If_ for whatever reason we missed to process some high-prio softirq and woke up ksoftirqd, we should give it a fair chance to actually get some work done, even if the system is under load. Signed-off-by: Ingo Molnar commit ff80a77f20f811c0cc5b251d0f657cbc6f788385 Author: Mike Galbraith Date: Mon Jul 9 18:52:00 2007 +0200 sched: simplify sched_find_first_bit() simplify sched_rt.c's sched_find_first_bit() function: there are only 100 RT priority levels left. Signed-off-by: Ingo Molnar commit 5e7eaade55d53da856f0e07dc9c188f78f780192 Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: add CFS documentation add Documentation/sched-design-CFS.txt Signed-off-by: Ingo Molnar commit b642b6d3fad45f659270a9e35df876b38c489082 Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: scheduler debugging, enable in Kconfig enable CONFIG_SCHED_DEBUG in lib/Kconfig.debug. the runtime overhead of this option is very small. Signed-off-by: Ingo Molnar commit 43ae34cb4cd650d1eb4460a8253a8e747ba052ac Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: scheduler debugging, core scheduler debugging core: implement /proc/sched_debug and /proc//sched files for scheduler debugging. Signed-off-by: Ingo Molnar commit 77e54a1f88a1cb0746c7694fa40052bd02df1123 Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: add CFS debug sysctls add CFS debug sysctls: only tweakable if SCHED_DEBUG is enabled. This allows for faster debugging of scheduler problems. Signed-off-by: Ingo Molnar commit 7dd593608df3f9d4e4531cfe29f28c3a3766a0ee Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: remove old cpu accounting field remove the old cpu-accounting field from signal_struct, now that the code is using CFS's stats. Signed-off-by: Ingo Molnar commit b2cfba19f67228e78e48177187f6b07f4107c784 Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: remove unused rq types from sched.c remove unused rq types from sched.c, now that we switched over to CFS. Signed-off-by: Ingo Molnar commit 0c57d5893e4a9857ff22ec9e379f6bdbdad50850 Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: remove batch_task() batch_task() in sched.h is now unused - remove it. Signed-off-by: Ingo Molnar commit 50e645a8a1a91f57dd5d8454620be5f1cb0fc089 Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: remove interactivity types from sched.h remove now-unused types/fields used by the old scheduler. Signed-off-by: Ingo Molnar commit 634fa8c97cc8f4ee2ae1dea7200ff0df762405e7 Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: remove interactivity types remove now unused interactivity-heuristics related defined and types of the old scheduler. Signed-off-by: Ingo Molnar commit dff06c157b6089b774514337769a3c1b7ccccf6c Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: clean up include files in sched.c clean up include files in sched.c, they were still old-style . Signed-off-by: Ingo Molnar commit ad46c2c4ebcead75cd364a79b63b134393094fb9 Author: Ingo Molnar Date: Mon Jul 9 18:52:00 2007 +0200 sched: clean up fastcall uses of sched_fork()/sched_exit() sched_fork()/sched_exit() does not need to specify fastcall anymore, as the x86 kernel defaults to regparm3, and no assembly code calls these functions. Signed-off-by: Ingo Molnar commit 172ba844a8851c3edd13c0a979cdf46bd5e3cc1a Author: Balbir Singh Date: Mon Jul 9 18:52:00 2007 +0200 sched: update delay-accounting to use CFS's precise stats update delay-accounting to use CFS's precise stats. Signed-off-by: Ingo Molnar commit b27f03d4bdc145a09fb7b0c0e004b29f1ee555fa Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: make use of precise accounting for /proc task stats make use of CFS's precise accounting to drive /proc//stat statistics. this code was co-authored by: Balbir Singh Dmitry Adamushko Ingo Molnar Signed-off-by: Ingo Molnar Signed-off-by: Dmitry Adamushko commit 1b9f19c2125dd1021b9327111dc40b14b557ee12 Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: turn on the use of unstable events make use of sched-clock-unstable events. Signed-off-by: Ingo Molnar commit bb29ab26863c022743143f27956cc0ca362f258c Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: x86, track TSC-unstable events track TSC-unstable events and propagate it to the scheduler code. Also allow sched_clock() to be used when the TSC is unstable, the rq_clock() wrapper creates a reliable clock out of it. Signed-off-by: Ingo Molnar commit dd41f596cda0d7d6e4a8b139ffdfabcefdd46528 Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: cfs core code apply the CFS core code. this change switches over the scheduler core to CFS's modular design and makes use of kernel/sched_fair/rt/idletask.c to implement Linux's scheduling policies. thanks to Andrew Morton and Thomas Gleixner for lots of detailed review feedback and for fixlets. Signed-off-by: Ingo Molnar Signed-off-by: Mike Galbraith Signed-off-by: Dmitry Adamushko Signed-off-by: Srivatsa Vaddagiri commit f3479f10c5d667e591f4417a0bba78e221924206 Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: remove the sleep-bonus interactivity code remove the sleep-bonus interactivity code from the core scheduler. scheduling policy is implemented in the policy modules, and CFS does not need such type of heuristics. Signed-off-by: Ingo Molnar commit c18a17329b3389315e8a138d998b217077509c13 Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: remove expired_starving() remove the expired_starving() heuristics from the core scheduler. CFS does not need it, and this did not really work well in practice anyway, due to the rq->nr_running multiplier to STARVATION_LIMIT. Signed-off-by: Ingo Molnar commit f2ac58ee617fd9f6cd9922fbcd291b661d7c9954 Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: remove sleep_type remove the sleep_type heuristics from the core scheduler - scheduling policy is implemented in the scheduling-policy modules. (and CFS does not use this type of sleep-type heuristics) Signed-off-by: Ingo Molnar commit 45bf76df4814a4cd1c57226ae001c464467cb656 Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: cfs, add load-calculation methods add the new load-calculation methods of CFS. Signed-off-by: Ingo Molnar commit 14531189f0a1071b928586e9e1a89eceac91d95f Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: clean up __normal_prio() position clean up: move __normal_prio() in head of normal_prio(). no code changed. Signed-off-by: Ingo Molnar commit 71f8bd4600521fecb08644072052b85853a5a615 Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: cleanup: move dequeue/enqueue_task() cleanup: move dequeue/enqueue_task() to a more logical place, to not split up __normal_prio()/normal_prio(). Signed-off-by: Ingo Molnar commit c24d20dbef948487cd14f15dbf04644142e9f886 Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: move around resched_task() move resched_task()/resched_cpu() into the 'public interfaces' section of sched.c, for use by kernel/sched_fair/rt/idletask.c Signed-off-by: Ingo Molnar commit 62480d13d5d1812176e969a47e2db78a5398d02e Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: remove the SleepAVG field remove the SleepAVG field from /proc//status, as with the removal of the sleep-average code this value no longer makes sense. Signed-off-by: Ingo Molnar commit e05606d3301525aa67b081ad9fccade2b31ab35a Author: Ingo Molnar Date: Mon Jul 9 18:51:59 2007 +0200 sched: clean up the rt priority macros clean up the rt priority macros, pointed out by Andrew Morton. Signed-off-by: Ingo Molnar commit 138a8aeb5b9e5c5abd5e5ec22b6d1848e7e9c50b Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: add cfs_rq ops add the set_task_cfs_rq() abstraction needed by CONFIG_FAIR_GROUP_SCHED. (not activated yet) Signed-off-by: Ingo Molnar commit 41b86e9c510ae66639bf29d3201e1d2384a7fde6 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: make posix-cpu-timers use CFS's accounting information update the posix-cpu-timers code to use CFS's CPU accounting information. Signed-off-by: Ingo Molnar commit 20d315d42aed95423a7203e1d7e84086004b5a00 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: add rq_clock()/__rq_clock() add rq_clock()/__rq_clock(), a robust wrapper around sched_clock(), used by CFS. It protects against common type of sched_clock() problems (caused by hardware): time warps forwards and backwards. Signed-off-by: Ingo Molnar commit 6aa645ea5f7a246702e07f29edc7075d487ae4a3 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: cfs rq data types add the CFS rq data types to sched.c. (the old scheduler fields are still intact, they are removed by a later patch) Signed-off-by: Ingo Molnar commit 20b8a59f2461e1be911dce2cfafefab9d22e4eee Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: cfs, core data types add the CFS data types to sched.h. (the old scheduler is still fully intact.) Signed-off-by: Ingo Molnar commit fa72e9e484c16f0c9aee23981917d8c8c03f0482 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: cfs core, kernel/sched_idletask.c add kernel/sched_idletask.c - which implements the idle thread scheduling class. This further simplifies sched.c (under CFS), for example a number of 'if (p == rq->idle)' type of special-cases can be removed from sched.c, and schedule() gets simpler too. Signed-off-by: Ingo Molnar commit bb44e5d1c6b3b748e0facf8f516b3162009feb27 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: cfs core, kernel/sched_rt.c add kernel/sched_rt.c: SCHED_FIFO/SCHED_RR support. The behavior and semantics of SCHED_FIFO/SCHED_RR tasks is unchanged. Signed-off-by: Ingo Molnar commit bf0f6f24a1ece8988b243aefe84ee613099a9245 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: cfs core, kernel/sched_fair.c add kernel/sched_fair.c - which implements the bulk of CFS's behavioral changes for SCHED_OTHER tasks. see Documentation/sched-design-CFS.txt about details. Authors: Ingo Molnar Dmitry Adamushko Srivatsa Vaddagiri Mike Galbraith Signed-off-by: Ingo Molnar Signed-off-by: Mike Galbraith Signed-off-by: Dmitry Adamushko Signed-off-by: Srivatsa Vaddagiri commit 9aa7b369819940cb1f3c74ba210516739a32ad95 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: increase the resolution of smpnice increase SMP-nice's resolution. This is needed by CFS to implement SCHED_IDLE and cleaned up nice level support. no behavioral changes. Signed-off-by: Ingo Molnar commit 425e0968a25fa3f111f9919964cac079738140b5 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: move code into kernel/sched_stats.h create sched_stats.h and move sched.c schedstats code into it. This cleans up sched.c a bit. no code changes are caused by this patch. Signed-off-by: Ingo Molnar commit 1df21055e34b6a68d62cf0c524b9e52deebd7ead Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: add init_idle_bootup_task() add the init_idle_bootup_task() callback to the bootup thread, unused at the moment. (CFS will use it to switch the scheduling class of the boot thread to the idle class) Signed-off-by: Ingo Molnar commit 4da1ce6d9c7e2a6d9236bf4dcfd33cf506082794 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: add in_atomic_preempt_off() add in_atomic_preempt_off() - debugging helper that will simplify schedule(). Signed-off-by: Ingo Molnar commit f64f61145a38f7039e4f1c0b50dcc3fbe70ec28e Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: remove sched_exit() remove sched_exit(): the elaborate dance of us trying to recover timeslices given to child tasks never really worked. CFS does not need it either. Signed-off-by: Ingo Molnar commit c65cc8705256ad7524c97564b4fe3ca9782bf6d1 Author: Ingo Molnar Date: Mon Jul 9 18:51:58 2007 +0200 sched: uninline set_task_cpu() uninline set_task_cpu(): CFS will add more code to it. Signed-off-by: Ingo Molnar commit 0437e109e1841607f2988891eaa36c531c6aa6ac Author: Ingo Molnar Date: Mon Jul 9 18:51:57 2007 +0200 sched: zap the migration init / cache-hot balancing code the SMP load-balancer uses the boot-time migration-cost estimation code to attempt to improve the quality of balancing. The reason for this code is that the discrete priority queues do not preserve the order of scheduling accurately, so the load-balancer skips tasks that were running on a CPU 'recently'. this code is fundamental fragile: the boot-time migration cost detector doesnt really work on systems that had large L3 caches, it caused boot delays on large systems and the whole cache-hot concept made the balancing code pretty undeterministic as well. (and hey, i wrote most of it, so i can say it out loud that it sucks ;-) under CFS the same purpose of cache affinity can be achieved without any special cache-hot special-case: tasks are sorted in the 'timeline' tree and the SMP balancer picks tasks from the left side of the tree, thus the most cache-cold task is balanced automatically. Signed-off-by: Ingo Molnar commit 0e6aca43e08a62a48d6770e9a159dbec167bf4c6 Author: Ingo Molnar Date: Mon Jul 9 18:51:57 2007 +0200 sched: add SCHED_IDLE policy this patch adds the SCHED_IDLE policy to sched.h. Signed-off-by: Ingo Molnar commit d15bcfdbe1818478891d714343f037cfe60875f0 Author: Ingo Molnar Date: Mon Jul 9 18:51:57 2007 +0200 sched: rename idle_type/SCHED_IDLE enum idle_type (used by the load-balancer) clashes with the SCHED_IDLE name that we want to introduce. 'CPU_IDLE' instead of 'SCHED_IDLE' is more descriptive as well. Signed-off-by: Ingo Molnar commit feb485d4010e450183bd422d90c0d0f6be98f932 Merge: 58037eb... 2c1d8ae... Author: Jiri Kosina Date: Mon Jul 9 14:23:37 2007 +0200 Merge branches 'debug-module-param' and 'upstream' into for-linus commit 2c1d8aea2ca76df1b1de2aed23e3ceda2a044ed1 Author: Jiri Kosina Date: Wed Jul 4 16:45:59 2007 +0200 HID: handle cases of volume knobs generating relative values There are some devices (for example Dell Multimedia Keyboard SK-8135) that have a volume control knob which generates relative events instead of absolute. hid-input maps them to ABS_VOLUME. HUT pages don't restrict volume to absolute values. Adding REL_VOLUME doesn't seem feasible, nothing knows how to handle it. This patch translates relative ABS_VOLUME events into appropriate number of series of VOLUME_UP or VOLUME_DOWN events respectively, so that userspace sees the correct values in the end. kernel.org bugzilla 5233 Reported-by: Jochen Eisinger Signed-off-by: Jiri Kosina commit 3c5f4b25f3552c9bcb52eb956753a3c8140480b7 Author: Jiri Kosina Date: Thu Jun 28 22:33:47 2007 +0200 HID: Logitech keyboard 0xc311 needs reset leds quirk The keyboard 0x046d/0xc311 needs reset leds quirk Tested-by: Antonino Ingargiola Signed-off-by: Jiri Kosina commit 5f9c464aaa1ba3a773c47004e98eb1f3aa2ab2a4 Author: Ryo Dairiki Date: Mon Jun 25 10:31:12 2007 +0200 HID: support for logitech cordless desktop LX500 special mapping This keyboard has wireless mouse which has left, middle, right buttons and 2-dimensional scrolling wheel. Unfornetuly, this wheel reports side scrolling events and 11 or 12 button events at the same time. I've wrote a patch to fix this mapping. I'm not sure if this mapping is proper for buttons, because , for example, there is no entry for "burn cd" in input.h. The patch also supress 11 and 12 button events from mouse when you scroll the wheel left and right. With this patch, only side scrolling events are reported. (This mouse has only 4 buttons and 2D wheel. There is no such buttons like 11 and 12.) Signed-off-by: Jiri Kosina commit 816cbfda8b5113629707f604660204701e93b7ce Author: Diogo Kastrup Date: Tue Jun 19 14:16:15 2007 +0200 HID: fix autocentering of PID devices When setting the autocentering of PID devices, PID_DIRECTION_ENABLE is not being explicitely set to 1. This results in autocentering working only on the vertical axis when this field is preset to 0. Fix that by setting it explicitely to 1 when preparing the set_effect report for autocentering spring effect. Signed-off-by: Diogo Kastrup Signed-off-by: Anssi Hannula Signed-off-by: Jiri Kosina commit ea9a4a8b0e5a34eca6613e39d21be879d92ecff5 Author: Jiri Kosina Date: Tue Jun 19 14:09:14 2007 +0200 HID: separate quirks for report descriptor fixup Lately there have been quite a lot of bug reports against broken devices which require us to fix their report descriptor in the runtime, before it is passed to the HID parser. Those devices have eaten quite an amount of our quirks space, which isn't particularly necessary - the quirks are not needed after the report descriptor is parsed, and they just consume bits. Therefore this patch separates the quirks for report descriptor fixup, and moves their handling into separate code. The quirks are then forgotten as soon as the report descriptor has been parsed. Module parameter 'rdesc_quirks' is introduced to be able to modify these quirks in runtime in a similar way to 'quirks' parameter for ordinary HID quirks. Signed-off-by: Jiri Kosina commit b8e98f1c47b743e56f8ebe21006199cefd577ce5 Author: Jiri Kosina Date: Mon Jun 18 17:41:14 2007 +0200 HID: Add NOGET quirk for all NCR devices Devices manufactured by NCR have userspace hiddev-based drivers, which do all the necessary device querying by themselves. The devices must not be queried directly by the generic HID driver, as reported by NCR engineers. Cc: Petr Ostadal Signed-off-by: Jiri Kosina commit 92d9e6e607eb7f8f1d2a43935f45cf300cf6fdf8 Author: Jiri Kosina Date: Mon Jun 18 13:30:11 2007 +0200 HID: support for Petalynx Maxter remote control Petalynx Maxter remote control [1] 0x18b1/0x0037 emits 0xfa and 0xfc from consumer page (reserved in HUT 1.12) for back and more keys. It also emits a few usages from LOGIVENDOR page, which need adding. Also, this device has broken report descriptor - the reported maximum is too low - it doesn't contain the range for 'back' and 'more' keys, so we need to bump it up before the report descriptor is being parsed. Besides all this, it also requires NOGET quirk. This patch does so. [1] http://www.elmak.pl/index.php?option=com_phpshop&page=shop.browse&category_id=14&ext=opis&lang=en Signed-off-by: Jiri Kosina commit 5fce620c0c7caa9e8d9588e8dcc66c52c456851a Author: Hans de Goede Date: Tue Jun 12 22:04:32 2007 +0200 HID: fix mismatch between hid-input HUT find/search mapping and the HUT When comparing usb vs ps2 / testing the keycodes generated for the easy access keys on my trust (microsoft compatible) keyboard. I noticed the search key generated the keycode for find when connected through USB. This lead me to check the consumer page mappings in hid-input.c . And it turns out the the mapping for ID 0x221 deviates from the HUT standard document: http://www.usb.org/developers/devclass_docs/Hut1_12.pdf Currently it is incorrectly mapped to find, whereas it should be mapped to search. I also added missing bindings for ID 0x21f, the real find and for 0x222, goto. Signed-off-by: Hans de Goede Signed-off-by: Jiri Kosina commit 1b3ebe931195725cceee825c430a8bd5319c2566 Author: Julien Eyries Date: Tue Jun 12 10:12:40 2007 +0200 HID: support for Gameron dual psx adaptor This patch provides support for the Gameron dual psx adaptor. The modification is to add the quirk HID_QUIRK_MULTI_INPUT for this specific USB device. Signed-off-by: Julien Eyries Signed-off-by: Jiri Kosina commit 2fa45a4cffd0c4ab4e238e8ad3b4f9b0c10ac1f3 Author: Alan Stern Date: Wed May 30 11:11:12 2007 -0400 USB HID: avoid flush_scheduled_work() This patch (as914) replaces a call to flush_scheduled_work() with cancel_work_sync(), in order to help avoid potential deadlocks. Signed-off-by: Alan Stern Signed-off-by: Jiri Kosina commit 3cd709866f639d24b0d0f38567c19662c98ea92e Author: Jan Engelhardt Date: Mon Apr 30 13:27:48 2007 +0200 HID: Use menuconfig objects Make a "menuconfig" out of the Kconfig objects "menu, ..., endmenu", so that the user can disable all the options in that menu at once instead of having to disable each option separately. Signed-off-by: Jan Engelhardt Signed-off-by: Jiri Kosina commit defd208681b721dbf2b69347cca5302d60246405 Author: Jiri Kosina Date: Sat May 19 16:28:04 2007 +0200 HID: force hid-input for Microsoft SideWinder GameVoice device Microsoft SideWinder GameVoice driver is a trivial device with a few buttons (0x09 HID usage) and an audio connector, which just forwards the audio input into oridinary sound card present in the computer. Despite this fact, the only interface of this device reports itself as a Telephony/Headset type of HID device. This is apparently incorrect - the device itself doesn't provide any audio/telephony functionality. This is achieved in userland application which only needs to receive the button events from the HID driver. This patch establishes a new quirk which forces hid-input to claim a device it will otherwise leave untouched. Reported-by: Tomas Carnecky Signed-off-by: Jiri Kosina commit cb1d93c98c49e268918e35e45e5c407fc4dc4e9f Author: Jiri Kosina Date: Mon May 14 10:20:29 2007 +0200 HID: input mapping for Chicony KU-0418 tactical pad Chicony KU-0418 (aka Saitek PZ08AU gaming keyboard) has a separate "tactical pad" with 11 non-functional buttons - they generate usage codes from 0xff00 (MSVENDOR) usage page. Special case handling for this keyboard added, so no later clash with MSVENDOR mappings is going to occur. Pointed out in bugzilla #7352 Signed-off-by: Jiri Kosina commit 58037eb961f859607b161c50d9d4ecb374de1e8f Author: Jiri Kosina Date: Wed May 30 15:07:13 2007 +0200 HID: make debugging output runtime-configurable There have been many reports recently about broken HID devices, the diagnosis of which required users to recompile their kernels in order to be able to provide debugging output needed for coding a quirk for a particular device. This patch makes CONFIG_HID_DEBUG default y if !EMBEDDED and makes it possible to control debugging output produced by HID code by supplying 'debug=1' module parameter. Signed-off-by: Jiri Kosina commit f2ec8030085a27c4ba8e95a10a96f248efb34177 Author: Thomas Bogendoerfer Date: Thu Jun 28 00:49:06 2007 +0200 Ethernet driver for EISA only SNI RM200/RM400 machines Changes to last version: - spelling fix - cleaned up probe code Thomas. Ethernet driver for EISA only SNI RM200/RM400 machines Signed-off-by: Thomas Bogendoerfer Signed-off-by: Jeff Garzik commit 2187f287e2827556210e96c619f76f0f9dd928f0 Author: Thomas Bogendoerfer Date: Thu Jun 28 00:46:22 2007 +0200 Extract chip specific code out of lasi_82596.c Changes to last version: - use netdev_alloc_skb - make init_rx_bufs just fail and not panic, if skb alloc fails - don/t free_irq, if request_irq failed Thomas. Extracted chip specific code out of lasi_82596.c and placed into a lib82596.c to make it usable for other 82596 drivers Signed-off-by: Thomas Bogendoerfer Signed-off-by: Jeff Garzik commit d1d25aaba85fd24ab18b0a4d22f19be02aac65c9 Author: Jan-Bernd Themann Date: Mon Jul 2 13:00:46 2007 +0200 ehea: Whitespace cleanup This patch fixes several whitespace issues. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit 7c00db3d28131f4fff42eb49632dcd70636f31f4 Author: Olof Johansson Date: Fri Jun 22 15:04:54 2007 -0500 pasemi_mac: Fix TX interrupt threshold It was mistakenly set to interrupt on the second packet instead of first, causing some interesting latency behaviour. Signed-off-by: Olof Johansson Signed-off-by: Jeff Garzik commit e65bbf13dd6ca8c0a4fc35028742c8c85f39c02b Author: Linas Vepstas Date: Thu Jun 14 18:12:23 2007 -0500 spidernet: Replace literal with const Replace literal with const; add bit definitions. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 57a9f236ebe76be6fe1c85b5f7b3cea842e44177 Author: Francois Romieu Date: Mon Jun 4 22:10:15 2007 +0200 r8169: perform RX config change after mac filtering It does not really make sense to update the RX config register before the mac filtering registers. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 773d202194be84cc17d35f62516eac6d8db833e6 Author: Francois Romieu Date: Wed Jan 31 23:47:43 2007 +0100 r8169: mac address change support Merged from Realtek's r8169-6.001 driver. I have added some locking to protect against the arp monitoring timer in the bonding driver. Accessing the configuration registers is otherwise performed under RTNL locking. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 96b9709c9b47c1f9e8fd80e756e8eddcba68e818 Author: Francois Romieu Date: Wed May 30 00:32:05 2007 +0200 r8169: display some extra debug information during startup It does not cost much and it will ease the identification of (so far) unknown devices. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 6cccd6e7a261263cdf06576bd1b241be575638b6 Author: Rolf Eike Beer Date: Mon May 21 22:11:04 2007 +0200 r8169: add endianess annotations to [RT]xDesc Signed-off-by: Rolf Eike Beer Signed-off-by: Francois Romieu Cc: Edward Hsu commit e9f63f30863fd778a5329e93c7e2208b9bcb5b79 Author: Francois Romieu Date: Wed Feb 28 23:16:57 2007 +0100 r8169: align the IP header when there is no DMA constraint Align the IP header when the chipset can DMA at any location (plain 0x8169). Otherwise (0x8136/0x8168) obey the constraint imposed by the hardware. This patch complements the previous alignment rework done for copybreak. Original idea from Philip Craig Signed-off-by: Francois Romieu Cc: Philip Craig Cc: Mike Isely Cc: Edward Hsu commit 275391a482c436282dde57beeffc5d61b229fdd2 Author: Francois Romieu Date: Fri Feb 23 23:50:28 2007 +0100 r8169: add bit description for the TxPoll register Signed-off-by: Francois Romieu Cc: Edward Hsu commit 07d3f51febdc139c63e95671126fd2791113902e Author: Francois Romieu Date: Wed Feb 21 22:40:46 2007 +0100 r8169: cleanup No functionnal change: - trim the old history log - whitespace/indent/case police - unsigned int where signedness does not matter - removal of obsolete assert - needless cast from void * (dev_instance) - remove dead code once related to power management - use netdev_alloc_skb. Signed-off-by: Francois Romieu Cc: Stephen Hemminger Cc: Edward Hsu commit 901dda2b5f0dfbd310d22d497ec8826d4c60363b Author: Francois Romieu Date: Wed Feb 21 00:10:20 2007 +0100 r8169: remove the media option It has been documented as deprecated: - in MODULE_PARM_DESC since may 2005 ; - at the top of the source file and in printk since june 2004. Good bye. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 0127215c17414322b350c3c6fbd1a7d8dd13856f Author: Francois Romieu Date: Tue Feb 20 22:58:51 2007 +0100 r8169: small 8101 comment Extracted from version 1.001.00 of Realtek's r8101. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 864022344caf43dab7fa5219152280d056c6e051 Author: Francois Romieu Date: Tue Feb 20 22:20:51 2007 +0100 r8169: confusion between hardware and IP header alignment The rx copybreak part is straightforward. The align field in struct rtl_cfg_info is related to the alignment requirements of the DMA operation. Its value is set at 2 to limit the scale of possible regression but my old v1.21 8169 datasheet claims a 8 bytes requirements (which never appeared in the driver, of course) and the 8101/8168 go with a plain 8 bytes alignment. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 0e4851502f846b13b29b7f88f1250c980d57e944 Author: Francois Romieu Date: Tue Feb 20 00:00:26 2007 +0100 r8169: merge with version 8.001.00 of Realtek's r8168 driver This one includes: - more tweaks to rtl_hw_start_8168 - a work around for a Rx FiFO overflow issue on the 8168Bb - rtl8169_{intr_mask/napi_event} are replaced with per-device fields, namely tp->{intr/napi}_event - rtl_cfg_info is converted to C99 for readability but the values are not changed for the 8169/8110 and the 8101 Includes ChipCmd fix from Bernhard Walle (2007/02/24). Signed-off-by: Francois Romieu Cc: Edward Hsu commit 6dccd16b7c2703e8bbf8bca62b5cf248332afbe2 Author: Francois Romieu Date: Tue Feb 13 23:38:05 2007 +0100 r8169: merge with version 6.001.00 of Realtek's r8169 driver - new identifier for the 8110SCe - the PCI latency timer is set unconditionally. This part is identical in Realtek's r8168 (8.001.00) and r8101 (1.001.00) - initialization of the cache line size register is for the 8169s only - more magic in rtl_hw_start_8169 - it is not possible to factor out the setting of the the irq event mask with the 8168 and the 8101 any more. Pushed it into the hw_start handler. - rtl_set_rx_tx_config_registers() and write to the ChipCmd register are issued identically for the whole 8169/8110 family: the 8110SCd/8110SCe are handled the same way - work around for AMD platform. Some registers definitions in Realtek's driver are let aside for later. Signed-off-by: Francois Romieu Cc: Edward Hsu commit ba6eb6ee8583a2c7c7f8327be5e5c239fb760b03 Author: Francois Romieu Date: Mon Jun 11 23:35:18 2007 +0200 r8169: prettify mac_version ...still a bit yucky though. Signed-off-by: Francois Romieu Cc: Edward Hsu commit cdf1a608a6ccf9cf1a773969395b58b017bd6f75 Author: Francois Romieu Date: Mon Jun 11 23:29:50 2007 +0200 r8169: populate the hw_start handler for the 8110 Same thing as the previous change for rtl_hw_start_8168. The 8101 related code in rtl_hw_start_8169 (see RTL_GIGA_MAC_VER_13) goes away. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 2dd99530a248bc70e712a5f98e0bc66139a582cb Author: Francois Romieu Date: Mon Jun 11 23:22:52 2007 +0200 r8169: populate the hw_start handler for the 8168 rtl_hw_start_8168 inherits the content of rtl_hw_start_8169 minus the code which depends on RTL_GIGA_MAC_VER_XY (XY != {11/12}). Signed-off-by: Francois Romieu Cc: Edward Hsu commit 7f796d83ffa58c6f752e53dbed8faebb74333e24 Author: Francois Romieu Date: Mon Jun 11 23:04:41 2007 +0200 r8169: add helpers for per-device hw_start handler They aim to limit the amount of moved code when the hw_start handler gets more specialized. No functional change. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 07ce4064677806e330599ade772a914f500e74af Author: Francois Romieu Date: Fri Feb 23 23:36:39 2007 +0100 r8169: add hooks for per-device hw_start handler Rationale: rtl8169_hw_start will not help maintaining an unified driver for different chipsets but people at Realtek are probably too polite to say it distinctly. Let's add the hook and keep hw_start handler unchanged. As can be seen from the content of rtl8169_pci_tbl, the RTL_CFG_1 entry in rtl_cfg_info was unused. I recycled it for the 0x8168. Signed-off-by: Francois Romieu Cc: Edward Hsu commit b449655ff52ff8a29c66c5fc3fc03617e61182ee Author: Stephen Hemminger Date: Sun Jun 17 01:06:49 2007 +0200 r8169: Rx path update - pci_dma_sync_single_for_cpu is not needed for a single large packet - remove the function pointer to help gcc optimizing the inline pci_dma functions. Signed-off-by: Stephen Hemminger Signed-off-by: Francois Romieu Cc: Edward Hsu commit 278667ba186a23770b0dd23ccd26de56a8cc4ec2 Author: David S. Miller Date: Sun Jun 10 17:55:04 2007 -0700 r8169: kill eth_copy_and_sum() It hasn't "summed" anything in over 7 years, and it's just a straight mempcy ala skb_copy_to_linear_data() so just get rid of it. Signed-off-by: David S. Miller Signed-off-by: Francois Romieu Cc: Edward Hsu commit 4ae47c2ddc55e3c571bb55fca921cfe9b02a685f Author: Francois Romieu Date: Sat Jun 16 23:28:45 2007 +0200 r8169: de-obfuscate modulo arithmetic The former style suggests a modulo arithmetic misuse but the expression should never be < 0. Even if it does, the driver will simply loop longer than expected (not that the remaining parts of the system will necessarily appreciate it...). Let's warn the user when something goes wrong and try to go over it. Signed-off-by: Francois Romieu Cc: Edward Hsu commit 15d317587e17dcb96484e46b17b6e826a1f97661 Author: Stephen Hemminger Date: Sat Jun 16 22:36:41 2007 +0200 r8169: use netdev_alloc_skb Use netdev_alloc_skb and remove the useless sk_buff * argument of rtl8169_alloc_rx_skb. Signed-off-by: Stephen Hemminger Signed-off-by: Francois Romieu Cc: Edward Hsu commit a73b629b3519ae97c5325eda346b1749961cfa8d Author: Stephen Hemminger Date: Mon Jun 4 17:23:27 2007 -0700 sky2: version 1.15 New version because of new chip support. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 69161611025b261cb64be70723c0dffe26aeb3ab Author: Stephen Hemminger Date: Mon Jun 4 17:23:26 2007 -0700 sky2: Yukon Extreme (88e8071) support. Enable support for Yukon EX chipset (88e8071). Most of changes are related to new commands to chip for transmit, and change in status and checksumming. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 8f70920f2f2a699b4ad35e625071cd92f4ba6ca3 Author: Stephen Hemminger Date: Mon Jun 4 17:23:25 2007 -0700 sky2: GPIO register The General Purpose I/O register is yet another hardware workaround catchall. Enable workaround that vendor driver does to stay but for bug compatiable. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 451af33552286b426940a32126bd3ece243223a3 Author: Stephen Hemminger Date: Mon Jun 4 17:23:24 2007 -0700 sky2: enable clocks before probe Catch-22: On Yukon EX (88E8071) need to have internal clocks enabled before reading chip id. It is harmless on other chips. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f449c7c10698e49e6c654452f852b1b719273d8a Author: Stephen Hemminger Date: Mon Jun 4 17:23:23 2007 -0700 sky2: rename BMU register This register is more of a test and control register on Yukon2. So rename it to Q_TEST and give some bit definitions. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit fc99fe0618f355b708ce88fedaca9783072ac3d5 Author: Stephen Hemminger Date: Mon Jun 4 17:23:22 2007 -0700 sky2: Add PCI device specfic register 4 & 5 Need to setup more PCI control control registers are on Yukon EX. Some of these also exist on Yukon EC-U as well. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3ead5db7bcd343917e567c083f5faf45f5301664 Author: Stephen Hemminger Date: Mon Jun 4 17:23:21 2007 -0700 sky2: avoid reserved regions on ethtool reg dump On Yukon EX reading some of the undocumented places in the memory space will cause a hang. Since they don't provide useful information, just skip the reserved areas. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3213e3abc68c776589d574decf3e6aee0467d12c Author: Linas Vepstas Date: Mon Jun 11 14:12:09 2007 -0500 spidernet: driver docmentation Documentation for the spidernet driver. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 5f309b90e242a4a9c5519ed113801a7ad542cd48 Author: Linas Vepstas Date: Mon Jun 11 14:09:16 2007 -0500 spidernet: fix misnamed flag The transmit frame tail bit is stranglely misnamed as "no checksum". Fix the name to what it should be: "transmit frame tail". No functional change, just a name change. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 59a11f8809ada4b89ac079fb7f549eaca0554f94 Author: Linas Vepstas Date: Mon Jun 11 14:05:41 2007 -0500 spidernet: move a block of code around Put the enable and disable routines next to one-another, as this makes verifying thier symmetry that much easier. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit e1fd9070729765910b144ffcf74ca199c766509b Author: Linas Vepstas Date: Mon Jun 11 13:59:21 2007 -0500 spidernet: service TX later. When entering the netdev poll routine, empty out the RX chain first, before cleaning up the TX chain. This should help avoid RX buffer overflows. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 9e0a6e2598ac08d14c3388567eae9a4ccea1244f Author: Linas Vepstas Date: Mon Jun 11 13:52:03 2007 -0500 spidernet: invalidate unused pointer. Invalidate a pointer as its pci_unmap'ed; this is a bit of paranoia to make sure hardware doesn't continue trying to DMA to it. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 9948357d49c84102151bc14233c2f489552c1f57 Author: Linas Vepstas Date: Mon Jun 11 13:48:55 2007 -0500 spidernet: enhance the dump routine Crazy device problems are hard to debug, when one does not have good trace info. This patch makes a major enhancement to the device dump routine. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit e6311d855e100184d42c0165ab9d5215fd792c89 Author: Linas Vepstas Date: Mon Jun 11 13:41:38 2007 -0500 spidernet: beautify error messages Use dev_err() to print device error messages. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit 91e745aa46336087e1295d44685ee2839bbba07d Author: Stephen Hemminger Date: Wed May 30 14:23:18 2007 -0700 qla3xxx: cleanup checksum offload code The code for checksum is more complex than needed when dealing with VLAN's; the higher layers already pass down the location of the IP header. Compile tested only, no hardware available. Signed-off-by: Stephen Hemminger Signed-off-by: Ron Mercer Signed-off-by: Jeff Garzik commit 59b34c1260045ca264c0208f2b666e839909e2d4 Author: Yoichi Yuasa Date: Tue Jun 5 22:55:06 2007 +0900 add return value check of request_irq() This patch has added return value check of request_irq() to pcmcia net drivers. Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit d1c0a65fb597697d1fbce4eadf42b84f70483edc Author: Jan Engelhardt Date: Wed Jun 13 12:48:53 2007 -0700 Use menuconfig objects II - netdev (general+100mbit) CONFIG_NETDEVICES, CONFIG_NET_ETHERNET: Change Kconfig objects from "menu, config" into "menuconfig" so that the user can disable the whole feature without having to enter the menu first. CONFIG_SMC9194: Move it so that it appears correctly in menuconfig. Signed-off-by: Jan Engelhardt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 8f036c04a8f3487fa4a2368d99dd74be42b7c6fd Author: Geert Uytterhoeven Date: Wed Jun 6 16:04:39 2007 +0200 acenic: SET_NETDEV_DEV is always there these days acenic: SET_NETDEV_DEV is always there these days Signed-off-by: Geert Uytterhoeven Signed-off-by: Jeff Garzik commit bf0dcbd929faf036f1a4f2918090344d0e249cf5 Author: Stephen Hemminger Date: Mon Jun 4 13:25:40 2007 -0700 b44: use netdev_alloc_skb Use netdev_alloc_skb rather than dev_alloc_skb when allocating receive buffers. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 72f4861ef9b1c1ca6e4abb49854698e80d3b684d Author: Stephen Hemminger Date: Mon Jun 4 13:25:39 2007 -0700 b44: packet offset is constant The receive buffer offset is constant in this driver. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit f65a71775cc3eb5d5d8ac4c349c8f48a7d5c7759 Author: Stephen Hemminger Date: Mon Jun 4 13:25:38 2007 -0700 b44: tx bounce sizing. No need to grap full size MTU buffer for possibly small transmit bounce buffers. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a72a8179734393ca351f6ecf8cad6841ab7e1470 Author: Stephen Hemminger Date: Mon Jun 4 13:25:37 2007 -0700 b44: timer power saving Make the PHY and statistic timer run on one second boundary for powersaving. On resume, the driver should check for link up immediately, to get online faster (rather than waiting for the next second). Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit eb034a7998956bffdd2acccb7fddfc114c913120 Author: Richard Knutsson Date: Sat May 19 22:18:10 2007 +0200 tulip: Convert to generic boolean Signed-off-by: Richard Knutsson Signed-off-by: Jeff Garzik commit 480fe1a31c662ef4ff0598a7cacefa21f98335f1 Author: Divy Le Ray Date: Wed May 30 21:10:58 2007 -0700 cxgb3 - TP SRAM update The chip executes microcode present in internal RAM, whose content is loaded from EEPROM on power cycle. This patch allows an update of the microcode through PIO without forcing a power cycle. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 8a9fab22cf6a3abde7731f4425d4ff87509bc15a Author: Divy Le Ray Date: Wed May 30 21:10:52 2007 -0700 cxgb3 - Firmware update Update FW to 4.1. Proceed to subsequent HW tuning to improve RDMA perfs.. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit cf992af561cc3ba72d79582535e6262818b00548 Author: Divy Le Ray Date: Wed May 30 21:10:47 2007 -0700 cxgb3 - sge page management Streamline sge page management. Fix dma mappings when buffers are recycled. Signed-off-by: Divy Le Ray Signed-off-by: Jeff Garzik commit 287aa83dffd1b39859f49d73b0d67f57106de5f1 Author: Bill Nottingham Date: Wed May 30 03:59:02 2007 -0400 drivers/net: fix comparisons of unsigned < 0 Recent gcc versions emit warnings when unsigned variables are compared < 0 or >= 0. Signed-off-by: Bill Nottingham Signed-off-by: Jeff Garzik commit 40738f3fcdb951fb8ade286dc1ea05812acc94db Author: Komuro Date: Sun May 27 08:57:58 2007 +0900 PCMCIA-NETDEV : add new ID of lan&modem multifunction card fmvj18x_cs: NEC PK-UG-J001 Panasonic CF-VML201 Panasonic TO-PDL9610 pcnet_cs: MICRO-RESEARCH MC336LAN Signed-off-by: Komuro Signed-off-by: Jeff Garzik commit 18ab458fb7bd5c64bef766090020648266cfa9b6 Author: David Brownell Date: Fri May 25 12:31:32 2007 -0700 usbnet whitespace fixes Whitespace updates for usbnet core, mostly switching to tab-only indents. Signed-off-by: David Brownell Signed-off-by: Jeff Garzik commit 2501f843b051621c5a6df7a092a64dfd78b201f7 Author: Richard Knutsson Date: Sat May 19 22:26:40 2007 +0200 8139cp: Convert to generic boolean Signed-off-by: Richard Knutsson Signed-off-by: Jeff Garzik commit 4117b5be4b877cec7c34058f0c239fcf78274e3d Author: Kapil Juneja Date: Fri May 11 18:25:18 2007 -0500 phylib: m88e1111: enable SGMII mode If connected via SGMII, initialize with SGMII mode configured. Signed-off-by: Kapil Juneja Signed-off-by: Andy Fleming Signed-off-by: Kim Phillips Signed-off-by: Jeff Garzik commit d3c12873c36005263286cf5660663c8c10f9d2b5 Author: Kapil Juneja Date: Fri May 11 18:25:11 2007 -0500 gianfar: add support for SGMII Add code for initialising and configuring TBI interface and programming it for connecting to on-chip SERDES (Lynx PHY) in case of SGMII mode selected through HRCW at reset. also add defines for TBI register configuration. TBI interface is programmed towards the SERDES. refactored mdio read/write functions to differentiate programming local interface MII regs (e.g., for TBI) from always programming the mdio master (TSEC1, for programming the PHYs). Signed-off-by: Kapil Juneja Signed-off-by: Andy Fleming Signed-off-by: Kim Phillips Signed-off-by: Jeff Garzik commit 0cefeebaf3da39d768bffcf62460fe2088e824ef Author: Michael Barkowski Date: Fri May 11 18:24:51 2007 -0500 phylib: add the ICPlus IP175C PHY driver The ICPlus IP175C sports a 100Mbit/s 4-port switch in addition to a dedicated 100Mbit/s WAN port. Signed-off-by: Michael Barkowski Signed-off-by: Kim Phillips Signed-off-by: Jeff Garzik commit 146bd683cc160d728f1f62a6ddade8451801a8c3 Author: Linas Vepstas Date: Mon May 14 18:41:41 2007 -0500 s2io: add PCI error recovery support s2io cleanup suggestions, per discussion on mailing lists. Signed-off-by: Linas Vepstas Signed-off-by: Jeff Garzik commit d796fdb708fc5b10112934cba43e832c36ce4923 Author: Linas Vepstas Date: Mon May 14 18:37:30 2007 -0500 s2io: add PCI error recovery support This patch adds PCI error recovery support to the s2io 10-Gigabit ethernet device driver. Third revision, blocks interrupts and the watchdog. Tested, seems to work well. Signed-off-by: Linas Vepstas Acked-by: Ramkrishna Vepa Cc: Raghavendra Koushik Cc: Wen Xiong Signed-off-by: Jeff Garzik commit bd5824f138153f407e300728919e814ab7dcfadb Author: Jouni Malinen Date: Mon May 28 09:38:49 2007 -0700 [PATCH] hostap: Remove driver version number The driver version number has not been updated since the driver was included in the main kernel tree and there is no plan on updating this in the future either. At this point, the only correct way to refer to the version is to use the kernel version. The 0.4.4 version is confusing since there are external version with higher version number even though they are not actually any newer than the in-tree version. Let's get rid of the version number in the kernel tree in order to avoid this kind of confusion. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit c15057313725942c6af8dcb60b4d4322101316d9 Author: Matthias Kaehlcke Date: Mon May 28 09:38:48 2007 -0700 [PATCH] hostap: Use list_for_each_entry Use list_for_each_entry() instead of manual iteration and substitute some list_for_each() loops with list_for_each_entry(). Signed-off-by: Matthias Kaehlcke Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit b918099030fe6cc093a7d60a88039bd98f16538e Author: Pavel Roskin Date: Mon May 28 09:38:47 2007 -0700 [PATCH] hostap: Suppress broadcast if no stations are associated This may be useful in mesh setups when most stations act as repeaters only. Signed-off-by: Pavel Roskin Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 67c4f7aa9e64d37f32eb44d6d093b7028f1060bb Author: Akinobu Mita Date: Sun May 27 23:27:40 2007 +0900 [PATCH] softmac: use list_for_each_entry Cleanup using list_for_each_entry. Cc: Johannes Berg Cc: Joe Jezak Cc: Daniel Drake Signed-off-by: Akinobu Mita Signed-off-by: John W. Linville commit 77548f58070894cf5970a110981e511ffe793369 Author: Larry Finger Date: Sat May 26 22:21:29 2007 -0500 [PATCH] bcm43xx: Fix deviation from specifications in set_baseband_attenuation A disagreement between the specifications and the bcm43xx code has just been discovered and is hereby fixed. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit aaf83d4fc4a596929306c894d341e17fbdfba758 Author: Daniel Drake Date: Thu May 24 01:07:15 2007 +0100 [PATCH] zd1211rw: Make CCK gain patching conditional on RF type The vendor driver code suggests that CR47 patching happens on every channel change for every RF (depending on bit 8 in POD). Due to a bug in their driver (upper bits of RF_Mode get zeroed out, then are examined for 1s when setting some other flags), this isn't actually what happens, and their generic CCK patching routine never takes effect. Some of their RF configurations do include explicit (duplicated) code for CR47 patching though. This patch makes zd1211rw match that behaviour. Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 4481d6093e62e168ab06e9bbb4e67a9bebb8c7f7 Author: Daniel Drake Date: Thu May 24 01:06:53 2007 +0100 [PATCH] zd1211rw: Add UW2453 RF support This patch adds support for another radio appearing in new devices: the Ubec UW2453. It's more complicated than the other RF's we support, but Ubec publish full tech specs so we're able to understand the vendor code relatively well. Now that we support UW2453, we also support Atheros' new USB chip: the AR5007UG. From the little info we have, this appears to be just a rebranded ZD1211B. This RF code doesn't work very well -- lots more TX/RX errors than the other RFs. However, the vendor driver doesn't do any better, so this is all we can do for now. [kune@deine-taler.de: bug fixes] Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 9c8fc71ddd1b42c0c632036333790f230cea815d Author: Daniel Drake Date: Thu May 24 01:06:41 2007 +0100 [PATCH] zd1211rw: Extend RF layer These changes are needed for UW2453 RF support: Add pointer which RF drivers can use to store private RF data Add exit hook so that RF drivers can free private data Allow RF's to disable the generic TX power integration handling code Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit a9eea9ae6e82d1b0f453c24103a84ce7af5d1e15 Author: Daniel Drake Date: Thu May 24 01:06:29 2007 +0100 [PATCH] zd1211rw: Add ID for ZyXEL G-200v2 Tested by Guy Gallagher zd1211 chip 0586:3407 v4721 high 00-13-49 AL2230_RF pa0 g--- FCC ID SI5WUB200Z Signed-off-by: Daniel Drake Signed-off-by: John W. Linville commit 0aec00ae1c39b0adaa6e958a4e0119cfc12d884b Author: John W. Linville Date: Tue Jun 12 22:11:42 2007 -0400 [PATCH] rtl8187: add header blocks and indicate origin of magic values Add top-of-file comment blocks to rtl818x headers and attribute origin of magic values to original r8187 driver. Signed-off-by: John W. Linville commit 7e9400f178d291b2208c4ed9aac0f425c1364000 Author: John W. Linville Date: Mon Jun 11 21:37:46 2007 -0400 [PATCH] eeprom_93cx6: shorten pulse timing to match spec 93cx6 datasheet available here: http://ww1.microchip.com/downloads/en/DeviceDoc/21749F.pdf Figure 1-1 and Table 1-2 on pages 4-5 indicate that both Clock High Time and Clock Low Time have largest minimum times of 450ns. Signed-off-by: John W. Linville commit 605bebe23bf6ac66c0a717e663a7baa2f981294d Author: Michael Wu Date: Mon May 14 01:41:02 2007 -0400 [PATCH] Add rtl8187 wireless driver This patch adds a mac80211 based wireless driver for the rtl8187 USB wireless card. Signed-off-by: Michael Wu Signed-off-by: John W. Linville commit 4b914dc0493edff19ff698a18198a173a14ba9d2 Author: Ivo van Doorn Date: Mon May 14 23:06:01 2007 +0200 [PATCH] eeprom_93cx6: Add comment for 1us delay after pulse This will add a comment for the 1us delay which is taken after the pulse has been switched. The 1us delay is based on the specifications so that should be made clear. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 9467d64b0e88763914c01f71ddf591b166c4f526 Author: Ivo van Doorn Date: Fri May 11 15:59:40 2007 -0400 [PATCH] Add 93cx6 eeprom library This patch adds a library for reading from 93cx6 eeproms. Signed-off-by: Michael Wu Signed-off-by: John W. Linville commit 288e4d838d1e999c0515f85a337cacb2be233071 Author: Dave Kleikamp Date: Wed Jun 13 10:17:50 2007 -0500 JFS: Update print_hex_dump() syntax Signed-off-by: Dave Kleikamp commit 209e101bf408a50acc426e32c8252daefacde5b0 Author: Dave Kleikamp Date: Wed Jun 6 16:30:17 2007 -0500 JFS: use print_hex_dump() rather than private dump_mem() function Signed-off-by: Dave Kleikamp commit f720e3ba558680cc7dd3995d005bdc8ee2ef46af Author: Dave Kleikamp Date: Wed Jun 6 15:28:35 2007 -0500 JFS: Whitespace cleanup and remove some dead code Signed-off-by: Dave Kleikamp