aboutsummaryrefslogtreecommitdiff
path: root/arch/cris
AgeCommit message (Collapse)Author
2008-02-09ide: introduce HAVE_IDESam Ravnborg
To allow flexible configuration of IDE introduce HAVE_IDE. All archs except arm, um and s390 unconditionally select it. For arm the actual configuration determine if IDE is supported. This is a step towards introducing drivers/Kconfig for arm. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Acked-by: Russell King - ARM Linux <linux@arm.linux.org.uk> Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-02-08Merge branch 'cris' of git://www.jni.nu/crisLinus Torvalds
* 'cris' of git://www.jni.nu/cris: (158 commits) CRIS v32: Remove hwregs/timer_defs.h, it is now architecture specific. CRIS v32: Change drivers/i2c.c locking. CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup. CRIS: Add new timerfd syscall entries. MAINTAINERS: Add my information for the CRIS port. CRIS v32: Correct spelling of bandwidth in function name. CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS. CRIS v10: Cleanup of drivers/gpio.c CRIS v10: drivers/net/cris/eth_v10.c rename LED defines to CRIS_LED to avoid name clash. CRIS: Make io_pwm_set_period members unsigned in etraxgpio.h CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file. CRIS: Drop regs parameter from call to profile_tick in kernel/time.c CRIS v32: Fix minor formatting issue in mach-a3/io.c CRIS v32: Initialize GIO even if we're rambooting in kernel/head.S CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory. CRIS v32: Minor changes to avoid errors in asm-cris/arch-v32/hwregs/reg_rdwr.h CRIS v32: arch-v32/hwregs/intr_vect_defs.h moved to machine dependent directory. CRIS v32: Correct offset for TASK_pid in asm-cris/arch-v32/offset.h CRIS v32: Move register map header to machine dependent directory. CRIS v32: Let compiler know that memory is clobbered after a break op. ...
2008-02-08avoid overflows in kernel/time.cH. Peter Anvin
When the conversion factor between jiffies and milli- or microseconds is not a single multiply or divide, as for the case of HZ == 300, we currently do a multiply followed by a divide. The intervening result, however, is subject to overflows, especially since the fraction is not simplified (for HZ == 300, we multiply by 300 and divide by 1000). This is exposed to the user when passing a large timeout to poll(), for example. This patch replaces the multiply-divide with a reciprocal multiplication on 32-bit platforms. When the input is an unsigned long, there is no portable way to do this on 64-bit platforms there is no portable way to do this since it requires a 128-bit intermediate result (which gcc does support on 64-bit platforms but may generate libgcc calls, e.g. on 64-bit s390), but since the output is a 32-bit integer in the cases affected, just simplify the multiply-divide (*3/10 instead of *300/1000). The reciprocal multiply used can have off-by-one errors in the upper half of the valid output range. This could be avoided at the expense of having to deal with a potential 65-bit intermediate result. Since the intent is to avoid overflow problems and most of the other time conversions are only semiexact, the off-by-one errors were considered an acceptable tradeoff. At Ralf Baechle's suggestion, this version uses a Perl script to compute the necessary constants. We already have dependencies on Perl for kernel compiles. This does, however, require the Perl module Math::BigInt, which is included in the standard Perl distribution starting with version 5.8.0. In order to support older versions of Perl, include a table of canned constants in the script itself, and structure the script so that Math::BigInt isn't required if pulling values from said table. Running the script requires that the HZ value is available from the Makefile. Thus, this patch also adds the Kconfig variable CONFIG_HZ to the architectures which didn't already have it (alpha, cris, frv, h8300, m32r, m68k, m68knommu, sparc, v850, and xtensa.) It does *not* touch the sh or sh64 architectures, since Paul Mundt has dealt with those separately in the sh tree. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Ralf Baechle <ralf@linux-mips.org>, Cc: Sam Ravnborg <sam@ravnborg.org>, Cc: Paul Mundt <lethal@linux-sh.org>, Cc: Richard Henderson <rth@twiddle.net>, Cc: Michael Starvik <starvik@axis.com>, Cc: David Howells <dhowells@redhat.com>, Cc: Yoshinori Sato <ysato@users.sourceforge.jp>, Cc: Hirokazu Takata <takata@linux-m32r.org>, Cc: Geert Uytterhoeven <geert@linux-m68k.org>, Cc: Roman Zippel <zippel@linux-m68k.org>, Cc: William L. Irwin <sparclinux@vger.kernel.org>, Cc: Chris Zankel <chris@zankel.net>, Cc: H. Peter Anvin <hpa@zytor.com>, Cc: Jan Engelhardt <jengelh@computergmbh.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-08procfs: constify function pointer tablesJan Engelhardt
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-By: David Howells <dhowells@redhat.com> Acked-by: Bryan Wu <bryan.wu@analog.com> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-08CRIS v32: Change drivers/i2c.c locking.Jesper Nilsson
- 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.
2008-02-08CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup.Jesper Nilsson
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)
2008-02-08CRIS: Add new timerfd syscall entries.Jesper Nilsson
2008-02-08CRIS v32: Correct spelling of bandwidth in function name.Jesper Nilsson
2008-02-08CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS.Jesper Nilsson
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.
2008-02-08CRIS v10: Cleanup of drivers/gpio.cJesper Nilsson
- Change parameters of gpio_write (const char * buf -> const char __user *buf) - Don't initialize static variables to zero. - Remove useless casts from void. - Change name of interrupt routine (gpio_pa_interrupt -> gpio_interrupt) - Use kzmalloc instead of allocating memory and zeroing it manually. - Correct casts for copy_to_user and copy_from_user to (void __user *) - Make file_operations gpio_fops static. - Make ioif_watcher static, not used outside this file.
2008-02-08CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file.Jesper Nilsson
2008-02-08CRIS: Drop regs parameter from call to profile_tick in kernel/time.cJesper Nilsson
2008-02-08CRIS v32: Fix minor formatting issue in mach-a3/io.cJesper Nilsson
2008-02-08CRIS v32: Initialize GIO even if we're rambooting in kernel/head.SJesper Nilsson
2008-02-08CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory.Jesper Nilsson
2008-02-08CRIS: Add sched_clock to kernel/time.cJesper Nilsson
Also, clean up some whitespace errors.
2008-02-08CRIS: Register cpus in kernel/setup.cJesper Nilsson
Also, fix some white space errors, and constify cpuinfo_op.
2008-02-08CRIS: Remove include of linux/init.h, not needed anymore.Jesper Nilsson
2008-02-08CRIS: Remove CONFIG_NO_IOMEM from ARTPEC-3 default config.Jesper Nilsson
2008-02-08CRIS: Remove useless CVS log from kernel/ptrace.cJesper Nilsson
Also, fix some whitespace errors.
2008-02-08CRIS: Remove useless CVS id and log from kernel/process.cJesper Nilsson
2008-02-08CRIS: Add configuration possibility for using kmalloc for modules.Jesper Nilsson
Using kmalloc instead of vmalloc solves the stability problems experienced by some 100 LX products.
2008-02-08CRIS: Remove CONFIG_NO_IOMEM from default configs.Jesper Nilsson
2008-02-08CRIS v32: Fix startup oops and replace hardcoded pagesize in vmlinux.lds.SJesper Nilsson
- 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.
2008-02-08CRIS v32: Avoid work when switching between tasks with shared memory ↵Jesper Nilsson
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.
2008-02-08CRIS v32: Add workaround for MMU hardware bug for ETRAX FS in mm/mmu.SJesper Nilsson
2008-02-08CRIS v32: Fix bug in internal memory allocator mm/intmem.cJesper Nilsson
- Fix bug where allocated memory didn't account for alignment. - Add support for ARTPEC-3 - Add module_init for crisv32_intmem_init.
2008-02-08CRIS v32: Change name of simulator config to CONFIG_ETRAX_VCS_SIM in mm/init.cJesper Nilsson
- Remove unneded code for ETRAX FS and ARTPEC-3
2008-02-08CRIS v32: Change lib/spinlock.S to use byte operations instead of dwords.Jesper Nilsson
2008-02-08CRIS v32: Move hw_settings.S to machine specific directories for ETRAX FS ↵Jesper Nilsson
and ARTPEC-3
2008-02-08CRIS v32: Update lib/checksum.S and lib/checksumcopy.SJesper Nilsson
- 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.
2008-02-08CRIS v32: Add lib/delay to build.Jesper Nilsson
2008-02-08CRIS v32: Add precise delay loops for ETRAX FS and ARTPEC-3.Jesper Nilsson
Implements cris_delay10ns.
2008-02-08CRIS v32: Update vcs_hook.c for ETRAX FS.Jesper Nilsson
- Clean up some formatting and whitespace.
2008-02-08CRIS v32: Move vcs_hook to machine specific directory.Jesper Nilsson
These files are different for ETRAX FS and ARTPEC-3.
2008-02-08CRIS v32: Update kernel/smp.c for CRIS v32.Jesper Nilsson
- 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
2008-02-08CRIS v32: Update signal handling in kernel/signal.cJesper Nilsson
- 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.
2008-02-08CRIS v32: Update boot/rescue/rescue.ldJesper Nilsson
- Update to work for ETRAX FS and ARTPEC-3
2008-02-08CRIS v10: Update drivers/gpio.c, fix locking and general improvements.Jesper Nilsson
- Change all spin_lock/local_irq_save to spin_lock_irqsave. - Change multiple returns in functions where we have a lock to goto out. - Correct number of arguments to gpio_poll_timer_interrupt, gpio_pa_interrupt. - Break out gpio_write logic to smaller functions to make it readable. - In setget_input and setget_output, avoid extra if-indent level. - Change name LED_* -> CRIS_LED_* to avoid name clash. - Don't use braces around single statement ifs. - Fix whitespace errors. - Remove useless CVS id and log.
2008-02-08CRIS v32: Change names of config variable and register field for data available.Jesper Nilsson
- CONFIG_ETRAXFS_SIM -> CONFIG_ETRAX_VCS_SIM - ser_intr_mask.data_avail -> ser_intr_mask.dav
2008-02-08CRIS v32: Change debug and formatting in kernel/fasttimer.cJesper Nilsson
- 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.
2008-02-08CRIS v32: Update kernel/crisksyms.cJesper Nilsson
- 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
2008-02-08CRIS v32: Remove config ifdef around init function for drivers/sync_serial.cJesper Nilsson
The init function should be defined always.
2008-02-08CRIS v32: Remove drivers/gpio.c, now exists as machine specific file.Jesper Nilsson
2008-02-08CRIS v32: Update driver for RTC chip pcf8563.Jesper Nilsson
- 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
2008-02-08CRIS v32: Remove drivers/nandflash.h, now exists as machine specific file.Jesper Nilsson
2008-02-08CRIS v32: ETRAX FS Change name of LED macros in drivers/mach-fs/gpio.c to ↵Jesper Nilsson
avoid collision.
2008-02-08CRIS v32: Change name of LED macros in drivers/mach-a3/gpio.c to avoid ↵Jesper Nilsson
collision.
2008-02-08CRIS v32: Change include path for hwregs in drivers/iop_fw_load.cJesper Nilsson
Also, remove useless CVS id tag.
2008-02-08CRIS v32: Rewrite of stream co-processor driver for ETRAX FS and ARTPEC-3Jesper Nilsson
- Workaround for cachebug (Guinness TR 106). - Add ARTPEC-3 support.