commit dfd8317d3340f03bc06eba6b58f0ec0861da4a13 tree 43bd5c93ad045355687c26beb0983fcf6ca18a6b parent 83626b01275d0228516b4d97da008328fc37c934 parent c0897856553d45aee1780bed455b7c2e888dd64b author Linus Torvalds Sat, 24 Jun 2006 17:48:14 -0700 committer Linus Torvalds Sat, 24 Jun 2006 17:48:14 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (25 commits) [ARM] 3648/1: Update struct ucontext layout for coprocessor registers [ARM] Add identifying number for non-rt sigframe [ARM] Gather common sigframe saving code into setup_sigframe() [ARM] Gather common sigframe restoration code into restore_sigframe() [ARM] Re-use sigframe within rt_sigframe [ARM] Merge sigcontext and sigmask members of sigframe [ARM] Replace extramask with a full copy of the sigmask [ARM] Remove rt_sigframe puc and pinfo pointers [ARM] 3647/1: S3C24XX: add Osiris to the list of simtec pm machines [ARM] 3645/1: S3C2412: irq support for external interrupts [ARM] 3643/1: S3C2410: Add new usb clocks [ARM] 3642/1: S3C24XX: Add machine SMDK2413 [ARM] 3641/1: S3C2412: Fixup gpio register naming [ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON [ARM] 3639/1: S3C2412: serial port support [ARM] 3638/1: S3C2412: core clocks [ARM] 3637/1: S3C24XX: Add mpll clock, and set as fclk parent [ARM] 3636/1: S3C2412: Add selection of CPU_ARM926 [ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support [ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos ... commit 83626b01275d0228516b4d97da008328fc37c934 tree 7414f0b4ee877e10e40671df03425e362dd43c43 parent abb1cf3cb9532d824c8bda00a111adb106dd457d author Linus Torvalds Sat, 24 Jun 2006 17:47:09 -0700 committer Linus Torvalds Sat, 24 Jun 2006 17:47:09 -0700 Revert "[PATCH] usb: drivers/usb/core/devio.c dereferences a userspace pointer" This reverts commit 786dc1d3d7333f269e17d742886eac2188a2d9cc. As Al so eloquently points out, the patch is crap. The old code was fine, the new code was bogus. It never dereferenced a user pointer, the "->" operator was to an array member, which gives the _address_ of the member (in user space), not an actual dereference at all. Signed-off-by: Linus Torvalds commit c0897856553d45aee1780bed455b7c2e888dd64b tree acbee1a7cedca5087c3500f991a7de69b68da6b1 parent e11c910b5bcc1dbc38a5af7a24be2812fc956b27 parent 85fe068123aa11d3477ce88c7d365e233b1f2e10 author Russell King Sat, 24 Jun 2006 23:53:01 +0100 committer Russell King Sat, 24 Jun 2006 23:53:01 +0100 Merge signal handler branch commit 85fe068123aa11d3477ce88c7d365e233b1f2e10 tree 2b4d4a255737dc3b2bc031e0853902637250e125 parent ca195cfec9fff622a61b1b72534e73360747f735 author Daniel Jacobowitz Sat, 24 Jun 2006 23:46:21 +0100 committer Russell King Sat, 24 Jun 2006 23:46:21 +0100 [ARM] 3648/1: Update struct ucontext layout for coprocessor registers Patch from Daniel Jacobowitz In order for userspace to find saved coprocessor registers, move them from struct rt_sigframe into struct ucontext. Also allow space for glibc's sigset_t, so that userspace and kernelspace can use the same ucontext layout. Define the magic numbers for iWMMXt in the header file for easier reference. Include the size of the coprocessor data in the magic numbers. Also define magic numbers and layout for VFP, not yet saved. Signed-off-by: Daniel Jacobowitz Signed-off-by: Russell King commit abb1cf3cb9532d824c8bda00a111adb106dd457d tree fd62d48b5057e36a476a8aa80ff5ea3fe337b4da parent b464f5794619bbe98a92e1bc4180986e39615ac4 parent c499aeb08cb24bed60e5bfc80720597bcf1a720d author Linus Torvalds Sat, 24 Jun 2006 14:48:43 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:48:43 -0700 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: radeon constify radeon microcode Add i915 ioctls to configure pipes for vblank interrupt. drm: update radeon to 1.25 add r200 vertex program support drm: radeon add a tcl state flush before accessing tcl vector space commit b464f5794619bbe98a92e1bc4180986e39615ac4 tree 50f6df06a582b1c6b563af7ffd736a365a7941dd parent b9d8be7828e974f076717f0da608d052440fe192 parent 0fe6e2d2928e089d16ec5ed7ba634c1d60916020 author Linus Torvalds Sat, 24 Jun 2006 14:48:35 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:48:35 -0700 Merge branch 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: intelfb delousing commit b9d8be7828e974f076717f0da608d052440fe192 tree d4bc4d3e13f816a76b1a02bde922ee7ad0dbdbd9 parent d02f40e81e003be6ddba5c176f2e40ea290c3729 parent 1812fd40725c13cf050c29791a6dd35d593eb8d8 author Linus Torvalds Sat, 24 Jun 2006 14:48:24 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:48:24 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (40 commits) [SPARC64]: Update defconfig. [SPARC64]: Make auxio a real driver. [PARPORT] sunbpp: Convert to new SBUS device framework. [Documentation]: Update probing info in sbus_drivers.txt [SCSI] qlogicpti: Convert to new SBUS device framework. [SCSI] esp: Fix bug in esp_remove_common. [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find(). [NET] myri_sbus: Kill unused next_module struct member. [NET] myri_sbus: Convert to new SBUS device layer. [NET] sunqe: Convert to new SBUS driver layer. [NET] sunbmac: Convert over to new SBUS device framework. [NET] sunlance: Convert to new SBUS driver framework. [NET] sunhme: Convert to new SBUS driver framework. [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs. [SCSI] sparc: Port esp to new SBUS driver layer. [SOUND] sparc: Port amd7930 to new SBUS device layer. [SBUS]: Rewrite and plug into of_device framework. [SPARC]: Port of_device layer and make ebus use it. [SPARC]: Port sparc64 in-kernel device tree code to sparc32. [SPARC64]: Add of_device layer and make ebus/isa use it. ... commit d02f40e81e003be6ddba5c176f2e40ea290c3729 tree 9a8147cc77bc6fead512abf6dfce25d4c38fa6b2 parent eb71c87a492b7090ff9e8ac46912c480a1687e38 author Linus Torvalds Sat, 24 Jun 2006 14:32:18 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:47:59 -0700 Enable minimal per-device resume tracing This is the minimal resume trace code to find which device resume (if any) results in problems. Usually, you'd use the information this generates as a starting point to adding more fine-grained trace event points. Signed-off-by: Linus Torvalds commit eb71c87a492b7090ff9e8ac46912c480a1687e38 tree 1136213dee0f942866b6c2c65de7e7c63ca94fda parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Linus Torvalds Sat, 24 Jun 2006 14:27:42 -0700 committer Linus Torvalds Sat, 24 Jun 2006 14:44:01 -0700 Add some basic resume trace facilities Considering that there isn't a lot of hw we can depend on during resume, this is about as good as it gets. This is x86-only for now, although the basic concept (and most of the code) will certainly work on almost any platform. Signed-off-by: Linus Torvalds commit ca195cfec9fff622a61b1b72534e73360747f735 tree a98ce000e4ad01909155cad73e1ce5d1ff150117 parent aca6ca10974aa78adfb47291722ce851160213e4 author Russell King Sat, 24 Jun 2006 22:41:09 +0100 committer Russell King Sat, 24 Jun 2006 22:41:09 +0100 [ARM] Add identifying number for non-rt sigframe GDB couldn't reliably tell the difference between the old and new non-rt sigframes, so provide it with a number at the beginning which will never appear in the old sigframe, and hence provide gdb with a reliable way to tell the two apart. Signed-off-by: Russell King commit e11c910b5bcc1dbc38a5af7a24be2812fc956b27 tree 38fb4c1b23bf2085cd0b05db9c85e3b91819130f parent c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7 parent c9b949a734adef5d05cbaa0b0546b924ca517155 author Russell King Sat, 24 Jun 2006 22:21:49 +0100 committer Russell King Sat, 24 Jun 2006 22:21:49 +0100 Merge S3C24xx branch commit c1e08adc86f886ba0ad7c8f29c240d6e833e7ec7 tree 67e66ff524c6d51c61475a3c0df7d8d4850b4284 parent 52e3e772a098274df3c6f5f1ad58cd7fe24089bf parent 1f64eb379cfc95d5f627b779685f7ac6721df322 author Russell King Sat, 24 Jun 2006 22:21:35 +0100 committer Russell King Sat, 24 Jun 2006 22:21:35 +0100 Merge ep93xx branch commit c9b949a734adef5d05cbaa0b0546b924ca517155 tree 030a98d23fd379139efd1d30f0c8fe885ceb0ca6 parent a019f4a9a7b4ec4986918e9aefa06815cf77b714 author Ben Dooks Sat, 24 Jun 2006 21:22:35 +0100 committer Russell King Sat, 24 Jun 2006 21:22:35 +0100 [ARM] 3647/1: S3C24XX: add Osiris to the list of simtec pm machines Patch from Ben Dooks Enable power management for Simtec Osiris Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a019f4a9a7b4ec4986918e9aefa06815cf77b714 tree 52f98219bc0d86e6c55e48513a6dcfa93a0cb44c parent 22346aea8d39372d6fd207468701e90bf546b882 author Ben Dooks Sat, 24 Jun 2006 21:21:37 +0100 committer Russell King Sat, 24 Jun 2006 21:21:37 +0100 [ARM] 3645/1: S3C2412: irq support for external interrupts Patch from Ben Dooks Move the decoding of the IRQ_EXT4 and above out of the entry macro, and into an chained irq handler as the EXTINT registers move depending on the CPU being used. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 22346aea8d39372d6fd207468701e90bf546b882 tree ceb871ca3512e5b0bbaeed74f4e497aace197a9a parent 66c594098db1ee885f486a684b66937e28e792b1 author Ben Dooks Sat, 24 Jun 2006 21:21:36 +0100 committer Russell King Sat, 24 Jun 2006 21:21:36 +0100 [ARM] 3643/1: S3C2410: Add new usb clocks Patch from Ben Dooks Make the S3C2410 use the same usb clock naming as the S3C2412 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 66c594098db1ee885f486a684b66937e28e792b1 tree 9be95a4fe527d163cee085162e5ffeaec5e6cc50 parent 44cc7c9c15124c4506da96304e5f9eb88200fc35 author Ben Dooks Sat, 24 Jun 2006 21:21:35 +0100 committer Russell King Sat, 24 Jun 2006 21:21:35 +0100 [ARM] 3642/1: S3C24XX: Add machine SMDK2413 Patch from Ben Dooks Add basic support for the Samsung/Aiji SMDK2413 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 44cc7c9c15124c4506da96304e5f9eb88200fc35 tree 911dcdfc55ed609a79f7c1c23c918e709b6e3cdf parent 46491c94d39a519178ba8c6b5b5d6a839210124d author Ben Dooks Sat, 24 Jun 2006 21:21:33 +0100 committer Russell King Sat, 24 Jun 2006 21:21:33 +0100 [ARM] 3641/1: S3C2412: Fixup gpio register naming Patch from Ben Dooks The current S3C2412 has used to moving S3C24XX_ for the generic form of an register has been moved from the S3C2410. Fixup S3C2410_EXTINTx and S3C2410_EINFLTx to S3C24XX_EXTINTx and S3C24XX_EXTINTx Depends on Patch #3635/1, Patch #3640/1 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 46491c94d39a519178ba8c6b5b5d6a839210124d tree a2b803640a19edfc4d1919b8f49d3304e5a20a55 parent 73e55cb3b3549d0174d1dadb755200938232e8d0 author Ben Dooks Sat, 24 Jun 2006 21:21:32 +0100 committer Russell King Sat, 24 Jun 2006 21:21:32 +0100 [ARM] 3640/1: S3C2412: Use S3C24XX_DCLKCON instead of S3C2410_DCLKCON Patch from Ben Dooks The current S3C2412 support has moved to using S3C24XX_DCLKCON unless the specific DCLKCON is required (S3C2412_DCLKCON or S3C2410_DKCLKCON) Move the few places using S3C2410_DCLKCON to S3C24XX_DCLKCON Depends on Patch #3635/1 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 73e55cb3b3549d0174d1dadb755200938232e8d0 tree 041dc51100fae9a8da403a69a7d966f99c578bc9 parent 736855f0c748dacb624070b8d6ffffe4532cf4dc author Ben Dooks Sat, 24 Jun 2006 21:21:32 +0100 committer Russell King Sat, 24 Jun 2006 21:21:32 +0100 [ARM] 3639/1: S3C2412: serial port support Patch from Ben Dooks Serial port support for the on-board UART blocks on the Samsung S3C2412 and S3C2413 UARTs. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 736855f0c748dacb624070b8d6ffffe4532cf4dc tree 273afc6674a29fa8e79b073c37d076846e200c3b parent 513846f82829efd5bab5359bdc33509e6386fd49 author Ben Dooks Sat, 24 Jun 2006 21:21:31 +0100 committer Russell King Sat, 24 Jun 2006 21:21:31 +0100 [ARM] 3638/1: S3C2412: core clocks Patch from Ben Dooks Clock support for the clocks on the Samsung S3C2412 and S3C2413 SoCs. This provides clock enables and parent selection for all the standard clocks. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 513846f82829efd5bab5359bdc33509e6386fd49 tree d04dec7a504f62ab4f37726a227fab19f1b51e39 parent 3434d9d9fc0fec0b96ab128ee0d743b6a0d90160 author Ben Dooks Sat, 24 Jun 2006 21:21:29 +0100 committer Russell King Sat, 24 Jun 2006 21:21:29 +0100 [ARM] 3637/1: S3C24XX: Add mpll clock, and set as fclk parent Patch from Ben Dooks Update the clocks with the MPLL clock, and use it as the parent. Also export these to the rest of arch/arm/mach-s3c2410 Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 3434d9d9fc0fec0b96ab128ee0d743b6a0d90160 tree 4d085e1ba319b979a1d9053fd78569db8493edf3 parent 68d9ab394f06f95fd4ca612c08edf13e410fd8d0 author Ben Dooks Sat, 24 Jun 2006 21:21:28 +0100 committer Russell King Sat, 24 Jun 2006 21:21:28 +0100 [ARM] 3636/1: S3C2412: Add selection of CPU_ARM926 Patch from Ben Dooks Select CONFIG_CPU_ARM926 when CONFIG_CPU_S3C2412 is selected. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 68d9ab394f06f95fd4ca612c08edf13e410fd8d0 tree ad5fc04b5b3c319134db680bebc9a552d88375fc parent a3ff55026e59687040f00fc35680fc0e774859f4 author Ben Dooks Sat, 24 Jun 2006 21:21:27 +0100 committer Russell King Sat, 24 Jun 2006 21:21:27 +0100 [ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support Patch from Ben Dooks Add support for the Samsung S3C2412 and S3C2413 range of SoCs. This patch contains the core identification, debug macros, and basic register updates to get these to build. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a3ff55026e59687040f00fc35680fc0e774859f4 tree 41fe003d4e2dddd794b989bc4bfde5ebfb2f8838 parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Ben Dooks Sat, 24 Jun 2006 21:21:26 +0100 committer Russell King Sat, 24 Jun 2006 21:21:26 +0100 [ARM] 3633/1: S3C24XX: s3c2410 gpio bugfix - wrong pin nos Patch from Ben Dooks The s3c2410 gpio functions have a pair of bugs where the code is using the pin function definitions instead of the pin gpio numbers. Also remove the changelog Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 52e3e772a098274df3c6f5f1ad58cd7fe24089bf tree 74af07ddbdc188b4d572e8586c0911dfafd3c336 parent fc8ea7a1eae3034505f70f02981d33bbc1284a86 author Andrew Victor Sat, 24 Jun 2006 09:58:14 +0100 committer Russell King Sat, 24 Jun 2006 10:34:48 +0100 [ARM] 3631/1: Remove legacy __mem_isa() definitions Patch from Andrew Victor Remove the remaining legacy __mem_isa() definitions for the ARM platforms. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit fc8ea7a1eae3034505f70f02981d33bbc1284a86 tree 57abfb6469bc5f6a5e8f0742be19798a781b8753 parent 3da4bd2bfc672a484d2a5df9f89b79f5e1e634dc author Lennert Buytenhek Sat, 24 Jun 2006 09:57:14 +0100 committer Russell King Sat, 24 Jun 2006 10:34:29 +0100 [ARM] 3644/1: ixp2000: export gpio_line_config() Patch from Lennert Buytenhek Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 1f64eb379cfc95d5f627b779685f7ac6721df322 tree df793338e6fe4b9f1623055cd39a00711e3e0f10 parent 1d81eedb8f6c13c262a70b8167530ec24b09c0ff author Lennert Buytenhek Sat, 24 Jun 2006 10:33:03 +0100 committer Russell King Sat, 24 Jun 2006 10:33:03 +0100 [ARM] 3646/1: ep93xx: instantiate ep93xx-ohci platform device Patch from Lennert Buytenhek The ep93xx ohci bits have been merged into the gregkh-2.6 tree, which means that they will probably go upstream soon, so make the core ep93xx code instantiate an appropriate ep93xx-ohci platform device. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 1d81eedb8f6c13c262a70b8167530ec24b09c0ff tree 12b1231f90127b117cdd88c8240c002e57460c3e parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Lennert Buytenhek Sat, 24 Jun 2006 10:33:02 +0100 committer Russell King Sat, 24 Jun 2006 10:33:02 +0100 [ARM] 3634/1: ep93xx: initial implementation of the clk_* API Patch from Lennert Buytenhek Add an initial implementation of the clk_* API for the cirrus ep93xx to the tree. The initial implementation is somewhat minimal, with the intention of extending it as we go along. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 3da4bd2bfc672a484d2a5df9f89b79f5e1e634dc tree be998210c8f123e138fa47ede373f07b70324d20 parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Lennert Buytenhek Sat, 24 Jun 2006 09:57:13 +0100 committer Russell King Sat, 24 Jun 2006 09:57:13 +0100 [ARM] 3632/1: iwmmxt: fix up argument comment for iwmmxt_task_restore() Patch from Lennert Buytenhek Commit d6551e884cf66de072b81f8b6d23259462c40baf forgot to update the description of what goes into r2 when calling iwmmxt_task_restore(). Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit c499aeb08cb24bed60e5bfc80720597bcf1a720d tree a0fdc43db1b379650e913dbe46947b7e3a5b9adb parent 702880f24373dfb31edb0bcd997ff924d07decc3 author Dave Airlie Sat, 24 Jun 2006 17:37:48 +1000 committer Dave Airlie Sat, 24 Jun 2006 17:37:48 +1000 drm: radeon constify radeon microcode From: Tilman (DRM CVS) Signed-off-by: Dave Airlie commit 702880f24373dfb31edb0bcd997ff924d07decc3 tree ce78f61ee3b9b71d97bed31437af84c5fa0682da parent d6fece051a4ef330922bfafb9d64e3e133e3a8a6 author Dave Airlie Sat, 24 Jun 2006 17:07:34 +1000 committer Dave Airlie Sat, 24 Jun 2006 17:32:58 +1000 Add i915 ioctls to configure pipes for vblank interrupt. i915 vblanks can be generated from either pipe a or b, however a disabled pipe generates no interrupts. This change allows the X server to select which pipe generates vblank interrupts. From: Keith Packard via DRM CVS Signed-off-by: Dave Airlie commit d6fece051a4ef330922bfafb9d64e3e133e3a8a6 tree f75c1a4d4f5324ab21f08cf753c849e33f3365e4 parent f2a2279ffc0dfd27f6909184a29910e40ae7eebd author Dave Airlie Sat, 24 Jun 2006 17:04:07 +1000 committer Dave Airlie Sat, 24 Jun 2006 17:32:10 +1000 drm: update radeon to 1.25 add r200 vertex program support Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, and new packet type for making it possible to address whole tcl vector space and have a larger count) From: Roland Scheidegger (DRM CVS) Signed-off-by: Dave Airlie commit f2a2279ffc0dfd27f6909184a29910e40ae7eebd tree e1e9e8a652256a6fd25a595f429f88a39543b3f2 parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Dave Airlie Sat, 24 Jun 2006 16:55:34 +1000 committer Dave Airlie Sat, 24 Jun 2006 17:32:04 +1000 drm: radeon add a tcl state flush before accessing tcl vector space Do a tcl state flush before accessing tcl vector space. This fixes some more problems with flickering (bug #6637). drm may not be appropriate place for this, since doing that flush there might both be overkill and insufficient in some cases. However, it's hard to figure out when that flush is needed, so this has to suffice. There does not seem to be a performance penalty associated with it. From: Roland Scheidegger (DRM CVS) Signed-off-by: Dave Airlie commit 0fe6e2d2928e089d16ec5ed7ba634c1d60916020 tree 00b045e1d693d2dfa5a8e89e7129592f176ae902 parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author Al Viro Fri, 23 Jun 2006 06:05:39 +0100 committer Dave Airlie Sat, 24 Jun 2006 17:22:17 +1000 intelfb delousing ring_head is offset in card memory, not iomem pointer. Fixed, removed fuckloads of amazingly bogus casts somebody had sprinkled all over the place. Signed-off-by: Al Viro Signed-off-by: Dave Airlie commit 1812fd40725c13cf050c29791a6dd35d593eb8d8 tree 7ae54e7908a80a00badd73a35285a3dba55218ef parent b5ba0740f852f4ad86ba7f21267bc77027d60703 author David S. Miller Fri, 23 Jun 2006 23:17:48 -0700 committer David S. Miller Fri, 23 Jun 2006 23:17:48 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit b5ba0740f852f4ad86ba7f21267bc77027d60703 tree efdcf4d668dd3b65ca1ef9f2898134ff4122da62 parent 4f62d158a32d9f470377a7bd6dcb797b42afe5f3 author David S. Miller Fri, 23 Jun 2006 22:46:49 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:21 -0700 [SPARC64]: Make auxio a real driver. Signed-off-by: David S. Miller commit 4f62d158a32d9f470377a7bd6dcb797b42afe5f3 tree 728af64e1de30a6049d03f1799f094fb1dda75f7 parent 9eccf1b3121f7e407d3159908f29252887194a16 author David S. Miller Fri, 23 Jun 2006 22:22:13 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:19 -0700 [PARPORT] sunbpp: Convert to new SBUS device framework. Signed-off-by: David S. Miller commit 9eccf1b3121f7e407d3159908f29252887194a16 tree da29cdcbe783e62dfffde79c77d0f0f846960272 parent 3d4253d9afabd6d42c33812a839ba67b8c9bbe49 author David S. Miller Fri, 23 Jun 2006 22:12:39 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:17 -0700 [Documentation]: Update probing info in sbus_drivers.txt Signed-off-by: David S. Miller commit 3d4253d9afabd6d42c33812a839ba67b8c9bbe49 tree 3816c3159f32135ff3265cf7e64793bf0ea9b744 parent 7bd5ed5dd4f12ba56c99c9b5a8838afbf121f397 author David S. Miller Fri, 23 Jun 2006 22:00:34 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:15 -0700 [SCSI] qlogicpti: Convert to new SBUS device framework. Signed-off-by: David S. Miller commit 7bd5ed5dd4f12ba56c99c9b5a8838afbf121f397 tree aff1f778fe94307880cf9b6b972fe7aafd924252 parent 96399487ad84b0d935923fe3652943159f36fb64 author David S. Miller Fri, 23 Jun 2006 21:58:34 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:13 -0700 [SCSI] esp: Fix bug in esp_remove_common. Do not try to kfree(esp), scsi_host_put() takes care of that. Signed-off-by: David S. Miller commit 96399487ad84b0d935923fe3652943159f36fb64 tree 97e82724bb3473abbb7c5e47766260d6bd26df92 parent c0442209e41b3453736ef974ee709a6ae15d99fb author David S. Miller Fri, 23 Jun 2006 21:36:46 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:11 -0700 [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find(). Signed-off-by: David S. Miller commit c0442209e41b3453736ef974ee709a6ae15d99fb tree 73db3fed40a9541db01e7b633555f8b258956e4d parent a46c30fd62636d5d0f4209fed79c99c01dd58218 author David S. Miller Fri, 23 Jun 2006 21:33:44 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:09 -0700 [NET] myri_sbus: Kill unused next_module struct member. Signed-off-by: David S. Miller commit a46c30fd62636d5d0f4209fed79c99c01dd58218 tree 2d9558e47d70d1c137752b24779a30ce7ed7d124 parent ecba38abfdaf012713b661177c2a6db12bb996c3 author David S. Miller Fri, 23 Jun 2006 21:32:48 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:07 -0700 [NET] myri_sbus: Convert to new SBUS device layer. Signed-off-by: David S. Miller commit ecba38abfdaf012713b661177c2a6db12bb996c3 tree 66803ba6b032d3ebd41bba37b3979fc0b056b377 parent 52a34c7fe43afcbcd0e1ecfdef6b3dfdb9a90180 author David S. Miller Fri, 23 Jun 2006 21:23:01 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:04 -0700 [NET] sunqe: Convert to new SBUS driver layer. Signed-off-by: David S. Miller commit 52a34c7fe43afcbcd0e1ecfdef6b3dfdb9a90180 tree 8977d6e367aa344e1d7a1ce008265af3a6848370 parent c2d81e63ced3e81b8b71087b9af44da26171ba36 author David S. Miller Fri, 23 Jun 2006 18:48:04 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:02 -0700 [NET] sunbmac: Convert over to new SBUS device framework. Signed-off-by: David S. Miller commit c2d81e63ced3e81b8b71087b9af44da26171ba36 tree d9b889d7b0fa34055a37680a63766a56bf202438 parent 050bbb196392b9c178f82b1205a23dd2f915ee93 author David S. Miller Fri, 23 Jun 2006 18:39:40 -0700 committer David S. Miller Fri, 23 Jun 2006 23:16:00 -0700 [NET] sunlance: Convert to new SBUS driver framework. Signed-off-by: David S. Miller commit 050bbb196392b9c178f82b1205a23dd2f915ee93 tree 7558fc040ea5cfedefd56f0e5412b15ee23d8228 parent 9e326acf567b605cf4177081cc7367c24ec10a66 author David S. Miller Fri, 23 Jun 2006 18:21:02 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:58 -0700 [NET] sunhme: Convert to new SBUS driver framework. And make it a real PCI driver too. Signed-off-by: David S. Miller commit 9e326acf567b605cf4177081cc7367c24ec10a66 tree 96a175748a36eeaa181ae3ce87ef19c47dc1d73b parent 411aa5540536feace62c97478a8ea5dab7469377 author David S. Miller Fri, 23 Jun 2006 17:31:12 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:56 -0700 [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs. Use CONFIG_SPARC and CONFIG_SPARC64 instead. Signed-off-by: David S. Miller commit 411aa5540536feace62c97478a8ea5dab7469377 tree 7aef2cb7f15734027d8f88b96826692e57f3fc94 parent 69b5c4f18b2ceab3da9e854d02f8d9a2aa5b8431 author David S. Miller Fri, 23 Jun 2006 17:29:28 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:54 -0700 [SCSI] sparc: Port esp to new SBUS driver layer. This also turns the driver into a new-style scsi driver. Signed-off-by: David S. Miller commit 69b5c4f18b2ceab3da9e854d02f8d9a2aa5b8431 tree c95b10216256a209de6ab3150eccf60ec0f2e116 parent 576c352e89e57cfa6c9f493e549d10d86f60a0cf author David S. Miller Fri, 23 Jun 2006 16:23:12 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:52 -0700 [SOUND] sparc: Port amd7930 to new SBUS device layer. Signed-off-by: David S. Miller commit 576c352e89e57cfa6c9f493e549d10d86f60a0cf tree 4f393f05beef86284a037b106bfb353ff0d72c8a parent fd5314311634245172d40ccb418d89dac91d6ad6 author David S. Miller Fri, 23 Jun 2006 15:55:45 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:50 -0700 [SBUS]: Rewrite and plug into of_device framework. I severely apologize, I was still learning how to program in C when I wrote this stuff 10 years ago... Signed-off-by: David S. Miller commit fd5314311634245172d40ccb418d89dac91d6ad6 tree a157e4f2ec03316d733de1ff5c64254d8068d078 parent 942a6bdd1c4d2419a42be77ba1c964e4ba8dae9e author David S. Miller Fri, 23 Jun 2006 15:55:17 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:47 -0700 [SPARC]: Port of_device layer and make ebus use it. Signed-off-by: David S. Miller commit 942a6bdd1c4d2419a42be77ba1c964e4ba8dae9e tree b1a432a83aff7b88d301d4932ff75e5078b8c347 parent a2bd4fd17926d715a470fbe0ebe05128ba410984 author David S. Miller Fri, 23 Jun 2006 15:53:31 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:45 -0700 [SPARC]: Port sparc64 in-kernel device tree code to sparc32. Signed-off-by: David S. Miller commit a2bd4fd17926d715a470fbe0ebe05128ba410984 tree 3e39a2f6aaf3a628b955067ef3668cae3456de03 parent 8cd24ed4f8031636fb5dacb04adee9e02556ecd5 author David S. Miller Fri, 23 Jun 2006 01:44:10 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:43 -0700 [SPARC64]: Add of_device layer and make ebus/isa use it. Sparcspkr and power drivers are converted, to make sure it works. Eventually the SBUS device layer will use this as a sub-class. I really cannot cut loose on that bit until sparc32 is given the same infrastructure. Signed-off-by: David S. Miller commit 8cd24ed4f8031636fb5dacb04adee9e02556ecd5 tree 8a58e54a4181adf91d0ee2c4af6a92be7427f7cb parent 92c4e22593c22eb0943b232c61c98b517081637d author David S. Miller Thu, 22 Jun 2006 22:08:58 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:41 -0700 [SPARC64]: Expand of_*() interfaces some more. Import some more stuff from powerpc. Add of_device_is_compatible(), and of_find_compatible_node(). Export some more of the other routines to modules. Signed-off-by: David S. Miller commit 92c4e22593c22eb0943b232c61c98b517081637d tree f1988604cf022ef0617b1f3b6c930b7c86f4ebe6 parent 25c7581bcdd11cf9b82a8ef062a10bea310cc9e9 author David S. Miller Thu, 22 Jun 2006 20:23:56 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:38 -0700 [SPARC64]: Kill unused local vars in map_prom_timers(). Signed-off-by: David S. Miller commit 25c7581bcdd11cf9b82a8ef062a10bea310cc9e9 tree c88f4ee5e91fa7921ff13627f373e1bfbcec8b81 parent 44bdef5e8f2e64ba5974b587989a829d57126bad author David S. Miller Thu, 22 Jun 2006 20:21:22 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:36 -0700 [SPARC64]: Kill off some more prom_getproperty() remnants. The remaining ones occur before we have imported the device tree. Signed-off-by: David S. Miller commit 44bdef5e8f2e64ba5974b587989a829d57126bad tree 9a024374403bc06942cfd908565b4a3a0fa12e76 parent cecc4e9222c4e2bca59834750e493eea6be97613 author David S. Miller Thu, 22 Jun 2006 20:04:30 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:34 -0700 [SPARC64]: Convert Cheetah memory controller driver to in-kernel PROM tree. Signed-off-by: David S. Miller commit cecc4e9222c4e2bca59834750e493eea6be97613 tree 9fd177ac904e4ef091c0322ae9f105210d42916d parent 9c10a58ed634d98114c5717e2da761d8a63f2cd4 author David S. Miller Thu, 22 Jun 2006 19:53:24 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:32 -0700 [SPARC64]: Convert central bus layer to in-kernel PROM device tree. Signed-off-by: David S. Miller commit 9c10a58ed634d98114c5717e2da761d8a63f2cd4 tree cedcda632d937706dec7621a15f3af97b9300791 parent 690c8fd31f1e35985d0f35772fde514da59ec9d1 author David S. Miller Thu, 22 Jun 2006 19:31:11 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:30 -0700 [SPARC64]: Kill ebus/isa range and interrupt mapping struct members. Unused outside of initial bus probe scan. Signed-off-by: David S. Miller commit 690c8fd31f1e35985d0f35772fde514da59ec9d1 tree 8a5a0036b3780a9eb315ea2201a2562570de1ebe parent de8d28b16f5614aeb12bb69c8f9a38578b8d3ada author David S. Miller Thu, 22 Jun 2006 19:12:03 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:28 -0700 [SPARC64]: Use in-kernel PROM tree for EBUS and ISA. Signed-off-by: David S. Miller commit de8d28b16f5614aeb12bb69c8f9a38578b8d3ada tree 152f0930dc099606342e9cc6d9a3892cd9f3f192 parent 765b5f32730cfd2608291e679060b0391570c8b3 author David S. Miller Thu, 22 Jun 2006 16:18:54 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:26 -0700 [SPARC64]: Convert sparc64 PCI layer to in-kernel device tree. One thing this change pointed out was that we really should pull the "get 'local-mac-address' property" logic into a helper function all the network drivers can call. Signed-off-by: David S. Miller commit 765b5f32730cfd2608291e679060b0391570c8b3 tree aff07bf3e34c25da9a2dffabd64d946471277614 parent c2a5a46be4a1c682e18e29e67785126b7610b14d author David S. Miller Thu, 22 Jun 2006 00:49:15 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:23 -0700 [SPARC64]: Must run smp_setup_cpu_possible_map() after paging_init() Otherwise the in-kernel PROM device tree isn't built yet, and therefore the present cpu bits don't get set properly. Signed-off-by: David S. Miller commit c2a5a46be4a1c682e18e29e67785126b7610b14d tree b9101fa7547c9c5d86ff550e6398a8cf7c2f283a parent 486ad10a7e1b2bb61ea9e48c4d9510f50cd74fc5 author David S. Miller Thu, 22 Jun 2006 00:01:56 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:21 -0700 [SPARC64]: Fix for Niagara memory corruption. On some sun4v systems, after netboot the ethernet controller and it's DMA mappings can be left active. The net result is that the kernel can end up using memory the ethernet controller will continue to DMA into, resulting in corruption. To deal with this, we are more careful about importing IOMMU translations which OBP has left in the IO-TLB. If the mapping maps into an area the firmware claimed was free and available memory for the kernel to use, we demap instead of import that IOMMU entry. This is going to cause the network chip to take a PCI master abort on the next DMA it attempts, if it has been left going like this. All tests show that this is handled properly by the PCI layer and the e1000 drivers. Signed-off-by: David S. Miller commit 486ad10a7e1b2bb61ea9e48c4d9510f50cd74fc5 tree eac1b6fe80626767f7bea620b9e06aedc6600b95 parent 07f8e5f358a0b7240f1dad6b3819f2fd1103f159 author David S. Miller Thu, 22 Jun 2006 00:00:00 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:19 -0700 [SPARC64]: Minor bug fix to obp_read_memory(). If we end up zero'ing out the size of one of the entries, pop it out of the array completely because some code that examines these things cannot handle a zero length element properly. Signed-off-by: David S. Miller commit 07f8e5f358a0b7240f1dad6b3819f2fd1103f159 tree 5976cc05de92f27a9cc12a3db31ced5311ac3769 parent 6d307724cb6a6b8466cad4fdf13d8a409bc2433f author David S. Miller Wed, 21 Jun 2006 23:34:02 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:17 -0700 [SPARC64]: Convert cpu_find_by_*() interface to in-kernel PROM device tree. Signed-off-by: David S. Miller commit 6d307724cb6a6b8466cad4fdf13d8a409bc2433f tree 66809731d2a7257f23b8583c69b7bd71a83d634c parent 6760d28bc691bb255c501c9b680f2fc1162258b2 author David S. Miller Wed, 21 Jun 2006 23:07:29 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:15 -0700 [SPARC64]: Add of_getintprop_default(). This encodes a common idiomatic coding pattern used when dealing with integer properties. Signed-off-by: David S. Miller commit 6760d28bc691bb255c501c9b680f2fc1162258b2 tree 8c6a249a56fc2a2eee995dbcb55daf4adf456705 parent 27cc64c7cc9e41788e53655c717aeca2f55f2041 author David S. Miller Wed, 21 Jun 2006 22:56:20 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:13 -0700 [SPARC64]: Convert sun4v virtual-device layer to in-kernel PROM device tree. Signed-off-by: David S. Miller commit 27cc64c7cc9e41788e53655c717aeca2f55f2041 tree 2ea1c64dcbf34013499d12f95fdb9db2b947d43c parent 20edac8ad487b784a286c1e59cc24819cb8d3b86 author David S. Miller Wed, 21 Jun 2006 22:31:08 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:11 -0700 [SPARC64]: Rate limited kernel unaligned trap logging, ala IA64. Signed-off-by: David S. Miller commit 20edac8ad487b784a286c1e59cc24819cb8d3b86 tree 1801d81a1164c07c6d136fd755fe181de4affa7f parent e87dc35020bc555969810452f44bceaf8394eafa author David S. Miller Wed, 21 Jun 2006 22:07:21 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:09 -0700 [SPARC64]: Disable verbose PCI IRQ probing messages by default. Allow them to be enabled with "pci=irq_verbose" on the boot command line. Signed-off-by: David S. Miller commit e87dc35020bc555969810452f44bceaf8394eafa tree b58f14d41f8e147f6ddc2d9657a88813fdb73bdf parent aaf7cec2769942035985716452107fc5ba0b11f6 author David S. Miller Wed, 21 Jun 2006 18:18:47 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:07 -0700 [SPARC64]: Use in-kernel OBP device tree for PCI controller probing. It can be pushed even further down, but this is a first step. Signed-off-by: David S. Miller commit aaf7cec2769942035985716452107fc5ba0b11f6 tree 4f4bc5278ef41e016b97b6860d30fa773db7fee2 parent 372b07bb5a13f8a1b8a3ce49cd76d39a79dbd3bd author David S. Miller Wed, 21 Jun 2006 16:33:54 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:04 -0700 [SPARC64]: Add of_find_node_by_{name,type}(). Signed-off-by: David S. Miller commit 372b07bb5a13f8a1b8a3ce49cd76d39a79dbd3bd tree 934af50f039921411e2ab6f4678b083f2b8c7eed parent 8fae097debdf8ac9b66d220ac258535ea09f3898 author David S. Miller Wed, 21 Jun 2006 15:35:28 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:02 -0700 [SPARC64]: Import OBP device tree into kernel data structures. The basic framework is based on the PowerPC OF code. This code even tries to get the device addressing components correct in the full path names. Signed-off-by: David S. Miller commit 8fae097debdf8ac9b66d220ac258535ea09f3898 tree 9c022cbf14e9174946a503b116fdf7376b8ce0ce parent d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 author David S. Miller Tue, 20 Jun 2006 15:23:28 -0700 committer David S. Miller Fri, 23 Jun 2006 23:15:00 -0700 [SBUS]: Start cleaning up generic sbus support layer. In particular, move the IRQ probing out to sparc32/sparc64 arch specific code where it belongs. Signed-off-by: David S. Miller commit d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 tree 1c91f0dd294b14edb6058d1236a65b997f7ed2a2 parent 6edad161cd4dfe1df772e7a74ab63cab53b5e8c1 author Dave Jones Sat, 24 Jun 2006 00:33:08 -0400 committer Linus Torvalds Fri, 23 Jun 2006 21:37:34 -0700 [PATCH] fix typo in acpi video brightness changes. Prevent possible null dereference due to misplaced ; Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds commit 6edad161cd4dfe1df772e7a74ab63cab53b5e8c1 tree 389d6daa728b2ba1bd8c2180cab705706449f62a parent 236ee8c33277ab48671995f26dc68a4639936418 parent 0dd4b21f517e138ea113db255645fbae1bf5eef3 author Linus Torvalds Fri, 23 Jun 2006 15:58:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 15:58:44 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (258 commits) [libata] conversion to new debug scheme, part 1 of $N [PATCH] libata: Add ata_scsi_dev_disabled [libata] Add host lock to struct ata_port [PATCH] libata: implement per-dev EH action mask eh_info->dev_action[] [PATCH] libata-dev: move the CDB-intr DMA blacklisting [PATCH] ahci: disable NCQ support on vt8251 [libata] ahci: add JMicron PCI IDs [libata] sata_nv: add PCI IDs [libata] ahci: Add NVIDIA PCI IDs. [PATCH] libata: convert several bmdma-style controllers to new EH, take #3 [PATCH] sata_via: convert to new EH, take #3 [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler [PATCH] sata_nv: add hotplug support [PATCH] sata_nv: convert to new EH [PATCH] sata_nv: better irq handlers [PATCH] sata_nv: simplify constants [PATCH] sata_nv: kill struct nv_host_desc and nv_host [PATCH] sata_nv: kill not-working hotplug code [libata] Update docs to reflect current driver API [PATCH] libata: add host_set->next for legacy two host_sets case, take #3 ... commit 236ee8c33277ab48671995f26dc68a4639936418 tree d32c005a5a20bbfdd72be17308e80a746cdce52e parent 8cf60e04a131310199d5776e2f9e915f0c468899 author Tony Luck Fri, 23 Jun 2006 13:49:25 -0700 committer Tony Luck Fri, 23 Jun 2006 13:49:25 -0700 [IA64] fix ia64 build (fadt_descriptor) arch/ia64/kernel/acpi.c got forgotten when include/acpi/actbl.h got a cleanup. Signed-off-by: Tony Luck commit 8cf60e04a131310199d5776e2f9e915f0c468899 tree 373a68e88e6737713a0a5723d552cdeefffff929 parent 1323523f505606cfd24af6122369afddefc3b09d parent 95eaa5fa8eb2c345244acd5f65b200b115ae8c65 author Tony Luck Fri, 23 Jun 2006 13:46:23 -0700 committer Tony Luck Fri, 23 Jun 2006 13:46:23 -0700 Auto-update from upstream commit 95eaa5fa8eb2c345244acd5f65b200b115ae8c65 tree 22e7c6949f9d930ec4f97460b9df6cf7738c1de7 parent a5cf4b9a02cb9b8ac16eaafb0fcd7fd24215146e author Nicolas Pitre Fri, 23 Jun 2006 11:40:53 -0400 committer Linus Torvalds Fri, 23 Jun 2006 08:47:27 -0700 [PATCH] fix silly ARM non-EABI build error My bad. Signed-off-by: Nicolas Pitre Signed-off-by: Linus Torvalds commit a5cf4b9a02cb9b8ac16eaafb0fcd7fd24215146e tree 3ec6a7706074f0e4c04977fed4944373077b6fd7 parent 138a0128c01899ee8492858a50856b90d0d9d815 author Andrew Morton Fri, 23 Jun 2006 04:01:35 -0700 committer Linus Torvalds Fri, 23 Jun 2006 08:47:27 -0700 [PATCH] s390_hypfs filesystem: get_sb_single() fix Update hypfs for dhowells API changes. Cc: Pekka Enberg Cc: Ingo Oeser Cc: Joern Engel Cc: Martin Schwidefsky Cc: Michael Holzheu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 138a0128c01899ee8492858a50856b90d0d9d815 tree 9f9865b39e7e65c2bb6763f0ad9d7b02aba59b33 parent 8269730b389d4793348d521140f9c76fb1828249 author Andrew Morton Fri, 23 Jun 2006 03:31:19 -0700 committer Linus Torvalds Fri, 23 Jun 2006 08:47:27 -0700 [PATCH] cpufreq build fix drivers/cpufreq/cpufreq_ondemand.c: In function 'do_dbs_timer': drivers/cpufreq/cpufreq_ondemand.c:374: warning: implicit declaration of function 'lock_cpu_hotplug' drivers/cpufreq/cpufreq_ondemand.c:381: warning: implicit declaration of function 'unlock_cpu_hotplug' drivers/cpufreq/cpufreq_conservative.c: In function 'do_dbs_timer': drivers/cpufreq/cpufreq_conservative.c:425: warning: implicit declaration of function 'lock_cpu_hotplug' drivers/cpufreq/cpufreq_conservative.c:432: warning: implicit declaration of function 'unlock_cpu_hotplug' Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8269730b389d4793348d521140f9c76fb1828249 tree c10c9441a16265f698dd4a38014c9d3026ee07c0 parent dd67d051529387f6e44d22d1d5540ef281965fdd author Andi Kleen Wed, 21 Jun 2006 14:48:09 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [BLOCK] Fix bounce limit address check Do a safer check for when to enable DMA. Currently we enable ISA DMA for cases that do not need it, resulting in OOM conditions when ZONE_DMA runs out of space. Signed-off-by: Jens Axboe commit dd67d051529387f6e44d22d1d5540ef281965fdd tree 80457f9a2ad3e562b179e40f5c8d51b4f24d6d9e parent 9e94cd4fd1812bab45237f998b3c6fa1b24023fd author Jens Axboe Wed, 21 Jun 2006 09:36:18 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] rbtree: support functions used by the io schedulers They all duplicate macros to check for empty root and/or node, and clearing a node. So put those in rbtree.h. Signed-off-by: Jens Axboe commit 9e94cd4fd1812bab45237f998b3c6fa1b24023fd tree e196939ff1df56179387f0ec440cc9ce52cf1f55 parent fd61af0384014ca29428ace7c17a978b755aeddd author Jens Axboe Tue, 20 Jun 2006 15:01:12 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] splice: retrieve mapping after locking the page Otherwise we could be racing with truncate/mapping removal. Problem found/fixed by Nick Piggin , logic rewritten by me. Signed-off-by: Jens Axboe commit fd61af0384014ca29428ace7c17a978b755aeddd tree c7aa5ca9b91383b7c97199189214fa86a6a51b4f parent caaa5f9f0a75d1dc5e812e69afdbb8720e077fd3 author Jens Axboe Fri, 16 Jun 2006 15:35:39 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] cfq-iosched: rq update fixes - Remember to set ->last_sector so that the cfq_choose_req() logic works correctly. - Remove redundant call to cfq_choose_req() Signed-off-by: Jens Axboe commit caaa5f9f0a75d1dc5e812e69afdbb8720e077fd3 tree 07aba6bac5a57cb3efd23762acfd719e255775ab parent 35e6077cb16f93517ba5a51ba849b186d2474d60 author Jens Axboe Fri, 16 Jun 2006 11:23:00 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] cfq-iosched: many performance fixes This is a collection of patches that greatly improve CFQ performance in some circumstances. - Change the idling logic to only kick in after a request is done and we are deciding what to do. Before the idling included the request service time, so it was hard to adjust. Now it's true think/idle time. - Take advantage of TCQ/NCQ/queueing for seeky sync workloads, but keep it in control for sync and sequential (or close to) workloads. - Expire queues immediately and move on to other busy queues, if we are not going to idle after the current one finishes. - Don't rearm idle timer if there are no busy queues. Just leave the system idle. Signed-off-by: Jens Axboe commit 35e6077cb16f93517ba5a51ba849b186d2474d60 tree 215bcf3548d80365b3cd3673feddf6a8f8ba9fbc parent b17fd9bceb99610f6dc7998c9a4ed6b71520be2b author Jens Axboe Wed, 14 Jun 2006 09:10:45 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] cfq-iosched: correctly set ioprio on both targets Patch originally from Vasily Tarasov If you set io-priority of process 1 using sys_ioprio_set system call by another process 2 (like ionice do), then cfq_init_prio_data() function sets priority of process 2 (current) on queue of process 1 and clears the flag, that designates change of ioprio. So the process 1 will work like with priority of process 2. I propose not to call cfq_init_prio_data() on io-priority change, but only mark queue as queue with changed prority. Every time when new request comes cfq-scheduler checks for this flag and atomaticaly changes priority of queue to new value. Signed-off-by: Jens Axboe commit b17fd9bceb99610f6dc7998c9a4ed6b71520be2b tree 13cb21955ce4677360c72f7120fee311f16ca3c7 parent 8f34ee75decb80007ba77bba5a7384eadff4866d author Jens Axboe Mon, 19 Jun 2006 10:06:48 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] Make CFQ the default IO scheduler Signed-off-by: Jens Axboe commit 8f34ee75decb80007ba77bba5a7384eadff4866d tree 63d6d4a613d0c7d2269e2dec01975d58b1e97a31 parent ad3caddaa1708e506f20b8e25a4a8ae586fc7d5b author Jens Axboe Tue, 13 Jun 2006 09:02:34 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] Rearrange a few struct request members This saves 8 bytes of data in 64-bit archs. Signed-off-by: Jens Axboe commit ad3caddaa1708e506f20b8e25a4a8ae586fc7d5b tree 60a79c55a71ed3ef7bc9daaea694995b034eb044 parent b31dc66a54ad986b6b73bdc49c8efc17cbad1833 author Jens Axboe Tue, 13 Jun 2006 08:46:57 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] Get rid of struct request request_pm_state member The IDE power management can just use the ->end_io_data member to store it's data. Signed-off-by: Jens Axboe commit b31dc66a54ad986b6b73bdc49c8efc17cbad1833 tree 5591383c1cbffe11512da889c971f899333f1a44 parent 271f18f102c789f59644bb6c53a69da1df72b2f4 author Jens Axboe Tue, 13 Jun 2006 08:26:10 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:39 +0200 [PATCH] Kill PF_SYNCWRITE flag A process flag to indicate whether we are doing sync io is incredibly ugly. It also causes performance problems when one does a lot of async io and then proceeds to sync it. Part of the io will go out as async, and the other part as sync. This causes a disconnect between the previously submitted io and the synced io. For io schedulers such as CFQ, this will cause us lost merges and suboptimal behaviour in scheduling. Remove PF_SYNCWRITE completely from the fsync/msync paths, and let the O_DIRECT path just directly indicate that the writes are sync by using WRITE_SYNC instead. Signed-off-by: Jens Axboe commit 271f18f102c789f59644bb6c53a69da1df72b2f4 tree f3593b5dbc90da69a91a69fb170c2600775703f7 parent acf421755593f7d7bd9352d57eda796c6eb4fa43 author Jens Axboe Tue, 13 Jun 2006 08:08:38 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] cfq-iosched: Don't set the queue batching limits We cannot update them if the user changes nr_requests, so don't set it in the first place. The gains are pretty questionable as well. The batching loss has been shown to decrease throughput. Signed-off-by: Jens Axboe commit acf421755593f7d7bd9352d57eda796c6eb4fa43 tree 08fe234e5a28556ef32d29de1d3045cfe94a931c parent fda151d9feafc0e8418f23c716587c44394fcdbf author Dave Jones Mon, 12 Jun 2006 14:20:58 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] remove dead code from elevator switching We already drop the refcount in elevator_exit(), and as we're setting 'e' to NULL, we'll never take that branch anyway. Finally, as 'e' is a local var that isn't referenced afterwards, setting it to NULL is pointless. Signed-off-by: Dave Jones Signed-off-by: Jens Axboe commit fda151d9feafc0e8418f23c716587c44394fcdbf tree 741684efbeb8b5fe881e28875bba5d619482561b parent a038e2536472b4dd932399b5277e65f188811de5 author Alexey Dobriyan Mon, 05 Jun 2006 12:09:50 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] blktrace_api.h: endian annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit a038e2536472b4dd932399b5277e65f188811de5 tree 15b311da1a9aa36b24f98ae914456ecb90e247f3 parent bae386f7884aa3720cc7880b36a41a1d2b9c327b author Paolo 'Blaisorblade' Giarrusso Mon, 05 Jun 2006 12:09:01 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] blk_start_queue() must be called with irq disabled - add warning The queue lock can be taken from interrupts so it must always be taken with irq disabling primitives. Some primitives already verify this. blk_start_queue() is called under this lock, so interrupts must be disabled. Also document this requirement clearly in blk_init_queue(), where the queue spinlock is set. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit bae386f7884aa3720cc7880b36a41a1d2b9c327b tree e6ea0627160dc009cd825e44489583028c83791f parent 199f4c9f76fd8b030405abddf294e771f888de03 author Akinobu Mita Mon, 24 Apr 2006 21:12:59 +0200 committer Jens Axboe Fri, 23 Jun 2006 17:10:38 +0200 [PATCH] iosched: use hlist for request hashtable Use hlist instead of list_head for request hashtable in deadline-iosched and as-iosched. It also can remove the flag to know hashed or unhashed. Signed-off-by: Akinobu Mita Signed-off-by: Jens Axboe block/as-iosched.c | 45 +++++++++++++++++++-------------------------- block/deadline-iosched.c | 39 ++++++++++++++++----------------------- 2 files changed, 35 insertions(+), 49 deletions(-) commit 199f4c9f76fd8b030405abddf294e771f888de03 tree ee4f104a7562e1fd76882bc40f2de7d90812e1df parent 37224470c8c6d90a4062e76a08d4dc1fcf91fc89 parent ca6bb5d7ab22ac79f608fe6cbc6b12de6a5a19f0 author Linus Torvalds Fri, 23 Jun 2006 08:00:01 -0700 committer Linus Torvalds Fri, 23 Jun 2006 08:00:01 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [NET]: Require CAP_NET_ADMIN to create tuntap devices. [NET]: fix net-core kernel-doc [TCP]: Move inclusion of to correct place in [IPSEC]: Handle GSO packets [NET]: Added GSO toggle [NET]: Add software TSOv4 [NET]: Add generic segmentation offload [NET]: Merge TSO/UFO fields in sk_buff [NET]: Prevent transmission after dev_deactivate [IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY [IPV6]: Fix source address selection. [NET]: Avoid allocating skb in skb_pad commit 37224470c8c6d90a4062e76a08d4dc1fcf91fc89 tree 627f537177bf8e951c12bec04c4a85f0125f5ece parent e83319510b04dd51a60da8a0b4ccf8b92b3ab1ad parent ae6c859b7dcd708efadf1c76279c33db213e3506 author Linus Torvalds Fri, 23 Jun 2006 07:52:36 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:52:36 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits) ACPI: suppress power button event on S3 resume ACPI: resolve merge conflict between sem2mutex and processor_perflib.c ACPI: use for_each_possible_cpu() instead of for_each_cpu() ACPI: delete newly added debugging macros in processor_perflib.c ACPI: UP build fix for bugzilla-5737 Enable P-state software coordination via _PDC P-state software coordination for speedstep-centrino P-state software coordination for acpi-cpufreq P-state software coordination for ACPI core ACPI: create acpi_thermal_resume() ACPI: create acpi_fan_suspend()/acpi_fan_resume() ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() ACPI: create acpi_device_suspend()/acpi_device_resume() ACPI: replace spin_lock_irq with mutex for ec poll mode ACPI: Allow a WAN module enable/disable on a Thinkpad X60. sem2mutex: acpi, acpi_link_lock ACPI: delete unused acpi_bus_drivers_lock sem2mutex: drivers/acpi/processor_perflib.c ACPI add ia64 exports to build acpi_memhotplug as a module ACPI: asus_acpi_init(): propagate correct return value ... Manual resolve of conflicts in: arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c include/acpi/processor.h commit e83319510b04dd51a60da8a0b4ccf8b92b3ab1ad tree e51972f61ee5e84b7312ae609352588b45462526 parent eefe85ee350ece1bdf3e9a61e941d3394a528660 author Bob Copeland Fri, 23 Jun 2006 02:06:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:09 -0700 [PATCH] docs: update sparse.txt with CHECK_ENDIAN Update the sparse documentation to omit the -Wbitwise flag example (as it is now passed by default), and document the kernel defines to enable endianness checking. Signed-off-by: Bob Copeland Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eefe85ee350ece1bdf3e9a61e941d3394a528660 tree 7ed531a7946a6d715622a7d39be9042c03de961d parent 98bd34eaf1a7d1f2ed9c4e5d3a9664d3dcdd2159 author Constantine Sapuntzakis Fri, 23 Jun 2006 02:06:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:09 -0700 [PATCH] drivers/block/loop.c: don't return garbage if LOOP_SET_STATUS not called While writing a version of losetup, I ran into the problem that the loop device was returning total garbage. It turns out the problem was that this losetup was only issuing the LOOP_SET_FD ioctl and not issuing a subsequent LOOP_SET_STATUS ioctl. This losetup didn't have any special status to set, so it left out the call. The deeper cause is that loop_set_fd sets the transfer function to NULL, which causes no transfer to happen lo_do_transfer. This patch fixes the problem by setting transfer to transfer_none in loop_set_fd. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98bd34eaf1a7d1f2ed9c4e5d3a9664d3dcdd2159 tree d14de7352fa3d0be85401c472e9a58afab03dadf parent 125e18745f16685f69a34fd6130d47598fc4bf54 author Mike Miller Fri, 23 Jun 2006 02:06:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:09 -0700 [PATCH] make kernel warn about incorrectly sized partitions Sometimes partitions claim to be larger than the reported capacity of a disk device. This patch makes the kernel warn about those partitions. We still permit these patitions to be used. Quoting Andries Brouwer : Case 1: The kernel is mistaken about the size of the disk. (There are commands to clip a disk to a certain capacity, there are jumpers to tell a disk that it should report a certain capacity etc. Usually this is because of BIOS bugs. In bad cases the machine will crash in the BIOS and hence fail to boot if the disk reports full capacity.) In such cases actually accessing the blocks of the partition may work fine, or may work fine after running an unclip utility. I wrote "setmax" some years ago precisely for this reason. Case 2: There was a messy partition table (maybe just a rounding error) but the actual filesystem on the partition is contained in the physical disk. Now using the filesystem goes without problem. Case 3: Both partition and filesystem extend beyond the end of the disk. In forensic or debugging situations one often uses a copy of the start of a disk. Now access beyond the end gives an expected I/O error. Signed-off-by: Mike Miller Signed-off-by: Stephen Cameron Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 125e18745f16685f69a34fd6130d47598fc4bf54 tree c97ed94b0525a572efa1bd4990a55b18be5d781d parent 78ce89c92bc6eaf5933b5664bff64253a7103bd7 author Eric Sesterhenn Fri, 23 Jun 2006 02:06:06 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] More BUG_ON conversion Signed-off-by: Eric Sesterhenn Signed-off-by: Alexey Dobriyan Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Cc: James Bottomley Acked-by: "Salyzyn, Mark" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78ce89c92bc6eaf5933b5664bff64253a7103bd7 tree edaadf283127c1a74bfe3aa7b165c1cf45d14347 parent cdaad343b561cdeb38b0578bb038eb5e87ed5551 author Jan Kara Fri, 23 Jun 2006 02:06:05 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] JBD: split checkpoint lists Split the checkpoint list of the transaction into two lists. In the first list we keep the buffers that need to be submitted for IO. In the second list are kept buffers that were already submitted and we just have to wait for the IO to complete. This should simplify a handling of checkpoint lists a bit and can eventually be also a performance gain. Signed-off-by: Jan Kara Cc: Mark Fasheh Cc: "Stephen C. Tweedie" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cdaad343b561cdeb38b0578bb038eb5e87ed5551 tree e9f43e14114b7bb46d3175df92a1de5643b2f976 parent 908dcecda1d18803b5823f30e6c47d2882dc0cf1 author Peter Hagervall Fri, 23 Jun 2006 02:06:04 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] Sparse fixes for synclink_cs Mark a few non-exported functions static. Signed-off-by: Peter Hagervall Cc: Paul Fulghum Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 908dcecda1d18803b5823f30e6c47d2882dc0cf1 tree 2e40b7484baa65af9aa4460ae958d445725f484f parent a5d6839b75ca4a29b5e0a5595914a8715e8f746d author Jan Beulich Fri, 23 Jun 2006 02:06:00 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] adjust handle_IRR_event() return type Correct the return type of handle_IRQ_event() (inconsistency noticed during Xen development), and remove redundant declarations. The return type adjustment required breaking out the definition of irqreturn_t into a separate header, in order to satisfy current include order dependencies. Signed-off-by: Jan Beulich Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Russell King Cc: Ian Molton Cc: Mikael Starvik Cc: Yoshinori Sato Cc: Hirokazu Takata Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: William Lee Irwin III Cc: "David S. Miller" Cc: Miles Bader Cc: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5d6839b75ca4a29b5e0a5595914a8715e8f746d tree 8bb38547046d71b42b687e7c07350fe02d9b3d63 parent 226a6b84aaaf1fac7a5d41cf4e7387fd9ba895d5 author Adrian Bunk Fri, 23 Jun 2006 02:05:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] drivers/md/raid6algos.c: fix a NULL dereference This patch fixes a NULL dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk Cc: "H. Peter Anvin" Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 226a6b84aaaf1fac7a5d41cf4e7387fd9ba895d5 tree f1d72ef1145ddbd108c2701e1154fb81e078adb3 parent 3439dd86e34580384d3b58cf8d54a9283cd7a342 author Randy Dunlap Fri, 23 Jun 2006 02:05:58 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] CodingStyle: add typedefs chapter Add a chapter on typedefs, copied from an email from Linus to lkml on Feb. 3, 2006. (Subject: Re: [RFC][PATCH 1/5] Virtualization/containers: startup) Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3439dd86e34580384d3b58cf8d54a9283cd7a342 tree b421244c25d96e83a744576ad543587339e581fb parent 626ab0e69d376fa07599af669af8ba92d58e87c1 author Porpoise Fri, 23 Jun 2006 02:05:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:08 -0700 [PATCH] When CONFIG_BASE_SMALL=1, cascade() may enter an infinite loop When CONFIG_BASE_SAMLL=1, cascade() in may enter the infinite loop. Because of CONFIG_BASE_SMALL=1(TVR_BITS=6 and TVN_BITS=4), the list base->tv5 may cascade into base->tv5. So, the kernel enters the infinite loop in the function cascade(). I created a test module to verify this bug, and a patch to fix it. #include #include #include #include #if 0 #include #else #define kdb_printf printk #endif #define TVN_BITS (CONFIG_BASE_SMALL ? 4 : 6) #define TVR_BITS (CONFIG_BASE_SMALL ? 6 : 8) #define TVN_SIZE (1 << TVN_BITS) #define TVR_SIZE (1 << TVR_BITS) #define TVN_MASK (TVN_SIZE - 1) #define TVR_MASK (TVR_SIZE - 1) #define TV_SIZE(N) (N*TVN_BITS + TVR_BITS) struct timer_list timer0; struct timer_list dummy_timer1; struct timer_list dummy_timer2; void dummy_timer_fun(unsigned long data) { } unsigned long j=0; void check_timer_base(unsigned long data) { kdb_printf("check_timer_base %08x\n",jiffies); mod_timer(&timer0,(jiffies & (~0xFFF)) + 0x1FFF); } int init_module(void) { init_timer(&timer0); timer0.data = (unsigned long)0; timer0.function = check_timer_base; mod_timer(&timer0,jiffies+1); init_timer(&dummy_timer1); dummy_timer1.data = (unsigned long)0; dummy_timer1.function = dummy_timer_fun; init_timer(&dummy_timer2); dummy_timer2.data = (unsigned long)0; dummy_timer2.function = dummy_timer_fun; j=jiffies; j&=(~((1< Cc: Matt Mackall Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 626ab0e69d376fa07599af669af8ba92d58e87c1 tree a995e0231e61fab63568bc7bade81dc20c1dae09 parent 54e73770357142e297c916c7865f5fca7499f69c author Oleg Nesterov Fri, 23 Jun 2006 02:05:55 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] list: use list_replace_init() instead of list_splice_init() list_splice_init(list, head) does unneeded job if it is known that list_empty(head) == 1. We can use list_replace_init() instead. Signed-off-by: Oleg Nesterov Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 54e73770357142e297c916c7865f5fca7499f69c tree a37b768005eee1fdf6e0ae3051098c51f918785f parent cb259f07b1daacafac3b12ecd7f180faf7e506b0 author Oleg Nesterov Fri, 23 Jun 2006 02:05:54 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] list: introduce list_replace() helper list_replace() is similar to list_replace_rcu(), but unlike list_replace_rcu() it could be used when list_empty(old) == 1 doesn't use barriers Signed-off-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb259f07b1daacafac3b12ecd7f180faf7e506b0 tree 99aa3cdf02b229d9dac6c5f510f29a7f22504f77 parent f5befceb5cfecba49fdf61f8e0eb4d453200eac9 author bjdouma Fri, 23 Jun 2006 02:05:53 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] two additions to ./linux/Documentation/ioctl-number.txt Cc: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5befceb5cfecba49fdf61f8e0eb4d453200eac9 tree d44d7b0375408895a686e274a4a336c271184d0a parent 862f5f0133f1c8a179dd93adc03d43f8f7e8bac5 author Brent Casavant Fri, 23 Jun 2006 02:05:52 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] SGI IOC4: Detect IO card variant There are three different IO cards which an SGI IOC4 controller may find itself on. One of these variants does not bring out the IDE and serial signals, so we need to disable attaching the corresponding IOC4 subdrivers to such cards. Cleans up message clutter emitted during device probing. Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 862f5f0133f1c8a179dd93adc03d43f8f7e8bac5 tree 51ef137f4a648859c339988413a19ab3567c032e parent d83015b8f62ee3fcd338f6f009051ed57f77a531 author Randy Dunlap Fri, 23 Jun 2006 02:05:52 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] Doc: add audit & acct to DocBook Fix one audit kernel-doc description (one parameter was missing). Add audit*.c interfaces to DocBook. Add BSD accounting interfaces to DocBook. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d83015b8f62ee3fcd338f6f009051ed57f77a531 tree 11e30548e6b07045f8a17aa4661e1cde6f374b18 parent 55f4e8d156d23709739029afb108932ef94cac94 author Paul E. McKenney Fri, 23 Jun 2006 02:05:51 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] Make RCU API inaccessible to non-GPL Linux kernel modules Remove synchronize_kernel() (deprecated 2-APR-2005 in http://lkml.org/lkml/2005/4/3/11) and makes the RCU API inaccessible to non-GPL Linux kernel modules (as was announced more than one year ago in http://lkml.org/lkml/2005/4/3/8). Tested on x86 and ppc64. Signed-off-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55f4e8d156d23709739029afb108932ef94cac94 tree b8877b3e23dbb82b3fd1fb93ed319a3c5cb1148d parent 915a56d2394f4ef70e9cb7115a9bdad778276338 author Jes Sorensen Fri, 23 Jun 2006 02:05:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] kernel/sys.c doesn't need init.h kernel/sys.c doesn't have anything in it relying on linux/init.h - remove the include. Signed-off-by: Jes Sorensen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 915a56d2394f4ef70e9cb7115a9bdad778276338 tree 783e0ab18ae8b0f02294dd50568de1dadbf06620 parent e0f23603fb2607315ce52432cc4225df410828cf author Randy Dunlap Fri, 23 Jun 2006 02:05:49 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] add Doc/SubmitChecklist Provide a checklist of techniques to aid kernel patch submitters in producing healthy patches and in lessening a burden on maintainers. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0f23603fb2607315ce52432cc4225df410828cf tree 7a32b42a64a64488aee0e91ab016d53c353f9482 parent 57ae2508610d50893cb3e3bbb869ff70ff724a2a author NeilBrown Fri, 23 Jun 2006 02:05:48 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:07 -0700 [PATCH] Remove semi-softlockup from invalidate_mapping_pages If invalidate_mapping_pages is called to invalidate a very large mapping (e.g. a very large block device) and if the only active page in that device is near the end (or at least, at a very large index), such as, say, the superblock of an md array, and if that page happens to be locked when invalidate_mapping_pages is called, then pagevec_lookup will return this page and as it is locked, 'next' will be incremented and pagevec_lookup will be called again. and again. and again. while we count from 0 upto a very large number. We should really always set 'next' to 'page->index+1' before going around the loop again, not just if the page isn't locked. Cc: "Steinar H. Gunderson" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57ae2508610d50893cb3e3bbb869ff70ff724a2a tree 33109c6d78be1b6e5db085a57a4509fcfd88ee95 parent deb0e9b234af24f4a827757fae9ff5542a3d2a12 author Andrew Morton Fri, 23 Jun 2006 02:05:47 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] CONFIG_NET=n build fix Cc: Greg KH Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit deb0e9b234af24f4a827757fae9ff5542a3d2a12 tree 5708987407378781ae22bb4c032ffb807e449e91 parent 66f969d064e46e6690c3426e2af846e76fb80e83 author Andrew Morton Fri, 23 Jun 2006 02:05:46 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] connector-exports Put the connector exports at the functions so people can see them in context. Cc: Evgeniy Polyakov Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66f969d064e46e6690c3426e2af846e76fb80e83 tree 3a1ab9196b5811ec287969a36dee12911fbd22f1 parent 481fad483487ea967fe20bbc9e565d787f7bf20f author Pekka Enberg Fri, 23 Jun 2006 02:05:45 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] ipmi: strstrip conversion Switch an open-coded strstrip() to use the new API. Acked-by: Corey Minyard Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 481fad483487ea967fe20bbc9e565d787f7bf20f tree 3a76336443129975d9f7ba99f9a9ea1c494315e5 parent 3fa2164d03fb7af17fcfe4f8800dd754fbd99ff7 author Pekka Enberg Fri, 23 Jun 2006 02:05:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] strstrip() API Add a new strstrip() function to lib/string.c for removing leading and trailing whitespace from a string. Cc: Michael Holzheu Acked-by: Ingo Oeser Acked-by: Joern Engel Cc: Corey Minyard Signed-off-by: Pekka Enberg Acked-by: Michael Holzheu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fa2164d03fb7af17fcfe4f8800dd754fbd99ff7 tree 1fd2d9bfaff3bd7ba8c7d6c1e60634f3f799b6c7 parent 1d31a4ea8cf7a2afc7299d1d3d8732ca54a5934e author Matt Helsley Fri, 23 Jun 2006 02:05:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] Process Events: License Change Change the license on the process event structure passed between kernel and userspace. Signed-off-by: Matt Helsley Acked-by: Guillaume Thouvenin Acked-by: Nguyen Anh Quynh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d31a4ea8cf7a2afc7299d1d3d8732ca54a5934e tree 74995c3163a0854d37a0a5193177928c2ded9ce8 parent 368a5fa1f28589e6b54588a139ea872d5b4b1914 author Matt Helsley Fri, 23 Jun 2006 02:05:42 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] Process Events - Header Cleanup Move connector header include to precisely where it's needed. Remove unused time.h header file as well. This was leftover from previous iterations of the process events patches. Signed-off-by: Matt Helsley Cc: Guillaume Thouvenin Cc: Nguyen Anh Quynh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 368a5fa1f28589e6b54588a139ea872d5b4b1914 tree 346923893f4814dffb51049f92f81c327374e60c parent 0216bfcffe424a5473daa4da47440881b36c1f41 author Hua Zhong Fri, 23 Jun 2006 02:05:42 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] remove unlikely() in might_sleep_if() The likely() profiling tools show that __alloc_page() causes a lot of misses: ! 132 119193 __alloc_pages():mm/page_alloc.c@937 Because most __alloc_page() calls are not atomic. Signed-off-by: Hua Zhong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0216bfcffe424a5473daa4da47440881b36c1f41 tree 80eaa49bfc644b070e57c251285048992ac6fafc parent 3cbc564024d8f174202f023e8a2991782f6a9431 author Mingming Cao Fri, 23 Jun 2006 02:05:41 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] percpu counter data type changes to suppport more than 2**31 ext3 free blocks counter The percpu counter data type are changed in this set of patches to support more users like ext3 who need more than 32 bit to store the free blocks total in the filesystem. - Generic perpcu counters data type changes. The size of the global counter and local counter were explictly specified using s64 and s32. The global counter is changed from long to s64, while the local counter is changed from long to s32, so we could avoid doing 64 bit update in most cases. - Users of the percpu counters are updated to make use of the new percpu_counter_init() routine now taking an additional parameter to allow users to pass the initial value of the global counter. Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cbc564024d8f174202f023e8a2991782f6a9431 tree 5d523ef9694b7a0bf07d4db58718f4654afa3f04 parent d09042da7284a86ffbdd18695f517a71514ed598 author Ravikiran G Thirumalai Fri, 23 Jun 2006 02:05:40 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:06 -0700 [PATCH] percpu_counters: create lib/percpu_counter.c - Move percpu_counter routines from mm/swap.c to lib/percpu_counter.c Signed-off-by: Ravikiran Thirumalai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d09042da7284a86ffbdd18695f517a71514ed598 tree 09e9a3de71a4a4cf6c8f8cb0c40ec0a916e01cae parent 785d55708c24c28d7646f3d1fe6c9f82fb714311 author Laurent MEYER Fri, 23 Jun 2006 02:05:36 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] fix incorrect SA_ONSTACK behaviour for 64-bit processes - When setting a sighandler using sigaction() call, if the flag SA_ONSTACK is set and no alternate stack is provided via sigaltstack(), the kernel still try to install the alternate stack. This behavior is the opposite of the one which is documented in Single Unix Specifications V3. - Also when setting an alternate stack using sigaltstack() with the flag SS_DISABLE, the kernel try to install the alternate stack on signal delivery. These two use cases makes the process crash at signal delivery. Signed-off-by: Laurent Meyer Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: David Howells Cc: Yoshinori Sato Cc: Geert Uytterhoeven Cc: Roman Zippel Cc: Kyle McMartin Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 785d55708c24c28d7646f3d1fe6c9f82fb714311 tree 3d843be61c44bded726ecccf16312fd45dff3dd5 parent f4e5cc2c44bf760c02875cf48c886c50ec7d2734 author Jesper Juhl Fri, 23 Jun 2006 02:05:35 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] binflt_elf: remove more casts Remove redundant casts from NEW_AUX_ENT() arguments in fs/binfmt_elf.c Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4e5cc2c44bf760c02875cf48c886c50ec7d2734 tree 768df1296b1294c2c84b82f3b0239e5bae3fd5fc parent 11420211b8123d0e2f71945ad022e8eec28ebfce author Jesper Juhl Fri, 23 Jun 2006 02:05:35 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] binfmt_elf: CodingStyle cleanup and remove some pointless casts Do a CodingStyle cleanup of fs/binfmt_elf.c and also remove some pointless casts of kmalloc() return values in the same file. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 11420211b8123d0e2f71945ad022e8eec28ebfce tree 079e4ba2e9484af81ed4ef6ae8dd2ecc58dbc6e9 parent 9becde79d2c5e382d955167c07017b5e34b142f0 author Jan Engelhardt Fri, 23 Jun 2006 02:05:34 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] Update devices.txt Update Documentation/devices.txt with a new version from the LANANA site http://www.lanana.org/docs/device-list/devices-2.6+.txt Signed-off-by: Jan Engelhardt Cc: Torben Mathiasen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9becde79d2c5e382d955167c07017b5e34b142f0 tree fb2f84658cf9a8d7c4089262bd545fa809ef84da parent 83d4e6e7fba0b2a01092f0cf14ba2e33bd1253e9 author Jonathan McDowell Fri, 23 Jun 2006 02:05:33 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] leds: Amstrad Delta LED support Use the new LED infrastructure to support the 6 LEDs present on the Amstrad Delta. [akpm@osdl.org: cleanup] Signed-off-by: Jonathan McDowell Ackde-by: Richard Purdie Cc: Ben Dooks Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83d4e6e7fba0b2a01092f0cf14ba2e33bd1253e9 tree 4fa75ffb35970e27762623edbc1f725171d2b0b5 parent e6022603b9aa7d61d20b392e69edcdbbc1789969 author Andreas Mohr Fri, 23 Jun 2006 02:05:32 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] make noirqdebug/irqfixup __read_mostly, add (un)likely() Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6022603b9aa7d61d20b392e69edcdbbc1789969 tree f94b059e312ea7b2f3c4d0b01939e868ed525fb0 parent 304c4c841a31c780a45d65e389b07706babf5d36 author Andrew Morton Fri, 23 Jun 2006 02:05:32 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] ext3_clear_inode(): avoid kfree(NULL) Steven Rostedt points out that `rsv' here is usually NULL, so we should avoid calling kfree(). Also, fix up some nearby whitespace damage. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 304c4c841a31c780a45d65e389b07706babf5d36 tree d5fed361a127e46c1a99d72ef907e1c6b03a1abe parent 22722051fb6bcbb95c895e68dad10d34a9db7e4d author Andrew Morton Fri, 23 Jun 2006 02:05:31 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] jbd: avoid kfree(NULL) There are a couple of places where JBD has to check to see whether an unneeded memory allocation was performed. Usually it _was_ needed, so we end up calling kfree(NULL). We can micro-optimise that by checking the pointer before calling kfree(). Thanks to Steven Rostedt for identifying this. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22722051fb6bcbb95c895e68dad10d34a9db7e4d tree 2f6e7a7888b4369cb2dd18be1cd4d3b18730280b parent 89d0cf01c0aa9e8241cc3703a359ecd6abf3c28a author Andreas Mohr Fri, 23 Jun 2006 02:05:30 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:05 -0700 [PATCH] x86/powerpc make hardirq_ctx and softirq_ctx __read_mostly The hardirq_ctx and softirq_ctx variables are written to on init only, Signed-off-by: Andreas Mohr Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89d0cf01c0aa9e8241cc3703a359ecd6abf3c28a tree 149611b8bbd430d482299f5b976da6a6cfc1e718 parent d20d04bc9befbd752092b4aa42bb8254a1af0776 author Daniel Walker Fri, 23 Jun 2006 02:05:29 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] invert irq/migration.c brach prediction If you get to that point in the code it means that desc->move_irq is set, pending_irq_cpumask[irq] and cpu_online_map should have a value. Still pretty good chance anding those two you'll still have a value. So these two branch predictors should be inverted. Signed-off-by: Daniel Walker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d20d04bc9befbd752092b4aa42bb8254a1af0776 tree acf5686c7353aab275451e9033f5aa7693c8dc23 parent 94a6735cd67375029c2092e6d46f14b2721e6793 author Jesper Juhl Fri, 23 Jun 2006 02:05:28 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] ISDN: correctly handle isdn_writebuf_stub() errors isdn_writebuf_stub() forgets to detect memory allocation and uaccess errors. And when that's fixed, if a error happens the caller will just keep on looping. So change the caller to detect the error, and to return it. Signed-off-by: Jesper Juhl Cc: Karsten Keil Signed-off-by: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94a6735cd67375029c2092e6d46f14b2721e6793 tree 1d9479e9c2900cdaf1ec7ded1b7a917c8528a3d8 parent 2eebb1925d25cfd7e7cd2eb18ac4d4e6d189dba0 author Jesper Juhl Fri, 23 Jun 2006 02:05:27 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] i4l: memory leak fix for sc_ioctl(). Fix leak of `rcvmsg' in sc_ioctl(). There are two returns in the switch in sc_ioctl (the SCIOCSTART case) that may leak `rcvmsg'. This patch fixes that by adding a kfree() call at the beginning of that case. Bug found by the coverity checker as #1098 Eric Sesterhenn send me a patch to fix the leak(s) by adding 2 kfree() calls before the returns, I changed that into just a single call at the beginning. Signed-off-by: Jesper Juhl Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2eebb1925d25cfd7e7cd2eb18ac4d4e6d189dba0 tree a4257f771edf0b1809eba1999447692741caeafa parent 9ada7340987aa24395809570840c7c6847044f52 author Jesper Juhl Fri, 23 Jun 2006 02:05:26 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] OSS: cs46xx cleanup and tiny bugfix Here's a patch for cs46xx that - (mostly) cleans up the cs46xx driver according to CodingStyle - removes a bunch of pointless casts - fixes a small, potential use of uninitialized variable, bug - reduces the size of the compiled code by 36 bytes - reduces the size of the source file by 1831 bytes I know I should probably have split this into bits, but since I only thought of that *after* doing all the edits, splitting it up would have been a royal pain. And since these are all pretty trivial changes I thought I'd just submit the one huge patch and hope people could live with it (if not, then just tell me and I'll split it). The bug fix that's in there may be hard to spot, so I'll point it out. It's the - int val, valsave, mapped, ret; + int val, valsave, ret; + int mapped = 0; bit. Without that change we may use `mapped' uninitialized if, in cs_ioctl, the first test of "if(state)" is false and the second "if(state)" test is true. Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ada7340987aa24395809570840c7c6847044f52 tree e2a57c184d15cbd2415f4fce35534cf635e9fa9f parent 8e0a43d8fa953179505869ec28de78550246e795 author Jan Kara Fri, 23 Jun 2006 02:05:25 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] jbd: fix BUG in journal_commit_transaction() Fix possible assertion failure in journal_commit_transaction() on jh->b_next_transaction == NULL (when we are processing BJ_Forget list and buffer is not jbddirty). !jbddirty buffers can be placed on BJ_Forget list for example by journal_forget() or by __dispose_buffer() - generally such buffer means that it has been freed by this transaction. Freed buffers should not be reallocated until the transaction has committed (that's why we have the assertion there) but they *can* be reallocated when the transaction has already been committed to disk and we are just processing the BJ_Forget list (as soon as we remove b_committed_data from the bitmap bh, ext3 will be able to reallocate buffers freed by the committing transaction). So we have to also count with the case that the buffer has been reallocated and b_next_transaction has been already set. And one more subtle point: it can happen that we manage to reallocate the buffer and also mark it jbddirty. Then we also add the freed buffer to the checkpoint list of the committing trasaction. But that should do no harm. Non-jbddirty buffers should be filed to BJ_Reserved and not BJ_Metadata list. It can actually happen that we refile such buffers during the commit phase when we reallocate in the running transaction blocks deleted in committing transaction (and that can happen if the committing transaction already wrote all the data and is just cleaning up BJ_Forget list). Signed-off-by: Jan Kara Acked-by: "Stephen C. Tweedie" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e0a43d8fa953179505869ec28de78550246e795 tree 1fc56d6337c487952ab008b8ff063b2a2d48ee02 parent 6e6672604773b9bae44d88d38afdf0763c104b1c author Ingo Molnar Fri, 23 Jun 2006 02:05:23 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] cond_resched() might_sleep() fix add the __might_sleep() check back to cond_resched(). Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e6672604773b9bae44d88d38afdf0763c104b1c tree fa597c1b9d46d3f7ed6743f2230a0ac9813693a7 parent 538c5902b81cc384e93ad3834b6d4a0b3fcb2285 author Prasanna Meda Fri, 23 Jun 2006 02:05:23 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] dup fd error fix Set errorp in dup_fd, it will be used in sys_unshare also. Signed-off-by: Prasanna Meda Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 538c5902b81cc384e93ad3834b6d4a0b3fcb2285 tree 690a8f276814946755ccb8261a8174511104b3f8 parent 5a9d6e0632b867ca71d3ee1e7e5c2365b6711031 author Jean-Luc Leger Fri, 23 Jun 2006 02:05:22 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] clean up default value of IP_DCCP_ACKVEC Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for IP_DCCP_ACKVEC. Signed-off-by: Jean-Luc Leger Cc: Arnaldo Carvalho de Melo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a9d6e0632b867ca71d3ee1e7e5c2365b6711031 tree 65e6d74dc6cc21dc027395fbdd042d9ba992e0b0 parent c7a43575518702fe6829d970c3d04acd91ae5c91 author Jean-Luc Leger Fri, 23 Jun 2006 02:05:21 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:04 -0700 [PATCH] clean up default value of USB_ISP116X_HCD, USB_SL811_HCD and USB_SL811_CS Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for USB_ISP116X_HCD, USB_SL811_HCD and USB_SL811_CS. Signed-off-by: Jean-Luc Leger Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7a43575518702fe6829d970c3d04acd91ae5c91 tree ac3e1fa7b6d51d734ece5abd7e72b79cad149376 parent 1e11d2782b2f8e86d22ad92c75b70ec8cad14dcf author Jean-Luc Leger Fri, 23 Jun 2006 02:05:20 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] clean up default value of SYSCALL_DEBUG Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for SYSCALL_DEBUG. Signed-off-by: Jean-Luc Leger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e11d2782b2f8e86d22ad92c75b70ec8cad14dcf tree c019b56dd2031f33bedcb976c35281836c80c19b parent 260ea1013283d8acbb451459ed1ca560c1445c20 author Jean-Luc Leger Fri, 23 Jun 2006 02:05:19 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] clean up default value of SCHED_SMT Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for SCHED_SMT. Signed-off-by: Jean-Luc Leger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 260ea1013283d8acbb451459ed1ca560c1445c20 tree 35819d28dbfa8600ac0de336147323e660b0390c parent 4a4b69f79ba7286794765a856349e380f984a6cb author Eric W. Biederman Fri, 23 Jun 2006 02:05:18 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] ptrace: document the locking rules After a lot of reading the code and thinking about how it behaves I have managed to figure out what the current ptrace locking rules are. The current code is in much better that it appears at first glance. The troublesome code paths are actually the code paths that violate the current rules. ptrace uses simple exclusive access as it's locking. You can only touch task->ptrace if the task is stopped and you are the ptracer, or if the task is running and are the task itself. Very simple, very easy to maintain. It just needs to be documented so people know not to touch ptrace from elsewhere. Currently we do have a few pieces of code that are in violation of this rule. Particularly the core dump code, and ptrace_attach. But so far the code looks fixable. Signed-off-by: Eric W. Biederman Cc: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a4b69f79ba7286794765a856349e380f984a6cb tree e437752eb3f53b4e732595815aa5d24ff4bcbaab parent 2da132646358c853d5caf296d079aefc69358d46 author Vadim Lobanov Fri, 23 Jun 2006 02:05:16 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] Poll cleanups/microoptimizations The "count" and "pt" variables are declared and modified by do_poll(), as well as accessed and written indirectly in the do_pollfd() subroutine. This patch pulls all handling of these variables into the do_poll() function, thereby eliminating the odd use of indirection in do_pollfd(). This is done by pulling the "struct pollfd" traversal loop from do_pollfd() into its only caller do_poll(). As an added bonus, the patch saves a few clock cycles, and also adds comments to make the code easier to follow. Signed-off-by: Vadim Lobanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2da132646358c853d5caf296d079aefc69358d46 tree 253119203069ade4dc11962191cdfd51bc8b783e parent 0ae26f1b3159f3acb21ae1e866c3c7e16edd450f author Adrian Bunk Fri, 23 Jun 2006 02:05:15 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] fs/fat/misc.c: unexport fat_sync_bhs Signed-off-by: Adrian Bunk Acked-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ae26f1b3159f3acb21ae1e866c3c7e16edd450f tree 28a86cc8682ad5b247f597773572e410b9457d72 parent 32797f976d62af709943aae38a9457b5a6dbcd8a author Andrew Morton Fri, 23 Jun 2006 02:05:15 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] mmput() might sleep exit_aio() and exit_mmap() can sleep. But it's easy to accidentally call mmput() from inside locks. Cc: Dave Peterson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32797f976d62af709943aae38a9457b5a6dbcd8a tree 63c71a314678946589d575bcb0559fe727a4daad parent 8d27e9084b372441dc8c9cf361a965ee58032767 author Domen Puncer Fri, 23 Jun 2006 02:05:14 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] Remove CONFIG_PARPORT_ARC, drivers/parport/parport_arc.c It's wasn't referenced in Makefile since at least 2.2.8, unbuildable due to trivial typos and things like DATA_LATCH and arc_write_control() which doesn't exist. Adrian Bunk: adapted the patch to unrelated context changes Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d27e9084b372441dc8c9cf361a965ee58032767 tree fa01bec4e62d494e0a3811d7e29b0b263262f42b parent b0904e147f7cbe4be3b4dae49ddccd627bb66f16 author Xose Vazquez Perez Fri, 23 Jun 2006 02:05:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] module.h: updated comments with a new license "Dual MIT/GPL" is also accepted (kernel/module.c), so updated comments. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b0904e147f7cbe4be3b4dae49ddccd627bb66f16 tree 81bb0e45d46a3bb038d953f616fd6e32d7ca5e4b parent 75e1fcc0b18df0a65ab113198e9dc0e98999a08c author Adrian Bunk Fri, 23 Jun 2006 02:05:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:03 -0700 [PATCH] fs/locks.c: make posix_locks_deadlock() static We can now make posix_locks_deadlock() static. Signed-off-by: Adrian Bunk Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75e1fcc0b18df0a65ab113198e9dc0e98999a08c tree 3ac0d0d3120cbca4ee9734494e2c9a4e0775ac4f parent ff7b86b82083f24b8637dff1528c7101c18c7f39 author Miklos Szeredi Fri, 23 Jun 2006 02:05:12 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] vfs: add lock owner argument to flush operation Pass the POSIX lock owner ID to the flush operation. This is useful for filesystems which don't want to store any locking state in inode->i_flock but want to handle locking/unlocking POSIX locks internally. FUSE is one such filesystem but I think it possible that some network filesystems would need this also. Also add a flag to indicate that a POSIX locking request was generated by close(), so filesystems using the above feature won't send an extra locking request in this case. Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ff7b86b82083f24b8637dff1528c7101c18c7f39 tree be80c94e4c1410b51190b617fa27caf33b0ba60b parent 39005d022ad221b76dc2de0ac62ef475a796433b author Miklos Szeredi Fri, 23 Jun 2006 02:05:11 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] locks: clean up locks_remove_posix() locks_remove_posix() can use posix_lock_file() instead of doing the lock removal by hand. posix_lock_file() now does exacly the same. The comment about pids no longer applies, posix_lock_file() takes only the owner into account. Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39005d022ad221b76dc2de0ac62ef475a796433b tree e0a36fec7076d48764f0588b9ce09ce8e9f067ff parent 0d9a490abe1f69fda220f7866f6f23af41daa128 author Miklos Szeredi Fri, 23 Jun 2006 02:05:10 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] locks: don't do unnecessary allocations posix_lock_file() always allocates new locks in advance, even if it's easy to determine that no allocations will be needed. Optimize these cases: - FL_ACCESS flag is set - Unlocking the whole range Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d9a490abe1f69fda220f7866f6f23af41daa128 tree 499b7f9c44bb5a079f8ba303fefba402e603c314 parent 090d2b185d8680fc26a2eaf4245d4171dcf4baf1 author Miklos Szeredi Fri, 23 Jun 2006 02:05:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] locks: don't unnecessarily fail posix lock operations posix_lock_file() was too cautious, failing operations on OOM, even if they didn't actually require an allocation. This has the disadvantage, that a failing unlock on process exit could lead to a memory leak. There are two possibilites for this: - filesystem implements .lock() and calls back to posix_lock_file(). On cleanup of files_struct locks_remove_posix() is called which should remove all locks belonging to files_struct. However if filesystem calls posix_lock_file() which fails, then those locks will never be freed. - if a file is closed while a lock is blocked, then after acquiring fcntl_setlk() will undo the lock. But this unlock itself might fail on OOM, again possibly leaking the lock. The solution is to move the checking of the allocations until after it is sure that they will be needed. This will solve the above problem since unlock will always succeed unless it splits an existing region. Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 090d2b185d8680fc26a2eaf4245d4171dcf4baf1 tree 67e604e3cd1bad3cfd034bced19a0fbff6a80c30 parent c330dda908b5a46469a997eea90b66f2f9f02b34 author Pekka Enberg Fri, 23 Jun 2006 02:05:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] read_mapping_page for address space Add read_mapping_page() which is used for callers that pass mapping->a_ops->readpage as the filler for read_cache_page. This removes some duplication from filesystem code. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c330dda908b5a46469a997eea90b66f2f9f02b34 tree aad52aa4e127c366ca185c2122650d7dbb3437a0 parent 24bbb1faf3f0420eb252dd0fdc1e477b1d4d73bd author Jeff Moyer Fri, 23 Jun 2006 02:05:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] Add a sysfs file to determine if a kexec kernel is loaded Create two files in /sys/kernel, kexec_loaded and kexec_crash_loaded. Each file contains a simple boolean value indicating whether the relevant kernel has been loaded into memory. The motivation for this is geared around support. Signed-off-by: Jeff Moyer Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24bbb1faf3f0420eb252dd0fdc1e477b1d4d73bd tree ce7f9358fdeaa4f299cb996e8a1d4224d51ee4c4 parent b9e122c80cd2e10fe18678c63db4717871ed31cf author Michael Holzheu Fri, 23 Jun 2006 02:05:06 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] s390_hypfs filesystem On zSeries machines there exists an interface which allows the operating system to retrieve LPAR hypervisor accounting data. For example, it is possible to get usage data for physical and virtual cpus. In order to provide this information to user space programs, I implemented a new virtual Linux file system named 's390_hypfs' using the Linux 2.6 libfs framework. The name 's390_hypfs' stands for 'S390 Hypervisor Filesystem'. All the accounting information is put into different virtual files which can be accessed from user space. All data is represented as ASCII strings. When the file system is mounted the accounting information is retrieved and a file system tree is created with the attribute files containing the cpu information. The content of the files remains unchanged until a new update is made. An update can be triggered from user space through writing 'something' into a special purpose update file. We create the following directory structure: / update cpus/ type mgmtime ... hyp/ type systems/ cpus/ type mgmtime cputime onlinetime ... cpus/ ... - update: File to trigger update - cpus/: Directory for all physical cpus - cpus//: Directory for one physical cpu. - cpus//type: Type name of physical zSeries cpu. - cpus//mgmtime: Physical-LPAR-management time in microseconds. - hyp/: Directory for hypervisor information - hyp/type: Typ of hypervisor (currently only 'LPAR Hypervisor') - systems/: Directory for all LPARs - systems//: Directory for one LPAR. - systems//cpus//: Directory for the virtual cpus - systems//cpus//type: Typ of cpu. - systems//cpus//mgmtime: Accumulated number of microseconds during which a physical CPU was assigned to the logical cpu and the cpu time was consumed by the hypervisor and was not provided to the LPAR (LPAR overhead). - systems//cpus//cputime: Accumulated number of microseconds during which a physical CPU was assigned to the logical cpu and the cpu time was consumed by the LPAR. - systems//cpus//onlinetime: Accumulated number of microseconds during which the logical CPU has been online. As mount point for the filesystem /sys/hypervisor/s390 is created. The update process is triggered when writing 'something' into the 'update' file at the top level hypfs directory. You can do this e.g. with 'echo 1 > update'. During the update the whole directory structure is deleted and built up again. Cc: Pekka Enberg Cc: Ingo Oeser Cc: Joern Engel Acked-by: Martin Schwidefsky Signed-off-by: Michael Holzheu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9e122c80cd2e10fe18678c63db4717871ed31cf tree 3e29f080ff69dc93d07e41774f2e3c53506ef37c parent 6f36d17a87ea9c2584aa8f649e438334bd69e32f author Jesper Juhl Fri, 23 Jun 2006 02:05:04 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:02 -0700 [PATCH] xtensa: remove verify_area macros verify_area() is still alive on xtensa in 2.6.17-rc3-git13 It would be nice to finally be rid of that function across the board. Signed-off-by: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f36d17a87ea9c2584aa8f649e438334bd69e32f tree d7fb30847c42598631cc29f4a5afa2ecd3a9d92d parent f1b5e520bb65e98d27632cd270d931838bd2a5da author Al Viro Fri, 23 Jun 2006 02:05:03 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: windfarm is powerpc-only, don't do it on m68k macs Signed-off-by: Al Viro Cc: Roman Zippel Cc: Geert Uytterhoeven Acked-by: Benjamin Herrenschmidt Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1b5e520bb65e98d27632cd270d931838bd2a5da tree 4685f12b6e919faabd1bd24a32b180c420aaa47a parent de290166552a037234bca44ed4bcbf4a4e9f5be9 author Al Viro Fri, 23 Jun 2006 02:05:03 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k traps.c constraints Cast is not an lvalue; =r constraint wants an lvalue and really couldn't care whether it's void * or other pointer type. Signed-off-by: Al Viro Cc: Roman Zippel Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de290166552a037234bca44ed4bcbf4a4e9f5be9 tree 57141f6ce3e37e9881259645e44de87b981f5e5f parent d94af931af42152e34539dd4782b1724084a89fb author Jan Altenberg Fri, 23 Jun 2006 02:05:01 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: ptrace.h typo fix Signed-off-by: Jan Altenberg Cc: Geert Uytterhoeven Cc: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d94af931af42152e34539dd4782b1724084a89fb tree 7cf8c1cce891ef6b87635a643fe62ea9d231b474 parent 1a23989475846547e5b7ce14e77f072894aaff54 author Roman Zippel Fri, 23 Jun 2006 02:05:00 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: clean up uaccess.h This uninlines a few large functions in uaccess.h and cleans up the rest. It includes a (hopefully temporary) workaround for the broken typeof of gcc-4.1. Signed-off-by: Roman Zippel Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a23989475846547e5b7ce14e77f072894aaff54 tree 8cc8726619f50ffcb62433e6548fd285da252922 parent 6d2f16a8917eb77a8b79849686159f3a5eae2501 author Finn Thain Fri, 23 Jun 2006 02:04:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: m68k mac VIA2 fixes and cleanups Some fixes and cleanups from the linux-mac68k repo. Fix mac_esp by clearing the VIA2 SCSI IRQ flag before the SCSI IRQ handler is invoked. Also fix a race condition caused by unmasking a nubus slot IRQ then setting the relevant nubus_active bit. Signed-off-by: Finn Thain Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d2f16a8917eb77a8b79849686159f3a5eae2501 tree eddcb022e805523873fccf30ce3d9a21d27dc41d parent 2dcf15b78d14c8d92fa1ce1be95b75e8d27ef99f author Roman Zippel Fri, 23 Jun 2006 02:04:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: adjust to changed HARDIRQ_MASK Adjust entry.S to the changed HARDIRQ_MASK, add a check to prevent it from silently breaking again. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2dcf15b78d14c8d92fa1ce1be95b75e8d27ef99f tree 782bc7e735f077832c7c6200be1b5454cac6293b parent 882905c7ff81763a3aa3413629f7253b75587cb1 author Roman Zippel Fri, 23 Jun 2006 02:04:58 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: use proper defines for zone initialization MAX_NR_ZONES changed, so use correct defines now. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 882905c7ff81763a3aa3413629f7253b75587cb1 tree 1425504c208f6c06a8817e376b113ae6360b12ef parent 5fa28ea42f28342ca6efaa2d23789f3fec5adff6 author Roman Zippel Fri, 23 Jun 2006 02:04:57 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: wd33c93: extra delay The wd33c93 needs a small delay before a new command can be started. Signed-off-by: Roman Zippel Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fa28ea42f28342ca6efaa2d23789f3fec5adff6 tree 3433408bfa592c8ca93a121422fab5f42e7c3444 parent cb7d390df391402c9630940d5a2ea1571fc5cde2 author Roman Zippel Fri, 23 Jun 2006 02:04:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:01 -0700 [PATCH] m68k: restore amikbd compatibility with 2.4 Dump the extra mapping in the amikbd interrupt handler, so old Amiga keymaps work again. Amigas need a special keymap anyway, standard keymaps are not usable and recreating all keymaps is simply not worth the trouble. Signed-off-by: Roman Zippel Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb7d390df391402c9630940d5a2ea1571fc5cde2 tree ce2e2406a477a45db3d0e77948f6431e040e81ee parent f6c4192e77dffbc50ee1b9a24a1063ff961aaf04 author Roman Zippel Fri, 23 Jun 2006 02:04:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: print correct stack trace Pass unmodified stack argument to show_trace(). Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6c4192e77dffbc50ee1b9a24a1063ff961aaf04 tree 5bf22818ac9f6adb7cd588986effab63fbf550e7 parent 98317f1271e7fd472983b013c76df6cc15fbef22 author Roman Zippel Fri, 23 Jun 2006 02:04:55 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: use c99 initializer Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98317f1271e7fd472983b013c76df6cc15fbef22 tree 98aa4a3193044e57fbe918850e2b9eed13904c30 parent 5a232eafedc385249ef1931d186169f9eed2ad93 author Roman Zippel Fri, 23 Jun 2006 02:04:54 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: Remove some unused definitions in zorro.h These definitions have long been superseded by asm-offsets.h Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a232eafedc385249ef1931d186169f9eed2ad93 tree 440fa3a66ae793f96e8c95942d8fb363ead259eb parent 078517e4118dc60a97c4eda127b849383eb26f8e author Roman Zippel Fri, 23 Jun 2006 02:04:54 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: cleanup unistd.h Remove long obsolete kernel syscalls, only execve is still used. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 078517e4118dc60a97c4eda127b849383eb26f8e tree 894d17bb1979dc894f12cb22d95507db1330536c parent 2c3e0262e0cb5395fe02cdf27c229ee7414ab0c0 author Roman Zippel Fri, 23 Jun 2006 02:04:53 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: atyfb_base compile fix for CONFIG_PCI=n The atyfb_driver structure is only available if CONFIG_PCI is set. Signed-off-by: Roman Zippel Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c3e0262e0cb5395fe02cdf27c229ee7414ab0c0 tree d375b705880fc70b8dc5029b81b697936f1bbce7 parent daacf8bc0dd37a6ad3a87d1a667599e15940815e author Roman Zippel Fri, 23 Jun 2006 02:04:51 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] m68k: completely initialize hw_regs_t in ide_setup_ports ide_setup_ports does not completely initialize the hw_regs_t structure which can cause random failures, as the structure is often on the stack. None of the callers expect a partially initialized structure, i.e. none of them do any setup of their own before calling ide_setup_ports(). Signed-off-by: Roman Zippel Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daacf8bc0dd37a6ad3a87d1a667599e15940815e tree d16b7b89d258b52cb95c00b1b53ce4fe5c379a3e parent e084dbd3a995f99f5444a9046e66d93c1b92c348 author Shaohua Li Fri, 23 Jun 2006 02:04:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] move do_suspend_lowlevel to correct segment Move do_suspend_lowlevel to correct segment. If it is in the same hugepage with ro data, mark_rodata_ro will make it unexecutable. Signed-off-by: Shaohua Li Cc: Len Brown Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e084dbd3a995f99f5444a9046e66d93c1b92c348 tree eda6d7537af3fb36c3152f2ff3942fc4d5790efa parent 55b2355eefc2f160246226d4d69fed431173a4d5 author Pavel Machek Fri, 23 Jun 2006 02:04:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] swsusp: documentation updates Update documentation a bit, add more machines to video.txt list. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55b2355eefc2f160246226d4d69fed431173a4d5 tree b5ed6dbf3d045443a12de412f9937a6b8dc20840 parent 968808b8956e332e556b1eae9b4f7df77518f53b author Shaohua Li Fri, 23 Jun 2006 02:04:49 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] don't use flush_tlb_all in suspend time flush_tlb_all uses on_each_cpu, which will disable/enable interrupt. In suspend/resume time, this will make interrupt wrongly enabled. Signed-off-by: Shaohua Li Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 968808b8956e332e556b1eae9b4f7df77518f53b tree e90598c5640df24a250aa0beb3e526f2571ed6e2 parent 7bff24e255ee11ecbc304315a252fcbd84f9ffce author Rafael J. Wysocki Fri, 23 Jun 2006 02:04:48 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:43:00 -0700 [PATCH] swsusp: use less memory during resume Make swsusp allocate only as much memory as needed to store the image data and metadata during resume. Without this patch swsusp additionally allocates many page frames that will conflict with the "original" locations of the image data and are considered as "unsafe", treating them as "eaten" pages (ie. allocated but unusable). The patch makes swsusp allocate as many pages as it'll need to store the data read from the image in one shot, creating a list of allocated "safe" pages, and use the observation that all pages allocated by it are marked with the PG_nosave and PG_nosave_free flags set.  Namely, when it's about to load an image page, swsusp can check whether the page frame corresponding to the "original" location of this page has been allocated (ie. if the page frame has the PG_nosave and PG_nosave_free flags set) and if so, it can load the page directly into this page frame.  Otherwise it uses an allocated "safe" page from the list to store the data that will be copied to their "original" location later on. This allows us to save many page copyings and page allocations during resume and in the future it may allow us to load images greater than 50% of the normal zone. Signed-off-by: Rafael J. Wysocki Acked-by: "Pavel Machek" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7bff24e255ee11ecbc304315a252fcbd84f9ffce tree 23397d27bad855d8b46da23ffc3d9ae5cc0c596c parent a938c356d5b007fe6d28251c0ddbf6c11d0d92b5 author Adrian Bunk Fri, 23 Jun 2006 02:04:47 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] kernel/power/snapshot.c: cleanups - make needlessly global functions static - make dummy functions static inline Signed-off-by: Adrian Bunk Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a938c356d5b007fe6d28251c0ddbf6c11d0d92b5 tree e55827ad27bf0a1b3a0cae821219a863c25173b7 parent 3e3318dee0878d42ed62a19c292a2ac284135db3 author Rafael J. Wysocki Fri, 23 Jun 2006 02:04:46 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] swsusp: take lowmem reserves into account swsusp allocates memory from the normal zone, so it cannot use lowmem reserve pages from the lower zones. Therefore it should not count these pages as available to it. Signed-off-by: Rafael J. Wysocki Cc: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e3318dee0878d42ed62a19c292a2ac284135db3 tree ad1656ed3ec0fc71012a14af087fd7fbb4fb601c parent b6370d96e09944c6e3ae8d5743ca8a8ab1f79f6c author Shaohua Li Fri, 23 Jun 2006 02:04:46 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] swsusp: x86_64 mark special saveable/unsaveable pages Pages (Reserved/ACPI NVS/ACPI Data) below end_pfn will be saved/restored by S4 currently. We should mark 'Reserved' pages not saveable. Pages (Reserved/ACPI NVS/ACPI Data) above end_pfn will not be saved/restored by S4 currently. We should save the 'ACPI NVS/ACPI Data' pages. Signed-off-by: Shaohua Li Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6370d96e09944c6e3ae8d5743ca8a8ab1f79f6c tree 00f4ca16e06914d11c9ce2d83443f544705f7a77 parent ce4ab0012b32c1a4a1d6e934aeb73bf3151c48d9 author Shaohua Li Fri, 23 Jun 2006 02:04:45 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] swsusp: i386 mark special saveable/unsaveable pages Pages (Reserved/ACPI NVS/ACPI Data) below max_low_pfn will be saved/restored by S4 currently. We should mark 'Reserved' pages not saveable. Pages (Reserved/ACPI NVS/ACPI Data) above max_low_pfn will not be saved/restored by S4 currently. We should save the 'ACPI NVS/ACPI Data' pages. Signed-off-by: Shaohua Li Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce4ab0012b32c1a4a1d6e934aeb73bf3151c48d9 tree 83b5ba44e93eeb8b72fe14028ac25943f77844fe parent 82dcaafc92fdfbe2c1d6c50b9f5e17d533caf950 author Shaohua Li Fri, 23 Jun 2006 02:04:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] swsusp: add architecture special saveable pages support 1. Add architecture specific pages save/restore support. Next two patches will use this to save/restore 'ACPI NVS' pages. 2. Allow reserved pages 'nosave'. This could avoid save/restore BIOS reserved pages. Signed-off-by: Shaohua Li Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Nigel Cunningham Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82dcaafc92fdfbe2c1d6c50b9f5e17d533caf950 tree 87244d19e2351315f566542152d6760f890041b1 parent 30343d6c3d4e3fe961369e7be19935683e808c88 author Mathieu Chouquet-Stringer Fri, 23 Jun 2006 02:04:40 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] Remove duplicate symbol exports on Alpha WARNING: vmlinux: 'enable_irq' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'disable_irq' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'disable_irq_nosync' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'probe_irq_mask' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'sys_open' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'sys_read' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strstr' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memscan' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'memcmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strnlen' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strncmp' exported twice. Previous export was in vmlinux WARNING: vmlinux: 'strcmp' exported twice. Previous export was in vmlinux Signed-off-by: Mathieu Chouquet-Stringer Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30343d6c3d4e3fe961369e7be19935683e808c88 tree 61efa604ac9f9d27b950dd16790a583e9e3b1fb4 parent 224f611c1639cb6c134a934dae7f7b9f0ac3b540 author Kirill Smelkov Fri, 23 Jun 2006 02:04:33 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] x86: compile fix for asm-i386/alternatives.h compile fix: needs for 'u8' -- just look at struct alt_instr. My module includes as the first header, and as of 2.6.17 this leads to compilation errors. Signed-off-by: Kirill Smelkov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 224f611c1639cb6c134a934dae7f7b9f0ac3b540 tree c5fb2f73e606dc172528f15947cef1d9c0df9e13 parent 7e04a1183eac3e6b3570a154c8677fd9184b51e7 author Michal Ludvig Fri, 23 Jun 2006 02:04:32 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] x86: VIA C7 CPU flags New CPU flags for next generation of crypto engine as found in VIA C7 processors. Signed-off-by: Michal Ludvig Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e04a1183eac3e6b3570a154c8677fd9184b51e7 tree c7e65549871504bb4df03982f9a7581aa6417cab parent 722f4f5b2600b8930b63a096e48b878cd6e0e15a author Chuck Ebbert <76306.1226@compuserve.com> Fri, 23 Jun 2006 02:04:31 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:59 -0700 [PATCH] i386: extra checks in show_registers() Sometimes thread_info and task_struct get out-of-sync with each other. Printing task.thread_info in show_registers() can help spot this. And when task_struct is corrupt then task.comm can contain garbage, so only print as many characters as it can hold. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 722f4f5b2600b8930b63a096e48b878cd6e0e15a tree 434c3af4a09ae3c0aa5a29f7bc25f1477ea67832 parent 6444541671bd821b950dbaafee70d65188198aa6 author Roman Zippel Fri, 23 Jun 2006 02:04:31 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] x86: fix __range_ok constraint An immediate operand can't be the destination of the cmpl instruction, so exclude it. Signed-off-by: Roman Zippel Cc: Mattia Dongili Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6444541671bd821b950dbaafee70d65188198aa6 tree bec166679ad3659407bafa0b088c5932461e8928 parent 19964fecf25c17f865dec07ae242b1a40ea93f16 author Zachary Amsden Fri, 23 Jun 2006 02:04:30 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] i386: don't try kprobes for v8086 mode Never allow int3 traps from V8086 mode to enter the kprobes handler. Signed-off-by: Zachary Amsden Cc: Prasanna S Panchamukhi Cc: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: Chuck Ebbert <76306.1226@compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19964fecf25c17f865dec07ae242b1a40ea93f16 tree e3eae33af9583dd6a7f88f54b2e9e0f5ecd0b74d parent 110cb1d2e343443c4a4b5f7e081928aa4da90f93 author Chuck Ebbert <76306.1226@compuserve.com> Fri, 23 Jun 2006 02:04:29 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] i386: fix get_segment_eip() with vm86 segments We need to check for vm86 mode first before looking at selector privilege bits. Segment limit is always base + 64k and only the low 16 bits of EIP are significant in vm86 mode. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Andi Kleen Cc: Zachary Amsden Cc: Rohit Seth Acked-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 110cb1d2e343443c4a4b5f7e081928aa4da90f93 tree 3bfa03442e95ed7fc4fcc79c97e7bf8cbc8abf22 parent a0de1f0a5038a957d50893db7a0d47e385fb2915 author Andreas Mohr Fri, 23 Jun 2006 02:04:28 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] x86: use proper defines for i8259A I/O Use proper defines instead of open-coded values. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0de1f0a5038a957d50893db7a0d47e385fb2915 tree 6be2b76aba77067aa35530e4f352006341897c29 parent 9f22271898707aed2f84cc75ab3bd109173cdbbf author Andreas Mohr Fri, 23 Jun 2006 02:04:28 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:58 -0700 [PATCH] x86: constify arch/i386/pci/irq.c constify structs and add one __initdata. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f22271898707aed2f84cc75ab3bd109173cdbbf tree 773c9c455c881a32ce5a5afd80dfe559ae10dc68 parent 7b0c2d92180dbd9c7cd0c4b9bd38b06bb0f12843 author Andreas Mohr Fri, 23 Jun 2006 02:04:27 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] make ACPI errata __read_mostly Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b0c2d92180dbd9c7cd0c4b9bd38b06bb0f12843 tree 5157857da98668f9473ba95993a623f604a2a5ab parent cefc01130ba2bb0a81abda14b3f00fcc2e70dd43 author Andreas Mohr Fri, 23 Jun 2006 02:04:26 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] x86: make i387 mxcsr_feature_mask __read_mostly Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cefc01130ba2bb0a81abda14b3f00fcc2e70dd43 tree 392da803d2da3804ca0359ffb6a4763d0decd7d2 parent acae9d32436122959667470b84da517d7b1b9c2d author Andreas Mohr Fri, 23 Jun 2006 02:04:26 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] x86: cyrix code CONFIG_PCI fix / add __initdata PCI code was outside of CONFIG_PCI, add __initdata at cyrix_55x0 (since accessed within __init function only). Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit acae9d32436122959667470b84da517d7b1b9c2d tree 4d933c5d4394184240d4cd89f2f5397a4277c21e parent 21528454f6dd18231ae20102f98aa8f51b6ec1b9 author Andreas Mohr Fri, 23 Jun 2006 02:04:25 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] x86: make using_apic_timer __read_mostly Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21528454f6dd18231ae20102f98aa8f51b6ec1b9 tree a167603f42c51c0e1a731ae9629305a11a5b8e44 parent 1b61b910e99059abdd54c93aa70e84e076e33d16 author Chuck Ebbert <76306.1226@compuserve.com> Fri, 23 Jun 2006 02:04:23 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] i386: let usermode execute the "enter" instruction The i386 page fault handler does not allow enough slack when checking for userspace access below the current stack pointer. This prevents use of the enter instruction by user code. Fix this by allowing enough slack for "enter $65535,$31" to execute. Problem reported by Tomasz Malesinski Tested using this program, based on the original from Tomasz: .file "ovflow.S" .version "01.01" gcc2_compiled.: .section .rodata .LC0: .string "asdf\n" .text .align 4 .globl main .type main,@function main: nest_level=0 .rept 30 enter $0,$nest_level nest_level=nest_level+1 .endr enter $65535,$30 enter $65535,$31 addl $-12,%esp pushl $.LC0 call printf addl $16,%esp .L2: .rept 32 leave .endr ret .Lfe1: .size main,.Lfe1-main .ident "GCC: (GNU) 2.95.4 20011002 (Debian prerelease)" Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b61b910e99059abdd54c93aa70e84e076e33d16 tree fe2cd431dc39521a0f2d30e22c9bd3eb3e1bc317 parent afa024c3dbccf026e45121f4b9de54cda48edbea author Zhang Yanmin Fri, 23 Jun 2006 02:04:22 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:57 -0700 [PATCH] x86: kernel irq balance doesn't work On i386, kernel irq balance doesn't work. 1) In function do_irq_balance, after kernel finds the min_loaded cpu but before calling set_pending_irq to really pin the selected_irq to the target cpu, kernel does a cpus_and with irq_affinity[selected_irq]. Later on, when the irq is acked, kernel would calls move_native_irq=>desc->handler->set_affinity to change the irq affinity. However, every function pointed by hw_interrupt_type->set_affinity(unsigned int irq, cpumask_t cpumask) always changes irq_affinity[irq] to cpumask. Next time when recalling do_irq_balance, it has to do cpu_ands again with irq_affinity[selected_irq], but irq_affinity[selected_irq] already becomes one cpu selected by the first irq balance. 2) Function balance_irq in file arch/i386/kernel/io_apic.c has the same issue. [akpm@osdl.org: cleanups] Signed-off-by: Zhang Yanmin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afa024c3dbccf026e45121f4b9de54cda48edbea tree 49882fc3a71bad0872d1230b0cae00050e690ddd parent a03a3e287b119c7bcbcff1d68f81864ce33b1ad2 author Linus Torvalds Fri, 23 Jun 2006 02:04:21 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] x86: call eisa_set_level_irq() in pbibios_lookup_irq() Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a03a3e287b119c7bcbcff1d68f81864ce33b1ad2 tree 9a95f05e533835a57b56645190b60cdd16f134e2 parent b88d4f1d390a6a232938d27d551f24cf08a2c7e0 author Alexey Dobriyan Fri, 23 Jun 2006 02:04:20 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] Don't trigger full rebuild via CONFIG_X86_MCE Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b88d4f1d390a6a232938d27d551f24cf08a2c7e0 tree eb0cf7af51b7049befc632a835722d5ee7660687 parent ba528f2854e8632c8d04ddcd45f06c47bc7188b0 author Ingo Molnar Fri, 23 Jun 2006 02:04:20 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] i386: break out of recursion in stackframe walk If CONFIG_FRAME_POINTERS is enabled, and one does a dump_stack() during early SMP init, an infinite stackdump and a bootup hang happens: [] show_trace+0xd/0xf [] dump_stack+0x15/0x17 [] save_trace+0xc3/0xce [] mark_lock+0x8c/0x4fe [] __lockdep_acquire+0x44e/0xaa5 [] lockdep_acquire+0x68/0x84 [] _spin_lock+0x21/0x2f [] prepare_set+0xd/0x5d [] generic_set_all+0x1d/0x201 [] mtrr_ap_init+0x23/0x3b [] identify_cpu+0x2a7/0x2af [] smp_store_cpu_info+0x2f/0xb4 [] start_secondary+0xb5/0x3ec [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [] end_of_stack_stop_unwind_function+0x1/0x4 [...] Due to "end_of_stack_stop_unwind_function" recursing back to itself in the EBP stackframe-walker. So avoid this type of recursion when walking the stack . Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba528f2854e8632c8d04ddcd45f06c47bc7188b0 tree 39caa13f0c1d2634e2e7947317c965792ee92d32 parent 27b07da7332f03a935cd13b6a6beb780bf19e7a4 author Jan Beulich Fri, 23 Jun 2006 02:04:19 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] fix x86 microcode driver handling of multiple matching revisions When multiple updates matching a given CPU are found in the update file, the action taken by the microcode update driver was inappropriate: - when lower revision microcode was found before matching or higher revision one, the driver would needlessly complain that it would not downgrade the CPU - when microcode matching the currently installed revision was found before newer revision code, no update would actually take place To change this behavior, the driver now concludes about possibly updates and issues messages only when the entire input was parsed. Additionally, this adds back (in different places, and conditionalized upon a new module option) some messages removed by a previous patch. Signed-off-by: Jan Beulich Cc: "Siddha, Suresh B" Cc: Tigran Aivazian Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27b07da7332f03a935cd13b6a6beb780bf19e7a4 tree a00fe04fbf8bb90fc3facb8b6b499f0f9dca3d77 parent 87af2ffd4ccd0e6a2ff316fd008a9bedb4a4cb66 author Alexey Dobriyan Fri, 23 Jun 2006 02:04:18 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] Don't trigger full rebuild via CONFIG_MTRR Only drm, framebuffer, mtrr parts + misc files here and there. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87af2ffd4ccd0e6a2ff316fd008a9bedb4a4cb66 tree 4cd80cf123aa220e5c1c3c534bf09fa8d001ad28 parent a0b4da91f4c5710b9c20219a19e905145647b48b author Andreas Mohr Fri, 23 Jun 2006 02:04:17 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] i386 apm.c optimization - avoid expensive modulo (integer division) which happened since APM_MAX_EVENTS is 20 (non-power-of-2) - kill compiler warnings by initializing two variables - add __read_mostly to some important static variables that are read often (by idle loop etc.) - constify several structures Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0b4da91f4c5710b9c20219a19e905145647b48b tree bd2a6e10d0194601548beaa0a2810fc994ca1d0f parent c22ce143d15eb288543fe9873e1c5ac1c01b69a1 author Adrian Bunk Fri, 23 Jun 2006 02:04:17 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] arch/i386/kernel/apic.c: make modern_apic() static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c22ce143d15eb288543fe9873e1c5ac1c01b69a1 tree dc7d457b8952fc50dfc90df659b35de4117c61fc parent 7dbdf43cfa635ddc3701cc8d1eab07597cd731c0 author Hiro Yoshioka Fri, 23 Jun 2006 02:04:16 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] x86: cache pollution aware __copy_from_user_ll() Use the x86 cache-bypassing copy instructions for copy_from_user(). Some performance data are Total of GLOBAL_POWER_EVENTS (CPU cycle samples) 2.6.12.4.orig 1921587 2.6.12.4.nt 1599424 1599424/1921587=83.23% (16.77% reduction) BSQ_CACHE_REFERENCE (L3 cache miss) 2.6.12.4.orig 57427 2.6.12.4.nt 20858 20858/57427=36.32% (63.7% reduction) L3 cache miss reduction of __copy_from_user_ll samples % 37408 65.1412 vmlinux __copy_from_user_ll 23 0.1103 vmlinux __copy_user_zeroing_intel_nocache 23/37408=0.061% (99.94% reduction) Top 5 of 2.6.12.4.nt Counted GLOBAL_POWER_EVENTS events (time during which processor is not stopped) with a unit mask of 0x01 (mandatory) count 100000 samples % app name symbol name 128392 8.0274 vmlinux __copy_user_zeroing_intel_nocache 64206 4.0143 vmlinux journal_add_journal_head 59746 3.7355 vmlinux do_get_write_access 47674 2.9807 vmlinux journal_put_journal_head 46021 2.8774 vmlinux journal_dirty_metadata pattern9-0-cpu4-0-09011728/summary.out Counted BSQ_CACHE_REFERENCE events (cache references seen by the bus unit) with a unit mask of 0x3f (multiple flags) count 3000 samples % app name symbol name 69755 4.2861 vmlinux __copy_user_zeroing_intel_nocache 55685 3.4215 vmlinux journal_add_journal_head 52371 3.2179 vmlinux __find_get_block 45504 2.7960 vmlinux journal_put_journal_head 36005 2.2123 vmlinux journal_stop pattern9-0-cpu4-0-09011744/summary.out Counted BSQ_CACHE_REFERENCE events (cache references seen by the bus unit) with a unit mask of 0x200 (read 3rd level cache miss) count 3000 samples % app name symbol name 1147 5.4994 vmlinux journal_add_journal_head 881 4.2240 vmlinux journal_dirty_data 872 4.1809 vmlinux blk_rq_map_sg 734 3.5192 vmlinux journal_commit_transaction 617 2.9582 vmlinux radix_tree_delete pattern9-0-cpu4-0-09011731/summary.out iozone results are original 2.6.12.4 CPU time = 207.768 sec cache aware CPU time = 184.783 sec (three times run) 184.783/207.768=88.94% (11.06% reduction) original: pattern9-0-cpu4-0-08191720/iozone.out: CPU Utilization: Wall time 45.997 CPU time 64.527 CPU utilization 140.28 % pattern9-0-cpu4-0-08191741/iozone.out: CPU Utilization: Wall time 46.878 CPU time 71.933 CPU utilization 153.45 % pattern9-0-cpu4-0-08191743/iozone.out: CPU Utilization: Wall time 45.152 CPU time 71.308 CPU utilization 157.93 % cache awre: pattern9-0-cpu4-0-09011728/iozone.out: CPU Utilization: Wall time 44.842 CPU time 62.465 CPU utilization 139.30 % pattern9-0-cpu4-0-09011731/iozone.out: CPU Utilization: Wall time 44.718 CPU time 59.273 CPU utilization 132.55 % pattern9-0-cpu4-0-09011744/iozone.out: CPU Utilization: Wall time 44.367 CPU time 63.045 CPU utilization 142.10 % Signed-off-by: Hiro Yoshioka Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dbdf43cfa635ddc3701cc8d1eab07597cd731c0 tree b0f3c8bcd1be31bbb97ced989e19eaf63280da80 parent f2c780c1fdbe5008c902c2d7e37242ac5e60f0b9 author Yoichi Yuasa Fri, 23 Jun 2006 02:04:14 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] mips: fix number of mremap arguments mremap syscall takes 5 arguments. Fixed by Ralf Baechle. Signed-off-by: Ralf Baechle Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2c780c1fdbe5008c902c2d7e37242ac5e60f0b9 tree f2fb215610897e06812548986f3c37a6d6dc38ca parent c52c17622e27876c2395f59cfe342497a399de41 author Sergei Shtylyov Fri, 23 Jun 2006 02:04:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:56 -0700 [PATCH] Au1550/1200: add missing PSC #define's, make OSS driver use the proper ones Add missing PSC #define's required for the drivers using PSC on DBAu1550 board (also fixing Au1550 PSC3 address) and all Au1200-based boards as well. Make the OSS driver use the correct PSC definitions fo each board. Signed-off-by: Sergei Shtylyov Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c52c17622e27876c2395f59cfe342497a399de41 tree 460c2a539927bf13e91a77634d592c1d68cf42c8 parent 8ccd05670309084c2dd2003b6840a4becb5acca0 author Al Viro Fri, 23 Jun 2006 02:04:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: clean frv unistd.h Remove _syscall invocations that aren't used in the kernel. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ccd05670309084c2dd2003b6840a4becb5acca0 tree 21123b2996a90b0d533f8b31091cfe467e3e952d parent 5e591a55576b60156ac3dbc5087660ed82646d66 author Al Viro Fri, 23 Jun 2006 02:04:12 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: trivial cleanups in frv_ksyms.c Remove duplicate EXPORT_SYMBOL annotations from the FRV arch. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e591a55576b60156ac3dbc5087660ed82646d66 tree 65f4323f7eab9b1c8fbf66c960071a87d10e39ad parent a73df4dfdb0e01a1cbf119416a00e520a5e22306 author Al Viro Fri, 23 Jun 2006 02:04:11 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: Add missing qualifier to memcpy_fromio() prototype The memcpy_fromio() function should have a const qualifier on its source pointer. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a73df4dfdb0e01a1cbf119416a00e520a5e22306 tree 4d75e3a690b9ad781dba21b1e12a1e3533e3028b parent 7f788435568795c4cd29301bb4ccf7aff54f5051 author Al Viro Fri, 23 Jun 2006 02:04:10 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: ieee1394 is borken on frv The ieee1394 assumes it may make direct use of ->count in the semaphore structure. Signed-off-by: Al Viro Signed-off-by: David Howells Cc: Stefan Richter Cc: Ben Collins Cc: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f788435568795c4cd29301bb4ccf7aff54f5051 tree 664b5c222a42da3b44da6b11c18cccc6e13425ce parent ffca11104c06aff1641b9787f9e5b1099187ff83 author Al Viro Fri, 23 Jun 2006 02:04:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: NULL noise removal in frv xchg() Clean up the FRV arch's xchg() function. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ffca11104c06aff1641b9787f9e5b1099187ff83 tree b9fb644c7397113f6ac91aad9187cb2f9fe59944 parent 0c426f26cce71626ed39cd7b9496ea7f460ea9d0 author Al Viro Fri, 23 Jun 2006 02:04:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: initrd is grossly broken on frv (never built) The FRV arch doesn't currently support initrd, so it should be disabled automatically for the moment. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c426f26cce71626ed39cd7b9496ea7f460ea9d0 tree dcff54163aaf2b5dc5b7e424622df3c5841587b5 parent be2338f3ceb6d80170ebb495190d6aee79d8c7e3 author Al Viro Fri, 23 Jun 2006 02:04:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] ext2 XIP won't build without MMU Disable Ext2 XIP if the kernel is configured in no-MMU mode as the former won't build. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be2338f3ceb6d80170ebb495190d6aee79d8c7e3 tree 553d329dfda6160a5511bfb3799c6fb8343d2f5c parent 576132b42647e3facd28e3148a20307fadfd9afc author Al Viro Fri, 23 Jun 2006 02:04:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: wrong syscall The FRV arch should use fstatat64 not newfstatat. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 576132b42647e3facd28e3148a20307fadfd9afc tree 3e986e0838df9c11d17a50c06a3a7d0fd9119006 parent 53470aaa02ef3c83187f1ffe0d2cb647274fe397 author Al Viro Fri, 23 Jun 2006 02:04:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:55 -0700 [PATCH] frv: misc sparse annotations Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53470aaa02ef3c83187f1ffe0d2cb647274fe397 tree d270412696da4d845be0003d442de0421ffa009e parent 530018bf3d93e04533eec9c6516e3ce8f5310e13 author Al Viro Fri, 23 Jun 2006 02:04:06 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: misc __user annotations Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 530018bf3d93e04533eec9c6516e3ce8f5310e13 tree 6e4d3fdf2762812a520fc769148344d9f1116a08 parent 7ab76d722a0d64369080ec96f0fd9fca2138e3c5 author Al Viro Fri, 23 Jun 2006 02:04:05 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: binfmt_elf_fdpic __user annotations Add __user annotations to binfmt_elf_fdpic. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ab76d722a0d64369080ec96f0fd9fca2138e3c5 tree c28b92f88c5d3e267f3c587c3b170518ae612be5 parent 9e4d11f8630d5350adc5d4d65180e69991c498f8 author Al Viro Fri, 23 Jun 2006 02:04:05 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: sysctl __user annotations Add __user annotations to FRV-specific sysctl stuff. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e4d11f8630d5350adc5d4d65180e69991c498f8 tree d8f05482adf66069f218833ea8f14d9285dae885 parent 3f4cd389c3564caf1eec70957fcbd9d88c995d45 author Al Viro Fri, 23 Jun 2006 02:04:04 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: signal annotations Add annotations to the FRV signal handling for sparse. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f4cd389c3564caf1eec70957fcbd9d88c995d45 tree a7d5870592f04adc4ee2c2e004737a976b28f728 parent a8a77573c9e5345bcf6a963858745cd83c923f44 author Al Viro Fri, 23 Jun 2006 02:04:03 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: basic __iomem annotations Add annotations to the FRV I/O handling functions for sparse. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8a77573c9e5345bcf6a963858745cd83c923f44 tree 04f9bc72aca54effdb2254dd1e0b8ec5fa94f6cf parent 86c3a7645c05a7d06b72653aa4b2bea4e7229d1b author Al Viro Fri, 23 Jun 2006 02:04:03 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] frv: __user infrastructure Add general annotations to the FRV arch for sparse. Signed-off-by: Al Viro Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86c3a7645c05a7d06b72653aa4b2bea4e7229d1b tree ac68280e9c44dbc6ca4c88dc1e9c72a8f56be95e parent 35601547baf92d984b6e59cf3583649da04baea5 author David Quigley Fri, 23 Jun 2006 02:04:02 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] SELinux: add security_task_movememory calls to mm code This patch inserts security_task_movememory hook calls into memory management code to enable security modules to mediate this operation between tasks. Since the last posting, the hook has been renamed following feedback from Christoph Lameter. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Cc: Andi Kleen Acked-by: Christoph Lameter Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35601547baf92d984b6e59cf3583649da04baea5 tree a392501e6e004ed33789dbf3f7a9fe43295439e1 parent 22fb52dd736a62e24c44c50739007496265dc38c author David Quigley Fri, 23 Jun 2006 02:04:01 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] SELinux: add task_movememory hook This patch adds new security hook, task_movememory, to be called when memory owened by a task is to be moved (e.g. when migrating pages to a this hook is identical to the setscheduler implementation, but a separate hook introduced to allow this check to be specialized in the future if necessary. Since the last posting, the hook has been renamed following feedback from Christoph Lameter. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Cc: Christoph Lameter Cc: Andi Kleen Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22fb52dd736a62e24c44c50739007496265dc38c tree 06cc6dcff21df6e18f189c6895cf6aa313e7a8ea parent e7834f8fccd791225a1cf91c2c3e740ad8e2e145 author David Quigley Fri, 23 Jun 2006 02:04:00 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:54 -0700 [PATCH] SELinux: add security hook call to mediate attach_task (kernel/cpuset.c) Add a security hook call to enable security modules to control the ability to attach a task to a cpuset. While limited control over this operation is possible via permission checks on the pseudo fs interface, those checks are not sufficient to control access to the target task, which is looked up in this function. The existing task_setscheduler hook is re-used for this operation since this falls under the same class of operations. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7834f8fccd791225a1cf91c2c3e740ad8e2e145 tree 8f48d03d7b1dc32d326825fef1d1c54117a06ac8 parent 03e68060636e05989ea94bcb671ab633948f328c author David Quigley Fri, 23 Jun 2006 02:03:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] SELinux: add security hooks to {get,set}affinity This patch adds LSM hooks into the setaffinity and getaffinity functions to enable security modules to control these operations between tasks with task_setscheduler and task_getscheduler LSM hooks. Signed-off-by: David Quigley Acked-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03e68060636e05989ea94bcb671ab633948f328c tree aee5e7b55f31998536dd3a4f54f38caeee6105d6 parent 9216dfad4fc97ab639ef0885efc713f3d7a20d5b author James Morris Fri, 23 Jun 2006 02:03:58 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] lsm: add task_setioprio hook Implement an LSM hook for setting a task's IO priority, similar to the hook for setting a tasks's nice value. A previous version of this LSM hook was included in an older version of multiadm by Jan Engelhardt, although I don't recall it being submitted upstream. Also included is the corresponding SELinux hook, which re-uses the setsched permission in the proccess class. Signed-off-by: James Morris Acked-by: Stephen Smalley Cc: Jan Engelhardt Cc: Chris Wright Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9216dfad4fc97ab639ef0885efc713f3d7a20d5b tree 546e301f3181f56133509327f9c5ed035dd4b50d parent 1b2db9fb7adc4d67d9ce7d16ce79c41ee84730fe author Christoph Lameter Fri, 23 Jun 2006 02:03:57 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] move_pages: fix 32 -> 64 bit compat function The definition of the third parameter is a pointer to an array of virtual addresses which give us some trouble. The existing code calculated the wrong address in the array since I used void to avoid having to specify a type. I now use the correct type "compat_uptr_t __user *" in the definition of the function in kernel/compat.c. However, I used __u32 in syscalls.h. Would have to include compat.h there in order to provide the same definition which would generate an ugly include situation. On both ia64 and x86_64 compat_uptr_t is u32. So this works although parameter declarations differ. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b2db9fb7adc4d67d9ce7d16ce79c41ee84730fe tree d3fc0962ada099d741717d36a3f658c15b20c65a parent b63d64a324056cf3c2f7a1a1fe8134100edbb058 author Christoph Lameter Fri, 23 Jun 2006 02:03:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] sys_move_pages: 32bit support (i386, x86_64) sys_move_pages() support for 32bit (i386 plus x86_64 compat layer) Add support for move_pages() on i386 and also add the compat functions necessary to run 32 bit binaries on x86_64. Add compat_sys_move_pages to the x86_64 32bit binary layer. Note that it is not up to date so I added the missing pieces. Not sure if this is done the right way. [akpm@osdl.org: compile fix] Signed-off-by: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b63d64a324056cf3c2f7a1a1fe8134100edbb058 tree 566cca52758aa05c4d2c6227f53e18b39e9f4fe3 parent 742755a1d8ce2b548428f7aacf1758b4bba50080 author Christoph Lameter Fri, 23 Jun 2006 02:03:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] sys_move_pages: x86_64 support sys_move_pages support for x86_64 Signed-off-by: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 742755a1d8ce2b548428f7aacf1758b4bba50080 tree 53426657e14dc19a694d418274c9a6f4dcb8a997 parent 95a402c3847cc16f4ba03013cd01404fa0f14c2e author Christoph Lameter Fri, 23 Jun 2006 02:03:55 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] page migration: sys_move_pages(): support moving of individual pages move_pages() is used to move individual pages of a process. The function can be used to determine the location of pages and to move them onto the desired node. move_pages() returns status information for each page. long move_pages(pid, number_of_pages_to_move, addresses_of_pages[], nodes[] or NULL, status[], flags); The addresses of pages is an array of void * pointing to the pages to be moved. The nodes array contains the node numbers that the pages should be moved to. If a NULL is passed instead of an array then no pages are moved but the status array is updated. The status request may be used to determine the page state before issuing another move_pages() to move pages. The status array will contain the state of all individual page migration attempts when the function terminates. The status array is only valid if move_pages() completed successfullly. Possible page states in status[]: 0..MAX_NUMNODES The page is now on the indicated node. -ENOENT Page is not present -EACCES Page is mapped by multiple processes and can only be moved if MPOL_MF_MOVE_ALL is specified. -EPERM The page has been mlocked by a process/driver and cannot be moved. -EBUSY Page is busy and cannot be moved. Try again later. -EFAULT Invalid address (no VMA or zero page). -ENOMEM Unable to allocate memory on target node. -EIO Unable to write back page. The page must be written back in order to move it since the page is dirty and the filesystem does not provide a migration function that would allow the moving of dirty pages. -EINVAL A dirty page cannot be moved. The filesystem does not provide a migration function and has no ability to write back pages. The flags parameter indicates what types of pages to move: MPOL_MF_MOVE Move pages that are only mapped by the process. MPOL_MF_MOVE_ALL Also move pages that are mapped by multiple processes. Requires sufficient capabilities. Possible return codes from move_pages() -ENOENT No pages found that would require moving. All pages are either already on the target node, not present, had an invalid address or could not be moved because they were mapped by multiple processes. -EINVAL Flags other than MPOL_MF_MOVE(_ALL) specified or an attempt to migrate pages in a kernel thread. -EPERM MPOL_MF_MOVE_ALL specified without sufficient priviledges. or an attempt to move a process belonging to another user. -EACCES One of the target nodes is not allowed by the current cpuset. -ENODEV One of the target nodes is not online. -ESRCH Process does not exist. -E2BIG Too many pages to move. -ENOMEM Not enough memory to allocate control array. -EFAULT Parameters could not be accessed. A test program for move_pages() may be found with the patches on ftp.kernel.org:/pub/linux/kernel/people/christoph/pmig/patches-2.6.17-rc4-mm3 From: Christoph Lameter Detailed results for sys_move_pages() Pass a pointer to an integer to get_new_page() that may be used to indicate where the completion status of a migration operation should be placed. This allows sys_move_pags() to report back exactly what happened to each page. Wish there would be a better way to do this. Looks a bit hacky. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Jes Sorensen Cc: KAMEZAWA Hiroyuki Cc: Lee Schermerhorn Cc: Andi Kleen Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95a402c3847cc16f4ba03013cd01404fa0f14c2e tree 0fd9b3379f70cc99b2325bccaa150089abf6c8b3 parent aaa994b300a172afafab47938804836b923e5ef7 author Christoph Lameter Fri, 23 Jun 2006 02:03:53 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] page migration: use allocator function for migrate_pages() Instead of passing a list of new pages, pass a function to allocate a new page. This allows the correct placement of MPOL_INTERLEAVE pages during page migration. It also further simplifies the callers of migrate pages. migrate_pages() becomes similar to migrate_pages_to() so drop migrate_pages_to(). The batching of new page allocations becomes unnecessary. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Jes Sorensen Cc: KAMEZAWA Hiroyuki Cc: Lee Schermerhorn Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aaa994b300a172afafab47938804836b923e5ef7 tree ccc1acf72e9d1dfbd25fa5f8e067a195f93b0319 parent e24f0b8f76cc3dd96f36f5b6a9f020f6c3fce198 author Christoph Lameter Fri, 23 Jun 2006 02:03:52 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:53 -0700 [PATCH] page migration: handle freeing of pages in migrate_pages() Do not leave pages on the lists passed to migrate_pages(). Seems that we will not need any postprocessing of pages. This will simplify the handling of pages by the callers of migrate_pages(). Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Jes Sorensen Cc: KAMEZAWA Hiroyuki Cc: Lee Schermerhorn Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e24f0b8f76cc3dd96f36f5b6a9f020f6c3fce198 tree 2c6ca6f0385d3d36135855f77a0474188cf33842 parent 8f9de51a4a98ba32f839903b7d009788bc2c295d author Christoph Lameter Fri, 23 Jun 2006 02:03:51 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] page migration: simplify migrate_pages() Currently migrate_pages() is mess with lots of goto. Extract two functions from migrate_pages() and get rid of the gotos. Plus we can just unconditionally set the locked bit on the new page since we are the only one holding a reference. Locking is to stop others from accessing the page once we establish references to the new page. Remove the list_del from move_to_lru in order to have finer control over list processing. [akpm@osdl.org: add debug check] Signed-off-by: Christoph Lameter Cc: Hugh Dickins Cc: Jes Sorensen Cc: KAMEZAWA Hiroyuki Cc: Lee Schermerhorn Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f9de51a4a98ba32f839903b7d009788bc2c295d tree 65cde3cd75bfc1df172f53ca956cba4fa4954a4e parent d501e62bc7796e90b0312648e23ac39490dfbf87 author Kirill Korotaev Fri, 23 Jun 2006 02:03:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] printk() should not be called under zone->lock This patch fixes printk() under zone->lock in show_free_areas(). It can be unsafe to call printk() under this lock, since caller can try to allocate/free some memory and selfdeadlock on this lock. I found allocations/freeing mem both in netconsole and serial console. This issue was faced in reallity when meminfo was periodically printed for debug purposes and netconsole was used. Signed-off-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d501e62bc7796e90b0312648e23ac39490dfbf87 tree fbeeb75898e9434c0c725738482b9e946f46d5bb parent 485bb99b49a173a22a0bbf4e189465414947ecac author Ralf Baechle Fri, 23 Jun 2006 02:03:50 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] Delete unused definitions of kvaddr_to_nid Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 485bb99b49a173a22a0bbf4e189465414947ecac tree 28d0975d4d205162ce1bd0e52537fc22b766e719 parent 800590f523bf3bde9fa6c8e4d6763e4bf6a2c8ec author Randy Dunlap Fri, 23 Jun 2006 02:03:49 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] kernel-doc for mm/filemap.c mm/filemap.c: - add lots of kernel-doc; - fix some typos and kernel-doc errors; - drop some blank lines between function close and EXPORT_SYMBOL(); Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 800590f523bf3bde9fa6c8e4d6763e4bf6a2c8ec tree 0afbccc4b3648633da42d2c4b79cdb8f756804fd parent 5a4d43615921575b0c8299a5407ce4836e4138fd author Paul Drynoff Fri, 23 Jun 2006 02:03:48 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] slab: kmalloc, kzalloc comments cleanup and fix - Move comments for kmalloc to right place, currently it near __do_kmalloc - Comments for kzalloc - More detailed comments for kmalloc - Appearance of "kmalloc" and "kzalloc" man pages after "make mandocs" [rdunlap@xenotime.net: simplification] Signed-off-by: Paul Drynoff Acked-by: Randy Dunlap Cc: Pekka Enberg Cc: Manfred Spraul Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a4d43615921575b0c8299a5407ce4836e4138fd tree ebe9c4ca8dada54124e6c4507736585ae4d57d0b parent bd1e22b8e0a90f9a91e4c27db14ca15773659bf7 author KAMEZAWA Hiroyuki Fri, 23 Jun 2006 02:03:47 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] update vm_total_pages at memory hotadd Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd1e22b8e0a90f9a91e4c27db14ca15773659bf7 tree 8d32bdc39977af9dd3ba577b1fa34c0106b7f18e parent e0a42726794f71336ff4b26084d453dd597471ce author Andrew Morton Fri, 23 Jun 2006 02:03:47 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] initialise total_memory() earlier Initialise total_memory earlier in boot. Because if for some reason we run page reclaim early in boot, we don't want total_memory to be zero when we use it as a divisor. And rename total_memory to vm_total_pages to avoid naming clashes with architectures. Cc: Yasunori Goto Cc: KAMEZAWA Hiroyuki Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0a42726794f71336ff4b26084d453dd597471ce tree 31debb23f7cce0510a63755f0c4297086761f623 parent 668e0d8f1a02fd75f1c1e8142a6b08455914242c author Ingo Molnar Fri, 23 Jun 2006 02:03:46 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] mm/slab.c: fix early init assumption The SLAB bootstrap code assumes that the first two kmalloc caches created (the INDEX_AC and INDEX_L3 kmalloc caches) wont be off-slab. But due to AC and L3 structure size increase in lockdep, one of them ended up being off-slab, and subsequently crashing with: Unable to handle kernel NULL pointer dereference at 0000000000000000 RIP: [] kmem_cache_alloc+0x26/0x7d The fix is to introduce a bootstrap flag and to use it to prevent off-slab caches being created so early during bootup. (The calculation for off-slab caches is quite complex so i didnt want to complicate things with introducing yet another INDEX_ calculation, the flag approach is simpler and smaller.) Signed-off-by: Ingo Molnar Cc: Manfred Spraul Cc: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 668e0d8f1a02fd75f1c1e8142a6b08455914242c tree 51fafed7f9260fb969953a89280c77b69a416e84 parent 185606fc6a120dbebffa6d06a559c20ec2b20034 author Hugh Dickins Fri, 23 Jun 2006 02:03:45 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:52 -0700 [PATCH] fix update_mmu_cache in fremap.c There are two calls to update_mmu_cache in fremap.c, both defective. The one in install_page needs to be accompanied by lazy_mmu_prot_update (some other cleanup time, move that into ia64 update_mmu_cache itself); and the one in install_file_pte should be removed since the pte is not present. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 185606fc6a120dbebffa6d06a559c20ec2b20034 tree 6702725dd3da6371d0816dceb1a358a67ae32a99 parent 70af7c5c6492ef6ad137dbff6c4568c73edbcaf0 author Hugh Dickins Fri, 23 Jun 2006 02:03:45 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] remove unused o_flags from do_shmat Remove the unused variable o_flags from do_shmat. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70af7c5c6492ef6ad137dbff6c4568c73edbcaf0 tree 4e8646ba72b14f2bdd94802d42684c00c1a7507c parent 9637a5efd4fbe36164c5ce7f6a0ee68b2bf22b7f author Hugh Dickins Fri, 23 Jun 2006 02:03:44 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] swapoff: use atomic_inc_not_zero() on mm_users Now that we have atomic_inc_not_zero, it's more elegant for try_to_unuse to use that on mm_users: doesn't actually matter at present, but safer to be sure that once mm_users has gone to 0, nothing raises it for an instant. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9637a5efd4fbe36164c5ce7f6a0ee68b2bf22b7f tree 38b86e3e2151e78f952076e36bee4fd7d77e3baf parent bd96b9eb7cfd6ab24ba244360a09980a720874d2 author David Howells Fri, 23 Jun 2006 02:03:43 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] add page_mkwrite() vm_operations method Add a new VMA operation to notify a filesystem or other driver about the MMU generating a fault because userspace attempted to write to a page mapped through a read-only PTE. This facility permits the filesystem or driver to: (*) Implement storage allocation/reservation on attempted write, and so to deal with problems such as ENOSPC more gracefully (perhaps by generating SIGBUS). (*) Delay making the page writable until the contents have been written to a backing cache. This is useful for NFS/AFS when using FS-Cache/CacheFS. It permits the filesystem to have some guarantee about the state of the cache. (*) Account and limit number of dirty pages. This is one piece of the puzzle needed to make shared writable mapping work safely in FUSE. Needed by cachefs (Or is it cachefiles? Or fscache? ). At least four other groups have stated an interest in it or a desire to use the functionality it provides: FUSE, OCFS2, NTFS and JFFS2. Also, things like EXT3 really ought to use it to deal with the case of shared-writable mmap encountering ENOSPC before we permit the page to be dirtied. From: Peter Zijlstra get_user_pages(.write=1, .force=1) can generate COW hits on read-only shared mappings, this patch traps those as mkpage_write candidates and fails to handle them the old way. Signed-off-by: David Howells Cc: Miklos Szeredi Cc: Joel Becker Cc: Mark Fasheh Cc: Anton Altaparmakov Cc: David Woodhouse Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd96b9eb7cfd6ab24ba244360a09980a720874d2 tree 9231d56e83f4ef43a6f664c2b416734318b92084 parent 30c253e6da655d73eb8bfe2adca9b8f4d82fb81e author Con Kolivas Fri, 23 Jun 2006 02:03:42 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] mm: fix swap unused warning If CONFIG_SWAP is not defined we get: mm/vmscan.c: In function ‘remove_mapping’: mm/vmscan.c:387: warning: unused variable ‘swap’ Convert defines in swap.h into blank inline functions to fix this warning and be consistent. Signed-off-by: Con Kolivas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30c253e6da655d73eb8bfe2adca9b8f4d82fb81e tree 97c49ad364855b95ce52d97a62d176a077ff2a85 parent ddc2e812d592457747c4367fb73edcaa8e1e49ff author Andy Whitcroft Fri, 23 Jun 2006 02:03:41 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] sparsemem: record nid during memory present Record the node id as we mark sections for instantiation. Use this nid during instantiation to direct allocations. Signed-off-by: Andy Whitcroft Cc: Mike Kravetz Cc: Dave Hansen Cc: Mel Gorman Cc: Bob Picco Cc: Jack Steiner Cc: Yasunori Goto Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddc2e812d592457747c4367fb73edcaa8e1e49ff tree 7dc9066c1e43d14f7c495847a9f0b24287806fb2 parent 8d3c138b77f195ca0eee6fb639ae73f5ea9edb6b author Pekka Enberg Fri, 23 Jun 2006 02:03:40 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] slab: verify pointers before free Passing an invalid pointer to kfree() and kmem_cache_free() is likely to cause bad memory corruption or even take down the whole system because the bad pointer is likely reused immediately due to the per-CPU caches. Until now, we don't do any verification for this if CONFIG_DEBUG_SLAB is disabled. As suggested by Linus, add PageSlab check to page_to_cache() and page_to_slab() to verify pointers passed to kfree(). Also, move the stronger check from cache_free_debugcheck() to kmem_cache_free() to ensure the passed pointer actually belongs to the cache we're about to free the object. For page_to_cache() and page_to_slab(), the assertions should have virtually no extra cost (two instructions, no data cache pressure) and for kmem_cache_free() the overhead should be minimal. Signed-off-by: Pekka Enberg Cc: Manfred Spraul Cc: Christoph Lameter Cc: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d3c138b77f195ca0eee6fb639ae73f5ea9edb6b tree 832ac3c87484f5875b3b4afeab1de5eca1115770 parent 04e62a29bf157ce1edd168f2b71b533c80d13628 author Christoph Lameter Fri, 23 Jun 2006 02:03:39 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] page migration: Update documentation Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04e62a29bf157ce1edd168f2b71b533c80d13628 tree 7f0d5a58eeef2c2e08da86dc7141a1ccd050a37d parent 442c9137de8d769053e81d325709dca72f0b5e44 author Christoph Lameter Fri, 23 Jun 2006 02:03:38 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] More page migration: use migration entries for file pages This implements the use of migration entries to preserve ptes of file backed pages during migration. Processes can therefore be migrated back and forth without loosing their connection to pagecache pages. Note that we implement the migration entries only for linear mappings. Nonlinear mappings still require the unmapping of the ptes for migration. And another writepage() ugliness shows up. writepage() can drop the page lock. Therefore we have to remove migration ptes before calling writepages() in order to avoid having migration entries point to unlocked pages. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 442c9137de8d769053e81d325709dca72f0b5e44 tree 200e5ace0310755d88dd1c7597cc0bb540264fe1 parent 6c5240ae7f48c83fcaa8e24fa63e7eb09aba5651 author Christoph Lameter Fri, 23 Jun 2006 02:03:38 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:51 -0700 [PATCH] More page migration: do not inc/dec rss counters If we install a migration entry then the rss not really decreases since the page is just moved somewhere else. We can save ourselves the work of decrementing and later incrementing which will just eventually cause cacheline bouncing. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c5240ae7f48c83fcaa8e24fa63e7eb09aba5651 tree fede2324f4348701e60758d7f894aae4b09cdc9a parent d75a0fcda2cfc71b50e16dc89e0c32c57d427e85 author Christoph Lameter Fri, 23 Jun 2006 02:03:37 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] Swapless page migration: modify core logic Use the migration entries for page migration This modifies the migration code to use the new migration entries. It now becomes possible to migrate anonymous pages without having to add a swap entry. We add a couple of new functions to replace migration entries with the proper ptes. We cannot take the tree_lock for migrating anonymous pages anymore. However, we know that we hold the only remaining reference to the page when the page count reaches 1. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d75a0fcda2cfc71b50e16dc89e0c32c57d427e85 tree cc9dda0a0e53e62c859bf7fcafe7b9c9f6de2352 parent 0697212a411c1dae03c27845f2de2f3adb32c331 author Christoph Lameter Fri, 23 Jun 2006 02:03:36 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] Swapless page migration: rip out swap based logic Rip the page migration logic out. Remove all code that has to do with swapping during page migration. This also guts the ability to migrate pages to swap. No one used that so lets let it go for good. Page migration should be a bit broken after this patch. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0697212a411c1dae03c27845f2de2f3adb32c331 tree 4bedcdb27522f4a42c422e0a8af155501f43a69c parent 8351a6e4785218a2b03c142be92926baff95ba5c author Christoph Lameter Fri, 23 Jun 2006 02:03:35 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] Swapless page migration: add R/W migration entries Implement read/write migration ptes We take the upper two swapfiles for the two types of migration ptes and define a series of macros in swapops.h. The VM is modified to handle the migration entries. migration entries can only be encountered when the page they are pointing to is locked. This limits the number of places one has to fix. We also check in copy_pte_range and in mprotect_pte_range() for migration ptes. We check for migration ptes in do_swap_cache and call a function that will then wait on the page lock. This allows us to effectively stop all accesses to apge. Migration entries are created by try_to_unmap if called for migration and removed by local functions in migrate.c From: Hugh Dickins Several times while testing swapless page migration (I've no NUMA, just hacking it up to migrate recklessly while running load), I've hit the BUG_ON(!PageLocked(p)) in migration_entry_to_page. This comes from an orphaned migration entry, unrelated to the current correctly locked migration, but hit by remove_anon_migration_ptes as it checks an address in each vma of the anon_vma list. Such an orphan may be left behind if an earlier migration raced with fork: copy_one_pte can duplicate a migration entry from parent to child, after remove_anon_migration_ptes has checked the child vma, but before it has removed it from the parent vma. (If the process were later to fault on this orphaned entry, it would hit the same BUG from migration_entry_wait.) This could be fixed by locking anon_vma in copy_one_pte, but we'd rather not. There's no such problem with file pages, because vma_prio_tree_add adds child vma after parent vma, and the page table locking at each end is enough to serialize. Follow that example with anon_vma: add new vmas to the tail instead of the head. (There's no corresponding problem when inserting migration entries, because a missed pte will leave the page count and mapcount high, which is allowed for. And there's no corresponding problem when migrating via swap, because a leftover swap entry will be correctly faulted. But the swapless method has no refcounting of its entries.) From: Ingo Molnar pte_unmap_unlock() takes the pte pointer as an argument. From: Hugh Dickins Several times while testing swapless page migration, gcc has tried to exec a pointer instead of a string: smells like COW mappings are not being properly write-protected on fork. The protection in copy_one_pte looks very convincing, until at last you realize that the second arg to make_migration_entry is a boolean "write", and SWP_MIGRATION_READ is 30. Anyway, it's better done like in change_pte_range, using is_write_migration_entry and make_migration_entry_read. From: Hugh Dickins Remove unnecessary obfuscation from sys_swapon's range check on swap type, which blew up causing memory corruption once swapless migration made MAX_SWAPFILES no longer 2 ^ MAX_SWAPFILES_SHIFT. Signed-off-by: Hugh Dickins Acked-by: Martin Schwidefsky Signed-off-by: Hugh Dickins Signed-off-by: Christoph Lameter Signed-off-by: Ingo Molnar From: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8351a6e4785218a2b03c142be92926baff95ba5c tree 479fe6bcecb38ddc2c34ec812d82e432a79d0dfa parent 2d1db3b1170db4e8bf0531dd636742269c2cf579 author Christoph Lameter Fri, 23 Jun 2006 02:03:33 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: move fallback handling into special function Move the fallback code into a new fallback function and make the function behave like any other migration function. This requires retaking the lock if pageout() drops it. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d1db3b1170db4e8bf0531dd636742269c2cf579 tree 1161ed614a55869c278234d7472673fd1a577887 parent c3fcf8a5daacf350f0632e1379414c01f34eeea3 author Christoph Lameter Fri, 23 Jun 2006 02:03:33 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: pass "mapping" to migration functions Change handling of address spaces. Pass a pointer to the address space in which the page is migrated to all migration function. This avoids repeatedly having to retrieve the address space pointer from the page and checking it for validity. The old page mapping will change once migration has gone to a certain step, so it is less confusing to have the pointer always available. Move the setting of the mapping and index for the new page into migrate_pages(). Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3fcf8a5daacf350f0632e1379414c01f34eeea3 tree ec7a4cd5d7a2b60ec4539479bb5b24c46b5cf72f parent 5b5c7120e2154239837fad5e3c7b7b781092b19c author Christoph Lameter Fri, 23 Jun 2006 02:03:32 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: extract try_to_unmap from migration functions Extract try_to_unmap and rename remove_references -> move_mapping try_to_unmap() may significantly change the page state by for example setting the dirty bit. It is therefore best to unmap in migrate_pages() before calling any migration functions. migrate_page_remove_references() will then only move the new page in place of the old page in the mapping. Rename the function to migrate_page_move_mapping(). This allows us to get rid of the special unmapping for the fallback path. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b5c7120e2154239837fad5e3c7b7b781092b19c tree 733d5e4268a79abb320316d98c15b822f9f55a15 parent e7340f73307abed9283d0a07570d06e228c205dd author Christoph Lameter Fri, 23 Jun 2006 02:03:29 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: drop nr_refs in remove_references() Drop nr_refs parameter from migrate_page_remove_references() The nr_refs parameter is not really useful since the number of remaining references is always 1 for anonymous pages without a mapping 2 for pages with a mapping 3 for pages with a mapping and PagePrivate set. Remove the early check for the number of references since we are checking page_mapcount() earlier. Ultimately only the refcount matters after the tree_lock has been obtained. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7340f73307abed9283d0a07570d06e228c205dd tree e786e2d09cfaf670128571029d833d1d27998d59 parent 1d8b85ccf1ed53a71b092fb5d807edf1ea7dabdd author Christoph Lameter Fri, 23 Jun 2006 02:03:29 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: remove useless definitions Remove the export for migrate_page_remove_references() and migrate_page_copy() that are unlikely to be used directly by filesystems implementing migration. The export was useful when buffer_migrate_page() lived in fs/buffer.c but it has now been moved to migrate.c in the migration reorg. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8b85ccf1ed53a71b092fb5d807edf1ea7dabdd tree 9742a9522a9834ee62dcfedc4c31fd76f4a2741e parent 7352349a19e84b28f10668eca9cbb6bbbfa9d38e author Christoph Lameter Fri, 23 Jun 2006 02:03:28 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:50 -0700 [PATCH] page migration cleanup: group functions Reorder functions in migrate.c. Group all migration functions for struct address_space_operations together. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7352349a19e84b28f10668eca9cbb6bbbfa9d38e tree ae9d78f593829f599d3412b11d2c871bcae98be2 parent 111ebb6e6f7bd7de6d722c5848e95621f43700d9 author Christoph Lameter Fri, 23 Jun 2006 02:03:27 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] page migration cleanup: rename "ignrefs" to "migration" migrate is a better name since it is only used by page migration. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 111ebb6e6f7bd7de6d722c5848e95621f43700d9 tree bb00b13001db9be201e9b6d31468a79f4d1240bf parent 4c91c3648c620003cb7b21b8858f36cd6132e168 author OGAWA Hirofumi Fri, 23 Jun 2006 02:03:26 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] writeback: fix range handling When a writeback_control's `start' and `end' fields are used to indicate a one-byte-range starting at file offset zero, the required values of .start=0,.end=0 mean that the ->writepages() implementation has no way of telling that it is being asked to perform a range request. Because we're currently overloading (start == 0 && end == 0) to mean "this is not a write-a-range request". To make all this sane, the patch changes range of writeback_control. So caller does: If it is calling ->writepages() to write pages, it sets range (range_start/end or range_cyclic) always. And if range_cyclic is true, ->writepages() thinks the range is cyclic, otherwise it just uses range_start and range_end. This patch does, - Add LLONG_MAX, LLONG_MIN, ULLONG_MAX to include/linux/kernel.h -1 is usually ok for range_end (type is long long). But, if someone did, range_end += val; range_end is "val - 1" u64val = range_end >> bits; u64val is "~(0ULL)" or something, they are wrong. So, this adds LLONG_MAX to avoid nasty things, and uses LLONG_MAX for range_end. - All callers of ->writepages() sets range_start/end or range_cyclic. - Fix updates of ->writeback_index. It seems already bit strange. If it starts at 0 and ended by check of nr_to_write, this last index may reduce chance to scan end of file. So, this updates ->writeback_index only if range_cyclic is true or whole-file is scanned. Signed-off-by: OGAWA Hirofumi Cc: Nathan Scott Cc: Anton Altaparmakov Cc: Steven French Cc: "Vladimir V. Saveliev" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c91c3648c620003cb7b21b8858f36cd6132e168 tree 6572fedb9a18ba0b31695f1ba30a219621b6f20a parent 58ce1fd5805647a58a050bbbbd2252ea5ecb47b3 author Peter Zijlstra Fri, 23 Jun 2006 02:03:25 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] buglet in radix_tree_tag_set The comment states: 'Setting a tag on a not-present item is a BUG.' Hence if 'index' is larger than the maxindex; the item _cannot_ be presen; it should also be a BUG. Also, this allows the following statement (assume a fresh tree): radix_tree_tag_set(root, 16, 1); to fail silently, but when preceded by: radix_tree_insert(root, 32, item); it would BUG, because the height has been extended by the insert. In neither case was 16 present. Signed-off-by: Peter Zijlstra Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58ce1fd5805647a58a050bbbbd2252ea5ecb47b3 tree 639aa44f21d0176c771b8b6e76d9c7ce9e2d1d19 parent b344e05c585406904c70865e531e02467c4c7931 author Pekka Enberg Fri, 23 Jun 2006 02:03:24 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] slab: redzone double-free detection At present our slab debugging tells us that it detected a double-free or corruption - it does not distinguish between them. Sometimes it's useful to be able to differentiate between these two types of information. Add double-free detection to redzone verification when freeing an object. As explained by Manfred, when we are freeing an object, both redzones should be RED_ACTIVE. However, if both are RED_INACTIVE, we are trying to free an object that was already free'd. Signed-off-by: Manfred Spraul Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b344e05c585406904c70865e531e02467c4c7931 tree 5c9b9be9c35f5921e4796f1bafab810839765354 parent cfd9b7df4abd3257c9e381b0e445817b26a51c0c author Hua Zhong Fri, 23 Jun 2006 02:03:23 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] likely cleanup: remove unlikely in sys_mprotect() With likely/unlikely profiling on my not-so-busy-typical-developmentsystem there are 5k misses vs 2k hits. So I guess we should remove the unlikely. Signed-off-by: Hua Zhong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfd9b7df4abd3257c9e381b0e445817b26a51c0c tree cd419f98fbf555fbcd92baf7ca41d45a8744f071 parent 612d6c19db2fd0dc97b0fa370613ecd4a305ffc3 author Nick Piggin Fri, 23 Jun 2006 02:03:22 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] radix-tree: small Reduce radix tree node memory usage by about a factor of 4 for small files (< 64K). There are pointer traversal and memory usage costs for large files with dense pagecache. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 612d6c19db2fd0dc97b0fa370613ecd4a305ffc3 tree 3ab670895b5c3e389ff922192a572cbfd8159d03 parent 929f97276bcf7f4a95272ed08a85339b98ba210d author Nick Piggin Fri, 23 Jun 2006 02:03:22 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] radix-tree: direct data The ability to have height 0 radix trees (a direct pointer to the data item rather than going through a full node->slot) quietly disappeared with old-2.6-bkcvs commit ffee171812d51652f9ba284302d9e5c5cc14bdfd. On 64-bit machines this causes nearly 600 bytes to be used for every <= 4K file in pagecache. Re-introduce this feature, root tags stored in spare ->gfp_mask bits. Simplify radix_tree_delete's complex tag clearing arrangement (which would become even more complex) by just falling back to tag clearing functions (the pagecache radix-tree never uses this path anyway, so the icache savings will mean it's actually a speedup). On my 4GB G5, this saves 8MB RAM per kernel kernel source+object tree in pagecache. Pagecache lookup, insertion, and removal speed for small files will also be improved. This makes RCU radix tree harder, but it's worth it. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 929f97276bcf7f4a95272ed08a85339b98ba210d tree 4975698af9559279c83e4e268213ed13e3efee9a parent 833423143c3a7c6545e409d65febd0d92deb351b author Dean Nelson Fri, 23 Jun 2006 02:03:21 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] change gen_pool allocator to not touch managed memory Modify the gen_pool allocator (lib/genalloc.c) to utilize a bitmap scheme instead of the buddy scheme. The purpose of this change is to eliminate the touching of the actual memory being allocated. Since the change modifies the interface, a change to the uncached allocator (arch/ia64/kernel/uncached.c) is also required. Both Andrey Volkov and Jes Sorenson have expressed a desire that the gen_pool allocator not write to the memory being managed. See the following: http://marc.theaimsgroup.com/?l=linux-kernel&m=113518602713125&w=2 http://marc.theaimsgroup.com/?l=linux-kernel&m=113533568827916&w=2 Signed-off-by: Dean Nelson Cc: Andrey Volkov Acked-by: Jes Sorensen Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 833423143c3a7c6545e409d65febd0d92deb351b tree 13a1881f1ffd6e546e80a2ec04b1ac44ad145298 parent 762834e8bf46bf41ce9034d062a7c1f8563175f3 author Nick Piggin Fri, 23 Jun 2006 02:03:20 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:49 -0700 [PATCH] mm: introduce remap_vmalloc_range() Add remap_vmalloc_range, vmalloc_user, and vmalloc_32_user so that drivers can have a nice interface for remapping vmalloc memory. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 762834e8bf46bf41ce9034d062a7c1f8563175f3 tree fb134ef41772ba61050a08cc4ed92c50cd057658 parent d6277db4ab271862ed599da08d78961c70f00002 author Yasunori Goto Fri, 23 Jun 2006 02:03:19 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] Unify pxm_to_node() and node_to_pxm() Consolidate the various arch-specific implementations of pxm_to_node() and node_to_pxm() into a single generic version. Signed-off-by: Yasunori Goto Cc: "Luck, Tony" Cc: Andi Kleen Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6277db4ab271862ed599da08d78961c70f00002 tree f11b2f82200c95d17e10779b44a6da37bc03965f parent 7a7c381d25067b9a2bfe025dfcb16459daec0373 author Rafael J. Wysocki Fri, 23 Jun 2006 02:03:18 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] swsusp: rework memory shrinker Rework the swsusp's memory shrinker in the following way: - Simplify balance_pgdat() by removing all of the swsusp-related code from it. - Make shrink_all_memory() use shrink_slab() and a new function shrink_all_zones() which calls shrink_active_list() and shrink_inactive_list() directly for each zone in a way that's optimized for suspend. In shrink_all_memory() we try to free exactly as many pages as the caller asks for, preferably in one shot, starting from easier targets.  If slab caches are huge, they are most likely to have enough pages to reclaim.  The inactive lists are next (the zones with more inactive pages go first) etc. Each time shrink_all_memory() attempts to shrink the active and inactive lists for each zone in 5 passes.  In the first pass, only the inactive lists are taken into consideration.  In the next two passes the active lists are also shrunk, but mapped pages are not reclaimed.  In the last two passes the active and inactive lists are shrunk and mapped pages are reclaimed as well. The aim of this is to alter the reclaim logic to choose the best pages to keep on resume and improve the responsiveness of the resumed system. Signed-off-by: Rafael J. Wysocki Signed-off-by: Con Kolivas Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a7c381d25067b9a2bfe025dfcb16459daec0373 tree 4c6cbd121a74e55e6147f0ac0541981d271b8371 parent e1b6aa6f1404f162697650df2cdb6c374b1d6a5b author Christoph Hellwig Fri, 23 Jun 2006 02:03:17 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] slab: stop using list_for_each Use the _entry variant everywhere to clean the code up a tiny bit. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1b6aa6f1404f162697650df2cdb6c374b1d6a5b tree 5d7f93f6d9a315b66fbc2bcfb7cc5d866a7013e9 parent a43a8c39bbb493c9e93f6764b350de2e33e18e92 author Christoph Hellwig Fri, 23 Jun 2006 02:03:17 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] slab: clean up kmem_getpages The last ifdef addition hit the ugliness treshold on this functions, so: - rename the variable i to nr_pages so it's somewhat descriptive - remove the addr variable and do the page_address call at the very end - instead of ifdef'ing the whole alloc_pages_node call just make the __GFP_COMP addition to flags conditional - rewrite the __GFP_COMP comment to make sense Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a43a8c39bbb493c9e93f6764b350de2e33e18e92 tree a3f0042371810ce6d076751d8e403baaa3d2630e parent e8f03d02080b25f53cd6bba8dc3a297803f18c01 author Chen, Kenneth W Fri, 23 Jun 2006 02:03:15 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:48 -0700 [PATCH] tightening hugetlb strict accounting Current hugetlb strict accounting for shared mapping always assume mapping starts at zero file offset and reserves pages between zero and size of the file. This assumption often reserves (or lock down) a lot more pages then necessary if application maps at none zero file offset. libhugetlbfs is one example that requires proper reservation on shared mapping starts at none zero offset. This patch extends the reservation and hugetlb strict accounting to support any arbitrary pair of (offset, len), resulting a much more robust and accurate scheme. More importantly, it won't lock down any hugetlb pages outside file mapping. Signed-off-by: Ken Chen Acked-by: Adam Litke Cc: David Gibson Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8f03d02080b25f53cd6bba8dc3a297803f18c01 tree 64d2731203aa3e90273322620c3b964bba7abed9 parent 6937a25cff818d32d0f9ff58a518c9ab96760aeb author Andreas Dilger Fri, 23 Jun 2006 02:03:14 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:47 -0700 [PATCH] reserve space for swap label Reserve space in the swap disk header for a LABEL and UUID to be specified. This has been possible with util-linux-2.12b (via e2fsprogs 1.36 libblkid), and is used by at least FC3 and later. The kernel doesn't really care about this, but the space shouldn't accidentally be used by something else either. Also make the on-disk structures be fixed-size types, instead of "int", though I don't know of any architecture in use where an "int" isn't the same size as a "__u32" (all current kernel arches have it as "unsigned int"). Signed-off-by: Andreas Dilger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6937a25cff818d32d0f9ff58a518c9ab96760aeb tree 233fd6927556b83818cdb31c1656b1066643d8dc parent fadd8fbd153c12963f8fe3c9ef7f8967f286f98b author Dave Peterson Fri, 23 Jun 2006 02:03:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:47 -0700 [PATCH] mm: fix typos in comments in mm/oom_kill.c This fixes a few typos in the comments in mm/oom_kill.c. Signed-off-by: David S. Peterson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fadd8fbd153c12963f8fe3c9ef7f8967f286f98b tree 547cdee6203b769773521118a4dd19e95a7ef3fd parent 67de648211fa041fe08a0c25241a4980bbb90698 author KAMEZAWA Hiroyuki Fri, 23 Jun 2006 02:03:13 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:47 -0700 [PATCH] support for panic at OOM This patch adds panic_on_oom sysctl under sys.vm. When sysctl vm.panic_on_oom = 1, the kernel panics intead of killing rogue processes. And if vm.panic_on_oom is 0 the kernel will do oom_kill() in the same way as it does today. Of course, the default value is 0 and only root can modifies it. In general, oom_killer works well and kill rogue processes. So the whole system can survive. But there are environments where panic is preferable rather than kill some processes. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67de648211fa041fe08a0c25241a4980bbb90698 tree 94f737e0fed7c40dc59e94f05d6851e490082068 parent 6811378e7d8b9aa4fca2a1ca73d24c9d67c9cb12 author Andy Whitcroft Fri, 23 Jun 2006 02:03:12 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:47 -0700 [PATCH] squash duplicate page_to_pfn and pfn_to_page We have architectures where the size of page_to_pfn and pfn_to_page are significant enough to overall image size that they wish to push them out of line. However, in the process we have grown a second copy of the implementation of each of these routines for each memory model. Share the implmentation exposing it either inline or out-of-line as required. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6811378e7d8b9aa4fca2a1ca73d24c9d67c9cb12 tree 37f2f5a2bf2e60848a571f8f43685c7406d7b238 parent cca448fe92246fb59efe55ba2e048ded0971a9af author Yasunori Goto Fri, 23 Jun 2006 02:03:11 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: update zonelists In current code, zonelist is considered to be build once, no modification. But MemoryHotplug can add new zone/pgdat. It must be updated. This patch modifies build_all_zonelists(). By this, build_all_zonelist() can reconfig pgdat's zonelists. To update them safety, this patch use stop_machine_run(). Other cpus don't touch among updating them by using it. In old version (V2 of node hotadd), kernel updated them after zone initialization. But present_page of its new zone is still 0, because online_page() is not called yet at this time. Build_zonelists() checks present_pages to find present zone. It was too early. So, I changed it after online_pages(). Signed-off-by: Yasunori Goto Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cca448fe92246fb59efe55ba2e048ded0971a9af tree 9663651686508b62a061851927f0b330200c40b1 parent 718127cc3170454f4aa274fdd2f1e01574fecd66 author Yasunori Goto Fri, 23 Jun 2006 02:03:10 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: wait_table initialization Wait_table is initialized according to zone size at boot time. But, we cannot know the maixmum zone size when memory hotplug is enabled. It can be changed.... And resizing of wait_table is hard. So kernel allocate and initialzie wait_table as its maximum size. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718127cc3170454f4aa274fdd2f1e01574fecd66 tree 8b42a48248d6508b8369718deef6b1af3ea82dbf parent 86356ab147669bd3bcb2149fd9561d1280835c24 author Yasunori Goto Fri, 23 Jun 2006 02:03:10 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: add return code for init_current_empty_zone When add_zone() is called against empty zone (not populated zone), we have to initialize the zone which didn't initialize at boot time. But, init_currently_empty_zone() may fail due to allocation of wait table. So, this patch is to catch its error code. Changes against wait_table is in the next patch. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86356ab147669bd3bcb2149fd9561d1280835c24 tree bedc7113593e0f6a91aff18bb506fc3327516d81 parent 02b694dea473ad3db1e2d1b14c1fef8fbd92e5e6 author Yasunori Goto Fri, 23 Jun 2006 02:03:09 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: change to meminit for build_zonelist Change definitions of some functions and data from __init to __meminit. These functions and data can be used after bootup by this patch to be used for hot-add codes. Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b694dea473ad3db1e2d1b14c1fef8fbd92e5e6 tree a39451192b589486d70f4d989f9b7f19ef889db0 parent 3c5a87f476bed45616e7e543dcaea4440c77bf93 author Yasunori Goto Fri, 23 Jun 2006 02:03:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] wait_table and zonelist initializing for memory hotadd: change name of wait_table_size() This is just to rename from wait_table_size() to wait_table_hash_nr_entries(). Signed-off-by: Yasunori Goto Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c5a87f476bed45616e7e543dcaea4440c77bf93 tree 0ff4c86ef594f7bfad9937095b69aab5e70b4174 parent 4776874ff096cd410382c0eca5d75f69c9dfa58f author Christoph Lameter Fri, 23 Jun 2006 02:03:08 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] migration: remove unnecessary PageSwapCache checks Remove two unnecessary PageSwapCache checks. The page refcount is raised and therefore page migration cannot occur in both functions. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4776874ff096cd410382c0eca5d75f69c9dfa58f tree 50501cc3d909b03c1e792ac203aa3b56641cd226 parent f886ed443fedb109e2062988bf120a531f0ec80a author Pekka Enberg Fri, 23 Jun 2006 02:03:07 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] slab: page mapping cleanup Clean up slab allocator page mapping a bit. The memory allocated for a slab is physically contiguous so it is okay to assume struct pages are too so kill the long-standing comment. Furthermore, rename set_slab_attr to slab_map_pages and add a comment explaining why its needed. Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f886ed443fedb109e2062988bf120a531f0ec80a tree 379858e1b4fc28c266f041902477ee41069171e4 parent 729bd0b74ce9ac6c829109052fcd565f5c366ca5 author Andrew Morton Fri, 23 Jun 2006 02:03:06 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] PG_uncached is ia64 only As Nick points out, only ia64 uses PG_uncached. So we can push it up into the higher bits of the lower half of page->flags and make room for another flag on 32-bit machines. Cc: "Luck, Tony" Cc: Jesse Barnes Cc: Jes Sorensen Cc: Nick Piggin Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 729bd0b74ce9ac6c829109052fcd565f5c366ca5 tree cfb2660d6107251f63f7480e193aca7c280ca5ab parent 4da5eda0dca9730f59f391230304526ab4bffec7 author Pekka Enberg Fri, 23 Jun 2006 02:03:05 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:46 -0700 [PATCH] slab: extract cache_free_alien from __cache_free Move alien object freeing to cache_free_alien() to reduce #ifdef clutter in __cache_free(). Signed-off-by: Pekka Enberg Acked-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4da5eda0dca9730f59f391230304526ab4bffec7 tree 948701e336ec4ca2742b69f7197b89aa61df27d2 parent cb2b95e1c6b56e3d2369d3a5f4bc97f4fa180683 author Christoph Lameter Fri, 23 Jun 2006 02:03:04 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] Page Migration: Make do_swap_page redo the fault It is better to redo the complete fault if do_swap_page() finds that the page is not in PageSwapCache() because the page migration code may have replaced the swap pte already with a pte pointing to valid memory. do_swap_page() may interpret an invalid swap entry without this patch because we do not reload the pte if we are looping back. The page migration code may already have reused the swap entry referenced by our local swp_entry. Signed-off-by: Christoph Lameter Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb2b95e1c6b56e3d2369d3a5f4bc97f4fa180683 tree 121d3fcd539f7d62887949840307ac26aadaa9e4 parent 6f0419e06a3b151ab616a31accdabef41dc2d1b0 author Andy Whitcroft Fri, 23 Jun 2006 02:03:01 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] zone handle unaligned zone boundaries The buddy allocator has a requirement that boundaries between contigious zones occur aligned with the the MAX_ORDER ranges. Where they do not we will incorrectly merge pages cross zone boundaries. This can lead to pages from the wrong zone being handed out. Originally the buddy allocator would check that buddies were in the same zone by referencing the zone start and end page frame numbers. This was removed as it became very expensive and the buddy allocator already made the assumption that zones boundaries were aligned. It is clear that not all configurations and architectures are honouring this alignment requirement. Therefore it seems safest to reintroduce support for non-aligned zone boundaries. This patch introduces a new check when considering a page a buddy it compares the zone_table index for the two pages and refuses to merge the pages where they do not match. The zone_table index is unique for each node/zone combination when FLATMEM/DISCONTIGMEM is enabled and for each section/zone combination when SPARSEMEM is enabled (a SPARSEMEM section is at least a MAX_ORDER size). Signed-off-by: Andy Whitcroft Cc: Dave Hansen Cc: Mel Gorman Cc: Yasunori Goto Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f0419e06a3b151ab616a31accdabef41dc2d1b0 tree a297e66f7fe2ba2bc68b560eb7fa55fd5047e10b parent d6938d1b2768fbf94d1091207d334ef7df786e5a author KAMEZAWA Hiroyuki Fri, 23 Jun 2006 02:03:00 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] for_each_possible_cpu: xfs for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. This patch replaces for_each_cpu with for_each_possible_cpu. in xfs. Signed-off-by: KAMEZAWA Hiroyuki Acked-by: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6938d1b2768fbf94d1091207d334ef7df786e5a tree a0b7ea4375ef9802f4fbd7eef2f6b5f960f77079 parent 726c334223180e3c0197cc980a432681370d4baf author David Howells Fri, 23 Jun 2006 02:02:59 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] XFS: Use the dentry passed to statfs() to limit the scope of the results Enable XFS to limit the statfs() results to the project quota covering the dentry used as a base for call. Signed-off-by: David Howells Signed-off-by: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 726c334223180e3c0197cc980a432681370d4baf tree 8327b354bb3dc959a6606051ae6f8d4d035e38a2 parent 454e2398be9b9fa30433fccc548db34d19aa9958 author David Howells Fri, 23 Jun 2006 02:02:58 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] VFS: Permit filesystem to perform statfs with a known root dentry Give the statfs superblock operation a dentry pointer rather than a superblock pointer. This complements the get_sb() patch. That reduced the significance of sb->s_root, allowing NFS to place a fake root there. However, NFS does require a dentry to use as a target for the statfs operation. This permits the root in the vfsmount to be used instead. linux/mount.h has been added where necessary to make allyesconfig build successfully. Interest has also been expressed for use with the FUSE and XFS filesystems. Signed-off-by: David Howells Acked-by: Al Viro Cc: Nathan Scott Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 454e2398be9b9fa30433fccc548db34d19aa9958 tree 1f61cb0c3716a33b661cfc8977e9beeb480a322c parent 1ad5544098a69d7dc1fa508cbb17e13a7a952fd8 author David Howells Fri, 23 Jun 2006 02:02:57 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:45 -0700 [PATCH] VFS: Permit filesystem to override root dentry on mount Extend the get_sb() filesystem operation to take an extra argument that permits the VFS to pass in the target vfsmount that defines the mountpoint. The filesystem is then required to manually set the superblock and root dentry pointers. For most filesystems, this should be done with simple_set_mnt() which will set the superblock pointer and then set the root dentry to the superblock's s_root (as per the old default behaviour). The get_sb() op now returns an integer as there's now no need to return the superblock pointer. This patch permits a superblock to be implicitly shared amongst several mount points, such as can be done with NFS to avoid potential inode aliasing. In such a case, simple_set_mnt() would not be called, and instead the mnt_root and mnt_sb would be set directly. The patch also makes the following changes: (*) the get_sb_*() convenience functions in the core kernel now take a vfsmount pointer argument and return an integer, so most filesystems have to change very little. (*) If one of the convenience function is not used, then get_sb() should normally call simple_set_mnt() to instantiate the vfsmount. This will always return 0, and so can be tail-called from get_sb(). (*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the dcache upon superblock destruction rather than shrink_dcache_anon(). This is required because the superblock may now have multiple trees that aren't actually bound to s_root, but that still need to be cleaned up. The currently called functions assume that the whole tree is rooted at s_root, and that anonymous dentries are not the roots of trees which results in dentries being left unculled. However, with the way NFS superblock sharing are currently set to be implemented, these assumptions are violated: the root of the filesystem is simply a dummy dentry and inode (the real inode for '/' may well be inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries with child trees. [*] Anonymous until discovered from another tree. (*) The documentation has been adjusted, including the additional bit of changing ext2_* into foo_* in the documentation. [akpm@osdl.org: convert ipath_fs, do other stuff] Signed-off-by: David Howells Acked-by: Al Viro Cc: Nathan Scott Cc: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ad5544098a69d7dc1fa508cbb17e13a7a952fd8 tree 60eb468a15572cbecd167286b5a91d22e8bd1710 parent 5fa21d821f6972e70942f2c555ec29dde962bdb2 author Rachita Kothiyal Fri, 23 Jun 2006 02:02:56 -0700 committer Linus Torvalds Fri, 23 Jun 2006 07:42:44 -0700 [PATCH] Fix cdrom being confused on using kdump I have seen the cdrom drive appearing confused on using kdump on certain x86_64 systems. During the booting up of the second kernel, the following message would keep flooding the console, and the booting would not proceed any further. hda: cdrom_pc_intr: The drive appears confused (ireason = 0x01) In this patch, whenever we are hitting a confused state in the interrupt handler with the DRQ set, we end the request and return ide_stopped. Using this I dont see the status error. Signed-off-by: Rachita Kothiyal Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca6bb5d7ab22ac79f608fe6cbc6b12de6a5a19f0 tree 7255df98fa5692c498605d2bd80402ec866f134a parent f4b8ea7849544114e9d3d682df4d400180854677 author David Woodhouse Thu, 22 Jun 2006 16:07:52 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:44 -0700 [NET]: Require CAP_NET_ADMIN to create tuntap devices. The tuntap driver allows an admin to create persistent devices and assign ownership of them to individual users. Unfortunately, relaxing the permissions on the /dev/net/tun device node so that they can actually use those devices will _also_ allow those users to create arbitrary new devices of their own. This patch corrects that, and adjusts the recommended permissions for the device node accordingly. Signed-off-By: David Woodhouse Signed-off-by: David S. Miller commit f4b8ea7849544114e9d3d682df4d400180854677 tree 502e33a7c2edaf9ffe899da39d0e7036128ccc12 parent c8a553ad7f0bf943047943a758cf07017819cb3c author Randy Dunlap Thu, 22 Jun 2006 16:00:11 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:42 -0700 [NET]: fix net-core kernel-doc Warning(/var/linsrc/linux-2617-g4//include/linux/skbuff.h:304): No description found for parameter 'dma_cookie' Warning(/var/linsrc/linux-2617-g4//include/net/sock.h:1274): No description found for parameter 'copied_early' Warning(/var/linsrc/linux-2617-g4//net/core/dev.c:3309): No description found for parameter 'chan' Warning(/var/linsrc/linux-2617-g4//net/core/dev.c:3309): No description found for parameter 'event' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit c8a553ad7f0bf943047943a758cf07017819cb3c tree df54b3d8c241ca59c1cb626819d06ba5106adc33 parent 09b8f7a93efd4b2c4ef391e2fbf076f28c6d36d6 author David Woodhouse Thu, 22 Jun 2006 14:28:09 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:40 -0700 [TCP]: Move inclusion of to correct place in The new header shouldn't be included from the !__KERNEL__ portion of tcp.h Signed-off-by: David Woodhouse Signed-off-by: David S. Miller commit 09b8f7a93efd4b2c4ef391e2fbf076f28c6d36d6 tree 7168ac18ce0b765e67f0536e13b8628b1c12ad38 parent 37c3185a02d4b85fbe134bf5204535405dd2c957 author Herbert Xu Thu, 22 Jun 2006 03:08:03 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:38 -0700 [IPSEC]: Handle GSO packets This patch segments GSO packets received by the IPsec stack. This can happen when a NIC driver injects GSO packets into the stack which are then forwarded to another host. The primary application of this is going to be Xen where its backend driver may inject GSO packets into dom0. Of course this also can be used by other virtualisation schemes such as VMWare or UML since the tap device could be modified to inject GSO packets received through splice. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 37c3185a02d4b85fbe134bf5204535405dd2c957 tree 7712fb706bb446b5b6a8ae25f365b4e135d9a1fb parent f4c50d990dcf11a296679dc05de3873783236711 author Herbert Xu Thu, 22 Jun 2006 03:07:29 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:36 -0700 [NET]: Added GSO toggle This patch adds a generic segmentation offload toggle that can be turned on/off for each net device. For now it only supports in TCPv4. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f4c50d990dcf11a296679dc05de3873783236711 tree f4daf1c80fe591d45631e998b0b5d31d6fe76d85 parent f6a78bfcb141f963187464bac838d46a81c3882a author Herbert Xu Thu, 22 Jun 2006 03:02:40 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:33 -0700 [NET]: Add software TSOv4 This patch adds the GSO implementation for IPv4 TCP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit f6a78bfcb141f963187464bac838d46a81c3882a tree fe30917dea1ab4cc046c6f1b8c1875373040c84a parent 7967168cefdbc63bf332d6b1548eca7cd65ebbcc author Herbert Xu Thu, 22 Jun 2006 02:57:17 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:31 -0700 [NET]: Add generic segmentation offload This patch adds the infrastructure for generic segmentation offload. The idea is to tap into the potential savings of TSO without hardware support by postponing the allocation of segmented skb's until just before the entry point into the NIC driver. The same structure can be used to support software IPv6 TSO, as well as UFO and segmentation offload for other relevant protocols, e.g., DCCP. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 7967168cefdbc63bf332d6b1548eca7cd65ebbcc tree c45759149ae0acdc89d746e556a0ae278d11776d parent d4828d85d188dc70ed172802e798d3978bb6e29e author Herbert Xu Thu, 22 Jun 2006 02:40:14 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:29 -0700 [NET]: Merge TSO/UFO fields in sk_buff Having separate fields in sk_buff for TSO/UFO (tso_size/ufo_size) is not going to scale if we add any more segmentation methods (e.g., DCCP). So let's merge them. They were used to tell the protocol of a packet. This function has been subsumed by the new gso_type field. This is essentially a set of netdev feature bits (shifted by 16 bits) that are required to process a specific skb. As such it's easy to tell whether a given device can process a GSO skb: you just have to and the gso_type field and the netdev's features field. I've made gso_type a conjunction. The idea is that you have a base type (e.g., SKB_GSO_TCPV4) that can be modified further to support new features. For example, if we add a hardware TSO type that supports ECN, they would declare NETIF_F_TSO | NETIF_F_TSO_ECN. All TSO packets with CWR set would have a gso_type of SKB_GSO_TCPV4 | SKB_GSO_TCPV4_ECN while all other TSO packets would be SKB_GSO_TCPV4. This means that only the CWR packets need to be emulated in software. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d4828d85d188dc70ed172802e798d3978bb6e29e tree 11e70b1c93b25c5e2c9a1547e23086fc9a76d287 parent 5e2707fa3aed8c24075087cbaea2628725adbe55 author Herbert Xu Thu, 22 Jun 2006 02:28:18 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:26 -0700 [NET]: Prevent transmission after dev_deactivate The dev_deactivate function has bit-rotted since the introduction of lockless drivers. In particular, the spin_unlock_wait call at the end has no effect on the xmit routine of lockless drivers. With a little bit of work, we can make it much more useful by providing the guarantee that when it returns, no more calls to the xmit routine of the underlying driver will be made. The idea is simple. There are two entry points in to the xmit routine. The first comes from dev_queue_xmit. That one is easily stopped by using synchronize_rcu. This works because we set the qdisc to noop_qdisc before the synchronize_rcu call. That in turn causes all subsequent packets sent to dev_queue_xmit to be dropped. The synchronize_rcu call also ensures all outstanding calls leave their critical section. The other entry point is from qdisc_run. Since we now have a bit that indicates whether it's running, all we have to do is to wait until the bit is off. I've removed the loop to wait for __LINK_STATE_SCHED to clear. This is useless because netif_wake_queue can cause it to be set again. It is also harmless because we've disarmed qdisc_run. I've also removed the spin_unlock_wait on xmit_lock because its only purpose of making sure that all outstanding xmit_lock holders have exited is also given by dev_watchdog_down. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 5e2707fa3aed8c24075087cbaea2628725adbe55 tree 8e70bb71a7ce79c40026caa3f9a5e37295668630 parent 102128e3a27821bdcbacb10f4f2bba253f587ba4 author YOSHIFUJI Hideaki Thu, 22 Jun 2006 01:41:18 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:24 -0700 [IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY We need to update hiscore.rule even if we don't enable CONFIG_IPV6_PRIVACY, because we have more less significant rule; longest match. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 102128e3a27821bdcbacb10f4f2bba253f587ba4 tree bbde6e385045eea27c5e8aeae051ac420a5cda92 parent 5b057c6b1a25d57edf2b4d1e956e50936480a9ff author Łukasz Stelmach Thu, 22 Jun 2006 01:37:19 -0700 committer David S. Miller Fri, 23 Jun 2006 02:07:22 -0700 [IPV6]: Fix source address selection. Two additional labels (RFC 3484, sec. 10.3) for IPv6 addreses are defined to make a distinction between global unicast addresses and Unique Local Addresses (fc00::/7, RFC 4193) and Teredo (2001::/32, RFC 4380). It is necessary to avoid attempts of connection that would either fail (eg. fec0:: to 2001:feed::) or be sub-optimal (2001:0:: to 2001:feed::). Signed-off-by: Łukasz Stelmach Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 5b057c6b1a25d57edf2b4d1e956e50936480a9ff tree e641febd6f562e0ed1198c160ff353ab513f0612 parent 5fa21d821f6972e70942f2c555ec29dde962bdb2 author Herbert Xu Fri, 23 Jun 2006 02:06:41 -0700 committer David S. Miller Fri, 23 Jun 2006 02:06:41 -0700 [NET]: Avoid allocating skb in skb_pad First of all it is unnecessary to allocate a new skb in skb_pad since the existing one is not shared. More importantly, our hard_start_xmit interface does not allow a new skb to be allocated since that breaks requeueing. This patch uses pskb_expand_head to expand the existing skb and linearize it if needed. Actually, someone should sift through every instance of skb_pad on a non-linear skb as they do not fit the reasons why this was originally created. Incidentally, this fixes a minor bug when the skb is cloned (tcpdump, TCP, etc.). As it is skb_pad will simply write over a cloned skb. Because of the position of the write it is unlikely to cause problems but still it's best if we don't do it. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0dd4b21f517e138ea113db255645fbae1bf5eef3 tree c5f9894fb7f9536e1a2149e64c44ca94d3ec063c parent 99ba9e093d058f6dff54f475136018e2e281d50f author Borislav Petkov Fri, 23 Jun 2006 02:29:08 -0400 committer Jeff Garzik Fri, 23 Jun 2006 02:29:08 -0400 [libata] conversion to new debug scheme, part 1 of $N The first 25% of libata-core.c converted to the new debugging scheme. Signed-off-by: (with addition of ATA_MSG_WARN to standard msg_enable by me) Signed-off-by: Jeff Garzik commit 5fa21d821f6972e70942f2c555ec29dde962bdb2 tree fbe0a083ce7fc7ddb58cd452d5598662acac325b parent 8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6 parent 5d9fd169c9fbdaecdc430431e59bf94ff40b93d3 author Linus Torvalds Thu, 22 Jun 2006 23:09:42 -0700 committer Linus Torvalds Thu, 22 Jun 2006 23:09:42 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: [PATCH] Driver core: fix locking issues with the devices that are attached to classes [PATCH] USB: get USB suspend to work again commit 5d9fd169c9fbdaecdc430431e59bf94ff40b93d3 tree 11afe01918373ecbfe9097b084a1cc88d706f1a4 parent 0517587e5896cef1d5f99d3b24f5f2ca15d952ad author Greg Kroah-Hartman Thu, 22 Jun 2006 17:17:32 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 22:54:30 -0700 [PATCH] Driver core: fix locking issues with the devices that are attached to classes Doh, that was foolish... Signed-off-by: Greg Kroah-Hartman commit 0517587e5896cef1d5f99d3b24f5f2ca15d952ad tree 8f96898bc231018e899ae92c5e2542fe13a7e9d8 parent c71bd6944eb1458b7887af1783101f5a46140c40 author Greg Kroah-Hartman Thu, 22 Jun 2006 13:29:52 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 22:54:23 -0700 [PATCH] USB: get USB suspend to work again Yeah, it's a hack, but it is only temporary until Alan's patches reworking this area make it in. We really should not care what devices below us are doing, especially when we do not really know what type of devices they are. This patch relies on the fact that the endpoint devices do not have a driver assigned to us. Signed-off-by: Greg Kroah-Hartman commit 8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6 tree a02ec337d6d6e4b30cd0b4d8968116a32c59357c parent 6f3cafce0ed24372084b5648c9e8a6aacbaf9900 parent b44fb7a09e6bb7d77c1b4b402591f6f953c1e51c author Linus Torvalds Thu, 22 Jun 2006 22:47:06 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:47:06 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc: [ARM] 3565/1: AT91RM9200 MMC update [MMC] Convert all hosts except mmci to use data->blksz commit 6f3cafce0ed24372084b5648c9e8a6aacbaf9900 tree a20de49dbad477a608d1df3ce19f3eeb68417585 parent 0c97f524fc16004602f97ba19c36acdcc0fb9688 parent 02916526133aebc0b3b6c486d1b0af95221033bd author Linus Torvalds Thu, 22 Jun 2006 22:46:28 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:46:28 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (21 commits) [ARM] 3629/1: S3C24XX: fix missing bracket in regs-dsc.h [ARM] 3537/1: Rework DMA-bounce locking for finer granularity [ARM] 3601/1: i.MX/MX1 DMA error handling for signaled channels only [ARM] 3597/1: ixp4xx/nslu2: Board support for new LED subsystem [ARM] 3595/1: ixp4xx/nas100d: Board support for new LED subsystem [ARM] 3626/1: ARM EABI: fix syscall restarting [ARM] 3628/1: S3C24XX: add get_rate call to struct clk [ARM] 3627/1: S3C24XX: split s3c2410 clocks from core clocks [ARM] 3613/1: S3C2410: Add sysdev and sysclass [ARM] 3624/1: Report true modem control line states [ARM] 3620/2: ixp23xx: add uengine loader support [ARM] 3618/1: add defconfig for logicpd pxa270 card engine [ARM] 3617/1: ep93xx: fix slightly incorrect timer tick rate [ARM] 3616/1: fix timer handler wrap logic for a number of platforms [ARM] 3615/1: ixp23xx: use platform devices for physmap flash [ARM] 3614/1: ep93xx: use platform devices for physmap flash [ARM] 3621/1: fix compilation breakage for pnx4008 [ARM] 3623/1: pnx4008: move GPIO-related defines to gpio.h [ARM] 3622/1: pnx4008: remove clk_use/clk_unuse [ARM] Enable VFP to be built when non-VFP capable CPUs are selected ... commit 0c97f524fc16004602f97ba19c36acdcc0fb9688 tree c413a5d51dec3ddbe5f2e5cb0ea828976538168f parent c71bd6944eb1458b7887af1783101f5a46140c40 parent 4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d author Linus Torvalds Thu, 22 Jun 2006 22:45:53 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:45:53 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial * 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3600/1: increase amba-pl010 UART_NR to 8 [ARM] 3571/1: netX: serial driver for Hilscher netX commit c71bd6944eb1458b7887af1783101f5a46140c40 tree 97a7f30a1fb5b3cde3d9f3108779e612960056da parent 065a3e17baa36d1d48eb7376138820035b44775e parent 4ec223d02f4d5f5a3129edc0e3d22550d6ac8a32 author Linus Torvalds Thu, 22 Jun 2006 22:40:00 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:40:00 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] Fix ondemand vs suspend deadlock [CPUFREQ] Fix powernow-k8 SMP kernel on UP hardware bug. [PATCH] redirect speedstep-centrino maintainer mail to cpufreq list [CPUFREQ] correct powernow-k8 fid/vid masks for extended parts [CPUFREQ] Clarify powernow-k8 cpu_family statements commit 065a3e17baa36d1d48eb7376138820035b44775e tree 556abb5dbeaad98fc5a66bd56f6a647dfbd22182 parent 45c091bb2d453ce4a8b06cf19872ec7a77fc4799 parent bfcbb00855db21dacd3c154ea13ec3fdd98e747b author Linus Torvalds Thu, 22 Jun 2006 22:15:09 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:15:09 -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: (33 commits) [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804 via-velocity: the link is not correctly detected when the device starts [PATCH] add b44 to maintainers [PATCH] WAN: ioremap() failure checks in drivers [PATCH] WAN: register_hdlc_device() doesn't need dev_alloc_name() [PATCH] skb_padto()-area fixes in 8390, wavelan [PATCH] make drivers/net/forcedeth.c:nv_update_pause() static [PATCH] network driver for Hilscher netx [PATCH] Dereference in tokenring/olympic.c [PATCH] Array overrun in drivers/net/wireless/wavelan.c [PATCH] Remove useless check in drivers/net/pcmcia/xirc2ps_cs.c [PATCH] 8139cp: add ethtool eeprom support [PATCH] 8139cp: fix eeprom read command length [PATCH] b44: update b44 Kconfig entry [PATCH] b44: update version to 1.01 [PATCH] b44: add wol for old nic [PATCH] b44: add parameter [PATCH] b44: add wol [PATCH] b44: fix manual speed/duplex/autoneg settings ... commit 45c091bb2d453ce4a8b06cf19872ec7a77fc4799 tree 06fb2e05518ebfba163f8424e028e7faf5672d66 parent d588fcbe5a7ba8bba2cebf7799ab2d573717a806 parent 2191fe3e39159e3375f4b7ec1420df149f154101 author Linus Torvalds Thu, 22 Jun 2006 22:11:30 -0700 committer Linus Torvalds Thu, 22 Jun 2006 22:11:30 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits) [POWERPC] re-enable OProfile for iSeries, using timer interrupt [POWERPC] support ibm,extended-*-frequency properties [POWERPC] Extra sanity check in EEH code [POWERPC] Dont look for class-code in pci children [POWERPC] Fix mdelay badness on shared processor partitions [POWERPC] disable floating point exceptions for init [POWERPC] Unify ppc syscall tables [POWERPC] mpic: add support for serial mode interrupts [POWERPC] pseries: Print PCI slot location code on failure [POWERPC] spufs: one more fix for 64k pages [POWERPC] spufs: fail spu_create with invalid flags [POWERPC] spufs: clear class2 interrupt status before wakeup [POWERPC] spufs: fix Makefile for "make clean" [POWERPC] spufs: remove stop_code from struct spu [POWERPC] spufs: fix spu irq affinity setting [POWERPC] spufs: further abstract priv1 register access [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts [POWERPC] spufs: dont try to access SPE channel 1 count [POWERPC] spufs: use kzalloc in create_spu [POWERPC] spufs: fix initial state of wbox file ... Manually resolved conflicts in: drivers/net/phy/Makefile include/asm-powerpc/spu.h commit 99ba9e093d058f6dff54f475136018e2e281d50f tree 8e69fbee21e413dc0f452cf3fb9bf3c383265c49 parent ba6a13083c1b720a47c05bee7bedbb6ef06c4611 author Brian King Mon, 12 Jun 2006 14:54:17 -0500 committer Jeff Garzik Thu, 22 Jun 2006 23:46:45 -0400 [PATCH] libata: Add ata_scsi_dev_disabled Separate out parts of ata_scsi_find_dev to be reused in future SAS/SATA patches. Acked-by: Jeff Garzik Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit ba6a13083c1b720a47c05bee7bedbb6ef06c4611 tree 26f9d8d37145fac426744f96ecf006ec0a481e31 parent 47005f255ed126a4b48a1a2f63164fb1d83bcb0a author Jeff Garzik Thu, 22 Jun 2006 23:46:10 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:46:10 -0400 [libata] Add host lock to struct ata_port Prepare for changes required to support SATA devices attached to SAS HBAs. For these devices we don't want to use host_set at all, since libata will not be the owner of struct scsi_host. Signed-off-by: Brian King (with slight merge modifications made by...) Signed-off-by: Jeff Garzik commit 47005f255ed126a4b48a1a2f63164fb1d83bcb0a tree bac4a73716af3d9cdb201f1bd83d65952fa2c988 parent 3a778275626c0eb97674e92875efeba01189ce0e author Tejun Heo Mon, 19 Jun 2006 18:27:23 +0900 committer Jeff Garzik Thu, 22 Jun 2006 23:36:58 -0400 [PATCH] libata: implement per-dev EH action mask eh_info->dev_action[] Currently, the only per-dev EH action is REVALIDATE. EH used to exploit ehi->dev to do selective revalidation on a ATA bus. However, this is a bit hacky and makes it impossible to request selective revalidation from outside of EH or add another per-dev EH action. This patch adds per-dev EH action mask eh_info->dev_action[] and update EH to use this field for REVALIDATE. Note that per-dev actions can still be specified at port-level and it has the same effect of specifying the action for all devices on the port. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit bfcbb00855db21dacd3c154ea13ec3fdd98e747b tree 507cfad1eb90150516984d964580c19127233b3c parent 69eb887b0c2380791d33f7c07bfba88d7c5cef15 author Brice Goglin Thu, 22 Jun 2006 21:12:36 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:35:19 -0400 [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI We don't need to restore the state right after saving it for later recovery since commit 99dc804d9bcc2c53f4c20c291bf4e185312a1a0c (PCI: disable msi mode in pci_disable_device) now prevents pci_save_state() from disabling MSI. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 69eb887b0c2380791d33f7c07bfba88d7c5cef15 tree c825bedddbc9fd6fd3094aff7d74af7e95a5b1d9 parent af57d238aa2107e1b45d8dacad6e50db938f0567 author Brice Goglin Thu, 22 Jun 2006 21:11:59 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:35:19 -0400 [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804 We don't need to hardcode the AER capability of the nVidia CK804 chipset anymore since commit cf34a8e07f02c76f3f1232eecb681301a3d7b10b (PCI: nVidia quirk to make AER PCI-E extended capability visible) now makes sure that this cap will be available to pci_find_ext_capability(). Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit af57d238aa2107e1b45d8dacad6e50db938f0567 tree c3ce4b9aa7a12e2b48a36fa01fef2190f13fc05c parent 39105890516b06319ffcf5ef0d0cea6c7f65bc96 parent 8a22dddb2a5b5834577afd9e25b5392218715611 author Jeff Garzik Thu, 22 Jun 2006 23:33:23 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:33:23 -0400 Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream commit 39105890516b06319ffcf5ef0d0cea6c7f65bc96 tree f336d6a252461b0a74c54d25c77bd1fc62bfa54b parent 4446065a2c9b65398ceb115f4d8c256eb1bb9647 author Gary Zambrano Thu, 22 Jun 2006 17:26:20 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:32:03 -0400 [PATCH] add b44 to maintainers Add b44 to the MAINTAINERS file. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 4446065a2c9b65398ceb115f4d8c256eb1bb9647 tree cdaa04d42876632e0df95054d46851cac6648ce3 parent 4a31e348e3ecaf54c50240109ac4574b180f8840 author Krzysztof Halasa Thu, 22 Jun 2006 22:29:28 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:32:03 -0400 [PATCH] WAN: ioremap() failure checks in drivers Eric Sesterhenn found that pci200syn initialization lacks return statement in ioremap() error path (coverity bug id #195). It looks like more WAN drivers have problems with ioremap(). Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit 4a31e348e3ecaf54c50240109ac4574b180f8840 tree 319978d90b95c7f1d4bf1fdfc552dc8850f330e7 parent aa95abefccc25efea5c8654bc3475e8161319b94 author Krzysztof Halasa Thu, 22 Jun 2006 22:20:19 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:32:03 -0400 [PATCH] WAN: register_hdlc_device() doesn't need dev_alloc_name() David Boggs noticed that register_hdlc_device() no longer needs to call dev_alloc_name() as it's called by register_netdev(). register_hdlc_device() is currently equivalent to register_netdev(). hdlc_setup() is now EXPORTed as per David's request. Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit aa95abefccc25efea5c8654bc3475e8161319b94 tree cd2611a0998be1e68ce10d3a5cd6d7e4c6810a03 parent c7985051dec26dc5ae2562a975a0b37b70621f3f author Alan Cox Thu, 22 Jun 2006 14:25:34 +0100 committer Jeff Garzik Thu, 22 Jun 2006 23:32:02 -0400 [PATCH] skb_padto()-area fixes in 8390, wavelan Ar Iau, 2006-06-22 am 21:29 +1000, ysgrifennodd Herbert Xu: > Alan Cox wrote: > > > > The 8390 change (corrected version) also makes 8390.c faster so should > > be applied anyway, and the orinoco one fixes some code that isn't even > > needed and someone forgot to remove long ago. Otherwise the skb_padto > > Yeah I agree totally. However, I haven't actually seen the fixed 8390 > version being posted yet or at least not to netdev :) Ah the resounding clang of a subtle hint ;) Signed-off-by: Alan Cox - Return 8390.c to the old way of handling short packets (which is also faster) - Remove the skb_padto from orinoco. This got left in when the padding bad write patch was added and is actually not needed. This is fixing a merge error way back when. - Wavelan can also use the stack based buffer trick if you want Signed-off-by: Jeff Garzik commit c7985051dec26dc5ae2562a975a0b37b70621f3f tree 390de4b741a22c8a18e6ce6203ef25b709d9a8e4 parent 92aa674d721d089c440301ab95cb6be19c78727e author Adrian Bunk Thu, 22 Jun 2006 12:03:29 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:31:06 -0400 [PATCH] make drivers/net/forcedeth.c:nv_update_pause() static This patch makes the needlessly global nv_update_pause() static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 92aa674d721d089c440301ab95cb6be19c78727e tree f5114973b0e5a975035664b48f44217802b4b6b1 parent 6d56ab936237b429366ade0d2a1540c7e41beb87 author Sascha Hauer Thu, 22 Jun 2006 07:11:13 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:28:05 -0400 [PATCH] network driver for Hilscher netx This is a patch for the Hilscher netx builtin ethernet ports. The netx board support was merged into 2.6.17-git2. The netx is a arm926 based SoC. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer -- drivers/net/Kconfig | 11 drivers/net/Makefile | 1 drivers/net/netx-eth.c | 516 ++++++++++++++++++++++++++++++++++++++++ include/asm-arm/arch-netx/eth.h | 27 ++ 4 files changed, 555 insertions(+) Signed-off-by: Jeff Garzik commit 3a778275626c0eb97674e92875efeba01189ce0e tree d0df8b559e2d95772ebd30a3cc70b86ae2703a9e parent 71f0737b2889b86f774a94afaf1342c2c0d61cb5 author Albert Lee Thu, 22 Jun 2006 13:00:25 +0800 committer Jeff Garzik Thu, 22 Jun 2006 23:26:24 -0400 [PATCH] libata-dev: move the CDB-intr DMA blacklisting Move the DMA blacklisting of the CDB-intr devices from ata_check_atapi_dma() to ata_dma_blacklisted(), where it makes more sense. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6d56ab936237b429366ade0d2a1540c7e41beb87 tree 6e767fd02c7c43aa72d600bdb5057c14dd05d56f parent a192491ad58098f2c57d2d1efe721ea0634dc0aa author Eric Sesterhenn Wed, 21 Jun 2006 16:17:17 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:24:18 -0400 [PATCH] Dereference in tokenring/olympic.c hi, coverity found (bug id #225) that we might call free_netdev() with NULL argument, when alloc_trdev() fails. This patch changes the goto, so we dont call free_netdev() for dev == NULL. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit a192491ad58098f2c57d2d1efe721ea0634dc0aa tree 7a8ef6923e28dcec98f0a6d5bd2c3246cd01eacf parent da4f5ccf6040b998b64c60db8fa5f4ee03fdaf95 author Eric Sesterhenn Wed, 21 Jun 2006 16:40:24 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:24:18 -0400 [PATCH] Array overrun in drivers/net/wireless/wavelan.c hi, this is another array overrun spotted by coverity (#id 507) we should check the index against array size before using it. Not sure why the driver doesnt use ARRAY_SIZE instead of its own macro. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit 71f0737b2889b86f774a94afaf1342c2c0d61cb5 tree e983d3f4c3fccad0679aa8ae18a0c3ce91bfafe7 parent 8fa29b23d9e0ef976dc578aab98297d4f24f70da author Tejun Heo Wed, 21 Jun 2006 23:12:48 +0900 committer Jeff Garzik Thu, 22 Jun 2006 23:22:39 -0400 [PATCH] ahci: disable NCQ support on vt8251 vt8251 chokes on NCQ commands. Two different disks from different vendors are showing the same symptom and it seems that the windows driver from via doesn't support NCQ either. Disable NCQ support on this controller for the time being. Signed-off-by: Tejun Heo Cc: Aalderd Bouwman Cc: Bastiaan Jacques Signed-off-by: Jeff Garzik commit da4f5ccf6040b998b64c60db8fa5f4ee03fdaf95 tree f150dbaf402cc48baca720749135ff47987ff87e parent 722fdb33591bc7308a661913fb2f829128236b6f author Eric Sesterhenn Wed, 21 Jun 2006 16:10:48 +0200 committer Jeff Garzik Thu, 22 Jun 2006 23:22:17 -0400 [PATCH] Remove useless check in drivers/net/pcmcia/xirc2ps_cs.c hi, coverity choked at this check (id #223), assuming that skb might be NULL and used anyways later. Since start_hard_xmit() always gets called with a valid skb, the check is useless and this patch removes it. Signed-off-by: Eric Sesterhenn Signed-off-by: Jeff Garzik commit 722fdb33591bc7308a661913fb2f829128236b6f tree 6b8612e0f72f1ae26adb7d7f07a60e5f1a8bdf60 parent d73f1e3c3b0703e25728ce5bdda9806d6f2c576f author Philip Craig Wed, 21 Jun 2006 11:33:27 +1000 committer Jeff Garzik Thu, 22 Jun 2006 23:20:29 -0400 [PATCH] 8139cp: add ethtool eeprom support Implement the ethtool eeprom operations for the 8139cp driver. Tested on x86 and big-endian ARM. Signed-off-by: Philip Craig Signed-off-by: Jeff Garzik commit d73f1e3c3b0703e25728ce5bdda9806d6f2c576f tree 5bb928aa9d053bf14cc5a2a2eeb63e6ffa6160d6 parent fc13dcae24bfd877aeff07774c035b2b896e05ca author Philip Craig Wed, 21 Jun 2006 11:33:26 +1000 committer Jeff Garzik Thu, 22 Jun 2006 23:20:29 -0400 [PATCH] 8139cp: fix eeprom read command length The read command for the 93C46/93C56 EEPROMS should be 3 bits plus the address. This doesn't appear to affect the operation of the read command, but similar errors for write commands do cause failures. Signed-off-by: Philip Craig Signed-off-by: Jeff Garzik commit 8fa29b23d9e0ef976dc578aab98297d4f24f70da tree e39c58a310ae00079cb0652a3f7d202347303e6b parent c57c064994f1544a5ed2e9b319ebd0bc087ea540 author Jeff Garzik Thu, 22 Jun 2006 23:19:15 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:19:15 -0400 [libata] ahci: add JMicron PCI IDs Originally contributed by Justin @ JMicron. Signed-off-by: Jeff Garzik commit fc13dcae24bfd877aeff07774c035b2b896e05ca tree 0127b4e01a4c672520b9521c53b144ab1e24ca89 parent 4d1dabdb52ee49f24cf874b6af2cd2c9efd9444a author Gary Zambrano Tue, 20 Jun 2006 15:34:46 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: update b44 Kconfig entry Deleted "EXPERIMENTAL" from b44 entry in Kconfig. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 4d1dabdb52ee49f24cf874b6af2cd2c9efd9444a tree 1e5584a3d9fc9ed073380046438bfbf0d7e1c702 parent 725ad800b73a71fe91bfd8859f928852de688ea0 author Gary Zambrano Tue, 20 Jun 2006 15:34:40 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: update version to 1.01 Update the driver version to 1.01 Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 725ad800b73a71fe91bfd8859f928852de688ea0 tree 1612e231baf1bd861c7a5724949a0b7b91966314 parent 00e8b3aa1cfd7577fd4019a24f7c3980506f83f3 author Gary Zambrano Tue, 20 Jun 2006 15:34:36 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: add wol for old nic This patch adds wol support for the older 440x nics that use pattern matching. This patch is a redo thanks to feedback from Michael Chan and Francois Romieu. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 00e8b3aa1cfd7577fd4019a24f7c3980506f83f3 tree bcdc179045db7ba908671ec864caf3cca74282ae parent 52cafd965507b7a7bb962486539f6d7422552692 author Gary Zambrano Tue, 20 Jun 2006 15:34:26 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: add parameter This patch adds a parameter to init_hw() to not completely initialize the nic for wol. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit 52cafd965507b7a7bb962486539f6d7422552692 tree 629aa6883f073b1d28fad4340f3d4d3f5c124230 parent 47b9c3b1e6afa3c40e3ac1822cd13946567b5955 author Gary Zambrano Tue, 20 Jun 2006 15:34:23 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: add wol Adds wol to the driver. This is a redo of a previous patch thanks to feedback from Francois Romieu. Signed-off-by Gary Zambrano Signed-off-by: Jeff Garzik commit 47b9c3b1e6afa3c40e3ac1822cd13946567b5955 tree 21316fb2f44240c9eb123367097b2e41a43a1ecc parent 00e5edcbfdb7030f6cbb8d5d89fdc2848133a182 author Gary Zambrano Tue, 20 Jun 2006 15:34:15 -0700 committer Jeff Garzik Thu, 22 Jun 2006 23:16:13 -0400 [PATCH] b44: fix manual speed/duplex/autoneg settings Fixes for speed/duplex/autoneg settings and driver settings info. This is a redo of a previous patch thanks to feedback from Jeff Garzik. Signed-off-by: Gary Zambrano Signed-off-by: Jeff Garzik commit c57c064994f1544a5ed2e9b319ebd0bc087ea540 tree 43a3756959c73eda9e48c1c7c4b728c94d68379f parent fe7fa31aa0749d7d247d21e1880f0c5aea15b158 author Jeff Garzik Thu, 22 Jun 2006 23:12:24 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:12:24 -0400 [libata] sata_nv: add PCI IDs Based on a patch contributed by Andrew Chew @ NVIDIA. Signed-off-by: Jeff Garzik commit fe7fa31aa0749d7d247d21e1880f0c5aea15b158 tree fe1bb95683d5032f4656a8e6276fab50533bf5e3 parent 71d530cd1b6d97094481002a04c77fea1c8e1c22 author Jeff Garzik Thu, 22 Jun 2006 23:05:36 -0400 committer Jeff Garzik Thu, 22 Jun 2006 23:05:36 -0400 [libata] ahci: Add NVIDIA PCI IDs. Based on a patch by Andrew Chew @ NVIDIA. Signed-off-by: Jeff Garzik commit 00e5edcbfdb7030f6cbb8d5d89fdc2848133a182 tree db1e8bc9e3ff9adbf78b7695bd566f9681567e98 parent 427d269f17fd02d192e9ae3bd93bdc07790fa02c author Andrew Victor Tue, 20 Jun 2006 12:19:13 +0200 committer Jeff Garzik Thu, 22 Jun 2006 22:56:21 -0400 [PATCH] AT91RM9200 Ethernet #4: Suspend/Resume Adds power-management (suspend/resume) support to the AT91RM9200 Ethernet driver. Patch from David Brownell. Signed-off-by: Andrew Victor Signed-off-by: Jeff Garzik commit 427d269f17fd02d192e9ae3bd93bdc07790fa02c tree 2bb5f446e7e134173a7b83a4940d147dd88a2c19 parent ca5585ed248dc01ce918002ee9a9c9c41ae4f7c0 author Andrew Victor Tue, 20 Jun 2006 12:10:57 +0200 committer Jeff Garzik Thu, 22 Jun 2006 22:56:21 -0400 [PATCH] AT91RM9200 Ethernet #3: Cleanup Moved global ether_clk variable into controller data structure. Patch from David Brownell. Davicom 9161 PHY was being incorrectly displayed as "9196". Patch from Brian Stafford. clk_get() doesn't return NULL on error, so the return value needs to be tested with IS_ERR(). Whitespace cleanup. Signed-off-by: Andrew Victor Signed-off-by: Jeff Garzik commit ca5585ed248dc01ce918002ee9a9c9c41ae4f7c0 tree 354844b9b92c9694625b805b7044ded9c9abe1c6 parent 775637df0caccc204628ebacca2b07f35c88b96b author Andrew Victor Tue, 20 Jun 2006 11:59:05 +0200 committer Jeff Garzik Thu, 22 Jun 2006 22:56:21 -0400 [PATCH] AT91RM9200 Ethernet #2: MII interface Adds support for the MII ioctls via generic_mii_ioctl(). Patch from Brian Stafford. Set the mii.phy_id to the detected PHY address, otherwise ethtool cannot access PHYs other than 0. Patch from Roman Kolesnikov. Signed-off-by: Andrew Victor Signed-off-by: Jeff Garzik commit 775637df0caccc204628ebacca2b07f35c88b96b tree 837b379c417d2bd39f92ede7036642c12f47b014 parent d955d90b90db4b3ac2a3e56d271f372c41fb00d6 author Andrew Victor Tue, 20 Jun 2006 11:50:23 +0200 committer Jeff Garzik Thu, 22 Jun 2006 22:56:21 -0400 [PATCH] AT91RM9200 Ethernet #1: Link poll For Ethernet PHYs that don't have an IRQ pin or boards that don't connect the IRQ pin to the processor, we enable a timer to poll the PHY's link state. Patch originally supplied by Eric Benard and Roman Kolesnikov. Signed-off-by: Andrew Victor Signed-off-by: Jeff Garzik commit d955d90b90db4b3ac2a3e56d271f372c41fb00d6 tree ef769c3b50bebc185785a0cff1bb1d20b779656b parent dbe1ab9514c231c9b062140a107d9dea0eabefcc author Ralf Baechle Sat, 17 Jun 2006 18:57:39 +0100 committer Jeff Garzik Thu, 22 Jun 2006 22:52:35 -0400 [PATCH] IP27: Really set PCI64_ATTR_VIRTUAL, not PCI64_ATTR_PREC. IOC3's homegrown DMA mapping functions that are used to optimize things a little on IP27 set the wrong bit. Signed-off-by: Ralf Baechle Signed-off-by: Jeff Garzik commit dbe1ab9514c231c9b062140a107d9dea0eabefcc tree 0001c7143cf923fc704215f0a0e54221e9e5cbb9 parent 612eff0e3715a6faff5ba1b74873b99e036c59fe parent d588fcbe5a7ba8bba2cebf7799ab2d573717a806 author Jeff Garzik Thu, 22 Jun 2006 22:51:46 -0400 committer Jeff Garzik Thu, 22 Jun 2006 22:51:46 -0400 Merge branch 'master' into upstream commit 71d530cd1b6d97094481002a04c77fea1c8e1c22 tree e786da7145d83c19a594adf76ed90d52c51058b1 parent d7a80dad2fe19a2b8c119c8e9cba605474a75a2b parent d588fcbe5a7ba8bba2cebf7799ab2d573717a806 author Jeff Garzik Thu, 22 Jun 2006 22:11:56 -0400 committer Jeff Garzik Thu, 22 Jun 2006 22:11:56 -0400 Merge branch 'master' into upstream Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h commit 8a22dddb2a5b5834577afd9e25b5392218715611 tree 987fb5c1b8a6ce4d0437b675909e4505a09144d7 parent 612eff0e3715a6faff5ba1b74873b99e036c59fe author Francois Romieu Fri, 23 Jun 2006 00:47:06 +0200 committer Francois Romieu Fri, 23 Jun 2006 01:18:35 +0200 via-velocity: the link is not correctly detected when the device starts The patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=6711 Signed-off-by: Roy Marples Signed-off-by: Francois Romieu commit d588fcbe5a7ba8bba2cebf7799ab2d573717a806 tree 2c82f5d26bd9f2e2f82711ef58f3c7a1b6a9a4df parent eaa8568901b3164197ce727c4c9b4067383e526c parent 4941b395b3c2635a8c16d88791a789fb6ac6be43 author Linus Torvalds Thu, 22 Jun 2006 15:08:56 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:08:56 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (44 commits) [PATCH] I2C: I2C controllers go into right place on sysfs [PATCH] hwmon-vid: Add support for Intel Core and Conroe [PATCH] lm70: New hardware monitoring driver [PATCH] hwmon: Fix the Kconfig header [PATCH] i2c-i801: Merge setup function [PATCH] i2c-i801: Better pci subsystem integration [PATCH] i2c-i801: Cleanups [PATCH] i2c-i801: Remove PCI function check [PATCH] i2c-i801: Remove force_addr parameter [PATCH] i2c-i801: Fix block transaction poll loops [PATCH] scx200_acb: Documentation update [PATCH] scx200_acb: Mark scx200_acb_probe __init [PATCH] scx200_acb: Use PCI I/O resource when appropriate [PATCH] i2c: Mark block write buffers as const [PATCH] i2c-ocores: Minor cleanups [PATCH] abituguru: Fix fan detection [PATCH] abituguru: Review fixes [PATCH] abituguru: New hardware monitoring driver [PATCH] w83792d: Add missing data access locks [PATCH] w83792d: Fix setting the PWM value ... commit eaa8568901b3164197ce727c4c9b4067383e526c tree 6dc48f016cfff6e1e5ce9278be819e1b651027b0 parent 6c763eb9ead86c612492b59287b36c0dcf7d09b1 parent c6976a4eb3c9ead165de950899b45db0840b8e30 author Linus Torvalds Thu, 22 Jun 2006 15:08:34 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:08:34 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6: [PATCH] w1: warning fix [PATCH] w1: clean up W1_CON dependency. [PATCH] drivers/w1/w1.c: fix a compile error [PATCH] W1: fix dependencies of W1_SLAVE_DS2433_CRC [PATCH] W1: possible cleanups [PATCH] W1: cleanups [PATCH] w1 exports [PATCH] w1: Use mutexes instead of semaphores. [PATCH] w1: Make w1 connector notifications depend on connector. [PATCH] w1: netlink: Mark netlink group 1 as unused. [PATCH] w1: Move w1-connector definitions into linux/include/connector.h [PATCH] w1: Userspace communication protocol over connector. [PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver. [PATCH] w1: Added default generic read/write operations. commit 6c763eb9ead86c612492b59287b36c0dcf7d09b1 tree 46497ff44bcf909517bffac70f0d6c7ad45ae1f0 parent dcc1a66a09420ccc5a22671bddc5a842f92d67e5 parent cf34a8e07f02c76f3f1232eecb681301a3d7b10b author Linus Torvalds Thu, 22 Jun 2006 15:07:59 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:07:59 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (27 commits) [PATCH] PCI: nVidia quirk to make AER PCI-E extended capability visible [PATCH] PCI: fix issues with extended conf space when MMCONFIG disabled because of e820 [PATCH] PCI: Bus Parity Status sysfs interface [PATCH] PCI: fix memory leak in MMCONFIG error path [PATCH] PCI: fix error with pci_get_device() call in the mpc85xx driver [PATCH] PCI: MSI-K8T-Neo2-Fir: run only where needed [PATCH] PCI: fix race with pci_walk_bus and pci_destroy_dev [PATCH] PCI: clean up pci documentation to be more specific [PATCH] PCI: remove unneeded msi code [PATCH] PCI: don't move ioapics below PCI bridge [PATCH] PCI: cleanup unused variable about msi driver [PATCH] PCI: disable msi mode in pci_disable_device [PATCH] PCI: Allow MSI to work on kexec kernel [PATCH] PCI: AMD 8131 MSI quirk called too late, bus_flags not inherited ? [PATCH] PCI: Move various PCI IDs to header file [PATCH] PCI Bus Parity Status-broken hardware attribute, EDAC foundation [PATCH] PCI: i386/x86_84: disable PCI resource decode on device disable [PATCH] PCI ACPI: Rename the functions to avoid multiple instances. [PATCH] PCI: don't enable device if already enabled [PATCH] PCI: Add a "enable" sysfs attribute to the pci devices to allow userspace (Xorg) to enable devices without doing foul direct access ... commit dcc1a66a09420ccc5a22671bddc5a842f92d67e5 tree 612610869ea027b80b721a0f205d217792b95f3d parent 4f3865fb57a04db7cca068fed1c15badc064a302 author Roman Zippel Thu, 22 Jun 2006 14:47:35 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:58 -0700 [PATCH] x86_64: use select for GART_IOMMU to enable AGP The AGP default doesn't work well with other selects, so use a select for GART_IOMMU as well. Remove a redundant default for SWIOTLB as well. Signed-off-by: Roman Zippel Signed-off-by: Andi Kleen Cc: Andi Kleen Cc: Dave Jones Cc: Dave Airlie Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f3865fb57a04db7cca068fed1c15badc064a302 tree 4c923c72b6ac9b633c87cc73b55a75c7cfd0f044 parent 4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4 author Richard Purdie Thu, 22 Jun 2006 14:47:34 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:58 -0700 [PATCH] zlib_inflate: Upgrade library code to a recent version Upgrade the zlib_inflate implementation in the kernel from a patched version 1.1.3/4 to a patched 1.2.3. The code in the kernel is about seven years old and I noticed that the external zlib library's inflate performance was significantly faster (~50%) than the code in the kernel on ARM (and faster again on x86_32). For comparison the newer deflate code is 20% slower on ARM and 50% slower on x86_32 but gives an approx 1% compression ratio improvement. I don't consider this to be an improvement for kernel use so have no plans to change the zlib_deflate code. Various changes have been made to the zlib code in the kernel, the most significant being the extra functions/flush option used by ppp_deflate. This update reimplements the features PPP needs to ensure it continues to work. This code has been tested on ARM under both JFFS2 (with zlib compression enabled) and ppp_deflate and on x86_32. JFFS2 sees an approx. 10% real world file read speed improvement. This patch also removes ZLIB_VERSION as it no longer has a correct value. We don't need version checks anyway as the kernel's module handling will take care of that for us. This removal is also more in keeping with the zlib author's wishes (http://www.zlib.net/zlib_faq.html#faq24) and I've added something to the zlib.h header to note its a modified version. Signed-off-by: Richard Purdie Acked-by: Joern Engel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4 tree 883c6ece20a28f86eb73cd329bb9d4674b1e5480 parent d702ccb342e49f7591df5a87c3857c698183b0fa author Bjorn Helgaas Thu, 22 Jun 2006 14:47:32 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:58 -0700 [PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use VGA_MAP_MEM translates to ioremap() on some architectures. It makes sense to do this to vga_vram_base, because we're going to access memory between vga_vram_base and vga_vram_end. But it doesn't really make sense to map starting at vga_vram_end, because we aren't going to access memory starting there. On ia64, which always has to be different, ioremapping vga_vram_end gives you something completely incompatible with ioremapped vga_vram_start, so vga_vram_size ends up being nonsense. As a bonus, we often know the size up front, so we can use ioremap() correctly, rather than giving it a zero size. Signed-off-by: Bjorn Helgaas Cc: "Antonino A. Daplas" Cc: "Luck, Tony" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d702ccb342e49f7591df5a87c3857c698183b0fa tree 4bc01a35030827a238c0822d74995b37efa4d9f7 parent 0feae5c47aabdde59cbbec32d150e17102de37f0 author Andrew Morton Thu, 22 Jun 2006 14:47:31 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] prune_one_dentry() tweaks - Add description of d_lock handling to comments over prune_one_dentry(). - It has three callsites - uninline it, saving 200 bytes of text. Cc: Jan Blunck Cc: Kirill Korotaev Cc: Olaf Hering Cc: Balbir Singh Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0feae5c47aabdde59cbbec32d150e17102de37f0 tree 244f742d943a0516921180b840419fdc329075f0 parent de047c1bcd7f7bcfbdc29eb5b439fb332594da3f author NeilBrown Thu, 22 Jun 2006 14:47:28 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] Fix dcache race during umount The race is that the shrink_dcache_memory shrinker could get called while a filesystem is being unmounted, and could try to prune a dentry belonging to that filesystem. If it does, then it will call in to iput on the inode while the dentry is no longer able to be found by the umounting process. If iput takes a while, generic_shutdown_super could get all the way though shrink_dcache_parent and shrink_dcache_anon and invalidate_inodes without ever waiting on this particular inode. Eventually the superblock gets freed anyway and if the iput tried to touch it (which some filesystems certainly do), it will lose. The promised "Self-destruct in 5 seconds" doesn't lead to a nice day. The race is closed by holding s_umount while calling prune_one_dentry on someone else's dentry. As a down_read_trylock is used, shrink_dcache_memory will no longer try to prune the dentry of a filesystem that is being unmounted, and unmount will not be able to start until any such active prune_one_dentry completes. This requires that prune_dcache *knows* which filesystem (if any) it is doing the prune on behalf of so that it can be careful of other filesystems. shrink_dcache_memory isn't called it on behalf of any filesystem, and so is careful of everything. shrink_dcache_anon is now passed a super_block rather than the s_anon list out of the superblock, so it can get the s_anon list itself, and can pass the superblock down to prune_dcache. If prune_dcache finds a dentry that it cannot free, it leaves it where it is (at the tail of the list) and exits, on the assumption that some other thread will be removing that dentry soon. To try to make sure that some work gets done, a limited number of dnetries which are untouchable are skipped over while choosing the dentry to work on. I believe this race was first found by Kirill Korotaev. Cc: Jan Blunck Acked-by: Kirill Korotaev Cc: Olaf Hering Acked-by: Balbir Singh Signed-off-by: Neil Brown Signed-off-by: Balbir Singh Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de047c1bcd7f7bcfbdc29eb5b439fb332594da3f tree ff0d52044559971b8d68aaeb00fc7b6a876b3a3d parent c89681ed7d0e4a61d35bdc12c06c6733b718b2cb author Ravikiran G Thirumalai Thu, 22 Jun 2006 14:47:26 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] avoid tasklist_lock at getrusage for multithreaded case too Avoid taking tasklist_lock for at getrusage for the multithreaded case too. We don't need to take the tasklist lock for thread traversal of a process since Oleg's do-__unhash_process-under-siglock.patch and related work. Signed-off-by: Ravikiran Thirumalai Cc: Oleg Nesterov Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c89681ed7d0e4a61d35bdc12c06c6733b718b2cb tree 170d7c54d578480ba231dd690243aa21067ca253 parent 09d967c6f32b35eab15b45862ae16e4f06259d8e author Miklos Szeredi Thu, 22 Jun 2006 14:47:22 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] remove steal_locks() This patch removes the steal_locks() function. steal_locks() doesn't work correctly with any filesystem that does it's own lock management, including NFS, CIFS, etc. In addition it has weird semantics on local filesystems in case tasks sharing file-descriptor tables are doing POSIX locking operations in parallel to execve(). The steal_locks() function has an effect on applications doing: clone(CLONE_FILES) /* in child */ lock execve lock POSIX locks acquired before execve (by "child", "parent" or any further task sharing files_struct) will after the execve be owned exclusively by "child". According to Chris Wright some LSB/LTP kind of suite triggers without the stealing behavior, but there's no known real-world application that would also fail. Apps using NPTL are not affected, since all other threads are killed before execve. Apps using LinuxThreads are only affected if they - have multiple threads during exec (LinuxThreads doesn't kill other threads, the app may do it with pthread_kill_other_threads_np()) - rely on POSIX locks being inherited across exec Both conditions are documented, but not their interaction. Apps using clone() natively are affected if they - use clone(CLONE_FILES) - rely on POSIX locks being inherited across exec The above scenarios are unlikely, but possible. If the patch is vetoed, there's a plan B, that involves mostly keeping the weird stealing semantics, but changing the way lock ownership is handled so that network and local filesystems work consistently. That would add more complexity though, so this solution seems to be preferred by most people. Signed-off-by: Miklos Szeredi Cc: Trond Myklebust Cc: Matthew Wilcox Cc: Chris Wright Cc: Christoph Hellwig Cc: Steven French Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09d967c6f32b35eab15b45862ae16e4f06259d8e tree 9fca9dda390612041f857a33cb746fe1eb28b60a parent 0e5b3781591cc954037c08ef78edf7f1192d38c5 author OGAWA Hirofumi Thu, 22 Jun 2006 14:47:21 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:57 -0700 [PATCH] Fix a race condition between ->i_mapping and iput() This race became a cause of oops, and can reproduce by the following. while true; do dd if=/dev/zero of=/dev/.static/dev/hdg1 bs=512 count=1000 & sync done This race condition was between __sync_single_inode() and iput(). cpu0 (fs's inode) cpu1 (bdev's inode) ----------------- ------------------- close("/dev/hda2") [...] __sync_single_inode() /* copy the bdev's ->i_mapping */ mapping = inode->i_mapping; generic_forget_inode() bdev_clear_inode() /* restre the fs's ->i_mapping */ inode->i_mapping = &inode->i_data; /* bdev's inode was freed */ destroy_inode(inode); if (wait) { /* dereference a freed bdev's mapping->host */ filemap_fdatawait(mapping); /* Oops */ Since __sync_single_inode() is only taking a ref-count of fs's inode, the another process can be close() and freeing the bdev's inode while writing fs's inode. So, __sync_signle_inode() accesses the freed ->i_mapping, oops. This patch takes a ref-count on the bdev's inode for the fs's inode before setting a ->i_mapping, and the clear_inode() of the fs's inode does iput() on the bdev's inode. So if the fs's inode is still living, bdev's inode shouldn't be freed. Signed-off-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e5b3781591cc954037c08ef78edf7f1192d38c5 tree 252bc504e76564f232bd889481212eb53d407049 parent bec0e85910b95c325a008ead7c3bbe047cc39672 author Brice Goglin Thu, 22 Jun 2006 14:47:20 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:56 -0700 [PATCH] PCI: Add PCI_CAP_ID_VNDR Add the vendor-specific extended capability PCI_CAP_ID_VNDR. It is required by the Myri-10G Ethernet driver. Signed-off-by: Brice Goglin Signed-off-by: Greg Kroah-Hartman Cc: Jeff Garzik Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bec0e85910b95c325a008ead7c3bbe047cc39672 tree 06628df44497bbcd17c7aadd2932f30d8170c8cb parent 6cc0719181a7aa8883855140541e7892250e66af author Andrew Morton Thu, 22 Jun 2006 14:47:19 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:56 -0700 [PATCH] myri10ge build fix Someone changed skb_linearize(). Cc: Brice Goglin Cc: "David S. Miller" Cc: Jeff Garzik Cc: Herbert Xu Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6cc0719181a7aa8883855140541e7892250e66af tree e5c740230abef71bb4d8367b68602fd294284e89 parent 04c567d9313e4927b9835361d8ac0318ce65af6b author Andrew Morton Thu, 22 Jun 2006 14:47:18 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:56 -0700 [PATCH] suspend_console() warning fix kernel/power/main.c: In function 'suspend_prepare': kernel/power/main.c:89: warning: implicit declaration of function 'suspend_console' kernel/power/main.c: In function 'suspend_finish': kernel/power/main.c:137: warning: implicit declaration of function 'resume_console' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04c567d9313e4927b9835361d8ac0318ce65af6b tree d040ef59337342603f2cc30917493fb6a74a212a parent d720024e94de4e8b7f10ee83c532926f3ad5d708 author David Howells Thu, 22 Jun 2006 14:47:18 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:56 -0700 [PATCH] Keys: Fix race between two instantiators of a key Add a revocation notification method to the key type and calls it whilst the key's semaphore is still write-locked after setting the revocation flag. The patch then uses this to maintain a reference on the task_struct of the process that calls request_key() for as long as the authorisation key remains unrevoked. This fixes a potential race between two processes both of which have assumed the authority to instantiate a key (one may have forked the other for example). The problem is that there's no locking around the check for revocation of the auth key and the use of the task_struct it points to, nor does the auth key keep a reference on the task_struct. Access to the "context" pointer in the auth key must thenceforth be done with the auth key semaphore held. The revocation method is called with the target key semaphore held write-locked and the search of the context process's keyrings is done with the auth key semaphore read-locked. The check for the revocation state of the auth key just prior to searching it is done after the auth key is read-locked for the search. This ensures that the auth key can't be revoked between the check and the search. The revocation notification method is added so that the context task_struct can be released as soon as instantiation happens rather than waiting for the auth key to be destroyed, thus avoiding the unnecessary pinning of the requesting process. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d720024e94de4e8b7f10ee83c532926f3ad5d708 tree 8f21613c29a26bfbeb334cb0104b8b998b09fbdc parent f893afbe1262e27e91234506f72e17716190dd2f author Michael LeMay Thu, 22 Jun 2006 14:47:17 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:55 -0700 [PATCH] selinux: add hooks for key subsystem Introduce SELinux hooks to support the access key retention subsystem within the kernel. Incorporate new flask headers from a modified version of the SELinux reference policy, with support for the new security class representing retained keys. Extend the "key_alloc" security hook with a task parameter representing the intended ownership context for the key being allocated. Attach security information to root's default keyrings within the SELinux initialization routine. Has passed David's testsuite. Signed-off-by: Michael LeMay Signed-off-by: David Howells Signed-off-by: James Morris Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f893afbe1262e27e91234506f72e17716190dd2f tree 4352204e9c53e278f7d494d2564f8ae78244feef parent 5d2170ad1092b2940138dc3ae4a944d7bf87ae9e author Anton Altaparmakov Thu, 22 Jun 2006 14:47:15 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:55 -0700 [PATCH] NTFS: Critical bug fix (affects MIPS and possibly others) Many thanks to Pauline Ng for the detailed bug report and analysis! Signed-off-by: Anton Altaparmakov Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d2170ad1092b2940138dc3ae4a944d7bf87ae9e tree aa06fc77266eff805b97e9f44fc35783f8f34c73 parent 7f98a44b9d09580036da7e7f8b33e66f411cf374 author Al Viro Thu, 22 Jun 2006 14:47:14 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:55 -0700 [PATCH] sparc build breakage rd_prompt et.al. depend on CONFIG_BLK_DEV_RAM, not CONFIG_BLK_INITRD; now that those are independent, setup.c blows with INITRD on and BLK_DEV_RAM off. Signed-off-by: Al Viro Cc: "David S. Miller" Cc: William Lee Irwin III Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f98a44b9d09580036da7e7f8b33e66f411cf374 tree d2200ab2fe158e696bcbde408cf4355f91f8d025 parent 0dad31d2da706ef114bc5c21123123be2f405d5b author Jeff Dike Thu, 22 Jun 2006 14:47:09 -0700 committer Linus Torvalds Thu, 22 Jun 2006 15:05:55 -0700 [PATCH] UML: fix wall_to_monotonic initialization Change a variable from unsigned to signed in order to get sign-extension when the thing is negated. Without this, uptime is horribly confused. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02916526133aebc0b3b6c486d1b0af95221033bd tree 7ff94b83c7affd3d254e4c225e972c457a76ebbc parent 823588c18689ddd49d4643eda7654302f18a275f author Ben Dooks Thu, 22 Jun 2006 22:57:54 +0100 committer Russell King Thu, 22 Jun 2006 22:57:54 +0100 [ARM] 3629/1: S3C24XX: fix missing bracket in regs-dsc.h Patch from Ben Dooks Fix missing bracket in include/asm-arm/arch-s3c2410/regs-dsc.h Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 823588c18689ddd49d4643eda7654302f18a275f tree 3cd555063265808fdf2b5c3375f27d32148bf822 parent fa3e686a34f4c33de31a128cc36def0b466bfe1a author Kevin Hilman Thu, 22 Jun 2006 22:27:14 +0100 committer Russell King Thu, 22 Jun 2006 22:27:14 +0100 [ARM] 3537/1: Rework DMA-bounce locking for finer granularity Patch from Kevin Hilman This time with IRQ versions of locks. Rework also enables compatability with realtime-preemption patch. With the current locking via interrupt disabling, under RT, potentially sleeping functions can be called with interrupts disabled. Signed-off-by: Kevin Hilman Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit fa3e686a34f4c33de31a128cc36def0b466bfe1a tree 7fb7bccf367a6d796fcf5751e5b3d901cbe91818 parent e22b04fb6b1689aee208b65966fa9fb19e098006 author Pavel Pisa Thu, 22 Jun 2006 22:21:03 +0100 committer Russell King Thu, 22 Jun 2006 22:21:03 +0100 [ARM] 3601/1: i.MX/MX1 DMA error handling for signaled channels only Patch from Pavel Pisa There has been bug, that dma_err_handler() touches even channels not signaling error condition. Problem noticed by Andrea Paterniani. Signed-off-by: Pavel Pisa Signed-off-by: Russell King commit e22b04fb6b1689aee208b65966fa9fb19e098006 tree 4b55d6133cfa7aa5e2e8f3d8909f8e2ed98c19d8 parent df6934b33c43a3ad517244935fe9c19715d9dc15 author Rod Whitby Thu, 22 Jun 2006 22:21:02 +0100 committer Russell King Thu, 22 Jun 2006 22:21:02 +0100 [ARM] 3597/1: ixp4xx/nslu2: Board support for new LED subsystem Patch from Rod Whitby This patch implements NEW_LEDS support for the Linksys NSLU2. The NSLU2 has four LED indicators, which are the only form of output for an unmodified device - there is no keyboard or display on an NSLU2. For an NSLU2 which has been modified to bring out the serial port console, it is important to register that device first separately, to enable debugging of other device support. Signed-off-by: John Bowler Signed-off-by: Rod Whitby Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit df6934b33c43a3ad517244935fe9c19715d9dc15 tree 6a8a6c66182e98466472aa4ab195e39ead6b1bb2 parent f606a6ff222dc7dceeb4d0e214ce4f55d9c6b0e6 author Rod Whitby Thu, 22 Jun 2006 22:21:01 +0100 committer Russell King Thu, 22 Jun 2006 22:21:01 +0100 [ARM] 3595/1: ixp4xx/nas100d: Board support for new LED subsystem Patch from Rod Whitby This patch implements NEW_LEDS support for the IOMega NAS100d. The NAS100d has three LED indicators, which are the only form of output for an unmodified device - there is no keyboard or display on an NAS100d. For an NAS100d which has been modified to bring out the serial port console, it is important to register that device first separately, to enable debugging of other device support. Signed-off-by: John Bowler Signed-off-by: Rod Whitby Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit f606a6ff222dc7dceeb4d0e214ce4f55d9c6b0e6 tree 6a44374b8085d5523743268f67bae7fd70e25a43 parent 92b7eb8ffc0741f1fd5fbd5458a466d608310442 author Nicolas Pitre Thu, 22 Jun 2006 22:18:45 +0100 committer Russell King Thu, 22 Jun 2006 22:18:45 +0100 [ARM] 3626/1: ARM EABI: fix syscall restarting Patch from Nicolas Pitre The RESTARTBLOCK case currently store some code on the stack to invoke sys_restart_syscall. However this is ABI dependent and there is a mismatch with the way __NR_restart_syscall gets defined when the kernel is compiled for EABI. There is also a long standing bug in the thumb case since with OABI the __NR_restart_syscall value includes __NR_SYSCALL_BASE which should not be the case for Thumb syscalls. Credits to Yauheni Kaliuta for finding the EABI bug. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 92b7eb8ffc0741f1fd5fbd5458a466d608310442 tree 55b34b892da1a64f62d7ae922c75fa903247e208 parent 99c13853ffa26dd6527995b3f47548e075f201fb author Ben Dooks Thu, 22 Jun 2006 22:18:21 +0100 committer Russell King Thu, 22 Jun 2006 22:18:21 +0100 [ARM] 3628/1: S3C24XX: add get_rate call to struct clk Patch from Ben Dooks Add a get_rate call to allow an given clock to over-ride the clk_get_rate() call. This provides support for clocks which rely on division of their parent to correctly report their frequency when the parent can also change. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 99c13853ffa26dd6527995b3f47548e075f201fb tree b007bb3e79739f7f442daa00f92a34b1348cd29b parent a341305e94982c66a2e94125a24b860605da9066 author Ben Dooks Thu, 22 Jun 2006 22:18:20 +0100 committer Russell King Thu, 22 Jun 2006 22:18:20 +0100 [ARM] 3627/1: S3C24XX: split s3c2410 clocks from core clocks Patch from Ben Dooks Split the s3c2410 specific clocks from the core clock code, as part of the work to support more of the Samsung line of SoCs. The patch does not use the sysdev mechanism as the clocks are needed for the timer init, which is very early in the kernel init sequence. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit a341305e94982c66a2e94125a24b860605da9066 tree 762cf31353b711f9ec12482d9823fa71a6ae18b8 parent 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0 author Ben Dooks Thu, 22 Jun 2006 22:18:13 +0100 committer Russell King Thu, 22 Jun 2006 22:18:13 +0100 [ARM] 3613/1: S3C2410: Add sysdev and sysclass Patch from Ben Dooks The S3C2440 and S3C2442 both have their own sysdev and sysclass for differentiating them from the currently default S3C2410. Add a sysdev for the S3C2410 as part of the work to make the code be non-dependant on the S3C2410. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0dad31d2da706ef114bc5c21123123be2f405d5b tree 83082c94a5c6fada0827cbaf98cc9d3cd44aca2c parent 607c0fbee7272be4d5455d6b29f6ffb092573eff author Jaroslav Kysela Thu, 22 Jun 2006 21:35:11 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:35:11 +0200 [ALSA] version 1.0.12rc1 commit 607c0fbee7272be4d5455d6b29f6ffb092573eff tree 1fbb30f4997ef7c50de8ec07590af31dcf3c1dd2 parent 5885492ab4fb18c155000d12f920754f7f35fbab author Jaroslav Kysela Thu, 22 Jun 2006 17:49:58 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:44 +0200 [ALSA] aoa driver - Kconfig - remove spaces for SND!=n Signed-off-by: Jaroslav Kysela commit 5885492ab4fb18c155000d12f920754f7f35fbab tree 7dbb41d41ebc7ec3f5240e2d44e5f17c20f0476a parent 45df379798b5c3b2ea937735ef04c58ce0f532a7 author Takashi Iwai Wed, 21 Jun 2006 19:19:25 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:43 +0200 [ALSA] hda-codec - Show EAPD and pin-detection capabilities in proc Show EAPD and pin-detection capabilities in proc files. They are often required to support the proper audio functionality. Signed-off-by: Takashi Iwai commit 45df379798b5c3b2ea937735ef04c58ce0f532a7 tree 3deab42967800920543f7d6d3dfdae2cdda595cd parent 555fdc2e9fb2071fdd10ff1d86b8d63265d80241 author Takashi Iwai Wed, 21 Jun 2006 16:37:54 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:42 +0200 [ALSA] Remove nested mutexes in seq_ports.c Removed nested mutexes in the removal routine of port connections. The port is guaranteed to be offline before calling it, so no mutex is needed. Signed-off-by: Takashi Iwai commit 555fdc2e9fb2071fdd10ff1d86b8d63265d80241 tree f29396055538d16fcaef1c728c1152ffeef00f0b parent 55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125 author Takashi Iwai Wed, 21 Jun 2006 16:23:31 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:41 +0200 [ALSA] Remove ppc/toonie.c Remove obsoleted ppc/toonie.c. The function is replaced with new snd-aoa driver. Signed-off-by: Takashi Iwai commit 55c385ad5e1f3cda887cd6a8ad69a6d74b4b9125 tree a15a2e0134adae10e76eca5434be29a0115011a0 parent f3d9478b2ce468c3115b02ecae7e975990697f15 author Johannes Berg Wed, 21 Jun 2006 15:43:44 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:39 +0200 [ALSA] snd-powermac: no longer handle anything with a layout-id property This patch removes from snd-powermac the code that check for the layout-id and instead adds code that makes it refuse loading when a layout-id property is present, nothing that snd-aoa should be used. It also removes the 'toonie' codec from snd-powermac which was only ever used on the mac mini which has a layout-id property. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai commit f3d9478b2ce468c3115b02ecae7e975990697f15 tree 8397671cbf251c54bf539016468164e08d0c45ee parent 41f0cd3a0c4c6547860cf3b1c2d7968008e6c071 author Johannes Berg Wed, 21 Jun 2006 15:42:43 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:38 +0200 [ALSA] snd-aoa: add snd-aoa This large patch adds all of snd-aoa. Consisting of many modules, it currently replaces snd-powermac for all layout-id based machines and handles many more (for example new powerbooks and powermacs with digital output that previously couldn't be used at all). It also has support for all layout-IDs that Apple has (judging from their Info.plist file) but not all are tested. The driver currently has 2 known regressions over snd-powermac: * it doesn't handle powermac 7,2 and 7,3 * it doesn't have a DRC control on snapper-based machines I will fix those during the 2.6.18 development cycle. Signed-off-by: Johannes Berg Signed-off-by: Takashi Iwai commit 41f0cd3a0c4c6547860cf3b1c2d7968008e6c071 tree e67dac0f4844d03fa243398696ce00fa09f7bf2c parent 6dac9a65f05600bc29316e3cf3365236efe69041 author Takashi Iwai Wed, 21 Jun 2006 12:14:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:34 +0200 [ALSA] hda-codec - Use 3stack model for ASUS P5RD2-VM / P5GPL-X SE Use 3stack model as default for ASUS P5RD2-VM and P5GPL-X SE boards with AD1986A codec (ALSA bug#2103). Signed-off-by: Takashi Iwai commit 6dac9a65f05600bc29316e3cf3365236efe69041 tree 992d3f9c3f9b8a778ab2647f034ecfa8efd3d08e parent c4a87ef4de9860d00460dce30776f7cc17e77459 author Daniel T Chen Wed, 21 Jun 2006 08:51:07 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:32 +0200 [ALSA] HDA - Lenovo 3000 N100-07684JU - enable laptop-eapd by default Justin Sunseri reports that sound is audible on his Lenovo 3000 N100-07684JU by passing 'model=laptop-eapd' to modprobe, so this patch adds the pci ids for his sound device to patch_analog.c . This commit closes LP#39517. Alexey Parshin also confirmed the fix at http://bugs.gentoo.org/137245 TODO: Mute onboard speakers when device is plugged into the headphone jack. Muting the 'External Amplifier' mixer element while a device is plugged into the headphone jack allows sound to be played only from the headphone jack. From: Daniel T Chen Signed-off-by: Daniel T Chen Signed-off-by: Daniel Drake Signed-off-by: Jaroslav Kysela commit c4a87ef4de9860d00460dce30776f7cc17e77459 tree 3cb5fc7db428e75e1c8545f890d76b11390465a2 parent 1561f09a2f91bc258a72225f919807c9e51c8290 author Ben Williamson Mon, 19 Jun 2006 17:20:09 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:31 +0200 [ALSA] USB midi: Remove duplicate CS_AUDIO_* #defines Removed the CS_AUDIO_* #defines, which were duplicates of the class-specific USB_DT_CS_* #defines in . Signed-off-by: Ben Williamson Signed-off-by: Takashi Iwai commit 1561f09a2f91bc258a72225f919807c9e51c8290 tree f045d98be38fd0a113b7f48c970ae66b26d26839 parent 1459c7849ea24fd71e4d2e678caa1cc3fef754e2 author Jaya Kumar Mon, 19 Jun 2006 15:06:14 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:30 +0200 [ALSA] AD1888 suspend/resume fix This patch adds a write to an undocumented register, 0x60 Extended Codec Register Page in the AD1888 codec. It is neccessary in order to make suspend/resume work with the AD1888. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai commit 1459c7849ea24fd71e4d2e678caa1cc3fef754e2 tree 9faaca96c655768056850706a82ac5bb4ffc1f80 parent 396f739e21f3b7ea9ece08bf0abf0a45693c3047 author Rodolfo Giometti Mon, 19 Jun 2006 15:04:54 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:29 +0200 [ALSA] Disable AC97 AUX and VIDEO controls for WM9705 touchscreen This patch by Rodolfo Giometti disables the AC97 AUX and VIDEO controls on the WM9705 when the touchscreen is selected as the AUX and VIDEO lines are shared with the touch controller. Changes:- o Added AC97_HAS_NO_AUX flag o Test for AC97_HAS_NO_AUX flag in snd_ac97_mixer_build() o Sets AC97_HAS_NO_VIDEO and AC97_HAS_NO_AUX in patch_wolfson05() when WM9705 touch driver is selected. Signed-off-by: Rodolfo Giometti Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai commit 396f739e21f3b7ea9ece08bf0abf0a45693c3047 tree 37c7c55a90858c49b9be9d311e457af938cbaf81 parent d4199f01750f3fa6a5b8bacdac9bd0051fee95ef author Karsten Wiese Mon, 19 Jun 2006 13:22:52 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:27 +0200 [ALSA] via82xx - Default to variable samplerate enabled for MSI K8T Neo2-FI Default to variable samplerate enabled for MSI K8T Neo2-FI No crackles here with 44100. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai commit d4199f01750f3fa6a5b8bacdac9bd0051fee95ef tree 0230ed321fe62b22646c94b175ede789e7e3fcf0 parent 1781a9af1d95256ed45abac4b0b87f48f64b9b87 author Daniel T Chen Fri, 16 Jun 2006 16:21:54 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:26 +0200 [ALSA] Add hp_only quirk for pci id [161f:2032] to via82xx http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=eae2cc78de39502595f67b7fc1f821f5963bb8ae UpstreamStatus: Not merged Christian Bjalevik reports in LP#38546 that his sound chipset requires the 'hp_only' quirk to allow him to control sound volume correctly when headphones are inserted. This patch adds the appropriate pci id to the via82xx ALSA driver so that the quirk is applied automatically, thereby removing the need for users to modify /etc/modprobe.d/alsa-base (or to unload and reload snd-via82xx with ac97_quirk=hp_only). This patch closes LP#38546. Signed-off-by: Daniel T Chen Signed-off-by: Ben Collins Signed-off-by: Takashi Iwai commit 1781a9af1d95256ed45abac4b0b87f48f64b9b87 tree 793af6d1aab74b41c6db1b893d2e59a906d43fcb parent 40a4f7a014339712a9f81b5fad99558611e99ca1 author Daniel T Chen Fri, 16 Jun 2006 12:13:00 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:25 +0200 [ALSA] sound/pci/: Add hp_only quirk for Dell D800 laptops http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=9ad787cd9670c3f3b8f3db235e84baf00a2ea526 Anders Ostling comments in Malone #41015 that his Dell D800 laptop's volume control works correctly when the hp_only quirk is passed to modprobe. This commit adds his hardware's sub{vendor,device} ids to the quirk list for the intel8x0 driver. Signed-off-by: Daniel T Chen Signed-off-by: Ben Collins Signed-off-by: Takashi Iwai commit 40a4f7a014339712a9f81b5fad99558611e99ca1 tree 95fb440b2ea037f265ef5d9c384548f11df881b3 parent 63eb1e4bd2975f1d1102c1f44e4fd6fcd76f7792 author Jaya Kumar Tue, 13 Jun 2006 12:01:14 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:24 +0200 [ALSA] cs5535audio - trivial debug printk Following is a trivial patch to get more info for boards where the AC97_VENDOR_ID2 register (or others) time out. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai commit 63eb1e4bd2975f1d1102c1f44e4fd6fcd76f7792 tree 6768bcbdfba41b7e4a79f5faee5d4f117e076321 parent 6540dffa6ecfe0d99fb263548dcc4b35ccefe784 author Jesper Juhl Tue, 13 Jun 2006 11:58:12 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:22 +0200 [ALSA] fix potential NULL pointer deref in snd_sb8dsp_midi_interrupt() First testing if a pointer is NULL and if it is (or might be), proceeding with code that dereferences that same pointer is clearly a mistake. This happens in sound/isa/sb/sb8_midi.c::snd_sb8dsp_midi_interrupt() The patch below reworks the code so this unfortunate case doesn't happen. Also remove some blank comments. Found by the Coverity checker as bug #367 Patch is compile testted only due to lack of hardware. Signed-off-by: Jesper Juhl Signed-off-by: Takashi Iwai commit 6540dffa6ecfe0d99fb263548dcc4b35ccefe784 tree 45aab0273192703d269578bf35f3b9fed9ef9bcb parent 70c5acbdcc7bb1651bb166f9e4b2345759a9fb18 author Takashi Iwai Tue, 13 Jun 2006 11:57:22 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:21 +0200 [ALSA] hda-codec - Add SPDIF support to Thinkpad T/X/Z60 Added IEC958 (SPDIF) output support to Thinkpad T/X/Z60 with AD1981HD codec. The spdif jack is on docking station. Also, renamed 'IEC958 Playback Route' to 'IEC958 Playback Source' to avoid the mixer name confliction with IEC958 switch. Signed-off-by: Takashi Iwai commit 70c5acbdcc7bb1651bb166f9e4b2345759a9fb18 tree 534753139efe08d6abbf4140063a6b0a74f227e7 parent ecb594e66e740dc390a301768d89662777f1fde2 author Jaya Kumar Mon, 12 Jun 2006 10:08:02 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:20 +0200 [ALSA] ac97_codec - fix duplicate control creation in AC97 This patch conditions AC97 control creation by whether or not the codec is an AD18xx codec. This fixes the case where the default control would get created and then snd_ac97_mixer_build fails out when creation of ad18xx specific control would get attempted. This problem was found and debuged by Marcelo Tosatti. Signed-off-by: Jaya Kumar Signed-off-by: Jaroslav Kysela commit ecb594e66e740dc390a301768d89662777f1fde2 tree c5f2e55e3e0e2e9f9693e9e56ef9002b59b311c1 parent 58398895663f855aa32b440b164c426cfae4450c author Remy Bruno Mon, 12 Jun 2006 09:25:22 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:19 +0200 [ALSA] RME HDSP - fixed proc interface (missing {}) From: Remy Bruno Signed-off-by: Jaroslav Kysela commit 58398895663f855aa32b440b164c426cfae4450c tree 6102d88c3ba683f9c634c35e067114a83e5db627 parent 2e74eba3e2f000184ade92833c80e799af41c180 author James Courtier-Dutton Sat, 10 Jun 2006 09:16:49 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:18 +0200 [ALSA] snd-ca0106: Update playback to 24bit. Fix typo is comment. Signed-off-by: James Courtier-Dutton commit 2e74eba3e2f000184ade92833c80e799af41c180 tree a83010a86190b9bf57e28352898e32acb4679e33 parent 3f3488b84c261ab3cb64b9f0b9f40b61e33edb98 author Takashi Iwai Fri, 09 Jun 2006 15:28:07 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:17 +0200 [ALSA] Fix invalid __init in ALSA ISA drivers Replaced invalid __init with __devinit in snd-sbawe and snd-opl3sa2 drivers. Signed-off-by: Takashi Iwai commit 3f3488b84c261ab3cb64b9f0b9f40b61e33edb98 tree 77a233779dbbe27fc4bcbf43427f377751da31fa parent 3758d4e601552a3d9066913a31ccb8dc6a25ee69 author Randy Dunlap Thu, 08 Jun 2006 12:01:44 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:15 +0200 [ALSA] sound/vxpocket: fix printk warning Fix printk format warning: sound/pcmcia/vx/vxp_ops.c:205: warning: format '%x' expects type 'unsigned int', but argument 5 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai commit 3758d4e601552a3d9066913a31ccb8dc6a25ee69 tree 715613a222b5d6abd47973a225191eecbcf11cc4 parent 688956f23bdbfb1c3551bfafc819f989b36bb8ae author Takashi Iwai Wed, 07 Jun 2006 18:12:31 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:14 +0200 [ALSA] Remove bogus check of mmap_count in snd_pcm_release() Removed a bogus check of mmap_count in snd_pcm_release(). This is no longer true for the shared streams. Signed-off-by: Takashi Iwai commit 688956f23bdbfb1c3551bfafc819f989b36bb8ae tree ae59fdf7662b5a27c66554cbfd2b67c49fc156da parent c5533bf36b4a6629dab0e08c4951247050928853 author Takashi Iwai Tue, 06 Jun 2006 15:44:34 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:13 +0200 [ALSA] Fix races in irq handler and ioremap Call ioremap before request_irq for avoiding possible races in the irq handler. Signed-off-by: Takashi Iwai Signed-off-by: Takashi Iwai commit c5533bf36b4a6629dab0e08c4951247050928853 tree 8ce30e7534a9ca7593ae5609c687fa6a7eb8cc58 parent f8e9f340da753c021c071f318f97ac9046c1316a author Clemens Ladisch Fri, 02 Jun 2006 09:15:44 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:12 +0200 [ALSA] virmidi: revert erroneous removal of zero initialization The last patch that tried to remove zero initializations of static variables accidentally removed a not-quite-zero initialization too. Signed-off-by: Clemens Ladisch commit f8e9f340da753c021c071f318f97ac9046c1316a tree fba37355bdd2abf2a3c4a651265348a764a8456d parent a43c4d4d7326c2894be9fd04519b109c438ee78b author Takashi Iwai Thu, 01 Jun 2006 21:08:53 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:11 +0200 [ALSA] hda-codec - Add model entry for HP nx6320 Added a model entry for HP nx6320 with AD1981HD codec. It wasn't covered by the generic HP entry because of a hardware bug (the SSID is reversed). Signed-off-by: Takashi Iwai commit a43c4d4d7326c2894be9fd04519b109c438ee78b tree 58fb7d478d5f9597b1e4d8cdb4a83aa4b937d00c parent 0a50d2b2951cb7ae12726814f9a198e1c699aa0b author Takashi Iwai Thu, 01 Jun 2006 17:16:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:09 +0200 [ALSA] ac97 - Add Thinkpad T41p to AD1981 jack-sense blacklist Added Thinkpad T41p to the blacklist to disable HP/line jack-sensing with AD1981B. The jack-sensing is just harmful on this laptop. Signed-off-by: Takashi Iwai commit 0a50d2b2951cb7ae12726814f9a198e1c699aa0b tree 38197874a92ead9bf652732d2dc03ecafe3bfdaf parent f079c25ab8a7d223875c5bac9b23b484e4a18f88 author Takashi Iwai Thu, 01 Jun 2006 14:47:29 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:08 +0200 [ALSA] Fix possible races in PCI driver removal Call free_irq() before releasing others to avoid races when shared irq is issued. Signed-off-by: Takashi Iwai commit f079c25ab8a7d223875c5bac9b23b484e4a18f88 tree de5d3fbad8b2f9f7ff8b66410ab7eb7a96e63167 parent 29463dfea754b8b360f638244f002c751aaad1b0 author Takashi Iwai Thu, 01 Jun 2006 11:42:14 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:07 +0200 [ALSA] hda-intel - Fix race in remove Call iounmap after free_irq to avoid invalid accesses in the shared irq. The patch is taken from https://bugzilla.novell.com/show_bug.cgi?id=167869 Signed-off-by: Takashi Iwai commit 29463dfea754b8b360f638244f002c751aaad1b0 tree b226ad43a18494c8847812e6ed6234100b745662 parent d20cad602fc3d92902dc3b4ed252359ab05eae0f author Clemens Ladisch Thu, 01 Jun 2006 08:33:48 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:06 +0200 [ALSA] bt87x: add Voodoo TV 200 whitelist entry This adds a whitelist entry for the digital audio input of the Voodoo TV 200. Signed-off-by: Clemens Ladisch commit d20cad602fc3d92902dc3b4ed252359ab05eae0f tree b2a2c5ffd6b94317ea26a7a349d44993d95d6dce parent f26eb78fcfb5b76fbe6d3e740b6fedda611f8395 author Eric Sesterhenn Wed, 31 May 2006 11:55:17 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:05 +0200 [ALSA] NULL pointer dereference in sound/synth/emux/soundfont.c this is about coverity id #100. It seems the if statement is negated, since the else branch calls remove_info() with sflist->currsf as a parameter where it gets dereferenced. Signed-off-by: Eric Sesterhenn Signed-off-by: Takashi Iwai commit f26eb78fcfb5b76fbe6d3e740b6fedda611f8395 tree 7ce241ac9e7b765d2c75e49a9f3f92078bbb5d63 parent cf78ee2ccc96d59e602188e0e6e3fe3522b6d3f6 author Takashi Iwai Mon, 29 May 2006 19:05:28 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:04 +0200 [ALSA] cmipci - Fix a typo in 'PC Speaker Playback Switch' control Fixed a typo in 'PC Speaker Playback Switch' control name. Signed-off-by: Takashi Iwai commit cf78ee2ccc96d59e602188e0e6e3fe3522b6d3f6 tree 027aff68ac7c21c27c86ba99b43a8f2b112f79e0 parent 766a6c36f3a0b12e1c55dddc1df6673db6b22bfb author Alan Horstmann Fri, 26 May 2006 17:19:34 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:02 +0200 [ALSA] ice1712 - Set mpu401 info flags from _card_info To permit use, in ice1712, of the mpu401 info flags recently added to mpu401_uart, adds info_flags in snd_ice1712_card_info so that additional flags can be set, if desired.  'MPU401_INFO_INTEGRATED' is always set with the ice1712.  The flags are passed on to snd_mpu401_uart_new(). _INFO_OUTPUT is set for DMX6fire mpu2. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit 766a6c36f3a0b12e1c55dddc1df6673db6b22bfb tree d9691f29148696d85d40e514f22fcc7cd841acad parent c51302710546f075e65b1e70487707e8324abf2f author Takashi Iwai Fri, 26 May 2006 14:58:29 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:01 +0200 [ALSA] hda-codec - Fix model for HP dc7600 Changed the assigned model for HP dc7600 with ALC260 codec to match better with the actual I/O assignment. Patch taken from ALSA bug#2157. Signed-off-by: Takashi Iwai commit c51302710546f075e65b1e70487707e8324abf2f tree 97a25d7fd3ead411ccb8b58bdc4bcb8b3c5fd5b4 parent d5a31b8b6e79145c832d530743ca80bf5f58a965 author Takashi Iwai Tue, 23 May 2006 15:46:10 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:34:00 +0200 [ALSA] ice1724 - Add functionality for Audiotrak Prodigy 7.1 LT This patch adds support for useable front audio channels, user controllable headphone channel and optical output. From: Anho Ki Signed-off-by: Matt Taylor Signed-off-by: Takashi Iwai commit d5a31b8b6e79145c832d530743ca80bf5f58a965 tree c3e421c6284a64e538162aa68bb15c6566d9f773 parent 721b8a297279276699900a662fa8299232ebc0e8 author Takashi Iwai Tue, 23 May 2006 13:30:59 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:59 +0200 [ALSA] au88x0 - Fix 64bit address of MPU401 MMIO port Fix 64bit address of MPU401 MMIO port on au88x0 chip. Signed-off-by: Takashi Iwai commit 721b8a297279276699900a662fa8299232ebc0e8 tree 26b007f788400ab9a1ba1775954a5050baa56824 parent 302e4c2f9e2b9f07c69649782330a61c60001ac4 author Alan Horstmann Tue, 23 May 2006 13:29:51 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:57 +0200 [ALSA] ice1712 - Disable AC97 for DMX6fire Consumer AC97 is not used by the Terratec DMX6fire, but eeprom bit indicates it is; change the stored value to disable failing consumer mode. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit 302e4c2f9e2b9f07c69649782330a61c60001ac4 tree 406d44e355f502ac5e7ee584a28d725c6e7c8a94 parent 140432fd2fbe68d59fe6fcddbcd4bcd0f84e951a author Takashi Iwai Tue, 23 May 2006 13:24:30 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:56 +0200 [ALSA] Change an arugment of snd_mpu401_uart_new() to bit flags Change the 5th argument of snd_mpu401_uart_new() to bit flags instead of a boolean. The argument takes bits that consist of MPU401_INFO_XXX flags. The callers that used the value 1 there are replaced with MPU401_INFO_INTEGRATED. Signed-off-by: Takashi Iwai commit 140432fd2fbe68d59fe6fcddbcd4bcd0f84e951a tree 3c2c1d1791f0bab08146bee76e73855a6ff2699d parent c00bd74a0dd69c4b39e4d95a20253e735616bdb9 author Takashi Iwai Mon, 22 May 2006 14:31:57 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:55 +0200 [ALSA] hdsp - Fix compilation with hdsp driver built in kernel Fixed the compilation with hdsp driver built in kernel. The traditional hwdep loader is used in this case. Signed-off-by: Takashi Iwai commit c00bd74a0dd69c4b39e4d95a20253e735616bdb9 tree a47815bc259c5bc0728e29d76da19a146605bd7f parent 77389b432344c811832962ca7f8181b8b3da3449 author Takashi Iwai Fri, 19 May 2006 19:22:34 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:53 +0200 [ALSA] Fix description of cs5535audio driver in ALSA-Configuration.txt Fix the description of cs5535audio driver in ALSA-Configuraiton.txt. Now it supports only single device. Signed-off-by: Takashi Iwai commit 77389b432344c811832962ca7f8181b8b3da3449 tree 2a48b7ef7e567b35ebb58692b1517acc785f5c22 parent 2851d963e0038c53d2175970daac4217abed7af2 author Jaya Kumar Fri, 19 May 2006 12:04:22 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:52 +0200 [ALSA] Single variables for cs5535audio As per Takashi's feedback, this is a cleanup to make cs5535audio be single device per system. The diff is against 2.6.17-rc4 with Takashi's patch adding the module_params for index, id and enable. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai commit 2851d963e0038c53d2175970daac4217abed7af2 tree f70c36bfe9beeeb8b63d8d576651889c478153ce parent f8c7579051763d6be275bf88a430ffb1c5234bad author Takashi Iwai Thu, 18 May 2006 14:48:26 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:51 +0200 [ALSA] mpu401_uart - Fix coding style and code clean up - fold lines and fix spaces to follow the standard style - added some comments - moved EXPORT_SYMBOL() near the definition - some code clean up Signed-off-by: Takashi Iwai commit f8c7579051763d6be275bf88a430ffb1c5234bad tree 9575641d80d4fd42656ff686cf74914269aaa2a2 parent c77a03551b3fd8ef6434153dfadff83ae404e526 author Takashi Iwai Thu, 18 May 2006 14:47:03 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:50 +0200 [ALSA] usbaudio - Fix a typo Fix a typo introduced by the last fix. Signed-off-by: Takashi Iwai commit c77a03551b3fd8ef6434153dfadff83ae404e526 tree 71d9ca72eb3b6c0898bc4420eaf6c498522db905 parent faf8d11743961c720c85be191f8a08c00e5c5d60 author Alan Horstmann Thu, 18 May 2006 14:24:30 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:49 +0200 [ALSA] Remove ENTER_UART from au88x0 init Remove an unnecessary ENTER_UART instruction during au88x0 init as it makes the first/subsequent midi open to fail. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit faf8d11743961c720c85be191f8a08c00e5c5d60 tree c769a20e29e8fa2f43c4f01e410ed502bf9ecdef parent 474167d646cb2147b9fcd7bacf5cdf8177ed43c4 author Clemens Ladisch Thu, 18 May 2006 09:35:15 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:47 +0200 [ALSA] usb-audio: add workaround for CSR Bluetooth Headphones (Saitek A-250) Some devices don't have the required class-specific endpoint descriptors. Instead of making this case an error, this patch makes the driver guess the endpoint attributes. Signed-off-by: Clemens Ladisch commit 474167d646cb2147b9fcd7bacf5cdf8177ed43c4 tree 8b2c6b202b6f419d6e4c9db6beedf679f47b467e parent 6581f4e74d8541dd7d579f64e94822622cbb1654 author Takashi Iwai Wed, 17 May 2006 17:17:43 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:46 +0200 [ALSA] hda-codec - Fix init verbs for ALC260 hp model Use the basic init verbs for ALC260 instead of hp init verbs since hp init verbs seem incomplete and not working on some machines. Signed-off-by: Takashi Iwai commit 6581f4e74d8541dd7d579f64e94822622cbb1654 tree fa7a0609c7a3e0460e052ab54a06a6fa935c64dc parent 0fbf405c583e6ee6d7227eb938a096d0998f7e78 author Takashi Iwai Wed, 17 May 2006 17:14:51 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:45 +0200 [ALSA] Remove zero-initialization of static variables Removed zero-initializations of static variables. A tiny optimization. Signed-off-by: Takashi Iwai commit 0fbf405c583e6ee6d7227eb938a096d0998f7e78 tree 796958578b3bf9c9f0e1da0faa201cfd09fa5a3c parent 9b87819b61060a3d32d5982f5ee998c22ab8ca27 author Takashi Iwai Wed, 17 May 2006 17:10:35 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:43 +0200 [ALSA] Fix pcm-draining of capture stream in PCM middle layer Fix the draining of PCM capture stream in the PCM middle layer. snd_pcm_drain() ignored capture streams, but it should change the state to SNDRV_PCM_DRAINING. Signed-off-by: Takashi Iwai commit 9b87819b61060a3d32d5982f5ee998c22ab8ca27 tree e7141b82856df6e64a06062da505beb6b807dac6 parent 778b6e1b2da260adf3d3254aaa35bffd1eb05b42 author Takashi Iwai Wed, 17 May 2006 11:26:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:42 +0200 [ALSA] Fix description of snd-hda-intel driver in document Fixed the description of snd-hda-intel driver in ALSA-Configuration.txt document. Signed-off-by: Takashi Iwai commit 778b6e1b2da260adf3d3254aaa35bffd1eb05b42 tree e1c55390dd5fc4b791dc9c0962f1c2f721333075 parent e2f872608af7f3c00beaa61ff6037e3cc5a66cf1 author Felix Kuehling Wed, 17 May 2006 11:22:21 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:41 +0200 [ALSA] hda - Add support for the ATI RS600 HDMI audio device Add support for the ATI RS600 HDMI audio device. It has a one-stream pure digital stereo codec that isn't handled by the generic codec support. Signed-off-by: Felix Kuehling Signed-off-by: Takashi Iwai commit e2f872608af7f3c00beaa61ff6037e3cc5a66cf1 tree c14cb26532ea165169f33f19f2bcc20c6472dd97 parent 13769e3f21d6e9c59999c9bf6908278b878d05c5 author Andreas Mohr Wed, 17 May 2006 11:04:19 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:40 +0200 [ALSA] azt3328.c: use kernel coding style Scope braces were not done the One True Kernel Way. Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 13769e3f21d6e9c59999c9bf6908278b878d05c5 tree 255c4fb239afbd2f6d6f1d4ccb824c81e3d52f82 parent ca54bde3634360afecd0dada9c59399bbe88bd32 author Andreas Mohr Wed, 17 May 2006 11:03:16 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:39 +0200 [ALSA] azt3328.c: add 3D sound mixer switch/rename controls - add 3D sound pre-3D/post-3D switch, as seen in standard AC-97 - rename controls to shorter and more accurate strings Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit ca54bde3634360afecd0dada9c59399bbe88bd32 tree 217d8c5f617da88191552433be734831edb6e6ed parent 746df94898554b3d8e91d855e934852e626c701c author Andreas Mohr Wed, 17 May 2006 11:02:24 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:38 +0200 [ALSA] azt3328.c: add suspend/resume support - add suspend/resume handlers - fix problem (private_data members not set) Playing a file while suspending will resume correctly with this patch, so I assume the hardware to get fully correctly reinitialized with this patch. Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 746df94898554b3d8e91d855e934852e626c701c tree dc312e426d52804d98080af18f12f5b14010d2e5 parent 0defb2672d7cde8d048eec35c183da7b88adbd9e author Takashi Iwai Mon, 15 May 2006 19:49:05 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:37 +0200 [ALSA] Fix rwlock around snd_iprintf() in sound core Fixed rwlock around snd_iprintf() in sound core part. Replaced with mutex. Also, make mutex and flags static variables with addition of snd_card_locked() function (just for sound.c). Signed-off-by: Takashi Iwai commit 0defb2672d7cde8d048eec35c183da7b88adbd9e tree b74310bf01b6b9c117db3b89c7cc655e6fa3701b parent ed7cbe3e4175e5fe9386793fbffee786840d7e9c author Takashi Iwai Thu, 11 May 2006 18:12:23 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:35 +0200 [ALSA] hda-codec - Fix handling of capture controls on ALC882 3/6-stack models Fixed the handling of capture controls on ALC882 3/6-stack models. Now the driver checks the availability of NID 07h. Signed-off-by: Takashi Iwai commit ed7cbe3e4175e5fe9386793fbffee786840d7e9c tree 1dbae20b435a1c90e421a807e78d3c2a314cf205 parent 3206b9ca9fba8dc8d6ddd371a3ff455c67ad137f author Takashi Iwai Thu, 11 May 2006 11:30:10 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:34 +0200 [ALSA] Remove obsolete description from ALSA-Configuration.txt Remove obsolete descriptions about the dependency on CONFIG_ISA for vxpocket and pdaudiocf drivers. Signed-off-by: Takashi Iwai commit 3206b9ca9fba8dc8d6ddd371a3ff455c67ad137f tree f93c8d055685b9562873eb7ade3ed7be8e6895ba parent 2ce7fb579f842f76a0216618c105bffd334d9233 author Takashi Iwai Wed, 10 May 2006 16:33:11 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:33 +0200 [ALSA] hda-codec - Add support for Sony Vaio VGN-S3HP Added the missing support for Sony Vaio VGN-S3HP with ALC260 codec. The patch taken from ALSA bug#2101. Signed-off-by: Takashi Iwai commit 2ce7fb579f842f76a0216618c105bffd334d9233 tree e84026ba0f087b4fdad4edd10d7db5c940b28bf0 parent 62fe78e90dc25b269362034487dc450cd8453e8c author Takashi Iwai Wed, 10 May 2006 16:24:42 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:32 +0200 [ALSA] rme96 - Fix OSS full-duplex Fixed a bug in rme96 driver that the full-duplex on OSS emulation doesn't work due to the invalid period size parameter. Signed-off-by: Takashi Iwai commit 62fe78e90dc25b269362034487dc450cd8453e8c tree eebf3a6431a50c179ffd5d019666bddad4f1cb3e parent 4d1a70dad0e1c44dc0725de6de25aceead48599e author Sam Revitch Wed, 10 May 2006 15:09:17 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:31 +0200 [ALSA] hda-codec - Add support for Apple Mac Mini (early 2006) Add support for some audio quirks of the Apple Mac Mini (early 2006) Signed-off-by: Sam Revitch Signed-off-by: Takashi Iwai commit 4d1a70dad0e1c44dc0725de6de25aceead48599e tree ad34123decaef69bf00e66463911ef20bdb14c25 parent cab5c4c97a98e46359faa52e86787c1f0ccd773c author Raimonds Cicans Fri, 05 May 2006 09:49:53 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:30 +0200 [ALSA] add support for SB Live! 24-Bit External remote control This patch rewrites the remote control code to use a table for the peculiarities of the various SB models, and adds support for a third model. Signed-off-by: Raimonds Cicans Signed-off-by: Clemens Ladisch commit cab5c4c97a98e46359faa52e86787c1f0ccd773c tree 8de8992098044914809cc6ef2d9accdffc90095a parent a7306336e818fe83f08a476c91ae2616e7fb209f author Takashi Iwai Thu, 04 May 2006 14:36:08 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:29 +0200 [ALSA] cmipci - Disable integrated mpu401 as default Enable the support of mpu401 PCI port only when mpu_port=1 module option is given, i.e. disabled as default. It turned out that the check of integrated midi port isn't perfect and caused hang-ups on some boards. Signed-off-by: Takashi Iwai commit a7306336e818fe83f08a476c91ae2616e7fb209f tree 6c207d342785854d8592f4a9523847ee6d0b94c0 parent 520290e43f9880da34e542185838816c6d79a340 author Takashi Iwai Thu, 04 May 2006 11:58:43 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:28 +0200 [ALSA] Fix a typo in writing-an-alsa-driver document Fixed a typo in writing-an-alsa-driver document. Signed-off-by: Takashi Iwai commit 520290e43f9880da34e542185838816c6d79a340 tree bf98333a95a459ea41dbe05b5d56785061ae3525 parent a59524faf3a2050e14a1c9038eb006ce96025394 author Alan Horstmann Wed, 03 May 2006 17:07:29 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:26 +0200 [ALSA] au88x0 - Init before create components Change the order in vortex_probe to set the card details before creating the components, meaning for example that card->shortname is available when registering the midi port. I have also added extra to card->shortname, and a line to overwrite the midi name following snd_mpu401_uart_new. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit a59524faf3a2050e14a1c9038eb006ce96025394 tree e4af56b4c6a0a5521bfe04cafb871bdc80b5c8e9 parent a9393d70e564e4afe0333b1e26dda48af8b9305e author Matt Porter Wed, 03 May 2006 14:08:33 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:25 +0200 [ALSA] hda: add sigmatel 9227/9228/9229 ids Adds support for the 9227/9228/9229 sigmatel hda codecs. Signed-off-by: Matt Porter Signed-off-by: Takashi Iwai commit a9393d70e564e4afe0333b1e26dda48af8b9305e tree 0a90f3bd33cf4548ca4b91a930e6b67e6e5704b2 parent 1dbfd8c56bd7366d86e58b3e510a75de93e1978b author Takashi Iwai Wed, 03 May 2006 11:59:03 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:24 +0200 [ALSA] hda-codec - Fix mute switch on VAIO laptops with STAC7661 Fixed the master mute switch on VAIO laptops with STAC7661 codec chip. Signed-off-by: Takashi Iwai commit 1dbfd8c56bd7366d86e58b3e510a75de93e1978b tree 613d0c04d4994925107cf23aa222848d4c6b5ebf parent eed656493a459bbc0fdf687fa8f43f87946d8d3a author Takashi Iwai Tue, 02 May 2006 18:31:31 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:23 +0200 [ALSA] cs5535audio - Add missing module_param*() and MODULE_PARM_DESC() Added missing module_param*() and MODULE_PARM_DESC() for cs5535audio driver. Signed-off-by: Takashi Iwai commit eed656493a459bbc0fdf687fa8f43f87946d8d3a tree acdfe0117c3139dfadd0b2fcb786f5822c416ac2 parent 886da8677d2e4e942fc8984b22bfb8da45e810ec author Takashi Iwai Tue, 02 May 2006 18:22:06 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:22 +0200 [ALSA] Add a workaround for ASUS A6KM Added a workaround for ASUS A6KM board that requires EAPD rather than SPDIF-in. Signed-off-by: Takashi Iwai commit 886da8677d2e4e942fc8984b22bfb8da45e810ec tree cf5da4e27559e406d1b65a19e68ebba56c05751b parent a7b928ac5fcd8e1b5c7c69926d8845b1d0500af3 author Takashi Iwai Tue, 02 May 2006 18:17:57 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:21 +0200 [ALSA] hda-codec - Add support for LG S1 laptop Added the model entry for LG S1 laptop. Signed-off-by: Takashi Iwai commit a7b928ac5fcd8e1b5c7c69926d8845b1d0500af3 tree 8157f37993802f1defa42f2126aca29fda4dd44c parent 450047a78f3c35a905576e121abfbee2ccd45993 author Clemens Ladisch Tue, 02 May 2006 16:22:12 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:20 +0200 [ALSA] rawmidi: add get_port_info callback for sequencer information flags Add a get_port_info callback to the snd_rawmidi_global_ops structure to allow the USB MIDI driver to supply information flags for the sequencer ports created by seq_midi. Signed-off-by: Clemens Ladisch commit 450047a78f3c35a905576e121abfbee2ccd45993 tree 7788c29141fc1dac2c0cb5f2b4799b7c9231c361 parent c97f3dd85490e51ba48782dd0c063cdade352c0d author Clemens Ladisch Tue, 02 May 2006 16:08:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:18 +0200 [ALSA] add more sequencer port type information bits Add four new information flags SNDRV_SEQ_PORT_TYPE_HARDWARE, _SOFTWARE, _SYNTHESIZER, _PORT for sequencer ports. This makes it easier for apps like Rosegarden to make policy decisions based on the port type. Signed-off-by: Clemens Ladisch commit c97f3dd85490e51ba48782dd0c063cdade352c0d tree ee2dee73cf5daaabc8acebc2c78f056465d284e4 parent f4a747f155fe375231196ec3d26fcb6e3675d82f author Clemens Ladisch Tue, 02 May 2006 15:50:05 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:17 +0200 [ALSA] fix port type bits Fix the port information about non-MIDI messages that had wrong values for some OPL3 and EmuX ports. Signed-off-by: Clemens Ladisch commit f4a747f155fe375231196ec3d26fcb6e3675d82f tree 1092a52d4df60019270408f01bcafe25870fa020 parent 170a34605c14a90df5f4a78e0b4ca643be6ef8ba author Clemens Ladisch Tue, 02 May 2006 15:33:25 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:16 +0200 [ALSA] fix a wrong lock fix a typo in the info locking code Signed-off-by: Clemens Ladisch commit 170a34605c14a90df5f4a78e0b4ca643be6ef8ba tree b605cca90122ed94b5ea2b01cadebc0d0a2ca629 parent 9c323fcbc51493f79f9700cb20830d0857c72d99 author Takashi Iwai Fri, 28 Apr 2006 15:29:15 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:15 +0200 [ALSA] Fix compile warning in timer.c Fix a compile warning in timer.c due to unused variables. Signed-off-by: Takashi Iwai commit 9c323fcbc51493f79f9700cb20830d0857c72d99 tree 17e17046c0642f918b9516de8d9517914cabd0ad parent 0df63e44c3e315ec0fe427ae62558231864108bd author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:14 +0200 [ALSA] Fix mmap_count with O_APPEND opened streams Move mmap_count to snd_pcm_substream instead of runtime struct so that multiplly opened substreams via O_APPEND can be handled correctly. Signed-off-by: Takashi Iwai commit 0df63e44c3e315ec0fe427ae62558231864108bd tree 3cff6f5d5fdb7ad047a61c591d891e3ca1bc669e parent f001c3acf64b8ca18fe40af592629abb261b321e author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:13 +0200 [ALSA] Add O_APPEND flag support to PCM Added O_APPEND flag support to PCM to enable shared substreams among multiple processes. This mechanism is used by dmix and dsnoop plugins. Signed-off-by: Takashi Iwai commit f001c3acf64b8ca18fe40af592629abb261b321e tree 20eeb99fe71d2128e6dcd5cfcb16d73b6315aa81 parent d689e34b524b69c111db0b7c844d71c8e1a53b15 author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:11 +0200 [ALSA] Insert might_sleep() in snd_iprintf() Inserted might_sleep() in snd_iprintf() for sanity check. Signed-off-by: Takashi Iwai commit d689e34b524b69c111db0b7c844d71c8e1a53b15 tree a37916ba70fd8d37d14bf546a656722fb4ed79ab parent bf850204a71a97eb5a6afaf27263bb667f9cab0a author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:10 +0200 [ALSA] Remove spinlocks around proc prints Don't lock during showing proc read. snd_iprintf() might sleep. Signed-off-by: Takashi Iwai commit bf850204a71a97eb5a6afaf27263bb667f9cab0a tree 2d917d9886a3488f1524699374d546d8bf6af88e parent 7e4eeec8a30fa9e00cac67a37ca9ddf6cbdb79c4 author Takashi Iwai Fri, 28 Apr 2006 15:13:41 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:09 +0200 [ALSA] Remove unneeded read/write_size fields in proc text ops Remove unneeded read/write_size fields in proc text ops. snd_info_set_text_ops() is fixed, too. Signed-off-by: Takashi Iwai commit 7e4eeec8a30fa9e00cac67a37ca9ddf6cbdb79c4 tree 73e296c11c87e399b32aa9b7714575180bf8b39a parent 2f4ca8e5c7cf6a6f7935483d8ee4aa8b039bdd7d author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:07 +0200 [ALSA] Make buffer size of proc text interface variable Make the read/write buffer size of proc text interface variable. Signed-off-by: Takashi Iwai commit 2f4ca8e5c7cf6a6f7935483d8ee4aa8b039bdd7d tree be79b48cd1d562a17379f0b602034ecacd358446 parent e88e8ae639a4908b903d9406c54e99a729b01a28 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:06 +0200 [ALSA] Clean up ugly hacks in pcm_lib.c Clean up ugly hacks for sync with alsa-lib code in pcm_lib.c. Also, optimize snd_pcm_hw_params_choose() with a loop. Signed-off-by: Takashi Iwai commit e88e8ae639a4908b903d9406c54e99a729b01a28 tree ff49ba0d2370c3259b055986ebca6487994cf6e2 parent e5e8a1d4618595ea406336da3cdbd0c6eb6f260d author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:05 +0200 [ALSA] Move OSS-specific hw_params helper to snd-pcm-oss module Move EXPORT_SYMBOL()s to places adjacent to functions/variables. Also move OSS-specific hw_params helper functions to pcm_oss.c. Signed-off-by: Takashi Iwai commit e5e8a1d4618595ea406336da3cdbd0c6eb6f260d tree 11d27311e920b03c710b6a1305fa6ffae2cd8abe parent 57c65c116e1c03c54ac7c4bf38f2b4086d2c1a17 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:03 +0200 [ALSA] hda-codec - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 57c65c116e1c03c54ac7c4bf38f2b4086d2c1a17 tree 61e636abe458e85207ea6c4d2e1e052f8015dabc parent fa325eb3afc3cdaf7fba6ee3eaf05b243f5614a3 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:02 +0200 [ALSA] i2c - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit fa325eb3afc3cdaf7fba6ee3eaf05b243f5614a3 tree f962e3a98b87bac02d7d7d567329a0fef215836b parent 95ff17564b6db34cad0cd67678fb79174e77531e author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:01 +0200 [ALSA] vx - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 95ff17564b6db34cad0cd67678fb79174e77531e tree e1ac40bfc703e6a32c62407081e313f1b14d2d46 parent cbef55f3d8e4e7efef4703c82302a0021d781483 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:33:00 +0200 [ALSA] emux - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit cbef55f3d8e4e7efef4703c82302a0021d781483 tree 071d499c332187b622ce834a316ef6e89562f3e4 parent 2dd31deeeb238a4f40c9fc9e219dc210fcbf8765 author Takashi Iwai Fri, 28 Apr 2006 15:13:40 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:59 +0200 [ALSA] trident - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 2dd31deeeb238a4f40c9fc9e219dc210fcbf8765 tree 19156b05b4e8a6624a1d9a87cc2236db435b90b4 parent 4181e5fe4b27b0a049402a359a4a5d8b80308528 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:58 +0200 [ALSA] emu10k1 - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 4181e5fe4b27b0a049402a359a4a5d8b80308528 tree 33c17ab9c81e54edbf9fc6e4dbdbe8dead9bfc41 parent ac19e19b3664feda8040fb9fb7885183a9eb7a80 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:56 +0200 [ALSA] opl4 - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit ac19e19b3664feda8040fb9fb7885183a9eb7a80 tree 4ce2320f85f42c5aeae15dc97c3457a62d0d17ef parent 7b09679c431ba91551a90203f7e7dadbb4c26d1b author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:55 +0200 [ALSA] opl3 - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 7b09679c431ba91551a90203f7e7dadbb4c26d1b tree 9e919199a28caeb8d40ca63384c06917457ea8b0 parent 91715ed934fb645948ff17b6c20c6f7fd7688a70 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:54 +0200 [ALSA] ac97 - Move EXPORT_SYMBOL() to adjacent to each function Move EXPORT_SYMBOL() to adjacent to each exported function/variable. Signed-off-by: Takashi Iwai commit 91715ed934fb645948ff17b6c20c6f7fd7688a70 tree 74a32f914cdcb8fae864ab1b6fd64bef9ddcffdb parent c0d3fb39e9511c6fad17d059a3a50d1be33add24 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:53 +0200 [ALSA] Clean up EXPORT_SYMBOL()s in snd-seq module Move EXPORT_SYMBOL()s to places adjacent to functions/variables. Signed-off-by: Takashi Iwai commit c0d3fb39e9511c6fad17d059a3a50d1be33add24 tree aa4c22034dcd035d919002f1c146153fe828e3a6 parent 9bb22e215c28204faee73dd7ac0ad98c075d6f7b author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:52 +0200 [ALSA] Clean up EXPORT_SYMBOL()s in snd module Move EXPORT_SYMBOL()s to places adjacent to functions/variables. Signed-off-by: Takashi Iwai commit 9bb22e215c28204faee73dd7ac0ad98c075d6f7b tree aa1492c0cac206b80b5932bbb1247ea8db0771b4 parent 9ac25594e68a4b61516e7c1140d8c0f7ef449e20 author Takashi Iwai Fri, 28 Apr 2006 15:13:39 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:51 +0200 [ALSA] Clean up ugly hacks in pcm_params.h Clean up ugly hacks for sync with alsa-lib in pcm_params.h. Signed-off-by: Takashi Iwai commit 9ac25594e68a4b61516e7c1140d8c0f7ef449e20 tree 628040fb065b882191a6ff5ed7aba42ef04b99d6 parent 5e1b1518a53fc62d9f39a13819c849336c6d8dd4 author Jaya Kumar Fri, 28 Apr 2006 14:34:49 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:49 +0200 [ALSA] PM support for cs5535audio Appended is my patch adding PM support to the cs5535audio driver. I also added the ac97 quirk but it's not yet confirmed which boards need to be in the quirk list. The patch also includes some Kconfig and misc cleanup. Signed-off-by: Jaya Kumar Signed-off-by: Takashi Iwai commit 5e1b1518a53fc62d9f39a13819c849336c6d8dd4 tree 88dd70e37014986800144d1fd6705d07c8b8f94c parent 3bef229e4f13790402b1387ea8147906f217a766 author Kenneth Crudup Fri, 28 Apr 2006 13:03:48 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:48 +0200 [ALSA] hda-codec - Add support for Sony Vaio VGN-A790 laptop Added the model entry for Sony Vaio VGN-A790 laptop with ALC260 codec. From: Kenneth Crudup Signed-off-by: Takashi Iwai commit 3bef229e4f13790402b1387ea8147906f217a766 tree 27d4bac19a6b64c14886954b2da552321e7c08f0 parent 78fc030bdbbeebdea436f2b02a616d67e5f9bd9b author Alan Horstmann Wed, 26 Apr 2006 18:13:59 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:47 +0200 [ALSA] ice1712 - Provides specified midi port names instead of defaults Patch provides for the ice1712 card driver to overwrite the midi port name string given by default in mpu401_uart, with one specified in snd_ice1712_card_info. Signed-off-by: Alan Horstmann Signed-off-by: Takashi Iwai commit 78fc030bdbbeebdea436f2b02a616d67e5f9bd9b tree 1c2264a565bc9f71a2cfdfffafe8cce38082c47c parent 887709be9063d233eb5abef25aafcd94615b03f9 author Alan Horstmann Fri, 21 Apr 2006 08:39:20 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:46 +0200 [ALSA] Change seq_midi.c so client name is card, rather than port, specific Change snd_seq_midisynth_register_port() in seq_midi.c so that if a new client is created, the client name string is based on card->shortname not (port-specific) info->name. Signed-off-by: Alan Horstmann Signed-off-by: Clemens Ladisch commit 887709be9063d233eb5abef25aafcd94615b03f9 tree 4f14da2d0d5f492ac61f736eab18818b4a806ee8 parent 01686c5fce4682350849f9f2c262fcaf67ec73c3 author Takashi Iwai Tue, 18 Apr 2006 13:27:31 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:45 +0200 [ALSA] hda-codec - Fix a typo Fixed a typo of 'pci_subsystem' in the last changeset. Signed-off-by: Takashi Iwai commit 01686c5fce4682350849f9f2c262fcaf67ec73c3 tree baa73c310d68bbc12b3f212326ab3fd5003bb5e6 parent 7152447df98b3981d621224be947a2c8d77aed06 author Takashi Iwai Tue, 18 Apr 2006 12:54:11 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:44 +0200 [ALSA] hda-codec - Add Thinkpad X60/T60/Z60 support Added the support for Thinkpad X60/T60/Z60 laptops with AD1981HD codec. Signed-off-by: Takashi Iwai commit 7152447df98b3981d621224be947a2c8d77aed06 tree 33419b17c13ee13c757c2d2fff9a09d47cc01af6 parent 79ca4f3f625e14212310f953b096e2e45110ac6b author Rene Herman Thu, 13 Apr 2006 12:58:06 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:42 +0200 [ALSA] unregister platform device again if probe was unsuccessful This second one unregisters the platform device again when the probe is unsuccesful for sound/drivers, sound/arm/sa11xx-uda1341.c and sound/ppc/powermac.c. This gets them all. Signed-off-by: Rene Herman Signed-off-by: Takashi Iwai commit 79ca4f3f625e14212310f953b096e2e45110ac6b tree 04087def5cdfe7771b0369310cbdfcd4198c9811 parent d7f6f1157f73dffe0a6afd12b90557e484b7fb35 author Takashi Iwai Wed, 12 Apr 2006 12:54:55 +0200 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:41 +0200 [ALSA] vxpocket - Fix a typo Fix a typo of return value from vxpocket_config(). Signed-off-by: Takashi Iwai commit d7f6f1157f73dffe0a6afd12b90557e484b7fb35 tree 16aa60bf3e602afea7ed52c219aa7c440a5b2b55 parent be0b7b0113300c324034e94a12244c4ac3f4b354 author James Courtier-Dutton Tue, 11 Apr 2006 21:47:27 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:40 +0200 [ALSA] AC97: Correct Mic Boost label. Signed-off-by: James Courtier-Dutton commit be0b7b0113300c324034e94a12244c4ac3f4b354 tree 95409a8755e9e8e8055da964383d7f35401cfd17 parent 3969f6178b86613fd443e70d11b8848451552bdd author James Courtier-Dutton Sun, 09 Apr 2006 20:48:44 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:39 +0200 [ALSA] ca0106: Fixes MSI K8N's SB Live 24 bit, no sound from line-in. Fixed bug#1331 Signed-off-by: James Courtier-Dutton commit 3969f6178b86613fd443e70d11b8848451552bdd tree 4e7c2c81b5dbeff5b48313d0d5fc2ef5b1bda5c8 parent 21fdddea8e4cc54341d389916d0c17db8c1ca452 author James Courtier-Dutton Sun, 09 Apr 2006 17:44:13 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:38 +0200 [ALSA] Add p17v.h file. Signed-off-by: James Courtier-Dutton commit 21fdddea8e4cc54341d389916d0c17db8c1ca452 tree 9ab8e7c8e92cfc747d71907a7c9ebaa2151fcd41 parent 6129daaa0d2b84c0e376b6b17b3d3740c4d1d1ca author James Courtier-Dutton Sun, 09 Apr 2006 17:36:39 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:37 +0200 [ALSA] emu10k1: Add support for Audigy4 (not Pro) Signed-off-by: James Courtier-Dutton commit 6129daaa0d2b84c0e376b6b17b3d3740c4d1d1ca tree 8a043f22709ffa613f44a4bc1d3aeed256f488cf parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author James Courtier-Dutton Sun, 09 Apr 2006 13:01:34 +0100 committer Jaroslav Kysela Thu, 22 Jun 2006 21:32:35 +0200 [ALSA] ca0106: Add analog capture controls. Signed-off-by: James Courtier-Dutton commit c6976a4eb3c9ead165de950899b45db0840b8e30 tree 093fdb13bdef4bbd5f9b23e6f02e98ddede68ed3 parent 30841711c88dc2d9ce31bfa3fa5479aa823804cf author Andrew Morton Sun, 14 May 2006 21:43:50 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:51 -0700 [PATCH] w1: warning fix drivers/w1/w1.c:423: warning: long long unsigned int format, __u64 arg (arg 8) u64 is not, never has been and never will be "unsigned long long"! While we're there, fix up some code layout - it looks awful in an 80-col display. Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 30841711c88dc2d9ce31bfa3fa5479aa823804cf tree f06a08530d844e17925179a0703dda6fc334e5d9 parent 6a873403d387c34c4466cc81649acc8acd66874d author Evgeniy Polyakov Thu, 27 Apr 2006 19:40:27 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:51 -0700 [PATCH] w1: clean up W1_CON dependency. If w1 is not enabled, w1_con should not appear in configuration, even if no logic is turned on without w1. W1_CON should depend on W1 also. Signed-off-by: Randy Dunlap Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 6a873403d387c34c4466cc81649acc8acd66874d tree 1b449b00ef736ede8e07481909d2e333c126a01b parent f621e1c78134f7cea0d2cf2c2822c917bedec516 author Adrian Bunk Thu, 27 Apr 2006 02:29:18 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:51 -0700 [PATCH] drivers/w1/w1.c: fix a compile error From: Adrian Bunk drivers/w1/w1.c:197: error: static declaration of 'w1_bus_type' follows non-static declaration drivers/w1/w1.h:217: error: previous declaration of 'w1_bus_type' was here Signed-off-by: Adrian Bunk Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit f621e1c78134f7cea0d2cf2c2822c917bedec516 tree 4b9b30d7d708aa778a5fb0e0e7c8fe230073386f parent 70d484bff43013e9b08f5d970b1c5941e9d98e16 author Jean-Luc Leger Tue, 18 Apr 2006 21:18:20 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:51 -0700 [PATCH] W1: fix dependencies of W1_SLAVE_DS2433_CRC From: Jean-Luc Leger Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch fixes dependencies of W1_SLAVE_DS2433_CRC. Signed-off-by: Jean-Luc Leger Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 70d484bff43013e9b08f5d970b1c5941e9d98e16 tree 1d5fdc87b7cdfe45b4ae745aef0310c256bd50f7 parent 2c5bfdac33607a618d8cf1532ef235ca9eccd49e author Evgeniy Polyakov Mon, 24 Apr 2006 10:46:14 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] W1: possible cleanups This patch contains the following possible cleanups: - the following file did't #include the header with the prototypes for it's global functions: - w1_int.c - #if 0 the following unused global function: - w1_family.c: w1_family_get() - make the following needlessly global functions static: - w1_family.c: __w1_family_put() - w1_io.c: w1_delay() - w1_io.c: w1_touch_bit() - w1_io.c: w1_read_8() - remove the following unused EXPORT_SYMBOL's: - w1_family.c: w1_family_put - w1_family.c: w1_family_registered Signed-off-by: Adrian Bunk Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 2c5bfdac33607a618d8cf1532ef235ca9eccd49e tree 77786a135938d368db3d386ab864fc9d8d50c153 parent 339f07236b481371ffb4993cf309dd1f1b3382ab author Evgeniy Polyakov Tue, 04 Apr 2006 20:35:22 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] W1: cleanups Nice cleanup spotted by Adrian Bunk, which was lost due to moving to the completely new functionality. Shame-shame-shame on me. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 339f07236b481371ffb4993cf309dd1f1b3382ab tree aaa6fe54ce812ca9fcf7752664acb74d846b77fe parent abd52a13206e02537ca1dc08fc5438c7d27bdbf1 author Andrew Morton Mon, 03 Apr 2006 22:51:17 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1 exports From: Andrew Morton WARNING: "w1_read_block" [drivers/w1/slaves/w1_therm.ko] undefined! WARNING: "w1_write_8" [drivers/w1/slaves/w1_therm.ko] undefined! WARNING: "w1_reset_select_slave" [drivers/w1/slaves/w1_therm.ko] undefined! WARNING: "w1_reset_bus" [drivers/w1/slaves/w1_ds2433.ko] undefined! WARNING: "w1_write_8" [drivers/w1/slaves/w1_ds2433.ko] undefined! WARNING: "w1_read_block" [drivers/w1/slaves/w1_ds2433.ko] undefined! WARNING: "w1_write_block" [drivers/w1/slaves/w1_ds2433.ko] undefined! WARNING: "w1_reset_select_slave" [drivers/w1/slaves/w1_ds2433.ko] undefined! Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit abd52a13206e02537ca1dc08fc5438c7d27bdbf1 tree efe0ff89898aad10600d392ac727dcea9e7af322 parent 46e07f6e5eb0e465e086b8f485f4238bd453e3e9 author Evgeniy Polyakov Mon, 03 Apr 2006 12:04:27 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Use mutexes instead of semaphores. Use mutexes instead of semaphores. Patch tested on x86_64 and i386 with test bus master driver. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 46e07f6e5eb0e465e086b8f485f4238bd453e3e9 tree 3ec2810e889f2938ba6811e8c717c1cde2e69eea parent bb5427b5466782ba0bbf56a4ed752e08b65a5d08 author Evgeniy Polyakov Mon, 03 Apr 2006 12:01:12 +0400 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Make w1 connector notifications depend on connector. Make w1 connector notifications depend on connector. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit bb5427b5466782ba0bbf56a4ed752e08b65a5d08 tree e59a0c4c6fa7ede28cfc245d320dda467831ddf7 parent b6043fcab4b2b06b9fcde4c783ab253cdc2c1129 author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: netlink: Mark netlink group 1 as unused. netlink_w1 was moved to connector. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit b6043fcab4b2b06b9fcde4c783ab253cdc2c1129 tree fd89df381e6d0beabf41f11be5fdc2b7bfe941d6 parent 12003375acd879e498c6c511faf27531296f9640 author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Move w1-connector definitions into linux/include/connector.h Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 12003375acd879e498c6c511faf27531296f9640 tree f69001169d28c6e56e1a12e04420683620e31d79 parent 81f6075ebcf3b0800321b7d81e4845d6ad9566d8 author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Userspace communication protocol over connector. There are three types of messages between w1 core and userspace: 1. Events. They are generated each time new master or slave device found either due to automatic or requested search. 2. Userspace commands. Includes read/write and search/alarm search comamnds. 3. Replies to userspace commands. From: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 81f6075ebcf3b0800321b7d81e4845d6ad9566d8 tree 48eb8a7a5f96813882402a211b8db9d91d2e7af5 parent f522d2396138e68bcb9cc5650aa368a81d7f7ff0 author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Replace dscore and ds_w1_bridge with ds2490 driver. commit f522d2396138e68bcb9cc5650aa368a81d7f7ff0 tree 3446d411b996b19094856c5729725e0e43ff4b0e parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author Evgeniy Polyakov Thu, 23 Mar 2006 19:11:58 +0300 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:22:50 -0700 [PATCH] w1: Added default generic read/write operations. Special file in each w1 slave device's directory called "rw" is created each time new slave and no appropriate w1 family is registered. "rw" file supports read and write operations, which allows to perform almost any kind of operations. Each logical operation is a transaction in nature, which can contain several (two or one) low-level operations. Let's see how one can read EEPROM context: 1. one must write control buffer, i.e. buffer containing command byte and two byte address. At this step bus is reset and appropriate device is selected using either W1_SKIP_ROM or W1_MATCH_ROM command. Then provided control buffer is being written to the wire. 2. reading. This will issue reading eeprom response. It is possible that between 1. and 2. w1 master thread will reset bus for searching and slave device will be even removed, but in this case 0xff will be read, since no device was selected. Signed-off-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 4941b395b3c2635a8c16d88791a789fb6ac6be43 tree 82c06cf9135c65a6d4c48240b87df8ceb73ffa48 parent 6af586dc58820d052aa538abef4d4d15c2a9e33e author David Brownell Tue, 13 Jun 2006 09:47:27 -0700 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:36 -0700 [PATCH] I2C: I2C controllers go into right place on sysfs I2C creates some sysfs nodes in the wrong places: not as children of parent controllers, but as their peers (!). This puts them into the right place always, instead of just when the adapter is on the platform bus. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 6af586dc58820d052aa538abef4d4d15c2a9e33e tree 8ff2ba7d6fd130259e099df3771694c5961bf924 parent e1a8e913f97e36cc5a23a24a8b4717e84998f13c author Rudolf Marek Mon, 12 Jun 2006 22:00:53 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:36 -0700 [PATCH] hwmon-vid: Add support for Intel Core and Conroe This patch adds support for two new VID codes, supporting Intel mobile Core processors and new Conroe based platforms. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e1a8e913f97e36cc5a23a24a8b4717e84998f13c tree 3ee23138ab7acba7a8ceb8f38f14eecac055141e parent 060b2f5584bf3bbb0268c83c24d5a506780fb702 author Kaiwan N Billimoria Mon, 12 Jun 2006 22:00:05 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] lm70: New hardware monitoring driver This driver implements support for the National Semiconductor LM70 temperature sensor. The LM70 temperature sensor chip supports a single temperature sensor. It communicates with a host processor (or microcontroller) via an SPI/Microwire Bus interface. Communication with the LM70 is simple: when the temperature is to be sensed, the driver accesses the LM70 using SPI communication: 16 SCLK cycles comprise the MOSI/MISO loop. At the end of the transfer, the 11-bit 2's complement digital temperature (sent via the SIO line), is available in the driver for interpretation. This driver makes use of the kernel's in-core SPI support. Signed-off-by: Kaiwan N Billimoria Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 060b2f5584bf3bbb0268c83c24d5a506780fb702 tree 32d2ea5f9325a24f1e733065bd46ed7d25695f43 parent 02dd7ae2892e5ceff111d032769c78d3377df970 author Jean Delvare Mon, 12 Jun 2006 21:55:28 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] hwmon: Fix the Kconfig header Hardware monitoring chips don't have to be on the I2C bus. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 02dd7ae2892e5ceff111d032769c78d3377df970 tree 965487234823f6d4895512d575d3f6a198182a37 parent 6dcc19dfbc84b2ea5428711b7a47146b5b1788bb author Jean Delvare Mon, 12 Jun 2006 21:53:41 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Merge setup function i2c-i801: Merge setup function Merge i801_setup into i801_probe, as it doesn't make much sense to have them split. This lets us handle errors better. Christopher Hellwig had been suggesting this back in March 2003 when the driver was merged. Also drop two useless debug messages (revision and base address can be obtained from lspci, procfs or sysfs.) Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 6dcc19dfbc84b2ea5428711b7a47146b5b1788bb tree f4f9edfc5c66a7ef586e941172c47f2482aa4508 parent 455f332323a17446fb66ea7b2f65f2751f1a3f06 author Jean Delvare Mon, 12 Jun 2006 21:53:02 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Better pci subsystem integration i2c-i801: Better pci subsystem integration Integrate the i2c-i801 driver better with the pci subsystem, by calling pci_{enable,disable}_device and requesting the I/O region by BAR rather than direct configuration space access. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 455f332323a17446fb66ea7b2f65f2751f1a3f06 tree e5e8011731dd00b41bd1dbf035bc9595afa1f114 parent 520e64d5c081c76b77b4ee87d241cd3e40edc43a author Jean Delvare Mon, 12 Jun 2006 21:52:02 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Cleanups i2c-i801: Cleanups Various cleanups to the i2c-i801 driver: * Fix documentation file and self file name references. * i801_setup can be marked __devinit. * Drop useless error local variable and label in i801_setup. * Avoid a double PCI configuration register write in some cases. * Use symbolic names for SMBHSTCFG bits. * Transmit the error code returned by i801_setup instead of forcing it to an arbitrary value. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 520e64d5c081c76b77b4ee87d241cd3e40edc43a tree 7ff6d4868a5be78b10e7a84927c18fc3c42cc538 parent d8db8f98562c1e358e42503bb920f75f15a5c6d2 author Jean Delvare Mon, 12 Jun 2006 21:51:20 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Remove PCI function check i2c-i801: Remove PCI function check Remove the PCI function number check when probing devices. This check is redundant, each function has a separate PCI device ID, so checking for that ID is sufficient. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit d8db8f98562c1e358e42503bb920f75f15a5c6d2 tree 389e113cfd07cef7e8c213a49d517bfe206aba79 parent 397e2f66a23469e2b8a13b764cb2d9ff2444ad5a author Jean Delvare Mon, 12 Jun 2006 21:50:11 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Remove force_addr parameter i2c-i801: Remove force_addr parameter Remove the force_addr module parameter. It doesn't appear to ever have been needed, and PCI resources shouldn't be arbitrarily changed anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 397e2f66a23469e2b8a13b764cb2d9ff2444ad5a tree 188283532b9ae804752b30cf8d5ac5c8739a53e2 parent 62aaa288ab0425b058fd337c5135a32e8c1aeace author Jean Delvare Mon, 12 Jun 2006 21:49:36 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] i2c-i801: Fix block transaction poll loops i2c-i801: Fix block transaction poll loops Two of the three poll loops have the poll and sleep swapped, causing an extra sleep to occur after the polled condition is fulfilled. In practice, this doubles the amount of sleep time for every block transaction. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 62aaa288ab0425b058fd337c5135a32e8c1aeace tree b189c6a1f203042910a602dd0f7d2aa96b57e544 parent 9917392608c6d8b8952bce9f7b5867b1e9149235 author Jean Delvare Mon, 12 Jun 2006 21:48:08 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] scx200_acb: Documentation update Documentation update for the scx200_acb driver. Hopefully this will help future users. References: [lm-sensors] Support of i2c-nscacb (April, May 2005) http://lists.lm-sensors.org/pipermail/lm-sensors/2005-April/011756.html http://lists.lm-sensors.org/pipermail/lm-sensors/2005-May/012043.html [lm-sensors] making a geode i2c slave driver (April 2006) http://lists.lm-sensors.org/pipermail/lm-sensors/2006-April/015998.html Kernel bug #6445 http://bugzilla.kernel.org/show_bug.cgi?id=6445 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9917392608c6d8b8952bce9f7b5867b1e9149235 tree 8a9947478ca98bba567ac55cb633a8165e095f28 parent 80cd3a8769c66203d55cdf635390bdcebd742091 author Jean Delvare Mon, 12 Jun 2006 21:46:04 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] scx200_acb: Mark scx200_acb_probe __init In i2c bus driver scx200_acb, function scx200_acb_probe can be tagged __init. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 80cd3a8769c66203d55cdf635390bdcebd742091 tree de8b6e47ffb2651dd75ddce036dee9b5732199fa parent 46f5ed753fac512f73069bd07455555b41a8a06e author Jordan Crouse Mon, 12 Jun 2006 21:44:28 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:35 -0700 [PATCH] scx200_acb: Use PCI I/O resource when appropriate On the CS5535 and CS5536, the I/O resource is allocated through PCI, so use that instead of using the MSR backdoor. Signed-off-by: Jordan Crouse Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 46f5ed753fac512f73069bd07455555b41a8a06e tree fd36fabe80349967a71efa373e2ad42c12b1af3b parent 1ded969fb97fba33e7310ef95f0b3e3123d4d92a author Krzysztof Halasa Mon, 12 Jun 2006 21:42:20 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] i2c: Mark block write buffers as const The attached patch marks i2c_smbus_write_block_data() and i2c_smbus_write_i2c_block_data() buffers as const. Signed-off-by: Krzysztof Halasa Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 1ded969fb97fba33e7310ef95f0b3e3123d4d92a tree 660ed1ca5eee779d8e03aae97324d318b2a1fa45 parent b7c066044f4355d9fbe1ac45e03303b78d21e8d4 author Peter Korsgaard Mon, 12 Jun 2006 21:40:53 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] i2c-ocores: Minor cleanups Minor cleanup to the i2c-ocores driver. Peter Korsgaard will maintain the i2c-ocores driver. Signed-off-by: Peter Korsgaard Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit b7c066044f4355d9fbe1ac45e03303b78d21e8d4 tree 4bcd5f967fcb44994eea388df23900f90fe94f0e parent a2392e0b907b9633c31be14ee75bb39fce348b01 author Hans de Goede Sun, 04 Jun 2006 20:24:11 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] abituguru: Fix fan detection One of my testers had a problem where the driver only saw 2 of the 4 fan sensors his uGuru has, this fixes this. -accept 0x40 (bit 6) being high as a valid fan sensor setting for all fans not just fan 1, I have a feeling this bit indicates whether or not a fan is actually connected . Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a2392e0b907b9633c31be14ee75bb39fce348b01 tree 7e393e1c53b7f26c87d871fd9eb401b0f4369d7d parent f2b84bbcebfdbe4855bab532909eef6621999f9f author Hans de Goede Sun, 04 Jun 2006 20:23:01 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] abituguru: Review fixes Fixes to the Abit uGuru driver as requested in review by Jean Delvare: - exactly calculate the sysfs_names array length using macro - use snprintf when generating names to double check that the sysfs_names array does not overflow. - use ARRAY_SIZE and / or defines to determine number of loops in for loops instead of using hardcoded values. - In abituguru_probe(), refactor the error path leaving a single call to kfree Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f2b84bbcebfdbe4855bab532909eef6621999f9f tree 9e0112af923b56af771708505b69e792c4bc9f2f parent bed730821b74be4c7d135098842219473f7c8f2c author Hans de Goede Sun, 04 Jun 2006 20:22:24 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] abituguru: New hardware monitoring driver New hardware monitoring driver for the Abit uGuru Signed-off-by: Hans de Goede Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit bed730821b74be4c7d135098842219473f7c8f2c tree 8cc046bc9b7415c5036322de29d754dd5bc97be5 parent 53e2761bb2e4ed58913c266ad13e8c10692aec1e author Yuan Mu Sun, 04 Jun 2006 20:18:45 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] w83792d: Add missing data access locks Add missing data lock in w83792d driver to avoid unexpected data change. Signed-off-by: Yuan Mu Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 53e2761bb2e4ed58913c266ad13e8c10692aec1e tree 163840e48c2a50f4a86f2a584cd9a697c065075a parent 3dc26c600cbae8e8e7566136148aef5667e8342b author Yuan Mu Sun, 04 Jun 2006 20:18:05 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] w83792d: Fix setting the PWM value W83792D use pwm register low 4 bits to store PWM/DC value, bit 7 is used to store fan PWM/DC mode. The store_pwm function did not convert the pwm input correctly, so it may change the fan mode when new value is set. This fix the problem. Change the "index" value of pwm*_mode and pwm* SENSOR_ATTR to simplify code. Signed-off-by: Yuan Mu Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 3dc26c600cbae8e8e7566136148aef5667e8342b tree 829ce9884acbf5eed5f85d6d07f73511e606c2be parent 0a704681f37f8cd84fa10312728a39e9fcf2c2c5 author Jean Delvare Sun, 04 Jun 2006 20:13:01 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] hwmon: Drop some maintainers entries I no more wish to be listed as the maintainer for the smsc47m1 and w83l785ts drivers. I have no test device, and people will fallback to me as the general hardware monitoring maintainer anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0a704681f37f8cd84fa10312728a39e9fcf2c2c5 tree 167dd8974c1a8f17c661b64ef3455343dad3a6b2 parent 740e06a89fb905ee1979c57442c544afe51ed21c author Jean Delvare Sun, 04 Jun 2006 20:10:55 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:34 -0700 [PATCH] hwmon: Fix a typo in the hdaps driver Fix a typo in the hdaps driver. Signed-off-by: Jean Delvare Acked-by: Robert Love Signed-off-by: Greg Kroah-Hartman commit 740e06a89fb905ee1979c57442c544afe51ed21c tree ad50727bef11b0423afa8910555283ffd158a63c parent 057bc350992fa2ac31fcd2ff80add269bdf32a80 author Jean Delvare Mon, 05 Jun 2006 20:31:20 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] hwmon: Sysfs interface documentation update, 2 of 2, take 2 Reword and complete certain parts of the hwmon sysfs-interface documentation file. Hopefully this will make things clearer for new driver authors. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 057bc350992fa2ac31fcd2ff80add269bdf32a80 tree e07c0d21c7f8f1df8dace43004bdd2c5aa0682de parent 18f98b1e3147afdb51e545cc6ff2b016c7d088a7 author Rudolf Marek Sun, 04 Jun 2006 20:03:39 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] hwmon: Sysfs interface documentation update, 1 of 2 This patch cleans up hwmon sysfs documentation file, plus introduces the description of DC/PWM selection for fan speed control. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 18f98b1e3147afdb51e545cc6ff2b016c7d088a7 tree 5f974b01a7efadabe037ace19a0f33037d36a4b7 parent aee62305345863430a937af289b9bd080a100dac author Peter Korsgaard Sun, 04 Jun 2006 20:01:08 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] i2c: New bus driver for the OpenCores I2C controller The following patch adds support for the OpenCores I2C controller IP core (See http://www.opencores.org/projects.cgi/web/i2c/overview). Signed-off-by: Peter Korsgaard Signed-off-by: Andrew Morton Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit aee62305345863430a937af289b9bd080a100dac tree 7e145ccf7052fd298ed94b75e7f9e85a64999a53 parent 177d165d7c2ec424007d6241a93d0cb83d953c51 author Jean Delvare Sun, 04 Jun 2006 19:59:57 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] i2c: Suggest N for rare devices in Kconfig Improve the Kconfig help text of the follwing i2c drivers: * busses/i2c-pca-isa.c * chips/pcf8574.c * chips/pcf8591.c These are hard to detect and building them into the kernel results in long delays at boot. March 2006, thread "I2C_PCA_ISA causes boot delays" http://marc.theaimsgroup.com/?l=linux-kernel&m=114360399415744&w=2 April 2006, thread "i2c-related 1-minute hang during bootup" http://marc.theaimsgroup.com/?l=linux-kernel&m=114640992330721&w=2 Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 177d165d7c2ec424007d6241a93d0cb83d953c51 tree 9ebddfb4b97fae069b99d1162334a95729bf4015 parent 0d0001dd956d4ae2c8739c2877fa660eec68ed5f author Rudolf Marek Tue, 25 Apr 2006 14:24:46 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: Trim VID values to correct number of bits Following patch trims the VID value to correct number of bits for each VRM. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 0d0001dd956d4ae2c8739c2877fa660eec68ed5f tree 5990ffaa2bdd946bf3b46d26107f4c76f2d67080 parent 114cc0c0c1e98f0b8e205f91ae7b2471e0ad5325 author Jean Delvare Tue, 25 Apr 2006 14:23:01 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: Improve the help text for CONFIG_HWMON Improve the help text for CONFIG_HWMON to let the users know how they pick the right hardware monitoring driver(s) for their system. Also fix a couple typos in the related documentation file and improve some parts a bit. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 114cc0c0c1e98f0b8e205f91ae7b2471e0ad5325 tree 5231dfed0b817dca786b82ec9c1c8ac49fbc365d parent 9873964d6eb24bd0205394f9b791de9eddbcb855 author Jean Delvare Tue, 25 Apr 2006 14:22:14 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: lm83: Documentation update One more motherboard confirmed to have an LM83 temperature sensor chip. Thanks to Steven Hardy for reporting. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 9873964d6eb24bd0205394f9b791de9eddbcb855 tree b0e4a6f72f31e4a1215d2ae1e79a16d6e753f617 parent 4f507ea1560805b16cf4a4359e304ae0db0c2dcb author Charles Spirakis Tue, 25 Apr 2006 14:21:03 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: w83791d: New hardware monitoring driver for the Winbond W83791D Add support for the w83791d sensor chip. The w83791d hardware is somewhere between the w83781d and the w83792d and this driver code is derived from the code that supports those chips. Signed-off-by: Charles Spirakis Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 4f507ea1560805b16cf4a4359e304ae0db0c2dcb tree 3b94e81b46f2c42461e2aaa734783ca94940efd4 parent 5c7ae65899a4c5b05b6277f856018d1eeeb98907 author Jean Delvare Tue, 25 Apr 2006 14:20:11 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] HWMON: hdaps: Update the list of supported systems Update the list of systems supported by the hdaps driver: * Add the "ThinkPad Z60m" entry, reported by Arkadiusz Miskiewicz. * Add the "ThinkPad H" entry, reported by Frank Gevaerts for some ThinkPad R52 models (1846AQG). * Drop the "ThinkPad X41 Tablet" entry, which looks redundant to me. And a comment update for good measure. Signed-off-by: Jean Delvare Cc: Arkadiusz Miskiewicz Cc: Frank Gevaerts Signed-off-by: Greg Kroah-Hartman commit 5c7ae65899a4c5b05b6277f856018d1eeeb98907 tree e59ee9f28b3e07bdb0a0716c058cfde0fd867ee1 parent f9ba6c04ef1dcf16f7179b7883e9751baaac218e author Jean Delvare Tue, 25 Apr 2006 14:18:16 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:33 -0700 [PATCH] I2C: i2c-nforce2: Add support for the nForce4 MCP51 and MCP55 Add support for the new nForce4 MCP51 (also known as nForce 410 or 430) and nForce4 MCP55 to the i2c-nforce2 driver. Some code changes were required because the base I/O address registers have changed in these versions. Standard BARs are now being used, while the original nForce2 chips used non-standard ones. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit f9ba6c04ef1dcf16f7179b7883e9751baaac218e tree 0d66c8aab1ea1c0343744925e53f7e9111daaff0 parent 7aadb8f943f6f8fb48962099cfba05ad0518b0ac author Jean Delvare Tue, 25 Apr 2006 13:37:25 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] I2C: i2c-piix4: Document the IBM problem more clearly Properly document on which systems the i2c-piix4 SMBus driver will refuse to load. Hopefully this will make it clearer for users, which were often wondering why their destop or server systems were detected as laptops. Closes bug #6429. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 7aadb8f943f6f8fb48962099cfba05ad0518b0ac tree 7c9143af3cf47a8c5a907a32dc90b671b416ab6d parent 54aaa1ca1022d95d854315743241bb6bf59f531f author Jean Delvare Tue, 25 Apr 2006 13:29:26 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] I2C: i2c-piix4: Fix typo in documentation Fix i2c-piix4 documentation typo. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 54aaa1ca1022d95d854315743241bb6bf59f531f tree af43ffb4efb559b823b6ce6db30df3667ecfe194 parent 5e9f4f2e5a02bb6908278a819952aa31fffefaa2 author Rudolf Marek Tue, 25 Apr 2006 13:06:41 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] I2C: i2c-piix4: Remove the fix_hstcfg parameter This patch removes the fix_hstcfg option from the driver and related SMBus Interrupt Select register magic because now we know what are valid values for this register. This patch updates the documentation and adds new IRQ mode check so we are sure not to miss any new "unusual" value. The PCI quirk for users of fix_hstcfg was not developed because the chipset lacks of subsystem ID registers and DMI is stated "To be filled". Impact to existing systems is minimal because the problem showed up on motherboards like 10 years back. On the other hand users of newer Serverworks and HT1000 systems won't be misleaded by the message suggesting to try the fix_hstcfg any more. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 5e9f4f2e5a02bb6908278a819952aa31fffefaa2 tree 6f000080ee15597f9523de0e6d31b192bdb0aaec parent e931b8d8a428f87e6ea488d2fd80007bb66b3ea8 author Mark A. Greer Tue, 25 Apr 2006 13:04:54 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] I2C: m41t00: Add support for the ST M41T81 and M41T85 This patch adds support for the ST m41t81 and m41t85 i2c rtc chips to the existing m41t00 driver. Since there is no way to reliably determine what type of rtc chip is in use, the chip type is passed in via platform_data. The i2c address and square wave frequency are passed in via platform_data as well. To accommodate the use of platform_data, a new header file include/linux/m41t00.h has been added. The m41t81 and m41t85 chips halt the updating of their time registers while they are being accessed. They resume when a stop condition exists on the i2c bus or when non-time related regs are accessed. To make the best use of that facility and to make more efficient use of the i2c bus, this patch replaces multiple i2c_smbus_xxx calls with a single i2c_transfer call. Signed-off-by: Mark A. Greer Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit e931b8d8a428f87e6ea488d2fd80007bb66b3ea8 tree 709992bdc7dee30f2eefd4b8481b09cb7dc4b670 parent 02e0c5d5c2e00374b6808a42f8eea4ea9baaa216 author Mark A. Greer Fri, 31 Mar 2006 23:06:46 +0200 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] i2c: cleanup m41t00 This patch does some cleanup to the m41t00 i2c/rtc driver including: - use BCD2BIN/BIN2BCD instead of BCD_TO_BIN/BIN_TO_BCD - use strlcpy instead of strncpy - some whitespace cleanup Signed-off-by: Mark A. Greer Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 02e0c5d5c2e00374b6808a42f8eea4ea9baaa216 tree 13ab61631d66e9fe83d8abd47e774e90c90239e1 parent 400b48ecd95a7fac6b126042d37b7efe0202b582 author Rudolf Marek Thu, 23 Mar 2006 16:48:09 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] i2c-piix4: Add ATI IXP200/300/400 support This patch adds the ATI IXP southbridges support to i2c-piix4, as it turned out those chips are compatible with it. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 400b48ecd95a7fac6b126042d37b7efe0202b582 tree f0fe5c22b7f2198a952ec75b476ac7a33c515248 parent 568825c8ed3c902981ce908ed5693abb3c9ddf59 author Jean Delvare Thu, 23 Mar 2006 16:46:47 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] hwmon: Add sysfs interface for individual alarm files Extend the sysfs interface of hardware monitoring chips, by adding individual alarm and beep files. Contrary to the old aggregated "alarms" and "beeps" files, individual files constitute a standard way to access the status information, making it finally possible to implement a chip-independant hardware monitoring chip access library (once all drivers have been added this new interface, that is.) If future drivers need more individual files, the interface will be extended as needed at the same time these drivers are merged into the kernel tree. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 568825c8ed3c902981ce908ed5693abb3c9ddf59 tree 29d37359823ea8439f5b51bf9632d31440a9f559 parent 59ac83677f72ea2cc25b5426e7df9589aa7a5384 author Jean Delvare Thu, 23 Mar 2006 16:40:23 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] f71805f: Resource needs not be global The F71805F I/O resource structure needs not be a global variable, as the platform core allocs its own copy of it anyway. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 59ac83677f72ea2cc25b5426e7df9589aa7a5384 tree a15039b9744a87832af8efa048cc9d229440aa97 parent a4589dbb4e2dc758d1aadb8b5d7e5a598ccb0341 author Hartmut Rick Thu, 23 Mar 2006 16:37:23 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] smsc47m192: New hwmon driver for SMSC LPC47M192/997 New driver (smsc47m192) which supports voltage and temperature measurement features of SMSC LPC47M192 and LPC47M997 chips. Signed-off-by: Hartmut Rick Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit a4589dbb4e2dc758d1aadb8b5d7e5a598ccb0341 tree 48f9807a0e1c237afbfd1661a203eea5b4236fba parent cf0676fe42c8e14c4c7ed5895e2fe5d17f779b43 author Jean Delvare Thu, 23 Mar 2006 16:30:29 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:32 -0700 [PATCH] w83627ehf: Add alarms support Add alarms support for the W83627EHF/EHG hardware monitoring chip. This is based on an earlier patch from Rudolf Marek. Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit cf0676fe42c8e14c4c7ed5895e2fe5d17f779b43 tree ff201260e2a0979471c60ca440e6eedbe87ee27f parent 43cb7ebee2f478d3f987ad773d4e6b07fc23c631 author Rudolf Marek Thu, 23 Mar 2006 16:25:22 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:31 -0700 [PATCH] w83627ehf: Add voltage inputs support Add the voltage measuring support to W83627EHF. The code is based on the patch provided by Yuan Mu from Winbond. Signed-off-by: Yuan Mu Signed-off-by: Rudolf Marek Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 43cb7ebee2f478d3f987ad773d4e6b07fc23c631 tree f862838ccb28af35ba9e1951a26ba9fb4b99b0e3 parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author Jordan Crouse Thu, 23 Mar 2006 16:19:49 +0100 committer Greg Kroah-Hartman Thu, 22 Jun 2006 11:10:31 -0700 [PATCH] lm83: Add LM82 support Add LM82 temperature sensor support (similar to the LM83, but less featureful). Signed-off-by: Jordan Crouse Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman commit 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0 tree cb2efd2684f74cfaa5f354f34acb77a13ee01811 parent 8b76a68c6caafef5a91cdc80958aecaca76a8896 author Uli Luckas Thu, 22 Jun 2006 16:49:54 +0100 committer Russell King Thu, 22 Jun 2006 16:49:54 +0100 [ARM] 3624/1: Report true modem control line states Patch from Uli Luckas This patch removes the fake return from serial_pxa_get_mctrl. Signed-off-by: Uli Luckas I just can't remember why this return was there. Being in the first column clearly indicates it was meant to be removed. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 8b76a68c6caafef5a91cdc80958aecaca76a8896 tree f22a684595267ee6b087381a00a543f46482c8a1 parent 744da2cb598639767ddcc90ca855771bc524fe76 author Lennert Buytenhek Thu, 22 Jun 2006 10:30:56 +0100 committer Russell King Thu, 22 Jun 2006 10:30:56 +0100 [ARM] 3620/2: ixp23xx: add uengine loader support Patch from Lennert Buytenhek This patch allows the ixp2000 uengine loader that is already in the tree to also be used on the ixp23xx. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 744da2cb598639767ddcc90ca855771bc524fe76 tree f84303b5b6ef0f239f0112b22b61bc167c84fe0d parent a059e33ce67cec5e990fdec43f242d3b06c60d1a author Lennert Buytenhek Thu, 22 Jun 2006 10:30:55 +0100 committer Russell King Thu, 22 Jun 2006 10:30:55 +0100 [ARM] 3618/1: add defconfig for logicpd pxa270 card engine Patch from Lennert Buytenhek As it's slightly nontrivial to make it possible to build a single kernel image for both the mainstone and the logicpd pxa270 card engine, add a separate defconfig for the logicpd pxa270 card engine for now. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit a059e33ce67cec5e990fdec43f242d3b06c60d1a tree 6ce83ae735281ab2e6ee891b2e06e965cd65c3be parent f869afab8f36c5f8561557f74b4b9846719092da author Lennert Buytenhek Thu, 22 Jun 2006 10:30:54 +0100 committer Russell King Thu, 22 Jun 2006 10:30:54 +0100 [ARM] 3617/1: ep93xx: fix slightly incorrect timer tick rate Patch from Lennert Buytenhek The tick rate of timers 1-3 isn't exactly 508 kHz as some parts of the relevant documentation claim, but more like 508.469 kHz (14.7456 MHz divided by 29.) Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit f869afab8f36c5f8561557f74b4b9846719092da tree 6a23d7981a3b06b9cd40ad99c1543d22f6a1d528 parent 84b61f6d3ad8a5761e61d83076588f64a289a574 author Lennert Buytenhek Thu, 22 Jun 2006 10:30:53 +0100 committer Russell King Thu, 22 Jun 2006 10:30:53 +0100 [ARM] 3616/1: fix timer handler wrap logic for a number of platforms Patch from Lennert Buytenhek A couple of platforms aren't using the right comparison type in their timer interrupt handlers (as we're comparing two wrapping timestamps, we need a bmi/bpl-type comparison, not an unsigned comparison) -- this patch fixes them up. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 84b61f6d3ad8a5761e61d83076588f64a289a574 tree 1a36155da857eedbd9834abc5d12f94cff6b9614 parent 0967b5f0790cff737c86e9797cbbbdf420eb00f3 author Lennert Buytenhek Thu, 22 Jun 2006 10:30:52 +0100 committer Russell King Thu, 22 Jun 2006 10:30:52 +0100 [ARM] 3615/1: ixp23xx: use platform devices for physmap flash Patch from Lennert Buytenhek Now that the physmap platform device rewrite is in, make the ixp23xx boards use platform devices for physmap flash. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 0967b5f0790cff737c86e9797cbbbdf420eb00f3 tree 9b9234f6fc133ad75c2a40779a89e87b99e8f1d3 parent ae2a120ce50e9dc8092f9bd4d76d8c8150a12c48 author Lennert Buytenhek Thu, 22 Jun 2006 10:30:51 +0100 committer Russell King Thu, 22 Jun 2006 10:30:51 +0100 [ARM] 3614/1: ep93xx: use platform devices for physmap flash Patch from Lennert Buytenhek Now that the physmap platform device rewrite is in, make the ep93xx boards use platform devices for physmap flash. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit ae2a120ce50e9dc8092f9bd4d76d8c8150a12c48 tree 10fd1a5d5cade798d95e28f8ce311a07d75be0b4 parent b741483d7d8d86d215daf2a1f77bc3d3770746a6 author Vitaly Wool Thu, 22 Jun 2006 10:27:15 +0100 committer Russell King Thu, 22 Jun 2006 10:27:15 +0100 [ARM] 3621/1: fix compilation breakage for pnx4008 Patch from Vitaly Wool pnx4008_defconfig fails to build: include/asm/hardware/debug-8250.S: Assembler messages: include/asm/hardware/debug-8250.S:12: Error: Macro with this name was already defined. This is due to senduart macro erroneously defined in include/asm-arm/arch-pnx4008/debug-macro.S. This patch removes it from that file. Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit b741483d7d8d86d215daf2a1f77bc3d3770746a6 tree 436e643627f06cdc8bc1765ece01673c5e52e899 parent e9931b5da6247c18cbf4db8e9e924c980758f41a author Vitaly Wool Thu, 22 Jun 2006 10:26:21 +0100 committer Russell King Thu, 22 Jun 2006 10:26:21 +0100 [ARM] 3623/1: pnx4008: move GPIO-related defines to gpio.h Patch from Vitaly Wool This patch moves GPIO-related defines and static inline funcs from include/asm-arm/arch-pnx4008/pm.h to include/asm-arm/arch-pnx4008/gpio.h. Also, some more GPIO-related defines are added to include/asm-arm/arch-pnx4008/gpio.h as they are needed for the USB host driver (coming soon...) Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit e9931b5da6247c18cbf4db8e9e924c980758f41a tree c82648c1bc484a738c695bf88831083777534ccf parent 1a6be26d5b1a86f66ef60e5b73bae64d50873724 author Vitaly Wool Thu, 22 Jun 2006 10:26:20 +0100 committer Russell King Thu, 22 Jun 2006 10:26:20 +0100 [ARM] 3622/1: pnx4008: remove clk_use/clk_unuse Patch from Vitaly Wool clk_use/clk_unuse functions are no longer needed, so removing those from arch/arm/mach-pnx4008/clock.c. Also, the order of functions is rearranged a bit, to avoid forward declarations. Signed-off-by: Vitaly Wool Signed-off-by: Russell King commit 1a6be26d5b1a86f66ef60e5b73bae64d50873724 tree c56cc8ed28d9d9dc062043a0a7862e1692908770 parent d6551e884cf66de072b81f8b6d23259462c40baf author Russell King Wed, 21 Jun 2006 13:51:41 +0100 committer Russell King Thu, 22 Jun 2006 10:24:24 +0100 [ARM] Enable VFP to be built when non-VFP capable CPUs are selected Since we pass flags to the compiler to control code generation based on the least capable selected CPU, if we want to include VFP support, we must tweak the assembler flags to allow the VFP instructions. Moreover, we must not use the mrrc/mcrr versions since these will not be recognised by the assembler. We do not convert all instructions to the VFP-equivalent (yet) since binutils appears to barf on "fmrx rn, fpinst" and doesn't provide any other way (other than using the mrc equivalent) to encode this instruction - which is rather a problem when you have a VFP implementation which requires these instructions. Signed-off-by: Russell King commit d6551e884cf66de072b81f8b6d23259462c40baf tree fd8af193bd045e4b16ce911d392d7ffd109d7284 parent 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f author Russell King Wed, 21 Jun 2006 13:31:52 +0100 committer Russell King Thu, 22 Jun 2006 10:24:18 +0100 [ARM] Add thread_notify infrastructure Some machine classes need to allow VFP support to be built into the kernel, but still allow the kernel to run even though VFP isn't present. Unfortunately, the kernel hard-codes VFP instructions into the thread switch, which prevents this being run-time selectable. Solve this by introducing a notifier which things such as VFP can hook into to be informed of events which affect the VFP subsystem (eg, creation and destruction of threads, switches between threads.) Signed-off-by: Russell King commit 52ab3f3dc711eeccbfbcc5d4f5c5d9b9ff59650f tree f6fa8468885835152f131e3abc094da369d15669 parent 43104f1da88f5335e9a45695df92a735ad550dda parent 98174e46974323e4941c72e46345f7277755e146 author Linus Torvalds Wed, 21 Jun 2006 18:10:19 -0700 committer Linus Torvalds Wed, 21 Jun 2006 18:10:19 -0700 Merge git://oss.sgi.com:8090/xfs-2.6 * git://oss.sgi.com:8090/xfs-2.6: (43 commits) [XFS] Remove files from the build that are now unused. [XFS] Fix a Makefile issue related to exports.o handling. [XFS] Remove version 1 directory code. Never functioned on Linux, just [XFS] Map EFSCORRUPTED to an actual error code, not just a made up one [XFS] Kill direct access to ->count in valusema(); all we ever use it for [XFS] Remove unneeded conditional code on NFS export interface related [XFS] Remove an incorrect use of unlikely() on a relatively likely code [XFS] Push some common code out of write path into core XFS code for [XFS] Remove unnecessary local from open_exec dmapi path. [XFS] Minor XFS documentation updates. [XFS] Fix broken const use inside local suffix_strtoul routine. [XFS] Fix nused counter. It's currently getting set to -1 rather than [XFS] Fix mismerge of the fs_writable cleanup patch causing a freeze/thaw [XFS] Fix up debug code so that bulkstat wont generate thousands of [XFS] Remove unused parameter from di2xflags routine. [XFS] Cleanup a missed porting conversion, and freezing. [XFS] Resolve a namespace collision on remaining vtypes for FreeBSD [XFS] Resolve a namespace collision on vnode/vnodeops for FreeBSD porters. [XFS] Resolve a namespace collision on vfs/vfsops for FreeBSD porters. [XFS] statvfs component of directory/project quota support, code ... commit 4ec223d02f4d5f5a3129edc0e3d22550d6ac8a32 tree 753cec643fa59ccda64a95fa5436956e481c1137 parent 9ed059e1551bf36092215b965838502ac21f42e4 author Venkatesh Pallipadi Wed, 21 Jun 2006 15:18:34 -0700 committer Dave Jones Wed, 21 Jun 2006 18:30:26 -0400 [CPUFREQ] Fix ondemand vs suspend deadlock Rootcaused the bug to a deadlock in cpufreq and ondemand. Due to non-existent ordering between cpu_hotplug lock and dbs_mutex. Basically a race condition between cpu_down() and do_dbs_timer(). cpu_down() flow: * cpu_down() call for CPU 1 * Takes hot plug lock * Calls pre down notifier * cpufreq notifier handler calls cpufreq_driver_target() which takes cpu_hotplug lock again. OK as cpu_hotplug lock is recursive in same process context * CPU 1 goes down * Calls post down notifier * cpufreq notifier handler calls ondemand event stop which takes dbs_mutex So, cpu_hotplug lock is taken before dbs_mutex in this flow. do_dbs_timer is triggerred by a periodic timer event. It first takes dbs_mutex and then takes cpu_hotplug lock in cpufreq_driver_target(). Note the reverse order here compared to above. So, if this timer event happens at right moment during cpu_down, system will deadlok. Attached patch fixes the issue for both ondemand and conservative. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Dave Jones commit 43104f1da88f5335e9a45695df92a735ad550dda tree 465c6e7a3bcc68cebf4b29f32c3574454cf98323 parent bd00949647ddcea47ce4ea8bb2cfcfc98ebf9f2a author Greg Kroah-Hartman Tue, 20 Jun 2006 15:14:07 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: only make /sys/class/usb show up when there is something in it Now /sys/class/usb is dynamically created when we have something to put in it, and removed when all devices go away. Just trying to cut down on the clutter in sysfs... Signed-off-by: Greg Kroah-Hartman commit bd00949647ddcea47ce4ea8bb2cfcfc98ebf9f2a tree 89086a5b63caf798086efbe7d3bb1094c8fa4d38 parent c182274ffe1277f4e7c564719a696a37cacf74ea author Greg Kroah-Hartman Tue, 20 Jun 2006 13:09:50 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: convert usb class devices to real devices Signed-off-by: Greg Kroah-Hartman commit c182274ffe1277f4e7c564719a696a37cacf74ea tree 0e9df4d75ff12dcefad3058b3509b2f2b09202bc parent 9bde7497e0b54178c317fac47a18be7f948dd471 author Greg Kroah-Hartman Mon, 19 Jun 2006 23:59:31 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: move usb_device_class class devices to be real devices This moves the usb class devices that control the usbfs nodes to show up in the proper place in the larger device tree. No userspace changes is needed, this is compatible due to the symlinks generated by the driver core. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 9bde7497e0b54178c317fac47a18be7f948dd471 tree 395a1c86801a1ba1bd04a007ffac3c5a73d9f27d parent 36679ea59846d8f34a48f71ca1a37671ca0ad3c5 author Greg Kroah-Hartman Wed, 14 Jun 2006 12:14:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: make endpoints real struct devices This will allow for us to give endpoints a major/minor to create a "usbfs2-like" way to access endpoints directly from userspace in an easier manner than the current usbfs provides us. Signed-off-by: Greg Kroah-Hartman commit 36679ea59846d8f34a48f71ca1a37671ca0ad3c5 tree 3483f57f83dc5af39c773246255c85954ff4b67f parent 84412f6291b50690febd81899e46f0f0ef7a13e0 author Greg Kroah-Hartman Wed, 14 Jun 2006 12:14:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:19 -0700 [PATCH] USB: make usb_create_ep_files take a struct device Instead of a kobject, will make things easier in the future (don't know what I was thinking when I did this originally...) Signed-off-by: Greg Kroah-Hartman commit 84412f6291b50690febd81899e46f0f0ef7a13e0 tree d13850f546c4d3a7a8ff561982145325336e4167 parent ae0dadcf0f912cbab2ac84caa437454620bf71b2 author Greg Kroah-Hartman Wed, 14 Jun 2006 12:14:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: move the endpoint specific sysfs code to it's own file This makes it easier to modify in the future without touching anything else. Signed-off-by: Greg Kroah-Hartman commit ae0dadcf0f912cbab2ac84caa437454620bf71b2 tree 8ad54ef4ddb8615256ee71196cbfca912e647a5c parent 325a4af60dc945bf2da9cbcdbabb276e312b297c author David Brownell Tue, 13 Jun 2006 10:04:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: move to Move to and remove some redundant includes. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 325a4af60dc945bf2da9cbcdbabb276e312b297c tree 05a6eeaf6c820485a011b3bcd40070c38b753abd parent a8c28f2389942bab376e39351d27525499630248 author David Brownell Tue, 13 Jun 2006 09:59:32 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: move hardware-specific to This moves header files for controller-specific platform data from to to start reducing some clutter. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit a8c28f2389942bab376e39351d27525499630248 tree a1e8aaa3eefbf2730a06e7ca16084d8ad7c94d90 parent 7e27f18c8a37ffb95f677e4e9c3cca818a3e9eb1 author David Brownell Tue, 13 Jun 2006 09:57:47 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: move to This moves to to reduce some of the clutter of usb header files. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7e27f18c8a37ffb95f677e4e9c3cca818a3e9eb1 tree 24bbec7b9e3bd8e2642471e9ee9bd1e45c992e71 parent d5681fe8110e1169902df37a8fd8bd01c2b7810e author David Brownell Tue, 13 Jun 2006 09:54:40 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: whitespace removal from usb/gadget/ether This removes extraneous whitespace from the Ethernet/RNDIS gadget driver. It's all space-at-EOL, spaces-before-tabs, or tabs-then-spaces. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d5681fe8110e1169902df37a8fd8bd01c2b7810e tree 028dd32c3b35ff0bb8398361abeb1eb0512d337b parent db54a53d26322e978e66482208afabaab9cd0752 author Alan Stern Tue, 13 Jun 2006 09:59:32 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] USB: unusual_devs entry for Nokia N80 Here is a patch (as720) adding an unusual_devs entry for the Nokia N80 mobile phone. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit db54a53d26322e978e66482208afabaab9cd0752 tree 389920f93a45647fec5f90eb27e75213c27934f9 parent 043ea18b2e145c4c9cb3c30757a65fe0f1678a35 author Luiz Fernando N. Capitulino Mon, 12 Jun 2006 22:46:20 -0300 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] usbserial: Fixes wrong return values. Some usbserial functions returns -EINVAL if the port doesn't exist or if it's not opened. However, the right error code for such situations is -ENODEV. Signed-off-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 043ea18b2e145c4c9cb3c30757a65fe0f1678a35 tree 8d5faa202172a6b13bb4ebd4682ff822454b7963 parent 44df45a09c7c20bbd641b1c30b6406d54ba7e2c8 author Milan Svoboda Mon, 29 May 2006 03:34:00 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] usb gadget: update pxa2xx_udc.c driver to fully support IXP4xx platform This patch adds IXP465 into the list of known devices and adds IXP425 and IXP465 to the list of devices that have cfr. This is not described in the hardware documentation, but without it driver won't work. Workaround (#if 1) that seemed to get rid of lost status irqs is disabled for IXP4XX as it caused freezes during testing of control messages. No lost irqs are visible on IXP4XX. Driver survived tests running over night without any visible problems. Signed-off-by: Milan Svoboda Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 44df45a09c7c20bbd641b1c30b6406d54ba7e2c8 tree c0693d486a8b73eb64c6f281d8fd8718084c2db8 parent 7c0642c196beb41b7770571b8a61151bdd418bbe author Milan Svoboda Mon, 29 May 2006 03:34:00 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:18 -0700 [PATCH] usb gadget: fix compile errors This patch fixes compile errors when pxa2xx_udc is to be compiled for ixp4xx platform. Signed-off-by: Milan Svoboda Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 7c0642c196beb41b7770571b8a61151bdd418bbe tree 7f117d31ede4743f56d936fef1921ab814c81fe4 parent ca094f1186ef50ef8983325072cdc4f051830f13 author Milan Svoboda Mon, 29 May 2006 03:34:00 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] usb gadget: allow drivers support speeds higher than full speed This patch removes limitation which prevents use of drivers that support speeds different that full speed. Signed-off-by: Milan Svoboda Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit ca094f1186ef50ef8983325072cdc4f051830f13 tree 1613108cc900cda8d209b48a86d9d1bf66d174ad parent 943e1b4d60dc7acfabe2ebad31189bcb3b853688 author Franck Bui-Huu Wed, 14 Jun 2006 10:47:18 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: gadget-serial: do not save/restore IRQ flags in gs_close() As pointed out by David Brownell, we know that IRQs are never blocked when calling gs_close function. So the save/restore IRQ flags are pointless. Signed-off-by: Franck Bui-Huu Signed-off-by: Greg Kroah-Hartman commit 943e1b4d60dc7acfabe2ebad31189bcb3b853688 tree 3a8de95902d0f8699d0c2dd1759a1841960d1720 parent b059c81af7a1759a911cfc20ce8a4bf47c435830 author Franck Bui-Huu Wed, 14 Jun 2006 10:29:21 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: gadget-serial: fix a deadlock when closing the serial device When closing the device, the driver acquires/release twice the port lock before/after waiting for the data to be completely sent. Therefore it will dead lock. This patch fixes it and also uses the generic scheduler services for waiting for an event. Signed-off-by: Franck Bui-Huu Signed-off-by: Greg Kroah-Hartman commit b059c81af7a1759a911cfc20ce8a4bf47c435830 tree 397568ad8fe0ebfd2ee504919f7ae8f12657703f parent 4186c29ca199063facdda49851b4c863699687b1 author Frank Gevaerts Wed, 14 Jun 2006 15:52:05 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB Serial: clean tty fields on failed device open If either the driver's open() method or try_module_get() fails, we need to set 'tty->driver_data' and 'port->tty' to NULL in serial_open(), otherwise we'll get an OOPS in usb_device_disconnect() when the device is disconnected. Signed-off-by: Frank Gevaerts Acked-by: Luiz Fernando N. Capitulino Signed-off-by: Greg Kroah-Hartman commit 4186c29ca199063facdda49851b4c863699687b1 tree 4288ce26277af8097faa38df90cd99b7cbeb7503 parent 4255e6f6d98ad092c27fa2b83ac314cbe8a0c56f author Matt Reimer Wed, 07 Jun 2006 11:46:13 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: trivial DEBUG message correction in gadget ether driver Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4255e6f6d98ad092c27fa2b83ac314cbe8a0c56f tree 564734c2b0112880b7b826af1c8e441e3e65f89e parent d9ac2cfc3aaf3bc37da4192d3edfa11d2ad2e96f author Oliver Bock Sat, 10 Jun 2006 00:42:19 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: new driver for Cypress CY7C63xxx mirco controllers This is a new driver for the Cypress CY7C63xxx mirco controller series. It currently supports the pre-programmed CYC63001A-PC by AK Modul-Bus GmbH. It's based on a kernel 2.4 driver (cyport) by Marcus Maul which I ported to kernel 2.6 using sysfs. I intend to support more controllers of this family (and more features) as soon as I get hold of the required IDs etc. Please see the source code's header for more information. Signed-off-by: Oliver Bock Signed-off-by: Greg Kroah-Hartman commit d9ac2cfc3aaf3bc37da4192d3edfa11d2ad2e96f tree 71afab7732f7acb26cb3637122a417a28741b17a parent 12e72feab5d9a23107f245b0f241a2484cbb5a4e author Pete Zaitcev Mon, 12 Jun 2006 20:09:39 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: update usbmon.txt Fix up the documentation. Apparently, I left unedited copy-paste results in examples. Also, Alan helped me to improve the most confusing parts. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 12e72feab5d9a23107f245b0f241a2484cbb5a4e tree 0a7325d03fddd768118e42e25cf7a8214b99a560 parent 5b1c674d223eef6c6494be8be91e9e3a3054817e author Pete Zaitcev Fri, 09 Jun 2006 22:03:32 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: implement error event in usbmon Implement the "error" event in usbmon. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 5b1c674d223eef6c6494be8be91e9e3a3054817e tree 4f7cbbc36d90ec00cd9f958b62cbfc87f550f34f parent 4bc203d997c0dc1eada4cc9681372c2f7a456c46 author Pete Zaitcev Fri, 09 Jun 2006 20:10:10 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:17 -0700 [PATCH] USB: update usbmon, fix glued lines This update contains one bug fix: some lines can come out truncated, because of the safety cutoff. This happened because I forgot to update the size when status packets began to be printed. The rest is: - Comments updates - Allow snooping with pkmap on x86_64, which is cache-coherent - Enlarge event buffers (certainly we can have a couple of pages) - Add event counter First touch upon usbmon for 2.6.18. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 4bc203d997c0dc1eada4cc9681372c2f7a456c46 tree 9bbe49aeed4efb64b72559bff9c49e128371c37c parent 34ab86e140e9810d6c5162971b6dcf01fcc0f11c author Pete Zaitcev Tue, 06 Jun 2006 18:18:33 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: io_edgeport touch-up Al Borchers suggested to do this in his review of my previous patch. I guess that I skipped this initially because of my visceral dislike of sizeof(data). But in this case it seems well localized. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 34ab86e140e9810d6c5162971b6dcf01fcc0f11c tree faf2836c04eef8670f010431e509366dab7181a2 parent c5e3b741a3fec6077a480aa65ded29d79ded8898 author Timothy Sipples Fri, 16 Jun 2006 20:42:59 +0900 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] airprime.c: add Kyocera Wireless KPC650/Passport support Adds vendor & product IDs to drivers/usb/serial/airprime.c for Kyocera Wireless KPC650/Passport EV-DO/1xRTT PC Cards. Signed-off-by: Timothy Sipples Signed-off-by: Greg Kroah-Hartman commit c5e3b741a3fec6077a480aa65ded29d79ded8898 tree 13d5bf2fe7d2cc14500bafbb2c804da2ed23b102 parent e323de46e83b6df2f330651907ac823f8d53308a author Alan Stern Mon, 05 Jun 2006 12:28:57 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] UHCI: Improve FSBR-off timing This patch (as707) improves the FSBR operation in uhci-hcd by turning it off more quickly when it isn't needed. FSBR puts a noticeable load on a computer's PCI bus, so it should be disabled as soon as possible when it isn't in use. The patch leaves it running for only 10 ms after the last URB stops using it, on the theory that this should be long enough for a driver to submit another URB if it wants keep FSBR going. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e323de46e83b6df2f330651907ac823f8d53308a tree c899168e635f967fe46acaf4873c6b29dbf7f406 parent be3cbc5f87d4b1fbd714644b6824ce4eb229f372 author Alan Stern Mon, 05 Jun 2006 12:21:30 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] UHCI: remove hc_inaccessible flag This patch (as706) removes the private hc_inaccessible flag from uhci-hcd. It's not needed because it conveys exactly the same information as the generic HCD_FLAG_HW_ACCESSIBLE bit. In its place goes a new flag recording whether the controller is dead. The new code allows a complete device reset to resurrect a dead controller (although usbcore doesn't yet implement such a facility). Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit be3cbc5f87d4b1fbd714644b6824ce4eb229f372 tree cea9e1dd8bc67ae65cb25dd7d46235234da7730f parent ae671813affd947d2f21ff8e3cd329e466ee85b2 author David Brownell Mon, 05 Jun 2006 12:16:39 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] UHCI: various updates This patch (as705) contains a small set of updates for uhci-hcd written mostly by Dave Brownell: * Root hub suspend messages come out labeled as root hub messages; PCI messages should only come out when the pci device suspends. * Rename the reset() method to better match its init() role * Behave more like the other HCDs by returning -ESHUTDOWN for root-hub suspend/resume errors. * When an URB fails, associate the message with the usb device not the host controller (it still hides endpoint and direction) From: David Brownell Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit ae671813affd947d2f21ff8e3cd329e466ee85b2 tree 161aa0691de2a02977d99d3507aba3724b7da132 parent 5c218e3b86510f9685bfae5b0d2d7cc8468056c1 author Alan Stern Tue, 06 Jun 2006 15:19:17 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] usb-storage: unusual_devs entry for Nikon DSC D70s This patch (as704) adds an unusual_devs entry for the Nikon DSC D70s, which uses a different Product ID from the D70. It also moves the entry for the DSC E2000 up in the list, to preserve the numerical ordering. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 5c218e3b86510f9685bfae5b0d2d7cc8468056c1 tree 5456256e4aa726f8c704e84ce12db49abe4f8a4f parent dfbaa7d8a4056436b6a170625d64986ebb648486 author Rene Rebe Sun, 04 Jun 2006 11:39:09 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: Add Apple MacBook product IDs to usbhid This adds the Apple MacBook product IDs for the Fn translation to the usbhid. Signed-off-by: Rene Rebe Signed-off-by: Greg Kroah-Hartman commit dfbaa7d8a4056436b6a170625d64986ebb648486 tree 61713fd79502bc395a7e13798e90e7ddba9f92aa parent bfd5df3c0cf65bdf10a3a00baff036cb096140f6 author Ralf Baechle Sat, 03 Jun 2006 23:58:55 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: EHCI on non-Au1200 build fix Including ehci-au1xxx.c on a non-Au1200 Alchemy only to have it throw an error is stupid. From: Ralf Baechle Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit bfd5df3c0cf65bdf10a3a00baff036cb096140f6 tree 3b7835253e0b1f03bc42e323fe3988ee407c0e11 parent 14f76cc7ab75b1c9db036dcd6b247e0dcc8952be author Chris Lund Sat, 03 Jun 2006 13:58:19 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: free allocated memory on io_edgeport startup memory failure While an Edgeport is allocating individual port structures, if kmalloc returns NULL, the serial structure is freed and -ENOMEM, but the ports allocated before the failure are not freed. This patch addresses that condition. Signed-off-by: Christopher Lund Signed-off-by: Greg Kroah-Hartman commit 14f76cc7ab75b1c9db036dcd6b247e0dcc8952be tree 21452b3fa8d83300a1604d16e1c8ed1a559d352a parent 786dc1d3d7333f269e17d742886eac2188a2d9cc author Matthias Urlichs Fri, 02 Jun 2006 11:48:56 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:16 -0700 [PATCH] USB: new devices for the Option driver This patch extends the "option" driver with a few more devices, some of which are actually connected to USB the "right" way -- as opposed to doing it via PCMCIA and OHCI. Signed-Off-By: Matthias Urlichs Signed-off-by: Greg Kroah-Hartman commit 786dc1d3d7333f269e17d742886eac2188a2d9cc tree c2c3f14b485fd2fd9bf41ba2a7dada7486ee4c49 parent 6ad07129a8ed2e13dcd7e6313c201c32bcf7cc32 author Philippe Retornaz Thu, 01 Jun 2006 20:48:46 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usb: drivers/usb/core/devio.c dereferences a userspace pointer See http://bugzilla.kernel.org/show_bug.cgi?id=6617. This function dereference a __user pointer. Signed-off-by: Philippe Retornaz Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6ad07129a8ed2e13dcd7e6313c201c32bcf7cc32 tree 55a1e1a2bdb6bfc5e93f169e22be98598dfbf8c7 parent df9a1f482d1252045210f50048911e2efba61e62 author Alan Stern Thu, 01 Jun 2006 13:59:16 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usbcore: recovery from Set-Configuration failure This patch (as703) improves the error handling when a Set-Configuration request fails. The old interfaces are all unregistered before the request is sent, and if the request fails then we don't know what config the device is using. So it makes no sense to leave actconfig pointing to the old configuration with its invalid interfaces. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit df9a1f482d1252045210f50048911e2efba61e62 tree a2a581e278e9ef6ede4b58ef73d3388510f06064 parent 47104b0dd32cec467574822b0dc3517b3de3f0ad author Alan Stern Thu, 01 Jun 2006 13:55:28 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usbhid: use usb_reset_composite_device This patch (as702) makes usbhid use the new usb_reset_composite_device API. Now HID interfaces can coexist with other interfaces on the same device, and a reset can safely be requested by any of the drivers. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 47104b0dd32cec467574822b0dc3517b3de3f0ad tree 7cc1a012b3351275249c15fbdfc608a1774762b4 parent 7de18d8bf4b470752e799e219b38b6dff4b49993 author Alan Stern Thu, 01 Jun 2006 13:52:56 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usb-storage: use usb_reset_composite_device This patch (as701) modifies usb-storage to take advantage of the new usb_reset_composite_device() API. Now we will be able to safely request port resets even if other drivers are bound to a mass-storage device. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 7de18d8bf4b470752e799e219b38b6dff4b49993 tree bb48636199b616fa578a93917295dcb99c8f7886 parent 79efa097e75018a2918155f343f0e08e61ee8a8c author Alan Stern Thu, 01 Jun 2006 13:37:24 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] USB hub: use usb_reset_composite_device This patch (as700) modifies the hub driver to take advantage of the new usb_reset_composite_device API. The existing code had special-case calls stuck into usb_reset_device, just before and after the reset. With the new version there's no need for special-case stuff; it all happens naturally in the form of pre_reset and post_reset notifications. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 79efa097e75018a2918155f343f0e08e61ee8a8c tree 336237ca96191aeb9cac6ed8706bc479545f3108 parent efcaa20525fde82bbb4fb8cd9e9016f6fabc6509 author Alan Stern Thu, 01 Jun 2006 13:33:42 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] usbcore: port reset for composite devices This patch (as699) adds usb_reset_composite_device(), a routine for sending a USB port reset to a device with multiple interfaces owned by different drivers. Drivers are notified about impending and completed resets through two new methods in the usb_driver structure. The patch modifieds the usbfs ioctl code to make it use the new routine instead of usb_reset_device(). Follow-up patches will modify the hub, usb-storage, and usbhid drivers so they can utilize this new API. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit efcaa20525fde82bbb4fb8cd9e9016f6fabc6509 tree bdceb58add9793206e4af8a147fe5fccb9bad74d parent d5ce1379be9c79d4bcf201c20c5cc87bb2bc973c author David Brownell Tue, 30 May 2006 20:49:29 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] USB: cdc_ether: recognize olympus r1000 (fix regression) Earlier work splitting the "usbnet" driver out into a core plus driver modules was missing a blacklist entry for the Olympus R-1000; it must not use the CDC Ethernet driver, only the "zaurus" support works with it. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit d5ce1379be9c79d4bcf201c20c5cc87bb2bc973c tree 35920fe3fd457b4a472dfa999b76393637d2d544 parent b10cee9d035db54d0bf5a9f9fa622dcfc3f740c6 author Eric Sesterhenn Thu, 01 Jun 2006 20:48:45 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] USB: negative index in drivers/usb/host/isp116x-hcd.c From: Eric Sesterhenn This fixes coverity Bug #390. With the following code ret = ep->branch = balance(isp116x, ep->period, ep->load); if (ret < 0) goto fail; the problem is that ret and balance are of the type int, and ep->branch is u16. so the int balance() returns gets reduced to u16 and then converted to an int again, which removes the sign. Maybe the following little c program can explain it better: commit b10cee9d035db54d0bf5a9f9fa622dcfc3f740c6 tree 22300f8dbab5fea58cbc43082fb2702415599613 parent 09fd6bc8b453c9215e81911cbb6882556aa03639 author Jeremy Fitzhardinge Wed, 31 May 2006 11:21:52 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:15 -0700 [PATCH] USB: Add Sierra Wireless MC5720 ID to airprime.c Recognize the Sierra Wireless MC5720. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Greg Kroah-Hartman commit 09fd6bc8b453c9215e81911cbb6882556aa03639 tree 8ad0daea7395d01200bbad239ec033d780486612 parent 069e8a65cd7970b15672825541be59218d9a8a0f author Stuart MacDonald Wed, 31 May 2006 13:28:40 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: Whiteheat: fix firmware spurious errors Attached patch fixes spurious errors during firmware load. Signed-off-by: Stuart MacDonald Signed-off-by: Greg Kroah-Hartman commit 069e8a65cd7970b15672825541be59218d9a8a0f tree fb71ec51c74b469a83be696c9133c1438e6c05e9 parent eb79b4fda4654eaa7e6421ad41b0a75c7b4f0608 author akpm@osdl.org Fri, 26 May 2006 13:17:09 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] Driver for Apple Cinema Display This is a driver to control the brightness of an Apple Cinema Display over USB. It updates the local brightness value if the user presses a button on the display. Signed-off-by: Michael Hanselmann Cc: Oliver Neukum Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit eb79b4fda4654eaa7e6421ad41b0a75c7b4f0608 tree fcc7812adc7c98f79d09e78947b9bc36f93a97e8 parent 633a7ecf89587879161179ac4f5a03722626866f author Ian Abbott Tue, 30 May 2006 12:36:30 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: ftdi_sio: add support for Yost Engineering ServoCenter3.1 This patch adds support for Yost Engineering Inc's ServoCenter 3.1 USB product to the ftdi_sio driver's device ID table. The PID was supplied by Aaron Prose of Yost Engineering on the ftdi-usb-sio-devel list. The PID 0xE050 matches the Windows INF files for this device. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 633a7ecf89587879161179ac4f5a03722626866f tree ecbc0930e6644ce0b3719e19c656d3ddd7d8f55f parent 3f8f4a18f4f76a67fe5b80da1d3a3940e41a14a8 author Alan Stern Tue, 30 May 2006 10:21:14 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] usbhid: Remove unneeded blacklist entries Now that usbhid automatically applies HID_QUIRK_NOGET to keyboards and mice, we no longer need the blacklist entries that were present for no other purpose. This patch (as698) removes them. Signed-off-by: Alan Stern Acked-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit 3f8f4a18f4f76a67fe5b80da1d3a3940e41a14a8 tree 14f7408ac859d47187f03256c145238320c3b525 parent 1fbe75e12f0dd567c86533e13ba2605f3ecad2e1 author Giridhar Pemmasani Tue, 30 May 2006 10:12:30 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] usbcore: Fix broken RNDIS config selection RNDIS devices don't get configured owing to a typo in choose_configuration(). This patch from Giridhar Pemmasani fixes the typo. From: Giridhar Pemmasani Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 1fbe75e12f0dd567c86533e13ba2605f3ecad2e1 tree 2fc8008f06fd96869dd591dcb08fc7536775212c parent 955a260829b5848fa90721678bab003234c93356 author Daniel Drake Fri, 26 May 2006 21:36:28 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: print message when device is rejected due to insufficient power 2.6.16 introduces USB power budgeting in the Linux kernel, and since then, a fair number of users have observed that some of their devices no longer work in unpowered hubs (this is not a bug, the devices claim that they need more than 100mA). The very least we can do is print an informational message to the kernel log when this happens, otherwise it is not at all clear why the device was not accepted. Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit 955a260829b5848fa90721678bab003234c93356 tree 279bf00d4d028b2787cc59b111ec7aa9580e37fe parent b5600339cd37472455d99b39963f3106411070b6 author David Brownell Fri, 26 May 2006 10:17:03 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: more pegasus log spamming removed Remove more log spamming from pegasus: stop talking to the device once we see ENODEV reported. It may take a while before khubd notifies us. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b5600339cd37472455d99b39963f3106411070b6 tree ed370175216754f26d2b9c98db105114f428533d parent 688e9fb1bbdd4e5a51b5030b7f9b1c811fd5e5e3 author Pete Zaitcev Thu, 25 May 2006 20:08:50 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] ub: random cleanups Remove some silly messages and cast in stone "temporary" messages which we keep around. Also, I am hesitant to remove the initialization retries without having the hardware to test (anyone who was at KS04 has a spare?) Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 688e9fb1bbdd4e5a51b5030b7f9b1c811fd5e5e3 tree 302c191611e780f3e897d353b134f1fe3c9394bc parent 2f8ad9a1b91bc6856860a2fea8b07e0c82c0ad0a author Pete Zaitcev Thu, 25 May 2006 20:04:54 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] ub: atomic add_disk I am taling about this: "if (disk->flags & GENHD_FL_UP) del_gendisk(disk);" If del_gendisk() undoes add_disk() like viro just said, why is it conditional? huh? add_disk() sets the damn flag So, I should not need to check ever so the above is "if I've called add_disk(), call gendisk()" which might be what you want, of course but usually you know if you'd done add_disk() on that puppy anyway In ub, nobody upstream should ever see half-constructed disks before they were passed to add_disk. To that end, only add the struct lun to the list on the path of no return. With that fix in place, we do not need to test GENHD_FL_UP. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 2f8ad9a1b91bc6856860a2fea8b07e0c82c0ad0a tree 8ee7eba6bfd0c955dfcd455e32e305466f53f829 parent ba47f66bd9fc451e9ce88f291e057b2f4910d01c author Pete Zaitcev Wed, 24 May 2006 11:04:04 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:14 -0700 [PATCH] USB: rmmod pl2303 after -28 Wait for the scheduled work to finish before freeing memory, prevent oops. http://bugzilla.kernel.org/show_bug.cgi?id=6596 Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit ba47f66bd9fc451e9ce88f291e057b2f4910d01c tree a05a5c8b59d8f15b50d84b8cb3d2810e72d9223b parent 3428cc43d23f125dcb31c981aa91535dd3c4cb0d author Dan Streetman Wed, 24 May 2006 09:39:16 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] improved TT scheduling for EHCI This updates the EHCI driver by adding an improved scheduler for the transaction translators, found in USB 2.0 hubs and used for low and full speed devices. - adds periodic_tt_usecs() and some helper functions, which does the same thing that "periodic_usecs" does, except on the other side of the TT, i.e. it calculates the low/fullspeed bandwidth usage instead of highspeed. - adds a tt_available() function which is the new implementation of what tt_no_collision() does ... while tt_no_collision() ensures that each TT handles only 1 periodic transfer at a time (a very pessimistic approach) this version instead tracks bandwidth and allows each TT to handle as many transfers as will fit on each TT's downstream bus (closer to best-case). The new scheduler is selected by a config option, marked as EXPERIMENTAL so it can be tested (and more broadly reviewed) for a while until it seems safe to remove the original scheduler. Signed-off-by: Dan Streetman Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 3428cc43d23f125dcb31c981aa91535dd3c4cb0d tree 6217a74b7bb3d475a88ab7437d7fcdaa64fab53c parent 80b47853b19114dd53e83e15bf1db3e183a66824 author Franck Bui-Huu Wed, 24 May 2006 16:57:28 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] usb-storage: get rid of the timer during URB submission This patch uses completion timeout instead of a timer to implement a timeout when submitting an URB. It also put the task in interruptible state instead of an uninterruptible one while waiting for the completion. Signed-off-by: Franck Bui-Huu Signed-off-by: Matthew Dharm Signed-off-by: Greg Kroah-Hartman commit 80b47853b19114dd53e83e15bf1db3e183a66824 tree 7b18b9ac43a8c158a6a544915be647e13c6d125e parent 6f065f70c0c1bfb0b8212438cee21e68aa155887 author Pete Zaitcev Mon, 22 May 2006 22:05:17 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] USB: Syntax cleanup for pl2303 (trailing backslash) Remove the silly trailing backslash. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 6f065f70c0c1bfb0b8212438cee21e68aa155887 tree 0b41372a44c6aae94152b5ff0dd1eb987640a6fb parent cf2c7481d2ff7f0c266de873b2fe93883e9782f9 author Pete Zaitcev Mon, 22 May 2006 22:02:32 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] USB: Improve Kconfig comment for mct_u232 Add a couple of supported devices into the help message. It's a long story... I promised this comment changed to a user long ago, so I'd like to have that promise kept. In reality though, nobody is likely to read this anyway. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit cf2c7481d2ff7f0c266de873b2fe93883e9782f9 tree 35dba35b3969f431feb0dfe5732c3825aa077a22 parent ad93375a30334cd97a61f7076d242e1cfdb66abc author Pete Zaitcev Mon, 22 May 2006 21:58:49 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] USB serial: encapsulate schedule_work, remove double-calling I'm going to throw schedule_work away, it's retarded. But for starters, let's have it encapsulated. Also, generic and whiteheat were both calling usb_serial_port_softint and scheduled work. Only one was necessary. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit ad93375a30334cd97a61f7076d242e1cfdb66abc tree 96f6c49d01c18389939c73d1e5f31516f26f3942 parent 9da2150f59e885d88b9eabe0a677f0fa4962f7b4 author Pete Zaitcev Mon, 22 May 2006 21:49:44 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] usb: io_edgeport, cleanup to unicode handling Clean up the unicode handling in io_edgeport. Make get_string size-limited. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 9da2150f59e885d88b9eabe0a677f0fa4962f7b4 tree 74913a5f9712fa8e2e37fc9796b54c7971899c3a parent 0ae4ea8092e1277cfca07cade7eaba5f594076c1 author Alan Stern Mon, 22 May 2006 16:47:13 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] usbtest: report errors in iso tests This patch (as693b) makes the usbtest driver report errors in the isochronous bulk transfer tests instead of always returning 0. As an arbitrary cutoff, an error is returned if more than 10% of the packet transfers fail. It also stops a test immediately upon receiving an URB submission error. For a test harness, it's especially important to report when errors occur! Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0ae4ea8092e1277cfca07cade7eaba5f594076c1 tree 79c822a07fe4e79587460d723e32a29d70b6dab1 parent 83196b52053068f0240371ad2efd9d6ad685bbeb author Alan Stern Mon, 22 May 2006 12:27:38 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:13 -0700 [PATCH] gadgetfs: fix memory leaks This patch (as692) fixes a few memory leaks in some unimportant error pathways of the gadgetfs driver. Signed-off-by: Alan Stern Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 83196b52053068f0240371ad2efd9d6ad685bbeb tree 61ce5b727519780633f1cc4cfaaebc7087a1f8d2 parent 212a4b4ed1ea9a969f3f967b3e3a8075ad1cb4de author Alan Stern Mon, 22 May 2006 12:26:31 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] gadgetfs: fix AIO interface bugs This patch (as691) fixes a few errors in the AIO interface for the gadgetfs driver. Now requests will complete properly instead of hanging. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 212a4b4ed1ea9a969f3f967b3e3a8075ad1cb4de tree 113adcb02cc4bc78baa327cdd2b6260885e64daa parent 782a7a632e4b0581ade665e3d89ee97c8db0f441 author Vitja Makarov Wed, 31 May 2006 00:40:06 +0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] USB: new cp2101 device By the way I have to ask you to add new (vid,pid) pair to cp2101 driver. This device is argussoft's avr in-system programmer AS3M, http://atmel.argussoft.ru/hard.htm it's based on cp2101 chip and works pretty well with the linux driver. It could be used with argussoft's `asisp1109.exe' (http://atmel.argussoft.ru/download/software/as-tools.soft/asisp.zip) tool run under wine. Signed-off-by: Vitja Makarov Signed-off-by: Greg Kroah-Hartman commit 782a7a632e4b0581ade665e3d89ee97c8db0f441 tree 3d2e829e4581ff2be519429d8ed81d2fc2305333 parent caa2a1226741e023a103e091a7f6dce7c42e82ee author Greg Kroah-Hartman Fri, 19 May 2006 13:20:20 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] USB: add usb_interrupt_msg() function for api completeness. Really just a wrapper around usb_bulk_msg() but now it's documented much better. Signed-off-by: Greg Kroah-Hartman commit caa2a1226741e023a103e091a7f6dce7c42e82ee tree 95a9552242797efd04bd752ab5f07963d837805a parent c8155cc5d839838f8425dbea568fc537337176a7 author Franck Bui-Huu Mon, 15 May 2006 19:23:53 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] Fix a deadlock in usbtest ctrl_complete functions acquires ctx->lock and tries to unlink all queued urbs in case of errors through usb_unlink_urb func. In its turn usb_unlink_urb calls, through the hcd driver, usb_hcd_giveback_urb which calls ctrl_complete again. At this time, ctx->lock is already taken by the same function. Signed-off-by: Franck Bui-Huu Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit c8155cc5d839838f8425dbea568fc537337176a7 tree fc50ffe774fa59a1a3d18e8543bb7e04d1e80726 parent caf3827a65af476c71eaeb79636869a4ab128d48 author Alan Stern Fri, 19 May 2006 16:52:35 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] UHCI: remove ISO TDs as they are used This patch (as690) does the same thing for ISO TDs as as680 did for non-ISO TDs: free them as they are used rather than all at once when an URB is complete. At the same time it fixes a minor buglet (I'm not aware of it ever affecting anyone): An ISO TD should be retired when its frame is over, regardless of whether or not the hardware has marked it inactive. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit caf3827a65af476c71eaeb79636869a4ab128d48 tree 78ef5d5ec466e59d9ac626faf34fb1031ba4fd8e parent 10b8e47d6b32bfba22874354c62770cb4e42aa6c author Alan Stern Fri, 19 May 2006 16:44:55 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] UHCI: store the period in the queue header This patch (as689) stores the period for periodic transfers (interrupt and ISO) in the queue header. This is necessary for proper bandwidth tracking (not yet implemented). It also makes the scheduling of ISO transfers a bit more rigorous, with checks for out-of-bounds frame numbers. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 10b8e47d6b32bfba22874354c62770cb4e42aa6c tree 5477d441bd4e01c4e3a4a9c2ef7b4e677b49d157 parent c433472658b4df11bd3590a59be79194a1ff43ae author Alan Stern Fri, 19 May 2006 16:39:52 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] UHCI: fix race in ISO dequeuing This patch (as688) fixes a small race in uhci-hcd. Because ISO queues aren't controlled by queue headers, they can't be unlinked. Only individual URBs can. So whenever multiple ISO URBs are dequeued, it's necessary to make sure the hardware is done with each one. We can't assume that dequeuing the first URB will suffice to unlink the entire queue. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c433472658b4df11bd3590a59be79194a1ff43ae tree 32d48a155360c8e877be3956c9964d2d4c19a236 parent 3612242e527eb47ee4756b5350f8bdf791aa5ede author Alan Stern Fri, 19 May 2006 16:34:57 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:12 -0700 [PATCH] UHCI: use integer-sized frame numbers This patch (as687) changes uhci-hcd to keep track of frame numbers as full-sized integers rather than 11-bit values. This makes them a lot easier to handle and makes it possible to schedule beyond a 2-second window, should anyone ever want to do so. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 3612242e527eb47ee4756b5350f8bdf791aa5ede tree 581c5088ce1cff693615ce06cac6ba5410d5aca9 parent e016683d595aacde78b9385aabd0b98c8915d885 author Micah Dowty Fri, 19 May 2006 11:26:24 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] USB: Allow high-bandwidth isochronous packets via usbfs This patch increases an arbitrary limit on the size of individual isochronous packets submitted via usbfs. The limit is still arbitrary, but it's now large enough to support the maximum packet size used by high-bandwidth isochronous transfers. Signed-off-by: Micah Dowty Signed-off-by: Greg Kroah-Hartman commit e016683d595aacde78b9385aabd0b98c8915d885 tree 72253a7751eb8568e65b306e3939ca0885f6fac0 parent b9827e4b29edb4af1481b75efdf9ea2d8a7ffc96 author Micah Dowty Fri, 19 May 2006 11:20:11 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] USB: Remove 4088-byte limit on usbfs control URBs This patch removes the artificial 4088-byte limit that usbfs currently places on Control transfers. The USB spec does not specify a strict limit on the size of an entire control transfer. It does, however, state that the data stage "follows the same protocol rules as bulk transfers." (USB 2, 8.5.3) The level of support for large control transfers in real host controllers varies, but it's important to support at least 4K transfers. Windows enforces a maximum control transfer size of 4K, so there exists some hardware that requires a full 4096 byte data stage. Without this patch, we fall short of that by 8 bytes on architectures with a 4K page size, and it becomes impossible to support such hardware with a user-space driver. Since any limit placed on control transfers by usbfs would be arbitrary, this patch replaces the PAGE_SIZE limit with the same arbitrary limit used by bulk transfers. Signed-off-by: Micah Dowty Signed-off-by: Greg Kroah-Hartman commit b9827e4b29edb4af1481b75efdf9ea2d8a7ffc96 tree fd8aabed6f397cd7ce968211bccdaa1993f5c4d6 parent b761d9d867bcc29e8de3e62d1d72b27e75078ca6 author David Brownell Tue, 16 May 2006 17:33:14 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] USB: correct the USB info in Documentation/power/swsusp.txt The swsusp.txt documentation harshes confusingly on USB, and this patch addresses the issue. It's harsh because it blames USB for some issues that are generic to all drivers -- especially those supporting removable media -- and it's confusing since it says that USB has the issue with "suspend" not just swsusp ... while in reality, USB doesn't have the issue when real system suspend states are used. Signed-off-by: David Brownell Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit b761d9d867bcc29e8de3e62d1d72b27e75078ca6 tree 40b8f2e530bd9bbece14007a3d887bbe12e8afde parent 84afddd7ac58adad00cb0e50d0af25fcf825668b author Alan Stern Fri, 12 May 2006 11:41:59 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Work around old Intel bug Some old Intel UHCI controllers have a bug that has shown up in a few systems (the PIIX3 "Neptune" chip set). Until now there has not been any simple way to work around the bug, but the lastest changes in uhci-hcd have made it easy. This patch (as684) adds the work-around. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 84afddd7ac58adad00cb0e50d0af25fcf825668b tree b528f0169ae61309ea4a0020bd53504f8faa827e parent 04538a255ac8b404c20cbf15867c9829254c470f author Alan Stern Fri, 12 May 2006 11:35:45 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Reimplement FSBR This patch (as683) re-implements Full-Speed Bandwidth Reclamation (FSBR) properly. It keeps track of which endpoint queues have advanced, and when none have advanced for a sufficiently long time, FSBR is turned off. The next TD on each of the non-moving queues is modified to generate an interrupt on completion, so that FSBR can be re-enabled as soon as the hardware starts to make some progress. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 04538a255ac8b404c20cbf15867c9829254c470f tree 8b8a9bf63e9b1b804e2bf732e32db2827f422867 parent a0b458b64b2a3a4cb806dd5cd889bbf6c7e9d686 author Alan Stern Fri, 12 May 2006 11:29:04 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Eliminate the TD-removal list This patch (as682) gets rid of the TD-removal list in uhci-hcd. It is no longer needed because now TDs are not freed until we know the hardware isn't using them. It also simplifies the code for adding and removing TDs to/from URBs. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a0b458b64b2a3a4cb806dd5cd889bbf6c7e9d686 tree 88a5d6e48140f4534e6b9e02352bf4b16cb5ef42 parent 59e29ed91cff90b27d393c7a3d3ac9c3fcaea7dd author Alan Stern Fri, 12 May 2006 11:23:19 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Move code for cleaning up unlinked URBs This patch (as681) moves some code for cleaning up after unlinked URBs out of the general completion pathway into the unlinking pathway. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 59e29ed91cff90b27d393c7a3d3ac9c3fcaea7dd tree 5003afaca5960954fe25a2fe6401f43fef48f8bb parent b1869000a60b0c72022811f24110a52d3e300b1e author Alan Stern Fri, 12 May 2006 11:19:19 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Remove non-iso TDs as they are used This patch (as680) frees non-isochronous TDs as they are used, rather than all at once when an URB is complete. Although not a terribly important change in itself, it opens the door to a later enhancement that will reduce storage requirements by allocating only a limited number of TDs at any time for each endpoint queue. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b1869000a60b0c72022811f24110a52d3e300b1e tree b44930e177a344e63fb7e8b60466a38ae4877b2b parent 0f28b55db543001d360e4319bfc3f2c4e28ba05f author Alan Stern Fri, 12 May 2006 11:14:25 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:11 -0700 [PATCH] UHCI: Common result routine for Control/Bulk/Interrupt This patch (as679) combines the result routine for Control URBs with the routine for Bulk/Interrupt URBs. Along the way I eliminated the debugging printouts for Control transfers unless the debugging level is set higher than 1. I also eliminated a long-unused (#ifdef'ed-out) section that works around some buggy old APC BackUPS devices. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 0f28b55db543001d360e4319bfc3f2c4e28ba05f tree ba4f93841ee399c6eba67c3920f4e10e74850258 parent a82e49b8aeb9f8dafdf6cf2e617c8b95bf056257 author Alan Stern Mon, 15 May 2006 14:49:04 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] usbhid: automatically set HID_QUIRK_NOGET for keyboards and mice It seems to be relatively common for USB keyboards and mice to dislike being polled for reports. Since there's no need to poll a keyboard or a mouse, this patch (as685) automatically sets the HID_QUIRK_NOGET flag for devices that advertise themselves as either sort of device with boot protocol support. This won't cure all the problems since some devices don't support the boot protocol, but it's simple and easy and it should fix quite a few problems. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit a82e49b8aeb9f8dafdf6cf2e617c8b95bf056257 tree c264d2e4193d76a68468c42ee36cb33affe018fa parent 2775562ad2af2fc131ef7987166db6e42217528f author Bart Massey Mon, 08 May 2006 14:40:13 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB HID/HIDBP, INPUT DRIVERS: fix various usb/input/hid-input.c bugs that make Apple Mighty Mouse work poorly Transposed lines of code in drivers/usb/input/hid-input.c causes the capability bits for a new HID device to be set before quirks are applied at configuration time. When an HID event is then sent up to the input layer, it may then be discarded as irrelevant because the wrong capability bit is set. Further, the quirks for the Apple Mighty Mouse are not quite right: the horizontal scrolling needs its axis reversed, and the left and center buttons are transposed. Also, the mouse is labeled in the kernel with its earlier name (I think) of Apple PowerMouse. Steps to reproduce problem: Plug in an Apple Mighty Mouse. Note that horizontal scrolling doesn't work at all, and in fact doesn't generate any input events on /dev/input/eventN. Note also that pushing the middle button performs the right button action, and vice versa. Once you have the horizontal scrolling working, note that it is backward WRT both to vertical scrolling and to common sense. This patch maybe should be broken up, as it does address two problems. The transposed code in hidinput_configure_usage() probably creates bugs beyond just the Mighty Mouse. The rest of the patch renames POWERMOUSE to MIGHTYMOUSE everywhere (which I *believe* is correct), fixes the MIGHTYMOUSE quirk to swap the center and right mouse buttons, and adds a new quirk HID_QUIRK_INVERT_HWHEEL also assigned to the MIGHTYMOUSE with code in hidinput_hid_event() to implement it. Signed-off-by: Bart Massey Signed-off-by: Greg Kroah-Hartman commit 2775562ad2af2fc131ef7987166db6e42217528f tree 87c0ba46d8daa8d4b9af6f54b34b21b52c3fa57e parent 4de7d2c231a8624a47417977be0768c5b5257c4f author Alan Stern Fri, 05 May 2006 16:32:02 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: UHCI: fix obscure bug in enqueue() This patch (as676) fixes a small bug in uhci-hcd's enqueue routine. When an URB is unlinked or gets an error and the completion handler queues another URB for the same endpoint, the queue shouldn't be allowed to start up again until the handler returns. Not even if the new URB is the only one on its queue. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 4de7d2c231a8624a47417977be0768c5b5257c4f tree 3dba388c3c8e0673a5884c900f2b04339dc4708e parent 2d61bde7a0e630e1906e6478b6b2a7aeaaa8f8da author Alan Stern Fri, 05 May 2006 16:26:58 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: UHCI: store the endpoint type in the QH structure This patch (as675) simplifies uhci-hcd slightly by storing each endpoint's type in the corresponding Queue Header structure. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 2d61bde7a0e630e1906e6478b6b2a7aeaaa8f8da tree b52f1ed6ea51a5503ef859e2ae3d4eaa16ee4b05 parent b383539e04c413e040d998aedcc120c49aa670da author Alan Stern Fri, 05 May 2006 16:23:42 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: net2280: add a shutdown routine The net2280 board has an annoying habit of surviving soft reboots with interrupts enabled. This patch (as674) adds a shutdown routine to the driver so that the board can be put in a quiescent state. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b383539e04c413e040d998aedcc120c49aa670da tree e926b4f73ec6929aa3b8a794e88ecc43d863e957 parent f9347c52347f24244c550871eab8ecb0fb5704d6 author Daniel Drake Tue, 09 May 2006 01:45:27 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: usb-storage alauda: Fix transport info mismerge Unfortunately it looks like the transport entry for this subdriver was merged into the protocol section, making this driver unusable :( Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit f9347c52347f24244c550871eab8ecb0fb5704d6 tree f6060ca35c9ad6eb6804e529de6186632bb5c160 parent bdcfd9e349eff9398a1d85eaa517294f493bb3c8 author Daniel Drake Mon, 08 May 2006 23:43:02 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB shuttle_usbat: hardcode flash detection for now After some further testing with my flash device I realised that our current probe doesn't always work (e.g. when no media is inserted). Now that Peter Chubb's patch has simplified the detection of 99% of the HP CD writers out there, we have a much smaller range of hardware to work with on the shared device ID, so it should be possible to try some of the previous probe options again: we just need to find another tester with a USBAT2-based HP CD writer. This patch hardcodes the flash detection until someone comes along with one of these obscure CD drives. Note that these devices are extremely rare, so even if we can't ever find a decent probe method, at least we will be supporting almost all of the USBAT-based hardware out there. Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit bdcfd9e349eff9398a1d85eaa517294f493bb3c8 tree 62a8804e6ff6559a0de1f09021c9f8cccaf11cf5 parent 141804d401631f0384feabfa5fc3e2ce1321c0f0 author Peter Chubb Tue, 02 May 2006 18:29:34 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: shuttle_usbat: Hardcode detection of HP CDRW devices Use USB vendor and product IDs to determine whether the attached device is a CDROM or a Flash device. Daniel Drake says that the *same* vendor and product IDs for non-HP vendor ID could be either flash or cdrom, so try to probe for them. Signed-off-by: Peter Chubb Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit 141804d401631f0384feabfa5fc3e2ce1321c0f0 tree 196342c81d2e9de937575d7851525a3e5b2f210e parent 69165c29bb4db9bafead7c6574c73ce245965f3a author Peter Chubb Tue, 02 May 2006 18:30:12 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB: shuttle_usbat: Fix handling of scatter-gather buffers I've worked out what's going wrong. The scsi layer is now much more likely to pass down scatterlists instead of plain buffers. So you have to make sure that they're handled correctly. In one of the changes along the way, usbat_write_block and friends stopped obeying the srb->use_sg flag. Anyway, with the appended patch, and the one I'm putting in the next email, it all seems to work for the HP cd4e. Of course, someone's going to have to test it with the flash drives as well.... This patch teaches the usbat_{read,write}_block functions to obey the use_sg flag in the scsi-request. Signed-off-by: Peter Chubb Signed-off-by: Daniel Drake Signed-off-by: Greg Kroah-Hartman commit 69165c29bb4db9bafead7c6574c73ce245965f3a tree 64e39463bb48cb1a40393640222e4ef69a2b308b parent a01c4ef1cc9622fcce5c10ddb8e9e7f76206959e author Sean Young Tue, 02 May 2006 11:44:43 +0000 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:10 -0700 [PATCH] USB Phidget InterfaceKit: make inputs pollable and new device support Make inputs pollable using sysfs_notify and add support for the Phidget InterfaceKit 0/16/16. Various cleanups. Signed-off-by: Sean Young Signed-off-by: Daniel Saakes Signed-off-by: Greg Kroah-Hartman commit a01c4ef1cc9622fcce5c10ddb8e9e7f76206959e tree d818051ca720f30307f70c99055583ed3e697d61 parent fcf4830a525d37b9bd3ba60430b5729b8621062d author Duncan Sands Fri, 28 Apr 2006 18:58:57 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USBATM: remove no-longer needed #include We #include only because needed it, but didn't #include it itself. But that's been fixed now. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit fcf4830a525d37b9bd3ba60430b5729b8621062d tree f074a52b10ea331915c9b3cbb5469cfe6a50a2ee parent 41fea55e0382b7d59d694d8055b39aa69c793b1f author Duncan Sands Fri, 28 Apr 2006 18:53:45 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USBATM: remove pointless inline Remove pointless inline. Signed-off-by: Duncan Sands Signed-off-by: Greg Kroah-Hartman commit 41fea55e0382b7d59d694d8055b39aa69c793b1f tree 634dce47441863b0270f66de25a0995bb767b8dd parent 4489a5712b086621a6c3f669057d2996245cd3fb author Pete Zaitcev Fri, 28 Apr 2006 20:45:49 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: clean out an unnecessary NULL check from ub Remove the check for NULL which makes no sense. Suggested by Al. Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman commit 4489a5712b086621a6c3f669057d2996245cd3fb tree f79eb7f00a4d95eb7505b2f29283b2ce927feac4 parent 9effa978f1d51f6d0426ebabcf6cb32336bb3153 author Alan Stern Thu, 27 Apr 2006 15:54:22 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: usbcore: always turn on hub port power Some hubs claim not to support port-power switching, and right now the hub driver believes them and does not enable power to their ports. However it turns out that even though they don't actually switch power, they do ignore all events on a port until told to turn on the power! This problem has been reported by several users. This revised patch (as672b) makes the hub driver always try to turn on port power to all hubs, regardless of what the hub descriptor says. It also adds a comment explaining the need for this. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 9effa978f1d51f6d0426ebabcf6cb32336bb3153 tree 9f30639c3bda03d031fc75f5b6404abbf19f17cb parent 73e487fdb75f8abf230968dbf73a3dc3b16808d3 author Nicolas Boichat Wed, 19 Apr 2006 23:36:40 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: MacBook Pro touchpad support Add support for MacBook touchpad in appletouch driver. Thanks to Alex Harper for the informations. Use u16 instead of int16_t in atp_is_geyser* functions. Acked-by: Johannes Berg Acked-by: Stelian Pop Signed-off-by: Nicolas Boichat Signed-off-by: Greg Kroah-Hartman commit 73e487fdb75f8abf230968dbf73a3dc3b16808d3 tree 3e40b1888ec5529b2f3e9a2dfa5d5e6b47947b48 parent ca85485c1f482e6625f36aceb85eaaeff4b22d79 author Guennadi Liakhovetski Tue, 25 Apr 2006 07:46:17 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB console: fix disconnection issues Prevent sending further output to a USB-serial console after the dongle is disconnected, take care not to leak kref. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit ca85485c1f482e6625f36aceb85eaaeff4b22d79 tree 8baa96756703e12b9033b8618bd0cdbfc2a1143b parent 57845bd104233cb75b9ab3624f7ea7662298bc27 author Paul Fulghum Thu, 13 Apr 2006 22:28:17 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: console: prevent ENODEV on node Prevent ENODEV on a /dev/ttyUSBx, used as a USB-serial console. From: Paul Fulghum Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit 57845bd104233cb75b9ab3624f7ea7662298bc27 tree 73ac01088881aa217b07c79a781b7c4412ea85e4 parent c10746dbb39d41e5fc27badfebe61448210c426d author Guennadi Liakhovetski Thu, 13 Apr 2006 22:27:12 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: console: fix oops Prevent NULL dereference when used as a USB-serial console. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit c10746dbb39d41e5fc27badfebe61448210c426d tree 8e1b47bb64433e8f7f282bdcebc38f0368323775 parent 01cced250722d22d99c2342979490f93ca886521 author Paul Fulghum Thu, 13 Apr 2006 22:26:35 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: console: fix cr/lf issues Append Carriage-Returns after Line-Feeds, analogous to the serial driver. From: Paul Fulghum Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit 01cced250722d22d99c2342979490f93ca886521 tree b29b395305836a0f3690a69173e1df2a2f0ecf4f parent df47e5330b0f5decb0a5736e9a81fff49d46d151 author Kumar Gala Tue, 11 Apr 2006 10:07:16 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:09 -0700 [PATCH] USB: allow multiple types of EHCI controllers to be built as modules In some systems we may have both a platform EHCI controller and PCI EHCI controller. Previously we couldn't build the EHCI support as a module due to conflicting module_init() calls in the code. Signed-off-by: Kumar Gala Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit df47e5330b0f5decb0a5736e9a81fff49d46d151 tree fcf5fe254235517ecb77fe652f5ed2e04fa02554 parent 2682d27c5884550857cd96231db5b22b3acced53 author Adrian Bunk Sat, 15 Apr 2006 11:17:27 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: sisusbvga: possible cleanups This patch contains the following possible cleanups: - make needlessly global functions static - function and struct declarations belong into header files - make SiS_VCLKData const - #if 0 the following unused global functions: - sisusb.c: sisusb_writew() - sisusb.c: sisusb_readw() - sisusb_init.c: SiSUSB_GetModeID() Signed-off-by: Adrian Bunk Signed-off-by: Greg Kroah-Hartman commit 2682d27c5884550857cd96231db5b22b3acced53 tree 94b19f6a04993352d8ce3f189366d9cd4969fb58 parent 7327413c745c2f8e8d4b92f76759821263b095c1 author Arjan van de Ven Tue, 28 Mar 2006 01:00:21 -0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: convert the semaphores in the sisusb driver to mutexes From: Arjan van de Ven Convert the semaphores-used-as-mutex to mutexes in the sisusb video driver; this required manual checking due to the "return as locked" stuff in this driver, but the ->lock semaphore is still used as mutex in the end. Signed-off-by: Arjan van de Ven Cc: Thomas Winischhofer Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 7327413c745c2f8e8d4b92f76759821263b095c1 tree 193e4ffb890a98757ca319fd90d9ec7b8920efe1 parent f44f725f7d635e8b9786eef13f836dc1a2851495 author Eduard Warkentin Thu, 18 May 2006 01:13:17 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: added support for ASIX 88178 chipset USB Gigabit Ethernet adaptor Add support for detection and dworking with a ASIX 88178 based USB-Gigabit adaptor. With the patch, it is detected and handled correctly by the asix module. Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit f44f725f7d635e8b9786eef13f836dc1a2851495 tree b9059a88ce6123ee093422b3ba47174534555ddb parent 86478944eba887f149e151bacc023ae4b2d23ea6 author David Brownell Fri, 12 May 2006 19:24:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: usbnet, zaurus mtu fixup This includes an MTU fixup which could affect larger packets with newer Zaurii, described as http://bugzilla.kernel.org/show_bug.cgi?id=6286; plus minor whitespace cleanup. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 86478944eba887f149e151bacc023ae4b2d23ea6 tree 21c9871c1524c75cc702e0fbaa7700e82a9f744f parent 5cd330f4f30eb154e7af9210bed42dfcd447997f author Oliver Neukum Sat, 13 May 2006 22:50:47 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: cdc-acm: add a new special case for modems with buggy firmware this fixes the "duplicated text" bug. There's a modem that cannot cope with large transfers and more than one urb in flight. This patch adds a special case to the driver. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 5cd330f4f30eb154e7af9210bed42dfcd447997f tree 5b480f10d1f4a3abb4fc338ae521b5c24d6fca20 parent c32ba30f76eb18b3d4449072fe9c345a9574796b author Henk Vergonet Mon, 15 May 2006 12:34:43 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: add YEALINK phones to the HID_QUIRK_IGNORE blacklist Keys on Yealink based phones will not function properly when using the generic HID driver. This patch prevents the generic HID code from grabbing the device before the regular yealink driver can get a grip on it. Signed-off-by: Henk Vergonet Signed-off-by: Vojtech Pavlik Signed-off-by: Greg Kroah-Hartman commit c32ba30f76eb18b3d4449072fe9c345a9574796b tree 33e589aa7da775a4a67aeec4b72d9f721013b7d4 parent a5117ba7da37deb09df5eb802dace229b3fb1e9f author Paul Serice Wed, 07 Jun 2006 10:23:38 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 15:04:08 -0700 [PATCH] USB: EHCI works again on NVidia controllers with >2GB RAM From: Paul Serice The workaround in commit f7201c3dcd7799f2aa3d6ec427b194225360ecee broke. The work around requires memory for DMA transfers for some NVidia EHCI controllers to be below 2GB, but recent changes have caused some DMA memory to be allocated before the DMA mask is set. Signed-off-by: Paul Serice Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1323523f505606cfd24af6122369afddefc3b09d tree a3238a27220dd91ec0918478683e59e48605865f parent 9ba89334552b96e2127dcafb1c46ce255ecf2667 parent 32e62c636a728cb39c0b3bd191286f2ca65d4028 author Tony Luck Wed, 21 Jun 2006 14:50:10 -0700 committer Tony Luck Wed, 21 Jun 2006 14:50:10 -0700 Pull rework-memory-attribute-aliasing into release branch commit 9ba89334552b96e2127dcafb1c46ce255ecf2667 tree 9e94efa48696b0796720a9f9f042da51a6fa7fc8 parent f640f94ec4f39e8a4d91d58354d3e09b28769edf author Ian Wienand Wed, 21 Jun 2006 10:33:04 +1000 committer Tony Luck Wed, 21 Jun 2006 14:48:34 -0700 [IA64] SKI Simulator boot Sorry I didn't notice earlier, but that BUG_ON triggers for me on the simulator. AFAICS the mask for itv is set in cpu_init(), which comes after sal_init(). Consequently on the simulator the itv still has its start value of zero. I've probably missed something, but I wonder why at this stage of the boot you even need to save and restore the itv? Signed-Off-By: Ian Wienand Signed-off-by: Tony Luck commit f640f94ec4f39e8a4d91d58354d3e09b28769edf tree 005abff2ede1284c7220f01c5f066cbb2d24ff8b parent d270acbc24f0ce451c773c214ac0e92e95396b2f author Mike Habeck Mon, 19 Jun 2006 15:38:10 -0500 committer Tony Luck Wed, 21 Jun 2006 14:47:06 -0700 [IA64-SGI] fix SGI Altix tioce_bus_fixup() bug The following patch fixes a bug in the SGI Altix tioce_bus_fixup() code. ce_dre_comp_err_addr needs to be zero'd out not ~0ULL. As a result completion errors weren't being captured. Signed-off-by: Mike Habeck Signed-off-by: Tony Luck commit d270acbc24f0ce451c773c214ac0e92e95396b2f tree 46fb1417fd85a4fe477afe391975bc3bc3dec1ab parent b7bb575c3fa3694811a072109f4e9c2f4705d8f5 author Keith Owens Fri, 07 Apr 2006 18:08:11 +1000 committer Tony Luck Wed, 21 Jun 2006 14:44:26 -0700 [IA64] Sanitize assembler code for ia64_sal_os_state struct ia64_sal_os_state has three semi-independent sections. The code in mca_asm.S assumes that these three sections are contiguous, which makes it very awkward to add new data to this structure. Remove the assumption that the sections are contiguous. Define a macro to shorten references to offsets in ia64_sal_os_state. This patch does not change the way that the code behaves. It just makes it easier to update the code in future and to add fields to ia64_sal_os_state when debugging the MCA/INIT handlers. Signed-off-by: Keith Owens Signed-off-by: Tony Luck commit b7bb575c3fa3694811a072109f4e9c2f4705d8f5 tree 7d3c8bc2ba07af4e551f6d847f358090fb39d51d parent ea95972f18481089e73368f9e62f6d70087bf4de author Kenji Kaneshige Fri, 28 Apr 2006 11:50:43 +0900 committer Tony Luck Wed, 21 Jun 2006 14:42:24 -0700 [IA64] Make PCI Express support selectable When I tried to use PCI Express Hotplug driver on my ia64 box, I noticed that "PCI Express support" is not even selectable on ia64. This patch makes PCI Express support selectable. Signed-off-by: Kenji Kaneshige Signed-off-by: Tony Luck commit ea95972f18481089e73368f9e62f6d70087bf4de tree 7ea2a8c039eff1dfb638d97732bfc27b0e1cd26c parent 65884734902c8f0b4d83293985678ab83b24ef72 author Russ Anderson Wed, 10 May 2006 11:09:01 -0500 committer Tony Luck Wed, 21 Jun 2006 14:39:41 -0700 [IA64-SGI] Remove SN SAL error handling feature bit that is no longer needed Due to improvements in linux & SAL MCA handling, the SAL_ERR_FEAT_MCA_SLV_TO_OS_INIT_SLV error handling features bit is no longer needed. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 65884734902c8f0b4d83293985678ab83b24ef72 tree 7e522d52daf95368d59cbd2699b8e96b6b3de222 parent a1d7057727bc9e20a0a417812f538fe6b8a02c03 author David Mosberger-Tang Wed, 24 May 2006 22:16:03 -0600 committer Tony Luck Wed, 21 Jun 2006 14:35:28 -0700 [IA64] make efi_stub.S fit in 80 cols Just a trivial cleanup patch Signed-off-by: Tony Luck commit 9ed059e1551bf36092215b965838502ac21f42e4 tree 083f7ffc708a4b0c9a2ebb6519478edf1ea3a825 parent 491b07c98f2ac75f1a4370af76ae2403a4c579f5 author Randy Dunlap Tue, 20 Jun 2006 22:32:56 -0700 committer Dave Jones Wed, 21 Jun 2006 17:34:25 -0400 [CPUFREQ] Fix powernow-k8 SMP kernel on UP hardware bug. Fix powernow-k8 doesn't load bug. Reference: https://launchpad.net/distros/ubuntu/+source/linux-source-2.6.15/+bug/35145 Signed-off-by: Ben Collins Signed-off-by: Dave Jones commit 491b07c98f2ac75f1a4370af76ae2403a4c579f5 tree b9c6bcbae16069aa9341448caef1723ecb328e82 parent 6cad647da228486f36a9794137ad459e39b02590 author Jeremy Fitzhardinge Wed, 21 Jun 2006 13:15:48 -0700 committer Dave Jones Wed, 21 Jun 2006 17:34:25 -0400 [PATCH] redirect speedstep-centrino maintainer mail to cpufreq list I haven't really maintained this driver for a while, and I'm not keeping up with the latest in Intel power management. I get a steady stream of mail which I don't really do anything useful with; the cpufreq list seems like a better destination, unless someone wants to get the mail directly. Also clean up a couple of ancient comments which don't really apply anymore (as far as I know, nobody has ever damaged a CPU with this driver). Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Dave Jones commit a1d7057727bc9e20a0a417812f538fe6b8a02c03 tree bd3627eb3ea4b916dd1de521c341b92e3444f4dd parent 5eb1d63f5fc8455269c2756223b3cf3779fd2f7a author Jack Steiner Wed, 31 May 2006 08:58:08 -0500 committer Tony Luck Wed, 21 Jun 2006 14:33:56 -0700 [IA64-SGI] SN topology fix for large systems There is an SN bug in sn_hwperf.c that affects systems with 1024n or 1024p. The bug manifests itself 2 ways: IO interrupts are not always targeted to the nearest node, and 2) the "cat /proc/sgi_sn/sn_topology" commands fails with "cannot allocate memory". The code is using the wrong macros for validating node numbers. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 5eb1d63f5fc8455269c2756223b3cf3779fd2f7a tree 169d7791754f75b970d0b7e8d3c921a8cf59919b parent 120b286d3c94a4e59fdb8069d42e8d49ea468ffd author Alex Williamson Tue, 06 Jun 2006 10:36:27 -0600 committer Tony Luck Wed, 21 Jun 2006 14:32:25 -0700 [IA64] sanity check reserved region usage One more trivial, stand-alone patch from the Xen/ia64 review. Sanity check usage of the reserved region numbers. Signed-off-by: Alex Williamson Signed-off-by: Tony Luck commit 120b286d3c94a4e59fdb8069d42e8d49ea468ffd tree c103f6926a08cb50c4586efd4db2a330a3381c40 parent 28e4b224955cbe30275b2a7842e729023a4f4b03 author Alex Williamson Tue, 06 Jun 2006 10:23:34 -0600 committer Tony Luck Wed, 21 Jun 2006 14:31:07 -0700 [IA64] add vmlinuz target This is a trivial stand-alone patch out of the Xen/ia64 patches. Add a vmlinuz build target to be more compatible with x86-ish targets. Signed-off-by: Alex Williamson Signed-off-by: Tony Luck commit a5117ba7da37deb09df5eb802dace229b3fb1e9f tree eec1e160cbc11a4a1dae107ed27d92c991f5fcf6 parent 3e95637a48820ff8bedb33e6439def96ccff1de5 author Rene Herman Tue, 06 Jun 2006 23:54:02 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver model: add ISA bus During the recent "isa drivers using platform devices" discussion it was pointed out that (ALSA) ISA drivers ran into the problem of not having the option to fail driver load (device registration rather) upon not finding their hardware due to a probe() error not being passed up through the driver model. In the course of that, I suggested a seperate ISA bus might be best; Russell King agreed and suggested this bus could use the .match() method for the actual device discovery. The attached does this. For this old non (generically) discoverable ISA hardware only the driver itself can do discovery so as a difference with the platform_bus, this isa_bus also distributes match() up to the driver. As another difference: these devices only exist in the driver model due to the driver creating them because it might want to drive them, meaning that all device creation has been made internal as well. The usage model this provides is nice, and has been acked from the ALSA side by Takashi Iwai and Jaroslav Kysela. The ALSA driver module_init's now (for oldisa-only drivers) become: static int __init alsa_card_foo_init(void) { return isa_register_driver(&snd_foo_isa_driver, SNDRV_CARDS); } static void __exit alsa_card_foo_exit(void) { isa_unregister_driver(&snd_foo_isa_driver); } Quite like the other bus models therefore. This removes a lot of duplicated init code from the ALSA ISA drivers. The passed in isa_driver struct is the regular driver struct embedding a struct device_driver, the normal probe/remove/shutdown/suspend/resume callbacks, and as indicated that .match callback. The "SNDRV_CARDS" you see being passed in is a "unsigned int ndev" parameter, indicating how many devices to create and call our methods with. The platform_driver callbacks are called with a platform_device param; the isa_driver callbacks are being called with a "struct device *dev, unsigned int id" pair directly -- with the device creation completely internal to the bus it's much cleaner to not leak isa_dev's by passing them in at all. The id is the only thing we ever want other then the struct device * anyways, and it makes for nicer code in the callbacks as well. With this additional .match() callback ISA drivers have all options. If ALSA would want to keep the old non-load behaviour, it could stick all of the old .probe in .match, which would only keep them registered after everything was found to be present and accounted for. If it wanted the behaviour of always loading as it inadvertently did for a bit after the changeover to platform devices, it could just not provide a .match() and do everything in .probe() as before. If it, as Takashi Iwai already suggested earlier as a way of following the model from saner buses more closely, wants to load when a later bind could conceivably succeed, it could use .match() for the prerequisites (such as checking the user wants the card enabled and that port/irq/dma values have been passed in) and .probe() for everything else. This is the nicest model. To the code... This exports only two functions; isa_{,un}register_driver(). isa_register_driver() register's the struct device_driver, and then loops over the passed in ndev creating devices and registering them. This causes the bus match method to be called for them, which is: int isa_bus_match(struct device *dev, struct device_driver *driver) { struct isa_driver *isa_driver = to_isa_driver(driver); if (dev->platform_data == isa_driver) { if (!isa_driver->match || isa_driver->match(dev, to_isa_dev(dev)->id)) return 1; dev->platform_data = NULL; } return 0; } The first thing this does is check if this device is in fact one of this driver's devices by seeing if the device's platform_data pointer is set to this driver. Platform devices compare strings, but we don't need to do that with everything being internal, so isa_register_driver() abuses dev->platform_data as a isa_driver pointer which we can then check here. I believe platform_data is available for this, but if rather not, moving the isa_driver pointer to the private struct isa_dev is ofcourse fine as well. Then, if the the driver did not provide a .match, it matches. If it did, the driver match() method is called to determine a match. If it did _not_ match, dev->platform_data is reset to indicate this to isa_register_driver which can then unregister the device again. If during all this, there's any error, or no devices matched at all everything is backed out again and the error, or -ENODEV, is returned. isa_unregister_driver() just unregisters the matched devices and the driver itself. More global points/questions... - I'm introducing include/linux/isa.h. It was available but is ofcourse a somewhat generic name. Moving more isa stuff over to it in time is ofcourse fine, so can I have it please? :) - I'm using device_initcall() and added the isa.o (dependent on CONFIG_ISA) after the base driver model things in the Makefile. Will this do, or I really need to stick it in drivers/base/init.c, inside #ifdef CONFIG_ISA? It's working fine. Lastly -- I also looked, a bit, into integrating with PnP. "Old ISA" could be another pnp_protocol, but this does not seem to be a good match, largely due to the same reason platform_devices weren't -- the devices do not have a life of their own outside the driver, meaning the pnp_protocol {get,set}_resources callbacks would need to callback into driver -- which again means you first need to _have_ that driver. Even if there's clean way around that, you only end up inventing fake but valid-form PnP IDs and generally catering to the PnP layer without any practical advantages over this very simple isa_bus. The thing I also suggested earlier about the user echoing values into /sys to set up the hardware from userspace first is... well, cute, but a horrible idea from a user standpoint. Comments ofcourse appreciated. Hope it's okay. As said, the usage model is nice at least. Signed-off-by: Rene Herman commit 3e95637a48820ff8bedb33e6439def96ccff1de5 tree 69930bc984892d68574e3623a0cbd88928fa6d06 parent e9a7d305faec364ba973d6c22c9b1e802ef79204 author Alan Stern Fri, 16 Jun 2006 17:10:48 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver Core: Make dev_info and friends print the bus name if there is no driver This patch (as721) makes dev_info and related macros print the device's bus name if the device doesn't have a driver, instead of printing just a blank. If the device isn't on a bus either... well, then it does leave a blank space. But it will be easier for someone else to change if they want. Cc: Matthew Wilcox Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit e9a7d305faec364ba973d6c22c9b1e802ef79204 tree 1bd38fb8f39d4895734885fd7b6f52c14222e481 parent b9d9c82b4d081feb464f62dfc786c8621d09ecd2 author Greg Kroah-Hartman Tue, 20 Jun 2006 13:59:20 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: add proper symlinks for devices We need to create the "compatible" symlinks that class_devices used to create when they were in the class directories so that userspace does not know anything changed at all. Yeah, we have a lot of symlinks now, but we should be able to get rid of them in a year or two... (wishful thinking...) Signed-off-by: Greg Kroah-Hartman commit b9d9c82b4d081feb464f62dfc786c8621d09ecd2 tree 511d15b4d7aaba80a2c0fe49622a3224ca386122 parent 23681e479129854305da1da32f7f1eaf635ef22c author Kay Sievers Thu, 15 Jun 2006 15:31:56 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: add generic "subsystem" link to all devices Like the SUBSYTEM= key we find in the environment of the uevent, this creates a generic "subsystem" link in sysfs for every device. Userspace usually doesn't care at all if its a "class" or a "bus" device. This provides an unified way to determine the subsytem of a device, regardless of the way the driver core has created it. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 23681e479129854305da1da32f7f1eaf635ef22c tree 5677e3d851e8d65feeb64c9852e4dbb60e75ff41 parent aa49b9136e3d44cc264811d77eef4ded88456717 author Greg Kroah-Hartman Wed, 14 Jun 2006 12:14:34 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: allow struct device to have a dev_t This is the first step in moving class_device to being replaced by struct device. It allows struct device to export a dev_t and makes it easy to dynamically create and destroy struct device as long as they are associated with a specific class. Cc: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit aa49b9136e3d44cc264811d77eef4ded88456717 tree 9f84c71790724ba53384a651ca523b35382c054c parent cad1e55d4d19a49c2b82b74562a6e4e555b05f38 author Greg Kroah-Hartman Tue, 20 Jun 2006 13:59:20 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: change make_class_name() to take kobjects This is needed for a future patch for the device code to create the proper symlinks for devices that are "class devices". Signed-off-by: Greg Kroah-Hartman commit cad1e55d4d19a49c2b82b74562a6e4e555b05f38 tree 8782a20ecc3086277ec9e1f0d97b0e32d058a512 parent fd869db6eb1ea0ffe251e53a113dbf259400f4f6 author Laura Garcia Tue, 23 May 2006 23:22:38 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] firmware_class: s/semaphores/mutexes Hi, this patch converts semaphores to mutexes for Randy's firmware_class. Signed-off-by: Laura Garcia Liebana Signed-off-by: Greg Kroah-Hartman commit fd869db6eb1ea0ffe251e53a113dbf259400f4f6 tree bce8f3d2316c3e257dfe5f6e5fa024abffa0c03d parent 1e724845034eb898c97dc6636207f0a231af9432 author David Brownell Tue, 16 May 2006 17:03:25 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] Driver core: PM_DEBUG device suspend() messages become informative This makes the driver model PM suspend debug messages more useful, by (a) explaining what event is being sent, since not all suspend() requests mean the same thing; (b) reporting when a PM_EVENT_SUSPEND call is allowing the device to issue wakeup events. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 1e724845034eb898c97dc6636207f0a231af9432 tree 1c99a56d22c10fe995ebc5c5a088233adeee677d parent 4039483fd3065920f035eed39ec59085421c0a4f author David Brownell Tue, 16 May 2006 17:00:08 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:49 -0700 [PATCH] remove duplication from Documentation/power/devices.txt Remove a chunk of duplicated documentation text. Signed-off-by: Greg Kroah-Hartman commit 4039483fd3065920f035eed39ec59085421c0a4f tree fc89410a8cd031c3f71a7319987fa6fc9b09336c parent e391553222211e07dfbe2f01c413b4e6d0ae32aa author Michael Holzheu Tue, 09 May 2006 12:53:49 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: Add /sys/hypervisor when needed To have a home for all hypervisors, this patch creates /sys/hypervisor. A new config option SYS_HYPERVISOR is introduced, which should to be set by architecture dependent hypervisors (e.g. s390 or Xen). Acked-by: Martin Schwidefsky Signed-off-by: Michael Holzheu Signed-off-by: Greg Kroah-Hartman commit e391553222211e07dfbe2f01c413b4e6d0ae32aa tree 4240a4023c5434de449a9f73e07a9d1ff0d68c84 parent 670dd90d81f60ef429cbba54ad235e9207f4d444 author Russell King Sat, 06 May 2006 08:15:26 +0100 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: Fix platform_device_add to use device_add platform_device_add() should be using device_add() rather than device_register() - any platform device passed to platform_device_add() should have already been initialised, either by platform_device_alloc() or platform_device_register(). Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman commit 670dd90d81f60ef429cbba54ad235e9207f4d444 tree 817c62329690f69cb32439d00c25023dfe977402 parent 1740757e8f94c6899705eb6f5434de9404992778 author Shaohua Li Mon, 08 May 2006 13:45:57 +0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: Allow sysdev_class have attributes allow sysdev_class adding attribute. Next patch will use the new API to add an attribute under /sys/device/system/cpu/. Signed-off-by: Shaohua Li Signed-off-by: Greg Kroah-Hartman commit 1740757e8f94c6899705eb6f5434de9404992778 tree 012bf37dae6c7705a50f88bbdd8d28d975a5dc46 parent a0245f7ad5214cb00131d7cd176446e067c913dc author Greg Kroah-Hartman Tue, 02 May 2006 16:59:59 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: remove unused exports Cc: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit a0245f7ad5214cb00131d7cd176446e067c913dc tree 78f138afefa3114cb587561e464ddc6a8b6a7805 parent 05967118a6c354eaa5950429c70ad4c8daca94bf author David Brownell Mon, 29 May 2006 10:37:33 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] platform_bus learns about modalias This patch adds modalias support to platform devices, for simpler hotplug/coldplug driven driver setup. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 05967118a6c354eaa5950429c70ad4c8daca94bf tree 000b297e0c8b673915389743587ef1a7218b8655 parent b7fe4a60f3a5a428832bf5dd9388e80f0d02fc2e author David Brownell Mon, 01 May 2006 13:58:33 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver Core: CONFIG_DEBUG_PM covers drivers/base/power too The drivers/base/power PM debug messages should appear when either PM or driver model debug are enabled. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit b7fe4a60f3a5a428832bf5dd9388e80f0d02fc2e tree e378263252c78af899e8db3f98a0e2cc6486a265 parent 3dda4e373c7474cfe280f4270b70c1563f92a2a7 author Stephen Hemminger Wed, 26 Apr 2006 09:53:14 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:48 -0700 [PATCH] Driver core: class_device_add needs error checks class_device_add needs to check the return value of all the setup it does. It doesn't handle out of memory well. This is not complete, probably more needs to be done. Signed-off-by: Stephen Hemminger Signed-off-by: Greg Kroah-Hartman commit 3dda4e373c7474cfe280f4270b70c1563f92a2a7 tree b38e2c22056859de773ef8e47b059f53a52d0215 parent 1cdcb6b43fda7424b7435dac8f80b2b5d8a48899 author Hansjoerg Lipp Sat, 22 Apr 2006 18:43:00 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] i4l gigaset: move sysfs entry to tty class device Using the class device pointer returned by tty_register_device() with part 1 of the patch, attach the Gigaset drivers' "cidmode" sysfs entry to its tty class device, where it can be found more easily by users who do not know nor care which USB port the device is attached to. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Signed-off-by: Greg Kroah-Hartman commit 1cdcb6b43fda7424b7435dac8f80b2b5d8a48899 tree 3090342c60b9b8f0f8144f67962d3cb3ce2a9207 parent 53877d06d53a412d901bb323f080296c363d8b51 author Hansjoerg Lipp Sat, 22 Apr 2006 18:36:53 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] TTY: return class device pointer from tty_register_device() Let tty_register_device() return a pointer to the class device it creates. This allows registrants to add their own sysfs files under the class device node. Signed-off-by: Hansjoerg Lipp Signed-off-by: Tilman Schmidt Signed-off-by: Greg Kroah-Hartman commit 53877d06d53a412d901bb323f080296c363d8b51 tree ceffbd4dd9342e1742bf59165880888f7f961f33 parent 27c0ff868f2ad3c9732ce45abbb8dd7e1723931f author Kay Sievers Tue, 04 Apr 2006 20:42:26 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] Driver core: bus device event delay split bus_add_device() and send device uevents after sysfs population Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 27c0ff868f2ad3c9732ce45abbb8dd7e1723931f tree bfb9a16843377d12a1d051d04cc8c7791eaceb6e parent c18f6365fdbaf30611a8822afcd7097865dcaa32 author Greg Kroah-Hartman Thu, 27 Apr 2006 15:46:39 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] CCISS: add device symlink to the block cciss block devices in sysfs Signed-off-by: Greg Kroah-Hartman commit c18f6365fdbaf30611a8822afcd7097865dcaa32 tree fb136fffab80d3022edcc4fc17b3da789eb7b838 parent 183bd5b3da82b80920c30c4772222df8027fc364 author Greg Kroah-Hartman Thu, 27 Apr 2006 14:10:12 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] Add kernel<->userspace ABI stability documentation Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 183bd5b3da82b80920c30c4772222df8027fc364 tree 9af7f9210a044b0604d09338cd0920fbab82e3a9 parent 789e7dc8ee6cfb7928208b077d0799d81196e9bb author Greg Kroah-Hartman Thu, 18 May 2006 10:39:21 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:40:47 -0700 [PATCH] kobject: make people pay attention to kobject_add errors These really need to be fixed, shout it out to the world. Signed-off-by: Greg Kroah-Hartman commit cf34a8e07f02c76f3f1232eecb681301a3d7b10b tree 9148713707b7b5f50bfeceeaefb78d87474a106b parent ead2bfeb7f739d2ad6e09dc1343f0da51feb7f51 author Brice Goglin Tue, 13 Jun 2006 14:35:42 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: nVidia quirk to make AER PCI-E extended capability visible The nVidia CK804 PCI-E chipset supports the AER extended capability but sometimes fails to link it (with some BIOS or after a warm reboot). It makes the AER cap invisible to pci_find_ext_capability(). The patch adds a quirk to set the missing bit that controls the linking of the capability. By the way, it removes the corresponding code in the myri10ge driver. Signed-off-by: Brice Goglin Signed-off-by: Loic Prylli Signed-off-by: Greg Kroah-Hartman commit ead2bfeb7f739d2ad6e09dc1343f0da51feb7f51 tree 08a716dbc0c5f1db461a2f1d5773ce08bcbf7654 parent bdee9d98d281d84718eaff6bf0dd2b6ad418b36f author Chuck Ebbert <76306.1226@compuserve.com> Thu, 15 Jun 2006 04:41:52 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: fix issues with extended conf space when MMCONFIG disabled because of e820 On 15 Jun 2006 03:45:10 +0200, Andi Kleen wrote: > Anyways I would say that if the BIOS can't get MCFG right then > it's likely not been validated on that board and shouldn't be used. According to Petr Vandrovec: ... "What is important (and checked) is address of MMCONFIG reported by MCFG table... Unfortunately code does not bother with printing that address :-( "Another problem is that code has hardcoded that MMCONFIG area is 256MB large. Unfortunately for the code PCI specification allows any power of two between 2MB and 256MB if vendor knows that such amount of busses (from 2 to 128) will be sufficient for system. With notebook it is quite possible that not full 8 bits are implemented for MMCONFIG bus number." So here is a patch. Unfortunately my system still fails the test because it doesn't reserve any part of the MMCONFIG area, but this may fix others. Booted on x86_64, only compiled on i386. x86_64 still remaps the max area (256MB) even though only 2MB is checked... but 2.6.16 had no check at all so it is still better. PCI: reduce size of x86 MMCONFIG reserved area check 1. Print the address of the MMCONFIG area when the test for that area being reserved fails. 2. Only check if the first 2MB is reserved, as that is the minimum. Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com> Acked-by: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit bdee9d98d281d84718eaff6bf0dd2b6ad418b36f tree b7122ecf946d3922f1462c512e2f0599fb505184 parent acc7c2e0b73a46122ec370bf8a3aa9f19065d331 author Doug Thompson Wed, 14 Jun 2006 16:59:48 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: Bus Parity Status sysfs interface From: Doug Thompson This patch adds the 'broken_parity_status' sysfs attribute file to a PCI device. Reading this attribute a userland program can determine if PCI device provides false positives (value of 1) in its generation of PCI Parity status, or not (value of 0). As PCI devices are found to be 'bad' in this regard, userland programs can also set the appropriate value (root access only) of a faulty device. This per device information will be used in the EDAC PCI Parity scanner code in a future patch once this interface becomes available. Signed-off-by: Doug Thompson Signed-off-by: Greg Kroah-Hartman commit acc7c2e0b73a46122ec370bf8a3aa9f19065d331 tree 6e37db90a6e73aa2095d00e66314b3c3dec7e072 parent 4d15a1779dfdf7e7a111022697d3a43da1745d31 author Konrad Rzeszutek Thu, 15 Jun 2006 12:08:30 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: fix memory leak in MMCONFIG error path This a bit late (yours patch was posted about a year ago), but a co-worker of spotted part of the code that looks like a memory leak. Looking at the code it seems that pci_mmcfg_config should be free-ed if MMCONFIG is above 4GB. From: Konrad Rzeszutek Signed-off-by: Greg Kroah-Hartman commit 4d15a1779dfdf7e7a111022697d3a43da1745d31 tree 883b86d569d70b52b4e4fc0170fb8efaa42b6260 parent bd91fde952b0aa80c820857241ff1923537d2bde author Greg Kroah-Hartman Tue, 06 Jun 2006 16:58:25 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: fix error with pci_get_device() call in the mpc85xx driver Signed-off-by: Greg Kroah-Hartman commit bd91fde952b0aa80c820857241ff1923537d2bde tree 5fe1d5703f430894bcf13635f95423c7560d30a6 parent d71374dafbba7ec3f67371d3b7e9f6310a588808 author Chris Wedgwood Mon, 05 Jun 2006 00:13:21 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: MSI-K8T-Neo2-Fir: run only where needed Be more selective when running the MSI-K8T-Neo2Fir soundcard PCI quirk so as not to run this on hardware where it's probably not needed. Signed-off-by: Chris Wedgwood Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d71374dafbba7ec3f67371d3b7e9f6310a588808 tree 116dcd65fde3701d10fea954cdbd5bb063182b2c parent 733a7fe12248072e1bca729c88a26298666f1956 author Zhang Yanmin Fri, 02 Jun 2006 12:35:43 +0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:01 -0700 [PATCH] PCI: fix race with pci_walk_bus and pci_destroy_dev pci_walk_bus has a race with pci_destroy_dev. When cb is called in pci_walk_bus, pci_destroy_dev might unlink the dev pointed by next. Later on in the next loop, pointer next becomes NULL and cause kernel panic. Below patch against 2.6.17-rc4 fixes it by changing pci_bus_lock (spin_lock) to pci_bus_sem (rw_semaphore). Signed-off-by: Zhang Yanmin Signed-off-by: Greg Kroah-Hartman commit 733a7fe12248072e1bca729c88a26298666f1956 tree 059c803091394a3a61a6c4537a4eaa3f5426fa5f parent f7e6600d762bf7c04b48c8d9bd0ab26d04a8d11f author Grant Grundler Thu, 01 Jun 2006 11:15:59 -0600 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: clean up pci documentation to be more specific On Thu, Jun 01, 2006 at 02:46:11AM -0700, Rajesh Shah wrote: > This patch assumes that pci_request_region() will always be called > after pci_enable_device() and pci_release_region() will always > be called before pci_disable_device(). We cannot make this > assumption,since it's perfectly legal to disable a device > first and then release it's regions. So, I think that patch > needs to change. Patch below clarifies comments in Documentation/pci.txt. Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit f7e6600d762bf7c04b48c8d9bd0ab26d04a8d11f tree 8e72e80936bf30be991fa8e023f7dd47837085fe parent c0da3ba0a29d70c95ed39366a1c9b849f3439fbe author Grant Grundler Wed, 31 May 2006 23:35:47 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: remove unneeded msi code The code is really not needed. Roland Dreier/Greg KH removed the release_mem_region() calls that were the only consumers of phys_addr: http://www.ussg.iu.edu/hypermail/linux/kernel/0503.0/1540.html patch below deletes the "dead" code. Signed-off-by: Grant Grundler Signed-off-by: Greg Kroah-Hartman commit c0da3ba0a29d70c95ed39366a1c9b849f3439fbe tree e8d31f5137a8f5bc5337e139c0778f8ba6b4b4f4 parent b209a6ee49099b7500abf024f7b6b9648b5a3eac author Kimball Murray Wed, 31 May 2006 14:20:04 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: don't move ioapics below PCI bridge A recent Stratus x86_64 platform uses a system ioapic that is a PCI device located below a PCI bridge. Other platforms like this may exist. This patch fixes a problem wherein the kernel's PCI setup code moves the ioapic to an address other than that assigned by the BIOS. It simply adds another exclusion (which already includes classless devices and host bridges) to the function pbus_assign_resources_sorted so that it will not move the ioapic. If the ioapic is moved, the fixmap mapping to it is broken, so the OS should leave it alone. From: Kimball Murray Signed-off-by: Greg Kroah-Hartman commit b209a6ee49099b7500abf024f7b6b9648b5a3eac tree 6e6c614ae010aa92e9ded5e55c3a913f3c6c9dd3 parent 99dc804d9bcc2c53f4c20c291bf4e185312a1a0c author bibo,mao Wed, 31 May 2006 18:17:33 +0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: cleanup unused variable about msi driver In IA64 platform, msi driver does not use irq_vector variable, and in x86 platform LAST_DEVICE_VECTOR should one before FIRST_SYSTEM_VECTOR, this patch modify this. Signed-off-by: bibo, mao Signed-off-by: Greg Kroah-Hartman commit 99dc804d9bcc2c53f4c20c291bf4e185312a1a0c tree 4798f39176d0f8fe06de446d74cf94ba48423aa9 parent 020d502488bebdbc1b2c2828d996f04e563f082a author Shaohua Li Fri, 26 May 2006 10:58:27 +0800 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: disable msi mode in pci_disable_device Brice said the pci_save_msi_state breaks his driver in his special usage (not in suspend/resume), as pci_save_msi_state will disable msi mode. In his usage, pci_save_state will be called at runtime, and later (after the device operates for some time and has an error) pci_restore_state will be called. In another hand, suspend/resume needs disable msi mode, as device should stop working completely. This patch try to workaround this issue. Drivers are expected call pci_disable_device in suspend time after pci_save_state. Signed-off-by: Shaohua Li Signed-off-by: Greg Kroah-Hartman commit 020d502488bebdbc1b2c2828d996f04e563f082a tree 101cf0138612137dc08844dff137f927ed0a3b8b parent 1edab4a164b229807853682f7ff7858c11dd3481 author Rajesh Shah Tue, 23 May 2006 10:14:36 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: Allow MSI to work on kexec kernel We recently ran into a problem where the e1000 device failed to work properly on the kexec kernel. MSI was enabled for the device in the main kernel when it crashed. The e1000 driver tried to enable MSI on the kexec kernel, but the code bailed early when it found that MSI was already enabled in the hardware, even though the software state was not properly set up in the kexec'd kernel. This patch fixes the problem by moving the early return to after making sure that the software state is properly initialized. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit 1edab4a164b229807853682f7ff7858c11dd3481 tree b2b65bb914850270f5e22f9b4c49ef371c0f20b6 parent 74d0a988d3aa359b6b8a8536c8cb92cce02ca5d5 author Brice Goglin Tue, 23 May 2006 03:05:27 -0400 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: AMD 8131 MSI quirk called too late, bus_flags not inherited ? The PCI_BUS_FLAGS_NO_MSI bus flags does not appear do be inherited correctly from the amd8131 MSI quirk to its parent busses. It makes devices behind a bridge behind amd8131 try to enable MSI while the amd8131 does not support it. We fix this by looking at flags of all parent busses in pci_enable_msi() and pci_enable_msix(). By the way, also add the missing dev->no_msi check in pci_enable_msix() Signed-off-by: Brice Goglin Signed-off-by: Greg Kroah-Hartman commit 74d0a988d3aa359b6b8a8536c8cb92cce02ca5d5 tree 7c5cad6b97a589ce70e1cf662ddc8b578c2bcf98 parent bd8481e1646d7649fa101ee57a5139b9da3c2436 author Brent Casavant Wed, 10 May 2006 01:49:14 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 12:00:00 -0700 [PATCH] PCI: Move various PCI IDs to header file Move various QLogic, Vitesse, and Intel storage controller PCI IDs to the main header file. Signed-off-by: Brent Casavant Acked-by: Jes Sorensen Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit bd8481e1646d7649fa101ee57a5139b9da3c2436 tree 6b64dfebc5c7eb36a3487f51373347341f36cac2 parent 53e4d30dd666d7f83598957ee4a415eefb47c9a6 author Doug Thompson Mon, 08 May 2006 17:06:09 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI Bus Parity Status-broken hardware attribute, EDAC foundation Currently, the EDAC (error detection and correction) modules that are in the kernel contain some features that need to be moved. After some good feedback on the PCI Parity detection code and interface (http://www.ussg.iu.edu/hypermail/linux/kernel/0603.1/0897.html) this patch ADDs an new attribute to the pci_dev structure: Namely the 'broken_parity_status' bit. When set this indicates that the respective hardware generates false positives of Parity errors. The EDAC "blacklist" solution was inferior and will be removed in a future patch. Also in this patch is a PCI quirk.c entry for an Infiniband PCI-X card which generates false positive parity errors. I am requesting comments on this AND on the possibility of a exposing this 'broken_parity_status' bit to userland via the PCI device sysfs directory for devices. This access would allow for enabling of this feature on new devices and for old devices that have their drivers updated. (SLES 9 SP3 did this on an ATI motherboard video device). There is a need to update such a PCI attribute between kernel releases. This patch just adds a storage place for the attribute and a quirk entry for a known bad PCI device. PCI Parity reaper/harvestor operations are in EDAC itself and will be refactored to use this PCI attribute instead of its own mechanisms (which are currently disabled) in the future. Signed-off-by: Doug Thompson Signed-off-by: Greg Kroah-Hartman commit 53e4d30dd666d7f83598957ee4a415eefb47c9a6 tree 3fb71e7d79e6290ea7758ae45d297912a4407ae9 parent 9c273b95808c270149e9be9e172e4ef19f5d5c98 author Rajesh Shah Wed, 03 May 2006 15:27:47 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: i386/x86_84: disable PCI resource decode on device disable When a PCI device is disabled via pci_disable_device(), it's still left decoding its BAR resource ranges even though its driver will have likely released those regions (and may even have unloaded). pci_enable_device() already explicitly enables BAR resource decode for the device being enabled. This patch disables resource decode for the PCI device being disabled, making it symmetric with the enable call. I saw this while doing something else, not because of a problem report. Still, seems to be the correct thing to do. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman commit 9c273b95808c270149e9be9e172e4ef19f5d5c98 tree 68bbd28b17e3f0d947d0d9ea61d08202c22a896d parent a1e022b3aeacf633a6c8e8f0eb04d9c9e44b4fcd author Muthu Kumar Fri, 28 Apr 2006 00:42:21 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI ACPI: Rename the functions to avoid multiple instances. There were two instances of pci_acpi_init(), one in drivers/pci/pci-acpi.c and another in arch/i386/pci/acpi.c. Rename the one in pci-acpi.c and make it consistent with other names in the same file. Signed-off-by: Muthukumar R Signed-off-by: Greg Kroah-Hartman commit a1e022b3aeacf633a6c8e8f0eb04d9c9e44b4fcd tree 55f95cedf7056a762caec8c61715bb0422c95f02 parent 9f125d30487cea72542a84b4835c037163c7f3d5 author Kristen Accardi Fri, 28 Apr 2006 11:37:38 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: don't enable device if already enabled If a device is already enabled, don't bother reenabling it. Signed-off-by: Kristen Carlson Accardi Acked-By: Arjan van de Ven Signed-off-by: Greg Kroah-Hartman commit 9f125d30487cea72542a84b4835c037163c7f3d5 tree 268a4592aaf2e6a43c82571dde4aae2cd2938100 parent 75acfecaa031c0e1bc412cee4fe58ba49ff3406c author Arjan van de Ven Sat, 29 Apr 2006 10:59:08 +0200 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: Add a "enable" sysfs attribute to the pci devices to allow userspace (Xorg) to enable devices without doing foul direct access This patch adds an "enable" sysfs attribute to each PCI device. When read it shows the "enabled-ness" of the device, but you can write a "0" into it to disable a device, and a "1" to enable it. This later is needed for X and other cases where userspace wants to enable the BARs on a device (typical example: to run the video bios on a secundary head). Right now X does all this "by hand" via bitbanging, that's just evil. This allows X to no longer do that but to just let the kernel do this. Signed-off-by: Arjan van de Ven CC: Peter Jones Acked-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 75acfecaa031c0e1bc412cee4fe58ba49ff3406c tree 39f784dcc17a093e80463163867ec0e554942453 parent ea28502d5d0fc624777a8a6b4d6865d282055b05 author Kumar Gala Mon, 01 May 2006 10:43:46 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: Add pci_assign_resource_fixed -- allow fixed address assignments PCI: Add pci_assign_resource_fixed -- allow fixed address assignments On some embedded systems the PCI address for hotplug devices are not only known a priori but are required to be at a given PCI address for other master in the system to be able to access. An example of such a system would be an FPGA which is setup from user space after the system has booted. The FPGA may be access by DSPs in the system and those DSPs expect the FPGA at a fixed PCI address. Added pci_assign_resource_fixed() as a way to allow assignment of the PCI devices's BARs at fixed PCI addresses. Signed-off-by: Kumar Gala Signed-off-by: Greg Kroah-Hartman commit ea28502d5d0fc624777a8a6b4d6865d282055b05 tree 561045b0bca2e2493bf41628dd965a8cb958f900 parent 17d6dc8ff098cc8c57941c82f7702804302b1ea1 author Bjorn Helgaas Fri, 09 Jun 2006 11:28:29 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: fix to pci ignore pre-set 64-bit bars on 32-bit platforms When we detect a 64-bit pre-set address in a BAR on a 32-bit platform, we disable it and treat it as if it had been unset, thus allowing the general address assignment code to assign a new address to it when the device is enabled. This can happen either if the firmware assigns 64-bit addresses; additionally, some cards have been found "in the wild" which do not come out of reset with all the BAR registers set to zero. Unfortunately, the patch that implemented this tested the low part of the address instead of the high part of the address. This patch fixes that. Signed-off-by: Bjorn Helgaas Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 17d6dc8ff098cc8c57941c82f7702804302b1ea1 tree 866b2243517d1dae26f1fff0986ed08f96e63baa parent 83821d3f558dc651e555d62182ed0c95651f41a6 author H. Peter Anvin Tue, 18 Apr 2006 17:19:52 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: Ignore pre-set 64-bit BARs on 32-bit platforms [pci] Ignore pre-set 64-bit BARs on 32-bit platforms Currently, Linux always rejects a device which has a pre-set 64-bit address on a 32-bit platform. On systems which do not do PCI initialization in firmware, this causes some devices which don't correctly power up with all BARs zero to fail. This patch makes the kernel automatically zero out such an address (thus treating it as if it had not been set at all, meaning it will assign an address if necessary). I have done this only for devices, not bridges. It seems potentially hazardous to do for bridges. Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman commit 83821d3f558dc651e555d62182ed0c95651f41a6 tree 60f3ae42e9b729a5061b8e4e2dce522b03e54810 parent 10083072bfabc40bc47306e512c158c57cf55c2e author Mark Maule Fri, 14 Apr 2006 16:03:54 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: altix: msi support MSI callouts for altix. Involves a fair amount of code reorg in sn irq.c code as well as adding some extensions to the altix PCI provider abstaction. Signed-off-by: Mark Maule Signed-off-by: Greg Kroah-Hartman commit 10083072bfabc40bc47306e512c158c57cf55c2e tree 2c7c3f08ae779594026e67a7a36915c2f97d73b9 parent fd58e55fcf5568e51da2ed54d7acd049c3fdb184 author Mark Maule Fri, 14 Apr 2006 16:03:49 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:59 -0700 [PATCH] PCI: per-platform IA64_{FIRST,LAST}_DEVICE_VECTOR definitions Abstract IA64_FIRST_DEVICE_VECTOR/IA64_LAST_DEVICE_VECTOR since SN platforms use a subset of the IA64 range. Implement this by making the above macros global variables which the platform can override in it setup code. Also add a reserve_irq_vector() routine used by SN to mark a vector's as in-use when that weren't allocated through assign_irq_vector(). Signed-off-by: Mark Maule Signed-off-by: Greg Kroah-Hartman commit fd58e55fcf5568e51da2ed54d7acd049c3fdb184 tree 2cf41864d66b8db39f637549d4652c7664256155 parent c34b4c734482dda750deb6089521f7c891b48736 author Mark Maule Mon, 10 Apr 2006 21:17:48 -0500 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:58 -0700 [PATCH] PCI: msi abstractions and support for altix Abstract portions of the MSI core for platforms that do not use standard APIC interrupt controllers. This is implemented through a new arch-specific msi setup routine, and a set of msi ops which can be set on a per platform basis. Signed-off-by: Mark Maule Signed-off-by: Greg Kroah-Hartman commit c34b4c734482dda750deb6089521f7c891b48736 tree 97ccfb8fcaeb5e9fb2b025794e5e72e9ba102b38 parent 789e7dc8ee6cfb7928208b077d0799d81196e9bb author Brice Goglin Tue, 09 May 2006 10:52:09 -0700 committer Greg Kroah-Hartman Wed, 21 Jun 2006 11:59:58 -0700 [PATCH] PCI: Add PCI_CAP_ID_VNDR Add the vendor-specific extended capability PCI_CAP_ID_VNDR. It will be used by the Myri-10G Ethernet driver (will be submitted soon). Signed-off-by: Brice Goglin Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 789e7dc8ee6cfb7928208b077d0799d81196e9bb tree cfaa3da3f3f919379d673819db9a27de355695dd parent 28e4b224955cbe30275b2a7842e729023a4f4b03 parent 9c64f9774805ba5d5ad4129899bdd822f61874e9 author Linus Torvalds Wed, 21 Jun 2006 11:23:13 -0700 committer Linus Torvalds Wed, 21 Jun 2006 11:23:13 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (30 commits) [PATCH] PCI Hotplug: Fix recovery path from errors during pcie_init() [PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver [PATCH] shpchp: Cleanup improper info messages [PATCH] shpchp: Remove Unused hpc_evelnt_lock [PATCH] shpchp: Cleanup interrupt polling timer [PATCH] shpchp: Cleanup SHPC commands [PATCH] shpchp: Cleanup interrupt handler [PATCH] shpchp: Remove unnecessary hpc_ctlr_handle check [PATCH] pciehp: Implement get_address callback [PATCH] pciehp: Add missing pci_dev_put [PATCH] pciehp: Replace pci_find_slot() with pci_get_slot() [PATCH] SGI Hotplug: Incorrect power status [PATCH] shpchp: Create shpchpd at controller probe time [PATCH] shpchp: Mask Global SERR and Intr at controller release time [PATCH] SHPC: Fix SHPC Contoller SERR-INT Register bits access [PATCH] SHPC: Fix SHPC Logical Slot Register bits access [PATCH] SHPC: Cleanup SHPC Logical Slot Register bits access [PATCH] SHPC: Cleanup SHPC Logical Slot Register access [PATCH] SHPC: Cleanup SHPC register access [PATCH] pciehp: Fix programming hotplug parameters ... commit 28e4b224955cbe30275b2a7842e729023a4f4b03 tree ab4d28fecc06070fc2a2742f4b4550b29de44912 parent 22ae813b85df7c0b0fc7c8d6f336d6a9f566ff97 parent 67d59dfdeb21df2c16dcd478b66177e91178ecd0 author Linus Torvalds Wed, 21 Jun 2006 11:18:25 -0700 committer Linus Torvalds Wed, 21 Jun 2006 11:18:25 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits) [SCSI] 53c700: remove reliance on deprecated cmnd fields [SCSI] hptiop: don't use cmnd->bufflen [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver [SCSI] aacraid: small misc. cleanups [SCSI] aacraid: Update supported product information [SCSI] aacraid: Fix return code interpretation [SCSI] scsi_transport_sas: fix panic in sas_free_rphy [SCSI] remove RQ_SCSI_* flags [SCSI] remove scsi_request infrastructure [SCSI] mptfusion: change driver revision to 3.03.10 [SCSI] mptfc: abort of board reset leaves port dead requiring reboot [SCSI] mptfc: fix fibre channel infinite request/response loop [SCSI] mptfc: set fibre channel fw target missing timers to one second [SCSI] mptfusion: move fc event/reset handling to mptfc [SCSI] spi transport: don't allow dt to be set on SE or HVD buses [SCSI] aic7xxx: expose the bus setting to sysfs [SCSI] scsi: remove Documentation/scsi/cpqfc.txt [SCSI] drivers/scsi: Use ARRAY_SIZE macro [SCSI] Remove last page_address from dc395x.c [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver ... Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to the sparc interrupt cleanups) commit 2191fe3e39159e3375f4b7ec1420df149f154101 tree cb196889a369cd8f1d0c0f7b936f61dc91a63f57 parent 0bb474a48e5d1ceb8e4005c7664b548c9834a784 author Kelly Daly Wed, 21 Jun 2006 13:52:55 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] re-enable OProfile for iSeries, using timer interrupt This patch removes the changes from an earlier patch that disables oProfile for iSeries within the oProfile KConfig (submitted Feb 23, 2006). Checks within the arch init for iSeries, still allowing profiling for timer interrupts (using firmware_has_feature). Signed-off-by: Kelly Daly Acked-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 0bb474a48e5d1ceb8e4005c7664b548c9834a784 tree 8ad98249b5fc854b0db2f02f7a4db5e4a9d56586 parent ccba051c373e342de240ba00d542dac67ae0eb7e author Anton Blanchard Tue, 20 Jun 2006 18:47:26 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] support ibm,extended-*-frequency properties Support the ibm,extended-*-frequency properties found in recent POWER5 firmware: cpus/PowerPC,POWER5@0/clock-frequency 59aa5880 (1504336000) cpus/PowerPC,POWER5@0/ibm,extended-clock-frequency 00000000 59aa5880 cpus/PowerPC,POWER5@0/timebase-frequency 0b354b10 (188042000) cpus/PowerPC,POWER5@0/ibm,extended-timebase-frequency 00000000 0b354b10 Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit ccba051c373e342de240ba00d542dac67ae0eb7e tree 7ee4bcffa4b500e916a3abc3a036954e73233bf1 parent d3c58fb177dc957af5cdac5ad1638d713fdb8765 author Nathan Lynch Tue, 20 Jun 2006 18:01:58 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] Extra sanity check in EEH code Don't dereference a device node that isn't there. A "shouldn't happen" case, but someone ran into it with a possibly misconfigured device tree. Signed-off-by: Nathan Lynch Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit d3c58fb177dc957af5cdac5ad1638d713fdb8765 tree e21ecac987f87343ab00763e616c242d56875744 parent 1e92a550e80fef01ebcc0bcd0896109cdb986c72 author Anton Blanchard Tue, 20 Jun 2006 18:00:30 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] Dont look for class-code in pci children Looking for class-code in PCI children breaks with direct slots. Lets just count all children. Signed-off-by: Anton Blanchard Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 1e92a550e80fef01ebcc0bcd0896109cdb986c72 tree 6cdb7bc6c6ad51644f9b899b2604d26fe7cd540b parent ddf5f75a16b3e7460ffee881795aa168dffcd0cf author Anton Blanchard Thu, 15 Jun 2006 14:11:22 +1000 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] Fix mdelay badness on shared processor partitions On partitioned PPC64 systems where a partition is given 1/10 of a processor, we have seen mdelay() delaying for 10 times longer than it should. The reason is that the generic mdelay(n) does n delays of 1 millisecond each. However, with 1/10 of a processor, we only get a one-millisecond timeslice every 10ms. Thus each 1 millisecond delay loop ends up taking 10ms elapsed time. The solution is just to use the PPC64 udelay function, which uses the timebase to ensure that the delay is based on elapsed time rather than how much processing time the partition has been given. (Yes, the generic mdelay uses the PPC64 udelay, but the problem is that the start time gets reset every millisecond, and each time it gets reset we lose another 9ms.) Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras Acked-by: Andrew Morton commit ddf5f75a16b3e7460ffee881795aa168dffcd0cf tree 28149044321f1f7e39a957b3eed3cc6537229536 parent 72abd54035a3d71fd8f02596e659257e8bba16ca author Arnd Bergmann Tue, 20 Jun 2006 02:30:33 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:33 +1000 [POWERPC] disable floating point exceptions for init Floating point exceptions should not be enabled by default, as this setting impacts the performance on some CPUs, in particular the Cell BE. Since the bits are inherited from parent processes, the place to change the default is the thread struct used for init. glibc sets this up correctly per thread in its fesetenv function, so user space should not be impacted by this setting. None of the other common libc implementations (uClibc, dietlibc, newlib, klibc) has support for fp exceptions, so they are unlikely to be hit by this either. There is a small risk that somebody wrote their own application that manually sets the fpscr bits instead of calling fesetenv, without changing the MSR bits as well. Those programs will break with this change. It probably makes sense to change glibc in the future to be more clever about FE bits, so that when running on a CPU where this is expensive, it disables exceptions ASAP, while it keeps them enabled on CPUs where running with exceptions on is cheaper than changing the state often. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 72abd54035a3d71fd8f02596e659257e8bba16ca tree 006ddd84ad8d7290bbadccd15633be0d36737c25 parent 868ea0c9256b658b14603e1ad7361b81b92ccacd author Andreas Schwab Mon, 19 Jun 2006 22:45:04 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] Unify ppc syscall tables Avoid duplication of the syscall table for the cell platform. Based on an idea from David Woodhouse. Signed-off-by: Andreas Schwab Acked-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 868ea0c9256b658b14603e1ad7361b81b92ccacd tree 6d080ba156f8098277329f26f1d4e3a73cae2093 parent 0aa8d15b01881ccaab5f2fb31eef33ced97ccb5f author Mark A. Greer Tue, 20 Jun 2006 14:15:36 -0700 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] mpic: add support for serial mode interrupts On Tue, Jun 20, 2006 at 02:01:26PM +1000, Benjamin Herrenschmidt wrote: > On Mon, 2006-06-19 at 13:08 -0700, Mark A. Greer wrote: > > MPC10x-style interrupt controllers have a serial mode that allows > > several interrupts to be clocked in through one INT signal. > > > > This patch adds the software support for that mode. > > You hard code the clock ratio... why not add a separate call to be > called after mpic_init, > something like mpic_set_serial_int(int mpic, int enable, int > clock_ratio) ? How's this? -- MPC10x-style interrupt controllers have a serial mode that allows several interrupts to be clocked in through one INT signal. This patch adds the software support for that mode. Signed-off-by: Mark A. Greer -- arch/powerpc/sysdev/mpic.c | 20 ++++++++++++++++++++ include/asm-powerpc/mpic.h | 10 ++++++++++ 2 files changed, 30 insertions(+) -- Signed-off-by: Paul Mackerras commit 0aa8d15b01881ccaab5f2fb31eef33ced97ccb5f tree 398d2b5c20d56073ade09e2e3bc1032bf6130324 parent 379507181a1e330d4f5b0fabe61cd43eccf09763 author Linas Vepstas Mon, 19 Jun 2006 15:07:40 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] pseries: Print PCI slot location code on failure The PCI error recovery code will printk diagnostic info when a PCI error event occurs. Change the messages to include the slot location code, which is how most sysadmins will know the device. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit 379507181a1e330d4f5b0fabe61cd43eccf09763 tree dc986704087a40854a9f8a386d125627b20dee14 parent c983294872ebccd4aacf1b8dd694ac2170feadc3 author arnd@arndb.de Mon, 19 Jun 2006 20:33:35 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] spufs: one more fix for 64k pages The SPU context save/restore code is currently built for a 4k page size and we provide a _shipped version of it since most people don't have the spu toolchain that is needed to rebuild that code. This patch hardcodes the data structures to a 64k page alignment, which also guarantees 4k alignment but unfortunately wastes 60k of memory per SPU context that is created in the running system. We will follow up on this with another patch to reduce that overhead or maybe redo the context save/restore logic to do this part entirely different, but for now it should make experimental systems work with either page size. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit c983294872ebccd4aacf1b8dd694ac2170feadc3 tree 529c3bc88a9ff10536ffdbf0936c3af2f193bac6 parent ba723fe2b2facc8d45b53701fec39aa429596759 author arnd@arndb.de Mon, 19 Jun 2006 20:33:34 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] spufs: fail spu_create with invalid flags At this time, all flags are invalid. Since we are planning to actually add valid flags in the future, we better check if any were passed by the user. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ba723fe2b2facc8d45b53701fec39aa429596759 tree 637c2ed713cbfa712d4306f98a43656379e1c5ba parent 6e18b27bd0911d4d2495c6fdeeac0c047d915300 author Masato Noguchi Mon, 19 Jun 2006 20:33:33 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:32 +1000 [POWERPC] spufs: clear class2 interrupt status before wakeup SPU interrupt status must be cleared before handle it. Otherwise, kernel may drop some interrupt packet. Currently, class2 interrupt treated like: 1) call callback to wake up waiting process 2) mask raised mailbox interrupt 3) clear interrupt status I changed like: 1) mask raised mailbox interrupt 2) clear interrupt status 3) call callback to wake up waiting process Clearing status before masking will make spurious interrupt. Thus, it is necessary to hold by steps I described above, I think. Signed-off-by: Masato Noguchi Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 6e18b27bd0911d4d2495c6fdeeac0c047d915300 tree a25ddde6b31ca7872d95710e4cd425cbd27e5f2b parent 2eabbbd33ec39f690005aa186c57476598edc6b3 author Masato Noguchi Mon, 19 Jun 2006 20:33:32 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: fix Makefile for "make clean" added spu_{save,restore}_dump.h to target of 'make clean' Signed-off-by: Masato Noguchi Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 2eabbbd33ec39f690005aa186c57476598edc6b3 tree abee6e62227111cfd961c7cf3bf692519837c380 parent a91942ae7ebd518006dcbeb2a1d7b147253c080e author Masato Noguchi Mon, 19 Jun 2006 20:33:31 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: remove stop_code from struct spu This patch remove 'stop_code' -- discarded member of struct spu. It is written at initialize and interrupt, but never read in current implementation. Signed-off-by: Masato Noguchi Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit a91942ae7ebd518006dcbeb2a1d7b147253c080e tree 74a923f4847495b509089d92010c42c0cb123f4a parent 540270d82db943855538cea5d0c790e7e669dda0 author Geoff Levand Mon, 19 Jun 2006 20:33:30 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: fix spu irq affinity setting This changes the hypervisor abstraction of setting cpu affinity to a higher level to avoid platform dependent interrupt controller routines. I replaced spu_priv1_ops:spu_int_route_set() with a new routine spu_priv1_ops:spu_cpu_affinity_set(). As a by-product, this change eliminated what looked like an existing bug in the set affinity code where spu_int_route_set() mistakenly called int_stat_get(). Signed-off-by: Geoff Levand Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 540270d82db943855538cea5d0c790e7e669dda0 tree e13b8194d8781b2f5d3bf6566a8d96ecc943f8f3 parent c01ea72a3b8abb7baa4291a1876b82599867035a author Geoff Levand Mon, 19 Jun 2006 20:33:29 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: further abstract priv1 register access To support muti-platform binaries the spu hypervisor accessor routines must have runtime binding. I removed the existing statically linked routines in spu.h and spu_priv1_mmio.c and created new accessor routines in spu_priv1.h that operate indirectly through an ops struct spu_priv1_ops. spu_priv1_mmio.c contains the instance of the accessor routines for running on raw hardware. Signed-off-by: Geoff Levand Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit c01ea72a3b8abb7baa4291a1876b82599867035a tree 0ba10d699df09db0b35d5aaea4a654a5d0b216d7 parent e46a0237fda640f02bc4cb3d9702b6ee91bfd6e4 author Geoff Levand Mon, 19 Jun 2006 20:33:28 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts Creates new config variables PPC_CELL_NATIVE and PPC_IBM_CELL_BLADE. The existing CONFIG_PPC_CELL is now used to denote the generic Cell processor support. PPC_CELL = make descends into platforms/cell PPC_CELL_NATIVE = add bare metal support PPC_IBM_CELL_BLADE = add blade device drivers, etc. Also renames spu_priv1.c to spu_priv1_mmio.c. Signed-off-by: Geoff Levand Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit e46a0237fda640f02bc4cb3d9702b6ee91bfd6e4 tree b61fd03a0eeb727da423cd6cfe5c20a666caa08c parent ecec21770d87a5035cfd210cfdb22e1935b0c4a6 author arnd@arndb.de Mon, 19 Jun 2006 20:33:27 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:31 +1000 [POWERPC] spufs: dont try to access SPE channel 1 count The save/restore sequence for SPE contexts currently attempts to save and restore the channel count for SPE channel 1 (the SPU_WriteEventMask channel. But the CBE architecture (section 9.11.2) clearly states that this channel does not have an associated count. Hardware simply ignores the attempt to write this count, but the simulator generates a warning message. WARNING: 279721590: SPE7: Attempt to write channel count for CH 1 with no associated count is ignored. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ecec21770d87a5035cfd210cfdb22e1935b0c4a6 tree 889884e4dd6ca476686197846a90f8bd551a3521 parent 970f1baae78ff99b7536464214d4c78dde4551e2 author Jeremy Kerr Mon, 19 Jun 2006 20:33:26 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: use kzalloc in create_spu Clean up create_spu() a little by using kzalloc instead of kmalloc + assignments. Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 970f1baae78ff99b7536464214d4c78dde4551e2 tree cc4ac218ea913c0aa36e4df3f80c9874604c55e1 parent 7b1a701480fb17b7f78b95b257bfc90a4f949d04 author arnd@arndb.de Mon, 19 Jun 2006 20:33:25 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: fix initial state of wbox file The wbox channel count of an spu is now initialized to four for the saved context. This makes it possible to write to the mailbox right away without waiting for the SPE to become scheduled first. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 7b1a701480fb17b7f78b95b257bfc90a4f949d04 tree 658ea67f2b96a174b90a3de52e2251a4471c2dc4 parent 724bd80e8102ac137868b23fad2b06af65f8e168 author arnd@arndb.de Mon, 19 Jun 2006 20:33:24 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: add a phys-id attribute to each SPU context For performance analysis, it is often interesting to know which physical SPE a thread is currently running on, and, more importantly, if it is running at all. This patch adds a simple attribute to each SPU directory with that information. The attribute is read-only and called 'phys-id'. It contains an ascii string with the number of the physical SPU (e.g. "0x5"), or alternatively the string "0xffffffff" (32 bit -1) when it is not running at all at the time that the file is read. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 724bd80e8102ac137868b23fad2b06af65f8e168 tree 768d32aa894a06abec676e26088b44072ce817bf parent 0309f02d8e1b68811e513bdd06015672d0696af5 author arnd@arndb.de Mon, 19 Jun 2006 20:33:23 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: set up correct SLB entries for 64k pages spufs currently knows only 4k pages and 16M hugetlb pages. Make it use the regular methods for deciding on the SLB bits. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 0309f02d8e1b68811e513bdd06015672d0696af5 tree 81e73d666fecdf50264f86a6eda98073cb9f0494 parent d9379c4bcee7046182edf45eeab349334421416e author Michael Ellerman Mon, 19 Jun 2006 20:33:22 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: fix deadlock in spu_create error path spufs_rmdir tries to acquire the spufs root i_mutex, which is already held by spufs_create_thread. This was tracked as Bug #H9512. Signed-off-by: Michael Ellerman Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit d9379c4bcee7046182edf45eeab349334421416e tree da337ebe3f683b5717a591175376e4426f908072 parent 91edfa49b97f0b0fafac5c8d5f171fc183782ce6 author arnd@arndb.de Mon, 19 Jun 2006 20:33:21 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] spufs: restore mapping of mssync register A recent change to the way that the mfc file gets mapped made it impossible to map the SPE Multi-Source Synchronization register into user space, but that may be needed by some applications. This restores the missing functionality. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 91edfa49b97f0b0fafac5c8d5f171fc183782ce6 tree 64737a0eb2e3594fcd1c619f5a04810aa5be5a8b parent 1d64093f6627a7eef1ed0fe005463f0a5ea25a5f author arnd@arndb.de Mon, 19 Jun 2006 20:33:20 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:30 +1000 [POWERPC] cell: always build spu base into the kernel The spu_base module is rather deeply intermixed with the core kernel, so it makes sense to have that built-in. This will let us extend the base in the future without having to export more core symbols just for it. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 1d64093f6627a7eef1ed0fe005463f0a5ea25a5f tree faa57ae7e34dd45b843161c233a59a15fe6ddaf1 parent 0f0f90c304b42d8ce7fc5958de894bdcff3a0ca1 author Jeremy Kerr Mon, 19 Jun 2006 20:33:19 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] cell: register SPUs as sysdevs SPUs are registered as system devices, exposing attributes through sysfs. Since the sysdev includes a kref, we can remove the one in struct spu (it isn't used at the moment anyway). Currently only the interrupt source and numa node attributes are added. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit 0f0f90c304b42d8ce7fc5958de894bdcff3a0ca1 tree 2cc6131da89ac3d38f211d22c2ba7886e6d150cb parent b40feec8efbe609a3a38bca1f18d3ba4d590563a author arnd@arndb.de Mon, 19 Jun 2006 20:33:18 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] cell: update defconfig Enable some of the most requested features in defconfig and refresh with the latest powerpc.git Kconfig files. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit b40feec8efbe609a3a38bca1f18d3ba4d590563a tree 6c2163a85a1c26250f1fd66692fbdb745b126681 parent acf7d76827a577059636e949079021e6af6dd702 author arnd@arndb.de Mon, 19 Jun 2006 20:33:17 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] cell: fix interrupt priority handling Checking the priority field to test for irq validity is completely bogus and breaks with future external interrupt controllers. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit acf7d76827a577059636e949079021e6af6dd702 tree 283e94488c79e75dd3df9a376e1e8a27a69e26ec parent ef82a306b46dbedaecbb154b24d05dfab937df35 author Benjamin Herrenschmidt Mon, 19 Jun 2006 20:33:16 +0200 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] cell: add RAS support This is a first version of support for the Cell BE "Reliability, Availability and Serviceability" features. It doesn't yet handle some of the RAS interrupts (the ones described in iic_is/iic_irr), I'm still working on a proper way to expose these. They are essentially a cascaded controller by themselves (sic !) though I may just handle them locally to the iic driver. I need also to sync with David Erb on the way he hooked in the performance monitor interrupt. So that's all for 2.6.17 and I'll do more work on that with my rework of the powerpc interrupt layer that I'm hacking on at the moment. Signed-off-by: Arnd Bergmann Signed-off-by: Paul Mackerras commit ef82a306b46dbedaecbb154b24d05dfab937df35 tree 04636c51f544b46b5562fe153538ad4638bcdc3f parent 2097c7f04af7fb962ab8676ed8083f350ed885f7 author Jon Loeliger Sat, 17 Jun 2006 17:52:55 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] Add Vitesse 8244 PHY for MPC8641 HPCN platform. Signed-off-by: Kriston Carson Signed-off-by: Xianghua Xiao Signed-off-by: Jon Loeliger Acked-by: Jeff Garzik Signed-off-by: Paul Mackerras commit 2097c7f04af7fb962ab8676ed8083f350ed885f7 tree 9114ad228b7ad71ac349d4c499059da2a4a3c806 parent 6b543404058a5ffdca8c48e95e0b8a69bb4bdba9 author Jon Loeliger Sat, 17 Jun 2006 17:52:54 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:29 +1000 [POWERPC] Document I2C_MPC option for 86xx too. The same I2C driver found on 85xx, etc., can be used for 86xx too. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 6b543404058a5ffdca8c48e95e0b8a69bb4bdba9 tree 0bde02196ca8de01df257679ddfc6ae66404472b parent b809b3e86f39651475b30ceb1caf535071534d4d author Jon Loeliger Sat, 17 Jun 2006 17:52:51 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add 8641 Register space and IRQ definitions. Signed-off-by: Jeff Brown Signed-off-by: Xianghua Xiao Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit b809b3e86f39651475b30ceb1caf535071534d4d tree 712cc40ccca8871df5c113142880e73a9828dcc9 parent 4ca4b6274c30d53d22014fb6974efe2b3e52cfdc author Jon Loeliger Sat, 17 Jun 2006 17:52:48 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add mpc8641hpcn PCI/PCI-Express platform files. Signed-off-by: Xianghua Xiao Signed-off-by: Wei Zhang Signed-off-by: Haiying Wang Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 4ca4b6274c30d53d22014fb6974efe2b3e52cfdc tree f02451f8c52a056829e4bbe681f2cf3c3f4f2bf4 parent ee0339f205d60375c5ce1653c0dc318c6ec72668 author Jon Loeliger Sat, 17 Jun 2006 17:52:45 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add the MPC8641 HPCN platform files. Signed-off-by: Xianghua Xiao Signed-off-by: Haiying Wang Signed-off-by: Wei Zhang Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit ee0339f205d60375c5ce1653c0dc318c6ec72668 tree 8c4e46f6645224d88b26fed0a8c5ff031f233952 parent 9674ed38d8e4a9ce15c61b4306ef803cad0e1dc0 author Jon Loeliger Sat, 17 Jun 2006 17:52:44 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add starting of secondary 86xx CPUs. Clear the high BATS during load_up_mmu if FTR_HAS_HIGH_BATS. Allow just a bit more time for secondary CPUs to phone home. Signed-off-by: Wei Zhang Signed-off-by: Haiying Wang Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 9674ed38d8e4a9ce15c61b4306ef803cad0e1dc0 tree 62311e5a6ed874f4c6b87e6e4bb12af6fb0ec4fb parent 96abe9358becb543c21121699c711897374bcbdf author Jon Loeliger Sat, 17 Jun 2006 17:52:40 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add 8641 CPU table entry. Signed-off-by: Wei Zhang Signed-off-by: Xianghua Xiao Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 96abe9358becb543c21121699c711897374bcbdf tree 1f1aeb1730f31a9d99ee7d58f6627002f7bc0a77 parent c9b484b5c1201321f40b04870e8b417033b6fe76 author Jon Loeliger Sat, 17 Jun 2006 17:52:37 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:28 +1000 [POWERPC] Add mpc8641_hpcn_defconfig config file. Signed-off-by: Jon Loeliger Signed-off-by: Haiying Wang Signed-off-by: Paul Mackerras commit c9b484b5c1201321f40b04870e8b417033b6fe76 tree cddf9f91d9d8b5e42e6cc74865ed6596a78df391 parent 8a30088794ff426cd3e21557db8f3d2687ac6695 author Jon Loeliger Sat, 17 Jun 2006 17:52:35 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:27 +1000 [POWERPC] Add the mpc8641 hpcn Kconfig and Makefiles. Signed-off-by: Xianghua Xiao Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 8a30088794ff426cd3e21557db8f3d2687ac6695 tree c6265fec921408ba689ef6c0e59236c88149c52c parent 2198c070498850c16d65c09bc587e3f5042126ef author Jon Loeliger Sat, 17 Jun 2006 17:51:09 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:27 +1000 [POWERPC] Prevent duplicate lmb reservations for Device Tree blob. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 2198c070498850c16d65c09bc587e3f5042126ef tree 4bc2cb0f7defd3f8e941195ce6de13d4d25ab2b0 parent 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db author Jon Loeliger Sat, 17 Jun 2006 17:49:42 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:27 +1000 [POWERPC] Guard L3CR references with CPU_FTR_L3CR. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit 7932f0b82ff1db35a5ed8d5825d51cafe15fa6db tree dea2b59f7a485a858187d57f61334da9330e6d25 parent 2ba73b1d6fa62ddaa235c3c5fdf6095cae6ba748 author John Rose Thu, 15 Jun 2006 17:32:15 -0500 committer Paul Mackerras Wed, 21 Jun 2006 15:01:27 +1000 [POWERPC] RTAS delay, fix module build breaks Export both news RTAS delay functions, and change the scanlog module to use the new delay functions. Signed-off-by: John Rose Signed-off-by: Paul Mackerras commit 22ae813b85df7c0b0fc7c8d6f336d6a9f566ff97 tree 0c7d3ecf772be41facaffdda60b037d1e31c8e98 parent 34641a58a227e498adf471ab016bd054cc399d7e author Brice Goglin Tue, 20 Jun 2006 20:03:02 -0700 committer Linus Torvalds Tue, 20 Jun 2006 20:24:58 -0700 [PATCH] add __iowrite64_copy Introduce __iowrite64_copy. It will be used by the Myri-10G Ethernet driver to post requests to the NIC. This driver will be submitted soon. __iowrite64_copy copies to I/O memory in units of 64 bits when possible (on 64 bit architectures). It reverts to __iowrite32_copy on 32 bit architectures. Signed-off-by: Brice Goglin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34641a58a227e498adf471ab016bd054cc399d7e tree da1e0af965d06d0c6e13c546ac01f6a54a904d86 parent 2eec0e0842ef747027eb9181d5f50d7157184d57 parent 7136b8073f0123918e3e50269ae021bbb09e1a81 author Linus Torvalds Tue, 20 Jun 2006 20:01:16 -0700 committer Linus Torvalds Tue, 20 Jun 2006 20:01:16 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6: (28 commits) eth1394: replace __constant_htons by htons ieee1394: adjust code formatting in highlevel.c ieee1394: hl_irqs_lock is taken in hardware interrupt context ieee1394_core: switch to kthread API ieee1394: sbp2: Kconfig fix ieee1394: add preprocessor constant for invalid csr address sbp2: fix deregistration of status fifo address space [PATCH] eth1394: endian fixes Fix broken suspend/resume in ohci1394 sbp2: use __attribute__((packed)) for on-the-wire structures sbp2: provide helptext for CONFIG_IEEE1394_SBP2_PHYS_DMA and mark it experimental Update feature removal of obsolete raw1394 ISO requests. sbp2: fix S800 transfers if phys_dma is off sbp2: remove ohci1394 specific constant ohci1394: make phys_dma parameter read-only ohci1394: set address range properties ieee1394: extend lowlevel API for address range properties sbp2: log number of supported concurrent logins sbp2: remove manipulation of inquiry response ieee1394: save RAM by using a single tlabel for broadcast transactions ... commit 2eec0e0842ef747027eb9181d5f50d7157184d57 tree 57756b7d0420833c5e46bd0635ac278d24888b84 parent 6b41fd1785f4effe2f3bd40da864415812f5b8c9 author Cedric Le Goater Mon, 19 Jun 2006 21:10:44 -0700 committer Linus Torvalds Tue, 20 Jun 2006 19:55:53 -0700 [PATCH] s390: add __raw_writeq required by __iowrite64_copy It also adds all the related quad routines. Signed-off-by: Cedric Le Goater Acked-by: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b41fd1785f4effe2f3bd40da864415812f5b8c9 tree 465b955a8055639828ef64bc963ddead4e44d3c8 parent 58dfd9c16e88b9d790e7df8f2c5b03b7887db54c author Linus Torvalds Tue, 20 Jun 2006 19:44:03 -0700 committer Linus Torvalds Tue, 20 Jun 2006 19:44:03 -0700 Fix up CFQ scheduler for recent rbtree node shrinkage The color is now in the low bits of the parent pointer, and initializing it to 0 happens as part of the whole memset above, so just remove the unnecessary RB_CLEAR_COLOR. Signed-off-by: Linus Torvalds commit 58dfd9c16e88b9d790e7df8f2c5b03b7887db54c tree c2df549913133d9885a182b926c76fa34a79f78d parent 050335db2a777ffaa859d77beb05fffe9e8c5ae9 author Herbert Xu Wed, 21 Jun 2006 10:53:54 +1000 committer Linus Torvalds Tue, 20 Jun 2006 17:57:28 -0700 [FORCEDETH] Fix xmit_lock/netif_tx_lock after merge There has been an update to the forcedeth driver that added a few new uses of xmit_lock which is no longer meant to be used directly. This patch replaces them with netif_tx_lock_bh. Signed-off-by: Herbert Xu Signed-off-by: Linus Torvalds commit 050335db2a777ffaa859d77beb05fffe9e8c5ae9 tree 6f1fb3e3477de613b4adac8c46bd6e86301ed8ae parent a4cfae13cef6a700a04b13ba1d819c0641b1b26f parent 905f14672e6d0552bfde954d5f7adb5f2c7a7960 author Linus Torvalds Tue, 20 Jun 2006 17:52:36 -0700 committer Linus Torvalds Tue, 20 Jun 2006 17:52:36 -0700 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (42 commits) [ARM] Fix tosa build error [ARM] 3610/1: Make reboot work on Versatile [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig [ARM] 3591/1: Anubis: IDE device definitions [ARM] Include asm/hardware.h not asm/arch/hardware.h [ARM] 3594/1: Poodle: Add touchscreen support + other updates [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters [ARM] 3561/1: Poodle: Correct the MMC/SD power control [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds [ARM] 3599/1: AT91RM9200 remove global variables [ARM] 3607/1: AT91RM9200 misc fixes [ARM] 3605/1: AT91RM9200 Power Management [ARM] 3604/1: AT91RM9200 New boards [ARM] 3603/1: AT91RM9200 remove old files [ARM] 3592/1: AT91RM9200 Serial driver update [ARM] 3590/1: AT91RM9200 Platform devices support [ARM] 3589/1: AT91RM9200 DK/EK board update [ARM] 3588/1: AT91RM9200 CSB337/637 board update [ARM] 3587/1: AT91RM9200 hardware headers [ARM] 3586/1: AT91RM9200 header update ... commit a4cfae13cef6a700a04b13ba1d819c0641b1b26f tree 91aa4f8be6df4494276d1a064d9f8f2b994aa367 parent be883da7594b0a2a02074e683673ae0e522566a4 parent ff7512e1a2a3504649d3716a757f43807b6d26ef author Linus Torvalds Tue, 20 Jun 2006 17:39:53 -0700 committer Linus Torvalds Tue, 20 Jun 2006 17:39:53 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [ATM]: fix broken uses of NIPQUAD in net/atm [SCTP]: sctp_unpack_cookie() fix [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG [NET]: Prevent multiple qdisc runs [CONNECTOR]: Initialize subsystem earlier. [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length commit be883da7594b0a2a02074e683673ae0e522566a4 tree b62f2a8a069fb4d389935c0b2de9bc78798f50c2 parent 077e98945db7e54a9865b5f29a1f02f531eca414 parent 4c5eb38af2131d867842cdd09fa83a3ed77bfd26 author Linus Torvalds Tue, 20 Jun 2006 17:39:28 -0700 committer Linus Torvalds Tue, 20 Jun 2006 17:39:28 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Update defconfig. [SPARC64]: Don't double-export synchronize_irq. [SPARC64]: Move over to GENERIC_HARDIRQS. [SPARC64]: Virtualize IRQ numbers. [SPARC64]: Kill ino_bucket->pil [SPARC]: Kill __irq_itoa(). [SPARC64]: bp->pil can never be zero [SPARC64]: Send all device interrupts via one PIL. [SPARC]: Fix iommu_flush_iotlb end address [SPARC]: Mark smp init functions as cpuinit [SPARC]: Add missing rw can_lock macros [SPARC]: Setup cpu_possible_map [SPARC]: Add topology_init() commit 077e98945db7e54a9865b5f29a1f02f531eca414 tree bb24d180075a2d5ac35bd0d893bdc867405bee03 parent d9eaec9e295a84a80b663996d0489fcff3a1dca9 parent 92af11cdec410f5de4e8d702d24e1672ce26a1f6 author Linus Torvalds Tue, 20 Jun 2006 15:38:12 -0700 committer Linus Torvalds Tue, 20 Jun 2006 15:38:12 -0700 Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird * 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird: [PATCH] missing readb/readw in rio [PATCH] copy_to_user() from iomem is a bad thing [PATCH] forgotten swap of copyout() arguments [PATCH] handling rio MEMDUMP [PATCH] fix rio_copy_to_card() for OLDPCI case [PATCH] uses of ->Copy() in rioroute are bogus [PATCH] bogus order of copy_from_user() arguments [PATCH] rio ->Copy() expects the sourse as first argument [PATCH] trivial annotations in rio commit d9eaec9e295a84a80b663996d0489fcff3a1dca9 tree 85cfc09bb5f0eb42d3be7dfbddaad31353307796 parent cee4cca740d209bcb4b9857baa2253d5ba4e3fbe parent 41757106b9ca7867dafb2404d618f947b4786fd7 author Linus Torvalds Tue, 20 Jun 2006 15:37:56 -0700 committer Linus Torvalds Tue, 20 Jun 2006 15:37:56 -0700 Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current * 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: (25 commits) [PATCH] make set_loginuid obey audit_enabled [PATCH] log more info for directory entry change events [PATCH] fix AUDIT_FILTER_PREPEND handling [PATCH] validate rule fields' types [PATCH] audit: path-based rules [PATCH] Audit of POSIX Message Queue Syscalls v.2 [PATCH] fix se_sen audit filter [PATCH] deprecate AUDIT_POSSBILE [PATCH] inline more audit helpers [PATCH] proc_loginuid_write() uses simple_strtoul() on non-terminated array [PATCH] update of IPC audit record cleanup [PATCH] minor audit updates [PATCH] fix audit_krule_to_{rule,data} return values [PATCH] add filtering by ppid [PATCH] log ppid [PATCH] collect sid of those who send signals to auditd [PATCH] execve argument logging [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES [PATCH] audit_panic() is audit-internal [PATCH] inotify (5/5): update kernel documentation ... Manual fixup of conflict in unclude/linux/inotify.h commit 905f14672e6d0552bfde954d5f7adb5f2c7a7960 tree 0793fd04f21f18990fbb3ae9fb6a7cbb51c59c26 parent 4af6fee18822d012a15b4c9b8992e1f2793dfe0b author Russell King Tue, 20 Jun 2006 23:27:37 +0100 committer Russell King Tue, 20 Jun 2006 23:27:37 +0100 [ARM] Fix tosa build error tosa.c references mdelay(), but was missing linux/delay.h Signed-off-by: Russell King commit cee4cca740d209bcb4b9857baa2253d5ba4e3fbe tree 88a23004393ea4a32cad79839479c8e653e401d6 parent 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 parent 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 author Linus Torvalds Tue, 20 Jun 2006 15:10:08 -0700 committer Linus Torvalds Tue, 20 Jun 2006 15:10:08 -0700 Merge git://git.infradead.org/hdrcleanup-2.6 * git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add to headers included for userspace in Move inclusion of out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include and use __uXX types in Use __uXX types in , include too Remove private struct dx_hash_info from public view in Include and use __uXX types in Use __uXX types in for struct divert_blk et al. Use __u32 for elf_addr_t in , not u32. It's user-visible. Remove PPP_FCS from user view in , remove __P mess entirely Use __uXX types in user-visible structures in Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of from Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h commit 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 tree e7be2cf442626316b6b6fb212960fe1f77ff2725 parent be967b7e2f7747a5ebf2a07ee627d9338491e784 parent 2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142 author Linus Torvalds Tue, 20 Jun 2006 14:51:22 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:51:22 -0700 Merge git://git.infradead.org/~dwmw2/rbtree-2.6 * git://git.infradead.org/~dwmw2/rbtree-2.6: [RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency Update UML kernel/physmem.c to use rb_parent() accessor macro [RBTREE] Update hrtimers to use rb_parent() accessor macro. [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node. [RBTREE] Merge colour and parent fields of struct rb_node. [RBTREE] Remove dead code in rb_erase() [RBTREE] Update JFFS2 to use rb_parent() accessor macro. [RBTREE] Update eventpoll.c to use rb_parent() accessor macro. [RBTREE] Update key.c to use rb_parent() accessor macro. [RBTREE] Update ext3 to use rb_parent() accessor macro. [RBTREE] Change rbtree off-tree marking in I/O schedulers. [RBTREE] Add accessor macros for colour and parent fields of rb_node commit be967b7e2f7747a5ebf2a07ee627d9338491e784 tree f42b82601209a52b8ee478e36d8b21543ab03060 parent eef11427edcb821b63920219f89379fab84198b9 parent 7bc3312bef4d6f220812500c0de7868fb7625a41 author Linus Torvalds Tue, 20 Jun 2006 14:50:31 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:50:31 -0700 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: (199 commits) [MTD] NAND: Fix breakage all over the place [PATCH] NAND: fix remaining OOB length calculation [MTD] NAND Fixup NDFC merge brokeness [MTD NAND] S3C2410 driver cleanup [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation. [JFFS2] Check CRC32 on dirent and data nodes each time they're read [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space [JFFS2] Mark XATTR support as experimental, for now [JFFS2] Don't trust node headers before the CRC is checked. [MTD] Restore MTD_ROM and MTD_RAM types [MTD] assume mtd->writesize is 1 for NOR flashes [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles [MTD] Prepare physmap for 64-bit-resources [JFFS2] Fix more breakage caused by janitorial meddling. [JFFS2] Remove stray __exit from jffs2_compressors_exit() [MTD] Allow alternate JFFS2 mount variant for root filesystem. [MTD] Disconnect struct mtd_info from ABI [MTD] replace MTD_RAM with MTD_GENERIC_TYPE [MTD] replace MTD_ROM with MTD_GENERIC_TYPE [MTD] remove a forgotten MTD_XIP ... commit eef11427edcb821b63920219f89379fab84198b9 tree 6a2863d3b2794958e30742bfb073a38e475989ae parent c9ab09710ecb071031b0a04f3f9d7e686c0a75e0 parent 14228a49913850493c7f9eb4501438c32da353f7 author Linus Torvalds Tue, 20 Jun 2006 14:49:45 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:49:45 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI commit c9ab09710ecb071031b0a04f3f9d7e686c0a75e0 tree 4c270fb2390392d44426ab7551f0fa0215e1def4 parent ff9144530e9cfe8923e00172e3f8ff83c3b8ff8b parent 12223dabc617a4babfba4e17feb1ed88e8cfeb8f author Linus Torvalds Tue, 20 Jun 2006 14:49:29 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:49:29 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-mmc * master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Add (MMC) to entry in MAINTAINERS file [MMC] sdhci truncated pointer fix commit ff9144530e9cfe8923e00172e3f8ff83c3b8ff8b tree c64a9528dde590b9f3174125ad361f46ee30bba8 parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f parent 96ce2385dd2817da549910001a69ac0a2762a1b9 author Linus Torvalds Tue, 20 Jun 2006 14:49:00 -0700 committer Linus Torvalds Tue, 20 Jun 2006 14:49:00 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits) [ARM] 3559/1: S3C2442: core and serial port [ARM] 3557/1: S3C24XX: centralise and cleanup uart registration [ARM] 3558/1: SMDK24XX: LED platform devices [ARM] 3534/1: add spi support to lubbock platform [ARM] 3554/1: ARM: Fix dyntick locking [ARM] 3553/1: S3C24XX: earlier print of cpu idcode info [ARM] 3552/1: S3C24XX: Move VA of GPIO for low-level debug [ARM] 3551/1: S3C24XX: PM code failes to compile with CONFIG_DCACHE_WRITETHROUGH [ARM] 3550/1: OSIRIS: fix serial port map for 1:1 [ARM] 3548/1: Fix the ARMv6 CPU id in compressed/head.S [ARM] 3335/1: Old-abi Thumb sys_syscall broken [ARM] 3467/1: [3/3] Support for Philips PNX4008 platform: defconfig [ARM] 3466/1: [2/3] Support for Philips PNX4008 platform: chip support [ARM] 3465/1: [1/3] Support for Philips PNX4008 platform: headers [ARM] 3407/1: lpd7x: documetation update [ARM] 3406/1: lpd7x: compilation fix for smc91x [ARM] 3405/1: lpd7a40x: CPLD ssp driver [ARM] 3404/1: lpd7a40x: AMBA CLCD support [ARM] 3403/1: lpd7a40x: updated default configurations [ARM] 3402/1: lpd7a40x: serial driver bug fix ... commit 4af6fee18822d012a15b4c9b8992e1f2793dfe0b tree 99223edd72ba52b0bc1ba87717e525b07d79d24b parent 098a4cb7c0c9bdd86e9d99f607e9f31206a914eb author Deepak Saxena Tue, 20 Jun 2006 21:30:44 +0100 committer Russell King Tue, 20 Jun 2006 21:30:44 +0100 [ARM] 3610/1: Make reboot work on Versatile Patch from Deepak Saxena This patch makes soft reboot work on the Versatile board. Thanks to Catalin Marinas @ ARM for pointing out the proper way to do this. Signed-off-by: Deepak Saxena Signed-off-by: Russell King commit 098a4cb7c0c9bdd86e9d99f607e9f31206a914eb tree fe96c6b220bdf09f691c0d82865572e1e1b2a456 parent ea75ee9ab8835ece099589c729574aa8aa94c0a6 parent ec57b709c3dc2e8b7643c51fc4c3fdae42b29be2 author Russell King Tue, 20 Jun 2006 20:57:34 +0100 committer Russell King Tue, 20 Jun 2006 20:57:34 +0100 Merge S3Cxxxx branch commit 7bc3312bef4d6f220812500c0de7868fb7625a41 tree 9ad49e850cdfe9868a19a37681bbf4d403e47ed3 parent 7e4178f90eec862affc97469118d5008bd1b5bda author Thomas Gleixner Tue, 20 Jun 2006 20:05:05 +0200 committer David Woodhouse Tue, 20 Jun 2006 20:31:24 +0100 [MTD] NAND: Fix breakage all over the place Following problems are addressed: - wrong status caused early break out of nand_wait() - removed the bogus status check in nand_wait() which is a relict of the abandoned support for interrupted erase. - status check moved to the correct place in read_oob - oob support for syndrom based ecc with strange layouts - use given offset in the AUTOOOB based oob operations Partially based on a patch from Vitaly Vool Thanks to Savin Zlobec for tracking down the status problem. Signed-off-by: Thomas Gleixner commit 7e4178f90eec862affc97469118d5008bd1b5bda tree b8b88499e53f5f306754aa26e879e3915e4e7e2c parent b6d5ee00e397b20dc88f7ffaa6f7651b71996a5c author Vitaly Wool Wed, 07 Jun 2006 09:34:37 +0400 committer David Woodhouse Tue, 20 Jun 2006 20:31:23 +0100 [PATCH] NAND: fix remaining OOB length calculation In nand_read_page_syndrome/nand_write_page_syndrome the calculation of the remaining oob length which is not used by the prepad/ecc/postpad areas is wrong. Signed-off-by: Vitaly Wool Signed-off-by: Thomas Gleixner commit b6d5ee00e397b20dc88f7ffaa6f7651b71996a5c tree 3b6f5c72fe60de068051189fd1d74962c2a147e7 parent ad3b5fb772e6a824f1ac341eb8e392eca6fc524f author Thomas Gleixner Fri, 16 Jun 2006 18:10:09 +0200 committer David Woodhouse Tue, 20 Jun 2006 20:31:23 +0100 [MTD] NAND Fixup NDFC merge brokeness Remove the remains of a broken merge. Signed-off-by: Thomas Gleixner commit ea75ee9ab8835ece099589c729574aa8aa94c0a6 tree e9b57958efda53f15dbb17dcb05bbba129d78e26 parent 3a8182bd886ab4197c9021645fac7a6f2bdc47ec author Russell King Tue, 20 Jun 2006 19:53:16 +0100 committer Russell King Tue, 20 Jun 2006 19:53:16 +0100 [ARM] Include asm/hardware.h not asm/arch/hardware.h Signed-off-by: Russell King commit 3a8182bd886ab4197c9021645fac7a6f2bdc47ec tree 1fdea3919dc2b4bfe2c1e61b81f7e06d6b2f4168 parent 695a9d236a6fd5a60557a02eff612880c37fe731 parent faed568413e89f87cd60aa8b292cc4b9996bae42 author Russell King Tue, 20 Jun 2006 19:49:07 +0100 committer Russell King Tue, 20 Jun 2006 19:49:07 +0100 Merge Zaurus branch commit 695a9d236a6fd5a60557a02eff612880c37fe731 tree 0ca809031f5f7139568914fe73ab5e244532aaf8 parent c322e24b40b83bbdfa7c269bc0105e76a39e627f parent 55c20c0af7fe7d5d09af4addfafcfe3bdc500f5d author Russell King Tue, 20 Jun 2006 19:48:18 +0100 committer Russell King Tue, 20 Jun 2006 19:48:18 +0100 Merge AT91 branch commit 55c20c0af7fe7d5d09af4addfafcfe3bdc500f5d tree 756496430a378be4be870928251c5aec43325634 parent 5c3fddced9f62f4b175ce400bb96b23f47626e50 author Andrew Victor Tue, 20 Jun 2006 19:31:39 +0100 committer Russell King Tue, 20 Jun 2006 19:31:39 +0100 [ARM] 3599/1: AT91RM9200 remove global variables Patch from Andrew Victor This patch removes some now unnecessary global variables - at91_master_clock, at91_serial_map, at91_console_port. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit ec57b709c3dc2e8b7643c51fc4c3fdae42b29be2 tree 2a1ca5ebfdd86f1d007883df0d17b49cc48bfe75 parent bf1c56a3aaa67ac74bc74e631ecc2a2673597cae author Ben Dooks Tue, 20 Jun 2006 19:31:06 +0100 committer Russell King Tue, 20 Jun 2006 19:31:06 +0100 [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig Patch from Ben Dooks Update s3c2410_defconfig to latest kernel with the latest patches Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 5c3fddced9f62f4b175ce400bb96b23f47626e50 tree 52bad626b8b5111eb727f4a5fcc586f60c88c426 parent 907d6deb625cd7ff5fea3ef4b20dfb6c1c19c3ee author Andrew Victor Tue, 20 Jun 2006 19:30:20 +0100 committer Russell King Tue, 20 Jun 2006 19:30:20 +0100 [ARM] 3607/1: AT91RM9200 misc fixes Patch from Andrew Victor This final patch includes some general fixes. 1. Link in pm.o if CONFIG_PM is enabled. [Should have been included in patch 3605/1]. 2. Use __raw_readl()/__raw_writel() when accessing System Peripheral registers. 3. Removed some unnecessary includes Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 907d6deb625cd7ff5fea3ef4b20dfb6c1c19c3ee tree e89da97418b5b4fa51212bc14a558bcf0c3f900b parent 6902f523a328bba5af036699b1352389c0746526 author Andrew Victor Tue, 20 Jun 2006 19:30:19 +0100 committer Russell King Tue, 20 Jun 2006 19:30:19 +0100 [ARM] 3605/1: AT91RM9200 Power Management Patch from Andrew Victor This patch adds the core Power Management support for the AT91RM9200 processor. It will support suspend-to-RAM and standby modes. The suspend-to-RAM functionality is not 100% complete. The code that needs to be execute from the internal SRAM to restore the system is outstanding. For now we just fall through to Standby mode. The AT91-specific at91_suspend_entering_slow_clock() function will eventually be replaced by clk_must_disable() once that functionality is added to mainline clock API. Patch from David Brownell. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 6902f523a328bba5af036699b1352389c0746526 tree 7e55b5f1effd8f75b5675ba3c15285720b60cd37 parent d6bdbb8ef3e4a9cafc747e1444b4908f9f2f548d author Andrew Victor Tue, 20 Jun 2006 19:30:18 +0100 committer Russell King Tue, 20 Jun 2006 19:30:18 +0100 [ARM] 3604/1: AT91RM9200 New boards Patch from Andrew Victor This patch adds support for an additional 4 AT91RM9200-based boards: 1. Conitec ARM&EVA [MACH_CARMEVA] (http://www.conitec.net/english/linuxboard.htm) 2. KwikByte KB920x [MACH_KB9200] (http://kwikbyte.com/KB9202_description_new.htm) 3. Embest ATEB9200 [MACH_ATEB9200] (http://www.embedinfo.com/english/product/ATEB9200.asp) 4. Sperry-Sun KAFA board [MACH_KAFA] (unknown) Signed-off-by: Andrew Victor Signed-off-by: Russell King commit d6bdbb8ef3e4a9cafc747e1444b4908f9f2f548d tree 04945fd4a850b68b8c110ed4a5b5c2aa4a1a64c1 parent afefc4158f3c8529e4bb99c1dc119fd792bac220 author Andrew Victor Tue, 20 Jun 2006 19:27:34 +0100 committer Russell King Tue, 20 Jun 2006 19:27:34 +0100 [ARM] 3603/1: AT91RM9200 remove old files Patch from Andrew Victor This patch removes the now unnecessary include/asm-arm/arch-at91rm9200/pio.h file. The pin configuration is now handled in the platform-device setup code (arch/arm/mach-at91rm9200/devices.c). Signed-off-by: Andrew Victor Signed-off-by: Russell King commit c322e24b40b83bbdfa7c269bc0105e76a39e627f tree b4f559deb3cc249280380807bdf8dc5ec8220159 parent e6fea6a5e30efef56dee2b8455fde0811922055b author Liam Girdwood Tue, 20 Jun 2006 19:26:42 +0100 committer Russell King Tue, 20 Jun 2006 19:26:42 +0100 [ARM] 3606/1: PXA27x SSP Register definitions Patch from Liam Girdwood This patch adds some new PXA27x SSP port registers and also fixes the SSP slots per frame macro Changes:- o SSCR0_SlotPerFrm fixed o Added SSP port TSA, RSA, TSS and ACD registers Signed-off-by: Liam Girdwood Signed-off-by: Russell King commit e6fea6a5e30efef56dee2b8455fde0811922055b tree 10018ebe35f826ae722aae9e196280516a56ff8b parent 5af29e56c221d709bdbd5fccaf190e21f290a30e author Lennert Buytenhek Tue, 20 Jun 2006 19:26:41 +0100 committer Russell King Tue, 20 Jun 2006 19:26:41 +0100 [ARM] 3602/1: ixp23xx: fix two typos Patch from Lennert Buytenhek Fix two typos in include/asm-arm/arch-ixp23xx. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit 4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d tree 2260b6dcdeef40ceea39ef1c2f31fd3f9dc53a33 parent f8441e13449638e9fc3c160c35ada3b6f1f8d9c0 author Lennert Buytenhek Tue, 20 Jun 2006 19:24:07 +0100 committer Russell King Tue, 20 Jun 2006 19:24:07 +0100 [ARM] 3600/1: increase amba-pl010 UART_NR to 8 Patch from Lennert Buytenhek The cirrus ep93xx has 3 pl010 UARTs, while amba-pl010.c only allows for 2 by default. A while ago, I think we agreed on changing the 2 to 8, but I don't see this in 2.6.17 yet. Signed-off-by: Lennert Buytenhek Signed-off-by: Russell King commit ff7512e1a2a3504649d3716a757f43807b6d26ef tree bda8de186c3990142701d9b97cf2f7d18f01b2a1 parent 8ca84481b69513f7bf341c7dd9897023a04d7d1d author Al Viro Tue, 20 Jun 2006 03:27:27 -0700 committer David S. Miller Tue, 20 Jun 2006 03:27:27 -0700 [ATM]: fix broken uses of NIPQUAD in net/atm NIPQUAD expects an l-value of type __be32, _NOT_ a pointer to __be32. Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8ca84481b69513f7bf341c7dd9897023a04d7d1d tree d6c930de1d67d19a01967e18e8d116421cbe4eda parent 65fd28f743be6e3e3fd8eefa9a517656636fee42 author Al Viro Tue, 20 Jun 2006 03:26:14 -0700 committer David S. Miller Tue, 20 Jun 2006 03:26:14 -0700 [SCTP]: sctp_unpack_cookie() fix sizeof(pointer) != sizeof(array)... Signed-off-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 41757106b9ca7867dafb2404d618f947b4786fd7 tree 6feff3fade7d842e58d535eef4f397ebfb8ae19e parent 9c937dcc71021f2dbf78f904f03d962dd9bcc130 author Steve Grubb Mon, 12 Jun 2006 07:48:28 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:29 -0400 [PATCH] make set_loginuid obey audit_enabled Hi, I was doing some testing and noticed that when the audit system was disabled, I was still getting messages about the loginuid being set. The following patch makes audit_set_loginuid look at in_syscall to determine if it should create an audit event. The loginuid will continue to be set as long as there is a context. Signed-off-by: Steve Grubb Signed-off-by: Al Viro commit 9c937dcc71021f2dbf78f904f03d962dd9bcc130 tree 6ab53c1cf1235515307d521cecc4f76afa34e137 parent 6a2bceec0ea7fdc47aef9a3f2f771c201eaabe5d author Amy Griffis Thu, 08 Jun 2006 23:19:31 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:28 -0400 [PATCH] log more info for directory entry change events When an audit event involves changes to a directory entry, include a PATH record for the directory itself. A few other notable changes: - fixed audit_inode_child() hooks in fsnotify_move() - removed unused flags arg from audit_inode() - added audit log routines for logging a portion of a string Here's some sample output. before patch: type=SYSCALL msg=audit(1149821605.320:26): arch=40000003 syscall=39 success=yes exit=0 a0=bf8d3c7c a1=1ff a2=804e1b8 a3=bf8d3c7c items=1 ppid=739 pid=800 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=ttyS0 comm="mkdir" exe="/bin/mkdir" subj=root:system_r:unconfined_t:s0-s0:c0.c255 type=CWD msg=audit(1149821605.320:26): cwd="/root" type=PATH msg=audit(1149821605.320:26): item=0 name="foo" parent=164068 inode=164010 dev=03:00 mode=040755 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_t:s0 after patch: type=SYSCALL msg=audit(1149822032.332:24): arch=40000003 syscall=39 success=yes exit=0 a0=bfdd9c7c a1=1ff a2=804e1b8 a3=bfdd9c7c items=2 ppid=714 pid=777 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=ttyS0 comm="mkdir" exe="/bin/mkdir" subj=root:system_r:unconfined_t:s0-s0:c0.c255 type=CWD msg=audit(1149822032.332:24): cwd="/root" type=PATH msg=audit(1149822032.332:24): item=0 name="/root" inode=164068 dev=03:00 mode=040750 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_dir_t:s0 type=PATH msg=audit(1149822032.332:24): item=1 name="foo" inode=164010 dev=03:00 mode=040755 ouid=0 ogid=0 rdev=00:00 obj=root:object_r:user_home_t:s0 Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 6a2bceec0ea7fdc47aef9a3f2f771c201eaabe5d tree 9496dcc64e7cf94f4e87f01957ef41ed18b13e40 parent 0a73dccc4fd472e65887eae6fbf4afc030541709 author Amy Griffis Fri, 02 Jun 2006 13:16:01 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:28 -0400 [PATCH] fix AUDIT_FILTER_PREPEND handling Clear AUDIT_FILTER_PREPEND flag after adding rule to list. This fixes three problems when a rule is added with the -A syntax: - auditctl displays filter list as "(null)" - the rule cannot be removed using -d - a duplicate rule can be added with -a Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 0a73dccc4fd472e65887eae6fbf4afc030541709 tree e9578332e31d0e88c681ac710acf2b196293ba8e parent f368c07d7214a7c41dfceb76c8db473b850f0229 author Al Viro Mon, 05 Jun 2006 08:15:59 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:27 -0400 [PATCH] validate rule fields' types Signed-off-by: Al Viro commit f368c07d7214a7c41dfceb76c8db473b850f0229 tree e3f1e2d1a6ffbe61bf99ece51b906654728db4c9 parent 20ca73bc792be9625af184cbec36e1372611d1c3 author Amy Griffis Fri, 07 Apr 2006 16:55:56 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:27 -0400 [PATCH] audit: path-based rules In this implementation, audit registers inotify watches on the parent directories of paths specified in audit rules. When audit's inotify event handler is called, it updates any affected rules based on the filesystem event. If the parent directory is renamed, removed, or its filesystem is unmounted, audit removes all rules referencing that inotify watch. To keep things simple, this implementation limits location-based auditing to the directory entries in an existing directory. Given a path-based rule for /foo/bar/passwd, the following table applies: passwd modified -- audit event logged passwd replaced -- audit event logged, rules list updated bar renamed -- rule removed foo renamed -- untracked, meaning that the rule now applies to the new location Audit users typically want to have many rules referencing filesystem objects, which can significantly impact filtering performance. This patch also adds an inode-number-based rule hash to mitigate this situation. The patch is relative to the audit git tree: http://kernel.org/git/?p=linux/kernel/git/viro/audit-current.git;a=summary and uses the inotify kernel API: http://lkml.org/lkml/2006/6/1/145 Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 20ca73bc792be9625af184cbec36e1372611d1c3 tree 98a1232ad3c9baa14676b2b48fab79a3df4a20b0 parent 8ba8e0fbe6321961f6ba04e2fd7215b37d935c83 author George C. Wilson Wed, 24 May 2006 16:09:55 -0500 committer Al Viro Tue, 20 Jun 2006 05:25:26 -0400 [PATCH] Audit of POSIX Message Queue Syscalls v.2 This patch adds audit support to POSIX message queues. It applies cleanly to the lspp.b15 branch of Al Viro's git tree. There are new auxiliary data structures, and collection and emission routines in kernel/auditsc.c. New hooks in ipc/mqueue.c collect arguments from the syscalls. I tested the patch by building the examples from the POSIX MQ library tarball. Build them -lrt, not against the old MQ library in the tarball. Here's the URL: http://www.geocities.com/wronski12/posix_ipc/libmqueue-4.41.tar.gz Do auditctl -a exit,always -S for mq_open, mq_timedsend, mq_timedreceive, mq_notify, mq_getsetattr. mq_unlink has no new hooks. Please see the corresponding userspace patch to get correct output from auditd for the new record types. [fixes folded] Signed-off-by: George Wilson Signed-off-by: Al Viro commit 8ba8e0fbe6321961f6ba04e2fd7215b37d935c83 tree 040b02209b21a06fc0c45cafce599773c905ef75 parent 014149cce19c5acb19014e57a5b739b7f64e6fbf author Darrel Goeddel Wed, 24 May 2006 09:38:25 -0500 committer Al Viro Tue, 20 Jun 2006 05:25:26 -0400 [PATCH] fix se_sen audit filter Fix a broken comparison that causes the process clearance to be checked for both se_clr and se_sen audit filters. Signed-off-by: Darrel Goeddel Signed-off-by: Al Viro commit 014149cce19c5acb19014e57a5b739b7f64e6fbf tree eb92d3e25264e1ff89bffcedaca88c44ff7efae2 parent d8945bb51a2bb6623cfa36b9ff63594f46d513aa author Al Viro Tue, 23 May 2006 01:36:13 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:25 -0400 [PATCH] deprecate AUDIT_POSSBILE Signed-off-by: Al Viro commit d8945bb51a2bb6623cfa36b9ff63594f46d513aa tree b369c9b853e90790a04baa70ee66a2ef9e15fd18 parent e0182909297da8d38a5d473ae7bee3d0324632a1 author Al Viro Thu, 18 May 2006 16:01:30 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:25 -0400 [PATCH] inline more audit helpers pull checks for ->audit_context into inlined wrappers Signed-off-by: Al Viro commit e0182909297da8d38a5d473ae7bee3d0324632a1 tree 0c5c06bac1d626ba66aba1142f439b0f34c75282 parent ac03221a4fdda9bfdabf99bcd129847f20fc1d80 author Al Viro Thu, 18 May 2006 08:28:02 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:24 -0400 [PATCH] proc_loginuid_write() uses simple_strtoul() on non-terminated array Signed-off-by: Al Viro commit ac03221a4fdda9bfdabf99bcd129847f20fc1d80 tree 9b65ede238b03007bfe5e25f46efca68ec0994e0 parent 5d136a010de3bc16fe595987feb9ef8868f064c2 author Linda Knippers Tue, 16 May 2006 22:03:48 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:24 -0400 [PATCH] update of IPC audit record cleanup The following patch addresses most of the issues with the IPC_SET_PERM records as described in: https://www.redhat.com/archives/linux-audit/2006-May/msg00010.html and addresses the comments I received on the record field names. To summarize, I made the following changes: 1. Changed sys_msgctl() and semctl_down() so that an IPC_SET_PERM record is emitted in the failure case as well as the success case. This matches the behavior in sys_shmctl(). I could simplify the code in sys_msgctl() and semctl_down() slightly but it would mean that in some error cases we could get an IPC_SET_PERM record without an IPC record and that seemed odd. 2. No change to the IPC record type, given no feedback on the backward compatibility question. 3. Removed the qbytes field from the IPC record. It wasn't being set and when audit_ipc_obj() is called from ipcperms(), the information isn't available. If we want the information in the IPC record, more extensive changes will be necessary. Since it only applies to message queues and it isn't really permission related, it doesn't seem worth it. 4. Removed the obj field from the IPC_SET_PERM record. This means that the kern_ipc_perm argument is no longer needed. 5. Removed the spaces and renamed the IPC_SET_PERM field names. Replaced iuid and igid fields with ouid and ogid in the IPC record. I tested this with the lspp.22 kernel on an x86_64 box. I believe it applies cleanly on the latest kernel. -- ljk Signed-off-by: Linda Knippers Signed-off-by: Al Viro commit 5d136a010de3bc16fe595987feb9ef8868f064c2 tree ce0dbf3d5da61bc9b69fa557f0f578cd980f3147 parent 0a3b483e83edb6aa6d3c49db70eeb6f1cd9f6c6b author Serge E. Hallyn Thu, 27 Apr 2006 16:45:14 -0500 committer Al Viro Tue, 20 Jun 2006 05:25:23 -0400 [PATCH] minor audit updates Just a few minor proposed updates. Only the last one will actually affect behavior. The rest are just misleading code. Several AUDIT_SET functions return 'old' value, but only return value <0 is checked for. So just return 0. propagate audit_set_rate_limit and audit_set_backlog_limit error values In audit_buffer_free, the audit_freelist_count was being incremented even when we discard the return buffer, so audit_freelist_count can end up wrong. This could cause the actual freelist to shrink over time, eventually threatening to degrate audit performance. Signed-off-by: Serge E. Hallyn Signed-off-by: Al Viro commit 0a3b483e83edb6aa6d3c49db70eeb6f1cd9f6c6b tree d8714c7953e2eb5f1e12243fe8098127b4e7cada parent 3c66251e573219a0532a5a07381b2f60a412d9eb author Amy Griffis Tue, 02 May 2006 15:06:01 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:23 -0400 [PATCH] fix audit_krule_to_{rule,data} return values Don't return -ENOMEM when callers of these functions are checking for a NULL return. Bug noticed by Serge Hallyn. Signed-off-by: Amy Griffis Signed-off-by: Al Viro commit 3c66251e573219a0532a5a07381b2f60a412d9eb tree b047b25d28ae1abe6bb81daba886e44e0a82094f parent f46038ff7d23ae092d61b366332c05aab8227b48 author Al Viro Sat, 06 May 2006 08:26:27 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:22 -0400 [PATCH] add filtering by ppid Signed-off-by: Al Viro commit f46038ff7d23ae092d61b366332c05aab8227b48 tree b1615e261d90cd6f83065b3d8350a6b2cd7176a2 parent e1396065e0489f98b35021b97907ab4edbfb24e1 author Al Viro Sat, 06 May 2006 08:22:52 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:22 -0400 [PATCH] log ppid Signed-off-by: Al Viro commit e1396065e0489f98b35021b97907ab4edbfb24e1 tree a276ea0a2ece9132d435adf1a1f82d0ada1ae938 parent 473ae30bc7b1dda5c5791c773f95e9424ddfead9 author Al Viro Thu, 25 May 2006 10:19:47 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:21 -0400 [PATCH] collect sid of those who send signals to auditd Signed-off-by: Al Viro commit 473ae30bc7b1dda5c5791c773f95e9424ddfead9 tree 541f6f20b9131fcfb650ca491e291d3c6b148a1b parent 9044e6bca5a4a575d3c068dfccb5651a2d6a13bc author Al Viro Wed, 26 Apr 2006 14:04:08 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:21 -0400 [PATCH] execve argument logging Signed-off-by: Al Viro commit 9044e6bca5a4a575d3c068dfccb5651a2d6a13bc tree e0fa2beb83c3ef4e52cc6c6b28ce3173656f4276 parent bc0f3b8ebba611291fdaa2864dbffd2d29336c64 author Al Viro Mon, 22 May 2006 01:09:24 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:20 -0400 [PATCH] fix deadlocks in AUDIT_LIST/AUDIT_LIST_RULES We should not send a pile of replies while holding audit_netlink_mutex since we hold the same mutex when we receive commands. As the result, we can get blocked while sending and sit there holding the mutex while auditctl is unable to send the next command and get around to receiving what we'd sent. Solution: create skb and put them into a queue instead of sending; once we are done, send what we've got on the list. The former can be done synchronously while we are handling AUDIT_LIST or AUDIT_LIST_RULES; we are holding audit_netlink_mutex at that point. The latter is done asynchronously and without messing with audit_netlink_mutex. Signed-off-by: Al Viro commit bc0f3b8ebba611291fdaa2864dbffd2d29336c64 tree 08418bb535747731348609b5ca2ddbbd8fa0f510 parent 0edce197db00094d04c7fb147903add814c9db67 author Al Viro Mon, 22 May 2006 01:36:34 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:20 -0400 [PATCH] audit_panic() is audit-internal ... no need to provide a stub; note that extern is already gone from include/linux/audit.h Signed-off-by: Al Viro commit 0edce197db00094d04c7fb147903add814c9db67 tree a8de0b2b6c5d57f1c6f2ba407a2e0c5f96486e42 parent 3ca10067f7f4bfa62a1b0edc84f590261fa02d75 author Amy Griffis Thu, 01 Jun 2006 13:11:07 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:19 -0400 [PATCH] inotify (5/5): update kernel documentation Update kernel documentation to include a description of the inotify kernel API. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit 3ca10067f7f4bfa62a1b0edc84f590261fa02d75 tree 456e1b555cd4af838bd4e833aa7589ab2bab6766 parent a9dc971d3fdb857a2bcd6d53238125a2cd31d5f4 author Amy Griffis Thu, 01 Jun 2006 13:11:05 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:19 -0400 [PATCH] inotify (4/5): allow watch removal from event handler Allow callers to remove watches from their event handler via inotify_remove_watch_locked(). This functionality can be used to achieve IN_ONESHOT-like functionality for a subset of events in the mask. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit a9dc971d3fdb857a2bcd6d53238125a2cd31d5f4 tree 02e8816f583b5ca40da5789ab9e8d7de9b3ed598 parent 7c29772288b7026504cfe75bfd90d40fbd1574bf author Amy Griffis Thu, 01 Jun 2006 13:11:03 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:18 -0400 [PATCH] inotify (3/5): add interfaces to kernel API Add inotify_init_watch() so caller can use inotify_watch refcounts before calling inotify_add_watch(). Add inotify_find_watch() to find an existing watch for an (ih,inode) pair. This is similar to inotify_find_update_watch(), but does not update the watch's mask if one is found. Add inotify_rm_watch() to remove a watch via the watch pointer instead of the watch descriptor. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit 7c29772288b7026504cfe75bfd90d40fbd1574bf tree dfc0cfef97c4c5fdbd87bbd9abdbf44bcd21c906 parent 2d9048e201bfb67ba21f05e647b1286b8a4a5667 author Amy Griffis Thu, 01 Jun 2006 13:11:01 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:18 -0400 [PATCH] inotify (2/5): add name's inode to event handler When an inotify event includes a dentry name, also include the inode associated with that name. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit 2d9048e201bfb67ba21f05e647b1286b8a4a5667 tree 1df2ca6780d403f3209cf445f8b0b27f45098434 parent 90204e0b7b51e9f2a6905adca12dc331128602c7 author Amy Griffis Thu, 01 Jun 2006 13:10:59 -0700 committer Al Viro Tue, 20 Jun 2006 05:25:17 -0400 [PATCH] inotify (1/5): split kernel API from userspace support The following series of patches introduces a kernel API for inotify, making it possible for kernel modules to benefit from inotify's mechanism for watching inodes. With these patches, inotify will maintain for each caller a list of watches (via an embedded struct inotify_watch), where each inotify_watch is associated with a corresponding struct inode. The caller registers an event handler and specifies for which filesystem events their event handler should be called per inotify_watch. Signed-off-by: Amy Griffis Acked-by: Robert Love Acked-by: John McCutchan Signed-off-by: Al Viro commit 90204e0b7b51e9f2a6905adca12dc331128602c7 tree fc5279d3cb343c3b3ec4bc2c3d825e5e01c8ff9a parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Al Viro Thu, 01 Jun 2006 21:39:38 -0400 committer Al Viro Tue, 20 Jun 2006 05:25:17 -0400 [PATCH] remove config.h from inotify.h Signed-off-by: Al Viro commit d7a80dad2fe19a2b8c119c8e9cba605474a75a2b tree b32a32f95bc40f7fa4dbc1f127213aaa75e96ca9 parent 40ef1d8d48e364dce689342adfdc475aa53f4808 author Tejun Heo Fri, 16 Jun 2006 15:00:18 +0900 committer Jeff Garzik Tue, 20 Jun 2006 05:12:15 -0400 [PATCH] libata: convert several bmdma-style controllers to new EH, take #3 Convert sata_sis, svw, uli and vsc drivers to new EH. All the drivers used to specify ATA_FLAG_SATA_RESET to tell libata to use SATA hardreset instead of SRST. This patch makes all the converted drivers use the standard bmdma error handler which uses both SRST and SATA hardreset. All the controllers should be able to perform SRST but still needs verification. If some of the controllers can't do SRST, it will be very easy to spot as it will show up during boot probing. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 40ef1d8d48e364dce689342adfdc475aa53f4808 tree 56c54e99479c471a614b87de6eeeb15193453053 parent c5fa46e175ccd02803031ea071060cdb01521736 author Tejun Heo Fri, 16 Jun 2006 15:13:53 +0900 committer Jeff Garzik Tue, 20 Jun 2006 05:12:15 -0400 [PATCH] sata_via: convert to new EH, take #3 Convert sata_via to new EH. vt6420 used ATA_FLAG_SRST while vt6421 used ATA_FLAG_SATA_RESET. This difference seems to be an accident rather than intended. This patch makes both flavors use ata_bmdma_error_handler() which makes use of both SRST and SATA hardreset. This behavior change is intended and if it breaks anything, it should be very easy to spot. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c5fa46e175ccd02803031ea071060cdb01521736 tree 5e6f49d86a2dcd069c45bfd434efd6d6fa311bea parent 5a44efff4f8fe8139c0c4166ad5aae5f2fa5bced author Jeff Garzik Tue, 20 Jun 2006 05:08:44 -0400 committer Jeff Garzik Tue, 20 Jun 2006 05:08:44 -0400 [libata] sata_nv: s/spin_lock_irqsave/spin_lock/ in irq handler We don't need to use the heavier spin lock in the irq handler. It's quite possible we can do this in nv_generic_interrupt() as well, but I didn't take the time to pursue that train of thought. Signed-off-by: Jeff Garzik commit 5a44efff4f8fe8139c0c4166ad5aae5f2fa5bced tree fe424beaa46ad3d59b28ef79b1da4a1f748e2ac8 parent 39f8758259868a01ecad29b4379661dd3f21881f author Tejun Heo Sat, 17 Jun 2006 15:49:56 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:22 -0400 [PATCH] sata_nv: add hotplug support Add hotplug support. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 39f8758259868a01ecad29b4379661dd3f21881f tree 12c9583bc5ed11d2c7c4b95b796251d30c465c16 parent ada364e884eb7e60ee96e84cbce07b3c90234c9d author Tejun Heo Sat, 17 Jun 2006 15:49:56 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:22 -0400 [PATCH] sata_nv: convert to new EH Convert to new EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ada364e884eb7e60ee96e84cbce07b3c90234c9d tree 4826b8e6638084e3d248457f5a7319820ccb9b29 parent 27e4b2745443cef67220da9a4f5f71b1c5f72442 author Tejun Heo Sat, 17 Jun 2006 15:49:56 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:22 -0400 [PATCH] sata_nv: better irq handlers nf2/3 and ck804 have irq status register. Implement better irq handler for those flavors of nv. This patch makes different flavors of nv controllers use different irq handlers by using separate port_info for each flavor. This change also makes following EH and hotplug updates easier to integrate. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 27e4b2745443cef67220da9a4f5f71b1c5f72442 tree 473afba54188a535a6ab3e4bfe36f7a9ed2a62ba parent e6faf082cd75d6dcdcf89258ddf40c6855df87a1 author Tejun Heo Sat, 17 Jun 2006 15:49:55 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:22 -0400 [PATCH] sata_nv: simplify constants Simplify interrupt constants and make NFORCE3 equal to NFORCE2. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e6faf082cd75d6dcdcf89258ddf40c6855df87a1 tree f0a74b0233a8524de32a21ae2c12300803f14c00 parent 638ebcc81f40b160f5e8b161e690e9b1b9503c1e author Tejun Heo Sat, 17 Jun 2006 15:49:55 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:21 -0400 [PATCH] sata_nv: kill struct nv_host_desc and nv_host nv_host_desc and nv_host are used to discern different generations of nv controllers. Kill those. New EH/hotplug implementation will use standard port_info/ata_port_operations for that. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 638ebcc81f40b160f5e8b161e690e9b1b9503c1e tree fc902a4de9705818efb2f93b286fed31d076e6f0 parent ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8 author Tejun Heo Sat, 17 Jun 2006 15:49:55 +0900 committer Jeff Garzik Tue, 20 Jun 2006 04:59:21 -0400 [PATCH] sata_nv: kill not-working hotplug code sata_nv contained hotplug code which is mainly for demonstrating how hotplug event is handled. This patch kills the demo code in prepration for real hotplug implementation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 612eff0e3715a6faff5ba1b74873b99e036c59fe tree 647f0ddec94d0fb4aaf74fa55bcad75946030f8a parent 4b2d9cf00962d0a0e697f887f3ecaa155cbde555 author Brian Haley Thu, 15 Jun 2006 14:36:36 -0400 committer Jeff Garzik Tue, 20 Jun 2006 04:50:36 -0400 [PATCH] s2io: netpoll support This adds netpoll support for things like netconsole/kgdboe to the s2io 10GbE driver. Signed-off-by: Brian Haley Signed-off-by: Jeff Garzik commit 4b2d9cf00962d0a0e697f887f3ecaa155cbde555 tree 3a64ad0825e82c3df0b4d84c412c647c19e34afb parent 4c1234ff24dd8dc2d9020d6315d91a71339be114 parent 89c318ed3985da1271e00ad586f2dce8a6e75656 author Jeff Garzik Tue, 20 Jun 2006 04:46:02 -0400 committer Jeff Garzik Tue, 20 Jun 2006 04:46:02 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 4c1234ff24dd8dc2d9020d6315d91a71339be114 tree 9d20c648648bb7544b48e2853667475d03273afd parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f parent 1668b19f75cb949f930814a23b74201ad6f76a53 author Jeff Garzik Tue, 20 Jun 2006 04:43:43 -0400 committer Jeff Garzik Tue, 20 Jun 2006 04:43:43 -0400 Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream commit 4c5eb38af2131d867842cdd09fa83a3ed77bfd26 tree bc46864eb3ac479bb4ea1cb454dd077dea759a81 parent c8bfcd95def89cb69a04c58e1de7995d696c8760 author David S. Miller Tue, 20 Jun 2006 01:27:08 -0700 committer David S. Miller Tue, 20 Jun 2006 01:27:08 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit c8bfcd95def89cb69a04c58e1de7995d696c8760 tree 48e19f24d0218d1ed92c3b58696b29ab1ae574be parent e18e2a00efc8352c131eb8d5a460149fb5776f1c author David S. Miller Tue, 20 Jun 2006 01:23:56 -0700 committer David S. Miller Tue, 20 Jun 2006 01:23:56 -0700 [SPARC64]: Don't double-export synchronize_irq. It is done by the generic IRQ layer now. Signed-off-by: David S. Miller commit e18e2a00efc8352c131eb8d5a460149fb5776f1c tree bee6e965d77f4289c37300714d7976c3e19f2994 parent 8047e247c899f80c33a23ad7e9e250224f0d26a5 author David S. Miller Tue, 20 Jun 2006 01:23:32 -0700 committer David S. Miller Tue, 20 Jun 2006 01:23:32 -0700 [SPARC64]: Move over to GENERIC_HARDIRQS. This is the long overdue conversion of sparc64 over to the generic IRQ layer. The kernel image is slightly larger, but the BSS is ~60K smaller due to the reduced size of struct ino_bucket. A lot of IRQ implementation details, including ino_bucket, were moved out of asm-sparc64/irq.h and are now private to arch/sparc64/kernel/irq.c, and most of the code in irq.c totally disappeared. One thing that's different at the moment is IRQ distribution, we do it at enable_irq() time. If the cpu mask is ALL then we round-robin using a global rotating cpu counter, else we pick the first cpu in the mask to support single cpu targetting. This is similar to what powerpc's XICS IRQ support code does. This works fine on my UP SB1000, and the SMP build goes fine and runs on that machine, but lots of testing on different setups is needed. Signed-off-by: David S. Miller commit 8047e247c899f80c33a23ad7e9e250224f0d26a5 tree 253a7ba3c902730928214df5c2b5630d7875cc11 parent 37cdcd9e82108f9b899f1631f66ade2e45738a6e author David S. Miller Tue, 20 Jun 2006 01:22:35 -0700 committer David S. Miller Tue, 20 Jun 2006 01:22:35 -0700 [SPARC64]: Virtualize IRQ numbers. Inspired by PowerPC XICS interrupt support code. All IRQs are virtualized in order to keep NR_IRQS from needing to be too large. Interrupts on sparc64 are arbitrary 11-bit values, but we don't need to define NR_IRQS to 2048 if we virtualize the IRQs. As PCI and SBUS controller drivers build device IRQs, we divy out virtual IRQ numbers incrementally starting at 1. Zero is a special virtual IRQ used for the timer interrupt. So device drivers all see virtual IRQs, and all the normal interfaces such as request_irq(), enable_irq(), etc. translate that into a real IRQ number in order to configure the IRQ. At this point knowledge of the struct ino_bucket is almost entirely contained within arch/sparc64/kernel/irq.c There are a few small bits in the PCI controller drivers that need to be swept away before we can remove ino_bucket's definition out of asm-sparc64/irq.h and privately into kernel/irq.c Signed-off-by: David S. Miller commit 37cdcd9e82108f9b899f1631f66ade2e45738a6e tree 452b4a106d767947664b99797640194c7483047e parent c6387a48cf5958e43c201fc27a158c328927531a author David S. Miller Tue, 20 Jun 2006 01:21:57 -0700 committer David S. Miller Tue, 20 Jun 2006 01:21:57 -0700 [SPARC64]: Kill ino_bucket->pil And reuse that struct member for virt_irq, which will be used in future changesets for the implementation of mapping between real and virtual IRQ numbers. This nicely kills off a ton of SBUS and PCI controller PIL assignment code which is no longer necessary. Signed-off-by: David S. Miller commit c6387a48cf5958e43c201fc27a158c328927531a tree a6c24951d6c86ac47bd3f0ba198adbfffd03291b parent 6a76267f0e52d920e6bb6da75541e6116d7304da author David S. Miller Tue, 20 Jun 2006 01:21:29 -0700 committer David S. Miller Tue, 20 Jun 2006 01:21:29 -0700 [SPARC]: Kill __irq_itoa(). This ugly hack was long overdue to die. It was a way to print out Sparc interrupts in a more freindly format, since IRQ numbers were arbitrary opaque 32-bit integers which vectored into PIL levels. These 32-bit integers were not necessarily in the 0-->NR_IRQS range, but the PILs they vectored to were. The idea now is that we will increase NR_IRQS a little bit and use a virtual<-->real IRQ number mapping scheme similar to PowerPC. That makes this IRQ printing hack irrelevant, and furthermore only a handful of drivers actually used __irq_itoa() making it even less useful. Signed-off-by: David S. Miller commit 6a76267f0e52d920e6bb6da75541e6116d7304da tree 82b40f6c49fad8746f534d047b309c628d4f708c parent fd0504c3217d6d1bc8f33f53fb536299cae8feda author David S. Miller Tue, 20 Jun 2006 01:20:30 -0700 committer David S. Miller Tue, 20 Jun 2006 01:20:30 -0700 [SPARC64]: bp->pil can never be zero Only pil0_dummy_bucket had a pil of zero and we just killed that off, so we can delete all special case code that used bp->pil==0 as a way to identify a dummy bucket. Signed-off-by: David S. Miller commit fd0504c3217d6d1bc8f33f53fb536299cae8feda tree 4379f5376358d1f54fc183f458614f289ed6d326 parent 3185d4d2873a46ca1620d784013f285522091aa0 author David S. Miller Tue, 20 Jun 2006 01:20:00 -0700 committer David S. Miller Tue, 20 Jun 2006 01:20:00 -0700 [SPARC64]: Send all device interrupts via one PIL. This is the first in a series of cleanups that will hopefully allow a seamless attempt at using the generic IRQ handling infrastructure in the Linux kernel. Define PIL_DEVICE_IRQ and vector all device interrupts through there. Get rid of the ugly pil0_dummy_{bucket,desc}, instead vector the timer interrupt directly to a specific handler since the timer interrupt is the only event that will be signaled on PIL 14. The irq_worklist is now in the per-cpu trap_block[]. Signed-off-by: David S. Miller commit 3185d4d2873a46ca1620d784013f285522091aa0 tree 2235141eace69aec31aebe70a60bc3e030928181 parent 92d452f0eb10774fb7779abf876baf9dfb295e6f author Bob Breuer Tue, 20 Jun 2006 00:36:56 -0700 committer David S. Miller Tue, 20 Jun 2006 00:36:56 -0700 [SPARC]: Fix iommu_flush_iotlb end address Fix the calculation of the end address when flushing iotlb entries to ram. This bug has been a cause of esp dma errors, and it affects HyperSPARC systems much worse than SuperSPARC systems. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit 92d452f0eb10774fb7779abf876baf9dfb295e6f tree b63a88962f899f88c962c88bcd9c30646e0e2b7e parent 61fc12d8e5c94176e7c2e04a2eab4c6e36d8dd41 author Bob Breuer Tue, 20 Jun 2006 00:36:10 -0700 committer David S. Miller Tue, 20 Jun 2006 00:36:10 -0700 [SPARC]: Mark smp init functions as cpuinit Fix the smp related section mismatch warnings by marking the smp init functions as cpuinit. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit 61fc12d8e5c94176e7c2e04a2eab4c6e36d8dd41 tree d58e41a70395f3638435ba9f09c4bf5fa994a38f parent 7202fb496af235506a3c6fea836fe4c9957f730e author Bob Breuer Tue, 20 Jun 2006 00:35:13 -0700 committer David S. Miller Tue, 20 Jun 2006 00:35:13 -0700 [SPARC]: Add missing rw can_lock macros Fix a link failure by adding the missing can_lock macros for the rw locks. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit 7202fb496af235506a3c6fea836fe4c9957f730e tree 44e5338a62fe866da0f9bac2f9bfb75226e4ca32 parent a8cbdcea341ac2f404ee81aa1c19d54aaa0416b4 author Bob Breuer Tue, 20 Jun 2006 00:30:31 -0700 committer David S. Miller Tue, 20 Jun 2006 00:30:31 -0700 [SPARC]: Setup cpu_possible_map Setup cpu_possible_map so the secondary cpus will get started. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit a8cbdcea341ac2f404ee81aa1c19d54aaa0416b4 tree b9aa7ac16fcbe287001bd27080a27b41db7eeb5b parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Bob Breuer Tue, 20 Jun 2006 00:28:33 -0700 committer David S. Miller Tue, 20 Jun 2006 00:28:33 -0700 [SPARC]: Add topology_init() Fix a crash in SMP mode by adding the missing topology_init. Also makes /proc/cpuinfo backwards compatible with 2.4. Signed-off-by: Bob Breuer Signed-off-by: David S. Miller commit 65fd28f743be6e3e3fd8eefa9a517656636fee42 tree c0534240f34ad9cf7c90ac844691e6f4f62a1941 parent 48d83325b61043e3bbd24dd37b9fe433744cf330 author David S. Miller Tue, 20 Jun 2006 00:07:52 -0700 committer David S. Miller Tue, 20 Jun 2006 00:07:52 -0700 [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG A local debugging change slipped into a previous changeset. When SCTP_DEBUG is off SCTP_ASSERT should do nothing. Signed-off-by: David S. Miller commit 48d83325b61043e3bbd24dd37b9fe433744cf330 tree 00dc0682be0f096676ac885152b4ae14c4137338 parent d6cc7f1a3b33c89c91b3dfce1ff053178893470e author Herbert Xu Mon, 19 Jun 2006 23:57:59 -0700 committer David S. Miller Mon, 19 Jun 2006 23:57:59 -0700 [NET]: Prevent multiple qdisc runs Having two or more qdisc_run's contend against each other is bad because it can induce packet reordering if the packets have to be requeued. It appears that this is an unintended consequence of relinquinshing the queue lock while transmitting. That in turn is needed for devices that spend a lot of time in their transmit routine. There are no advantages to be had as devices with queues are inherently single-threaded (the loopback device is not but then it doesn't have a queue). Even if you were to add a queue to a parallel virtual device (e.g., bolt a tbf filter in front of an ipip tunnel device), you would still want to process the queue in sequence to ensure that the packets are ordered correctly. The solution here is to steal a bit from net_device to prevent this. BTW, as qdisc_restart is no longer used by anyone as a module inside the kernel (IIRC it used to with netif_wake_queue), I have not exported the new __qdisc_run function. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d6cc7f1a3b33c89c91b3dfce1ff053178893470e tree 8eb8796588b53648c42378a19a6089a5b8790308 parent d3dcd4efe2ad1ad1865b2fe5c863c1ebd9482a84 author Evgeniy Polyakov Mon, 19 Jun 2006 23:42:53 -0700 committer David S. Miller Mon, 19 Jun 2006 23:42:53 -0700 [CONNECTOR]: Initialize subsystem earlier. Attached patch declares connector init function as subsys_init() and returns -EAGAIN in case connector is not initialized yet. Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit d3dcd4efe2ad1ad1865b2fe5c863c1ebd9482a84 tree 058379919390c78a18075fabf43e8fdd3d645418 parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Patrick McHardy Mon, 19 Jun 2006 23:39:45 -0700 committer David S. Miller Mon, 19 Jun 2006 23:39:45 -0700 [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length Fix endless loop in the SCTP match similar to those already fixed in the SCTP conntrack helper (was CVE-2006-1527). Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6cad647da228486f36a9794137ad459e39b02590 tree a2def0c9e2caaa619547581f58dabf8e602eb25d parent e7bdd7a531320eb4a4a8160afbe0c7cc98ac7187 author Langsdorf, Mark Thu, 08 Jun 2006 10:33:19 -0500 committer Dave Jones Tue, 20 Jun 2006 01:46:04 -0400 [CPUFREQ] correct powernow-k8 fid/vid masks for extended parts The fid/vid masks for parts using the extended parts are slightly incorrect and can result in incorrect fid/vid codes being applied. No instances of this problem have been reported in the field but it could be a problem with future parts. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit e7bdd7a531320eb4a4a8160afbe0c7cc98ac7187 tree 1b485fada2e6b00220019fdd46e391554bb4221f parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Langsdorf, Mark Thu, 08 Jun 2006 10:30:17 -0500 committer Dave Jones Tue, 20 Jun 2006 01:46:04 -0400 [CPUFREQ] Clarify powernow-k8 cpu_family statements This patch clarifies the meaning of the cpu_family if statements in the hw pstate driver patch for powernow-k8 Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit 98174e46974323e4941c72e46345f7277755e146 tree c4644c8f38a519cfb3929d1175fc7107eefe48b9 parent d8ce75324135ea7100124c1fff4ec5090a350607 parent 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f author Nathan Scott Tue, 20 Jun 2006 14:56:23 +1000 committer Nathan Scott Tue, 20 Jun 2006 14:56:23 +1000 Merge HEAD from ../linux-2.6 commit d8ce75324135ea7100124c1fff4ec5090a350607 tree 1233f6e07c5e9372a95a5ce07d8ee8a9c8bfd0ed parent d7b849da47a59d2be6d6aea1effb0efa91c30424 author Nathan Scott Tue, 20 Jun 2006 14:53:51 +1000 committer Nathan Scott Tue, 20 Jun 2006 14:53:51 +1000 [XFS] Remove files from the build that are now unused. Signed-off-by: Nathan Scott commit d7b849da47a59d2be6d6aea1effb0efa91c30424 tree 5cbb616a4cf838f1491b8c5e517436fff93e2d1d parent f6c2d1fa6310a71b1c2e05fc6d9ff9b91489fa0e author Nathan Scott Tue, 20 Jun 2006 14:01:29 +1000 committer Nathan Scott Tue, 20 Jun 2006 14:01:29 +1000 [XFS] Fix a Makefile issue related to exports.o handling. Signed-off-by: Nathan Scott commit f6c2d1fa6310a71b1c2e05fc6d9ff9b91489fa0e tree 8541585188bfb903fc5198ea349122bf52d8ec96 parent da2f4d679c8070ba5b6a920281e495917b293aa0 author Nathan Scott Tue, 20 Jun 2006 13:04:51 +1000 committer Nathan Scott Tue, 20 Jun 2006 13:04:51 +1000 [XFS] Remove version 1 directory code. Never functioned on Linux, just pure bloat. SGI-PV: 952969 SGI-Modid: xfs-linux-melb:xfs-kern:26251a Signed-off-by: Nathan Scott commit da2f4d679c8070ba5b6a920281e495917b293aa0 tree 762c7fdc9692697a7a4177535461ba2f555b9623 parent 0d8fee3270f8a5e4bf95fbed3e81e21b57f8a5a0 author Nathan Scott Tue, 20 Jun 2006 13:01:38 +1000 committer Nathan Scott Tue, 20 Jun 2006 13:01:38 +1000 [XFS] Map EFSCORRUPTED to an actual error code, not just a made up one (990). Turns out some ye-olde unices used EUCLEAN as Filesystem-needs-cleaning, so now we use that too. SGI-PV: 953954 SGI-Modid: xfs-linux-melb:xfs-kern:26286a Signed-off-by: Nathan Scott commit 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f tree e0977d906193eadeafebc442775491b844be79d5 parent 4c84a39c8adba6bf2f829b217e78bfd61478191a parent 1723b4a34af85447684c9696af83929d2c1e8e6b author Linus Torvalds Mon, 19 Jun 2006 19:07:12 -0700 committer Linus Torvalds Mon, 19 Jun 2006 19:07:12 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits) [MIPS] Make timer interrupt frequency configurable from kconfig. [MIPS] Correct HAL2 Kconfig description [MIPS] Fix R4K cache macro names [MIPS] Add Missing R4K Cache Macros to IP27 & IP32 [MIPS] Support for the RM9000-based Basler eXcite smart camera platform. [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors. [MIPS] SN: include asm/sn/types.h for nasid_t. [MIPS] Random fixes for sb1250 [MIPS] Fix bcm1480 compile [MIPS] Remove support for NEC DDB5476. [MIPS] Remove support for NEC DDB5074. [MIPS] Cleanup memory managment initialization. [MIPS] SN: Declare bridge_pci_ops. [MIPS] Remove unused function alloc_pci_controller. [MIPS] IP27: Extract pci_ops into separate file. [MIPS] IP27: Use symbolic constants instead of magic numbers. [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig. [MIPS] IP27: Cleanup N/M mode configuration. [MIPS] IP27: Throw away old unused hacks. ... commit 4c84a39c8adba6bf2f829b217e78bfd61478191a tree 0f0f415099cf49d894d65e5120563d30cf1a0fc9 parent d0b952a9837f81cd89e756b1b34293fa6e1cb59d parent 9ead190bfde2a434c74ea604382d08acb2eceef5 author Linus Torvalds Mon, 19 Jun 2006 19:01:59 -0700 committer Linus Torvalds Mon, 19 Jun 2006 19:01:59 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (46 commits) IB/uverbs: Don't serialize with ib_uverbs_idr_mutex IB/mthca: Make all device methods truly reentrant IB/mthca: Fix memory leak on modify_qp error paths IB/uverbs: Factor out common idr code IB/uverbs: Don't decrement usecnt on error paths IB/uverbs: Release lock on error path IB/cm: Use address handle helpers IB/sa: Add ib_init_ah_from_path() IB: Add ib_init_ah_from_wc() IB/ucm: Get rid of duplicate P_Key parameter IB/srp: Factor out common request reset code IB/srp: Support SRP rev. 10 targets [SCSI] srp.h: Add I/O Class values IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool. IB/mthca: Fill in max_map_per_fmr device attribute IB/ipath: Add client reregister event generation IB/mthca: Add client reregister event generation IB: Move struct port_info from ipath to IPoIB: Handle client reregister events IB: Add client reregister event type ... commit d0b952a9837f81cd89e756b1b34293fa6e1cb59d tree fbe488bc5f407afa0e91cefb262d9e9ee69062ac parent d90125bfe958ed0451c6b98f831c86aba08b43d5 parent 47552c4e555eefe381f3d45140b59a2ea4b16486 author Linus Torvalds Mon, 19 Jun 2006 18:55:56 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:55:56 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits) [ETHTOOL]: Fix UFO typo [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer. [SCTP]: Send only 1 window update SACK per message. [SCTP]: Don't do CRC32C checksum over loopback. [SCTP] Reset rtt_in_progress for the chunk when processing its sack. [SCTP]: Reject sctp packets with broadcast addresses. [SCTP]: Limit association max_retrans setting in setsockopt. [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate. [IPV6]: Sum real space for RTAs. [IRDA]: Use put_unaligned() in irlmp_do_discovery(). [BRIDGE]: Add support for NETIF_F_HW_CSUM devices [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM [TG3]: Convert to non-LLTX [TG3]: Remove unnecessary tx_lock [TCP]: Add tcp_slow_start_after_idle sysctl. [BNX2]: Update version and reldate [BNX2]: Use CPU native page size [BNX2]: Use compressed firmware [BNX2]: Add firmware decompression [BNX2]: Allow WoL settings on new 5708 chips ... Manual fixup for conflict in drivers/net/tulip/winbond-840.c commit d90125bfe958ed0451c6b98f831c86aba08b43d5 tree 3a9ea24091f958a92e1d0d12f5135e50adf71b31 parent bfd189a8e944dd0b8135dea2c23ac399bbe34535 parent 2abac1db3522d9f56c695d1b42e77f3e52d4c51a author Linus Torvalds Mon, 19 Jun 2006 18:53:20 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:53:20 -0700 Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: (25 commits) intelfb: fixup clock calculation debugging. Removed hard coded EDID buffer size. intelfb: use regular modedb table instead of VESA intelfb: use firmware EDID for mode database Revert "intelfb driver -- use the regular modedb table instead of the VESA" intelfb: int option fix sync modesetting code with X.org intelfb: align with changes from my X driver. intelfb driver -- use the regular modedb table instead of the VESA Adds support for 256MB aperture on 945 chipsets to the intelfb driver intelfb -- uses stride alignment of 64 on the 9xx chipsets. intelfb: some cleanups for intelfbhw intelfb: fixup pitch calculation like X does intelfb: fixup p calculation This patch makes a needlessly global struct static. intelfb: add i945GM support intelfb: fixup whitespace.. intelfb: add hw cursor support for i9xx intelfb: make i915 modeset intelfb: add support for i945G ... commit bfd189a8e944dd0b8135dea2c23ac399bbe34535 tree 89f2963ec3e2df7b9b980587ec2d2a334c7e2172 parent bbf70132db2767f66b411fa90488aacac72e06dd parent 81c246691535ee3f865fbe6804b3be1b2c159e95 author Linus Torvalds Mon, 19 Jun 2006 18:51:41 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:51:41 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] alpha-agp warning fix [AGPGART] uninorth-agp warning fixes [AGPGART] Remove pointless initialisation in intel-agp [AGPGART] Remove pointless code from agp_generic_create_gatt_table() commit bbf70132db2767f66b411fa90488aacac72e06dd tree 19bebd76503c351f74e2fc24ac161b20c8d30fd4 parent 2090af718014f3d434fb8b85b00eeea01ebcec19 parent 6ccf58ab22499139bacc683493c9fd70af55adbb author Linus Torvalds Mon, 19 Jun 2006 18:51:21 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:51:21 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] sets nforce2 minimum PLL divider to 2. [CPUFREQ] Make powernow-k7 work on SMP kernels. [CPUFREQ] cpufreq core {d,}printk adjustments [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino [CPUFREQ] dprintk adjustments to cpufreq-nforce2 [CPUFREQ] Prepare powernow-k8 for future CPUs. [CPUFREQ] Make acpi-cpufreq 'sticky'. [CPUFREQ] Remove strange No-op from longrun.c [CPUFREQ] Remove more freq_table reinitialisations. [CPUFREQ] Fix another redundant initialisation in freq_table [CPUFREQ] Remove duplicate assignment in freq_table [CPUFREQ] CodingStyle nits in cpufreq_stats.c [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2 [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq [CPUFREQ] Remove pointless reinitialisation from powernow-k8 [CPUFREQ] Remove redundant initialisation from longhaul. [CPUFREQ] Clean up longhaul's speed pretty-printer [CPUFREQ] Disambiguate loop indexes in powernow-k7 [CPUFREQ] Typo in powernow-k8 commit 2090af718014f3d434fb8b85b00eeea01ebcec19 tree 97eb6e655a3c2d90c212de79b563fa35837a341f parent 557240b48e2dc4f6fa878afc3fc767ad745ca7ed parent 4b6ace7f02cddb8c363ad27bb1e5014c6791e34a author Linus Torvalds Mon, 19 Jun 2006 18:50:43 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:50:43 -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: (166 commits) [PATCH] net: au1000_eth: PHY framework conversion [PATCH] 3c5zz ethernet: fix section warnings [PATCH] smc ethernet: fix section mismatch warnings [PATCH] hp ethernet: fix section mismatches [PATCH] Section mismatch in drivers/net/ne.o during modpost [PATCH] e1000: prevent statistics from getting garbled during reset [PATCH] smc911x Kconfig fix [PATCH] forcedeth: new device ids [PATCH] forcedeth config: version [PATCH] forcedeth config: module parameters [PATCH] forcedeth config: diagnostics [PATCH] forcedeth config: move functions [PATCH] forcedeth config: statistics [PATCH] forcedeth config: csum [PATCH] forcedeth config: wol [PATCH] forcedeth config: phy [PATCH] forcedeth config: flow control [PATCH] forcedeth config: ring sizes [PATCH] forcedeth config: tso cleanup [DOC] Update bonding documentation with sysfs info ... commit 557240b48e2dc4f6fa878afc3fc767ad745ca7ed tree 354e9de17c28b438db675f6a2b779415f1634c45 parent 5603509137940f4cbc577281cee62110d4097b1b author Linus Torvalds Mon, 19 Jun 2006 18:16:01 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:16:01 -0700 Add support for suspending and resuming the whole console subsystem Trying to suspend/resume with console messages flying all around is doomed to failure, when the devices that the messages are trying to go to are being shut down. Signed-off-by: Linus Torvalds commit 5603509137940f4cbc577281cee62110d4097b1b tree def89e77479baa644160ffa1467b1ead0ac88e2f parent 1cca0ebbb74298958dae1d1d3e7e9287c98a720c author Linus Torvalds Mon, 19 Jun 2006 18:05:09 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:05:09 -0700 Make sure to re-enable SCI after an ACPI suspend According to the ACPI spec, it should be enabled on return from suspend, but bugs happen. Apparently especially on the Apple Intel Macs. Signed-off-by: Linus Torvalds commit 1cca0ebbb74298958dae1d1d3e7e9287c98a720c tree b41fa520bf848584a91e4e0d9fd3aa22d99c0f86 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Linus Torvalds Mon, 19 Jun 2006 18:01:27 -0700 committer Linus Torvalds Mon, 19 Jun 2006 18:01:27 -0700 Improve SATA core suspend/resume Doing a full ata_busy_sleep() seems to get suspend and resume working fine on the Apple Mac Mini, at least. Signed-off-by: Linus Torvalds commit 67d59dfdeb21df2c16dcd478b66177e91178ecd0 tree ae85703651d81740f4a6cd398f9dd4d6aabe6a2f parent 6db874fbdbedba5e15e76cc03b42f52ea70338c0 author James Bottomley Tue, 13 Jun 2006 21:31:19 -0500 committer James Bottomley Mon, 19 Jun 2006 19:34:01 -0500 [SCSI] 53c700: remove reliance on deprecated cmnd fields This one's quite tricky. The 53c700 uses the now deprecated fields of the command structure for saving the prior command when it does autosense. To fix this, we have to add extra fields to the LUN to accommodate a copy of the real command. Signed-off-by: James Bottomley commit 6db874fbdbedba5e15e76cc03b42f52ea70338c0 tree fc55c8bb280cb1137468270cac12d12a9582e6e4 parent 4f2ddba39a550eba9233d9f0e8309092da0ba293 author James Bottomley Tue, 13 Jun 2006 21:40:34 -0500 committer James Bottomley Mon, 19 Jun 2006 19:32:04 -0500 [SCSI] hptiop: don't use cmnd->bufflen use cmnd->request_bufflen instead. Signed-off-by: James Bottomley commit 4f2ddba39a550eba9233d9f0e8309092da0ba293 tree 8fdfacf8a5b7ffcb58a093c5887ff1c9753e8d2e parent a623e14dafe72329dd1defe36ee2cd4ff4b2e6f1 author HighPoint Linux Team Wed, 14 Jun 2006 16:50:57 +0800 committer James Bottomley Mon, 19 Jun 2006 19:30:15 -0500 [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver Updates: - don't bypass SYNCHRONIZE_CACHE command - return SCSI_MLQUEUE_HOST_BUSY when no free request slots - move scsi_remove_host() to the begin of hpt_remove(), or it will not work after resources being released. Signed-off-by: HighPoint Linux Team Signed-off-by: James Bottomley commit a623e14dafe72329dd1defe36ee2cd4ff4b2e6f1 tree 68499cbb10448ea645cfab1e82cb7e5969266ee6 parent 75c3628db75c573870379094a5f90f690ee99b76 author Mark Haverkamp Thu, 08 Jun 2006 13:55:57 -0700 committer James Bottomley Mon, 19 Jun 2006 19:23:54 -0500 [SCSI] aacraid: small misc. cleanups Received from Mark Salyzyn Spelling correction, orphaned comment removal & update branch name. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 75c3628db75c573870379094a5f90f690ee99b76 tree 373db3823cb2a52e5809e335cf2ee33c347da9cf parent 821499a8241019be5591fad5ab925759fbcd9f32 author Mark Haverkamp Thu, 08 Jun 2006 13:55:42 -0700 committer James Bottomley Mon, 19 Jun 2006 19:23:07 -0500 [SCSI] aacraid: Update supported product information Received From Mark Salyzyn Some of the cards product names changed. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit ae6c859b7dcd708efadf1c76279c33db213e3506 tree c18c2e94537d5e3d4fde5bf52800333b7c237048 parent 5b4b7a236e7787f16af4e15a6253d46d8e794be6 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Len Brown Mon, 19 Jun 2006 18:01:24 -0400 committer Len Brown Mon, 19 Jun 2006 18:01:24 -0400 merge linus into release branch commit 9c64f9774805ba5d5ad4129899bdd822f61874e9 tree afa3c4325d7867f3417b44fecd4915b8f529c776 parent 9df7fde52c33075b9f9148ee31215c03824fcc38 author Jan Beulich Tue, 09 May 2006 00:50:31 -0700 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] PCI Hotplug: Fix recovery path from errors during pcie_init() Signed-off-by: Jan Beulich Cc: Kristen Accardi Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 9df7fde52c33075b9f9148ee31215c03824fcc38 tree debb5999dd3689639310d52632d26864ce208c24 parent 99ff124d1673a1e3f19061ebc82634608d1119ed author Eric Sesterhenn Thu, 01 Jun 2006 11:41:44 +0200 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] PCI Hotplug: fake NULL pointer dereferences in IBM Hot Plug Controller Driver Remove checks for value, since the hotplug core always provides a valid value. Signed-off-by: Eric Sesterhenn Signed-off-by: Greg Kroah-Hartman commit 99ff124d1673a1e3f19061ebc82634608d1119ed tree ab06a2edc2049dd8b32206cb8203aa7f6a88db7d parent ea83bc1dabdca9da643972b591259a7657459ff5 author Kenji Kaneshige Fri, 12 May 2006 11:13:50 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Cleanup improper info messages Current SHPCHP driver shows device number of slots in info messages, but it is useless and should be replaced with slot name. This patch replaces the device number shown in the info messages with the slot name. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit ea83bc1dabdca9da643972b591259a7657459ff5 tree f6eb9a99fdbb9063bb13e434f04403834488be0f parent f42639572680f4d69d9522f91c65e793ebeca098 author Kenji Kaneshige Fri, 12 May 2006 11:12:23 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Remove Unused hpc_evelnt_lock This patch removes unused hpc_event_lock. This patch has no functional change. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit f42639572680f4d69d9522f91c65e793ebeca098 tree 62a905ab3c2f5f11319d1e558bf87c0e75459f83 parent 4085399da3c2176ba8ed64e93a2722907d41df3f author Kenji Kaneshige Fri, 12 May 2006 11:13:02 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Cleanup interrupt polling timer This patch cleans up the interrupt polling timer code in shpchp_hpc.c. This has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 4085399da3c2176ba8ed64e93a2722907d41df3f tree fc923b10c70ededacf661b21285d852a8da8d886 parent c4cecc1937cafd8505151452a9f7eea876a5bd9c author Kenji Kaneshige Fri, 12 May 2006 11:11:48 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Cleanup SHPC commands This patch cleans up the code related to issuing SHPC commands. This patch has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit c4cecc1937cafd8505151452a9f7eea876a5bd9c tree e7464d502dc606d2197811fc969acbaf383c8859 parent d4fbf600666569c3921d12bdcfcfdb2cdb4fd5fb author Kenji Kaneshige Fri, 12 May 2006 11:10:56 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Cleanup interrupt handler This patch cleans up the interrupt handler of shpchp driver. This patch has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit d4fbf600666569c3921d12bdcfcfdb2cdb4fd5fb tree 3b5ac234da4a4498f4c17a3bf32e7d1c2543db95 parent 132066a9c84af6f5e8d893145a9c63f849143867 author Kenji Kaneshige Fri, 12 May 2006 11:05:59 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:24 -0700 [PATCH] shpchp: Remove unnecessary hpc_ctlr_handle check This patch removes unnecessary error check for hpc_ctlr_handle. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 132066a9c84af6f5e8d893145a9c63f849143867 tree b81ad81f65e79088e84666a98b0d53dcf2cb0b78 parent 6e33706b191ff8687f103a86de842b690fd8fb9d author Kenji Kaneshige Fri, 12 May 2006 13:39:45 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] pciehp: Implement get_address callback This patch implements .get_address callback of hotplug_slot_ops for PCIEHP driver. With this patch, we can see bus address of hotplug slots as follows: # cat /sys/bus/pci/slots/0010_0000/address 0000:0a:00 Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 6e33706b191ff8687f103a86de842b690fd8fb9d tree c41ba3730a875f650d53feeaef8d853a5a1a5dd7 parent 56bfada3e1a25c0da6f4590a4b04c67ec10910c2 author Kenji Kaneshige Fri, 12 May 2006 11:23:39 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] pciehp: Add missing pci_dev_put The PCIEHP driver leaks reference counter of pci_dev structures. This patch adds missing pci_dev_put() calls to PCIEHP driver. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 56bfada3e1a25c0da6f4590a4b04c67ec10910c2 tree 14df15811b0aed4b66ecdec8476b9edbda8d738b parent 466ee36b62b4b294ecf68a2eee2e18c6ff8c9be4 author Kenji Kaneshige Fri, 12 May 2006 11:22:24 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] pciehp: Replace pci_find_slot() with pci_get_slot() This patch replaces pci_find_slot() with pci_get_slot() in PCIEHP driver. This patch enables PCI Express Hotplug on the system which has multiple PCI domains. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 466ee36b62b4b294ecf68a2eee2e18c6ff8c9be4 tree 4dd5ed1ad7a0d1081f687ea535e05f9ea838b08c parent 82d5f4aaf182c306d2c2ef4d3a89d0fb8e386aa8 author Mike Habeck Sat, 06 May 2006 09:01:59 -0500 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SGI Hotplug: Incorrect power status This is a repost of a patch submitted by Prarit Bhargava on 01-19-06 that never got integrated. The get_power_status function is currently reporting a bitwise mapping of the slot if the slot is powered on. It should return 1 if powered on and 0 if powered off. Signed-off-by: Mike Habeck Signed-off-by: Greg Kroah-Hartman commit 82d5f4aaf182c306d2c2ef4d3a89d0fb8e386aa8 tree ef7de5f12bee715364576d84bd47a05f61326d05 parent d49f2c49c39bbd0cb2069fe11c1630c709061037 author Kenji Kaneshige Wed, 03 May 2006 23:42:04 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] shpchp: Create shpchpd at controller probe time The workqueue thread of shpchp driver should be created only when SHPC based hotplug slots are detected on the system. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit d49f2c49c39bbd0cb2069fe11c1630c709061037 tree 5fcf4ccaef04d1e3fe28bcbeecf1d58908108419 parent e7138723692e43b7d43578746ad21bf194847527 author Kenji Kaneshige Wed, 03 May 2006 23:34:17 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] shpchp: Mask Global SERR and Intr at controller release time Global SERR and Interrupt should be masked at shpchp driver unload time. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit e7138723692e43b7d43578746ad21bf194847527 tree 7d8e769c25324381708536e9fbcadfb2f4754622 parent 795eb5c4a73bee30e8c2dbb29174b329da56051c author Kenji Kaneshige Tue, 02 May 2006 11:12:37 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SHPC: Fix SHPC Contoller SERR-INT Register bits access Current SHPCHP driver doesn't take care of RsvdP/RsvdZ[*] bits in controller SERR-INT register. This might cause unpredicable results. This patch fixes this bug. [*] RsvdP and RsvdZ are defined in SHPC spec as follows: RsvdP - Reserved and Preserved. Register bits of this type are reserved for future use as R/W bits. The value read is undefined. Writes are ignored. Software must follow These rules when accessing RsvdP bits: - Software must ignore RsvdP bits when testing values read from these registers. - Software must not depend on RsvdP bit's ability to retain information when written - Software must always write back the value read in the RsvdP bits when writing one of these registers. RsvdZ - Reserved and Zero. Register bits of this type are reserved for future use as R/WC bits. The value read is undefined. Writes are ignored. Software must follow these rules when accessing RsvdZ bits: - Software must ignore RsvdZ bits when testing values read from these registers. - Software must not depends on a RsvdZ bit's ability to retain information when written. - Software must always write 0 to RsvdZ bits when writing one of these register. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 795eb5c4a73bee30e8c2dbb29174b329da56051c tree 2c489f1f647d46cdc29322839d766cbf37d55485 parent 5858759c2098c6792af1afa6d5ded94044740f9c author Kenji Kaneshige Tue, 02 May 2006 11:11:54 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SHPC: Fix SHPC Logical Slot Register bits access Current SHPCHP driver doesn't take care of RsvdP/RsvdZ[*] bits in logical slot registers. This might cause unpredicable results. This patch fixes this bug. [*] RsvdP and RsvdZ are defined in SHPC spec as follows: RsvdP - Reserved and Preserved. Register bits of this type are reserved for future use as R/W bits. The value read is undefined. Writes are ignored. Software must follow These rules when accessing RsvdP bits: - Software must ignore RsvdP bits when testing values read from these registers. - Software must not depend on RsvdP bit's ability to retain information when written - Software must always write back the value read in the RsvdP bits when writing one of these registers. RsvdZ - Reserved and Zero. Register bits of this type are reserved for future use as R/WC bits. The value read is undefined. Writes are ignored. Software must follow these rules when accessing RsvdZ bits: - Software must ignore RsvdZ bits when testing values read from these registers. - Software must not depends on a RsvdZ bit's ability to retain information when written. - Software must always write 0 to RsvdZ bits when writing one of these register. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 5858759c2098c6792af1afa6d5ded94044740f9c tree 673a917583ba1f4e8c16027f0aa712bc04fb4b48 parent 2b34da7e61383b4b7773d2d4e776e58725794347 author Kenji Kaneshige Tue, 02 May 2006 11:10:37 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SHPC: Cleanup SHPC Logical Slot Register bits access This patch cleans up the code to access bits in slot logical registers. This patch has no functional change. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 2b34da7e61383b4b7773d2d4e776e58725794347 tree 9f350ae052288ed099332f148f0b234330bb6e16 parent 75d97c59a192ca0fe2577974dac0c16a73a377eb author Kenji Kaneshige Tue, 02 May 2006 11:09:42 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:23 -0700 [PATCH] SHPC: Cleanup SHPC Logical Slot Register access This patch cleans up the code to access slot logical registers. This patch has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 75d97c59a192ca0fe2577974dac0c16a73a377eb tree bf0c4b2bd3bae7405d57bc9f9a219f25b2a4bd2a parent 40abb96c51bbcb06785e233e96f40c35657ade83 author Kenji Kaneshige Tue, 02 May 2006 11:08:42 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] SHPC: Cleanup SHPC register access This patch cleans up the code to access SHPC working register sets. This patch has no functional changes. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 40abb96c51bbcb06785e233e96f40c35657ade83 tree 646b5993ac5adf4f4ac7b7e1e498c3e367fbbded parent e22b73501608901bab7ee9b1f8cb67f15e8efb7a author Kenji Kaneshige Mon, 08 May 2006 18:34:09 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] pciehp: Fix programming hotplug parameters Current PCHEHP driver doesn't have any code to program hotplug parameters from firmware. So hotplug parameters are never programed at hot-add time. This patch add support for programming hotplug parameters to PCIEHP driver. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit e22b73501608901bab7ee9b1f8cb67f15e8efb7a tree 4edf850a0216b36c184b6abe43e32a600d4f7787 parent aad20cabaa3d6dfa1e0ebc8fb0537a96d3518b8f author Kenji Kaneshige Tue, 02 May 2006 10:57:14 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpi_pcihp: Add support for _HPX This patch adds support for _HPX (Hot Plug Parameter Extensions) defined in ACPI3.0a spec. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit aad20cabaa3d6dfa1e0ebc8fb0537a96d3518b8f tree 75f8e44cd25fe5ce7851815224f775b15cf9c8b3 parent 7430e34c70106a9576fc61d77604d164b187a1b7 author Kenji Kaneshige Wed, 10 May 2006 22:20:34 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpi_pcihp: Remove improper error message about OSHP This patch converts the improper error message about OSHP evaluation to debug message which is displayed only when pci_hotplug.ko is loaded with debugging mode enabled. To do this, this patch adds a new module parameter "debug_acpi" to pci_hotplug.ko for enabling/disabling debug messages in acpi_pcihp.c. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 7430e34c70106a9576fc61d77604d164b187a1b7 tree 4b9eeaaa3702c9be216f820e8eeaf11f93610d2c parent 2433ee2654f0ac86f7886e5a8d01bee7f3c7c6db author Kenji Kaneshige Tue, 02 May 2006 10:54:50 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpi_pcihp: Fix programming _HPP values This patch fixes the problem that hotplug parameters are not programed when PCI cards are hot-added by ACPIPHP, SHPCHP and PCIEHP driver. The pci_dev structure being hot-added is not bound to ACPI handle, so we need to trace PCI bus tree to find ACPI handle. Signed-off-by: Kenji Kaneshige Cc: Kristen Accardi Signed-off-by: Greg Kroah-Hartman commit 2433ee2654f0ac86f7886e5a8d01bee7f3c7c6db tree 61e29c5f1adaccca28a6b059440b053d45da583a parent 81b26bcacd5df0f65344fb430b1bf7fe9cfbfe2a author Kristen Accardi Mon, 24 Apr 2006 15:50:59 -0700 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] pciehp: dont call pci_enable_dev Don't call pci_enable_device from pciehp because the pcie port service driver already does this. Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit 81b26bcacd5df0f65344fb430b1bf7fe9cfbfe2a tree c56c0826fab80511af74ba4fe4b3b5ae85a01c50 parent cde0e5d722c77d1194f40de54a99c90afe365480 author Kristen Accardi Tue, 18 Apr 2006 14:36:43 -0700 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] PCI Hotplug: don't use acpi_os_free acpi_os_free should not be used by drivers outside of acpi/*/*.c. Replace with kfree(). Signed-off-by: Kristen Carlson Accardi Signed-off-by: Greg Kroah-Hartman commit cde0e5d722c77d1194f40de54a99c90afe365480 tree 4c569d32f7ff40010e97a1a133bfbabed69e2b7d parent c14424736e76f3d8477a41de531e6b5dcce3d5b0 author MUNEDA Takahiro Wed, 22 Mar 2006 14:49:33 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpiphp: turn off slot power at error case When acpiphp_enable_slot() is failed, acpiphp does not change the slot->flags. Therefore, when user tries to read power status, acpiphp_get_power_status() returns the enable status whether the slot is not really enabled. This patch fixes this BUG. Signed-off-by: MUNEDA Takahiro Signed-off-by: Greg Kroah-Hartman commit c14424736e76f3d8477a41de531e6b5dcce3d5b0 tree 26a34143daf21ac1771b6862e019e0a875c9146a parent 551bcb75b3d9f23348a524210ccfff26d865e425 author MUNEDA Takahiro Wed, 22 Mar 2006 14:49:27 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpiphp: host and p2p hotplug I encountered the problem that when there are some hotplug slots are under the host bridge, the hotplug slots under the p2p bridge are not treated as hotpluggable. This patch fixes this BUG. Signed-off-by: MUNEDA Takahiro Signed-off-by: Greg Kroah-Hartman commit 551bcb75b3d9f23348a524210ccfff26d865e425 tree fd4990605440ffff56c041ebef87624d225a6c08 parent 92c9be95549632da09088320f202fa5c05b21ddf author MUNEDA Takahiro Wed, 22 Mar 2006 14:49:20 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:22 -0700 [PATCH] acpiphp: hotplug slot hotplug o hotplug slots add When the hot-added PCI device is p2p bridge, acpiphp calls find_p2p_bridge() to add hotplug slots. o hotplug slots remove When the hot-removing PCI device is p2p bridge, acpiphp calls cleanup_p2p_bridge() to remove hotplug slots. o notify handler exchange When the p2p bridge is added, acpiphp changes the notify hanlder. If no bridge device is inserted into the hotpluggable PCI slot, acpiphp installs the notify handler for function. After the p2p bridge hot-add, acpiphp has to install the notify handler for bridge. Because, the role of the handlers are not same. The hot-remove case is ditto. Signed-off-by: MUNEDA Takahiro Signed-off-by: Greg Kroah-Hartman commit 92c9be95549632da09088320f202fa5c05b21ddf tree 744691b15a41c90f9eb6747aff01396c55222834 parent e55dea58c5609aece6156a6cd2306b820a7794ef author MUNEDA Takahiro Wed, 22 Mar 2006 14:49:09 +0900 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:21 -0700 [PATCH] acpiphp: configure _PRT - V3 Current acpiphp does not free acpi_device structs when the PCI devices are removed. When the PCI device is added, acpi_bus_add() fails because acpi_device struct has already exists. So, _PRT method does not evaluate. This patch fixes this issue. Signed-off-by: MUNEDA Takahiro Signed-off-by: Greg Kroah-Hartman commit e55dea58c5609aece6156a6cd2306b820a7794ef tree 23ed63d8920d473029b50b5de7e04a03e511b681 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Prarit Bhargava Tue, 04 Apr 2006 09:26:46 -0400 committer Greg Kroah-Hartman Mon, 19 Jun 2006 14:13:21 -0700 [PATCH] PCI Hotplug: Tollhouse HP: SGI hotplug driver changes SGI hotplug driver changes required to support Tollhouse system PCI hotplug, and implements the PRF_HOTPLUG_SUPPORT feature bit. Signed-off-by: Prarit Bhargava Signed-off-by: Greg Kroah-Hartman commit faed568413e89f87cd60aa8b292cc4b9996bae42 tree 366c9f3e75f5e35f6ebf3b42d26c82e39248f471 parent f8703dc8cb10eca7f6fe6ef364d8e106fe07f034 author Richard Purdie Mon, 19 Jun 2006 20:46:05 +0100 committer Russell King Mon, 19 Jun 2006 20:46:05 +0100 [ARM] 3594/1: Poodle: Add touchscreen support + other updates Patch from Richard Purdie Poodle Updates: * Update corgi_ssp to make the GPIO chip selects optional * Enable corgi_ssp for use by poodle * Add corgi touchscreen platform device for poodle * Export locomo platform device. * Set framebuffer device parent correctly Signed-off-by: Richard Purdie Signed-off-by: Russell King commit f8703dc8cb10eca7f6fe6ef364d8e106fe07f034 tree 371f01b78f7fa205128b9ba9127b30904dfdd7b7 parent 88660351cb6daa85baf9700f12dff3af564dc14a author Richard Purdie Mon, 19 Jun 2006 19:58:52 +0100 committer Russell King Mon, 19 Jun 2006 19:58:52 +0100 [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters Patch from Richard Purdie Abstract some machine specific parameters from the sharpsl_pm core into the machine specific drivers. This allows the core to support tosa/poodle. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 88660351cb6daa85baf9700f12dff3af564dc14a tree 8824d4dac6576324e9922d0acc72a42f39325af5 parent 74617fb6b825ea370ae72565f7543306bc08ef6e author Richard Purdie Mon, 19 Jun 2006 19:58:51 +0100 committer Russell King Mon, 19 Jun 2006 19:58:51 +0100 [ARM] 3561/1: Poodle: Correct the MMC/SD power control Patch from Richard Purdie Correct the Poodle power control for the MMC/SD port. Also add write protection switch support. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 74617fb6b825ea370ae72565f7543306bc08ef6e tree ac6032e0b476f1bf61bf03aba44240e448739d57 parent b7408aff2d325581dcafffa5dbcc09c42ae64b5d author Richard Purdie Mon, 19 Jun 2006 19:57:12 +0100 committer Russell King Mon, 19 Jun 2006 19:57:12 +0100 [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds Patch from Richard Purdie Add functionality to allow machine specific reboot handlers on ARM. Add machine specific reboot and poweroff handlers for all PXA Zaurus models. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit afefc4158f3c8529e4bb99c1dc119fd792bac220 tree c985ca3b92ac101a6da45a5d372a2f873429ed02 parent 82dc0772a892f8b430a2d567c981fe47a11489c3 author Andrew Victor Mon, 19 Jun 2006 19:53:19 +0100 committer Russell King Mon, 19 Jun 2006 19:53:19 +0100 [ARM] 3592/1: AT91RM9200 Serial driver update Patch from Andrew Victor This patch includes a number of updates to the AT91RM9200 serial driver. Changes include: 1. Conversion to a platform_driver. [Ivan Kokshaysky] 2. Replaced all references to AT91RM9200 with AT91. This driver can now also be used for the AT91SAM9216. 3. Allow TIOCM_LOOP to configure local loopback mode. 4. Cleaned up the 'read_status_mask' usage and interrupt handler code. [Chip Coldwell] 5. Suspend/resume support. [David Brownell] There are a few 'unused variable' warning when compiling this - I removed the new DMA support to keep this first patch simpler. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit bf1c56a3aaa67ac74bc74e631ecc2a2673597cae tree 2600ec87aca8d4eecac84a3e12dd09a1a3d3cf5d parent 96ce2385dd2817da549910001a69ac0a2762a1b9 author Ben Dooks Mon, 19 Jun 2006 18:30:04 +0100 committer Russell King Mon, 19 Jun 2006 18:30:04 +0100 [ARM] 3591/1: Anubis: IDE device definitions Patch from Ben Dooks Platform device definitions for the two IDE ports on the Simtec Anubis board. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 82dc0772a892f8b430a2d567c981fe47a11489c3 tree db9e2e86f91e817ae1ad8e4478d402f1316edc2a parent 067bbada4cc574eaa4fa577483ecae4012049477 author Andrew Victor Mon, 19 Jun 2006 18:16:46 +0100 committer Russell King Mon, 19 Jun 2006 18:16:46 +0100 [ARM] 3590/1: AT91RM9200 Platform devices support Patch from Andrew Victor This patch includes the structures and exported functions required for the platform-device support (added in patch 3585/1). Also adds the arch_identify() function for run-time detection of which AT91 processor the code is running on. [Original patch from Ivan Kokshaysky] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 067bbada4cc574eaa4fa577483ecae4012049477 tree ec609719b6b413cf0baf4fd9d57b1a0570274fc7 parent 466e6227e6a54d9b94b50972612fe8bf0450f786 author Andrew Victor Mon, 19 Jun 2006 18:16:45 +0100 committer Russell King Mon, 19 Jun 2006 18:16:45 +0100 [ARM] 3589/1: AT91RM9200 DK/EK board update Patch from Andrew Victor This patch updates the support for the Atmel DK and EK boards. The changes include: 1. Use the new at91_uart_config structure and device registration functions for the UARTs. 2. Registration of I2C and SPI platform devices. 3. The USB Device pullup line is connected to reset, so multidrive needs to be enabled on the line. [Patch from David Brownell]. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 1723b4a34af85447684c9696af83929d2c1e8e6b tree ffd16da24a0a6a661d21d1b1f8ef85f0f3b615d9 parent b97b36bfd761d83f714eb1b5d6bce519794fa650 author Atsushi Nemoto Tue, 20 Jun 2006 00:19:13 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:27 +0100 [MIPS] Make timer interrupt frequency configurable from kconfig. Make HZ configurable. DECSTATION can select 128/256/1024 HZ, JAZZ can only select 100 HZ, others can select 100/128/250/256/1000/1024 HZ if not explicitly specified). Also remove all mach-xxx/param.h files and update all defconfigs according to current HZ value. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit b97b36bfd761d83f714eb1b5d6bce519794fa650 tree 256963db26c9ce44451cb48ee893c64a1322453a parent c3b1c2de2254aa4721e7e3c8d418fa9302e6acb0 author Kumba Sun, 18 Jun 2006 02:17:08 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Correct HAL2 Kconfig description The current HAL2 Kconfig description indicates it is only used on SGI Indy systems, however all members of the Indigo2 Family have this sound card as well. Plus a minor grammatical fix is included. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit c3b1c2de2254aa4721e7e3c8d418fa9302e6acb0 tree 81939a7c5aa1a7ec369d1899dd0df35fbe51d8ae parent 2493921c284813b9f512c95d972a302cf82296cb author Kumba Sun, 18 Jun 2006 02:17:01 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Fix R4K cache macro names Several machines have the R4K cache macro name spelled incorrectly. Namely, they have cpu_has_4kcache defined instead of cpu_has_4k_cache. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit 2493921c284813b9f512c95d972a302cf82296cb tree cda347ae07400e2aa277b52ee5ba27d1b7b5588c parent 35189fad3cb5f6e3ab66c8321928a851de0cd2b1 author Kumba Sun, 18 Jun 2006 02:16:53 -0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Add Missing R4K Cache Macros to IP27 & IP32 Keeping in accordance with other machines, IP27 and IP32 lack a few macros. IP27 lacks cpu_has_4kex & cpu_has_4k_cache macros while IP32 lacks just the cpu_has_4k_cache macro. Signed-off-by: Joshua Kinard Signed-off-by: Ralf Baechle commit 35189fad3cb5f6e3ab66c8321928a851de0cd2b1 tree 70dcd11a08d964da9ee27bc716b2205f250b42dd parent 355c471f2ff324c21f8a1fb8e2e242a0f2a4aa68 author Ralf Baechle Sun, 18 Jun 2006 16:39:46 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Support for the RM9000-based Basler eXcite smart camera platform. Signed-off-by: Thomas Koeller Signed-off-by: Ralf Baechle commit 355c471f2ff324c21f8a1fb8e2e242a0f2a4aa68 tree 8a491d03e865b9e16686004dea765a141e048219 parent 4a0312fca6599299bbed944ce09278d90388a3e5 author dmitry pervushin Sun, 21 May 2006 14:53:06 +0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:26 +0100 [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board Signed-off-by: dmitry pervushin Signed-off-by: Ralf Baechle commit 4a0312fca6599299bbed944ce09278d90388a3e5 tree cde9b9d353eab1aa7ab062c2a958986bd45c1f24 parent b00f473e1af9a11454e572de1ea446eb672e700d author Thomas Bogendoerfer Tue, 13 Jun 2006 13:59:01 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors. Added support for RM200C machines with big endian firmware Added support for RM200-C40 (R5000 support) Signed-off-by: Florian Lohoff Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle commit b00f473e1af9a11454e572de1ea446eb672e700d tree daed429452901d2b1d3d09380e2b9467b4f68cda parent 4fb60a4b80f9db94605c2a47807d34dfb9ae44c8 author Ralf Baechle Sat, 17 Jun 2006 10:56:26 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] SN: include asm/sn/types.h for nasid_t. Signed-off-by: Ralf Baechle commit 4fb60a4b80f9db94605c2a47807d34dfb9ae44c8 tree 07f454d04edd7a02b8e6d8a8c7ec04b6b0d1aec6 parent b75d4c1d686aff4f8f9ea96b2e8908a3454a3ff3 author Thiemo Seufer Sun, 18 Jun 2006 05:23:47 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Random fixes for sb1250 Random improvements for sb1250: Silence compiler warnings, a bugfix for the profiling code, and a comment typo. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit b75d4c1d686aff4f8f9ea96b2e8908a3454a3ff3 tree 037024e26c3f91919dbbcb35fb0af341970c64eb parent 470b160364db5b8096b8e557a23c97eb6612be67 author Thiemo Seufer Sun, 18 Jun 2006 05:17:54 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Fix bcm1480 compile Fix compilation for bcm1480, a hpt is only available on sb1250/bcm112x. Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit 470b160364db5b8096b8e557a23c97eb6612be67 tree e788b9548129880ecf5f6a7be89d7f1380050616 parent eaff3888742155bd397e45a1c3323c0173042e5b author Ralf Baechle Sun, 18 Jun 2006 05:28:38 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Remove support for NEC DDB5476. As warned several times before. Signed-off-by: Ralf Baechle commit eaff3888742155bd397e45a1c3323c0173042e5b tree bf8ee6203072e01ce0d50db5898137c7552da6e5 parent 2925aba4223f4532e85f0c6f64584b3e0b2849c3 author Ralf Baechle Sun, 18 Jun 2006 04:58:57 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:24 +0100 [MIPS] Remove support for NEC DDB5074. As warned several times before. Signed-off-by: Ralf Baechle commit 2925aba4223f4532e85f0c6f64584b3e0b2849c3 tree 1a7d38a22db3b745926232d665d6653baa47ee61 parent 7ab2dc41d15f31e9d5472e46148337b4cf7c941c author Ralf Baechle Sun, 18 Jun 2006 01:32:22 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] Cleanup memory managment initialization. Historically plat_mem_setup did the entire platform initialization. This was rather impractical because it meant plat_mem_setup had to get away without any kind of memory allocator. To keep old code from breaking plat_setup was just renamed to plat_setup and a second platform initialization hook for anything else was introduced. Signed-off-by: Ralf Baechle commit 7ab2dc41d15f31e9d5472e46148337b4cf7c941c tree f42d6678527130086997dfb3fe8e7a7f41dbf933 parent 610019baddcb4c4c323c12cd44ca7f73d7145d6f author Ralf Baechle Sat, 17 Jun 2006 14:55:40 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] SN: Declare bridge_pci_ops. Signed-off-by: Ralf Baechle commit 610019baddcb4c4c323c12cd44ca7f73d7145d6f tree e08e7fbac1f2358b8725a5082ac456d66502d532 parent 9e0c7afd0ec6e6d788df14270b2b1b8f21a384a8 author Ralf Baechle Sat, 17 Jun 2006 14:54:32 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] Remove unused function alloc_pci_controller. Signed-off-by: Ralf Baechle commit 9e0c7afd0ec6e6d788df14270b2b1b8f21a384a8 tree 40ab41d3405e393c94b01b9d863263df94f39744 parent 3a11545615dedd8dd52ff110ddf6e970bfac963a author Ralf Baechle Sat, 17 Jun 2006 00:55:45 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Extract pci_ops into separate file. Signed-off-by: Ralf Baechle commit 3a11545615dedd8dd52ff110ddf6e970bfac963a tree 54f72b728ff5c36d3134d2e18ad69ba4c6801325 parent c340cc504c91cf81561ecca10ec13396ae24dcc0 author Ralf Baechle Sat, 17 Jun 2006 00:46:27 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Use symbolic constants instead of magic numbers. Signed-off-by: Ralf Baechle commit c340cc504c91cf81561ecca10ec13396ae24dcc0 tree aae1bca403ae101ee6c907447be7aa3936e151bc parent f456acae4fe9b4504db7d75c51fba6b8db787ee2 author Yoichi Yuasa Thu, 15 Jun 2006 23:29:37 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig. Remove unnecessary items from vr41xx/Kconfig. SYS_HA_CPU_VR41XX has already been selected by MACH_VR41XX. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit f456acae4fe9b4504db7d75c51fba6b8db787ee2 tree 0957b407a6ce53a67a3df333a83d24a9d47d3c9b parent 09866258612bd9f389b0d86b3a63fe98e855d3f0 author Ralf Baechle Wed, 14 Jun 2006 08:10:35 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:23 +0100 [MIPS] IP27: Cleanup N/M mode configuration. Signed-off-by: Ralf Baechle commit 09866258612bd9f389b0d86b3a63fe98e855d3f0 tree 0c6efa03ce82f343d4e6deeed9118a9ebc68aa71 parent d9b8d0da404cf952a425d990c37c29c166eec954 author Ralf Baechle Wed, 14 Jun 2006 08:01:30 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] IP27: Throw away old unused hacks. Signed-off-by: Ralf Baechle commit d9b8d0da404cf952a425d990c37c29c166eec954 tree 22083744b8735c22314f52cd276df35126c8a7b6 parent e53639d8f313974a87540015cbb0832905be6056 author Ralf Baechle Mon, 12 Jun 2006 12:20:09 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] Drop 0 definition for kern_addr_valid kern_addr_valid is currently only being used in kmem_ptr_validate which is making some vague attempt at verfying the validity of an address. Only IA-64, PARISC and x86-64 actually make some actual effort to verify the validity of the pointer. Most architecture definitions of kern_addr_valid() just define it as 1; the Alpha and CONFIG_DISCONTIGMEM on i386 and MIPS even as 0; the 0-definition will result in kmem_ptr_validate always failing which in turn will cause d_validate to always fail. d_validate's only two users are smbfs and ncpfs, so the 0 definition ended breaking those ... Signed-off-by: Ralf Baechle commit e53639d8f313974a87540015cbb0832905be6056 tree b6a442bd408c9c4f2d3de284097d06c69cae273f parent 952fa954a61cee43de5afba91ae605e30ed2586c author Ralf Baechle Mon, 12 Jun 2006 09:13:56 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] Consolidate definitions of pfn_valid in one file. Signed-off-by: Ralf Baechle commit 952fa954a61cee43de5afba91ae605e30ed2586c tree 8d94bd87614cb1c8a7eda02e383c7b6c4f45a474 parent aa9772e330d6c0a8a94316cb38ae8a7495885a60 author Rodolfo Giometti Mon, 05 Jun 2006 17:43:10 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] APM emu support Signed-off-by: Rodolfo Giometti Signed-off-by: Ralf Baechle commit aa9772e330d6c0a8a94316cb38ae8a7495885a60 tree 7371d03f0d86a74eb751d0e262fd562214bf8da5 parent bf5a312b26e9943613b765a29a8de5f4c762df11 author Ralf Baechle Mon, 12 Jun 2006 00:55:14 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] SN: Rename SGI_SN0_N_MODE -> SGI_SN_N_MODE. It's not SN0-specific. Signed-off-by: Ralf Baechle commit bf5a312b26e9943613b765a29a8de5f4c762df11 tree 163a30c499ad6f92f73cbbbd48bfcec73b9a9efc parent d8cb4e119f9a97f87f69a179d855f5dfc5d578c2 author Ralf Baechle Sat, 10 Jun 2006 00:37:20 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:22 +0100 [MIPS] SN: Move FRU header one level up; it is not SN0-specific. Signed-off-by: Ralf Baechle commit d8cb4e119f9a97f87f69a179d855f5dfc5d578c2 tree 65758baf0c2bb77c86d002ec602f4b3c75fa27c9 parent 3e0ba410a5d5595c2b79ecbfb85fb2466b998680 author Ralf Baechle Sun, 11 Jun 2006 23:03:08 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] Cleanup ARCH_DISCONTIGMEM_ENABLE and NUMA configuration. IP27 configuration isn't the only NUMA system - it just happens to be the currently only supported MIPS NUMA system. So move the necessary options back into the main MIPS Kconfig file. Signed-off-by: Ralf Baechle commit 3e0ba410a5d5595c2b79ecbfb85fb2466b998680 tree 22f2044fb6f8c630b02c1c86cc7a96ed017395d0 parent 8f2f360da9262091153c97d756c40eabdde75f1a author Ralf Baechle Wed, 07 Jun 2006 20:13:20 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Remove #if 0'ed code. Signed-off-by: Ralf Baechle commit 8f2f360da9262091153c97d756c40eabdde75f1a tree 057e7afec78f5f2f56e487f4c8dea5d62553a3e6 parent edc123d18397008fcd4fdf04f60e033ba1042834 author Ralf Baechle Wed, 07 Jun 2006 20:10:06 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Nuke leftovers of _STANDALONE Signed-off-by: Ralf Baechle commit edc123d18397008fcd4fdf04f60e033ba1042834 tree 27abf8dda80d61d46c3ee20502e236f1345f77d7 parent 8dbd1d3e65f0281ddf9f7b8123ef81763bc2051f author Ralf Baechle Wed, 07 Jun 2006 20:07:29 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Remove leftovers of sable support. Signed-off-by: Ralf Baechle commit 8dbd1d3e65f0281ddf9f7b8123ef81763bc2051f tree 45f61ecc0a919451d4e4178f3baae69324ed3a22 parent b383f47ec71de66dbba5f7233479783041f5096a author Ralf Baechle Wed, 07 Jun 2006 20:04:23 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:21 +0100 [MIPS] IP27: Nuke last leftovers from FRUTEST Signed-off-by: Ralf Baechle commit b383f47ec71de66dbba5f7233479783041f5096a tree dec6cffd527d78e03cb784629f438e5208523672 parent 5e46c3aefe60d1398488410a0c39b4cd87738614 author Ralf Baechle Wed, 07 Jun 2006 20:02:21 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] IP27: Nuke last leftovers of CONFIG_SGI_IO. Signed-off-by: Ralf Baechle commit 5e46c3aefe60d1398488410a0c39b4cd87738614 tree 982f9820e63cee8aacc4a6132f124d1cef4fe901 parent cbb306962ec4b30e03423137e22d605281a8f598 author Ralf Baechle Sun, 04 Jun 2006 15:14:05 -0700 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] C99-ify struct resource initialization. Signed-off-by: Ralf Baechle commit cbb306962ec4b30e03423137e22d605281a8f598 tree 510435da13b336be64eb210f6d2a552503188c43 parent 1bd5e16168b58e73f7be432ba3558af9d38662cf author Ralf Baechle Sun, 04 Jun 2006 00:55:21 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] Remove duplicate declarations from Alchemy code. Signed-off-by: Ralf Baechle commit 1bd5e16168b58e73f7be432ba3558af9d38662cf tree f816acdb0a3a8015c2049c2a7bd1f655e2ec3a15 parent c0589f1ecea73e7bce09c569dca44b83e68a39b1 author Ralf Baechle Sat, 03 Jun 2006 21:59:51 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:20 +0100 [MIPS] Cleanup __emt() a bit. Signed-off-by: Ralf Baechle commit c0589f1ecea73e7bce09c569dca44b83e68a39b1 tree c601141cbcf2f80b28f41c1a27556b764f385540 parent fbd7a38ffb127da53a4c9fd0ad09e6ed937e8e3f author Yoichi Yuasa Wed, 31 May 2006 16:00:05 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Remove unused definitions from addrspace.h. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit fbd7a38ffb127da53a4c9fd0ad09e6ed937e8e3f tree 2f06c671b67200e181c289949caf4bc08eb2a77e parent b0b0e13e7dd309be13ab9324e67893e62b136e44 author Sergei Shtylyov Sun, 28 May 2006 00:04:01 +0400 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] arch/mips/au1000/time.c cleanup Mark au1xxx_timer_setup() __init, just because it is. Get rid of unneeded extern's (note that (*do_gettimeoffset)() is already declared by ) and an unused variable. Kill some whitespace... Signed-off-by: Sergei Shtylyov Signed-off-by: Ralf Baechle commit b0b0e13e7dd309be13ab9324e67893e62b136e44 tree 522f2ee785c8ab5600a254cabe8b2d0326425a0c parent c583122c26ad04bb2379933dc5acc8b9479d6c67 author Ralf Baechle Thu, 18 May 2006 12:38:47 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Remove unused instances of prom_build_cpu_map. Signed-off-by: Ralf Baechle commit c583122c26ad04bb2379933dc5acc8b9479d6c67 tree 8afc9153e18b300ab93ff6a675e0c0f6e464c518 parent eae89076e696f51762d81d6e2538c3beb59fa7bd author Thiemo Seufer Mon, 15 May 2006 18:59:34 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:19 +0100 [MIPS] Qemu system shutdown support Signed-off-by: Thiemo Seufer Signed-off-by: Ralf Baechle commit eae89076e696f51762d81d6e2538c3beb59fa7bd tree 7aab0972d6786721eb6c9b01d77a1b5f13263c49 parent 5deee2dbf495b2693629f7e8f846483432096278 author Atsushi Nemoto Tue, 16 May 2006 01:26:03 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Unify mips_fpu_soft_struct and mips_fpu_hard_structs. The struct mips_fpu_soft_struct and mips_fpu_hard_struct are completely same now and the kernel fpu emulator assumes that. This patch unifies them to mips_fpu_struct and get rid of mips_fpu_union. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 5deee2dbf495b2693629f7e8f846483432096278 tree 8ab697ac6c3217a60a93e56e88df482230eb2f77 parent a240a469649eaab03f0c4c7fbb21ea5041bf5572 author Ralf Baechle Mon, 15 May 2006 15:08:22 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Remove prototype for non-existing function. Signed-off-by: Ralf Baechle commit a240a469649eaab03f0c4c7fbb21ea5041bf5572 tree 71801adbf35a8a449a76398a4a5d7c34066313b4 parent a643d2b57403dc943fd4d9a3c803addd1c6b0ddc author Mark.Zhan Sat, 06 May 2006 17:04:20 +0800 committer Ralf Baechle Mon, 19 Jun 2006 17:39:18 +0100 [MIPS] Wind River 4KC PPMC Eval Board Support Support for the GT-64120-based Wind River 4KC PPMC Evaluation board. Signed-off-by: Rongkai.Zhan Signed-off-by: Ralf Baechle commit a643d2b57403dc943fd4d9a3c803addd1c6b0ddc tree c06e22a97cffe9f700874fba938eceb6226e50e8 parent 3c0094426f3ff37697062b940211712746419688 author Herbert Valerio Riedel Sun, 07 May 2006 15:48:25 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] Au1xxx: board specific irq code cleanup Convert sizeof/sizeof use to use of ARRAY_SIZE macro, and annotate irqmap structures as __initdata. Signed-off-by: Herbert Valerio Riedel Signed-off-by: Ralf Baechle commit 3c0094426f3ff37697062b940211712746419688 tree 9cf7f61829a9ac03294bc04e9b00257a17c2d2d9 parent 0307e8d024dffc00743fb54b9afa920a346f1adb author Ralf Baechle Fri, 16 Jun 2006 17:10:49 +0200 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] IP27: Fix collision with hardcoded interrupt number. Signed-off-by: Ralf Baechle commit 0307e8d024dffc00743fb54b9afa920a346f1adb tree 3e6ea1c677105501fc9efb57105cb23cec4e8f2d parent e1701fb2e2f3c02760684e26007e3379be23b690 author Atsushi Nemoto Sun, 11 Jun 2006 23:25:43 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:17 +0100 [MIPS] Fix futex_atomic_op_inuser. I found that NPTL's pthread_cond_signal() does not work properly on kernels compiled by gcc 4.1.x. I suppose inline asm for __futex_atomic_op() was wrong. I suppose: 1. "=&r" constraint should be used for oldval. 2. Instead of "r" (uaddr), "=R" (*uaddr) for output and "R" (*uaddr) for input should be used. 3. "memory" should be added to the clobber list. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit e1701fb2e2f3c02760684e26007e3379be23b690 tree ed27a4aa460a0fa5ae0a928e2dd86de0e555bd68 parent 4b29f6043dbb07823a0a618fb8b35ef3ac83e759 author [MIPS] James E Wilson Mon, 27 Feb 2006 15:04:38 -0800 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [PATCH] Fix BCM1480 doubled process accounting times. Running a UP kernel on a bcm1480 board, I get nonsensical timing results, like this: release@unknown:~/tmp$ time ./a.out real 0m22.906s user 0m45.792s sys 0m0.010s According to my watch, this program took 23 seconds to run, so the real time clock is OK. It is process accounting that is broken. I tracked this down to a problem with the function bcm1480_timer_interrupt in the file sibyte/bcm1480/time.c. This function calls ll_timer_interrupt for cpu0, and ll_local_timer_interrupt for all cpus. However, both of these functions do process accounting. Thus processes running on cpu0 end up with doubled times. This is very obvious in a UP kernel where all processes run on cpu0. The correct way to do this is to only call ll_local_timer interrupt if this is not cpu0. This can be seen in the mips-board/generic/time.c file, and also in the sibyte/sb1250/time.c file, both of which handle this correctly. I fixed the bcm1480/time.c file by copying over the correct code from the sb1250/time.c file. With this fix, I now get sensible results. release@unknown:~/tmp$ time ./a.out real 0m22.903s user 0m22.894s sys 0m0.006s Signed-off-by: Ralf Baechle commit 4b29f6043dbb07823a0a618fb8b35ef3ac83e759 tree 60958a8df2a8b5e5cadb0df225753d5500a95f95 parent 72fbfb260197a52c2bc2583f3e8f15d261d0f924 author Ralf Baechle Wed, 07 Jun 2006 15:24:44 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [MIPS] Mark PNX8550 support broken. Broken in too many way for me to fix it for 2.6.17. Signed-off-by: Ralf Baechle commit 72fbfb260197a52c2bc2583f3e8f15d261d0f924 tree 4801ed07d35013ece68ed9ca40f40421ff8f5e2a parent aac076f8805448a6331a526aa02cc438730ddd39 author Ralf Baechle Wed, 07 Jun 2006 13:25:37 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:16 +0100 [MIPS] Fix optimization for size build. It took a while longer than on other architectures but gcc has finally started to strike us as well ... This also fixes the damage by 6edfba1b33c701108717f4e036320fc39abe1912. Signed-off-by: Ralf Baechle commit aac076f8805448a6331a526aa02cc438730ddd39 tree 270ad4de03c5cf88e6a267335ac4888dcce09854 parent 973c789742b4dc957cd7feb96cae98988dd0cf01 author Ralf Baechle Wed, 07 Jun 2006 12:53:17 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:15 +0100 [MIPS] IP22: Fix ISA driver builds if CONFIG_EISA is selected. Signed-off-by: Ralf Baechle commit 973c789742b4dc957cd7feb96cae98988dd0cf01 tree f9a78f2c8fccf4b9be408eddf365d7fb68950743 parent c138e12f3a2e0421a4c8edf02587d2d394418679 author Yoichi Yuasa Wed, 07 Jun 2006 09:53:34 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:14 +0100 [MIPS] Cobalt: Fix undefined reference to disable_early_printk. Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit c138e12f3a2e0421a4c8edf02587d2d394418679 tree 66abbf27cbfc9030958b469aa4d826242417a752 parent 734996820fd02b52a3fa0fcc09bdb914934bea4c author Atsushi Nemoto Tue, 23 May 2006 00:47:41 +0900 committer Ralf Baechle Mon, 19 Jun 2006 17:39:13 +0100 [MIPS] Fix fpu_save_double on 64-bit. > Without this fix, _save_fp() in 64-bit kernel is seriously broken. > > ffffffff8010bec0 <_save_fp>: > ffffffff8010bec0: 400d6000 mfc0 t1,c0_status > ffffffff8010bec4: 000c7140 sll t2,t0,0x5 > ffffffff8010bec8: 05c10011 bgez t2,ffffffff8010bf10 <_save_fp+0x50> > ffffffff8010becc: 00000000 nop > ffffffff8010bed0: f4810328 sdc1 $f1,808(a0) > ... Fix register usage in fpu_save_double() and make fpu_restore_double() more symmetric with fpu_save_double(). Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 734996820fd02b52a3fa0fcc09bdb914934bea4c tree 7d12e625c842bfc605b83506fd2423a44fad53ed parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Elizabeth Oldham Tue, 06 Jun 2006 10:57:09 +0100 committer Ralf Baechle Mon, 19 Jun 2006 17:39:13 +0100 [MIPS] Malta: Handle byteswapping hardare bug in big endian mode. The SOC-it system controller running in big endian mode might forget byteswapping when DMAing to the last word of physical memory. Fixed by ignoring the last page of memory. Signed-off-by: Ralf Baechle commit 466e6227e6a54d9b94b50972612fe8bf0450f786 tree b6704d537eac6deb9ba97a937460058e9ad19201 parent 82c583e3ae31ffa76d1280197274cc1e1cde3179 author Andrew Victor Mon, 19 Jun 2006 17:26:23 +0100 committer Russell King Mon, 19 Jun 2006 17:26:23 +0100 [ARM] 3588/1: AT91RM9200 CSB337/637 board update Patch from Andrew Victor This patch updates the support for the Cogent CSB337 and CSB637 boards. The changes include: 1. Use the new at91_uart_config structure and device registration functions for the UARTs. 2. Registration of I2C and SPI platform devices. 3. The CSB337 board uses PB0 & PB1 (and not PB2) for the LEDs. [Patch from David Brownell] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 82c583e3ae31ffa76d1280197274cc1e1cde3179 tree e51bb66dd2a4f0a13f9089b5ddb4872ecdae7538 parent 7238d7ee82d325212e83630047e9844943225118 author Andrew Victor Mon, 19 Jun 2006 16:57:00 +0100 committer Russell King Mon, 19 Jun 2006 16:57:00 +0100 [ARM] 3587/1: AT91RM9200 hardware headers Patch from Andrew Victor These headers define the registers and bits for the SPI (Serial Peripheral Interface), SSC (Synchronous Serial), TC (Timer/Counter) and UDP (USB Device) peripherals integrated in the AT91RM9200 processor. (They will probably also be usable for the AT91SAM9 series of SoC processors) Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 7238d7ee82d325212e83630047e9844943225118 tree b0b9020419ef037650a3398de1525c52c961ef60 parent 2e83640270b4a76a3855131953c82bbc1919e589 author Andrew Victor Mon, 19 Jun 2006 16:57:00 +0100 committer Russell King Mon, 19 Jun 2006 16:57:00 +0100 [ARM] 3586/1: AT91RM9200 header update Patch from Andrew Victor Added definition for the bits in the Chip ID register. Corrected the capitalization of AT91_RTC_AMPM register name. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 2e83640270b4a76a3855131953c82bbc1919e589 tree 7130aceafd79421f20e9c7ffb7b1eb931b2a14a5 parent 814138ffa488824393d2f49f2720dcd197a7d4cf author Andrew Victor Mon, 19 Jun 2006 16:31:55 +0100 committer Russell King Mon, 19 Jun 2006 16:31:55 +0100 [ARM] 3585/1: AT91RM9200 Platform devices Patch from Andrew Victor This patch updates the platform device support for the AT91RM9200. The changes include: 1. USB Host device renamed to "at91_ohci" since the driver is also usable on the AT91SAM9261 processor. 2. Enabling multidrive on the USB Device's pullup pin should not be done for all boards. Moved into board-specific files. [Patch from David Brownell] 3. Move enabling of PCMCIA/Compact Flash pins out of the driver. 4. Added SPI device and resources. 5. Added Watchdog device and resources. [Patch from David Brownell] 6. Added UART device and resources. 7. The simple devices (watchdog, rtc, i2c) are now automatically registered and don't have to be registered separately in each board-specific file. [Patch from David Brownell] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 5af29e56c221d709bdbd5fccaf190e21f290a30e tree 03c48002fd45ea4479345a9cf89b0e442305e1db parent 441ff855f3edf5d355bea30f557bbed6bcd42c6c author Russell King Mon, 19 Jun 2006 15:37:31 +0100 committer Russell King Mon, 19 Jun 2006 15:37:31 +0100 [ARM] Fix badge4 build error The Badge4 PCMCIA driver was referencing structure elements which had been renamed. Fix the missing renames. Signed-off-by: Russell King commit 441ff855f3edf5d355bea30f557bbed6bcd42c6c tree 6327490a1106630deb7fc20255c61072c85a943f parent 5e6423871772b89120c9fb356d2eabb67fea60bd author H. Peter Anvin Mon, 19 Jun 2006 15:35:36 +0100 committer Russell King Mon, 19 Jun 2006 15:35:36 +0100 [ARM] Fix byte order macros for Thumb The byte order functions are visible to userspace. Unfortunately, __arch_swab32() contains an assembly instruction which is invalid when compiling for Thumb. This reverts to the C version when compiling for Thumb. Signed-off-by: H. Peter Anvin Signed-off-by: Russell King commit 5e6423871772b89120c9fb356d2eabb67fea60bd tree b9ae5a7fa508fdf26bfa5e9a6b565352e4feaa97 parent 2697c5e1f799f201366d5fd7d25e96a21587f1a9 author Sascha Hauer Mon, 19 Jun 2006 15:30:21 +0100 committer Russell King Mon, 19 Jun 2006 15:30:21 +0100 [ARM] 3577/1: netX: Default config for netx based boards Patch from Sascha Hauer This patch adds the default config file for netx based boards. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 2697c5e1f799f201366d5fd7d25e96a21587f1a9 tree 43e234d320316394a38be278ae0f002a5a7a7c3a parent af614ba072dab2940471fec1f30bd59b8272fc6b author Sascha Hauer Mon, 19 Jun 2006 15:29:45 +0100 committer Russell King Mon, 19 Jun 2006 15:29:45 +0100 [ARM] 3576/1: netX: board support for NXEB500HMI development board Patch from Sascha Hauer This patch adds the board specific code for the Hilscher NXEB500HMI development board. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit af614ba072dab2940471fec1f30bd59b8272fc6b tree 58dd752e79c50fc0342f8a7fa662c783a178b8d1 parent 693532dcff871543639743e9c2e2b99c492f8f8d author Sascha Hauer Mon, 19 Jun 2006 15:29:44 +0100 committer Russell King Mon, 19 Jun 2006 15:29:44 +0100 [ARM] 3575/1: netX: board support for NXDB500 development board Patch from Sascha Hauer This patch adds the board specific code for the Hilscher NXDB500 development board. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 693532dcff871543639743e9c2e2b99c492f8f8d tree 88e5dd99441b2641f96ca9452aa1d496db8037c1 parent 8e77da68a6107ee47323fec5dfb3a93ebbc809e2 author Sascha Hauer Mon, 19 Jun 2006 15:29:43 +0100 committer Russell King Mon, 19 Jun 2006 15:29:43 +0100 [ARM] 3574/1: netX: board support for NXDKN development board Patch from Sascha Hauer This patch adds the board specific code for the Hilscher NXDKN development board. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 8e77da68a6107ee47323fec5dfb3a93ebbc809e2 tree e7cee971204ddf5e9e5729f264c3480425e07e01 parent ef70cd4d247defcd7c0f789a5a98deab0afadf53 author Sascha Hauer Mon, 19 Jun 2006 15:28:20 +0100 committer Russell King Mon, 19 Jun 2006 15:28:20 +0100 [ARM] 3569/2: netX: driver for XMAC/XPEC engines Patch from Sascha Hauer The netX processors have generic network bitstream engines (XMAC/XPEC). This driver adds support for firmware loading and start, stop, reset commands. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit ef70cd4d247defcd7c0f789a5a98deab0afadf53 tree f70493a24f7e83aaf09c52ee274d7b1dc36ade28 parent bb6d8c8828123e01e2ae6c9d9c4870477889fd94 author Sascha Hauer Mon, 19 Jun 2006 15:28:19 +0100 committer Russell King Mon, 19 Jun 2006 15:28:19 +0100 [ARM] 3568/2: netX: pointer fifo driver Patch from Sascha Hauer This patch adds support for the pointer FIFOs on netX. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit bb6d8c8828123e01e2ae6c9d9c4870477889fd94 tree 43d7a6ec2cc15f1bf8810a65aa38d508c7fa955a parent 3095faf5295f2da9118469c925d2cfb7775ad287 author Sascha Hauer Mon, 19 Jun 2006 15:27:53 +0100 committer Russell King Mon, 19 Jun 2006 15:27:53 +0100 [ARM] 3567/2: arm: base support for Hilscher netX Patch from Sascha Hauer This patch adds the base support for Hilscher's netX network processors. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 814138ffa488824393d2f49f2720dcd197a7d4cf tree 24e86542da43b8e797859a0b085b03a9a3cb5091 parent 683c66bf75ce277b90d658da0c1a0bf1a55cce4c author Andrew Victor Mon, 19 Jun 2006 15:26:54 +0100 committer Russell King Mon, 19 Jun 2006 15:26:54 +0100 [ARM] 3584/1: AT91RM9200 GPIO suspend/resume support Patch from Andrew Victor This patch adds suspend/resume/set_wake support for the AT91RM9200's GPIO interrupts. Original patch from David Brownell. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 683c66bf75ce277b90d658da0c1a0bf1a55cce4c tree 962a3d92b8eba3424df5642e5a02e66220876281 parent 37f2e4bc120bd784e7f69f961233e1c16b74d170 author Andrew Victor Mon, 19 Jun 2006 15:26:53 +0100 committer Russell King Mon, 19 Jun 2006 15:26:53 +0100 [ARM] 3583/1: AT91RM9200 IRQ suspend/resume support Patch from Andrew Victor Added suspend/resume/set_wake support for the AT91RM9200's AIC interrupt controller. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 37f2e4bc120bd784e7f69f961233e1c16b74d170 tree fbe1d1b32bc81c0b5f5cf030639a13a51f08906b parent 10e8e1fb758eed5cfb0cae1b770f842624851e7b author Andrew Victor Mon, 19 Jun 2006 15:26:52 +0100 committer Russell King Mon, 19 Jun 2006 15:26:52 +0100 [ARM] 3582/1: AT91RM9200 IRQ trigger types Patch from Andrew Victor The AIC interrupt controller's set_irq_type() can also be used for internal interrupts. IRQT_LOW and IRQT_FALLING are the only options not supported for the internal interrupts. [Original patch from Karl Olsen] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 10e8e1fb758eed5cfb0cae1b770f842624851e7b tree 3276408aedaf5b1061c7f681ad5ea6dcf89925c2 parent 2a6f9902c6a799a9c0218b37e39b75690c3b9a70 author Andrew Victor Mon, 19 Jun 2006 15:26:51 +0100 committer Russell King Mon, 19 Jun 2006 15:26:51 +0100 [ARM] 3581/1: AT91RM9200 Internal SRAM Patch from Andrew Victor This patch maps the AT91RM9200's internal SRAM into the virtual memory address space - just below the internal peripheral registers. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 2a6f9902c6a799a9c0218b37e39b75690c3b9a70 tree ef35c9fd90421e0e667be719489422cb52c629c1 parent 963151f2471d0e6475d8b2d3a005417aec1766f7 author Andrew Victor Mon, 19 Jun 2006 15:26:50 +0100 committer Russell King Mon, 19 Jun 2006 15:26:50 +0100 [ARM] 3580/1: AT91RM9200 Timer suspend/resume support Patch from Andrew Victor Added suspend/resume support for the AT91RM9200 timer. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 963151f2471d0e6475d8b2d3a005417aec1766f7 tree 37602e1518fea1fea3243f7a527ea3c7deea3d34 parent 91f8ed835ffb34b4108cc16eefd3303e4068bee0 author Andrew Victor Mon, 19 Jun 2006 15:23:41 +0100 committer Russell King Mon, 19 Jun 2006 15:23:41 +0100 [ARM] 3579/1: AT91RM9200 Timer simplification Patch from Andrew Victor Use a global variable 'last_crtr' to store the time of the last timer tick instead of the ST_RTAR register. It's faster, frees up the ST_RTAR register for other uses, and hopefully makes the code more understandable. [Patch from Peter Menzebach] Also add the SA_TIMER flag to Timer IRQ. (It seems to be required for the realtime preempt patch). Signed-off-by: Andrew Victor Signed-off-by: Russell King commit 3095faf5295f2da9118469c925d2cfb7775ad287 tree f874744f93762562c1a3263ba69c188d1dfc17e6 parent ab76fb13d73488ded53c87b77b1b5e38df2acf74 author Sascha Hauer Mon, 19 Jun 2006 13:30:58 +0100 committer Russell King Mon, 19 Jun 2006 13:30:58 +0100 [ARM] 3572/1: netX: framebuffer driver for Hilscher netX Patch from Sascha Hauer This patch adds framebuffer support for Hilscher's netX network processors. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit f8441e13449638e9fc3c160c35ada3b6f1f8d9c0 tree 10035c1a56d9f8d91e56ea6021a7aaa5ed7f9f52 parent 14228a49913850493c7f9eb4501438c32da353f7 author Sascha Hauer Mon, 19 Jun 2006 13:29:07 +0100 committer Russell King Mon, 19 Jun 2006 13:29:07 +0100 [ARM] 3571/1: netX: serial driver for Hilscher netX Patch from Sascha Hauer This patch adds the serial driver for Hilscher's netX network processors. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit ab76fb13d73488ded53c87b77b1b5e38df2acf74 tree f94b56e908875df9918df7e1bc2c72fc4f17a257 parent 91f8ed835ffb34b4108cc16eefd3303e4068bee0 author Sascha Hauer Mon, 19 Jun 2006 13:24:32 +0100 committer Russell King Mon, 19 Jun 2006 13:24:32 +0100 [ARM] 3566/1: netX: register definitions Patch from Sascha Hauer This patch adds the register definitions for Hilscher's netX network processors. Signed-off-by: Robert Schwebel Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit 91f8ed835ffb34b4108cc16eefd3303e4068bee0 tree cb600e909c298ef9bede94e99bd911611ddc86d6 parent b7408aff2d325581dcafffa5dbcc09c42ae64b5d author Andrew Victor Mon, 19 Jun 2006 13:20:23 +0100 committer Russell King Mon, 19 Jun 2006 13:20:23 +0100 [ARM] 3578/1: AT91RM9200 Clock update Patch from Andrew Victor Some updates to the clock infrastructure for the AT91RM9200. 1. Hard-coded values replaced with names defined in at91rm9200_sys.h. 2. Added the four PIO clocks, which are enabled at startup. 3. At startup, disable all unused clocks. 4. Minor bugfix for usage counts associated with MCK. [Patch from David Brownell] 5. Added at91_clock_associate() function to associate device & function with a particular clock. [Patch from David Brownell] Signed-off-by: Andrew Victor Signed-off-by: Russell King commit b7408aff2d325581dcafffa5dbcc09c42ae64b5d tree d3f0c225b68108626853b1b40e4af49bd5be080c parent 96ce2385dd2817da549910001a69ac0a2762a1b9 author Richard Purdie Mon, 19 Jun 2006 13:08:39 +0100 committer Russell King Mon, 19 Jun 2006 13:08:39 +0100 [ARM] 3563/1: LED: Set the LOCOMO LED driver default triggers Patch from Richard Purdie Set the default triggers for the LOCOMO LED driver. Signed-off-by: Richard Purdie Signed-off-by: Russell King commit b44fb7a09e6bb7d77c1b4b402591f6f953c1e51c tree 8460db80ce3d5f50cfdeeabc6425a457813ad6ac parent a3fd4a1b9ced850ac1a9d5bb9f8fab494d07f3fa author Andrew Victor Mon, 19 Jun 2006 13:06:05 +0100 committer Russell King Mon, 19 Jun 2006 13:06:05 +0100 [ARM] 3565/1: AT91RM9200 MMC update Patch from Andrew Victor This patch includes code cleanups and minor fixes to the AT91RM9200 MMC driver. 1. Replace calls to DBG() with pr_debug(). 2. 'host' can never be null, so don't bother checking for that case. 3. Remove SA_SAMPLE_RANDOM from request_irq(). [Patch from Matt Mackall] 4. clk_get() doesn't return NULL on error - need to test returned value with IS_ERR(). 5. Free resources if clk_get() or request_irq() fails. Signed-off-by: Andrew Victor Signed-off-by: Russell King commit a3fd4a1b9ced850ac1a9d5bb9f8fab494d07f3fa tree dc2b9354fe087663cc862a966d12824601702c29 parent 12223dabc617a4babfba4e17feb1ed88e8cfeb8f author Russell King Sun, 04 Jun 2006 17:51:15 +0100 committer Russell King Mon, 19 Jun 2006 13:05:08 +0100 [MMC] Convert all hosts except mmci to use data->blksz The MMC specification allows non-power of two block sizes. As such, we should not pass the log2 block size to host drivers, but instead pass the byte size. However, ARM MMCI can only work with log2 block size, so continue to pass both the log2 block size and byte block size. This means that for the moment, the byte block size must remain a power of two, but this is the first stage of removing this restriction for other hosts. Signed-off-by: Russell King commit ad3b5fb772e6a824f1ac341eb8e392eca6fc524f tree 71efb4bd4406ad944afd0e1549c191d120ae4619 parent d1fef3c5e16327661be6cb127d68f5be379697a5 author Ben Dooks Mon, 19 Jun 2006 09:43:23 +0100 committer David Woodhouse Mon, 19 Jun 2006 09:43:23 +0100 [MTD NAND] S3C2410 driver cleanup Fix unused variables and commenting since tglx's new NAND updates Signed-off-by: Ben Dooks Signed-off-by: David Woodhouse commit d1fef3c5e16327661be6cb127d68f5be379697a5 tree edb5ac6e2a75619aec19a594b327eded84e301d5 parent 1046d88001e7b8819f60dece2eaf1b44bf4b4460 author Ben Dooks Mon, 19 Jun 2006 09:29:38 +0100 committer David Woodhouse Mon, 19 Jun 2006 09:29:38 +0100 [MTD NAND] s3c24x0 board: Fix clock handling, ensure proper initialisation. Signed-off-by: Ben Dooks Signed-off-by: David Woodhouse commit 0d8fee3270f8a5e4bf95fbed3e81e21b57f8a5a0 tree e965874962259a2f16980f19a4e5c03ef635a86f parent a805bad5daae8d4f92ce46f467484d4867e996d4 author Al Viro Mon, 19 Jun 2006 08:41:30 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:41:30 +1000 [XFS] Kill direct access to ->count in valusema(); all we ever use it for is check if semaphore is actually locked, which can be trivially done in portable way. Code gets more reabable, while we are at it... SGI-PV: 953915 SGI-Modid: xfs-linux-melb:xfs-kern:26274a Signed-off-by: Al Viro Signed-off-by: Nathan Scott commit a805bad5daae8d4f92ce46f467484d4867e996d4 tree 60a028285061b29b4b86935dec699c918d190d5a parent 6fe90e6d1451a05db37b2a582410ddcb45af3606 author Nathan Scott Mon, 19 Jun 2006 08:40:27 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:40:27 +1000 [XFS] Remove unneeded conditional code on NFS export interface related code paths. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26250a Signed-off-by: Nathan Scott commit 6fe90e6d1451a05db37b2a582410ddcb45af3606 tree 9eb884a4928582a563b835809bb6fc8d9786a3a0 parent 1e69dd0eb354d6f1a77098a3946b5ba57d4e3109 author Nathan Scott Mon, 19 Jun 2006 08:40:12 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:40:12 +1000 [XFS] Remove an incorrect use of unlikely() on a relatively likely code path. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26249a Signed-off-by: Nathan Scott commit 1e69dd0eb354d6f1a77098a3946b5ba57d4e3109 tree f97ce9c94f72cf142831ad12a701fc6378dc279f parent 1d47bec290a6f1f366192946840efef5076d9fc7 author Nathan Scott Mon, 19 Jun 2006 08:39:53 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:39:53 +1000 [XFS] Push some common code out of write path into core XFS code for sharing. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26248a Signed-off-by: Nathan Scott commit 1d47bec290a6f1f366192946840efef5076d9fc7 tree 06c46c4cdf4eba2b8bae974d443b310bd81df2cc parent d7ede1aa5dfff53e76dbabac5b8087341686f662 author Nathan Scott Mon, 19 Jun 2006 08:39:16 +1000 committer Nathan Scott Mon, 19 Jun 2006 08:39:16 +1000 [XFS] Remove unnecessary local from open_exec dmapi path. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26247a Signed-off-by: Nathan Scott commit 96ce2385dd2817da549910001a69ac0a2762a1b9 tree 18ec36e9e1e8a6b7c19aacb53c256fdb941c4ecd parent 66a9b49a370baac75d90b7da9a2445997a8a9438 author Ben Dooks Sun, 18 Jun 2006 23:06:41 +0100 committer Russell King Sun, 18 Jun 2006 23:06:41 +0100 [ARM] 3559/1: S3C2442: core and serial port Patch from Ben Dooks Core support for the Samsung S3C2442, and the serial port driver update to allow the serial port blocks to be used. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 66a9b49a370baac75d90b7da9a2445997a8a9438 tree 62b22d1559c1c1d1e02428f27c08dca0fb66aa83 parent 810c894f2b27b634883723f9fee10a7cf1d0bcb4 author Ben Dooks Sun, 18 Jun 2006 23:04:05 +0100 committer Russell King Sun, 18 Jun 2006 23:04:05 +0100 [ARM] 3557/1: S3C24XX: centralise and cleanup uart registration Patch from Ben Dooks All the S3C24XX based devices currently have similar uart blocks, in the same location. Make the process of adding new uart blocks easier by commonising the device definitions and adding a new init function for the cpu code. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 810c894f2b27b634883723f9fee10a7cf1d0bcb4 tree 5a4150fa4bd8c833990cd45eeabf1accbdde493e parent 9df5db80a781c1a1c67388c82f64f835093c3cc3 author Ben Dooks Sun, 18 Jun 2006 22:56:37 +0100 committer Russell King Sun, 18 Jun 2006 22:56:37 +0100 [ARM] 3558/1: SMDK24XX: LED platform devices Patch from Ben Dooks Platform devices for the LEDs on all the SMDK24XX boards Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 1046d88001e7b8819f60dece2eaf1b44bf4b4460 tree 82a8f62e785375b2f43bbb3f2b52da60775b5b56 parent fc6612f627c697b348a4ef64f16fb373d86dbd76 author David Woodhouse Sun, 18 Jun 2006 22:44:21 +0100 committer David Woodhouse Sun, 18 Jun 2006 22:44:21 +0100 [JFFS2] Check CRC32 on dirent and data nodes each time they're read Also, make sure dirents are marked REF_UNCHECKED when we 'discover' them through eraseblock summary. Signed-off-by: David Woodhouse commit fc6612f627c697b348a4ef64f16fb373d86dbd76 tree 5367b23890ea9ec990e4855f22115ee8e7f7f125 parent 2ba72cb754bb091bb24a44e9682f7105110f7f38 author David Woodhouse Sun, 18 Jun 2006 18:35:10 +0100 committer David Woodhouse Sun, 18 Jun 2006 18:39:38 +0100 [JFFS2] When retiring nextblock, allocate a node_ref for the wasted space Failing to do so makes the calculated length of the last node incorrect, when we're not using eraseblock summaries. Signed-off-by: David Woodhouse commit 9df5db80a781c1a1c67388c82f64f835093c3cc3 tree 65f80286fefe7a85a1d2cdb74a9befdcf9084564 parent ebc67da65fda03cbe5b4019d91229287fddd5c6e author David Brownell Sun, 18 Jun 2006 16:39:33 +0100 committer Russell King Sun, 18 Jun 2006 16:39:33 +0100 [ARM] 3534/1: add spi support to lubbock platform Patch from David Brownell This adds the platform device for SSP/SPI controller, and declares the ads7846 device hooked up to it. Not all Lubbock boards appear to populate the connector needed to use this instead of the ucb1400 chip, but it can always be used as a temperature sensor. In short, this is probably most useful as an example of how to provide the configuration data used by the pxa2xx_spi driver. (Last tested against a slightly earlier version of that driver.) Signed-off-by: David Brownell Signed-off-by: Russell King commit ebc67da65fda03cbe5b4019d91229287fddd5c6e tree 7f1f77aa0525eecfca86f066d64938c62794e663 parent 36fe6a83b4a52276eebb929ff94896fa65d83401 author Tony Lindgren Sun, 18 Jun 2006 16:26:58 +0100 committer Russell King Sun, 18 Jun 2006 16:26:58 +0100 [ARM] 3554/1: ARM: Fix dyntick locking Patch from Tony Lindgren This patch fixes some dyntick locking issues on ARM as pointed out by Russell King. Signed-off-by: Tony Lindgren Signed-off-by: Russell King commit 36fe6a83b4a52276eebb929ff94896fa65d83401 tree 503562ded0a767c7879b70d44e3f2309012a6903 parent 68d5969378fc21d9f70c0fdbc25176a68d873922 author Ben Dooks Sun, 18 Jun 2006 16:21:53 +0100 committer Russell King Sun, 18 Jun 2006 16:21:53 +0100 [ARM] 3553/1: S3C24XX: earlier print of cpu idcode info Patch from Ben Dooks Move the printk of the CPU information and IDCODE before the checking of the table entry validity to aide in debugging new cpu entries. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 68d5969378fc21d9f70c0fdbc25176a68d873922 tree 117635d7e73759a97bd34966320941c7f7b801a1 parent 4833acb2e19f669ce87c439a7d91ead600d8a7c9 author Ben Dooks Sun, 18 Jun 2006 16:21:52 +0100 committer Russell King Sun, 18 Jun 2006 16:21:52 +0100 [ARM] 3552/1: S3C24XX: Move VA of GPIO for low-level debug Patch from Ben Dooks Using the low-level debug routines early in the kernel debug cause the 1:1 mapping to get into the TLB, which is not flushed until after the CPU detection process (which needs the GPIO VA). This patch moves the VA for the GPIO to the same offset as the physical offset of the UART to the GPIO. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 4833acb2e19f669ce87c439a7d91ead600d8a7c9 tree 696cd2a5efa20f6780cb3c724ffad57f22c79a72 parent e2e5810f41646a400a9c6f941000db88d2ca10eb author Ben Dooks Sun, 18 Jun 2006 16:21:51 +0100 committer Russell King Sun, 18 Jun 2006 16:21:51 +0100 [ARM] 3551/1: S3C24XX: PM code failes to compile with CONFIG_DCACHE_WRITETHROUGH Patch from Ben Dooks If CONFIG_CPU_DCACHE_WRITETHOUGH is set, then the S3C24XX PM code fails to compile, as there is no need to flush the D-cache, the flush function arm920_flush_kern_cache_all() is not compiled. Fix the code to not use this if the config is set. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit e2e5810f41646a400a9c6f941000db88d2ca10eb tree d14e742b461939b44050677a7bc59752dfa3980c parent 45a7b9cf8e0634fa546e9e7ad29af990ab4afcf2 author Ben Dooks Sun, 18 Jun 2006 16:21:50 +0100 committer Russell King Sun, 18 Jun 2006 16:21:50 +0100 [ARM] 3550/1: OSIRIS: fix serial port map for 1:1 Patch from Ben Dooks The default serial port-mapping for the Osiris has the port 2 mapped onto the first serial port, and no port1. Correct this so port 1 is port. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 45a7b9cf8e0634fa546e9e7ad29af990ab4afcf2 tree 2a9910617eeebe7f70b4406fe7843908b2a0359e parent 5247593c9634309d1b9f7b549495b8e5ad521688 author Catalin Marinas Sun, 18 Jun 2006 16:21:50 +0100 committer Russell King Sun, 18 Jun 2006 16:21:50 +0100 [ARM] 3548/1: Fix the ARMv6 CPU id in compressed/head.S Patch from Catalin Marinas This code was still using the old format for the ARMv6 CPU id and it wasn't flushing the caches on the MPCore CPU (and other ARM1176 cores). The patch changes the mask bits to cope with the new id format. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit aca6ca10974aa78adfb47291722ce851160213e4 tree 5e1daa21e63d19c5bab1a2f00eb6b8e1dcc6e9ea parent 680714844fd1dcc6f03b22353103985be9d58db6 author Russell King Thu, 15 Jun 2006 20:28:03 +0100 committer Russell King Sun, 18 Jun 2006 16:17:45 +0100 [ARM] Gather common sigframe saving code into setup_sigframe() Gather the common sigmask savbing code inside setup_sigcontext(), and rename the function setup_sigframe(). Pass it a sigframe structure. Signed-off-by: Russell King commit 680714844fd1dcc6f03b22353103985be9d58db6 tree 9e0a0b1835690c4f796bdad5ca4e9eca720256f5 parent cb3504e8fa84870aabcf51c67e29675817e30836 author Russell King Thu, 15 Jun 2006 20:23:02 +0100 committer Russell King Sun, 18 Jun 2006 16:17:44 +0100 [ARM] Gather common sigframe restoration code into restore_sigframe() Gather the sigmask restoration code inside restore_sigcontext(), and rename the function restore_sigframe(). Pass it a sigframe structure. Signed-off-by: Russell King commit cb3504e8fa84870aabcf51c67e29675817e30836 tree 7c46380f8672e87ecc40cecb004772f5301ea0f8 parent 7d4fdc19fc134f69f3711c14e63caef56aee0f2a author Russell King Thu, 15 Jun 2006 20:18:25 +0100 committer Russell King Sun, 18 Jun 2006 16:17:43 +0100 [ARM] Re-use sigframe within rt_sigframe sigframe is now a contained subset of rt_sigframe, so we can start to re-use code which accesses sigframe data for both rt and non-rt signals. Signed-off-by: Russell King commit 7d4fdc19fc134f69f3711c14e63caef56aee0f2a tree 85d88f7807f295284cc05afd747e95c56ba2bc57 parent cc1a852137d6c12d50c372d61a1c5f763998536b author Russell King Thu, 15 Jun 2006 20:13:25 +0100 committer Russell King Sun, 18 Jun 2006 16:17:42 +0100 [ARM] Merge sigcontext and sigmask members of sigframe ucontext contains both the sigcontext and sigmask structures, and is also used for rt signal contexts. Re-use this structure for non-rt signals. Signed-off-by: Russell King commit cc1a852137d6c12d50c372d61a1c5f763998536b tree d7c01ac23534b98ae76af22f1a914b4a569176dc parent ce7a3fdc5c55fd01d8e2deda0daef84473644f8b author Russell King Thu, 15 Jun 2006 18:02:25 +0100 committer Russell King Sun, 18 Jun 2006 16:17:42 +0100 [ARM] Replace extramask with a full copy of the sigmask There's not much point in splitting the sigmask between two different locations, so copy it entirely into a proper sigset_t. This will eventually allow rt_sigframe and sigframe to share more code. Signed-off-by: Russell King commit ce7a3fdc5c55fd01d8e2deda0daef84473644f8b tree b2aad3635d9026b0cf9c415cffc6345f0af05295 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Russell King Thu, 15 Jun 2006 18:00:34 +0100 committer Russell King Sun, 18 Jun 2006 16:17:41 +0100 [ARM] Remove rt_sigframe puc and pinfo pointers These two members appear to be surplus to requirements. Discussing this issue with glibc folk: | > Additionally, do you see any need for these weird "puc" and "pinfo" | > pointers in the kernels rt_sigframe structure? Can we kill them? | | We can kill them. I checked with Phil B. about them last week, and he | didn't remember any reason they still needed to be there. And nothing | should know where they are on the stack. Unfortunately, doing this | will upset GDB, which knows that the saved registers are 0x88 bytes | above the stack pointer on entrance to an rt signal trampoline; but, | since puc and pinfo are quite recognizable, I can adapt GDB to support | the new layout if you want to remove them. So remove them. Signed-off-by: Russell King commit 5247593c9634309d1b9f7b549495b8e5ad521688 tree b9744271e43b76b22a43fd70d09c4b2aa81aa95f parent 254a1564fb6f9242782f9a8e5d59a212424686e8 author Paul Brook Tue, 16 May 2006 14:25:55 +0100 committer Russell King Sun, 18 Jun 2006 16:16:57 +0100 [ARM] 3335/1: Old-abi Thumb sys_syscall broken Patch from Paul Brook The old-abi sys_syscall syscall is broken when called from Thumb mode. It assumes the syscall number is an Arm syscall number (ie. starts from __NR_OABI_SYSCALL_BASE). In thumb mode syscall numbers start from zero. The patch below fixes this by clearing the nigh bits of the syscall number instead of inverting them. Technically this means we accept some invalid syscall numbers, but I can't see how that could be a problem. The two sets of numbers far apart that unimplemented syscalls should still be rejected. Signed-off-by: Paul Brook Signed-off-by: Russell King commit 254a1564fb6f9242782f9a8e5d59a212424686e8 tree cdac58eb69e29a35a1d744e4d29faaf56b16a276 parent 78818e477bf785391b02672d053fdbb2e111fb50 author Vitaly Wool Tue, 16 May 2006 11:54:38 +0100 committer Russell King Sun, 18 Jun 2006 16:16:56 +0100 [ARM] 3467/1: [3/3] Support for Philips PNX4008 platform: defconfig Patch from Vitaly Wool This patch adds default configuration file PNX4008 ARM platform. It\'s basically the same as the previos one. Signed-off-by: Vitaly Wool Signed-off-by: Dmitry Pervushin Signed-off-by: Russell King commit 78818e477bf785391b02672d053fdbb2e111fb50 tree d1a43ddfb1b966fe981c10c874bae4faad070f29 parent a5a503038e71a6b7d4bd9e596ac13087274e60c7 author Vitaly Wool Tue, 16 May 2006 11:54:37 +0100 committer Russell King Sun, 18 Jun 2006 16:16:55 +0100 [ARM] 3466/1: [2/3] Support for Philips PNX4008 platform: chip support Patch from Vitaly Wool This patch adds basic chip support for PNX4008 ARM platform. It's basically the same as the previous one, but with the rmk's comments taken into account. Signed-off-by: Vitaly Wool Signed-off-by: Dmitry Pervushin Signed-off-by: Russell King commit a5a503038e71a6b7d4bd9e596ac13087274e60c7 tree 81d8f31ba42d54ff65d4223584be7a77c3be38df parent 51cb21a9cd2e3bba8a69948794eb9480facdef45 author Vitaly Wool Tue, 16 May 2006 11:54:36 +0100 committer Russell King Sun, 18 Jun 2006 16:16:53 +0100 [ARM] 3465/1: [1/3] Support for Philips PNX4008 platform: headers Patch from Vitaly Wool This patch adds kernel headers for PNX4008 ARM platform. It's basically the same as the previos one, but with the rmk's comments taken into account. Signed-off-by: Vitaly Wool Signed-off-by: Dmitry Pervushin Signed-off-by: Russell King commit 51cb21a9cd2e3bba8a69948794eb9480facdef45 tree fde0724d77635c2f4c681b9f35b07e17314b6cf5 parent d4adcffb6574d3414f2e39d6ca1be5eccf97ac52 author Marc Singer Tue, 16 May 2006 11:41:43 +0100 committer Russell King Sun, 18 Jun 2006 16:16:51 +0100 [ARM] 3407/1: lpd7x: documetation update Patch from Marc Singer New documentation for the touchscreen controllers and LCD panels. Signed-off-by: Marc Singer Signed-off-by: Russell King commit d4adcffb6574d3414f2e39d6ca1be5eccf97ac52 tree 1604f18abc55dd1bf0679affb5e9b62fa31fc54e parent c97898614bf0ac9605333a2c99bdbcf4276a22bd author Marc Singer Tue, 16 May 2006 11:41:40 +0100 committer Russell King Sun, 18 Jun 2006 16:16:50 +0100 [ARM] 3406/1: lpd7x: compilation fix for smc91x Patch from Marc Singer Reworking of the adaptation macros to allow driver to compile again for the lpd7x's. Also, support added for the lh79520 so it may use the smc91x. Signed-off-by: Marc Singer Signed-off-by: Russell King commit c97898614bf0ac9605333a2c99bdbcf4276a22bd tree 9b947f1f4dd0f1e14ef0579cf4e48078ac7a2009 parent 903e2bbda92e5a14f8050154046a14230abb800b author Marc Singer Tue, 16 May 2006 11:41:32 +0100 committer Russell King Sun, 18 Jun 2006 16:16:49 +0100 [ARM] 3405/1: lpd7a40x: CPLD ssp driver Patch from Marc Singer Driver for operating SSP devices through LPD7A40X CPLD chip. This driver is used by the audio codecs. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 903e2bbda92e5a14f8050154046a14230abb800b tree bbadc3277c9f72ea45d88a2e7892e7b001449aad parent 2514581eb13f778d70bdc270b8dc36bd6eaac4f8 author Marc Singer Tue, 16 May 2006 11:41:30 +0100 committer Russell King Sun, 18 Jun 2006 16:16:48 +0100 [ARM] 3404/1: lpd7a40x: AMBA CLCD support Patch from Marc Singer Board support and LCD panel configurations to integrate lh7a40x's with the amba clcd driver. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 2514581eb13f778d70bdc270b8dc36bd6eaac4f8 tree 6b3bdfe588d0a55377b3344babe128dc745bde07 parent fb62c5a7043617dd9d678beafc368b217aa28da4 author Marc Singer Tue, 16 May 2006 11:41:29 +0100 committer Russell King Sun, 18 Jun 2006 16:16:47 +0100 [ARM] 3403/1: lpd7a40x: updated default configurations Patch from Marc Singer Revised default configuration files. Signed-off-by: Marc Singer Signed-off-by: Russell King commit fb62c5a7043617dd9d678beafc368b217aa28da4 tree 0e97b7e1ae185f0bfaef618c92d59d8b1368954d parent 638b266630db8d492255d340e18d46ba6ab1b057 author Marc Singer Tue, 16 May 2006 11:41:29 +0100 committer Russell King Sun, 18 Jun 2006 16:16:46 +0100 [ARM] 3402/1: lpd7a40x: serial driver bug fix Patch from Marc Singer The serial driver now sets up the third UART when it is to be used. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 638b266630db8d492255d340e18d46ba6ab1b057 tree 305dbef19f1bbec6daaec98a52d38c15d47d3824 parent 2295196c30ea686389519f699f0ccbfbc5c3b94c author Marc Singer Tue, 16 May 2006 11:41:28 +0100 committer Russell King Sun, 18 Jun 2006 16:16:45 +0100 [ARM] 3401/1: lpd7a40x: platform update Patch from Marc Singer Updates to the lpd7a40x_platform files. Includes support for new architecture, lpd7a400. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 2295196c30ea686389519f699f0ccbfbc5c3b94c tree 312918803ae8ec19276d7fd6ba1bcfbcdb31ecbf parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Marc Singer Tue, 16 May 2006 11:41:27 +0100 committer Russell King Sun, 18 Jun 2006 16:16:44 +0100 [ARM] 3400/1: lpd7a40x: platform headers update Patch from Marc Singer Updates to the lpd7a40x platform headers. Includes support for new architecture, lpd7a400. Signed-off-by: Marc Singer Signed-off-by: Russell King commit 14228a49913850493c7f9eb4501438c32da353f7 tree c2a7659494be68b310d94723ca0c3196038449e2 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Russell King Sun, 18 Jun 2006 13:00:48 +0100 committer Russell King Sun, 18 Jun 2006 13:00:48 +0100 [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI Since parport_serial uses symbols from 8250_pci, there should be a dependency between the configuration symbols for these two modules. Problem reported by Andrey Borzenkov Signed-off-by: Russell King commit 2ba72cb754bb091bb24a44e9682f7105110f7f38 tree bff0ce7740916296861f7a40114bdc6d030d4c70 parent 3877f0b6c9f54d43e55e532404a935b90393b635 author David Woodhouse Sun, 18 Jun 2006 10:22:40 +0100 committer David Woodhouse Sun, 18 Jun 2006 10:22:40 +0100 [JFFS2] Mark XATTR support as experimental, for now Signed-off-by: David Woodhouse commit 2abac1db3522d9f56c695d1b42e77f3e52d4c51a tree e1a93a13f8dfb44dd5018e5dda2b074304baadac parent 72109368de7aaa5d489d9ca4641f4a11a6fc7653 author Dave Airlie Sun, 18 Jun 2006 16:12:27 +1000 committer Dave Airlie Sun, 18 Jun 2006 16:12:27 +1000 intelfb: fixup clock calculation debugging. The debugging code for pll clocks was wrong and causing div by 0. Signed-off-by: Dave Airlie commit 47552c4e555eefe381f3d45140b59a2ea4b16486 tree 674bb6f7371745fd49404f635404cea14af70f45 parent d5b9f4c083b0e3102f3101545279f623680cb3a0 author Herbert Xu Sat, 17 Jun 2006 23:00:20 -0700 committer David S. Miller Sat, 17 Jun 2006 23:00:20 -0700 [ETHTOOL]: Fix UFO typo The function ethtool_get_ufo was referring to ETHTOOL_GTSO instead of ETHTOOL_GUFO. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d5b9f4c083b0e3102f3101545279f623680cb3a0 tree 86d5f77d14a8ae687e585ec4535ca8038e450ab9 parent d7c2c9e3977e4312d093ac092761798d4d47c9e0 author Neil Horman Sat, 17 Jun 2006 22:59:03 -0700 committer David S. Miller Sat, 17 Jun 2006 22:59:03 -0700 [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer. In the event that our entire receive buffer is full with a series of chunks that represent a single gap-ack, and then we accept a chunk (or chunks) that fill in the gap between the ctsn and the first gap, we renege chunks from the end of the buffer, which effectively does nothing but move our gap to the end of our received tsn stream. This does little but move our missing tsns down stream a little, and, if the sender is sending sufficiently large retransmit frames, the result is a perpetual slowdown which can never be recovered from, since the only chunk that can be accepted to allow progress in the tsn stream necessitates that a new gap be created to make room for it. This leads to a constant need for retransmits, and subsequent receiver stalls. The fix I've come up with is to deliver the frame without reneging if we have a full receive buffer and the receiving sockets sk_receive_queue is empty(indicating that the receive buffer is being blocked by a missing tsn). Signed-off-by: Neil Horman Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit d7c2c9e3977e4312d093ac092761798d4d47c9e0 tree 1228ed1e6729f8dd6069698e9221ac35790cf0c5 parent 503b55fd77d11381b1950d1651d3bc782c0cc2cd author Tsutomu Fujii Sat, 17 Jun 2006 22:58:28 -0700 committer David S. Miller Sat, 17 Jun 2006 22:58:28 -0700 [SCTP]: Send only 1 window update SACK per message. Right now, every time we increase our rwnd by more then MTU bytes, we trigger a SACK. When processing large messages, this will generate a SACK for almost every other SCTP fragment. However since we are freeing the entire message at the same time, we might as well collapse the SACK generation to 1. Signed-off-by: Tsutomu Fujii Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 503b55fd77d11381b1950d1651d3bc782c0cc2cd tree a960542bcc10b97218a601a94e56e579595c0a2c parent 4c9f5d5305a23851e67471b147e0d459a7166717 author Sridhar Samudrala Sat, 17 Jun 2006 22:57:28 -0700 committer David S. Miller Sat, 17 Jun 2006 22:57:28 -0700 [SCTP]: Don't do CRC32C checksum over loopback. Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 4c9f5d5305a23851e67471b147e0d459a7166717 tree 6cacecfa0b61248b996dfe54d1f944c5bab32d6d parent 5636bef7324f49e36f05ec8a5f6284e11b1bcca4 author Vlad Yasevich Sat, 17 Jun 2006 22:56:08 -0700 committer David S. Miller Sat, 17 Jun 2006 22:56:08 -0700 [SCTP] Reset rtt_in_progress for the chunk when processing its sack. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 5636bef7324f49e36f05ec8a5f6284e11b1bcca4 tree b5e9e42560ba86ffbbd63a582df87844996b6d03 parent 402d68c43326d2f0e7e2e9a9013cd4c098d9b87c author Vlad Yasevich Sat, 17 Jun 2006 22:55:35 -0700 committer David S. Miller Sat, 17 Jun 2006 22:55:35 -0700 [SCTP]: Reject sctp packets with broadcast addresses. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit 402d68c43326d2f0e7e2e9a9013cd4c098d9b87c tree a493d4130e07f14e29e89cc746a59475cbb073f4 parent c7ce1ae21223fe1f905feba272bc14b87994a57d author Vlad Yasevich Sat, 17 Jun 2006 22:54:51 -0700 committer David S. Miller Sat, 17 Jun 2006 22:54:51 -0700 [SCTP]: Limit association max_retrans setting in setsockopt. When using ASSOCINFO socket option, we need to limit the number of maximum association retransmissions to be no greater than the sum of all the path retransmissions. This is specified in Section 7.1.2 of the SCTP socket API draft. However, we only do this if the association has multiple paths. If there is only one path, the protocol stack will use the assoc_max_retrans setting when trying to retransmit packets. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller commit c7ce1ae21223fe1f905feba272bc14b87994a57d tree cd527489396fd9def8d19416fd05c2c11f794394 parent c5396a31b20991c856facbce18a2a56d1a14e8d0 author Tushar Gohad Sat, 17 Jun 2006 22:54:03 -0700 committer David S. Miller Sat, 17 Jun 2006 22:54:03 -0700 [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate. Signed-off-by: Tushar Gohad Signed-off-by: David S. Miller commit c5396a31b20991c856facbce18a2a56d1a14e8d0 tree 39213f3e9cabee6ba2ffe7440a7a4efef8a1e033 parent b293acfd3133393a81bcd382eb71a210c9cf9526 author YOSHIFUJI Hideaki Sat, 17 Jun 2006 22:48:48 -0700 committer David S. Miller Sat, 17 Jun 2006 22:48:48 -0700 [IPV6]: Sum real space for RTAs. This patch fixes RTNLGRP_IPV6_IFINFO netlink notifications. Issue pointed out by Patrick McHardy . Signed-off-by: YOSHIFUJI Hideaki Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 4b6ace7f02cddb8c363ad27bb1e5014c6791e34a tree df99b49818371ee6dcdbfedaee66f457dafc3a68 parent b5ed7639c9f502898af4109e778f5613dacbfd9c parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Jeff Garzik Sun, 18 Jun 2006 01:22:42 -0400 committer Jeff Garzik Sun, 18 Jun 2006 01:22:42 -0400 Merge branch 'master' into upstream commit b293acfd3133393a81bcd382eb71a210c9cf9526 tree 0b940bd69064a6fafa725d442ce6d93ebbe5254c parent 2c6cc0d8539f121c3c75aa3641c19b67e8723379 author David S. Miller Sat, 17 Jun 2006 22:16:13 -0700 committer David S. Miller Sat, 17 Jun 2006 22:16:13 -0700 [IRDA]: Use put_unaligned() in irlmp_do_discovery(). irda_device_info->hints[] is byte aligned but is being accessed as a u16 Based upon a patch by Luke Yang . Signed-off-by: David S. Miller commit ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8 tree 712ae925e95105b763b2fd851348288c53e78d55 parent db9ca5803566078aafe63cf364ef98b5097e4194 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Jeff Garzik Sun, 18 Jun 2006 01:15:45 -0400 committer Jeff Garzik Sun, 18 Jun 2006 01:15:45 -0400 Merge branch 'master' into upstream commit 2c6cc0d8539f121c3c75aa3641c19b67e8723379 tree dbc8cc8a5b3fd83734dc6b80b614136e663a017e parent 8648b3053bff39a7ee4c711d74268079c928a657 author Herbert Xu Sat, 17 Jun 2006 22:06:45 -0700 committer David S. Miller Sat, 17 Jun 2006 22:06:45 -0700 [BRIDGE]: Add support for NETIF_F_HW_CSUM devices As it is the bridge will only ever declare NETIF_F_IP_CSUM even if all its constituent devices support NETIF_F_HW_CSUM. This patch fixes this by supporting the first one out of NETIF_F_NO_CSUM, NETIF_F_HW_CSUM, and NETIF_F_IP_CSUM that is supported by all constituent devices. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8648b3053bff39a7ee4c711d74268079c928a657 tree 6de70eedf63c4b965d04040323827f1bc520ccdf parent 00b7050426da8e7e58c889c5c80a19920d2d41b3 author Herbert Xu Sat, 17 Jun 2006 22:06:05 -0700 committer David S. Miller Sat, 17 Jun 2006 22:06:05 -0700 [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM The current stack treats NETIF_F_HW_CSUM and NETIF_F_NO_CSUM identically so we test for them in quite a few places. For the sake of brevity, I'm adding the macro NETIF_F_GEN_CSUM for these two. We also test the disjunct of NETIF_F_IP_CSUM and the other two in various places, for that purpose I've added NETIF_F_ALL_CSUM. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 00b7050426da8e7e58c889c5c80a19920d2d41b3 tree 55a07464fdf81b23fced966feca2b041af77c6f6 parent c71302d61f844f766a44e1b04258086cc41f624e author Michael Chan Sat, 17 Jun 2006 21:58:45 -0700 committer David S. Miller Sat, 17 Jun 2006 21:58:45 -0700 [TG3]: Convert to non-LLTX Herbert Xu pointed out that it is unsafe to call netif_tx_disable() from LLTX drivers because it uses dev->xmit_lock to synchronize whereas LLTX drivers use private locks. Convert tg3 to non-LLTX to fix this issue. tg3 is a lockless driver where hard_start_xmit and tx completion handling can run concurrently under normal conditions. A tx_lock is only needed to prevent netif_stop_queue and netif_wake_queue race condtions when the queue is full. So whether we use LLTX or non-LLTX, it makes practically no difference. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c71302d61f844f766a44e1b04258086cc41f624e tree 678780353e025222ce87667466bba599c4c21d97 parent 35089bb203f44e33b6bbb6c4de0b0708f9a48921 author Michael Chan Sat, 17 Jun 2006 21:55:55 -0700 committer David S. Miller Sat, 17 Jun 2006 21:55:55 -0700 [TG3]: Remove unnecessary tx_lock Remove tx_lock where it is unnecessary. tg3 runs lockless and so it requires interrupts to be disabled and sync'ed, netif_queue and NAPI poll to be stopped before the device can be reconfigured. After stopping everything, it is no longer necessary to get the tx_lock. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 35089bb203f44e33b6bbb6c4de0b0708f9a48921 tree 3e9ca3dbc12a063121c3ecba2558400307d4acd5 parent 9e1881dec9e3e8f8408551cddfda489857a7ec99 author David S. Miller Tue, 13 Jun 2006 22:33:04 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:53 -0700 [TCP]: Add tcp_slow_start_after_idle sysctl. A lot of people have asked for a way to disable tcp_cwnd_restart(), and it seems reasonable to add a sysctl to do that. Signed-off-by: David S. Miller commit 9e1881dec9e3e8f8408551cddfda489857a7ec99 tree 2b4b131ee096e2ad604117d14a85cbd49c7090e5 parent c86a31f452f7dd132a1765d6d7160b0947f37b14 author Michael Chan Tue, 13 Jun 2006 15:04:12 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:51 -0700 [BNX2]: Update version and reldate Update driver version to 1.4.42. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit c86a31f452f7dd132a1765d6d7160b0947f37b14 tree b531650af625d24958bb59b511a1e4157525dc1e parent 7a6400cd3dbcfc3bbffcdb6dac4ffc957fb50e19 author Michael Chan Tue, 13 Jun 2006 15:03:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:49 -0700 [BNX2]: Use CPU native page size Use CPU native page size to determine various ring sizes. This allows order-0 memory allocations on all systems. Added check to limit the page size to 16K since that's the maximum rx ring size that will be used. This will prevent using unnecessarily large page sizes on some architectures with large page sizes. [Suggested by David Miller] Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 7a6400cd3dbcfc3bbffcdb6dac4ffc957fb50e19 tree 521d780caa40ccf034c4f612cdd0c916f146a96b parent fba9fe911bb4213c3de1d142fe0ee127cd361a78 author Michael Chan Mon, 12 Jun 2006 22:22:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:47 -0700 [BNX2]: Use compressed firmware Change bnx2_fw.h to use compressed text for all CPU images. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit fba9fe911bb4213c3de1d142fe0ee127cd361a78 tree 2fc7a68e612644cc8ce3ff8e44f210e20f6964b4 parent 160882722cb21cbe5cead55cf38a5e70fc3af63e author Michael Chan Mon, 12 Jun 2006 22:21:25 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:44 -0700 [BNX2]: Add firmware decompression Add functions to decompress firmware before loading to the internal CPUs. Compressing the firmware reduces the driver size significantly. Added file name length sanity check in the gzip header to prevent going past the end of buffer [suggested by DaveM]. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 160882722cb21cbe5cead55cf38a5e70fc3af63e tree 76753321be54ae173132df788cece79a12651901 parent cea94db9b496d7fe25bbd3ebd0f24afaac2069d5 author Michael Chan Mon, 12 Jun 2006 22:16:43 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:42 -0700 [BNX2]: Allow WoL settings on new 5708 chips Allow WOL settings on 5708 B2 and newer chips that have the problem fixed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit cea94db9b496d7fe25bbd3ebd0f24afaac2069d5 tree e425453a1f5fcc28c4db9c750f825161a58d03ac parent bc726a71d2799f0f8b68a17f49d86aa030f64abc author Michael Chan Mon, 12 Jun 2006 22:16:13 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:40 -0700 [BNX2]: Add an rx drop counter Add a counter for packets dropped by firmware. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit bc726a71d2799f0f8b68a17f49d86aa030f64abc tree d16e9cc28069700c8f0a7cc8878ef04edab2206e parent b3a92eabe5b67bd207a38ae13dd51f4e08c1f6f7 author Luca De Cicco Sun, 11 Jun 2006 23:02:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:38 -0700 [TCP] Westwood: reset RTT min after FRTO RTT_min is updated each time a timeout event occurs in order to cope with hard handovers in wireless scenarios such as UMTS. Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b3a92eabe5b67bd207a38ae13dd51f4e08c1f6f7 tree 511472b1fb5e71e810dd73c9d8b11c12d9aa0efe parent b7d7a9e3c900f0733bf2aabdd41e6dbc70eae94b author Luca De Cicco Sun, 11 Jun 2006 23:01:59 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:36 -0700 [TCP] Westwood: bandwidth filter startup The bandwidth estimate filter is now initialized with the first sample in order to have better performances in the case of small file transfers. Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b7d7a9e3c900f0733bf2aabdd41e6dbc70eae94b tree fa8d5b51f68ea0decac901026f7f6d6648d75614 parent f61e29018a30c738e1298e1b13be956aa17ee17b author Luca De Cicco Sun, 11 Jun 2006 23:01:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:34 -0700 [TCP] Westwood: comment fixes Cleanup some comments and add more references Signed-off-by: Luca De Cicco Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f61e29018a30c738e1298e1b13be956aa17ee17b tree 1ea51ae6fd477d9e3271d8eb8b2cec24f6fa39b2 parent bdeb04c6d9a957ae2a51c3033414467b82b2a736 author Stephen Hemminger Sun, 11 Jun 2006 23:01:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:32 -0700 [TCP] Westwood: fix first sample Need to update send sequence number tracking after first ack. Rework of patch from Luca De Cicco. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bdeb04c6d9a957ae2a51c3033414467b82b2a736 tree 7e457169cd43dc8367067bff23f1b3fad6eb98b2 parent d1e100ba69131bb788e89a07b94b08f6e006725a author Stephen Hemminger Sun, 11 Jun 2006 21:20:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:30 -0700 [NET]: net.ipv4.ip_autoconfig sysctl removal The sysctl net.ipv4.ip_autoconfig is a legacy value that is not used. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit d1e100ba69131bb788e89a07b94b08f6e006725a tree 8ece0a94f8920803b8a36e6ecdce7d0196e978d3 parent 8ef80aef118e405f2b6505f623830e6e73224f85 author Alexey Dobriyan Sun, 11 Jun 2006 20:57:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:28 -0700 [BNX2]: Endian fixes. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 8ef80aef118e405f2b6505f623830e6e73224f85 tree 6abecac69d73eb3ffb884e29eb6ecc3c1d39cb7e parent f8d596211291a8d98efa47ae0261326218f310cf author Nick Fedchik Sun, 11 Jun 2006 20:56:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:26 -0700 [IRDA]: irda-usb.c: STIR421x cleanups This cleans the STIR421x part of the irda-usb code. We also no longer try to load all existing firmwares but only the matching one (according to the USB id we get from the dongle). Signed-off-by: Nick Fedchik Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit f8d596211291a8d98efa47ae0261326218f310cf tree 957501662f985e72ab2ec6f086bc9feefb9e6a60 parent 3cc0e873986fe594d0e96d07259b11f755325cb2 author Alexey Dobriyan Sat, 10 Jun 2006 18:05:35 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:24 -0700 [IPX]: Endian bug in ipxrtr_route_packet() Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 3cc0e873986fe594d0e96d07259b11f755325cb2 tree 5d3e9a57333a2d7088a6a63c09bc97db98f480af parent b38dfee3d616ffadb58d4215e3ff9d1d7921031e author Herbert Xu Fri, 09 Jun 2006 16:13:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:22 -0700 [NET]: Warn in __skb_trim if skb is paged It's better to warn and fail rather than rarely triggering BUG on paths that incorrectly call skb_trim/__skb_trim on a non-linear skb. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b38dfee3d616ffadb58d4215e3ff9d1d7921031e tree 55ae104c8522e973291f490c9902580de798ae93 parent c8c9f9a3de2c50c876b1068dd41f9a06c5749f80 author Herbert Xu Fri, 09 Jun 2006 16:13:01 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:20 -0700 [NET]: skb_trim audit I found a few more spots where pskb_trim_rcsum could be used but were not. This patch changes them to use it. Also, sk_filter can get paged skb data. Therefore we must use pskb_trim instead of skb_trim. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c8c9f9a3de2c50c876b1068dd41f9a06c5749f80 tree 18cb4685232e030518d637fa7496a95bc69fc6d8 parent 364c6badde0dd62a0a38e5ed67f85d87d6665780 author Herbert Xu Fri, 09 Jun 2006 16:11:27 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:18 -0700 [NET] ppp: Remove unnecessary pskb_may_pull In ppp_receive_nonmp_frame, we call pskb_may_pull(skb, skb->len) if the tailroom is >= 124. This is pointless because this pskb_may_pull is only needed if the skb is non-linear. However, if it is non-linear then the tailroom would be zero. So it can be safely removed. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 364c6badde0dd62a0a38e5ed67f85d87d6665780 tree 56c8ad3e3f45fafec010da4f5858825db5dbc86c parent 932ff279a43ab7257942cddff2595acd541cc49b author Herbert Xu Fri, 09 Jun 2006 16:10:40 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:16 -0700 [NET]: Clean up skb_linearize The linearisation operation doesn't need to be super-optimised. So we can replace __skb_linearize with __pskb_pull_tail which does the same thing but is more general. Also, most users of skb_linearize end up testing whether the skb is linear or not so it helps to make skb_linearize do just that. Some callers of skb_linearize also use it to copy cloned data, so it's useful to have a new function skb_linearize_cow to copy the data if it's either non-linear or cloned. Last but not least, I've removed the gfp argument since nobody uses it anymore. If it's ever needed we can easily add it back. Misc bugs fixed by this patch: * via-velocity error handling (also, no SG => no frags) Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 932ff279a43ab7257942cddff2595acd541cc49b tree e60130673a20d71becdac858c2589d8dfbf3ae1f parent bf0857ea32addb6bc8b46383604b218b8ec09f19 author Herbert Xu Fri, 09 Jun 2006 12:20:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:14 -0700 [NET]: Add netif_tx_lock Various drivers use xmit_lock internally to synchronise with their transmission routines. They do so without setting xmit_lock_owner. This is fine as long as netpoll is not in use. With netpoll it is possible for deadlocks to occur if xmit_lock_owner isn't set. This is because if a printk occurs while xmit_lock is held and xmit_lock_owner is not set can cause netpoll to attempt to take xmit_lock recursively. While it is possible to resolve this by getting netpoll to use trylock, it is suboptimal because netpoll's sole objective is to maximise the chance of getting the printk out on the wire. So delaying or dropping the message is to be avoided as much as possible. So the only alternative is to always set xmit_lock_owner. The following patch does this by introducing the netif_tx_lock family of functions that take care of setting/unsetting xmit_lock_owner. I renamed xmit_lock to _xmit_lock to indicate that it should not be used directly. I didn't provide irq versions of the netif_tx_lock functions since xmit_lock is meant to be a BH-disabling lock. This is pretty much a straight text substitution except for a small bug fix in winbond. It currently uses netif_stop_queue/spin_unlock_wait to stop transmission. This is unsafe as an IRQ can potentially wake up the queue. So it is safer to use netif_tx_disable. The hamradio bits used spin_lock_irq but it is unnecessary as xmit_lock must never be taken in an IRQ handler. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit bf0857ea32addb6bc8b46383604b218b8ec09f19 tree 84b92a237f4f5e538f401dcbcc2725c75cc06955 parent 2b2283d0302d520f08ded41c2ca17886dfbb865a author Patrick McHardy Fri, 09 Jun 2006 12:18:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:11 -0700 [NETFILTER]: hashlimit match: fix random initialization hashlimit does: if (!ht->rnd) get_random_bytes(&ht->rnd, 4); ignoring that 0 is also a valid random number. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 2b2283d0302d520f08ded41c2ca17886dfbb865a tree 35b8cfa9a50107a73b6e47552eae433133f16931 parent a0e889bb1bdc083dbbdb02cce9698765847b841f author Patrick McHardy Fri, 09 Jun 2006 12:18:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:09 -0700 [NETFILTER]: recent match: missing refcnt initialization Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a0e889bb1bdc083dbbdb02cce9698765847b841f tree 3f176b4be0d7821f7104303f856839579deb0091 parent 4e5ab4cb85683cf77b507ba0c4d48871e1562305 author Patrick McHardy Fri, 09 Jun 2006 12:17:41 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:07 -0700 [NETFILTER]: recent match: fix "sleeping function called from invalid context" create_proc_entry must not be called with locks held. Use a mutex instead to protect data only changed in user context. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4e5ab4cb85683cf77b507ba0c4d48871e1562305 tree aef7ba8b6050fcaccbaf0d05f8e5ba860a143eaf parent 100468e9c05c10fb6872751c1af523b996d6afa9 author James Morris Fri, 09 Jun 2006 00:33:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:05 -0700 [SECMARK]: Add new packet controls to SELinux Add new per-packet access controls to SELinux, replacing the old packet controls. Packets are labeled with the iptables SECMARK and CONNSECMARK targets, then security policy for the packets is enforced with these controls. To allow for a smooth transition to the new controls, the old code is still present, but not active by default. To restore previous behavior, the old controls may be activated at runtime by writing a '1' to /selinux/compat_net, and also via the kernel boot parameter selinux_compat_net. Switching between the network control models requires the security load_policy permission. The old controls will probably eventually be removed and any continued use is discouraged. With this patch, the new secmark controls for SElinux are disabled by default, so existing behavior is entirely preserved, and the user is not affected at all. It also provides a config option to enable the secmark controls by default (which can always be overridden at boot and runtime). It is also noted in the kconfig help that the user will need updated userspace if enabling secmark controls for SELinux and that they'll probably need the SECMARK and CONNMARK targets, and conntrack protocol helpers, although such decisions are beyond the scope of kernel configuration. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 100468e9c05c10fb6872751c1af523b996d6afa9 tree 2ad0e988897a3636cbe5353a7624232c62b0968a parent 7c9728c393dceb724d66d696cfabce82151a78e5 author James Morris Fri, 09 Jun 2006 00:32:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:03 -0700 [SECMARK]: Add CONNSECMARK xtables target Add a new xtables target, CONNSECMARK, which is used to specify rules for copying security marks from packets to connections, and for copyying security marks back from connections to packets. This is similar to the CONNMARK target, but is more limited in scope in that it only allows copying of security marks to and from packets, as this is all it needs to do. A typical scenario would be to apply a security mark to a 'new' packet with SECMARK, then copy that to its conntrack via CONNMARK, and then restore the security mark from the connection to established and related packets on that connection. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 7c9728c393dceb724d66d696cfabce82151a78e5 tree af2b67ff7c579d669d01f28af33929f780b9c1b3 parent 5e6874cdb8de94cd3c15d853a8ef9c6f4c305055 author James Morris Fri, 09 Jun 2006 00:31:46 -0700 committer David S. Miller Sat, 17 Jun 2006 21:30:01 -0700 [SECMARK]: Add secmark support to conntrack Add a secmark field to IP and NF conntracks, so that security markings on packets can be copied to their associated connections, and also copied back to packets as required. This is similar to the network mark field currently used with conntrack, although it is intended for enforcement of security policy rather than network policy. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 5e6874cdb8de94cd3c15d853a8ef9c6f4c305055 tree 3f289088db7512d55d6e46d1d14c5d18f07f9b4f parent 984bc16cc92ea3c247bf34ad667cfb95331b9d3c author James Morris Fri, 09 Jun 2006 00:30:57 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:59 -0700 [SECMARK]: Add xtables SECMARK target Add a SECMARK target to xtables, allowing the admin to apply security marks to packets via both iptables and ip6tables. The target currently handles SELinux security marking, but can be extended for other purposes as needed. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 984bc16cc92ea3c247bf34ad667cfb95331b9d3c tree 2342638457f43980501179056f4ba1e4e3c2c1aa parent c749b29fae74ed59c507d84025b3298202b42609 author James Morris Fri, 09 Jun 2006 00:29:17 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:57 -0700 [SECMARK]: Add secmark support to core networking. Add a secmark field to the skbuff structure, to allow security subsystems to place security markings on network packets. This is similar to the nfmark field, except is intended for implementing security policy, rather than than networking policy. This patch was already acked in principle by Dave Miller. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c749b29fae74ed59c507d84025b3298202b42609 tree c06b1fb17cce425692f7ab40b2df8c5b00d8c931 parent 29a395eac4c320c570e73f0a90d8953d80da8359 author James Morris Fri, 09 Jun 2006 00:28:25 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:55 -0700 [SECMARK]: Add SELinux exports Add and export new functions to the in-kernel SELinux API in support of the new secmark-based packet controls. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 29a395eac4c320c570e73f0a90d8953d80da8359 tree 9d34d7987754004e76de76d3f9facbee804779b7 parent 3e3ff15e6d8ba931fa9a6c7f9fe711edc77e96e5 author James Morris Fri, 09 Jun 2006 00:27:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:53 -0700 [SECMARK]: Add new flask definitions to SELinux Secmark implements a new scheme for adding security markings to packets via iptables, as well as changes to SELinux to use these markings for security policy enforcement. The rationale for this scheme is explained and discussed in detail in the original threads: http://thread.gmane.org/gmane.linux.network/34927/ http://thread.gmane.org/gmane.linux.network/35244/ Examples of policy and rulesets, as well as a full archive of patches for iptables and SELinux userland, may be found at: http://people.redhat.com/jmorris/selinux/secmark/ The code has been tested with various compilation options and in several scenarios, including with 'complicated' protocols such as FTP and also with the new generic conntrack code with IPv6 connection tracking. This patch: Add support for a new object class ('packet'), and associated permissions ('send', 'recv', 'relabelto'). These are used to enforce security policy for network packets labeled with SECMARK, and for adding labeling rules. Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 3e3ff15e6d8ba931fa9a6c7f9fe711edc77e96e5 tree e3b3edcf5092e9533539f6e8abdda83eee2cb96d parent 6f68dc37759b1d6ff3b4d4a9d097605a09f8f043 author Christopher J. PeBenito Fri, 09 Jun 2006 00:25:03 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:51 -0700 [SELINUX]: add security class for appletalk sockets Add a security class for appletalk sockets so that they can be distinguished in SELinux policy. Please apply. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6f68dc37759b1d6ff3b4d4a9d097605a09f8f043 tree 7d0be960b8c0ec5b947637a0650f1c639002103a parent 9dadaa19cb11a8db38072a92a3f95deab7a797fb author David S. Miller Thu, 08 Jun 2006 23:58:52 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:49 -0700 [NET]: Fix warnings after LSM-IPSEC changes. Assignment used as truth value in xfrm_del_sa() and xfrm_get_policy(). Wrong argument type declared for security_xfrm_state_delete() when SELINUX is disabled. Signed-off-by: David S. Miller commit 9dadaa19cb11a8db38072a92a3f95deab7a797fb tree 30a173768a0a84194c89898ecba1cb2a1bd49619 parent c8c05a8eec6f1258f6d5cb71a44ee5dc1e989b63 author Dave Jones Thu, 08 Jun 2006 23:42:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:47 -0700 [NET]: NET_TCPPROBE Kconfig fix Just spotted this typo in a new option. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c8c05a8eec6f1258f6d5cb71a44ee5dc1e989b63 tree b4a04dd9e2b940cb5b2911fb67fbe49c5f8b3fbf parent cec6f7f39c3db7d9f6091bf2f8fc8d520f372719 author Catherine Zhang Thu, 08 Jun 2006 23:39:49 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:45 -0700 [LSM-IPsec]: SELinux Authorize This patch contains a fix for the previous patch that adds security contexts to IPsec policies and security associations. In the previous patch, no authorization (besides the check for write permissions to SAD and SPD) is required to delete IPsec policies and security assocations with security contexts. Thus a user authorized to change SAD and SPD can bypass the IPsec policy authorization by simply deleteing policies with security contexts. To fix this security hole, an additional authorization check is added for removing security policies and security associations with security contexts. Note that if no security context is supplied on add or present on policy to be deleted, the SELinux module allows the change unconditionally. The hook is called on deletion when no context is present, which we may want to change. At present, I left it up to the module. LSM changes: The patch adds two new LSM hooks: xfrm_policy_delete and xfrm_state_delete. The new hooks are necessary to authorize deletion of IPsec policies that have security contexts. The existing hooks xfrm_policy_free and xfrm_state_free lack the context to do the authorization, so I decided to split authorization of deletion and memory management of security data, as is typical in the LSM interface. Use: The new delete hooks are checked when xfrm_policy or xfrm_state are deleted by either the xfrm_user interface (xfrm_get_policy, xfrm_del_sa) or the pfkey interface (pfkey_spddelete, pfkey_delete). SELinux changes: The new policy_delete and state_delete functions are added. Signed-off-by: Catherine Zhang Signed-off-by: Trent Jaeger Acked-by: James Morris Signed-off-by: David S. Miller commit cec6f7f39c3db7d9f6091bf2f8fc8d520f372719 tree 08142a001fa9b010056202293697c7b5aea6bae8 parent f86502bfc177f69bbabbedb78ebf710579ae0e54 author Andreas Schwab Mon, 05 Jun 2006 21:21:57 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:43 -0700 [CONNECTOR]: Fix warning in cn_queue.c cn_queue.c:130: warning: value computed is not used There is no point in testing the atomic value if the result is thrown away. From Evgeniy: It was created to put implicit smp barrier, but it is not needed there. Signed-off-by: Andreas Schwab Signed-off-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit f86502bfc177f69bbabbedb78ebf710579ae0e54 tree 07a1551eb832f1c7c437c2d959f44d68e7c24a6a parent 6d7416535097ed0943bdae8e69c14ba43061cab1 author David S. Miller Mon, 05 Jun 2006 21:19:24 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:41 -0700 [IPV4] icmp: Kill local 'ip' arg in icmp_redirect(). It is typed wrong, and it's only assigned and used once. So just pass in iph->daddr directly which fixes both problems. Based upon a patch by Alexey Dobriyan. Signed-off-by: David S. Miller commit 6d7416535097ed0943bdae8e69c14ba43061cab1 tree f71792b9ac32edd8016900067b55dff8f3941cf3 parent 338fcf9886df9ad2873772197a73a57818973316 author Alexey Dobriyan Mon, 05 Jun 2006 21:06:41 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:39 -0700 [IPV4]: Right prototype of __raw_v4_lookup() All users pass 32-bit values as addresses and internally they're compared with 32-bit entities. So, change "laddr" and "raddr" types to __be32. Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 338fcf9886df9ad2873772197a73a57818973316 tree 3d58fed24e4c171110788ad479093a9b4ba27133 parent 70df2311ee3fc607e7511873d7dade5bd17d593d author Alexey Dobriyan Mon, 05 Jun 2006 21:04:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:37 -0700 [IPV4] igmp: Fixup struct ip_mc_list::multiaddr type All users except two expect 32-bit big-endian value. One is of ->multiaddr = ->multiaddr variety. And last one is "%08lX". Signed-off-by: Alexey Dobriyan Signed-off-by: David S. Miller commit 70df2311ee3fc607e7511873d7dade5bd17d593d tree b47ade0173eef5c30fbe57cc9ceea204783b2def parent 738980ffa658c86bd494ebb242ce8e44aff16a9e author David S. Miller Mon, 05 Jun 2006 17:59:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:35 -0700 [TCP]: Fix compile warning in tcp_probe.c The suseconds_t et al. are not necessarily any particular type on every platform, so cast to unsigned long so that we can use one printf format string and avoid warnings across the board Signed-off-by: David S. Miller commit 738980ffa658c86bd494ebb242ce8e44aff16a9e tree 92076c6d40f3024d760a5439e564473d70511af0 parent a42e9d6ce89cfd19aee9f990b7231ce697f0d00f author Stephen Hemminger Mon, 05 Jun 2006 17:30:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:33 -0700 [TCP]: Limited slow start for Highspeed TCP Implementation of RFC3742 limited slow start. Added as part of the TCP highspeed congestion control module. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a42e9d6ce89cfd19aee9f990b7231ce697f0d00f tree 3afea026bdf3698fd81509925d8cf7d5f1e95fbd parent 72dc5b9225c53310c010b68a70ea97c8c8e24bdf author Stephen Hemminger Mon, 05 Jun 2006 17:30:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:31 -0700 [TCP]: TCP Probe congestion window tracing This adds a new module for tracking TCP state variables non-intrusively using kprobes. It has a simple /proc interface that outputs one line for each packet received. A sample usage is to collect congestion window and ssthresh over time graphs. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 72dc5b9225c53310c010b68a70ea97c8c8e24bdf tree ebd23e7cbe9846414b6fa8f8327f37043447e019 parent a4ed25849532728effaa0665c92e08e029e41407 author Stephen Hemminger Mon, 05 Jun 2006 17:30:08 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:29 -0700 [TCP]: Minimum congestion window consolidation. Many of the TCP congestion methods all just use ssthresh as the minimum congestion window on decrease. Rather than duplicating the code, just have that be the default if that handle in the ops structure is not set. Minor behaviour change to TCP compound. It probably wants to use this (ssthresh) as lower bound, rather than ssthresh/2 because the latter causes undershoot on loss. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a4ed25849532728effaa0665c92e08e029e41407 tree 812c1da0f0052715ae07e3beb088344115c27daf parent f890f921040fef6a35e39d15b729af1fd1a35f29 author Stephen Hemminger Mon, 05 Jun 2006 17:29:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:27 -0700 [TCP]: TCP Compound quad root function The original code did a 64 bit divide directly, which won't work on 32 bit platforms. Rather than doing a 64 bit square root twice, just implement a 4th root function in one pass using Newton's method. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f890f921040fef6a35e39d15b729af1fd1a35f29 tree 130ee6a827a092cc205d6054d2e11f185e60ad1c parent 76f1017757aa0c308a0b83ca611c9a89ee9a79a4 author Angelo P. Castellani Mon, 05 Jun 2006 17:29:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:25 -0700 [TCP]: TCP Compound congestion control TCP Compound is a sender-side only change to TCP that uses a mixed Reno/Vegas approach to calculate the cwnd. For further details look here: ftp://ftp.research.microsoft.com/pub/tr/TR-2005-86.pdf Signed-off-by: Angelo P. Castellani Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 76f1017757aa0c308a0b83ca611c9a89ee9a79a4 tree 2599325e5774525b5ea0088f1c64cbd2e1f40410 parent 7c106d7e782bd4805f39da30e81018f861b4b8c5 author Bin Zhou Mon, 05 Jun 2006 17:28:30 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:23 -0700 [TCP]: TCP Veno congestion control TCP Veno module is a new congestion control module to improve TCP performance over wireless networks. The key innovation in TCP Veno is the enhancement of TCP Reno/Sack congestion control algorithm by using the estimated state of a connection based on TCP Vegas. This scheme significantly reduces "blind" reduction of TCP window regardless of the cause of packet loss. This work is based on the research paper "TCP Veno: TCP Enhancement for Transmission over Wireless Access Networks." C. P. Fu, S. C. Liew, IEEE Journal on Selected Areas in Communication, Feb. 2003. Original paper and many latest research works on veno: http://www.ntu.edu.sg/home/ascpfu/veno/veno.html Signed-off-by: Bin Zhou Cheng Peng Fu Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 7c106d7e782bd4805f39da30e81018f861b4b8c5 tree a0bf2f8820c599151ee951a412e86039da3a11ba parent 2f45c340e09242641d4f11498c3be48b35abb926 author Wong Hoi Sing Edison Mon, 05 Jun 2006 17:27:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:21 -0700 [TCP]: TCP Low Priority congestion control TCP Low Priority is a distributed algorithm whose goal is to utilize only the excess network bandwidth as compared to the ``fair share`` of bandwidth as targeted by TCP. Available from: http://www.ece.rice.edu/~akuzma/Doc/akuzma/TCP-LP.pdf Original Author: Aleksandar Kuzmanovic See http://www-ece.rice.edu/networks/TCP-LP/ for their implementation. As of 2.6.13, Linux supports pluggable congestion control algorithms. Due to the limitation of the API, we take the following changes from the original TCP-LP implementation: o We use newReno in most core CA handling. Only add some checking within cong_avoid. o Error correcting in remote HZ, therefore remote HZ will be keeped on checking and updating. o Handling calculation of One-Way-Delay (OWD) within rtt_sample, sicne OWD have a similar meaning as RTT. Also correct the buggy formular. o Handle reaction for Early Congestion Indication (ECI) within pkts_acked, as mentioned within pseudo code. o OWD is handled in relative format, where local time stamp will in tcp_time_stamp format. Port from 2.4.19 to 2.6.16 as module by: Wong Hoi Sing Edison Hung Hing Lun Signed-off-by: Wong Hoi Sing Edison Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 2f45c340e09242641d4f11498c3be48b35abb926 tree 9a14226719f9a1e10d7ef219e24404570be155f2 parent c45fb1089e714146206d7e295ff337893424c874 author Andrew Morton Fri, 02 Jun 2006 16:29:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:19 -0700 [LLC]: Fix double receive of SKB. Oops fix from Stephen: remove duplicate rcv() calls. Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit c45fb1089e714146206d7e295ff337893424c874 tree 6482dbb72e3670e4ab7ee3b81683383dad4f7c9c parent ae5b7d8ba2c28d7d9835856fe0ca5f6ec95ea768 author Alexey Dobriyan Mon, 29 May 2006 18:27:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:17 -0700 [NETFILTER]: PPTP helper: fixup gre_keymap_lookup() return type GRE keys are 16-bit wide. Signed-off-by: Alexey Dobriyan Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ae5b7d8ba2c28d7d9835856fe0ca5f6ec95ea768 tree 54de467b6ee9344a51c8b254be3da933b57cc531 parent e44ab66a75e20c02193440a5e27c16c91630109b author Patrick McHardy Mon, 29 May 2006 18:27:09 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:15 -0700 [NETFILTER]: Add SIP connection tracking helper Add SIP connection tracking helper. Originally written by Christian Hentschel , some cleanup, minor fixes and bidirectional SIP support added by myself. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit e44ab66a75e20c02193440a5e27c16c91630109b tree 13aa30980b223b19720ff5d864d43e3708339fdc parent c0d4cfd96dd0cc0dbf49435898808b5553af4822 author Patrick McHardy Mon, 29 May 2006 18:26:47 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:13 -0700 [NETFILTER]: H.323 helper: replace internal_net_addr parameter by routing-based heuristic Call Forwarding doesn't need to create an expectation if both peers can reach each other without our help. The internal_net_addr parameter lets the user explicitly specify a single network where this is true, but is not very flexible and even fails in the common case that calls will both be forwarded to outside parties and inside parties. Use an optional heuristic based on routing instead, the assumption is that if bpth the outgoing device and the gateway are equal, both peers can reach each other directly. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c0d4cfd96dd0cc0dbf49435898808b5553af4822 tree aa8fb9afbed9da300bb22adfd3798fe7e196cee0 parent c95261693467f0aeac7fafa69860ddfb02bc12f8 author Jing Min Zhao Mon, 29 May 2006 18:26:27 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:11 -0700 [NETFILTER]: H.323 helper: Add support for Call Forwarding Signed-off-by: Jing Min Zhao Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit c95261693467f0aeac7fafa69860ddfb02bc12f8 tree 07d8686091cfe893d021e6d897983331fc596b3c parent 7d8c50181778b6ba10c2bba9a2f22db9493bb245 author Patrick McHardy Mon, 29 May 2006 18:25:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:09 -0700 [NETFILTER]: amanda helper: convert to textsearch infrastructure When a port number within a packet is replaced by a differently sized number only the packet is resized, but not the copy of the data. Following port numbers are rewritten based on their offsets within the copy, leading to packet corruption. Convert the amanda helper to the textsearch infrastructure to avoid the copy entirely. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 7d8c50181778b6ba10c2bba9a2f22db9493bb245 tree b0a87854e0c377eccca3849351951d5456687729 parent 695ecea3299dba2239d1cb4fd4d4e4c95a5b9ce7 author Patrick McHardy Mon, 29 May 2006 18:25:38 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:07 -0700 [NETFILTER]: FTP helper: search optimization Instead of skipping search entries for the wrong direction simply index them by direction. Based on patch by Pablo Neira Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 695ecea3299dba2239d1cb4fd4d4e4c95a5b9ce7 tree 5262c56a6d34a355ac424a0b63757eb32d94ac08 parent 89f2e21883b59a6ff1e64d0b4924d06b1c6101ba author Patrick McHardy Mon, 29 May 2006 18:25:14 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:05 -0700 [NETFILTER]: SNMP helper: fix debug module param type debug is the debug level, not a bool. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 89f2e21883b59a6ff1e64d0b4924d06b1c6101ba tree 86c26d648afcfa3a37270189a33867cbf0d38f9b parent 3726add76643c715d437aceda320d319153b6113 author Patrick McHardy Mon, 29 May 2006 18:24:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:03 -0700 [NETFILTER]: ctnetlink: change table dumping not to require an unique ID Instead of using the ID to find out where to continue dumping, take a reference to the last entry dumped and try to continue there. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3726add76643c715d437aceda320d319153b6113 tree 70b343ab57ae6575ebc2828cc1e8bab24c4df120 parent 997ae831ade74bdaed4172b1c02060b9efd6e206 author Patrick McHardy Mon, 29 May 2006 18:24:39 -0700 committer David S. Miller Sat, 17 Jun 2006 21:29:01 -0700 [NETFILTER]: ctnetlink: fix NAT configuration The current configuration only allows to configure one manip and overloads conntrack status flags with netlink semantic. Signed-off-by: Patrick Mchardy Signed-off-by: David S. Miller commit 997ae831ade74bdaed4172b1c02060b9efd6e206 tree feca25f5c27c47724ecfbcc66f4f437619fb57ed parent 39a27a35c5c1b5be499a0576a35c45a011788bf8 author Eric Leblond Mon, 29 May 2006 18:24:20 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:59 -0700 [NETFILTER]: conntrack: add fixed timeout flag in connection tracking Add a flag in a connection status to have a non updated timeout. This permits to have connection that automatically die at a given time. Signed-off-by: Eric Leblond Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 39a27a35c5c1b5be499a0576a35c45a011788bf8 tree ec5383eec578c455ca5a14184dc9398bbc5f9afb parent 6442f1cf897643d4ca597f2f7d3464b765bae960 author Patrick McHardy Mon, 29 May 2006 18:23:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:57 -0700 [NETFILTER]: conntrack: add sysctl to disable checksumming Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 6442f1cf897643d4ca597f2f7d3464b765bae960 tree 0708a7d312c1db1f78c20df9cbdfc9f5e6218523 parent 404bdbfd242cb99ca0e9d3eb5fbb5bcd54123081 author Patrick McHardy Mon, 29 May 2006 18:21:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:55 -0700 [NETFILTER]: conntrack: don't call helpers for related ICMP messages None of the existing helpers expects to get called for related ICMP packets and some even drop them if they can't parse them. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 404bdbfd242cb99ca0e9d3eb5fbb5bcd54123081 tree a6a0ad112275016d3e622d4ab53cac6f2e0dcd3d parent f3389805e53a13bd969ee1c8fc5a4137b7c6c167 author Patrick McHardy Mon, 29 May 2006 18:21:34 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:53 -0700 [NETFILTER]: recent match: replace by rewritten version Replace the unmaintainable ipt_recent match by a rewritten version that should be fully compatible. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f3389805e53a13bd969ee1c8fc5a4137b7c6c167 tree f73b639579da1f201c1886027d59960380c2296a parent 62b7743483b402f8fb73545d5d487ca714e82766 author Patrick McHardy Mon, 29 May 2006 18:21:00 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:51 -0700 [NETFILTER]: x_tables: add statistic match Add statistic match which is a combination of the nth and random matches. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 62b7743483b402f8fb73545d5d487ca714e82766 tree f90e434e85c1f4391ad46310ee128ce25c1dca57 parent 957dc80ac30f3c4d53259fa936df807663ba54fa author Patrick McHardy Mon, 29 May 2006 18:20:32 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:49 -0700 [NETFILTER]: x_tables: add quota match Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 957dc80ac30f3c4d53259fa936df807663ba54fa tree 4815a3d43700d79868f50c83b4850502a12a7dd4 parent 3e72b2fe5b31791f976350b023b7a37ef59c02c1 author Patrick McHardy Mon, 29 May 2006 18:19:56 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:47 -0700 [NETFILTER]: x_tables: add SCTP/DCCP support where missing Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 3e72b2fe5b31791f976350b023b7a37ef59c02c1 tree 94c34d9264d68141c11530cb94f58ed4d03a1dbd parent 73654d61e556483ad324b90989eae26b22df6ef6 author Patrick McHardy Mon, 29 May 2006 18:19:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:45 -0700 [NETFILTER]: x_tables: remove some unnecessary casts Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 73654d61e556483ad324b90989eae26b22df6ef6 tree f3aee3be0e35bb6012917b71ed77301de6b39ad4 parent 31a4ab93025719e62e7cf7ce899f71c34ecde5a0 author Herbert Xu Sat, 27 May 2006 23:06:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:43 -0700 [IPSEC] xfrm: Use IPPROTO_MAX instead of 256 The size of the type_map array (256) comes from the number of IP protocols, i.e., IPPROTO_MAX. This patch is based on a suggestion from Ingo Oeser. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 31a4ab93025719e62e7cf7ce899f71c34ecde5a0 tree 60404c5fd1124882753b38e334656a15f8de0804 parent b59f45d0b2878ab76f8053b0973654e6621828ee author Herbert Xu Sat, 27 May 2006 23:06:13 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:41 -0700 [IPSEC] proto: Move transport mode input path into xfrm_mode_transport Now that we have xfrm_mode objects we can move the transport mode specific input decapsulation code into xfrm_mode_transport. This removes duplicate code as well as unnecessary header movement in case of tunnel mode SAs since we will discard the original IP header immediately. This also fixes a minor bug for transport-mode ESP where the IP payload length is set to the correct value minus the header length (with extension headers for IPv6). Of course the other neat thing is that we no longer have to allocate temporary buffers to hold the IP headers for ESP and IPComp. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b59f45d0b2878ab76f8053b0973654e6621828ee tree 40dc5e2ede2620f7935fb3dae0d0eb199851f611 parent 546be2405be119ef55467aace45f337a16e5d424 author Herbert Xu Sat, 27 May 2006 23:05:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:39 -0700 [IPSEC] xfrm: Abstract out encapsulation modes This patch adds the structure xfrm_mode. It is meant to represent the operations carried out by transport/tunnel modes. By doing this we allow additional encapsulation modes to be added without clogging up the xfrm_input/xfrm_output paths. Candidate modes include 4-to-6 tunnel mode, 6-to-4 tunnel mode, and BEET modes. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 546be2405be119ef55467aace45f337a16e5d424 tree 9b09f0041f9f82a20ab25ace3c7360e4a4b7989f parent 9cb3528cdbffc513eb9fb8faa45d41e397355830 author Herbert Xu Sat, 27 May 2006 23:03:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:37 -0700 [IPSEC] xfrm: Undo afinfo lock proliferation The number of locks used to manage afinfo structures can easily be reduced down to one each for policy and state respectively. This is based on the observation that the write locks are only held by module insertion/removal which are very rare events so there is no need to further differentiate between the insertion of modules like ipv6 versus esp6. The removal of the read locks in xfrm4_policy.c/xfrm6_policy.c might look suspicious at first. However, after you realise that nobody ever takes the corresponding write lock you'll feel better :) As far as I can gather it's an attempt to guard against the removal of the corresponding modules. Since neither module can be unloaded at all we can leave it to whoever fixes up IPv6 unloading :) Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 9cb3528cdbffc513eb9fb8faa45d41e397355830 tree 468eaacb1e62026f737c621f9c3e00806be71fd1 parent df3e6548186f0baa727cd6d3a492891854bd31f2 author Michael Chan Sat, 17 Jun 2006 21:28:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:28:28 -0700 [TG3]: update version and reldate Update version to 3.60. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit df3e6548186f0baa727cd6d3a492891854bd31f2 tree 525617b51451b730b0723d57258c6a8bf7f53d09 parent 30b6c28d2aca4669f2e609ad5d77ea2a6cf0dd3a author Michael Chan Fri, 26 May 2006 17:48:07 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:26 -0700 [TG3]: Add recovery logic when MMIOs are re-ordered Add recovery logic when we suspect that the system is re-ordering MMIOs. Re-ordered MMIOs to the send mailbox can cause bogus tx completions and hit BUG_ON() in the tx completion path. tg3 already has logic to handle re-ordered MMIOs by flushing the MMIOs that must be strictly ordered (such as the send mailbox). Determining when to enable the flush is currently a manual process of adding known chipsets to a list. The new code replaces the BUG_ON() in the tx completion path with the call to tg3_tx_recover(). It will set the TG3_FLAG_MBOX_WRITE_REORDER flag and reset the chip later in the workqueue to recover and start flushing MMIOs to the mailbox. A message to report the problem will be printed. We will then decide whether or not to add the host bridge to the list of chipsets that do re-ordering. We may add some additional code later to print the host bridge's ID so that the user can report it more easily. The assumption that re-ordering can only happen on x86 systems is also removed. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 30b6c28d2aca4669f2e609ad5d77ea2a6cf0dd3a tree eb7d8cf4f45b1030aaa17cb816fe1bbdbd35abd8 parent 898b1d16f8230fb912a0c2248df685735c6ceda3 author Michael Chan Fri, 26 May 2006 17:44:45 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:24 -0700 [TG3]: Add 5786 PCI ID Add PCI ID for BCM5786 which is a variant of 5787. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 898b1d16f8230fb912a0c2248df685735c6ceda3 tree e5e78b80373b4e2c74d9870d70f9deee0b3f7677 parent bc1d6937e6cf4e81a5afeae2c9cf35ffb0905ba5 author Samuel Ortiz Thu, 25 May 2006 16:21:10 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:22 -0700 [IRDA]: ali-ircc: using device model power management This patch gets rid of the old power management code and now uses the device model for the ali-ircc driver. Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit bc1d6937e6cf4e81a5afeae2c9cf35ffb0905ba5 tree b8cbfa60a9f296d24c0ca558906cd7457062bf97 parent c6ae522e3a50fc1ec483d7f03ece9c7a25e6de95 author Christoph Hellwig Thu, 25 May 2006 16:20:19 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:20 -0700 [IRDA]: stir4200, switching to the kthread API stir4200 uses a kernel thread for its TX/RX operations, and it is now converted to the kernel kthread API. Tested on an STIR4200 based dongle. Signed-off-by: Christoph Hellwig Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit c6ae522e3a50fc1ec483d7f03ece9c7a25e6de95 tree 98a67649b473bfc64751458283aeb3bb47e76703 parent 15986e1aadbbf40a331cddd0470bb434d156431d author Samuel Ortiz Thu, 25 May 2006 16:19:22 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:18 -0700 [IRDA]: Initial support for MCS7780 based dongles The MosChip MCS7780 chipset is an IrDA USB bridge that doesn't conform with the IrDA-USB standard and thus needs its separate driver. Tested on an actual MCS7780 based dongle. Original implementation by Brian Pugh Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit 15986e1aadbbf40a331cddd0470bb434d156431d tree bcfa9d6d58fbf89184a951c4738d9d3ec8cae0d5 parent 11dc1f36a6701b502ecb695f308aae46ede8bac6 author David S. Miller Thu, 25 May 2006 16:11:14 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:16 -0700 [TCP]: tcp_rcv_rtt_measure_ts() call in pure-ACK path is superfluous We only want to take receive RTT mesaurements for data bearing frames, here in the header prediction fast path for a pure-sender, we know that we have a pure-ACK and thus the checks in tcp_rcv_rtt_mesaure_ts() will not pass. Signed-off-by: David S. Miller commit 11dc1f36a6701b502ecb695f308aae46ede8bac6 tree e510f5514b3885489c8fe9a1661a7fa7b9e88f8d parent c090971326db094ed702c1f8f2dbe04b7e3b8f27 author Stephen Hemminger Thu, 25 May 2006 16:00:12 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:14 -0700 [BRIDGE]: netlink interface for link management Add basic netlink support to the Ethernet bridge. Including: * dump interfaces in bridges * monitor link status changes * change state of bridge port For some demo programs see: http://developer.osdl.org/shemminger/prototypes/brnl.tar.gz These are to allow building a daemon that does alternative implementations of Spanning Tree Protocol. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit c090971326db094ed702c1f8f2dbe04b7e3b8f27 tree 9c964fc79298455eb4b45981a34a6117175ff846 parent 9ef513bed68534110727381ab652f06756803f5a author Stephen Hemminger Thu, 25 May 2006 15:59:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:12 -0700 [BRIDGE]: fix module startup error handling Return address in use, if some other kernel code has the SAP. Propogate out error codes from netfilter registration and unwind. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9ef513bed68534110727381ab652f06756803f5a tree d4981dbce1d613c68d022ed3509eb3bf41c7c4fb parent bc0e646796928918e45b6465e02616f2fe65c3c1 author Stephen Hemminger Thu, 25 May 2006 15:58:54 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:10 -0700 [BRIDGE]: optimize conditional in forward path Small optimizations of bridge forwarding path. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bc0e646796928918e45b6465e02616f2fe65c3c1 tree 8c7a52563188e7e4168cd98b58b980c8096c02ce parent 8f182b494f87799d6ae20a1401825c516da46081 author Stephen Hemminger Thu, 25 May 2006 15:10:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:08 -0700 [LLC]: add multicast support for datagrams Allow mulitcast reception of datagrams (similar to UDP). All sockets bound to the same SAP receive a clone. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8f182b494f87799d6ae20a1401825c516da46081 tree 509fc735e59cb1094cd68029a9e0a4b9a9a01e86 parent 23dbe7912dad6be71bb9e69cb819d05e2442d362 author Stephen Hemminger Thu, 25 May 2006 15:10:02 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:06 -0700 [LLC]: allow applications to get copy of kernel datagrams It is legal for an application to bind to a SAP that is also being used by the kernel. This happens if the bridge module binds to the STP SAP, and the user wants to have a daemon for STP as well. It is possible to have kernel doing STP on one bridge, but let application do RSTP on another bridge. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 23dbe7912dad6be71bb9e69cb819d05e2442d362 tree 89fedd1d2c2c1ab710cfd90e8a8bb1f513935797 parent 29efcd2666b3a465b40aa07ef1f4d79847303e2f author Stephen Hemminger Thu, 25 May 2006 15:09:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:04 -0700 [LLC]: use rcu_dereference on receive handler The receive hander pointer might be modified during network changes of protocol. So use rcu_dereference (only matters on alpha). Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 29efcd2666b3a465b40aa07ef1f4d79847303e2f tree 6d1b3bb6543a24a6aa1a319adea20fbcea7b930a parent aecbd4e45c2e469e0452ffb2c0b0d881e2815bb8 author Stephen Hemminger Thu, 25 May 2006 15:08:59 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:02 -0700 [LLC]: allow datagram recvmsg LLC receive is broken for SOCK_DGRAM. If an application does recv() on a datagram socket and there is no data present, don't return "not connected". Instead, just do normal datagram semantics. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit aecbd4e45c2e469e0452ffb2c0b0d881e2815bb8 tree 4e5a1e9e2625287acfcb27e693c634700bf57611 parent 17f3ae08b6e7fd778371f2cafbd1c988a67ee343 author Stephen Hemminger Thu, 25 May 2006 15:08:30 -0700 committer David S. Miller Sat, 17 Jun 2006 21:26:00 -0700 [LLC]: use more efficient ether address routines Use more cache efficient Ethernet address manipulation functions in etherdevice.h. Signed-off-by: Stephen Hemminger commit 17f3ae08b6e7fd778371f2cafbd1c988a67ee343 tree 9e33f603469628d9bbe679bede945d61e7417dbf parent 1a2449a87bb7606113b1aa1a9d3c3e78ef189a1c author Andrew Morton Thu, 25 May 2006 13:26:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:58 -0700 [I/OAT]: Do not use for_each_cpu(). for_each_cpu() is going away (and is gone in -mm). Signed-off-by: Andrew Morton Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 1a2449a87bb7606113b1aa1a9d3c3e78ef189a1c tree 86e833a8694f201de138697646e7e8469e9c8ef6 parent 9593782585e0cf70babe787a8463d492a68b1744 author Chris Leech Tue, 23 May 2006 18:05:53 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:56 -0700 [I/OAT]: TCP recv offload to I/OAT Locks down user pages and sets up for DMA in tcp_recvmsg, then calls dma_async_try_early_copy in tcp_v4_do_rcv Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 9593782585e0cf70babe787a8463d492a68b1744 tree 149401a3973036452a07bed899e70d3b92abe1bf parent 624d1164730d58a494cc5aa4afa37d02c41e83a7 author Chris Leech Tue, 23 May 2006 18:02:55 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:54 -0700 [I/OAT]: Add a sysctl for tuning the I/OAT offloaded I/O threshold Any socket recv of less than this ammount will not be offloaded Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 624d1164730d58a494cc5aa4afa37d02c41e83a7 tree b6cc0776a826f8f2611eff41149410c7f4ccb355 parent 0e4b4992b8007c6b62ec143cbbb292f98813ca11 author Chris Leech Tue, 23 May 2006 18:01:28 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:52 -0700 [I/OAT]: Make sk_eat_skb I/OAT aware. Add an extra argument to sk_eat_skb, and make it move early copied packets to the async_wait_queue instead of freeing them. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 0e4b4992b8007c6b62ec143cbbb292f98813ca11 tree fccdef8ec226d1febc5f7c22a793b10337026187 parent 97fc2f0848c928c63c2ae619deee61a0b1107b69 author Chris Leech Tue, 23 May 2006 18:00:16 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:50 -0700 [I/OAT]: Rename cleanup_rbuf to tcp_cleanup_rbuf and make non-static Needed to be able to call tcp_cleanup_rbuf in tcp_input.c for I/OAT Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 97fc2f0848c928c63c2ae619deee61a0b1107b69 tree 651f5ec78128605736d6c777a13697d5e58a1b62 parent de5506e155276d385712c2aa1c2d9a27cd4ed947 author Chris Leech Tue, 23 May 2006 17:55:33 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:48 -0700 [I/OAT]: Structure changes for TCP recv offload to I/OAT Adds an async_wait_queue and some additional fields to tcp_sock, and a dma_cookie_t to sk_buff. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit de5506e155276d385712c2aa1c2d9a27cd4ed947 tree 219c30dab27b9aef2597d8735dfc19db8454849e parent db21733488f84a596faaad0d05430b3f51804692 author Chris Leech Tue, 23 May 2006 17:50:37 -0700 committer David S. Miller Sat, 17 Jun 2006 21:25:46 -0700 [I/OAT]: Utility functions for offloading sk_buff to iovec copies Provides for pinning user space pages in memory, copying to iovecs, and copying from sk_buffs including fragmented and chained sk_buffs. Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit db21733488f84a596faaad0d05430b3f51804692 tree a2c1f6d39ce27d2e86b395f2bf536c1ab7396411 parent 57c651f74cd8383df10a648e677902849de1bc0b author Chris Leech Sat, 17 Jun 2006 21:24:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:24:58 -0700 [I/OAT]: Setup the networking subsystem as a DMA client Attempts to allocate per-CPU DMA channels Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 57c651f74cd8383df10a648e677902849de1bc0b tree caf432ce2828b25e17cea3cff523e481c740c65e parent 6b00c92c4b26428cd80e966380c07103556f7b14 author David S. Miller Tue, 23 May 2006 17:39:49 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:50 -0700 [I/OAT]: Move PCI_DEVICE_ID_INTEL_IOAT to linux/pci_ids.h Signed-off-by: David S. Miller commit 6b00c92c4b26428cd80e966380c07103556f7b14 tree ffaa433a8a0f64285e2365084cf83b329f2070cb parent 0bbd5f4e97ff9c057b385a1886b4aed1fb0300f1 author David S. Miller Tue, 23 May 2006 17:37:58 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:48 -0700 [I/OAT]: ioatdma.c needs linux/dma-mapping.h For DMA_*_MASK defines. Signed-off-by: David S. Miller commit 0bbd5f4e97ff9c057b385a1886b4aed1fb0300f1 tree 0c3d8528c31e8291fb78c2e7a287910987ed2888 parent c13c8260da3155f2cefb63b0d1b7dcdcb405c644 author Chris Leech Tue, 23 May 2006 17:35:34 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:46 -0700 [I/OAT]: Driver for the Intel(R) I/OAT DMA engine Adds a new ioatdma driver Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit c13c8260da3155f2cefb63b0d1b7dcdcb405c644 tree ecfe02fa44a423a948f5fb5ad76497da2bb7a402 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Chris Leech Tue, 23 May 2006 17:18:44 -0700 committer David S. Miller Sat, 17 Jun 2006 21:18:43 -0700 [I/OAT]: DMA memcpy subsystem Provides an API for offloading memory copies to DMA devices Signed-off-by: Chris Leech Signed-off-by: David S. Miller commit 9ead190bfde2a434c74ea604382d08acb2eceef5 tree 937f1bb8dedea56efc46aed12370bb3865898763 parent c93b6fbaa99bb3a1552e14317296be14dde51dfb author Roland Dreier Sat, 17 Jun 2006 20:44:49 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:44:49 -0700 IB/uverbs: Don't serialize with ib_uverbs_idr_mutex Currently, all userspace verbs operations that call into the kernel are serialized by ib_uverbs_idr_mutex. This can be a scalability issue for some workloads, especially for devices driven by the ipath driver, which needs to call into the kernel even for datapath operations. Fix this by adding reference counts to the userspace objects, and then converting ib_uverbs_idr_mutex into a spinlock that only protects the idrs long enough to take a reference on the object being looked up. Because remove operations may fail, we have to do a slightly funky two-step deletion, which is described in the comments at the top of uverbs_cmd.c. This also still leaves ib_uverbs_idr_lock as a single lock that is possibly subject to contention. However, the lock hold time will only be a single idr operation, so multiple threads should still be able to make progress, even if ib_uverbs_idr_lock is being ping-ponged. Surprisingly, these changes even shrink the object code: add/remove: 23/5 grow/shrink: 4/21 up/down: 633/-693 (-60) Signed-off-by: Roland Dreier commit c93b6fbaa99bb3a1552e14317296be14dde51dfb tree bad61dc728f0eb28fcfdf01953cd0ae43a4b2350 parent c9c5d9feef86debee4d8e77a738ad86877cf371a author Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 IB/mthca: Make all device methods truly reentrant Documentation/infiniband/core_locking.txt says: All of the methods in struct ib_device exported by a low-level driver must be fully reentrant. The low-level driver is required to perform all synchronization necessary to maintain consistency, even if multiple function calls using the same object are run simultaneously. However, mthca's modify_qp, modify_srq and resize_cq methods are currently not reentrant. Add a mutex to the QP, SRQ and CQ structures so that these calls can be properly serialized. Signed-off-by: Roland Dreier commit c9c5d9feef86debee4d8e77a738ad86877cf371a tree 692adc21d8337a063be7e159860ded87b6e6829a parent 3463175d6ee55fdbd5cda2a03415e2068599b2b7 author Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:41 -0700 IB/mthca: Fix memory leak on modify_qp error paths Some error paths after the mthca_alloc_mailbox() call in mthca_modify_qp() just do a "return -EINVAL" without freeing the mailbox. Convert these returns to "goto out" to avoid leaking the mailbox storage. Signed-off-by: Roland Dreier commit 3463175d6ee55fdbd5cda2a03415e2068599b2b7 tree f629b7c65894d591d861bb121a71f67d0b960f36 parent 92b1582268e269b3a9e54e186e740396f0f2012b author Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Factor out common idr code Factor out common code for adding a userspace object to an idr into a function idr_add_uobj(). This shrinks both the source and object code: add/remove: 1/0 grow/shrink: 0/6 up/down: 57/-220 (-163) function old new delta idr_add_uobj - 57 +57 ib_uverbs_create_ah 543 512 -31 ib_uverbs_create_srq 662 630 -32 ib_uverbs_reg_mr 737 699 -38 ib_uverbs_create_cq 639 600 -39 ib_uverbs_alloc_pd 485 446 -39 ib_uverbs_create_qp 1020 979 -41 Signed-off-by: Roland Dreier commit 92b1582268e269b3a9e54e186e740396f0f2012b tree 6dee998bb8c363ccecdf1f36f155875aea80cdc1 parent 77f76013e3ffda605b20184db5862ce1efcb6f5a author Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Don't decrement usecnt on error paths In error paths when destroying an object, uverbs should not decrement associated objects' usecnt, since ib_dereg_mr(), ib_destroy_qp(), etc. already do that. Signed-off-by: Roland Dreier commit 77f76013e3ffda605b20184db5862ce1efcb6f5a tree ce0c5fb39d891027e2609f74a160eb54b15dce37 parent ca222c6b2c48e1e0be330a55611ba394251330cb author Ganapathi CH Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/uverbs: Release lock on error path If ibdev->alloc_ucontext() fails then ib_uverbs_get_context() does not unlock file->mutex before returning error. Signed-off by: Ganapathi CH Signed-off-by: Roland Dreier commit ca222c6b2c48e1e0be330a55611ba394251330cb tree 80491af9034f3cadad8b68fdb140bb6909f4e48e parent 6d969a471ba107d94cf03dab3c69f45b9733f500 author Sean Hefty Sat, 17 Jun 2006 20:37:40 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:40 -0700 IB/cm: Use address handle helpers Use new ib_init_ah_from_wc() and ib_init_ah_from_path() helper functions to clean up the IB CM. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6d969a471ba107d94cf03dab3c69f45b9733f500 tree 7a9fea5c2a321434e5c4c3bc590393728b85b4dd parent 4e00d69454a8747798de11dc4eeef1edeee5ce98 author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB/sa: Add ib_init_ah_from_path() Add a call to initialize address handle attributes given a path record. This is used by the CM, and would be useful for users of UD QPs. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e00d69454a8747798de11dc4eeef1edeee5ce98 tree e09582595f80e1e7479c4f8b5a559be0db9ac251 parent 75af9088514432ef0c1052ba3767ceb0beb6f101 author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB: Add ib_init_ah_from_wc() Add a function to initialize address handle attributes from a work completion. This functionality is duplicated by both verbs and the CM. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 75af9088514432ef0c1052ba3767ceb0beb6f101 tree 92f312a058889beef2c85a18b9b7f231947c7590 parent 526b4caa0a48382115fa9d8f7d8caf68dbcaa2bf author Sean Hefty Sat, 17 Jun 2006 20:37:39 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:39 -0700 IB/ucm: Get rid of duplicate P_Key parameter The P_Key is provided into a SIDR REQ in two places, once as a parameter, and again in the path record. Remove the P_Key as a parameter and always use the one given in the path record. This change has no practical effect on ABI functionality. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 526b4caa0a48382115fa9d8f7d8caf68dbcaa2bf tree 82383da15f298a7d42f161e12bea175f55b78dea parent 0c0450db31481aa01a04e7faecc93ee6841972d6 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 IB/srp: Factor out common request reset code Misc cleanups in ib_srp: 1) I think that it is more efficient to move the req entries from req_list to free_list in srp_reconnect_target (rather than rebuild the free_list). (In any case this code is shorter). 2) This allows us to reuse code in srp_reset_device and srp_reconnect_target and call a new function srp_reset_req. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit 0c0450db31481aa01a04e7faecc93ee6841972d6 tree c7a1ed2896345d022011831f8a9aaa21e8d8ff00 parent 73c0996b1ca60338fa50e42acfcebd32b7636a8b author Ramachandra K Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 IB/srp: Support SRP rev. 10 targets There has been a change in the format of port identifiers between revision 10 of the SRP specification and the current revision 16A. Revision 10 specifies port identifier format as lower 8 bytes : GUID upper 8 bytes : Extension Whereas revision 16A specifies it as lower 8 bytes : Extension upper 8 bytes : GUID There are older targets (e.g. SilverStorm Virtual Fibre Channel Bridge) which conform to revision 10 of the SRP specification. The I/O class of revision 10 is 0xFF00 and the I/O class of revision 16A is 0x0100. For supporting older targets, this patch: 1) Adds a new optional target creation parameter "io_class". Default value of io_class is 0x0100 (i.e. revision 16A) 2) Uses the correct port identifier format for targets with IO class of 0xFF00 (i.e. conforming to revision 10) Signed-off-by: Ramachandra K Signed-off-by: Roland Dreier commit 73c0996b1ca60338fa50e42acfcebd32b7636a8b tree d4c0378fbac112b25e3a1adf66b06a8d0a32087d parent 6c8c1aa25d213a288df381f431ce5b6a155146ec author Ramachandra K Sat, 17 Jun 2006 20:37:38 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:38 -0700 [SCSI] srp.h: Add I/O Class values Add enum values for I/O Class values from rev. 10 and rev. 16a SRP drafts. The values are used to detect targets that implement obsolete revisions of SRP, so that the initiator can use the old format for port identifier when connecting to them. Signed-off-by: Ramachandra K Signed-off-by: Roland Dreier commit 6c8c1aa25d213a288df381f431ce5b6a155146ec tree 379670131076d3ca0af68f9e91f6f038e86e0e96 parent d4cb0784fd1ea99ef3d20526811bd5608146fe60 author Or Gerlitz Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/fmr: Use device's max_map_map_per_fmr attribute in FMR pool. When creating a FMR pool, query the IB device and use the returned max_map_map_per_fmr attribute as for the max number of FMR remaps. If the device does not suport querying this attribute, use the original IB_FMR_MAX_REMAPS (32) default. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit d4cb0784fd1ea99ef3d20526811bd5608146fe60 tree 214f2e6923c9a04c27b09d790968736cc90c0cdd parent 6eddb5cb906ac5c9a17a1b76464eadacd88b6c92 author Or Gerlitz Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/mthca: Fill in max_map_per_fmr device attribute Report the true max_map_per_fmr value from mthca_query_device(), taking into account the change in FMR remapping introduced by the Sinai performance optimization. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 6eddb5cb906ac5c9a17a1b76464eadacd88b6c92 tree 8f12b13a64030e422b7c7d753009dab3dce3aa6b parent 12bbb2b7be7f5564952ebe0196623e97464b8ac5 author Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:37 -0700 IB/ipath: Add client reregister event generation Generate a client reregister event instead of a LID change event when client reregister bit is set. Signed-off-by: Roland Dreier commit 12bbb2b7be7f5564952ebe0196623e97464b8ac5 tree 2c2aed2ffd043a145ba0369a799d9e8a1bd29ede parent da2ab62ab5e430e6ffafc2d0e6046dcd2780f570 author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IB/mthca: Add client reregister event generation Change the mthca snoop of MADs that set PortInfo to check if the SM has set the client reregister bit, and if it has, generate a client reregister event. If the bit is not set, just generate a LID change event as usual. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit da2ab62ab5e430e6ffafc2d0e6046dcd2780f570 tree 8628b70e91c193cd2ed90dca062974dc90fe16d7 parent 508e434123b136c96d1bf989e8d4ab0c8d7498b1 author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IB: Move struct port_info from ipath to Move ipath's struct port_info into , so that it can be used by mthca to implement client reregister support. Remove the __attribute__((packed)) because all the members of the struct are naturally aligned anyway. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 508e434123b136c96d1bf989e8d4ab0c8d7498b1 tree 1085714b3d50f6a8706e6ab5fb5ba721cac38209 parent 63942c9a981ecfa2aabfb27ff1a87b88f2ee9f5b author Leonid Arsh Sat, 17 Jun 2006 20:37:36 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:36 -0700 IPoIB: Handle client reregister events Handle client reregister events by treating them just like LID or SM changes -- flush all cached paths and rejoin multicast groups. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 63942c9a981ecfa2aabfb27ff1a87b88f2ee9f5b tree 40ddf2d6a967564c979fb198b5a78a4e888fea84 parent 37c22a77212c13201497378cc8becc5c95d0f3f5 author Leonid Arsh Sat, 17 Jun 2006 20:37:35 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:35 -0700 IB: Add client reregister event type Add IB_EVENT_CLIENT_REREGISTER to enum so low-level drivers can generate "client reregister" events. Signed-off-by: Leonid Arsh Signed-off-by: Roland Dreier commit 37c22a77212c13201497378cc8becc5c95d0f3f5 tree 5a38388266a09c9892e5d8e336d7287ae763e7c0 parent 31c02e215700c2b704d9441f629ae87bb9aeb561 author Jack Morgenstein Mon, 29 May 2006 19:14:05 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:35 -0700 IPoIB: Fix kernel unaligned access on ia64 Fix misaligned access faults on ia64: never cast a misaligned neighbour->ha + 4 pointer to union ib_gid type; pass a void * pointer instead. The memcpy was being optimized to use full word accesses because the compiler thought that union ib_gid is always aligned. The cast in IPOIB_GID_ARG is safe, since it is fixed to access each byte separately. Signed-off-by: Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 31c02e215700c2b704d9441f629ae87bb9aeb561 tree 057b5e1de62cbecbbe6a0a4532e7eab0fd0313e4 parent 9874e746550fbd366484621b8838b98589bb2a15 author Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IPoIB: Avoid using stale last_send counter when reaping AHs The comparisons of priv->tx_tail to ah->last_send in ipoib_free_ah() and ipoib_post_receive() are slightly unsafe, because priv->tx_lock is not held and hence a stale value of ah->last_send might be used, which would lead to freeing an AH before the driver was really done with it. The simple way to fix this is to the optimization of early free from ipoib_free_ah() and unconditionally queue AHs for reaping, and then take priv->tx_lock in __ipoib_reap_ah(). Signed-off-by: Roland Dreier commit 9874e746550fbd366484621b8838b98589bb2a15 tree 8927d1f6a2c082591a539e42202c3b266a684ae0 parent 6fb9cdbf2cdb2ea187e57ec2e16cc59df2adf86a author Jack Morgenstein Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IB/mad: Check GID/LID when matching requests Check GID/LID for requester side when searching for request which matches received response. This is in order to guarantee uniqueness if the same TID is used when requesting via multiple source LIDs (when LMC is not zero). Use ports' cached LMC to perform the check. Further, do not perform LID check for direct-routed packets, since the permissive LID makes a proper check impossible. Signed-off-by: Jack Morgenstein Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6fb9cdbf2cdb2ea187e57ec2e16cc59df2adf86a tree 329eb272835bd3105696ddbc60cdaea971aa2a6e parent 856c256f883f027a14b546164294b4a86fea81a4 author Jack Morgenstein Sat, 17 Jun 2006 20:37:34 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:34 -0700 IB: Add caching of ports' LMC Add an LMC cache to struct ib_device, and add a function ib_get_cached_lmc() to query the cache. Signed-off-by: Jack Morgenstein Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 856c256f883f027a14b546164294b4a86fea81a4 tree c505262354179db879aed2c8a48806f98ba6c614 parent 4be10c1e6dcafec993ac4f9abfa5fdcd83728302 author Michael S. Tsirkin Thu, 25 May 2006 14:51:33 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/cm: remove unneeded flush_workqueue destroy_workqueue() already does flush_workqueue(). Signed-off-by: Michael S. Tsirkin Signed-off-by: Sean Hefty commit 4be10c1e6dcafec993ac4f9abfa5fdcd83728302 tree c7f804d21f0fb39cf3a7b7e85266eeb020957af2 parent 6bfa24fa3e189269e113197a80e12862c211b3d3 author Sean Hefty Thu, 25 May 2006 10:03:23 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/ucm: convert semaphore to mutex Convert semaphore in ib_ucm_file to a real mutex. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6bfa24fa3e189269e113197a80e12862c211b3d3 tree cdd5adcb58ce726708a48636d3b657155000e8cf parent b7ac4ab497e44cba75fb0e9e5afca06776518934 author Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:33 -0700 IB/srp: Get rid of "Target has req_lim 0" messages It's perfectly valid for a connection to an SRP target to have a request limit of 0, so get rid of the message about it, which can spam kernel logs even with printk_ratelimit(). Keep a count of such events in a "zero_req_lim" SCSI host attribute instead, so someone who cares can look at the statistics. Signed-off-by: Roland Dreier commit b7ac4ab497e44cba75fb0e9e5afca06776518934 tree d0d513d83ef71ea7530a3e57ccac41c3684a4fcb parent ac83cbaa9a41344c3adf329ede607e58d887f354 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IB/srp: Handle DREQ events from CM Handle IB_CM_DREQ_ERROR and IB_CM_DREQ_RECEIVED events from the CM, instead of just printing "Unhandled CM event". In the case of DREQ_ERROR, just ignore the event -- a TIMEWAIT_EXIT will be generated also. For DREQ_RECEIVED, send a DREP in response to shut the connection down cleanly. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit ac83cbaa9a41344c3adf329ede607e58d887f354 tree 5523955d6c776951827f36024e9dc93a3bbdcbab parent 74b0a15b5e18e44206c98419745a472c3d28e561 author Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IPoIB: Mention RFC numbers in documentation Now that the IETF has released RFCs covering IPoIB, give the numbers in the documentation for IPoIB. Signed-off-by: Roland Dreier commit 74b0a15b5e18e44206c98419745a472c3d28e561 tree 9aa9846193df826cc81d2072a0ca56a569ea9668 parent 52fb2b50c4baa1430064c1e6c1c7df473d469df1 author Vu Pham Sat, 17 Jun 2006 20:37:32 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:32 -0700 IB/srp: Allow sg_tablesize to be adjusted Make the sg_tablesize used by SRP adjustable at module load time via a module parameter. Calculate the corresponding IU length required to support this. Signed-off-by: Vu Pham Signed-off-by: Roland Dreier commit 52fb2b50c4baa1430064c1e6c1c7df473d469df1 tree 7d538c270d6b9064b5674a8fd6f7cf81d8b8580f parent 0c5b395239cdea4db3d9c23a5738fdaf3b9ada4c author Vu Pham Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB/srp: Allow cmd_per_lun to be set per target port Allow userspace to throttle traffic on a given connection to a target port by adding "max_cmd_per_lun=xyz" to lower the cmd_per_lun value set for that scsi_host. Signed-off-by: Vu Pham Signed-off-by: Roland Dreier commit 0c5b395239cdea4db3d9c23a5738fdaf3b9ada4c tree 92262c3a2480603bee7e8b8b405a3a4060433315 parent 403a496fd4af3036c12e1f9c90a89cf846fadd35 author Ishai Rabinovitz Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB/srp: Clean up loop in srp_remove_one() Interrupts will always be enabled in srp_remove_one(), so spin_lock_irq() can be used instead of spin_lock_irqsave(). Also, the loop takes target->scsi_host->host_lock, so target->state can just be set to SRP_TARGET_REMOVED witout testing the old value. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit 403a496fd4af3036c12e1f9c90a89cf846fadd35 tree a2aaa788cb21341f9245db9c7f5c2dfb459d206b parent b3589fd49067bab9fe0c60430860e6befbd5ba37 author Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:31 -0700 IB: Make needlessly global ib_mad_cache static Signed-off-by: Roland Dreier commit b3589fd49067bab9fe0c60430860e6befbd5ba37 tree be054dba4fd5d39e4af03d18e1d57d3b88033ca7 parent 549c5fc2c8149498118f2494a1b6a4938ca05985 author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Change target_mutex to a spinlock The SRP driver never sleeps while holding target_mutex, and it's just used to protect some simple list operations, so hold times will be short. So just convert it to a spinlock, which is smaller and faster. Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit 549c5fc2c8149498118f2494a1b6a4938ca05985 tree 409aff9ba655db4a58d475a7f74f7917d8eca31e parent 1962a4a1e4b3716aa836ebeb5b80c804a7f7c5ba author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Get rid of unneeded use of list_for_each_entry_safe() list_for_each_entry_safe() is used in one place where the list isn't modified. So just change it to list_for_each_entry(). Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit 1962a4a1e4b3716aa836ebeb5b80c804a7f7c5ba tree f88f56331bdae7d46a16261c1c31ab8731b1ac91 parent e9cd59418f049966a690372c4919e98c88bb119b author Matthew Wilcox Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/srp: Use SCAN_WILD_CARD from SCSI headers SCAN_WILD_CARD is indeed available from , which is already included. So get rid of private hack. Signed-off-by: Matthew Wilcox Signed-off-by: Roland Dreier commit e9cd59418f049966a690372c4919e98c88bb119b tree 7624e7d85f4f927692771483a763dafa9f8bb8d5 parent f5358a172f79e3f995919224401b25637f4324f6 author Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:30 -0700 IB/mthca: Convert FW commands to use wait_for_completion_timeout() The kernel has had wait_for_completion_timeout() for a long time now. mthca should use it to handle FW commands timing out, instead of implementing the same thing in a much more complicated way by using wait_for_completion() along with a timer that does complete(). Signed-off-by: Roland Dreier commit f5358a172f79e3f995919224401b25637f4324f6 tree 52980f6f7707af3fca77958d04e88b9cee3c1a2a parent a26026c1221c3e78e6e9f156994c41fb74e99022 author Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB/srp: Use FMRs to map gather/scatter lists Create an SRP FMR pool on HCAs that support FMRs, and use FMRs to map gather/scatter lists that have more than one entry into a single memory region that appears virtually contiguous to the SRP target (which is the RDMA initiator). This patch bails out on FMR mapping for SCSI commands where the gather/scatter list cannot be mapped into a single FMR because there are sub-page-sized entries in middle of the list. An unaligned start or end of the list is OK. Based on a patch by Vu Pham . Signed-off-by: Roland Dreier commit a26026c1221c3e78e6e9f156994c41fb74e99022 tree 3c5cf6f6e43ffc8d078d096809490a29df7c23e4 parent e51060f08a61965c4dd91516d82fe90617152590 author Michael S. Tsirkin Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB/mthca: Remove dead code Kill some dead code in mthca_eq.c Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit e51060f08a61965c4dd91516d82fe90617152590 tree 19a8a0cc519e215e12ce460258a356cdac842f6e parent 7025fcd36bd62af2c6ca0ea3490c00b216c4d168 author Sean Hefty Sat, 17 Jun 2006 20:37:29 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:29 -0700 IB: IP address based RDMA connection manager Kernel connection management agent over InfiniBand that connects based on IP addresses. The agent defines a generic RDMA connection abstraction to support clients wanting to connect over different RDMA devices. The agent also handles RDMA device hotplug events on behalf of clients. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 7025fcd36bd62af2c6ca0ea3490c00b216c4d168 tree e2fda3944176fcafb24876680d6eb8b6be394fe6 parent a1e8733e557bb390e13aa00ef044a6022c8d0bb2 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 IB: address translation to map IP toIB addresses (GIDs) Add an address translation service that maps IP addresses to InfiniBand GID addresses using IPoIB. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit a1e8733e557bb390e13aa00ef044a6022c8d0bb2 tree 52f2d60bc33d19806ce0522c62d84fba33d80691 parent 6e61d04f2d8c7ac4f67e1f498ed2a2a3ad8edaa3 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 [NET]: Export ip_dev_find() Export ip_dev_find() to allow locating a net_device given an IP address. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6e61d04f2d8c7ac4f67e1f498ed2a2a3ad8edaa3 tree cf184fe1a9ebc7187cd452b2427234726436da94 parent 6a9af2e18a5c6ebcf8283309d20ac0e9fa35e346 author Sean Hefty Sat, 17 Jun 2006 20:37:28 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:28 -0700 IB/cm: Match connection requests based on private data Extend matching connection requests to listens in the InfiniBand CM to include private data checks. This allows applications to listen on the same service identifier, with private data directing the request to the appropriate application. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 6a9af2e18a5c6ebcf8283309d20ac0e9fa35e346 tree 550bf42e4fff6b89160224fdf130085fefd0fe2e parent 4e56ea794ec8636991e21942fc2e0d071ea8ee1d author Sean Hefty Sat, 17 Jun 2006 20:37:27 -0700 committer Roland Dreier Sat, 17 Jun 2006 20:37:27 -0700 IB: common handling for marshalling parameters to/from userspace Provide common handling for marshalling data between userspace clients and kernel InfiniBand drivers. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 4e56ea794ec8636991e21942fc2e0d071ea8ee1d tree eb03f5a3246c69fdaf6dd485395b13d33aef158d parent 13aa6ecb47990cfc78e20e347fdd3f1df6189426 author Michael S. Tsirkin Tue, 13 Jun 2006 17:19:42 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:20 -0700 IB/mthca: memfree completion with error FW bug workaround Memfree firmware is in rare cases reporting WQE index == base - 1 in receive completion with error, instead of (rq size - 1); base is 0 in mthca. Here is a patch to avoid kernel crash and report a correct WR id in this case. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 13aa6ecb47990cfc78e20e347fdd3f1df6189426 tree d26f2ed61becb6603aff5dc1467270a370483333 parent 427abfa28afedffadfca9dd8b067eb6d36bac53f author Michael S. Tsirkin Mon, 12 Jun 2006 16:57:51 +0300 committer Roland Dreier Sat, 17 Jun 2006 20:37:00 -0700 IB/mthca: restore missing PCI registers after reset mthca does not restore the following PCI-X/PCI Express registers after reset: PCI-X device: PCI-X command register PCI-X bridge: upstream and downstream split transaction registers PCI Express : PCI Express device control and link control registers This causes instability and/or bad performance on systems where one of these registers is set to a non-default value by BIOS. Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 3877f0b6c9f54d43e55e532404a935b90393b635 tree b22e658ee19ea83c630c6464ed9c7a46d8073606 parent 21c8db9eff95260e543535dfc6f27164c4c0c0ff author David Woodhouse Sun, 18 Jun 2006 00:05:26 +0100 committer David Woodhouse Sun, 18 Jun 2006 00:05:26 +0100 [JFFS2] Don't trust node headers before the CRC is checked. Especially when summary code is used, we can have in-memory data structures referencing certain nodes without them actually being readable on the flash. Discard the nodes gracefully in that case, rather than triggering a BUG(). Signed-off-by: David Woodhouse commit 5b4b7a236e7787f16af4e15a6253d46d8e794be6 tree f38fce923719c0d2cb893fe04f5513cf8009755b parent 785fcccd68bd4dc436f75fd4cd40e8557966c86d parent 872d83d00f67021e036d75aab3b7c6e3fc7e29ee author Len Brown Thu, 15 Jun 2006 23:17:14 -0400 committer Len Brown Thu, 15 Jun 2006 23:17:14 -0400 Pull button into release branch commit 872d83d00f67021e036d75aab3b7c6e3fc7e29ee tree 54d3940f3de7f97f3773973acdfd0a48d10a796d parent d8c3291c73b958243b33f8509d4507e76dafd055 author Arnaud Patard Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Thu, 15 Jun 2006 23:16:05 -0400 ACPI: suppress power button event on S3 resume http://bugzilla.kernel.org/show_bug.cgi?id=6612 Note that this fix depends on a fix in ACPICA 20060608 to replace a semaphore with a spin-lock. Signed-off-by: Arnaud Patard Acked-by: "Yu, Luming" Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 785fcccd68bd4dc436f75fd4cd40e8557966c86d tree 92fbac7035de7751a9db89c4761e4bdbac346749 parent d42510a0f58c2583c37c8e9b7548e3a68545863a author Len Brown Thu, 15 Jun 2006 22:19:31 -0400 committer Len Brown Thu, 15 Jun 2006 22:19:31 -0400 ACPI: resolve merge conflict between sem2mutex and processor_perflib.c Signed-off-by: Len Brown commit d42510a0f58c2583c37c8e9b7548e3a68545863a tree 9d44b95405b9f0083e911a66cc5512860293f95a parent 8f2ddb37e564a9616c05fa0d5652e0049072a730 parent 193de0c79da580eb33a66113b62e2378fc1fb629 author Len Brown Thu, 15 Jun 2006 21:39:25 -0400 committer Len Brown Thu, 15 Jun 2006 21:39:25 -0400 Pull bugzilla-5737 into release branch Conflicts: arch/x86_64/kernel/acpi/processor.c commit 8f2ddb37e564a9616c05fa0d5652e0049072a730 tree a28df8762bb77979b0ff8cc14cfcc12a1204ca09 parent 5b542e4422766d644ca303b8a47b27ec9eeeef3a parent 74ce1468128e299fe6a85e7e78e528e45e72d6d9 author Len Brown Thu, 15 Jun 2006 21:36:11 -0400 committer Len Brown Thu, 15 Jun 2006 21:36:11 -0400 Pull bugzilla-5000 into release branch commit 5b542e4422766d644ca303b8a47b27ec9eeeef3a tree e489ca691577a09baf337d9837ff25a5fa882d67 parent e4151eaa7f231296d027b8fb34e2b855a3480836 parent f9a6ee1afb84fd767508428ec5d1df4fb60a03ad author Len Brown Thu, 15 Jun 2006 21:34:21 -0400 committer Len Brown Thu, 15 Jun 2006 21:34:21 -0400 Pull bugzilla-5764 into release branch commit e4151eaa7f231296d027b8fb34e2b855a3480836 tree 9821c60756cff4b4a0d8cca3b4a9889ea66dee49 parent c080a3e69dfb58ae9b8c7e70a1e33f4f4e493ea7 parent 42adb53cb36d19862a02d3087e2e3d9dab39e5fa author Len Brown Thu, 15 Jun 2006 21:33:36 -0400 committer Len Brown Thu, 15 Jun 2006 21:33:36 -0400 Pull ibm_acpi into release branch commit c080a3e69dfb58ae9b8c7e70a1e33f4f4e493ea7 tree 849d913226a6d38b66bf5ad1ccf6ea07559009af parent bf891bd65de65284f3964216fcde493dba5149db parent 36e430951af0b0d1bdfd50ce22e70079d02646df author Len Brown Thu, 15 Jun 2006 21:31:47 -0400 committer Len Brown Thu, 15 Jun 2006 21:31:47 -0400 Pull sem2mutex into release branch commit bf891bd65de65284f3964216fcde493dba5149db tree 082056dd77fa9599034424c46ef8a67f93565e89 parent de59e3aa6eda7fc7cd6c717f084930f6a841b602 parent 9c576ff1bc9ab42d06457e68e39c121481138562 author Len Brown Thu, 15 Jun 2006 21:31:17 -0400 committer Len Brown Thu, 15 Jun 2006 21:31:17 -0400 Pull trivial2 into release branch commit de59e3aa6eda7fc7cd6c717f084930f6a841b602 tree 0b763a7992a75885ca74f130b0807b4def2c341a parent 69cd291c6bbc6647fe3783257c5a2e076e808f71 parent 973bf491a55b825740f0d8d300b50bcd3d6fb8de author Len Brown Thu, 15 Jun 2006 21:30:59 -0400 committer Len Brown Thu, 15 Jun 2006 21:30:59 -0400 Pull video into release branch commit 69cd291c6bbc6647fe3783257c5a2e076e808f71 tree 6f65a2d7d29228129cef09343c485aad64e3a3f1 parent 35a5d9ed9fedb74c22cb19ff7d749289473144e0 parent 06ea8e08ae7e7e450b6a78e7ce5e10b3c5f954ea author Len Brown Thu, 15 Jun 2006 21:28:57 -0400 committer Len Brown Thu, 15 Jun 2006 21:28:57 -0400 Pull acpi_bus_register_driver into release branch Conflicts: drivers/acpi/asus_acpi.c drivers/acpi/scan.c commit 1668b19f75cb949f930814a23b74201ad6f76a53 tree fecf28d203ec6263372f2772c0adc5b72841ac79 parent 553698f944ed715dfe023b4cef07601f0ce735f0 author Pedro Alejandro López-Valencia Thu, 15 Jun 2006 22:46:44 +0200 committer Francois Romieu Thu, 15 Jun 2006 23:02:00 +0200 sundance: PCI ID for ip100a Patch provided by Pedro Alejandro López-Valencia in http://bugzilla.kernel.org/show_bug.cgi?id=6691 The patch is derived from IC+ GPL'ed rework of sundance driver available at http://www.icplus.com.tw/pp-IP100A.html Patch closes http://bugzilla.kernel.org/show_bug.cgi?id=5858 as well. Signed-off-by: Francois Romieu Cc: Pedro Alejandro López-Valencia commit 89c318ed3985da1271e00ad586f2dce8a6e75656 tree b8be0c7a76b11a971650eff3508efe197e896fe1 parent 7bd6b91800c996da328bd57e40e62b3f73760fbe author Zhu Yi Thu, 08 Jun 2006 22:19:49 -0700 committer John W. Linville Thu, 15 Jun 2006 15:48:14 -0400 [PATCH] ipw2200 locking fix Well, this is not 100% if when the card fires two consecutive interrupts. Though unlikely, it's better to protect early than seeing some "weird" bugs one day. I proposed attached patch. If you can help to test, that will be appreciated (I cannot see the lockdep warning on my box somehow). Cc: Frederik Deweerdt Cc: Arjan van de Ven Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 7bd6b91800c996da328bd57e40e62b3f73760fbe tree ff1ae357b6789c5439864a0b611d5e7ba10949dd parent 12a3768792dc27f11a5edb96e38db32bcdc5fd27 author Larry Finger Thu, 08 Jun 2006 09:47:42 -0500 committer John W. Linville Thu, 15 Jun 2006 15:48:14 -0400 [PATCH] wireless: correct dump of WPA IE In net/ieee80211/softmac/ieee80211softmac_wx.c, there is a bug that prints extended sign information whenever the byte value exceeds 0x7f. The following patch changes the printk to use a u8 cast to limit the output to 2 digits. This bug was first noticed by Dan Williams . This patch applies to the current master branch of the Linville tree. Signed-Off-By: Larry Finger Signed-off-by: John W. Linville commit 12a3768792dc27f11a5edb96e38db32bcdc5fd27 tree eaf1362f4b3280cdc9347cccee69f49e1f3d310f parent 91769e7dd9cef7988dc4280f74ed168351beb5b8 author Jiri Slaby Mon, 05 Jun 2006 22:20:07 +0200 committer John W. Linville Thu, 15 Jun 2006 15:48:13 -0400 [PATCH] pci: bcm43xx avoid pci_find_device bcm43xx avoid pci_find_device Change pci_find_device to safer pci_get_device with support for more devices. Signed-off-by: Jiri Slaby Signed-off-by: John W. Linville commit 91769e7dd9cef7988dc4280f74ed168351beb5b8 tree ef854d83ec881882b94a3e88b580e2468f62bac1 parent 78ff56a06edc3407996173daf63e48f6b90c7062 author Michael Buesch Mon, 05 Jun 2006 20:24:21 +0200 committer John W. Linville Thu, 15 Jun 2006 15:48:13 -0400 [PATCH] bcm43xx: preemptible periodic work Make the heavy periodic work preemptible to avoid disabling local IRQs for several msecs. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 78ff56a06edc3407996173daf63e48f6b90c7062 tree 93ddfccd648ee84faeb95bcf8f5183ac91d873f7 parent 74f4903363579d3336c294ebb11f02c8f35845ca author Michael Buesch Mon, 05 Jun 2006 20:24:10 +0200 committer John W. Linville Thu, 15 Jun 2006 15:48:13 -0400 [PATCH] bcm43xx: redesign locking Redesign the bcm43xx locking. This is pre-work to get a preemptible periodic work handler. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit 74f4903363579d3336c294ebb11f02c8f35845ca tree 61050f4d54dc69a24cef2deb5ca86b228de0767f parent 76df73ff90e99681a99e457aec4cfe0a240b7982 author Larry Finger Tue, 30 May 2006 11:55:42 -0500 committer John W. Linville Thu, 15 Jun 2006 15:48:13 -0400 [PATCH] wireless: Changes to ieee80211.h for user space regulatory daemon Attached are two small patches for include/net/ieee80211.h to prepare for later submission of code to implement a user-space daemon that supplies 802.11 regulatory information. The first change adds a bit indicating that 802.11h rules are to be applied to a channel. As discussed earlier in this list, a single bit is unlikely to be sufficient; however, at this time I have been unable to find any regulations implementing differences between 802.11a and 802.11h other than DFS, radar detection and passive scanning. A single bit is thus sufficient to convey to the driver that these rules should be obeyed. The second change adds comments to the freq and max_power fields of struct ieee80211_channel to indicate the units that are used. Signed-Off-By: Larry Finger Signed-off-by: John W. Linville commit 35a5d9ed9fedb74c22cb19ff7d749289473144e0 tree c414a1aeac5d4fe6db3a411685ca66e733f71496 parent 3e8e7c93d7eb091463839b5212789c4aae09459e parent 0eacee585a89ce5827b572a73a024931506bef48 author Len Brown Thu, 15 Jun 2006 15:42:14 -0400 committer Len Brown Thu, 15 Jun 2006 15:42:14 -0400 Pull bugzilla-5452 into release branch commit 3e8e7c93d7eb091463839b5212789c4aae09459e tree 697a04ce1202b8d8ff398b96944be844329b713c parent 36a557d1f48669c57f59e37d9334400a29e4e53c parent ffd642e748c867a7339b57225b8bf8b9a0dcd9c5 author Len Brown Thu, 15 Jun 2006 15:41:53 -0400 committer Len Brown Thu, 15 Jun 2006 15:41:53 -0400 Pull bugzilla-5653 into release branch commit 36a557d1f48669c57f59e37d9334400a29e4e53c tree 6d97b3eb9fefa6a82dd11dd7caeb799f986bdc48 parent 4e8f10b7ccf1c3c53a818a157962074a7340732e parent 6665bda76461308868bd1e52caf627f4cb29ed32 author Len Brown Thu, 15 Jun 2006 15:40:39 -0400 committer Len Brown Thu, 15 Jun 2006 15:40:39 -0400 Pull trivial into release branch commit 4e8f10b7ccf1c3c53a818a157962074a7340732e tree b5b60b535b9068541bd7c1504216c2428c5cb109 parent 63518472c05a351d779f35803e6ccfb361ae630a parent 9cfda2c94df61c9f859b474abe774c65a4464d0a author Len Brown Thu, 15 Jun 2006 15:38:30 -0400 committer Len Brown Thu, 15 Jun 2006 15:38:30 -0400 Pull novell-bugzilla-156426 into release branch Conflicts: arch/i386/kernel/acpi/boot.c commit 63518472c05a351d779f35803e6ccfb361ae630a tree d3668e960f945a7a1204cfb839bc8aaabcdf2341 parent e44e20ff1273cf96c7f195297208f654c49295cf parent e6f1f3c54974a30c65ea0b699809d12f0aa04272 author Len Brown Thu, 15 Jun 2006 15:37:09 -0400 committer Len Brown Thu, 15 Jun 2006 15:37:09 -0400 Pull trivial1 into release branch commit e44e20ff1273cf96c7f195297208f654c49295cf tree 7ed673b54106774752053acafb1de71b77a2dd40 parent 3145012c1c34a3504a2234bd2034ca6ea4767bc5 parent 1c6e7d0aeecac38e66b1bb63e3eff07b2a1c2f2c author Len Brown Thu, 15 Jun 2006 15:36:43 -0400 committer Len Brown Thu, 15 Jun 2006 15:36:43 -0400 Pull pnpacpi into release branch commit 3145012c1c34a3504a2234bd2034ca6ea4767bc5 tree 21eb2109e7b00f16bb6c3dc72a1e835c0bf3dd33 parent 1465887cfe79889273e3fd3aaf862e7ec3ee244f parent cd090eedd85256829f762677d0752a846c1b88b9 author Len Brown Thu, 15 Jun 2006 15:36:16 -0400 committer Len Brown Thu, 15 Jun 2006 15:36:16 -0400 Pull motherboard into release branch commit 1465887cfe79889273e3fd3aaf862e7ec3ee244f tree 210930f245d2bdd47b65480e11ed8ea24a564550 parent 60e04a5c533785c23ce6b76a6e5058328fe68edb parent 1300124f69cafc54331bc06e968a8dd67863f989 author Len Brown Thu, 15 Jun 2006 15:35:57 -0400 committer Len Brown Thu, 15 Jun 2006 15:35:57 -0400 Pull Kconfig into release branch commit 60e04a5c533785c23ce6b76a6e5058328fe68edb tree 233d985e2195ae5917ec91cec650d8d11bae2e40 parent 61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143 parent ff2fc3e9e3edb918b6c6b288485c6cb267bc865e author Len Brown Thu, 15 Jun 2006 15:35:37 -0400 committer Len Brown Thu, 15 Jun 2006 15:35:37 -0400 Pull ec into release branch commit 61fb46c5b3578fda7cc780e8bc53b3e8f8c1a143 tree dd1772adc6c3bd5cd73467009b586fe9d53396da parent 59f720eb5a4337b2c4fc0b4c6cfd9c144e492aa8 parent eefa27a93a0490902f33837ac86dbcf344b3aa29 author Len Brown Thu, 15 Jun 2006 15:35:15 -0400 committer Len Brown Thu, 15 Jun 2006 15:35:15 -0400 Pull cpu-hotplug into release branch commit 59f720eb5a4337b2c4fc0b4c6cfd9c144e492aa8 tree 455c48b0c8158846fe1e34c226a4389c663f45c4 parent b3899c6613160b18f79e4356184de55311302fe4 parent 9224a867c497053842dc595e594ca6d32112221f author Len Brown Thu, 15 Jun 2006 15:34:42 -0400 committer Len Brown Thu, 15 Jun 2006 15:34:42 -0400 Pull address_range into release branch commit b3899c6613160b18f79e4356184de55311302fe4 tree 4aa7945bac59cbe5bb5d863be2d4ded285d3e936 parent 553698f944ed715dfe023b4cef07601f0ce735f0 parent 4c90ece249992c7a2e3fc921e5cdb8eb92193067 author Len Brown Thu, 15 Jun 2006 15:19:48 -0400 committer Len Brown Thu, 15 Jun 2006 15:19:48 -0400 Pull acpica into release branch commit 12223dabc617a4babfba4e17feb1ed88e8cfeb8f tree c749ed8c0b6e0fc83ecf89b62bd949384b2e02bc parent e474c66b1c76f9755f5d6dd5bfe88ce5e0435184 author Russell King Thu, 15 Jun 2006 13:28:52 +0100 committer Russell King Thu, 15 Jun 2006 13:28:52 +0100 [MMC] Add (MMC) to entry in MAINTAINERS file Juha Yrjola suggests that adding the string "MMC" to the maintainers file entry will make it easier to find. Add it to the file. Signed-off-by: Russell King commit 2ba73b1d6fa62ddaa235c3c5fdf6095cae6ba748 tree cd1d84913a99e685fbc2a6a088ca86afc7d25501 parent 4312dc76a88146c4f1d693fc4643d1df12aaf755 author Matthias Fuchs Wed, 14 Jun 2006 15:35:05 +0200 committer Paul Mackerras Thu, 15 Jun 2006 19:31:27 +1000 [POWERPC] ppc32: fix CPCI405 board support Hi, this patch brings the CPCI405 board support up to date and fixes several outstanding issues: -add bios_fixup() -enable RTC only when CONFIG_GEN_RTC defined -corrected CompactPCI interrupt map -added cpci405_early_serial_map for correct UART clocking -removed unused code Matthias Signed-off-by: Matthias Fuchs Signed-off-by: Paul Mackerras commit 4312dc76a88146c4f1d693fc4643d1df12aaf755 tree dc416a6b6c562c2563c37d00656fcf6ad2166c12 parent 368a6ba5d188552aea2a668301a259164c9f355e author Johannes Berg Tue, 13 Jun 2006 17:43:42 +0200 committer Paul Mackerras Thu, 15 Jun 2006 19:31:27 +1000 [POWERPC] make pmf irq_client functions safe against pmf interrupts coming in This fixes the pmf irq_client functions to be safe against pmf interrupts coming in while a client is registered/unregistered. Signed-off-by: Johannes Berg Signed-off-by: Paul Mackerras commit 368a6ba5d188552aea2a668301a259164c9f355e tree d22916e2870618b2b4ff26588df8f66a5928ac64 parent 0e4aa9c2009187fff1c999fe0aaa134c1a84f48a author Dave C Boutcher Mon, 12 Jun 2006 19:49:20 -0500 committer Paul Mackerras Thu, 15 Jun 2006 19:31:27 +1000 [POWERPC] check firmware state before suspending Currently the kernel blindly halts all the processors and calls the ibm,suspend-me rtas call. If the firmware is not in the correct state, we then re-start all the processors and return. It is much smarter to first check the firmware state, and only if it is waiting, call the ibm,suspend-me call. Signed-off-by: Paul Mackerras commit 0e4aa9c2009187fff1c999fe0aaa134c1a84f48a tree 9680eac732205bd6e0c0b2135357b718a336b95c parent 6fe87675314b4b1ac7ba339e2a4ab8d739b600d6 author Amos Waterland Mon, 12 Jun 2006 23:45:02 -0400 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] Fix builtin command line interaction with firmware It seems that prom_init's early_cmdline_parse is broken on at least Apple 970 xserves and IBM JS20 blades with SLOF. The firmware of these machines returns -1 and 1 respectively when getprop is called for the bootargs property of /chosen, causing Linux to ignore its builtin command line in favor of a null string. This patch makes Linux use its builtin command line if getprop returns an error or a null string. Signed-off-by: Amos Waterland Acked-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 6fe87675314b4b1ac7ba339e2a4ab8d739b600d6 tree 76e61aa0b25f2a0c568f5c541fad5dc25ae977f0 parent bd19c8994a828e70b5472f0ce9df5831c6c3db84 author Anton Blanchard Sun, 11 Jun 2006 11:40:43 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] update pmac32_defconfig Some updates to the pmac32_defconfig to make it more useful: - Enable LSF (large single files) since we enable LBD (large block devices) - Enable IPSEC related options - Enable remaining raid/dm options as modules - Disable eth1394, I doubt any has that hardware and it has a nasty habit of auto loading first and skewing network device numbering - Enable dummy and tun as modules, always useful to have them around - Enable EHCI, no wonder my usb2 disk was so slow - Enable USB storage - Enable ext3 acls - Disable autofs and enable autofsv4 instead - Enable nfs v3/v4 client and server. Dont want to be left in the dark ages of pre v3 - Enable all crypto as modules, things like cryptsetup want some of them I havent enabled the BCM43xx, perhaps we should now? Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit bd19c8994a828e70b5472f0ce9df5831c6c3db84 tree 5462c6d574b995084aa9ed4472257851c4b6ad54 parent 9e6e3c2c796f1e0ef335804d5c87073e365dea50 author Anton Blanchard Sun, 11 Jun 2006 01:15:55 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] system call micro optimisation In the syscall path we currently have: crclr so mfcr r9 If we shift the crclr up we can avoid a stall on some CPUs. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 9e6e3c2c796f1e0ef335804d5c87073e365dea50 tree 0d749f2b5f2c9eb67f9084c88ef10151199cc4ff parent df310656c7552ae7b8252e4b3d8e300cff164b16 author Anton Blanchard Sat, 10 Jun 2006 23:14:51 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] Fix HV bit handling on non partitioned machines On non partitioned machines we currently set the HV bit in kernel space only. It turns out we are supposed to maintain the HV bit in both user and kernel space. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit df310656c7552ae7b8252e4b3d8e300cff164b16 tree 89644b8725237c755422853d749acfb0c7a49c57 parent ca1588e71b70534e18368a46a3aad9b25dff941d author Anton Blanchard Sat, 10 Jun 2006 23:04:39 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] cleanup dma_mapping_ops For pseries IOMMU bypass I want to be able to fall back to the regular IOMMU ops. Do this by creating a dma_mapping_ops struct, and convert the others while at it. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit ca1588e71b70534e18368a46a3aad9b25dff941d tree 5bee264d69ba4cbd8b5f5ffaf7f981cab161a52b parent 357518fa34d9dceda42bfc09642356a58370050d author Anton Blanchard Sat, 10 Jun 2006 20:58:08 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] node local IOMMU tables Allocate IOMMU tables local to the relevant node. Signed-off-by: Anton Blanchard Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 357518fa34d9dceda42bfc09642356a58370050d tree c75689198fa2667a3d73d89ff125d910061b4fcf parent f2b09c8189bc7b64a42753e98f7006b11bae1bdc author Anton Blanchard Sat, 10 Jun 2006 20:53:06 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] pcibus_to_node fixes of_node_to_nid returns -1 if the associativity cannot be found. This means pcibus_to_cpumask has to be careful not to pass a negative index into node_to_cpumask. Since pcibus_to_node could be used a lot, and of_node_to_nid is slow (it walks a list doing strcmps), lets also cache the node in the pci_controller struct. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit f2b09c8189bc7b64a42753e98f7006b11bae1bdc tree 7e2cdda3b2fa25b632299a18c9fcd67bc3112474 parent 227318bbde6c8309b1d20ab46532ec2b737e1fee author Anton Blanchard Sat, 10 Jun 2006 20:37:24 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] Update pseries defconfig pseries defconfig updates: - Enable jsm and re-enable qlogic FC drivers as modules. - Enable ocfs2, autofs4 and fuse filesystems as modules. - Enable Kprobes. - Enable ebus, binfmt_misc, sas attrs, md5 reshape, hvc rtas backend and some infiniband options. - Finally disable debug options: DEBUG_MUTEXES and DEBUG_STACK_USAGE. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 227318bbde6c8309b1d20ab46532ec2b737e1fee tree de8bbbda0d69fc641629c10e5a0a1070a09bdde7 parent 8555a0029b1b0840237b750e55d4835a52cc719b author Anton Blanchard Sat, 10 Jun 2006 20:32:01 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:26 +1000 [POWERPC] Remove stale 64bit on 32bit kernel code Remove some stale POWER3/POWER4/970 on 32bit kernel support. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8555a0029b1b0840237b750e55d4835a52cc719b tree fb17c491f12deb3d7ac93397091ec900fbce46e9 parent 3a2c48cfc97f9046abbd810f1efb1aa824bcfaf1 author Anton Blanchard Sat, 10 Jun 2006 20:23:54 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] Optimise some TOC usage Micro-optimisation - add no-minimal-toc to some more arch/powerpc Makefiles. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3a2c48cfc97f9046abbd810f1efb1aa824bcfaf1 tree afcd54f2ad36353abcf2282fdf15a05e77fcba4a parent 30d8caf7c625203b295a78f143820cdc3124830b author Anton Blanchard Sat, 10 Jun 2006 20:18:39 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] 64bit FPSCR support Forthcoming machines will extend the FPSCR to 64 bits. We already had a 64-bit save area for the FPSCR, but we need to use a new form of the mtfsf instruction. Fortunately this new form is decoded as an ordinary mtfsf by existing 64-bit processors. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 30d8caf7c625203b295a78f143820cdc3124830b tree a8a759a1fcf3d8b53e1d9a587943932b4fc9011c parent 204face4fb3ba2ca09a4073e7debc595e14c2388 author mostrows@watson.ibm.com Fri, 09 Jun 2006 09:06:12 -0400 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] Editable kernel command-line in zImage binary. zImage will set /chosen/bootargs (if it is otherwise empty) with the contents of a buffer in the section "__builtin_cmdline". This permits tools to edit zImage binaries to set the command-line eventually processed by vmlinux. -- Signed-off-by: Michal Ostrowski Signed-off-by: Paul Mackerras commit 204face4fb3ba2ca09a4073e7debc595e14c2388 tree c98c1b576d249b392669a0d534598718af40478d parent bb53bb3dcb12d79efdee3d82bff46a204af377f3 author Jake Moilanen Wed, 07 Jun 2006 16:15:10 -0500 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] MSI abstraction Instead of trying to make PPC64 MSI fit in a Intel-centric MSI layer, a simple short-term solution is to hook the pci_{en/dis}able_msi() calls and make a machdep call. The rest of the MSI functions are superfluous for what is needed at this time. Many of which can have machdep calls added as needed. Ben and Michael Ellerman are looking into rewrite the MSI layer to be more generic. However, in the meantime this works as a interim solution. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit bb53bb3dcb12d79efdee3d82bff46a204af377f3 tree 3bbe796265817fdf461a5caa0ad6253445460309 parent 0f582bc1f2cccacd613c411fbea55873d17c3429 author Jake Moilanen Wed, 07 Jun 2006 16:05:46 -0500 committer Paul Mackerras Thu, 15 Jun 2006 19:31:25 +1000 [POWERPC] Add support for PCI-Express nodes in the device tree This adds support to recognize the PCIe device_type "pciex" and made the portdrv buildable. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit 0f582bc1f2cccacd613c411fbea55873d17c3429 tree 83fc9e579bb520a876ffd75910861c811a0eac14 parent bf72aeba2ffef599d1d386425c9e46b82be657cd author Paul Mackerras Thu, 15 Jun 2006 18:03:32 +1000 committer Paul Mackerras Thu, 15 Jun 2006 19:25:50 +1000 powerpc: Simplify push_end definition in pci_32.c The push_end macro in arch/powerpc/kernel/pci_32.c uses integer division and multiplication to achieve the effect of rounding a resource end address up and then advancing it to the end of a power-of-2 sized region. This changes it to an equivalent computation that only needs an integer add and OR. This is partly based on an earlier patch by Mel Gorman. Signed-off-by: Paul Mackerras commit bf72aeba2ffef599d1d386425c9e46b82be657cd tree ead8e5111dbcfa22e156999d1bb8a96e50f06fef parent 31925323b1b51bb65db729e029472a8b1f635b7d author Paul Mackerras Thu, 15 Jun 2006 10:45:18 +1000 committer Paul Mackerras Thu, 15 Jun 2006 10:45:18 +1000 powerpc: Use 64k pages without needing cache-inhibited large pages Some POWER5+ machines can do 64k hardware pages for normal memory but not for cache-inhibited pages. This patch lets us use 64k hardware pages for most user processes on such machines (assuming the kernel has been configured with CONFIG_PPC_64K_PAGES=y). User processes start out using 64k pages and get switched to 4k pages if they use any non-cacheable mappings. With this, we use 64k pages for the vmalloc region and 4k pages for the imalloc region. If anything creates a non-cacheable mapping in the vmalloc region, the vmalloc region will get switched to 4k pages. I don't know of any driver other than the DRM that would do this, though, and these machines don't have AGP. When a region gets switched from 64k pages to 4k pages, we do not have to clear out all the 64k HPTEs from the hash table immediately. We use the _PAGE_COMBO bit in the Linux PTE to indicate whether the page was hashed in as a 64k page or a set of 4k pages. If hash_page is trying to insert a 4k page for a Linux PTE and it sees that it has already been inserted as a 64k page, it first invalidates the 64k HPTE before inserting the 4k HPTE. The hash invalidation routines also use the _PAGE_COMBO bit, to determine whether to look for a 64k HPTE or a set of 4k HPTEs to remove. With those two changes, we can tolerate a mix of 4k and 64k HPTEs in the hash table, and they will all get removed when the address space is torn down. Signed-off-by: Paul Mackerras commit 21c8db9eff95260e543535dfc6f27164c4c0c0ff tree 68dd7562b241b5cc95e5e45c8fa555fbbe26875f parent 783ed81ff39d3f938a6b2efd09fbad96e41e5c1f author David Woodhouse Wed, 14 Jun 2006 21:39:48 +0100 committer David Woodhouse Wed, 14 Jun 2006 21:39:48 +0100 [MTD] Restore MTD_ROM and MTD_RAM types Let's not attempt the abolition of mtd->type until/unless it's properly thought through. And certainly, let's not do it by halves. Signed-off-by: David Woodhouse commit 783ed81ff39d3f938a6b2efd09fbad96e41e5c1f tree 31cdfd9c39c9451ba37866dcb6e82e68c770216c parent f9068876f5ef583f8e9ebf4acd2ef5b35b113db9 author Artem B. Bityutskiy Wed, 14 Jun 2006 19:53:44 +0400 committer Artem B. Bityutskiy Wed, 14 Jun 2006 19:53:44 +0400 [MTD] assume mtd->writesize is 1 for NOR flashes Signed-off-by: Artem B. Bityitskiy commit 9348f0de2d2b541b4ba64fb1f4efee9710a3d731 tree a7ba0a32697123ff7fbcc12e37d2472249963d41 parent d27317657ae18cfbc45def8f566e4c3ed1f51d74 author Martin Schwidefsky Wed, 14 Jun 2006 14:10:51 +0100 committer David Woodhouse Wed, 14 Jun 2006 14:10:51 +0100 [S390] __FD_foo definitions. Make the definitions of __FD_SET, __FD_CLR and __FD_ISSET independent from asm/bitops.h and remove the macro magic that tests for __GLIBC__. Use simple C inline functions instead of set_bit, clear_bit and test_bit. Signed-off-by: Martin Schwidefsky Signed-off-by: David Woodhouse commit 4c90ece249992c7a2e3fc921e5cdb8eb92193067 tree e145ffe472802ef870ba1eaea150b688c19e45ca parent 4119532c95547821dbe72d6916dfa1b2148475b3 author Bob Moore Thu, 08 Jun 2006 16:29:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:45:47 -0400 ACPI: ACPICA 20060608 Converted the locking mutex used for the ACPI hardware to a spinlock. This change should eliminate all problems caused by attempting to acquire a semaphore at interrupt level, and it means that all ACPICA external interfaces that directly access the ACPI hardware can be safely called from interrupt level. Fixed a regression introduced in 20060526 where the ACPI device initialization could be prematurely aborted with an AE_NOT_FOUND if a device did not have an optional _INI method. Fixed an IndexField issue where a write to the Data Register should be limited in size to the AccessSize (width) of the IndexField itself. (BZ 433, Fiodor Suietov) Fixed problem reports (Valery Podrezov) integrated: - Allow store of ThermalZone objects to Debug object. http://bugzilla.kernel.org/show_bug.cgi?id=5369 http://bugzilla.kernel.org/show_bug.cgi?id=5370 Fixed problem reports (Fiodor Suietov) integrated: - acpi_get_table_header() doesn't handle multiple instances correctly (BZ 364) Removed four global mutexes that were obsolete and were no longer being used. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 4119532c95547821dbe72d6916dfa1b2148475b3 tree 564eb8f69924fb7dc72e93526faf1547acac7d30 parent b8d35192c55fb055792ff0641408eaaec7c88988 author Bob Moore Fri, 26 May 2006 16:36:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:44:35 -0400 ACPI: ACPICA 20060526 Restructured, flattened, and simplified the internal interfaces for namespace object evaluation - resulting in smaller code, less CPU stack use, and fewer interfaces. (With assistance from Mikhail Kouzmich) Fixed a problem with the CopyObject operator where the first parameter was not typed correctly for the parser, interpreter, compiler, and disassembler. Caused various errors and unexpected behavior. Fixed a problem where a ShiftLeft or ShiftRight of more than 64 bits produced incorrect results with some C compilers. Since the behavior of C compilers when the shift value is larger than the datatype width is apparently not well defined, the interpreter now detects this condition and simply returns zero as expected in all such cases. (BZ 395) Fixed problem reports (Valery Podrezov) integrated: - Update String-to-Integer conversion to match ACPI 3.0A spec http://bugzilla.kernel.org/show_bug.cgi?id=5329 Allow interpreter to handle nested method declarations http://bugzilla.kernel.org/show_bug.cgi?id=5361 Fixed problem reports (Fiodor Suietov) integrated: - acpi_terminate() doesn't free debug memory allocation list objects (BZ 355) - After Core Subsystem shutdown, acpi_subsystem_status() returns AE_OK (BZ 356) - acpi_os_unmap_memory() for RSDP can be invoked inconsistently (BZ 357) - Resource Manager should return AE_TYPE for non-device objects (BZ 358) - Incomplete cleanup branch in AcpiNsEvaluateRelative (BZ 359) - Use acpi_os_free() instead of ACPI_FREE in acpi_rs_set_srs_method_data (BZ 360) - Incomplete cleanup branch in acpi_ps_parse_aml (BZ 361) - Incomplete cleanup branch in acpi_ds_delete_walk_state (BZ 362) - acpi_get_table_header returns AE_NO_ACPI_TABLES until DSDT is loaded (BZ 365) - Status of the Global Initialization Handler call not used (BZ 366) - Incorrect object parameter to Global Initialization Handler (BZ 367) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit b8d35192c55fb055792ff0641408eaaec7c88988 tree 87272903bda56a4ddedcc513d35a74f072ab1f5d parent 958dd242b691f64ab4632b4903dbb1e16fee8269 author Alexey Starikovskiy Fri, 05 May 2006 03:23:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:43:23 -0400 ACPI: execute Notify() handlers on new thread http://bugzilla.kernel.org/show_bug.cgi?id=5534 Thanks to Peter Wainwright for isolating the issue. Thanks to Andi Kleen and Bob Moore for feedback. Thanks to Richard Mace and others for testing. Updates by Konstantin Karasyov. Signed-off-by: Konstantin Karasyov Signed-off-by: Len Brown commit 958dd242b691f64ab4632b4903dbb1e16fee8269 tree ddf4932fb4e3023dd0d1914571f17f2e3b03978d parent b229cf92eee616c7cb5ad8cdb35a19b119f00bc8 author Bob Moore Fri, 12 May 2006 17:12:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:34:48 -0400 ACPI: ACPICA 20060512 Replaced the acpi_os_queue_for_execution() with a new interface named acpi_os_execute(). The major difference is that the new interface does not have a Priority parameter, this appeared to be useless and has been replaced by a Type parameter. The Type tells the OS what type of execution is being requested, such as global lock handler, notify handler, GPE handler, etc. This allows the host to queue and execute the request as appropriate for the request type, possibly using different work queues and different priorities for the various request types. This enables fixes for multithreading deadlock problems such as http://bugzilla.kernel.org/show_bug.cgi?id=5534 (Alexey Starikovskiy and Bob Moore) Fixed a possible memory leak associated with the support for the so-called "implicit return" ACPI extension. Reported by FreeBSD (Fiodor Suietov) http://bugzilla.kernel.org/show_bug.cgi?id=6514 Fixed a problem with the Load() operator where a table load from an operation region could overwrite an internal table buffer by up to 7 bytes and cause alignment faults on IPF systems. (With assistance from Luming Yu) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit b229cf92eee616c7cb5ad8cdb35a19b119f00bc8 tree 74b52bec6ec029859c2320aba227290a503af31a parent 793c2388cae3fd023b3b5166354931752d42353c author Bob Moore Fri, 21 Apr 2006 17:15:00 -0400 committer Len Brown Wed, 14 Jun 2006 02:30:55 -0400 ACPI: ACPICA 20060421 Removed a device initialization optimization introduced in 20051216 where the _STA method was not run unless an _INI was also present for the same device. This optimization could cause problems because it could allow _INI methods to be run within a not-present device subtree (If a not-present device had no _INI, _STA would not be run, the not-present status would not be discovered, and the children of the device would be incorrectly traversed.) Implemented a new _STA optimization where namespace subtrees that do not contain _INI are identified and ignored during device initialization. Selectively running _STA can significantly improve boot time on large machines (with assistance from Len Brown.) Implemented support for the device initialization case where the returned _STA flags indicate a device not-present but functioning. In this case, _INI is not run, but the device children are examined for presence, as per the ACPI specification. Implemented an additional change to the IndexField support in order to conform to MS behavior. The value written to the Index Register is not simply a byte offset, it is a byte offset in units of the access width of the parent Index Field. (Fiodor Suietov) Defined and deployed a new OSL interface, acpi_os_validate_address(). This interface is called during the creation of all AML operation regions, and allows the host OS to exert control over what addresses it will allow the AML code to access. Operation Regions whose addresses are disallowed will cause a runtime exception when they are actually accessed (will not affect or abort table loading.) Defined and deployed a new OSL interface, acpi_os_validate_interface(). This interface allows the host OS to match the various "optional" interface/behavior strings for the _OSI predefined control method as appropriate (with assistance from Bjorn Helgaas.) Restructured and corrected various problems in the exception handling code paths within DsCallControlMethod and DsTerminateControlMethod in dsmethod (with assistance from Takayoshi Kochi.) Modified the Linux source converter to ignore quoted string literals while converting identifiers from mixed to lower case. This will correct problems with the disassembler and other areas where such strings must not be modified. The ACPI_FUNCTION_* macros no longer require quotes around the function name. This allows the Linux source converter to convert the names, now that the converter ignores quoted strings. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 793c2388cae3fd023b3b5166354931752d42353c tree 6859cde48677cf1e9b9766cd1d95081a863c060c parent 61686124f47d7c4b78610346c5f8f9d8a6d46bb5 author Bob Moore Fri, 31 Mar 2006 00:00:00 -0500 committer Len Brown Wed, 14 Jun 2006 02:04:16 -0400 ACPI: ACPICA 20060331 Implemented header file support for the following additional ACPI tables: ASF!, BOOT, CPEP, DBGP, MCFG, SPCR, SPMI, TCPA, and WDRT. With this support, all current and known ACPI tables are now defined in the ACPICA headers and are available for use by device drivers and other software. Implemented support to allow tables that contain ACPI names with invalid characters to be loaded. Previously, this would cause the table load to fail, but since there are several known cases of such tables on existing machines, this change was made to enable ACPI support for them. Also, this matches the behavior of the Microsoft ACPI implementation. https://bugzilla.novell.com/show_bug.cgi?id=147621 Fixed a couple regressions introduced during the memory optimization in the 20060317 release. The namespace node definition required additional reorganization and an internal datatype that had been changed to 8-bit was restored to 32-bit. (Valery Podrezov) Fixed a problem where a null pointer passed to acpi_ut_delete_generic_state() could be passed through to acpi_os_release_object which is unexpected. Such null pointers are now trapped and ignored, matching the behavior of the previous implementation before the deployment of acpi_os_release_object(). (Valery Podrezov, Fiodor Suietov) Fixed a memory mapping leak during the deletion of a SystemMemory operation region where a cached memory mapping was not deleted. This became a noticeable problem for operation regions that are defined within frequently used control methods. (Dana Meyers) Reorganized the ACPI table header files into two main files: one for the ACPI tables consumed by the ACPICA core, and another for the miscellaneous ACPI tables that are consumed by the drivers and other software. The various FADT definitions were merged into one common section and three different tables (ACPI 1.0, 1.0+, and 2.0) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 61686124f47d7c4b78610346c5f8f9d8a6d46bb5 tree 6fd91b2c1749907e58ef136107e53d634d7978c4 parent 144c87b4e03759214c362d267e01c2905f1ab095 author Bob Moore Fri, 17 Mar 2006 16:44:00 -0500 committer Len Brown Wed, 14 Jun 2006 01:22:20 -0400 [ACPI] ACPICA 20060317 Implemented the use of a cache object for all internal namespace nodes. Since there are about 1000 static nodes in a typical system, this will decrease memory use for cache implementations that minimize per-allocation overhead (such as a slab allocator.) Removed the reference count mechanism for internal namespace nodes, since it was deemed unnecessary. This reduces the size of each namespace node by about 5%-10% on all platforms. Nodes are now 20 bytes for the 32-bit case, and 32 bytes for the 64-bit case. Optimized several internal data structures to reduce object size on 64-bit platforms by packing data within the 64-bit alignment. This includes the frequently used ACPI_OPERAND_OBJECT, of which there can be ~1000 static instances corresponding to the namespace objects. Added two new strings for the predefined _OSI method: "Windows 2001.1 SP1" and "Windows 2006". Split the allocation tracking mechanism out to a separate file, from utalloc.c to uttrack.c. This mechanism appears to be only useful for application-level code. Kernels may wish to not include uttrack.c in distributions. Removed all remnants of the obsolete ACPI_REPORT_* macros and the associated code. (These macros have been replaced by the ACPI_ERROR and ACPI_WARNING macros.) Signed-off-by: Bob Moore Signed-off-by: Len Brown commit b5ed7639c9f502898af4109e778f5613dacbfd9c tree abe908c60ce1ea8f201028c9fc830cacd25c724b parent 0638dec01e89059c853515ab71c55fd13ba5a8ea parent eb35cf60e462491249166182e3e755d3d5d91a28 author Jeff Garzik Tue, 13 Jun 2006 20:29:04 -0400 committer Jeff Garzik Tue, 13 Jun 2006 20:29:04 -0400 Merge branch 'master' into upstream commit db9ca5803566078aafe63cf364ef98b5097e4194 tree ce330cdf21728f00801004e3900c79e4195cd516 parent bf717b11aec20965d48dea36dea3eea18a75d18c parent eb35cf60e462491249166182e3e755d3d5d91a28 author Jeff Garzik Tue, 13 Jun 2006 20:28:05 -0400 committer Jeff Garzik Tue, 13 Jun 2006 20:28:05 -0400 Merge branch 'master' into upstream commit bf717b11aec20965d48dea36dea3eea18a75d18c tree 4e2d1051910cc983d689c6b4ce86eb497e6667cf parent f0eb62b81dd16bfc4034916418c3406ba20011e1 author Jeff Garzik Tue, 13 Jun 2006 20:27:03 -0400 committer Jeff Garzik Tue, 13 Jun 2006 20:27:03 -0400 [libata] Update docs to reflect current driver API commit 76df73ff90e99681a99e457aec4cfe0a240b7982 tree 0a6302b1a8e5d11aeed8aa49f7e846f35aad4f5a parent 5c601d0c942f5aaf7f3cff7e08f61047d70a964e parent 86bc843a268058df558844b6bf64531617fbc698 author John W. Linville Tue, 13 Jun 2006 15:38:11 -0400 committer John W. Linville Tue, 13 Jun 2006 15:38:11 -0400 Merge branch 'from-linus' into upstream commit d7ede1aa5dfff53e76dbabac5b8087341686f662 tree a5c973fc20ed782dca3b52ae15fe4bd517028bf9 parent b190f1138b0f30fbe837b3f09fb6ffdb2fc4da24 author Nathan Scott Tue, 13 Jun 2006 16:28:11 +1000 committer Nathan Scott Tue, 13 Jun 2006 16:28:11 +1000 [XFS] Minor XFS documentation updates. Signed-off-by: Nathan Scott commit 31925323b1b51bb65db729e029472a8b1f635b7d tree e902a594508124adc74d07018834f5dce49af052 parent 430644312810645a6e05855db50a978df9ba3ad3 author Paul Mackerras Tue, 13 Jun 2006 13:43:00 +1000 committer Paul Mackerras Tue, 13 Jun 2006 13:43:00 +1000 powerpc: Fix some missed ppc32 mm->context.id conversions Signed-off-by: Paul Mackerras commit 7136b8073f0123918e3e50269ae021bbb09e1a81 tree 65643f892bcac13e27f65bf53dd6a00f1969c071 parent 2c4b69bd7bff85ae9e8b2032179aee9c04da70ba author Ben Collins Mon, 12 Jun 2006 18:16:25 -0400 committer Ben Collins Mon, 12 Jun 2006 18:16:25 -0400 eth1394: replace __constant_htons by htons ...and __constant_ntohs, __constant_ntohl, __constant_cpu_to_be32 too where possible. Htons and friends are resolved to constants in these places anyway. Also fix an endianess glitch in a log message, spotted by Alexey Dobriyan. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 2c4b69bd7bff85ae9e8b2032179aee9c04da70ba tree 1e6033068a2725c7e42da0fe006066b2ea40615c parent 445151932e869fd76b23bccff75ae2a600ccf3c9 author Ben Collins Mon, 12 Jun 2006 18:16:16 -0400 committer Ben Collins Mon, 12 Jun 2006 18:16:16 -0400 ieee1394: adjust code formatting in highlevel.c Replace spaces by tabulators, wrap lines at 80 columns, delete some blank lines and superfluous braces. Collapse some if()-within-if() constructs. Replace a literal CSR address by its preprocessor constant. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 445151932e869fd76b23bccff75ae2a600ccf3c9 tree 5d71807bde779cd3f7454f02085a3d4b27cd7399 parent f654240f330d77eb198af4abde89131e2a0e4f90 author Ben Collins Mon, 12 Jun 2006 18:16:01 -0400 committer Ben Collins Mon, 12 Jun 2006 18:16:01 -0400 ieee1394: hl_irqs_lock is taken in hardware interrupt context ohci1394 and pcilynx call highlevel_host_reset from their hardware interrupt handler (via hpsb_selfid_complete). Therefore all readers and writers of hl_irqs_lock have to disable interrupts. Reported by Jiri Slaby and J. A. Magallon. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit f654240f330d77eb198af4abde89131e2a0e4f90 tree 60693ba031145a7ec6bb0c82f89ab9e8419d48dd parent dd082c670523231dc9a26dafee1dc22b57df2921 author Ben Collins Mon, 12 Jun 2006 18:15:50 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:50 -0400 ieee1394_core: switch to kthread API This gets also rid of the MODPOST warning "drivers/ieee1394/ieee1394.o - Section mismatch: reference to .exit.text: from .smp_locks after '' (at offset 0x18)". Signed-off-by: Christoph Hellwig Signed-off-by: Jody McIntyre Signed-off-by: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Ben Collins commit dd082c670523231dc9a26dafee1dc22b57df2921 tree 1fc7145e190d5e9869c626125eed58be36185f58 parent 6737231ead125c7cee7ce4d3a74179bdac085529 author Ben Collins Mon, 12 Jun 2006 18:15:40 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:40 -0400 ieee1394: sbp2: Kconfig fix We only support x86 and ppc, due to the use of bus_to_virt() and friends. Signed-off-by: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Ben Collins commit 6737231ead125c7cee7ce4d3a74179bdac085529 tree f0c996c8c48d07398c47ada5a2dacdcbf0800770 parent e269d276792684a13ab0d9acd8c024ec7d6c5f4d author Ben Collins Mon, 12 Jun 2006 18:15:31 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:31 -0400 ieee1394: add preprocessor constant for invalid csr address Replace occurrences of the magic value ~(u64)0 for invalid CSR address spaces by a named constant for better readability. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit e269d276792684a13ab0d9acd8c024ec7d6c5f4d tree 18d02851685f4e458a52984e290ced6aaa976998 parent 02f4213fc43dbddc3a3ab9fa4d2dc2501a2d30dc author Ben Collins Mon, 12 Jun 2006 18:15:20 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:20 -0400 sbp2: fix deregistration of status fifo address space The proper designator of an invalid CSR address is ~(u64)0, not (u64)0. Use the correct value in initialization and deregistration. Also, scsi_id->sbp2_lun does not need to be initialized twice. (scsi_id was kzalloc'd.) Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 02f4213fc43dbddc3a3ab9fa4d2dc2501a2d30dc tree 933b5873408730694f64470aa7bc218b0c380827 parent b21efb59c5d317a2a972b9d66939cbfeababd982 author Ben Collins Mon, 12 Jun 2006 18:15:11 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:11 -0400 [PATCH] eth1394: endian fixes Signed-off-by: Alexey Dobriyan Signed-off-by: Ben Collins commit b21efb59c5d317a2a972b9d66939cbfeababd982 tree c9a33f904597a5ab9e1e6e021963bc3db3411fcd parent 05db5055b1844bf39d1429a0c43078959198cd1d author Ben Collins Mon, 12 Jun 2006 18:15:03 -0400 committer Ben Collins Mon, 12 Jun 2006 18:15:03 -0400 Fix broken suspend/resume in ohci1394 I've been experimenting to track down the cause of suspend/resume problems on my Compaq Presario X1050 laptop: http://bugzilla.kernel.org/show_bug.cgi?id=6075 Essentially the ACPI Embedded Controller and keyboard controller would get into a bizarre, confused state after resume. I found that unloading the ohci1394 module before suspend and reloading it after resume made the problem go away. Diffing the dmesg output from resume, with and without the module loaded, I found that with the module loaded I was missing these: PM: Writing back config space on device 0000:02:00.0 at offset 1. (Was 2100080, writing 2100007) PM: Writing back config space on device 0000:02:00.0 at offset 3. (Was 0, writing 8008) PM: Writing back config space on device 0000:02:00.0 at offset 4. (Was 0, writing 90200000) PM: Writing back config space on device 0000:02:00.0 at offset 5. (Was 1, writing 2401) PM: Writing back config space on device 0000:02:00.0 at offset f. (Was 20000100, writing 2000010a) The default PCI driver performs the pci_restore_state when no driver is loaded for the device. When the ohci1394 driver is loaded, it is supposed to do this, however it appears not to do so. I created the patch below and tested it, and it appears to resolve the suspend problems I was having with the module loaded. I only added in the pci_save_state and pci_restore_state - however, though I know little of this hardware, surely the driver should really be doing more than this when suspending and resuming? Currently it does almost nothing, what if there are commands in progress, etc? Signed-off-by: Robert Hancock Cc: Jody McIntyre Cc: Ben Collins Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Ben Collins commit 05db5055b1844bf39d1429a0c43078959198cd1d tree c0848d2d8fa638987479b4146a90976e27f1964c parent bccbccdbf8f866a8e01967a48241db548e12adf2 author Ben Collins Mon, 12 Jun 2006 18:14:47 -0400 committer Ben Collins Mon, 12 Jun 2006 18:14:47 -0400 sbp2: use __attribute__((packed)) for on-the-wire structures It seems to have worked without the attribute during all the years just because sizes of all struct members are multiples of 32 bits. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit bccbccdbf8f866a8e01967a48241db548e12adf2 tree 0248baa7bbd23ba6c4b3afab8167ff187f60b698 parent d0aef39f9b5941beb322924986ddee8c4903cd72 author Ben Collins Mon, 12 Jun 2006 18:14:36 -0400 committer Ben Collins Mon, 12 Jun 2006 18:14:36 -0400 sbp2: provide helptext for CONFIG_IEEE1394_SBP2_PHYS_DMA and mark it experimental It appears I will not get it fixed overnight. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit d0aef39f9b5941beb322924986ddee8c4903cd72 tree bcbc3d99dc5b1f5d3b852e0aa5556698d77c7f2c parent fd23ade80e2bef156aa096459c31c010dacbea1e author Ben Collins Mon, 12 Jun 2006 18:14:27 -0400 committer Ben Collins Mon, 12 Jun 2006 18:14:27 -0400 Update feature removal of obsolete raw1394 ISO requests. Signed-off-by: Jody McIntyre Signed-off-by: Ben Collins commit fd23ade80e2bef156aa096459c31c010dacbea1e tree 7e381b0be5a7475d18c11b9795520e2eb0eba19a parent 40ae6c5e88790c2558013640ca4e0a5017c54162 author Ben Collins Mon, 12 Jun 2006 18:14:14 -0400 committer Ben Collins Mon, 12 Jun 2006 18:14:14 -0400 sbp2: fix S800 transfers if phys_dma is off If sbp2 is forced to move data via ARM handler, the maximum packet size allowed for S800 transfers exceeds ohci1394's buffer size on platforms where PAGE_SIZE is 4096. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 40ae6c5e88790c2558013640ca4e0a5017c54162 tree 1dd23d5c0ad48fed0266e75da9fe7fac78aa36fe parent fa9b73997cc621b9a15c96f07dda26775e61ac6a author Ben Collins Mon, 12 Jun 2006 18:13:49 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:49 -0400 sbp2: remove ohci1394 specific constant Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit fa9b73997cc621b9a15c96f07dda26775e61ac6a tree 2bb2606a0bda551d662ae75554ebb044cc02e749 parent 4611ed38030a2ce3661de999c3487e5a1eed0dc0 author Ben Collins Mon, 12 Jun 2006 18:13:42 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:42 -0400 ohci1394: make phys_dma parameter read-only Being able to switch physical DMA on and off at run time would be a nice feature but a PITA to support by highlevel drivers and userspace apps. Therefore allow it only to be set when the driver is being loaded. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 4611ed38030a2ce3661de999c3487e5a1eed0dc0 tree bd0924844e1b5b5ccefc4ee5cf81c917b8781e5c parent 8aef63ff033fb0e7ba02d8e760d268eb0aafc58c author Ben Collins Mon, 12 Jun 2006 18:13:32 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:32 -0400 ohci1394: set address range properties This patch supplies the API extension introduced by patch "ieee1394: extend lowlevel API for address range properties" with proper addresses. Like in patch ''ohci1394, sbp2: fix "scsi_add_device failed" with PL-3507 based devices'', 1 TeraByte is chosen as physical upper bound. This leaves a window for the middle address range. This choice is only relevant for adapters which actually have a programmable pysical upper bound register. (Only ALi and Fujitsu adapters are known for this. Most adapters have a fixed bound at 4 GB.) The middle address range is suitable for posted writes. AFAIK, PCILynx does not support physical DMA nor posted writes, therefore no equivalent change in the pcilynx driver is necessary. There is also a driver for GP2Lynx, although not in mainline Linux. I assume this hardware does not support these OHCI features either. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 8aef63ff033fb0e7ba02d8e760d268eb0aafc58c tree 0e458c802e8e409c29fb53752b93b757b1a141c7 parent 20f4578156995e95613497baf16d5b2d54921e5d author Ben Collins Mon, 12 Jun 2006 18:13:21 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:21 -0400 ieee1394: extend lowlevel API for address range properties Host adapter hardware imposes certain restrictions and features on address ranges. Instead of hard-wire such ranges into the ieee1394 core or even into protocol drivers, let lowlevel drivers specify these ranges via struct hpsb_host. Patch "ohci1394: set address range properties" must be applied too, else hpsb_allocate_and_register_addrspace() won't work properly. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 20f4578156995e95613497baf16d5b2d54921e5d tree 65e6431950cda92aa16bd587c5a05d5acbc7beff parent fe42b05a9929e159355bde6025ae46db2ac88658 author Ben Collins Mon, 12 Jun 2006 18:13:11 -0400 committer Ben Collins Mon, 12 Jun 2006 18:13:11 -0400 sbp2: log number of supported concurrent logins Since this is useful information, promote it from a debug macro to a regular log message. The message appears only if the user set exclusive_login=0, therefore won't clutter the logs in normal use. Also update the comment on exclusive_login. Signed-off-by: Stefan Richter Signed-off-by: Jody McIntyre Signed-off-by: Ben Collins commit fe42b05a9929e159355bde6025ae46db2ac88658 tree 61a4bd4dd7b138e3d3148f1b288158eb53361c37 parent eaf88450d21fc839c3e77fa6942b8d4192bdfe53 author Ben Collins Mon, 12 Jun 2006 18:12:59 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:59 -0400 sbp2: remove manipulation of inquiry response This code became ineffective a few Linux releases ago and is not required anyway. Note from Christoph Hellwig: scsi_cmnd.request_buffer is always a scatterlist these days. Checking random bites into it and then mangling the data in sbp2_check_sbp2_response will cause really bad memory corruption when you're not lucky enough to have the check not trigger by luck. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit eaf88450d21fc839c3e77fa6942b8d4192bdfe53 tree 5684c02796ac92f1283c06bd9179f5730a32632d parent 647dcb5fae0ebb5da1272ed2773df0d3f152c303 author Ben Collins Mon, 12 Jun 2006 18:12:49 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:49 -0400 ieee1394: save RAM by using a single tlabel for broadcast transactions Since broadcast transactions are already complete when the request has been sent, the same transaction label can be reused all over again, see IEEE 1394 7.3.2.5 and 6.2.4.3. Therefore we can reduce the footprint of struct hpsb_host by the size of one struct hpsb_tlabel_pool. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 647dcb5fae0ebb5da1272ed2773df0d3f152c303 tree 31d6a6ab3fd8acb2dc9335dfa181972f4433158a parent 57fdb58fa5a140bdd52cf4c4ffc30df73676f0a5 author Ben Collins Mon, 12 Jun 2006 18:12:37 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:37 -0400 ieee1394: support for slow links or slow 1394b phy ports Add support for the following types of hardware: + nodes that have a link speed < PHY speed + 1394b PHYs that are less than S800 capable + 1394b/1394a adapter cable between two 1394b PHYs Also, S1600 and S3200 are now supported if IEEE1394_SPEED_MAX is raised. A probing function is added to nodemgr's config ROM fetching routine which adjusts the allowable speed if an access problem was encountered. Pros and Cons of the approach: + minimum code footprint to support this less widely used hardware + nearly no overhead for unaffected hardware - ineffective before nodemgr began to read the ROM of affected nodes - ineffective if ieee1394 is loaded with disable_nodemgr=1 The speed map CSRs which are published to the bus are not touched by the patch. Signed-off-by: Stefan Richter Cc: Hakan Ardo Cc: Calculex Cc: Robert J. Kosinski Signed-off-by: Ben Collins commit 57fdb58fa5a140bdd52cf4c4ffc30df73676f0a5 tree 336c32051f005771cbfad5501a5a73caa6493eb1 parent 7597028a833b6bfafae0a8fbc18992a278467adf author Ben Collins Mon, 12 Jun 2006 18:12:21 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:21 -0400 ieee1394/ohci1394: CycleTooLong interrupt management This patch modifies the ohci1394.c file to enable and manage the "cycle too long" interrupt. If this interrupt occurs, the "LinkControl.CycleMaster" bit of the host controller is reseted. This implies, that the host controller does not send "cycle start" packet anymore freezing then the isochronous communication. The management of the interrupt added by the patch is that when the interrupt occurs, the OHCI irq handler prints a kernel log warning and then sets the "LinkControl.CycleMaster" bit again resuming the isochronous communication. Signed-off-by: Jean-Baptiste Mur Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 7597028a833b6bfafae0a8fbc18992a278467adf tree 7ab3352fbac05b650662d158eb82c334e3dfd008 parent fa7614de60d10460a607c3ca22ea080d021c3fef author Ben Collins Mon, 12 Jun 2006 18:12:10 -0400 committer Ben Collins Mon, 12 Jun 2006 18:12:10 -0400 raw1394: fix whitespace after x86_64 compat patch Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit fa7614de60d10460a607c3ca22ea080d021c3fef tree 527366903701b51a0f9425886e547f8dc4de4788 parent 4b9a334703cf99a1a5b9f64cf9f028e3e1ae91ff author Ben Collins Mon, 12 Jun 2006 18:11:07 -0400 committer Ben Collins Mon, 12 Jun 2006 18:11:07 -0400 From: Arjan van de Ven Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Cc: Ben Collins Cc: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Ben Collins commit 4b9a334703cf99a1a5b9f64cf9f028e3e1ae91ff tree cccba18796585dd7e31f1b81c08ef529f45a4501 parent ff34d3bddf2a1d7ae1e96a25e73e16042778c4c4 author Ben Collins Mon, 12 Jun 2006 18:10:18 -0400 committer Ben Collins Mon, 12 Jun 2006 18:10:18 -0400 sbp2: make TSB42AA9 workaround specific to Momobay CX-1 The workarounds are not required for DViCO Momobay FX-3A and AFAIR not for Momobay CX-2. These contain an TSB42AA9A but feature the same firmware_revision value as the older DViCO Momobay CX-1. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit ff34d3bddf2a1d7ae1e96a25e73e16042778c4c4 tree e23906b6f9ce5d66d67133df305507bf0b7ba491 parent 9bb2bcdb4b6f9a04363c8ea4cf72c592d6c7af71 author Ben Collins Mon, 12 Jun 2006 17:53:31 -0400 committer Ben Collins Mon, 12 Jun 2006 17:53:31 -0400 ohci1394: Remove superfluous call to free_dma_rcv_ctx, spotted by Adrian Bunk. Also remove some superfluous comments. Signed-off-by: Stefan Richter Signed-off-by: Ben Collins commit 9bb2bcdb4b6f9a04363c8ea4cf72c592d6c7af71 tree 5821a1f75856b45997856f19c0760a932d9709d0 parent f54b1bdff1b470ff4461de3a73a7ceaf3a52e10a author Ben Collins Mon, 12 Jun 2006 17:52:59 -0400 committer Ben Collins Mon, 12 Jun 2006 17:52:59 -0400 ieee1394: speed up of dma_region_sync_for_cpu when attempting to find the 'last' part of the dma region continue the search from where we left off, instead of starting the search over. Signed-off-by: Jim Westfall Signed-off-by: Ben Collins commit f54b1bdff1b470ff4461de3a73a7ceaf3a52e10a tree ce424168fcab891cc04e6fc2440ab2ed172ab0c5 parent 0e838b72d54ed189033939258a961f2a0cd59647 author Ben Collins Mon, 12 Jun 2006 17:52:16 -0400 committer Ben Collins Mon, 12 Jun 2006 17:52:16 -0400 video1394: be quiet When working with multiple cameras and intensive applications, our logs get flooded with video1394 information which isn't of much interest. Any objections to demoting these messages to debug messages? Signed-off-by: Daniel Drake Signed-off-by: Ben Collins commit e474c66b1c76f9755f5d6dd5bfe88ce5e0435184 tree 4034e9825a19b1ae1bed578ca03f595c0c282c36 parent 0e838b72d54ed189033939258a961f2a0cd59647 author Andrew Morton Mon, 12 Jun 2006 22:10:22 +0100 committer Russell King Mon, 12 Jun 2006 22:10:22 +0100 [MMC] sdhci truncated pointer fix On 64-bit machines, we just lost the uppermost 32 bits. Signed-off-by: Andrew Morton Signed-off-by: Russell King commit 821499a8241019be5591fad5ab925759fbcd9f32 tree 2a68cbe5ad747412afa085fbca2fc56b19d10722 parent c5943d36aebb79589ac3983eec418bbeca897573 author Mark Haverkamp Mon, 12 Jun 2006 10:53:58 -0700 committer James Bottomley Mon, 12 Jun 2006 14:47:55 -0500 [SCSI] aacraid: Fix return code interpretation Received from Mark Salyzyn clear_user return is 0 for success, the code fragment is written to assume that it is the count of the number of bytes zero'd. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit c5943d36aebb79589ac3983eec418bbeca897573 tree 6412182aab9b3f97e2163346cfc6c0a04af70be3 parent 8d7feac3c7504425aaf61dc7d804685a6b89ee43 author James Bottomley Mon, 12 Jun 2006 09:09:18 -0500 committer James Bottomley Mon, 12 Jun 2006 10:38:51 -0500 [SCSI] scsi_transport_sas: fix panic in sas_free_rphy This is a hold over from the end device/expander conversion. Apparently the rphy list pointer is never initialised, so list_del() on the uninitialised pointer can panic the system Signed-off-by: James Bottomley commit f0eb62b81dd16bfc4034916418c3406ba20011e1 tree c051e5da940044e189b2227ede4ccb373d0fa169 parent d01712698c7c52bc71f41192e864dccc90a1217d author Tejun Heo Mon, 12 Jun 2006 23:05:38 +0900 committer Jeff Garzik Mon, 12 Jun 2006 10:23:21 -0400 [PATCH] libata: add host_set->next for legacy two host_sets case, take #3 For a legacy ATA controller, libata registers two separate host sets. There was no connection between the two hosts making it impossible to traverse all ports related to the controller. This patch adds host_set->next which points to the second host_set and makes ata_pci_remove_one() remove all associated host_sets. * On device removal, all ports hanging off the device are properly detached. Prior to this patch, ports on the first host_set weren't detached casuing oops on driver unloading. * On device removal, both host_sets are properly freed This will also be used by new power management code to suspend and resume all ports of a controller. host_set/port representation will be improved to handle legacy controllers better and this host_set linking will go away with it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d01712698c7c52bc71f41192e864dccc90a1217d tree f7736e757162618bb7f1dbebe3f60a78f861a49a parent d4c85325a817d3351e61c4be64b437116e8483b4 author Tejun Heo Mon, 12 Jun 2006 22:51:14 +0900 committer Jeff Garzik Mon, 12 Jun 2006 10:23:21 -0400 [PATCH] libata: fix oops caused rescanning NULL sdev Depending on timing, ata_scsi_dev_rescan() might encounter a device which is enabled but not yet attached to sdev. On such cases, the original code caused oops. This patch makes ata_scsi_dev_rescan() rescan only device which are attached to sdevs. While at it, properly indent leading comment and add description about how it's synchronized with sdev attach/detach. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d4c85325a817d3351e61c4be64b437116e8483b4 tree 6a97a2e92a3068782cca7d139456e695c82935ec parent aeb2ecd6096182cc080d37679080c0f088dcd4a4 author Tejun Heo Mon, 12 Jun 2006 18:45:55 +0900 committer Jeff Garzik Mon, 12 Jun 2006 09:37:21 -0400 [PATCH] sata_sil: update device hotplug handling, take #2 SIEN on some 3112 controllers doesn't mask SATA IRQ properly. IRQ stays asserted even after SIEN is masked and IRQ is acked. Also, even while frozen, any SATA PHY event including hardreset raises SATA IRQ. Clearing SError seems to be the only way to deassert SATA IRQ. This patch makes sil_host_intr() clear SError on SATA IRQs and ignore SATA IRQs reported while frozen so that hardreset doesn't trigger hotplug event (which ends up hardresetting again). In such cases, the port still gets re-frozen to minimize the danger of screaming interrupts. This results in one nil EH repeat on controllers with broken SIEN but other than that does no harm. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 430644312810645a6e05855db50a978df9ba3ad3 tree 2363ddbb95af2b3df95c0071060d9c69044e28ba parent 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e author Paul Mackerras Mon, 12 Jun 2006 18:38:21 +1000 committer Paul Mackerras Mon, 12 Jun 2006 18:38:21 +1000 powerpc: Remove unused paca->pgdir field The pgdir field in the paca was a leftover from the dynamic VSIDs patch, and is not used in the current kernel code. This removes it. Signed-off-by: Paul Mackerras commit 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e tree d18f58349ced242aa62e622e381e60933f71d451 parent 6218a761bbc27acc65248c80024875bcc06d52b1 parent 289a1e995e74734b5ec76ca8a5490058f4fecc24 author Paul Mackerras Mon, 12 Jun 2006 17:53:34 +1000 committer Paul Mackerras Mon, 12 Jun 2006 17:53:34 +1000 Merge branch 'merge' commit aeb2ecd6096182cc080d37679080c0f088dcd4a4 tree 8e103a541f59c8a31656666352a4d5ea10c00088 parent f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94 author Tejun Heo Mon, 12 Jun 2006 14:11:43 +0900 committer Jeff Garzik Mon, 12 Jun 2006 02:10:26 -0400 [PATCH] libata: fast exit from EH while unloading Make EH exit fast if the port is being unloaded. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94 tree e500b57b88989563a4b073f34a1ce8a9a1f48353 parent 551e8889509c30cda31e464e5cbe7572c4e1febd author Tejun Heo Mon, 12 Jun 2006 14:11:01 +0900 committer Jeff Garzik Mon, 12 Jun 2006 02:10:26 -0400 [PATCH] libata: fix ATA_EH_REVALIDATE clearing ATA_EH_REVALIDATE should be cleared after all devices on the target port have been revalidated. Fix ata_eh_revalidate_and_attach() accordingly. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 551e8889509c30cda31e464e5cbe7572c4e1febd tree 80dd36adfea622ffdf7c35a7a3496b6d1e1c7487 parent 23fa9618094975f803ed0c6a44604b16747b9637 author Tejun Heo Mon, 12 Jun 2006 14:09:49 +0900 committer Jeff Garzik Mon, 12 Jun 2006 02:10:26 -0400 [PATCH] libata: fix comment above ata_exec_internal() Add RETURNS comment above ata_exec_internal() and kill extra blank line. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 23fa9618094975f803ed0c6a44604b16747b9637 tree 6ddba8a0202624cb34a9a5b6cb98ae503b466faf parent 3b01b8af2414b6684051da4a1507dfacdbf24f86 author Tejun Heo Mon, 12 Jun 2006 14:18:51 +0900 committer Jeff Garzik Mon, 12 Jun 2006 02:10:26 -0400 [PATCH] sata_sil: add controller unplug detection in sil_interrupt() Short-circuit interrupt handling if BMDMA2 is reported as 0xffffffff indicating device removal. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3b01b8af2414b6684051da4a1507dfacdbf24f86 tree fe47e129a121047ac39e7ed4501d65338c3a1f57 parent 3057ac3c1a992ee135cbb7b7d1a12e58d81f0739 author Jeff Garzik Mon, 12 Jun 2006 00:22:04 -0400 committer Jeff Garzik Mon, 12 Jun 2006 00:22:04 -0400 libata: fix build, by adding required workqueue member to port struct commit 3057ac3c1a992ee135cbb7b7d1a12e58d81f0739 tree 38d83a88ee949b9db8f6655f90f98d88f8a5f2fd parent 39b07ce6d9f7cd4da8567baed844801e0aaa7b1a author zhao, forrest Mon, 12 Jun 2006 12:01:34 +0800 committer Jeff Garzik Mon, 12 Jun 2006 00:18:35 -0400 [PATCH] Snoop SET FEATURES - WRITE CACHE ENABLE/DISABLE command(v5) This patch makes libata snoop 'SET FEATURES - WRITE CACHE ENABLE/DISABLE' command, executing requisite revalidation processes to update cached data. Signed-off-by: Forrest Zhao Signed-off-by: Jeff Garzik commit 39b07ce6d9f7cd4da8567baed844801e0aaa7b1a tree cbae130d51c51f9c5f37fafb5c48ff9d41cfd10b parent 233277cad6dacca6a8e53743641cf43ef7f37c4a author Jeff Garzik Sun, 11 Jun 2006 23:59:44 -0400 committer Jeff Garzik Sun, 11 Jun 2006 23:59:44 -0400 libata: more verbose request_irq() failure Suggested by Jarek P. commit 233277cad6dacca6a8e53743641cf43ef7f37c4a tree 06cc72070888f7ec35f3ffb3144b9f3f35eaac24 parent bd5d825c9434b83925a88bd30eb9eef51908a3c9 author Brian King Wed, 07 Jun 2006 11:25:31 -0500 committer Jeff Garzik Sun, 11 Jun 2006 23:24:25 -0400 [PATCH] libata: Setup nbytes in ata_sg_init_one Setup nbytes in ata_sg_init_one to the total transfer length of the command. This is needed by some HBAs that need to know the total transfer length of each command. Signed-off-by: Brian King Signed-off-by: Jeff Garzik commit 0638dec01e89059c853515ab71c55fd13ba5a8ea tree 7743a5714b03ef408b3147475cfe61127d580ed3 parent 96e672c79fb114ec38a868dc864e743205c24332 author Herbert Valerio Riedel Thu, 01 Jun 2006 09:41:04 +0200 committer Jeff Garzik Sun, 11 Jun 2006 23:19:00 -0400 [PATCH] net: au1000_eth: PHY framework conversion convert au1000_eth driver to use PHY framework and garbage collected functions and identifiers that became unused/obsolete in the process Signed-off-by: Herbert Valerio Riedel Signed-off-by: Jeff Garzik commit bd5d825c9434b83925a88bd30eb9eef51908a3c9 tree 1b95f111b90d2a6909d325a100d3c75840e3991c parent b47725743cc53203d275ede5c54985ad92c15f42 author Borislav Petkov Sun, 11 Jun 2006 23:17:01 -0400 committer Jeff Garzik Sun, 11 Jun 2006 23:17:01 -0400 libata: Adjust initial debugging levels through preprocessor defines. Signed-off-by: Signed-off-by: Jeff Garzik commit b47725743cc53203d275ede5c54985ad92c15f42 tree 4d8d51d660ba507acdc705fd791424fa6fa085a4 parent fec69a97489f961026e24536dbb7b86ac663948c author Alexey Dobriyan Tue, 06 Jun 2006 07:31:14 +0400 committer Jeff Garzik Sun, 11 Jun 2006 23:07:19 -0400 [PATCH] sata_sil24: endian anotations With help from Tejun Heo. Signed-off-by: Alexey Dobriyan Signed-off-by: Jeff Garzik commit fec69a97489f961026e24536dbb7b86ac663948c tree 869713470d81ebc261598489a2711960336c7c37 parent 1049cb478783c74ca8c99ef70e7d2bf920b9335b parent 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 author Jeff Garzik Sun, 11 Jun 2006 23:04:37 -0400 committer Jeff Garzik Sun, 11 Jun 2006 23:04:37 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/sata_sil24.c commit 96e672c79fb114ec38a868dc864e743205c24332 tree 0bad9a61fdab616e7e4070dbfc972045b34b0954 parent a2bd2ec8d1bef7479d26d375162963106757e8e9 author Randy Dunlap Sat, 10 Jun 2006 13:33:48 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] 3c5zz ethernet: fix section warnings Priority: not critical; makes init code discardable. Fix section mismatch warnings: WARNING: drivers/net/3c501.o - Section mismatch: reference to .init.text:el1_probe from .text between 'init_module' (at offset 0x812) and 'cleanup_module' WARNING: drivers/net/3c503.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x661) and 'cleanup_card' WARNING: drivers/net/3c505.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x228d) and 'cleanup_module' WARNING: drivers/net/3c507.o - Section mismatch: reference to .init.text:el16_probe from .text between 'init_module' (at offset 0xa99) and 'cleanup_module' WARNING: drivers/net/3c523.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x12e7) and 'cleanup_module' WARNING: drivers/net/3c527.o - Section mismatch: reference to .init.text:mc32_probe from .text between 'init_module' (at offset 0xd8d) and 'cleanup_module' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit a2bd2ec8d1bef7479d26d375162963106757e8e9 tree dc68527991d0bdaddec167bbe8ab4119c82faf7e parent 29f9f6d234753da97b74402f746981c63ec0b2f0 author Randy Dunlap Sat, 10 Jun 2006 13:30:10 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] smc ethernet: fix section mismatch warnings Priority: not critical; makes init code discardable. Removes one duplicate assignment. Fix section mismatch warnings: WARNING: drivers/net/smc-ultra.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x369) and 'cleanup_card' WARNING: drivers/net/smc-ultra32.o - Section mismatch: reference to .init.text:ultra32_probe from .text between 'init_module' (at offset 0x254) and 'cleanup_module' WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.text:smc_init from .text between 'init_module' (at offset 0x997) and 'cleanup_module' WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.data: from .data between 'smcdev.0' (at offset 0x44) and '__param_str_io' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 29f9f6d234753da97b74402f746981c63ec0b2f0 tree e563c6e8b676255300e4f6fa9efc3a15fa458dc9 parent 5d1f16c6c4d64d1e4f53e277e39c0ada89f00a48 author Randy Dunlap Sat, 10 Jun 2006 13:32:12 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] hp ethernet: fix section mismatches Priority: not critical; makes init code discardable. Fix section mismatch warnings: WARNING: drivers/net/hp-plus.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x387) and 'cleanup_card' WARNING: drivers/net/hp.o - Section mismatch: reference to .init.data: from .text between 'hp_init_card' (at offset 0x310) and 'init_module' WARNING: drivers/net/hp.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x367) and 'cleanup_card' Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 5d1f16c6c4d64d1e4f53e277e39c0ada89f00a48 tree be867e13fb4d36b740b5a306d965bef900ff3556 parent 282f33c98618a3877043ec9dd5ac777c5e7c117d author Randy.Dunlap Sat, 10 Jun 2006 12:13:35 -0700 committer Jeff Garzik Sun, 11 Jun 2006 12:16:01 -0400 [PATCH] Section mismatch in drivers/net/ne.o during modpost On Sat, 10 Jun 2006 14:11:42 +0200 (MEST) Mikael Pettersson wrote: > While compiling 2.6.17-rc6 for a 486 with an NE2000 ISA ethernet card, I got: > > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x158) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x176) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x183) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x1ea) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.data:isapnp_clone_list from .text between 'init_module' (at offset 0x251) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x266) and 'ne_block_input' > WARNING: drivers/net/ne.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x29b) and 'ne_block_input' > > Not sure how serious this is; the driver seems to work fine later on. Doesn't look serious. init_module() is not __init, but it calls some __init functions and touches some __initdata. BTW, I would be happy to see some consistent results from modpost section checking. I don't see all of these warnings (I see only 1) when using gcc 3.3.6. What gcc version are you using? Does that matter? (not directed at anyone in particular) Patch below fixes it for me. Please test/report. Signed-off-by: Jeff Garzik commit 282f33c98618a3877043ec9dd5ac777c5e7c117d tree 2194a2b7b067f8718aa42486cc14f29062e19dae parent b89fa8b6d738d71c3a9eff584177bb7de13f33b9 author Linas Vepstas Thu, 08 Jun 2006 22:19:44 -0700 committer Jeff Garzik Sun, 11 Jun 2006 10:35:15 -0400 [PATCH] e1000: prevent statistics from getting garbled during reset If a PCI bus error/fault triggers a PCI bus reset, attempts to get the ethernet packet count statistics from the hardware will fail, returning garbage data upstream. This patch skips statistics data collection if the PCI device is not on the bus. This patch presumes that an earlier patch, [PATCH] PCI Error Recovery: e1000 network device driver has already been applied. Signed-off-by: Linas Vepstas Cc: John Ronciak Cc: Jesse Brandeburg Cc: Jeff Kirsher Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit b89fa8b6d738d71c3a9eff584177bb7de13f33b9 tree 7a46854faeb856065b8686f14c48a1d5e9a99011 parent c99ce7ee75db7836e2faba932affd2aadd1e942f author Andrew Morton Thu, 08 Jun 2006 22:19:41 -0700 committer Jeff Garzik Sun, 11 Jun 2006 10:34:40 -0400 [PATCH] smc911x Kconfig fix In file included from drivers/net/smc911x.c:84: drivers/net/smc911x.h:46:9: warning: "SMC_USE_16BIT" is not defined drivers/net/smc911x.h:60:9: warning: "SMC_USE_32BIT" is not defined drivers/net/smc911x.h:73:10: warning: "SMC_USE_PXA_DMA" is not defined drivers/net/smc911x.c: In function `smc911x_reset': drivers/net/smc911x.c:247: warning: implicit declaration of function `SMC_inl' drivers/net/smc911x.c:249: warning: implicit declaration of function `SMC_outl' Cc: Dustin McIntire Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 1049cb478783c74ca8c99ef70e7d2bf920b9335b tree 724c27376039622a09504555e1df946a62b9aaaa parent 9a9c77dc4c4eed9dfb74080e768c0b3c9d905496 author Tejun Heo Thu, 08 Jun 2006 22:15:42 -0700 committer Jeff Garzik Sun, 11 Jun 2006 10:21:13 -0400 [PATCH] libata: add missing ->data_xfer for pdc_adma pdc_adma use libata-core PIO path but were left out during ->data_xfer conversion. Initialize with proper callbacks. This patch is against the current libata-dev#ALL. Controllers which implement their own PIO HSM (ahci and sil24) don't need ->data_xfer, so the above two are the only drivers which were left out during conversion. From: "Barry K. Nathan" Signed-off-by: Barry K. Nathan Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit c99ce7ee75db7836e2faba932affd2aadd1e942f tree f390bcb4658ba6149d72773f3963ee5599554968 parent ebe611a48378f8f5c347d86dc403a2d56c320f1c author Ayaz Abdulla Sat, 10 Jun 2006 22:48:28 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth: new device ids This patch contains new device ids for forcedeth ethernet. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit ebe611a48378f8f5c347d86dc403a2d56c320f1c tree 7c76f60f82b1434e5c79caf2000a10a1c9b10ea0 parent 69fe3fd7b1adac55f794cb2b34cb1c13a0b19f05 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:24 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: version This patch bumps up the version number for config support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 69fe3fd7b1adac55f794cb2b34cb1c13a0b19f05 tree 7c5e668c6bbb8a8b1abd17c3b5c649304023475c parent 9589c77a0de19c0c95370d5212eb1f9006d8abcb author Ayaz Abdulla Sat, 10 Jun 2006 22:48:18 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: module parameters This patch adds (and modifies) module parameter support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 9589c77a0de19c0c95370d5212eb1f9006d8abcb tree 428c84c41d0e53bef95577fbb74ef764e7b8be89 parent 7a1854b7977d36360fde4e06c2d9cedcc3dd0933 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:13 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: diagnostics This patch adds support for diagnostic tests through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 7a1854b7977d36360fde4e06c2d9cedcc3dd0933 tree 65bc7ef5a9df892f35436847dd2769bf075bad14 parent 52da35789c305f6f44d0e85b294a9845c1271898 author Ayaz Abdulla Sat, 10 Jun 2006 22:48:08 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: move functions This patch moves a few functions (no logic change) so that the next patch has these functions defined. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 52da35789c305f6f44d0e85b294a9845c1271898 tree 08a3300452bdd23fbf2d835721fe64700739bd34 parent 5ed2616f621b41d3477d4f4ae2ba0e0a0e80bdce author Ayaz Abdulla Sat, 10 Jun 2006 22:48:04 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:16 -0400 [PATCH] forcedeth config: statistics This patch exposes hardware statistic counters through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 5ed2616f621b41d3477d4f4ae2ba0e0a0e80bdce tree 3455e8f39b655cd9cef5c347fb345383be43b008 parent c42d9df932ce3732044dc1394114380140ccffe0 author Ayaz Abdulla Sat, 10 Jun 2006 22:47:59 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: csum This patch allows for configurable rx and tx checksum offloads through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit c42d9df932ce3732044dc1394114380140ccffe0 tree d268f5e64c67d4c4e8b88f7db2ab2b3a17be3143 parent f9430a015a4331ba950eba1d7661dcd876c29f3c author Ayaz Abdulla Sat, 10 Jun 2006 22:47:52 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: wol This patch fixes configuration bugs when modifying wol settings. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit f9430a015a4331ba950eba1d7661dcd876c29f3c tree 52433da933bc935fe3be5f5bf0cc617ca4ac017c parent b6d0773fa7943fd93d564056395a7ff29b81213b author Ayaz Abdulla Sat, 10 Jun 2006 22:47:47 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: phy This patch fixes configuration bugs when modifying phy settings. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit b6d0773fa7943fd93d564056395a7ff29b81213b tree 119a6000893c91ed6a5aa7c29d5e84bf1aeab069 parent eafa59f6bcc6e46b756198a5388d195c4f0e671a author Ayaz Abdulla Sat, 10 Jun 2006 22:47:42 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: flow control This patch allows for configurable flow control through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit eafa59f6bcc6e46b756198a5388d195c4f0e671a tree 9530cd65e90c8b53e1dd4293c30b5eced199ecee parent 6a78814f6c9e35e9b4815c1973c988555212d6ef author Ayaz Abdulla Sat, 10 Jun 2006 22:47:34 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: ring sizes This patch allows for configurable ring size through ethtool support. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 6a78814f6c9e35e9b4815c1973c988555212d6ef tree d786e34f58b786664f0b776d2e82fecbd127b7b3 parent cac925a4aab1b7233d3beb591f53498816058a08 author Ayaz Abdulla Sat, 10 Jun 2006 22:47:26 -0400 committer Jeff Garzik Sun, 11 Jun 2006 09:25:15 -0400 [PATCH] forcedeth config: tso cleanup There are a series of patches for configuration support in forcedeth and one patch for device ids. This patch is a cleanup of the a previous TSO patch. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 6218a761bbc27acc65248c80024875bcc06d52b1 tree 59a278c4c189f838ede99de5fd46241d1923f52b parent 050613545b389825c1f5beb67fa2667b727f866d author Paul Mackerras Sun, 11 Jun 2006 14:15:17 +1000 committer Paul Mackerras Sun, 11 Jun 2006 14:15:17 +1000 powerpc: add context.vdso_base for 32-bit too This adds a vdso_base element to the mm_context_t for 32-bit compiles (both for ARCH=powerpc and ARCH=ppc). This fixes the compile errors that have been reported in arch/powerpc/kernel/signal_32.c. Signed-off-by: Paul Mackerras commit 9a9c77dc4c4eed9dfb74080e768c0b3c9d905496 tree a87eb0896be71537a99748f54184887785bf383e parent 0a1b622ef495d8ebba9ad8982414c6661c16b604 author Tejun Heo Sun, 11 Jun 2006 11:19:00 +0900 committer Tejun Heo Sun, 11 Jun 2006 11:19:00 +0900 [PATCH] libata: cosmetic change in struct ata_port Cosmetic change in struct ata_port. Signed-off-by: Tejun Heo commit 0a1b622ef495d8ebba9ad8982414c6661c16b604 tree f5aeae33e8e0347635a9e309c46f90387156c42a parent d87fa38e70853a9607dc34a02d15cf5f149f49f2 author Tejun Heo Sun, 11 Jun 2006 11:01:38 +0900 committer Tejun Heo Sun, 11 Jun 2006 11:01:38 +0900 [PATCH] libata: add missing finish_wait() call in ata_port_wait_eh() Add missing finish_wait() call after wait loop in ata_port_wait_eh(). Signed-off-by: Tejun Heo commit 8d7feac3c7504425aaf61dc7d804685a6b89ee43 tree 0dd98c8cbfea10bdc748951cf9dc10b44f0042eb parent beb40487508290f5d6565598c60a3f44261beef2 author Christoph Hellwig Sat, 10 Jun 2006 18:37:19 +0200 committer James Bottomley Sat, 10 Jun 2006 16:25:21 -0500 [SCSI] remove RQ_SCSI_* flags The RQ_SCSI_* flags are a vestiage of a long past history. The EH code still sets them but we never make use of that information. The other users is pluto.c which never had a chance to work but needs to be kept compiling to keep Davem happy, so copy over the definition there. We could probably get rid of RQ_ACTIVE/RQ_INACTIVE aswell with some work, there's only two more or less bogus looking uses in ubd and scsi. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit beb40487508290f5d6565598c60a3f44261beef2 tree ca63df47d8db8f1b1161b5db094b0a9c2b541d91 parent 1951d099dfd8fa529e86f4ac81d1a34554fbe302 author Christoph Hellwig Sat, 10 Jun 2006 18:01:03 +0200 committer James Bottomley Sat, 10 Jun 2006 16:24:40 -0500 [SCSI] remove scsi_request infrastructure With Achim patch the last user (gdth) is switched away from scsi_request so we an kill it now. Also disables some code in i2o_scsi that was broken since the sg driver stopped using scsi_requests. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit 1951d099dfd8fa529e86f4ac81d1a34554fbe302 tree e5a92385151b77254c7c527653ee99d99206d1ff parent d6be06c84da9626b10443c664ee55bda96fb3514 author Michael Reed Wed, 24 May 2006 15:08:10 -0500 committer James Bottomley Sat, 10 Jun 2006 16:02:21 -0500 [SCSI] mptfusion: change driver revision to 3.03.10 Bump driver version number to reflect addition of various fibre channel patches. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit d6be06c84da9626b10443c664ee55bda96fb3514 tree 603c279d787722b9a64208ae7255c34a74af7405 parent 419835e285c3e39cd62c8c8426da0aebea9cd89f author Michael Reed Wed, 24 May 2006 15:07:57 -0500 committer James Bottomley Sat, 10 Jun 2006 16:01:52 -0500 [SCSI] mptfc: abort of board reset leaves port dead requiring reboot The driver uses msleep_interruptible() in the code path responsible for resetting the card's ports via the lsiutil command. If a is received during the reset it can leave a port in such a state that the only way to regain its use is to reboot the system. Changing from msleep_interruptible() to msleep() corrects the problem. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit 419835e285c3e39cd62c8c8426da0aebea9cd89f tree e550176245f09598ccf7ffff915524ff07d75c88 parent ca2f938efe71ca48cbc689db4df8d4f04b5d8f07 author Michael Reed Wed, 24 May 2006 15:07:40 -0500 committer James Bottomley Sat, 10 Jun 2006 16:00:03 -0500 [SCSI] mptfc: fix fibre channel infinite request/response loop While doing board reset testing I was able to put the system in an infinite request/response loop between the scsi layer and mptscsih_qcmd() by aborting the reset. This patch installs a "SETUP RESET" handler which calls fc_remote_port_delete() for all registered rports. This blocks the target which prevents the loop. Additionally, should the reset fail to complete, the transport will now terminate i/o to the target. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit ca2f938efe71ca48cbc689db4df8d4f04b5d8f07 tree 044df117f00aa7838d83a78aa40ed41c1f0baf31 parent 80d3ac77a84987d5132726f3d7cef342a280f7d9 author Michael Reed Wed, 24 May 2006 15:07:24 -0500 committer James Bottomley Sat, 10 Jun 2006 15:59:19 -0500 [SCSI] mptfc: set fibre channel fw target missing timers to one second The fibre channel firmware provides a timer which is similar in purpose to the fibre channel transport's device loss timer. The effect of this timer is to extend the total time that a target will be missing beyond the value associated with the transport's timer. This patch changes the firmware timer to a default of one second which significantly reduces the lag between when a target goes missing and the notification of the fibre channel transport. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit 80d3ac77a84987d5132726f3d7cef342a280f7d9 tree cb126b63a06eed078cd7daa95a998d01f3df015e parent f0cd91a68acdc9b49d7f6738b514a426da627649 author Michael Reed Wed, 24 May 2006 15:07:09 -0500 committer James Bottomley Sat, 10 Jun 2006 15:58:37 -0500 [SCSI] mptfusion: move fc event/reset handling to mptfc Move fibre channel event and reset handling to mptfc. This will result in fewer changes over time that need to be applied to either mptbase.c or mptscsih.c. Signed-off-by: Michael Reed Signed-off-by: James Bottomley commit f0cd91a68acdc9b49d7f6738b514a426da627649 tree 8ad73564015794197583b094217ae0a71e71e753 parent 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 author James Bottomley Sat, 10 Jun 2006 13:47:26 -0500 committer James Bottomley Sat, 10 Jun 2006 13:47:26 -0500 Merge ../linux-2.6 commit 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e tree 6aedae05234660d5e188328c6165a760fbde4727 parent b2d8bfe18578c4e50e8ba52011c9b260a1b51dac author James Bottomley Sat, 10 Jun 2006 10:51:23 -0500 committer James Bottomley Sat, 10 Jun 2006 10:51:23 -0500 [SCSI] spi transport: don't allow dt to be set on SE or HVD buses This is really just a belt and braces test. The standards require disks to respond DT not capable on a non-LVD bus ... however, not all disks follow the standards ... Signed-off-by: James Bottomley commit b2d8bfe18578c4e50e8ba52011c9b260a1b51dac tree ab949e11e1e6d4e46ccb2bd5f8c9401cf46052a7 parent b9f051eb6cc013b90cb6062a1e2502e9c0adf0f4 author James Bottomley Sat, 10 Jun 2006 10:49:07 -0500 committer James Bottomley Sat, 10 Jun 2006 10:49:07 -0500 [SCSI] aic7xxx: expose the bus setting to sysfs Read the transciever register and display in the host transport properties. I'm still not entirely sure what this does for multiple transciever adapters (like some 160 ones) however, I suspect it displays the transciever state of the switchable bus segment. Signed-off-by: James Bottomley commit b9f051eb6cc013b90cb6062a1e2502e9c0adf0f4 tree 57255361ec2100e2193ef0d80ce820514cdcf073 parent 6391a11375de5e2bb1eb8481e54619761dc65d9f author Arthur Othieno Thu, 08 Jun 2006 22:23:45 -0700 committer James Bottomley Sat, 10 Jun 2006 10:46:01 -0500 [SCSI] scsi: remove Documentation/scsi/cpqfc.txt cpqfc driver flushed out with: [SCSI] remove broken driver cpqfc (commit ca61f10ab2b874b889e89d14ea09fae2dcccdca6) but somehow Documentation/scsi/cpqfc.txt managed to survive the blast. Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 6391a11375de5e2bb1eb8481e54619761dc65d9f tree 956aae1d278a3f731b2e6148ff40a69aa7957ea8 parent 9dc399de0840a478adb71278becf598d3ab3aacc author Tobias Klauser Thu, 08 Jun 2006 22:23:48 -0700 committer James Bottomley Sat, 10 Jun 2006 10:45:30 -0500 [SCSI] drivers/scsi: Use ARRAY_SIZE macro Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove duplicates of the macro. Signed-off-by: Tobias Klauser Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 9dc399de0840a478adb71278becf598d3ab3aacc tree 3fed70eebb84f14f75b813843a887408dfe67580 parent ede1e6f8b43246a9796583346839669b1f4b77d4 author Guennadi Liakhovetski Fri, 09 Jun 2006 22:25:23 +0200 committer James Bottomley Sat, 10 Jun 2006 10:38:24 -0500 [SCSI] Remove last page_address from dc395x.c Dynamically map scattergather buffer instead of using page_address(). Signed-off-by: Guennadi Liakhovetski Signed-off-by: James Bottomley commit ede1e6f8b43246a9796583346839669b1f4b77d4 tree 9fd35517168bf363bec59205f211db59d36beedf parent cbd5f69b98bb5d7a0d207230bcf8fa51fca3f3cf author HighPoint Linux Team Tue, 16 May 2006 14:38:09 +0800 committer James Bottomley Sat, 10 Jun 2006 10:36:13 -0500 [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver HighPoint RocketRAID 3220/3320 series 8 channel PCI-X SATA RAID Host Adapters. Fixes from original submission: Merge Andrew Morton's patches: - Provide locking for global list - Fix debug printks - uninline function with multiple callsites - coding style fixups - remove unneeded casts of void* - kfree(NULL) is legal - Don't "succeed" if register_chrdev() failed - otherwise we'll later unregister a not-registered chrdev. - Don't return from hptiop_do_ioctl() with the spinlock held. - uninline __hpt_do_ioctl() Update for Arjan van de Ven's comments: - put all asm/ includes after the linux/ ones - replace mdelay with msleep - add pci posting flush - do not set pci command reqister in map_pci_bar - do not try merging sg elements in hptiop_buildsgl() - remove unused outstandingcommands member from hba structure - remove unimplemented hptiop_abort() handler - remove typedef u32 hpt_id_t Other updates: - fix endianess Signed-off-by: HighPoint Linux Team Signed-off-by: James Bottomley commit cbd5f69b98bb5d7a0d207230bcf8fa51fca3f3cf tree f828a83b0e8006316b6b7a61819f4ef4ce6eac04 parent 5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068 author Leubner, Achim Fri, 09 Jun 2006 11:34:29 -0700 committer James Bottomley Sat, 10 Jun 2006 10:24:40 -0500 [SCSI] remove the scsi_request interface from the gdth driver Initial pass at converting the gdth driver away from the scsi_request interface so that the request interface can be removed post 2.6.18 without breaking gdth. Based on changes from Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 050613545b389825c1f5beb67fa2667b727f866d tree d1d06c033d5254052dcc4824c1051a9966727c5b parent 6b81e80049a8815dc457fec4dadb6ae535c3b988 author Paul Mackerras Sat, 10 Jun 2006 18:17:35 +1000 committer Paul Mackerras Sat, 10 Jun 2006 18:17:35 +1000 powerpc: Fix bug in iommu_alloc_coherent causing hang during boot In commit 8eb6c6e3b9c8bfed3d75536ab142d7694627c2e5, Christoph Hellwig made iommu_alloc_coherent able to do node-local allocations, but unfortunately got the order of the arguments to alloc_pages_node wrong. This fixes it. Signed-off-by: Paul Mackerras commit f9068876f5ef583f8e9ebf4acd2ef5b35b113db9 tree 9347def6b7859dfa6c08e54640ee0f6c94f1ede3 parent f24ff6bf8c903bc0c645bf87fbe87f9a6d9f634f author David Woodhouse Sat, 10 Jun 2006 00:53:16 +0100 committer David Woodhouse Sat, 10 Jun 2006 00:53:16 +0100 [MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles Fix the control bit handling so it even looks like it might work, too. Bad tglx. No biscuit. Signed-off-by: David Woodhouse commit f24ff6bf8c903bc0c645bf87fbe87f9a6d9f634f tree 7138c0fad5b093e6e6762bfb31e5e3414685e428 parent 4ed0156f774cf50252e7f51032d1cc857fe86879 author Andrew Morton Fri, 09 Jun 2006 15:12:34 +0100 committer David Woodhouse Fri, 09 Jun 2006 15:12:34 +0100 [MTD] Prepare physmap for 64-bit-resources Fallout from the incoming 64-bit-resource stuff: drivers/mtd/maps/physmap.c: In function 'physmap_flash_probe': drivers/mtd/maps/physmap.c:94: warning: format '%.8lx' expects type 'long unsigned int', but argument 2 has type 'resource_size_t' drivers/mtd/maps/physmap.c:94: warning: format '%.8lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t' Cc: Vivek Goyal Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 4ed0156f774cf50252e7f51032d1cc857fe86879 tree 5b8e8b038309ce99d3a88e600f46b66ca7392b94 parent 3bcc86f507f5a0b6f5bfa312f37ec33711558acb author David Woodhouse Fri, 09 Jun 2006 15:06:42 +0100 committer David Woodhouse Fri, 09 Jun 2006 15:06:42 +0100 [JFFS2] Fix more breakage caused by janitorial meddling. jffs2_zlib_exit() and free_workspaces() shouldn't be marked __exit because they get called in the error case from the init functions. Signed-off-by: David Woodhouse commit 6b81e80049a8815dc457fec4dadb6ae535c3b988 tree 410158801f1ed00ad6011d34da1fd23d9e9edb40 parent b53744612f276ad20c5d7ef33ac991ec13101417 author Michael Ellerman Wed, 07 Jun 2006 17:10:09 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:20 +1000 [PATCH] powerpc: Cleanup hvc_rtas.c a little A few cleanups in hvc_rtas.c: 1. Remove unused RTASCONS_PUT_ATTEMPTS 2. Remove unused rtascons_put_delay. 3. Use i as a loop counter like everyone else on earth. 4. Remove pointless variables, eg. x = foo; if (x) return something_else; 5. Whitespace cleanups and formatting. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit b53744612f276ad20c5d7ef33ac991ec13101417 tree 937dbded1be6edd989e325fbc9b803931946c7f5 parent e9370ae15dc2f8ba1e1889ce26f13cda565b6ecb author Michael Ellerman Wed, 07 Jun 2006 17:10:03 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:18 +1000 [PATCH] powerpc: Make rtas console _much_ faster Currently the hvc_rtas driver is painfully slow to use. Our "benchmark" is ls -R /etc, which spits out about 27866 characters. The theoretical maximum speed would be about 2.2 seconds, the current code takes ~50 seconds. The core of the problem is that sometimes when the tty layer asks us to push characters the firmware isn't able to handle some or all of them, and so returns an error. The current code sees this and just returns to the tty code with the buffer half sent. The khvcd thread will eventually wake up and try to push more characters, which will usually work because by then the firmware's had time to make room. But the khvcd thread only wakes up every 10 milliseconds, which isn't fast enough. So change the khvcd thread logic so that if there's an incomplete write we yield() and then immediately try writing again. Doing so makes POLL_QUICK and POLL_WRITE synonymous, so remove POLL_QUICK. With this patch our "benchmark" takes ~2.8 seconds. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit e9370ae15dc2f8ba1e1889ce26f13cda565b6ecb tree 338ed732f7a6607bc168795008e244f180876cda parent fab5db97e44f76461f76b24adfa8ccb14d4df498 author Paul Mackerras Wed, 07 Jun 2006 16:15:39 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:16 +1000 [PATCH] powerpc: Implement PR_[GS]ET_UNALIGN prctls for powerpc This gives the ability to control whether alignment exceptions get fixed up or reported to the process as a SIGBUS, using the existing PR_SET_UNALIGN and PR_GET_UNALIGN prctls. We do not implement the option of logging a message on alignment exceptions. Signed-off-by: Paul Mackerras commit fab5db97e44f76461f76b24adfa8ccb14d4df498 tree 123026a1a6f1702468220189b7410077479ae8a2 parent 651d765d0b2c72d33430487c8b6ef64c60cd2134 author Paul Mackerras Wed, 07 Jun 2006 16:14:40 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:15 +1000 [PATCH] powerpc: Implement support for setting little-endian mode via prctl This adds the PowerPC part of the code to allow processes to change their endian mode via prctl. This also extends the alignment exception handler to be able to fix up alignment exceptions that occur in little-endian mode, both for "PowerPC" little-endian and true little-endian. We always enter signal handlers in big-endian mode -- the support for little-endian mode does not amount to the creation of a little-endian user/kernel ABI. If the signal handler returns, the endian mode is restored to what it was when the signal was delivered. We have two new kernel CPU feature bits, one for PPC little-endian and one for true little-endian. Most of the classic 32-bit processors support PPC little-endian, and this is reflected in the CPU feature table. There are two corresponding feature bits reported to userland in the AT_HWCAP aux vector entry. This is based on an earlier patch by Anton Blanchard. Signed-off-by: Paul Mackerras commit 651d765d0b2c72d33430487c8b6ef64c60cd2134 tree 3a7253dc0b80585a03ddd581e0c00fc0f8bda7a0 parent 3b5e905ee3bd23e9311951890aba57a0dbc81ca4 author Anton Blanchard Wed, 07 Jun 2006 16:10:19 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:13 +1000 [PATCH] Add a prctl to change the endianness of a process. This new prctl is intended for changing the execution mode of the processor, on processors that support both a little-endian mode and a big-endian mode. It is intended for use by programs such as instruction set emulators (for example an x86 emulator on PowerPC), which may find it convenient to use the processor in an alternate endianness mode when executing translated instructions. Note that this does not imply the existence of a fully-fledged ABI for both endiannesses, or of compatibility code for converting system calls done in the non-native endianness mode. The program is expected to arrange for all of its system call arguments to be presented in the native endianness. Switching between big and little-endian mode will require some care in constructing the instruction sequence for the switch. Generally the instructions up to the instruction that invokes the prctl system call will have to be in the old endianness, and subsequent instructions will have to be in the new endianness. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3b5e905ee3bd23e9311951890aba57a0dbc81ca4 tree 700e3dd7e21b09006216647fb0dec284b682f2ab parent e78dbc800c37f035d476c4fdebdf43cdecfcb731 author Benjamin Herrenschmidt Wed, 07 Jun 2006 12:06:20 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:10 +1000 [PATCH] powerpc: Add udbg-immortal kernel option When debugging early kernel crashes that happen after console_init() and before a proper console driver takes over, we often have to go hack into udbg.c to prevent it from unregistering so we can "see" what is happening. This patch adds a kernel command line option "udbg-immortal" instead to avoid having to modify the kernel. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit e78dbc800c37f035d476c4fdebdf43cdecfcb731 tree 3b5ff1242c284e0c77e755b62d7e8600aafceb25 parent 8eb6c6e3b9c8bfed3d75536ab142d7694627c2e5 author Michael Neuling Thu, 08 Jun 2006 14:42:34 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:24:05 +1000 [PATCH] powerpc: oprofile support for POWER6 POWER6 moves some of the MMCRA bits and also requires some bits to be cleared each PMU interrupt. Signed-off-by: Michael Neuling Acked-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 8eb6c6e3b9c8bfed3d75536ab142d7694627c2e5 tree 7dd9c4146f60e88ca1fc8ebe976e1b7a3ae6ea2c parent 318facbee05417fb432603a8309a10cdb942a87b author Christoph Hellwig Tue, 06 Jun 2006 16:11:35 +0200 committer Paul Mackerras Fri, 09 Jun 2006 21:24:01 +1000 [PATCH] powerpc: node-aware dma allocations Make sure dma_alloc_coherent allocates memory from the local node. This is important on Cell where we avoid going through the slow cpu interconnect. Note: I could only test this patch on Cell, it should be verified on some pseries machine by those that have the hardware. Signed-off-by: Christoph Hellwig Signed-off-by: Paul Mackerras commit 318facbee05417fb432603a8309a10cdb942a87b tree 753d84a8213b9e6639e661d329d5473b35e6c191 parent 507279db1819aacf4022e790b3fc8bc8cf56debf author Christoph Hellwig Tue, 06 Jun 2006 16:09:39 +0200 committer Paul Mackerras Fri, 09 Jun 2006 21:21:08 +1000 [PATCH] powerpc: implement pcibus_to_node and pcibus_to_cpumask On 64bit powerpc we can find out what node a pci bus hangs off, so implement the topology.h macros that export this information. For 32bit this seems a little more difficult, but I don't know of 32bit powerpc NUMA machines either, so let's leave it out for now. Signed-off-by: Christoph Hellwig Signed-off-by: Paul Mackerras commit 507279db1819aacf4022e790b3fc8bc8cf56debf tree e5e95d50b093f0eab31e7856b9f596caa6e097af parent 4a3ecc622465dbff7404139a8ad18bf4cb99f836 author John Rose Mon, 05 Jun 2006 16:31:48 -0500 committer Paul Mackerras Fri, 09 Jun 2006 21:21:06 +1000 [PATCH] powerpc: reorg RTAS delay code This patch attempts to handle RTAS "busy" return codes in a more simple and consistent manner. Typical callers of RTAS shouldn't have to manage wait times and delay calls. This patch also changes the kernel to use msleep() rather than udelay() when a runtime delay is necessary. This will avoid CPU soft lockups for extended delay conditions. Signed-off-by: John Rose Signed-off-by: Paul Mackerras commit 4a3ecc622465dbff7404139a8ad18bf4cb99f836 tree a63244b945c4ef6cecacedbbe9ba841e6106a1b5 parent 87af41beb9b70f06f760fc973b793488f2825853 author Andrew Morton Thu, 01 Jun 2006 20:36:04 -0700 committer Paul Mackerras Fri, 09 Jun 2006 21:21:05 +1000 [PATCH] powerpc kbuild warning fix From: Andrew Morton arch/powerpc/Kconfig:339:warning: leading whitespace ignored arch/powerpc/Kconfig:347:warning: leading whitespace ignored arch/powerpc/Kconfig:357:warning: leading whitespace ignored arch/powerpc/Kconfig:373:warning: leading whitespace ignored arch/powerpc/Kconfig:382:warning: leading whitespace ignored arch/powerpc/Kconfig:394:warning: leading whitespace ignored arch/powerpc/Kconfig:842:warning: leading whitespace ignored arch/powerpc/Kconfig:847:warning: leading whitespace ignored Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit 87af41beb9b70f06f760fc973b793488f2825853 tree e33fbd7da48404c05d950d5184a0c2474d3d13f9 parent 03ac829b0046d5769eef3dd841cec33a211db96e author Anton Blanchard Fri, 05 May 2006 05:44:26 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:21:03 +1000 [PATCH] powerpc: add num_pmcs to 970MP cputable entry The 970MP cputable entry needs a num_pmcs entry for oprofile to work. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 03ac829b0046d5769eef3dd841cec33a211db96e tree fbabaac94b4848f1906c49d7cbdbe9dbcd066372 parent c5cf0e30bf3d8cb56758abb612827647c0a821cf author Will Schmidt Tue, 30 May 2006 13:38:40 -0500 committer Paul Mackerras Fri, 09 Jun 2006 21:21:02 +1000 [PATCH] powerpc: fix of_parse_dma_window My js20 appears to lack the ibm,#dma- properties, and boot fails with a "Kernel panic - not syncing: iommu_init_table: Can't allocate 0 bytes" message. This adds a fallback to the "#address-cells" property in case the "#ibm,dma-address-cells" property is missing. Tested on js20 and power5 lpar. Unless there is a more elegant solution... :-) Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras commit c5cf0e30bf3d8cb56758abb612827647c0a821cf tree 54a471818e91204db11f14544df0bb38bd03058f parent a5bba930d802009c259e56c8d53086d96f63813b author Benjamin Herrenschmidt Tue, 30 May 2006 14:14:19 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:20:59 +1000 [PATCH] powerpc: Fix buglet with MMU hash management Our MMU hash management code would not set the "C" bit (changed bit) in the hardware PTE when updating a RO PTE into a RW PTE. That would cause the hardware to possibly to a write back to the hash table to set it on the first store access, which in addition to being a performance issue, might also hit a bug when running with native hash management (non-HV) as our code is specifically optimized for the case where no write back happens. Thus there is a very small therocial window were a hash PTE can become corrupted if that HPTE has just been upgraded to read write, a store access happens on it, and that races with another processor evicting that same slot. Since eviction (caused by an almost full hash) is extremely rare, the bug is very unlikely to happen fortunately. This fixes by allowing the updating of the protection bits in the native hash handling to also set (but not clear) the "C" bit, and, in order to also improve performances in the general case, by always setting that bit on newly inserted hash PTE so that writeback really never happens. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit a5bba930d802009c259e56c8d53086d96f63813b tree 8dd60002042bc0795b3d0544fcae7f5082405b16 parent 98a90c02792f22afd8161f96fc9b9f0f0eb0880e author Benjamin Herrenschmidt Tue, 30 May 2006 13:51:37 +1000 committer Paul Mackerras Fri, 09 Jun 2006 21:20:57 +1000 [PATCH] powerpc vdso updates This patch cleans up some locking & error handling in the ppc vdso and moves the vdso base pointer from the thread struct to the mm context where it more logically belongs. It brings the powerpc implementation closer to Ingo's new x86 one and also adds an arch_vma_name() function allowing to print [vsdo] in /proc//maps if Ingo's x86 vdso patch is also applied. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 98a90c02792f22afd8161f96fc9b9f0f0eb0880e tree df721c929ab40ab986793369ece2eed6029e3227 parent c029cc66cb3d83f70c02e0c182f0eed1419f8020 author Renzo Davoli Sun, 21 May 2006 20:06:58 +0200 committer Paul Mackerras Fri, 09 Jun 2006 21:20:51 +1000 [PATCH] powerpc: enable PPC_PTRACE_[GS]ETREGS on ppc32 I have tested PPC_PTRACE_GETREGS and PPC_PTRACE_SETREGS on umview. I do not understand why historically these tags has been defined as PPC_PTRACE_GETREGS and PPC_PTRACE_SETREGS instead of simply PTRACE_[GS]ETREGS. The other "originality" is that the address must be put into the "addr" field instead of the "data" field as stated in the manual. Signed-off-by: renzo davoli Signed-off-by: Paul Mackerras commit b190f1138b0f30fbe837b3f09fb6ffdb2fc4da24 tree 319fb258e80786451928f7f98aa85c31b06ba599 parent 477829ef2e9e831c56c98948cfef6dfcec305c3a author Nathan Scott Fri, 09 Jun 2006 17:13:15 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:13:15 +1000 [XFS] Fix broken const use inside local suffix_strtoul routine. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26201a Signed-off-by: Nathan Scott commit 477829ef2e9e831c56c98948cfef6dfcec305c3a tree 9256a402252489fd3867d06b1379c1eca21738ac parent 421ad134583bff86c0ae068e2ddcb17f530957ab author Mandy Kirkconnell Fri, 09 Jun 2006 17:13:04 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:13:04 +1000 [XFS] Fix nused counter. It's currently getting set to -1 rather than getting decremented by 1. Since nused never reaches 0, the "if (!free->hdr.nused)" check in xfs_dir2_leafn_remove() fails every time and xfs_dir2_shrink_inode() doesn't get called when it should. This causes extra blocks to be left on an empty directory and the directory in unable to be converted back to inline extent mode. SGI-PV: 951958 SGI-Modid: xfs-linux-melb:xfs-kern:211382a Signed-off-by: Mandy Kirkconnell Signed-off-by: Nathan Scott commit 421ad134583bff86c0ae068e2ddcb17f530957ab tree cf910641c032ca5381a8bd30c0f56dfca9dcaa97 parent 4d1a2ed3d8d6e306d20f5d99a5ae12ac4c8b787b author Nathan Scott Fri, 09 Jun 2006 17:12:46 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:12:46 +1000 [XFS] Fix mismerge of the fs_writable cleanup patch causing a freeze/thaw test hang. SGI-PV: 953563 SGI-Modid: xfs-linux-melb:xfs-kern:26182a Signed-off-by: Nathan Scott commit 4d1a2ed3d8d6e306d20f5d99a5ae12ac4c8b787b tree a6d6def1330a320787dcf688a7e02d537d9b5b7b parent a916e2bd15b7572d9e791ae2a9333f74175470cd author Nathan Scott Fri, 09 Jun 2006 17:12:28 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:12:28 +1000 [XFS] Fix up debug code so that bulkstat wont generate thousands of fsstress warnings. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26111a Signed-off-by: Nathan Scott commit a916e2bd15b7572d9e791ae2a9333f74175470cd tree f1910dc6cdf930ca0927ed257f836ab3435179f9 parent 34327e138481137a81a2e33060b8eb0944013801 author Nathan Scott Fri, 09 Jun 2006 17:12:17 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:12:17 +1000 [XFS] Remove unused parameter from di2xflags routine. SGI-PV: 904192 SGI-Modid: xfs-linux-melb:xfs-kern:26110a Signed-off-by: Nathan Scott commit 34327e138481137a81a2e33060b8eb0944013801 tree d78521e82598c0b1aae46e466f38a5fa99a2b842 parent 8285fb58e75bfdb447c7a2c533ec9efdb238f966 author Nathan Scott Fri, 09 Jun 2006 17:11:55 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:11:55 +1000 [XFS] Cleanup a missed porting conversion, and freezing. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26109a Signed-off-by: Nathan Scott commit 8285fb58e75bfdb447c7a2c533ec9efdb238f966 tree 4bcfa74d3328ff5d71437556d24019be98c1d9fa parent 67fcaa73adafb19139a7cd8ab133592b6a0a0901 author Nathan Scott Fri, 09 Jun 2006 17:07:12 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:07:12 +1000 [XFS] Resolve a namespace collision on remaining vtypes for FreeBSD porters. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26108a Signed-off-by: Nathan Scott commit 67fcaa73adafb19139a7cd8ab133592b6a0a0901 tree 6e7b83e7c8b0a1d8b4776af1537d6f07ebe9435d parent b83bd1388133e914c38bd31d69bc90143e6ab10c author Nathan Scott Fri, 09 Jun 2006 17:00:52 +1000 committer Nathan Scott Fri, 09 Jun 2006 17:00:52 +1000 [XFS] Resolve a namespace collision on vnode/vnodeops for FreeBSD porters. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26107a Signed-off-by: Nathan Scott commit b83bd1388133e914c38bd31d69bc90143e6ab10c tree 3f7fecf3913d1aa8216e06f109746c63ec0ac501 parent 932f2c323196c214e645d5a572a1d7b562c0f93f author Nathan Scott Fri, 09 Jun 2006 16:48:30 +1000 committer Nathan Scott Fri, 09 Jun 2006 16:48:30 +1000 [XFS] Resolve a namespace collision on vfs/vfsops for FreeBSD porters. SGI-PV: 9533338 SGI-Modid: xfs-linux-melb:xfs-kern:26106a Signed-off-by: Nathan Scott commit 932f2c323196c214e645d5a572a1d7b562c0f93f tree 3129798a4b60a90f55165030ec434ec106cd0373 parent b65745205fc00d8c7722ec74e9bd955f3861c7e2 author Nathan Scott Fri, 09 Jun 2006 15:29:58 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:29:58 +1000 [XFS] statvfs component of directory/project quota support, code originally by Glen. SGI-PV: 932952 SGI-Modid: xfs-linux-melb:xfs-kern:26105a Signed-off-by: Nathan Scott commit b65745205fc00d8c7722ec74e9bd955f3861c7e2 tree 524f5bacfcdf54828e97b5368eb35de938651ada parent 9c48876a05b6fbe41f1933fae3529c268d78cad0 author Nathan Scott Fri, 09 Jun 2006 15:29:40 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:29:40 +1000 [XFS] Portability changes: remove prdev, stick to one diagnostic interface. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26103a Signed-off-by: Nathan Scott commit 9c48876a05b6fbe41f1933fae3529c268d78cad0 tree becfedbde574228e6fb2a1d96721d78e9b0b4dc7 parent ad723875ac238137207754d2633dd9c261c71558 author Nathan Scott Fri, 09 Jun 2006 15:29:22 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:29:22 +1000 [XFS] Remove dead code from come bulkstat paths. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26102a Signed-off-by: Nathan Scott commit ad723875ac238137207754d2633dd9c261c71558 tree cfb3600e492d872d30350f9dd6e05c4c2e9b4e4a parent 7d4fb40ad7efe4586d1341d4731377fb4530836f author Nathan Scott Fri, 09 Jun 2006 15:29:12 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:29:12 +1000 [XFS] Fix a typo in a header file comment. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26101a Signed-off-by: Nathan Scott commit 7d4fb40ad7efe4586d1341d4731377fb4530836f tree bf802cce6bc60627186b02b71014a683f6cb4a05 parent 59c1b082f5fff8269565039600a2ef18d48649b5 author Nathan Scott Fri, 09 Jun 2006 15:27:16 +1000 committer Nathan Scott Fri, 09 Jun 2006 15:27:16 +1000 [XFS] Start writeout earlier (on last close) in the case where we have a truncate down followed by delayed allocation (buffered writes) - worst case scenario for the notorious NULL files problem. This reduces the window where we are exposed to that problem significantly. SGI-PV: 917976 SGI-Modid: xfs-linux-melb:xfs-kern:26100a Signed-off-by: Nathan Scott commit 59c1b082f5fff8269565039600a2ef18d48649b5 tree 28093cd9a1b61267d76edef992a91e7cecf40b5e parent e109007461cddfc80a908f0b015f4eeb485e1d85 author Nathan Scott Fri, 09 Jun 2006 14:59:13 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:59:13 +1000 [XFS] Make the pflags test/set wrappers more legible for us mere humans. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26099a Signed-off-by: Nathan Scott commit e109007461cddfc80a908f0b015f4eeb485e1d85 tree bd3ce386cfce2905dd72182c4dbee2581bb76018 parent 7d04a335b6b2d79e3742ffd28bd651204574e794 author Nathan Scott Fri, 09 Jun 2006 14:58:48 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:58:48 +1000 [XFS] Fix a buffer refcount leak in dir2 code on a forced shutdown. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26097a Signed-off-by: Nathan Scott commit 7d04a335b6b2d79e3742ffd28bd651204574e794 tree 2b687202ae47c5e0c70a2b921b77135066131d8d parent b76963fac4a17b661bad46e5a57b0f918c6f0cd1 author Nathan Scott Fri, 09 Jun 2006 14:58:38 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:58:38 +1000 [XFS] Shutdown the filesystem if all device paths have gone. Made shutdown vop flags consistent with sync vop flags declarations too. SGI-PV: 939911 SGI-Modid: xfs-linux-melb:xfs-kern:26096a Signed-off-by: Nathan Scott commit b76963fac4a17b661bad46e5a57b0f918c6f0cd1 tree d2dc3d6fcc166878f978f7ed531f790b14c02e06 parent 3d80ede4799889ede2aa785c2511aef3e78d5bb1 author Nathan Scott Fri, 09 Jun 2006 14:58:20 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:58:20 +1000 [XFS] getattr can return an error code, so propogate any from lower layers. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26095a Signed-off-by: Nathan Scott commit 3d80ede4799889ede2aa785c2511aef3e78d5bb1 tree a35aeeb3cc34871e65d0368b011831a96b5a9a70 parent 72c93bcc6348a385416603459c2fdb4cf6c43687 author Nathan Scott Fri, 09 Jun 2006 14:57:30 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:57:30 +1000 [XFS] Drop use of m_writeio_blocks when zeroing, its not meaningful anymore here. SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26094a Signed-off-by: Nathan Scott commit 72c93bcc6348a385416603459c2fdb4cf6c43687 tree d72b32c62346b476c81b8e22253cfeb39f8b6468 parent 87c199c2a79220ac9e216e72d18a15148f84d9e0 author Ingo Molnar Fri, 09 Jun 2006 14:57:01 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:57:01 +1000 [XFS] lock validator: lockdep: small xfs init_rwsem() cleanup init_rwsem() has no return value. This is not a problem if init_rwsem() is a function, but it's a problem if it's a do { ... } while (0) macro. (which lockdep introduces) SGI-PV: 904196 SGI-Modid: xfs-linux-melb:xfs-kern:26082a Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Nathan Scott commit 87c199c2a79220ac9e216e72d18a15148f84d9e0 tree 1c48deb1f3385afa0225ce223da2aa4eaba85724 parent 714250879ea61cdb1a39bb96fe9d934ee0c669a2 author Tim Shimmin Fri, 09 Jun 2006 14:56:16 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:56:16 +1000 [XFS] Over zealous with doing endian conversions. We endian converted the logged version of di_next_unlinked which is actually always stored in the correct ondisk format. This was pointed out to us by Shailendra Tripathi. And is evident in the xfs qa test of 121. SGI-PV: 953263 SGI-Modid: xfs-linux-melb:xfs-kern:26044a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit 714250879ea61cdb1a39bb96fe9d934ee0c669a2 tree 607f2b06c56d026f04721f99cd8dba884df86b75 parent 6d192a9b82212abf1e0e89da6e3a952afba7e4d6 author David Chinner Fri, 09 Jun 2006 14:55:52 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:55:52 +1000 [XFS] Stop a BUG from occurring in generic_delete_inode by preventing transaction completion from marking the inode dirty while it is being cleaned up on it's way out of the system. SGI-PV: 952967 SGI-Modid: xfs-linux-melb:xfs-kern:26040a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit 6d192a9b82212abf1e0e89da6e3a952afba7e4d6 tree 608a463ba4fd04f518558ead3567952e757cd2ae parent d210a28cd851082cec9b282443f8cc0e6fc09830 author Tim Shimmin Fri, 09 Jun 2006 14:55:38 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:55:38 +1000 [XFS] inode items and EFI/EFDs have different ondisk format for 32bit and 64bit kernels allow recovery to handle both versions and do the necessary decoding SGI-PV: 952214 SGI-Modid: xfs-linux-melb:xfs-kern:26011a Signed-off-by: Tim Shimmin Signed-off-by: Nathan Scott commit d210a28cd851082cec9b282443f8cc0e6fc09830 tree 77b8c843d4cb7e6095b607570c5fd16702e50592 parent d3446eac3f50dade2f09ed212b112609ee78fb33 author Yingping Lu Fri, 09 Jun 2006 14:55:18 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:55:18 +1000 [XFS] In actual allocation of file system blocks and freeing extents, the transaction within each such operation may involve multiple locking of AGF buffer. While the freeing extent function has sorted the extents based on AGF number before entering into transaction, however, when the file system space is very limited, the allocation of space would try every AGF to get space allocated, this could potentially cause out-of-order locking, thus deadlock could happen. This fix mitigates the scarce space for allocation by setting aside a few blocks without reservation, and avoid deadlock by maintaining ascending order of AGF locking. SGI-PV: 947395 SGI-Modid: xfs-linux-melb:xfs-kern:210801a Signed-off-by: Yingping Lu Signed-off-by: Nathan Scott commit d3446eac3f50dade2f09ed212b112609ee78fb33 tree c3cf3fd0349975ef72e78a1ebbd06725c5b34d2a parent fbc1462bcb421620a04eb390fc79a2615c9d01d0 author Barry Naujok Fri, 09 Jun 2006 14:54:19 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:54:19 +1000 [XFS] Add degframentation exclusion support SGI-PV: 953061 SGI-Modid: xfs-linux-melb:xfs-kern:25986a Signed-off-by: Barry Naujok Signed-off-by: Nathan Scott commit fbc1462bcb421620a04eb390fc79a2615c9d01d0 tree 106e95d7d933241c24b47af10299243a6f289bd4 parent ba0b92d671c36cbebd66a306790c9b66a3224d83 author Nathan Scott Fri, 09 Jun 2006 14:52:13 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:52:13 +1000 [XFS] Fix a noatime regression related to updating inode atime field on mmap only. SGI-PV: 952736 SGI-Modid: xfs-linux-melb:xfs-kern:25922a Signed-off-by: Nathan Scott commit ba0b92d671c36cbebd66a306790c9b66a3224d83 tree a13886281e18979acd9748d4a6773a0675229c2f parent fe6c1e7240e3a7cb600030f9c909273365d52a9d author Nathan Scott Fri, 09 Jun 2006 14:52:00 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:52:00 +1000 [XFS] Fix a comment typo, originally noticed by Ming Zhang. SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:25921a Signed-off-by: Nathan Scott commit fe6c1e7240e3a7cb600030f9c909273365d52a9d tree 26e55aea45e754fae8888ce16d0001544432fd29 parent 3f368a0d58cb8cadab298546286f94ca14220f65 author Mandy Kirkconnell Fri, 09 Jun 2006 14:51:25 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:51:25 +1000 [XFS] Fix size argument in kmem_free(). SGI-PV: 952291 SGI-Modid: xfs-linux-melb:xfs-kern:209807a Signed-off-by: Mandy Kirkconnell Signed-off-by: Nathan Scott commit 3f368a0d58cb8cadab298546286f94ca14220f65 tree 12d93670a1e79a167416f96a147d5ad29e698b9b parent 1d8daf06f67c8920a640eb61b30c3176ecc52405 author Olaf Weber Fri, 09 Jun 2006 14:51:11 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:51:11 +1000 [XFS] Originally the ATTR_DMI flag also had the functionality of the ATTR_NOLOCK flag, but this was split off some time ago, as ATTR_DMI needed to be used separately. Two asserts were added to guard correctness of the code during the transition. These are no longer required. SGI-PV: 952145 SGI-Modid: xfs-linux-melb:xfs-kern:209633a Signed-off-by: Olaf Weber Signed-off-by: Nathan Scott commit 1d8daf06f67c8920a640eb61b30c3176ecc52405 tree b5ee131d524177d05d7f5cacdfd662f65246ca7c parent 8034fff39bb9430d807375ec7a04097efba42cd2 author Christoph Hellwig Fri, 09 Jun 2006 14:50:37 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:50:37 +1000 [XFS] endianess annotations for xfs_dir_leaf_entry_t SGI-PV: 943272 SGI-Modid: xfs-linux-melb:xfs-kern:25808a Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro Signed-off-by: Nathan Scott commit 8034fff39bb9430d807375ec7a04097efba42cd2 tree bcc66e93d114764e4c513e9389cd751143c8102a parent ff9901c1e7c7be06a99c59cfc3133d2316cbc957 author Christoph Hellwig Fri, 09 Jun 2006 14:50:24 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:50:24 +1000 [XFS] endianess annotations for xfs_dir_leaf_hdr_t SGI-PV: 943272 SGI-Modid: xfs-linux-melb:xfs-kern:25807a Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro Signed-off-by: Nathan Scott commit ff9901c1e7c7be06a99c59cfc3133d2316cbc957 tree d9cae983cf713d07ff65566e56beca52c21412d1 parent 3e57ecf640428c01ba1ed8c8fc538447ada1715b author Christoph Hellwig Fri, 09 Jun 2006 14:48:37 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:48:37 +1000 [XFS] endianess annotations for xfs_dir2_data_entry_t SGI-PV: 943272 SGI-Modid: xfs-linux-melb:xfs-kern:25806a Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro Signed-off-by: Nathan Scott commit 3e57ecf640428c01ba1ed8c8fc538447ada1715b tree bcc92b0017b5ec8e106649cd53beffdd6addde07 parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 author Olaf Weber Fri, 09 Jun 2006 14:48:12 +1000 committer Nathan Scott Fri, 09 Jun 2006 14:48:12 +1000 [XFS] Add parameters to xfs_bmapi() and xfs_bunmapi() to have them report the range spanned by modifications to the in-core extent map. Add XFS_BUNMAPI() and XFS_SWAP_EXTENTS() macros that call xfs_bunmapi() and xfs_swap_extents() via the ioops vector. Change all calls that may modify the in-core extent map for the data fork to go through the ioops vector. This allows a cache of extent map data to be kept in sync. SGI-PV: 947615 SGI-Modid: xfs-linux-melb:xfs-kern:209226a Signed-off-by: Olaf Weber Signed-off-by: Nathan Scott commit 81c246691535ee3f865fbe6804b3be1b2c159e95 tree bee0ca28e848c223caa68cbf52f36c7045cdd81b parent b07cd5181f3c8de8c28fdac7dbeec9e4220b8037 author Andrew Morton Thu, 01 Jun 2006 20:19:36 -0700 committer Dave Jones Thu, 08 Jun 2006 22:41:17 -0400 [AGPGART] alpha-agp warning fix drivers/char/agp/alpha-agp.c:138: warning: initialization from incompatible pointer type drivers/char/agp/alpha-agp.c:139: warning: initialization from incompatible pointer type Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit b07cd5181f3c8de8c28fdac7dbeec9e4220b8037 tree 480bdcd2ad5129bfd9e1ec216525a48a92eb3e51 parent 01af2fac9ea76513e2fba689ad580f985f32a8c3 author Andrew Morton Thu, 01 Jun 2006 20:19:35 -0700 committer Dave Jones Thu, 08 Jun 2006 22:41:16 -0400 [AGPGART] uninorth-agp warning fixes drivers/char/agp/uninorth-agp.c: In function `agp_uninorth_suspend': drivers/char/agp/uninorth-agp.c:332: warning: cast to pointer from integer of different size drivers/char/agp/uninorth-agp.c: In function `agp_uninorth_resume': drivers/char/agp/uninorth-agp.c:354: warning: cast from pointer to integer of different size Signed-off-by: Andrew Morton Signed-off-by: Dave Jones commit cac925a4aab1b7233d3beb591f53498816058a08 tree a800537068aa05fd426ff44b8efd52d66e6d2051 parent bcd618e4eac6fbf82de05d23c15ecb694c62b8af parent 6224e01dccf2543a8f8b4d825baf1510c79c2878 author Jeff Garzik Thu, 08 Jun 2006 15:56:17 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:56:17 -0400 Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp commit bcd618e4eac6fbf82de05d23c15ecb694c62b8af tree e1a85b6a5f10c7ac20ef3b3357e15c5802dca019 parent ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 parent cb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a author Jeff Garzik Thu, 08 Jun 2006 15:55:45 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:55:45 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/net/e1000/e1000_ethtool.c commit ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683 tree d770bd8c536771cb3804abb51ed029d7dd9d30d2 parent 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 parent 5c601d0c942f5aaf7f3cff7e08f61047d70a964e author Jeff Garzik Thu, 08 Jun 2006 15:48:25 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:48:25 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 862fc81b62c2d41a7e0b97b90844c80e59c7b0f1 tree 583b0c57ebd0cf99b916f7c32c4a03ea1e3f29a0 parent 987024ca9e11b5ea348e4014ac0e41fdee4f50f1 parent 2e84abe742c42f7b063b141db55e5793ce4c502c author Jeff Garzik Thu, 08 Jun 2006 15:46:38 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:46:38 -0400 Merge branch 'upstream-fixes' into upstream commit 987024ca9e11b5ea348e4014ac0e41fdee4f50f1 tree 4f10b14020029b6a6ba8db7b6a84c53749bf3748 parent 631ae320a4123898927ab1eb32ad81274a713488 author Stephen Hemminger Tue, 06 Jun 2006 10:11:15 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: version 1.6 Update version string. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 631ae320a4123898927ab1eb32ad81274a713488 tree 81c3e089f06a17efbc9f075bc8a875406492c9e2 parent 7c442fa17eabd34301598acbca8ecb99daad6027 author Stephen Hemminger Tue, 06 Jun 2006 10:11:14 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: dont allow bad hardware address from ROM Sometimes boards don't reset properly, and the address read out of the EEPROM is zero. Stop the insanity before the device gets registered. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 7c442fa17eabd34301598acbca8ecb99daad6027 tree c77ff92e3c8e2eefddbc9bab112bdc01939dc020 parent 9db96479b4e682b1bc3796873589db1f8d38a9d5 author Stephen Hemminger Tue, 06 Jun 2006 10:11:13 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: transmit complete via IRQ not NAPI The transmit side code has a number of ring problems that caused some of the Bugzilla reports. Rather than trying to fix the details, it is safer to rewrite the code that handles transmit completion and freeing. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 9db96479b4e682b1bc3796873589db1f8d38a9d5 tree 67e962fc0c1a1a0d7d9eb51fa6d684bb220ba38a parent d85b514fd9aa95d2089fa16dccc25863fb2a766c author Stephen Hemminger Tue, 06 Jun 2006 10:11:12 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: TX low water mark definition Consolidate all usage of ring low water mark to one value. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d85b514fd9aa95d2089fa16dccc25863fb2a766c tree 7a46eaf6bfa9d745e821cedc51d9deb81b2d7108 parent b10c066823c97c0e40989b2048540e85f5190501 author Stephen Hemminger Tue, 06 Jun 2006 10:11:11 -0700 committer Jeff Garzik Thu, 08 Jun 2006 15:44:54 -0400 [PATCH] skge: use workq for PHY handling Since accessing the PHY can take 100's of usecs, use a work queue to allow spinning in outside of soft/hard irq. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit b10c066823c97c0e40989b2048540e85f5190501 tree 6e1dae7c49b009a21ceb0407188d4432fe009e15 parent d15a88fc21ef225768ce31be16edfc9c6e2e02e3 author Brice Goglin Thu, 08 Jun 2006 10:25:00 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:25:22 -0400 [PATCH] myri10ge update The following patch updates the myri10ge to 1.0.0, with the following changes: * Switch to dma_alloc_coherent API. * Avoid PCI burst when writing the firmware on chipset with unaligned completions. * Use ethtool_op_set_tx_hw_csum instead of ethtool_op_set_tx_csum. * Include linux/dma-mapping.h to bring DMA_32/64BIT_MASK on all architectures (was missing at least on alpha). * Some typo and warning fixes. Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/net/myri10ge/myri10ge.c | 57 +++++++++++++++++++----------- 1 file changed, 37 insertions(+), 20 deletions(-) Signed-off-by: Jeff Garzik commit d15a88fc21ef225768ce31be16edfc9c6e2e02e3 tree d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d parent b53471711f21ba0e151075f0e1d6d531eb50f1b1 parent 1def630a6a49dda5bc89dfbd86656293640456f0 author Jeff Garzik Thu, 08 Jun 2006 15:24:46 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:24:46 -0400 Merge branch 'master' into upstream commit 6224e01dccf2543a8f8b4d825baf1510c79c2878 tree 3d4c7e59b0e1ba7ac0f5eaf211c04049feb9fe1c parent 9026729bfeb4329a4edc01f427f01af7ee0a5273 author Auke Kok Thu, 08 Jun 2006 11:15:35 -0700 committer Auke Kok Thu, 08 Jun 2006 11:15:35 -0700 [DOC] Update bonding documentation with sysfs info Bonding documentation needed an update to include sysfs specific information. This patch adds information on how to change bonding parameters at runtime using the sysfs interface. Signed-off-by: Mitch Williams Signed-off-by: Auke Kok commit 9026729bfeb4329a4edc01f427f01af7ee0a5273 tree 956f921b9511b87da6337a9f169b4b5d14590fc6 parent 2cc304923d87403abc103a741382b9af08b6decc author Auke Kok Thu, 08 Jun 2006 09:30:24 -0700 committer Auke Kok Thu, 08 Jun 2006 09:30:24 -0700 e1000: add PCI Error Recovery Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel gigabit ethernet e1000 device driver. The patch has been tested, and appears to work well. Signed-off-by: Linas Vepstas Acked-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 2cc304923d87403abc103a741382b9af08b6decc tree f14d99c13a1b8960964dcfdb6a3774c628ab7042 parent 983f27d37d4fc72c252835cb2ee3103b360735a6 author Auke Kok Thu, 08 Jun 2006 09:30:18 -0700 committer Auke Kok Thu, 08 Jun 2006 09:30:18 -0700 e100: add PCI Error Recovery Various PCI bus errors can be signaled by newer PCI controllers. This patch adds the PCI error recovery callbacks to the intel ethernet e100 device driver. The patch has been tested, and appears to work well. Signed-off-by: Linas Vepstas Acked-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 72109368de7aaa5d489d9ca4641f4a11a6fc7653 tree 0ea8bd820daf11bea34c45f319c2ea0b848d166b parent 7a532c69c37dbb46bfd0276160e624f06552adfc author Dennis Munsie Wed, 07 Jun 2006 18:53:38 +1000 committer Dave Airlie Wed, 07 Jun 2006 18:53:38 +1000 Removed hard coded EDID buffer size. Signed-off-by: Dennis Munsie Acked-by: Antonino Daplas Signed-off-by: Dave Airlie commit 5d5ff44fe6775ccb922fd1f7d478b2ba9ca95068 tree d8569caefe1cb5ecced30929ef98d3e1fe642425 parent e4a082c7c1f9a7b11fece6918e7ee5519b39ac46 author Christoph Hellwig Sat, 03 Jun 2006 13:21:13 +0200 committer James Bottomley Tue, 06 Jun 2006 11:07:25 -0400 [SCSI] fix up request buffer reference in various scsi drivers Various scsi drivers use scsi_cmnd.buffer and scsi_cmnd.bufflen in their queuecommand functions. Those fields are internal storage for the midlayer only and are used to restore the original payload after request_buffer and request_bufflen have been overwritten for EH. Using the buffer and bufflen fields means they do very broken things in error handling. Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley commit e4a082c7c1f9a7b11fece6918e7ee5519b39ac46 tree 8aa1d865b2ddfb9b897e30e97dede3268c00b582 parent f70e9c5f91f1d2d9ce79dc45221540e25b4e4ac0 author Sumant Patro Tue, 30 May 2006 12:03:37 -0700 committer James Bottomley Tue, 06 Jun 2006 10:57:18 -0400 [SCSI] megaraid_sas: switch fw_outstanding to an atomic_t This patch( originally submitted by Christoph Hellwig) removes instance_lock and changes fw_outstanding variable data type to atomic_t. Signed-off-by: Sumant Patro Signed-off-by: James Bottomley commit f70e9c5f91f1d2d9ce79dc45221540e25b4e4ac0 tree 56a1ad6b1a9d7f4c84141973beca182e80c91aac parent 3219e5294150aee7d389e19029f49b44fb6b5c9f author Mike Christie Tue, 30 May 2006 01:04:51 -0500 committer James Bottomley Mon, 05 Jun 2006 19:13:16 -0400 [SCSI] iscsi: update version to 1.0-595 Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 3219e5294150aee7d389e19029f49b44fb6b5c9f tree 44236fd9f2eb40d5622cadb126e9f2672b129486 parent 040515f53c09047c76ad074dc6a280984dc84b04 author Mike Christie Tue, 30 May 2006 00:37:28 -0500 committer James Bottomley Mon, 05 Jun 2006 19:12:25 -0400 [SCSI] iscsi: fix writepsace race We can race and misset the suspend bit if iscsi_write_space is called then iscsi_send returns with a failure indicating there is no space. To handle this this patch returns a error upwards allowing xmitworker to decide if we need to try and transmit again. For the no write space case xmitworker will not retry, and instead let iscsi_write_space queue it back up if needed (this relies on the work queue code to properly requeue us if needed). Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 040515f53c09047c76ad074dc6a280984dc84b04 tree cf7a3ed3a34b925be4a842e04bbfab34f4a8a17d parent 994442e807782d68bb1d3ae34044f95990411a22 author Mike Christie Tue, 30 May 2006 00:37:25 -0500 committer James Bottomley Mon, 05 Jun 2006 19:11:43 -0400 [SCSI] iscsi: return task found during search from davidw@netapp.com: remove task type should return a task on success. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 994442e807782d68bb1d3ae34044f95990411a22 tree 09535e792aabe72306c44c4eb8a962f1177edbf4 parent 67a611149b2ac5f4af1e36bfffbfe3198cd3712c author Mike Christie Tue, 30 May 2006 00:37:22 -0500 committer James Bottomley Mon, 05 Jun 2006 19:11:18 -0400 [SCSI] iscsi: fix run list corruption from davidw@netapp.com: We must grab the session lock when modifying the running lists. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 67a611149b2ac5f4af1e36bfffbfe3198cd3712c tree f74b70aefc16544901a3a3191bee8be8c467747d parent 9bf0a28c9a24e2cee5deecf89d118254374c75ba author Mike Christie Tue, 30 May 2006 00:37:20 -0500 committer James Bottomley Mon, 05 Jun 2006 19:10:45 -0400 [SCSI] iscsi: don't switch states when just cleaning up If recovery failed or we are in recovery only overwrite the state if we are going to terminate the session or if we logged back in. STOP_CONN_SUSPEND and conn_cnt are not used. We only support a single connection session ATM, so cleanup that code while we are working around it. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5c601d0c942f5aaf7f3cff7e08f61047d70a964e tree 0144bcb5291d5cd49192270b6ff192e21f661da7 parent ff7562aaec1e68448888572033f072fc21ef2ac8 author Pavel Machek Mon, 05 Jun 2006 16:13:30 -0400 committer John W. Linville Mon, 05 Jun 2006 16:13:30 -0400 [PATCH] wireless: move zd1201 where it belongs zd1201 is wifi adapter, yet it is hiding in drivers/usb/net where noone can find it. This moves Kconfig/Makefile zd1201 to the right place. Signed-off-by: Pavel Machek Signed-off-by: John W. Linville commit ff7562aaec1e68448888572033f072fc21ef2ac8 tree 16a39b85e2099081d9801fa0285a297199041f4d parent c4b3d1bb3206513d7f10cd60bbac97c82624c2d3 author Jason Lunz Sun, 04 Jun 2006 23:05:49 +0200 committer John W. Linville Mon, 05 Jun 2006 15:53:10 -0400 [PATCH] bcm43xx: quiet down log spam from set_security The debug logging in bcm43xx_ieee80211_set_security() is pretty noisy. Make it more silent. Signed-off-by: Jason Lunz Signed-off-by: Michael Buesch Signed-off-by: John W. Linville commit c4b3d1bb3206513d7f10cd60bbac97c82624c2d3 tree 33cd40b28136809c4fc462742c9f1519b4b2ed73 parent 6ae15df16ef3dc3f5f043e94bb2cd4aa6c7f2aa8 author Joseph Jezak Thu, 01 Jun 2006 17:12:49 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:30 -0400 [PATCH] softmac: unified capabilities computation This patch moves the capabilities field computation to a function for clarity and adds some previously unimplemented bits. Signed off by Joseph Jezak Signed-off-by: Daniel Drake Acked-By: Johannes Berg Signed-off-by: John W. Linville commit 6ae15df16ef3dc3f5f043e94bb2cd4aa6c7f2aa8 tree 4aaf3f6dd60df4dd712679e8594796dfd8322194 parent 76ea4c7f4cd319dee35934ecab57745feae58fa5 author Daniel Drake Thu, 01 Jun 2006 15:37:22 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:30 -0400 [PATCH] softmac: Fix handling of authentication failure My router blew up earlier, but exhibited some interesting behaviour during its dying moments. It was broadcasting beacons but wouldn't respond to any authentication requests. I noticed that softmac wasn't playing nice with this, as I couldn't make it try to connect to other networks after it had timed out authenticating to my ill router. To resolve this, I modified the softmac event/notify API to pass the event code to the callback, so that callbacks being notified from IEEE80211SOFTMAC_EVENT_ANY masks can make some judgement. In this case, the ieee80211softmac_assoc callback needs to make a decision based upon whether the association passed or failed. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 76ea4c7f4cd319dee35934ecab57745feae58fa5 tree 6151f9d89084a1e96f216a182ed3fc265dffd429 parent 47fbe1bf3980b41d2e18e3774e8e1094f716d2d1 author Daniel Drake Thu, 01 Jun 2006 15:34:26 +0100 committer John W. Linville Mon, 05 Jun 2006 15:51:29 -0400 [PATCH] softmac: complete shared key authentication This patch finishes of the partially-complete shared key authentication implementation in softmac. The complication here is that we need to encrypt a management frame during the authentication process. I don't think there are any other scenarios where this would have to happen. To get around this without causing too many headaches, we decided to just use software encryption for this frame. The softmac config option now selects IEEE80211_CRYPT_WEP so that we can ensure this available. This also involved a modification to some otherwise unused ieee80211 API. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 47fbe1bf3980b41d2e18e3774e8e1094f716d2d1 tree 6c6b7d7dfacfa9bff197aaa32773996f472d99a9 parent 2a8063403112030f1748e207d97d4f8654754dff author Toralf Förster Mon, 05 Jun 2006 15:48:31 -0400 committer John W. Linville Mon, 05 Jun 2006 15:48:31 -0400 [PATCH] ieee80211softmac_io.c: fix warning "defined but not used" Got this compiler warning and Johannes Berg wrote: Yeah, known 'bug', we have that code there but never use it. Feel free to submit a patch (to John Linville, CC netdev and softmac-dev) to remove it. Signed-off-by: Toralf Foerster Signed-off-by: John W. Linville commit 2a8063403112030f1748e207d97d4f8654754dff tree 5a6d789aaf243d96807a3a8431c4c741a469e318 parent f6882a0688ea83db5fc2f3491ac9fcdce0834cc7 author Pavel Machek Fri, 26 May 2006 22:07:48 +0200 committer John W. Linville Mon, 05 Jun 2006 15:34:18 -0400 [PATCH] usb wifi: zd1201 cleanups Cleanup coding style and other small stuff in zd1201. No real code changes. Signed-off-by: Pavel Machek Signed-off-by: John W. Linville commit f6882a0688ea83db5fc2f3491ac9fcdce0834cc7 tree 19a30d557610787dc0520a2955852b4882056bdb parent dea58b80f2625d3712645fb6ff0af45866cedaae parent ea9a7719597e81a119a155178eabfc941eef11cc author John W. Linville Mon, 05 Jun 2006 15:31:57 -0400 committer John W. Linville Mon, 05 Jun 2006 15:31:57 -0400 Merge branch 'upstream-fixes' into upstream commit 6ccf58ab22499139bacc683493c9fd70af55adbb tree 5fd813e5eab0f24ccf7d908380ae347df0e7123e parent 436fe7b8b4a5016ef1fcb32bff77bde84003e15d author Dave Jones Mon, 05 Jun 2006 15:25:20 -0400 committer Dave Jones Mon, 05 Jun 2006 15:25:20 -0400 [CPUFREQ] sets nforce2 minimum PLL divider to 2. Sets minimum PLL divider to 2. No negative impact when tested with two nForce2 based boards. Alexander Choporov reported (06/01/06) that xdiv = 1 does not work on his Abit NF7S2. Although there shouldn't be much cases that lead to xdiv = 1. (Updates also the (C) year) Signed-off-by: Sebastian Witt Signed-off-by: Dave Jones commit 2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142 tree a5b5e3ec2be7f9497dc991b7c7914df6fde27b98 parent aa783a8f31c79f493bd49ba926b171b79b9839fb author David Woodhouse Mon, 05 Jun 2006 20:19:05 +0100 committer David Woodhouse Mon, 05 Jun 2006 20:19:05 +0100 [RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency Since rb_insert_color() is part of the _public_ API, while the others are purely internal, switch to be consistent with that. Signed-off-by: David Woodhouse commit dea58b80f2625d3712645fb6ff0af45866cedaae tree b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d parent b1141f6d5dead296adcabd4a1e8ea2b994e287cb parent 672c6108a51bf559d19595d9f8193dfd81f0f752 author John W. Linville Mon, 05 Jun 2006 14:42:27 -0400 committer John W. Linville Mon, 05 Jun 2006 14:42:27 -0400 Merge branch 'from-linus' into upstream commit 436fe7b8b4a5016ef1fcb32bff77bde84003e15d tree e9c366a5539fbdc13febc563001e4117353a815b parent b10eec2246690f069febd3aa9578decd5ffb3f5b author Dave Jones Mon, 05 Jun 2006 14:03:50 -0400 committer Dave Jones Mon, 05 Jun 2006 14:03:50 -0400 [CPUFREQ] Make powernow-k7 work on SMP kernels. Even though powernow-k7 doesn't work in SMP environments, it can work on an SMP configured kernel if there's only one CPU present, however recalibrate_cpu_khz was returning -EINVAL on such kernels, so we failed to init the cpufreq driver. Signed-off-by: Dave Jones commit b10eec2246690f069febd3aa9578decd5ffb3f5b tree 789c892dc6c2ec4e1aca1ab52fd068815c7f4692 parent 8c362a5d62c98ee117b229c3555f402e72f5c21e author Jan Beulich Fri, 28 Apr 2006 13:47:13 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] cpufreq core {d,}printk adjustments Remove KERN_* suffixes from some cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 8c362a5d62c98ee117b229c3555f402e72f5c21e tree 14e4795b4eead7fd6cb93c54e0d0a5fa018019ad parent 0fc25dd17eaea64b21612f8e2816a4695b418100 author Jan Beulich Wed, 26 Apr 2006 15:41:22 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] dprintk adjustments to cpufreq-speedstep-centrino Remove KERN_* suffixes from some Centrino cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 0fc25dd17eaea64b21612f8e2816a4695b418100 tree 865a26fe983d26fb93296db6ce2566f1c1c95ca0 parent 1f729e0660f974cec1f0f7f4fba03ea4c2c4b9a9 author Jan Beulich Wed, 26 Apr 2006 15:40:02 +0200 committer Dave Jones Sun, 04 Jun 2006 19:47:38 -0400 [CPUFREQ] dprintk adjustments to cpufreq-nforce2 Remove KERN_* suffixes from some NForce2 cpufreq driver's dprintk-s. Signed-off-by: Jan Beulich Signed-off-by: Dave Jones commit 1f729e0660f974cec1f0f7f4fba03ea4c2c4b9a9 tree 9254031f1f252e5b38c962b3e2ed93a0351ce319 parent 911cb74bb9e77e40749abc2fca6fe74d87d940f3 author Dave Jones Sun, 04 Jun 2006 19:37:58 -0400 committer Dave Jones Sun, 04 Jun 2006 19:37:58 -0400 [CPUFREQ] Prepare powernow-k8 for future CPUs. Forthcoming AMD products will use a different algorithm for transitioning pstates than the current generation Opteron products do. The attached patch allows the powernow-k8 driver to work with those products. Signed-off-by: Mark Langsdorf Signed-off-by: Dave Jones commit d27317657ae18cfbc45def8f566e4c3ed1f51d74 tree 6523aa4dc2f3a9b8c788fba931b6cfb7a85135aa parent 7b1c6ca73aa102e9dde5098f58c523bca0f8e2c3 author David Woodhouse Sat, 03 Jun 2006 00:27:53 +0100 committer David Woodhouse Sat, 03 Jun 2006 00:27:53 +0100 Switch to __s32 types in joystick.h instead of C99 types for consistency. The rest of the file uses these types instead of C99 types. Acked-by: Dmitry Torokhov Signed-off-by: David Woodhouse commit 3bcc86f507f5a0b6f5bfa312f37ec33711558acb tree e7070dce2d59618dbf0f58f9701cef2dae6c51d7 parent e9482b4374e2596e6f3f1ab30c4ea469f4ac6311 author David Woodhouse Sat, 03 Jun 2006 00:25:50 +0100 committer David Woodhouse Sat, 03 Jun 2006 00:25:50 +0100 [JFFS2] Remove stray __exit from jffs2_compressors_exit() It's used from the initfunc in case of failure too. We could actually do with an '__initexit' for this kind of thing -- when built in to the kernel, it could do with being dropped with the init text. We _could_ actually just use __init for it, but that would break if/when we start dropping init text from modules. So let's just leave it as it was for now, and mutter a little more about random 'janitorial' fixes from people who aren't paying attention to what they're doing. Signed-off-by: David Woodhouse commit 42adb53cb36d19862a02d3087e2e3d9dab39e5fa tree cbf070073a1bedaf8ab2247864ba03269e3e7f26 parent ba8f5baba79da8eb502f8534c3a8ecb64aceb790 author Jeremy Fitzhardinge Thu, 01 Jun 2006 17:41:00 -0400 committer Len Brown Thu, 01 Jun 2006 20:42:32 -0400 ACPI: Allow a WAN module enable/disable on a Thinkpad X60. The WAN (Sierra Wireless EV-DO) module is very similar to the Bluetooth module. It appears on the USB bus when enabled. It can be controlled via hot key, or directly via ACPI. This change enables direct control via ACPI. I have tested it on my Lenovo Thinkpad X60; I guess it will probably work on other Thinkpad models which come with this module installed. Signed-off-by: Jeremy Fitzhardinge Ack'd by: Borislav Deianov Signed-off-by: Len Brown commit 911cb74bb9e77e40749abc2fca6fe74d87d940f3 tree 19e5fe6f750315a94abf5057a0ea41947f2c92bb parent 75de7d55f8e148848cadefc92140d8f083d13924 author Dave Jones Thu, 01 Jun 2006 11:38:28 -0400 committer Dave Jones Thu, 01 Jun 2006 11:38:28 -0400 [CPUFREQ] Make acpi-cpufreq 'sticky'. This prevents annoying messages being printed when it gets loaded on a machine that doesn't have support scaling via ACPI. Signed-off-by: Dave Jones commit 7b1c6ca73aa102e9dde5098f58c523bca0f8e2c3 tree af793f1552892d3d017f284843e3d85251fd8e73 parent 66643de455c27973ac31ad6de9f859d399916842 author David Woodhouse Thu, 01 Jun 2006 12:49:30 +0100 committer David Woodhouse Thu, 01 Jun 2006 12:49:30 +0100 Add to headers included for userspace in Signed-off-by: David Woodhouse Signed-off-by: Vojtech Pavlik commit c029cc66cb3d83f70c02e0c182f0eed1419f8020 tree b9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 parent 0a9cb46a73abd6c45e7c986bec984eed60c417b6 parent ba8f5baba79da8eb502f8534c3a8ecb64aceb790 author Paul Mackerras Thu, 01 Jun 2006 19:05:23 +1000 committer Paul Mackerras Thu, 01 Jun 2006 19:05:23 +1000 Merge branch 'merge' commit 75de7d55f8e148848cadefc92140d8f083d13924 tree cd25015b00d398c8274db81e9f49ea7e4570f914 parent 484944a5b002cf87b38a8f073d37afcfb8afff28 author Dave Jones Wed, 31 May 2006 16:13:14 -0400 committer Dave Jones Wed, 31 May 2006 16:13:14 -0400 [CPUFREQ] Remove strange No-op from longrun.c ORing something with zero is meaningless. ACKed-by: Dominik Brodowski Signed-off-by: Dave Jones commit 9bf0a28c9a24e2cee5deecf89d118254374c75ba tree 1a422b6e38ab0ad291f00dfb061ae3c0d9e4d1e5 parent 2b89dad0c7e3b03d45d9674ee9a7b49670df098e author Vivek Goyal Thu, 27 Apr 2006 02:33:13 -0700 committer James Bottomley Wed, 31 May 2006 10:33:49 -0500 [SCSI] kdump: mpt fusion driver initialization failure fix MPT fusion driver initialization fails while second kernel is booting, after a system crash (if kdump kernel is configured). Oops message is pasted below. ***************************************************************************** Fusion MPT base driver 3.03.08 Copyright (c) 1999-2005 LSI Logic Corporation Fusion MPT SAS Host driver 3.03.08 ACPI: PCI Interrupt 0000:01:00.0[A] -> Link [LNKA] -> GSI 5 (level, low) -> IRQ 5 mptbase: Initiating ioc0 bringup BUG: unable to handle kernel paging request at virtual address 00002608 printing eip: c11782fd *pde = 00000000 Oops: 0000 [#1] Modules linked in: CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00010046 (2.6.17-rc1-16M #2) EIP is at mptscsih_io_done+0x27/0x3a3 eax: c4fed000 ebx: c4fed000 ecx: 00002600 edx: 00000298 esi: c11782d6 edi: 00002600 ebp: 00000000 esp: c1332f74 ds: 007b es: 007b ss: 0068 Process swapper (pid: 0, threadinfo=c1332000 task=c128f9c0) Stack: <0>0000006c 00000020 00000298 00002600 c4fed000 c4fed000 c11782d6 0000260 0 00000000 c1172c49 c4fed000 c1305b40 00000005 00000000 c1172d75 c48877e0 c1029687 00000000 c1307fb8 00000000 c1305a00 00000001 00000000 c1307fb8 Call Trace: mptscsih_io_done+0x0/0x3a3 mpt_turbo_reply+0xbb/0xd3 mpt_interrupt+0x22/0x2b misrouted_irq+0x63/0xcb note_interrupt+0x43/0x98 __do_IRQ+0x68/0x8f do_IRQ+0x36/0x4e ======================= common_interrupt+0x1a/0x20 mwait_idle+0x1a/0x2a cpu_idle+0x40/0x5c start_kernel+0x17a/0x17c Code: 5e 5f 5d c3 55 89 cd 57 56 53 83 ec 14 89 54 24 0c 89 44 24 10 8b 90 cc 00 00 00 8b 4c 24 0c 81 c2 98 02 00 00 85 ed 89 54 24 08 <0f> b7 79 08 89 fe 74 04 0f b7 75 08 66 39 f7 75 0d 8b 44 24 0c ******************************************************************************* o Kdump capture kernel boot fails during initialization of MPT fusion driver. (LSI Logic / Symbios Logic SAS1064E PCI-Express Fusion-MPT SAS (rev 01)) o Problem is easily reproducible, if system crashed while some disk activity like cp operation was going on. o After a system crash, devices are not shutdown and capture kernel starts booting while skipping BIOS. Hence underlying device is left in operational state. In this case scsi contoller was left with interrupt line asserted reply FIFO was not empty. When driver starts initializing in the second kernel, it receives the interrupt the moment request_irq() is called. Interrupt handler, reads the message from reply FIFO and tries to access the associated message frame and panics, as in the new kernel's context that message frame is not valid at all. o In this scenario, probably we should delay the request_irq() call. First bring up the IOC, reset it if needed and then should register for irq. o I have tested the patch with SAS1064E and 53c1030 controllers. Signed-off-by: Vivek Goyal Signed-off-by: Andrew Morton Acked-by: "Moore, Eric Dean" Signed-off-by: James Bottomley commit d87fa38e70853a9607dc34a02d15cf5f149f49f2 tree 6afc6f8b9ff9c2c441efd61829d5d6fa6eb5698d parent 52783c5dcc8d317bc8c3e2692d366e8a305abada author Tejun Heo Wed, 31 May 2006 18:28:24 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:24 +0900 [PATCH] libata-hp: move ata_do_reset() to libata-eh.c With ops->probe_init() gone, no user is left in libata-core.c. Move ata_do_reset() to libata-eh.c and make it static. Signed-off-by: Tejun Heo commit 52783c5dcc8d317bc8c3e2692d366e8a305abada tree 328fafa2775f835329b0e9ca64bc173dba4cf2b3 parent 0542925b25676543e8384edf454668f89227e905 author Tejun Heo Wed, 31 May 2006 18:28:22 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:22 +0900 [PATCH] libata-hp: killl ops->probe_reset Now that all drivers implementing new EH are converted to new probing mechanism, ops->probe_reset doesn't have any user. Kill it. Signed-off-by: Tejun Heo commit 0542925b25676543e8384edf454668f89227e905 tree ba9add993cf4c5e0499260126f23782a75a8219d parent 4296971dd36e2c2deae0826305f591480223af88 author Tejun Heo Wed, 31 May 2006 18:28:20 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:20 +0900 [PATCH] sata_sil24: convert to new probing mechanism and add hotplug support Convert to new probing mechanism and add hotplug support by enabling PORT_IRQ_PHYRDY_CHG, marking ehi for hotplug and scheduling EH on PORT_IRQ_PHYRDY_CHG or PORT_IRQ_DEV_XCHG. Sil3124/32 family of controllers don't have any mechanism to wait for the first D2H FIS after hotplug, so ATA_FLAG_SKIP_D2H_BSY is used. Signed-off-by: Tejun Heo commit 4296971dd36e2c2deae0826305f591480223af88 tree bd3cce15c252cea18869b39da231d542a6255e59 parent e573890b00426189e1e223967a2c46fb758bf06e author Tejun Heo Wed, 31 May 2006 18:28:18 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:18 +0900 [PATCH] ahci: convert to new probing mechanism and add hotplug support Convert to new probing mechanism and add hotplug support by enabling PORT_IRQ_PHYRDY, marking ehi for hotplug and scheduling EH on CONNECT/PHYRDY interrupts. Unfortunately, ahci cannot reliably wait for the first D2H FIS after hotplug. It sometimes succeeds but times out more often than not, so ATA_FLAG_SKIP_D2H_BSY is used. This patch also fixes ahci_hardreset() such that D2H Register FIS RX area is cleared before issuing COMRESET. Without this, ata_busy_sleep() after COMRESET might prematually finish if the previous TF contains DRDY && !BSY. Signed-off-by: Tejun Heo commit e573890b00426189e1e223967a2c46fb758bf06e tree 0ab6f7f0c5561a9886cacafbb68ae0fce7e4bee0 parent ccc4672aff1861a9c80ed9e8ec11dc304b31d307 author Tejun Heo Wed, 31 May 2006 18:28:16 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:16 +0900 [PATCH] sata_sil: convert to new probing mechanism and add hotplug support Convert to new probing mechanism and add hotplug support by enabling SATA IRQ for SError.N, marking ehi for hotplug and scheduling EH on SATA IRQs. Sil3112/3512/3114 family of controllers use COMRESET as TF clearing point and can reliably wait for D2H FIS after COMRESET whether the FIS is the first D2H FIS after POR or in response to the COMRESET. Thus, setting ATA_FLAG_HRST_TO_RESUME is enough for device detection after hotplug. Signed-off-by: Tejun Heo commit ccc4672aff1861a9c80ed9e8ec11dc304b31d307 tree d8828f303749444177337b68cfe3d0abe56f78ee parent 720ba12620ee09dce269adf4ad50958adac7bb54 author Tejun Heo Wed, 31 May 2006 18:28:14 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:14 +0900 [PATCH] ata_piix: convert ata_piix to new probing mechanism Convert ata_piix to new probing mechanism. Automatic hotplug is not supported due to hardware limitation (no PHY event interrupt), but warm plugging works. Signed-off-by: Tejun Heo commit 720ba12620ee09dce269adf4ad50958adac7bb54 tree f31a8b3da52195610bd244baf42a5fe2e26b0a36 parent 3e706399b03bd237d087d731d4b1b029e546b33d author Tejun Heo Wed, 31 May 2006 18:28:13 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:13 +0900 [PATCH] libata-hp: update unload-unplug Update unload unplug - driver unloading / PCI removal. This is done by ata_port_detach() which short-circuits EH, disables all devices and freezes the port. With this patch, EH and unloading/unplugging are properly synchronized. Signed-off-by: Tejun Heo commit 3e706399b03bd237d087d731d4b1b029e546b33d tree 51a5de83f8493d1b78cc16b0fa0abcac2b37cebc parent ccf68c3405fca11386004674377d951b9b18e756 author Tejun Heo Wed, 31 May 2006 18:28:11 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:11 +0900 [PATCH] libata-hp: implement bootplug Implement bootplug - boot probing via hotplug path. While loading, ata_host_add() simply schedules probing and invokes EH. After EH completes, ata_host_add() scans and assicates them with SCSI devices. EH path is slightly modified to handle this (e.g. no autopsy during bootplug). The SCSI part is left in ata_host_add() because it's shared with legacy path and to keep probing order as before (ATA scan all ports in host_set then attach all). Signed-off-by: Tejun Heo commit ccf68c3405fca11386004674377d951b9b18e756 tree b42439454c401ab801e3fbd3b4ee872c73956725 parent 83c47bcb3c533180a6dda78152334de50065358a author Tejun Heo Wed, 31 May 2006 18:28:09 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:09 +0900 [PATCH] libata-hp: hook warmplug Hook transportt->user_scan() and hostt->slave_destroy(). Signed-off-by: Tejun Heo commit 83c47bcb3c533180a6dda78152334de50065358a tree 4bc9ac04f8c3797e49284e0b96e2d654769254ff parent 580b2102327ab8444af5bde4e70b50d268a1d558 author Tejun Heo Wed, 31 May 2006 18:28:07 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:07 +0900 [PATCH] libata-hp: implement warmplug Implement warmplug. User-initiated unplug can be detected by hostt->slave_destroy() and plug by transportt->user_scan(). This patch only implements the two callbacks. The next function will hook them. Signed-off-by: Tejun Heo commit 580b2102327ab8444af5bde4e70b50d268a1d558 tree 01389e898e09dbaddb06405b182116b9be0e6d59 parent 084fe639b81c4d418a2cf714acb0475e3713cb73 author Tejun Heo Wed, 31 May 2006 18:28:05 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:05 +0900 [PATCH] libata-hp: implement SCSI part of hotplug Implement SCSI part of hotplug. This must be done in a separate context as SCSI makes use of EH during probing. SCSI scan fails silently if EH is in progress. In such cases, libata pauses briefly and retries until every device is attached. Signed-off-by: Tejun Heo commit 084fe639b81c4d418a2cf714acb0475e3713cb73 tree 55afc26dbb866488b69e49b1742863d1293f6612 parent 0ea035a3d1ad948096e205f08f350c03d5cea453 author Tejun Heo Wed, 31 May 2006 18:28:03 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:03 +0900 [PATCH] libata-hp: implement hotplug Implement ATA part of hotplug. To avoid probing broken devices over and over again, disabled devices are not automatically detached. They are detached only if probing is requested for the device or the associated port is offline. Also, to avoid infinite probing loop, Each device is probed only once per EH run. As SATA PHY status is fragile, devices are detached only after it has used up its recovery chances unless explicitly requested by LLDD or user (LLDD may request direct detach if, for example, it supports cold presence detection). Signed-off-by: Tejun Heo commit 0ea035a3d1ad948096e205f08f350c03d5cea453 tree fd003f929ab079f0852e3709436ca30a18265a39 parent e8e008e7b5ed8c65675cc9b3e778b8bb909f65ab author Tejun Heo Wed, 31 May 2006 18:28:01 +0900 committer Tejun Heo Wed, 31 May 2006 18:28:01 +0900 [PATCH] libata-hp: implement ata_eh_detach_dev() Implement ata_eh_detach_dev(). This function is responsible for detaching an ATA device and offlining the associated SCSI device atomically so that the detached device is not accessed after ATA detach is complete. Signed-off-by: Tejun Heo commit e8e008e7b5ed8c65675cc9b3e778b8bb909f65ab tree 88ab9cff204c3a09630b145835bb0f7576a72791 parent 135da34573f6d3bab2976a75063f7232a4311a74 author Tejun Heo Wed, 31 May 2006 18:27:59 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:59 +0900 [PATCH] sata_sil24: update sil24_hardreset() Use phy debouncing instead of unconditional wait after DEV_RST and make sil24_hardreset() to request followup SRST as that's the only way to wait for !BSY. Note that the original implementation never worked - if the cached status was !BSY, ata_busy_sleep() finished immediately; otherwise, it timed out regardless of the actual device status. Signed-off-by: Tejun Heo commit 135da34573f6d3bab2976a75063f7232a4311a74 tree 7650320dc0136bbd4b2df640f9f8300eb87c4abb parent cbe88fbc72d9e1aa4a6f994cb6e19fa08ae5a0ba author Tejun Heo Wed, 31 May 2006 18:27:57 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:57 +0900 [PATCH] sata_sil24: rename PORT_PRB to PORT_LRAM and add PORT_LRAM_SLOT_SZ PORT_PRB is a misnomer as the area also contains other stuff. Rename it to PORT_LRAM and add PORT_LRAM_SLOT_SZ. Signed-off-by: Tejun Heo commit cbe88fbc72d9e1aa4a6f994cb6e19fa08ae5a0ba tree 117fce53d60b1f08346ee9fa64c6b0c6fe72b4bf parent 20888d83687d5cb374cdb5b0afa746ab79666f4e author Tejun Heo Wed, 31 May 2006 18:27:55 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:55 +0900 [PATCH] sata_sil: new interrupt handler The DMA complete bit of these controllers reflects ATA IRQ status while no DMA command is in progress. So, we can tell whether the controller is raising an interrupt or not in deterministic manner. This patch gives sata_sil its own interrupt handler which behaves much better than the original one in terms of error detection and handling. This change is also necessary for later hotplug support. Further improvements are possible, in both 2 and 4 ports versions, we can get all status with only one readl and using custom bmdma operations can further cut down register accesses. Signed-off-by: Tejun Heo commit 20888d83687d5cb374cdb5b0afa746ab79666f4e tree 7101992452740b728cf54481c8555d5acf49b76a parent 9a1004d0c11be41c83d06a67dfe74567a41ae582 author Tejun Heo Wed, 31 May 2006 18:27:53 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:53 +0900 [PATCH] sata_sil: add new constants in preparation for new interrupt handler sata_sil is about to get a brand new interrupt handler. Add relevant constants. Signed-off-by: Tejun Heo commit 9a1004d0c11be41c83d06a67dfe74567a41ae582 tree 759f686bb1d2999b56b2b91c30c9d62480156965 parent 664faf09a05d74085c0b31e2c621d7647322325b author Tejun Heo Wed, 31 May 2006 18:27:52 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:52 +0900 [PATCH] libata: export ata_hsm_move() ata_hsm_move() will be used by LLDDs which depend on standard PIO HSM but implement their own interrupt handlers. Signed-off-by: Tejun Heo commit 664faf09a05d74085c0b31e2c621d7647322325b tree 6506775bb94e7e99f1730f4fd50eb2f3f7359620 parent f5914a461eb9703773226a0813f6ffcae10c0861 author Tejun Heo Wed, 31 May 2006 18:27:50 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:50 +0900 [PATCH] libata-hp-prep: implement followup softreset handling In some cases, hardreset must be followed by SRST. * some controllers can't classify with hardreset * some controllers can't wait for !BSY after hardreset (LLDD should explicitly request followup softreset by returning -EAGAIN) * (later) PM needs SRST w/ PMP==15 to operate after hardreset To handle above cases, this patch implements follow-up softreset. After a hardreset, ata_eh_reset() checks whether any of above conditions are met and do a follow-up softreset if necessary. Signed-off-by: Tejun Heo commit f5914a461eb9703773226a0813f6ffcae10c0861 tree 3441af53250530c3135a8fa55f06dd7bc62da037 parent d7bb4cc7575929a60b0a718daa1bce87bea9a9cc author Tejun Heo Wed, 31 May 2006 18:27:48 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:48 +0900 [PATCH] libata-hp-prep: add prereset() method and implement ata_std_prereset() With hotplug, every reset might be a probing reset and thus something similar to probe_init() is needed. prereset() method is called before a series of resets to a port and is the counterpart of postreset(). prereset() can tell EH to use different type of reset or skip reset by modifying ehc->i.action. This patch also implements ata_std_prereset(). Most controllers should be able to use this function directly or with some wrapping. After hotplug, different controllers need different actions to resume the PHY and detect the newly attached device. Controllers can be categorized as follows. * Controllers which can wait for the first D2H FIS after hotplug. Note that if the waiting is implemented by polling TF status, there needs to be a way to set BSY on PHY status change. It can be implemented by hardware or with the help of the driver. * Controllers which can wait for the first D2H FIS after sending COMRESET. These controllers need to issue COMRESET to wait for the first FIS. Note that the received D2H FIS could be the first D2H FIS after POR (power-on-reset) or D2H FIS in response to the COMRESET. Some controllers use COMRESET as TF status synchronization point and clear TF automatically (sata_sil). * Controllers which cannot wait for the first D2H FIS reliably. Blindly issuing SRST to spinning-up device often results in command issue failure or timeout, causing extended delay. For these controllers, ata_std_prereset() explicitly waits ATA_SPINUP_WAIT (currently 8s) to give newly attached device time to spin up, then issues reset. Note that failing to getting ready in ATA_SPINUP_WAIT is not critical. libata will retry. So, the timeout needs to be long enough to spin up most devices. LLDDs can tell ata_std_prereset() which of above action is needed with ATA_FLAG_HRST_TO_RESUME and ATA_FLAG_SKIP_D2H_BSY flags. These flags are PHY-specific property and will be moved to ata_link later. While at it, this patch unifies function typedef's such that they all have named arguments. Signed-off-by: Tejun Heo commit d7bb4cc7575929a60b0a718daa1bce87bea9a9cc tree ff4cd9715f5ba608795bc4a1b7b86ffd2cf4f99c parent a9beec95352ff675f27d74c3cb97dc258d022497 author Tejun Heo Wed, 31 May 2006 18:27:46 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:46 +0900 [PATCH] libata-hp-prep: implement sata_phy_debounce() With hotplug, PHY always needs to be debounced before a reset as any reset might find new devices. Extract PHY waiting code from sata_phy_resume() and extend it to include SStatus debouncing. Note that sata_phy_debounce() is superset of what used to be done inside sata_phy_resume(). Three default debounce timing parameters are defined to be used by hot/boot plug. As resume failure during probing will be properly handled as errors, timeout doesn't have to be long as before. probeinit() uses the same timeout to retain the original behavior. Signed-off-by: Tejun Heo commit a9beec95352ff675f27d74c3cb97dc258d022497 tree f301e31e3a9648bd6e2f4050a44b4e89aebe0f18 parent 453b07accb47c5b54aa2f156ebffac63c543027b author Tejun Heo Wed, 31 May 2006 18:27:44 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:44 +0900 [PATCH] libata-hp-prep: make probing related functions global Hotplug will be implemented in libata-eh.c. Make ata_dev_read_id() and ata_dev_configure() global. Signed-off-by: Tejun Heo commit 453b07accb47c5b54aa2f156ebffac63c543027b tree a08ee98bab64b1d92a9856e086c87de53012b6fc parent 3edebac41bab7e146578ad9e723ee7fff71c99c0 author Tejun Heo Wed, 31 May 2006 18:27:42 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:42 +0900 [PATCH] libata-hp-prep: add ata_aux_wq It's best to run ATA hotplug from EH but attaching SCSI devices needs working EH. ata_aux_wq is used to give SCSI hotplug operations a separate context. Signed-off-by: Tejun Heo commit 3edebac41bab7e146578ad9e723ee7fff71c99c0 tree c5f1276f7c0e93b51ad67b12e241b37c05f4f38a parent 5a04bf4befa8bffa012eedc3a0903c158b9131a9 author Tejun Heo Wed, 31 May 2006 18:27:40 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:40 +0900 [PATCH] libata-hp-prep: store attached SCSI device Add device persistent field dev->sdev and store the attached SCSI device. With hotplug, libata needs to know the attached SCSI device to offline and detach it, but scsi_device_lookup() cannot be used because libata will reuse SCSI ID numbers - dead but not gone devices (due to zombie opens, etc...) interfere with the lookup. dev->sdev doesn't hold reference to the SCSI device. It's cleared when the SCSI device goes away. Signed-off-by: Tejun Heo commit 5a04bf4befa8bffa012eedc3a0903c158b9131a9 tree 7145c99e6df311a6d732fc3569d9a048829f92ba parent 315343637b988ac32d730a6a9f7bf5866838bcb0 author Tejun Heo Wed, 31 May 2006 18:27:38 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:38 +0900 [PATCH] libata-hp-prep: implement ap->hw_sata_spd_limit Add ap->hw_sata_spd_limit and initialize it once during the boot initialization (or driver load initialization). ap->sata_spd_limit is reset to ap->hw_sata_spd_limit on hotplug. This prevents spd limits introduced by earlier devices from affecting new devices. Signed-off-by: Tejun Heo commit 315343637b988ac32d730a6a9f7bf5866838bcb0 tree 2e6660fa9d30127cd9fe88149219b75ee2c3ce3f parent ab5b3a5b2d887ce63f8c6a7fcb9f5c07ca4b4d43 author Tejun Heo Wed, 31 May 2006 18:27:36 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:36 +0900 [PATCH] libata-hp-prep: use __ata_scsi_find_dev() Convert direct sdev -> dev lookup to __ata_scsi_find_dev(). Signed-off-by: Tejun Heo commit ab5b3a5b2d887ce63f8c6a7fcb9f5c07ca4b4d43 tree 397504068ad90818ee6e553438e89bc429acd5fb parent 72fa4b742b327bd1b07985d79a61c61dbd9fd4e6 author Tejun Heo Wed, 31 May 2006 18:27:34 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:34 +0900 [PATCH] libata-hp-prep: update ata_scsi_find_dev() and friends Separate out ata_find_dev() and __ata_scsi_find_dev() from ata_scsi_find_dev(). These will be used by later hotplug implementation. Signed-off-by: Tejun Heo commit 72fa4b742b327bd1b07985d79a61c61dbd9fd4e6 tree 50d95fcf58e709b12510151e8e1cae8d8cb2538e parent 3ef3b43d5633d30fa3f033f62094ec2e9c5b8376 author Tejun Heo Wed, 31 May 2006 18:27:32 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:32 +0900 [PATCH] libata-hp-prep: make some ata_device fields persistent Lifetimes of some fields span over device plugging/unplugging. This patch moves such persistent fields to the top of ata_device and separate them with ATA_DEVICE_CLEAR_OFFSET. Fields above the offset are initialized once during host initializatino while all other fields are cleared before hotplugging. Currently ->ap, devno and part of flags are persistent. Note that flags is partially cleared while holding host_set lock. This is to synchronize with later warm plug implementation which will record hotplug request in dev->flags. Signed-off-by: Tejun Heo commit 3ef3b43d5633d30fa3f033f62094ec2e9c5b8376 tree 815ba1afeb202834667e1dff08fa69b63ec0628f parent abdda7331d469fa965167365f011d05e226008fb author Tejun Heo Wed, 31 May 2006 18:27:30 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:30 +0900 [PATCH] libata-hp-prep: implement ata_dev_init() Move initialization of struct ata_device into ata_dev_init() in preparation for hotplug. This patch calls ata_dev_init() from ata_host_init() and thus makes no functional difference. Signed-off-by: Tejun Heo commit abdda7331d469fa965167365f011d05e226008fb tree ce2c66d01eba2b6a383080d6d3812884c6418e6a parent c6cf9e99d1de5ca6a08fb639bb73031ffe50d802 author Tejun Heo Wed, 31 May 2006 18:27:29 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:29 +0900 [PATCH] libata-hp-prep: add flags and eh_info/context fields for hotplug Add hotplug related flags and eh_info/context fields. Signed-off-by: Tejun Heo commit c6cf9e99d1de5ca6a08fb639bb73031ffe50d802 tree 555a47d45b5b80ef14ff53ccb4c6d1439460e251 parent 7395acb2c840fd4d0cacc91d6fb71440057141ab author Tejun Heo Wed, 31 May 2006 18:27:27 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:27 +0900 [PATCH] libata: implement ata_eh_wait() Implement ata_eh_wait(). On return from this function, it's guaranteed that the EH which was pending or in progress when the function was called is complete - including the tailing part of SCSI EH. This will be used by hotplug and others to synchronize with EH. Signed-off-by: Tejun Heo commit 7395acb2c840fd4d0cacc91d6fb71440057141ab tree 29ea31b15be4cbcb44321eda2e607ea984adfd57 parent 20952b699035448d2277c64efc5910a31be66ed1 author Tejun Heo Wed, 31 May 2006 18:27:25 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:25 +0900 [PATCH] libata: shift host flag constants Nudge host flag constants to make a room after ATA_FLAG_EH_PENDING. New EH flag will be added. Signed-off-by: Tejun Heo commit 20952b699035448d2277c64efc5910a31be66ed1 tree a2fab9d516ce200ebc8cf72cda214ec447e0d5d9 parent ef2824073fba9def3cf122e89cc485f66dd71f70 author Tejun Heo Wed, 31 May 2006 18:27:23 +0900 committer Tejun Heo Wed, 31 May 2006 18:27:23 +0900 [PATCH] libata: set PIO-0 after successful EH reset Set ata_device->pio_mode to XFER_PIO_0 after a successful reset. This is to keep EH resets consistent with probe resets as updated by the commit b6079ca409bf88c248992e96510dd6f610f7ed89. Note that, with soon-to-follow hotplug update, EH resets will include probe resets. Signed-off-by: Tejun Heo commit 01af2fac9ea76513e2fba689ad580f985f32a8c3 tree d43148c46bc3fcf25b61813751f253953d7a31ce parent 89197e34ea63d7f619dade525de8e69a15f40405 author Dave Jones Tue, 30 May 2006 18:22:07 -0400 committer Dave Jones Tue, 30 May 2006 18:22:07 -0400 [AGPGART] Remove pointless initialisation in intel-agp Signed-off-by: Dave Jones commit 89197e34ea63d7f619dade525de8e69a15f40405 tree 217fb21dc00b3172e64ebe127f233ebf62e08e31 parent e60a48f5ab35737118e19bc965c640900a842f02 author Dave Jones Tue, 30 May 2006 18:19:39 -0400 committer Dave Jones Tue, 30 May 2006 18:19:39 -0400 [AGPGART] Remove pointless code from agp_generic_create_gatt_table() Signed-off-by: Dave Jones commit 484944a5b002cf87b38a8f073d37afcfb8afff28 tree 40a960d5b4bee4ea5e4bafb2f1017f5d98484b87 parent 5557976ca97c3a3002805f575a45ad354e1050ff author Dave Jones Tue, 30 May 2006 18:09:31 -0400 committer Dave Jones Tue, 30 May 2006 18:09:31 -0400 [CPUFREQ] Remove more freq_table reinitialisations. Signed-off-by: Dave Jones commit 5557976ca97c3a3002805f575a45ad354e1050ff tree 7357b8341c36e7f4448e71cc8ae37a448e81cf4b parent 355eb318018c6f44a335b0e5efb1f3bf2f1685d0 author Dave Jones Tue, 30 May 2006 17:59:48 -0400 committer Dave Jones Tue, 30 May 2006 17:59:48 -0400 [CPUFREQ] Fix another redundant initialisation in freq_table Signed-off-by: Dave Jones commit 355eb318018c6f44a335b0e5efb1f3bf2f1685d0 tree 278afd3f9be8f7ac3c58d1fa4d37d73569bb410c parent 511e9ee17099c6ebe315c0524b8b482d4767ab3d author Dave Jones Tue, 30 May 2006 17:58:41 -0400 committer Dave Jones Tue, 30 May 2006 17:58:41 -0400 [CPUFREQ] Remove duplicate assignment in freq_table Signed-off-by: Dave Jones commit 511e9ee17099c6ebe315c0524b8b482d4767ab3d tree 7eb8bb99ddfbe5dfe4cd96735275405c7efcccc2 parent 851777b7b686c80e417fd811cdea3e5aa5305745 author Dave Jones Tue, 30 May 2006 17:57:14 -0400 committer Dave Jones Tue, 30 May 2006 17:57:14 -0400 [CPUFREQ] CodingStyle nits in cpufreq_stats.c Signed-off-by: Dave Jones commit 851777b7b686c80e417fd811cdea3e5aa5305745 tree f5aef4b3d86b0a2077a998a6ab44d8c67a9c355d parent b6571da9f328999a6bce429b5f614a3d64b926ee author Dave Jones Tue, 30 May 2006 17:55:01 -0400 committer Dave Jones Tue, 30 May 2006 17:55:01 -0400 [CPUFREQ] Remove duplicate assignment from cpufreq-nforce2 Signed-off-by: Dave Jones commit b6571da9f328999a6bce429b5f614a3d64b926ee tree ef017bddd20db6e0363575ed77c1c4fa524edfa2 parent 83844510ec9dc89a676e71d3cc28289905c2caec author Dave Jones Tue, 30 May 2006 17:50:22 -0400 committer Dave Jones Tue, 30 May 2006 17:50:22 -0400 [CPUFREQ] Remove pointless reinitialisations in acpi-cpufreq Signed-off-by: Dave Jones commit 83844510ec9dc89a676e71d3cc28289905c2caec tree a90113ca845785c4f014683f6f85aa8464d01ceb parent 8eebf1a4c3682f71dbda3348abfcdd4d2a751fd3 author Dave Jones Tue, 30 May 2006 17:43:54 -0400 committer Dave Jones Tue, 30 May 2006 17:43:54 -0400 [CPUFREQ] Remove pointless reinitialisation from powernow-k8 This var is already set at entry to the function. Signed-off-by: Dave Jones commit 8eebf1a4c3682f71dbda3348abfcdd4d2a751fd3 tree 49527b033c491cccef897054dfdcbc62baf35aac parent e2aa8732ac11570acddf326874a34ab684752e34 author Dave Jones Tue, 30 May 2006 17:40:16 -0400 committer Dave Jones Tue, 30 May 2006 17:40:16 -0400 [CPUFREQ] Remove redundant initialisation from longhaul. Signed-off-by: Dave Jones commit e2aa8732ac11570acddf326874a34ab684752e34 tree 968a22e50a92b280ada993d5e92c6f2d3d120b57 parent 8cbe0169053ffa185ad349088eb0901946c14a09 author Dave Jones Tue, 30 May 2006 17:37:15 -0400 committer Dave Jones Tue, 30 May 2006 17:37:15 -0400 [CPUFREQ] Clean up longhaul's speed pretty-printer Getting ready to move to core cpufreq. - Use snprintf - Remove unnecessary nesting improving readability. Signed-off-by: Dave Jones commit 8cbe0169053ffa185ad349088eb0901946c14a09 tree efb5c0ab82e411027499a7f133eeecf79dad6f99 parent 2e3f8faaa73f5065ae653a84997b5cd4d5876e1a author Dave Jones Tue, 30 May 2006 17:26:08 -0400 committer Dave Jones Tue, 30 May 2006 17:26:08 -0400 [CPUFREQ] Disambiguate loop indexes in powernow-k7 This shouldn't have actually caused any problems (as we return if we 'corrupt' 'i', but it's still not very pretty. For the sake of adding another local variable, this got cleaner. Signed-off-by: Dave Jones commit 2e3f8faaa73f5065ae653a84997b5cd4d5876e1a tree 76c120be357ec972173df880ac9211914f040bce parent e60a48f5ab35737118e19bc965c640900a842f02 author Dave Jones Tue, 30 May 2006 17:25:14 -0400 committer Dave Jones Tue, 30 May 2006 17:25:14 -0400 [CPUFREQ] Typo in powernow-k8 (Also fix some horked indentation) Signed-off-by: Dave Jones commit e9482b4374e2596e6f3f1ab30c4ea469f4ac6311 tree 526893a35e432f7ae2be6300a134c5c7c79aaba6 parent 73c619ea0e49c9306afa7ea53c3362fbc56ffd70 author Joern Engel Tue, 30 May 2006 14:25:46 +0200 committer Joern Engel Tue, 30 May 2006 14:25:46 +0200 [MTD] Allow alternate JFFS2 mount variant for root filesystem. With this patch, "root=mtd3" and "root=mtd:foo" work for a JFFS2 rootfs. Signed-off-by: Joern Engel commit 73c619ea0e49c9306afa7ea53c3362fbc56ffd70 tree d71189bae015f56bf72e7421d4cf1a307b3c1fb8 parent 92cbfdcc3661d7670b01b92b89811cd3a2412297 author Joern Engel Tue, 30 May 2006 14:25:35 +0200 committer Joern Engel Tue, 30 May 2006 14:25:35 +0200 [MTD] Disconnect struct mtd_info from ABI mtdchar.c direcly copied part of struct mtd_info to userspace, thereby implicitly making it part of the ABI. With this patch, struct mtd_info is independent of the ABI and can have its fields removed, reordered, etc. Signed-off-by: Joern Engel commit 92cbfdcc3661d7670b01b92b89811cd3a2412297 tree 70e4c9a94a121594e58a57c4c454ac854bb10a3a parent e369d62e92d526a7ed641e2f0b2978fb0ce366c5 author Joern Engel Tue, 30 May 2006 14:25:24 +0200 committer Joern Engel Tue, 30 May 2006 14:25:24 +0200 [MTD] replace MTD_RAM with MTD_GENERIC_TYPE Ram devices get the extra capability of MTD_NO_ERASE - not requiring an explicit erase before writing to it. Currently only mtdblock uses this capability. Rest of the patch is a simple text replacement. Signed-off-by: Joern Engel commit e369d62e92d526a7ed641e2f0b2978fb0ce366c5 tree 472a4b65509c725a84ca9ecc61516cc904189029 parent e1219724be193519f20743f5500bd1eff11890d0 author Joern Engel Tue, 30 May 2006 14:25:17 +0200 committer Joern Engel Tue, 30 May 2006 14:25:17 +0200 [MTD] replace MTD_ROM with MTD_GENERIC_TYPE No mtd user should ever check for the device type. Instead, device features should be checked by the flags - if at all. As a first step towards type removal, change MTD_ROM into MTD_GENERIC_TYPE. Signed-off-by: Joern Engel commit e1219724be193519f20743f5500bd1eff11890d0 tree 861e93f4c42000f0de3f348d4941b50a30bbc6e4 parent 7e9a0bb00c4ccb7a05c41b2728758d5bb3dd54fc author Joern Engel Tue, 30 May 2006 14:25:05 +0200 committer Joern Engel Tue, 30 May 2006 14:25:05 +0200 [MTD] remove a forgotten MTD_XIP MTD_XIP definition was removed in an earlier patch. This invocation was left by mistake. Signed-off-by: Joern Engel commit 7e9a0bb00c4ccb7a05c41b2728758d5bb3dd54fc tree 40131aa37bf424530108d4a88f494fc6ba98dff7 parent 098a19811b483f8e047d8292641c88e776452de0 author Andrew Morton Tue, 30 May 2006 09:06:41 +0100 committer David Woodhouse Tue, 30 May 2006 09:06:41 +0100 [MTD] Fix build warnings (and debug build error) in nand_base.c drivers/mtd/nand/nand_base.c: In function 'nand_transfer_oob': drivers/mtd/nand/nand_base.c:909: warning: comparison of distinct pointer types lacks a cast drivers/mtd/nand/nand_base.c: In function 'nand_do_read_oob': drivers/mtd/nand/nand_base.c:1097: error: 'len' undeclared (first use in this function) drivers/mtd/nand/nand_base.c:1097: error: (Each undeclared identifier is reported only once drivers/mtd/nand/nand_base.c:1097: error: for each function it appears in.) drivers/mtd/nand/nand_base.c: In function 'nand_fill_oob': drivers/mtd/nand/nand_base.c:1411: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse commit 098a19811b483f8e047d8292641c88e776452de0 tree fc12a477f7f46aa7339d5e8ae86ed883ce79c90a parent 13ba42df4a385d7b77d7aac32b93bdcd73e6d6e1 author David Woodhouse Tue, 30 May 2006 09:00:14 +0100 committer David Woodhouse Tue, 30 May 2006 09:00:14 +0100 [JFFS2] Preallocate node refs for cleanmarker in summary scan Signed-off-by: David Woodhouse commit 13ba42df4a385d7b77d7aac32b93bdcd73e6d6e1 tree 55aedef4dfd7d29aaf46fe8983f95a7966a00bc4 parent f1a28c02843efcfcc41982149880bac3ac180234 author David Woodhouse Tue, 30 May 2006 08:59:34 +0100 committer David Woodhouse Tue, 30 May 2006 08:59:34 +0100 [JFFS2] Fix calculation of potential summary marker offset on NOR flash. Helps if we look _inside_ the buffer, rather than adding jeb->offset to it. Doh. Signed-off-by: David Woodhouse commit f1a28c02843efcfcc41982149880bac3ac180234 tree b15ca1a140e463ef3cde6b9a8591e7be172ee1f1 parent 9a1fcdfd4bee27c418424cac47abf7c049541297 author Thomas Gleixner Tue, 30 May 2006 00:37:34 +0200 committer Thomas Gleixner Tue, 30 May 2006 00:37:34 +0200 [MTD] NAND Expose the new raw mode function and status info to userspace The raw read/write access to NAND (without ECC) has been changed in the NAND rework. Expose the new way - setting the file mode via ioctl - to userspace. Also allow to read out the ecc statistics information so userspace tools can see that bitflips happened and whether errors where correctable or not. Also expose the number of bad blocks for the partition, so nandwrite can check if the data fits into the parition before writing to it. Signed-off-by: Thomas Gleixner commit 9a1fcdfd4bee27c418424cac47abf7c049541297 tree 5baa5f1e1d1a296a319bf6a5a4b636668c107e00 parent 8593fbc68b0df1168995de76d1af38eb62fd6b62 author Thomas Gleixner Mon, 29 May 2006 14:56:39 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:51 +0200 [MTD] NAND Signal that a bitflip was corrected by ECC Return -EUCLEAN on read when a bitflip was detected and corrected, so the clients can react and eventually copy the affected block to a spare one. Make all in kernel users aware of the change. Signed-off-by: Thomas Gleixner commit 8593fbc68b0df1168995de76d1af38eb62fd6b62 tree dd244def53d2be4f1fbff9f74eac404fab8e240f parent f4a43cfcecfcaeeaa40a9dbc1d1378298c22446e author Thomas Gleixner Mon, 29 May 2006 03:26:58 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:51 +0200 [MTD] Rework the out of band handling completely Hopefully the last iteration on this! The handling of out of band data on NAND was accompanied by tons of fruitless discussions and halfarsed patches to make it work for a particular problem. Sufficiently annoyed by I all those "I know it better" mails and the resonable amount of discarded "it solves my problem" patches, I finally decided to go for the big rework. After removing the _ecc variants of mtd read/write functions the solution to satisfy the various requirements was to refactor the read/write _oob functions in mtd. The major change is that read/write_oob now takes a pointer to an operation descriptor structure "struct mtd_oob_ops".instead of having a function with at least seven arguments. read/write_oob which should probably renamed to a more descriptive name, can do the following tasks: - read/write out of band data - read/write data content and out of band data - read/write raw data content and out of band data (ecc disabled) struct mtd_oob_ops has a mode field, which determines the oob handling mode. Aside of the MTD_OOB_RAW mode, which is intended to be especially for diagnostic purposes and some internal functions e.g. bad block table creation, the other two modes are for mtd clients: MTD_OOB_PLACE puts/gets the given oob data exactly to/from the place which is described by the ooboffs and ooblen fields of the mtd_oob_ops strcuture. It's up to the caller to make sure that the byte positions are not used by the ECC placement algorithms. MTD_OOB_AUTO puts/gets the given oob data automaticaly to/from the places in the out of band area which are described by the oobfree tuples in the ecclayout data structre which is associated to the devicee. The decision whether data plus oob or oob only handling is done depends on the setting of the datbuf member of the data structure. When datbuf == NULL then the internal read/write_oob functions are selected, otherwise the read/write data routines are invoked. Tested on a few platforms with all variants. Please be aware of possible regressions for your particular device / application scenario Disclaimer: Any whining will be ignored from those who just contributed "hot air blurb" and never sat down to tackle the underlying problem of the mess in the NAND driver grown over time and the big chunk of work to fix up the existing users. The problem was not the holiness of the existing MTD interfaces. The problems was the lack of time to go for the big overhaul. It's easy to add more mess to the existing one, but it takes alot of effort to go for a real solution. Improvements and bugfixes are welcome! Signed-off-by: Thomas Gleixner commit f4a43cfcecfcaeeaa40a9dbc1d1378298c22446e tree 5647ebccb720c9d8ca314c8a3a5f6a660d000019 parent 5bd34c091a044d130601370c370f84b1c59f1627 author Thomas Gleixner Sun, 28 May 2006 11:01:53 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:50 +0200 [MTD] Remove silly MTD_WRITE/READ macros Most of those macros are unused and the used ones just obfuscate the code. Remove them and fixup all users. Signed-off-by: Thomas Gleixner commit 5bd34c091a044d130601370c370f84b1c59f1627 tree 8b08012a9a30186a8805d506f8438e2944f5f31b parent ff268fb8791cf18df536113355d7184007c269d9 author Thomas Gleixner Sat, 27 May 2006 22:16:10 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:50 +0200 [MTD] NAND Replace oobinfo by ecclayout The nand_oobinfo structure is not fitting the newer error correction demands anymore. Replace it by struct nand_ecclayout and fixup the users all over the place. Keep the nand_oobinfo based ioctl for user space compability reasons. Signed-off-by: Thomas Gleixner commit ff268fb8791cf18df536113355d7184007c269d9 tree 3a7d9fc72b28f5a0f11a2f8b08174b1bee6ea20d parent 8be834f76291fdcc0614cb84926c6910b9f2ecbc author Thomas Gleixner Sat, 27 May 2006 20:36:12 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:49 +0200 [MTD] NAND Consolidate oobinfo handling The info structure for out of band data was copied into the mtd structure. Make it a pointer and remove the ability to set it from userspace. The position of ecc bytes is defined by the hardware and should not be changed by software. Signed-off-by: Thomas Gleixner commit 8be834f76291fdcc0614cb84926c6910b9f2ecbc tree c982bac1ebe520e7f6c17291887ff8b1c2219180 parent 19676ff0a64af9d75d48f17cb67bee8110f6ffbf author Thomas Gleixner Sat, 27 May 2006 20:05:26 +0200 committer Thomas Gleixner Mon, 29 May 2006 15:06:49 +0200 [MTD] NAND Fix platform structure and NDFC driver The platform structure was lacking an oobinfo field. The NDFC driver had some remains from another tree. Signed-off-by: Thomas Gleixner commit 19676ff0a64af9d75d48f17cb67bee8110f6ffbf tree 3dffe9a2a0696c084d90501862866fb24a0d5687 parent 33280eac704e3e156eef2fa9ed9ddf427a1c223c author Andrew Morton Mon, 29 May 2006 11:33:33 +0100 committer David Woodhouse Mon, 29 May 2006 11:33:33 +0100 [MTD] Fix debug printk format warning in m25p80 SPI chip driver, again. Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 33280eac704e3e156eef2fa9ed9ddf427a1c223c tree c9bafe50a595e7ea5472b65f7b7cdf44b7b4aa21 parent a6a8bef722875a95bb73e6de7da924a8d417b52c author David Woodhouse Mon, 29 May 2006 11:24:29 +0100 committer David Woodhouse Mon, 29 May 2006 11:24:29 +0100 [MTD] AMD Geode NAND support can depend on X86_32; we won't see it on x86_64 Signed-off-by: David Woodhouse commit 7a532c69c37dbb46bfd0276160e624f06552adfc tree f397e591c22fc727c0784d0754f22f4a09de476b parent 56e004e5435c008728b1444b51d757da2e098976 author Dennis Munsie Mon, 29 May 2006 18:58:09 +1000 committer Dave Airlie Mon, 29 May 2006 18:58:09 +1000 intelfb: use regular modedb table instead of VESA intelfb driver -- use the regular modedb table instead of the VESA modedb table. Ideally, the 9xx stride patch should be applied first, since there are modes in the VESA table that won't work without that patch. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 56e004e5435c008728b1444b51d757da2e098976 tree 2c68226e34c739e1802aa07166ae0161ce72eb23 parent 080a416802153dbbb20ab4f4fa1225867096d071 author Antonino A. Daplas Mon, 29 May 2006 18:49:08 +1000 committer Dave Airlie Mon, 29 May 2006 18:49:08 +1000 intelfb: use firmware EDID for mode database Use firmware EDID for the driver's private mode database. Signed-off-by: Antonino Daplas Cc: Sylvain Meyer Signed-off-by: Andrew Morton Signed-off-by: Dave Airlie commit 080a416802153dbbb20ab4f4fa1225867096d071 tree 519f0ae3e845403b237c4a16ed8e3eaa5e3a165a parent 65eb2f97db17f6f6a92cad3aad93b531f991ebf1 author Dave Airlie Mon, 29 May 2006 18:45:19 +1000 committer Dave Airlie Mon, 29 May 2006 18:45:19 +1000 Revert "intelfb driver -- use the regular modedb table instead of the VESA" This reverts 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 commit. This conflicts with a patch in -mm from Antonino reapply later. Signed-off-by: Dave Airlie commit 65eb2f97db17f6f6a92cad3aad93b531f991ebf1 tree 70e7f3025cd2511fca6bf09a512588fbbbfab5c7 parent f728377f6786bcdf1dbf33394360164e86f40094 author Eric Hustvedt Mon, 29 May 2006 18:38:55 +1000 committer Dave Airlie Mon, 29 May 2006 18:38:55 +1000 intelfb: int option fix Fix integer option parsing in the intelfb driver. The macro wasn't accounting for the equal sign past the option name. As a result, the vram option always returned 0. Signed-off-by: Eric Hustvedt Signed-off-by: Dennis Munsie commit ef2824073fba9def3cf122e89cc485f66dd71f70 tree 4fc56ab1e96d81f8920d111d07640c3ad5a60670 parent 89f8185e9b62f6478c2a39e117606eec70387d1d author Borislav Petkov Mon, 29 May 2006 01:06:23 -0400 committer Jeff Garzik Mon, 29 May 2006 01:06:23 -0400 libata debugging: set initial dbg value This patch sets the prerequisites for the new debugging scheme that more or less resembles Donald Becker's net driver example. This one liner doesn't change any functionality beside setting the appropriate debug level for the msg_enable control in the ata_port struct, which will be later used by the ata_msg_* macros to control the amount of debug information sent to printk. Signed-off-by: Signed-off-by: Jeff Garzik commit 89f8185e9b62f6478c2a39e117606eec70387d1d tree 8344192137c1386ed331df2cd0e4ad4886ee63bb parent e42d7be25cf53548347bff8b8f43410704ea7bb0 parent d9ec5ad24ce80b7ef69a0717363db661d13aada5 author Jeff Garzik Mon, 29 May 2006 01:03:37 -0400 committer Jeff Garzik Mon, 29 May 2006 01:03:37 -0400 Merge branch 'master' into upstream commit a6a8bef722875a95bb73e6de7da924a8d417b52c tree 4bdb7461ad785b8e24e5bb65f4bde9448e4fae25 parent 2ebf09c2491433a499e0ae7723d04e9e810afa84 author David Woodhouse Mon, 29 May 2006 00:41:11 +0100 committer David Woodhouse Mon, 29 May 2006 00:41:11 +0100 [JFFS2] Preallocate raw_node_refs in a couple of missing places in scan Signed-off-by: David Woodhouse commit 2ebf09c2491433a499e0ae7723d04e9e810afa84 tree 82b0c67ceffe6796f4f7c30af3e724c56095dcc2 parent ddc58bd65ebe58c243e9f609384825df9ffd04ad author David Woodhouse Sun, 28 May 2006 22:13:25 +0100 committer David Woodhouse Sun, 28 May 2006 22:13:25 +0100 [JFFS2] Fix oops when marking space dirty in scan, but no previous node exists. Signed-off-by: David Woodhouse commit b53471711f21ba0e151075f0e1d6d531eb50f1b1 tree e912dbe14b6af76b0ebe853a9976c99616bb8a4c parent 983f27d37d4fc72c252835cb2ee3103b360735a6 parent 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b author Jeff Garzik Sun, 28 May 2006 16:35:13 -0400 committer Jeff Garzik Sun, 28 May 2006 16:35:13 -0400 Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream commit e42d7be25cf53548347bff8b8f43410704ea7bb0 tree 7afd08ee70f929abec9118960508828e2d07f234 parent 75e995855f45a83afdae34d50c0b3ee14fb23b7a parent 0737ac895afbfbe210557fa5fbafcca932d5fa7c author Jeff Garzik Sun, 28 May 2006 16:32:59 -0400 committer Jeff Garzik Sun, 28 May 2006 16:32:59 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/libata-core.c commit 2b89dad0c7e3b03d45d9674ee9a7b49670df098e tree 8f480172c865e9d6cfab9ed4888a043bc75ab4ce parent 091686d3b5569d2ec76b9e6dab7f3608b6f64497 author Hannes Reinecke Tue, 23 May 2006 10:29:28 +0200 committer James Bottomley Sun, 28 May 2006 13:07:41 -0400 [SCSI] audit drivers for incorrect max_id use max_id now means the maximum number of ids on the bus, which means it is one greater than the largest possible id number. Signed-off-by: James Bottomley commit 091686d3b5569d2ec76b9e6dab7f3608b6f64497 tree 8e2e85f774899d72b5419fdfb574dd994c35f8fd parent 93ef588735973e4c35ff3707685678cdebd694a4 author Amit Arora Fri, 19 May 2006 16:14:50 -0700 committer James Bottomley Sun, 28 May 2006 13:01:23 -0400 [SCSI] Return -EINVAL when "id == max_id" in scsi_scan_host_selected() The scsi_scan_host_selected() should return -EINVAL when the id is equal to the max_id. Currently it uses ">" when comparing with max_id, and hence leaves the border case when "id==max_id". The channel and lun have values valid from 0 up to, and including, max_channel or max_lun. But, the valid values for id range from 0 to max_id-1. This patch fixes the problem. Signed-off-by: Amit Arora Signed-off-by: James Bottomley commit 93ef588735973e4c35ff3707685678cdebd694a4 tree ab4c1424fa4a50ae568e4fc4db60e3c031f442af parent 338151e066084d92d89f44311e5521ef847a50b9 author Andreas Herrmann Mon, 22 May 2006 18:27:30 +0200 committer James Bottomley Sun, 28 May 2006 12:50:45 -0400 [SCSI] zfcp: bump up version number Bump up version number, skip "4.6.0" because this might clash with zfcp version in certain distros. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 338151e066084d92d89f44311e5521ef847a50b9 tree 5783d26710203f2c5b309530334f3dd39ca68dfc parent 75bfc2837bbcc329193d51e8b7115184b78beae0 author Andreas Herrmann Mon, 22 May 2006 18:25:56 +0200 committer James Bottomley Sun, 28 May 2006 12:50:17 -0400 [SCSI] zfcp: make use of fc_remote_port_delete when target port is unavailable If zfcp's port erp fails we now call fc_remote_port_delete. This helps to avoid offlined scsi devices if scsi commands time out due to path failures. When an adapter erp fails we call fc_remote_port_delete for all ports on that adapter. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 75bfc2837bbcc329193d51e8b7115184b78beae0 tree 6d1511fce28948bd134f7148a996c04dc04e9d32 parent b7a52fa7fff2309031a2f849bc489206afd2fa4a author Ralph Wuerthner Mon, 22 May 2006 18:24:33 +0200 committer James Bottomley Sun, 28 May 2006 12:45:15 -0400 [SCSI] zfcp: evaluate plogi payload to set maxframe_size, supported_classes of rports Signed-off-by: Ralph Wuerthner Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit b7a52fa7fff2309031a2f849bc489206afd2fa4a tree 0f29db5a3e8fa99f88e621df1c3c91542ed82e89 parent 06506d00ec1a0d7d3b1dff59185af355ce29ac0a author Ralph Wuerthner Mon, 22 May 2006 18:21:28 +0200 committer James Bottomley Sun, 28 May 2006 12:43:59 -0400 [SCSI] zfcp: print bit error threshold data human readable Replace hex dump of bit error threshold data by log message showing bit error threshold data human readable. Signed-off-by: Ralph Wuerthner Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 06506d00ec1a0d7d3b1dff59185af355ce29ac0a tree fef406818d1bccd745913ece2df0dbcee16ec74a parent ec4081c6ba4fba6a8bc12a0e93db8817ba63ce47 author Andreas Herrmann Mon, 22 May 2006 18:18:19 +0200 committer James Bottomley Sun, 28 May 2006 12:43:33 -0400 [SCSI] zfcp: (cleanup) removed superfluous macros, struct members, typedefs Removed some macros, struct members and typedefs which were unused or not necessary. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit ec4081c6ba4fba6a8bc12a0e93db8817ba63ce47 tree 9aa5953a42fac103d216a08688bffe8f57029f8d parent ca3271b40225a1049334766f6fb35b57a0162bd2 author Andreas Herrmann Mon, 22 May 2006 18:17:30 +0200 committer James Bottomley Sun, 28 May 2006 12:42:52 -0400 [SCSI] zfcp: (cleanup) kmalloc/kzalloc replacement Replace kmalloc/memset by kzalloc or kcalloc. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit ca3271b40225a1049334766f6fb35b57a0162bd2 tree a781c265f8cde3ba06a775948a923cb7b5fe896d parent 4a9d2d8bf989c77b54add430932fa5ed8a80dba9 author Andreas Herrmann Mon, 22 May 2006 18:15:49 +0200 committer James Bottomley Sun, 28 May 2006 12:38:15 -0400 [SCSI] zfcp: (cleanup) remove useless comments Removed some useless comments. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 4a9d2d8bf989c77b54add430932fa5ed8a80dba9 tree d57022575739b1331d9c5c4edc6c1c32ca1bfbd9 parent 979dca3826841e5dc9170c28f20bd75ece266a9a author Andreas Herrmann Mon, 22 May 2006 18:14:08 +0200 committer James Bottomley Sun, 28 May 2006 12:36:02 -0400 [SCSI] zfcp: (cleanup) shortened copyright and author information Copyright update, shortened file headers, shortened author information. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b tree 0fbffb32574f00e1326c1aad4832c63b4aaeea70 parent 371858568e02698fe2de8ba4bf771e3f40db69e5 author Jay Cliburn Wed, 24 May 2006 00:02:51 +0200 committer Francois Romieu Sat, 27 May 2006 21:26:13 +0200 via-velocity: allow MTU size less than 1500 bytes Change the minimum allowable MTU size from 1500 bytes to 64 bytes. Signed-off-by: Jay Cliburn commit ddc58bd65ebe58c243e9f609384825df9ffd04ad tree 6a88d6293af01e89daa2dc38e1463c7493c688cb parent ba0251fe87ea560eb377917e06ba0b5b9ab89094 author David Woodhouse Sat, 27 May 2006 13:15:16 +0100 committer David Woodhouse Sat, 27 May 2006 13:15:16 +0100 [JFFS2] Fix wbuf recovery of f->metadata->raw node. A data node might not be in the fraglist; it could be f->metadata. Signed-off-by: David Woodhouse commit f728377f6786bcdf1dbf33394360164e86f40094 tree e1651c2772f53ebe28f135c024b619834ae5eca2 parent c9daa873c3a7c769821ec6c8258adf098bb0435c author Dave Airlie Sat, 27 May 2006 18:56:02 +1000 committer Dave Airlie Sat, 27 May 2006 18:56:02 +1000 sync modesetting code with X.org Signed-off-by: Dave Airlie commit c9daa873c3a7c769821ec6c8258adf098bb0435c tree 4867272494138d1c6a4975caa7e61dc49c8ae26f parent 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 author Dave Airlie Sat, 27 May 2006 18:44:02 +1000 committer Dave Airlie Sat, 27 May 2006 18:44:02 +1000 intelfb: align with changes from my X driver. This just realigns the PLL calculation routines with the ones from my X.org driver. Signed-off-by: Dave Airlie commit 2c47430a03bbcc3c9a623a07eca5baf92c7d20c8 tree 35eab865ff670a01e638f0584605f14d6ce68cd0 parent 1aecb393091d3c0787f92445420d96ef58c9782a author Dennis Munsie Sat, 27 May 2006 18:33:35 +1000 committer Dave Airlie Sat, 27 May 2006 18:33:35 +1000 intelfb driver -- use the regular modedb table instead of the VESA modedb table. Ideally, the 9xx stride patch should be applied first, since there are modes in the VESA table that won't work without that patch. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 1aecb393091d3c0787f92445420d96ef58c9782a tree ad1a929d79f6219b461ab037105f0b52380bc41d parent df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f author Eric Hustvedt Sat, 27 May 2006 18:30:00 +1000 committer Dave Airlie Sat, 27 May 2006 18:30:00 +1000 Adds support for 256MB aperture on 945 chipsets to the intelfb driver and corrects calculation of stolen memory overhead. Signed-off-by: Eric Hustvedt Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit df7df8ab7b38ca80bbaf5ffafd401d6c739fd45f tree 83f7f6768ac730231386fdbf70f30c165d3cb134 parent 51d797474f87b375819d084f7583a2864c5656c4 author Dennis Munsie Sat, 27 May 2006 18:17:52 +1000 committer Dave Airlie Sat, 27 May 2006 18:17:52 +1000 intelfb -- uses stride alignment of 64 on the 9xx chipsets. Signed-off-by: Dennis Munsie Signed-off-by: Dave Airlie commit 92af11cdec410f5de4e8d702d24e1672ce26a1f6 tree 329a87ad837ff445a111dc8455d0d1f3425a9ab6 parent 0645819196b5029936cf07a8ba27860e0d45c8d9 author Al Viro Sat, 27 May 2006 02:24:14 -0400 committer Al Viro Sat, 27 May 2006 02:27:23 -0400 [PATCH] missing readb/readw in rio Signed-off-by: Al Viro commit 0645819196b5029936cf07a8ba27860e0d45c8d9 tree 4691984b5c51c8315af84f2762c39a106216c5bb parent 6bc540e69a6376b9d58d8490f4998da9e45e2746 author Al Viro Sat, 27 May 2006 02:11:12 -0400 committer Al Viro Sat, 27 May 2006 02:27:15 -0400 [PATCH] copy_to_user() from iomem is a bad thing Signed-off-by: Al Viro commit 6bc540e69a6376b9d58d8490f4998da9e45e2746 tree 26abbdf8b4e8ca51c2c5dfa015158119d48bb4f4 parent 1bf087194f01bce5b2d7b39f27d71d5f346fbf08 author Al Viro Sat, 27 May 2006 02:00:00 -0400 committer Al Viro Sat, 27 May 2006 02:27:06 -0400 [PATCH] forgotten swap of copyout() arguments Signed-off-by: Al Viro commit 1bf087194f01bce5b2d7b39f27d71d5f346fbf08 tree da68ababe29fb526d92bd9bf10084921f747bd0d parent ae5b28a5bb1b5f5d53085a044aec69db41fd0336 author Al Viro Sat, 27 May 2006 01:55:52 -0400 committer Al Viro Sat, 27 May 2006 02:26:58 -0400 [PATCH] handling rio MEMDUMP it copies data _from_ iomem, so it should be rio_memcpy_fromio(), not ->Copy(). Signed-off-by: Al Viro commit ae5b28a5bb1b5f5d53085a044aec69db41fd0336 tree 8b618a3ef0efc0c49de551c4c13fd146b38fa746 parent bfa6b7bb35a9c8c8acae3056f2cb3364c52693d4 author Al Viro Sat, 27 May 2006 01:48:08 -0400 committer Al Viro Sat, 27 May 2006 02:26:49 -0400 [PATCH] fix rio_copy_to_card() for OLDPCI case It replaced old rio_pcicopy(). That puppy did _not_ do readb() (unlike rio_memcpy_toio()) and current implementation is simply broken - readb(NULL) is never a valid thing to do. Signed-off-by: Al Viro commit bfa6b7bb35a9c8c8acae3056f2cb3364c52693d4 tree eb6c4b26737a51b09b5acb26dee1546d5f7571d6 parent c7c0d0a10f6e4cea95ed84adcdd37948cac09b85 author Al Viro Sat, 27 May 2006 00:36:10 -0400 committer Al Viro Sat, 27 May 2006 02:26:40 -0400 [PATCH] uses of ->Copy() in rioroute are bogus ... there we are building a command in normal memory; it will be copied to iomem (by ->Copy()) later. Use memcpy()... Signed-off-by: Al Viro commit c7c0d0a10f6e4cea95ed84adcdd37948cac09b85 tree 4af26a97e8561766a9b0da9a29926ae645dc0468 parent 38d0d001b973d8c72c18524cc25ef39db85c66cd author Al Viro Sat, 27 May 2006 00:19:54 -0400 committer Al Viro Sat, 27 May 2006 02:26:32 -0400 [PATCH] bogus order of copy_from_user() arguments ... aka "somebody forgot to swap arguments when converting from copyin()" Signed-off-by: Al Viro commit 38d0d001b973d8c72c18524cc25ef39db85c66cd tree c261b690e3fcdc87bbc4d07b95083d8944503919 parent d886cb586f60a5ccf156392f96a39bc52db925d0 author Al Viro Sat, 27 May 2006 00:15:09 -0400 committer Al Viro Sat, 27 May 2006 02:26:23 -0400 [PATCH] rio ->Copy() expects the sourse as first argument ... so conversion from rio_pcicopy() to rio_copy_to_card() had broken the damn thing. Signed-off-by: Al Viro commit d886cb586f60a5ccf156392f96a39bc52db925d0 tree 5862de796cf8dfd2f38e30d36cc589a07b5f9d88 parent a8bd60705aa17a998516837d9c1e503ad4cbd7fc author Al Viro Sat, 27 May 2006 00:08:25 -0400 committer Al Viro Sat, 27 May 2006 02:26:14 -0400 [PATCH] trivial annotations in rio Signed-off-by: Al Viro commit 75e995855f45a83afdae34d50c0b3ee14fb23b7a tree 9909a5bd5129cfa957baf05d475b0bcac3f45f94 parent 622b20fcb8b42aa4c3c87c0a036f2ad0927b64bc author Alan Cox Wed, 24 May 2006 14:14:41 +0100 committer Jeff Garzik Fri, 26 May 2006 22:02:23 -0400 [PATCH] libata: add pio_data_xfer_noirq Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 622b20fcb8b42aa4c3c87c0a036f2ad0927b64bc tree 082ab2b5891b0bad720d13c020424bfa983da2d6 parent 835d39fcb56cba00b78c60634d6bb0f046ef601c author Alan Cox Wed, 24 May 2006 14:06:11 +0100 committer Jeff Garzik Fri, 26 May 2006 22:02:23 -0400 [PATCH] PCI identifiers for the pata_via update These IDs are also used by the drivers/ide/pci changes submitted by VIA. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 983f27d37d4fc72c252835cb2ee3103b360735a6 tree 8a7d3c3e251db494e285896debeb906473178a3e parent de1e938e54deba5b093a3074dfafd0d11afacbe1 parent e82b0f2cc21be905e504573483fa9542b15df96f author Jeff Garzik Fri, 26 May 2006 22:01:26 -0400 committer Jeff Garzik Fri, 26 May 2006 22:01:26 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/s390/net/ctctty.c commit de1e938e54deba5b093a3074dfafd0d11afacbe1 tree 2740ac2cc161bb07a408a761afa961c713a37d9d parent f3b197ac26ed0e57989856494c495818dcc7f9ac author Yoichi Yuasa Thu, 25 May 2006 10:24:46 +0900 committer Jeff Garzik Fri, 26 May 2006 21:47:15 -0400 [PATCH] r8169: add new PCI ID Hi, This patch add new PCI ID for r8169 driver. RTL8110SBL has this PCI ID. Please aply. Yoichi Signed-off-by: Yoichi Yuasa Signed-off-by: Jeff Garzik commit f3b197ac26ed0e57989856494c495818dcc7f9ac tree 5451adb0bc6c219d0a794ea32e3c598740c82bdf parent 4c0c2fd486b6598e37c77b5d81a08bc2d948aa7b author Jeff Garzik Fri, 26 May 2006 21:39:03 -0400 committer Jeff Garzik Fri, 26 May 2006 21:39:03 -0400 [netdrvr] trim trailing whitespace: 8139*.c, epic100, forcedeth, tulip/* commit 4c0c2fd486b6598e37c77b5d81a08bc2d948aa7b tree 5275fe083a58dece97502c64a49b99a743e865fd parent eb91f61b2294ccdb914df255164ada70dbbf2d58 author Ayaz Abdulla Thu, 25 May 2006 13:10:38 -0400 committer Jeff Garzik Fri, 26 May 2006 21:37:54 -0400 [PATCH] pci_ids: add new device ids This patch adds new device ids for MCP61 and MCP65 chips. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit eb91f61b2294ccdb914df255164ada70dbbf2d58 tree 7cfe3bb749c26fe02864687301c262acb9211b0c parent 48cf270e45ff6ff076dd6557b38ec1068dd71809 author Ayaz Abdulla Wed, 24 May 2006 18:13:19 -0400 committer Jeff Garzik Fri, 26 May 2006 21:37:54 -0400 [PATCH] forcedeth: add support for flow control This patch adds flow control support for tx and rx pause frames in forcedeth. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit 48cf270e45ff6ff076dd6557b38ec1068dd71809 tree 26da9f40dc45385277ea33fb54b93f16e6dc0e89 parent f29cb26c43d7c064421e76540b7654fbba9efc78 author Jens Osterkamp Wed, 24 May 2006 23:33:11 +0200 committer Jeff Garzik Fri, 26 May 2006 21:33:58 -0400 [PATCH] spidernet: replace whitespaces by tabs The original patch was using whitespaces instead of tabs. Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit f29cb26c43d7c064421e76540b7654fbba9efc78 tree de6a1c292e4e5be0ebedc21cae6130a421c8590f parent 6d0c07cc6eec4636d83dd75c85b3205229f1960a parent a24b163b7c16f9e30e726319115e45ed6e683582 author Jeff Garzik Fri, 26 May 2006 21:33:55 -0400 committer Jeff Garzik Fri, 26 May 2006 21:33:55 -0400 Merge branch 'upstream-fixes' into upstream commit 6d0c07cc6eec4636d83dd75c85b3205229f1960a tree be9f17d81216d3fdf3cbd5ce659c43d523876eb8 parent 6082823632e40737515d03381e1ba59cfb4d4909 parent 80871e63e410c53524ef47eaf475c13e0f164ea6 author Jeff Garzik Fri, 26 May 2006 21:32:31 -0400 committer Jeff Garzik Fri, 26 May 2006 21:32:31 -0400 Merge branch 'upstream-fixes' into upstream commit 835d39fcb56cba00b78c60634d6bb0f046ef601c tree 235cecc646bada5c0b76836d42e44e7a5d93c0f8 parent 89bad5892abca55f56d0ea713c7306d1f845ac8e parent ecd68853b852cdafb138f9c437f3a751fe7dc381 author Jeff Garzik Fri, 26 May 2006 21:30:38 -0400 committer Jeff Garzik Fri, 26 May 2006 21:30:38 -0400 Merge branch 'master' into upstream commit 89bad5892abca55f56d0ea713c7306d1f845ac8e tree 41423cb7f285ff3a87eabf44d414a5b197e10e4a parent 957d2df1801865eb1e63864bc63b970aa9c460ba author Albert Lee Fri, 26 May 2006 13:49:18 +0800 committer Jeff Garzik Fri, 26 May 2006 21:30:12 -0400 [PATCH] libata: add back ->data_xfer to ata_piix.c Add back ->data_xfer and ->mode_filter to ata_piix.c. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6082823632e40737515d03381e1ba59cfb4d4909 tree be9f17d81216d3fdf3cbd5ce659c43d523876eb8 parent cbc696a5fa3942aa2e6ad52a71d5126ffa84d031 author Alexey Dobriyan Tue, 23 May 2006 14:52:21 -0700 committer Jeff Garzik Fri, 26 May 2006 21:29:09 -0400 [PATCH] e1000: endian fixes Signed-off-by: Alexey Dobriyan Cc: "Ronciak, John" Cc: Jesse Brandeburg Acked-by: Auke Kok Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit cbc696a5fa3942aa2e6ad52a71d5126ffa84d031 tree 98eab655c0e5d0853267557616cb7059f27f7fc9 parent d3f464b5385531c4250a8b1dbd2f9ba6bbfcebb9 parent 8fc29ba65bd669b8f23a46b4760f3ba773e2a635 author Jeff Garzik Fri, 26 May 2006 21:26:34 -0400 committer Jeff Garzik Fri, 26 May 2006 21:26:34 -0400 Merge branch 'upstream-fixes' into upstream commit ba0251fe87ea560eb377917e06ba0b5b9ab89094 tree 9f01452bb883ddcbd2ef1047638f9aeefeb4c89f parent cca3b837bbb4c984165f9f9c7c06846bc0425791 author Thomas Gleixner Sat, 27 May 2006 01:02:13 +0200 committer Thomas Gleixner Sat, 27 May 2006 01:02:13 +0200 [MTD] NAND Consolidate references and add back default name setting We have a type pointer. Make use of it instead of the error prone nand_ids[i] reference. The NAND driver used to set default name settings from the chip ID string for the device. The feature got lost during the rework. Add it back. Signed-off-by: Thomas Gleixner commit cca3b837bbb4c984165f9f9c7c06846bc0425791 tree 4bc0cde8cb73b5a5e74220072de5db8a9d1448aa parent 29da9cea46f65cb9488641354fe554e9ef8a3a85 author Thomas Gleixner Sat, 27 May 2006 00:47:18 +0200 committer Thomas Gleixner Sat, 27 May 2006 00:47:18 +0200 [MTD] NAND simplify nand_chip_select nCE setting can be done when the first command is issued to the device. We keep the deselect functionality as it makes sense to deassert nCE when the device becomes idle. Signed-off-by: Thomas Gleixner commit 29da9cea46f65cb9488641354fe554e9ef8a3a85 tree 1f7f075e554ef2282510b4c6d9a761043cae072b parent 9bfeb691e75b21fdaa80ffae719083200b190381 author David Woodhouse Fri, 26 May 2006 23:05:44 +0100 committer David Woodhouse Fri, 26 May 2006 23:05:44 +0100 [MTD] Fix thinko in nand_write_page_hwecc() Signed-off-by: Thomas Gleixner Signed-off-by: David Woodhouse commit 9bfeb691e75b21fdaa80ffae719083200b190381 tree 3c828820f1385249835f85e5073b4ffd10fcd09c parent f75e5097ef298c5a0aa106faa211d1afdc92dc3d author David Woodhouse Fri, 26 May 2006 21:19:05 +0100 committer David Woodhouse Fri, 26 May 2006 21:19:05 +0100 [JFFS2] Switch to using an array of jffs2_raw_node_refs instead of a list. This allows us to drop another pointer from the struct jffs2_raw_node_ref, shrinking it to 8 bytes on 32-bit machines (if the TEST_TOTLEN) paranoia check is turned off, which will be committed soon). Signed-off-by: David Woodhouse commit b1141f6d5dead296adcabd4a1e8ea2b994e287cb tree d943fdb68114edcf67223659764ef458860eebbd parent f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 parent 4541a5db0ba33d9c692e5b2f8d7805e336fabe7c author John W. Linville Fri, 26 May 2006 16:12:24 -0400 committer John W. Linville Fri, 26 May 2006 16:12:24 -0400 Merge branch 'upstream-fixes' into upstream commit f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 tree a453a270fc86ada85d808487c911387739ce2296 parent df8ccb9bf1ca360581a94c2245efb9fa613fbb29 parent 705af309505681f197f81618440954d10f120dc0 author John W. Linville Fri, 26 May 2006 16:06:58 -0400 committer John W. Linville Fri, 26 May 2006 16:06:58 -0400 Merge branch 'from-linus' into upstream commit f75e5097ef298c5a0aa106faa211d1afdc92dc3d tree 0de4534e9ae54cf5d17ea9ef20acefb931167eee parent e4d222ff18bca6322f032088a21e9c4a4c038b85 author Thomas Gleixner Fri, 26 May 2006 18:52:08 +0200 committer Thomas Gleixner Fri, 26 May 2006 18:52:08 +0200 [MTD] NAND modularize write function Modularize the write function and reorganaize the internal buffer management. Remove obsolete chip options and fixup all affected users. Signed-off-by: Thomas Gleixner commit d3f464b5385531c4250a8b1dbd2f9ba6bbfcebb9 tree 9d2c162e6accb605a14d6307b545439e84de7178 parent 25a9f2f154feaf1c86e46a8fe7b9940d0b0a96f6 author Auke Kok Fri, 26 May 2006 09:38:10 -0700 committer Auke Kok Fri, 26 May 2006 09:38:10 -0700 ixgb: update version, dates increase the year dates to 2006 and bump the version to 1.0.109-k2 Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 25a9f2f154feaf1c86e46a8fe7b9940d0b0a96f6 tree 3a78f7cfff8f4d5bc804f5d26ef2fcdc03926a37 parent 25943071b40580ba24e0a111e86b4869b9f5c07c author Auke Kok Fri, 26 May 2006 09:36:03 -0700 committer Auke Kok Fri, 26 May 2006 09:36:03 -0700 ixgb: remove changelog same as e1000 - remove the changelog from the driver code itself. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 25943071b40580ba24e0a111e86b4869b9f5c07c tree d0a098bec435e4a7db0bc3f043273ae189c324e1 parent 235949d162076832b8b9a6e30ca51876c3fa11e8 author Auke Kok Fri, 26 May 2006 09:35:57 -0700 committer Auke Kok Fri, 26 May 2006 09:35:57 -0700 ixgb: replace netdev->priv with netdev_priv() fix netdev->priv ==> netdev_priv(netdev) Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 235949d162076832b8b9a6e30ca51876c3fa11e8 tree e9f666fa8e4cd6f41287295665a55e7b68d5536d parent 3352a3b20ce880b17f185ad55bf27751f1c8edb9 author Auke Kok Fri, 26 May 2006 09:35:52 -0700 committer Auke Kok Fri, 26 May 2006 09:35:52 -0700 ixgb: remove inlines, allow compiler to choose deinline a few large functions as to allow the compiler to pick. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3352a3b20ce880b17f185ad55bf27751f1c8edb9 tree 48b968af4adf8fd1bea134c64f888b53c8fe8436 parent 3f3dc0dd2086402b684545d66bb5ece93c76330b author Auke Kok Fri, 26 May 2006 09:35:47 -0700 committer Auke Kok Fri, 26 May 2006 09:35:47 -0700 ixgb: remove lock access in the fast path This mimics a change made in the e1000 driver that imitates a slick tg3 way of avoiding grabbing the lock around restarting the tx queue. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3f3dc0dd2086402b684545d66bb5ece93c76330b tree 623c09c2cfc13bfe31c15afe22ce3ab223c4763f parent 989316ddfeafd0e8fb51a4d811383769ad62637a author Auke Kok Fri, 26 May 2006 09:35:43 -0700 committer Auke Kok Fri, 26 May 2006 09:35:43 -0700 ixgb: allocate only buffersize needed In order to help correct window size growth, use the MFS register to limit the packet sizes received and allocate only the buffer size necessary Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak index 0905a82..84a8064 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -574,9 +574,8 @@ ixgb_sw_init(struct ixgb_adapter *adapte hw->subsystem_vendor_id = pdev->subsystem_vendor; hw->subsystem_id = pdev->subsystem_device; - adapter->rx_buffer_len = IXGB_RXBUFFER_2048; - hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH; + adapter->rx_buffer_len = hw->max_frame_size; if((hw->device_id == IXGB_DEVICE_ID_82597EX) || (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4) @@ -820,21 +819,14 @@ ixgb_setup_rctl(struct ixgb_adapter *ada rctl |= IXGB_RCTL_SECRC; - switch (adapter->rx_buffer_len) { - case IXGB_RXBUFFER_2048: - default: + if (adapter->rx_buffer_len <= IXGB_RXBUFFER_2048) rctl |= IXGB_RCTL_BSIZE_2048; - break; - case IXGB_RXBUFFER_4096: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_4096) rctl |= IXGB_RCTL_BSIZE_4096; - break; - case IXGB_RXBUFFER_8192: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_8192) rctl |= IXGB_RCTL_BSIZE_8192; - break; - case IXGB_RXBUFFER_16384: + else if (adapter->rx_buffer_len <= IXGB_RXBUFFER_16384) rctl |= IXGB_RCTL_BSIZE_16384; - break; - } IXGB_WRITE_REG(&adapter->hw, RCTL, rctl); } @@ -1551,25 +1543,12 @@ ixgb_change_mtu(struct net_device *netde DPRINTK(PROBE, ERR, "Invalid MTU setting %d\n", new_mtu); return -EINVAL; } - - if((max_frame <= IXGB_MAX_ENET_FRAME_SIZE_WITHOUT_FCS + ENET_FCS_LENGTH) - || (max_frame <= IXGB_RXBUFFER_2048)) { - adapter->rx_buffer_len = IXGB_RXBUFFER_2048; - - } else if(max_frame <= IXGB_RXBUFFER_4096) { - adapter->rx_buffer_len = IXGB_RXBUFFER_4096; - } else if(max_frame <= IXGB_RXBUFFER_8192) { - adapter->rx_buffer_len = IXGB_RXBUFFER_8192; + adapter->rx_buffer_len = max_frame; - } else { - adapter->rx_buffer_len = IXGB_RXBUFFER_16384; - } - netdev->mtu = new_mtu; - - if(old_max_frame != max_frame && netif_running(netdev)) { + if ((old_max_frame != max_frame) && netif_running(netdev)) { ixgb_down(adapter, TRUE); ixgb_up(adapter); } commit 989316ddfeafd0e8fb51a4d811383769ad62637a tree 42ac64d569fcd2690b9db631272abc33cb08604b parent 8556f0d18923495ffd15ce87089312b3d8f2414c author Auke Kok Fri, 26 May 2006 09:35:38 -0700 committer Auke Kok Fri, 26 May 2006 09:35:38 -0700 ixgb: revert an unwanted fix regarding tso/descriptors There seemed to be another bug introduced as well as a performance hit with the addtion of the sentinel descriptor workaround. Removal of this workaround appears to prevent the hang. We'll take a risk and remove it, as we had never seen the originally reported bug under linux. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 8556f0d18923495ffd15ce87089312b3d8f2414c tree dda1069465bffa70e35a293d46ccc9c54064e5d7 parent e59d16965ca38df91c4d9390d8eb5a62d7739589 author Auke Kok Fri, 26 May 2006 09:35:32 -0700 committer Auke Kok Fri, 26 May 2006 09:35:32 -0700 ixgb: fix interface losing macaddr on ifdn/up user contributed fix for LAA across down/up, from tonychung00@users.sf.net. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit e59d16965ca38df91c4d9390d8eb5a62d7739589 tree 430dd5d0174c4a7c566d8f176599b4a1c324c8c7 parent a24e2513c2d03c9a92739ec6fa7e7208f792881e author Auke Kok Fri, 26 May 2006 09:35:28 -0700 committer Auke Kok Fri, 26 May 2006 09:35:28 -0700 ixgb: fix smp polling race condition Moved interrupt masking to before requesting the interrupt from the OS. Moved interrupt enable to after netif_poll_enable. This fixes a racy BUG() where polling would be running on another CPU at the same time that netif_poll_enable would run. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit e4d222ff18bca6322f032088a21e9c4a4c038b85 tree 5c8c2bc4202bfb185746473d27ac9a7ecb69780e parent 89291a9d5b70778e49e2563247c6c7e3efac9b14 author David Woodhouse Fri, 26 May 2006 02:06:27 +0100 committer David Woodhouse Fri, 26 May 2006 02:06:27 +0100 [MTD] Remove PCI dependency for Geode CS553[56] NAND controller. PCI is faked on these devices by SMM traps. Don't depend on that -- check for the chipset directly instead. Signed-off-by: David Woodhouse commit a24e2513c2d03c9a92739ec6fa7e7208f792881e tree 31c7dbbc3fa76087d215924d2143fefa271cfa01 parent 6b900bb4bcb6095339f8d404babd9d779bfa1ea4 author Auke Kok Thu, 25 May 2006 13:24:27 -0700 committer Auke Kok Thu, 25 May 2006 13:24:27 -0700 ixgb: increment version to 1.0.104-k4 Increment the driver version to 1.0.104-k4 Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 6b900bb4bcb6095339f8d404babd9d779bfa1ea4 tree c3c727be5c0b9d99e8c01eae16412d0ad43e9c48 parent 1dfdd7df21309e57867962020a5ccb83d00e5432 author Auke Kok Thu, 25 May 2006 13:24:21 -0700 committer Auke Kok Thu, 25 May 2006 13:24:21 -0700 ixgb: use rx copybreak/skb recycle o use rx copybreak/skb recycle Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 1dfdd7df21309e57867962020a5ccb83d00e5432 tree 6e04f530caa49cbc4957fcad1429fe9bb77fe5d9 parent c9e055ac4fdbb52622437e0dbfdbc1d4897d2775 author Auke Kok Thu, 25 May 2006 13:24:17 -0700 committer Auke Kok Thu, 25 May 2006 13:24:17 -0700 ixgb: add performance enhancements to the buffer_info struct o modify the rx refill logic and tail bump o add counter for failures Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 89291a9d5b70778e49e2563247c6c7e3efac9b14 tree b8fdf0d2e88d47dda7ba70e088dd3c8dd0c90d78 parent c5b553cc2c36f770086a37764f7a06dd615eda8f author David Woodhouse Thu, 25 May 2006 13:30:24 +0100 committer David Woodhouse Thu, 25 May 2006 13:30:24 +0100 [JFFS2] Fix 64-bit size_t problems in XATTR code. Signed-off-by: David Woodhouse commit c5b553cc2c36f770086a37764f7a06dd615eda8f tree a61204320628293b63eacd68cb932354e5883549 parent 8546ac4f84b252fff078fab1a992c70504147914 author David Woodhouse Thu, 25 May 2006 13:25:17 +0100 committer David Woodhouse Thu, 25 May 2006 13:25:17 +0100 [MTD] Fix NAND_VERIFY_WRITE case to build with tglx's recent changes Bad tglx. No biscuit. Signed-off-by: David Woodhouse commit 8546ac4f84b252fff078fab1a992c70504147914 tree 98fd824f18bb045b0a8191ad2735fc1978ea6f91 parent f5bbdacc41939f89d8ccb18dd79cd9b21c0cb75d author Thomas Gleixner Thu, 25 May 2006 13:38:45 +0200 committer David Woodhouse Thu, 25 May 2006 12:53:47 +0100 [MTD] Remove the only useless readv implementation Removing readv from struct mtd_info broke block2mtd. Remove the reference and the useless default implementation. Signed-off-by: Thomas Gleixner commit f5bbdacc41939f89d8ccb18dd79cd9b21c0cb75d tree c9e45db9701c41c842282b0432d915cc9facc013 parent 9577f44a899cf4acb9e381c8946307b72153cd15 author Thomas Gleixner Thu, 25 May 2006 10:07:16 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:27 +0100 [MTD] NAND Modularize read function Split the core of the read function out and implement seperate handling functions for software and hardware ECC. Signed-off-by: Thomas Gleixner commit 9577f44a899cf4acb9e381c8946307b72153cd15 tree 0e3ef3fd6a094da30584c8fc06483f0fff3cda4f parent 7fac464868ec5d80019fa549b8b4516dd1dc9d5c author Thomas Gleixner Thu, 25 May 2006 10:04:31 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:27 +0100 [MTD] NAND Add read/write function pointers to struct nand_ecc_ctrl Add read/write function pointers to struct nand_ecc_ctrl to prepare the modulaization of nand_read/write functions. The current implementation handles every type of ecc mode software/hardware and all kinds of strange ecc placement schemes in one switch/if construct. Thats too complex to maintain and too inflexible to expand. Modularization will also shorten the code pathes of the read/write functions. Signed-off-by: Thomas Gleixner commit 7fac464868ec5d80019fa549b8b4516dd1dc9d5c tree 0b8003852a430e91c31481bf6bb8cec66993199b parent 7314e9e7d57293c58b3e10a25a8a1d9328444187 author Thomas Gleixner Thu, 25 May 2006 09:57:31 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:27 +0100 [MTD] Add ECC statistics to struct mtd_info FLASH - especially NAND FLASH - will become less reliable and bit flips more likely. Add an ECC statistics struct to struct mtd_info to keep track of this. Signed-off-by: Thomas Gleixner commit 7314e9e7d57293c58b3e10a25a8a1d9328444187 tree 024eedaa981089699bec36db78b8b460546df575 parent 7a30601b3ac7b02440ffa629fd3d2cca71c1bcd8 author Thomas Gleixner Thu, 25 May 2006 09:51:54 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:27 +0100 [MTD] NAND Cleanup oob functions Cleanup the code in the oob related functions and make use of the new NO_READRDY flag. Signed-off-by: Thomas Gleixner commit 7a30601b3ac7b02440ffa629fd3d2cca71c1bcd8 tree df5b7d220d4a911d8fadedf123e98955a2a9c3c4 parent 04bbd0eafb0c733c6c7f5d63c5098c615fe0685a author Thomas Gleixner Thu, 25 May 2006 09:50:16 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:26 +0100 [MTD] NAND Introduce NAND_NO_READRDY option The nand driver has a superflous read ready / command delay in the read functions. This was added to handle chips which have an automatic read forward. Newer chips do not have this functionality anymore. Add this option to avoid the delay / I/O operation. Mark all large page chips with the new option flag. Signed-off-by: Thomas Gleixner commit 04bbd0eafb0c733c6c7f5d63c5098c615fe0685a tree e4bf0095d7a46912d13a1508ba9acd6e39fa3733 parent 8b9e9fe8c6ee354aa75dc5a33e1575b21aa52084 author Thomas Gleixner Thu, 25 May 2006 09:45:29 +0200 committer David Woodhouse Thu, 25 May 2006 12:45:26 +0100 [MTD] NAND Initialize controller lock and wq only once The lock simplifying patch did not move the lock and waitqueue initialization into the controller allocation patch. This reinitializes waitqueue and spinlocks also for driver supplied controller stuctures. Move it into the allocation path. Signed-off-by: Thomas Gleixner commit 8b9e9fe8c6ee354aa75dc5a33e1575b21aa52084 tree dd18ecbeeaa6729908c7b14f11600e61578242ee parent 046b8b9808127d63326a33bc6298c90eaee90eeb author David Woodhouse Thu, 25 May 2006 01:53:09 +0100 committer David Woodhouse Thu, 25 May 2006 01:53:09 +0100 [JFFS2] Fix and improve debugging output during scan. Print wasted_size in scanned eraseblocks, print range correctly for summary dirent and inode entries. Signed-off-by: David Woodhouse commit 046b8b9808127d63326a33bc6298c90eaee90eeb tree 93caaabd7ae10969acb4758634b9b1c9448ef951 parent f61579c33736476e41e296a16c0d4ead4b953187 author David Woodhouse Thu, 25 May 2006 01:50:35 +0100 committer David Woodhouse Thu, 25 May 2006 01:50:35 +0100 [JFFS2] Add 'jeb' argument to jffs2_prealloc_raw_node_refs() Preallocation of refs is shortly going to be a per-eraseblock thing, rather than per-filesystem. Add the required argument to the function. Signed-off-by: David Woodhouse commit f61579c33736476e41e296a16c0d4ead4b953187 tree e71114ae2b4afb8bd660c84ad22950cebc1870a5 parent c38c1b613d742b5fa075071568f44dc8ec9f1cb8 author David Woodhouse Thu, 25 May 2006 01:42:40 +0100 committer David Woodhouse Thu, 25 May 2006 01:42:40 +0100 [JFFS2] Correctly handle wasted space before summary node. Signed-off-by: David Woodhouse commit c38c1b613d742b5fa075071568f44dc8ec9f1cb8 tree 73ac1b5e08ed331490d056ac0a27588930d592f5 parent f560928baa605e8faaa3de6cc1b11ebb645e97db author David Woodhouse Thu, 25 May 2006 01:38:27 +0100 committer David Woodhouse Thu, 25 May 2006 01:38:27 +0100 [JFFS2] jffs2_free_all_node_refs() doesn't free them all. Rename it. ... to jffs2_free_jeb_node_refs() since that's what it does. Signed-off-by: David Woodhouse commit f560928baa605e8faaa3de6cc1b11ebb645e97db tree 312b87f1d1fc3164ce246d04cbfcd9daede25f7d parent 12efdde3139c568a59561b69865fd14f37c75603 author David Woodhouse Thu, 25 May 2006 01:37:28 +0100 committer David Woodhouse Thu, 25 May 2006 01:37:28 +0100 [JFFS2] Allocate node_ref for wasted space when skipping to page boundary One more place where we were changing the accounting info without actually allocating a ref for the lost space... Signed-off-by: David Woodhouse commit 12efdde3139c568a59561b69865fd14f37c75603 tree ef5b0b445dd6da3ab61120bee09b3c93fae953a8 parent ace4dfee56fff184e07d7248a759b574321afa8b author Thomas Gleixner Wed, 24 May 2006 22:57:09 +0200 committer David Woodhouse Wed, 24 May 2006 23:45:24 +0100 [MTD] NAND fix cmd_ctrl breakage The cmd_ctrl rework lacks some state transition flags. Signed-off-by: Thomas Gleixner commit ace4dfee56fff184e07d7248a759b574321afa8b tree ee5f3b3d05cb081f073f6f9e9042ae457ba43b12 parent c7c16c8e7604a8974d48562fecf8d9c7e221fced author Thomas Gleixner Wed, 24 May 2006 12:07:37 +0200 committer David Woodhouse Wed, 24 May 2006 23:45:24 +0100 [MTD] NAND coding style and namespace cleanup Cleanup the functions which are not going to change in the next steps. Signed-off-by: Thomas Gleixner commit c7c16c8e7604a8974d48562fecf8d9c7e221fced tree 6dda7ddecd86076bb8d9cdd437bd0b2359a033ba parent 0305c8659ff9cebabf469d5cd0ab8dc384857e10 author David Woodhouse Wed, 24 May 2006 14:24:02 +0100 committer David Woodhouse Wed, 24 May 2006 14:24:02 +0100 [JFFS2] Revert Artem's Bunkage in debug messages. Random unthinking 'cleanup' caused debug messages like this: Obsoleting node at 0x0006daf4 of len 0x3a4: <7>Dirtying If messages are continuation of an existing line, they don't need to be prefixed with KERN_DEBUG. THINK. Or you will be replaced by a small shell script. Signed-off-by: David Woodhouse commit 0305c8659ff9cebabf469d5cd0ab8dc384857e10 tree 1784b2bb078a58e50ca75dfccd1e9fc5f8b211b8 parent 99988f7bbd16b861590dda4631c4db6cb17b5091 parent d470a97c70a43ffafd6e728c913254b6d6fd1219 author David Woodhouse Wed, 24 May 2006 10:01:43 +0100 committer David Woodhouse Wed, 24 May 2006 10:01:43 +0100 Merge branch 'master' of git://git.infradead.org/~gleixner/mtd-nand-2.6.git commit 66643de455c27973ac31ad6de9f859d399916842 tree 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f parent 2c23d62abb820e19c54012520f08a198c2233a85 parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author David Woodhouse Wed, 24 May 2006 09:22:21 +0100 committer David Woodhouse Wed, 24 May 2006 09:22:21 +0100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse commit 99988f7bbd16b861590dda4631c4db6cb17b5091 tree 38865d44c905d7f84d7eeb70186482e1e399fe9c parent 2f785402f39b96a077b6e62bf26164bfb8e0c980 author David Woodhouse Wed, 24 May 2006 09:04:17 +0100 committer David Woodhouse Wed, 24 May 2006 09:04:17 +0100 [JFFS2] Introduce ref_next() macro for finding next physical node Another part of the preparation for switching to an array... Signed-off-by: David Woodhouse commit c9e055ac4fdbb52622437e0dbfdbc1d4897d2775 tree 42b5a2fba2fd06d24dda9b6ca7667645940ac5d1 parent d7fbeba60b4021dfaf5d315884fbf7672b4ae87b author Herbert Valerio Riedel Sun, 07 May 2006 23:22:53 +0200 committer Jeff Garzik Wed, 24 May 2006 02:51:33 -0400 [PATCH] phy: new SMSC LAN83C185 PHY driver new SMSC LAN83C185 10BaseT/100BaseTX PHY driver for the PHY subsystem Signed-off-by: Herbert Valerio Riedel Signed-off-by: Jeff Garzik commit 957d2df1801865eb1e63864bc63b970aa9c460ba tree e0281c79adb24a64c712c10bd445f42ccadaf4a8 parent 31a34fe75906ba5f61606eaed01da313f29ca4b1 author Alan Cox Tue, 23 May 2006 13:18:57 +0100 committer Jeff Garzik Wed, 24 May 2006 02:09:56 -0400 [PATCH] libata: Remove obsolete flag ATA_FLAG_IRQ_MASK was added when I did the original data transfer with IRQ masked bits for PIO. It has since been replaced by ->pio_data_xfer methods so should be removed so nobody uses it by mistake thinking it still works. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 31a34fe75906ba5f61606eaed01da313f29ca4b1 tree 31f91e71800208aa1a532c37fedbb850910cde4e parent e14698745dd0de1ddbf5cd0cca4313a90f8c1cc1 author Alan Cox Mon, 22 May 2006 22:58:14 +0100 committer Jeff Garzik Wed, 24 May 2006 02:09:01 -0400 [PATCH] ata_piix formatting if( spacing fix for Garzik compliant formatting Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0a9cb46a73abd6c45e7c986bec984eed60c417b6 tree e713d9a0d03de947f3727e6fead942024f4c0767 parent 7499bf1a4cabde789e7694b33d01a1913ae1dddf author Jon Mason Fri, 19 May 2006 15:35:32 -0500 committer Paul Mackerras Wed, 24 May 2006 16:08:58 +1000 [PATCH] remove powerpc bitops in favor of existing generic bitops There already exists a big endian safe bitops implementation in lib/find_next_bit.c. The code in it is 90%+ common with the powerpc specific version, so the powerpc version is redundant. This patch makes the necessary changes to use the generic bitops in powerpc, and removes the powerpc specific version. Signed-off-by: Jon Mason Signed-off-by: Paul Mackerras commit 7499bf1a4cabde789e7694b33d01a1913ae1dddf tree 0bcc92093b8782df448b0521e2ebefc5f5634f75 parent 72a14eafb243b1f31118ea55a7e8c2588b5ad468 author Stephen Rothwell Fri, 19 May 2006 17:06:38 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: cleanup of iSeries flat device tree Consolidate the vio device node creation. Make some parameters const. Make a few more things __initdata. Get the device_type strings out of the device tree blob. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 72a14eafb243b1f31118ea55a7e8c2588b5ad468 tree 718a1f016ed660e9445d18106ba77c582416f81f parent c4e3ea2553308ba65fea582dc9a42221ef8b49e5 author Stephen Rothwell Fri, 19 May 2006 17:04:12 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: make iSeries flattened device tree dynamic - part 2 This actually simplies things as we just figure out how much space we used at the end and adjust klimit then. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit c4e3ea2553308ba65fea582dc9a42221ef8b49e5 tree ae8126834cda2638a3f151a6ce24a98a90dbbab6 parent c81014f603db26e1ed818decebd3b594606e20a6 author Stephen Rothwell Fri, 19 May 2006 17:04:48 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: make iSeries flattened device tree dynamic First we capture all the strings from dt.c statically by noting that gcc puts them in a special section of their own. Idea from Michael Ellerman. Then we move the flattened device tree to klimit. Still to come, making the values blob grow as needed. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit c81014f603db26e1ed818decebd3b594606e20a6 tree 8777dbf5e18f062c921a46929af996d953cf443e parent 9ceb19093b5e5f037c6b47df0607dd567283287d author Stephen Rothwell Fri, 19 May 2006 17:00:04 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: split device tree stuff out of iseries/setup.c Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 9ceb19093b5e5f037c6b47df0607dd567283287d tree 15db4f5d1eb688b7d67ca01889d0b4835d3c8707 parent 29629b2972467f6cc00427a89008c09d010074c8 author Stephen Rothwell Fri, 19 May 2006 16:58:13 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: give iSeries device tree nodes better names Use the PCI class code to choose a name for the PCI device nodes and to guess a device_type. Failing that, base the name on the vendor and device ids as specified in the spec. Mark just about everything __init{data}. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 29629b2972467f6cc00427a89008c09d010074c8 tree 3dd725adc1b186b8520436c5053946715b006bf6 parent 095eed4f8d0be13a7934031434b6e9ceddb87ff6 author Stephen Rothwell Fri, 19 May 2006 16:55:53 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: make iSeries flat device tree stuff static Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 095eed4f8d0be13a7934031434b6e9ceddb87ff6 tree 6ae36b38c3cb8ab78e8cc8e019ed226829304ad6 parent efbd386967aaa7fcf7ffbb13e4975df1cdf04cb8 author Stephen Rothwell Fri, 19 May 2006 16:54:42 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:57 +1000 [PATCH] powerpc: clean up iSeries PCI probe Only scan the host bridges and then use the existing pci_devs_phb_init() routine. Also fix typo in setup of reg property. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit efbd386967aaa7fcf7ffbb13e4975df1cdf04cb8 tree 22e60f8e821e5ef616b69dac404003cb70e3cbaf parent 403fac4f83bd8e089a192c542511fbeb2729a6c5 author Stephen Rothwell Fri, 19 May 2006 16:53:11 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: iSeries PCI devices can now have a devpsec attribute Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 403fac4f83bd8e089a192c542511fbeb2729a6c5 tree f33cf1d6caee0cb7edaa977ec8cc5d6f340d93b7 parent b02527931672749d404b5f640b7e086afc37f4e0 author Stephen Rothwell Fri, 19 May 2006 16:51:57 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: remove LogicalSlot from pci_dn As we now store enough information in the device_node. Also the Flags field was not used either, do remove that. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b02527931672749d404b5f640b7e086afc37f4e0 tree 7f825ab2706441559a39710f360c1fb4c1073b85 parent 96ff6afaf1c2fdd118139095dea66c0910379780 author Stephen Rothwell Fri, 19 May 2006 16:50:39 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: remove Irq from pci_dn As we now store enough information in the device_node to allocate the irq number in pcibios_final_fixup. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 96ff6afaf1c2fdd118139095dea66c0910379780 tree 5364530523d40789b549edc66e02e47b04932c9a parent 0d177df15d12926dc2ef7c814f317f02de52ce17 author Stephen Rothwell Fri, 19 May 2006 16:48:47 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: remove iSeries_Global_Device_List We can now scan the list of device nodes instead. This also allows us to remove the Device_list member of struct pci_dn. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 0d177df15d12926dc2ef7c814f317f02de52ce17 tree da10171a931af0ff709016a8ce5111a3c39e83d2 parent 66b3851a6947482987b4c05aa781a33696287648 author Stephen Rothwell Fri, 19 May 2006 16:46:28 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: move iSeries PCI devices to the device tree Move the probing of PCI devices to setup.c and put them all into the flattened device tree. The later probing is now done by traversing the device tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 66b3851a6947482987b4c05aa781a33696287648 tree eab5dafa3268a35d51ef6cf5fa2659f18ba976ad parent b58b7f98670ab6dd7774b67ff1655a787321209f author Stephen Rothwell Fri, 19 May 2006 16:43:58 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: reintroduce HvCallPci_configLoad32 This function was removed during iSeries cleanup but will prove useful in the following patches. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b58b7f98670ab6dd7774b67ff1655a787321209f tree 3d7b4f3685f8743842e46f599b7c8a304d734014 parent 3c06da5ae5358e9d325d541a053e1059e9654bcc author Stephen Rothwell Fri, 19 May 2006 16:42:49 +1000 committer Paul Mackerras Wed, 24 May 2006 16:08:56 +1000 [PATCH] powerpc: tidy up iseries/pci.c Remove some unused counters. No need to allocate iomm_table and iobar_table, which means that iomm_table_initialize is not longer needed. Use kzalloc where sensible. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e14698745dd0de1ddbf5cd0cca4313a90f8c1cc1 tree 34a7a3c0e0d77e44239ff9a3299f7410d84ae087 parent a6b2c5d4754dc539a560fdf0d3fb78a14174394a author Mark Lord Mon, 22 May 2006 19:02:03 -0400 committer Jeff Garzik Wed, 24 May 2006 02:04:09 -0400 [PATCH] sata_mv: endian annotations Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik commit a6b2c5d4754dc539a560fdf0d3fb78a14174394a tree c6daf88f97c7ed20becf2bd8666be81190eb4bb4 parent 8190bdb9291758f3b8c436ec1154c9923ddb57ea author Alan Cox Mon, 22 May 2006 16:59:59 +0100 committer Jeff Garzik Wed, 24 May 2006 01:58:54 -0400 [PATCH] PATCH: libata. Add ->data_xfer method We need to pass the device in order to do per device checks such as 32bit I/O enables. With the changes to include dev->ap we now don't have to add parameters however just clean them up. Also add data_xfer methods to the existing drivers except ata_piix (which is in the other block of patches). If you reject the piix one just add a data_xfer to it... Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 8190bdb9291758f3b8c436ec1154c9923ddb57ea tree 19d576f7e3becc935f577329a7694296eaa0287e parent f79d409fae879d135d1aaca6d83451f2787aec07 author Jeff Garzik Wed, 24 May 2006 01:53:39 -0400 committer Jeff Garzik Wed, 24 May 2006 01:53:39 -0400 [libata] libata-scsi, sata_mv: trim trailing whitespace commit f79d409fae879d135d1aaca6d83451f2787aec07 tree ee96566a7472e6953bb1b7993414063b9c9f6f24 parent b6079ca409bf88c248992e96510dd6f610f7ed89 author Alan Cox Mon, 22 May 2006 16:55:11 +0100 committer Jeff Garzik Wed, 24 May 2006 01:53:00 -0400 [PATCH] libata - fix bracketing and DMA oops The upstream tree has the ATA_DFLAG_PIO bug fixed but does not have the pass throuugh bug fix Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit b6079ca409bf88c248992e96510dd6f610f7ed89 tree e4096503f69f12838969133a995878ed81d8d716 parent 1f3461a72619fcd70a0fcb563306c91f753b4620 author Alan Cox Mon, 22 May 2006 16:52:06 +0100 committer Jeff Garzik Wed, 24 May 2006 01:53:00 -0400 [PATCH] libata: PIO 0 Ensure the pio_mode is always setup. Don't do any setup on the controller b just ensure the mode reporting is valid to avoid tons of special cases in PATA driver code when mode switching on the fly. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 1f3461a72619fcd70a0fcb563306c91f753b4620 tree e5695e40b038dcf75ec7fa9b0a3f85279c433b48 parent c81e29b4aca2b2503238276219d97faaac994b4f author Albert Lee Tue, 23 May 2006 18:12:30 +0800 committer Jeff Garzik Wed, 24 May 2006 01:50:04 -0400 [PATCH] libata: minor fix for irq-pio merge Minor fix to put the ATA_FLAG_NO_ATAPI flag back. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c81e29b4aca2b2503238276219d97faaac994b4f tree 02ec800bd9e2625b89757e2ba59f3b3c0f7c1236 parent d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5 parent bb31a8faa270beafcc51a65880c5564c6b718bd6 author Jeff Garzik Wed, 24 May 2006 01:49:12 -0400 committer Jeff Garzik Wed, 24 May 2006 01:49:12 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/libata-core.c commit d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5 tree 71fda9bd6527463079f9b936abaa0abe5c90da24 parent 4c5c81613b0eb0dba97a8f312a2f1162f39fd47b author Jeff Garzik Wed, 24 May 2006 01:43:25 -0400 committer Jeff Garzik Wed, 24 May 2006 01:43:25 -0400 [libata sata_promise] Add PATA cable detection. Original patch from Phillip Jordan Cleanups and fixes by me. commit 4c5c81613b0eb0dba97a8f312a2f1162f39fd47b tree 6d2a8b48efe47ea53877b8165e40dedd904a031d parent 26e27cd424554202d36f38ee35421143788da127 author Andrew Chew Thu, 20 Apr 2006 15:54:26 -0700 committer Jeff Garzik Wed, 24 May 2006 01:34:10 -0400 [PATCH] sata_nv: Add MCP61 support Added MCP61 SATA support to sata_nv. Signed-off-by: Jeff Garzik commit 26e27cd424554202d36f38ee35421143788da127 tree 04d068c76af5b636c061173465faa574d4b5e7b0 parent b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Jeff Garzik Wed, 24 May 2006 01:32:42 -0400 committer Jeff Garzik Wed, 24 May 2006 01:32:42 -0400 Merge branch 'master' into upstream commit d7fbeba60b4021dfaf5d315884fbf7672b4ae87b tree 1da0475fa710af806a2a83d6ee9f6d16c144a028 parent 860f242eb5340d0b0cfe243cb86b2a98f92e8b91 author Jeff Garzik Wed, 24 May 2006 01:31:14 -0400 committer Jeff Garzik Wed, 24 May 2006 01:31:14 -0400 [netdrvr ibmlana, ibmveth] trim trailing whitespace commit 860f242eb5340d0b0cfe243cb86b2a98f92e8b91 tree 286d64b4acfc392bcb926a6f5f7bfb311b0d3efc parent 7b32a312895c00ff03178e49db8b651ee1e48178 author Santiago Leon Tue, 25 Apr 2006 11:19:59 -0500 committer Jeff Garzik Wed, 24 May 2006 01:30:37 -0400 [PATCH] ibmveth change buffer pools dynamically This patch provides a sysfs interface to change some properties of the ibmveth buffer pools (size of the buffers, number of buffers per pool, and whether a pool is active). Ethernet drivers use ethtool to provide this type of functionality. However, the buffers in the ibmveth driver can have an arbitrary size (not only regular, mini, and jumbo which are the only sizes that ethtool can change), and also ibmveth can have an arbitrary number of buffer pools Under heavy load we have seen dropped packets which obviously kills TCP performance. We have created several fixes that mitigate this issue, but we definitely need a way of changing the number of buffers for an adapter dynamically. Also, changing the size of the buffers allows users to change the MTU to something big (bigger than a jumbo frame) greatly improving performance on partition to partition transfers. The patch creates directories pool1...pool4 in the device directory in sysfs, each with files: num, size, and active (which default to the values in the mainline version). Comments and suggestions are welcome... -- Santiago A. Leon Power Linux Development IBM Linux Technology Center Signed-off-by: Jeff Garzik commit 7b32a312895c00ff03178e49db8b651ee1e48178 tree 4a5b3b4fa62eaee004ea162fa6676a18f142363a parent 75ac6ae8187d1c2205eb9f55c4a154cb7f4a2f45 author Adrian Bunk Tue, 16 May 2006 17:30:50 +0200 committer Jeff Garzik Wed, 24 May 2006 01:28:14 -0400 [PATCH] drivers/net/s2io.c: make bus_speed[] static On Mon, May 15, 2006 at 12:56:37AM -0700, Andrew Morton wrote: >... > Changes since 2.6.17-rc3-mm1: >... > git-netdev-all.patch >... > git trees >... This patch makes the needlessly global bus_speed[] static. Signed-off-by: Adrian Bunk Signed-off-by: Jeff Garzik commit 75ac6ae8187d1c2205eb9f55c4a154cb7f4a2f45 tree f4862aa47af8b5752b0d303a80ab78d6411ec99f parent db21e578e551421d76641d72cb3f8296ed3f9e61 parent a1433ac4ab46fb23ae77804c207a1f710a7b12f1 author Jeff Garzik Wed, 24 May 2006 01:28:05 -0400 committer Jeff Garzik Wed, 24 May 2006 01:28:05 -0400 Merge branch 'upstream-fixes' into upstream commit db21e578e551421d76641d72cb3f8296ed3f9e61 tree 73968aeda7ed0051b5cff6950ad513011a3c7a5f parent 6ed14254cb6e269030ff09bed8673473b7be0283 parent df8ccb9bf1ca360581a94c2245efb9fa613fbb29 author Jeff Garzik Wed, 24 May 2006 00:29:57 -0400 committer Jeff Garzik Wed, 24 May 2006 00:29:57 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 6ed14254cb6e269030ff09bed8673473b7be0283 tree a5a994f9f1afccfcc8d7b98a32e47d82cc90b5fb parent cf393ebed0abb1186c34b21f3d1d939ac2b5568a author Jeff Garzik Wed, 24 May 2006 00:28:37 -0400 committer Jeff Garzik Wed, 24 May 2006 00:28:37 -0400 [netdrvr pcnet_cs, myri] trim trailing whitespace commit cf393ebed0abb1186c34b21f3d1d939ac2b5568a tree 1a3042dfd0d55fbb36fe86da7f7b7f028e79e895 parent 0da34b6dfe55810ae60db57e08e2af8a808c0a55 author Marcin Juszkiewicz Tue, 23 May 2006 11:15:57 +0200 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] pcnet_cs: Add TRENDnet TE-CF100 ethernet adapter ID Add TRENDnet TE-CF100 ethernet adapter to pcnet_cs list. product info: "Fast Ethernet", "CF Size PC Card", "1.0", "" manfid: 0x0149, 0xc1ab Signed-off-by: Marcin Juszkiewicz drivers/net/pcmcia/pcnet_cs.c | 2 ++ 1 file changed, 2 insertions(+) Signed-off-by: Jeff Garzik commit 0da34b6dfe55810ae60db57e08e2af8a808c0a55 tree 4a62f33ee86aba9245bd1356b64a5e797cfde967 parent 3a720d726a6aa0a7cd9190f694587adf7bafdf4f author Brice Goglin Tue, 23 May 2006 06:10:15 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] Add Myri-10G Ethernet driver Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/net/Kconfig | 17 drivers/net/Makefile | 1 drivers/net/myri10ge/Makefile | 5 drivers/net/myri10ge/myri10ge.c | 2851 +++++++++++++++ drivers/net/myri10ge/myri10ge_mcp.h | 205 + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 58 include/linux/pci_ids.h | 1 7 files changed, 3138 insertions(+) Signed-off-by: Jeff Garzik commit 3a720d726a6aa0a7cd9190f694587adf7bafdf4f tree 2162cbeb1786c8f7826c7e19850bae52395dacea parent d99ef36ed7e56f816a235f1af115420a81853fb9 author Brice Goglin Tue, 23 May 2006 06:10:01 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:31 -0400 [PATCH] Revive pci_find_ext_capability This patch revives pci_find_ext_capability (has been disabled a couple month ago since it was not used anywhere. See http://lkml.org/lkml/2006/1/20/247). It will now be used by the myri10ge driver. Signed-off-by: Brice Goglin Signed-off-by: Andrew J. Gallatin drivers/pci/pci.c | 3 +-- include/linux/pci.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Jeff Garzik commit d99ef36ed7e56f816a235f1af115420a81853fb9 tree d752c659a59a3f89f3add7f13ca5b8b5d424a4fe parent bdad69b23c86e41262b85d8affc9a3b34ee2ee74 parent 387e2b0439026aa738a9edca15a57e5c0bcb4dfc author Jeff Garzik Wed, 24 May 2006 00:27:05 -0400 committer Jeff Garzik Wed, 24 May 2006 00:27:05 -0400 Merge branch 'master' into upstream commit 2f785402f39b96a077b6e62bf26164bfb8e0c980 tree 3f3a38b484ef2dabda1599d4d8f08b121bd03a76 parent 4cbb9b80e171107c6c34116283fe38e5a396c68b author David Woodhouse Wed, 24 May 2006 02:04:45 +0100 committer David Woodhouse Wed, 24 May 2006 02:04:45 +0100 [JFFS2] Reduce visibility of raw_node_ref to upper layers of JFFS2 code. As the first step towards eliminating the ref->next_phys member and saving memory by using an _array_ of struct jffs2_raw_node_ref per eraseblock, stop the write functions from allocating their own refs; have them just _reserve_ the appropriate number instead. Then jffs2_link_node_ref() can just fill them in. Use a linked list of pre-allocated refs in the superblock, for now. Once we switch to an array, it'll just be a case of extending that array. Signed-off-by: David Woodhouse commit d470a97c70a43ffafd6e728c913254b6d6fd1219 tree e440261dc50c345126901390b9ffa6e0c5cb7222 parent cad74f2c380411ae7bee997f3ba18834cfe313a2 author Thomas Gleixner Tue, 23 May 2006 23:48:57 +0200 committer Thomas Gleixner Tue, 23 May 2006 23:48:57 +0200 [MTD] NAND LED support cleanup Move the define out of the middle of the code and add an appropriate comment. Signed-off-by: Thomas Gleixner commit cad74f2c380411ae7bee997f3ba18834cfe313a2 tree aec691447dc3ab76688fe9dbe3cc2ae04ad1cbee parent 7abd3ef9875eb2afcdcd4f450680298a2983a55e author Thomas Gleixner Tue, 23 May 2006 23:28:48 +0200 committer Thomas Gleixner Tue, 23 May 2006 23:28:48 +0200 [MTD] NAND remove write_byte/word function from nand_chip The previous change of the command / hardware control allows to remove the write_byte/word functions completely, as their only user were nand_command and nand_command_lp. Signed-off-by: Thomas Gleixner commit 7abd3ef9875eb2afcdcd4f450680298a2983a55e tree 64c19d2e5ecca182938acfcb8a172efb7d907d85 parent 3821720d51b5f304d2c33021a82c8da70f6d6ac9 author Thomas Gleixner Tue, 23 May 2006 23:25:53 +0200 committer Thomas Gleixner Tue, 23 May 2006 23:25:53 +0200 [MTD] Refactor NAND hwcontrol to cmd_ctrl The hwcontrol function enforced a step by step state machine for any kind of hardware chip access. Let the hardware driver know which control bits are set and inform it about a change of the control lines. Let the hardware driver write out the command and address bytes directly. This gives a peformance advantage for address bus controlled chips and simplifies the quirks in the hardware drivers. Signed-off-by: Thomas Gleixner commit bdad69b23c86e41262b85d8affc9a3b34ee2ee74 tree 1998fc609e8c614247db8b617e194a746e2bcc03 parent 9528454f9c02fb9c359c4c42c69eed4d47407e39 parent 440c052d6f717495806fe2c65f3f5677c92397c7 author Jeff Garzik Tue, 23 May 2006 17:21:33 -0400 committer Jeff Garzik Tue, 23 May 2006 17:21:33 -0400 Merge branch 'e1000-7.0.38-k4' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream commit 9528454f9c02fb9c359c4c42c69eed4d47407e39 tree 40e8c7f829b528073d2b216c3b8e6be205c76245 parent 777e1d4a0f3387933f668e7adc81384827975189 parent 1faadface9c5d000bb16e42c89f24859337cf2db author Jeff Garzik Tue, 23 May 2006 17:20:58 -0400 committer Jeff Garzik Tue, 23 May 2006 17:20:58 -0400 Merge branch 'master' into upstream commit 440c052d6f717495806fe2c65f3f5677c92397c7 tree 92e8eed3ddc36ca171b4223de3d11d1be84931f2 parent fdf35d3c49be0ad99e2fd5f5f27c6c0c336a3f11 author Auke Kok Tue, 23 May 2006 13:36:19 -0700 committer Auke Kok Tue, 23 May 2006 13:36:19 -0700 e1000: bump version to 7.0.38-k4 Signed-off-by: Auke Kok commit fdf35d3c49be0ad99e2fd5f5f27c6c0c336a3f11 tree 91983404ceea7b3cb9a30f954a9537fe8fc697fb parent a1943b5a796a11ee516f5c085453d653a87ee8fe author Auke Kok Tue, 23 May 2006 13:36:14 -0700 committer Auke Kok Tue, 23 May 2006 13:36:14 -0700 e1000: remove changelog in driver This honours the request to remove the changelog in the driver code. Signed-off-by: Auke Kok commit a1943b5a796a11ee516f5c085453d653a87ee8fe tree de709f1f48387f06b44f5eb4d82f85c76c48a6ad parent 76c224bc9fdf108ae6e97553322122f53bdbe75c author Auke Kok Tue, 23 May 2006 13:36:10 -0700 committer Auke Kok Tue, 23 May 2006 13:36:10 -0700 e1000: Fix date string in Makefile I forgot to update the date string in the Makefile last time. Signed-off-by: Auke Kok commit 76c224bc9fdf108ae6e97553322122f53bdbe75c tree 3901c34cf3ed64b7cf907917500a5317cf5467a6 parent a42a507cd3af14a2696b7c020996e48c10bf7742 author Auke Kok Tue, 23 May 2006 13:36:06 -0700 committer Auke Kok Tue, 23 May 2006 13:36:06 -0700 e1000: remove leading and trailing whitespace. Some leading and trailing whitespace made it into the driver code here. Signed-off-by: Auke Kok commit a42a507cd3af14a2696b7c020996e48c10bf7742 tree 3e3be1c902ea510d6c84da9c083dccfadfa36c59 parent c653e6351e371b33b29871e5eedf610ffb3be037 author Auke Kok Tue, 23 May 2006 13:36:01 -0700 committer Auke Kok Tue, 23 May 2006 13:36:01 -0700 e1000: remove backslash r debug printfs This removes unwanted characters in the debug output that should have never been there. Signed-off-by: Auke Kok commit c653e6351e371b33b29871e5eedf610ffb3be037 tree 401b966e60317c09c6f2b2d5cd81bfbc0d9e3aeb parent 4e3ceac609cce39cb96e0eb8604934592371ed8c author Auke Kok Tue, 23 May 2006 13:35:57 -0700 committer Auke Kok Tue, 23 May 2006 13:35:57 -0700 e1000: add shutdown handler back to fix WOL Someone was waaay too aggressive and removed e1000's reboot notifier instead of porting it to the new way of the shutdown handler. This change broke wake on lan. Add the shutdown handler back in using the same method as e100 uses. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 3821720d51b5f304d2c33021a82c8da70f6d6ac9 tree 191b408d5b3c7ee40e24bdb49353ac613cbd311a parent 85b85fee0cbb9d22b619a4981f046ca49adbc5cd author Thomas Gleixner Tue, 23 May 2006 22:33:52 +0200 committer Thomas Gleixner Tue, 23 May 2006 22:33:52 +0200 [MTD] Export nand_write_raw The previous _ecc removal / cleanup broke (i)nftl module usage. Export the missing symbol. Signed-off-by: Thomas Gleixner commit 85b85fee0cbb9d22b619a4981f046ca49adbc5cd tree c582cc0078f6aa3581514e892bf12908298cb046 parent 9223a456da8ed357bf7e0b128c853e2c8bd54614 author Thomas Gleixner Tue, 23 May 2006 22:03:39 +0200 committer Thomas Gleixner Tue, 23 May 2006 22:03:39 +0200 [MTD] Mark NAND drivers TOTO and PPChameleon broken Both drivers can not be fixed and compiled due to missing header files. Signed-off-by: Thomas Gleixner commit 777e1d4a0f3387933f668e7adc81384827975189 tree 306580b0d6975cb54a74971aa2f4eb20cec1c8e5 parent 9b8118df486ffec2f42d43dadaceebd0561dd564 author Auke Kok Tue, 23 May 2006 10:35:08 -0700 committer Auke Kok Tue, 23 May 2006 10:35:08 -0700 ixgb: increment version to 1.0.104-k2 Increment the driver version to 1.0.104-k2 Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 9b8118df486ffec2f42d43dadaceebd0561dd564 tree c50db295920c2e71b9a3de58029315336b2a2103 parent ec9c3f5d3b8c4dd7340800f02eed87bdf0233e3b author Auke Kok Tue, 23 May 2006 10:35:04 -0700 committer Auke Kok Tue, 23 May 2006 10:35:04 -0700 ixgb: add tx timeout counter This adds a TX timeout counter to the ethtool stats, a tx timeout debug message, and sets the timer to 5 seconds. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit ec9c3f5d3b8c4dd7340800f02eed87bdf0233e3b tree 5397e9b952cf06246b8360bab0e27f91eb329ae4 parent c85fd6f0dedcec411438768bb5ebd133b1ae3347 author Auke Kok Tue, 23 May 2006 10:34:59 -0700 committer Auke Kok Tue, 23 May 2006 10:34:59 -0700 ixgb: use DPRINTK and msglvl, and ethtool to control it Use DPRINTK and msglvl, and ethtool to control it. Add proper names to netdev structs and mappings. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit c85fd6f0dedcec411438768bb5ebd133b1ae3347 tree 868cde6c975b2505658faedf24f99a637f41bd1b parent 940829e2f9d89d3caddc852bca9018cf503ea719 author Auke Kok Tue, 23 May 2006 10:30:02 -0700 committer Auke Kok Tue, 23 May 2006 10:30:02 -0700 ixgb: remove hardcoded number This adds a define for an awkward and uncommented value. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 940829e2f9d89d3caddc852bca9018cf503ea719 tree aae6a6f8c3bcc80a54fae135634958e2f4b6c6cb parent f017f14b3f18b38f2388e7d6e83a7f6997ee9dd6 author Auke Kok Tue, 23 May 2006 10:29:58 -0700 committer Auke Kok Tue, 23 May 2006 10:29:58 -0700 ixgb: add copper 10gig driver id Add support for Copper 10GbE device ID 109E Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit f017f14b3f18b38f2388e7d6e83a7f6997ee9dd6 tree f4afafd176b7b8a1635e58dfa2f24f859dce9ed4 parent 953784d66d8f621a8684d007e526ca26b12d54a1 author Auke Kok Tue, 23 May 2006 10:29:53 -0700 committer Auke Kok Tue, 23 May 2006 10:29:53 -0700 ixgb: add NETIF_F_LLTX analogous to e1000 add NETIF_F_LLTX code like e1000 has Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 953784d66d8f621a8684d007e526ca26b12d54a1 tree 2bc2564e76b842e37d2a7d87e001fba6c38ecb4f parent 4de17c8c7295d32d4e112e214aa90d8f7006972f author Auke Kok Tue, 23 May 2006 10:29:50 -0700 committer Auke Kok Tue, 23 May 2006 10:29:50 -0700 ixgb: fix flow control Make default flow control only have *sending* of flow control packets enabled, and fix to disable / enable flow control correctly. Set flow control defaults to disable receiving flow control from the link partner, to fix the transmit fifo overlow errata Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 4de17c8c7295d32d4e112e214aa90d8f7006972f tree a484ef4d60c9efc274dcfbcae573aecc16e53fa5 parent 96f9c2e277768099479fbed7c3b69c294b1fadef author Auke Kok Tue, 23 May 2006 10:29:46 -0700 committer Auke Kok Tue, 23 May 2006 10:29:46 -0700 ixgb: remove duplicate code setting duplex and speed Removed duplicate code. Create ixgb_set_speed_duplex function to contain duplicate code. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 96f9c2e277768099479fbed7c3b69c294b1fadef tree 468b06ab34bb6184e6561c1849dbffef06ffc7eb parent 4e3ceac609cce39cb96e0eb8604934592371ed8c author Auke Kok Tue, 23 May 2006 10:29:41 -0700 committer Auke Kok Tue, 23 May 2006 10:29:41 -0700 ixgb: fix rare early tso completion Fix rare early completion when using TSO. This essentially is the e1000 fix, with code that was mostly already written. Another skb frag was also needed. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 9223a456da8ed357bf7e0b128c853e2c8bd54614 tree 50cb225c4ba9c610ae4cb67231b319e78e935ac4 parent 2528e8cdf376d7da24647c442ec1e88c360d76ca author Thomas Gleixner Tue, 23 May 2006 17:21:03 +0200 committer Thomas Gleixner Tue, 23 May 2006 17:21:03 +0200 [MTD] Remove read/write _ecc variants MTD clients are agnostic of FLASH which needs ECC suppport. Remove the functions and fixup the callers. Signed-off-by: Thomas Gleixner commit 2528e8cdf376d7da24647c442ec1e88c360d76ca tree 09df5f524085f4d12117fc81791bca10fa8a5f0e parent 9d8522df37f91621a70c5c0dbbf5bf2220b16798 author Thomas Gleixner Tue, 23 May 2006 16:10:00 +0200 committer Thomas Gleixner Tue, 23 May 2006 16:10:00 +0200 [MTD] Remove readv/readv_ecc These functions were never implemented and added only bloat to partition and concat code. Signed-off-by: Thomas Gleixner commit 9d8522df37f91621a70c5c0dbbf5bf2220b16798 tree 30f51aaccb18b1d4a97b7a5c8a64c63633a2fb7b parent 0cddd6c258b2ed3798d12619c28ed0d2b5a669bc author Thomas Gleixner Tue, 23 May 2006 16:06:03 +0200 committer Thomas Gleixner Tue, 23 May 2006 16:06:03 +0200 [MTD] Remove nand writev support NAND writev(_ecc) support is not longer necessary. Remove it. Signed-off-by: Thomas Gleixner commit 0cddd6c258b2ed3798d12619c28ed0d2b5a669bc tree 83c6e0e55cd05a7a651701121f78140c21c22ce8 parent 9a57d470fd4a77b9732fee97bed29c565c730af0 author Thomas Gleixner Tue, 23 May 2006 15:59:58 +0200 committer Thomas Gleixner Tue, 23 May 2006 15:59:58 +0200 [MTD] ECC rework broke diskonchip Fix the diskonchip ecc setup. Signed-off-by: Thomas Gleixner commit 9a57d470fd4a77b9732fee97bed29c565c730af0 tree 1fa237ba77cbb94049254c27ca9536e2aecd8f5b parent 4cbb9b80e171107c6c34116283fe38e5a396c68b author Thomas Gleixner Tue, 23 May 2006 15:58:23 +0200 committer Thomas Gleixner Tue, 23 May 2006 15:58:23 +0200 [MTD] NAND ECC hwctl function has no return value Fix the broken prototype Signed-off-by: Thomas Gleixner commit 4cbb9b80e171107c6c34116283fe38e5a396c68b tree 9463f2e4774f14752cf4bb52431e14e569256f72 parent 6dfc6d250d0b7ebaa6423c44dcd09fcfe68deabd parent 9fe4854cd1f60273f9a3ece053f4789605f58a5e author Thomas Gleixner Tue, 23 May 2006 12:37:31 +0200 committer Thomas Gleixner Tue, 23 May 2006 12:37:31 +0200 Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/ Signed-off-by: Thomas Gleixner commit 6dfc6d250d0b7ebaa6423c44dcd09fcfe68deabd tree 2be25b1e302eca5984a8ad5ed3e5bde77bafaabb parent 7aa65bfd6793a56cc3bbce8436abbfea3a7bdd1f author Thomas Gleixner Tue, 23 May 2006 12:00:46 +0200 committer Thomas Gleixner Tue, 23 May 2006 12:00:46 +0200 [MTD] NAND modularize ECC First step of modularizing ECC support. - Move ECC related functionality into a seperate embedded data structure - Get rid of the hardware dependend constants to simplify new ECC models Signed-off-by: Thomas Gleixner commit 7aa65bfd6793a56cc3bbce8436abbfea3a7bdd1f tree 1f87d2645b888a838c0fac90da148170d4c8cd63 parent 58dd8f2bfdcad1b219a4a92a2aadd8ea8c819f79 author Thomas Gleixner Tue, 23 May 2006 11:54:38 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:54:38 +0200 [MTD] NAND cleanup nand_scan Seperate functionality out of nand_scan so the code is more readable. No functional change. First step of simplifying the nand driver. Signed-off-by: Thomas Gleixner commit 58dd8f2bfdcad1b219a4a92a2aadd8ea8c819f79 tree 8f98c9128a9e49ef181e06d6edda52f03210dc16 parent 2c0a2bed9276ebbec5794edc07f66e21e9a1735c author Thomas Gleixner Tue, 23 May 2006 11:52:35 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:52:35 +0200 [MTD] NAND consolidate data types The NAND driver used a mix of unsigned char, u_char amd uint8_t data types. Consolidate to uint8_t usage Signed-off-by: Thomas Gleixner commit 2c0a2bed9276ebbec5794edc07f66e21e9a1735c tree ad0fb96624fd92f270d9e5d1cbbff14ffd7921f0 parent dcb0932884b801290efd80fbc37630297b98181f author Thomas Gleixner Tue, 23 May 2006 11:50:56 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:50:56 +0200 [MTD] NAND whitespace and formatting cleanup Signed-off-by: Thomas Gleixner commit dcb0932884b801290efd80fbc37630297b98181f tree c6519feda290a963087958f1e196abec11866d49 parent ce4c61f184864991881ec789f7524f4b332eaafc author Thomas Gleixner Tue, 23 May 2006 11:49:14 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:49:14 +0200 [JFFS2] Simplify writebuffer handling The writev based write buffer implementation was far to complex as in most use cases the write buffer had to be handled anyway. Simplify the write buffer handling and use mtd->write instead. From extensive testing no performance impact has been noted. Signed-off-by: Thomas Gleixner commit ce4c61f184864991881ec789f7524f4b332eaafc tree 405bc1011d919c3b83f252c49a51f40e7d5de536 parent 41796c2ea9b74cdf3bc2c368193d15b8ae8950ca author Thomas Gleixner Tue, 23 May 2006 11:43:28 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:43:28 +0200 [MTD] Add support for NDFC NAND controller NDFC NAND Flash controller is embedded in PPC EP44x SoCs. Add platform driver based support. Signed-off-by: Thomas Gleixner commit 41796c2ea9b74cdf3bc2c368193d15b8ae8950ca tree d7a21961f93103536656b255f717d54989f9b144 parent a36ed2995c56d4f858ecb524a78837473e7115ae author Thomas Gleixner Tue, 23 May 2006 11:38:59 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:38:59 +0200 [MTD] Add platform support for NAND Add the data structures necessary to provide platform device support for NAND Signed-off-by: Thomas Gleixner commit a36ed2995c56d4f858ecb524a78837473e7115ae tree 510f31485713ae5be63a20fe29b3809f0fafbbb8 parent 819d6a32c397534c819d3c72a3947b7e7e4bec4b author Thomas Gleixner Tue, 23 May 2006 11:37:03 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:37:03 +0200 [MTD] Simplify NAND locking Replace the chip lock by a the controller lock. For simple drivers a dummy controller structure is created by the scan code. This simplifies the locking algorithm in nand_get/release_chip(). Signed-off-by: Thomas Gleixner commit 819d6a32c397534c819d3c72a3947b7e7e4bec4b tree e5c25ca9545014a4512102629d09b42438cb378d parent a1b563d652b54647ffacb2d6edf7859d3e97a723 author Thomas Gleixner Tue, 23 May 2006 11:32:45 +0200 committer Thomas Gleixner Tue, 23 May 2006 11:32:45 +0200 [MTD] Improve software ECC calculation Unrolling the loops produces denser and much faster code. Add a config switch which allows to select the byte order of the resulting ecc code. The current Linux implementation has a byte swap versus the SmartMedia specification Signed-off-by: Thomas Gleixner commit 9fe4854cd1f60273f9a3ece053f4789605f58a5e tree 277ac17807a1596f78464641500ed35f3d47a32a parent 5fa433942ba4e399f7e28764c9db4ade89e91d40 author David Woodhouse Tue, 23 May 2006 00:38:06 +0100 committer David Woodhouse Tue, 23 May 2006 00:38:06 +0100 [JFFS2] Remove flash offset argument from various functions. We don't need the upper layers to deal with the physical offset. It's _always_ c->nextblock->offset + c->sector_size - c->nextblock->free_size so we might as well just let the actual write functions deal with that. Signed-off-by: David Woodhouse commit 5fa433942ba4e399f7e28764c9db4ade89e91d40 tree 29a2691729645bf27fd2d7d8d61a5c720c6569c1 parent c8b229de2b05c2b3e8d282ce260935a88ac030ca author Joern Engel Mon, 22 May 2006 23:18:29 +0200 committer Joern Engel Mon, 22 May 2006 23:18:29 +0200 [MTD] Introduce MTD_BIT_WRITEABLE o Add a flag MTD_BIT_WRITEABLE for devices that allow single bits to be cleared. o Replace MTD_PROGRAM_REGIONS with a cleared MTD_BIT_WRITEABLE flag for STMicro and Intel Sibley flashes with internal ECC. Those flashes disallow clearing of single bits, unlike regular NOR flashes, so the new flag models their behaviour better. o Remove MTD_ECC. After the STMicro/Sibley merge, this flag is only set and never checked. Signed-off-by: Joern Engel commit c8b229de2b05c2b3e8d282ce260935a88ac030ca tree 09391866a6a9740df2a178c7894557025c9dc2c8 parent 28318776a80bc3261f9af91ef79e6e38bb9f5bec author Joern Engel Mon, 22 May 2006 23:18:12 +0200 committer Joern Engel Mon, 22 May 2006 23:18:12 +0200 [MTD] Merge STMicro NOR_ECC code with Intel Sibley code In 2002, STMicro started producing NOR flashes with internal ECC protection for small blocks (8 or 16 bytes). Support for those flashes was added by me. In 2005, Intel Sibley flashes copied this strategy and Nico added support for those. Merge the code for both. Signed-off-by: Joern Engel commit 28318776a80bc3261f9af91ef79e6e38bb9f5bec tree 36ef9144accf19db9d51019aa479807e80aeb8fd parent 8ca9ed5db3aea8d27989c239e8a2f79b839f1e99 author Joern Engel Mon, 22 May 2006 23:18:05 +0200 committer Joern Engel Mon, 22 May 2006 23:18:05 +0200 [MTD] Introduce writesize At least two flashes exists that have the concept of a minimum write unit, similar to NAND pages, but no other NAND characteristics. Therefore, rename the minimum write unit to "writesize" for all flashes, including NAND. Signed-off-by: Joern Engel commit 8ca9ed5db3aea8d27989c239e8a2f79b839f1e99 tree 496ed4b78875ed19db0fad3bac8afaedae9d79d0 parent 987d47b71a85bd83dc40c870abee3b64f2002163 author Joern Engel Mon, 22 May 2006 23:17:23 +0200 committer Joern Engel Mon, 22 May 2006 23:17:23 +0200 [MTD] Use single flag to mark writeable devices. Two flags exist to decide whether a device is writeable or not. None of those two flags is checked for independently, so they are clearly redundant, if not an invitation to bugs. This patch removed both of them, replacing them with a single new flag. Signed-off-by: Joern Engel commit df8ccb9bf1ca360581a94c2245efb9fa613fbb29 tree 7b8649190804451fe8e13316d5aaa949afb513b6 parent 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908 author Marcin Juszkiewicz Mon, 22 May 2006 10:56:55 +0200 committer John W. Linville Mon, 22 May 2006 14:51:33 -0400 [PATCH] hostap: new pcmcia IDs Add two Prism cards to hostap_cs driver. product info: "Pretec", "CompactWLAN Card 802.11b", "2.5" manfid: 0x0156, 0x0002 product info: "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02", "" manfid: 0x0156, 0x0002 Signed-off-by: Marcin Juszkiewicz Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 01d654d25d23fb73deb7904ce1c0b3a0f5fc2908 tree 625280bf6eae0141fe91844334168d51d7d89fca parent 3b38f317e529d8396377dafc7d95a1451a151df5 parent 82464e63a0653a4d8e5c684fcb41b163e6357c6d author John W. Linville Mon, 22 May 2006 14:45:29 -0400 committer John W. Linville Mon, 22 May 2006 14:45:29 -0400 Merge branch 'upstream-fixes' into upstream commit 82464e63a0653a4d8e5c684fcb41b163e6357c6d tree 6e6862df039c1118caecc5c669a53ffded38381e parent 353b28bafd1b962359a866ff263a7fad833d29a1 author Florin Malita Sun, 21 May 2006 14:04:44 -0700 committer John W. Linville Mon, 22 May 2006 14:39:04 -0400 [PATCH] orinoco: possible null pointer dereference in orinoco_rx_monitor() If the skb allocation fails, the current error path calls dev_kfree_skb_irq() with a NULL argument. Also, 'err' is not being used. Coverity CID: 275. Signed-off-by: Florin Malita Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 3b38f317e529d8396377dafc7d95a1451a151df5 tree 65e80799417c456bdd907b7d80182732be02e5f4 parent 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 parent 353b28bafd1b962359a866ff263a7fad833d29a1 author John W. Linville Mon, 22 May 2006 14:26:25 -0400 committer John W. Linville Mon, 22 May 2006 14:26:25 -0400 Merge branch 'from-linus' into upstream commit 987d47b71a85bd83dc40c870abee3b64f2002163 tree ecb840640cb1f7309b26d2c9a332bee5d0db6df9 parent 0eac940b8a087576c66ecf8e0f294f2ceb3b607b author David Woodhouse Mon, 22 May 2006 16:32:05 +0100 committer David Woodhouse Mon, 22 May 2006 16:32:05 +0100 [JFFS2] Put list of nodes in common part of ic/x_ref/x_datum structure We'll be using a proper list of nodes in the jffs2_xattr_datum and jffs2_xattr_ref structures, because the existing code to overwrite them is just broken. Put it in the common part at the front of the structure which is shared with the jffs2_inode_cache, so that the jffs2_link_node_ref() function can do the right thing. Signed-off-by: David Woodhouse commit 0eac940b8a087576c66ecf8e0f294f2ceb3b607b tree a21f5376f5fec2c21fe23e90e3317f1a1c48cc3e parent fcb7578719529898aef9edce8e409e457a1c2d15 author David Woodhouse Mon, 22 May 2006 16:29:23 +0100 committer David Woodhouse Mon, 22 May 2006 16:29:23 +0100 [JFFS2] Add some preemptive BUG checks for XATTR code In a couple of places, we assume that what's at the end of the ->next_in_ino list is a struct jffs2_inode_cache. Let's check for that, since we expect it to change soon. Signed-off-by: David Woodhouse commit fcb7578719529898aef9edce8e409e457a1c2d15 tree 58022b22d175b69e4b267f2f19ab26d93f7d4910 parent a1b563d652b54647ffacb2d6edf7859d3e97a723 author David Woodhouse Mon, 22 May 2006 15:23:10 +0100 committer David Woodhouse Mon, 22 May 2006 15:23:10 +0100 [JFFS2] Extend jffs2_link_node_ref() to link into per-inode list too. Let's avoid the potential for forgetting to set ref->next_in_ino, by doing it within jffs2_link_node_ref() instead. This highlights the ugliness of what we're currently doing with xattr_datum and xattr_ref structures -- we should find a nicer way of dealing with that. Signed-off-by: David Woodhouse commit a1b563d652b54647ffacb2d6edf7859d3e97a723 tree 94f706c3070acee9d5b246846b8d748dfcb4cc06 parent 3b79673cfae93d0ed63eceb058bb26aba602a278 author David Woodhouse Mon, 22 May 2006 13:55:46 +0100 committer David Woodhouse Mon, 22 May 2006 13:55:46 +0100 [JFFS2] Initialise ref->next_in_ino when marking dirty space in wbuf flush Signed-off-by: David Woodhouse commit 3b79673cfae93d0ed63eceb058bb26aba602a278 tree 2639f8783e4f3023f883e00de16f62a1a39a8c90 parent 06c6764b5830798c39617b24497cade90451592f author David Woodhouse Mon, 22 May 2006 12:15:47 +0100 committer David Woodhouse Mon, 22 May 2006 12:15:47 +0100 [JFFS2] Fix accounting error in jffs2_link_node_ref() When filing REF_OBSOLETE nodes, we'd add their size to the global 'dirty_size' count, but then to the eraseblock's 'used_size' count. That's not clever. Signed-off-by: David Woodhouse commit 06c6764b5830798c39617b24497cade90451592f tree 802411eb1bf64d600aa5b63ca3cb8cd9c969cf7a parent 0d25971d7c969debf76f9fab6d6b37cb62408f55 author David Woodhouse Mon, 22 May 2006 11:27:14 +0100 committer David Woodhouse Mon, 22 May 2006 11:27:14 +0100 [JFFS2] Fix dummy jffs2_sum_scan_sumnode() macro for !SUMMARY case. I added an argument to the real function... Signed-off-by: David Woodhouse commit 2c23d62abb820e19c54012520f08a198c2233a85 tree 1b7646fe81694041f7e364d2a15644ad56b7063b parent 3ac6c7b44560fdf2ea8865536bd52d4ff038107e author David Woodhouse Sun, 21 May 2006 22:51:13 +0100 committer David Woodhouse Sun, 21 May 2006 22:51:13 +0100 Move inclusion of out of user scope in asm-x86_64/mtrr.h Signed-off-by: David Woodhouse commit 0d25971d7c969debf76f9fab6d6b37cb62408f55 tree 89e6b432d4e8c84d59b4738e5bc1c47a2402adf2 parent 615191bb1dfc6980e7c7a85225444d860d74b343 parent ca89a517fa577e6f26621463d3aa4f3c3d530b1e author David Woodhouse Sun, 21 May 2006 19:05:55 +0100 committer David Woodhouse Sun, 21 May 2006 19:05:55 +0100 Merge git://git.infradead.org/jffs2-devel-2.6 commit 615191bb1dfc6980e7c7a85225444d860d74b343 tree b1cd002e1bd6818cf1f9aac290084e0462ca6376 parent ecde26313076e5055dcd54d6537632275346203f author David Woodhouse Sun, 21 May 2006 19:03:21 +0100 committer David Woodhouse Sun, 21 May 2006 19:03:21 +0100 [MTD] Account for MODULE_SYMBOL_PREFIX when requesting NOR chip driver Signed-off-by: David Woodhouse commit ecde26313076e5055dcd54d6537632275346203f tree c6b0f54717bd50efaf984ec88156b94af859a366 parent 3d12c0c75db0cd85beb11c4e2d86a49cabe3cfff author David Woodhouse Sun, 21 May 2006 18:38:51 +0100 committer David Woodhouse Sun, 21 May 2006 18:38:51 +0100 [MTD] Use symbol_request() in old DiskOnChip probe code to find actual driver The previous code wouldn't work correctly on architectures which have a non-empty MODULE_SYMBOL_PREFIX, and this version is neater if slightly less optimal in the built-in case. Signed-off-by: David Woodhouse commit 3d12c0c75db0cd85beb11c4e2d86a49cabe3cfff tree 5ca5abdf22e5b9887ea3665fd14c9a91c7c77d0b parent 6c8b44abc86a3e23dd1a22c0ee187f06bd7c7f5d author Jonathan McDowell Sun, 21 May 2006 18:11:55 +0100 committer David Woodhouse Sun, 21 May 2006 18:11:55 +0100 [MTD] Add Amstrad Delta NAND support The patch below adds support for the NAND device on the Amstrad Delta. This is a 32MiB 8bit Toshiba device, with the data bus connected to the OMAP MPUIO pins and ALE, CLE, NCE, NRE, NWE and NWP all connected to the Delta's latch2 16bit latch. Signed-Off-By: Jonathan McDowell Signed-off-by: David Woodhouse commit ca89a517fa577e6f26621463d3aa4f3c3d530b1e tree e277f31d6629c5dcc358adfa80190fc247d43f65 parent 010b06d6d07d9fa5ea6070aa72bb3e0de1761ab7 author David Woodhouse Sun, 21 May 2006 13:29:11 +0100 committer David Woodhouse Sun, 21 May 2006 13:29:11 +0100 [JFFS2] Finally eliminate __totlen field from struct jffs2_raw_node_ref Well, almost. We'll actually keep a 'TEST_TOTLEN' macro set for now, and keep doing some paranoia checks to make sure it's all working correctly. But if TEST_TOTLEN is unset, the size of struct jffs2_raw_node_ref drops from 16 bytes to 12 on 32-bit machines. That's a saving of about half a megabyte of memory on the OLPC prototype board, with 125K or so nodes in its 512MiB of flash. Signed-off-by: David Woodhouse commit 010b06d6d07d9fa5ea6070aa72bb3e0de1761ab7 tree 96c6ceddfec1aa6ddcdd0efcb39f903b284203c2 parent 9167e0f811cbe28564c44a99c2f07b0ce5b368cf author David Woodhouse Sun, 21 May 2006 13:15:59 +0100 committer David Woodhouse Sun, 21 May 2006 13:15:59 +0100 [JFFS2] Locking issues in summary write code. We can't use jffs2_scan_dirty_space() because it doesn't do any locking; it's only for use at scan time -- hence the 'scan' in the name. Also, don't allocate refs while we have c->erase_completion_lock held. Signed-off-by: David Woodhouse commit 9167e0f811cbe28564c44a99c2f07b0ce5b368cf tree ed98ccdf3b268bc577d6eefb0a76a87da8aa2496 parent 0bcc099d6d1a7b9fa2adf7c19812e4e816915e10 author David Woodhouse Sun, 21 May 2006 13:13:45 +0100 committer David Woodhouse Sun, 21 May 2006 13:13:45 +0100 [JFFS2] Remove stray kfree of summary info in XATTR code. We don't allocate this locally any more -- it's given to us and owner by our caller. Also improve the debug messages a little. Signed-off-by: David Woodhouse commit 0bcc099d6d1a7b9fa2adf7c19812e4e816915e10 tree 36f4c8c9c50369577b0b65823c04fcfb85502d98 parent b64335f2b740d6f5dbf5d3b04af30d407bf599f5 author David Woodhouse Sun, 21 May 2006 13:00:54 +0100 committer David Woodhouse Sun, 21 May 2006 13:00:54 +0100 [JFFS2] File node reference for wasted space when flushing wbuf Next step in ongoing campaign to file a struct jffs2_raw_node_ref for every piece of dirty space in the system, so that __totlen can be killed off.... Signed-off-by: David Woodhouse commit b64335f2b740d6f5dbf5d3b04af30d407bf599f5 tree 442e85ebc977f8d01bf9c1fe6dfbe898788422c5 parent 49f11d40751b974f3b829f208eefa6f97a10cac8 author David Woodhouse Sun, 21 May 2006 04:36:45 +0100 committer David Woodhouse Sun, 21 May 2006 04:36:45 +0100 [JFFS2] Add length argument to jffs2_add_physical_node_ref() If __totlen is going away, we need to pass the length in separately. Also stop callers from needlessly setting ref->next_phys to NULL, since that's done for them... and since that'll also be going away soon. Signed-off-by: David Woodhouse commit 49f11d40751b974f3b829f208eefa6f97a10cac8 tree 3a08ec1f7f94e6fc81754a40ef4dfcaf0c489d11 parent 25090a6b23906552cf3d204aa421f811327e1b15 author David Woodhouse Sun, 21 May 2006 04:00:01 +0100 committer David Woodhouse Sun, 21 May 2006 04:00:01 +0100 [JFFS2] Mark gaps in summary list as dirty space Make sure we allocate a ref for any dirty space which exists between nodes which we find in an eraseblock summary. Signed-off-by: David Woodhouse commit 25090a6b23906552cf3d204aa421f811327e1b15 tree fba39a988d6d5048b5ca445364b5f13ea415078d parent 68270995f29f1a82b3eaab01df63ea7e721e2fa6 author David Woodhouse Sun, 21 May 2006 03:57:56 +0100 committer David Woodhouse Sun, 21 May 2006 03:57:56 +0100 [JFFS2] Discard remaining free space when filing a dirty block in scan. The incoming ref_totlen() calculation is going to rely on the existence of nodes which cover all dirty space. We can't just tweak the accounting data any more; we have to call jffs2_scan_dirty_space() to do it. Signed-off-by: David Woodhouse commit 68270995f29f1a82b3eaab01df63ea7e721e2fa6 tree 44388152f209c9f8f0df8eec33efaaca7817ec6d parent 7807ef7ba2a41c05f6197381f572dd38baa6c1ce author David Woodhouse Sun, 21 May 2006 03:46:05 +0100 committer David Woodhouse Sun, 21 May 2006 03:46:05 +0100 [JFFS2] Introduce jffs2_scan_dirty_space() function. To eliminate the __totlen field from struct jffs2_raw_node_ref, we need to allocate nodes for dirty space instead of just tweaking the accounting data. Introduce jffs2_scan_dirty_space() in preparation for that. Signed-off-by: David Woodhouse commit 7807ef7ba2a41c05f6197381f572dd38baa6c1ce tree 73d06f8b60b3e007b49fec33983365938135d2d1 parent 3560160aa26ebced1944aaa2e7e436d2a1b1bf70 author David Woodhouse Sun, 21 May 2006 03:45:27 +0100 committer David Woodhouse Sun, 21 May 2006 03:45:27 +0100 [JFFS2] Fix summary handling of unknown but compatible nodes. For RWCOMPAT and ROCOMPAT nodes, we should still allow the mount to succeed. Just abandon the summary and fall through to the full scan. Signed-off-by: David Woodhouse commit 3560160aa26ebced1944aaa2e7e436d2a1b1bf70 tree ee0bb33931cef644b1e5f6794e6bed833f33d42c parent 6171586a7ae5198988774e8480631e8d15f65dfe author David Woodhouse Sun, 21 May 2006 01:28:05 +0100 committer David Woodhouse Sun, 21 May 2006 01:28:05 +0100 [JFFS2] Fix memory leak in scan code; improve comments. If we had to allocate extra space for the summary node, we weren't correctly freeing it when jffs2_sum_scan_sumnode() returned nonzero -- which is both the success and the failure case. Only when it returned zero, which means fall through to the full scan, were we correctly freeing the buffer. Document the meaning of those return codes while we're at it. Signed-off-by: David Woodhouse commit 6171586a7ae5198988774e8480631e8d15f65dfe tree eef74bde60005c4e39c0c213030b27cb07a5c236 parent fb9fbbcc9389edabb172ac1b6419c01e32046787 author David Woodhouse Sun, 21 May 2006 00:02:06 +0100 committer David Woodhouse Sun, 21 May 2006 00:02:06 +0100 [JFFS2] Correct handling of JFFS2_FEATURE_RWCOMPAT_COPY nodes. We should preserve these when we come to garbage collect them, not let them get erased. Use jffs2_garbage_collect_pristine() for this, and make sure the summary code copes -- just refrain from writing a summary for any block which contains a node we don't understand. Signed-off-by: David Woodhouse commit fb9fbbcc9389edabb172ac1b6419c01e32046787 tree 9e5dd2385010324a00edbf6d5c8c8a8565970a9d parent f1f9671bd8f7d2ac6a918bad806ab5bdc0daaf4e author David Woodhouse Sat, 20 May 2006 20:08:42 +0100 committer David Woodhouse Sat, 20 May 2006 20:08:42 +0100 [JFFS2] Correct accounting of erroneous cleanmarkers and failed summaries. It should all be counted as dirty space, not wasted and _definitely_ not unchecked. Signed-off-by: David Woodhouse commit f1f9671bd8f7d2ac6a918bad806ab5bdc0daaf4e tree f1fb5992fbd299375c911eb4c36d7fc8774f9208 parent 0cfc7da3ff4b39a3aac261ab3f6b1329e2485653 author David Woodhouse Sat, 20 May 2006 19:45:26 +0100 committer David Woodhouse Sat, 20 May 2006 19:45:26 +0100 [JFFS2] Introduce jffs2_link_node_ref() function to reduce code duplication The same sequence of code was repeated in many places, to add a new struct jffs2_raw_node_ref to an eraseblock and adjust the space accounting accordingly. Move it out-of-line. Signed-off-by: David Woodhouse commit 0cfc7da3ff4b39a3aac261ab3f6b1329e2485653 tree 447073fe757b42e6da63b96a26cbbc6b4c705946 parent 1417fc44ee923418df3adadeb4846c891bba1ba5 parent 20a92fc74c5c91c7bc5693d51acc2b99aceb0465 author David Woodhouse Sat, 20 May 2006 17:27:32 +0100 committer David Woodhouse Sat, 20 May 2006 17:27:32 +0100 Merge git://git.infradead.org/jffs2-xattr-2.6 Signed-off-by: David Woodhouse commit 1417fc44ee923418df3adadeb4846c891bba1ba5 tree 07e58ced7665ec94dad951175795ed3cbf11513c parent 9641b784ff82cf0a48a6c70ef9867f5fd728de67 author David Woodhouse Sat, 20 May 2006 16:20:19 +0100 committer David Woodhouse Sat, 20 May 2006 16:20:19 +0100 [JFFS2] Reduce calls to ref_totlen() in jffs2_mark_node_obsolete() We were calling ref_totlen() 18 times. Even before that becomes a real function rather than just a dereference, apparently some compilers still suck anyway. It'll _certainly_ suck after ref_totlen() becomes more complicated, so calculate it once and don't rely on CSE. Signed-off-by: David Woodhouse commit 9641b784ff82cf0a48a6c70ef9867f5fd728de67 tree 40d7bbc06ee5e54560ea7e7dabe75ac01a72e00c parent 6c8b44abc86a3e23dd1a22c0ee187f06bd7c7f5d author David Woodhouse Sat, 20 May 2006 16:13:34 +0100 committer David Woodhouse Sat, 20 May 2006 16:13:34 +0100 [JFFS2] Optimise reading of eraseblock summary nodes This improves the time to mount 512MiB of NAND flash on my OLPC prototype by about 4%. We used to read the last page of the eraseblock twice -- once to find the offset of the summary node, and again to actually _read_ the summary node. Now we read the last page only once, and read more only if we need to. We also don't allocate a new buffer just for the summary code -- we use the buffer which was already allocated for the scan. Better still, if the 'buffer' for the scan is actually just a pointer directly into NOR flash, we use that too, avoiding the memcpy() which we used to do. Signed-off-by: David Woodhouse commit 979dca3826841e5dc9170c28f20bd75ece266a9a tree 1cfeb1d2b47314a50d2e2e567e89cdbfa69f8162 parent 818bf493525d2a0ce3ddaefb2b78db1635596666 author Randy Dunlap Fri, 19 May 2006 11:55:58 -0700 committer James Bottomley Sat, 20 May 2006 09:56:15 -0500 [SCSI] imm: no need for unchecked_isa_dma Relax the lowmem bounce buffer requirement for imm so that any low memory page will do -- they don't need to be below the ISA 16 MB limit, just need to be mapped in low memory. Signed-off-by: Randy Dunlap Signed-off-by: James Bottomley commit 818bf493525d2a0ce3ddaefb2b78db1635596666 tree fa722a10a1cd358205fd6313b75830e2df24b59e parent 21333b481159a78b5379b8ddb400efafd5857d55 author Andrew Vasquez Wed, 17 May 2006 15:10:01 -0700 committer James Bottomley Sat, 20 May 2006 09:50:47 -0500 [SCSI] qla2xxx: Update version number to 8.01.05-k2. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 21333b481159a78b5379b8ddb400efafd5857d55 tree 5d92f1f7b363f62f9b469fb1ba0764d3c72f13ea parent d4e3e04d789ba23027c66e176b10ac7477906948 author Andrew Vasquez Wed, 17 May 2006 15:09:56 -0700 committer James Bottomley Sat, 20 May 2006 09:50:29 -0500 [SCSI] qla2xxx: Correct issue where driver improperly issued SNS commands in N2N topologies. Semantic changes in ISP24xx firmware behaviour inadvertently caused the driver to believe an F-port topology was present in an N_port-to-N_port configuration. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit d4e3e04d789ba23027c66e176b10ac7477906948 tree e98c514c2b3505af6f0c0a2e48f697899735ff15 parent cb63067a772c0149184309a1f232d62c81a93673 author Andrew Vasquez Wed, 17 May 2006 15:09:50 -0700 committer James Bottomley Sat, 20 May 2006 09:50:11 -0500 [SCSI] qla2xxx: Consolidate firmware-dump handling across ISPs. Simplify and centralise buffer allocation/deallocation, as there's no point in having two memory request methods. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit cb63067a772c0149184309a1f232d62c81a93673 tree a42a6561416022e0d5275369c52f7fba10103552 parent 47f5e069e4d03dda36e3a13f3e20147efd710340 author Andrew Vasquez Wed, 17 May 2006 15:09:45 -0700 committer James Bottomley Sat, 20 May 2006 09:49:53 -0500 [SCSI] qla2xxx: Consolidate "qla2xxx" string usage to a #define. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 47f5e069e4d03dda36e3a13f3e20147efd710340 tree a9816facb46a919754751edb675c73089e2ff2b5 parent 441d1072040823feb4950a21094860bfddd310c0 author Andrew Vasquez Wed, 17 May 2006 15:09:39 -0700 committer James Bottomley Sat, 20 May 2006 09:49:37 -0500 [SCSI] qla2xxx: Use PCI_DEVICE() for pci_device_id definition. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 441d1072040823feb4950a21094860bfddd310c0 tree 590e90b78af52ab69530cec945f980d7290b844e parent 4971cd221ad3f1266b87aa0e996d082d91bac2a6 author Andrew Vasquez Wed, 17 May 2006 15:09:34 -0700 committer James Bottomley Sat, 20 May 2006 09:49:13 -0500 [SCSI] qla2xxx: Remove obsolete firmware-loader-module support. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 4971cd221ad3f1266b87aa0e996d082d91bac2a6 tree d4fc40793c825ecdb788533efc2d1376fa51b03f parent 75bc4190701d3c6bdffdc21c8a9e17751de9f77a author Andrew Vasquez Wed, 17 May 2006 15:09:27 -0700 committer James Bottomley Sat, 20 May 2006 09:43:44 -0500 [SCSI] qla2xxx: Remove unused port-type RSCN handling code. Expandind on the previous commit: commit 79f89a4296ff22f09baf538d4ff2a6d0c3097a73 Author: andrew.vasquez@qlogic.com Date: Fri Jan 13 17:05:58 2006 -0800 [SCSI] qla2xxx: Disable port-type RSCN handling via driver state-machine. and given: - the process-context requirements of the FC transport rport-APIs. - lack of port-type RSCN processing logic for ISP24xx and newer chips. it's time now to remove the state-machine logic from mainline. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 75bc4190701d3c6bdffdc21c8a9e17751de9f77a tree 3d0567fcf95bab224f8a75759f593619a0a2f28a parent 5341e868fb2e98090a68860a35bf4c11d7f8e5da author Andrew Vasquez Wed, 17 May 2006 15:09:22 -0700 committer James Bottomley Sat, 20 May 2006 09:43:22 -0500 [SCSI] qla2xxx: Drop unused driver cruft. - structure definitions. - structure members. - #define's. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 5341e868fb2e98090a68860a35bf4c11d7f8e5da tree db31c8e430368bb7198c6c673c2c7c89e3b862bc parent fd0e7e4dd507cd21d714d34a1cc1a620d01e9772 author Andrew Vasquez Wed, 17 May 2006 15:09:16 -0700 committer James Bottomley Sat, 20 May 2006 09:42:43 -0500 [SCSI] qla2xxx: Add support for alternate WWN NVRAM setting. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit fd0e7e4dd507cd21d714d34a1cc1a620d01e9772 tree 3f405e581dda39cfa8b4ca87a8e5795e4312c378 parent ffb39f0324b56bacaabac26133143cf861d0e9f9 author Andrew Vasquez Wed, 17 May 2006 15:09:11 -0700 committer James Bottomley Sat, 20 May 2006 09:42:18 -0500 [SCSI] qla2xxx: Correct endianess comparisons during ISP24xx NVRAM configuration. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit ffb39f0324b56bacaabac26133143cf861d0e9f9 tree 3c4f1fd64e5199565637ff40b01228d3ec82a2fd parent d1c61909c05ead100f855e640fba53925d0665ac author Andrew Vasquez Wed, 17 May 2006 15:09:06 -0700 committer James Bottomley Sat, 20 May 2006 09:41:56 -0500 [SCSI] qla2xxx: ABBA lock ordering fix. In qla2x00_reset_chip the driver first takes the hardware lock, and then later on takes the mbx lock. In the mailbox_command code.. it goes the other way around. Discovered with the lock validator. Cc: Ingo Molnar Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit d1c61909c05ead100f855e640fba53925d0665ac tree 2fc533e6e77a7bf2814bff98edb66990fc97a211 parent ed17c71b5d11327efd40666fd621486f964fae4f author Andrew Vasquez Wed, 17 May 2006 15:09:00 -0700 committer James Bottomley Sat, 20 May 2006 09:41:31 -0500 [SCSI] qla2xxx: Update ISP24xx firwmare loading heuristics. If firmware image is unavailable via request_firwmare(), then attempt to load the image (likely out-of-date) stored in flash memory. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit ed17c71b5d11327efd40666fd621486f964fae4f tree 63fa5ae594acb8a66361ead95f43001fd0630945 parent 45aeaf1e8e4552ef82d3ff7a06e526e6d635f767 author Ravi Anand Wed, 17 May 2006 15:08:55 -0700 committer James Bottomley Sat, 20 May 2006 09:41:02 -0500 [SCSI] qla2xxx: Use FW calculated residual count for underrun handling. With ISP24XX and ISP54XX parts. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 45aeaf1e8e4552ef82d3ff7a06e526e6d635f767 tree 10001713a5e9ae01cccbad02ad61d55307a97acd parent 57680080baf3a8e289fad7f9e3c43ed58309e1eb author Ravi Anand Wed, 17 May 2006 15:08:49 -0700 committer James Bottomley Sat, 20 May 2006 09:40:41 -0500 [SCSI] qla2xxx: Add support for new flash part. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit 57680080baf3a8e289fad7f9e3c43ed58309e1eb tree 6c94db89570d765cdbbc86b453a005c70b98082d parent e0ecae8da26d94dd878ff1d939c5aa4224df18a4 author Ravi Anand Wed, 17 May 2006 15:08:44 -0700 committer James Bottomley Sat, 20 May 2006 09:40:21 -0500 [SCSI] qla2xxx: Don't wait for loop transition to complete if LOOP_DEAD state is attained. Signed-off-by: Andrew Vasquez Signed-off-by: James Bottomley commit e0ecae8da26d94dd878ff1d939c5aa4224df18a4 tree e03fe5b9319ccac73a94ce23fe5d6f005e618495 parent 656cffc95f0cb8211aa75eaca249e6ff4f59ec83 author Mike Christie Thu, 18 May 2006 20:31:43 -0500 committer James Bottomley Sat, 20 May 2006 09:36:38 -0500 [SCSI] iscsi: update version update version Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 656cffc95f0cb8211aa75eaca249e6ff4f59ec83 tree 7b10e224ef3ac140570101ed98c918949863995b parent 790f39a2d5f03623b027f340b945f135d006ceba author Mike Christie Thu, 18 May 2006 20:31:42 -0500 committer James Bottomley Sat, 20 May 2006 09:36:17 -0500 [SCSI] iscsi: fix command requeues during iscsi recovery Do not flush queues then block session. This will cause commands to needlessly swing around on us and remove goofy recovery_failed field and replace with state value. And do not start recovery from within the host reset function. This causeis too many problems becuase open-iscsi was desinged to call out to userspace then have userpscae decide if we should go into recovery or kill the session. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 790f39a2d5f03623b027f340b945f135d006ceba tree 5a591a6c7952d758d0f9a8d7874020cc3d4f8571 parent ffbfe92533810bf1bb76fd275400825ef8898ed9 author Mike Christie Thu, 18 May 2006 20:31:39 -0500 committer James Bottomley Sat, 20 May 2006 09:35:51 -0500 [SCSI] iscsi: support mutiple daemons Patch from david.somayajulu@qlogic.com and cleaned up by Tomo. qla4xxx is going to have a different daemon so this patch just routes the events to the right daemon. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ffbfe92533810bf1bb76fd275400825ef8898ed9 tree dbb251eaf0196df7b69d8af76a03cba0e1d9ad18 parent d36ab6f3212053b260214bc915687765e2fd1178 author Mike Christie Thu, 18 May 2006 20:31:36 -0500 committer James Bottomley Sat, 20 May 2006 09:35:20 -0500 [SCSI] iscsi: kill dtask mempools Discovered by steven@hayter.me.uk and patch by michaelc@cs.wisc.edu The dtask mempool is reserving 261120 items per session! Since we are now sending headers with sendmsg there is no reason for the mempool and that was causing us to us carzy amounts of mem. We can preallicate a header in the r2t and task struct and reuse them Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit d36ab6f3212053b260214bc915687765e2fd1178 tree b06957a99c8094ba45de16498b623d2eae5db543 parent 6e458cc943dd494ac68b570418f187883e555362 author Mike Christie Thu, 18 May 2006 20:31:34 -0500 committer James Bottomley Sat, 20 May 2006 09:34:54 -0500 [SCSI] iscsi: only preallocate login buffer We only use the mtask data buffer for login tasks so we do not need to preallocate a buffer for every mtask. This saves 8 * 31 KB. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 6e458cc943dd494ac68b570418f187883e555362 tree 11519c1b451bfb54a1dcf0a003dfe183c9c34fd7 parent 07fb75a50600c0c480b40c6d11dbc993f21bc2bc author Mike Christie Thu, 18 May 2006 20:31:31 -0500 committer James Bottomley Sat, 20 May 2006 09:34:21 -0500 [SCSI] iscsi: dont use sendpage for iscsi headers From Zhen and ported by Mike: Don't use sendpage for the headers. sendpage for the pdu headers does not seem to have a performance impact, makes life harder for mutiple data pdus to be in flight and still trips up some network cards when it is from slab mem. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 07fb75a50600c0c480b40c6d11dbc993f21bc2bc tree 9012c689500d33f576c99f00235f44901c86a6cc parent 5b9851b5511833a96fea2196971b5709ef019136 author Jesper Juhl Sun, 14 May 2006 00:39:38 +0200 committer James Bottomley Sat, 20 May 2006 09:23:23 -0500 [SCSI] fix (unlikely) memory leak in DAC960 driver The Coverity checker found a memory leak (bug nr. 1245) in drivers/block/DAC960.c::DAC960_V2_ProcessCompletedCommand() The leak is pretty unlikely since it requires that the first of two successive kmalloc() calls fail while the second one succeeds. But it can still happen even if it's unlikely. If the first call that allocates 'PhysicalDeviceInfo' fails but the one that allocates 'InquiryUnitSerialNumber' succeeds, then we will leak the memory allocated to 'InquiryUnitSerialNumber' when the variable goes out of scope. A simple fix for this is to change the existing code that frees 'PhysicalDeviceInfo' if that one was allocated but 'InquiryUnitSerialNumber' was not, into a check for either pointer being NULL and if so just free both. This is safe since kfree() can deal with being passed a NULL pointer and it avoids the leak. While I was there I also removed the casts of the kmalloc() return value since it's pointless. I also updated the driver version since this patch changes the workings of the code (however slightly). This issue could probably be fixed a lot more elegantly, but the code is a big mess IMHO and I just took the least intrusive route to a fix that I could find instead of starting on a cleanup as well (that can come later). Please consider for inclusion. Signed-off-by: Jesper Juhl Signed-off-by: James Bottomley commit 5b9851b5511833a96fea2196971b5709ef019136 tree fd87212b1f9efb9db1f8bea67e6b3c204e1ac955 parent df3b7668715f9acfe6ff37dd886f68e46ccd677e author Mark Haverkamp Wed, 10 May 2006 09:13:37 -0700 committer James Bottomley Sat, 20 May 2006 09:23:02 -0500 [SCSI] aacraid: remove unneeded list Received From Mark Salyzyn The queue tracking is just not being used, not even for debugging. Information about outstanding commands can be acquired from the scsi structures. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit df3b7668715f9acfe6ff37dd886f68e46ccd677e tree e789432027f8b11775f9f55e9f1f6d64df1fe2c1 parent 404d9a900b5bc83a3780ec337ca6fdcb04b766c0 author Mark Haverkamp Wed, 10 May 2006 09:13:11 -0700 committer James Bottomley Sat, 20 May 2006 09:22:44 -0500 [SCSI] aacraid: sa race condition fix Received From Mark Salyzyn A race condition existed that could result in a lost completion of a command to the ppc based cards. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 404d9a900b5bc83a3780ec337ca6fdcb04b766c0 tree cb43521e7ddd2e20cae26ed8b70ea77dab9bae79 parent 3c1e0cca9469bd19590ade25f6d9f94da2710d5b author Mark Haverkamp Wed, 10 May 2006 09:12:48 -0700 committer James Bottomley Sat, 20 May 2006 09:22:25 -0500 [SCSI] aacraid: adjustable timeouts Received From Mark Salyzyn Add the ability to adjust for unusual corner case failures. Both of these additional module parameters deal with embedded, non-intel or complicated system scenarios. Aif_timeout can be increased past the default 2 minute timeout to drop application registrations when a system has an unusually high event load resulting from continuing management requests, or simultaneous builds, or sluggish user space as a result of system load. Startup_timeout can be increased past the default 3 minute timeout to drop an adapter initialization for systems that have a very large number of targets, or slow to spin-up targets, or a complicated set of array configurations that extend the time for the firmware to declare that it is operational. This timeout would only have an affect on non-intel based systems, as the (more patient) BIOS would generally be where the startup delay would be dealt with. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 3c1e0cca9469bd19590ade25f6d9f94da2710d5b tree bdfab89960048e1df4a2b6978cf1cd1a188dc5a2 parent edb527ce35b0c86e72ed518af255f02e1cecb3b7 author Mark Haverkamp Wed, 10 May 2006 09:12:05 -0700 committer James Bottomley Sat, 20 May 2006 09:21:57 -0500 [SCSI] aacraid: optimize sg alloc Received From Mark Salyzyn Slight space and speed efficiency improvement. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit edb527ce35b0c86e72ed518af255f02e1cecb3b7 tree c53500fe591727d5f2f81c7c38a47c389472ec83 parent 2ca48a132167f9f12efba179382979aafde0ab36 author Mark Haverkamp Wed, 10 May 2006 09:11:38 -0700 committer James Bottomley Sat, 20 May 2006 09:21:36 -0500 [SCSI] aacraid: remove unneeded locking Received From Mark Salyzyn Since new commands to the card are quiesced, respect the changes in the SCSI error path which dropped locking around the hba reset handler and similarly drop the lock requirement in the driver's path. Signed-off-by: Mark Haverkamp Signed-off-by: James Bottomley commit 6c8b44abc86a3e23dd1a22c0ee187f06bd7c7f5d tree 8b40f20e9c0dda7a52a39a14d131684d3549a3d3 parent 5fc3dbc418e01345e25e96b3192a1c46051c3fdc author Andrew Morton Sat, 20 May 2006 10:17:21 +0100 committer David Woodhouse Sat, 20 May 2006 10:17:21 +0100 [MTD] Avoid 64-bit division in mtdconcat WARNING: "__moddi3" [drivers/mtd/mtdconcat.ko] undefined! Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c tree 7d707a8352a678491ae45b88e86fa25e5b24f9f1 parent f8bbfc247efb0e5fa69094614380768ce79afe17 author Thomas Glanzmann Fri, 12 May 2006 10:00:41 +0200 committer Jeff Garzik Sat, 20 May 2006 00:43:03 -0400 [PATCH] Add PCI ID for the Intel IDE Controller which is in the Intel Mac Minis shipped in first quarter 2006 Signed-off-by: Thomas Glanzmann Signed-off-by: Jeff Garzik commit f8bbfc247efb0e5fa69094614380768ce79afe17 tree 726b8eb9d41b5f7036c987b80282b90440a295ed parent a20f33ffde8ba5fb27666aa1e228a45b7e3b8dcb author Tejun Heo Fri, 19 May 2006 21:07:05 +0900 committer Jeff Garzik Sat, 20 May 2006 00:39:08 -0400 [PATCH] SCSI: make scsi_implement_eh() generic API for SCSI transports libata implemented a feature to schedule EH without an associated EH by manipulating shost->host_eh_scheduled in ata_scsi_schedule_eh() directly. Move this function to scsi_error.c and rename it to scsi_schedule_eh(). It is now an exported API for SCSI transports and exported via new header file drivers/scsi/scsi_transport_api.h This patch also de-export scsi_eh_wakeup() which was exported specifically for ata_scsi_schedule_eh(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a20f33ffde8ba5fb27666aa1e228a45b7e3b8dcb tree 850a2717f3861470a0020272f98416e17d36e5bf parent eec4c3f317991dc85c786ffccd9c1a8620c41b18 author Tejun Heo Tue, 16 May 2006 12:58:24 +0900 committer Jeff Garzik Sat, 20 May 2006 00:39:08 -0400 [PATCH] libata: enforce default EH actions LLDDs rely on libata that certain EH actions are automatically taken on some errors. If the port is frozen or one or more qc's have failed with HSM violation or timeout, softreset is enforced (LLDD can ask for storonger EH action at will). If any other error condition exists, libata EH always revalidates. This behavior existed in earlier revisions of new EH but lost during development process. This patch restores it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit eec4c3f317991dc85c786ffccd9c1a8620c41b18 tree 0ba309ca3e7df22295c43181715f7b0c445a92b1 parent 3655d1d323386e001c786af10f0a3f39f438f03b author Albert Lee Thu, 18 May 2006 17:51:10 +0800 committer Jeff Garzik Sat, 20 May 2006 00:37:01 -0400 [PATCH] libata: use qc->result_tf for temp taskfile storage Use qc->result_tf for temp taskfile storage. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 3655d1d323386e001c786af10f0a3f39f438f03b tree 16fd30cc6d255e5aaad4a5372cb8ec140c5b9736 parent 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb author Albert Lee Fri, 19 May 2006 11:43:04 +0800 committer Jeff Garzik Sat, 20 May 2006 00:37:01 -0400 [PATCH] libata: Fix the HSM error_mask mapping (was: Re: libata-tj and SMART) Fix the HSM error_mask mapping. Changes: - Better mapping in ac_err_mask() - In HSM_ST_FIRST ans HSM_ST state, check ATA_ERR|ATA_DF and map it to AC_ERR_DEV instead of AC_ERR_HSM. - In HSM_ST_FIRST and HSM_ST state, map DRQ=1 ERR=1 to AC_ERR_HSM. - For PIO data in and DRQ=1 ERR=1, add check after the junk data block is read. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb tree addbc37a278a126a19e03edd8270e577c75a8829 parent 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 parent e2a7f77a7b4ab298a38c8d1f624628456069bdb0 author Jeff Garzik Sat, 20 May 2006 00:36:08 -0400 committer Jeff Garzik Sat, 20 May 2006 00:36:08 -0400 Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/libata-core.c commit 4e3ceac609cce39cb96e0eb8604934592371ed8c tree 019b674bf79489128b4f1985ea99c5deca2cb15b parent badc48e6605ddeeb2484afae5993c859494decaa parent bb02aacc02c6002143a1cfc313d144a413eec8d0 author Jeff Garzik Sat, 20 May 2006 00:26:26 -0400 committer Jeff Garzik Sat, 20 May 2006 00:26:26 -0400 Merge branch 'upstream-fixes' into upstream commit badc48e6605ddeeb2484afae5993c859494decaa tree 7da638f9bb53b1812b71e40ad6deca91d59ad301 parent 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a parent 2f880b65fdbc2d4915bddc59d75a176329570fdd author Jeff Garzik Sat, 20 May 2006 00:03:38 -0400 committer Jeff Garzik Sat, 20 May 2006 00:03:38 -0400 Merge branch 'master' into upstream commit 5fc3dbc418e01345e25e96b3192a1c46051c3fdc tree 09691055b24900aceb5a1a021ce64ab8d907f694 parent dcb6592d72923123e3e479134f9381e0133d7d9d author David Woodhouse Sat, 20 May 2006 02:41:34 +0100 committer David Woodhouse Sat, 20 May 2006 02:41:34 +0100 [MTD] Use __symbol_get() instead of symbol_get() in NOR chip probe Signed-off-by: David Woodhouse commit dcb6592d72923123e3e479134f9381e0133d7d9d tree 6e95205db30cb81aae87b052acc6f5de0e6e1f91 parent 8e4482fba21d15da99f39a13396d3361e810d199 author Andrew Morton Fri, 19 May 2006 18:06:34 -0700 committer David Woodhouse Sat, 20 May 2006 02:39:43 +0100 git-mtd: symbol_get() fix drivers/mtd/devices/docprobe.c: In function `DoC_Probe': drivers/mtd/devices/docprobe.c:338: warning: assignment from incompatible pointer type drivers/mtd/devices/docprobe.c:341: warning: assignment from incompatible pointer type Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 8e4482fba21d15da99f39a13396d3361e810d199 tree 8dbfaedd9c0326040e8ac7e98b4d2c297b9151a0 parent aef9ab47841af45888d950baa6448072cc70bdd5 author Ferenc Havasi Fri, 19 May 2006 21:00:36 +0100 committer David Woodhouse Fri, 19 May 2006 21:00:36 +0100 [JFFS2] Remove forgotten summary code Remove forgotten lines from jffs2_scan_eraseblock() which were unnecessary and may cause problem in some environments. Thanks to Alexander Belyakov . Signed-off-by: Ferenc Havasi Signed-off-by: David Woodhouse commit 3c06da5ae5358e9d325d541a053e1059e9654bcc tree 04c953cc82fe57cff248ac523095cd4f0d9611a7 parent 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 parent a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e author Paul Mackerras Fri, 19 May 2006 15:02:42 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:42 +1000 Merge ../linux-2.6 commit 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 tree ab418b136a78442fc4f0f8d3575da74b82df4bda parent 1dc461f0b03fab309eb9214df1c9b586aeaf3b22 author Jimi Xenidis Thu, 18 May 2006 17:03:05 -0500 committer Paul Mackerras Fri, 19 May 2006 15:02:26 +1000 [PATCH] powerpc: Auto reserve of device tree blob A devtree compiler (dtc) generated devtree blob is "relocatable" and so does not contain a reserved_map entry for the blob itself. This means that if passed to Linux, Linux will not get lmb_reserve() the blob and it could be over. The following patch will explicitly reserve the "blob" as it was given to us and stops prom_init.c from creating a reserved mapping for the blob. NOTE: that the dtc/kexec should not generate the blob reservation entry. Although if they do, LMB reserver handles overlaps. Signed-off-by: Acked-by: Michael Neuling Signed-off-by: Paul Mackerras commit 1dc461f0b03fab309eb9214df1c9b586aeaf3b22 tree a56220353855a2339367a0b3acf011d9dede33fd parent 4c76e0bcdeac27b45d55955f073a97ff8452a42f author Stephen Rothwell Thu, 18 May 2006 17:21:26 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:24 +1000 [PATCH] powerpc: the iSeries vio lan driver changed device type So the IOMMU table building code needs to match. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 4c76e0bcdeac27b45d55955f073a97ff8452a42f tree 9a274ffdfb1159012c10b7367e8d09207fbd28d0 parent d4ad66faecc4dd9f3db14e0b013741a6f867b089 author Jeremy Kerr Thu, 18 May 2006 18:06:37 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:23 +1000 [PATCH] powerpc: pseries: Use generic dma-window parsing function Change the pseries iommu init code to use the new of_parse_dma_window() to parse the ibm,dma-window and ibm,my-dma-window properties of pci and virtual device nodes. Also, clean up vio_build_iommu_table() a little. Tested on pseries, with both vio and pci devices. Signed-off-by: Jeremy Kerr Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit d4ad66faecc4dd9f3db14e0b013741a6f867b089 tree 002f68be37820100103202270f07e5d6a6fb840f parent 8ae5b2801a0beb10a55a7ebd5140482e2f84c3fa author Jeremy Kerr Thu, 18 May 2006 18:05:15 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:21 +1000 [PATCH] powerpc: Add of_parse_dma_window() Add a function for generic parsing of dma-window properties (ie, ibm,dma-window and ibm,my-dma-window) of pci and virtual device nodes. This function will also be used by cell. Signed-off-by: Jeremy Kerr Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 8ae5b2801a0beb10a55a7ebd5140482e2f84c3fa tree e392faf5cc57559564da909f2bb2b65fcc18b516 parent 35dd54326e857f1648c7cc1028e8d5e1dbe04992 author jimix@watson.ibm.com Wed, 17 May 2006 12:00:35 -0400 committer Paul Mackerras Fri, 19 May 2006 15:02:19 +1000 [PATCH] powerpc: udbg_printf() formatting attribute This patch allows the compiler to catch any printf-like mismatches for udbg_printf(). After some brute force building I've only found issues with my own code and lparcfg.c It could break some developers, but IMHO that would be goodness. Signed-off-by: Jimi Xenidis Signed-off-by: Paul Mackerras commit 35dd54326e857f1648c7cc1028e8d5e1dbe04992 tree dea05effa25bc751d1b777a0b80f0f46d3ff0b8e parent 473104134b35ce1c3ca77b738c561d6c215adc1b author Michael Ellerman Thu, 18 May 2006 11:16:11 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:18 +1000 [PATCH] powerpc: Move crashkernel= handling into the kernel. This was missing a quilt ref. Signed-off-by: Paul Mackerras commit 473104134b35ce1c3ca77b738c561d6c215adc1b tree 979ccd57fe0695a66287d5f09fd3781e16cd1faa parent 2babf5c2ec2f2d5de3e38d20f7df7fd815fd10c9 author Michael Ellerman Wed, 17 May 2006 18:00:49 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:16 +1000 [PATCH] powerpc: Kdump header cleanup We need to know the base address of the kdump kernel even when we're not a kdump kernel, so add a #define for it. Move the logic that sets the kdump kernelbase into kdump.h instead of page.h. Rename kdump_setup() to setup_kdump_trampoline() to make it clearer what it's doing, and add an empty definition for the !CRASH_DUMP case to avoid a Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 2babf5c2ec2f2d5de3e38d20f7df7fd815fd10c9 tree 9ecda21067fe36f36fbefae87141150b62c39acd parent 846f77b08c8301682ded5ce127c56397327a60d0 author Michael Ellerman Wed, 17 May 2006 18:00:46 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:15 +1000 [PATCH] powerpc: Unify mem= handling We currently do mem= handling in three seperate places. And as benh pointed out I wrote two of them. Now that we parse command line parameters earlier we can clean this mess up. Moving the parsing out of prom_init means the device tree might be allocated above the memory limit. If that happens we'd have to move it. As it happens we already have logic to do that for kdump, so just genericise it. This also means we might have reserved regions above the memory limit, if we do the bootmem allocator will blow up, so we have to modify lmb_enforce_memory_limit() to truncate the reserves as well. Tested on P5 LPAR, iSeries, F50, 44p. Tested moving device tree on P5 and 44p and F50. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 846f77b08c8301682ded5ce127c56397327a60d0 tree c155737af3eceab34c621cc6930145062323eef8 parent 480f6f35a149802a94ad5c1a2673ed6ec8d2c158 author Michael Ellerman Wed, 17 May 2006 18:00:45 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:13 +1000 [PATCH] powerpc: Parse early parameters earlier Currently we have call parse_early_param() earliyish, but not really very early. In particular, it's not early enough to do things like mem=x or crashkernel=blah, which is annoying. So do it earlier. I've checked all the early param handlers, and none of them look like they should have any trouble with this. I haven't tested the booke_wdt ones though. On 32-bit we were doing the CONFIG_CMDLINE logic twice, so don't. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 480f6f35a149802a94ad5c1a2673ed6ec8d2c158 tree b0cded201abfbc7c6a1c5bfa316e6fecc1e2b507 parent 9dabbfbab312909782b26580d71e3977622fab6e author Michael Ellerman Wed, 17 May 2006 18:00:41 +1000 committer Paul Mackerras Fri, 19 May 2006 15:02:12 +1000 [PATCH] powerpc: Make early xmon logic immune to location of early parsing Currently early_xmon() calls directly into debugger() if xmon=early is passed. This ties the invocation of early xmon to the location of parse_early_param(), which might change. Tested on P5 LPAR and F50. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit f9a6ee1afb84fd767508428ec5d1df4fb60a03ad tree 5180efc6208c58676001b637fec8bba7ba542f33 parent a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e author Rich Townsend Mon, 19 Dec 2005 23:07:00 -0500 committer Len Brown Fri, 19 May 2006 00:49:52 -0400 ACPI: replace spin_lock_irq with mutex for ec poll mode http://bugzilla.kernel.org/show_bug.cgi?id=5764 Signed-off-by: Luming Yu Signed-off-by: Len Brown commit 9dabbfbab312909782b26580d71e3977622fab6e tree 2a691ca642995241224f087b3a53e815b8d67455 parent de0fe3b83f4bb47a0a6b47897bb3800862194016 author mostrows@watson.ibm.com Mon, 15 May 2006 08:51:07 -0400 committer Paul Mackerras Fri, 19 May 2006 14:35:32 +1000 [PATCH] powerpc: Create /proc/rtas, /proc/ppc64/rtas if RTAS exists. Use the existence of RTAS device tree node to determine if /proc/rtas. /proc/ppc64/rtas are to be created. Using machine type is not reliable (i.e. Maple-like machines may have RTAS). Signed-off-by: Michal Ostrowski Signed-off-by: Paul Mackerras commit de0fe3b83f4bb47a0a6b47897bb3800862194016 tree 4187a5035042eddc3010e91f6c2a8eabf5e24859 parent dc3c9b8ca2ec15cf56d071b85f3734a07bf5f808 author Stephen Rothwell Mon, 15 May 2006 13:44:01 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:31 +1000 [PATCH] powerpc: update iSeries viocd and viotape device-tree Make their device_type entries more generic and their compatible entries more specific. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit dc3c9b8ca2ec15cf56d071b85f3734a07bf5f808 tree 494e26fdf3736048ce0e9d1582ca1bf07f753ff8 parent fbabeb60ba783bf7a43858ecefc5066ac1f07162 author Stephen Rothwell Mon, 15 May 2006 13:42:29 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:29 +1000 [PATCH] powerpc: update iSeries vdevice Make it look more like the pSeries vdevice tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit fbabeb60ba783bf7a43858ecefc5066ac1f07162 tree 53e319022fa39f3fd44ee12214708f2e4036b920 parent 07fb3f454cc9e0f656e378a6feb5bdd6cac4bd41 author Stephen Rothwell Mon, 15 May 2006 13:41:22 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:28 +1000 [PATCH] powerpc: update iSeries viodasd device-tree entries These devices should have device_type block and a unique compatible entry. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 07fb3f454cc9e0f656e378a6feb5bdd6cac4bd41 tree 5a754125950cb7ccb4029fc61748e1b171a7920a parent d6b89a196dfb03fdfbe3d574ab6773fe14a1d2c6 author Stephen Rothwell Mon, 15 May 2006 13:39:47 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:26 +1000 [PATCH] powerpc: update iseries_veth device-tree information Make the device-tree information more generic and more like the pSeries virtual lan device. Also use the MAC address from the device tree. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit d6b89a196dfb03fdfbe3d574ab6773fe14a1d2c6 tree e2434d227933e425af867f37ed822fafcd76ef80 parent 485a2d54dbc7cf939bd0c22daad74e2cf6f001d7 author Michael Neuling Tue, 09 May 2006 11:33:38 -0500 committer Paul Mackerras Fri, 19 May 2006 14:35:25 +1000 [PATCH] powerpc: whitespace cleanup in reg.h In reg.h we mostly have #define but there are a few #define around. Clean these up so we use space exclusively. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit 485a2d54dbc7cf939bd0c22daad74e2cf6f001d7 tree 4939a7b849faf8e0fc3f5069b7f696475845eaa9 parent b26f100d89c87060b561c3108582b7cb81521df8 author Michael Ellerman Tue, 09 May 2006 16:03:51 +1000 committer Paul Mackerras Fri, 19 May 2006 14:35:23 +1000 [PATCH] powerpc: Make early debugging options behave with oldconfig If you undefine all the early debugging options and then run make oldconfig, you don't get prompted to see if you want to enable any of them. This is annoying. AFAICT we can't do this just with a choice, because the choice is either optional, in which case we don't get prompted, or not in which case we _must_ select early debugging. So add a bool which controls whether we have early debugging at all, and then if that's enabled provide the choice. The extra bool will actually be useful in another patch I have lying around, so this is a win-win. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit b26f100d89c87060b561c3108582b7cb81521df8 tree 57e566bb4f1411e059e59b0f43bc9544e15616e8 parent 4240545661fc0ac25122f166e96633527150300c author Geoff Levand Fri, 19 May 2006 14:24:18 +1000 committer Paul Mackerras Fri, 19 May 2006 14:24:18 +1000 [PATCH] powerpc: remove do-nothing cpu setup routines Removed the do-nothing routines __setup_cpu_power3 and __setup_cpu_power4 and replaced them with a null pointer check in the caller. Also removed the Cell processor specific routine __setup_cpu_be which improperly accessed the hypervisor page size configuration at SPR HID6. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 4240545661fc0ac25122f166e96633527150300c tree 9be44f79aa0a37d49744ce5a685ec41d057c60f3 parent 877fbae3d51ba792639535bfc0f428154b8da605 author Linas Vepstas Fri, 28 Apr 2006 17:39:38 -0500 committer Paul Mackerras Fri, 19 May 2006 13:51:12 +1000 [PATCH] powerpc/pseries: Increment fail counter in PCI recovery When a PCI device driver does not support PCI error recovery, the powerpc/pseries code takes a walk through a branch of code that resets the failure counter. Because of this, if a broken PCI card is present, the kernel will attempt to reset it an infinite number of times. (This is annoying but mostly harmless: each reset takes about 10-20 seconds, and uses almost no CPU time). This patch preserves the failure count across resets. Signed-off-by: Linas Vepstas Signed-off-by: Paul Mackerras commit aef9ab47841af45888d950baa6448072cc70bdd5 tree 79545ddc225f64bc38fa04525ac4125c86202cb8 parent f6a673b3f4f93c1c50e1b18f29254b0531b722a8 author David Woodhouse Fri, 19 May 2006 00:28:49 +0100 committer David Woodhouse Fri, 19 May 2006 00:28:49 +0100 [JFFS2] Support new device nodes Device node major/minor numbers are just stored in the payload of a single data node. Just extend that to 4 bytes and use new_encode_dev() for it. We only use the 4-byte format if we _need_ to, if !old_valid_dev(foo). This preserves backwards compatibility with older code as much as possible. If we do make devices with major or minor numbers above 255, and then mount the file system with the old code, it'll just read the first two bytes and get the numbers wrong. If it comes to garbage-collect it, it'll then write back those wrong numbers. But that's about the best we can expect. Signed-off-by: David Woodhouse commit 877fbae3d51ba792639535bfc0f428154b8da605 tree a9cb1827e31a5e82c5473c0357eb6b3a7084f201 parent f18fc729cd2d67b76e24206ee3567c1f6983c358 parent 7e990266c845d7f712c96013891aaf74baef198f author Paul Mackerras Fri, 19 May 2006 09:23:47 +1000 committer Paul Mackerras Fri, 19 May 2006 09:23:47 +1000 Merge branch 'for_paulus' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc commit 20a92fc74c5c91c7bc5693d51acc2b99aceb0465 tree 41bf535f38ff1a29c560bcf622e9b4ef03c2c106 parent 21b9879bf2817aca343cdda11ade6a87f5373e74 parent f6a673b3f4f93c1c50e1b18f29254b0531b722a8 author KaiGai Kohei Fri, 19 May 2006 00:43:53 +0900 committer KaiGai Kohei Fri, 19 May 2006 00:43:53 +0900 Merge git://git.infradead.org/mtd-2.6 commit f6a673b3f4f93c1c50e1b18f29254b0531b722a8 tree 3b5bb0dd88456bad514bdcd65abaebdef6d41102 parent fd0e5187458041c82fea616575104698397d68d3 author David Woodhouse Wed, 17 May 2006 22:03:10 +0100 committer David Woodhouse Wed, 17 May 2006 22:03:10 +0100 [MTD] Fix printk format error in gen_probe.c Signed-off-by: David Woodhouse commit fd0e5187458041c82fea616575104698397d68d3 tree 9ca58b78007cf1f917d83e1e0291f34893c3de69 parent e8d32937d9f2022c31871ef357a4883f78da1b7f author David Woodhouse Wed, 17 May 2006 21:53:58 +0100 committer David Woodhouse Wed, 17 May 2006 21:53:58 +0100 [MTD] Fix mtdconcat build. We didn't introduce mtd->writesize yet. Signed-off-by: David Woodhouse commit 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 tree dfae1dfe50155f0ab85d057acf1b94cf7072eafe parent 59d4b684fbe74b25ac8593f39d2aaa86aa485b1f author Arjan van de Ven Tue, 02 May 2006 18:01:41 +0200 committer John W. Linville Wed, 17 May 2006 14:58:55 -0400 [PATCH] unused exports in wireless drivers There's a bunch of unused exports in the wireless drivers; that's bad since unused exports take up quite a bit of space in total; the patch below removes them. Signed-off-by: Arjan van de Ven Signed-off-by: John W. Linville commit 59d4b684fbe74b25ac8593f39d2aaa86aa485b1f tree fb9b7de045e39313509c370dfa1c0ffa827f41be parent 5dd8816aeb1f068ade0349a22009ff7a66f25413 parent bc519f30eb039f023c15167663d5a8a14fed7dcb author John W. Linville Wed, 17 May 2006 14:54:09 -0400 committer John W. Linville Wed, 17 May 2006 14:54:09 -0400 Merge branch 'upstream-fixes' into upstream commit 5dd8816aeb1f068ade0349a22009ff7a66f25413 tree c56ff327b1dfa8868b4208aea9ac4158e3bfe308 parent f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc parent 0c056c50a6218e0e577817c16ba8851af593d742 author John W. Linville Wed, 17 May 2006 14:51:24 -0400 committer John W. Linville Wed, 17 May 2006 14:51:24 -0400 Merge branch 'from-linus' into upstream commit e8d32937d9f2022c31871ef357a4883f78da1b7f tree c1cbf0718343d2faa1354570949217055763122c parent ceb31db11f78935c666c50fe9c99d4560d592fde author Alexander Belyakov Wed, 17 May 2006 19:11:16 +0400 committer David Woodhouse Wed, 17 May 2006 16:31:31 +0100 MTD: mtdconcat NAND/Sibley support (rev.2) There is a second revision of "mtdconcat NAND/Sibley" patch. I hope the patch will not get damaged as I'm posting it from gmail account, thanks to Jorn. The patch adds previously missing concat_writev(), concat_writev_ecc(), concat_block_isbad(), concat_block_markbad() functions to make concatenation layer compatible with Sibley and NAND chips. Patch has been cleared from whitespaces, fixed some lines of code as requested. Also I have added code for alignment check that should support Jorn's "writesize" patch. Signed-off-by: Alexander Belyakov Signed-off-by: David Woodhouse commit ceb31db11f78935c666c50fe9c99d4560d592fde tree cbe81df911ebd9ba1c840d1203e7835e7b583504 parent be21ce119716f821c595552917ce7c05a3997b6b author Martin Michlmayr Mon, 20 Mar 2006 04:40:46 +0000 committer David Woodhouse Wed, 17 May 2006 16:20:57 +0100 LASAT depends on MTD_CFI The following difference was found between the mainline and linux-mips kernel. LASAT depends on MTD_CFI. Signed-off-by: Martin Michlmayr Signed-off-by: David Woodhouse commit be21ce119716f821c595552917ce7c05a3997b6b tree 8cfe4ce1dc840ed150f3e072c341dc8f356551ac parent 683b30c8e78ab363dc8d8c94bdb61b64d1f6f5e2 author Martin Michlmayr Mon, 20 Mar 2006 04:40:26 +0000 committer David Woodhouse Wed, 17 May 2006 16:20:37 +0100 Re-add module description for ms02-nv to Kconfig In an unrelated MTD commit, a description about the ms02-nv module got removed from Kconfig. While I personally agree with this removal, the module maintainer (Maciej W. Rozycki) would like to see it added back. In the absense of any consistency regarding Kconfig descriptions his wish should be followed. Signed-off-by: Martin Michlmayr Acked-by: Maciej W. Rozycki Signed-off-by: David Woodhouse commit 683b30c8e78ab363dc8d8c94bdb61b64d1f6f5e2 tree 85ec4bf9ee63e8531c338c82c0609c48c7618d09 parent ae282d497d5631ce31539717131c760e3872c539 author Sean Young Wed, 17 May 2006 12:45:34 +0100 committer David Woodhouse Wed, 17 May 2006 12:45:34 +0100 [MTD] RFD FTL: Be noisier, and don't assume block without RFD magic are erased Signed-off-by: Sean Young Signed-off-by: David Woodhouse commit ae282d497d5631ce31539717131c760e3872c539 tree a3067a25401d0fa0d8cf409827d4d7031523095f parent 599fb3298b70d75c12dbdc4dd30f52c5cf04ea2f author Vitaly Wool Wed, 17 May 2006 12:34:27 +0100 committer David Woodhouse Wed, 17 May 2006 12:34:27 +0100 [MTD] generic: propagate oobavail to MTD partitions 'oobavail' parameter of mtd_info structure is now propagated to the MTD partitions Signed-off-by: Vitaly Wool Signed-off-by: David Woodhouse commit 599fb3298b70d75c12dbdc4dd30f52c5cf04ea2f tree d968c97f084f3788dd7c781532523eca667e7842 parent c172471b78255a5cf6d05383d9ebbf0c6683167a author Sean Young Wed, 17 May 2006 11:47:48 +0100 committer David Woodhouse Wed, 17 May 2006 11:47:48 +0100 [PCMCIA MTD] Fix leak and crash on reboot Signed-off-by: Sean Young Signed-off-by: David Woodhouse commit c172471b78255a5cf6d05383d9ebbf0c6683167a tree ecb18d8ef5686eeb11f14a8b9d6e12df03ba7520 parent 6e7a6809c555aeb7cb98544df4d446fbd6f123ec author Nicolas Pitre Thu, 30 Mar 2006 15:52:41 +0100 committer David Woodhouse Wed, 17 May 2006 01:25:37 +0100 cfi_cmdset_0001: factorize code to wait for flash status This allows for much better abstraction and separation of the XIP and non-XIP cases with their own specific implementations. This fixes the case where a timeout was tripped on in the XIP case by the code that was meant for the non-XIP case only. This also makes for a nice code reduction. Signed-off-by: Nicolas Pitre CC: "Alexey, Korolev" Signed-off-by: David Woodhouse commit 6e7a6809c555aeb7cb98544df4d446fbd6f123ec tree 15b9d84d7350396fc08541f54ec42842fd2187ef parent df54b52c411befdcf1d0989f939a49163570ad29 author Nicolas Pitre Wed, 29 Mar 2006 23:31:42 +0100 committer David Woodhouse Wed, 17 May 2006 01:22:23 +0100 cfi-cmdset-0001: always update the chip status ... otherwise xip_enable() won't do the right thing. Signed-off-by: Nicolas Pitre Signed-off-by: David Woodhouse commit df54b52c411befdcf1d0989f939a49163570ad29 tree e51dbc7a88da164ed1ab6b29273ae01d2faf4025 parent ba9627b85fcb5ed67285ca0711f0f4d1e965746e author Josh Boyer Tue, 06 Dec 2005 17:28:19 +0000 committer David Woodhouse Wed, 17 May 2006 01:11:17 +0100 CHIPS: Fix potential starvation in cfi_cmdset_0001 The patch below fixes a potential starvation issue that can arise when there is contention on a chip during a period when a process is currently writing to it. The starvation is avoided by conditionally rescheduling when the chip is left in a state usable by other processes. Signed-off-by: Josh Boyer Signed-off-by: Tom Gall Signed-off-by: David Woodhouse commit 3ac6c7b44560fdf2ea8865536bd52d4ff038107e tree e206d3e8f5eefcad32a9d8ea8dbe43113ac86efc parent 80b9192ee032f919da1b6e8b305c7cc9881b0907 author David Woodhouse Tue, 16 May 2006 23:25:37 +0100 committer David Woodhouse Tue, 16 May 2006 23:25:37 +0100 Remove struct fddi_statistics from user view in Signed-off-by: David Woodhouse commit ba9627b85fcb5ed67285ca0711f0f4d1e965746e tree 4a21707583c0cbbcc63cc23f416b3fa2f609e1e0 parent 35af68b53a62c98bf551aaae7be179bde248eb34 author David Woodhouse Tue, 16 May 2006 23:03:08 +0100 committer David Woodhouse Tue, 16 May 2006 23:03:08 +0100 [JFFS2] Repack some on-medium structures. ARM is weirder than I thought. We have to pack at least the jint16_t structure, because otherwise it'll be four bytes in size. Thankfully, we can do that and _not_ pack the actual node structures, and the compiler still doesn't emit stupid code. Signed-off-by: David Woodhouse commit 35af68b53a62c98bf551aaae7be179bde248eb34 tree a5e3b4d694674af5db6c705ef016738b680f73f4 parent b020bb7d3b3a8e3568a16eaf98c033bb9ee474eb author Sergei Shtylyov Tue, 16 May 2006 20:52:06 +0400 committer David Woodhouse Tue, 16 May 2006 18:03:18 +0100 NAND: Fix NAND ECC errors on AMD Au1550 On AMD Au1550 the static bus controller fails to keep -CE asserted during chip ready delay on read commands and the NAND chip being used requires this. So, the current driver allows nand_base.c to drive -CE manually during the entire sector read. When the PCMCIA driver is enabled however, occasionally the ECC errors occur on NAND reads. This happens because the PCMCIA driver polls sockets periodically and reads one of the board's control/status regs (BCSRs) which are on the same static bus as the NAND flash, and just use another chip select (and the NOR flash also resides on that bus), so as the NAND driver forces NAND chip select asserted and the -RE signal is shared, a contention occurs on the static bus when BCSR or NOR flash is read while we're reading from NAND. So, we either can't keep interrupts enabled during the whole NAND sector read (which is hardly acceptable), or have to implement some interlocking scheme between multiple drivers (which is painful, and makes me shudder :-). There's a third way which has proven to work: to force -CE asserted only while we're waiting for a NAND chip to become ready after a read command, disabling interrupts for a maximum of 25 microseconds (according to Toshiba TC58DVM92A1FT00 datasheet -- this chip is mentioned in the board schematics); for Samsung NAND chip which seems to be actually used this delay is even less, 12 us. Signed-off-by: Konstantin Baydarov Signed-off-by: Sergei Shtylyov Signed-off-by: David Woodhouse commit b020bb7d3b3a8e3568a16eaf98c033bb9ee474eb tree 97b621406f5ee19059d14afa1b2cfb76f2efb4eb parent 155285c4775b7027b01a5b744c721ae43cced798 author Ben Dooks Tue, 16 May 2006 17:31:15 +0100 committer David Woodhouse Tue, 16 May 2006 17:31:15 +0100 [MTD] Fix build warnings in RedBoot MTD partition parser. Fix build warnings from drivers/mtd/redboot.c due to use of `unsigned long` in `struct fis_image_desc` for fields being passed to swab32s() which expects __u32 * Change the entries to uint32_t to make them compatible with the swab32s() function Signed-off-by: Ben Dooks Signed-off-by: David Woodhouse commit 155285c4775b7027b01a5b744c721ae43cced798 tree 4bbfba4b281c3368c2544eafa1e93b63b517c509 parent c41ff6e5f38b02ff927d0d510e28dc1392bb4690 author Sergei Shtylyov Tue, 16 May 2006 20:16:41 +0400 committer David Woodhouse Tue, 16 May 2006 17:25:19 +0100 NAND: AMD Au1550 driver reads write-only register During the last cleanup of the AMD Au1550 NAND driver the old buglet was reintroduced: as the MEM_STNDCTL register is write-only and seem to always read as 0x31, read-modify-write to it done in au1xxx_nand_init() will have the side effect of enabling -RCS0/1 pin override (via bits 4/5 of this reg.), thus possibly causing a contention on the static bus when the NOR flash (using -RCS0) or board control status registers (using -RCS2) are read. Luckily, this goes away with a first NAND access, since au1550_hwcontrol() doesn't try to read this register before writing anymore. Signed-off-by: Sergei Shtylyov Signed-off-by: David Woodhouse commit c41ff6e5f38b02ff927d0d510e28dc1392bb4690 tree 338255986d719d68d18851416100f305548123b7 parent 7d2beb135986477f53da77303356bd04329f8d0e author David Woodhouse Tue, 16 May 2006 17:05:33 +0100 committer David Woodhouse Tue, 16 May 2006 17:05:33 +0100 [JFFS2] Fix printk format in jffs2_sum_write_data() error message. fs/jffs2/summary.c: In function ‘jffs2_sum_write_data’: fs/jffs2/summary.c:658: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 4 has type ‘uint32_t’ Signed-off-by: David Woodhouse commit 7d2beb135986477f53da77303356bd04329f8d0e tree 686bb65bf6e6f2f7da5b4efe427d7ba56d1469e7 parent cead4dbc03ba6eb2e35bac04439b76a0cc2286ce author David Brownell Tue, 16 May 2006 16:08:10 +0100 committer David Woodhouse Tue, 16 May 2006 16:08:10 +0100 [JFFS2] Fix section mismatch warnings in JFFS2. Mark certain functions with __init and __exit appropriately. Signed-off-by: David Brownell Signed-off-by: David Woodhouse commit cead4dbc03ba6eb2e35bac04439b76a0cc2286ce tree 7563bdedb51b496ee57f5f1b7141305d59dcddf1 parent ce589a0328866228412ea0df2c834688da8f4700 author David Woodhouse Tue, 16 May 2006 13:54:50 +0100 committer David Woodhouse Tue, 16 May 2006 13:54:50 +0100 [MTD NAND] Make various initfuncs static, remove #ifdef MODULE from exitfuncs We all inherited the same error from the original NAND board driver which got copied and changed. Fix them all at once... Signed-off-by: David Woodhouse commit ce589a0328866228412ea0df2c834688da8f4700 tree 548c843d4750223a3ebef78de0b88d67c2b5f319 parent f41a5f804a5862e9b87cf2d4cca1d6a7db7a9e82 author Adrian Bunk Tue, 16 May 2006 13:46:44 +0200 committer David Woodhouse Tue, 16 May 2006 13:12:12 +0100 drivers/mtd/devices/docprobe.c: correct #if's On Mon, May 15, 2006 at 12:56:37AM -0700, Andrew Morton wrote: >... > Changes since 2.6.17-rc3-mm1: >... > git-mtd.patch >... > git trees >... If we correct the names of the config options, the code might actually work as intended... Signed-off-by: Adrian Bunk Signed-off-by: David Woodhouse commit f41a5f804a5862e9b87cf2d4cca1d6a7db7a9e82 tree b436a0a85faca15179eb7b666424fc9a15654127 parent 18594822fcb01d4b35e05b9018f770a0b4156d1a author David Woodhouse Tue, 16 May 2006 13:11:47 +0100 committer David Woodhouse Tue, 16 May 2006 13:11:47 +0100 [MTD] Add help text for MTD_NAND_CS553X option. Signed-off-by: David Woodhouse commit 18594822fcb01d4b35e05b9018f770a0b4156d1a tree 38d35c38086a564beaac215f8e52694cdbfab1c3 parent 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce parent c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 author David Woodhouse Tue, 16 May 2006 01:19:52 +0100 committer David Woodhouse Tue, 16 May 2006 01:19:52 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Signed-off-by: David Woodhouse commit 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce tree c2330fcf5e5c2e64d4b1bf3c7dce3ed19e164af1 parent 184f565210c6c8a852c53ffc070f9add61e0f331 author Florin Malita Mon, 15 May 2006 23:42:31 +0100 committer David Woodhouse Mon, 15 May 2006 23:42:31 +0100 [PATCH] jffs2: memory leak in jffs2_scan_medium() If jffs2_scan_eraseblock() fails and the exit path is taken, 's' is not being deallocated. Reported by Coverity, CID: 1258. Signed-off-by: Florin Malita Signed-off-by: David Woodhouse commit 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 tree ae03881d6d86b528e075f7b6af8af74f4dbbf9ec parent efa6e7e9d40fe01406d889a5bed62f2e0da49bff parent 9a375e93f88269bb770fb2eaa57554c975449c88 author Jeff Garzik Mon, 15 May 2006 11:27:47 -0400 committer Jeff Garzik Mon, 15 May 2006 11:27:47 -0400 Merge branch 'max-sect' into upstream commit efa6e7e9d40fe01406d889a5bed62f2e0da49bff tree 7f856e4c4264a2e51768610f4b883ef023152f27 parent 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 parent aee10a03eb3e240bfd1a6f91e06ce82df47c5c58 author Jeff Garzik Mon, 15 May 2006 11:26:53 -0400 committer Jeff Garzik Mon, 15 May 2006 11:26:53 -0400 Merge branch 'for-jeff' of git://htj.dyndns.org/libata-tj into tejun-merge commit 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 tree bedfff6f96118771b809de30e559cc370f94c7be parent acc696d93dcf993dec123d69d599979e1456ffec parent 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 author Jeff Garzik Mon, 15 May 2006 11:26:03 -0400 committer Jeff Garzik Mon, 15 May 2006 11:26:03 -0400 Merge branch 'master' into upstream commit 184f565210c6c8a852c53ffc070f9add61e0f331 tree 194f8076b973f5404746ecf523114af4ce943ca3 parent 3e68fbb59b3d4e6b47b65e9928b5929e02179759 author Andrew Morton Mon, 15 May 2006 13:45:58 +0100 committer David Woodhouse Mon, 15 May 2006 13:45:58 +0100 [JFFS2] Fix printk format in some error messages. fs/jffs2/nodelist.c: In function `check_node_data': fs/jffs2/nodelist.c:441: warning: unsigned int format, different type arg (arg 4) fs/jffs2/nodelist.c:464: warning: int format, different type arg (arg 5) Modified from Andrew's original fix because while his terminal may indeed only have eighty columns, mine only has _TWENTYFOUR_ lines. So the cosmetic fluff is perfectly OK out past column 80 where it was -- the casual reader doesn't _care_ about anything more than the fact that it goes 'if (foo) JFFS2_WARNING...', and there's no point wasting a whole line to display the tail end of the printk which nobody actually cares about. Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit aee10a03eb3e240bfd1a6f91e06ce82df47c5c58 tree 103a12557c6dc042bc555781ce8eece045fccae2 parent 12fad3f965830d71f6454f02b2af002a64cec4d3 author Tejun Heo Mon, 15 May 2006 21:03:56 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:56 +0900 [PATCH] sata_sil24: implement NCQ support Implement NCQ support. Sil24 has 31 command slots and all of them are used for NCQ command queueing. libata guarantees that no other command is in progress when it issues an internal command, so always use tag 0 for internal commands. Signed-off-by: Tejun Heo commit 12fad3f965830d71f6454f02b2af002a64cec4d3 tree 124b6f283a1432b8a2f334fadc8b8be2757fa73e parent a9764c2bb5b6d3c9df91f2977a2a640f55de0dc2 author Tejun Heo Mon, 15 May 2006 21:03:55 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:55 +0900 [PATCH] ahci: implement NCQ suppport Implement NCQ support. Original implementation is from Jens Axboe. Signed-off-by: Tejun Heo commit a9764c2bb5b6d3c9df91f2977a2a640f55de0dc2 tree aafd47e6257d9d5e22f69c5639612e6b540093e5 parent 979db803b8fd120d4ed5216520e9d1815e18bc38 author Tejun Heo Mon, 15 May 2006 21:03:53 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:53 +0900 [PATCH] ahci: kill pp->cmd_tbl_sg With NCQ, there are multiple sg tables, so pp->cmd_tbl_sg doesn't cut it. Directly calculate sg table address from pp->cmd_tbl. Signed-off-by: Tejun Heo commit 979db803b8fd120d4ed5216520e9d1815e18bc38 tree e334de1ca174f6d211a26d396955d8e2e6ad4d12 parent dd410ff12925fc49df3174b18e43598b2b2b621f author Tejun Heo Mon, 15 May 2006 21:03:52 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:52 +0900 [PATCH] ahci: add HOST_CAP_NCQ constant Add HOST_CAP_NCQ. Signed-off-by: Tejun Heo commit dd410ff12925fc49df3174b18e43598b2b2b621f tree 782f1127a074fbb70e90ac46b5e97e42aceddc9d parent a6e6ce8e8dc907a2cf2b994b0ea4099423f046bf author Tejun Heo Mon, 15 May 2006 21:03:50 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:50 +0900 [PATCH] ahci: clean up AHCI constants in preparation for NCQ * Rename CMD_TBL_HDR to CMD_TBL_HDR_SZ as it's size not offset. * Define MAX_CMDS and CMD_SZ and use them in calculation of other constants. * Define CMD_TBL_AR_SZ as product of CMD_TBL_SZ and MAX_CMDS, and use it when calculating PRIV_DMA_SZ. * CMD_SLOT_SZ is also dependent on MAX_CMDS but hasn't been changed because I didn't want to change the value used by the original code (32 commands). Later NCQ change will bump MAX_CMDS to 32 anyway and the hard coded 32 can be changed to MAX_CMDS then. * Reorder HOST_CAP_* flags. Signed-off-by: Tejun Heo commit a6e6ce8e8dc907a2cf2b994b0ea4099423f046bf tree cc308c45c0d2df9e52be69959b9fd189371ad5d7 parent e8ee84518c159a663c07bf691ace187527380f61 author Tejun Heo Mon, 15 May 2006 21:03:48 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:48 +0900 [PATCH] libata-ncq: implement NCQ device configuration Now that all NCQ related stuff are in place, implement NCQ device configuration and bump ATA_MAX_QUEUE to 32 thus activating NCQ support. Original implementation is from Jens Axboe. Signed-off-by: Tejun Heo commit e8ee84518c159a663c07bf691ace187527380f61 tree ffd6d89b4e38ff2a70463125a3022771f69b2286 parent 3dc1d88193b9c65b01b64fb2dc730e486306649f author Tejun Heo Mon, 15 May 2006 21:03:46 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:46 +0900 [PATCH] libata-ncq: update EH to handle NCQ Update EH to handle NCQ. ata_eh_autopsy() is updated to call ata_eh_analyze_ncq_error() which reads log page 10h on NCQ device error and updates eh_context accordingly. ata_eh_report() is updated to report SActive. Signed-off-by: Tejun Heo commit 3dc1d88193b9c65b01b64fb2dc730e486306649f tree 1ffba999eadfe0e5b704d8ee9163483ef31e0591 parent dedaf2b0365ccec50714fbde0b3215e7e94fa47c author Tejun Heo Mon, 15 May 2006 21:03:45 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:45 +0900 [PATCH] libata-ncq: implement NCQ command translation and exclusion This patch implements NCQ command translation and exclusion. Note that NCQ commands don't use ata_rwcmd_protocol() to choose ATA command. This is because, unlike non-NCQ RW commands, NCQ commands can only be used for NCQ protocol and FUA handling is done with a flag rather than separate command. NCQ enabled device will have queue depth larger than one but no two non-NCQ commands can be issued simultaneously, neither can a non-NCQ command and NCQ commands. This patch makes ata_scsi_translate() return SCSI_MLQUEUE_DEVICE_BUSY if such exclusion is necessary. SCSI midlayer will retry the command later. As SCSI midlayer always retries once a command completes, this doesn't incur unnecessary delays and as most commands will be NCQ ones for NCQ device, so the overhead should be negligible. Initial implementation is from Jens Axboe and using SCSI_MLQUEUE_DEVICE_BUSY for exclusion is suggested by Jeff Garzik. Signed-off-by: Tejun Heo commit dedaf2b0365ccec50714fbde0b3215e7e94fa47c tree d98e2a928793e6072d4ff65b0e2ceedaa600e25d parent 6cec4a3943bdfe46e2952bc246f17670f747be8d author Tejun Heo Mon, 15 May 2006 21:03:43 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:43 +0900 [PATCH] libata-ncq: implement ap->qc_active, ap->sactive and complete helper Add ap->qc_active and ap->sactive, mask of all active qcs and libata's view of the SActive register, respectively. Also, implement ata_qc_complete_multiple() which takes new qc_active mask and complete multiple qcs according to the mask. These will be used to track NCQ commands and complete them. The distinction between ap->qc_active and ap->sactive is also useful for later PM implementation. Signed-off-by: Tejun Heo commit 6cec4a3943bdfe46e2952bc246f17670f747be8d tree 46fa642814683174b6da21c992ef6f672cec3ab5 parent 2115ea94a2d11fbd228b049e667ec2d3e91ca371 author Tejun Heo Mon, 15 May 2006 21:03:41 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:41 +0900 [PATCH] libata-ncq: rename ap->qactive to ap->qc_allocated Rename ap->qactive to ap->qc_allocated. This is to accomodate addition of ap->qc_active, mask of active qcs. Signed-off-by: Tejun Heo commit 2115ea94a2d11fbd228b049e667ec2d3e91ca371 tree 0584347308aa40af982f5f01d654a8186599b48c parent 88e490340ea4c3a2ebc0187a4339912e2fc1a081 author Tejun Heo Mon, 15 May 2006 21:03:39 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:39 +0900 [PATCH] libata-ncq: pass ata_scsi_translate() return value to SCSI midlayer ata_scsi_translate() will need to return SCSI_ML_QUEUE_DEVICE_BUSY to achieve exlusion between NCQ and non-NCQ commands or among non-NCQ commands. Pass its return value upward to SCSI midlayer. Signed-off-by: Tejun Heo commit 88e490340ea4c3a2ebc0187a4339912e2fc1a081 tree ab2604a796754a0fba301b4362dc649136b180c3 parent c17ea20d9a689d7335e97e09354865cdd9f873e1 author Tejun Heo Mon, 15 May 2006 21:03:38 +0900 committer Tejun Heo Mon, 15 May 2006 21:03:38 +0900 [PATCH] libata-ncq: add NCQ related ATA/libata constants and macros Add NCQ related ATA/libata constants and macros. Signed-off-by: Tejun Heo commit c17ea20d9a689d7335e97e09354865cdd9f873e1 tree 74b04b022513b66b5a84977b15296c1d8df97674 parent 12436c30f4808e00fa008c6787c609bc6ae216ba author Tejun Heo Mon, 15 May 2006 20:59:29 +0900 committer Tejun Heo Mon, 15 May 2006 20:59:29 +0900 [PATCH] libata: fix irq-pio merge * kill ata_poll_qc_complete() and implement/use ata_hsm_qc_complete() which completes qcs in new EH compliant manner from HSM * don't print error message from ata_hsm_move(). it's responsibility of EH. * kill ATA_FLAG_NOINTR usage in bmdma EH Signed-off-by: Tejun Heo commit 12436c30f4808e00fa008c6787c609bc6ae216ba tree 22ddaad8def4f4a77637a3da62a8d8f422a95c29 parent 88ce7550c38f46c8697f53727a571bf838bee398 parent 7894eaf291238a62a565e9e9777483beeb00eeae author Tejun Heo Mon, 15 May 2006 20:59:15 +0900 committer Tejun Heo Mon, 15 May 2006 20:59:15 +0900 Merge branch 'irq-pio' Conflicts: drivers/scsi/libata-core.c include/linux/libata.h commit 88ce7550c38f46c8697f53727a571bf838bee398 tree 58df8b1898eb2077a8fdb8c8a8ab8d00294ccbe8 parent 2a3917a8bb40a2cb75b458da9c356e8557e8fbed author Tejun Heo Mon, 15 May 2006 20:58:32 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:32 +0900 [PATCH] sata_sil24: convert to new EH Convert sata_sil24 to new EH. * When port is frozen, IRQ for the port is masked. * sil24_softreset() doesn't need to mangle with IRQ mask anymore. libata ensures that the port is frozen during reset. * Only turn on interrupts which are handled by interrupt handler and EH. As we don't handle SDB notify yet, turn it off. DEV_XCHG and UNK_FIS are handled by EH and thus turned on. * sil24_softreset() usually fails to recover the port after DEV_XCHG. ATA_PORT_HARDRESET is used as recovery action for DEV_XCHG. * sil24 may be invoked without any active command. e.g. DEV_XCHG irq occuring while no qc in progress still triggers EH and will reset the port and revalidate attached device. Signed-off-by: Tejun Heo commit 2a3917a8bb40a2cb75b458da9c356e8557e8fbed tree 8899c9447b35c5fb00ce272837fd733df7c5aa35 parent 78cd52d02fa0735949a9fa30a6b79bf02c94c250 author Tejun Heo Mon, 15 May 2006 20:58:30 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:30 +0900 [PATCH] ahci: add PIOS interim interrupt handling During multiblock PIO, multiple PIOS interrupts are generated before qc compltion. Current code prints unnecessary message for such cases. This is exposed when new EH slows down attached device into PIO mode. Signed-off-by: Tejun Heo commit 78cd52d02fa0735949a9fa30a6b79bf02c94c250 tree f52d2053c5fd930357130c9bf6a00743920bf19c parent f6aae27ed002ba9c0a98aff811dbde32ce749d28 author Tejun Heo Mon, 15 May 2006 20:58:29 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:29 +0900 [PATCH] ahci: convert to new EH Convert AHCI to new EH. Unfortunately, ICH7 AHCI reacts badly if IRQ mask is diddled during operation. So, freezing is implemented by unconditionally clearing interrupt conditions while frozen. * Interrupts are categorized according to required action. e.g. Connection status or unknown FIS error requires freezing the port while TF or HBUS_DATA don't. * Only CONNECT (reflects SErr.X) interrupt is taken into account not PHYRDY (SErr.N), as CONNECT is better cue for starting EH. * AHCI may be invoked without any active command. e.g. CONNECT irq occuring while no qc in progress still triggers EH and will reset the port and revalidate attached device. Signed-off-by: Tejun Heo commit f6aae27ed002ba9c0a98aff811dbde32ce749d28 tree 8c3326657bb0917536d02d81c3d52f13590af7a8 parent 3f037db0ba043022e43e8e7266e698d4af264851 author Tejun Heo Mon, 15 May 2006 20:58:27 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:27 +0900 [PATCH] sata_sil: convert to new EH Convert sata_sil to new EH. As these controllers have hardware interrupt mask and are known to have screaming interrupts issues, use hardware IRQ masking for freezing. sil_freeze() masks interrupts for the port and sil_thaw() unmasks them. As ports are automatically frozen before probing reset, there is no need to initialize interrupt masks sil_init_onde(). Remove related code. Other than freezing, sata_sil uses stock BMDMA EH routines. Signed-off-by: Tejun Heo commit 3f037db0ba043022e43e8e7266e698d4af264851 tree 53b7222a08b60b028d91db3dd0689984abfb18b5 parent 6d97dbd72da31a0e334f251fa9df4be9fab6fde2 author Tejun Heo Mon, 15 May 2006 20:58:25 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:25 +0900 [PATCH] ata_piix: convert to new EH ata_piix can use stock BMDMA EH routines. Convert to new EH. Signed-off-by: Tejun Heo commit 6d97dbd72da31a0e334f251fa9df4be9fab6fde2 tree f31e023080474ba91529d7e1b1468cc999e32c73 parent 022bdb075b9e1f224088a0b268de56268d7bc5b6 author Tejun Heo Mon, 15 May 2006 20:58:24 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:24 +0900 [PATCH] libata-eh: implement BMDMA EH Implement stock BMDMA error handling methods. Signed-off-by: Tejun Heo commit 022bdb075b9e1f224088a0b268de56268d7bc5b6 tree 05878e28202f0a86bdcc32ae5d995db9f15042da parent f3e81b19aac23c0e8c55d5961324ef7de44c23bb author Tejun Heo Mon, 15 May 2006 20:58:22 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:22 +0900 [PATCH] libata-eh: implement new EH Implement new EH. The exported interface is ata_do_eh() which is to be called from ->error_handler and performs the following steps to recover the failed port. ata_eh_autopsy() : analyze SError/TF, determine the cause of failure and required recovery actions and record it in ap->eh_context ata_eh_report() : report the failure to user ata_eh_recover() : perform recovery actions described in ap->eh_context ata_eh_finish() : finish failed qcs LLDDs can customize error handling by modifying eh_context before calling ata_do_eh() or, if necessary, doing so inbetween each major steps by calling each step explicitly. Signed-off-by: Tejun Heo commit f3e81b19aac23c0e8c55d5961324ef7de44c23bb tree 9ea0bf3c5ecabb855a78623236d07e7bc2976ca3 parent 0c247c559cd70f85ba9f0764ce13ae00e20fcad8 author Tejun Heo Mon, 15 May 2006 20:58:21 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:21 +0900 [PATCH] libata-eh: implement ata_eh_info and ata_eh_context struct ata_eh_info serves as the communication channel between execution path and EH. Execution path describes detected error condition in ap->eh_info and EH recovers the port using it. To avoid missing error conditions detected during EH, EH makes its own copy of eh_info and clears it on entry allowing error info to accumulate during EH. Most EH states including EH's copy of eh_info are stored in ap->eh_context (struct ata_eh_context) which is owned by EH and thus doesn't require any synchronization to access and alter. This standardized context makes it easy to integrate various parts of EH and extend EH to handle multiple links (for PM). Signed-off-by: Tejun Heo commit 0c247c559cd70f85ba9f0764ce13ae00e20fcad8 tree 9b0d00b300ad9178438b9c7feba95ed62f540c1a parent 9be1e979f2e1e57a091a658fa88dac266f9fd6fe author Tejun Heo Mon, 15 May 2006 20:58:19 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:19 +0900 [PATCH] libata-eh: implement dev->ering This patch implements ata_ering and uses it to define dev->ering. ata_ering is a ring buffer which records libata errors - whether a command was for normar IO request, err_mask and timestamp. Errors are recorded per-device in dev->ering. This will be used by EH to determine recovery actions. Signed-off-by: Tejun Heo commit 9be1e979f2e1e57a091a658fa88dac266f9fd6fe tree 781b216ce5a2b39c711ee32d285f4455feba7d34 parent 246619da308c6910a3ae30e7e5fbf46139619efe author Tejun Heo Mon, 15 May 2006 20:58:17 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:17 +0900 [PATCH] libata-eh: add ATA and libata flags for new EH Add ATA and libata flags to be used by new EH. Signed-off-by: Tejun Heo commit 246619da308c6910a3ae30e7e5fbf46139619efe tree 65e408c907d3e6e80f71faa33313d0eb28313411 parent d95a717f579e81061830a308125c89f5858f740a author Tejun Heo Mon, 15 May 2006 20:58:16 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:16 +0900 [PATCH] libata-eh-fw: update SCSI command completion path for new EH SCSI command completion path used to do some part of EH including printing messages and obtaining sense data. With new EH, all these are responsibilities of the EH, update SCSI command completion path to reflect this. Signed-off-by: Tejun Heo commit d95a717f579e81061830a308125c89f5858f740a tree efa4b35ffcd1f8f3eabe5cb27ffc128313378064 parent ad9e27624479bd167dd7eac0cea4bb3ad13bc926 author Tejun Heo Mon, 15 May 2006 20:58:14 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:14 +0900 [PATCH] libata-eh-fw: update ata_exec_internal() for new EH Update ata_exec_internal() such that it uses new EH framework. ->post_internal_cmd() is always invoked regardless of completion status. Also, when ata_exec_internal() detects a timeout condition and new EH is in place, it freezes the port as timeout for normal commands would do. Note that ata_port_flush_task() is called regardless of wait_for_completion status. This is necessary as exceptions unrelated to the qc can abort the qc, in which case PIO task could still be running after the wait for completion returns. Signed-off-by: Tejun Heo commit ad9e27624479bd167dd7eac0cea4bb3ad13bc926 tree 47b863c91509a29c9b0f760faa52d60a95272ba6 parent dafadcde8d4dc5ea8c742faa7ff4403336b542b8 author Tejun Heo Mon, 15 May 2006 20:58:12 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:12 +0900 [PATCH] libata-eh-fw: update ata_scsi_error() for new EH Update ata_scsi_error() for new EH. ata_scsi_error() is responsible for claiming timed out qcs and invoking ->error_handler in safe and synchronized manner. As the state of the controller is unknown if a qc has timed out, the port is frozen in such cases. Note that ata_scsi_timed_out() isn't used for new EH. This is because a timed out qc cannot be claimed by EH without freezing the port and freezing the port in ata_scsi_timed_out() results in unnecessary abortion of other active qcs. ata_scsi_timed_out() can be removed once all drivers are converted to new EH. While at it, add 'TODO: kill' comments to old EH functions. Signed-off-by: Tejun Heo commit dafadcde8d4dc5ea8c742faa7ff4403336b542b8 tree 0d24a079ece4b481fcd680c7056aa4e06974f41f parent e318049949b07152d851dbfebbd93e560af45ebe author Tejun Heo Mon, 15 May 2006 20:58:11 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:11 +0900 [PATCH] libata-eh-fw: implement new EH scheduling from PIO PIO executes without holding host_set lock, so it cannot be synchronized using the same mechanism as interrupt driven execution. port_task framework makes sure that EH is not entered until PIO task is flushed, so PIO task can be sure the qc in progress won't go away underneath it. One thing it cannot be sure of is whether the qc has already been scheduled for EH by another exception condition while host_set lock was released. This patch makes ata_poll_qc-complete() handle such conditions properly and make it freeze the port if HSM violation is detected during PIO execution. Signed-off-by: Tejun Heo commit e318049949b07152d851dbfebbd93e560af45ebe tree cbc322c94717c9ac5d7e2c48a9f690a2e0145b81 parent 7b70fc039824bc7303e4007a5f758f832de56611 author Tejun Heo Mon, 15 May 2006 20:58:09 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:09 +0900 [PATCH] libata-eh-fw: implement freeze/thaw Freezing is performed atomic w.r.t. host_set->lock and once frozen LLDD is not allowed to access the port or any qc on it. Also, libata makes sure that no new qc gets issued to a frozen port. A frozen port is thawed after a reset operation completes successfully, so reset methods must do its job while the port is frozen. During initialization all ports get frozen before requesting IRQ, so reset methods are always invoked on a frozen port. Optional ->freeze and ->thaw operations notify LLDD that the port is being frozen and thawed, respectively. LLDD can disable/enable hardware interrupt in these callbacks if the controller's IRQ mask can be changed dynamically. If the controller doesn't allow such operation, LLDD can check for frozen state in the interrupt handler and ack/clear interrupts unconditionally while frozen. Signed-off-by: Tejun Heo commit 7b70fc039824bc7303e4007a5f758f832de56611 tree d973a40055dec97fedc5ae87852667ed2d30ea71 parent f686bcb8078ac7505ec88818886c2c72639f4fc5 author Tejun Heo Mon, 15 May 2006 20:58:07 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:07 +0900 [PATCH] libata-eh-fw: implement ata_port_schedule_eh() and ata_port_abort() ata_port_schedule_eh() directly schedules EH for @ap without associated qc. Once EH scheduled, no further qc is allowed and EH kicks in as soon as all currently active qc's are drained. ata_port_abort() schedules all currently active commands for EH by qc_completing them with ATA_QCFLAG_FAILED set. If ata_port_abort() doesn't find any qc to abort, it directly schedule EH using ata_port_schedule_eh(). These two functions provide ways to invoke EH for conditions which aren't directly related to any specfic qc. Signed-off-by: Tejun Heo commit f686bcb8078ac7505ec88818886c2c72639f4fc5 tree 7c563e0032b2d85b631b617b8bb2a7a648607468 parent f69499f42caf74194df678c9c293f2ee0fe90bc3 author Tejun Heo Mon, 15 May 2006 20:58:05 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:05 +0900 [PATCH] libata-eh-fw: implement new EH scheduling via error completion There are several ways a qc can get schedule for EH in new EH. This patch implements one of them - completing a qc with ATA_QCFLAG_FAILED set or with non-zero qc->err_mask. ALL such qc's are examined by EH. New EH schedules a qc for EH from completion iff ->error_handler is implemented, qc is marked as failed or qc->err_mask is non-zero and the command is not an internal command (internal cmd is handled via ->post_internal_cmd). The EH scheduling itself is performed by asking SCSI midlayer to schedule EH for the specified scmd. For drivers implementing old-EH, nothing changes. As this change makes ata_qc_complete() rather large, it's not inlined anymore and __ata_qc_complete() is exported to other parts of libata for later use. Signed-off-by: Tejun Heo commit f69499f42caf74194df678c9c293f2ee0fe90bc3 tree 642f3d5792eb6561fd01116f6a247d26f9e3e304 parent 2ab7db1ff1d64a2ba389d0692d532f42a15f1f72 author Tejun Heo Mon, 15 May 2006 20:58:03 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:03 +0900 [PATCH] libata-eh-fw: update ata_qc_from_tag() to enforce normal/EH qc ownership New EH framework has clear distinction about who owns a qc. Every qc starts owned by normal execution path - PIO, interrupt or whatever. When an exception condition occurs which affects the qc, the qc gets scheduled for EH. Note that some events (say, link lost and regained, command timeout) may schedule qc's which are not directly related but could have been affected for EH too. Scheduling for EH is atomic w.r.t. ap->host_set->lock and once schedule for EH, normal execution path is not allowed to access the qc in whatever way. (PIO synchronization acts a bit different and will be dealt with later) This patch make ata_qc_from_tag() check whether a qc is active and owned by normal path before returning it. If conditions don't match, NULL is returned and thus access to the qc is denied. __ata_qc_from_tag() is the original ata_qc_from_tag() and is used by libata core/EH layers to access inactive/failed qc's. This change is applied only if the associated LLDD implements new EH as indicated by non-NULL ->error_handler Signed-off-by: Tejun Heo commit 2ab7db1ff1d64a2ba389d0692d532f42a15f1f72 tree c676e2796896e6856fda6cc6598d5670d06b5c1c parent dc2b3515868a254b3d653d77844bff93c5d4c095 author Tejun Heo Mon, 15 May 2006 20:58:02 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:02 +0900 [PATCH] libata-eh-fw: use special reserved tag and qc for internal commands New EH may issue internal commands to recover from error while failed qc's are still hanging around. To allow such usage, reserve tag ATA_MAX_QUEUE-1 for internal command. This also makes it easy to tell whether a qc is for internal command or not. ata_tag_internal() test implements this test. To avoid breaking existing drivers, ata_exec_internal() uses ATA_TAG_INTERNAL only for drivers which implement ->error_handler. For drivers using old EH, tag 0 is used. Note that this makes ata_tag_internal() test valid only when ->error_handler is implemented. This is okay as drivers on old EH should not and does not have any reason to use ata_tag_internal(). Signed-off-by: Tejun Heo commit dc2b3515868a254b3d653d77844bff93c5d4c095 tree 9593b32b85cce3cc03802ed00d928f3b7ea65aa9 parent 9ec957f2002bd2994be659bbc0ec28397fa251ee author Tejun Heo Mon, 15 May 2006 20:58:00 +0900 committer Tejun Heo Mon, 15 May 2006 20:58:00 +0900 [PATCH] libata-eh-fw: clear SError in ata_std_postreset() Clear SError in ata_std_postreset(). This is to clear SError bits which get set during reset. Signed-off-by: Tejun Heo commit 9ec957f2002bd2994be659bbc0ec28397fa251ee tree 26c920d57260ebd397f19dd597ab845b68d04d18 parent f15a1dafed22d5037e0feea7528e1eeb28a1a7a3 author Tejun Heo Mon, 15 May 2006 20:57:58 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:58 +0900 [PATCH] libata-eh-fw: add flags and operations for new EH Add ATA_FLAG_EH_{PENDING|FROZEN}, ATA_ATA_QCFLAG_{FAILED|SENSE_VALID} and ops->freeze, thaw, error_handler, post_internal_cmd() for new EH. Signed-off-by: Tejun Heo commit f15a1dafed22d5037e0feea7528e1eeb28a1a7a3 tree 5bf5c98332036d62bd4cca3a104844faa318c712 parent 61440db61fe4945ad9f7b32b4d6a22b17174aa1f author Tejun Heo Mon, 15 May 2006 20:57:56 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:56 +0900 [PATCH] libata: use ATA printk helpers Use ATA printk helpers. Signed-off-by: Tejun Heo commit 61440db61fe4945ad9f7b32b4d6a22b17174aa1f tree 4c093d6c72facf6bc77fcedce7d8c1cb85415f5b parent 3373efd89dead4ce7818d685729e0431448357c9 author Tejun Heo Mon, 15 May 2006 20:57:55 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:55 +0900 [PATCH] libata: implement ATA printk helpers Implement ata_{port|dev}_printk() which prefixes the message with proper identification string. This change is necessary for later PM support because devices and links should be identified differently depending on how they are attached. This also helps unifying device id strings. Currently, there are two forms in use (P is the port number D device number) - 'ataP(D):', and 'ataP: dev D '. These macros also make it harder to forget proper ID string (e.g. printing only port number when a device is in question). Debug message handling can be integrated into these printk macros by passing debug type and level via @lv. Signed-off-by: Tejun Heo commit 3373efd89dead4ce7818d685729e0431448357c9 tree d7e7a1afd83e269c3c0978f924cd8c54d9be7f5a parent 38d87234d6c47ca487fc6344100323d5adc6f32c author Tejun Heo Mon, 15 May 2006 20:57:53 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:53 +0900 [PATCH] libata: use dev->ap Use dev->ap where possible and eliminate superflous @ap from functions and structures. Signed-off-by: Tejun Heo commit 38d87234d6c47ca487fc6344100323d5adc6f32c tree 5136dc203543954ab8340988c3a18fcec39bf533 parent a0ab51cefc95cb7756c4914603fea2b1a0f813c5 author Tejun Heo Mon, 15 May 2006 20:57:51 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:51 +0900 [PATCH] libata: add dev->ap Add dev->ap which points back to the port the device belongs to. This makes it unnecessary to pass @ap for silly reasons (e.g. printks). Also, this change is necessary to accomodate later PM support which will introduce ATA link inbetween port and device. Signed-off-by: Tejun Heo commit a0ab51cefc95cb7756c4914603fea2b1a0f813c5 tree 8ad4be1bd8df959db434f83d33ced04dab211145 parent 81952c5497b40ae56835bd0d6537f8c6bdea07e7 author Tejun Heo Mon, 15 May 2006 20:57:49 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:49 +0900 [PATCH] libata: kill old SCR functions and sata_dev_present() Kill now unused scr_{read|write|write_flush}() and sata_dev_present(). Signed-off-by: Tejun Heo commit 81952c5497b40ae56835bd0d6537f8c6bdea07e7 tree fa2db695c56e481c271c7249197ad3b4a98b6087 parent 34bf21704c848fe00c516d1c8f163db08b70b137 author Tejun Heo Mon, 15 May 2006 20:57:47 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:47 +0900 [PATCH] libata: use new SCR and on/offline functions Use new SCR and on/offline functions. Note that for LLDD which know it implements SCR callbacks, SCR functions are guaranteed to succeed and ata_port_online() == !ata_port_offline(). Signed-off-by: Tejun Heo commit 34bf21704c848fe00c516d1c8f163db08b70b137 tree 8482de3ddf6ff1b02ff9ddfd027d2478c7ecd7ac parent 838df6284c54447efae956fb9c243d8ba4ab0f47 author Tejun Heo Mon, 15 May 2006 20:57:46 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:46 +0900 [PATCH] libata: implement new SCR handling and port on/offline functions Implement ata_scr_{valid|read|write|write_flush}() and ata_port_{online|offline}(). These functions replace scr_{read|write}() and sata_dev_present(). Major difference between between the new SCR functions and the old ones is that the new ones have a way to signal error to the caller. This makes handling SCR-available and SCR-unavailable cases in the same path easier. Also, it eases later PM implementation where SCR access can fail due to various reasons. ata_port_{online|offline}() functions return 1 only when they are affirmitive of the condition. e.g. if SCR is unaccessible or presence cannot be determined for other reasons, these functions return 0. So, ata_port_online() != !ata_port_offline(). This distinction is useful in many exception handling cases. Signed-off-by: Tejun Heo commit 838df6284c54447efae956fb9c243d8ba4ab0f47 tree 1bba23b1bf77f80facfc5c6046f357e237176d48 parent ce5f7f3d0cab82d6c16fcb64def8bfc0a3a85dd6 author Tejun Heo Mon, 15 May 2006 20:57:44 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:44 +0900 [PATCH] libata: init ap->cbl to ATA_CBL_SATA early Init ap->cbl to ATA_CBL_SATA in ata_host_init(). This is necessary for soon-to-follow SCR handling function changes. LLDDs are free to change ap->cbl during probing. Signed-off-by: Tejun Heo commit ce5f7f3d0cab82d6c16fcb64def8bfc0a3a85dd6 tree 35a8af3090fef05001f931fee0c5e374433f5458 parent e61e067227bc76b4d9411a50d735c9d87f27b0e2 author Tejun Heo Mon, 15 May 2006 20:57:42 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:42 +0900 [PATCH] sata_sil24: update TF image only when necessary Update TF image (pp->tf) only when necessary. Signed-off-by: Tejun Heo commit e61e067227bc76b4d9411a50d735c9d87f27b0e2 tree 007d22539b24aa6ae8e258af6e22a4187490a4c1 parent 96bd39ec295e49443c8b0c25a6b69fdace18780f author Tejun Heo Mon, 15 May 2006 20:57:40 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:40 +0900 [PATCH] libata: implement qc->result_tf Add qc->result_tf and ATA_QCFLAG_RESULT_TF. This moves the responsibility of loading result TF from post-compltion path to qc execution path. qc->result_tf is loaded if explicitly requested or the qc failsa. This allows more efficient completion implementation and correct handling of result TF for controllers which don't have global TF representation such as sil3124/32. Signed-off-by: Tejun Heo commit 96bd39ec295e49443c8b0c25a6b69fdace18780f tree 02b80f3a37f3b75b68f41e6243fab513aed30b32 parent 3adcebb2b59d590d572844815c906ca30477b14a author Tejun Heo Mon, 15 May 2006 20:57:38 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:38 +0900 [PATCH] libata: remove postreset handling from ata_do_reset() Make ata_do_reset() deal only with reset. postreset is now the responsibility of the caller. This is simpler and eases later prereset addition. Signed-off-by: Tejun Heo commit 3adcebb2b59d590d572844815c906ca30477b14a tree e3103126556b5363ae7a30fc967d1ea4645de5a6 parent fe635c7e91036282e4fd0cc5b4eebc712e43270d author Tejun Heo Mon, 15 May 2006 20:57:37 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:37 +0900 [PATCH] libata: move ->set_mode() handling into ata_set_mode() Move ->set_mode() handlng into ata_set_mode(). Signed-off-by: Tejun Heo commit fe635c7e91036282e4fd0cc5b4eebc712e43270d tree 22054d039df52c19e729f30ceee836936a730ce6 parent 158693031d7c58a355ec1852052a4fca75fd3bda author Tejun Heo Mon, 15 May 2006 20:57:35 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:35 +0900 [PATCH] libata: use preallocated buffers It's not a very good idea to allocate memory during EH. Use statically allocated buffer for dev->id[] and add 512byte buffer ap->sector_buf. This buffer is owned by EH (or probing) and to be used as temporary buffer for various purposes (IDENTIFY, NCQ log page 10h, PM GSCR block). Signed-off-by: Tejun Heo commit 158693031d7c58a355ec1852052a4fca75fd3bda tree 2afbc7cb635746b2b6f2a6b6b5c64e9c62777168 parent 7401abf2f44695ef44eef47d5deba1c20214a063 author Tejun Heo Mon, 15 May 2006 20:57:33 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:33 +0900 [PATCH] libata: hold host_set lock while finishing internal qc Hold host_set lock while finishing internal qc. Signed-off-by: Tejun Heo commit 7401abf2f44695ef44eef47d5deba1c20214a063 tree 582a02c76d1d975846bd779923d715cb617efef9 parent f8c2c4202d86e14ca03b7adc7ebcb30fc74b24e1 author Tejun Heo Mon, 15 May 2006 20:57:32 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:32 +0900 [PATCH] libata: clear ap->active_tag atomically w.r.t. command completion ap->active_tag was cleared in ata_qc_free(). This left ap->active_tag dangling after ata_qc_complete(). Spurious interrupts inbetween could incorrectly access the qc. Clear active_tag in ata_qc_complete(). This change is necessary for later EH changes. Signed-off-by: Tejun Heo commit f8c2c4202d86e14ca03b7adc7ebcb30fc74b24e1 tree acd1428c4cf8f6b2370db54f368309143774e72a parent 6cd727b14f1a6cdcb088d1067c1ba0ba124806a7 author Tejun Heo Mon, 15 May 2006 20:57:30 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:30 +0900 [PATCH] libata: fix ->phy_reset class code handling in ata_bus_probe() ata_bus_probe() doesn't clear dev->class after ->phy_reset(). This can result in falsely enabled devices if probing fails. Clear dev->class to ATA_DEV_UNKNOWN after fetching it. Signed-off-by: Tejun Heo commit 6cd727b14f1a6cdcb088d1067c1ba0ba124806a7 tree 21ad0764c0f511b029e2f4548a5035a983d978e2 parent e23befe9018319dc218e2e51c20ce480e6b45eeb author Tejun Heo Mon, 15 May 2006 20:57:28 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:28 +0900 [PATCH] libata: kill duplicate prototypes Kill duplicate prototypes for ata_eh_qc_complete/retry() in libata.h. Signed-off-by: Tejun Heo commit e23befe9018319dc218e2e51c20ce480e6b45eeb tree 2b0ca8ab4454ca5ecff93448699236e7687af133 parent e4fac92ae744cd5d5c3c1774825788e6b91a5965 author Tejun Heo Mon, 15 May 2006 20:57:27 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:27 +0900 [PATCH] libata: unexport ata_scsi_error() While moving ata_scsi_error() from LLDD sht to libata transportt, EXPORT_SYMBOL_GPL() entry was left out. Kill it. Signed-off-by: Tejun Heo commit e4fac92ae744cd5d5c3c1774825788e6b91a5965 tree 26af28126d5051f6bd49763ff99a9e6945c87920 parent 3c567b7d1137633f3ff67cd1df94abc5fd497a85 author Tejun Heo Mon, 15 May 2006 20:57:25 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:25 +0900 [PATCH] ahci: hardreset classification fix AHCI calls ata_dev_classify() even when no device is attached which results in false class code. Fix it. Signed-off-by: Tejun Heo commit 3c567b7d1137633f3ff67cd1df94abc5fd497a85 tree 085d98f696a0b8a2440bac4686929731769a6760 parent c44078c03f018c8cc9d7463b0db4c6c7fb316792 author Tejun Heo Mon, 15 May 2006 20:57:23 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:23 +0900 [PATCH] libata: rename ata_down_sata_spd_limit() and friends Rename ata_down_sata_spd_limit() and friends to sata_down_spd_limit() and likewise for simplicity & consistency. Signed-off-by: Tejun Heo commit c44078c03f018c8cc9d7463b0db4c6c7fb316792 tree 3f638ee85d7e1eb8e0951b581b51fdcec43ff9d6 parent ee7863bc68fa6ad6fe7cfcc0e5ebe9efe0c0664e author Tejun Heo Mon, 15 May 2006 20:57:21 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:21 +0900 [PATCH] libata: silly fix in ata_scsi_start_stop_xlat() Don't directly access &qc->tf when tf == &qc->tf. Signed-off-by: Tejun Heo commit ee7863bc68fa6ad6fe7cfcc0e5ebe9efe0c0664e tree 2ca442445403be0101abf0592df3c625633dd49d parent 89f48c4d67dd875cf2216d4402bf77eda41fbdd9 author Tejun Heo Mon, 15 May 2006 20:57:20 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:20 +0900 [PATCH] SCSI: implement shost->host_eh_scheduled libata needs to invoke EH without scmd. This patch adds shost->host_eh_scheduled to implement such behavior. Currently the only user of this feature is libata and no general interface is defined. This patch simply adds handling for host_eh_scheduled where needed and exports scsi_eh_wakeup() to modules. The rest is upto libata. This is the result of the following discussion. http://thread.gmane.org/gmane.linux.scsi/23853/focus=9760 In short, SCSI host is not supposed to know about exceptions unrelated to specific device or command. Such exceptions should be handled by transport layer proper. However, the distinction is not essential to ATA and libata is planning to depart from SCSI, so, for the time being, libata will be using SCSI EH to handle such exceptions. Signed-off-by: Tejun Heo commit 89f48c4d67dd875cf2216d4402bf77eda41fbdd9 tree 72f8664d7029f0190557b1b9f437b35e047cfd95 parent acc696d93dcf993dec123d69d599979e1456ffec author Luben Tuikov Mon, 15 May 2006 20:57:18 +0900 committer Tejun Heo Mon, 15 May 2006 20:57:18 +0900 [PATCH] SCSI: Introduce scsi_req_abort_cmd (REPOST) Introduce scsi_req_abort_cmd(struct scsi_cmnd *). This function requests that SCSI Core start recovery for the command by deleting the timer and adding the command to the eh queue. It can be called by either LLDDs or SCSI Core. LLDDs who implement their own error recovery MAY ignore the timeout event if they generated scsi_req_abort_cmd. First post: http://marc.theaimsgroup.com/?l=linux-scsi&m=113833937421677&w=2 Signed-off-by: Luben Tuikov Signed-off-by: Tejun Heo commit 74ce1468128e299fe6a85e7e78e528e45e72d6d9 tree bea67551393eec8ce05bbf9ad01c11ae67415d3f parent 0feabb01d93e5801d1127416a66cfc3963280bca author Konstantin Karasyov Mon, 08 May 2006 08:32:00 -0400 committer Len Brown Mon, 15 May 2006 03:27:32 -0400 ACPI: create acpi_thermal_resume() http://bugzilla.kernel.org/show_bug.cgi?id=4364 Signed-off-by: Konstantin Karasyov Signed-off-by: Len Brown commit 0feabb01d93e5801d1127416a66cfc3963280bca tree 8f8a813abfbc82e9c9e6c0d58de0868be163fa67 parent 531881d665ca011326bb466b97b07c95dee8d0a1 author Konstantin Karasyov Mon, 08 May 2006 00:00:00 -0400 committer Len Brown Mon, 15 May 2006 03:16:45 -0400 ACPI: create acpi_fan_suspend()/acpi_fan_resume() http://bugzilla.kernel.org/show_bug.cgi?id=5000 Signed-off-by: Len Brown commit 531881d665ca011326bb466b97b07c95dee8d0a1 tree 20f5e15751ff07bc9124dde4a3e6387a03b75933 parent 5b3272655a8e8a9a6e2503bc5a88fc9d9c8292a4 author Len Brown Mon, 15 May 2006 03:06:41 -0400 committer Len Brown Mon, 15 May 2006 03:06:41 -0400 ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() in case we want to decode it for future use in acpi_op_suspend(..., state) also, inline new 1-liner static function http://bugzilla.kernel.org/show_bug.cgi?id=5000 Signed-off-by: Len Brown commit 5b3272655a8e8a9a6e2503bc5a88fc9d9c8292a4 tree a292396e87e1bdafdca199ab1c1843302ccf00f6 parent d8c3291c73b958243b33f8509d4507e76dafd055 author Patrick Mochel Wed, 10 May 2006 10:33:00 -0400 committer Len Brown Mon, 15 May 2006 02:44:47 -0400 ACPI: create acpi_device_suspend()/acpi_device_resume() updated and tested by Konstantin Karasyov http://bugzilla.kernel.org/show_bug.cgi?id=5000 Signed-off-by: Patrick Mochel Signed-off-by: Konstantin Karasyov Signed-off-by: Len Brown commit 9c576ff1bc9ab42d06457e68e39c121481138562 tree 8082e3ccad2ea162eee9889a681b87267e42f6f6 parent ebd5f2ca811b75f7145fa487748f26430c584a72 author KAMEZAWA Hiroyuki Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Mon, 15 May 2006 02:23:35 -0400 ACPI add ia64 exports to build acpi_memhotplug as a module Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 973bf491a55b825740f0d8d300b50bcd3d6fb8de tree c01d8e5ff13020dfffe6d99248820f0a737eba4c parent d8c3291c73b958243b33f8509d4507e76dafd055 author Yu, Luming Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Mon, 15 May 2006 02:05:48 -0400 ACPI: fix potential memory leaks in driver/acpi/video.c acpi_video_bus_get_one_device() and other functions in driver/acpi/video.c do not release allocated memory on remove and on the error path. Signed-off-by: "Yu, Luming" Signed-off-by: Vasily Averin Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit ebd5f2ca811b75f7145fa487748f26430c584a72 tree bbe03f3fe9b68cbb05b7e8d9b8135dffa1fbc20e parent b6835052a6aa00536343b6d2127fc65cd814a040 author Andrew Morton Sat, 13 May 2006 22:56:00 -0400 committer Len Brown Mon, 15 May 2006 01:26:20 -0400 ACPI: asus_acpi_init(): propagate correct return value Cc: Bjorn Helgaas Acked-by: Francois Romieu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 3e68fbb59b3d4e6b47b65e9928b5929e02179759 tree 6ff2574161328a89f81f637ac42ce639e8ba31d3 parent 52239da1b06ff445bf71d35e04d8ce74e4c6fe7b author David Woodhouse Mon, 15 May 2006 00:49:43 +0100 committer David Woodhouse Mon, 15 May 2006 00:49:43 +0100 [JFFS2] Don't pack on-medium structures, because GCC emits crappy code If we use __attribute__((packed)), GCC will _also_ assume that the structures aren't sensibly aligned, and it'll emit code to cope with that instead of straight word load/save. This can be _very_ suboptimal on architectures like ARM. Ideally, we want an attribute which just tells GCC not to do any padding, without the alignment side-effects. In the absense of that, we'll just drop the 'packed' attribute and hope that everything stays as it was (which to be fair is fairly much what we expect). And add some paranoia checks in the initialisation code, which should be optimised away completely in the normal case. Signed-off-by: David Woodhouse commit 52239da1b06ff445bf71d35e04d8ce74e4c6fe7b tree b33fe34d8a641600fbddb8dda7f4706c70026346 parent 0d4e30d26a279f1b6a008a233a6835ad2af571e4 author David Woodhouse Sun, 14 May 2006 16:54:39 +0100 committer David Woodhouse Sun, 14 May 2006 16:54:39 +0100 [MTD NAND] Modify check for modules registering NAND devices without ->owner Make it work even with compilers which lack the wit to notice that THIS_MODULE is always non-NULL. Use #ifdef MODULE instead. It's only a temporary debugging check anyway. Signed-off-by: David Woodhouse commit 0d4e30d26a279f1b6a008a233a6835ad2af571e4 tree c1e239af9f94e37565f876db90245ce999228658 parent 2f206701ae9b5c13719c2be26121b9461f05f87c author David Woodhouse Sun, 14 May 2006 12:25:19 +0100 committer David Woodhouse Sun, 14 May 2006 12:25:19 +0100 [MTD] Clean up to fix modular build ... and also fix the multiple inclusion guard so it actually _works_ Signed-off-by: David Woodhouse commit 2f206701ae9b5c13719c2be26121b9461f05f87c tree 574037d71f805a50062f5752f6e70f688b33620e parent cf5eba53346fbfdf1b80e05ca3fd7fe2ec841077 author David Woodhouse Sun, 14 May 2006 11:59:20 +0100 committer David Woodhouse Sun, 14 May 2006 11:59:20 +0100 [MTD] Remove gratuitous inclusion of ARM-only header from physmap.c The physmap platform driver conversion added to physmap.c an include of asm/mach/flash.h which is 1) ARM-specific; and 2) isn't actually necessary. Remove it. Signed-off-by: Lennert Buytenhek Signed-off-by: David Woodhouse commit b6835052a6aa00536343b6d2127fc65cd814a040 tree b5ea66977f0963c6d9e0668e55c60592957da6b8 parent 09047e75f69428dcfa977b326256085154068b65 author Andreas Mohr Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sun, 14 May 2006 00:03:48 -0400 ACPI: apply "__read_mostly" to processor_idle.c loop module parameters and friends make pm_idle_save, nocst and bm_history __read_mostly remove initializer from static 'first_run'. Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 09047e75f69428dcfa977b326256085154068b65 tree d04433b26231bc7932676873f5b40bd4c78ab0e9 parent 64385f2fd8bc9d8803c8d10dcd391871cb126b77 author Vasily Averin Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 23:43:39 -0400 ACPI: fix memory leak in acpi_thermal_add() error path Signed-off-by: Vasily Averin Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 64385f2fd8bc9d8803c8d10dcd391871cb126b77 tree bc18ddbf256b959a10386cee2d9cf44c208eec03 parent 5810452d00ae5fed7f720185d02d79ec9d15b91e author Vasily Averin Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 23:38:24 -0400 ACPI: fix potential memory leak in acpi_evaluate_integer() error path Signed-off-by: Vasily Averin Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 06ea8e08ae7e7e450b6a78e7ce5e10b3c5f954ea tree 23497be5428324a3d9e8cdd504e1f37f9213c8bd parent e4513a57ef719d3d6d1cee0ca4d9f4016aa452bb author Bjorn Helgaas Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 23:23:57 -0400 ACPI: acpi_bus_unregister_driver() returns void Nobody looks at the return value, and this brings it into line with pci_unregister_driver(), etc. Also removed validation of the driver pointer passed in to register and unregister. More consistent, and we'll find bugs faster if we fault rather than returning an error that's ignored. Also makes internal functions acpi_device_unregister() and acpi_driver_detach() void, since nobody uses their returns either. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 193de0c79da580eb33a66113b62e2378fc1fb629 tree 62e278011d758b57105af7d00d1b0b9977d0f2e3 parent 9011bff4bdc0fef1f9a782d7415c306ee61826c9 author KAMEZAWA Hiroyuki Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 23:11:29 -0400 ACPI: use for_each_possible_cpu() instead of for_each_cpu() for_each_cpu() actually iterates across all possible CPUs. We've had mistakes in the past where people were using for_each_cpu() where they should have been iterating across only online or present CPUs. This is inefficient and possibly buggy. We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the future. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit cf5eba53346fbfdf1b80e05ca3fd7fe2ec841077 tree 22e24ce02de0ddd1c7a1113a59f0cac157aa9dab parent 151e76590f66f5406eb2e1f4270c5323f385d2e8 author David Woodhouse Sun, 14 May 2006 04:06:24 +0100 committer David Woodhouse Sun, 14 May 2006 04:06:24 +0100 [JFFS2] Reduce excessive node count for syslog files. We currently get fairly poor behaviour with files which get many short writes, such as system logs. This is because we end up with many tiny data nodes, and the rbtree gets massive. None of these nodes are actually obsolete, so they are counted as 'clean' space. Eraseblocks can be entirely full of these nodes (which are REF_NORMAL instead of REF_PRISTINE), and still they count entirely towards 'used_size' and the eraseblocks can sit on the clean_list for a long time without being picked for GC. One way to alleviate this in the long term is to account REF_NORMAL space separately from REF_PRISTINE space, rather than counting them both towards used_size. Then these eraseblocks can be picked for GC and the offending nodes will be garbage collected. The short-term fix, though -- which probably makes sense even if we do eventually implement the above -- is to merge these nodes as they're written. When we write the last byte in a page, write the _whole_ page. This obsoletes the earlier nodes in the page _immediately_ and we don't even need to wait for the garbage collection to do it. Original implementation from Ferenc Havasi Signed-off-by: David Woodhouse commit 36e430951af0b0d1bdfd50ce22e70079d02646df tree 6743bd4ea66e74e2318e1c694fe4941334322605 parent 415d320a2384bb80d2be98b1dfa41594e085012d author Ingo Molnar Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 21:48:21 -0400 sem2mutex: acpi, acpi_link_lock Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 415d320a2384bb80d2be98b1dfa41594e085012d tree b4a7676536edb3550c41d3ae7e1ba8fd34e2cb7e parent 65c19bbd28cba587d9bd24feccf7272da18481a7 author Len Brown Sat, 13 May 2006 21:35:56 -0400 committer Len Brown Sat, 13 May 2006 21:35:56 -0400 ACPI: delete unused acpi_bus_drivers_lock acpi_bus_drivers is protected by acpi_device_lock Signed-off-by: Len Brown commit 65c19bbd28cba587d9bd24feccf7272da18481a7 tree 62467a7d5a1c5e1b918add2ff0d55982843318ea parent d8c3291c73b958243b33f8509d4507e76dafd055 author Arjan van de Ven Thu, 27 Apr 2006 05:25:00 -0400 committer Len Brown Sat, 13 May 2006 21:33:52 -0400 sem2mutex: drivers/acpi/processor_perflib.c Semaphore to mutex conversion. The conversion was generated via scripts, and the result was validated automatically via a script as well. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 151e76590f66f5406eb2e1f4270c5323f385d2e8 tree 307920af4883b7466eb303f4045865429e4d0711 parent 0f5ae3d2e9f49af55eb2a9b7cb54b4c0c2373017 author David Woodhouse Sun, 14 May 2006 01:51:54 +0100 committer David Woodhouse Sun, 14 May 2006 01:51:54 +0100 [MTD] Fix legacy character sets throughout drivers/mtd, include/linux/mtd Signed-off-by: David Woodhouse commit 0f5ae3d2e9f49af55eb2a9b7cb54b4c0c2373017 tree c06f26d34bff12e4324e901a6406835894010da3 parent a6550e57f9d074511cf420bdb802ab5e56edc3bb author David Woodhouse Sun, 14 May 2006 01:40:50 +0100 committer David Woodhouse Sun, 14 May 2006 01:40:50 +0100 [MTD] Deal correctly with NOR chips which are smaller than the map window We used to calculate the number of chips to be zero, allocate an array of that size, then nasty things would happen when we attempt to access the first object in that zero-sized array. Now, if the number of _full_ chips that would fit into the map is zero, we allocate an array of one anyway, and then artificially reduce the total size of the resulting MTD device to fit in the map. Signed-off-by: David Woodhouse commit a6550e57f9d074511cf420bdb802ab5e56edc3bb tree 56010126c6a1660b6fbd97765c73f8808214f98c parent 552d9205186428a1e2a49ed577bcbba9f777af37 author Jesper Juhl Sun, 14 May 2006 01:42:25 +0200 committer David Woodhouse Sun, 14 May 2006 01:21:31 +0100 mtd: fix memory leak in block2mtd_setup() There's a mem leak in drivers/mtd/devices/block2mtd.c::block2mtd_setup() We can leak 'name' allocated with kmalloc in 'parse_name' if leave via the 'parse_err' macro since it contains a return but doesn't do any freeing. Spotted by coverity checker as bug 615. Signed-off-by: Jesper Juhl Signed-off-by: David Woodhouse commit 552d9205186428a1e2a49ed577bcbba9f777af37 tree d61e09abae0ad18a3beef281384e576d8a54c145 parent 4f678a58d335291ce9213c049bbe16e6d24487ed author David Woodhouse Sun, 14 May 2006 01:20:46 +0100 committer David Woodhouse Sun, 14 May 2006 01:20:46 +0100 [MTD] Fix module refcounting in NAND board drivers. The _board_ driver needs to be mtd->owner, and it in turn pins the nand.ko module. Fix them all to actually do that, and fix nand.ko not to overwrite it -- and also to check that the caller sets it, if the caller is a module. Signed-off-by: David Woodhouse commit 4f678a58d335291ce9213c049bbe16e6d24487ed tree 136a3406bf5b0e80b3d45cd4d3c6ca40bb9961fd parent e0c7d7675331140e5186d2d1a0efce1d3877d379 author Jesper Juhl Sun, 14 May 2006 01:07:18 +0200 committer David Woodhouse Sun, 14 May 2006 00:13:30 +0100 mtd: fix memory leaks in phram_setup There are two code paths in drivers/mtd/devices/phram.c::phram_setup() that will leak memory. Memory is allocated to the variable 'name' with kmalloc() by the parse_name() function, but if we leave by way of the parse_err() macro, then that memory is never kfree()'d, nor is it ever used with register_device() so it won't be freed later either - leak. Found by the Coverity checker as #593 - simple fix below. Signed-off-by: Jesper Juhl Signed-off-by: David Woodhouse commit e0c7d7675331140e5186d2d1a0efce1d3877d379 tree 45247eb5029382c64392aa641e8b0e5506ed152f parent 6943f8af7d6583be57d67bba8b2644371f6a10ca author David Woodhouse Sat, 13 May 2006 18:07:53 +0100 committer David Woodhouse Sat, 13 May 2006 18:07:53 +0100 [MTD NAND] Indent all of drivers/mtd/nand/*.c. It was just too painful to deal with. Signed-off-by: David Woodhouse commit 6943f8af7d6583be57d67bba8b2644371f6a10ca tree b6c3842b6616b4878677c9bded3a12a6e99dda3d parent 9d75414b4fa7390975ef0e2b56ff40425657fe52 author David Woodhouse Sat, 13 May 2006 16:14:26 +0100 committer David Woodhouse Sat, 13 May 2006 16:14:26 +0100 [MTD NAND] Reduce paranoia level when scanning for bad blocks on virgin chips We were scanning for 0xFF through the entire chip -- which takes a while when it's a 512MiB device as I have on my current toy. The specs only say we need to check certain bytes -- so do only that. Signed-off-by: David Woodhouse commit 21b9879bf2817aca343cdda11ade6a87f5373e74 tree 1282485660b9faaac206c2b445e3b6081c2ba89f parent c8708a9275928cc8e77bd443cd12565dda0a3ded author KaiGai Kohei Sat, 13 May 2006 15:22:29 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:22:29 +0900 [JFFS2][XATTR] Fix obvious typo [2/2] jffs2-xattr-v5.2-02-fix_obvious_typo.patch Signed-off-by: KaiGai Kohei commit c8708a9275928cc8e77bd443cd12565dda0a3ded tree 8a3eb502f0f0474eff19ec6a083cffea240ec9e3 parent dea80134dc4d54df52c0c59b0ba2bb5aa999bf30 author KaiGai Kohei Sat, 13 May 2006 15:21:38 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:21:38 +0900 [JFFS2][XATTR] Handling the duplicate JFFS2_NODETYPE_XATTR node cases. When jffs2_sum_process_sum_data() found a JFFS2_NODETYPE_XATTR which has duplicate xid and older version, an error was returned without appropriate process. In the result, mounting filesystem is failed. This patch fix this problem. If jffs2_setup_xattr_datum() returned -EEXIST, the caller marks this node as DIRTY_SPACE(). [1/2] jffs2-xattr-v5.2-01-fix-duplicate-xdatum.patch Signed-off-by: KaiGai Kohei commit dea80134dc4d54df52c0c59b0ba2bb5aa999bf30 tree 37bfacafa5f5ad58b211c483497218d0ec82443b parent 5a14959c0700cd389d9e7ba312e15c8e85255e1f author KaiGai Kohei Sat, 13 May 2006 15:20:24 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:20:24 +0900 [JFFS2][XATTR] remove redundant pointer cast in acl.c remove redundant pointer cast in acl.c. [10/10] jffs2-xattr-v5.1-10-remove_pointer_cast.patch Signed-off-by: KaiGai Kohei commit 5a14959c0700cd389d9e7ba312e15c8e85255e1f tree f243be5a7a8b33b7d85a066efe22a338b6f8e32e parent ee886b5df17f9791a72cf0afe7f6c0c079231ef8 author KaiGai Kohei Sat, 13 May 2006 15:19:36 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:19:36 +0900 [JFFS2][XATTR] remove '__KERNEL__' from acl.h [9/10] jffs2-xattr-v5.1-09-remove__KERNEL__.patch Signed-off-by: KaiGai Kohei commit ee886b5df17f9791a72cf0afe7f6c0c079231ef8 tree 38bd27b4a465dc439fca2de3fb5c1c0efe8b40ca parent 652ecc20d1f5b4fd745c185c940e5b3afb2a0711 author KaiGai Kohei Sat, 13 May 2006 15:19:03 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:19:03 +0900 [JFFS2][XATTR] remove senseless comment remove senseless comment. [8/10] jffs2-xattr-v5.1-08-remove_senseless_comment.patch Signed-off-by: KaiGai Kohei commit 652ecc20d1f5b4fd745c185c940e5b3afb2a0711 tree 5ab059d451b0ee203cd9c6f7e1e934314b87ee1d parent 4470d0409bfe093abbf965dcc97e5c1450c80afb author KaiGai Kohei Sat, 13 May 2006 15:18:27 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:18:27 +0900 [JFFS2][XATTR] Unify each file header part with any jffs2 file. Unify each file header part with any jffs2 file. [7/10] jffs2-xattr-v5.1-07-unify_file_header.patch Signed-off-by: KaiGai Kohei commit 4470d0409bfe093abbf965dcc97e5c1450c80afb tree 7dba696c0e7ab8e03a9bef023933b532459651fc parent 084702e00111eb9ffb6d8a5c1938b8e5423e40a8 author KaiGai Kohei Sat, 13 May 2006 15:17:11 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:17:11 +0900 [JFFS2][XATTR] '#include ' was added into xattr.h. '#include ' was added into xattr.h. because 'struct list_head' is used in this header file. [6/10] jffs2-xattr-v5.1-06-add_list.h.patch Signed-off-by: KaiGai Kohei commit 084702e00111eb9ffb6d8a5c1938b8e5423e40a8 tree 42f5842eb6f5373b04c4f4d254fde0bdcea2a4d5 parent 8f2b6f49c656dd4597904f8c20661d6b73cdbbeb author KaiGai Kohei Sat, 13 May 2006 15:16:13 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:16:13 +0900 [JFFS2][XATTR] Remove jffs2_garbage_collect_xattr(c, ic) Remove jffs2_garbage_collect_xattr(c, ic). jffs2_garbage_collect_xattr_datum/ref() are called from gc.c directly. In original implementation, jffs2_garbage_collect_xattr(c, ic) returns with holding a spinlock if 'ic' is inode_cache. But it returns after releasing a spinlock if 'ic' is xattr_datum/ref. It looks so confusable behavior. Thus, this patch makes caller manage locking/unlocking. [5/10] jffs2-xattr-v5.1-05-update_xattr_gc.patch Signed-off-by: KaiGai Kohei commit 8f2b6f49c656dd4597904f8c20661d6b73cdbbeb tree 7452e7d2fb9070181a943c104c409cac79abc991 parent 8b0b339d46ca0105a9936e3caa3bac80b72de7a3 author KaiGai Kohei Sat, 13 May 2006 15:15:07 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:15:07 +0900 [JFFS2][XATTR] Remove 'struct list_head ilist' from jffs2_inode_cache. This patch can reduce 4-byte of memory usage per inode_cache. [4/10] jffs2-xattr-v5.1-04-remove_ilist_from_ic.patch Signed-off-by: KaiGai Kohei commit 8b0b339d46ca0105a9936e3caa3bac80b72de7a3 tree 3849c24ba41edad67a610f4e584e41f803df23c5 parent de1f72fab35d2b6215017690c6dc27b8f4aa14bc author KaiGai Kohei Sat, 13 May 2006 15:14:14 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:14:14 +0900 [JFFS2][XATTR] Add a description about c->xattr_sem Add a description about the c->xattr_sem read/write semaphore into README.Locking. [3/10] jffs2-xattr-v5.1-03-append_README.Locking.patch Signed-off-by: KaiGai Kohei commit de1f72fab35d2b6215017690c6dc27b8f4aa14bc tree 7ed7688335b1f5a5b5ac86420f48810a94a5d4ce parent aa98d7cf59b5b0764d3502662053489585faf2fe author KaiGai Kohei Sat, 13 May 2006 15:13:27 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:13:27 +0900 [JFFS2][XATTR] remove typedef from posix_acl related definition. jffs2_acl_header, jffs2_acl_entry and jffs2_acl_entry_short were redefined with using 'struct' instead of 'typedef' in kernel implementation. [1/10] jffs2-xattr-v5.1-01-remove_typedef_kernel.patch Signed-off-by: KaiGai Kohei commit aa98d7cf59b5b0764d3502662053489585faf2fe tree e98e83f3e69ebe3a1112394a19d440419e899749 parent 4992a9e88886b0c5ebc3d27eb74d0344c873eeea author KaiGai Kohei Sat, 13 May 2006 15:09:47 +0900 committer KaiGai Kohei Sat, 13 May 2006 15:09:47 +0900 [JFFS2][XATTR] XATTR support on JFFS2 (version. 5) This attached patches provide xattr support including POSIX-ACL and SELinux support on JFFS2 (version.5). There are some significant differences from previous version posted at last December. The biggest change is addition of EBS(Erase Block Summary) support. Currently, both kernel and usermode utility (sumtool) can recognize xattr nodes which have JFFS2_NODETYPE_XATTR/_XREF nodetype. In addition, some bugs are fixed. - A potential race condition was fixed. - Unexpected fail when updating a xattr by same name/value pair was fixed. - A bug when removing xattr name/value pair was fixed. The fundamental structures (such as using two new nodetypes and exclusion mechanism by rwsem) are unchanged. But most of implementation were reviewed and updated if necessary. Espacially, we had to change several internal implementations related to load_xattr_datum() to avoid a potential race condition. [1/2] xattr_on_jffs2.kernel.version-5.patch [2/2] xattr_on_jffs2.utils.version-5.patch Signed-off-by: KaiGai Kohei Signed-off-by: David Woodhouse commit 5810452d00ae5fed7f720185d02d79ec9d15b91e tree a7921eb6bd46df160712bdd031703c45f4a8155b parent d8c3291c73b958243b33f8509d4507e76dafd055 author Len Brown Sat, 13 May 2006 01:12:15 -0400 committer Len Brown Sat, 13 May 2006 01:12:15 -0400 ACPI: silence ia64 build warning When building sim_defconfig, which does not define CONFIG_ACPI arch/ia64/kernel/acpi.c:71: warning: 'acpi_madt_rev' defined but not used really acpi.c should not be built when CONFIG_ACPI=n... Signed-off-by: Len Brown commit 9d75414b4fa7390975ef0e2b56ff40425657fe52 tree ff21b8e752f83f285c0452c45b3f0c54ccb30550 parent c3f8abf481c2d2b221b028f7369bc6dd39a9590e author David Woodhouse Sat, 13 May 2006 04:12:40 +0100 committer David Woodhouse Sat, 13 May 2006 04:12:40 +0100 [MTD NAND] Update CS553x NAND driver: Hardware ECC support, optimisations. - Implement HW ECC support, - Provide read_buf() and write_buf() routines using memcpy - Use on-flash bad block table - Fix module refcounting - Avoid read/modify/write in hwcontrol() - Minor cosmetic fixes Partly based on code and ideas from Tom Sylla Signed-off-by: David Woodhouse commit c3f8abf481c2d2b221b028f7369bc6dd39a9590e tree 58a8fbb73f736da8b4d0529e0e182ec41f30b6d5 parent 4992a9e88886b0c5ebc3d27eb74d0344c873eeea author David Woodhouse Sat, 13 May 2006 04:03:42 +0100 committer David Woodhouse Sat, 13 May 2006 04:03:42 +0100 [MTD NAND] Use vmalloc for buffer when scanning for bad blocks. These new chips have 128KiB blocks. Don't try to kmalloc that. Signed-off-by: David Woodhouse commit 4992a9e88886b0c5ebc3d27eb74d0344c873eeea tree 23befdd7ccd4ed95b271144f98a6a27749ff3f68 parent 752870707f2818b5f0d94ca05e46cb0ffee6cbf9 author Egry Gábor Fri, 12 May 2006 17:35:02 +0100 committer David Woodhouse Fri, 12 May 2006 17:35:02 +0100 Trivial typo fixes in Kconfig files (MTD). Signed-off-by: Egry Gábor Signed-off-by: David Woodhouse commit 752870707f2818b5f0d94ca05e46cb0ffee6cbf9 tree 4daef328761c5bc00fe891718010ed5cbab81202 parent 493c646077ef0b8668ed71b8057f81cb7454af87 author Kyungmin Park Fri, 12 May 2006 17:03:23 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:51 +0100 OneNAND: fix block command typo We need to check block cmd only instead with comparing with cmd Signed-off-by: Kyungmin Park commit 493c646077ef0b8668ed71b8057f81cb7454af87 tree e05992a8d8c9ba911e5a9809dc0678ca50e96c76 parent 3cecf69ecde22199699c4f0e609dfed2a487b674 author Kyungmin Park Fri, 12 May 2006 17:03:07 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:50 +0100 OneNAND: One-Time Programmable (OTP) support One Block of the NAND Flash Array memory is reserved as a One-Time Programmable Block memory area. Also, 1st Block of NAND Flash Array can be used as OTP. The OTP block can be read, programmed and locked using the same operations as any other NAND Flash Array memory block. OTP block cannot be erased. OTP block is fully-guaranteed to be a valid block. Signed-off-by: Kyungmin Park commit 3cecf69ecde22199699c4f0e609dfed2a487b674 tree dda3a1cdd96b211a747cd0967a1c231daf2d0a47 parent 34c1060959b61a5bb2e97a88411446028cebfa7c author Kyungmin Park Fri, 12 May 2006 17:02:51 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:48 +0100 OneNAND: Handle erase correctly in Double Density Package (DDP) There's erase bug in DDP. We need to add DDP select in erase Signed-off-by: Kyungmin Park commit 34c1060959b61a5bb2e97a88411446028cebfa7c tree 74a58f5e63a2ee4d91d3cae4985ed55141c70aa0 parent 8e6ec69059ba0eecbb2226d3d9e45c6efe6fb82b author Kyungmin Park Fri, 12 May 2006 17:02:46 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:47 +0100 OneNAND: Write oob area with aligned size, mtd->oobsize There's some problem with write oob in serveral platform. So we write oob with oobsize aligned (16bytes) instead of 3 bytes (from {2, 3}) Signed-off-by: Kyungmin Park commit 8e6ec69059ba0eecbb2226d3d9e45c6efe6fb82b tree a44175779ce9ffc379f333709d0903b463fb5c47 parent d9777f1c42bffff0d21cd029a2415776aa874e96 author Kyungmin Park Fri, 12 May 2006 17:02:41 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:47 +0100 OneNAND: Add write_oob verify function Signed-off-by: Jarkko Lavinen commit d9777f1c42bffff0d21cd029a2415776aa874e96 tree c759ccb395e3b97ef15b1af0e9bd9bf3d85f0528 parent 9c01f87db183403a4f603fe5180c57b82b54b4a1 author Jarkko Lavinen Fri, 12 May 2006 17:02:35 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:46 +0100 OneNand: Fix free byte positions. Some free byte positions at onenand_oob_64 were wrong. This was also reported by Christian Lehne. 3 byte slots are at 2+16*i and 2 byte slots at 14+16*i. Signed-off-by: Jarkko Lavinen commit 9c01f87db183403a4f603fe5180c57b82b54b4a1 tree 74da95f8e772be1130296a1bfb31302f89737769 parent 628bee6593107c466e28462f58c5fd5cd4163c7c author Kyungmin Park Fri, 12 May 2006 17:02:31 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:45 +0100 OneNAND: handle byte access on BufferRAM Signed-off-by: Kyungmin Park commit 628bee6593107c466e28462f58c5fd5cd4163c7c tree 5487fecea1e5220ff7448f68d1b26d375b11f1e8 parent 20ffdcb00a792073f6e620dc2c644b3c8fbab528 author Kyungmin Park Fri, 12 May 2006 17:02:24 +0300 committer Jarkko Lavinen Fri, 12 May 2006 15:35:45 +0100 OneNAND: Add touch_softlock_watchdog() Signed-off-by: Kyungmin Park commit 20ffdcb00a792073f6e620dc2c644b3c8fbab528 tree 73983f99c0f2e3f46cf69ef1f14585937782f1c3 parent 1867b7e3f85dc69695735ea4a4cd12027c565d89 author Jesper Juhl Fri, 12 May 2006 11:55:51 +0100 committer David Woodhouse Fri, 12 May 2006 11:55:51 +0100 [JFFS2] Remove number of pointer dereferences in fs/jffs2/summary.c Reduce the nr. of pointer dereferences in fs/jffs2/summary.c Benefits: - micro speed optimization due to fewer pointer derefs - generated code is slightly smaller - better readability (The first two sound like a compiler problem but I'll go with the third. dwmw2). Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 1867b7e3f85dc69695735ea4a4cd12027c565d89 tree dea474351c048fd0507dd2dcc71f754f683625e2 parent 7e59f2ccd7fc2424b2e70132ac613d16acae37da author Jean-Luc Leger Fri, 12 May 2006 11:53:40 +0100 committer David Woodhouse Fri, 12 May 2006 11:53:40 +0100 [MTD] Fix invalid default value of CONFIG_MTD_PCMCIA_ANONYMOUS in Kconfig Default values for boolean and tristate options can only be 'y', 'm' or 'n'. This patch removes wrong default for MTD_PCMCIA_ANONYMOUS. Signed-off-by: Jean-Luc Leger Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 7e59f2ccd7fc2424b2e70132ac613d16acae37da tree 21636370bfcec0895a77420d20522b1ff5f60be0 parent f0ad11d060c7acf727ead8339432bdd2bfd7f868 author Domen Puncer Fri, 12 May 2006 11:51:46 +0100 committer David Woodhouse Fri, 12 May 2006 11:51:46 +0100 [JFFS2] Remove obsolete histo.h This file hasn't actually been used since the very early days of JFFS2 when Arjan was playing with compression methods. It can go now. Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Acked-by: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit f0ad11d060c7acf727ead8339432bdd2bfd7f868 tree a9136db2309cfa33ae2389f2ad8e0487e8132acf parent 179fdc3f8dec5757ddbebd95a1b493d65fa08671 author David Woodhouse Fri, 12 May 2006 11:40:13 +0100 committer David Woodhouse Fri, 12 May 2006 11:40:13 +0100 [MTD] Fix capitalisation in export of old doc2001.c initfunc Oops. Stupid StudlyCaps. Again. This driver is doubly-deprecated because is was subsumed into doc2000.c and _also_ we want people to start using the new NAND wrapper for these devices anyway. But ISTR there was still one person using it because something didn't work for them. Must chase that up and then I can kill this. Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 179fdc3f8dec5757ddbebd95a1b493d65fa08671 tree 422f229859e847b5987ec7f0d757eecbdac2f6df parent b04ecae3d62edea2af49fd40ab12435b5ad8a492 author David Woodhouse Thu, 11 May 2006 22:35:28 +0100 committer David Woodhouse Thu, 11 May 2006 22:35:28 +0100 [MTD] Basic NAND driver for AMD/NatSemi CS5535/CS5536 Geode companion chip This lacks hardware ECC support and a few optimisations we're going to want fairly soon, but it works well enough to mount and use JFFS2. Signed-off-by: David Woodhouse commit 9011bff4bdc0fef1f9a782d7415c306ee61826c9 tree 6214e32b2148951416708ee6da0c862da67fa3f8 parent 7e1f19e50371e1d148226b64c8edc77fec47fa5b author Len Brown Thu, 11 May 2006 00:28:12 -0400 committer Len Brown Thu, 11 May 2006 00:28:12 -0400 ACPI: delete newly added debugging macros in processor_perflib.c Signed-off-by: Len Brown commit 2ca48a132167f9f12efba179382979aafde0ab36 tree 4eb3bbce62ac02590d6b49e5529ff90c0253b0fd parent 665b44aee34e9f2c64558df4ec01d40576e45651 author James Bottomley Thu, 27 Apr 2006 14:07:49 -0500 committer James Bottomley Wed, 10 May 2006 10:22:30 -0500 [SCSI] fix proc_scsi_write to return "length" on success with remove-single-device case Problem spotted by: Suzuki K P A zero return on success isn't correct for filesystem write functions. They should either return negative error or the length of bytes consumed. Add code to convert our zero on success error return to return the length of bytes passed in. This fixes the following: $ echo "scsi remove-single-device 0 0 3 0" > /proc/scsi/scsi bash: echo: write error: No such device or address" Signed-off-by: James Bottomley commit b04ecae3d62edea2af49fd40ab12435b5ad8a492 tree 19c6589239372df3445c5944c7c7ea6899088a19 parent 83ea4ef213628683e5a63f2987a91044ab868051 author David Woodhouse Wed, 10 May 2006 16:16:13 +0100 committer David Woodhouse Wed, 10 May 2006 16:16:13 +0100 [MTD] Fix capitalisation in export of DiskOnChip Millennium initfunc Stupid StudlyCaps. Who did that? Signed-off-by: David Woodhouse commit 665b44aee34e9f2c64558df4ec01d40576e45651 tree 2ac5ff4b706f45c0259bdd9ecbe18d792255f109 parent 8d2860b3c3e933304f49171770658c00ed26fd79 author Mike Christie Tue, 02 May 2006 19:46:49 -0500 committer James Bottomley Wed, 10 May 2006 10:13:44 -0500 [SCSI] iscsi: dequeue all buffers from queue debugged by wrwhitehead@novell.com patch and analysis by fujita.tomonori@lab.ntt.co.jp Only tcp_read_sock and recv_actor (iscsi_tcp_data_recv for us) see desc.count. It is is used just for permitting tcp_read_sock to read the portion of data in the socket. When iscsi_tcp_data_recv sees a partial header, it sets desc.count. However, it is possible that the next skb (containing the rest of the header) still does not come. So I'm not sure that this scheme is completely correct. Ideally, we should use the exact length of the data in the socket for desc.count. However, it is not so simple (see SIOCINQ in tcp_ioctl). So I think that iscsi_tcp_data_recv can just stop playing with desc.count and tell tcp_read_sock to read the all skbs. As proposed already, if iscsi_tcp_data_ready sets desc.count to non-zero, tcp_read_sock does that. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 8d2860b3c3e933304f49171770658c00ed26fd79 tree 979395449d53d41bd22732a4be1387f9af73a994 parent be2df72e7ec5fa5e6e1ccccab6cef97ecbb9c191 author Mike Christie Tue, 02 May 2006 19:46:47 -0500 committer James Bottomley Wed, 10 May 2006 10:13:21 -0500 [SCSI] iscsi: increment expstatsn during login debugged by Ming and Rohan: The problem Ming and Rohan debugged was that during a normal session login, open-iscsi is not incrementing the exp_statsn counter. It was stuck at zero. From the RFC, it looks like if the login response PDU has a successful status then we should be incrementing that value. Also from the RFC, it looks like if when we drop a connection then reconnect, we should be using the exp_statsn from the old connection in the next relogin attempt. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit be2df72e7ec5fa5e6e1ccccab6cef97ecbb9c191 tree f4a78a36be0fac5304960e615ad46cc127cf6306 parent ed2abc7ff19dc99c6242a70f8578a17b2ff0d0ce author Or Gerlitz Tue, 02 May 2006 19:46:43 -0500 committer James Bottomley Wed, 10 May 2006 10:12:52 -0500 [SCSI] iscsi: align printks align printk output Signed-off-by: Or Gerlitz Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit ed2abc7ff19dc99c6242a70f8578a17b2ff0d0ce tree 3bf226387f002ee6c67619afd1a950e1d0bde30f parent 264faaaa12544e7914928ad57ccba21907cad56b author Mike Christie Tue, 02 May 2006 19:46:40 -0500 committer James Bottomley Wed, 10 May 2006 10:12:04 -0500 [SCSI] iscsi: fix manamgement task oops from patmans@us.ibm.com and michaelc@cs.wisc.edu Fix bugs when forcing a mgmt task to fail and allow session recovery to cleanup the session/connection of any running mgmt tasks. When called during the in login state. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 264faaaa12544e7914928ad57ccba21907cad56b tree eb8a6993e43f3802b203b371b81fcfb89fc4f754 parent 169e1a2a8a789fa84254695ec6a56fc410bb19a9 author Or Gerlitz Tue, 02 May 2006 19:46:36 -0500 committer James Bottomley Wed, 10 May 2006 10:11:38 -0500 [SCSI] iscsi: add transport end point callbacks add transport end point callbacks so iscsi drivers that cannot connect from userspace, like iscsi tcp, using sockets do not have to implement their own socket infrastructure. Signed-off-by: Or Gerlitz Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 32e62c636a728cb39c0b3bd191286f2ca65d4028 tree 656454a01e720819103c172daae15b5f2fd85d68 parent 6810b548b25114607e0814612d84125abccc0a4f author Bjorn Helgaas Fri, 05 May 2006 17:19:50 -0600 committer Tony Luck Mon, 08 May 2006 16:32:05 -0700 [IA64] rework memory attribute aliasing This closes a couple holes in our attribute aliasing avoidance scheme: - The current kernel fails mmaps of some /dev/mem MMIO regions because they don't appear in the EFI memory map. This keeps X from working on the Intel Tiger box. - The current kernel allows UC mmap of the 0-1MB region of /sys/.../legacy_mem even when the chipset doesn't support UC access. This causes an MCA when starting X on HP rx7620 and rx8620 boxes in the default configuration. There's more detail in the Documentation/ia64/aliasing.txt file this adds, but the general idea is that if a region might be covered by a granule-sized kernel identity mapping, any access via /dev/mem or mmap must use the same attribute as the identity mapping. Otherwise, we fall back to using an attribute that is supported according to the EFI memory map, or to using UC if the EFI memory map doesn't mention the region. Signed-off-by: Bjorn Helgaas Signed-off-by: Tony Luck commit 83ea4ef213628683e5a63f2987a91044ab868051 tree 7667c3eec45bee9a24128a93da373ca838e7807c parent 6f18a022fb311f07f3b32f2c0e1b5c9477dc4439 author David Woodhouse Mon, 08 May 2006 22:58:25 +0100 committer David Woodhouse Mon, 08 May 2006 22:58:25 +0100 Export cfi_cmdset_0020 and cfi_cmdset_0002 with EXPORT_SYMBOL_GPL Signed-off-by: David Woodhouse commit 6f18a022fb311f07f3b32f2c0e1b5c9477dc4439 tree 5c0e66f14e02f53555bfc365098cc7e5eb85c343 parent a15bdeef108d282e540e202fc3c3e4bdf9692074 author David Woodhouse Mon, 08 May 2006 22:40:05 +0100 committer David Woodhouse Mon, 08 May 2006 22:40:05 +0100 Finally remove the obnoxious inter_module_xxx() This was already a bad plan when I argued against adding it in the first place. Good riddance. Signed-off-by: David Woodhouse commit a15bdeef108d282e540e202fc3c3e4bdf9692074 tree 1bc767c9013713a4d62d1bc5dffef631583e6ee7 parent 396674e58fb9d01b7768ccb8db181aea8ebead0e author David Woodhouse Mon, 08 May 2006 22:35:05 +0100 committer David Woodhouse Mon, 08 May 2006 22:35:05 +0100 Remove use of inter_module_crap in NOR flash chip drivers. Signed-off-by: David Woodhouse commit 396674e58fb9d01b7768ccb8db181aea8ebead0e tree 827b925d0fa37c19fd78a4e2a981c93a575066d5 parent 5e535429a9117b8b6219da0e0cb087f52c0c9597 author David Woodhouse Mon, 08 May 2006 17:10:11 +0100 committer David Woodhouse Mon, 08 May 2006 17:10:11 +0100 Fix non-modular case for DiskOnChip probe Signed-off-by: David Woodhouse commit 80b9192ee032f919da1b6e8b305c7cc9881b0907 tree 996465552d71f11bfba2d26a075d8a4d99048fa4 parent 5047f09b56d0bc3c21aec9cb16de60283da645c6 author David Woodhouse Mon, 08 May 2006 15:51:57 +0100 committer David Woodhouse Mon, 08 May 2006 15:51:57 +0100 Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Also remove Bob Burroughs' email address, since it's no longer valid. Acked-by: Eric D Rossman Signed-off-by: David Woodhouse commit 5e535429a9117b8b6219da0e0cb087f52c0c9597 tree b20a402b5696e2b5aabdc7a4720eaf33e306bd71 parent 73566edf9b91dd085ddb12033d0ea7288979dd10 author David Woodhouse Mon, 08 May 2006 14:05:05 +0100 committer David Woodhouse Mon, 08 May 2006 14:05:05 +0100 Remove inter_module_xxx() from DiskOnChip drivers. Finally putting it back how it was before Keith got at it -- yay :) Signed-off-by: David Woodhouse commit 73566edf9b91dd085ddb12033d0ea7288979dd10 tree ec3810665792713ae97b6bb566f530f77e367586 parent 422138dd68202fbd8ca9fb0df65e92d733249374 author Lennert Buytenhek Sun, 07 May 2006 17:16:36 +0100 committer David Woodhouse Sun, 07 May 2006 17:16:36 +0100 [MTD] Convert physmap to platform driver After dwmw2 let me know it ought to be done, I rewrote the physmap map driver to be a platform driver. I know zilch about the driver model, so I probably botched it in some way, but I've done some tests on an ixp23xx board which uses physmap, and it all seems to work. In order to not break existing physmap users, I've added some compat code that will instantiate a platform device iff CONFIG_MTD_PHYSMAP_LEN is defined and != 0. Also, I've changed the default value for CONFIG_MTD_PHYSMAP_LEN to zero, so that people who inadvertently compile in physmap (or new, platform-style, users of physmap) don't get burned. This works pretty well -- the new physmap driver is a drop-in replacement for the old one, and works on said ixp23xx board without any code changes needed. (This should hold as long as users don't touch 'physmap_map' directly.) Once all physmap users have been converted to instantiate their own platform devices, the compat code can go. (Or we decide that we can change all the in-tree users at the same time, and never merge the compat code.) Signed-off-by: Lennert Buytenhek Signed-off-by: David Woodhouse commit 5047f09b56d0bc3c21aec9cb16de60283da645c6 tree 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c parent c0f1fe00c3923135b2c2f443448585482da8a53e parent 5528e568a760442e0ec8fd2dea1f0791875a066b author David Woodhouse Sat, 06 May 2006 19:59:18 +0100 committer David Woodhouse Sat, 06 May 2006 19:59:18 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Signed-off-by: David Woodhouse commit c0f1fe00c3923135b2c2f443448585482da8a53e tree 325ab2d2b36553b6319a3a995c6c0cc5cb3a110c parent 05f75fd3bb92d9f5eaa8620195ff77a89431f2d2 author David Woodhouse Sat, 06 May 2006 19:47:57 +0100 committer David Woodhouse Sat, 06 May 2006 19:47:57 +0100 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Reverts commit eba7f3bdb6344adee8a3d044f405ed38f5c66c6b Signed-off-by: David Woodhouse commit 422138dd68202fbd8ca9fb0df65e92d733249374 tree 6991cf489ef3fa040309c2e715e02d61632fa7d4 parent edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 author Dmitry Bazhenov Fri, 05 May 2006 22:46:49 +0100 committer David Woodhouse Fri, 05 May 2006 22:46:49 +0100 [JFFS2] Fix race in setting file attributes It seems like there is a potential race in the function jffs2_do_setattr() in the case when attributes of a symlink are updated. The symlink metadata is read without having f->sem locked. The following patch should fix the race. Signed-off-by: Dmitry Bazhenov Signed-off-by: David Woodhouse commit f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc tree 461bccf4b2ff9ad57a19800f02670be818a9c0b2 parent ec000ca9d4b23dfb67b70bdf72950e76728c74d9 author Stefano Brivio Fri, 05 May 2006 03:02:25 +0200 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] bcm43xx: add PCI ID for bcm4319 Add PCI ID for bcm4319. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit ec000ca9d4b23dfb67b70bdf72950e76728c74d9 tree e8d062818ce0f4293c3a37850f51ed96a2bd455e parent 8462fe3cd9ec8951871a20a4dfe36321ab075964 author Stefano Brivio Fri, 05 May 2006 02:58:29 +0200 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] bcm43xx: fix whitespace Fix whitespace. Signed-off-by: Stefano Brivio Signed-off-by: John W. Linville commit 8462fe3cd9ec8951871a20a4dfe36321ab075964 tree 8b3c6db6091ee99b4791a911734229181ef6f473 parent 461c078c9cdfc1d24a436a87daed90f18c3b0d0d author Daniel Drake Mon, 01 May 2006 22:45:50 +0100 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] softmac: suggest per-frame-type TX rate This patch is the first step towards rate control inside softmac. The txrates substructure has been extended to provide different fields for different types of packets (management/data, unicast/multicast). These fields are updated on association to values compatible with the access point we are associating to. Drivers can then use the new ieee80211softmac_suggest_txrate() function call when deciding which rate to transmit each frame at. This is immensely useful for ZD1211, and bcm can use it too. The user can still specify a rate through iwconfig, which is matched for all transmissions (assuming the rate they have specified is in the rate set required by the AP). At a later date, we can incorporate automatic rate management into the ieee80211softmac_recalc_txrates() function. This patch also removes the mcast_fallback field. Sam Leffler pointed out that this field is meaningless, because no driver will ever be retransmitting mcast frames (they are not acked). Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 461c078c9cdfc1d24a436a87daed90f18c3b0d0d tree 90b08022254282c74cba106e0d94431ad31dc598 parent 95047dd6d00ad00e7f1f632db6b8ecaa704cfc7e author Pavel Roskin Mon, 01 May 2006 02:13:33 -0400 committer John W. Linville Fri, 05 May 2006 17:10:41 -0400 [PATCH] orinoco: don't put PCI resource data to the network device The resource data in the network device is intended for ISA and other older busses, but not for PCI. Don't put PCI data there. Don't (ab)use the network device for keeping the IRQ number. Retire orinoco_pci_setup_netdev(), and print some minimal information to the kernel log instead, identifying the network device and the driver mostly to identify problems at startup. Scripts should rely on sysfs. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 95047dd6d00ad00e7f1f632db6b8ecaa704cfc7e tree 7def22b19bd1e844df935c0d2ec3929adc76930d parent 6cbaa330f1022abfc7419aaa11ee1a9291f0beb0 author Pavel Roskin Mon, 01 May 2006 02:13:30 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: eliminate the suspend/resume functions if CONFIG_PM is unset Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6cbaa330f1022abfc7419aaa11ee1a9291f0beb0 tree da9de71c1eef54be38880ef5ddc63e5622cae516 parent 9a568da2097ad3701ca575cb6d360d56ffeee446 author Pavel Roskin Mon, 01 May 2006 02:13:28 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: simplify locking, fix error handling in PCMCIA resume Don't use flags in the spinlocks - the PCMCIA resume functions may not be called under lock. Don't ignore any errors. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 9a568da2097ad3701ca575cb6d360d56ffeee446 tree 063cf2e349753d83d6306baf06ccf0d84a4c7abb parent e4f4f98efdb4619ab95eb724fd5e0c4675307cc1 author Pavel Roskin Mon, 01 May 2006 02:13:26 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: report more relevant data on startup Report only the first I/O window and IRQ, and also add the driver name. The second I/O window, Vpp and configuration index are not interesting to most users. They can be found by PCMCIA debug tools if needed. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit e4f4f98efdb4619ab95eb724fd5e0c4675307cc1 tree 1ba191d656aaf340bf35788e2f90ad613b9e384e parent 6274115ce9f0c87068761b2ba5b0b2f7d13c17cf author Pavel Roskin Mon, 01 May 2006 02:13:24 -0400 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] orinoco: unregister network device before releasing PCMCIA resources Hardware resources should not be made available to other devices while the network device is still registered. Also remove the related debug statements. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6274115ce9f0c87068761b2ba5b0b2f7d13c17cf tree aa91c45eb089e087d74903e5483487b97cbd863c parent 6d92f83ffafe8e2ce105c3ec5696c62d6fcebcee author Adrian Bunk Thu, 27 Apr 2006 02:33:42 -0700 committer John W. Linville Fri, 05 May 2006 17:10:40 -0400 [PATCH] ieee80211_wx.c: remove dead code Since sec->key_sizes[] is an u8, len can't be < 0. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Cc: "John W. Linville" Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 6d92f83ffafe8e2ce105c3ec5696c62d6fcebcee tree 7d82f1380f10ac3b4f042f4953c65e5e284e5acf parent 0c6157a371f72b91bd9d2f72c2e65e2bde4cdf39 author Daniel Drake Mon, 01 May 2006 22:23:27 +0100 committer John W. Linville Fri, 05 May 2006 17:10:39 -0400 [PATCH] softmac: deauthentication implies deassociation The 802.11 specs state that deauthenticating also implies disassociating. This patch implements that, which improve the behaviour of SIOCSIWMLME. Signed-off-by: Daniel Drake Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 0c6157a371f72b91bd9d2f72c2e65e2bde4cdf39 tree 0db5ac2e35e29738a17a1f7bbe3a19c5f1b85a84 parent fd5226a72694d1c0abe1cc39711a86f1754e637d author Michal Schmidt Tue, 02 May 2006 23:29:55 +0200 committer John W. Linville Fri, 05 May 2006 17:10:39 -0400 [PATCH] wireless/airo: minimal WPA awareness Running Linux 2.6.17-rc3-mm1 which has this patch included I get this interesting message: airo(eth0): WPA unsupported (only firmware versions 5.30.17 and greater support WPA. Detected 5.30.17) airo_test_wpa_capable assumes that the softSubVer part of the firmware version number is coded in BCD. Apparently, that's not true. I have firmware version 5.30.17 and cap_rid.softSubVer is 0x11==17. Signed-off-by: Michal Schmidt Signed-off-by: John W. Linville commit fd5226a72694d1c0abe1cc39711a86f1754e637d tree 1d90b27c392fb2ef9859f2652dee7640916ed806 parent aad61439e6a00bdb72cb649e11f6e166590c5f66 parent 178e0cc5ff249965c6cfbd78b1af6a5e614d837c author John W. Linville Fri, 05 May 2006 16:56:24 -0400 committer John W. Linville Fri, 05 May 2006 16:56:24 -0400 Merge branch 'upstream-fixes' into upstream commit aad61439e6a00bdb72cb649e11f6e166590c5f66 tree 2279f3c2a15f81526d14182c6acb358cafd0b359 parent 3c304956755fa63ee80ca51ce38078fe1c4e8818 parent d98550e334715b2d9e45f8f0f4e1608720108640 author John W. Linville Fri, 05 May 2006 16:50:23 -0400 committer John W. Linville Fri, 05 May 2006 16:50:23 -0400 Merge branch 'from-linus' into upstream commit f18fc729cd2d67b76e24206ee3567c1f6983c358 tree 9dbf177222d94213d9dd82d67de6d905e1a2b278 parent 5a43ee65620d628ba04deecf241b63b2410b97f2 parent d98550e334715b2d9e45f8f0f4e1608720108640 author Paul Mackerras Fri, 05 May 2006 15:45:48 +1000 committer Paul Mackerras Fri, 05 May 2006 15:45:48 +1000 Merge ../linux-2.6 commit 7e990266c845d7f712c96013891aaf74baef198f tree 92bc569003abdfd53b53f1081132469d92497ded parent 5a43ee65620d628ba04deecf241b63b2410b97f2 author Kumar Gala Fri, 05 May 2006 00:02:08 -0500 committer Kumar Gala Fri, 05 May 2006 00:02:08 -0500 powerpc: provide ppc_md.panic() for both ppc32 & ppc64 Allow boards to provide a panic callback on ppc32. Moved the code to sets this up into setup-common.c so its shared between ppc32 & ppc64. Also moved do_init_bootmem prototype into setup.h. Signed-off-by: Kumar Gala commit 05f75fd3bb92d9f5eaa8620195ff77a89431f2d2 tree 808d4b7812c025cafde7ca69cfbf5c8624904d03 parent cb8c1fdc0cf703e3297499dcd1a4b20b27570a7a author David Woodhouse Thu, 04 May 2006 17:50:04 +0100 committer David Woodhouse Thu, 04 May 2006 17:50:04 +0100 Include and use __uXX types in Signed-off-by: David Woodhouse commit cb8c1fdc0cf703e3297499dcd1a4b20b27570a7a tree 02f3706aaa519ec22b0b0260410973d323eadda0 parent de654c97861c314fd0fc0b6a6dd1bc4202e00e42 author David Woodhouse Thu, 04 May 2006 17:32:44 +0100 committer David Woodhouse Thu, 04 May 2006 17:32:44 +0100 Use __uXX types in , include too Signed-off-by: David Woodhouse commit de654c97861c314fd0fc0b6a6dd1bc4202e00e42 tree db922e0c667e86c816eb7a0bb87f11787b581216 parent 7ee7d0e3186e2ad2a872436b5a272a814ea5cb0f author David Woodhouse Thu, 04 May 2006 17:28:26 +0100 committer David Woodhouse Thu, 04 May 2006 17:28:26 +0100 Remove private struct dx_hash_info from public view in Signed-off-by: David Woodhouse commit 7ee7d0e3186e2ad2a872436b5a272a814ea5cb0f tree 0e2b22cf33b2632d7446cbf5bbf7db8939bd7812 parent 5da0458900bb5f56eb5e7a7c5ed275b5eaf51762 author David Woodhouse Thu, 04 May 2006 15:49:24 +0100 committer David Woodhouse Thu, 04 May 2006 15:49:24 +0100 Include and use __uXX types in Signed-off-by: David Woodhouse commit 5da0458900bb5f56eb5e7a7c5ed275b5eaf51762 tree f18d6efa3832d8d0c62053670e689e6f4e9c02d4 parent 5ee882f153a49098a12f6b26f153ba12a33d767a author David Woodhouse Thu, 04 May 2006 15:07:59 +0100 committer David Woodhouse Thu, 04 May 2006 15:07:59 +0100 Use __uXX types in for struct divert_blk et al. Signed-off-by: David Woodhouse commit 5ee882f153a49098a12f6b26f153ba12a33d767a tree 0e30f008608f8c7ba9622512643d0c4a8b0e8116 parent 2c88f4a8bc4276013f7eee7824056d9cecccadb1 author David Woodhouse Thu, 04 May 2006 12:39:12 +0100 committer David Woodhouse Thu, 04 May 2006 12:39:12 +0100 Use __u32 for elf_addr_t in , not u32. It's user-visible. Signed-off-by: David Woodhouse commit 2c88f4a8bc4276013f7eee7824056d9cecccadb1 tree 0a6711528c7e6aa65cd0e8a4a49b2ad75809aadf parent 90abbae2d35b3dc55fd39f8ab04acaf3da5cdc0a author David Woodhouse Thu, 04 May 2006 12:07:37 +0100 committer David Woodhouse Thu, 04 May 2006 12:07:37 +0100 Remove PPP_FCS from user view in , remove __P mess entirely Signed-off-by: David Woodhouse commit 90abbae2d35b3dc55fd39f8ab04acaf3da5cdc0a tree fff2d1966e8ac1bbf328fa156769722041a513a1 parent 8e1515df578e4665b77d1e0eec3c8b041d159b23 author David Woodhouse Thu, 04 May 2006 02:55:50 +0100 committer David Woodhouse Thu, 04 May 2006 02:55:50 +0100 Use __uXX types in user-visible structures in Signed-off-by: David Woodhouse commit 8e1515df578e4665b77d1e0eec3c8b041d159b23 tree cd106ed847d542886206f47958678e00f2be7355 parent 56b192c337ddad05dee83c9bea079f41df775990 author David Woodhouse Thu, 04 May 2006 01:42:36 +0100 committer David Woodhouse Thu, 04 May 2006 01:42:36 +0100 Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Signed-off-by: David Woodhouse commit 56b192c337ddad05dee83c9bea079f41df775990 tree b132fdf2ee4067d7f309328cd694c2e286ca7477 parent 9a798c076fcc26f29bf9e9d350a17cdeff0a314f author David Woodhouse Thu, 04 May 2006 01:18:33 +0100 committer David Woodhouse Thu, 04 May 2006 01:18:33 +0100 Use __uXX types for S390 DASD volume label definitions which are user-visible Signed-off-by: David Woodhouse commit 9a798c076fcc26f29bf9e9d350a17cdeff0a314f tree 98f5c773f214614fe7ebcf3256326d3793bddbea parent ac12c0fc8c08a14bfa263c3a478ee82ad3e346d2 author David Woodhouse Thu, 04 May 2006 01:17:41 +0100 committer David Woodhouse Thu, 04 May 2006 01:17:41 +0100 S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Signed-off-by: David Woodhouse commit ac12c0fc8c08a14bfa263c3a478ee82ad3e346d2 tree fe5258e1ed41273ed3a73efcbc7dea8d25490f64 parent eba7f3bdb6344adee8a3d044f405ed38f5c66c6b author David Woodhouse Thu, 04 May 2006 00:59:14 +0100 committer David Woodhouse Thu, 04 May 2006 00:59:14 +0100 Remove unneeded inclusion of from Signed-off-by: David Woodhouse commit eba7f3bdb6344adee8a3d044f405ed38f5c66c6b tree 93f811f318da092f2ebfa2071b116b603fccb060 parent 888855dc00c302c88663ec256bb422f4b27046f2 author David Woodhouse Thu, 04 May 2006 00:44:14 +0100 committer David Woodhouse Thu, 04 May 2006 00:44:14 +0100 Fix private integer types used in V4L2 ioctls. Signed-off-by: David Woodhouse commit 888855dc00c302c88663ec256bb422f4b27046f2 tree 1a2a52d028f265b3792c2678959befee34c3ab74 parent 423bc7b22bdeb73efeabfcf91d8a459ac33088f1 author David Woodhouse Thu, 04 May 2006 00:42:42 +0100 committer David Woodhouse Thu, 04 May 2006 00:42:42 +0100 Fix integer types in SNDRV_HDSP_IOCTL_GET_PEAK_RMS ioctl We should be using __u32 et al, not the kernel-private types. Signed-off-by: David Woodhouse commit 423bc7b22bdeb73efeabfcf91d8a459ac33088f1 tree 511017422848fd9b6164379b10c44f020d5a51a2 parent 4f79c3ffc6e04623711e86cf9a0e09e4aad8cb36 author David Woodhouse Thu, 04 May 2006 00:41:02 +0100 committer David Woodhouse Thu, 04 May 2006 00:41:02 +0100 Restore __attribute_const__ to user-visibility in linux/compiler.h...for now Signed-off-by: David Woodhouse commit edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 tree f375d28043dd4457428a841167dc93d760ba9a46 parent cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 parent e17df688f7064dae1417ce425dd1e4b71d24d63b author David Woodhouse Wed, 03 May 2006 13:30:35 +0100 committer David Woodhouse Wed, 03 May 2006 13:30:35 +0100 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 tree d14ca0758cb0bbdd2f4afddef3b0a721a1ed9da4 parent 7d532dd50de1c0cd7d15ba06ad7261e13474fef2 author David Woodhouse Wed, 03 May 2006 13:07:27 +0100 committer David Woodhouse Wed, 03 May 2006 13:07:27 +0100 Move jffs2_fs_i.h and jffs2_fs_sb.h from include/linux/ to fs/jffs2/ Signed-off-by: David Woodhouse commit 753a6c4ff4c371a3e4e3408aaba4d03f3cfde73a tree b55e9d7a5d4ef746f38a10614bf01c2ab2dacd42 parent 5d3213cc8f4d6244b76ee0c4ab73a97d5d2ee956 parent ebf34c9b6fcd22338ef764b039b3ac55ed0e297b author Jeff Garzik Tue, 02 May 2006 15:26:21 -0400 committer Jeff Garzik Tue, 02 May 2006 15:26:21 -0400 Merge branch 'upstream-fixes' into upstream commit 5d3213cc8f4d6244b76ee0c4ab73a97d5d2ee956 tree 94c34884194215e427538a6bc14c239ad8b5c09c parent bd1034f035f3679fbc753a1368559c0b4b89f8f6 author Ananda Raju Fri, 21 Apr 2006 19:23:26 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: init/shutdown fixes Hi, The following patch contains fix related to init and shutdown of adapter as per user guide. The list of changes include 1. shutdown gracefully. 2. Need to mask/unmask interrupts in ISR required fro Xframe-E 3. Tx FIFO should be enabled after WRR calender programming Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit bd1034f035f3679fbc753a1368559c0b4b89f8f6 tree b4c51f217c4067a0dfbebe20cc5a19dc7817cd3c parent c92ca04b2a21852fbc6842e8a7c6fff3ae255b30 author Ananda Raju Fri, 21 Apr 2006 19:20:22 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: additional stats Hi, This patch contains additional statistics counters added to s2io driver these statistics are very much usefull in debugging the driver. Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit c92ca04b2a21852fbc6842e8a7c6fff3ae255b30 tree 9c161719d811a693d1ee3b202494e5a6d446c42e parent 9dc737a77353920a67337aa627f7d9dae8dade05 author Ananda Raju Fri, 21 Apr 2006 19:18:03 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: fixes Hi, This patch contains some of the bug fixes done for S2io driver. Following are the brief description of changes 1. Continuing with initialization if we get minimum required MSI-X vectors 2. fix for ethtool online link test fails 3. make wait_for_cmd_complete generic for all command status registers 4. Print "Device is on PCI-E bus" for Xframe-E card 5. CX4 requires additional delay after sw_reset, and requires higher value for igp 6. Fixed panic due to non-TCP and/or LLC/SNAP traffic in case of lro 7. remove legacy code for old transponder 8. SPECIAL_REG_WRITE made to use 32-bit writes irrespective of system type 9. handle link interrupt as per user guide for Xframe II 10. Wait till all interrupts hndled Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 9dc737a77353920a67337aa627f7d9dae8dade05 tree b87c69eb07c905791c68b7b976b72b31712ac621 parent 863c11a91e4507c3ff44783a75a5433c8cf7700e author Ananda Raju Fri, 21 Apr 2006 19:05:41 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:36 -0400 [PATCH] s2io: input parms, output messages update hi, This patch contains the modification and bug fixes with respect to input parameters and outupt dmesages. following is brief description of the changes. 1. Set default values for rx_ring_sz[0..7] and tx_fifo_len[0..7] 2. verify few basic load parameters 3. read product description from VPD 4. clean up of dmesg when driver is loaded Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 863c11a91e4507c3ff44783a75a5433c8cf7700e tree f1a3e065ed6787c693b8b56418c571dc950bdb88 parent 1fb5fef9b80d9a3b5368e22031627afd1585487b author Ananda Raju Fri, 21 Apr 2006 19:03:13 -0400 committer Jeff Garzik Tue, 02 May 2006 15:16:35 -0400 [PATCH] s2io: performance improvements hi, This patch contains all the changes that were done to improve performance of s2io driver. one line description of the changes are 1. For Non NAPI case the rx interrupt handler is being called unconditionally 2. code optimization and adding prefetch skb->data 3. Remove modulo operations in fast path 4. Enable Group Reads and set backoff interval to 0x1000 5. correct PIC_CNTL_SHARED_SPLITS macro definition, and reduce pause parameter 6. Corrected logic of identifying rx buffer level in rx_buffer_level() 7. fix DMA map and unmap done with different sizes in 1-buf mode 8. Removed forcible disabling of ERO 9. Send up the packets with transfer code = 0x5 Signed-off-by: Ananda Raju Signed-off-by: Jeff Garzik commit 1fb5fef9b80d9a3b5368e22031627afd1585487b tree 54f07a532b5b2622b8642156bbcaeca637fcdb8f parent 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e parent 330ab71619bacc4d4494227a6cfc9b7f5500403d author Jeff Garzik Tue, 02 May 2006 14:33:57 -0400 committer Jeff Garzik Tue, 02 May 2006 14:33:57 -0400 Merge branch 'master' into upstream commit 4f79c3ffc6e04623711e86cf9a0e09e4aad8cb36 tree cbb828ab47b9350ea57726b7be8d98fe21f23de7 parent 2683e88413977a7f382106f8e8b3b684a597c761 author David Woodhouse Tue, 02 May 2006 10:41:25 +0100 committer David Woodhouse Tue, 02 May 2006 10:41:25 +0100 Guard some of linux/compiler.h with #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit 2683e88413977a7f382106f8e8b3b684a597c761 tree 96f56121c3afed843fb705cbc75aa85cf9038fd0 parent b07019f29328ebb1b48d3faf952b84f07ec9b973 parent 9f29333dae3488542b1344871e8ecb84084ad80e author David Woodhouse Mon, 01 May 2006 16:24:37 +0100 committer David Woodhouse Mon, 01 May 2006 16:24:37 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Reverting c7afb48eb5147be9eb9789b4161462d246451ac2 since a better (but more intrusive) fix is now merged upstream. Signed-off-by: David Woodhouse commit aa783a8f31c79f493bd49ba926b171b79b9839fb tree ffe2694f91da0edad897df1e03d0014104fcf6df parent ed198cb49750fd9ec564e9f1df66c10efea605f1 author Andrew Morton Mon, 01 May 2006 09:41:47 +0100 committer David Woodhouse Mon, 01 May 2006 09:41:47 +0100 Update UML kernel/physmem.c to use rb_parent() accessor macro Signed-off-by: Andrew Morton Signed-off-by: David Woodhouse commit 7d532dd50de1c0cd7d15ba06ad7261e13474fef2 tree 8cdf0c7b882524dcda1ae08e10275817b33af364 parent fbbc21c6a491503e55e08e3f7c4629c1337ea1cc author Lennert Buytenhek Sun, 30 Apr 2006 10:36:38 +0200 committer David Woodhouse Sun, 30 Apr 2006 21:19:44 +0100 ts72xx NAND driver The TS-72xx is a series of embedded single board computers from Technologic Systems based on the Cirrus ep93xx (arm920t based) CPU. The TS-7200 uses NOR flash, while all the other models in the series (TS-7250, TS-7260) use NAND flash -- included is a driver for the NAND flash on those boards. Signed-off-by: Lennert Buytenhek Signed-off-by: David Woodhouse commit b07019f29328ebb1b48d3faf952b84f07ec9b973 tree 99fbd8379fb9fe17c5b06c74871f71207ebb072e parent c3ce7e203af5d8eab7c3390fc991a1fcb152f741 parent e0a515bc6a2188f02916e976f419a8640312e32a author David Woodhouse Sun, 30 Apr 2006 20:34:39 +0100 committer David Woodhouse Sun, 30 Apr 2006 20:34:39 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Signed-off-by: David Woodhouse commit fbbc21c6a491503e55e08e3f7c4629c1337ea1cc tree 12edcb1cfb2d687655819fb85b3035dfee5e375d parent 954c24227318c166ec1925e1229db442e1f56f51 author Daniel Drake Sat, 29 Apr 2006 11:41:44 +0100 committer Josh Boyer Sat, 29 Apr 2006 08:48:55 -0500 mtd: SC520CDP should depend on MTD_CONCAT Toralf Förster found a compile error when CONFIG_MTD_SC520CDP=y and CONFIG_MTD_CONCAT=n: drivers/built-in.o: In function `init_sc520cdp': sc520cdp.c:(.init.text+0xb4de): undefined reference to `mtd_concat_create' drivers/built-in.o: In function `cleanup_sc520cdp': sc520cdp.c:(.exit.text+0x14bc): undefined reference to `mtd_concat_destroy' This patch fixes it. Signed-off-by: Daniel Drake Signed-off-by: Josh Boyer commit 5a43ee65620d628ba04deecf241b63b2410b97f2 tree c91452c9c06a1d592bb45ddf44498e28d6a28cea parent c5c4591375a10f6bc1bc55d86af7764033b10367 author Will Schmidt Wed, 26 Apr 2006 11:09:46 -0500 committer Paul Mackerras Sat, 29 Apr 2006 18:08:05 +1000 [PATCH] nvram_print_partitions cosmetic fixup This is a cosmetic fixup. When printing the nvram partition table, the first couple entries have a shorter 'index' value than the others, so table is a bit askew. This change makes the table look pretty. Tested on pseries and g5. Footnote: yes, this table is normally hidden behind a DEBUG_NVRAM #define. Signed-off-by: Will Schmidt Signed-off-by: Paul Mackerras commit c5c4591375a10f6bc1bc55d86af7764033b10367 tree caf9e8dcc98d04a4338f8f17d99c37cb3d0d7817 parent a74e5e5facb854ab4be9e0320e0f65074012df9b author Jeremy Kerr Fri, 28 Apr 2006 16:37:47 +0800 committer Paul Mackerras Sat, 29 Apr 2006 18:08:03 +1000 [PATCH] powerpc: cell: use kzalloc in alloc_spu_context() Use kzalloc when allocating a new spu context, rather than kmalloc + zeroing. Booted & tested on cell. Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit a74e5e5facb854ab4be9e0320e0f65074012df9b tree ae2c8b1462ca659d8b306a530a855d203a303e9f parent bc97ce951cfb697eaac9d5b6a2fbe4544fdf1a7c author Olof Johansson Fri, 28 Apr 2006 08:57:09 -0500 committer Paul Mackerras Sat, 29 Apr 2006 18:08:01 +1000 [PATCH] powerpc iommu: minor cleanup A couple of minor renames: * The iommu_table is no longer a part of the device node structure, so devnode_table is misleading * Rename struct device *-variables to hwdev Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit bc97ce951cfb697eaac9d5b6a2fbe4544fdf1a7c tree ae880181c00f47a28e805f5328ab7e9a15620ee9 parent c7f0e8cb5654a50986c6097b3c0cca972e406899 author Olof Johansson Fri, 28 Apr 2006 22:51:59 -0500 committer Paul Mackerras Sat, 29 Apr 2006 18:07:54 +1000 [PATCH] powerpc: kill union tce_entry It's been long overdue to kill the union tce_entry in the pSeries/iSeries TCE code, especially since I asked the Summit guys to do it on the code they copied from us. Also, while I was at it, I cleaned up some whitespace. Built and booted on pSeries, built on iSeries. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit c7f0e8cb5654a50986c6097b3c0cca972e406899 tree dc8a8e590c5cf97d8b7cae2f1e93bdbef178f89f parent dd721ffd95d5e1516380da0b254ef737582a258f author Stephen Rothwell Thu, 27 Apr 2006 17:23:32 +1000 committer Paul Mackerras Sat, 29 Apr 2006 18:02:02 +1000 [PATCH] powerpc: merge the rest of the vio code Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit dd721ffd95d5e1516380da0b254ef737582a258f tree fc31c2124b0de8b301622d755e444e4d5acb95b1 parent e10fa77368dff31140451fac04d78d9f51f0f3ac author Stephen Rothwell Thu, 27 Apr 2006 17:21:46 +1000 committer Paul Mackerras Sat, 29 Apr 2006 18:02:01 +1000 [PATCH] powerpc: use a common vio_match_device routine This requires the compatible properties having vaules that are empty strings instead of just being empty properties. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit e10fa77368dff31140451fac04d78d9f51f0f3ac tree 20f3645859dbd995ded831f5a40b78e823e4fc6e parent 95a1ca6cd8e702a19ee56efae522a5816a56a205 author Stephen Rothwell Thu, 27 Apr 2006 17:18:21 +1000 committer Paul Mackerras Sat, 29 Apr 2006 18:02:00 +1000 [PATCH] powerpc: use the device tree for the iSeries vio bus probe As an added bonus, since every vio_dev now has a device_node associated with it, hotplug now works. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 95a1ca6cd8e702a19ee56efae522a5816a56a205 tree b641fb9888afa4b7e51a337a78f0824f729b3881 parent 29f147d746326e4db5fe350c70373081d61a2965 author Stephen Rothwell Thu, 27 Apr 2006 17:09:02 +1000 committer Paul Mackerras Sat, 29 Apr 2006 18:01:58 +1000 [PATCH] powerpc: add all the iSeries virtual devices to the device tree We do this by putting them in the flattened device tree at setup time. This required the flattened device tree blob to be made bigger. Currenly we don't do anything with these. Also make a function static. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 29f147d746326e4db5fe350c70373081d61a2965 tree 04c065ace8c62953441bc22079b93449b996f283 parent 916a3d5729c8b710d56acf579f3fdb4de7c03e77 parent 6fb8f3acbe833586eb32598d1f844eb9f77c4fba author Paul Mackerras Sat, 29 Apr 2006 16:15:57 +1000 committer Paul Mackerras Sat, 29 Apr 2006 16:15:57 +1000 Merge branch 'merge' commit c3ce7e203af5d8eab7c3390fc991a1fcb152f741 tree 43b0837c42a1deb5b0f87800bf6a5ed8eea2eafe parent 56142536868a2be34f261ed8fdca1610f8a73fbd author David Woodhouse Sat, 29 Apr 2006 01:53:47 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:53:47 +0100 Sanitise ethtool.h and mii.h for userspace. They shouldn't be using 'u32' et al in structures which are used for communication with userspace. Switch to the proper types (__u32 etc). Signed-off-by: David Woodhouse commit 56142536868a2be34f261ed8fdca1610f8a73fbd tree 0bd66166b318d8403b1881285f6813ece2acced1 parent 34c278d3913a15b64943e8c40a16b4f732cc7c59 author David Woodhouse Sat, 29 Apr 2006 01:51:47 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:51:47 +0100 Remove unneeded _syscallX macros from user view in asm-*/unistd.h These aren't needed by glibc or klibc, and they're broken in some cases anyway. The uClibc folks are apparently switching over to stop using them too (now that we agreed that they should be dropped, at least). Signed-off-by: David Woodhouse commit 34c278d3913a15b64943e8c40a16b4f732cc7c59 tree 25857091378e3062b101076aef7cc9ef397efdea parent c7afb48eb5147be9eb9789b4161462d246451ac2 author David Woodhouse Sat, 29 Apr 2006 01:49:06 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:49:06 +0100 Remove 'extern int errno;' from public view in linux/unistd.h Signed-off-by: David Woodhouse commit c7afb48eb5147be9eb9789b4161462d246451ac2 tree 1313cde51b5bfe91464bd944e3512a6d83cd7d3a parent 778382e08cce51b6268ca49449e5bd70c8413799 author David Woodhouse Sat, 29 Apr 2006 01:48:16 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:48:16 +0100 Remove struct input_device_id from public view in linux/input.h It uses kernel_ulong_t but can't be wrapped in __KERNEL__ because it's used from scripts/mod/file2alias.c -- but we _can_ hide it inside header manually too (and it doesn't generally exist for userspace). Signed-off-by: David Woodhouse commit 778382e08cce51b6268ca49449e5bd70c8413799 tree 14a2ed2295c31890499306e007523d6aa74c313e parent d6754b401a15eaa16492ea5dbaa4826361d3f411 author David Woodhouse Sat, 29 Apr 2006 01:46:02 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:46:02 +0100 Don't include in public part of linux/pci.h Signed-off-by: David Woodhouse commit d6754b401a15eaa16492ea5dbaa4826361d3f411 tree 032f067d3af458527d903a7653885404ed82431e parent acc429a517bd11fdcac9bea97d082d26231beb92 parent 693f7d362055261882659475d2ef022e32edbff1 author David Woodhouse Sat, 29 Apr 2006 01:42:26 +0100 committer David Woodhouse Sat, 29 Apr 2006 01:42:26 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit acc429a517bd11fdcac9bea97d082d26231beb92 tree e6e0f2c58fab3f1ce8d614ac08c21a3379123a4b parent cd469e0cc67b74ba41daec335ea72baedb750b80 author David Woodhouse Thu, 27 Apr 2006 16:46:56 +0100 committer David Woodhouse Thu, 27 Apr 2006 16:46:56 +0100 linux/blkpg.h needs for __user Signed-off-by: David Woodhouse commit cd469e0cc67b74ba41daec335ea72baedb750b80 tree 8054cc6b13f48785165af1485a873dd3e33d4ca6 parent ad1588798620901c12ba86c71865150a4eb727bf author David Woodhouse Thu, 27 Apr 2006 15:48:08 +0100 committer David Woodhouse Thu, 27 Apr 2006 15:48:08 +0100 Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h Signed-off-by: David Woodhouse commit 7894eaf291238a62a565e9e9777483beeb00eeae tree 43c08830d2030d39d719f3f3d54a0e9b36554770 parent 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 parent acc696d93dcf993dec123d69d599979e1456ffec author Jeff Garzik Thu, 27 Apr 2006 04:55:53 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:55:53 -0400 Merge branch 'upstream' into irq-pio commit 9a375e93f88269bb770fb2eaa57554c975449c88 tree 4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f parent b2b4b9a7c09ad66e095b13c97946a96f2dc8284e parent acc696d93dcf993dec123d69d599979e1456ffec author Jeff Garzik Thu, 27 Apr 2006 04:55:26 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:55:26 -0400 Merge branch 'upstream' into max-sect commit acc696d93dcf993dec123d69d599979e1456ffec tree b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 parent bf2af2a2027e52b653882fbca840620e896ae081 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Jeff Garzik Thu, 27 Apr 2006 04:53:34 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:53:34 -0400 Merge branch 'master' into upstream commit 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e tree e0e70aa880b8c8f2c1a979438a523241f6193742 parent 9f1da23b631f92393f58f664348ffc5faeaddeb3 parent 2be4d50295e2b6f62c07b614e1b103e280dddb84 author Jeff Garzik Thu, 27 Apr 2006 04:52:44 -0400 committer Jeff Garzik Thu, 27 Apr 2006 04:52:44 -0400 Merge branch 'master' into upstream commit ad1588798620901c12ba86c71865150a4eb727bf tree dcc148c8007e649e549cc44dd0b2a02bae832af5 parent 274f5946dcb7c970455067be9e13a22174787592 author David Woodhouse Thu, 27 Apr 2006 06:57:23 +0100 committer David Woodhouse Thu, 27 Apr 2006 06:57:23 +0100 Add standard include guard to asm-generic/signal and use compiler.h Signed-off-by: David Woodhouse commit 274f5946dcb7c970455067be9e13a22174787592 tree 6f6929a35540273c90730f77c07eed827ae89728 parent b7b3c76a0a21c5a98124e90c47c488f7e4166f87 author David Woodhouse Thu, 27 Apr 2006 04:47:10 +0100 committer David Woodhouse Thu, 27 Apr 2006 04:47:10 +0100 Don't include implementation details from asm-s390/ptrace.h and page.h Signed-off-by: David Woodhouse commit b7b3c76a0a21c5a98124e90c47c488f7e4166f87 tree 475b13a18a81b3ac6377a6c2701e78268f543e5c parent f001e47f83db18a9f202f25c0255b4d11ebe468b author David Woodhouse Thu, 27 Apr 2006 00:12:56 +0100 committer David Woodhouse Thu, 27 Apr 2006 00:12:56 +0100 Sanitise linux/sched.h for userspace consumption There was a whole load of crap exposed which should have been inside the existing #ifdef __KERNEL__ part. Also hide struct sched_param for now, since glibc has its own and doesn't like being given ours (yet). Signed-off-by: David Woodhouse commit f001e47f83db18a9f202f25c0255b4d11ebe468b tree 0d459fdb2dce2d21f5739619210bcd4b679a49f2 parent 62c4f0a2d5a188f73a94f2cb8ea0dba3e7cf0a7f author David Woodhouse Thu, 27 Apr 2006 00:11:01 +0100 committer David Woodhouse Thu, 27 Apr 2006 00:11:01 +0100 Sanitise linux/audit.h for userspace consumption, split elf-em.h from elf.h Don't include outside __KERNEL__, and split the EM_xxx definitions out of elf.h into elf-em.h so that audit.h can include just that and not pollute the namespace any further than it needs to. Signed-off-by: David Woodhouse commit 62c4f0a2d5a188f73a94f2cb8ea0dba3e7cf0a7f tree e85ca2d0dd43f90dccf758338764c3caa55f333f parent 089f26d5e31b7bf42a9a8fefec08b30cd27f4b0e author David Woodhouse Wed, 26 Apr 2006 12:56:16 +0100 committer David Woodhouse Wed, 26 Apr 2006 12:56:16 +0100 Don't include linux/config.h from anywhere else in include/ Signed-off-by: David Woodhouse commit 9f1da23b631f92393f58f664348ffc5faeaddeb3 tree 68c7bf9c0f4b11117cf6b3cde5fa5c4f2929088a parent 00355cd938bac2a6006efa140352958784431f1f parent 86a0f04387bfa814618bf0c2c8b203899c4fa5d2 author Jeff Garzik Wed, 26 Apr 2006 06:21:31 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:21:31 -0400 Merge branch 'upstream-fixes' into upstream commit 00355cd938bac2a6006efa140352958784431f1f tree 4f8bd8f9117a5ea180da97fd889b5305738b3be2 parent 45de6fd958d7f407bdb5fdc6914b3262519d891c parent 3c304956755fa63ee80ca51ce38078fe1c4e8818 author Jeff Garzik Wed, 26 Apr 2006 06:18:15 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:18:15 -0400 Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream commit 45de6fd958d7f407bdb5fdc6914b3262519d891c tree c1b9f9023e93d0f28f773ca4be41d107f79cd600 parent 1f5d5dbf0372dd933d8325054889ba09d996e50b parent 3b908870b8332dfd40be0e919e187aa4991536fb author Jeff Garzik Wed, 26 Apr 2006 06:18:00 -0400 committer Jeff Garzik Wed, 26 Apr 2006 06:18:00 -0400 Merge branch 'upstream-fixes' into upstream commit 089f26d5e31b7bf42a9a8fefec08b30cd27f4b0e tree 5e15cfd59d2056ea3e796ebcb60270bb125416f6 parent d85004eb15a635b3937e91d1dbadb1d37541983c author David Woodhouse Tue, 25 Apr 2006 15:29:01 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:29:01 +0100 Don't include and from linux/socket.h Signed-off-by: David Woodhouse commit d85004eb15a635b3937e91d1dbadb1d37541983c tree 0ac080c0b83feae466a436a73fab3f0efedcafa3 parent 52a78c1cae382ff5684f3970848676de12449745 author David Woodhouse Tue, 25 Apr 2006 15:18:46 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:18:46 +0100 Don't include private headers from user-visible part of linux/ext3_fs.h Signed-off-by: David Woodhouse commit 52a78c1cae382ff5684f3970848676de12449745 tree ea5377cb74058418a03dae9c855c7acb200a4f2f parent 19b3bd667b6a4fc4c164c743492cec08d91d74a5 author David Woodhouse Tue, 25 Apr 2006 15:18:31 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:18:31 +0100 Don't include private headers from user-visible part of linux/ext2_fs.h Signed-off-by: David Woodhouse commit 19b3bd667b6a4fc4c164c743492cec08d91d74a5 tree 33b3a7cc733f64ca284f7a617ef1e4504dffa9d3 parent 1af042271f9bf7601f7ecf4d328ccde3a44d2c72 author David Woodhouse Tue, 25 Apr 2006 15:18:05 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:18:05 +0100 Don't include private headers from user-visible part of linux/smb_fs.h Signed-off-by: David Woodhouse commit 1af042271f9bf7601f7ecf4d328ccde3a44d2c72 tree 9c1dea25088aed63a29b2f759edfb6fbca2a186c parent eae19a762de975e109394b1edcba6587323c7d1a author David Woodhouse Tue, 25 Apr 2006 15:16:44 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:16:44 +0100 Sanitise linux/sunrpc/debug.h for userspace consumption Move some inclusion of private header files and the definition of RPC_DEBUG inside the existing #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit eae19a762de975e109394b1edcba6587323c7d1a tree e53c2fb47f3d574eaf6d29c33bf46a57fa4d3e8d parent 468db83658f776ec87a953778f18611301668148 author David Woodhouse Tue, 25 Apr 2006 15:14:50 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:14:50 +0100 Don't export CONFIG_COMPAT stuff in linux/usbdevice_fs.h to userspace Signed-off-by: David Woodhouse commit 468db83658f776ec87a953778f18611301668148 tree d494c1b4f8d5b635ae9eb827a83ad11a40966abf parent c6e82e72361db12759fdcdbfd3b598acb6b34b07 author David Woodhouse Tue, 25 Apr 2006 15:00:56 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:00:56 +0100 Don't include from user-visible part of linux/wanrouter.h Signed-off-by: David Woodhouse commit c6e82e72361db12759fdcdbfd3b598acb6b34b07 tree 50ffec76ba950855b4ed388afee2ead6214e08e2 parent 7ab2febd4d3c6f50545cee11a116536a09748d59 author David Woodhouse Tue, 25 Apr 2006 15:00:06 +0100 committer David Woodhouse Tue, 25 Apr 2006 15:00:06 +0100 Move comment in mtd-abi.h to stop confusing unifdef Currently, unifdef removes the comment which starts on the same line as the #ifdef __KERNEL__, but leaves the second line of the comment in place. Move the comment onto a separate line. Signed-off-by: David Woodhouse commit 7ab2febd4d3c6f50545cee11a116536a09748d59 tree fe6acab1ca8130081d5dcf056bdfc7c0a8f62cba parent 8ffbc759a5b655feb69435c4dfa857c391f9dcc8 author David Woodhouse Tue, 25 Apr 2006 14:55:46 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:55:46 +0100 Don't include private headers from user-visible part of linux/signal.h Signed-off-by: David Woodhouse commit 8ffbc759a5b655feb69435c4dfa857c391f9dcc8 tree 1fca46b69677e8e482498b9de143b9db915b3ebf parent a3b6714e1744a5e841753d74aca1de5972f24e6d author David Woodhouse Tue, 25 Apr 2006 14:55:13 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:55:13 +0100 Don't include from user-visible part of linux/sem.h Signed-off-by: David Woodhouse commit a3b6714e1744a5e841753d74aca1de5972f24e6d tree 2a463aa2d4fd93f754fb819e5e2ec56482844c99 parent 98ca79d52bc34b8dfff729bc8559dbb918c9d02a author David Woodhouse Tue, 25 Apr 2006 14:54:40 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:54:40 +0100 Partially sanitise linux/sched.h for userspace consumption For now, just make sure all inclusion of private header files is done within #ifdef __KERNEL__. There'll be more to clean up later. Signed-off-by: David Woodhouse commit 98ca79d52bc34b8dfff729bc8559dbb918c9d02a tree 3a7dc458e50c6950b7ca1b31380851f37a081af5 parent 0409d3a332fc4347efba535a5003943f2a4aa1ca author David Woodhouse Tue, 25 Apr 2006 14:52:51 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:52:51 +0100 Don't include from user-visible part of reiserfs_xattr.h Signed-off-by: David Woodhouse commit 0409d3a332fc4347efba535a5003943f2a4aa1ca tree 40452f9514818eb255923cc1e3055078085d1991 parent 997b7af2fe0810ca82a2f801a295218b51426e5a author David Woodhouse Tue, 25 Apr 2006 14:52:13 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:52:13 +0100 Don't include private headers from user-visible parts of linux/quota.h Signed-off-by: David Woodhouse commit 997b7af2fe0810ca82a2f801a295218b51426e5a tree 06803bb0fcf2b910c4a222f0ce0b575cf23b90f7 parent eacf17bdbc8e6f24fe46cd7e10fb9a657f060d08 author David Woodhouse Tue, 25 Apr 2006 14:51:45 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:51:45 +0100 Don't include private headers from user-visible parts of include/linux/nfs*.h Signed-off-by: David Woodhouse commit eacf17bdbc8e6f24fe46cd7e10fb9a657f060d08 tree 5452c85230cf326c313773ddfd2ee6dc306331ed parent 77597ad663f9e2d40a89c6e27824701bb5fabb83 author David Woodhouse Tue, 25 Apr 2006 14:46:09 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:46:09 +0100 Don't include from user-visible part of linux/net.h Signed-off-by: David Woodhouse commit 77597ad663f9e2d40a89c6e27824701bb5fabb83 tree 83e9a96117e87138c524bba303364aa4e62c25bf parent 58908d093e77224973b3f7bf54470d51949ff110 author David Woodhouse Tue, 25 Apr 2006 14:26:46 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:26:46 +0100 Don't include from user-visible part of linux/msg.h Signed-off-by: David Woodhouse commit 58908d093e77224973b3f7bf54470d51949ff110 tree 9caa92036c29c0fab210750a2a80149bc07e089a parent 9cdcb56636717ccb935dc66c5d56681eaa5941c1 author David Woodhouse Tue, 25 Apr 2006 14:26:26 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:26:26 +0100 Don't include private files from user-visible part of linux/ncp_fs.h Signed-off-by: David Woodhouse commit 9cdcb56636717ccb935dc66c5d56681eaa5941c1 tree 290ac168d09b892641fd2f2f023b88f212976587 parent 8e442735ae6e2e1c857fb0c746027da8d8e40a81 author David Woodhouse Tue, 25 Apr 2006 14:18:07 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:18:07 +0100 Sanitise linux/mman.h for userspace consumption It only really needs to define a few constants and include when it's used by userspace. Move the rest within #ifdef __KERNEL__ Signed-off-by: David Woodhouse commit 8e442735ae6e2e1c857fb0c746027da8d8e40a81 tree 4f50a887c9ba593cd69a164df9c16ee61a07cfaa parent 2e0e1f9f1c478ee14fb60524024f7b730df76912 author David Woodhouse Tue, 25 Apr 2006 14:16:14 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:16:14 +0100 Remove gratuitous inclusion of from linux/isdn/tpam.h Signed-off-by: David Woodhouse commit 2e0e1f9f1c478ee14fb60524024f7b730df76912 tree 12b050c8c40bbe61d9c001556ca7547e12a19a9b parent a1b9298e55d2395be4ac25de3340b6eee01c6f67 author David Woodhouse Tue, 25 Apr 2006 14:15:44 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:15:44 +0100 Don't include from user-visible part of linux/ipmi.h Signed-off-by: David Woodhouse commit a1b9298e55d2395be4ac25de3340b6eee01c6f67 tree 23a80fc7105a3d58db7af410eec0fbab692fe758 parent 5a570cc0a41bd316afc91ba2c7151fed70d10b31 author David Woodhouse Tue, 25 Apr 2006 14:14:52 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:14:52 +0100 Sanitise linux/i2c.h for userspace consumption It was unconditionally including a whole bunch of headers which aren't user-visible, and also exposing a lot of private internal stuff of its own. Also fix some legacy character set to UTF-8 while we're at it. Signed-off-by: David Woodhouse commit 5a570cc0a41bd316afc91ba2c7151fed70d10b31 tree 89fa6a2098f772dad535ddba9294e6ed7ed55f89 parent 34186efc17025520a53a48468338003d238a77d7 author David Woodhouse Tue, 25 Apr 2006 14:10:40 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:10:40 +0100 Sanitise linux/i2c-algo-ite.h for userspace consumption It doesn't need to include i2c.h, because a forward declaration of struct i2c_adapter is perfectly sufficient. And it can be inside #ifdef __KERNEL__ along with the kernel-internal structure definition. Signed-off-by: David Woodhouse commit 34186efc17025520a53a48468338003d238a77d7 tree f887ed9f90f3a817cfb239c343f08dd380cfa15d parent f2999e4ea41d6ec6252d3b6d275b40d468a3c07e author David Woodhouse Tue, 25 Apr 2006 14:07:57 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:07:57 +0100 Include various private files only from within __KERNEL__ in genhd.h Signed-off-by: David Woodhouse commit f2999e4ea41d6ec6252d3b6d275b40d468a3c07e tree 376e4053b8472e9cf307920154463fdf4f28ed7d parent 25478bb26f2be1504112b764047105811a52c3cb author David Woodhouse Tue, 25 Apr 2006 14:07:02 +0100 committer David Woodhouse Tue, 25 Apr 2006 14:07:02 +0100 Export only the appropriate GS_xxx flags to userspace from generic_serial.h Signed-off-by: David Woodhouse commit 25478bb26f2be1504112b764047105811a52c3cb tree aa8a47b93ba07e1950b84a0b3538031697f7fcc9 parent 72b9760b65cbe0d24e668c34c8fefb2ba417f14b author David Woodhouse Tue, 25 Apr 2006 13:59:30 +0100 committer David Woodhouse Tue, 25 Apr 2006 13:59:30 +0100 Use __KERNEL__ to hide kernel-private bits of linux/gameport.h Signed-off-by: David Woodhouse commit 72b9760b65cbe0d24e668c34c8fefb2ba417f14b tree 9feae872f60e08f604369ca4e4a7f9f2564f7229 parent a1ff0eafce81a58861534926722a70f211b04faa author David Woodhouse Tue, 25 Apr 2006 13:58:23 +0100 committer David Woodhouse Tue, 25 Apr 2006 13:58:23 +0100 Don't include agp_backend.h in user-visible part of agpgart.h Signed-off-by: David Woodhouse commit a1ff0eafce81a58861534926722a70f211b04faa tree b805851abebd142b8cef766f593bd45c8482af62 parent dd02ec3ac25828d0918f5b389defe2238d015fe6 author David Woodhouse Tue, 25 Apr 2006 13:57:44 +0100 committer David Woodhouse Tue, 25 Apr 2006 13:57:44 +0100 Include from linux/acct.h only in kernel-private part. Signed-off-by: David Woodhouse commit dd02ec3ac25828d0918f5b389defe2238d015fe6 tree 67cff36d121dc0f06561c8142fbabb72fef4105e parent 454ac778459bc70f0a9818a6a8fd974ced11de66 author David Woodhouse Tue, 25 Apr 2006 13:51:52 +0100 committer David Woodhouse Tue, 25 Apr 2006 13:51:52 +0100 Remove user-visible references to PAGE_SIZE in include/asm-powerpc/elf.h Signed-off-by: David Woodhouse commit 3c304956755fa63ee80ca51ce38078fe1c4e8818 tree 4225b87cdf197139e47f931b28fa897dc21f56d5 parent 921a91ef6adffe066ce80823350b982c647033e7 author Dan Williams Sat, 15 Apr 2006 12:26:18 -0400 committer John W. Linville Mon, 24 Apr 2006 16:26:14 -0400 [PATCH] wireless/airo: minimal WPA awareness airo cards with firmware versions of 5.30.17 and higher support WPA. This patch recognizes WPA-capable firmware versions and adds support for retrieving the WPA and RSN information elements from the card's scan results. The JOB and FLAG fields are now independent, since there was no space left in the FLAG field for FLAG_WPA_CAPABLE. Signed-off-by: matthieu castet Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit 921a91ef6adffe066ce80823350b982c647033e7 tree b950c18419413d860a8caa7ac0819d0159beed79 parent 9a1771e86756212041b32d80b850cc4c8063360a author Johannes Berg Thu, 20 Apr 2006 20:02:04 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:58 -0400 [PATCH] softmac: clean up event handling code This patch cleans up the event handling code in ieee80211softmac_event.c and makes the module slightly smaller by removing some strings that are not used any more and consolidating some code. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9a1771e86756212041b32d80b850cc4c8063360a tree 798f75306930072d8d97f95ef1a6846a27f003f5 parent e3c5a64e7075dd066316f1685caadabcbc649427 author Johannes Berg Thu, 20 Apr 2006 20:02:02 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:58 -0400 [PATCH] softmac: add SIOCSIWMLME This patch adds the SIOCSIWMLME wext to softmac, this functionality appears to be used by wpa_supplicant and is softmac-specific. Signed-off-by: Johannes Berg Cc: Jouni Malinen Signed-off-by: John W. Linville commit e3c5a64e7075dd066316f1685caadabcbc649427 tree b7ebbc4e7867755f2f30df73523f55f4655788be parent 127119d50ff6e226c602ae920722897f8a0c81e2 author Zhu Yi Thu, 13 Apr 2006 17:21:13 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: Fix wpa_supplicant association problem The new ipw2200 scan completion event feature will cause a potential event race condition in wpa_supplicant. The patch fixes this problem by move the ipw_disassociate() to the IW_AUTH_WPA_ENABLED event handling code. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 127119d50ff6e226c602ae920722897f8a0c81e2 tree c750aeb5340e3bfae329876b85bef5b0555848ef parent 459d408768fecfd1c2d170ab073e8cfd48326b1f author Zhu Yi Thu, 13 Apr 2006 17:21:06 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: remove priv->last_noise reference priv->last_noise is not used with the exponential averaging algorithm Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 459d408768fecfd1c2d170ab073e8cfd48326b1f tree e7eb822be216be303e7a1bff4882696e387da1ac parent 34f8ae467b066ab4cf90bdf85efd10e7d43f2ff0 author Zhu Yi Thu, 13 Apr 2006 17:21:00 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: rename CONFIG_IEEE80211_RADIOTAP to CONFIG_IPW2200_RADIOTAP Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 34f8ae467b066ab4cf90bdf85efd10e7d43f2ff0 tree be89041e69e3bceaf9b86503849f17f6b951b330 parent e43e3c1e900ec5b6662cf1901b27975c111289bf author Zhu Yi Thu, 13 Apr 2006 17:20:54 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] wireless Kconfig add IPW2200_RADIOTAP Makefile both IPW2200_RADIOTAP and IPW2200_PROMISCUOUS depend on IPW2200_MONITOR. Let IPW2200_PROMISCUOUS select IPW2200_RADIOTAP. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit e43e3c1e900ec5b6662cf1901b27975c111289bf tree 7b926393a0fc33d69693705e26f4d62a02559cb3 parent 555fd91852880f927f131520889e1fe674ed7e7a author Zhu Yi Thu, 13 Apr 2006 17:20:45 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:57 -0400 [PATCH] ipw2200: rename CONFIG_IPW_QOS to CONFIG_IPW2200_QOS Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 555fd91852880f927f131520889e1fe674ed7e7a tree 6a26f6324e2f777adc3135a5f10e6500e2f66fd5 parent ae4af61f6d9909f3c3ab74694c06865f27c9b054 author Zhu Yi Thu, 13 Apr 2006 17:20:40 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: update version stamp to 1.1.2 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ae4af61f6d9909f3c3ab74694c06865f27c9b054 tree 10ff60e450e43389484a99cceeffd3578a89d3af parent d685b8c226727bf5db907c7241f55461e7f1f008 author Zhu Yi Thu, 13 Apr 2006 17:20:34 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: version string rework Added version string fields so the version string indicates what is configured (ie, you'll see 1.1.1kpmd if you are using a GIT snapshot (Kernel.. previously -git), promiscuous (p), monitor (m), debug (d) build. Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d685b8c226727bf5db907c7241f55461e7f1f008 tree 698e2194daef4c065ccbfd22802e7214caf6ea93 parent c6c33a779dfe7aa8254be4da08c217914f1390a0 author Zhu Yi Thu, 13 Apr 2006 17:20:27 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: Enable rtap interface for RF promiscuous mode while associated With this patch, a new promiscuous mode is enabled. If the module is loaded with the rtap_iface=1 module parameter, two interfaces will be created (instead of just one). The second interface is prefixed 'rtap' and provides received 802.11 frames on the current channel to user space in a radiotap header format. Example usage: % modprobe ipw2200 rtap_iface=1 % iwconfig eth1 essid MyNetwork % dhcpcd eth1 % tcpdump -i rtap0 If you do not specify 'rtap_iface=1' then the rtap interface will not be created and you will need to turn it on via: % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface You can filter out what type of information is passed to user space via the rtap_filter sysfs entry. Currently you can tell the driver to transmit just the headers (which will provide the RADIOTAP and IEEE 802.11 header but not the payload), to filter based on frame control type (Management, Control, or Data), and whether to report transmitted frames, received frames, or both. The transmit frame reporting is based on a patch by Stefan Rompf. Filters can be get and set via a sysfs interface. For example, set the filter to only send headers (0x7), don't report Tx'd frames (0x10), and don't report data frames (0x100): % echo 0x117 > /sys/bus/pci/drivers/ipw2200/*/rtap_filter All your packets are belong to us: % tethereal -n -i rtap0 Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit c6c33a779dfe7aa8254be4da08c217914f1390a0 tree cca4c65451d90489d458a14501c26f2155723784 parent 0070f8c738f757c2dda521d6bc310dc2dfdbf643 author Zhu Yi Thu, 13 Apr 2006 17:20:21 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] README.ipw2200: rename CONFIG_IPW_DEBUG to CONFIG_IPW2200_DEBUG Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 0070f8c738f757c2dda521d6bc310dc2dfdbf643 tree 229a423cc8ec6f11d9f7094546350eef76928376 parent 455936c73337c1c9abeac8c4da1c109a0250ab68 author Zhu Yi Thu, 13 Apr 2006 17:20:12 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:56 -0400 [PATCH] ipw2200: Fix endian issues with v3.0 fw image format This patch corrects endian issues with the v3.0 fw image format. Signed-off-by: James Ketrenos Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 455936c73337c1c9abeac8c4da1c109a0250ab68 tree e2f5c6bfa7aa58387fa3544c7d1705b6363d58b2 parent 61fb9ed99dc8876cb118bd9ab46b535ca8c820e8 author Zhu Yi Thu, 13 Apr 2006 17:20:05 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: Set the 'fixed' flags in wext get_rate Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 61fb9ed99dc8876cb118bd9ab46b535ca8c820e8 tree 0542c4df6ea30f9fd8b87dc61de7bffc284c5e5f parent d0b526b71569446aaa848cdf4cf3dd8948f0931a author Zhu Yi Thu, 13 Apr 2006 17:19:55 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: turn off signal debug log Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d0b526b71569446aaa848cdf4cf3dd8948f0931a tree a21580d1a8c7b43aeae621935e979751ab7f93d2 parent 5dc81c3071d015a6afb4a04c1bcb6a35ec29df37 author Zhu Yi Thu, 13 Apr 2006 17:19:50 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: Do not continue loading the firmware if kmalloc fails Signed-off-by: Ingo Molnar Cc: "Zhu, Yi" Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 5dc81c3071d015a6afb4a04c1bcb6a35ec29df37 tree 741a1e4d1d4cb1e82832e68f25582117ed82e99d parent d2b83e1214a8395ee18e028d4526cffe9d2eb4ad author Zhu Yi Thu, 13 Apr 2006 17:19:44 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: fix compile warning when !CONFIG_IPW2200_DEBUG Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit d2b83e1214a8395ee18e028d4526cffe9d2eb4ad tree 883bb1cfe11a76e92dfcc6b6dc40a4a3ba5420f7 parent 07f02e4625e6d7ca5d4f3835aea9807fe1e0f9c5 author Zhu Yi Thu, 13 Apr 2006 17:19:36 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:55 -0400 [PATCH] ipw2200: add module_param support for antenna selection Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 07f02e4625e6d7ca5d4f3835aea9807fe1e0f9c5 tree 99ab4f99a0025155ff3a62410c40ba38aeaf8b91 parent a5cf4fe65144ff2f35de37c7b58e7ab8ffd84d19 author Zhu Yi Thu, 13 Apr 2006 17:19:25 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: generates a scan event after a scan has completed The patch make ipw2200 generate the scan event every time a scan has completed, so that user space know when to get fresh results. Dan Williams would like to go towards this model in Network Manager rather than having to poll. Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit a5cf4fe65144ff2f35de37c7b58e7ab8ffd84d19 tree 405454d2816152c41e0e40d7846c9de18ae927d2 parent 00d21de5c685ab450ef376acdd1b733badb6b50d author Zhu Yi Thu, 13 Apr 2006 17:19:11 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: Fix TX QoS enabled frames problem This patch works with the ieee80211 stack to set the correct QoS bit to the ipw2200 card. It fixed the TX failure problem for using WPA with QoS. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 00d21de5c685ab450ef376acdd1b733badb6b50d tree cafb8af00344d068943666f893a84260eaa84bed parent 45a62ab3d6f9d5963cb7c01fa76c950e42d037c2 author Zhu Yi Thu, 13 Apr 2006 17:19:02 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ipw2200: Exponential averaging for signal and noise Level This patch replaces sliding averaging by exponential averaging for reporting the wireless statistics for signal and noise level for ipw2200. See details from: http://www.ces.clemson.edu/linux/ipw2200_averages.shtml Signed-off-by: Bill Moss Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 45a62ab3d6f9d5963cb7c01fa76c950e42d037c2 tree 203fb320997e967d47edcc699a2c5facacd3d65d parent 7736b5bd93765fc1db5b3b6e25200d7c4292d14b author Zhu Yi Thu, 13 Apr 2006 17:17:54 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ieee80211: update version stamp to 1.1.13 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 7736b5bd93765fc1db5b3b6e25200d7c4292d14b tree 458d68ad73890f4847ef50831bcae3a2b8e0637e parent 35c14b855f52c49e4f3d078b9532b056005ed321 author Zhu Yi Thu, 13 Apr 2006 17:17:47 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:54 -0400 [PATCH] ieee80211: replace debug IEEE80211_WARNING with each own debug macro Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 35c14b855f52c49e4f3d078b9532b056005ed321 tree 4fea40fcc0c6a29038a0c5f3a0927affe20110b3 parent 09593047d8210ca017a0b4aa0a7fb10abf12615f author Zhu Yi Thu, 13 Apr 2006 17:17:35 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: remove unnecessary CONFIG_WIRELESS_EXT checking Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 09593047d8210ca017a0b4aa0a7fb10abf12615f tree cde17a6145434c799dfa6b82427068cefb3953cd parent 73858062b66c07d71bce47a0e4798dd3ce604590 author Zhu Yi Thu, 13 Apr 2006 17:17:26 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: export list of bit rates with standard WEXT procddures The patch replace the way to export the list of bit rates in scan results from IWEVCUSTOM to SIOCGIWRATE. It also removes the max_rate item exported with SIOCGIWRATE since this should be done by userspace. Signed-off-by: Jean Tourrilhes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 73858062b66c07d71bce47a0e4798dd3ce604590 tree ab97d0268e29c237cbc397bd254ca75c00e9c1be parent ea2841521a7e061b772d6cee03f5b23c58a58284 author Zhu Yi Thu, 13 Apr 2006 17:17:17 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: Fix TX code doesn't enable QoS when using WPA + QoS Fix ieee80211 TX code when using WPA+QOS. TKIP/CCMP will use the TID field of qos_ctl in 802.11 frame header to do encryption. We cannot ignore this field when doing host encryption and add the qos_ctl field later. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit ea2841521a7e061b772d6cee03f5b23c58a58284 tree 6333c04cd21360477fa37cd6a4556d92d6067da4 parent cc9357104b19b2b0377713c33d87d78518912c3d author Zhu Yi Thu, 13 Apr 2006 17:17:06 +0800 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] ieee80211: Fix TKIP MIC calculation for QoS frames Fix TKIP MIC verification failure when receiving QoS frames from AP. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit cc9357104b19b2b0377713c33d87d78518912c3d tree e53b117c4d01ef0f4d567d6f7e0891f24fc89fb3 parent f298a2ec62e51cc81b85a120d8fa5b9f8f5a94b1 author Michael Buesch Mon, 10 Apr 2006 02:08:33 +0200 committer John W. Linville Mon, 24 Apr 2006 16:15:53 -0400 [PATCH] bcm43xx: use pci_iomap() for convenience. This reduces codesize. Signed-off-by: John W. Linville commit f298a2ec62e51cc81b85a120d8fa5b9f8f5a94b1 tree 1f3d2824c3ece2ac94ac45bd8f7c6de4b17ffdab parent dc3437d205dcd1a195ebf795f1c54ceb638337fb author Pavel Roskin Fri, 07 Apr 2006 04:11:02 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: bump version to 0.15 Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit dc3437d205dcd1a195ebf795f1c54ceb638337fb tree 0537c6ad05795a090a908d10e418f213817a4ee1 parent b884c872fa1917614b42a39020ffcca7fa9302b1 author Pavel Roskin Fri, 07 Apr 2006 04:11:00 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: further comment cleanup in the PCI drivers Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b884c872fa1917614b42a39020ffcca7fa9302b1 tree 82f5ba67f6b38c96804fb449e018d83fbdce65a1 parent c6fb2e9abef894efc4870e4c1e3aa4365b830a11 author Pavel Roskin Fri, 07 Apr 2006 04:10:57 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: reduce differences between PCI drivers, create orinoco_pci.h Make all Orinoco PCI drivers (orinoco_pci, orinoco_plx, orinoco_tmd and orinoco_nortel) as similar as possible. Use the best implementation of error handling, the best error messages, the best comments. Put common code to orinoco_pci.h. For now, it's suspend and resume functions and function for registering the network device. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit c6fb2e9abef894efc4870e4c1e3aa4365b830a11 tree ab262b6f480665fa6ea5b9bdc2a6d6383b0dc2f2 parent 3d529962217c3fec36f53f270a37e132b9763c65 author Pavel Roskin Fri, 07 Apr 2006 04:10:55 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco: support PCI suspend/resume for Nortel, PLX and TMD adaptors Copy PCI suspend/resume functions from orinoco_pci.c. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 3d529962217c3fec36f53f270a37e132b9763c65 tree e327ba184a666f4ad2e706912c4eba1c6a4a0947 parent d62274b374ce41dd3a90820b124d28fec292a5b7 author Pavel Roskin Fri, 07 Apr 2006 04:10:53 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco_pci: use pci_iomap() for resources Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d62274b374ce41dd3a90820b124d28fec292a5b7 tree d8b7973d10c1e4013608301d678029ddb97aac81 parent 37a6c6117db3f10e1923c14dffa089b10600c4b8 author Pavel Roskin Fri, 07 Apr 2006 04:10:51 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:52 -0400 [PATCH] orinoco_pci: disable device and free IRQ when suspending Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 37a6c6117db3f10e1923c14dffa089b10600c4b8 tree 88e84f1635b2e24744061fdbac7c1e2b7ead38d9 parent 2c1bd26035491cd0ba7e49be6ed610fc4912fef9 author Pavel Roskin Fri, 07 Apr 2006 04:10:49 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: delay FID allocation after firmware initialization This is needed to identify the card before possible allocation problems, so that the user at least can report the firmware version that fails. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 2c1bd26035491cd0ba7e49be6ed610fc4912fef9 tree a49cb8466cccfd065419d017c4f6aba023d183d6 parent a28dc81dcd9ca9a451bfcab0a2351b0b07146759 author Jiri Benc Fri, 07 Apr 2006 04:10:47 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: fix BAP0 offset error after several days of operation After several days of operation of Netgear MA311 card, the card becomes to seek improperly and needs reset. This patch tries to reset the card when this situation occurs. Mar 9 06:45:16 berkeley kernel: wlan0: Error -5 writing packet to BAP Mar 9 06:45:16 berkeley kernel: hermes @ f992a000: BAP0 offset error: reg=0x4044 id=0x128 offset=0x44 Mar 9 06:45:16 berkeley kernel: wlan0: Error -5 writing packet to BAP Mar 9 06:45:16 berkeley kernel: hermes @ f992a000: BAP0 offset error: reg=0x4044 id=0x128 offset=0x44 (etc.) A more detailed description of the problem can be found at https://bugzilla.novell.com/show_bug.cgi?id=154773 The same problem with different card is reported at http://sourceforge.net/mailarchive/message.php?msg_id=14597046 Signed-off-by: Jiri Benc Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit a28dc81dcd9ca9a451bfcab0a2351b0b07146759 tree 6f9e4b754807e3c81c99879dabd13a422a785327 parent 470e2aa6dbdd2c7eb6562ae365a17a627f7070e8 author Pavel Roskin Fri, 07 Apr 2006 04:10:45 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: simplify 802.3 encapsulation code Use skb_pull() to strip the addresses from the original packet. Don't strip protocol bytes. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 470e2aa6dbdd2c7eb6562ae365a17a627f7070e8 tree d6ecbf82b73c6cb1700c635704dacbda8baa4b7c parent 8d5be088263b0d3dbb7e7959b7c403b3d026a5d3 author Pavel Roskin Fri, 07 Apr 2006 04:10:43 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: refactor and clean up Tx error handling The result of orinoco_xmit() can be OK, dropped packet and busy transmitter. Rename labels accordingly. Increment stats->tx_errors in one place. Increment stats->tx_dropped - nobody is doing it for us. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 8d5be088263b0d3dbb7e7959b7c403b3d026a5d3 tree 912fd8275e7f96a22f3c4935ffba86a520e97b63 parent 6b61626290900f12b7f3978f57f329da6811fb59 author Pavel Roskin Fri, 07 Apr 2006 04:10:41 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:51 -0400 [PATCH] orinoco: don't use any padding for Tx frames hermes_bap_pwrite() supports odd-sized packets now. There is no minimal packet size for 802.11. Also, hermes_bap_pwrite() supports odd-sized packets now. This removes all reasons to pad the Tx data. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 6b61626290900f12b7f3978f57f329da6811fb59 tree 2e1d9518d786bbca0e87ffec3f42a6f5794fe384 parent b34b867e944628418d587367276c9a82e03aba8c author Pavel Roskin Fri, 07 Apr 2006 04:10:39 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco replace hermes_write_words() with hermes_write_bytes() The new function can write an odd number of bytes, thus making padding unnecessary. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b34b867e944628418d587367276c9a82e03aba8c tree 5e2222980d25a95ab478cbe42bd8b84244cbfccf parent 30c2d3b48176279b1381b00ae86f3d01147d0915 author Pavel Roskin Fri, 07 Apr 2006 04:10:36 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: orinoco_xmit() should only return valid symbolic constants Don't ever return -errno from orinoco_xmit() - the network layer doesn't expect it. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 30c2d3b48176279b1381b00ae86f3d01147d0915 tree db25219cc9fc44a2e5590b1fb01c2923a20078a3 parent 4ebe2eb0b388445d18dae34849cc6a9e7c55315f author Pavel Roskin Fri, 07 Apr 2006 04:10:34 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: optimize Tx exception handling in orinoco When processing Tx exception, only read data until addr1. Rename hermes_tx_descriptor_802_11 to hermes_txexc_data since it's only used to Tx exceptions. Reuse existing hermes_tx_descriptor structure. Remove fields after addr1 - they are not read from the card. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 4ebe2eb0b388445d18dae34849cc6a9e7c55315f tree d16c3c0eac315cb62518483f8d78e61c01deb7f5 parent 754b1364e78db796bb3a541f6ea8dec2821c745a author Pavel Roskin Fri, 07 Apr 2006 04:10:32 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: Symbol card supported by spectrum_cs is LA4137, not LA4100 Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 754b1364e78db796bb3a541f6ea8dec2821c745a tree 4a522edc2293f202a53ef4ad3220d39b32a45e05 parent 65b1fe7df71e7ad09e9203b6c3875781c30557e0 author Pavel Roskin Fri, 07 Apr 2006 04:10:30 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:50 -0400 [PATCH] orinoco: remove debug buffer code and userspace include support Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 65b1fe7df71e7ad09e9203b6c3875781c30557e0 tree cfec3c86e899d6148a75b7f21782374e3b9c044f parent 7eeae2ffadf170f954205733f511ca40df91f0b7 author Pavel Roskin Fri, 07 Apr 2006 04:10:28 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove tracing code, it's unused Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 7eeae2ffadf170f954205733f511ca40df91f0b7 tree 82b76648d108291dc15c4cd664b5392cd80da092 parent b018779cbda646c37346433167145b4624c8979b author Pavel Roskin Fri, 07 Apr 2006 04:10:24 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove underscores from little-endian field names Sparse is much better at finding endianess issues than such visual cues. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit b018779cbda646c37346433167145b4624c8979b tree de052210e58a6e694192e20eafb543ca6f9fd231 parent a6e26e8ddbe8717103556ecd8ecd383de32671e4 author Pavel Roskin Fri, 07 Apr 2006 04:10:21 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: remove PCMCIA audio support, it's useless for wireless cards Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit a6e26e8ddbe8717103556ecd8ecd383de32671e4 tree 3a6d4954784e68cd97871b33d76e28849abf294b parent 7c241d37fe0e6442c5cf3b5d73f7f58f2dc66352 author Pavel Roskin Fri, 07 Apr 2006 04:10:19 -0400 committer John W. Linville Mon, 24 Apr 2006 16:15:49 -0400 [PATCH] orinoco: Remove useless CIS validation The PCMCIA drivers would never be loaded if the CIS were wrong. No other PCMCIA drivers validate CIS. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit 916a3d5729c8b710d56acf579f3fdb4de7c03e77 tree 3c063664f777cfd345a2c9d557fdef12f73d773c parent 55308c3712f56279d5547ef6e97d365ac3ab9e6d parent d0e15bed84db7a9b0ea85d2ad9707b5e6d2e38da author Paul Mackerras Sun, 23 Apr 2006 10:55:56 +1000 committer Paul Mackerras Sun, 23 Apr 2006 10:55:56 +1000 Merge branch 'merge' commit 55308c3712f56279d5547ef6e97d365ac3ab9e6d tree efa60b533b83ab55baf90791cb3bf19bfe325d08 parent 8833843c877cca459ab7b9fee661523bf25b98d1 parent c18bcf45c46f72f630cbbddc79a765336b79ab4f author Paul Mackerras Sat, 22 Apr 2006 19:47:47 +1000 committer Paul Mackerras Sat, 22 Apr 2006 19:47:47 +1000 Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc commit 8833843c877cca459ab7b9fee661523bf25b98d1 tree 971de008289771eea00018d6ae36672387b5351e parent ac325acd50013fa8f4953208cbb96504dec9b12a parent 7c8ce71b092425f1e938285cab2a679c09444d9b author Paul Mackerras Sat, 22 Apr 2006 19:47:24 +1000 committer Paul Mackerras Sat, 22 Apr 2006 19:47:24 +1000 Merge branch 'merge' commit ac325acd50013fa8f4953208cbb96504dec9b12a tree 6c08470d68be38504c6aadae168b873efb39e8db parent 4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed author Linas Vepstas Tue, 18 Apr 2006 21:05:21 -0700 committer Paul Mackerras Sat, 22 Apr 2006 18:46:13 +1000 [PATCH] powerpc/pseries: clear PCI failure counter if no new failures The current PCI error recovery system keeps track of the number of PCI card resets, and refuses to bring a card back up if this number is too large. The goal of doing this was to avoid an infinite loop of resets if a card is obviously dead. However, if the failures are rare, but the machine has a high uptime, this mechanism might still be triggered; this is too harsh. This patch will avoids this problem by decrementing the fail count after an hour. Thus, as long as a pci card BSOD's less than 6 times an hour, it will continue to be reset indefinitely. If it's failure rate is greater than that, it will be taken off-line permanently. This patch is larger than it might otherwise be because it changes indentation by removing a pointless while-loop. The while loop is not needed, as the handler is invoked once fo each event (by schedule_work()); the loop is leftover cruft from an earlier implementation. Signed-off-by: Linas Vepstas Signed-off-by: Andrew Morton Signed-off-by: Paul Mackerras commit 4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed tree e4dffbeddbcb7e7f928c5989f0062f8142f83327 parent 5e1415c3f7d3ad133edb7ce9ca90641cf0f5fe79 author Olof Johansson Tue, 18 Apr 2006 11:25:53 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:46:11 +1000 [PATCH] powerpc: Remove stale iseries global Not even the iSeries maintainer seems to have access to this legendary piranha simulator. It adds a bit of ugliness in the common time init code, and if it's no longer used we might as well be done with it and remove the bloat. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 5e1415c3f7d3ad133edb7ce9ca90641cf0f5fe79 tree ba8144744acb3cbe4bdacb386f15cdc0b97e9e46 parent 90ddfebec1b450258f85d42f043cfbae450fe47e author Olof Johansson Wed, 12 Apr 2006 15:29:00 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:46:09 +1000 [PATCH] powerpc: Quiet oprofile output at boot No need to always print out which performance monitoring type is used on the console at every boot. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 90ddfebec1b450258f85d42f043cfbae450fe47e tree fce173315c893aef8f197bda3e4ad3d7c7e901ed parent e884e9c5f28c747ac2c3e1056e1fd655a79e950d author Olof Johansson Wed, 12 Apr 2006 15:28:13 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:46:07 +1000 [PATCH] powerpc: Quiet rtasd output at boot Most users won't really know the difference between a started RTAS daemon and a missing event-scan. Move it to debug levels. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit e884e9c5f28c747ac2c3e1056e1fd655a79e950d tree 2d32a8cac548d53b7f10dd8a6b1650ed5b58464c parent cc98f70557bd08f2eea7b955dd918692a655d72e author Olof Johansson Wed, 12 Apr 2006 15:26:59 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:14 +1000 [PATCH] powerpc: Quiet PCI init printouts Quiet some of the more debug related output from the pci probe routines. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit cc98f70557bd08f2eea7b955dd918692a655d72e tree 61e868f18d6000dfd4cc6017e44d88b2cc6d1dcb parent e110b281dc93e3b4587a3d0440bb7ae38daddfde author Olof Johansson Wed, 12 Apr 2006 15:26:00 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:13 +1000 [PATCH] powerpc: Lack of ISA interrupts on XICS isn't dangerous This isn't really a dangerous thing any more; most systems lack ISA interrupt controllers. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit e110b281dc93e3b4587a3d0440bb7ae38daddfde tree f124e7ce169a85f289d20d315901cbf6b1fba700 parent 4baaf0cfda7279e1adaedc203d7a09e8e44597ab author Olof Johansson Wed, 12 Apr 2006 15:25:01 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:12 +1000 [PATCH] powerpc: Less verbose mem configuration output Quieten some of the debug ram config output. we already print out available memory at KERN_INFO level. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 4baaf0cfda7279e1adaedc203d7a09e8e44597ab tree fbd95c42873b2a82972bd4d4fe40cb8876eb35d0 parent f98baffb82710803005c19897f1a55af91da5685 author Olof Johansson Wed, 12 Apr 2006 15:23:22 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:11 +1000 [PATCH] powerpc: Don't print chosen idle loop at every boot No need to write out what idle loop is used on every boot. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit f98baffb82710803005c19897f1a55af91da5685 tree 31c894ce8bfbf1438e05c1bced3fbf527ac7bc55 parent f430c02b13f00146106fedcace810e61b4493d8c author Olof Johansson Wed, 12 Apr 2006 15:22:29 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:10 +1000 [PATCH] powerpc: Quiet VETH version printk ibmveth_printk() is only used to print the driver version when the module initializes, which means on all machines as long as it's compiled in. If it's really only needed for debugging, boot with loglevel=8, or get it from dmesg instead. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit f430c02b13f00146106fedcace810e61b4493d8c tree bc4dc9cf36a466a6569dbf6b2f35941733f53097 parent 224ad80ac0de102d7bede8d36afbd5ef0a64019f author Olof Johansson Wed, 12 Apr 2006 15:21:06 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:09 +1000 [PATCH] powerpc: Quiet page order output No need to always print page orders. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 224ad80ac0de102d7bede8d36afbd5ef0a64019f tree 8ebb087c133c9e217c1ed81c7544b6c102e320d8 parent 8b6a7b2ea2ab18d46bc9e0e76b614d8c155291ad author Olof Johansson Wed, 12 Apr 2006 15:20:27 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:08 +1000 [PATCH] powerpc: Quiet time init output Move time_init console output to KERN_DEBUG prink level. No need to print it at every boot. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 8b6a7b2ea2ab18d46bc9e0e76b614d8c155291ad tree 4d492241e0cd8074147acf2aae7d9d1923a637e1 parent c256f4b9598c71afd8eb0b7d3d3790a38734cf43 author Olof Johansson Wed, 12 Apr 2006 15:19:50 -0500 committer Paul Mackerras Sat, 22 Apr 2006 18:45:07 +1000 [PATCH] powerpc: Quiet HVSI boot output There's no real need to print the number of found HVSI devices on the console at every boot. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit c256f4b9598c71afd8eb0b7d3d3790a38734cf43 tree 7366b0e03b5d9f1b0abfaa38230246f6d3875735 parent 81bbbe92949b069c101e13d3acbd4bc7d088cb79 author Anton Blanchard Fri, 07 Apr 2006 15:23:03 +1000 committer Paul Mackerras Sat, 22 Apr 2006 18:45:05 +1000 [PATCH] powerpc: remove io_page_mask Cleanup patch which removes the io_page_mask. It fixes the reset on some e1000 devices which is needed for clean kexec reboots. The legacy devices which broke with this patch (parallel port and PC speaker) have now been fixed in Linus' tree. Signed-off-by: Anton Blanchard Acked-by: Michael Neuling Signed-off-by: Paul Mackerras commit 81bbbe92949b069c101e13d3acbd4bc7d088cb79 tree 8417edecc09a954bc6bb2bd7b99d4a279535dd2b parent d6c1a9081080c6c4658acf2a06d851feb2855933 author Haren Myneni Wed, 05 Apr 2006 21:10:18 -0600 committer Paul Mackerras Sat, 22 Apr 2006 18:45:01 +1000 [PATCH] powerpc: clear IPIs on kdump In some crash scenarios, the kexec CPU is not responding to an IPI sent by secondary CPU after init thread is forked, causing the system to drop into xmon during kdump boot. This problem can be reproduced each time when the debugger is enabled and soft-reset is used to invoke kdump boot. The first CPU sends an IPI - setting the IPI priority for all secondary cpus (xics_cause_ipi()). But some CPUs will enter into the xmon via soft-reset, i.e, not executing xics_ipi_action(). Hence, IPI is not cleared. When exited from the debugger, one of these CPUs could become the primary kexec CPU. Since the IPI is not cleared, causing this issue in kdump boot. This patch clears and EOI IPI for kexec CPU as well before the kdump boot started. Signed-off-by: Haren Myneni Signed-off-by: Paul Mackerras commit d6c1a9081080c6c4658acf2a06d851feb2855933 tree eaf1095adbe057846485de066561327066ab9bb1 parent 4d6c58899c1cdac018f92cfa0383bb835a0c80ef author Michael Ellerman Tue, 04 Apr 2006 13:43:01 +0200 committer Paul Mackerras Sat, 22 Apr 2006 18:44:25 +1000 [PATCH] powerpc: Disable and EOI interrupts in machine_crash_shutdown() We've seen several bugs caused by interrupt weirdness in the kdump kernel. Panicking from an interrupt handler means we fail to EOI the interrupt, and so the second kernel never gets that interrupt ever again. We also see hangs on JS20 where we take interrupts in the second kernel early during boot. This patch fixes both those problems, and although it adds more code to the crash path I think it is the best solution. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit ed198cb49750fd9ec564e9f1df66c10efea605f1 tree 04b508f5455c6c49e8af89913974108b3e1a83b0 parent e977145aeaad23d443686f2a2d5b32800d1607c5 author David Woodhouse Sat, 22 Apr 2006 02:38:50 +0100 committer David Woodhouse Sat, 22 Apr 2006 02:38:50 +0100 [RBTREE] Update hrtimers to use rb_parent() accessor macro. Also switch it to use the same method of using off-tree nodes as everyone else now does -- set them to point to themselves. Signed-off-by: David Woodhouse commit e977145aeaad23d443686f2a2d5b32800d1607c5 tree 99b066ca9933aef27778b62e3f783d55592ba9e2 parent 55a981027fc393c86de2c4e7836c9515088a9a58 author David Woodhouse Fri, 21 Apr 2006 23:15:39 +0100 committer David Woodhouse Fri, 21 Apr 2006 23:15:39 +0100 [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node. Seems like a strange requirement, but allegedly it was necessary for struct address_space on CRIS, because it otherwise ended up being only byte-aligned. It's harmless enough, and easier to just do it than to prove it isn't necessary... although I really ought to dig out my etrax board and test it some time. Signed-off-by: David Woodhouse commit 55a981027fc393c86de2c4e7836c9515088a9a58 tree dd950b79d9f57ce48b2b2a91262b88eecb5296da parent 1975e59375756da4ff4e6e7d12f67485e813ace0 author David Woodhouse Fri, 21 Apr 2006 13:35:51 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:35:51 +0100 [RBTREE] Merge colour and parent fields of struct rb_node. We only used a single bit for colour information, so having a whole machine word of space allocated for it was a bit wasteful. Instead, store it in the lowest bit of the 'parent' pointer, since that was always going to be aligned anyway. Signed-off-by: David Woodhouse commit 1975e59375756da4ff4e6e7d12f67485e813ace0 tree 2370244862fa47b4ad8d4156d1a4ed32c326d628 parent 21f1d5fc592e145574dede8debe9603334d08fde author David Woodhouse Fri, 21 Apr 2006 13:30:36 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:30:36 +0100 [RBTREE] Remove dead code in rb_erase() Observe rb_erase(), when the victim node 'old' has two children so neither of the simple cases at the beginning are taken. Observe that it effectively does an 'rb_next()' operation to find the next (by value) node in the tree. That is; we go to the victim's right-hand child and then follow left-hand pointers all the way down the tree as far as we can until we find the next node 'node'. We end up with 'node' being either the same immediate right-hand child of 'old', or one of its descendants on the far left-hand side. For a start, we _know_ that 'node' has a parent. We can drop that check. We also know that if 'node's parent is 'old', then 'node' is the right-hand child of its parent. And that if 'node's parent is _not_ 'old', then 'node' is the left-hand child of its parent. So instead of checking for 'node->rb_parent == old' in one place and also checking 'node's heritage separately when we're trying to change its link from its parent, we can shuffle things around a bit and do it like this... Signed-off-by: David Woodhouse commit 21f1d5fc592e145574dede8debe9603334d08fde tree 95e58363205a01dc32aa15d18ea8d36bd434d7d2 parent c569882b2e70a0c4eac99acdb39b493549041ba1 author David Woodhouse Fri, 21 Apr 2006 13:17:57 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:17:57 +0100 [RBTREE] Update JFFS2 to use rb_parent() accessor macro. Signed-off-by: David Woodhouse commit c569882b2e70a0c4eac99acdb39b493549041ba1 tree 2c405fa9d5c0bc29a1b7edc1bd92cb3db749a8d2 parent fed306f2baa170220b0299198a39c6be2a91bf19 author David Woodhouse Fri, 21 Apr 2006 13:17:24 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:17:24 +0100 [RBTREE] Update eventpoll.c to use rb_parent() accessor macro. Signed-off-by: David Woodhouse commit fed306f2baa170220b0299198a39c6be2a91bf19 tree 366ad7c6f8029608587d5e45738f8c229c3ff924 parent 52b5108ca7490c0609e4dbddd8439bc03d702c99 author David Woodhouse Fri, 21 Apr 2006 13:16:49 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:16:49 +0100 [RBTREE] Update key.c to use rb_parent() accessor macro. Signed-off-by: David Woodhouse commit 52b5108ca7490c0609e4dbddd8439bc03d702c99 tree 410b7114047eb0b0f84f5b11b7981994d64a3904 parent 3db3a445308b3cee9bbbd8baa6d05081c9532da0 author David Woodhouse Fri, 21 Apr 2006 13:15:57 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:15:57 +0100 [RBTREE] Update ext3 to use rb_parent() accessor macro. Signed-off-by: David Woodhouse commit 3db3a445308b3cee9bbbd8baa6d05081c9532da0 tree 768e3a190df58b0f5f5d4a5c5ade925649e757dd parent 7fe1e133bf45b0fe70491ed3d4c5b491feff7aa8 author David Woodhouse Fri, 21 Apr 2006 13:15:17 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:15:17 +0100 [RBTREE] Change rbtree off-tree marking in I/O schedulers. They were abusing the rb_color field to mark nodes which weren't currently on the tree. Fix that to use the same method as eventpoll did -- setting the parent pointer to point back to itself. And use the appropriate accessor macros for setting and reading the parent. Signed-off-by: David Woodhouse commit 7fe1e133bf45b0fe70491ed3d4c5b491feff7aa8 tree f21150f65eeaa03fc624c312dfc71d9f912983c2 parent f4ffaa452e71495a06376f12f772342bc57051fc author David Woodhouse Fri, 21 Apr 2006 13:12:44 +0100 committer David Woodhouse Fri, 21 Apr 2006 13:12:44 +0100 [RBTREE] Add accessor macros for colour and parent fields of rb_node This is in preparation for merging those fields into a single 'unsigned long', because using a whole machine-word for a single bit of colour information is wasteful. Signed-off-by: David Woodhouse commit bf2af2a2027e52b653882fbca840620e896ae081 tree e42ce1ac34058c1990d929f38a6e805dd6edb602 parent 857c68f733eea07f11a061caea43a38fed61adb7 author Bastiaan Jacques Mon, 17 Apr 2006 14:17:59 +0200 committer Jeff Garzik Thu, 20 Apr 2006 18:37:08 -0400 [PATCH] ahci: add support for VIA VT8251 Adds AHCI support for the VIA VT8251. Includes a workaround for a hardware bug which requires a Command List Override before softreset. Signed-off-by: Bastiaan Jacques Signed-off-by: Jeff Garzik commit 857c68f733eea07f11a061caea43a38fed61adb7 tree 4567a9e91f717b22143ac1ccb0fb5323ac15afd3 parent 4741c336d27dec3ea68a35659abb8dc82b142388 parent 402a26f0c040077ed6f941eefac5a6971f0d5f40 author Jeff Garzik Thu, 20 Apr 2006 18:36:05 -0400 committer Jeff Garzik Thu, 20 Apr 2006 18:36:05 -0400 Merge branch 'master' commit 1f5d5dbf0372dd933d8325054889ba09d996e50b tree 16bffeb01b538b70e309dd248b198f30530fa8ad parent a7bb131899814fc2bb7a3226fa8384685fe34f7d parent fef6108d4556917c45cd9ba397c1c7597f3990e1 author Jeff Garzik Thu, 20 Apr 2006 17:55:24 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:55:24 -0400 Merge branch 'upstream-fixes' commit a7bb131899814fc2bb7a3226fa8384685fe34f7d tree 416fe931bfef0599615d7568b30244668315fa65 parent 18e37f2a979dd696e6b4495b6f2470c01ffeab6c parent f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3 author Jeff Garzik Thu, 20 Apr 2006 17:42:15 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:42:15 -0400 Merge branch 'upstream-fixes' commit 18e37f2a979dd696e6b4495b6f2470c01ffeab6c tree c1e5b5fe2db54c7596d8db10935ce8d2886a4db1 parent d5498bef6fcd8ca0e4579eeb0b0d724f20221bb1 author Marc Zyngier Thu, 13 Apr 2006 11:38:20 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:42:05 -0400 [PATCH] netdrvr: Convert cassini to pci_iomap Folks, This patch (against 2.6.17-rc1) converts the cassini driver to the pci_iomap API that will do the right thing, so architectures like PARISC can stop screaming about illegal usage of ioremap() on non-cacheable regions. Tested on 64bit PARISC kernel. Signed-off-by: Marc Zyngier Signed-off-by: Jeff Garzik commit d5498bef6fcd8ca0e4579eeb0b0d724f20221bb1 tree c95370d6526d60886731924cf2d467701006df13 parent 0a0c72c9118c4e63080eb409f0cfdf15808d23a4 author Jeff Garzik Thu, 20 Apr 2006 17:39:14 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:39:14 -0400 [netdrvr smc911x] trim trailing whitespace commit 0a0c72c9118c4e63080eb409f0cfdf15808d23a4 tree 99bd8141839f4b26d853626b5eaf532ca8a38bde parent 89be0501a013737d562f56ce1c5a2ff075995b11 author Dustin McIntire Wed, 19 Apr 2006 20:24:51 -0700 committer Jeff Garzik Thu, 20 Apr 2006 17:38:39 -0400 [PATCH] RE: [PATCH 1/1] net driver: Add support for SMSC LAN911x line of ethernet chips > > The patch was badly wordwrapped. Please fix and resend. > OK, I've fixed the wrapping and removed the CONFIG_ARM restriction. I've also did my best to modify the C style to conform to the comments. I noticed that the patch is getting ignored by majordomo due to its size >100K. Should it be broken up somehow to allow posting to the lists? Signed-off-by: Dustin McIntire Signed-off-by: Jeff Garzik commit 89be0501a013737d562f56ce1c5a2ff075995b11 tree 95ab664bcc4949235dce678c72436c673fbf06e9 parent e2fd956c670928e93208dc5d27dfdc7b51163900 author Sergei Shtylyov Wed, 19 Apr 2006 22:46:21 +0400 committer Jeff Garzik Thu, 20 Apr 2006 17:35:26 -0400 [PATCH] au1000_eth.c probe code straightened up Straighten up the AMD Au1xx0 Ethernet probing code, make it print out (and store in the 'net_device' structure) the physical address of the controller, not the KSEG1-based virtual. Make the driver also claim/release the 4-byte MAC enable registers and assign to the Ethernet ports two consecutive MAC addresses to match those that are printed on their stickers. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit e2fd956c670928e93208dc5d27dfdc7b51163900 tree 3ffdee703277984c7383af43de13963654c117e6 parent d1a667892658259aab52d9968571abd9efbc59a1 author Johannes Berg Wed, 19 Apr 2006 15:39:09 +1000 committer Jeff Garzik Thu, 20 Apr 2006 17:32:06 -0400 [PATCH] sungem: Marvell PHY suspend In a short discussion with Benjamin Herrenschmidt he mentioned that Marvell PHYs are powered down the same way as the other ones we currently handle. Thus actually do that, hopefully saving some power during suspend. Signed-off-by: Johannes Berg Acked-by: Benjamin Herrenschmidt Signed-off-by: Jeff Garzik commit d1a667892658259aab52d9968571abd9efbc59a1 tree 470101ab379d375bfd635ecec27ecd59441ac460 parent d269a69fbbbb7ddd2081af7a768feac754b8357a parent 1cb5821f444cadbe94453282f9f4767cf8744a8e author Jeff Garzik Thu, 20 Apr 2006 17:30:41 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:30:41 -0400 Merge branch 'e1000-7.0.38-k2-fixes' of git://63.64.152.142/~ahkok/git/netdev-2.6 commit d269a69fbbbb7ddd2081af7a768feac754b8357a tree 339e4e580ef66551a3f090bf6f6481755db1b59a parent 5ad05b990062c1b7a797f0ca293f6bdde62a50d9 author Daniele Venzano Mon, 17 Apr 2006 10:28:06 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:29:43 -0400 [PATCH] Add VLAN (802.1q) support to sis900 driver The attached patch adds support for VLANs to the sis900 driver and bumps the version number. It is based on an old (2003) patch for the 2.4 series by Hamid Hashemi Golpayegani. It applies on top of 2.6.16(.5). I have one report that it works and behaves as intended. Please review and consider for inclusion. Signed-off-by: Daniele Venzano -- Signed-off-by: Jeff Garzik commit 5ad05b990062c1b7a797f0ca293f6bdde62a50d9 tree 185775eb5fd444817cb643b5cc01ed1ef16d2212 parent 56347a2e7287377c35c2bac2e8643bf88690425f author Frank Pavlic Thu, 13 Apr 2006 20:19:23 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:27:54 -0400 [PATCH] s390: remove tty support from ctc network device driver [2/2] Hi, here comes the second of the two patches ... Frank From: Peter Tiedemann [2/2]: remove ctctty.c and ctctty.h files . Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 56347a2e7287377c35c2bac2e8643bf88690425f tree e312b0378db979377c96f2395e617c03d1184f43 parent 9707b27100a48950f1e15e08a7c5028786e47f55 author Frank Pavlic Thu, 13 Apr 2006 20:19:12 +0200 committer Jeff Garzik Thu, 20 Apr 2006 17:27:54 -0400 [PATCH] s390: remove tty support from ctc network device driver [1/2] Hi jeff, after the first shot I sent to you did not apply I resend two new patches I've made today to remove tty from ctc network driver. Please apply .... Thank you ... Frank From: Peter Tiedemann [1/2]: tty support code will be removed from the ctc network device driver. Today we have a couple of alternatives which are performing much better. The second thing is that ctc should be a network device driver only. We should not mix tty and networking here. This first patch will remove the tty code from ctcmain.c . It also removes the build entry from the Makefile as well as TTY definitions from ctcmain.h. The second patch will remove two files, ctctty.c and ctctty.h. Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik commit 9707b27100a48950f1e15e08a7c5028786e47f55 tree 5745b1e7497ae1499a2e2e9e0a567996419ab34f parent 8fc65162a8f25929be80c8d6321a3479e92b5aae parent 402a26f0c040077ed6f941eefac5a6971f0d5f40 author Jeff Garzik Thu, 20 Apr 2006 17:27:45 -0400 committer Jeff Garzik Thu, 20 Apr 2006 17:27:45 -0400 Merge branch 'master' commit 169e1a2a8a789fa84254695ec6a56fc410bb19a9 tree a12e7d6de595faae8ce3d05be54b6e6cb9c9c2fa parent c5f2e6404c65e8380c9ba80a7d58a27d2642743b author Andrew Morton Tue, 18 Apr 2006 21:09:08 -0700 committer James Bottomley Wed, 19 Apr 2006 20:51:18 -0400 [SCSI] scsi_lib.c: fix warning in scsi_kmap_atomic_sg drivers/scsi/scsi_lib.c: In function `scsi_kmap_atomic_sg': drivers/scsi/scsi_lib.c:2394: warning: unsigned int format, different type arg (arg 3) drivers/scsi/scsi_lib.c:2394: warning: unsigned int format, different type arg (arg 4) Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 954c24227318c166ec1925e1229db442e1f56f51 tree 6fab80f6c186bc83dd06e697774fbb5bf83e4235 parent 373d5e71833978fe3d91264d86857762bb92cfe2 author Joern Engel Tue, 18 Apr 2006 21:03:08 -0700 committer David Woodhouse Wed, 19 Apr 2006 09:10:06 +0100 mtd: improve parameter parsing for block2mtd Expand the parameter parsing for block2mtd. It now accepts: Ki, Mi, Gi - the official prefixes for binary multiples, see http://physics.nist.gov/cuu/Units/binary.html, ki - mistake on my side and analog to "k" for decimal multiples, KiB, MiB, GiB - for people that prefer to add a "B" for byte, kiB - combination of the above. There were complaints about not accepting "k" for 1024. This has long been common practice, but is known to lead to confusion. Hence the new SI units and hence block2mtd only accepts units that cannot be confused with decimal units. Diverging from common practice doesn't always please people, even if the change is for the better. Signed-off-by: Joern Engel Cc: David Woodhouse Cc: Thomas Gleixner Signed-off-by: Andrew Morton commit 1cb5821f444cadbe94453282f9f4767cf8744a8e tree b23e6c848614a7ca67248eaf4e8ec9b50c092075 parent dc86d32ab51c4ad3086472457fb90b61249d91f5 author Auke Kok Tue, 18 Apr 2006 12:31:04 -0700 committer Auke Kok Tue, 18 Apr 2006 12:31:04 -0700 e1000: fix mismerge skb_put. Seems there was a bit of a fix needed to due a bad merge in the legacy receive path. Fixes a panic due to skb_over_panic. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit dc86d32ab51c4ad3086472457fb90b61249d91f5 tree 4f8a266d797110e9f9f76eae04117a756e94f7a2 parent 8fc65162a8f25929be80c8d6321a3479e92b5aae author Auke Kok Tue, 18 Apr 2006 12:30:51 -0700 committer Auke Kok Tue, 18 Apr 2006 12:30:51 -0700 e1000: fix mispatch for media type detect. Recent patch was mismerged in the miitool path. e1000_media_type_copper was being compared with the phy type instead of the media type. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 tree 27907bbd653504d71ff47cb00bdf8cd61e82f126 parent a890b15c0990cc8d686edcc85f5fccde71ad5ce9 parent 4741c336d27dec3ea68a35659abb8dc82b142388 author Jeff Garzik Tue, 18 Apr 2006 05:39:23 -0400 committer Jeff Garzik Tue, 18 Apr 2006 05:39:23 -0400 Merge branch 'upstream' commit b2b4b9a7c09ad66e095b13c97946a96f2dc8284e tree fb856b5998df266bd83e6e64b8884287e812845a parent 875999c5539999f61a45620aae0c3e5fb1d2b035 parent 4741c336d27dec3ea68a35659abb8dc82b142388 author Jeff Garzik Tue, 18 Apr 2006 05:39:10 -0400 committer Jeff Garzik Tue, 18 Apr 2006 05:39:10 -0400 Merge branch 'upstream' commit 4741c336d27dec3ea68a35659abb8dc82b142388 tree a8576df82129354b77b0144c480c446ec7aba7b2 parent 26ec634c31a11a003040e10b4d650495158632fd parent a9a5cd5d2a57fb76dbae2115450f777b69beccf7 author Jeff Garzik Tue, 18 Apr 2006 04:54:00 -0400 committer Jeff Garzik Tue, 18 Apr 2006 04:54:00 -0400 Merge branch 'master' commit 373d5e71833978fe3d91264d86857762bb92cfe2 tree 0c56caf25b684d7022ba023bcbdf8f963548d6e1 parent 6e62e8c2c7b1e3387d73ecb3f7539314b7a9931e author Richard Purdie Tue, 18 Apr 2006 02:05:46 +0100 committer Richard Purdie Tue, 18 Apr 2006 02:05:46 +0100 JFFS2: Return an error for long filenames Return an error if a name is too long for JFFS2 rather than corrupting data. Signed-off-by: Richard Purdie commit 6e62e8c2c7b1e3387d73ecb3f7539314b7a9931e tree 9bd5531198ad83d70a1a328f573f0d7561ad0da0 parent b802c0741103aa92251d536c115874d51f802ec8 author Richard Purdie Tue, 18 Apr 2006 02:04:18 +0100 committer Richard Purdie Tue, 18 Apr 2006 02:04:18 +0100 MTD: Correct Poodle partition size Correct the MTD NAND partition size for Poodle (Sharp Zaurus SL-5600) Signed-off-by: Richard Purdie commit b802c0741103aa92251d536c115874d51f802ec8 tree cf2cb539e68b224ad06b4a43350454b847543381 parent cd2866faaa0efd9af18fe4a86d129cbd99240796 author Thago Galesi Mon, 17 Apr 2006 17:38:15 +0100 committer David Woodhouse Mon, 17 Apr 2006 17:38:15 +0100 [PATCH] Remove unnecessary kmalloc/kfree calls in mtdchar This patch removes repeated calls to kmalloc / kfree in mtd_write / mtd_read functions, replacing them by a single kmalloc / kfree pair. Signed-off-by: Thiago Galesi Signed-off-by: David Woodhouse commit cd2866faaa0efd9af18fe4a86d129cbd99240796 tree aaf1892043ac32f6ea0dc19d0a4a74c40ce215f4 parent a6c591eda3078f92e7a3ff3db55f6841e4819fb5 author Jörn Engel Thu, 13 Apr 2006 18:55:09 +0200 committer David Woodhouse Mon, 17 Apr 2006 15:48:17 +0100 Remove unused MTD types Three types are never set or checked for. Remove. Signed-off-by: Jörn Engel Signed-off-by: David Woodhouse commit a6c591eda3078f92e7a3ff3db55f6841e4819fb5 tree 1d1c2ab720bc9931f00b8cc177878a6ad8ec5651 parent af63a3bcac77d8c01f3d963bac11a6f3f9b7c473 author Jörn Engel Thu, 13 Apr 2006 18:54:34 +0200 committer David Woodhouse Mon, 17 Apr 2006 15:48:17 +0100 Remove unchecked MTD flags Several flags are set by some devices, but never checked. Remove them. Signed-off-by: Jörn Engel Signed-off-by: David Woodhouse commit af63a3bcac77d8c01f3d963bac11a6f3f9b7c473 tree 0c4ce08cb4a1c377e7c0c30aac9eb4c025fd8e9a parent 7f7c08dfdf5bc0a7c906285d9d97b932f83e8979 author Jörn Engel Thu, 13 Apr 2006 18:53:55 +0200 committer David Woodhouse Mon, 17 Apr 2006 15:48:16 +0100 Make mtdblock_ro unconditionally readonly mtdblock_ro is by definition readonly. Remove the silly checks. Signed-off-by: Jörn Engel Signed-off-by: David Woodhouse commit 7f7c08dfdf5bc0a7c906285d9d97b932f83e8979 tree aaf40f4ef508cee41586e788d7d3f9e7075c364d parent 94171db1d2f23c22b6050d210b72db3bb2f0b81e author Jörn Engel Thu, 13 Apr 2006 18:53:14 +0200 committer David Woodhouse Mon, 17 Apr 2006 15:48:16 +0100 Simplify test for RAM devices mtdblock is the only user of aggregate capabilities in mtd. This is clearly bogus and should be changed. In particular, it tries to determine whether the device in question is a piece of RAM. For every single driver that fits the current criteria, an easier test would be to check for the type being MTD_RAM. Signed-off-by: Jörn Engel Signed-off-by: David Woodhouse commit 94171db1d2f23c22b6050d210b72db3bb2f0b81e tree 2318d487807e9f7393fcd46ef0090a27b4ad7981 parent d96fb997c6174f98a2a0a98200f99ac13b053bd6 parent c19f7a9e1ac45b57375d51f033b02deca50f4d3f author David Woodhouse Mon, 17 Apr 2006 15:35:18 +0100 committer David Woodhouse Mon, 17 Apr 2006 15:35:18 +0100 Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit d96fb997c6174f98a2a0a98200f99ac13b053bd6 tree bd2400a8553975a6463ef0160a7aaad914a9b236 parent fb6a82c94a9c69adfb6b9f6ce9f84be36884e471 author David Woodhouse Mon, 17 Apr 2006 00:19:48 +0100 committer David Woodhouse Mon, 17 Apr 2006 00:19:48 +0100 [JFFS2] Fix race in post-mount node checking For a while now, we've postponed CRC-checking of data nodes to be done by the GC thread, instead of being done while the user is waiting for mount to finish. The GC thread would iterate through all the inodes on the system and check each of their data nodes. It would skip over inodes which had already been used or were already being read in by read_inode(), because their data nodes would have been examined anyway. However, we could sometimes reach the end of the for-each-inode loop and still have some unchecked space left, if an inode we'd skipped was _still_ in the process of being read. This fixes that race by actually waiting for read_inode() to finish rather than just moving on. Thanks to Ladislav Michl for coming up with a reproducible test case and helping to track it down. Signed-off-by: David Woodhouse commit c5f2e6404c65e8380c9ba80a7d58a27d2642743b tree a8af59f4cd7154032ac35486586babe73467b3c9 parent cdb8c2a6d848deb9eeefffff42974478fbb51b8c author akpm@osdl.org Sat, 15 Apr 2006 00:30:24 -0700 committer James Bottomley Sat, 15 Apr 2006 09:04:40 -0500 [SCSI] scsi_scan.c: fix compile warnings drivers/scsi/scsi_scan.c: In function `scsi_probe_and_add_lun': drivers/scsi/scsi_scan.c:926: warning: unused variable `vend' drivers/scsi/scsi_scan.c:926: warning: unused variable `mod' drivers/scsi/scsi_scan.c: At top level: drivers/scsi/scsi_scan.c:829: warning: `scsi_inq_str' defined but not used Fix those, tighten up the (somewhat poorly-designed) logging macro and fix some coding-style warts. Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 8fc65162a8f25929be80c8d6321a3479e92b5aae tree cfad5c32408bbdc59a43db16c88f2bea7face7a5 parent 2acab771b7e676125cb8c96b61dcdefe9ba67e57 parent 99a1f9e88694b406b7c334153bacb56adfcf8388 author Jeff Garzik Fri, 14 Apr 2006 23:19:41 -0400 committer Jeff Garzik Fri, 14 Apr 2006 23:19:41 -0400 Merge branch '7.0.38-k2' of git://66.93.40.222/srv/git/netdev-2.6 commit 99a1f9e88694b406b7c334153bacb56adfcf8388 tree 01f2b3e0dc17f202ce91ebe6dcc0424e9eb9690d parent 3d41e30aa3dde76c81ecbbf0e3a25392fcd90469 author Auke Kok Fri, 14 Apr 2006 19:05:38 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:38 -0700 {e100{,0},ixgb}: Add Auke Kok as new patch maintainer for e{100,1000} and ixgb This adds Auke Kok to the list of maintainers for the Intel NICs. Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 3d41e30aa3dde76c81ecbbf0e3a25392fcd90469 tree c8dc188cd9f9016a0359e7fc6d2521f614c41641 parent 77b2aad5b4fcb6e050b64bbda158ce528f933023 author Auke Kok Fri, 14 Apr 2006 19:05:31 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:31 -0700 e1000: Version bump, contact fix, year string change Add the sourceforge project mailinglist to the contact information. Bump version to 7.0.38-k2 Update copyright string with the new year. Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 77b2aad5b4fcb6e050b64bbda158ce528f933023 tree 7d60229345056e9c4e4fe39e79801376bb61dc69 parent 9e2feace1acd38d7a3b1275f7f9f8a397d09040e author Auke Kok Fri, 14 Apr 2006 19:05:25 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:25 -0700 e1000: implement more efficient tx queue locking Implement more efficient locking (avoid the lock) when checking for a stopped queue. Also don't wake the queue unless the threshold is reached to avoid queue on/off thrash. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 9e2feace1acd38d7a3b1275f7f9f8a397d09040e tree 109e9bae993df91e2ff83ce7b4fccba9498d0273 parent 6fc7a7eca70780dc1539ce68a6513f9b11891f3c author Auke Kok Fri, 14 Apr 2006 19:05:18 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:18 -0700 e1000: Buffer optimizations for small MTU Remove multi-descriptor support from legacy recieve path Add memory usage efficiency by using more correct size descriptors for small MTU sizes and optimize using LPE for <= 1522 byte frame sizes An extra performance fix that effected our TCP window size growth as a receiver. Set our initial buffer to be 128 bytes instead of 256 to prevent over-socket charge when truesize is computed in the stack. old way: truesize = 256 + l1 = 256 + 1460 = 1716 new way: truesize = 128 + l1 = 128 + 1460 = 1588 The magic value that we can't cross is 1648. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 6fc7a7eca70780dc1539ce68a6513f9b11891f3c tree 474efb015129d75368637ee28aecbb3262da8680 parent 5d51b80f9224ca5b0ba1efc5a6348cd29b5c16b7 author Auke Kok Fri, 14 Apr 2006 19:05:12 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:12 -0700 e1000: Dead variable cleanup Removal of unused rx_dropped counter. Removed reference to E1000_CTRL_EXT_CANC which is no longer valid, replaced with E1000_CTRL_EXT_INT_TIMER_CLR Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 5d51b80f9224ca5b0ba1efc5a6348cd29b5c16b7 tree c6748fb719c9da8dc7124b7cccccf6cf31394000 parent fe7fe28ea581e090d2908a0d78a2611ae6d43e2c author Auke Kok Fri, 14 Apr 2006 19:05:06 -0700 committer Auke Kok Fri, 14 Apr 2006 19:05:06 -0700 e1000: Update truesize with the length of the packet for packet split Update skb with the real packet size. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit fe7fe28ea581e090d2908a0d78a2611ae6d43e2c tree 20ffef790a0ca0f0e8463df68d0628bffdccefe9 parent e619d52349ab8c0044859c28ab05e4c7a410fe14 author Auke Kok Fri, 14 Apr 2006 19:04:59 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:59 -0700 e1000: Made an adapter struct variable into a local (txb2b) Made an adapter struct variable into a local (txb2b) Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit e619d52349ab8c0044859c28ab05e4c7a410fe14 tree 74c09a1acbe54f569a1bc0c4eca05211ff9dab5f parent 4cc15f54991caf1572e03ffc65d9986e433007e2 author Auke Kok Fri, 14 Apr 2006 19:04:52 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:52 -0700 e1000: De-inline functions to benefit from compiler smartness De-inline functions to benefit from compiler smartness Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 4cc15f54991caf1572e03ffc65d9986e433007e2 tree cc32bb4993833593f3c46ead3a5572ba8920fdb6 parent d0e027db7861ef03de0ac08494a9a61984d8f8b0 author Auke Kok Fri, 14 Apr 2006 19:04:46 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:46 -0700 e1000: Esb2 wol link cycle bug and uninitialized registers Esb2 link didn't return after wol disable. The code previously assumed that writing reset to PHY_CTRL phy register turned the phy back on. In the ESB2 phy case that didn't occur. Add ESB2 to acquire/release_hw functions upon review it was discovered that esb2 was skipped on these functions Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit d0e027db7861ef03de0ac08494a9a61984d8f8b0 tree d1102d2ef0867b972a0737b70e5f0643c44788df parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author Auke Kok Fri, 14 Apr 2006 19:04:40 -0700 committer Auke Kok Fri, 14 Apr 2006 19:04:40 -0700 e1000: Remove PM warning DPRINTKs breaking 2.4.x kernels remove DPRINTKs that were printing warnings about power management on 2.4 kernels. Since we really don't react differently these printk statements are not needed. This code was originally added to fix some compile time warnings that got fixed by newer kernels. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: John Ronciak commit 2acab771b7e676125cb8c96b61dcdefe9ba67e57 tree 86227af3c9ad0d90823e5488a86f7f453ed1837a parent 201e06279823c73242de987f192f43d2b30e5331 parent 64541d19702cfdb7ea946fdc20faee849f6874b1 author Jeff Garzik Fri, 14 Apr 2006 20:48:55 -0400 committer Jeff Garzik Fri, 14 Apr 2006 20:48:55 -0400 Merge branch 'master' commit cdb8c2a6d848deb9eeefffff42974478fbb51b8c tree fc862e003d35def8bc9d160180ec1b1440679a52 parent 4c021dd136c0ad524e6d117296beafad2bf570c0 author Guennadi Liakhovetski Sun, 02 Apr 2006 21:57:43 +0200 committer James Bottomley Fri, 14 Apr 2006 16:45:27 -0500 [SCSI] dc395x: dynamically map scatter-gather for PIO The current dc395x driver uses PIO to transfer up to 4 bytes which do not get transferred by DMA (under unclear circumstances). For this the driver uses page_address() which is broken on highmem. Apart from this the actual calculation of the virtual address is wrong (even without highmem). So, e.g., for reading it reads bytes from the driver to a wrong address and returns wrong data, I guess, for writing it would just output random data to the device. The proper fix, as suggested by many, is to dynamically map data using kmap_atomic(page, KM_BIO_SRC_IRQ) / kunmap_atomic(virt). The reason why it has not been done until now, although I've done some preliminary patches more than a year ago was that nobody interested in fixing this problem was able to reliably reproduce it. Now it changed - with the help from Sebastian Frei (CC'ed) I was able to trigger the PIO path. Thus, I was also able to test and debug it. There are 4 cases when PIO is used in dc395x - data-in / -out with and without scatter-gather. I was able to reproduce and test only data-in with and without SG. So, the data-out path is still untested, but it is also somewhat simpler than the data-in. Fredrik Roubert (also CC'ed) also had PIO triggering on his system, and in his case it was data-out without SG. It would be great if he could test the attached patch on his system, but even if he cannot, I would still request to apply the patch and just wait if anybody cries... Implementation: I put 2 new functions in scsi_lib.c and their declarations in scsi_cmnd.h. I exported them without _GPL, although, I don't feel strongly about that - not many drivers are likely to use them. But there is at least one more - I want to use them in tmscsim.c. Whether these are the right files for the functions and their declarations - not sure either. Actually, they are not scsi-specific, so, might go somewhere around other scattergather magic? They are not platform specific either, and most SG functions are defined under arch/*/... As these issues were discussed previously there were some more routines suggested to manipulate scattergather buffers, I think, some of them were needed around crypto code... So, might be a common place reasonable, like lib/scattergather.c? I am open here. Signed-off-by: James Bottomley commit 4c021dd136c0ad524e6d117296beafad2bf570c0 tree a919121c43a6a47f5e9d8fdff6bf0b9c23701c90 parent 84d891d6727c17832c79ec96d3d107a87d857978 author FUJITA Tomonori Fri, 07 Apr 2006 19:10:03 +0900 committer James Bottomley Fri, 14 Apr 2006 15:50:04 -0500 [SCSI] ibmvscsi: convert kmalloc + memset to kcalloc Convert kmalloc + memset to kcalloc in ibmvscsi Signed-off-by: FUJITA Tomonori Acked-by: Dave Boutcher Signed-off-by: James Bottomley commit 84d891d6727c17832c79ec96d3d107a87d857978 tree a189a4d00c1387e409e2f9808c72c8088728c33b parent 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 parent 7676f83aeb774e7a3abe6af06ec92b29488b5b79 author James Bottomley Fri, 14 Apr 2006 15:47:45 -0500 committer James Bottomley Fri, 14 Apr 2006 15:47:45 -0500 Merge ../scsi-rc-fixes-2.6 Conflicts: include/scsi/scsi_devinfo.h Same number for two BLIST flags: BLIST_MAX_512 and BLIST_ATTACH_PQ3 Signed-off-by: James Bottomley commit 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 tree efecf16a9627f624df15822c90c5980e0a0ef289 parent 7996a778ff8c717cb1a7a294475c59cc8f1e9fb8 author Mike Christie Thu, 06 Apr 2006 21:26:46 -0500 committer James Bottomley Fri, 14 Apr 2006 15:19:42 -0500 [SCSI] iscsi: convert iscsi tcp to libiscsi This just converts iscsi_tcp to the lib Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 7996a778ff8c717cb1a7a294475c59cc8f1e9fb8 tree 3d7ee67ad547a65ad10f5c7e41e20f6124ee249b parent 30a6c65236f9d26e3325cae468f330b833a3878c author Mike Christie Thu, 06 Apr 2006 21:13:41 -0500 committer James Bottomley Fri, 14 Apr 2006 14:09:00 -0500 [SCSI] iscsi: add libiscsi There is a lot of code duplcited between iscsi_tcp and the upcoming iscsi_iser driver. This patch puts the duplicated code in a lib. There is more code to move around but this takes care of the basics. For iscsi_offload if they use the lib we will probably move some things around. For example in the queuecommand we will not assume that the LLD wants to do queue_work, but it is better to handle that later when we know for sure what iscsi_offload looks like (we could probably do this for iscsi_iser though to). Ideally I would like to get the iscsi_transports modules to a place where all they really have to do is put data on the wire, but how to do that will hopefully be more clear when we see other modules like iscsi_offload. Or maybe iscsi_offload will not use the lib and it will just be iscsi_iser and iscsi_tcp and maybe the iscsi_tcp_tgt if that is allowed in mainline. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 30a6c65236f9d26e3325cae468f330b833a3878c tree 355519ccc74d4b3984c06d7dcb5852282e47c845 parent fd7255f51a13ea915099c7e488001dfbbeb05104 author Mike Christie Thu, 06 Apr 2006 21:13:39 -0500 committer James Bottomley Fri, 14 Apr 2006 14:05:09 -0500 [SCSI] iscsi: fix up iscsi eh The current iscsi_tcp eh is not nicely setup for dm-multipath and performs some extra task management functions when they are not needed. The attached patch: - Fixes the TMF issues. If a session is rebuilt then we do not send aborts. - Fixes the problem where if the host reset fired, we would return SUCCESS even though we had not really done anything yet. This ends up causing problem with scsi_error.c's TUR. - If someone has turned on the userspace nop daemon code to try and detect network problems before the scsi command timeout we can now drop and clean up the session before the scsi command timesout and fires the eh speeding up the time it takes for a command to go from one patch to another. For network problems we fail the command with DID_BUS_BUSY so if failfast is set scsi_decide_disposition fails the command up to dm for it to try on another path. - And we had to add some basic iscsi session block code. Previously if we were trying to repair a session we would retrun a MLQUEUE code in the queuecommand. This worked but it was not the most efficient or pretty thing to do since it would take a while to relogin to the target. For iscsi_tcp/open-iscsi a lot of the iscsi error handler is in userspace the block code is pretty bare. We will be adding to that for qla4xxx. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit fd7255f51a13ea915099c7e488001dfbbeb05104 tree 964624f68f000848dae1a9f4c396502849707826 parent b5c7a12dc29ae0990d9e867749bdd717a3160325 author Mike Christie Thu, 06 Apr 2006 21:13:36 -0500 committer James Bottomley Fri, 14 Apr 2006 14:03:41 -0500 [SCSI] iscsi: add sysfs attrs for uspace sync up For iscsi boot when going from initramfs to the real root we need to stop the userpsace iscsi daemon. To later restart it iscsid needs to be able to rebuild itself and part of that process is matching a session running the kernel with the iscsid representation. To do this the attached patch adds several required iscsi values. If the LLD does not provide them becuase, login is done in userspace, then the transport class and userspace set ths up for the LLD. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit b5c7a12dc29ae0990d9e867749bdd717a3160325 tree 66bb4b7fd02e5a8a89f385aadf80a666ac941fbe parent 13f7e5acc8b329080672c13f05f252ace5b79825 author Mike Christie Thu, 06 Apr 2006 21:13:33 -0500 committer James Bottomley Fri, 14 Apr 2006 14:02:43 -0500 [SCSI] iscsi: rm kernel iscsi handles usage for session and connection from hare@suse.de and michaelc@cs.wisc.edu hw iscsi like qla4xxx does not allocate a host per session and for userspace it is difficult to restart iscsid using the "iscsi handles" for the session and connection, so this patch just has the class or userspace allocate the id for the session and connection. Note: this breaks userspace and requires users to upgrade to the newest open-iscsi tools. Sorry about his but open-iscsi is still too new to say we have a stable user-kernel api and we were not good nough designers to know that other hw iscsi drivers and iscsid itself would need such changes. Actually we sorta did but at the time we did not have the HW available to us so we could only guess. Luckily, the only tools hooking into the class are the open-iscsi ones or other tools like iscsitart hook into the open-iscsi engine from userspace or prgroams like anaconda call our tools so they are not affected. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 13f7e5acc8b329080672c13f05f252ace5b79825 tree 917c208390543eb0f926850778bf0540486e7ba3 parent 6c7154c97e20c0ea28547240dc86731c0cee1b2f author Kurt Garloff Mon, 03 Apr 2006 15:20:08 +0200 committer James Bottomley Fri, 14 Apr 2006 13:56:56 -0500 [SCSI] BLIST_ATTACH_PQ3 flags Some devices report a peripheral qualifier of 3 for LUN 0; with the original code, we would still try a REPORT_LUNS scan (if SCSI level is >= 3 or if we have the BLIST_REPORTLUNS2 passed in), but NOT any sequential scan. Also, the device at LUN 0 (which is not connected according to the PQ) is not registered with the OS. Unfortunately, SANs exist that are SCSI-2 and do NOT support REPORT_LUNS, but report a unknown device with PQ 3 on LUN 0. We still need to scan them, and most probably we even need BLIST_SPARSELUN (and BLIST_LARGELUN). See the bug reference for an infamous example. This is patch 3/3: 3. Implement the blacklist flag BLIST_ATTACH_PQ3 that makes the scsi scanning code register PQ3 devices and continues scanning; only sg will attach thanks to scsi_bus_match(). Signed-off-by: Kurt Garloff Signed-off-by: James Bottomley commit 6c7154c97e20c0ea28547240dc86731c0cee1b2f tree 9960dbadf3f685e70c03f0551f0bb890a68b94b7 parent 4186ab1973758190916703eb8889ebe8002c5c8f author Kurt Garloff Mon, 03 Apr 2006 15:18:35 +0200 committer James Bottomley Fri, 14 Apr 2006 13:56:03 -0500 [SCSI] Better log messages for PQ3 devs Some devices report a peripheral qualifier of 3 for LUN 0; with the original code, we would still try a REPORT_LUNS scan (if SCSI level is >= 3 or if we have the BLIST_REPORTLUNS2 passed in), but NOT any sequential scan. Also, the device at LUN 0 (which is not connected according to the PQ) is not registered with the OS. Unfortunately, SANs exist that are SCSI-2 and do NOT support REPORT_LUNS, but report a unknown device with PQ 3 on LUN 0. We still need to scan them, and most probably we even need BLIST_SPARSELUN (and BLIST_LARGELUN). See the bug reference for an infamous example. This patch 2/3: If a PQ3 device is found, log a message that describes the device (INQUIRY DATA and C:B:T:U tuple) and make a suggestion for blacklisting it. Signed-off-by: Kurt Garloff Signed-off-by: James Bottomley commit 4186ab1973758190916703eb8889ebe8002c5c8f tree e25a6c46e49ea9c310f2c7af8698d022fb7a2d4d parent 907d91d708d9999bec0185d630062576ac4181a7 author Kurt Garloff Mon, 03 Apr 2006 15:16:48 +0200 committer James Bottomley Fri, 14 Apr 2006 13:53:43 -0500 [SCSI] Try LUN 1 and use bflags Some devices report a peripheral qualifier of 3 for LUN 0; with the original code, we would still try a REPORT_LUNS scan (if SCSI level is >= 3 or if we have the BLIST_REPORTLUNS2 passed in), but NOT any sequential scan. Also, the device at LUN 0 (which is not connected according to the PQ) is not registered with the OS. Unfortunately, SANs exist that are SCSI-2 and do NOT support REPORT_LUNS, but report a unknown device with PQ 3 on LUN 0. We still need to scan them, and most probably we even need BLIST_SPARSELUN (and BLIST_LARGELUN). See the bug reference for an infamous example. This is patch 1/3: If we end up in sequential scan, at least try LUN 1 for devices that reported a PQ of 3 for LUN 0. Also return blacklist flags, even for PQ3 devices. Signed-off-by: Kurt Garloff Signed-off-by: James Bottomley commit 201e06279823c73242de987f192f43d2b30e5331 tree 409cbf8533ae3242a036c8c013bcd43d9c1410b3 parent 32ea89ecb25789b1b7db28146558587a42f3b372 parent c91e468a48a2afd2a2b0c2e29a35d6b8c51ea682 author Jeff Garzik Wed, 12 Apr 2006 18:11:33 -0400 committer Jeff Garzik Wed, 12 Apr 2006 18:11:33 -0400 Merge branch 'upstream-fixes' commit 32ea89ecb25789b1b7db28146558587a42f3b372 tree c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 parent 58a7ce64426394a46e80cdc9440cc1e7c195e85d parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author Jeff Garzik Wed, 12 Apr 2006 17:52:52 -0400 committer Jeff Garzik Wed, 12 Apr 2006 17:52:52 -0400 Merge branch 'master' commit a890b15c0990cc8d686edcc85f5fccde71ad5ce9 tree 73162355b58283a2531f13fbbf663809f95c1483 parent 79fa1b677be3a985cc66b9218a4dd09818f1051b parent 26ec634c31a11a003040e10b4d650495158632fd author Jeff Garzik Wed, 12 Apr 2006 16:54:43 -0400 committer Jeff Garzik Wed, 12 Apr 2006 16:54:43 -0400 Merge branch 'upstream' commit 875999c5539999f61a45620aae0c3e5fb1d2b035 tree 4535032a8a10f5782c0aef6a620b1a624ea9f863 parent 79072f38909e3d9883317238887460c39ddcc4cb parent 26ec634c31a11a003040e10b4d650495158632fd author Jeff Garzik Wed, 12 Apr 2006 16:54:16 -0400 committer Jeff Garzik Wed, 12 Apr 2006 16:54:16 -0400 Merge branch 'upstream' commit fb6a82c94a9c69adfb6b9f6ce9f84be36884e471 tree 7109ae6ececc3aeee7449a2fb692472875a57c84 parent b104513c74d972f09737017394c5abc7e0a6835d author Randy Dunlap Tue, 11 Apr 2006 20:12:10 -0400 committer David Woodhouse Tue, 11 Apr 2006 20:12:10 -0400 [PATCH] jffs2: fix printk warnings Fix printk format warnings in jffs2. Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse commit b104513c74d972f09737017394c5abc7e0a6835d tree dc1eb76a9b110c2a7895b9c72077d1201eecabf9 parent 6cc449c7d0292cb9b993f0df84fd3225e3099492 author Randy Dunlap Tue, 11 Apr 2006 20:05:20 -0400 committer David Woodhouse Tue, 11 Apr 2006 20:05:20 -0400 [PATCH] MTD: m25p80: fix printk format warning Fix printk format warning: drivers/mtd/devices/m25p80.c:189: warning: format '%zd' expects type 'signed size_t', but argument 6 has type 'u_int32_t' Signed-off-by: Randy Dunlap Signed-off-by: David Woodhouse commit 6cc449c7d0292cb9b993f0df84fd3225e3099492 tree f8ca83dc334e9f9ac12bae78689ae2441daabea0 parent f4e9ce66c70c5d08b8a4d2c676924748c8b7550b author Jesper Juhl Tue, 11 Apr 2006 19:42:44 -0400 committer David Woodhouse Tue, 11 Apr 2006 19:42:44 -0400 [PATCH] mtd, nettel: fix build error and implicit declaration I just hit the following error and warning : drivers/mtd/maps/nettel.c: In function `nettel_init': drivers/mtd/maps/nettel.c:418: error: `ROOT_DEV' undeclared (first use in this function) drivers/mtd/maps/nettel.c:418: error: (Each undeclared identifier is reported only once drivers/mtd/maps/nettel.c:418: error: for each function it appears in.) drivers/mtd/maps/nettel.c:418: warning: implicit declaration of function `MKDEV' make[3]: *** [drivers/mtd/maps/nettel.o] Error 1 make[2]: *** [drivers/mtd/maps] Error 2 make[1]: *** [drivers/mtd] Error 2 The patch fixes the missing ROOT_DEV declaration by including linux/root_dev.h and fixes the implicit declaration of MKDEV by including linux/kdev_t.h . Signed-off-by: Jesper Juhl Signed-off-by: David Woodhouse commit f4e9ce66c70c5d08b8a4d2c676924748c8b7550b tree cc986f086fb5ed6149ab0ef4beb2d97878d9e5c5 parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author David Woodhouse Tue, 11 Apr 2006 19:29:07 -0400 committer David Woodhouse Tue, 11 Apr 2006 19:29:07 -0400 New MTD git tree in MAINTAINERS Signed-off-by: David Woodhouse commit 26ec634c31a11a003040e10b4d650495158632fd tree c2d12e097783bd36a83d8437c58ed1cf6a244914 parent bad28a37f5e4ab1db5c5f01b77664597b02b257f author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:37 -0400 [PATCH] sata_sil24: enable 64bit Enable 64bit. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit bad28a37f5e4ab1db5c5f01b77664597b02b257f tree a8821f7d5b48f639b054a0f17d03bc89d0c7b95f parent a5b4c47a2731f1dd685f28b79464e4442f3682ec author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:37 -0400 [PATCH] sata_sil24: fix on-memory structure byteorder Data structures residing on memory and fetched by the controller should have LE ordering. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a5b4c47a2731f1dd685f28b79464e4442f3682ec tree 00394defab68b5457eb79b46c0c50e7cbcf20231 parent ecc2e2b9c97719592b3078d5a5a8666551c91115 author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: don't do hardreset during driver initialization There's no need to perform hardreset during driver initialization. It's already done during host reset and even if the controller is in some wacky state, we now have proper hardreset to back us up. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ecc2e2b9c97719592b3078d5a5a8666551c91115 tree a941aa2a8f8daacc8d21990a7b1b85a767c5de5c parent 0eaa6058a6a664ce692e3dc38c6891a74ca47f59 author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: reimplement hardreset Reimplement hardreset according to the datasheet. The old hardreset didn't reset controller status and the controller might not be ready after reset. Also, as SStatus is a bit flakey after hardreset, sata_std_hardrset() didn't use to wait long enough before proceeding. Note that as we're not depending on SStatus, DET==1 condition cannot be used to wait for link, so use shorter timeout for no device case. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 0eaa6058a6a664ce692e3dc38c6891a74ca47f59 tree 58f2c7f19d20a036e15b52c0171583ca8053a1a2 parent 2555d6c268240fb3f5f335bd62d0518025343c0f author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: kill 10ms sleep in softreset Nothing, not the datasheet nor the errats, says this delay is necessary and with the previous PORT_CS_INIT change, we know the controller is in good state. Kill 10ms sleep. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2555d6c268240fb3f5f335bd62d0518025343c0f tree a4cd391fb73cf9c37fa4976d7d999ddea546d383 parent b5bc421c96ca56a9abaad4619da01fe0071904a2 author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: put port into known state before softresetting Make sure the controller has no pending commands and ready for command before issuing SRST. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit b5bc421c96ca56a9abaad4619da01fe0071904a2 tree 524f5edb321970e1595e9c6c940bc221ef41184f parent 37024e8ee0d8dbcd0c2634192cb3836549db054e author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: implement sil24_init_port() Implement sil24_init_port which performs port initialization via PORT_CS_INIT. To be used later by softreset and EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 37024e8ee0d8dbcd0c2634192cb3836549db054e tree 681276204a0bc13833e1b48eec5b43aa3f3d865e parent 9466d85bb2c80b1aa169dda638b535f2f19714e4 author Tejun Heo Tue, 11 Apr 2006 22:32:19 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: implement loss of completion interrupt on PCI-X errta fix SiI3124 might lose completion interrupt if completion interrupt occurs shortly after SLOT_STAT register is read for the previous completion interrupt if it is operating in PCI-X mode. This currently doesn't trigger as libata never queues more than one command, but it will with NCQ changes. This patch implements the workaround - turning on WoC and explicitly clearing interrupt. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9466d85bb2c80b1aa169dda638b535f2f19714e4 tree ccba111574540f6f5807c028be3f92049e17fdb3 parent 7dafc3fd9a9e34e4a02ee6d141fd391ad5bdcd90 author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: consolidate host flags into SIL24_COMMON_FLAGS All sil24 controllers share the same host flags except for NPORTS. Consolidate them into SIL24_COMMON_FLAGS. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 7dafc3fd9a9e34e4a02ee6d141fd391ad5bdcd90 tree cb7e541c1e3bf6a3f181faaa8f56d3a18825f13d parent 3b9f1d0fb3fd68419ee3fa3e0833c6a05462150d author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:36 -0400 [PATCH] sata_sil24: add more constants Add HOST_CTRL_* and more PORT_IRQ_* bits. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 3b9f1d0fb3fd68419ee3fa3e0833c6a05462150d tree 502e4de127ad51afb82b670497c436bb5ee1cc0f parent 640088024dbf19553bb4b53d81e919cdf570f3b0 author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:35 -0400 [PATCH] sata_sil24: rename PORT_IRQ_SDB_FIS to PORT_IRQ_SDB_NOTIFY Rename PORT_IRQ_SDB_FIS to more proper PORT_IRQ_SDB_NOTIFY. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 640088024dbf19553bb4b53d81e919cdf570f3b0 tree fcad1a678196c47b591154079a0b626be1c8b420 parent 499a86af41cf5a4bf811726841bbc49c0e96fd35 author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:35 -0400 [PATCH] sata_sil24: typo fix Type fix. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 499a86af41cf5a4bf811726841bbc49c0e96fd35 tree 4fc1f8ff32782f069e488eaea200be055046704a parent 51713d359ae274fa4dd4b199ba3a6b0c21ef99e0 author Tejun Heo Tue, 11 Apr 2006 22:32:18 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:31:35 -0400 [PATCH] libata: export ata_set_sata_spd() This will be used by LLDD hardreset implementation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 51713d359ae274fa4dd4b199ba3a6b0c21ef99e0 tree c233c1f8848ed921cabd4f8591085c24ccb0cdc3 parent ec573755fcd7975aae6b0d536dbcd74a6eed029c author Tejun Heo Tue, 11 Apr 2006 22:26:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:22:17 -0400 [PATCH] libata: cosmetic update to ata_bus_probe() Move ata_set_mode() failure handling outside of ap->ops->set_mode if clause such that it can handle ap->ops->set_mode failures after it's updated. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ec573755fcd7975aae6b0d536dbcd74a6eed029c tree 58600b1d741ba2a8f5bfa214768469a5031d0b49 parent 7dd29dd629bd5a4e6d8a164a9886da01f291ecf2 author Tejun Heo Tue, 11 Apr 2006 22:26:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:22:17 -0400 [PATCH] libata: disable failed devices only once in ata_bus_probe() Devices which consumed all their changes used to be disabled every iteration. This causes unnecessary noise in the console output. Disable once and leave alone. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 7dd29dd629bd5a4e6d8a164a9886da01f291ecf2 tree cf0dc7ae2468378dd5795346dac23badc7344667 parent 75fe18069a55c78f553643b4e3a24c6864d71d87 author Tejun Heo Tue, 11 Apr 2006 22:22:30 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] sata_sil24: use ata_wait_register() Replace hard-coded waiting loops in sata_sil24 to ata_wait_register(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 75fe18069a55c78f553643b4e3a24c6864d71d87 tree 30aa797f948d25589b4057d43c703b27a737eaeb parent c22daff41001e9ccead87179ac0547f85447139e author Tejun Heo Tue, 11 Apr 2006 22:22:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] ahci: use ata_wait_register() Replace ahci_poll_register() with ata_wait_register(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c22daff41001e9ccead87179ac0547f85447139e tree b8faa6e19419704c19f07a9f7043ab2435f719df parent 643be977f9feba8c3c1e768fc06cac84596ec6f8 author Tejun Heo Tue, 11 Apr 2006 22:22:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] libata: implement ata_wait_register() As waiting for some register bits to change seems to be a common operation shared by some controllers, implement helper function ata_wait_register(). This function also takes care of register write flushing. Note that the condition is inverted, the wait is over when the masked value does NOT match @val. As we're waiting for bits to change, this test is more powerful and allows the function to be used in more places. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 643be977f9feba8c3c1e768fc06cac84596ec6f8 tree f7c7b23e60cc726ba8874411956d15f3bfd7c9c4 parent 1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6 author Tejun Heo Tue, 11 Apr 2006 22:22:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] sata_sil24: better error message from softreset Improve softreset error message. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1c1d832cea1ab851a3f9b9d83245f5bc8b5b04b6 tree f74785a6acfd94b8fe4efdc39a8919f7f2e63e9c parent 987d2f05b396760517eef7cba66b2f415ac484f5 author Tejun Heo Tue, 11 Apr 2006 22:22:29 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:19:11 -0400 [PATCH] sata_sil24: fix timeout calculation in sil24_softreset sil24_softreset calculated timeout by adding ATA_TMOUT_BOOT * HZ to jiffies; however, as ATA_TMOUT_BOOT is already in jiffies, multiplying by HZ makes the value way off. Fix it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 987d2f05b396760517eef7cba66b2f415ac484f5 tree 72d7d4e31f5aa8df3c7988119fa0787632d01460 parent 2bf2cb26b2512c6a609bb152982c388329bedff6 author Tejun Heo Tue, 11 Apr 2006 22:16:45 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:12:46 -0400 [PATCH] libata: make reset methods complain when they fail Make reset methods complain loud when they fail. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2bf2cb26b2512c6a609bb152982c388329bedff6 tree 9f1f3ea5000304fd946f34b24d9904c2a1027480 parent db70fef0750e5f8dbb64f9fadb333d2c7caf26a1 author Tejun Heo Tue, 11 Apr 2006 22:16:45 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:12:46 -0400 [PATCH] libata: kill @verbose from ata_reset_fn_t @verbose was added to ata_reset_fn_t because AHCI complained during probing if no device was attached to the port. However, muting failure message isn't the correct approach. Reset methods are responsible for detecting no device condition and finishing successfully. Now that AHCI softreset is fixed, kill @verbose. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit db70fef0750e5f8dbb64f9fadb333d2c7caf26a1 tree 3ae791d9a7034701ee9cdd22ac79355f675105b8 parent 35bb94b116e1fd4959ef0d3187458b5820eac8c4 author Tejun Heo Tue, 11 Apr 2006 22:16:44 +0900 committer Jeff Garzik Tue, 11 Apr 2006 13:12:46 -0400 [PATCH] libata: set default cbl in probeinit Make setting CBL type responsibility of probeinit. This allows using only ap->cbl == ATA_CBL_SATA test in all other parts. Without this, ata_down_sata_spd_limit() doesn't work during probe reset. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 35bb94b116e1fd4959ef0d3187458b5820eac8c4 tree 48a05166c489838d04429279a2886ac6a32b20c9 parent 381544bba3ae6f2f1004b267da34f840b469033c author Jeff Garzik Tue, 11 Apr 2006 13:12:34 -0400 committer Jeff Garzik Tue, 11 Apr 2006 13:12:34 -0400 libata: Add helper ata_shost_to_port() commit 381544bba3ae6f2f1004b267da34f840b469033c tree e748d5da19d3fa79bee2ad5b40b44722cdf64184 parent 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 author Jeff Garzik Tue, 11 Apr 2006 13:04:39 -0400 committer Jeff Garzik Tue, 11 Apr 2006 13:04:39 -0400 libata: Fix EH merge difference between this branch and upstream. commit 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 tree eddf856286234f28cac747d20eb59d918e1bc8b5 parent c2a6585296009379e0f4eff39cdcb108b457ebf2 parent a145410dccdb44f81d3b56763ef9b6f721f4e47c author Jeff Garzik Tue, 11 Apr 2006 12:51:40 -0400 committer Jeff Garzik Tue, 11 Apr 2006 12:51:40 -0400 Merge branch 'master' Conflicts: drivers/scsi/libata-scsi.c include/linux/libata.h commit c18bcf45c46f72f630cbbddc79a765336b79ab4f tree da83ea4fc0c1e4e0744513f2bee4247c216c6587 parent 12df7556705aae97f24a397377e17898700d7192 parent 591f0a4287d0de243493fd0c133c862e1d1f1c97 author Kumar Gala Tue, 04 Apr 2006 16:11:29 -0500 committer Kumar Gala Tue, 04 Apr 2006 16:11:29 -0500 Merge branch '85xx' commit 591f0a4287d0de243493fd0c133c862e1d1f1c97 tree 02ee295688f70c00e8034139d1966b217bb7725e parent 6246b6128bbe34d0752f119cf7c5111c85fe481d author Andy Fleming Sun, 02 Apr 2006 17:42:40 -0500 committer Kumar Gala Tue, 04 Apr 2006 16:09:18 -0500 Add 85xx CDS to arch/powerpc This patch adds support for 85xx CDS support to arch/powerpc Signed-off-by: Andy Fleming Signed-off-by: Kumar Gala commit 79fa1b677be3a985cc66b9218a4dd09818f1051b tree d36030be7cd07461055f005394ef275212353010 parent 31ce6daefe2d312e31ee06b0b3301b1cb7878c04 parent c2a6585296009379e0f4eff39cdcb108b457ebf2 author Jeff Garzik Tue, 04 Apr 2006 08:45:13 -0400 committer Jeff Garzik Tue, 04 Apr 2006 08:45:13 -0400 Merge branch 'upstream' commit c2a6585296009379e0f4eff39cdcb108b457ebf2 tree d6c123aca21e0e54a3b2a52c93f26b6352b068de parent 95de719adc94392a95c3c4d0a2d6b8b1ea39d236 author Tejun Heo Mon, 03 Apr 2006 01:58:06 +0900 committer Jeff Garzik Tue, 04 Apr 2006 08:44:24 -0400 [PATCH] ahci: do not fail softreset if PHY reports no device All softreset methods are responsible for detecting device presence and succeed softreset in such cases. AHCI didn't use to check for device presence before proceeding with softreset and this caused unnecessary reset retrials during probing. This patch adds presence detection to AHCI softreset. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 95de719adc94392a95c3c4d0a2d6b8b1ea39d236 tree d8196f39ca64a2c727ff6eff94b28d10013c6564 parent c16226a1c75042bfdc50bd2921d5919f6267ba51 author Albert Lee Tue, 04 Apr 2006 10:57:18 +0800 committer Jeff Garzik Tue, 04 Apr 2006 08:44:24 -0400 [PATCH] libata: convert ATAPI_ENABLE_DMADIR to module parameter Convert the ATAPI_ENABLE_DMADIR compile time option needed by some SATA-PATA bridge to runtime module parameter. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 31ce6daefe2d312e31ee06b0b3301b1cb7878c04 tree c956f2e8cecb151b067289504475a57a7e9d7d80 parent 4332a771f4d2f23a6d3beff3dd5405e79775a211 author Albert Lee Mon, 03 Apr 2006 18:31:44 +0800 committer Jeff Garzik Tue, 04 Apr 2006 08:42:26 -0400 [PATCH] libata-dev: irq-pio minor fix 2 irq-pio minor fix 2: - Use qc as data for ata_pio_task(). Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 4332a771f4d2f23a6d3beff3dd5405e79775a211 tree 4d4dbcb97e1ff0ac89d49ab36ed6c248e348c4ce parent 862cff63781e3a9de85d8947c82d55f4cc95572b author Albert Lee Mon, 03 Apr 2006 17:43:24 +0800 committer Jeff Garzik Tue, 04 Apr 2006 08:42:25 -0400 [PATCH] libata-dev: irq-pio minor fix irq-pio minor fix: - remove the redundant hsm_task_state = HSM_ST_IDLE - add devno to printk() as done in upstream Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 862cff63781e3a9de85d8947c82d55f4cc95572b tree ab47b1597e3ef193590da98147e494b2d702bac2 parent 7819d64e31a685e35e4819515c84168d0879816e parent c16226a1c75042bfdc50bd2921d5919f6267ba51 author Jeff Garzik Tue, 04 Apr 2006 08:42:17 -0400 committer Jeff Garzik Tue, 04 Apr 2006 08:42:17 -0400 Merge branch 'upstream' commit c16226a1c75042bfdc50bd2921d5919f6267ba51 tree f7f6081aab45d598fa44b9e588722ed38c299b8e parent af64371ada9452632c349563d688d30d94e918ba parent 6246b6128bbe34d0752f119cf7c5111c85fe481d author Jeff Garzik Tue, 04 Apr 2006 08:41:29 -0400 committer Jeff Garzik Tue, 04 Apr 2006 08:41:29 -0400 Merge branch 'master' commit e6f1f3c54974a30c65ea0b699809d12f0aa04272 tree e9a0e2ebcc249e8e64d53a055a5016d821f03155 parent c12ea918ee175ceb3a258cd81f1c43e897d0c0bc author Bjorn Helgaas Mon, 03 Apr 2006 13:14:00 -0400 committer Len Brown Mon, 03 Apr 2006 16:06:47 -0400 ACPI: Don't print internal BIOS names of wakeup devices Internal BIOS names like these should be exposed to the user as little as possible: ACPI wakeup devices: C069 C0CE C1D1 C0DE C1D4 Eventually, the "wakeup" property of a device should be exported via the device tree, not by a printk of an internal BIOS name. For the hard-core, these are still available in /proc/acpi/wakeup_devices, just not printed to dmesg. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 51d797474f87b375819d084f7583a2864c5656c4 tree 03ccc62e0b1b9f62442ef26e373e2a9ad798d5d8 parent 3587c50991b96fee2d26942f380e36e4f40fad71 author Dave Airlie Mon, 03 Apr 2006 16:19:26 +1000 committer Dave Airlie Mon, 03 Apr 2006 16:19:26 +1000 intelfb: some cleanups for intelfbhw Signed-off-by: Dave Airlie commit 3587c50991b96fee2d26942f380e36e4f40fad71 tree 1266f26fa14b96e540a1388968a030edf264894d parent 3aff13cfb8810cc228e8fdcb92103ed0b11ee38e author Dave Airlie Mon, 03 Apr 2006 14:46:55 +1000 committer Dave Airlie Mon, 03 Apr 2006 14:46:55 +1000 intelfb: fixup pitch calculation like X does Signed-off-by: Dave Airlie commit 3aff13cfb8810cc228e8fdcb92103ed0b11ee38e tree f2fe6212fcee1952a81022c33afa9dbc836c2e71 parent 46f60b8e67e6fceede851dc69cdee2d7c0de27b9 author Dave Airlie Fri, 31 Mar 2006 17:08:52 +1000 committer Dave Airlie Mon, 03 Apr 2006 11:43:29 +1000 intelfb: fixup p calculation This fixes up the p calculation of p1 and p2 for the i9xx chipsets. This seems to work a lot better for lower pixel clocks.. Signed-off-by: Dave Airlie commit 46f60b8e67e6fceede851dc69cdee2d7c0de27b9 tree 844bfba5d06f348bdd443cdd471d5d814337d141 parent 9a90603f65dd5046ddcd586158abcad7784892b6 author Dave Airlie Fri, 24 Mar 2006 12:31:14 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:29 +1000 This patch makes a needlessly global struct static. Signed-off-by: Adrian Bunk Signed-off-by: Dave Airlie commit 9a90603f65dd5046ddcd586158abcad7784892b6 tree e522d2fbc83a491ed50cee596a4c5d983460c2b4 parent 8b91b0b4f2d731b92f59bc82492769a09b4955a6 author Dave Airlie Thu, 23 Mar 2006 21:53:05 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add i945GM support Untested i945GM support just add the framework. Signed-off-by: Dave Airlie commit 8b91b0b4f2d731b92f59bc82492769a09b4955a6 tree aeb384e59229d4814733195db5836ad9ab448c17 parent 8bb91f6a2d1db8031bfbb367df075f041d0cdfe2 author Dave Airlie Thu, 23 Mar 2006 19:23:48 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: fixup whitespace.. repeat after me, I must not take code from X without reformatting... Signed-off-by: Dave Airlie commit 8bb91f6a2d1db8031bfbb367df075f041d0cdfe2 tree 558db93f69096ede171d0b4e6c6c0330d8362e92 parent 7679f4d69296de97a7f62458cc4d1c6c884dfcfb author Dave Airlie Thu, 23 Mar 2006 13:06:32 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add hw cursor support for i9xx This adds hw cursor support for the i9xx chipsets. Signed-off-by: Dave Airlie commit 7679f4d69296de97a7f62458cc4d1c6c884dfcfb tree 118ec34ee36be93d95abeb2628a16cd0d386c927 parent 9639d5ec07a490134f05ac890506a367aaf8663b author Dave Airlie Thu, 23 Mar 2006 12:30:05 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: make i915 modeset This takes the modeset and pll code from my X driver. Signed-off-by: Dave Airlie commit 9639d5ec07a490134f05ac890506a367aaf8663b tree 9e921a2fa9de05dadbb75ab1e63d06df1efd6fa6 parent 0c187addabbaf93512902442b4a90140a21b0ddc author Dave Airlie Thu, 23 Mar 2006 11:23:55 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add support for i945G This just adds the defines and structure for i945G Signed-off-by: Dave Airlie commit 0c187addabbaf93512902442b4a90140a21b0ddc tree 40cd618a76474ec9ba2cfde129315c7ebbaf4f9f parent 16109b3f4c1f2635afd32eb6d49348590de2cb25 author Dave Airlie Thu, 23 Mar 2006 11:20:08 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: enable on x86_64 i945G chipsets supports 64-bit. Signed-off-by: Dave Airlie commit 16109b3f4c1f2635afd32eb6d49348590de2cb25 tree 6a8777173acbc8d41fdcce615b899446eba8053b parent 8492f081e5552ff388068f612eae6f55f7210ed4 author Dave Airlie Mon, 20 Mar 2006 21:22:09 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:28 +1000 intelfb: add p divisor increments for i9xx. Signed-off-by: Dave Airlie commit 8492f081e5552ff388068f612eae6f55f7210ed4 tree 8d86450eea6a761ef4a541a5f67a9401f88aac19 parent d024960cff5173bef6e83c01cf9cd2763c2c0ab0 author Dave Airlie Mon, 20 Mar 2006 20:54:12 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: change splitm to be brute force The old splitm didn't always work use a brute force. Signed-off-by: Dave Airlie commit d024960cff5173bef6e83c01cf9cd2763c2c0ab0 tree a63dfaf6de88b82b2aaf892e741881e4e602befb parent 7258b11d2e9a47d2b01620622579f22906960e1a author Dave Airlie Mon, 20 Mar 2006 20:26:45 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: add pll index to the intelfb structure Add the pll index into the information structure, change get_chipset to take only the info structure, use plls in correct places commit 7258b11d2e9a47d2b01620622579f22906960e1a tree cfc7fce74a518077b0d068c13da710e072a57b20 parent 6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6 author Dave Airlie Mon, 20 Mar 2006 20:02:24 +1100 committer Dave Airlie Mon, 03 Apr 2006 11:43:27 +1000 intelfb: prepare for i9xx support. This code just moves the PLL min/max calculations variables into a structure, it doesn't change or add any new functionality. Signed-off-by: Dave Airlie commit 7819d64e31a685e35e4819515c84168d0879816e tree dd567398511128d63ac8bc10567279a68e9ddd37 parent a808be8a12d61cdacba350fdce2e448045be8202 parent af64371ada9452632c349563d688d30d94e918ba author Jeff Garzik Sun, 02 Apr 2006 20:41:48 -0400 committer Jeff Garzik Sun, 02 Apr 2006 20:41:48 -0400 Merge branch 'upstream' commit af64371ada9452632c349563d688d30d94e918ba tree 0b6b451ba75c18bff270ab31eedffcfa5f941d67 parent 4bced2d40555eebf8d685f174aa6d58ace353655 author Jeff Garzik Sun, 02 Apr 2006 20:41:36 -0400 committer Jeff Garzik Sun, 02 Apr 2006 20:41:36 -0400 [libata] bump versions commit 4bced2d40555eebf8d685f174aa6d58ace353655 tree 55b3b7317ffe00c1688d579684bd5aad00b5380e parent 6d5f9732a16a74d75f8cdba5b00557662e83f466 author Jeff Garzik Sun, 02 Apr 2006 20:17:48 -0400 committer Jeff Garzik Sun, 02 Apr 2006 20:17:48 -0400 [libata] kill bogus cut-n-pasted comments in three drivers commit a808be8a12d61cdacba350fdce2e448045be8202 tree b08dda3fb0dee06724320a5b0079fbc51c09c35b parent c13b56a1130bbfacfb588de100e5a248383805a6 parent 6d5f9732a16a74d75f8cdba5b00557662e83f466 author Jeff Garzik Sun, 02 Apr 2006 11:38:12 -0400 committer Jeff Garzik Sun, 02 Apr 2006 11:38:12 -0400 Merge branch 'upstream' commit 6d5f9732a16a74d75f8cdba5b00557662e83f466 tree dd29e5a0ea5eb1ca9ee51b62606036b0f9846e3a parent 1ad8e7f9eb051b040880e45337ed74bfd916ef7f author Tejun Heo Mon, 03 Apr 2006 00:09:41 +0900 committer Jeff Garzik Sun, 02 Apr 2006 11:37:57 -0400 [PATCH] libata: print SControl in SATA link status info message Now that libata mangles with SControl, it's helpful to print out SControl in link status message. Add it. Signed-off-by: Jeff Garzik commit c13b56a1130bbfacfb588de100e5a248383805a6 tree 7f10fbcb822fe50225a3ae6f4644775b72c6290c parent 029f5468b5b5f93a09bf90326fdcb9124079658d author Jeff Garzik Sun, 02 Apr 2006 10:34:24 -0400 committer Jeff Garzik Sun, 02 Apr 2006 10:34:24 -0400 [libata] irq-pio: Fix merge mistake commit 029f5468b5b5f93a09bf90326fdcb9124079658d tree f869fb02ad1ca49e0920e073b22cbb96a184ccae parent 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110 parent 1ad8e7f9eb051b040880e45337ed74bfd916ef7f author Jeff Garzik Sun, 02 Apr 2006 10:30:40 -0400 committer Jeff Garzik Sun, 02 Apr 2006 10:30:40 -0400 Merge branch 'upstream' Conflicts: drivers/scsi/libata-core.c drivers/scsi/pdc_adma.c drivers/scsi/sata_mv.c drivers/scsi/sata_nv.c drivers/scsi/sata_promise.c drivers/scsi/sata_qstor.c drivers/scsi/sata_sx4.c drivers/scsi/sata_vsc.c include/linux/libata.h commit 1ad8e7f9eb051b040880e45337ed74bfd916ef7f tree 010f563b369b0d00a280aa6545790c95a7b5a8a5 parent ece1d63619df010b8c4f08e43755e2a03f3b6eed author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:21 -0400 [PATCH] libata: make some libata-core routines extern Make libata-core routines which will be used by EH implementation extern. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ece1d63619df010b8c4f08e43755e2a03f3b6eed tree c6474fe7541d479bf19c36c79700dfa9f6093a8d parent 35e86b53b1a38e78ff0d70dae4aeb25f4572e433 author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:21 -0400 [PATCH] libata: separate out libata-eh.c A lot of EH codes are about to be added to libata. Separate out libata-eh.c. ata_scsi_timed_out(), ata_scsi_error(), ata_qc_timeout(), ata_eng_timeout(), ata_eh_qc_complete() and ata_eh_qc_retry() are moved. No code is changed by this patch. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 35e86b53b1a38e78ff0d70dae4aeb25f4572e433 tree aa182ee897dd7211723b4f73843f1a638df2a5ea parent d69cf37d5387801914bbf5297f070c7d2ee0206f author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: dec scmd->retries for qcs with zero err_mask qcs might get retried because of unrelated failure. e.g. NCQ command failure causes the whole command set to be aborted. Decrement scmd->retries for such retrials to avoid unnecessarily failing commands. Note that scmd->retries will be incremented the first time. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d69cf37d5387801914bbf5297f070c7d2ee0206f tree de9f081b20302e394936d23a3f983407d87dafd3 parent 74e6c8c394ca2126a60e97bc1142ec2d91761e9a author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: add @cdb to ata_exec_internal() Add @cdb to ata_exec_internal(). It will be used by new EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 74e6c8c394ca2126a60e97bc1142ec2d91761e9a tree 4f9422284300b495590501d9fb919c062d60069f parent 058e55e120ca59d37392f9aa753da2d9ead24505 author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: don't read TF directly from sense generation functions TF register might not be directly accessible depending on errors. e.g. TF of failed NCQ command is in log page 10h. Make reading TF responsibility of error handlers. For the current EH, simply push TF reading into qc completion functions as they are practically part of EH. New EH will fill qc->tf with status registers before complting qcs. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 058e55e120ca59d37392f9aa753da2d9ead24505 tree 31b248615b0534dce61d52634b3adaae526c89aa parent c91af2c87e4048cdefcfc9f16fed8d728243c92d author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: always generate sense if qc->err_mask is non-zero Current sense generation code does not generate sense error if status register value doesn't indicate error condition. However, LLDD's may indicate errors which 't show up in status register. Completing such qc's without generating sense results in successful completion of failed commands. Invoke ata_to_sense_error() regardless of status register if qc->err_mask is not zero such that ata_to_sense_error() generates default sense error. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c91af2c87e4048cdefcfc9f16fed8d728243c92d tree 346a50bed1b05bd144d755ba4281186877a432db parent 2719736779da2c7fbb17d3de16c817b429bfeb9c author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: pass qc around intead of ap during PIO The current code passes pointer to ap around and repeatedly performs ata_qc_from_tag() to access the ongoing qc. This is unnatural and makes EH synchronization cumbersome. Make PIO codes deal with qc instead of ap. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2719736779da2c7fbb17d3de16c817b429bfeb9c tree f65b910e990cc59805faefc33fbb84cd419572c4 parent e8384607d4f395985e3cc5f82d75fc73efc2ecf0 author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: add ATA_QCFLAG_IO Add a new qc flag ATA_QCFLAG_IO. This flag gets set for normal IO commands originating from SCSI midlayer. This information will be used by EH to determine transfer speed reconfiguration. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e8384607d4f395985e3cc5f82d75fc73efc2ecf0 tree bc6f6e3b8b31734d6ef4f827e85473b5928a500b parent ea1dd4e13010eb9dd5ffb4bfabbb472bc238bebb author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:20 -0400 [PATCH] libata: clear ATA_DFLAG_PIO before setting it ata_dev_set_mode() is now responsible for managing ATA_DFLAG_PIO. Clear it before setting it. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ea1dd4e13010eb9dd5ffb4bfabbb472bc238bebb tree 2c55fb5671c1dab0c99d84d46c09fd03ebdc5f53 parent 198e0fed9e59461fc1890dd8b75ec72d14638873 author Tejun Heo Sun, 02 Apr 2006 18:51:53 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: clear only affected flags during ata_dev_configure() ata_dev_configure() should not clear dynamic device flags determined elsewhere. Lower eight bits are reserved for feature flags, define ATA_DFLAG_CFG_MASK and clear only those bits before configuring device. Without this patch, ATA_DFLAG_PIO gets turned off during revalidation making PIO mode unuseable. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 198e0fed9e59461fc1890dd8b75ec72d14638873 tree c5c1d727117df989d6e6e8e2b79d065a669a7a27 parent 949b38af40a0b88b7267908b1554a45b97b5b737 author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: rename ATA_FLAG_PORT_DISABLED to ATA_FLAG_DISABLED Rename ATA_FLAG_PORT_DISABLED to ATA_FLAG_DISABLED for consistency. (ATA_FLAG_* are always about ports). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 949b38af40a0b88b7267908b1554a45b97b5b737 tree cff0a143d71c8e03bf8aceefdfec8f735bc33416 parent c43c555c3a6db7f0b55fd9b66d7ecff16e827d4e author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: clean up constants * Reorder ATA_DFLAG_* such that feature flags determined by ata_dev_configure() are on lower bits. Reserve lower eight bits for this purpose and allocate dynamic flags from bit 8. * Reorder ATA_FLAG_* such that feature flags determined during driver initiailization are on bits 0:15, dynamic flags on 16:23 and LLDD specific flags on 24:31. * Kill trailing white space and lower-case an one line comment for consistency. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit c43c555c3a6db7f0b55fd9b66d7ecff16e827d4e tree 3036762ea56f742414eaaf098f9f5f34dedb03e4 parent 5eb45c02a9944e813a0b82457607557a1f2c64b5 author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: ATA_FLAG_IN_EH is not used, kill it Kill unused flag ATA_FLAG_IN_EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5eb45c02a9944e813a0b82457607557a1f2c64b5 tree 32a874e2c41ceaa541ef6a30d8d3faf4be2127ad parent d63cb4a6365aa161341fc365df1edc87cd00c9c0 author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: ata_dev_revalidate() printk update Make sure ata_dev_revalidate() complains on failures and kill revalidation failure message printed from ata_dev_set_mode(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d63cb4a6365aa161341fc365df1edc87cd00c9c0 tree 6dbc938ac7f4f2d4ce3fcaadabadb8c2ff7fd01c parent 565083e1f14e7771aa6bac2d3d4aae0b08d48d78 author Tejun Heo Sun, 02 Apr 2006 18:51:52 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:09:19 -0400 [PATCH] libata: report device number when PIO fails Report device number on PIO failure. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 565083e1f14e7771aa6bac2d3d4aae0b08d48d78 tree 8e6a81175297d3d03aa1eede59fcb635d65380e2 parent 14d2bac1877ed4e2cc940d1680db1a4f29225811 author Tejun Heo Sun, 02 Apr 2006 17:54:47 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:58 -0400 [PATCH] libata: consider disabled devices in ata_dev_xfermask() ata_bus_probe() now marks failed devices properly and leaves meaningful transfer mode masks. This patch makes ata_dev_xfermask() consider disable devices when determining PIO mode to avoid violating device selection timing. While at it, move port-wide resttriction out of device iteration loop and try to make the function look a bit prettier. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 14d2bac1877ed4e2cc940d1680db1a4f29225811 tree 60b478485e7453dd5a41aea34699a305dd3c8d2c parent cf176e1aa92eb2a3faea8409e841396a66413937 author Tejun Heo Sun, 02 Apr 2006 17:54:46 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: improve ata_bus_probe() Improve ata_bus_probe() such that configuration failures are handled better. Each device is given ATA_PROBE_MAX_TRIES chances, but any non-transient error (revalidation failure with -ENODEV, configuration failure with -EINVAL...) disables the device directly. Any IO error results in SATA PHY speed down and ata_set_mode() failure lowers transfer mode. The last try always puts a device into PIO-0. After each failure, the whole port is reset to make sure that the controller and all the devices are in a known and stable state. The reset also applies SATA SPD configuration if necessary. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit cf176e1aa92eb2a3faea8409e841396a66413937 tree b62a516d2f91d43a9f6d48492e2f6205160ac849 parent edbabd8679a39faef67def4438c9cbccb5c05c5d author Tejun Heo Sun, 02 Apr 2006 17:54:46 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: implement ata_down_xfermask_limit() Implement ata_down_xfermask_limit(). This function manipulates @dev->pio/mwdma/udma_mask such that the next lower transfer mode is selected. This will be used to improve ata_bus_probe() failure handling and later by EH. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit edbabd8679a39faef67def4438c9cbccb5c05c5d tree dec165edf531bba3adf7c95239f14ded5d48c9f3 parent 90dac02c08dabd471927f151b8393eb51e3e020e author Tejun Heo Sun, 02 Apr 2006 20:55:02 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: add 5s sleep between resets Some devices react badly if resets are performed back-to-back. Give devices some time to breath and tell user that we're taking a nap. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 90dac02c08dabd471927f151b8393eb51e3e020e tree fb799ab84c4fec00dba52c0180f24bd84a6ba69a parent 1c3fae4d7eb121933341443c37d3bbee43c0fb68 author Tejun Heo Sun, 02 Apr 2006 17:54:46 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: use SATA speed down in ata_drive_probe_reset() Make ata_drive_probe_reset() use SATA SPD configuration. Hardreset will be force if speed renegotiation is necessary. Also, if a hardreset fails, PHY speed is stepped down and hardreset is retried until the lowest speed is reached. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1c3fae4d7eb121933341443c37d3bbee43c0fb68 tree e7f0c4145b3a108817c2a7e6bea58a72eb3692e1 parent 002c8054fa8d0f1afce2b0c728be32d338b9293a author Tejun Heo Sun, 02 Apr 2006 20:53:28 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: implement ap->sata_spd_limit and helpers ap->sata_spd_limit contrains SATA PHY speed of the port. It is initialized to the configured value prior to probing thus preserving BIOS configured value. hardreset is responsible for applying SPD limit and sata_std_hardreset() is updated to do that. SATA SPD limit will be used to enhance failure handling during probing and later by EH. This patch also normalizes some comments around affected code. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 002c8054fa8d0f1afce2b0c728be32d338b9293a tree 3ca1bddacad6bb08b8f9b27ef6ebfbdb4cee4d46 parent 852ee16a914fb3ada2f81e222677c04defc2f15f author Tejun Heo Sun, 02 Apr 2006 17:54:46 +0900 committer Jeff Garzik Sun, 02 Apr 2006 10:02:57 -0400 [PATCH] libata: implement ata_dev_absent() For the time being we cannot use ata_dev_present() as it was renamed to ata_dev_enabled() but we still need presence test. Implement negation of the test. Conveniently, the negated result is needed in more places. This is suggested by Jeff Garzik. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 144c87b4e03759214c362d267e01c2905f1ab095 tree ea92934f57b6ad05df936b61fa3ff35befcbd14b parent 7f048801f4a6767433d1aeefd9c24372515265f8 author Len Brown Sun, 02 Apr 2006 00:15:39 -0500 committer Len Brown Sun, 02 Apr 2006 00:15:39 -0500 ACPI: ia64 buildfix arch/ia64/hp/common/sba_iommu.c used ACPI_MEM_FREE instead of kfree() Signed-off-by: Len Brown Sat, 01 Apr 2006 23:45:39 -0500 committer Len Brown Sat, 01 Apr 2006 23:45:39 -0500 ACPI: ia64 buildfix Signed-off-by: Len Brown commit c12ea918ee175ceb3a258cd81f1c43e897d0c0bc tree faa804c30ab12a6e1aa73b9ec7c1aaf8628d6eaf parent df42baa0d8e54df18dd9366dd7c93d6be7d5d063 author Ashok Raj Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:50:03 -0500 x86_64: Remove stale lapic definition from apicdef.h Signed-off-by: Ashok Raj Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit eefa27a93a0490902f33837ac86dbcf344b3aa29 tree ffb8e6f4d56045c679850f41d5c5808773b67a49 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Ashok Raj Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:45:30 -0500 ACPI: Allow hot-add of ejected processor acpi_eject_store() didn't trim processors, causing subsequent hot-add to fail. Signed-off-by: Ashok Raj Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit ff2fc3e9e3edb918b6c6b288485c6cb267bc865e tree b59bfffe58d9e34be055030078b8da9451b8d5a7 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Jiri Slaby Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:33:06 -0500 ACPI: EC acpi-ecdt-uid-hack On some boxes ecdt uid may be equal to 0, so do not test for uids equality, so that fake handler will be unconditionally removed to allow loading the real one. See http://bugzilla.kernel.org/show_bug.cgi?id=6111 Signed-off-by: Jiri Slaby Cc: Luming Yu Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit df42baa0d8e54df18dd9366dd7c93d6be7d5d063 tree c64ec1197bbc2fb95ef90a66e3edfaff7356db70 parent 200739c179c63d21804e9e8e2ced265243831579 author Ashok Raj Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:28:30 -0500 ACPI: build fix for u8 cpu_index Local apic entries are only 8 bits, but it seemed to not be caught with u8 return value result in the check cpu_index >= NR_CPUS becomming always false. drivers/acpi/processor_core.c: In function `acpi_processor_get_info': drivers/acpi/processor_core.c:483: warning: comparison is always false due to limited range of data type Signed-off-by: Ashok Raj Cc: Dave Jones Cc: Kenji Kaneshige Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 200739c179c63d21804e9e8e2ced265243831579 tree bbe38c43d29dea3eeae632de5e2f82d3c75eb484 parent 1a36561607abf1405b56a41aac2fd163429cd1f8 author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:20:49 -0500 ACPI: remove __init/__exit from Asus .add()/.remove() methods Even though the devices claimed by asus_acpi.c can not be hot-plugged, the driver registration infrastructure allows the .add() and .remove() methods to be called at any time while the driver is registered. So remove __init and __exit from them. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 9224a867c497053842dc595e594ca6d32112221f tree c952060abbe5563f15bd7cd69531d4fad3a9aafa parent 459c7266d7a5c1730169258217e25fdd1b7ca854 author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:07:51 -0500 HPET: fix ACPI memory range length handling ACPI address space descriptors contain _MIN, _MAX, and _LEN. _MIN and _MAX are the bounds within which the region can be moved (this is clarified in Table 6-38 of the ACPI 3.0 spec). We should use _LEN to determine the size of the region, not _MAX - _MIN + 1. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 459c7266d7a5c1730169258217e25fdd1b7ca854 tree 79b50e2c6d530539bfe4a468ab290069ddf8ac32 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 22:05:18 -0500 ACPI: fix memory hotplug range length handling Address space descriptors contain _MIN, _MAX, and _LEN. _MIN and _MAX are the bounds within which the region can be moved (this is clarified in Table 6-38 of the ACPI 3.0 spec). We should use _LEN to determine the size of the region, not _MAX - _MIN + 1. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1a36561607abf1405b56a41aac2fd163429cd1f8 tree 096ea8a5212164643e54218a2d4b76ecdec95350 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:53:51 -0500 ACPI: simplify scan.c coding No functional changes; just remove leftover, unused "buffer" and simplify control flow (no need to remember error values and goto the end, when we can simply return the value directly). Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit e4513a57ef719d3d6d1cee0ca4d9f4016aa452bb tree e4b837a10ada6c1d8ecfb065cb864c556a4641ce parent 578b333bfe8eb1360207a08a53c321822a8f40f3 author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:48:08 -0500 ACPI: fix sonypi ACPI driver registration to unregister on failure Remove the assumption that acpi_bus_register_driver() returns the number of devices claimed. Returning the count is unreliable because devices may be hot-plugged in the future (admittedly not applicable for this driver). This also fixes a bug: if sonypi_acpi_driver was registered but found no devices, sonypi_exit() did not unregister it. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 578b333bfe8eb1360207a08a53c321822a8f40f3 tree ee71cd7fed8182b0477d733039509f4097933aab parent 9d9f749b316ac21cb59ad3e595cbce469b409e1a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:48:08 -0500 ACPI: update asus_acpi driver registration to unload on failure Remove the assumption that acpi_bus_register_driver() returns the number of devices claimed. Returning the count is unreliable because devices may be hot-plugged in the future (admittedly not applicable for this driver). Since the hardware for this driver is not hot-pluggable, determine whether the hardware is present by noticing calls to the .add() method. It would be better to probe the ACPI namespace for the ASUS HIDs, and load the driver only when we find one, but ACPI doesn't support that yet. I don't have an ASUS laptop to test on, but on my HP dl360, it does report the appropriate error when attempting to load the module: $ sudo insmod drivers/acpi/asus_acpi.ko insmod: error inserting 'drivers/acpi/asus_acpi.ko': -1 No such device Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 9d9f749b316ac21cb59ad3e595cbce469b409e1a tree a7075d54e97fc67f72684a5e280adcb24c4666b8 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:42:57 -0500 ACPI: make acpi_bus_register_driver() return success/failure, not device count acpi_bus_register_driver() should not return the number of devices claimed. We're not asking to find devices, we're making a driver available to devices, including hot-pluggable devices that may appear in the future. I audited all callers of acpi_bus_register_driver(), and except asus_acpi.c and sonypi.c (fixed in previous patches), all either ignore the return value or test only for failure (<0). Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit cd090eedd85256829f762677d0752a846c1b88b9 tree 51fa4ddbaa8fc5fb70077dc1a6946bc3f52a47cb parent 81507ea9cfa64e9851b53e0fefebfa776eda9ecb author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:33:00 -0500 ACPI: Display "ACPI" to motherboard resources in /proc/io{mem,port} Add "ACPI" to motherboard resource allocation names, so people have a clue about where to look. And remove some trailing spaces. Changes these /proc/iomem entries from this: ff5c1004-ff5c1007 : PM_TMR ff5c1008-ff5c100b : PM1a_EVT_BLK ff5c100c-ff5c100d : PM1a_CNT_BLK ff5c1010-ff5c1013 : GPE0_BLK ff5c1014-ff5c1017 : GPE1_BLK to this: ff5c1004-ff5c1007 : ACPI PM_TMR ff5c1008-ff5c100b : ACPI PM1a_EVT_BLK ff5c100c-ff5c100d : ACPI PM1a_CNT_BLK ff5c1010-ff5c1013 : ACPI GPE0_BLK ff5c1014-ff5c1017 : ACPI GPE1_BLK Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 81507ea9cfa64e9851b53e0fefebfa776eda9ecb tree 0e76e2e8dd0bc5d0542c8490f09af886a5c82749 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:31:29 -0500 ACPI: request correct fixed hardware resource type (MMIO vs I/O port) ACPI supports fixed hardware (PM_TMR, GPE blocks, etc) in either I/O port or MMIO space, but used to always request the regions from I/O space because it didn't check the address_space_id. Sample ACPI fixed hardware in MMIO space (HP rx2600), was incorrectly reported in /proc/ioports, now reported in /proc/iomem: ff5c1004-ff5c1007 : PM_TMR ff5c1008-ff5c100b : PM1a_EVT_BLK ff5c100c-ff5c100d : PM1a_CNT_BLK ff5c1010-ff5c1013 : GPE0_BLK ff5c1014-ff5c1017 : GPE1_BLK Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1c6e7d0aeecac38e66b1bb63e3eff07b2a1c2f2c tree 5d851856e5e5c76171053cdf6fe95b04ec76152d parent b5f2490b6e3317059e87ba40d4f659d1c30afc1f author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:28:25 -0500 PNPACPI: whitespace cleanup Tidy up whitespace. No functional change. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit b5f2490b6e3317059e87ba40d4f659d1c30afc1f tree 8eaa4898b89001bc5e53922d2414967f911b84dd parent 1acfb7f2b0d460ee86bdb25ad0679070ec8a5f0d author Bjorn Helgaas Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:26:45 -0500 PNPACPI: remove some code duplication Factor out the duplicated switch from pnpacpi_count_resources() and pnpacpi_type_resources(). Remove the unnecessary re-initialization of resource->type and length from all the encode functions (id and length are originally set in the pnpacpi_build_resource_template() -> pnpacpi_type_resources() path). Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1acfb7f2b0d460ee86bdb25ad0679070ec8a5f0d tree 2870bc143e40e0d7da477ff8e1b8df1a047bc52f parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Bjorn Helgaas Tue, 28 Mar 2006 17:03:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:24:49 -0500 PNPACPI: fix non-memory address space descriptor handling Fix resource_type handling for QWORD, DWORD, and WORD Address Space Descriptors. Previously we ignored the resource_type, so I/O ports and bus number ranges were incorrectly parsed as memory ranges. Sample PCI root bridge resources from HP rx2600 before this patch: # cat /sys/bus/pnp/devices/00:02/resources state = active mem 0x0-0x1f mem 0x0-0x3af mem 0x3e0-0x1fff mem 0x80000000-0x8fffffff With this patch: # cat /sys/bus/pnp/devices/00:02/resources state = active io 0x0-0x3af io 0x3e0-0x1fff mem 0x80000000-0x8fffffff mem 0x80004000000-0x80103fffffe Changes: 0x0-0x1f PCI bus number range was incorrectly reported as memory, now not reported at all 0x0-0x3af I/O port range was incorrectly reported as memory 0x3e0-0x1fff I/O port range was incorrectly reported as memory 0x80004000000-0x80103fffffe memory range wasn't reported at all because we only support PNP_MAX_MEM (4) memory resources Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 7e1f19e50371e1d148226b64c8edc77fec47fa5b tree 1daff4e687c568b0245dbdb92a3ec993abdbe464 parent d52bb94d56676acd9bdac8e097257a87b4b1b2e1 author Andrew Morton Tue, 28 Mar 2006 17:03:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:13:15 -0500 ACPI: UP build fix for bugzilla-5737 cpu_online_map doesn't exist if !CONFIG_SMP. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 1300124f69cafc54331bc06e968a8dd67863f989 tree 4f94d162680b699f159d04a1bcc6d793f3b8a23c parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Adrian Bunk Tue, 28 Mar 2006 17:04:00 -0500 committer Len Brown Sat, 01 Apr 2006 21:07:42 -0500 ACPI: Kconfig: ACPI should depend on, not select PCI Otherwise, illegal configurations like X86_VOYAGER=y, PCI=y are possible. This patch also fixes the options select'ing ACPI to also select PCI. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110 tree b99427b2639c70e33911e80c947c984b340a4ed9 parent eee6c32f5f114f9b9f2d94862f0dc0d3ff523864 parent 852ee16a914fb3ada2f81e222677c04defc2f15f author Jeff Garzik Sat, 01 Apr 2006 15:17:56 -0500 committer Jeff Garzik Sat, 01 Apr 2006 15:17:56 -0500 Merge branch 'upstream' commit 852ee16a914fb3ada2f81e222677c04defc2f15f tree 8635f8a309a023e0991e30a6a3583aafd91b99f5 parent e82cbdb9a3791f781462c9d00e3486e8fb7e58a8 author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 14:52:08 -0500 [PATCH] libata: preserve SATA SPD setting over hard resets Don't overwrite SPD setting during hard reset. This change has the (intended) side effect of honoring the BIOS configuration. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e82cbdb9a3791f781462c9d00e3486e8fb7e58a8 tree 70c08be45f82a44e86a2889a16841ea58c89fa84 parent e8e0619f68bff8f39d98c46aac85ed1d4557ccfd author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 14:46:09 -0500 [PATCH] libata: don't disable devices from ata_set_mode() When ata_set_mode() fails on a device, make ata_set_mode() return error code and pointer to the device instead of disabling it directly. This gives more control to higher level driving logic. This patch does not change the end result (configured transfer mode) although it may make libata repeat mode configuration to the peer of a failing device. Later ata_bus_probe() rewrite will make full use of this change. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 58a7ce64426394a46e80cdc9440cc1e7c195e85d tree a33f3a552c22deb4a47976eb67d1a557d7fed29e parent b0348b90a4a8149e5a0df312ab7810793ba7b3a4 author Krzysztof Halasa Thu, 30 Mar 2006 17:01:53 +0200 committer Jeff Garzik Sat, 01 Apr 2006 14:32:52 -0500 [PATCH] Goramo PCI200SYN WAN driver subsystem ID patch Goramo finally got PCI subsystem ID for their PCI200SYN card. The attached patch adds support for it - cards with old EEPROM data will emit a warning with URL for update tool. Signed-off-by: Krzysztof Halasa Signed-off-by: Jeff Garzik commit b0348b90a4a8149e5a0df312ab7810793ba7b3a4 tree b2880d09ba55a08acb98dcf8062dd99e59e733e8 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Lennert Buytenhek Tue, 28 Mar 2006 17:19:50 +0200 committer Jeff Garzik Sat, 01 Apr 2006 14:32:52 -0500 [PATCH] smc91x: add support for LogicPD PXA270 platform This patch adds support for the smc91x on the LogicPD PXA270 to the smc91x driver. Signed-off-by: Lennert Buytenhek Signed-off-by: Jeff Garzik commit eee6c32f5f114f9b9f2d94862f0dc0d3ff523864 tree 76cae31872925fd2e66aeab833fed6b293f9af2d parent 6e07e16404deafadf45895a7d2aeb5feba53b479 author Albert Lee Sat, 01 Apr 2006 17:38:43 +0800 committer Jeff Garzik Sat, 01 Apr 2006 14:29:21 -0500 [PATCH] libata-dev: handle DRQ=1 ERR=1 (revised) Handle DRQ=1 ERR=1 situation. Revised according to what IDE try_to_flush_leftover_data() does. Changes: - For ATA PIO writes and ATAPI devices, just stop the HSM and let EH handle it. - For ATA PIO reads, read only one block of junk data and then let EH handle it. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6e07e16404deafadf45895a7d2aeb5feba53b479 tree a7025d6632f0b3eb6232eafba79f331ead812fcf parent 08a556db919f67e1e4d33ae8d40f7222da34d994 parent e8e0619f68bff8f39d98c46aac85ed1d4557ccfd author Jeff Garzik Sat, 01 Apr 2006 14:29:12 -0500 committer Jeff Garzik Sat, 01 Apr 2006 14:29:12 -0500 Merge branch 'upstream' commit e8e0619f68bff8f39d98c46aac85ed1d4557ccfd tree 96bd428799db0694f6ebfd29fcb207857fa60c0f parent 4f65977df0b9a667fdcd85b95d457a220c94113f author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:46 -0500 [PATCH] libata: reorganize ata_set_mode() Merge ata_host_set_pio() and ata_host_set_dma() into ata_set_mode() and use function-level *dev to iterate over devices. This eases soon-to-follow ata_set_mode() interface change. While at it, kill an unnecessary comment and normalize others. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4f65977df0b9a667fdcd85b95d457a220c94113f tree b7cccdf707088b2f5c07c01c26b7761ef92ed175 parent e1211e3fa7fd05ff0d4f597fd37e40de8acc6784 author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:46 -0500 [PATCH] libata: make ata_set_mode() handle no-device case properly Make ata_set_mode() return without doing anything if there is no device on the port. This is in preparation for ata_bus_probe() changes. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e1211e3fa7fd05ff0d4f597fd37e40de8acc6784 tree 672018d7facf99ad4d45b09e2e2980accebdfe38 parent 9974e7cc6c8b8ea796c92cdf28db93e4579a4000 author Tejun Heo Sat, 01 Apr 2006 01:38:18 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: implement ata_dev_enabled and disabled() This patch renames ata_dev_present() to ata_dev_enabled() and adds ata_dev_disabled(). This is to discern the state where a device is present but disabled from not-present state. This disctinction is necessary when configuring transfer mode because device selection timing must not be violated even if a device fails to configure. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9974e7cc6c8b8ea796c92cdf28db93e4579a4000 tree 4130f93143410344d191194464e38a5d89de7033 parent 4c360c81a6f8d4253f7fc2e69852305676fdfa72 author Tejun Heo Sat, 01 Apr 2006 01:38:17 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: convert do_probe_reset() to ata_do_reset() Make do_probe_reset() generic by pushing classification check into ata_drive_probe_reset() and rename it to ata_do_reset(). This will be used by EH reset. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4c360c81a6f8d4253f7fc2e69852305676fdfa72 tree ac36bd47924d0b591d966c4976335c6e6409b99c parent 96072e699be08af8e7c33c56759582ea89088a02 author Tejun Heo Sat, 01 Apr 2006 01:38:17 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: separate out ata_spd_string() Separate out ata_spd_string() from sata_print_link_status(). This will be used by SATA spd configuration routines. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 96072e699be08af8e7c33c56759582ea89088a02 tree 121ba18baf51bd12a9066fcd8b7d530d15ee6017 parent 5bbc53f4cfd28bf1d0e476ed23bc3a094eff718a author Tejun Heo Sat, 01 Apr 2006 01:38:17 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: make ata_bus_probe() return negative errno on failure ata_bus_probe() uses unsigned int rc to receive negative errno and returns the converted unsigned int value. Convert temporary variables to int and make ata_bus_probe() return negative errno on failure. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5bbc53f4cfd28bf1d0e476ed23bc3a094eff718a tree a08fc82da508294f841570fdcb8553d69f8ac2d3 parent 683aa4012f53b2ada0f430487e05d37b0d94e90a author Tejun Heo Sat, 01 Apr 2006 01:38:17 +0900 committer Jeff Garzik Sat, 01 Apr 2006 12:33:45 -0500 [PATCH] libata: fix ata_set_mode() return value Make ata_set_mode() return correct error value when ata_dev_set_mode() fails. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit ec7381d6bfd3e7b8d2880dd5e9d03b131b0603f6 tree 011cacb6bdbc32ea0fe54e7be4e4cc0848c8e77e parent 8313524a0d466f451a62709aaedf988d8257b21c author Len Brown Sat, 01 Apr 2006 05:12:23 -0500 committer Len Brown Sat, 01 Apr 2006 05:12:23 -0500 ACPI: inline trivial acpi_os_get_thread_id() acpi_os_get_thread_id() is used only for debugging code that is not enabled on Linux, so stub it out. Signed-off-by: Len Brown commit 8313524a0d466f451a62709aaedf988d8257b21c tree d612fc796ae07d8a39542c95eec0f5169c9f64eb parent ea936b78f46cbe089a4ac363e1682dee7d427096 author Bob Moore Tue, 03 Oct 2006 00:00:00 -0400 committer Len Brown Sat, 01 Apr 2006 01:26:39 -0500 ACPI: ACPICA 20060310 Tagged all external interfaces to the subsystem with the new ACPI_EXPORT_SYMBOL macro. This macro can be defined as necessary to assist kernel integration. For Linux, the macro resolves to the EXPORT_SYMBOL macro. The default definition is NULL. Added the ACPI_THREAD_ID type for the return value from acpi_os_get_thread_id(). This allows the host to define this as necessary to simplify kernel integration. The default definition is ACPI_NATIVE_UINT. Valery Podrezov fixed two interpreter problems related to error processing, the deletion of objects, and placing invalid pointers onto the internal operator result stack. http://bugzilla.kernel.org/show_bug.cgi?id=6028 http://bugzilla.kernel.org/show_bug.cgi?id=6151 Increased the reference count threshold where a warning is emitted for large reference counts in order to eliminate unnecessary warnings on systems with large namespaces (especially 64-bit.) Increased the value from 0x400 to 0x800. Due to universal disagreement as to the meaning of the 'c' in the calloc() function, the ACPI_MEM_CALLOCATE macro has been renamed to ACPI_ALLOCATE_ZEROED so that the purpose of the interface is 'clear'. ACPI_MEM_ALLOCATE and ACPI_MEM_FREE are renamed to ACPI_ALLOCATE and ACPI_FREE. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit ea936b78f46cbe089a4ac363e1682dee7d427096 tree c444b65c3d02b05934497caefcdcbbe675a00bdf parent 52fc0b026e99b5d5d585095148d997d5634bbc25 author Bob Moore Fri, 17 Feb 2006 00:00:00 -0500 committer Len Brown Sat, 01 Apr 2006 01:23:23 -0500 ACPI: ACPICA 20060217 Implemented a change to the IndexField support to match the behavior of the Microsoft AML interpreter. The value written to the Index register is now a byte offset, no longer an index based upon the width of the Data register. This should fix IndexField problems seen on some machines where the Data register is not exactly one byte wide. The ACPI specification will be clarified on this point. Fixed a problem where several resource descriptor types could overrun the internal descriptor buffer due to size miscalculation: VendorShort, VendorLong, and Interrupt. This was noticed on IA64 machines, but could affect all platforms. Fixed a problem where individual resource descriptors were misaligned within the internal buffer, causing alignment faults on IA64 platforms. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 08a556db919f67e1e4d33ae8d40f7222da34d994 tree a83cc2c32b0f9996e67c430be200fb55c24444d9 parent 4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2 author Albert Lee Fri, 31 Mar 2006 13:29:04 +0800 committer Jeff Garzik Fri, 31 Mar 2006 10:07:06 -0500 [PATCH] libata-dev: print out information for ATAPI devices with CDB interrupts print out information for ATAPI devices with CDB interrupts Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 52fc0b026e99b5d5d585095148d997d5634bbc25 tree 7bf93132cfd3e6957308a84198ee159f7d43cf6f parent 46358614ed5b031797522f1020e989c959a8d8a6 author Bob Moore Mon, 02 Oct 2006 00:00:00 -0400 committer Len Brown Fri, 31 Mar 2006 02:19:03 -0500 [ACPI] ACPICA 20060210 Removed a couple of extraneous ACPI_ERROR messages that appeared during normal execution. These became apparent after the conversion from ACPI_DEBUG_PRINT. Fixed a problem where the CreateField operator could hang if the BitIndex or NumBits parameter referred to a named object. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5359 Fixed a problem where a DeRefOf operation on a buffer object incorrectly failed with an exception. This also fixes a couple of related RefOf and DeRefOf issues. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5360 http://bugzilla.kernel.org/show_bug.cgi?id=5387 http://bugzilla.kernel.org/show_bug.cgi?id=5392 Fixed a problem where the AE_BUFFER_LIMIT exception was returned instead of AE_STRING_LIMIT on an out-of-bounds Index() operation. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5480 Implemented a memory cleanup at the end of the execution of each iteration of an AML While() loop, preventing the accumulation of outstanding objects. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5427 Eliminated a chunk of duplicate code in the object resolution code. From Valery Podrezov. http://bugzilla.kernel.org/show_bug.cgi?id=5336 Fixed several warnings during the 64-bit code generation. Signed-off-by: Bob Moore Signed-off-by: Len Brown commit 46358614ed5b031797522f1020e989c959a8d8a6 tree 1f342b7a2a2424d3a71750c1d72ed9337a1b59cf parent a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 author Len Brown Fri, 31 Mar 2006 02:16:19 -0500 committer Len Brown Fri, 31 Mar 2006 02:16:19 -0500 Revert "[PATCH] ACPI: fix vendor resource length computation" fixed in a different way by a subsequent ACPICA patch This reverts 35b73ceb9a7d10c81bd9e79e8485f7079ef2b40e commit. commit 6665bda76461308868bd1e52caf627f4cb29ed32 tree 7d4690bc13d631759c3c8f59f72f66b515a02968 parent fdc136ccd3332938e989439c025c363f8479f3e6 author Adrian Bunk Sat, 11 Mar 2006 10:12:00 -0500 committer Len Brown Fri, 31 Mar 2006 01:02:39 -0500 [ACPI] drivers/acpi/video.c: fix error path NULL pointer dereference The Coverity checker spotted this bug in acpi_video_device_lcd_query_levels(). Signed-off-by: Adrian Bunk Signed-off-by: Len Brown commit fdc136ccd3332938e989439c025c363f8479f3e6 tree 6e71b49f8b1ed92fe0c51984e27379acdf2991c3 parent a1f9e65e2085e0a87f28a4d5a8ae43b32c087f24 author Dave Jones Wed, 08 Mar 2006 22:12:00 -0500 committer Len Brown Fri, 31 Mar 2006 01:02:39 -0500 [ACPI] fix possible acpi thermal leak in failure path Coverity: #601 Signed-off-by: Dave Jones Signed-off-by: Len Brown commit a1f9e65e2085e0a87f28a4d5a8ae43b32c087f24 tree 153b66f46d752f45057472b3e64e8c2ac73407c1 parent 1fee94034917aa711fcbd4ebf4c36f7ebd9fa7d6 author Len Brown Wed, 25 Jan 2006 23:47:36 -0500 committer Len Brown Fri, 31 Mar 2006 01:02:39 -0500 [ACPI] document cmdline acpi_os_name= This can sometimes be used to work around broken BIOS. Use "Microsoft Windows" to take the same path through the BIOS as Windows98 would. The default is "Microsoft Windows NT", which is what NT and later versions of Windows use, and is the most tested path through most BIOS. Set it to anything else, including "Linux", at your own risk, as it seems that virtually no BIOS has been tested with anything but the two options above. Note that this uses the legacy _OS interface, so we don't expect this to ever change. Signed-off-by: Len Brown commit 1fee94034917aa711fcbd4ebf4c36f7ebd9fa7d6 tree 2fb60f5c2462654b88764bdf7acfa63a3aa6f4a0 parent ce362c009250340358a7221f3cdb7954cbf19c01 author Irwan Djajadi Fri, 20 Jan 2006 15:28:00 -0500 committer Len Brown Fri, 31 Mar 2006 01:02:39 -0500 [ACPI] drivers/acpi/hotkey.c: check kmalloc return value Signed-off-by: Irwan Djajadi Signed-off-by: Alexey Dobriyan Signed-off-by: Len Brown commit 0eacee585a89ce5827b572a73a024931506bef48 tree 063fb47ffc91fd9863f8314acf2db58001414736 parent ce362c009250340358a7221f3cdb7954cbf19c01 author Len Brown Fri, 31 Mar 2006 00:37:23 -0500 committer Len Brown Fri, 31 Mar 2006 00:37:23 -0500 ACPI: enable BIOS warning http://bugzilla.kernel.org/show_bug.cgi?id=5452 Signed-off-by: Len Brown commit 4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2 tree 664564736e52a88e14d9c699c5c723b89785f4cb parent 74d89c16735d83349ea74232031819e989a49156 parent 55d8ca4f8094246da6e71889a4e04bfafaa78b10 author Jeff Garzik Wed, 29 Mar 2006 19:59:39 -0500 committer Jeff Garzik Wed, 29 Mar 2006 19:59:39 -0500 Merge branch 'upstream' Conflicts: drivers/scsi/sata_mv.c commit 79072f38909e3d9883317238887460c39ddcc4cb tree 28369f5a844535ff836565eefd62695b0e890fa3 parent 200d5a7684cc49ef4be40e832daf3f217e70dfbb parent 55d8ca4f8094246da6e71889a4e04bfafaa78b10 author Jeff Garzik Wed, 29 Mar 2006 19:58:22 -0500 committer Jeff Garzik Wed, 29 Mar 2006 19:58:22 -0500 Merge branch 'upstream' commit 74d89c16735d83349ea74232031819e989a49156 tree 1d8ded9c76b6ebe97c3841bbb986aacd63a801e5 parent 52a3220599647ba429fcbca2388ec35b850fa72f parent 05c8e0ac5c37e9739a852b526afeecae97607cbb author Jeff Garzik Wed, 29 Mar 2006 17:24:55 -0500 committer Jeff Garzik Wed, 29 Mar 2006 17:24:55 -0500 Merge branch 'upstream' commit 52a3220599647ba429fcbca2388ec35b850fa72f tree 7c2c775c130d852c94029807cb4a061e7d96dcbd parent 71601958f73b952281f2b02e16d1f11c99ee0a8b author Albert Lee Sat, 25 Mar 2006 18:18:15 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:22:36 -0500 [PATCH] libata-dev: wait idle after reading the last data block Some CD-ROM drives are slow to clear DRQ, after the last data block is read by PIO. Use ata_wait_idle() after reading the last data block. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 71601958f73b952281f2b02e16d1f11c99ee0a8b tree 87d7c55a27f0553f901b0c3ef4dfef792a3f946c parent 999bb6f4260f9499fdeab3f8fdcd8b9013eca39e author Albert Lee Sat, 25 Mar 2006 18:11:12 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:22:36 -0500 [PATCH] libata-dev: fix the device err check sequence (respin) Current irq-pio checks ERR bit and stops on ERR before it does anything else. This behavior doesn't look right. The DRQ bit should take higher precedence than the ERR bit. Changes: - Let the HSM do the data transfer whenever the device asks for DRQ bit, even if the ERR bit is set. - For DRQ=1 ERR=1, don't trust the data Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 999bb6f4260f9499fdeab3f8fdcd8b9013eca39e tree 9ba633841e27207bdbe9e08b76ee912962dd400e parent c234fb00ea8999076728137d96603b713ad8b53f author Albert Lee Sat, 25 Mar 2006 18:07:48 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:22:36 -0500 [PATCH] libata-dev: irq-pio minor fixes (respin) irq-pio minor fixes for printk() and comments. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c234fb00ea8999076728137d96603b713ad8b53f tree 7490f2ff6546c493a41e85fbc36571f4c5b5e6c9 parent c2bbc551615c21a4c280c797987dbb50f2701594 author Albert Lee Sat, 25 Mar 2006 17:58:38 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: Make the the in_wq check as an inline function Make the the in_wq check easier to read as an inline function. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c2bbc551615c21a4c280c797987dbb50f2701594 tree 8f23c49dceec2123663377c4750ea48fb46d8fea parent 27cdadef6dfe0d0614653919a110fc75ab1650ce author Albert Lee Sat, 25 Mar 2006 17:56:55 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: ata_check_atapi_dma() fix for ATA_FLAG_PIO_POLLING LLDDs ata_check_atapi_dma() fix for LLDDs with the ATA_FLAG_PIO_POLLING flag. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 27cdadef6dfe0d0614653919a110fc75ab1650ce tree 88c762ec72b2f09ef7aab5acdd8d3888b5c50758 parent a1af37344f669d0fefa8c8a9e37eb6a7c086a2c2 author Albert Lee Sat, 25 Mar 2006 17:53:57 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: Cleanup unused enums/functions Cleanup the following unused functions: - ata_pio_poll() - ata_pio_complete() - ata_pio_first_block() - ata_pio_block() - ata_pio_error() ap->pio_task_timeout and other enums. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit a1af37344f669d0fefa8c8a9e37eb6a7c086a2c2 tree 8a24383b850349d59917680700829d2ac25750b2 parent bb5cb290f095f17f88c912e3da35adf5b2d9500b author Albert Lee Sat, 25 Mar 2006 17:50:15 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: Convert ata_pio_task() to use the new ata_hsm_move() Convert ata_pio_task() to use the new ata_hsm_move(). Changes: - refactor ata_pio_task() to poll device status register and - call the new ata_hsm_move() when device indicates it is not BSY. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit bb5cb290f095f17f88c912e3da35adf5b2d9500b tree cf8cbbfc3419988f869b4527c8be5d63361b3eb2 parent 6912ccd5a4a095d71fd7215ef2abea877c8fed6f author Albert Lee Sat, 25 Mar 2006 17:48:02 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:54 -0500 [PATCH] libata-dev: Let ata_hsm_move() work with both irq-pio and polling pio Let ata_hsm_move() work with both irq-pio and polling pio codepath. Changes: - add a new parameter "in_wq" for polling pio - add return value "poll_next" to tell polling pio task whether the HSM is finished - merge code from ata_pio_first_block() to the HSM_ST_FIRST state. - call ata_poll_qc_complete() if called from the workqueue Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 6912ccd5a4a095d71fd7215ef2abea877c8fed6f tree e8381968de60c1e92e98b8c35b828ab1c44ca573 parent e2cec77117a6e4fcbac2601e2f7b0b3f4f5a4c84 author Albert Lee Sat, 25 Mar 2006 17:45:49 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Minor fix for ata_hsm_move() to work with ata_host_intr() Minor fix for ata_hsm_move() to work with ata_host_intr(). Changes: - WARN_ON() and comment fix - Make the HSM_ST_LAST device status checking more rigid. - Treat unknown HSM state as BUG(). Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit e2cec77117a6e4fcbac2601e2f7b0b3f4f5a4c84 tree d1cbdf9f959c7d4584bca1e850fa9719b61bc99d parent 19d5d7309a928eb86f58b37165a2d501621ae3c0 author Albert Lee Sat, 25 Mar 2006 17:43:49 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Move out the HSM code from ata_host_intr() Move out the irq-pio HSM code from ata_host_intr() to the new ata_hsm_move() function verbatim. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 19d5d7309a928eb86f58b37165a2d501621ae3c0 tree e811e0a3fa2786cd3b05a7fbb5037e9928737a29 parent 13ee4628ce68d1e54df01cc31239c8887c59e65d author Albert Lee Sat, 25 Mar 2006 17:41:43 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Remove atapi_packet_task() atapi_packet_task() was replaced by ata_pio_task(). Remove the unused atapi_packet_task(). Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 13ee4628ce68d1e54df01cc31239c8887c59e65d tree 7d77a0b9e45b437c112d66d4968d5ae24a77e3cf parent cf2f7689f94ee02e52d5331bc1a87421a67a882c author Albert Lee Sat, 25 Mar 2006 17:39:34 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Fix merge problem with upstream Fix merge problem with upstream. Changes: 1. add missing dev->cdb_len = 16 for ATA devices 2. use ata_pio_task instead of atapi_packet_task Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit cf2f7689f94ee02e52d5331bc1a87421a67a882c tree a356e551197ecc9852d5678cbff554119843440c parent 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 author Albert Lee Sat, 25 Mar 2006 17:37:53 +0800 committer Jeff Garzik Wed, 29 Mar 2006 17:21:53 -0500 [PATCH] libata-dev: Remove trailing whitespaces Remove trailing whitespaces. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 9cfda2c94df61c9f859b474abe774c65a4464d0a tree d6fa93519c2182f89d36c59dd9176dec264e8594 parent 5d5d7727a8cde78f798ecf04bac8031eff536f9d author Andi Kleen Mon, 27 Mar 2006 02:24:32 -0500 committer Len Brown Mon, 27 Mar 2006 02:33:00 -0500 [ACPI] fix "nolapic" flag in ACPI mode Signed-off-by: Len Brown commit 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 tree c4ff89dc09abe69d58db1e14da22ecda9fdd3ce8 parent 84ac69e8bf9f36eb0166817373336d14fa58f5cc parent aec5c3c1a929d7d79a420e943285cf3ba26a7c0d author Jeff Garzik Fri, 24 Mar 2006 12:29:39 -0500 committer Jeff Garzik Fri, 24 Mar 2006 12:29:39 -0500 Merge branch 'upstream' Conflicts: drivers/scsi/libata-core.c commit 84ac69e8bf9f36eb0166817373336d14fa58f5cc tree 46325313df2311680c8e11a828c243f5dccb3407 parent 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e author Jeff Garzik Fri, 24 Mar 2006 09:27:49 -0500 committer Jeff Garzik Fri, 24 Mar 2006 09:27:49 -0500 [libata] irq-pio: fix build breakage commit 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e tree b01421cb139b11065d776ed361a7a12b3a1aecc9 parent 54da9a3968448681d0ddf193ec90f2480c5cba1c parent 2cc432eed0491df66e14b578139bba2c75fb3f9a author Jeff Garzik Fri, 24 Mar 2006 09:24:04 -0500 committer Jeff Garzik Fri, 24 Mar 2006 09:24:04 -0500 Merge branch 'upstream' Conflicts: drivers/scsi/sata_vsc.c commit 200d5a7684cc49ef4be40e832daf3f217e70dfbb tree 44f51433004ed93a750342c3216bdda1c864b1fc parent 949ec2c8e6b7b89179b85baf6309c009e1a1b951 author Tejun Heo Wed, 15 Feb 2006 16:24:49 +0900 committer Jeff Garzik Wed, 22 Mar 2006 07:47:42 -0500 [PATCH] libata: increase LBA48 max sectors to 65535 max_hw_sectors/max_sectors separation patch made into the tree, increase max_sectors to its hardware limit. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 54da9a3968448681d0ddf193ec90f2480c5cba1c tree 69fdbaf8fb9cc61629e191b158a51073bd0c83fb parent 46e202ec1feeac3cb722cd3410d62a9a00891388 parent 2f7ccc51db9f10ed2eaa4cd1777181972a23754e author Jeff Garzik Sat, 11 Mar 2006 20:07:36 -0500 committer Jeff Garzik Sat, 11 Mar 2006 20:07:36 -0500 Merge branch 'upstream' commit 46e202ec1feeac3cb722cd3410d62a9a00891388 tree 158643d029b35d0ae7c10b52d522c516d80a3a8a parent ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 author Jeff Garzik Sat, 11 Mar 2006 19:25:47 -0500 committer Jeff Garzik Sat, 11 Mar 2006 19:25:47 -0500 libata: irq-pio build fixes commit ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 tree a7c0d18d6486734dffb9498e30db5b226b6e23bf parent c2956a3b0d1c17b38da369811a6ce93eb7a01a04 parent 75deb6fa985bd3162b9472f1fc394e23294da816 author Jeff Garzik Sat, 11 Mar 2006 19:21:17 -0500 committer Jeff Garzik Sat, 11 Mar 2006 19:21:17 -0500 Merge branch 'upstream' commit c2956a3b0d1c17b38da369811a6ce93eb7a01a04 tree 4b70c386afe2547908a8f03f0746ff614eb393e0 parent 801c63c38ae52e8bfb3f6518de00a0be22c55f9a author Albert Lee Fri, 03 Mar 2006 10:34:05 +0800 committer Jeff Garzik Fri, 03 Mar 2006 12:19:43 -0500 [PATCH] libata-dev: recognize WRITE_MULTI_FUA_EXT for r/w multiple Recognize ATA_CMD_WRITE_MULTI_FUA_EXT as r/w multiple commands. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 801c63c38ae52e8bfb3f6518de00a0be22c55f9a tree bb7b9539f2f2b8077a04c2df3b60ac8cc8fa692d parent 1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 parent 348edc59a8f9b9a66700781d972c24a46a79ae86 author Jeff Garzik Fri, 03 Mar 2006 12:16:03 -0500 committer Jeff Garzik Fri, 03 Mar 2006 12:16:03 -0500 Merge branch 'upstream' commit 1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 tree 7f30dbdccd6c28aa4e8f2c9edb7813a7ae78097b parent 11fff8287fdaeb700df79aa8253650b60c7b21e2 parent cccc65a3b60edaf721cdee5a14f68ba009341822 author Jeff Garzik Mon, 27 Feb 2006 11:51:52 -0500 committer Jeff Garzik Mon, 27 Feb 2006 11:51:52 -0500 Merge branch 'upstream' commit 11fff8287fdaeb700df79aa8253650b60c7b21e2 tree a0b695f44810b4cf8c4b3f81dd25811a10871003 parent a5fd79ccd60b7c9cc0221dfaaa950933eff6af99 parent f131883e73a8662dc92c3ea371ae9ded0c8f2c37 author Jeff Garzik Mon, 20 Feb 2006 16:56:08 -0500 committer Jeff Garzik Mon, 20 Feb 2006 16:56:08 -0500 Merge branch 'upstream' commit a5fd79ccd60b7c9cc0221dfaaa950933eff6af99 tree b227d75acaa3c3c45a82a0ee536a8723452e62ab parent ff607748590fba14aecedb0d50edc4ada98d4302 author Jeff Garzik Mon, 20 Feb 2006 05:21:14 -0500 committer Jeff Garzik Mon, 20 Feb 2006 05:21:14 -0500 sata_vsc build fix commit ff607748590fba14aecedb0d50edc4ada98d4302 tree 986e0a3abe922713069a8e8bc913043fed89a39a parent db024d5398cd332023896caf70530564b15ec88e parent 6aff8f1f07a7fff48121d1ad4a550f3af24ccc81 author Jeff Garzik Mon, 20 Feb 2006 05:13:31 -0500 committer Jeff Garzik Mon, 20 Feb 2006 05:13:31 -0500 Merge branch 'upstream' commit db024d5398cd332023896caf70530564b15ec88e tree 3d222d99f9264fdc66e7c7ad982d33b42d566c72 parent 3875e1945b55f0eb83fe7359614a801eeb716761 author Jeff Garzik Mon, 13 Feb 2006 00:23:57 -0500 committer Jeff Garzik Mon, 13 Feb 2006 00:23:57 -0500 [libata] build fix after cdb_len move commit 3875e1945b55f0eb83fe7359614a801eeb716761 tree 4567aef3fb7d081cb7d7b7c9bcd94e0e44d39557 parent 587005de144acd3007b8e7f2a2a7c6add157c155 parent f1b318793dcd2d9ff6b5ac06e7762098fa079cee author Jeff Garzik Mon, 13 Feb 2006 00:13:48 -0500 committer Jeff Garzik Mon, 13 Feb 2006 00:13:48 -0500 Merge branch 'upstream' commit 587005de144acd3007b8e7f2a2a7c6add157c155 tree edc973e8d9d44a2a2ebc8695f4adda8becd25118 parent 1cb9d721d9df9182a42d1ff59427a100c6522efc author Jeff Garzik Sat, 11 Feb 2006 18:17:32 -0500 committer Jeff Garzik Sat, 11 Feb 2006 18:17:32 -0500 [libata irq-pio] s/assert/WARN_ON/ commit 1cb9d721d9df9182a42d1ff59427a100c6522efc tree 3c7d47828f89853de49e979f97ffe78fd1dba7d6 parent ca7d5e42d783e54f0057317c9226262d68ab7717 parent bef4a456b8dc8b3638f4d49a25a89e1467da9483 author Jeff Garzik Sat, 11 Feb 2006 18:02:04 -0500 committer Jeff Garzik Sat, 11 Feb 2006 18:02:04 -0500 Merge branch 'upstream' commit ca7d5e42d783e54f0057317c9226262d68ab7717 tree 209751546842e1200bfbd2fd5144e1727ab18c86 parent a0819750024a0056d760a936d72f76882a7e393f parent cc9278ed5e992122a654a3f762561ee5e013810f author Jeff Garzik Fri, 10 Feb 2006 07:09:37 -0500 committer Jeff Garzik Fri, 10 Feb 2006 07:09:37 -0500 Merge branch 'upstream' commit a0819750024a0056d760a936d72f76882a7e393f tree 4d3e5a22b13e5a8ac3553fca1cedd9c689235138 parent 41232d3ecac9df8eb94ff27330eb84b8baccc6b7 parent 1fdffbce0332b3e00993d741e76935e7f4f0d40f author Jeff Garzik Thu, 09 Feb 2006 05:15:47 -0500 committer Jeff Garzik Thu, 09 Feb 2006 05:15:47 -0500 Merge branch 'upstream' commit 41232d3ecac9df8eb94ff27330eb84b8baccc6b7 tree e10e3b23dbb12c021270c8026c52abc7d0fe14c0 parent 2ddd1023d2ccde0b330338c48ab898b153f37712 author Jeff Garzik Thu, 09 Feb 2006 04:52:55 -0500 committer Jeff Garzik Thu, 09 Feb 2006 04:52:55 -0500 [libata] build fix after merging some pre-packet_task-removal code commit 2ddd1023d2ccde0b330338c48ab898b153f37712 tree 7f4f99bb6af63d638c1fcbc482c07f3908ffaf99 parent 99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed parent 389984cb75a5d26aa6ee9724c343bbd130cb3eec author Jeff Garzik Thu, 09 Feb 2006 04:31:08 -0500 committer Jeff Garzik Thu, 09 Feb 2006 04:31:08 -0500 Merge branch 'upstream' commit 99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed tree 6f977546112ccbd617ef40ae38a1ca558d71bce9 parent 332b5a52f2f96bc2d13bbe594a430318c0ee4425 parent 8a19ac89edbe9b702c10fd2039b8cb2db4644a5f author Jeff Garzik Thu, 09 Feb 2006 04:28:13 -0500 committer Jeff Garzik Thu, 09 Feb 2006 04:28:13 -0500 Merge branch 'upstream' commit 332b5a52f2f96bc2d13bbe594a430318c0ee4425 tree 6dd2a6c2689a1e0b848a90599c27270456ab69a3 parent 555a8965069b8e34292cbccc3ad8f619b96815fe author Albert Lee Wed, 08 Feb 2006 16:51:34 +0800 committer Jeff Garzik Thu, 09 Feb 2006 04:26:13 -0500 [PATCH] libata-dev: Minor comment fix Signed-off-by: Albert Lee === Signed-off-by: Jeff Garzik commit 555a8965069b8e34292cbccc3ad8f619b96815fe tree 4e28970fa7b2abea9507ca4c19ef3a0baac23ca4 parent 20ea079e5883ab2b82fa5e576957f52e4e5c252c author Albert Lee Wed, 08 Feb 2006 16:50:29 +0800 committer Jeff Garzik Thu, 09 Feb 2006 04:26:13 -0500 [PATCH] libata-dev: Use new AC_ERR_* flags - Use new AC_ERR_* flags as done in Tejun's patches - In ata_qc_timeout(), replace ac_err_mask(drv_stat) with AC_ERR_TIMEOUT. This makes time out handler always report error to upper layer. Otherwise if the drv_stat looks good, libata might falsely report OK to the upper layer. Signed-off-by: Albert Lee === Signed-off-by: Jeff Garzik commit 20ea079e5883ab2b82fa5e576957f52e4e5c252c tree b29d55ec3c4e4df846914365ad0c5a7eecbb2408 parent aef9d533da2eb7a5700a8c8700f2597c35cc50d1 author Albert Lee Wed, 08 Feb 2006 16:48:49 +0800 committer Jeff Garzik Thu, 09 Feb 2006 04:26:12 -0500 [PATCH] libata-dev: Use new ata_queue_pio_task() for PIO polling task - Use new ata_queue_pio_task() for PIO polling task. - Remove the unused ata_queue_packet_task() function. (irq-pio had merged the 2 queues into one.) Signed-off-by: Albert Lee === Signed-off-by: Jeff Garzik commit aef9d533da2eb7a5700a8c8700f2597c35cc50d1 tree fffe44eb7b843dafd101b3dee6b99330086ddaec parent f6ef65e6d004b77d516037424c7ccc209d0d3509 author Albert Lee Wed, 08 Feb 2006 16:37:43 +0800 committer Jeff Garzik Thu, 09 Feb 2006 04:26:12 -0500 [PATCH] libata-dev: Fix array index value in ata_rwcmd_protocol() Signed-off-by: Albert Lee === Signed-off-by: Jeff Garzik commit d52bb94d56676acd9bdac8e097257a87b4b1b2e1 tree f8b2d60d74eeb045860983ebeb1696869973ac6e parent c52851b60cc0aaaf974ff0e49989fb698220447d author Venkatesh Pallipadi Wed, 14 Dec 2005 15:05:00 -0500 committer Len Brown Thu, 09 Feb 2006 03:21:49 -0500 Enable P-state software coordination via _PDC http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit c52851b60cc0aaaf974ff0e49989fb698220447d tree 37870e68caedb1a732833cd8868de28bbf97b8c4 parent 09b4d1ee881c8593bfad2a42f838d85070365c3e author Venkatesh Pallipadi Wed, 14 Dec 2005 15:05:00 -0500 committer Len Brown Thu, 09 Feb 2006 03:21:49 -0500 P-state software coordination for speedstep-centrino http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 09b4d1ee881c8593bfad2a42f838d85070365c3e tree 7576d293ed3d14efcde7b88dcc352041c7dce7d1 parent 3b2d99429e3386b6e2ac949fc72486509c8bbe36 author Venkatesh Pallipadi Wed, 14 Dec 2005 15:05:00 -0500 committer Len Brown Thu, 09 Feb 2006 03:21:49 -0500 P-state software coordination for acpi-cpufreq http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 3b2d99429e3386b6e2ac949fc72486509c8bbe36 tree b2162152b2c7fa56b13f74a0b166b978dd3ee548 parent 0bdd340c092b0936f78a54bdbd3927463ed4fca3 author Venkatesh Pallipadi Wed, 14 Dec 2005 15:05:00 -0500 committer Len Brown Thu, 09 Feb 2006 03:21:48 -0500 P-state software coordination for ACPI core http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit ffd642e748c867a7339b57225b8bf8b9a0dcd9c5 tree 4e924eab664b99c87a59e4603f60c5002901ccbb parent 0bdd340c092b0936f78a54bdbd3927463ed4fca3 author David Shaohua Li Wed, 08 Feb 2006 17:35:00 -0500 committer Len Brown Thu, 09 Feb 2006 00:38:04 -0500 [ACPI] enable SMP C-states on x86_64 http://bugzilla.kernel.org/show_bug.cgi?id=5653 Signed-off-by: David Shaohua Li Signed-off-by: Len Brown commit f6ef65e6d004b77d516037424c7ccc209d0d3509 tree 394bac3559237abb94be5051828b3e45315d6489 parent 7103c7bc863c10dd2a26c19c8cf4d7d2846da947 parent c19ba8af4f104cca28d548cac55c128b28dd31fb author Jeff Garzik Fri, 27 Jan 2006 02:45:00 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:45:00 -0500 Merge branch 'upstream-2.6.17' commit 7103c7bc863c10dd2a26c19c8cf4d7d2846da947 tree 73a9d674670c37e4f160c0d4553f3d14664900be parent b4d28889f7ebfe498dedaceb773b4c785b97d195 parent a72ec4ce6d3ae92e76baf5b2c65cc26e5e775e83 author Jeff Garzik Fri, 27 Jan 2006 02:39:25 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:39:25 -0500 Merge branch 'tmp' commit b4d28889f7ebfe498dedaceb773b4c785b97d195 tree 7ac1070f4c956d035f40cc3b381b5868b980fafa parent 7dfb869c8e45e5863534f38fdac990829b22964a parent 041c5fc33cb7ed4fe5322585a611fb6e29a05d3a author Jeff Garzik Fri, 27 Jan 2006 02:37:46 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:37:46 -0500 Merge branch 'tmp' commit 7dfb869c8e45e5863534f38fdac990829b22964a tree f36bbdba46b022356d05ac26d5073e395d2f8abd parent 628e386e27674906326455f01d87878a5f0cbce7 parent 11a56d2439259892319df81cf1582687d7e7fde5 author Jeff Garzik Fri, 27 Jan 2006 02:36:14 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:36:14 -0500 Merge branch 'tmp' commit 628e386e27674906326455f01d87878a5f0cbce7 tree 932163636366f5dcd6f9b3ee90a37fe0f21285b0 parent 8dd2e3bd57c3b389febba1de6b10372ef507f985 parent 77853bf2b48e34449e826a9ef4df5ea0dbe947f4 author Jeff Garzik Fri, 27 Jan 2006 02:29:20 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:29:20 -0500 Merge branch 'tmp' commit 8dd2e3bd57c3b389febba1de6b10372ef507f985 tree 1fdb120ec9c0c81f8f2a9452ae6c225d68aed5e3 parent 2af5920b81a4cd0a22d40b6b2c38356d3df03e13 parent 71e834f563799e09c6bd7d6638993b464fac26f5 author Jeff Garzik Fri, 27 Jan 2006 02:26:46 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:26:46 -0500 Merge branch 'tmp' commit 2af5920b81a4cd0a22d40b6b2c38356d3df03e13 tree 7ee66d514e394f70f12a608548487353d506215d parent 000080c3499cd5037e60c08a8053efb9e48aa9c0 parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 author Jeff Garzik Fri, 27 Jan 2006 02:20:42 -0500 committer Jeff Garzik Fri, 27 Jan 2006 02:20:42 -0500 Merge branch 'master' commit 000080c3499cd5037e60c08a8053efb9e48aa9c0 tree 9b3534675d986ad1d2982bc78a93f1a3912d61bc parent a4f16610081001640ffe0314024bc31c10f69757 author Albert Lee Mon, 26 Dec 2005 16:48:00 +0800 committer Jeff Garzik Tue, 17 Jan 2006 19:55:03 -0500 [PATCH] libata-dev: filter out noisy ATAPI error messages Changes: - Filter out ATAPI packet command error messages in ata_pio_error() - Filter out ATAPI packet command error messages in ata_host_intr() Signed-off-by: Albert Lee ====== Signed-off-by: Jeff Garzik commit a4f16610081001640ffe0314024bc31c10f69757 tree ed2586027ef02a9d195dd00e5c61ab1728afee24 parent ea9b395fe20ac74be788f415af2622ac8f0c35c7 author Albert Lee Mon, 26 Dec 2005 16:40:53 +0800 committer Jeff Garzik Tue, 17 Jan 2006 19:55:03 -0500 [PATCH] libata-dev: determine err_mask when error is found Changes: - Determine err_mask directly when an error is found. - Remove "qc->err_mask |= __ac_err_mask(status);" in ata_host_intr() Signed-off-by: Albert Lee ============ Signed-off-by: Jeff Garzik commit ea9b395fe20ac74be788f415af2622ac8f0c35c7 tree d1653e1a4cbe360aa7132ea4e29ab92a02038224 parent 61420e147a706ee7c7a902008045547fb2a2a330 parent 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 author Jeff Garzik Tue, 17 Jan 2006 10:29:06 -0500 committer Jeff Garzik Tue, 17 Jan 2006 10:29:06 -0500 Merge branch 'upstream' commit 61420e147a706ee7c7a902008045547fb2a2a330 tree c5739fe1feac05cac49c96107138520c65f8f657 parent 3d0a59c02303df01848537b3bf938dc11e9a0ded parent a18ceba7b40e24a9da87249bd74f16ea5abd6894 author Jeff Garzik Tue, 03 Jan 2006 11:00:06 -0500 committer Jeff Garzik Tue, 03 Jan 2006 11:00:06 -0500 Merge branch 'upstream' commit 3d0a59c02303df01848537b3bf938dc11e9a0ded tree 69740a2e39a805ec1318253c2349c09cdf6da9cc parent 36dfc3f67b3054e6bbc5344256461802aa5d6257 author Jeff Garzik Tue, 13 Dec 2005 22:28:19 -0500 committer Jeff Garzik Tue, 13 Dec 2005 22:28:19 -0500 [libata sata_promise] irq_pio: fix merge bug commit 36dfc3f67b3054e6bbc5344256461802aa5d6257 tree 760f07b428964b0c0961deabe2f2bb0f54155142 parent e8b09428482deff1a9d7a36d371acee364182ec3 parent c6329f4df2263ab5a40601a5236639e61b682f51 author Jeff Garzik Tue, 13 Dec 2005 22:22:50 -0500 committer Jeff Garzik Tue, 13 Dec 2005 22:22:50 -0500 Merge branch 'upstream' commit e8b09428482deff1a9d7a36d371acee364182ec3 tree d6494c2681ac7f0ca0b267a8ac80f2d23102758c parent d1397f837647d8b6b3c9253a7e713d203f3cbb26 parent e508a391a0705f770ef1c4f1c304678b0e8e4fe8 author Jeff Garzik Tue, 13 Dec 2005 02:32:01 -0500 committer Jeff Garzik Tue, 13 Dec 2005 02:32:01 -0500 Merge branch 'upstream' commit d1397f837647d8b6b3c9253a7e713d203f3cbb26 tree 0bfe939169987703e63f3624d5dbb38938253760 parent 278efe950988e72e2d0cea35059438fc27035d13 parent d00d598ffbba974d9045ba8b95296655fe2162c5 author Jeff Garzik Tue, 13 Dec 2005 01:47:05 -0500 committer Jeff Garzik Tue, 13 Dec 2005 01:47:05 -0500 Merge branch 'upstream' commit 278efe950988e72e2d0cea35059438fc27035d13 tree 76096041fa7eeb2b6ecd5dcc8207012952d2bbc2 parent 701db69d6647f61e4660c9102d7f2fd5dffc203d author Jeff Garzik Tue, 06 Dec 2005 05:01:27 -0500 committer Jeff Garzik Tue, 06 Dec 2005 05:01:27 -0500 [libata] irq-pio: fix breakage related to err_mask merge commit 701db69d6647f61e4660c9102d7f2fd5dffc203d tree e3ebe94f72b4bbdfad608d77d7b11719022b8c9b parent 6cf5bcaaf9a92225017f7a3f1a630f6b5147ad4a parent fe79e683ccdb29c13b3e0d18507474b4e2d9aab6 author Jeff Garzik Tue, 06 Dec 2005 04:52:48 -0500 committer Jeff Garzik Tue, 06 Dec 2005 04:52:48 -0500 Merge branch 'upstream' commit 6cf5bcaaf9a92225017f7a3f1a630f6b5147ad4a tree bf5fead8ac5333346b17d34a1d2f8f9d5dc608be parent 6fc88198961141c2d9d34cde0855fb2e85ea3382 parent 436b0f76f2cee6617f27a649637766628909dd5d author Jeff Garzik Tue, 06 Dec 2005 04:14:25 -0500 committer Jeff Garzik Tue, 06 Dec 2005 04:14:25 -0500 Merge branch 'master' commit 6fc88198961141c2d9d34cde0855fb2e85ea3382 tree 8b8919de6277e77763b7a584fe2b2867c96cefd0 parent 5f3fdeb6242d84126e4bd45ac9e2246833fe8352 parent 5666c0947ede0432ba5148570aa66ffb9febff5b author Jeff Garzik Thu, 01 Dec 2005 01:59:38 -0500 committer Jeff Garzik Thu, 01 Dec 2005 01:59:38 -0500 Merge branch 'master' commit 5f3fdeb6242d84126e4bd45ac9e2246833fe8352 tree 011ff83db06c9d42c72544e8c10c06c978ba88ce parent 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 parent b71d4da092801634d04190693a38ca03bdbe2505 author Jeff Garzik Tue, 29 Nov 2005 03:57:29 -0500 committer Jeff Garzik Tue, 29 Nov 2005 03:57:29 -0500 Merge branch 'upstream' commit 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 tree 456799ad9fce41cdb2186ba3872c7a077ec3bd05 parent d67e7ebb2a15bf0429c55f2fc1c4b02808367874 parent 1b15688b31d8c88881102426279e8cc03953860b author Jeff Garzik Sun, 20 Nov 2005 00:41:18 -0500 committer Jeff Garzik Sun, 20 Nov 2005 00:41:18 -0500 Merge branch 'upstream' commit d67e7ebb2a15bf0429c55f2fc1c4b02808367874 tree 069547c95e376312fc0e7a51637a7a3c2a7c5c50 parent f333b3f111e9db76109e304df8ee777ace7fbf86 author Jeff Garzik Fri, 18 Nov 2005 11:55:00 -0500 committer Jeff Garzik Fri, 18 Nov 2005 11:55:00 -0500 [libata sata_mv] IRQ PIO build fix commit f333b3f111e9db76109e304df8ee777ace7fbf86 tree ce9a74a7327020c48c80d278e1db5f12552f0fb0 parent f4256e301d9800b1e0276404cb01b3ac85b51067 parent 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb author Jeff Garzik Fri, 18 Nov 2005 11:44:17 -0500 committer Jeff Garzik Fri, 18 Nov 2005 11:44:17 -0500 Merge branch 'upstream' commit f4256e301d9800b1e0276404cb01b3ac85b51067 tree 975f56627b78f757608b31684311a24ca1478481 parent fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 parent cd52d1ee9a92587b242d946a2300a3245d3b885a author Jeff Garzik Fri, 11 Nov 2005 23:39:35 -0500 committer Jeff Garzik Fri, 11 Nov 2005 23:39:35 -0500 Merge branch 'master' commit fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 tree 9019fb641794f0a3962d45621e6e5ffb0a8acaf6 parent 07f6f7d074e68d56d82e7cc5c65096033ac8dc56 parent 7c3983357fdaef3ae71a0d7081a4b6dcfd869d39 author Jeff Garzik Wed, 09 Nov 2005 01:35:03 -0500 committer Jeff Garzik Wed, 09 Nov 2005 01:35:03 -0500 Merge branch 'upstream' commit 07f6f7d074e68d56d82e7cc5c65096033ac8dc56 tree d420722be7721691e5c56dc5a0ff326e926a58e6 parent fbcdd80b0d5bde06f3483b9a13f9599a0452431c author Albert Lee Tue, 01 Nov 2005 19:33:20 +0800 committer Jeff Garzik Wed, 09 Nov 2005 01:22:19 -0500 [PATCH] libata irq-pio: add read/write multiple support - add is_multi_taskfile() to ata.h - initialize ata_device->multi_count with device identify data - use ata_pio_sectors() to support r/w multiple commands Signed-off-by: Albert Lee ======== Signed-off-by: Jeff Garzik commit fbcdd80b0d5bde06f3483b9a13f9599a0452431c tree d0fa83e2c4fc52fe44940524843a53b864f35adc parent e27486db89ef04d5df1727c52362fa3d50cff241 author Albert Lee Tue, 01 Nov 2005 19:30:05 +0800 committer Jeff Garzik Wed, 09 Nov 2005 01:22:19 -0500 [PATCH] libata irq-pio: eliminate unnecessary queuing in ata_pio_first_block() - change the return value of ata_pio_complete() 0 <-> 1 - add return value for ata_pio_first_block() - rename variable "qc_completed" to "has_next" in ata_pio_task() - use has_next to eliminate unnecessary queuing in ata_pio_first_block() Signed-off-by: Albert Lee ========== Signed-off-by: Jeff Garzik commit e27486db89ef04d5df1727c52362fa3d50cff241 tree cd78598ac47f541f51b5d729ea9cf31bdfa10e56 parent 467b16d4bebe8d251ca974eaa5da50b315206e9d author Albert Lee Tue, 01 Nov 2005 19:24:49 +0800 committer Jeff Garzik Wed, 09 Nov 2005 01:22:19 -0500 [PATCH] libata irq-pio: merge the ata_dataout_task workqueue with ata_pio_task workqueue - remove ap->dataout_task from struct ata_port - let ata_pio_task() handle the HSM_ST_FIRST state. - rename ata_dataout_task() to ata_pio_first_block() - replace the ata_dataout_task workqueue with ata_pio_task workqueue Signed-off-by: Albert Lee ======== Signed-off-by: Jeff Garzik commit 467b16d4bebe8d251ca974eaa5da50b315206e9d tree b9e2892e19e52f5889b16b14b1463958a900f51f parent c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 author Albert Lee Tue, 01 Nov 2005 19:19:01 +0800 committer Jeff Garzik Wed, 09 Nov 2005 01:22:19 -0500 [PATCH] libata irq-pio: misc fixes - ata_pio_block(): add ata_altstatus(ap) to prevent reading device status before it is valid - remove the unnecessary HSM_ST_IDLE state from ata_pio_task() - raise BUG() when unknown state is found in ata_pio_task() Signed-off-by: Albert Lee ============ Signed-off-by: Jeff Garzik commit c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 tree 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d parent 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 parent 8e8b77dd4846b73f2e0756cf59123ee709246d11 author Jeff Garzik Wed, 09 Nov 2005 01:20:26 -0500 committer Jeff Garzik Wed, 09 Nov 2005 01:20:26 -0500 Merge branch 'upstream' commit 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 tree 41758e4da78f94a20813554ef9f5ed9b323a4f8c parent cd8200e6d4f9f05e6ea48f7c000be890337396ac parent 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab author Jeff Garzik Sat, 05 Nov 2005 15:44:02 -0500 committer Jeff Garzik Sat, 05 Nov 2005 15:44:02 -0500 Merge branch 'master' commit cd8200e6d4f9f05e6ea48f7c000be890337396ac tree 2542b1bca535526750e5e1978091beebf4cf282b parent 122401ce39faab22b29eb11b20e4342f7f566b1b parent 005a5a06a6dd13a0ca3f2c6a0218e8d94ed36d8a author Jeff Garzik Sun, 30 Oct 2005 23:35:23 -0500 committer Jeff Garzik Sun, 30 Oct 2005 23:35:23 -0500 Merge branch 'upstream' commit 122401ce39faab22b29eb11b20e4342f7f566b1b tree e164f8fa5decc4b7182e7d66b1634c7fd43b9f7f parent 94ec1ef1cf29e137e5c79372e432b040c6604be6 parent 6e9d6b8ee4e0c37d3952256e6472c57490d6780d author Jeff Garzik Sun, 30 Oct 2005 20:25:28 -0500 committer Jeff Garzik Sun, 30 Oct 2005 20:25:28 -0500 Merge branch 'master' commit 94ec1ef1cf29e137e5c79372e432b040c6604be6 tree dde896c04e1684489f2019a527ee0c3fb0892c0c parent fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 author Jeff Garzik Sun, 30 Oct 2005 02:15:08 -0500 committer Jeff Garzik Sun, 30 Oct 2005 02:15:08 -0500 [libata pdc_adma] fix for new irq-driven PIO code commit fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 tree cba2597077cf33d122f8d771bf84618cc5374cf6 parent 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 parent 81cfb8864c73230eb1c37753aba517db15cf4d8f author Jeff Garzik Sun, 30 Oct 2005 01:58:41 -0500 committer Jeff Garzik Sun, 30 Oct 2005 01:58:41 -0500 Merge branch 'upstream' commit 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 tree e65562d7300ac653207b1e45ec7e5960ddf78fff parent be697c3f137c9ed808753bbbc5d7751c6e5303fc parent 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e author Jeff Garzik Fri, 28 Oct 2005 12:30:16 -0400 committer Jeff Garzik Fri, 28 Oct 2005 12:30:16 -0400 Merge branch 'master' commit be697c3f137c9ed808753bbbc5d7751c6e5303fc tree b9b71ffe318ea3668a5bf0ed8d1db9cf18a54698 parent 4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283 author Jeff Garzik Tue, 18 Oct 2005 21:27:34 -0400 committer Jeff Garzik Tue, 18 Oct 2005 21:27:34 -0400 [libata pdc_adma] update for removal of ATA_FLAG_NOINTR commit 4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283 tree a802614e01460631c694dfa118642d54c3d5fc79 parent e33b9dfa3008fcaa908dc0c8c472a812c400f839 parent 59a10b172fccaea793352c00fd9065f0a5b4ef70 author Jeff Garzik Tue, 18 Oct 2005 21:23:11 -0400 committer Jeff Garzik Tue, 18 Oct 2005 21:23:11 -0400 Merge branch 'upstream' commit e33b9dfa3008fcaa908dc0c8c472a812c400f839 tree 4a4f65a5ca0407ce67dd822047a687d2cdb431f3 parent 91b8b3132e1870bfe3c4d3a999f13f20fc4e9726 author Jeff Garzik Sun, 09 Oct 2005 09:51:46 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:51:46 -0400 [libata irq-pio] build fix commit 91b8b3132e1870bfe3c4d3a999f13f20fc4e9726 tree adc98107179591d18490e407da4f3e86145ccc6a parent 083958d313f886dc7d00522f2972f90f55c40041 author Albert Lee Sun, 09 Oct 2005 09:48:44 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:48:44 -0400 [libata irq-pio] use PageHighMem() to optimize the kmap_atomic() usage as done in ide-scsi.c Signed-off-by: Albert Lee commit 083958d313f886dc7d00522f2972f90f55c40041 tree 1cc709fc4a4c2441cff1ce29b13a4d5e57a238dc parent 7282aa4b49d08254ff1dcefdf3a2fb01b02ebbe2 author Albert Lee Sun, 09 Oct 2005 09:47:31 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:47:31 -0400 [libata irq-pio] reorganize "buf + offset" in ata_pio_sector() and __atapi_pio_bytes() - relocate DPRINTK("data %s\n", qc->tf.flags & ATA_TFLAG_WRITE ? "write" : "read"); - buf + offset, buf - offset tidy up Signed-off-by: Albert Lee commit 7282aa4b49d08254ff1dcefdf3a2fb01b02ebbe2 tree 37cba0515abcbf19190acd58f4a74227050a5b4d parent f58f8be7f65312f602f7970e7da47a6413e692b0 author Albert Lee Sun, 09 Oct 2005 09:46:07 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:46:07 -0400 [libata irq-pio] reorganize ata_pio_sector() and __atapi_pio_bytes() - move some code out of the kmap_atomic() / kunmap_atomic() zone - remove the redundant "do_write = (qc->tf.flags & ATA_TFLAG_WRITE);" Signed-off-by: Albert Lee commit f58f8be7f65312f602f7970e7da47a6413e692b0 tree f60cc040deebceea1b44082dc713e95687d8527f parent c71c18576d0d8aa4db876c737c3c597c724cf02f parent e710245bb0f980adfb1dfe850e43761a8117c6be author Jeff Garzik Sun, 09 Oct 2005 09:44:07 -0400 committer Jeff Garzik Sun, 09 Oct 2005 09:44:07 -0400 Merge branch 'upstream' commit c71c18576d0d8aa4db876c737c3c597c724cf02f tree f485f9f6491275eded41098a09eaf16ac43f3afc parent 0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8 author Albert Lee Tue, 04 Oct 2005 06:03:45 -0400 committer Jeff Garzik Tue, 04 Oct 2005 06:03:45 -0400 libata: move atapi_send_cdb() and ata_dataout_task() to be near ata_pio_*() functions commit 0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8 tree f081ef10f3067b28a1ee316a8e7292eeda143419 parent 54f00389563c80fa1de250a21256313ba01ca07d parent 2b235826098bb653982894dfc3f70fd029f6c2e4 author Jeff Garzik Mon, 03 Oct 2005 19:48:49 -0400 committer Jeff Garzik Mon, 03 Oct 2005 19:48:49 -0400 Merge libata upstream (which includes C/H/S support) include irq-pio branch. Merge branch 'upstream' commit 54f00389563c80fa1de250a21256313ba01ca07d tree d8f0372ba782b902144f8efbaec6a38d439aad09 parent 86a7397cda08a65bc4f306e812c846e2437b5347 author Albert Lee Fri, 30 Sep 2005 19:14:19 +0800 committer Jeff Garzik Fri, 30 Sep 2005 07:21:06 -0400 [PATCH] libata irq-pio: cleanup ata_qc_issue_prot() ata_qc_issue_prot(): - cleanup and let the PIO data out case always go through the ata_dataout_task() codepath. (Previously for PIO data out case, 2 code pathes were used - irq case goes through ata_data_out_task() codepath. - polling case jumps over the HSM_ST_FIRST state and goes to HSM_ST and ata_pio_task() directly.) ata_dataout_task(): - rearrange the queue_work() code to handle the PIO data out + polling case. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 86a7397cda08a65bc4f306e812c846e2437b5347 tree 05b9153129a271737271066b6efc648a5639e1bc parent f9997be974be40e884e9e8157ded2f2f9aed454c author Albert Lee Fri, 30 Sep 2005 19:11:35 +0800 committer Jeff Garzik Fri, 30 Sep 2005 07:21:06 -0400 [PATCH] libata irq-pio: simplify if condition in ata_dataout_task() - Use if (qc->tf.protocol == ATA_PROT_PIO) instead of if(is_atapi_taskfile()) in ata_dataout_task() Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit f9997be974be40e884e9e8157ded2f2f9aed454c tree 3881cac4d9ac8758ac008054a5e9af88a7184bbf parent c56b14d2a3e32695e13cd49b417da889da744d1c author Albert Lee Fri, 30 Sep 2005 19:09:31 +0800 committer Jeff Garzik Fri, 30 Sep 2005 07:21:06 -0400 [PATCH] libata irq-pio: rename atapi_packet_task() and comments Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit c56b14d2a3e32695e13cd49b417da889da744d1c tree 271722df61c97bd213ad54ac088cd835c09d4d07 parent e50362eccd8809a224cda5f71714a088ba37b2ab author Albert Lee Fri, 30 Sep 2005 19:07:39 +0800 committer Jeff Garzik Fri, 30 Sep 2005 07:21:06 -0400 [PATCH] libata irq-pio: add comments and cleanup Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit e50362eccd8809a224cda5f71714a088ba37b2ab tree 762b753691ef8c4645efaa677b32c57fd33ecbc0 parent 312f7da2824c82800ee78d6190f12854456957af author Albert Lee Tue, 27 Sep 2005 17:39:50 +0800 committer Jeff Garzik Wed, 28 Sep 2005 12:07:13 -0400 [PATCH] libata: interrupt driven pio for LLD libata.h: libata-core: Add ATA_FLAG_PIO_POLLING flag for LLDs that expect interrupt for command completion only. sata_nv.c: sata_vsc.c: irq handler is wrapper around ata_host_intr(), can handle PIO interrupts. sata_promise.c: sata_sx4.c: sata_qstor.c: sata_mv.c: Private irq handler. Polling mode ATA_FLAG_PIO_POLLING used for compatibility. Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik commit 312f7da2824c82800ee78d6190f12854456957af tree 68b3b18a4ddd783a5c75dba688aabf2de0682fb3 parent 14be71f4c5c5ad1e222c5202ee6d234e9c8828b7 author Albert Lee Tue, 27 Sep 2005 17:38:03 +0800 committer Jeff Garzik Wed, 28 Sep 2005 12:07:13 -0400 [PATCH] libata: interrupt driven pio for libata-core - add PIO_ST_FIRST for the state before sending ATAPI CDB or sending "ATA PIO data out" first data block. - add ATA_TFLAG_POLLING and ATA_DFLAG_CDB_INTR flags - remove the ATA_FLAG_NOINTR flag since the interrupt handler is now aware of the states - modify ata_pio_sector() and atapi_pio_bytes() to work in the interrupt context - modify the ata_host_intr() to handle PIO interrupts - modify ata_qc_issue_prot() to initialize states - atapi_packet_task() changed to handle "ATA PIO data out" first data block - support the pre-ATA4 ATAPI device which raise interrupt when ready to receive CDB Signed-off-by: Albert Lee Signed-off-by: Jeff Garzik