summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'generic-ipi' into generic-ipi-for-linusIngo Molnar2008-07-151-3/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/powerpc/Kconfig arch/s390/kernel/time.c arch/x86/kernel/apic_32.c arch/x86/kernel/cpu/perfctr-watchdog.c arch/x86/kernel/i8259_64.c arch/x86/kernel/ldt.c arch/x86/kernel/nmi_64.c arch/x86/kernel/smpboot.c arch/x86/xen/smp.c include/asm-x86/hw_irq_32.h include/asm-x86/hw_irq_64.h include/asm-x86/mach-default/irq_vectors.h include/asm-x86/mach-voyager/irq_vectors.h include/asm-x86/smp.h kernel/Makefile Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * smp_call_function: get rid of the unused nonatomic/retry argumentJens Axboe2008-06-261-3/+2
| | | | | | | | | | | | | | | | It's never used and the comments refer to nonatomic and retry interchangably. So get rid of it. Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
* | Add a bunch of cycle_kernel_lock() callsJonathan Corbet2008-06-202-1/+4
| | | | | | | | | | | | | | | | | | All of the open() functions which don't need the BKL on their face may still depend on its acquisition to serialize opens against driver initialization. So make those functions acquire then release the BKL to be on the safe side. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
* | Add "no BKL needed" comments to several driversJonathan Corbet2008-06-201-1/+1
| | | | | | | | | | | | | | | | This documents the fact that somebody looked at the relevant open() functions and concluded that, due to their trivial nature, no locking was needed. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
* | cris: cdev lock_kernel() pushdownJonathan Corbet2008-05-183-14/+28
|/ | | | | | Push the cdev lock_kernel() call into cris drivers. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
* cris: correct usage of __user for copy to and from user space in ↵Jesper Nilsson2008-03-041-1/+1
| | | | | | | | | | | | | | | | | lib/usercopy and uaccess.h Function __copy_user_zeroing in arch/lib/usercopy.c had the wrong parameter set as __user, and in include/asm-cris/uaccess.h, it was not set at all for some of the calling functions. This will cut the number of warnings quite dramatically when using sparse. While we're here, remove useless CVS log and correct confusing typo. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Mikael Starvik <mikael.starvik@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* CRIS: Import string.c (memcpy) from newlib: fixes compile error with gcc 4Jesper Nilsson2008-03-041-154/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adrian Bunk reported another compile error with a SVN head GCC: ... CC arch/cris/arch-v10/lib/string.o /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/string.c:138: error: lvalue required as increment operand /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/string.c:138: error: lvalue required as increment operand /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/string.c:139: error: lvalue required as increment operand ... This is due to the use of the construct: *((long*)dst)++ = lc; Which isn't legal since casts don't return an lvalue. The solution is to import the implementation from newlib, which is continually autotested together with GCC mainline, and uses the construct: *(long *) dst = lc; dst += 4; Since this is an import of a file from newlib, I'm not touching the formatting or correcting any checkpatch errors. As for the earlier fix for memset.c, even if the two files for CRIS v10 and CRIS v32 are identical at the moment, it might be possible to tweak the CRIS v32 version. Thus, I'm not yet folding them into the same file, at least not until we've done some research on it. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Mikael Starvik <starvik@axis.com> Cc: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* cris: import memset.c from newlib: fixes compile error with newer (pre4.3) gccJesper Nilsson2008-02-141-196/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adrian Bunk reported the following compile error with a SVN head GCC: ... CC arch/cris/arch-v10/lib/memset.o /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c: In function 'memset': /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:164: error: lvalue required as increment operand /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:165: error: lvalue required as increment operand /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:166: error: lvalue required as increment operand /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:167: error: lvalue required as increment operand /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:185: error: lvalue required as increment operand /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:189: error: lvalue required as increment operand /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:192: error: lvalue required as increment operand ... etc ... This is due to the use of the construct: *((long*)dst)++ = lc; Which is no longer legal since casts don't return an lvalue. The solution is to import the implementation from newlib, which is continually autotested together with GCC mainline, and uses the construct: *(long *) dst = lc; dst += 4; With this change, the generated code actually shrinks 76 bytes since gcc notices that it can use autoincrement for the move instruction in CRIS. text data bss dec hex filename 304 0 0 304 130 memset.old.o text data bss dec hex filename 228 0 0 228 e4 memset.o Since this is an import of a file from newlib, I'm not touching the formatting or correcting any checkpatch errors. Note also that even if the two files for the CRIS v10 and CRIS v32 are identical at the moment, it might be possible to tweak the CRIS v32 version. Thus, I'm not yet folding them into the same file, at least not until we've done some research on it. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Mikael Starvik <mikael.starvik@axis.com> Cc: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* CRIS v32: Change drivers/i2c.c locking.Jesper Nilsson2008-02-081-49/+12
| | | | | | | - Change spin_lock + local_irq_save into spin_lock_irqsave - Change spin_unlock + local_irq_restore into spin_unlock_irqrestore - Return ENOTTY if ioctl is not recognized as a cris ioctl. - Make init functions static.
* CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup.Jesper Nilsson2008-02-081-174/+174
| | | | | | | | | | | | | | | | | | | | Changes as suggested by Andrew Morton, plus general cleanup to ease later consolidation of driver into machine common driver. - Correct parameter type of gpio_write to const char __user * - Remove volatile from the arrays of machine dependent registers, use readl and writel to access them instead. - Remove useless casts of void. - Use spin_lock_irqsave for locking. - Break gpio_write into smaller sub-functions. - Remove useless breaks after returns. - Don't perform any change in IO_CFG_WRITE_MODE if values are invalid. (previously values were set and then set to zero) - Change cast for copy_to_user to (void __user *) - Make file_operations gpio_fops static and const. - Make setget_output static. (However, it's still inline since the CRIS architecture is still not SMP, which makes the function small enough to inline)
* CRIS: Add new timerfd syscall entries.Jesper Nilsson2008-02-081-1/+3
|
* CRIS v32: Correct spelling of bandwidth in function name.Jesper Nilsson2008-02-082-4/+4
|
* CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS.Jesper Nilsson2008-02-082-20/+24
| | | | | | | | | | Clean up issues noticed by Andrew Morton: - Use a combined struct for allocating the mtd_info and nand_chip structs instead of using anonymous memory as the example in Documentation/DocBook/mtdnand.tmpl - Use kzalloc instead of using kmalloc/memset(0) - Make crisv32_device_ready static.
* CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file.Jesper Nilsson2008-02-081-16/+0
|
* CRIS v32: Fix minor formatting issue in mach-a3/io.cJesper Nilsson2008-02-081-2/+1
|
* CRIS v32: Initialize GIO even if we're rambooting in kernel/head.SJesper Nilsson2008-02-081-0/+2
|
* CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory.Jesper Nilsson2008-02-081-296/+0
|
* CRIS v32: Fix startup oops and replace hardcoded pagesize in vmlinux.lds.SJesper Nilsson2008-02-081-37/+37
| | | | | | | | | - Move alignment of init data to page size outside define CONFIG_BLK_DEV_INITRD This avoids oops due to memory on the same page as init data being freed. - Change hardcoded page size to use macro from asm/page.h - Add reserved memory via CONFIG_ETRAX_VMEM_SIZE. - Use available defines for TEXT_TEXT and INITCALLS. - Cleanup whitespace.
* CRIS v32: Avoid work when switching between tasks with shared memory ↵Jesper Nilsson2008-02-081-28/+28
| | | | | | | descriptors in mm/tlb.c There is no need to do all this work if they share memory descriptors. Also, fix some minor whitespace and long lines.
* CRIS v32: Add workaround for MMU hardware bug for ETRAX FS in mm/mmu.SJesper Nilsson2008-02-081-12/+81
|
* CRIS v32: Fix bug in internal memory allocator mm/intmem.cJesper Nilsson2008-02-081-17/+31
| | | | | | - Fix bug where allocated memory didn't account for alignment. - Add support for ARTPEC-3 - Add module_init for crisv32_intmem_init.
* CRIS v32: Change name of simulator config to CONFIG_ETRAX_VCS_SIM in mm/init.cJesper Nilsson2008-02-081-6/+2
| | | | - Remove unneded code for ETRAX FS and ARTPEC-3
* CRIS v32: Change lib/spinlock.S to use byte operations instead of dwords.Jesper Nilsson2008-02-083-143/+5
|
* CRIS v32: Move hw_settings.S to machine specific directories for ETRAX FS ↵Jesper Nilsson2008-02-081-72/+0
| | | | and ARTPEC-3
* CRIS v32: Update lib/checksum.S and lib/checksumcopy.SJesper Nilsson2008-02-082-98/+43
| | | | | | - Slight tweaks, use $acr + addoq to propagate carry across the loop boundary. - Better use of latency cycles. - Remove duplicate folding of carry, it is not needed.
* CRIS v32: Add lib/delay to build.Jesper Nilsson2008-02-081-1/+2
|
* CRIS v32: Add precise delay loops for ETRAX FS and ARTPEC-3.Jesper Nilsson2008-02-081-0/+28
| | | | Implements cris_delay10ns.
* CRIS v32: Update vcs_hook.c for ETRAX FS.Jesper Nilsson2008-02-082-66/+70
| | | | - Clean up some formatting and whitespace.
* CRIS v32: Move vcs_hook to machine specific directory.Jesper Nilsson2008-02-082-70/+66
| | | | These files are different for ETRAX FS and ARTPEC-3.
* CRIS v32: Update kernel/smp.c for CRIS v32.Jesper Nilsson2008-02-081-10/+21
| | | | | | | - Change include paths to machine specific headers (asm/arch/hwregs -> hwregs) - Add cpu_possible_map as cpumask_t and export it. - Drop struct pt_regs parameter from crisv32_ipi_interrupt. - timer -> timer0
* CRIS v32: Update signal handling in kernel/signal.cJesper Nilsson2008-02-081-88/+56
| | | | | | | | | | | - do_signal now returns void, and does not have the previous signal set as a parameter. - Remove sys_rt_sigsuspend, we can use the common one instead. - Change sys_sigsuspend to be more like x86, don't call do_signal here. - handle_signal, setup_frame and setup_rt_frame now return -EFAULT if we've delivered a segfault, which is used by callers to perform necessary cleanup. - Break long lines, correct whitespace and formatting errors.
* CRIS v32: Update boot/rescue/rescue.ldJesper Nilsson2008-02-081-7/+30
| | | | - Update to work for ETRAX FS and ARTPEC-3
* CRIS v32: Change names of config variable and register field for data available.Jesper Nilsson2008-02-081-6/+6
| | | | | - CONFIG_ETRAXFS_SIM -> CONFIG_ETRAX_VCS_SIM - ser_intr_mask.data_avail -> ser_intr_mask.dav
* CRIS v32: Change debug and formatting in kernel/fasttimer.cJesper Nilsson2008-02-081-9/+7
| | | | | | | - Don't use SANITYCHECK(x) as a macro, test FAST_TIMER_SANITY_CHECKS with ifdef. This makes it possible for automatic indent etc to work. - Correct some whitespace errors. - Don't initialize static variable.
* CRIS v32: Update kernel/crisksyms.cJesper Nilsson2008-02-081-1/+6
| | | | | | - Include pinmux.h from machine specific directory. - Add some more symbols: crisv32_pinmux_alloc, crisv32_pinmux_dealloc_fixed, crisv32_io_get_name and crisv32_io_get
* CRIS v32: Remove config ifdef around init function for drivers/sync_serial.cJesper Nilsson2008-02-081-5/+1
| | | | The init function should be defined always.
* CRIS v32: Remove drivers/gpio.c, now exists as machine specific file.Jesper Nilsson2008-02-081-765/+0
|
* CRIS v32: Update driver for RTC chip pcf8563.Jesper Nilsson2008-02-081-133/+163
| | | | | | | | | | | | - Moved all calls to register_chrdev to a function called by module_init. - Added mutex locking. - Added better error handling at start up. - Added BIN_TO_BCD of the month value before it is saved to the RTC. - Corrected the month value returned by pcf8563_readreg. - Cache the voltage low value at driver init so the battery status information does not get 'accidentally' cleared when setting the RTC time. - Removed obsolete CONFIG_ETRAX_RTC_READONLY - Voltage low ioctl():s RTC_VLOW_RD -> RTC_VL_READ, RTC_VLOW_SET -> RTC_VL_CLR
* CRIS v32: Remove drivers/nandflash.h, now exists as machine specific file.Jesper Nilsson2008-02-081-156/+0
|
* CRIS v32: ETRAX FS Change name of LED macros in drivers/mach-fs/gpio.c to ↵Jesper Nilsson2008-02-081-8/+8
| | | | avoid collision.
* CRIS v32: Change name of LED macros in drivers/mach-a3/gpio.c to avoid ↵Jesper Nilsson2008-02-081-7/+7
| | | | collision.
* CRIS v32: Change include path for hwregs in drivers/iop_fw_load.cJesper Nilsson2008-02-081-8/+8
| | | | Also, remove useless CVS id tag.
* CRIS v32: Rewrite of stream co-processor driver for ETRAX FS and ARTPEC-3Jesper Nilsson2008-02-081-50/+54
| | | | | - Workaround for cachebug (Guinness TR 106). - Add ARTPEC-3 support.
* CRIS v32: Replace build flags in boot/rescue/MakefileJesper Nilsson2008-02-081-4/+4
| | | | | - Change AFLAGS to asflags-y, LDFLAGS to ldflags-y and EXTRA_CFLAGS to ccflags-y. We only need the flags in this Makefile.
* CRIS v32: Replace build flags in boot/compressed/MakefileJesper Nilsson2008-02-081-3/+3
| | | | | - Change AFLAGS to asflags-y, LDFLAGS to ldflags-y and KBUILD_CFLAGS to ccflags-y. We only need the flags in this Makefile.
* CRIS v32: Remove useless CVS id tag from boot/compressed/READMEJesper Nilsson2008-02-081-1/+0
|
* CRIS: Move common Kconfig variable ETRAX_RTC to arch independet Kconfig.Jesper Nilsson2008-02-081-6/+0
|
* CRIS v32: Update and improve kernel/time.cJesper Nilsson2008-02-081-98/+139
| | | | | | | | | - Shorten include paths to machine dependent header files. - Register name for first timer is now regi_timer0. - Remove raw_printk hack, use oops_in_progress instead. - Add handling of CPU frequency scaling for CRIS. - Remove regs parameter to timer_interrupt, get them from get_irq_regs instead. - Whitespace and formatting changes.
* CRIS v32: Update and improve kernel/traps.cJesper Nilsson2008-02-081-78/+114
| | | | | | | | - Remove watchdog handling, handled elsewhere. - Shorten include paths to machine dependent header files. - Remove raw_printk hack, we now use oops_in_progress instead. - Add handling of BUG for exception handlers (break 14). - Formatting and whitespace changes.
* CRIS v32: Minor updates to kernel/process.cJesper Nilsson2008-02-081-9/+5
| | | | | | - Shorten include paths for machine dependent header files. - Remove unused extern declaration of etrax_gpio_wake_up_check. - Register name for first timer is now regi_timer0.