aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-11-17
|\
| * [ARM] No need to include asm/proc-fns.h into asm/system.hRussell King2005-11-16
| | | | | | | | | | | | | | | | | | In the old days when arm26/arm32 was combined into the same architecture, proc-fns.h provided the xchg implementation for arm26 CPUs. Since we no longer combine these two, this include is no longer required. Remove it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] sa1111.c needs asm/sizes.hRussell King2005-11-16
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Use unsigned long not u32 in atomic_cmpxchgRussell King2005-11-16
| | | | | | | | | | | | | | | | Since atomic.h does not include types.h, u32 may not be defined. Since atomics are supposed to work on unsigned long quantities, use unsigned long instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Move zone adjustment for SA1111 on SA11x0 platformsRussell King2005-11-16
| | | | | | | | | | | | | | | | | | Unfortunately, using PAGE_SHIFT in asm/arch/memory.h is unsafe, and we can't include asm/page.h into this file because then we have a circular dependency. Move the offending code to arch/arm/common/sa1111.c instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Add linux/compiler.h includes where requiredRussell King2005-11-16
| | | | | | | | | | | | | | | | atomic.h, bitops.h and mmu_context.h are using likely/unlikely. thread_info.h uses __attribute_const__. Hence these files require linux/compiler.h to be included. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 3162/1: S3C2410 - updated defconfigBen Dooks2005-11-16
| | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Minor changes, including add SysRq, selecting the DM9000 as a built-in driver, not as a module, and selecting the framebuffer. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 3161/1: BAST - fix commas on end of structsBen Dooks2005-11-16
| | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Make the use of , on the lsat entry structs consistenent through arch/arm/mach-s3c2410/mach-bast.c Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] 3165/1: fix atomic_cmpxchg() implementation for ARMv6+Nicolas Pitre2005-11-16
| | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre If 'old' and 'oldval' are different then 'res' never gets set. In that case, if ever %0 happened to contain anything but zero (rather likely) then the code will loop forever (or until another CPU just come along and change the atomic value to match 'old' which is rather unlikely). Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] compressed/head.S debugging defaults to asm/arch/debug-macro.SRussell King2005-11-16
| | | | | | | | | | | | | | | | Since we want new platforms to use debug-macro.S, make the decompressor debugging method default to using this include file rather than having new platforms add to an #if defined(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Include asm/hardware.h instead of asm/arch/hardware.hRussell King2005-11-16
| | | | | | | | | | | | Rationalise hardware.h include. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Fix arch-realview/system.h to use __io_address()Russell King2005-11-16
| | | | | | | | | | | | | | Move __io_address to arch-realview/hardware.h, drop core.h from platsmp.c and localtimer.c, and include asm/io.h where required. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'upstream-fixes' of ↵Linus Torvalds2005-11-17
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * | [libata sata_mv] handle lack of hardware nIEN supportJeff Garzik2005-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle errata (it was unintentional on this h/w, whereas its intentional on others) whereby the nIEN bit in Device Control is ignored, leading to a situation where a hardware interrupt completes the qc before the polling code has a chance to. This will get fixed The Right Way(tm) once Albert Lee's irq-pio branch is merged, as the more natural PIO method on this hardware is interrupt-driven.
| * | [libata sata_mv] SATA probe, DMA boundary fixesJeff Garzik2005-11-17
| | | | | | | | | | | | | | | | | | | | | | | | - DMA boundary was being handled incorrectly. Copied the code from ata_fill_sg(), since Marvell has the same DMA boundary needs. (we can't use ata_fill_sg directly since we have different hardware descriptors) - cleaned up the SATA phy reset code, to deal with various errata
| * | [libata] add timeout to commands for which we call wait_completion()Jeff Garzik2005-11-17
| | |
| * | Merge branch 'upstream-fixes'Jeff Garzik2005-11-16
| |\ \
| | * \ Merge branch 'master'Jeff Garzik2005-11-16
| | |\ \
| * | | | Merge branch 'upstream-fixes'Jeff Garzik2005-11-16
| |\| | |
| | * | | [libata] bump versionsJeff Garzik2005-11-16
| | | | |
| | * | | [libata ahci] tone down ATAPI errorsJeff Garzik2005-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ATA devices don't generate many errors, so the preferred method is to printk() when they occur. ATAPI devices generate tons of exceptions during the normal course of operation, so this change skips logging the most common class of errors.
| | * | | [PATCH] libata: honor the transfer cycle time speficied by the EIDE deviceAlbert Lee2005-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following code segment is not functional because the transfer cycle time speficied by the EIDE device is later overwritten by ata_timing_quantize(): /* * If the drive is an EIDE drive, it can tell us it needs extended * PIO/MW_DMA cycle timing. */ if (adev->id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */ memset(&p, 0, sizeof(p)); (snip) ata_timing_merge(&p, t, t, ATA_TIMING_CYCLE | ATA_TIMING_CYC8B); <== uninitialized "t" is used here } /* * Convert the timing to bus clock counts. */ ata_timing_quantize(s, t, T, UT); <== t is overwritten by quantized s The patch has been submitted for ide-timing.h before: http://marc.theaimsgroup.com/?l=linux-ide&m=110820013425454&w=2 Resubmitted for libata. Changes: - Minor fix to honor the following transfer cycle time speficied by the device - id[65]: Minimum Multiword DMA transfer cycle time per word - id[67]: Minimum PIO transfer cycle time without flow control - id[68]: Minimum PIO transfer cycle time with IORDY Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ======= Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [PATCH] sil24: add constantsTejun Heo2005-11-16
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Adds constants for ATAPI support to sata_sil24. This patch is originally from Jeff Garzik <jgarzik@pobox.com>. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | Merge branch 'master'Jeff Garzik2005-11-13
| |\ \ \
| * | | | [libata sata_mv] fix tons of 50XX bugsJeff Garzik2005-11-13
| | | | |
| * | | | [libata sata_mv] call phy fixups during init, as well as phy resetJeff Garzik2005-11-12
| | | | |
| * | | | [libata sata_mv] move code aroundJeff Garzik2005-11-12
| | | | | | | | | | | | | | | | | | | | No content changes. Move 60xx code to be closer to other 60xx code.
| * | | | [libata sata_mv] hardware initialization workJeff Garzik2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | Implement flash reset and PCI reset on 50xx and 60xx. Implement LED enable on 50xx.
| * | | | [libata sata_mv] mv_hw_ops for hardware families; new errataJeff Garzik2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - eliminate a bunch of redundant tests by creating a per-chip-family set of hooks, mv_hw_ops - implement more errata, from newer Marvell GPL'd driver
| * | | | [libata sata_mv] move code aroundJeff Garzik2005-11-12
| | | | | | | | | | | | | | | | | | | | No content change, just prepping up future mv_hw_ops modularization.
| * | | | [libata sata_mv] implement a bunch of errata workaroundsJeff Garzik2005-11-12
| | | | | | | | | | | | | | | | | | | | Based largely on the GPL'd Marvell vendor driver.
| * | | | [libata sata_mv] note driver is "HIGHLY EXPERIMENTAL" in KconfigJeff Garzik2005-11-12
| | | | |
| * | | | [libata sata_mv] trim trailing whitespaceJeff Garzik2005-11-12
| | | | |
| * | | | [libata sata_mv] minor fixesJeff Garzik2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | - clear SError and EDMA irq cause registers, after re-init'ing the phy - move enums with type suffix 'U' to their own enum
* | | | | [PATCH] x86: fix sigaddset() inline asm memory constraintConstantine Gavrilov2005-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to incomplete memory constraints, gcc would miscompile code with sigaddset on i386 if sig arg was const. A quote form Jakub to make the issue clear: "You need either __asm__("btsl %1,%0" : "+m"(*set) : "Ir"(_sig-1) : "cc"); or __asm__("btsl %1,%0" : "=m"(*set) : "Ir"(_sig-1), "m"(*set) : "cc"); because the btsl instruction doesn't just set the memory to some value, but needs to read its previous content as well. If you don't tell that fact to GCC, GCC is of course free to optimize as if the asm was just setting the value and not depended on the previous value." Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | [PATCH] ipw2200: fix error log offset calculationZhu Yi2005-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a slab corruption issue in the ipw2200 driver: it essentially multiplied the error log number _twice_ by the size of the error element entry (once explicitly in the code, and once implicitly as part of the regular pointer arithmetic). Cc: Henrik Brix Andersen <brix@gentoo.org> Cc: Bernard Blackham <bernard@blackham.com.au> Cc: Zilvinas Valinskas <zilvinas@gemtek.lt> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org> --
* | | | | [PATCH] ipw2200: disallow direct scanning when device is downPekka Enberg2005-11-17
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function ipw_request_direct_scan() should bail out when the device is down. This fixes a lockup caused by wpa_supplicant triggering ipw_request_direct_scan() while the driver was in a middle of a reset due to firmware errors. Thanks to Zilvinas Valinskas for reporting the bug and helping me debug it. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-11-16
|\ \ \ \
| * | | | [DVB]: Add compat ioctl handling.David S. Miller2005-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based upon a patch by Guido Guenther <agx@sigxcpu.org>. Some of these ioctls had embedded time_t objects or pointers, so needed translation. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [DVB] cinergyT2: cinergyt2_register_rc() should return 0 on successDavid S. Miller2005-11-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the version when ENABLE_RC is defined, falls through to the end of the function without returning anything. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | | [SPARC64]: Oops in pci_alloc_consistent with cingergyT2Guido Guenther2005-11-16
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Guido Guenther <agx@sigxcpu.org> - Use correct API for allocating and freeing DMA buffers. Acked-by: Johannes Stezenbach <js@linuxtv.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2005-11-16
|\ \ \ \ | |/ / / |/| | |
| * | | [PATCH] powerpc: Make the vDSO functions set error code (#2)Benjamin Herrenschmidt2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vDSO functions should have the same calling convention as a syscall. Unfortunately, they currently don't set the cr0.so bit which is used to indicate an error. This patch makes them clear this bit unconditionally since all functions currently succeed. The syscall fallback done by some of them will eventually override this if the syscall fails. This also changes the symbol version of all vdso exports to make sure glibc can differenciate between old and fixed calls for existing ones like __kernel_gettimeofday. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc: Fix build with CONFIG_CHRP not setBenjamin Herrenschmidt2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building ARCH=ppc for multiplatforms with CONFIG_CHRP not set fails due to some unshielded code in xmon Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | powerpc: Move ppc64 boot wrapper code over to arch/powerpcPaul Mackerras2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also extends the code to handle 32-bit ELF vmlinux files as well as 64-bit ones. This is sufficient for booting on new-world 32-bit powermacs (i.e. all recent machines). Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] powerpc: replace page_to_virt() with lowmem_page_address() for Book-EKumar Gala2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | page_to_virt and lowmem_page_address provided equiavlent functionality so use the more standard lowmem_page_address This also addresses build issue in ARCH=powerpc since page_to_virt() has been removed from include/asm-powerpc/page.h Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] powerpc: add new powerbooks to feature tableOlof Johansson2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, The previous PowerBook patch didn't contain the feature table updates for ARCH=powerpc. Here they are. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc: Fix boot with yaboot with ARCH=ppcBenjamin Herrenschmidt2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge of machine types broke boot with yaboot & ARCH=ppc due to the old code still retreiving the old-syle machine type passed in by yaboot. This patch fixes it by translating those old numbers. Since that whole mecanism is deprecated, this is a temporary fix until ARCH=ppc uses the new prom_init that the merged architecture now uses for both ppc32 and ppc64 (after 2.6.15) Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] PowerBook 6,1: headphone not detected after suspendGuido Guenther2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ever since suspend to disk works I had the problem that headphone (un)plugging doesn't get detected properly anymore after the first resume. Reloading the module worked around this ever since, however the real cause of the problem was that after a resume the driver only got interrupts on "unplug" not on "plug". Reactivating the headphone status interrupt in tumbler_resume fixes this. This shouldn't cause any trouble with software suspend, but it would be nice if somebody could confirm this: Signed-off-by: Guido Guenther <agx@sigxcpu.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] powerpc: pci_64 fixes & cleanupsBenjamin Herrenschmidt2005-11-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I discovered that in some cases (PowerMac for example) we wouldn't properly map the PCI IO space on recent kernels. In addition, the code for initializing PCI host bridges was scattered all over the place with some duplication between platforms. This patch fixes the problem and does a small cleanup by creating a pcibios_alloc_controller() in pci_64.c that is similar to the one in pci_32.c (just takes an additional device node argument) that takes care of all the grunt allocation and initialisation work. It should work for both boot time and dynamically allocated PHBs. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-23 10:58:01 -0500