aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [MTD] pmc551 use kzallocJiri Slaby2006-09-221-5/+2
| | | | | | | | | | | | | | | | | | | | | Use kzalloc instad of kmalloc+memset(0). Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD] pmc551 whitespace cleanupJiri Slaby2006-09-221-567/+596
| | | | | | | | | | | | | | | | | | | | | | | | Spaces were used for indent, there was more than 80 columns per line. Get rid of that stuff. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD] Remove iq80310 map driverLennert Buytenhek2006-09-223-127/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iq80310 mtd map driver depends on ARCH_IQ80310, which isn't defined anywhere in the tree (as we don't have 80310 support), and furthermore, everything the driver does can be done with physmap instead. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD NAND] Fix in typo ndfc.c causing wrong ECC layoutFrank Haverkamp2006-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | Due to this typo, a wrong ECC layout table is chosen. Signed-off-by: Frank Haverkamp <haver@vnet.ibm.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD] physmap: add power management supportLennert Buytenhek2006-09-221-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | Implement PM handling for physmap. Idea from Steven Scholz, patch by David Anders. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | ioremap balanced with iounmap for drivers/mtd subsystemAmol Lad2006-09-2215-15/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ioremap must be balanced by an iounmap and failing to do so can result in a memory leak. Tested (compilation only) with: - allmodconfig - Modifying drivers/mtd/maps/Kconfig and drivers/mtd/nand/Kconfig to make sure that the changed file is compiling without warning Signed-off-by: Amol Lad <amol@verismonetworks.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD] Switch to pci_get_device and do ref countingAlan Cox2006-09-225-8/+32
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD] blkdev helper code: fix printk format warningRandy Dunlap2006-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix printk format warning(s): drivers/mtd/mtd_blkdevs.c:72: warning: long int format, different type arg (arg 2) Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD] Fix ixp4xx partition parsing.Brian Walsh2006-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the amount of flash is not divisible by 2 then the mask in parse_mtd_partitions would fail to work as designed. Passing in the base address corrects this problem. Signed-off-by: Brian Walsh <brian@walsh.ws> Cc: Deepak Sanexa <dsanexa@mvista.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [JFFS2] Remove unneeded ifdefs from jffs2_fs_i.hMichal Piotrowski2006-09-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We certainly don't need the check for Linux version > 2.5.2, and in fact we can also live without the __ECOS check, since we can just add it back in the eCos git tree which is automatically derived from the Linux fs/jffs2 subdirectory in the upstream git tree. Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD NAND] Remove old code in au1550nd.cMichal Piotrowski2006-09-221-11/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| * | [MTD] Unlock NOR flash automatically where necessaryHåvard Skinnemoen2006-09-223-0/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce the MTD_STUPID_LOCK flag which indicates that the flash chip is always locked after power-up, so all sectors need to be unlocked before it is usable. If this flag is set, and the chip provides an unlock() operation, mtd_add_device will unlock the whole MTD device if it's writeable. This means that non-writeable partitions will stay locked. Set MTD_STUPID_LOCK in fixup_use_atmel_lock() so that these chips will work as expected. Signed-off-by: Håvard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpcLinus Torvalds2006-09-22219-2459/+4351
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits) [POWERPC] Fix ohare IDE irq workaround on old powermacs [POWERPC] EEH: Power4 systems sometimes need multiple resets. [POWERPC] Include <asm/mmu.h> in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t. [POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c [POWERPC] Maple U3 HT - reject inappropriate config space access [POWERPC] Fix IPIC pending register assignments [POWERPC] powerpc: fix building gdb against asm/ptrace.h [POWERPC] Remove DISCONTIGMEM cruft from page.h [POWERPC] Merge iSeries i/o operations with the rest [POWERPC] 40x: Fix debug status register defines [POWERPC] Fix compile error in sbc8560 [POWERPC] EEH: support MMIO enable recovery step [POWERPC] EEH: enable MMIO/DMA on frozen slot [POWERPC] EEH: code comment cleanup [POWERPC] EEH: balance pcidev_get/put calls [POWERPC] PPC: Fix xmon stack frame address in backtrace [POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX [POWERPC] Start arch/powerpc/boot code reorganization [POWERPC] Define of_read_ulong helper [POWERPC] iseries: eliminate a couple of warnings ...
| * [POWERPC] Fix ohare IDE irq workaround on old powermacsBenjamin Herrenschmidt2006-09-221-1/+1
| | | | | | | | | | | | | | | | Looks like a workaround for old bogus OF bitrot... This fixes it and hence fixes boot on some performa machines. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] EEH: Power4 systems sometimes need multiple resets.Linas Vepstas2006-09-221-12/+24
| | | | | | | | | | | | | | | | | | | | On detection of an EEH error, some Power4 systems seem to occasionally want to be reset twice before they report themselves as fully recovered. This patch re-arranges the code to attempt additional resets if the first one doesn't take. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Include <asm/mmu.h> in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.Scott Wood2006-09-221-0/+2
| | | | | | | | | | | | | | | | This patch causes fsl_soc.h to import the definition of phys_addr_t itself, rather than relying on its includer to do so. Signed-off-by: Scott Wood <scott@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.cNathan Lynch2006-09-221-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed that the U3_*CFA macros have some typos: #define U3_HT_CFA0(devfn, off) \ ((((unsigned long)devfn) << 8) | offset) (refers to offset rather than off) #define U3_AGP_CFA0(devfn, off) \ ((1 << (unsigned long)PCI_SLOT(dev_fn)) \ | (((unsigned long)PCI_FUNC(dev_fn)) << 8) \ (refers to dev_fn rather than devfn) Things happen to work, but there doesn't seem to be any reason these shouldn't be functions. Overall behavior should be unchanged. Signed-off-by: Nathan Lynch <ntl@pobox.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Maple U3 HT - reject inappropriate config space accessNathan Lynch2006-09-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is a PCI-X mode 2 capable device behind the HT<->PCI-X bridge, the pci core decides that the device has the extended 4K config space, even though the bus is not operating in mode 2. This is because the u3_ht pci ops silently accept offsets greater than 255 but use only the 8 least significant bits, which means reading at offset 0x100 gets the data at offset 0x0, and causes confusion for lspci. Reject accesses to configuration space offsets greater than 255. Signed-off-by: Nathan Lynch <ntl@pobox.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Fix IPIC pending register assignmentsScott Wood2006-09-221-21/+21
| | | | | | | | | | | | | | | | | | This patch fixes the assignment of pending registers to IRQ numbers for the IPIC; the code previously assigned all IRQs to the high pending word regardless of which word the interrupt belonged to. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] powerpc: fix building gdb against asm/ptrace.hArnd Bergmann2006-09-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ulrich Weigand found a bug with the current version of the asm-powerpc/ptrace.h that prevents building at least the SPU target version of gdb, since some ptrace opcodes are not defined. The problem seems to have originated in the merging of 32 and 64 bit versions of that file, the problem is that some opcodes are only valid on 64 bit kernels, but are also used by 32 bit programs, so they can't depends on the __powerpc64__ symbol. Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Remove DISCONTIGMEM cruft from page.hMichael Ellerman2006-09-221-6/+0
| | | | | | | | | | | | | | | | | | | | This looks like cruft to me, these functions don't exist AFAICT, and I can't see that it's possible to even enable DISCONTIGMEM on powerpc anymore. CC'ing some folks who might know better, based on the who-touched-it-last principle. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Merge iSeries i/o operations with the restStephen Rothwell2006-09-224-183/+319
| | | | | | | | | | | | | | | | | | This patch changes the io operations so that they are out of line if CONFIG_PPC_ISERIES is set and includes a firmware feature check in that case. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] 40x: Fix debug status register definesJosh Boyer2006-09-211-8/+8
| | | | | | | | | | | | | | This fixes some debug register defines on PPC 40x that were incorrect. Signed-off-by: Josh Boyer <jdub@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Fix compile error in sbc8560Amy Fong2006-09-212-0/+19
| | | | | | | | | | | | | | The following fixes compile errors in sbc8560. Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] EEH: support MMIO enable recovery stepLinas Vepstas2006-09-211-17/+64
| | | | | | | | | | | | | | | | | | | | | | | | Update to the PowerPC PCI error recovery code. Add code to enable MMIO if a device driver reports that it is capable of recovering on its own. One anticipated use of this having a device driver enable MMIO so that it can take a register dump, which might then be followed by the device driver requesting a full reset. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] EEH: enable MMIO/DMA on frozen slotLinas Vepstas2006-09-212-0/+40
| | | | | | | | | | | | | | | | Add wrapper around the rtas call to enable MMIO or DMA on a frozen pci slot. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] EEH: code comment cleanupLinas Vepstas2006-09-212-11/+35
| | | | | | | | | | | | | | | | Clean up subroutine documentation; mostly formatting changes, with some new content. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] EEH: balance pcidev_get/put callsLinas Vepstas2006-09-211-15/+2
| | | | | | | | | | | | | | | | | | | | This corrects a pci_dev get/put imbalance that can occur only in highly unlikely situations (kmalloc failures, pci devices with overlapping resource addresses). No actual failures seen, this was spotted during code review. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] PPC: Fix xmon stack frame address in backtraceJosh Boyer2006-09-211-1/+1
| | | | | | | | | | | | | | | | | | The stack frame address was being printed incorrectly in the backtrace option of XMON on PPC. This patch fixes it to print the actual stack address instead of the address of the local variable that contains it. Signed-off-by: Josh Boyer <jdub@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FXPeter Bergner2006-09-211-0/+1
| | | | | | | | | | | | | | | | | | Jakub noticed the cputable.c entry for Xilinx Virtex-4 FX was missing a .platform value, so the AT_PLATFORM value wouldn't be set correctly. This adds it. Signed-off-by: Peter Bergner <bergner@vnet.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Start arch/powerpc/boot code reorganizationMark A. Greer2006-09-209-178/+441
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This abstracts the operations used in the bootwrapper, and defines the operations needed for the bootwrapper to run on an OF platform. The operations have been divided up into platform ops (platform_ops), firmware ops (fw_ops), device tree ops (dt_ops), and console ops (console_ops). The proper operations will be hooked up at runtime to provide the functionality that you need. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Define of_read_ulong helperPaul Mackerras2006-09-204-26/+22
| | | | | | | | | | | | | | | | | | | | There are various places where we want to extract an unsigned long value from a device-tree property that can be 1 or 2 cells in length. This replaces some open-coded calculations, and one place where we assumed without checking that properties were the length we wanted, with a little of_read_ulong() helper. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] iseries: eliminate a couple of warningsStephen Rothwell2006-09-201-2/+2
| | | | | | | | | | | | Copy and paste bug in io.h Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] convert string i/o operations to CStephen Rothwell2006-09-206-115/+130
| | | | | | | | | | | | | | | | | | | | This produces essentially the same code and will make the iSeries i/o consolidation easier. The count parameter is changed to long since that will produce the same (better) code on 32 and 64 bit builds. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] clean up ide io accessorsStephen Rothwell2006-09-206-40/+6
| | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] remove unused asm routinesStephen Rothwell2006-09-206-152/+0
| | | | | | | | | | | | _insw, _outsw, _insl amd _outsl are all unused, so remove them. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] remove unused io accessorsStephen Rothwell2006-09-204-42/+1
| | | | | | | | | | | | | | | | The io accessors insw_ns, outsw_ns, insl_ns and outsl_ns are unused (except for one unnecessary use in drivers/net/3c509.c that is addressed in a previous patch) and are only defined in powerpc/ppc, so remove them. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] silence a warningStephen Rothwell2006-09-201-1/+1
| | | | | | | | | | | | Left over from the constifying of get_property. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] make spinlocks work in a combined kernelStephen Rothwell2006-09-201-14/+13
| | | | | | | | | | | | If we build a pSeries/iSeries combined kernel, we will need this. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * [POWERPC] Fix MPC8349EMDS dts PCI interrupt-map values for IDSEL 0x18Kim Phillips2006-09-141-8/+8
| | | | | | | | | | | | | | | | | | Fix MPC8349EMDS dts PCI interrupt-map values for IDSEL 0x18 per Tanya's catch. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Tanya Jiang <tanya.jiang@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * [POWERPC] Fix non-smp buildOlof Johansson2006-09-141-0/+1
| | | | | | | | | | | | | | | | | | This fixes a compile error that only surfaces on CONFIG_SMP=n builds; <asm/hvcall.h> seems to get pulled in through another header file for SMP builds. This problem was introduced by the hvcall stats patch. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * Merge branch 'linux-2.6'Paul Mackerras2006-09-14295-2190/+3609
| |\
| * | [POWERPC] Export copy_4K_page()David Howells2006-09-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Export copy_4K_page() for use by modules via copy_page() (such as CacheFiles). Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] print backtrace when entering xmonOlaf Hering2006-09-133-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xmon does not print a backtrace per default. This is bad on systems with USB keyboard, the most needed info about the crash is lost. print a backtrace during the very first xmon entry. Booting with xmon=nobt disables the autobacktrace functionality. Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Quiet hvc_console console output on failed opensOlof Johansson2006-09-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No other tty driver will print on the console when the open of it fails. On systems that happen to be configured for both ttyS0 and hvc0 console, this will keep flooding the console output. This is most likely to happen with systems booted between with and without hypervisor from the same filesystem. Let's just remove it. When it's really needed (i.e. when the open fails and someone is trying to debug it), noone will see the output anyway. And init will report the opens failing in due time through the syslog. Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Ryan S. Arnold <rsa@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] PPC: Fix Kconfig whitespace warningsJosh Boyer2006-09-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following whitespace warnings when compiling with ARCH=ppc arch/ppc/Kconfig:1207:warning: leading whitespace ignored arch/ppc/Kconfig:1226:warning: leading whitespace ignored arch/ppc/Kconfig:1231:warning: leading whitespace ignored Also fix a typo ("Supprt"). Signed-off-by: Josh Boyer <jdub@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] powerpc: Instrument Hypervisor CallsMike Kravetz2006-09-136-1/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add instrumentation for hypervisor calls on pseries. Call statistics include number of calls, wall time and cpu cycles (if available) and are made available via debugfs. Instrumentation code is behind the HCALL_STATS config option and has no impact if not enabled. Signed-off-by: Mike Kravetz <kravetz@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] powerpc: PA Semi PWRficient MAINTAINER entryOlof Johansson2006-09-131-0/+7
| | | | | | | | | | | | | | | | | | | | | Maintainer entry for PWRficient Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] powerpc: PA Semi PWRficient platform supportOlof Johansson2006-09-137-0/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base patch for PA6T and PA6T-1682M. This introduces the arch/powerpc/platform/pasemi directory, together with basic implementations for various setup. Much of this was based on other platform code, i.e. Maple, etc. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] powerpc: PA6T cputable entry, PVR valueOlof Johansson2006-09-133-2/+22
| | | | | | | | | | | | | | | | | | | | | Introduce PWRficient PA6T cputable entries and feature bits. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>