summaryrefslogtreecommitdiffstats
path: root/arch/cris
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs485fix' of git://www.jni.nu/crisLinus Torvalds2010-08-091-0/+1
|\ | | | | | | | | * 'rs485fix' of git://www.jni.nu/cris: CRIS: ioctl for getting RS485 information
| * CRIS: ioctl for getting RS485 informationClaudio Scordino2010-08-091-0/+1
| | | | | | | | | | | | | | Add ioctl to CRIS serial driver to get RS485 data from user-space. Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
* | Merge branch 'for-linus' of git://www.jni.nu/crisLinus Torvalds2010-08-0854-742/+857
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://www.jni.nu/cris: (51 commits) CRIS: Fix alignment problem for older ld CRIS: Always dump registers for segfaulting process. CRIS: Add config for pausing a seg-faulting process CRIS: Don't take faults while in_atomic CRIS: Fixup lookup for delay slot faults CRIS: Discard exit.text and .data at runtime CRIS: Add cache aligned and read mostly data sections CRIS: Return something from profile write CRIS: Add ARTPEC-3 and timestamps for sync-serial CRIS: Better ARTPEC-3 support for gpio CRIS: Add include guard CRIS: Better handling of pinmux settings CRIS: New DMA defines for ARTPEC-3 CRIS: __do_strncpy_from_user: Don't read the byte beyond the nil CRIS: Pagetable for ARTPEC-3 CRIS: Machine dependent memmap.h CRIS: Check if pointer is set before using it CRIS: Machine dependent dma.h CRIS: Define __read_mostly for CRISv32 CRIS: Discard .note.gnu.build-id section ...
| * | CRIS: Fix alignment problem for older ldJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | CRISv10 uses a pretty old ld, which does not allow ALIGN(0), (It becomes . = 0;) so instead we align to 1 byte. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Always dump registers for segfaulting process.Jesper Nilsson2010-08-041-0/+6
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add config for pausing a seg-faulting processJesper Nilsson2010-08-042-3/+16
| | | | | | | | | | | | | | | | | | | | | Put it on a wait queue, so we can attach gdb to the process to debug it instead of just killing it. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Don't take faults while in_atomicJesper Nilsson2010-08-041-8/+5
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Fixup lookup for delay slot faultsJesper Nilsson2010-08-041-1/+4
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Discard exit.text and .data at runtimeJesper Nilsson2010-08-041-0/+10
| | | | | | | | | | | | | | | | | | This allows us to handle references from __bug_table. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add cache aligned and read mostly data sectionsJesper Nilsson2010-08-041-0/+2
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Return something from profile writeJesper Nilsson2010-08-041-8/+7
| | | | | | | | | | | | | | | | | | | | | Even if it doesn't matter, we should return something. Also, clean up some formatting. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add ARTPEC-3 and timestamps for sync-serialJesper Nilsson2010-08-041-1/+26
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Better ARTPEC-3 support for gpioJesper Nilsson2010-08-041-18/+78
| | | | | | | | | | | | | | | | | | Add PWM support, correct comment for ARTPEC-3. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add include guardJesper Nilsson2010-08-041-0/+5
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Better handling of pinmux settingsJesper Nilsson2010-08-041-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | Depending on eth, eth_mido and geth fields in wr_hwprot, don't set corresponding pins on gpio port b to gpio mode. This avoids re-resetting the ethernet PHY should this already have been done. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: New DMA defines for ARTPEC-3Jesper Nilsson2010-08-041-0/+27
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: __do_strncpy_from_user: Don't read the byte beyond the nilJesper Nilsson2010-08-041-4/+3
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Pagetable for ARTPEC-3Jesper Nilsson2010-08-041-0/+8
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Machine dependent memmap.hJesper Nilsson2010-08-042-24/+25
| | | | | | | | | | | | | | | | | | | | | Move the old one to mach-fs and replace with a new one that only include the correct one for the machine architecture. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Check if pointer is set before using itJesper Nilsson2010-08-041-8/+12
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Machine dependent dma.hJesper Nilsson2010-08-042-79/+80
| | | | | | | | | | | | | | | | | | | | | Move the old one to mach-fs and replace with a new one that only include the correct one for the machine architecture. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Define __read_mostly for CRISv32Jesper Nilsson2010-08-041-0/+2
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Discard .note.gnu.build-id sectionJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Avoid compilation warning for putsJesper Nilsson2010-08-041-40/+25
| | | | | | | | | | | | | | | | | | | | | Rename to aputs. Also, simplify code by moving some common code out to macros. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug for assembler macrosJesper Nilsson2010-08-041-0/+4
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Update for ARTPEC-3Jesper Nilsson2010-08-041-5/+18
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add more delays in DDR setupJesper Nilsson2010-08-043-1/+21
| | | | | | | | | | | | | | | | | | Also, make DDR latency configurable. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug info for assembler codeJesper Nilsson2010-08-041-0/+7
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug info for assembler codeJesper Nilsson2010-08-041-0/+3
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug symbols for assembler codeJesper Nilsson2010-08-041-0/+3
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Minor formatting fix in traps.cJesper Nilsson2010-08-041-4/+2
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v32: Correct auto-restart of syscallsJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Register number was incorrect in syscalls that go via the restartblock (e.g, poll). Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: More ARTPEC-3 support and i2c-boardinfo.Jesper Nilsson2010-08-041-8/+66
| | | | | | | | | | | | | | | | | | Add standard i2d-devices. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Remove obsolete pinmux.c, now machine dependent.Jesper Nilsson2010-08-041-229/+0
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: kgdb: Fix compilation errorsJesper Nilsson2010-08-041-8/+8
| | | | | | | | | | | | | | | | | | Paths were not correct and pack_hex_byte() takes two arguments. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v32: Correct path for intr_vect.hJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v32: Better irq mapping codeJesper Nilsson2010-08-041-25/+22
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v32: Correct address for romfs in the imageJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | Is after __bss_start, not __vmlinux_end Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Additional mmu settings for ARTPEC-3Jesper Nilsson2010-08-041-2/+40
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Faster syscall entry for CRISv32.Jesper Nilsson2010-08-041-20/+17
| | | | | | | | | | | | | | | Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Simple insn reschedule to avoid interlocks.Jesper Nilsson2010-08-041-9/+9
| | | | | | | | | | | | | | | | | | | | | Brings down the CPI from ~1.5 to ~1.1. Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug for assembler functionsJesper Nilsson2010-08-042-1/+29
| | | | | | | | | | | | | | | Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Correct address of the romfs in boot imageJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | The romfs should land after __init_end Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Fasttimer: Remove obsolete ifdefJesper Nilsson2010-08-041-5/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Better link to rs485 in helpJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Remove CVS tag.Jesper Nilsson2010-08-041-2/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v10: remove all BKL usageJesper Nilsson2010-08-041-26/+13
| | | | | | | | | | | | | | | | | | | | | We don't need to take the BKL here. Also fixes compile error after last commit (smp_lock.h was not included) Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: gpio: don't call copy_to_user()/copy_from_user() while holding spinlocksJesper Nilsson2010-08-041-32/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | copy_to_user()/copy_from_user() must not be used with spinlocks held. Move locks inside each case so we have better control of when the locks are held. Also, since we use spinlocks, we don't need to hold the BKL, so remove it. Reported-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | arch/cris: Remove unnecessary casts of private_dataJoe Perches2010-08-041-5/+5
| | | | | | | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | cris: autoconvert trivial BKL users to private mutexJesper Nilsson2010-08-044-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All these files use the big kernel lock in a trivial way to serialize their private file operations, typically resulting from an earlier semi-automatic pushdown from VFS. None of these drivers appears to want to lock against other code, and they all use the BKL as the top-level lock in their file operations, meaning that there is no lock-order inversion problem. Consequently, we can remove the BKL completely, replacing it with a per-file mutex in every case. Using a scripted approach means we can avoid typos. file=$1 name=$2 if grep -q lock_kernel ${file} ; then if grep -q 'include.*linux.mutex.h' ${file} ; then sed -i '/include.*<linux\/smp_lock.h>/d' ${file} else sed -i 's/include.*<linux\/smp_lock.h>.*$/include <linux\/mutex.h>/g' ${file} fi sed -i ${file} \ -e "/^#include.*linux.mutex.h/,$ { 1,/^\(static\|int\|long\)/ { /^\(static\|int\|long\)/istatic DEFINE_MUTEX(${name}_mutex); } }" \ -e "s/\(un\)*lock_kernel\>[ ]*()/mutex_\1lock(\&${name}_mutex)/g" \ -e '/[ ]*cycle_kernel_lock();/d' else sed -i -e '/include.*\<smp_lock.h\>/d' ${file} \ -e '/cycle_kernel_lock()/d' fi Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
OpenPOWER on IntegriCloud