aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* IB/mad: Improve an error message so error code is includedMichael Heinz2011-03-18
| | | | | Signed-off-by: Michael Heinz <michael.heinz@qlogic.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
* RDMA/addr: Fix return of uninitialized ret valueSean Hefty2011-03-17
| | | | | | | | | Commit b23dd4fe42b4 ("ipv4: Make output route lookup return rtable directly") resulted in leaving ret uninitialized, where it may later be returned. Signed-off-by: Sean Hefty <sean.hefty@intel.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
* Merge branch 'for_linus' of ↵Linus Torvalds2011-03-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: (40 commits) unicore32: rewrite arch-specific tlb.h to use asm-generic version unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs unicore32: replace unicore32-specific iomap functions with generic lib implementation unicore32 machine related: add frame buffer driver for pkunity-v3 soc unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc unicore32 io: redefine __REG(x) and re-use readl/writel funcs unicore32 i8042 upgrade and bugfix: adjust resource request region type unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call unicore32 i8042: adjust io funcs of i8042-unicore32io.h unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE unicore32: modify function names and parameters for irq_chips unicore32: remove unused lines in arch/unicore32/include/asm/irq.h unicore32 time.c: change calculate method for clock_event_device unicore32: ADD MAINTAINER for unicore32 architecture unicore32 machine related files: ps2 driver unicore32 machine related files: pci bus handling unicore32 machine related files: hardware registers unicore32 machine related files: core files unicore32 additional architecture files: boot process unicore32 additional architecture files: low-level lib: misc ... Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32: rewrite arch-specific tlb.h to use asm-generic versionGuanXuetao2011-03-16
| | | | | | | | Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEsGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | 1. remove __REG macro 2. add (void __iomem *) to io_p2v macro 3. add (phys_addr_t) to io_v2p macro 4. add PKUNITY_AHB_BASE and PKUNITY_APB_BASE definitions 5. modify all PKUNITY_mmio_BASEs from physical addr to virtual addr 6. adjust prefix macro for all usage of PKUNITY_mmio_BASEs -- by advice with Arnd Bergmann Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32: replace unicore32-specific iomap functions with generic lib ↵GuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | | | | | implementation 1. define and enable CONFIG_GENERIC_IOMAP 2. define unicore32-specific PCI_IOBASE for asm-generic/io.h 3. define HAVE_ARCH_PIO_SIZE and unicore32-specific PIO_* macros 4. remove all unicore32-specific iomap functions Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-and-Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 machine related: add frame buffer driver for pkunity-v3 socGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change from original version -- by advice of Paul Mundt 1. remove videomemorysize definitions 2. remove unifb_enable and unifb_setup 3. use dev_warn instead of printk in fb driver 4. remove judgement for FB_ACCEL_PUV3_UNIGFX 5. adjust clk_get and clk_set_rate calls 6. add resources definitions 7. remove unifb_option 8. adjust register for platform_device 9. adjust unifb_ops position and unifb_regs assignment position Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 machine related files: add i2c bus drivers for pkunity-v3 socGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | change from original version -- by advice of Jean Delvare 1. remove global variable i2c_reg, replaced by local variables 2. replace ENXIO with ENODEV when no platform resources 3. add adapter->nr assignment before i2c_add_numbered_adapter() call 4. add judgement for i2c_del_adapter() return value 5. release adapter when driver removed 6. add __devexit for puv3_i2c_remove() function 7. modify several names to more appropriated ones Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 io: redefine __REG(x) and re-use readl/writel funcsGuanXuetao2011-03-16
| | | | | | | | | | | | | | -- by advice of Arnd Bergmann Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 i8042 upgrade and bugfix: adjust resource request region typeGuanXuetao2011-03-16
| | | | | | | | Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map callGuanXuetao2011-03-16
| | | | | | | | Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32 i8042: adjust io funcs of i8042-unicore32io.hGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | replace inb/outb with readb/writeb in i8042-unicore32io.h and correct typecasting of register and region macros -- by advice with Arnd Bergmann Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASEGuanXuetao2011-03-16
| | | | | | | | | | | | | | for the term IOSPACE normally refers to the PCI PIO space -- by advice with Arnd Bergmann Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32: modify function names and parameters for irq_chipsGuanXuetao2011-03-16
| | | | | | | | | | | | -- by advice with Thomas Gleixner Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32: remove unused lines in arch/unicore32/include/asm/irq.hGuanXuetao2011-03-16
| | | | | | | | Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32 time.c: change calculate method for clock_event_deviceGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | apply clockevents_calc_mult_shift() to get rid of shift assignment and mult calculation for osmr0 -- by advice with Thomas Gleixner Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32: ADD MAINTAINER for unicore32 architectureGuanXuetao2011-03-16
| | | | | | | | | | | | | | Add MAINTAINER list for unicore32 architecture and pkunity soc drivers. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 machine related files: ps2 driverGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | | | | | This patch implements arch-specific ps2 driver. By reviewed with Dmitry Torokhov: 1. move i8042-ucio.h to drivers/input/serio/i8042-unicore32io.h 2. move puv3_ps2_init() to arch/unicore32/kernel/puv3-core.c 3. remove unused comments. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Dmitry Torokhov <dtor@mail.ru>
| * unicore32 machine related files: pci bus handlingGuanXuetao2011-03-16
| | | | | | | | | | | | This patch implements arch-specific pci bus driver. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32 machine related files: hardware registersGuanXuetao2011-03-16
| | | | | | | | | | | | This patch adds all hardware registers definitions. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32 machine related files: core filesGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch adds machine related core files, also including build infrastructure. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 additional architecture files: boot processGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements booting process, including uncompression process. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 additional architecture files: low-level lib: miscGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements the rest low-level libraries. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 additional architecture files: low-level lib: uaccessGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements low-level uaccess libraries. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 additional architecture files: low-level lib: ocd debugGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements low-level debug libraries with On-Chip-Debugger hardware support. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 additional architecture files: ptrace handlingGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds ptrace support. Changed from previous version: 1. disable arch_has_single_step and remove single-step instruction handler 2. add 'Ross Biro 1/23/92' contributor information 3. clean unused codes Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 additional architecture files: float point handlingGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | This patch implements support for float point unit, which using UniCore-F64 FPU hardware in UniCore32 ISA. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 additional architecture files: pm related filesGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch adds pm related files, including hibernate and sleep supports. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 core architecture: signals handlingGuanXuetao2011-03-16
| | | | | | | | | | | | This patch implements signals. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32 core architecture: interrupts ang gpio handlingGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | This patch implements interrupts and gpio handling. UniCore32 has 9 gpio interrupt sources. And gpio device operations are also here. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32 core architecture: timer and time handlingGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements timer and time. RTC and PWM device drivers are also here. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
| * unicore32 core architecture: mm related: consistent device DMA handlingGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | This patch implements consistent device DMA handling of memory management. DMA device operations are also here. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 core architecture: mm related: fault handlingGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements fault handling of memory management. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 core architecture: mm related: generic codesGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch includes generic codes for memory management. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 core architecture: process/thread related codesGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements process/thread related codes. Backtrace and stacktrace are here. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 core architecture: low level entry and setup codesGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements low level entry and setup codes. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 core architecture: processor and system headersGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | This patch includes processor and system headers. System call interface is here. We used the syscall interface the same as asm-generic version. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 core architecture: generic elf and ksyms stuffGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | This patch includes some generic stuff including elf and ksyms. Because all one-line asm-generic headers are auto-generated by ASM_GENERIC_HEADERS in arch/unicore32/Makefile, so the rest seems very little. ELF handling functions and module handling functions are also here. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * unicore32 core architecture: build infrastructureGuanXuetao2011-03-16
| | | | | | | | | | | | | | This patch implements build infrastructure. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * asm-generic headers: add arch-specific __strnlen_user calling in uaccess.hGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | This patch changes the implementation of strnlen_user in include/asm-generic/uaccess.h. Originally, it calls strlen() function directly, which may not correctly handle the access of user space in most mmu-enabled architectures. New __strnlen_user is added for using as an architecture specific function. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
| * asm-generic headers: add ftrace.hGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | This patch adds ftrace.h into asm-generic headers. The file content could be empty in most architectures. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * asm-generic headers: add sizes.hGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | This patch adds sizes.h into asm-generic headers. Only 32-bit version supported. Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> Acked-by: Arnd Bergmann <arnd@arndb.de>
| * asm-generic: fix inX/outX functions for architectures that have PCIGuanXuetao2011-03-16
| | | | | | | | | | | | | | | | | | | | The definitions for the PC-style PIO functions in asm-generic/io.h were meant as dummies so you could compile code on architectures without ISA and PCI buses. However, unicore32 actually wants to use them with a real PCI bus, so they need to be defined to actually address the register window holding the I/O ports. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2011-03-17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] kexec: Disable ftrace during kexec [S390] support XZ compressed kernel [S390] css_bus_type: make it static [S390] css_driver: remove duplicate members [S390] css: remove subchannel private [S390] css: move chsc_private to drv_data [S390] css: move io_private to drv_data [S390] cio: move cdev pointer to io_subchannel_private [S390] cio: move options to io_sch_private [S390] cio: move asms to generic header [S390] cio: move orb definitions to separate header [S390] Write protect module text and RO data [S390] dasd: get rid of compile warning [S390] remove superfluous check from do_IRQ [S390] remove redundant stack check option
| * | [S390] kexec: Disable ftrace during kexecHeiko Carstens2011-03-15
| | | | | | | | | | | | | | | | | | | | | | | | Disable ftrace during kexec. Same as on x86/powerpc. ac4414e "powerpc/kdump: Disable ftrace during kexec". Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| * | [S390] support XZ compressed kernelHeiko Carstens2011-03-15
| | | | | | | | | | | | | | | | | | | | | Add support for XZ compressed kernel. Same as on x86 and sh. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| * | [S390] css_bus_type: make it staticSebastian Ott2011-03-15
| | | | | | | | | | | | | | | | | | | | | | | | Make css_bus_type static. Subchannel drivers have to use css_driver_register. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| * | [S390] css_driver: remove duplicate membersSebastian Ott2011-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the owner and name members of struct css_driver and convert all drivers to store this data in the embedded struct device_driver. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| * | [S390] css: remove subchannel privateSebastian Ott2011-03-15
| | | | | | | | | | | | | | | | | | | | | | | | All subchannel drivers use drv_data, so get rid of the additional private pointer of struct subchannel. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| * | [S390] css: move chsc_private to drv_dataSebastian Ott2011-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the subchannels drv_data to access chsc_private for chsc subchannels. Note: Also set the drv_data prior to the cio_enable_subchannel call, since we can receive an interrupt the moment we enable the subchannel and the IRQ handler relies on this data. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>