summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6Linus Torvalds2006-10-0445-727/+1473
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/willy/parisc-2.6: (41 commits) [PARISC] Kill wall_jiffies use [PARISC] Honour "panic_on_oops" sysctl [PARISC] Fix fs/binfmt_som.c [PARISC] Export clear_user_page to modules [PARISC] Make DMA routines more stubby [PARISC] Define pci_get_legacy_ide_irq [PARISC] Fix CONFIG_DEBUG_SPINLOCK [PARISC] Fix HPUX compat compile with current GCC [PARISC] Fix iounmap compile warning [PARISC] Add support for Quicksilver AGPGART [PARISC] Move LBA and SBA register defines to the common ropes.h [PARISC] Create shared <asm/ropes.h> header [PARISC] Stash the lba_device in its struct device drvdata [PARISC] Generalize IS_ASTRO et al to take a parisc_device like [PARISC] Pretty print the name of the lba type on kernel boot [PARISC] Remove some obsolete comments and I checked that Reo is similar to Ike [PARISC] Add hardware found in the rp8400 [PARISC] Allow nested interrupts [PARISC] Further updates to timer_interrupt() [PARISC] remove halftick and copy clocktick to local var (gcc can optimize usage) ...
| * [PARISC] Kill wall_jiffies useAndrew Morton2006-10-041-3/+0
| | | | | | | | | | | | | | wall_jiffies and jiffies are now equal, so this is a noop... Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Honour "panic_on_oops" sysctlHelge Deller2006-10-041-0/+10
| | | | | | | | | | Signed-off-by: Helge Deller <deller@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Fix fs/binfmt_som.cMatthew Wilcox2006-10-041-2/+16
| | | | | | | | | | | | | | | | Fix compilation (missing include of a.out.h) Fix security hole (need to call unshare_files) Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Export clear_user_page to modulesMatthew Wilcox2006-10-041-2/+2
| | | | | | | | | | Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Make DMA routines more stubbyMatthew Wilcox2006-10-041-6/+1
| | | | | | | | | | | | | | | | | | | | We were pretending to use the GENERIC_ISA_DMA routines, but never selected that symbol. Since ISA DMA is known to not work right now, just remove the attempts to acquire the dma_spin_lock to fix compile warnings. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Define pci_get_legacy_ide_irqMatthew Wilcox2006-10-041-0/+5
| | | | | | | | | | | | | | | | | | We can compile at least one IDE driver that refers to this. We can't use the asm-generic file because we have our own definitions of pcibios_resource_to_bus etc. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Fix CONFIG_DEBUG_SPINLOCKMatthew Wilcox2006-10-041-3/+0
| | | | | | | | | | | | | | | | | | Joel Soete points out that we refer to pa_tlb_lock but only define it if CONFIG_SMP which breaks a uniprocessor build with CONFIG_DEBUG_SPINLOCK enabled. No module refers to pa_tlb_lock, so we can delete the export. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Fix HPUX compat compile with current GCCMatthew Wilcox2006-10-041-1/+1
| | | | | | | | | | | | | | GCC no longer allows a cast as lvalue; fix the same way fs/readdir.c was Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Fix iounmap compile warningMatthew Wilcox2006-10-042-2/+2
| | | | | | | | | | | | | | | | iounmap's argument needs to be both const and volatile, otherwise we'll get warnings that we're discarding pointer qualifiers Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Add support for Quicksilver AGPGARTKyle McMartin2006-10-046-12/+487
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Move LBA and SBA register defines to the common ropes.hKyle McMartin2006-10-043-162/+162
| | | | | | | | | | | | | | header. This will allow the use of more constants in the agpgart driver. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Create shared <asm/ropes.h> headerKyle McMartin2006-10-045-201/+153
| | | | | | | | | | | | | | | | | | Pull out struct sba_device and struct lba_device into a common ropes.h header. Also fold the parisc portion of iosapic.h into this file. (Then delete the useless portion of iosapic.h) Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Stash the lba_device in its struct device drvdataKyle McMartin2006-10-041-0/+1
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Generalize IS_ASTRO et al to take a parisc_device likeKyle McMartin2006-10-041-14/+20
| | | | | | | | | | | | | | IS_ELROY. Also remove the useless caching of the parisc_device_id in struct sba_device. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Pretty print the name of the lba type on kernel bootKyle McMartin2006-10-041-6/+10
| | | | | | | | | | | | | | (it's pretty useless telling a user they have a whole bunch of TR%d.%d LBAs) Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Remove some obsolete comments and I checked that Reo is similar to IkeMatthew Wilcox2006-10-041-7/+2
| | | | | | | | | | Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Add hardware found in the rp8400Matthew Wilcox2006-10-041-0/+3
| | | | | | | | | | Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Allow nested interruptsJames Bottomley2006-10-044-64/+93
| | | | | | | | | | | | | | | | | | | | | | | | Our prior mode of operation didn't allow nested interrupts because it makes the interrupt code much simpler. However, nested interrupts are better for latency. This code uses the EIEM register to simulate level interrupts and thus achieve nesting. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Further updates to timer_interrupt()Grant Grundler2006-10-041-62/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | This version (relative to the current tree): o eliminates "while (ticks_elapsed)" loop. It's not needed. o drop "ticks_elapsed" completely from timer_interrupt(). o Estimates elapsed cycles (based on HZ) to see which kind of math we want to use to calculate "cycles_remainder". o Fixes a bug where we would loose a tick if we decided we wanted to skip one interrupt. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] remove halftick and copy clocktick to local var (gcc can optimize ↵Grant Grundler2006-10-041-15/+31
| | | | | | | | | | | | | | usage) Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Rewrite timer_interrupt() and gettimeoffset() using "unsigned" math.Grant Grundler2006-10-041-44/+96
| | | | | | | | | | | | | | | | | | | | It's just a bit easier to follow and timer code is complex enough. So far, only tested on A500-5x (64-bit SMP), ie: gettimeoffset() code hasn't been tested at all. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Enable interrupts while spinningMatthew Wilcox2006-10-041-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the __raw_spin_lock_flags routine so we can take an interrupt while spinning. This re-fixes a bug jejb found on 2005-10-20: CPU0 does a flush_tlb_all holding the vmlist_lock for write. CPU1 tries a cat of /proc/meminfo which tries to acquire vmlist_lock for read CPU1 is now spinning with interrupts disabled CPU0 tries to execute a smp_call_function to flush the local tlb caches This is now a deadlock because CPU1 is spinning with interrupts disabled and can never receive the IPI Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Add new function to start local Interval Timer, start_cpu_itimer()Grant Grundler2006-10-042-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I couldn't find where the itimer was getting started for slave CPUs. CPU 0 (master) itimer was started in time_init() (arch/parisc/kernel/time.c). start_cpu_itimer() code was striped from time_init(). Slaves now start their itimer in smp_cpu_init(). This is a first step towards making gettimeoffset() work for SMP. Next step will be to determine the CR16 (cycle counter) offsets for each CPU relative to the master (CPU 0). Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Prevent processor_probe() from clobbering cpu_data[0]Grant Grundler2006-10-041-2/+3
| | | | | | | | | | | | | | | | processor_probe() shouldn't clobber cpu_data[0] cpu_data[0].it_value (used by timer_interrupt()) is already set. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Use CONFIG_HZ to determine interval timer rate (aka clock ticks)Grant Grundler2006-10-041-7/+3
| | | | | | | | | | | | | | | | | | This isn't likely to be causing problems for other bits of kernel code. I can't find any other user of CONFIG_HZ outside of arch specific code. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Implement futex_atomic_cmpxchg_inatomicCarlos O'Donell2006-10-041-3/+68
| | | | | | | | | | | | | | Implement trivial futex_atomic_cmpxchg_inatomic for testing. Signed-off-by: Carlos O'Donell <carlos@systemhalted.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Improve rwlock implementationMatthew Wilcox2006-10-041-37/+61
| | | | | | | | | | | | | | | | Rewrite rwlock implementation to avoid various deadlocks in the current scheme. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] [BUGFIX] nullify branch delay slot of the jump back toKyle McMartin2006-10-041-1/+1
| | | | | | | | | | | | | | intr_restore in intr_do_preempt. This prevents the execution of an unwanted insn... Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Clean up asm-parisc/serial.hMatthew Wilcox2006-10-042-16/+4
| | | | | | | | | | | | | | | | | | Russell King pointed out that asm/serial.h is anachronistic and we were misusing BASE_BAUD. So fix BASE_BAUD for PCI 16550 UARTs, move LASI_BASE_BAUD into 8250_gsc, and fix the obsolete comment about reserving serial port slots. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Allow overriding personality with sys_personalityKyle McMartin2006-10-042-2/+47
| | | | | | | | | | | | And now suddenly, linux32 works on parisc... Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Switch is_compat_task to use TIF_32BITKyle McMartin2006-10-044-29/+6
| | | | | | | | | | | | | | | | Stop using PER_LINUX32 to designate processes needing compaterizing. Convert is_compat_task to use TIF_32BIT and set TIF_32BIT in binfmt_elf32.c Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Prevent multiple includes of asm-parisc/parisc-device.hKyle McMartin2006-10-041-0/+5
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] parisc specific kmap API implementation for pa8800James Bottomley2006-10-044-23/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the pa8800 at a gross level (there are still other subtle incoherency issues which can still cause crashes and HPMCs). What it does is try to force eject inequivalent aliases before they become visible to the L2 cache (which is where we get the incoherence problems). A new function (parisc_requires_coherency) is introduced in asm/processor.h to identify the pa8x00 processors (8800 and 8900) which have the issue. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Document that D-class can also use serial_muxCarlos O'Donell2006-10-041-4/+5
| | | | | | | | | | Signed-off-by: Carlos O'Donell <carlos@systemhalted.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Fix up parisc irq handling for genirq changesKyle McMartin2006-10-042-3/+3
| | | | | | | | | | | | Clean up enough to get things compiling again in the interim. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Add asm-parisc/mckinley.h bus headerKyle McMartin2006-10-042-4/+10
| | | | | | | | | | | | | | Add header for McKinley bus related code. Remove extern decl of proc_mckinley_root in drivers/parisc/sba_iommu.c Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Abstract shift register left in .SKyle McMartin2006-10-042-17/+8
| | | | | | | | | | | | | | | | Abstract existing shift register left macros as shift register right are. This lends itself to a nice clean up of some #ifdef blocks in entry.S Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PATCH] Need forward decl of task_struct in linux/debug_locks.hKyle McMartin2006-10-041-0/+2
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Remove variables decls duplicated from asm-generic/sections.hKyle McMartin2006-10-041-13/+10
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] PA7200 also supports prefetch for readKyle McMartin2006-10-042-1/+4
| | | | | | | | | | | | | | | | | | It seems PA7200 processors also suppress traps on loads to %r0. This means we can prefetch for read on these cpus. Of course, we can't support prefetch for write, since that requires LOAD DOUBLEWORD which was added with PA2.0 Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
| * [PARISC] Untangle <asm/processor.h> header include messKyle McMartin2006-10-042-26/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asm/processor.h on parisc wants spinlocks for cpuinfo, but linux/spinlock_types.h needs lockdep, and lockdep wants prefetch. This leads to a horrible circular dependancy, because <asm/processor.h> is including something which depends on things which are not defined until the end of the file. Kludge around this by moving prefetch related code into <asm/prefetch.h> and including it before <linux/spinlock_types.h>, however this is just a temporary solution until this mess can be cleaned up. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpcLinus Torvalds2006-10-0462-304/+7809
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (25 commits) [POWERPC] Add support for the mpc832x mds board [POWERPC] Add initial support for the e300c2 core [POWERPC] Add MPC8360EMDS default dts file [POWERPC] Add MPC8360EMDS board support [POWERPC] Add QUICC Engine (QE) infrastructure [POWERPC] Add QE device tree node definition [POWERPC] Don't try to just continue if xmon has no input device [POWERPC] Fix a printk in pseries_mpic_init_IRQ [POWERPC] Get default baud rate in udbg_scc [POWERPC] Fix zImage.coff on oldworld PowerMac [POWERPC] Fix xmon=off and cleanup xmon initialisation [POWERPC] Cleanup include/asm-powerpc/xmon.h [POWERPC] Update swim3 printk after blkdev.h change [POWERPC] Cell interrupt rework POWERPC: mpc82xx merge: board-specific/platform stuff(resend) POWERPC: 8272ads merge to powerpc: common stuff POWERPC: Added devicetree for mpc8272ads board [POWERPC] iSeries has no legacy I/O [POWERPC] implement BEGIN/END_FW_FTR_SECTION [POWERPC] iSeries does not need pcibios_fixup_resources ...
| * | [POWERPC] Add support for the mpc832x mds boardKim Phillips2006-10-043-0/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for MPC832x MDS evaluation board. This patch depends on the 8360+QE lib patches by Leo. The MPC832x processors (MPC8323E, MPC8323, MPC8321E, MPC8321) sport the e300c2 core plus a QUICC Engine (QE). This patch adds support for the 832x MDS evaluation board. The 832x MDS dts and defconfig files are pending more tests. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Add initial support for the e300c2 coreKim Phillips2006-10-041-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the Freescale e300c2 core found in the MPC832x processor line. As far as initial kernel support is concerned, the e300c2 core is identical to the e300c1 found in the mpc834x, except that it's had its floating point unit chopped off. Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Add MPC8360EMDS default dts fileLi Yang2006-10-041-0/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add MPC8360EMDS default device-tree source file Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jiang Bo <Tanya.jiang@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Add MPC8360EMDS board supportLi Yang2006-10-042-0/+1237
| | | | | | | | | | | | | | | | | | | | | | | | | | | The patch adds MPC8360EMDS board support. Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Yin Olivia <hong-hua.yin@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Add QUICC Engine (QE) infrastructureLi Yang2006-10-0418-14/+4007
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QUICC Engine (QE) configuration, header files, and QE management and library code that are used by QE devices drivers. Includes Leo's modifications up to, and including, the platform_device to of_device adaptation: "The series of patches add generic QE infrastructure called qe_lib, and MPC8360EMDS board support. Qe_lib is used by QE device drivers such as ucc_geth driver. This version updates QE interrupt controller to use new irq mapping mechanism, addresses all the comments received with last submission and includes some style fixes. v2: Change to use device tree for BCSR and MURAM; Remove I/O port interrupt handling code as it is not generic enough. v3: Address comments from Kumar; Update definition of several device tree nodes; Copyright style change." In addition, the following changes have been made: o removed typedefs o uint -> u32 conversions o removed following defines: QE_SIZEOF_BD, BD_BUFFER_ARG, BD_BUFFER_CLEAR, BD_BUFFER, BD_STATUS_AND_LENGTH_SET, BD_STATUS_AND_LENGTH, and BD_BUFFER_SET because they hid sizeof/in_be32/out_be32 operations from the reader. o fixed qe_snums_init() serial num assignment to use a const array o made CONFIG_UCC_FAST select UCC_SLOW o reduced NR_QE_IC_INTS from 128 to 64 o remove _IO_BASE, etc. defines (not used) o removed irrelevant comments, added others to resemble removed BD_ defines o realigned struct definitions in headers o various other style fixes including things like pinMask -> pin_mask o fixed a ton of whitespace issues o marked ioregs as __be32/__be16 o removed platform_device code and redundant get_qe_base() o removed redundant comments o added cpu_relax() to qe_reset o uncasted all get_property() assignments o eliminated unneeded casts o eliminated immrbar_phys_to_virt (not used) Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Shlomi Gridish <gridish@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] Add QE device tree node definitionLi Yang2006-10-041-0/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OF device tree node spec used in QE/8360 support patches. Signed-off-by: Li Yang <leoli@freescale.com> Signed-off-by: Jiang Bo <Tanya.jiang@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | Merge branch 'upstream' of ↵Paul Mackerras2006-10-0411-9/+1165
| |\ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 18:58:03 +0000