summaryrefslogtreecommitdiffstats
path: root/arch (follow)
Commit message (Collapse)AuthorAgeFilesLines
* net: drop NET dependency from HAVE_BPF_JITSam Ravnborg2012-05-214-4/+4
| | | | | | | | | | | | | | | There is no point having the NET dependency on the select target, as it forces all users to depend on NET to tell they support BPF_JIT. Move the config option to the bottom of the file - this could be a nice place also for future "selectable" config symbols. Fix up all users to drop the dependency on NET now that it is not required to supress warnings for non-NET builds. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Acked-by: David Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2012-05-21142-1320/+14357
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin Pull blackfin changes from Bob Liu: "The biggest change was added an new processor(bf60x series). Bf60x series processor of blackfin can up to 1GHz with Hardware Support for HD Video Analytics, it use the same blackfin ISA but with some changes on system buses, interrupt controller and peripheral devices. Added dir arch/blackfin/mach-bf609/ and did some changes to the framework made linux working fine on the reference board bf609-ezkit now." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: (41 commits) blackfin: fix build after add bf60x mach/pm.h blackfin: twi: include linux/i2c.h blackfin: bf60x: add head file for crc controller blackfin: bf60x: twi: work around temporary anomaly 0501001 blackfin: twi: Move TWI MMR access macro to twi head file blackfin: twi: Move TWI peripheral pin request array to platform data blackfin: bf60x: anomaly: Add a temporary anomaly 0501001 blackfin: bf60x: Rename the DDR controller macro blackfin: mach-bf609: pm: cleanup bfin_deepsleep blackfin: bf60x: cleanup get clock code blackfin: bf60x: pm: Add a debug option to calculate kernel wakeup time. blackfin: bf60x: add wakeup source select blackfin: bf60x: make clock changeable in kernel menuconfig blackfin:mach-bf609: fix norflash for bf609-ezkit blackfin: mach-bf609: add can_wakeup to ethernet device blackfin: remove redundant CONFIG_BF60x macro blackfin: rotary: Add pm_wakeup flag to platform data structure. bfin_gpio: fix bf548-ezkit kernel fail to boot bfin_dma: fix initcall return error in proc_dma_init() Blackfin: delete fork func ...
| * blackfin: fix build after add bf60x mach/pm.hSteven Miao2012-05-212-1/+3
| | | | | | | | | | Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: twi: include linux/i2c.hSonic Zhang2012-05-211-0/+1
| | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: add head file for crc controllerSonic Zhang2012-05-211-0/+139
| | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: twi: work around temporary anomaly 0501001Sonic Zhang2012-05-211-0/+27
| | | | | | | | | | | | | | Disable IRQ when reading MMR rcv_data8 and rcv_data16. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: twi: Move TWI MMR access macro to twi head fileSonic Zhang2012-05-211-0/+44
| | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: twi: Move TWI peripheral pin request array to platform dataSonic Zhang2012-05-2117-1/+102
| | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: anomaly: Add a temporary anomaly 0501001Sonic Zhang2012-05-212-0/+14
| | | | | | | | | | | | | | | | Add a temporary anomaly 0501001 for data loss in MMR reading if interrupted. Add work around for bfin serial driver as well. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: Rename the DDR controller macroSonic Zhang2012-05-214-56/+56
| | | | | | | | | | | | | | | | Rename the DDR controller macro from DDR0 to DMC0 to avoid confustion for bf60x. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: mach-bf609: pm: cleanup bfin_deepsleepSteven Miao2012-05-211-8/+7
| | | | | | | | | | | | | | | | In bfin_deepsleep(), using register instead of local variable and remove unused dpmc register read. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: cleanup get clock codeSonic Zhang2012-05-211-42/+22
| | | | | | | | | | | | | | Remove redundance code for get clock. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: pm: Add a debug option to calculate kernel wakeup time.Sonic Zhang2012-05-216-0/+74
| | | | | | | | | | | | | | | | Display the total time when kernel resumes normal from standby or suspend to mem mode. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: add wakeup source selectSteven Miao2012-05-216-29/+192
| | | | | | | | | | | | | | Support select the wakeup source for power management on bf60x. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: make clock changeable in kernel menuconfigBob Liu2012-05-215-29/+197
| | | | | | | | | | | | Add clock changeable support in kernel menuconfig for bf60x. Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin:mach-bf609: fix norflash for bf609-ezkitBob Liu2012-05-212-5/+6
| | | | | | | | | | | | | | Set smc register to async flash protocol mode and use physmap driver instead of bfin-bf6xx. Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: mach-bf609: add can_wakeup to ethernet deviceBob Liu2012-05-211-0/+1
| | | | | | | | Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: remove redundant CONFIG_BF60x macroSonic Zhang2012-05-211-6/+0
| | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: rotary: Add pm_wakeup flag to platform data structure.Sonic Zhang2012-05-214-0/+4
| | | | | | | | | | | | | | Rotary can't be used as a wakeup source in all platform. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * bfin_gpio: fix bf548-ezkit kernel fail to bootSteven Miao2012-05-211-1/+2
| | | | | | | | | | | | | | Fix bf548-ezkit kernel fail to boot when request peripheral pins. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * bfin_dma: fix initcall return error in proc_dma_init()Steven Miao2012-05-211-1/+2
| | | | | | | | | | Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * Blackfin: delete fork funcMike Frysinger2012-05-213-12/+2
| | | | | | | | | | | | | | | | We don't implement fork() since we are no-mmu, so redirect it to the existing ENOSYS stub rather than adding a custom EINVAL one. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * Blackfin: fix unused clk var warningMike Frysinger2012-05-211-0/+2
| | | | | | | | | | | | | | | | This is only used on BF60x code (so this patch should get squashed into the original one that added it). Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: SMP: pda: "next" field of blackfin_pda only used in SMP kernelSteven Miao2012-05-211-0/+2
| | | | | | | | | | Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: GPIO: Implement more GPIO APIsSonic Zhang2012-05-211-0/+44
| | | | | | | | | | | | | | Implement more GPIO APIs in case GPIOLIB is disabled. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: mach-common: ints-priority: fix compile errorBob Liu2012-05-211-0/+2
| | | | | | | | | | | | IRQ_PINT4/PINT5 are not defined on !CONFIG_BF60x, this patch fix it. Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: bfin_uart: Add more LCR bits masksSonic Zhang2012-05-211-2/+4
| | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: license: Change ADI BSD licenseSonic Zhang2012-05-2153-100/+84
| | | | | | | | | | | | | | | | Change ADI BSD license to standart 3 clause BSD license for some blackfin arch code requested by ADI Legal. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf537-stamp: update board file for platform bfin_sport deviceAaron Wu2012-05-212-8/+54
| | | | | | | | | | | | | | Blackfin sport driver has been rewrited update board file according. Signed-off-by: Aaron Wu <Aaron.Wu@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: cleanup mem_map macroSteven Miao2012-05-211-3/+3
| | | | | | | | | | Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: fix compiling warningBob Liu2012-05-213-3/+11
| | | | | | | | | | | | Fix several compiling warning for bf60x. Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: add power management supportSteven Miao2012-05-218-595/+1105
| | | | | | | | | | | | | | Add bf60x cpu pm callbacks and change blackfin pm framework to support bf60x. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: add l2 ecc irq handlerBob Liu2012-05-211-0/+36
| | | | | | | | | | | | | | bf60x support l2 hardware ecc error check, add panic when double bits ecc error happened. Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: twi: move twi bit mask macro to twi head fileSonic Zhang2012-05-216-396/+70
| | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: enable gptimer clock sourceSteven Miao2012-05-213-3/+211
| | | | | | | | | | Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: add spi/sport3/ppi head file for bf60xScott Jiang2012-05-213-0/+493
| | | | | | | | | | Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: cplb: add support for bf60xBob Liu2012-05-214-2/+16
| | | | | | | | | | | | Bf60x support big CPLB pages, this commit enable it. Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: mach-common: add sec support for bf60xSteven Miao2012-05-212-39/+385
| | | | | | | | | | | | | | | | Add system event controller support for bf60x so that interrupt can be handled. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: bf60x: add clock supportSteven Miao2012-05-216-2/+495
| | | | | | | | | | | | | | Add clock support for bf60x. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: add bf60x to current frameworkBob Liu2012-05-2119-146/+840
| | | | | | | | | | | | This patch added bf60x to current blackfin kernel framework. Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: mach-bf609: add machine filesSonic Zhang2012-05-2120-0/+9781
| | | | | | | | | | | | | | | | Add machine files for bf60x including head files, Kconfig/Makefile and board file. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: asm: fix blackfin.h brokenBob Liu2012-05-211-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do{...}while makes no sense in __ASSEMBLY__ code paths. now kernels fail to build: arch/blackfin/mach-bf561/atomic.S: Assembler messages: arch/blackfin/mach-bf561/atomic.S:48: Error: syntax error. Input text was do. arch/blackfin/mach-bf561/atomic.S:48: Error: arch/blackfin/mach-bf561/atomic.S:48: Error: syntax error. Input text was }. arch/blackfin/mach-bf561/atomic.S:48: Error: arch/blackfin/mach-bf561/atomic.S:53: Error: syntax error. Input text was do. arch/blackfin/mach-bf561/atomic.S:53: Error: arch/blackfin/mach-bf561/atomic.S:53: Error: syntax error. Input text was }. Signed-off-by: Bob Liu <lliubbo@gmail.com>
| * blackfin: configs: add SMP support back to BF561-EZKIT-SMP_defconfigBob Liu2012-05-211-3/+1
| | | | | | | | | | | | | | SMP support was removed from BF561-EZKIT-SMP_defconfig in last commit by mistake, this patch add it back. Signed-off-by: Bob Liu <lliubbo@gmail.com>
* | Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreamingLinus Torvalds2012-05-214-14/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull c6x updates from Mark Salter: "Clean up some c6x Kconfig items and add support for Elf FDPIC loader." * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming: C6X: remove unused config items C6X: add support to build with BINFMT_ELF_FDPIC C6X: change main arch kbuild symbol
| * | C6X: remove unused config itemsMark Salter2012-05-181-12/+0
| | | | | | | | | | | | Signed-off-by: Mark Salter <msalter@redhat.com>
| * | C6X: add support to build with BINFMT_ELF_FDPICMark Salter2012-05-153-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C6x userspace supports a shared library mechanism called DSBT for systems with no MMU. DSBT is similar to FDPIC in allowing shared text segments and private copies of data segments without an MMU. Both methods access data using a base register and offset. With FDPIC, the caller of an external function sets up the base register for the callee. With DSBT, the called function sets up its own base register. Other details differ but both userspaces need the same thing from the kernel loader: a map of where each ELF segment was loaded. The FDPIC loader already provides this, so DSBT just uses it. This patch enables BINFMT_ELF_FDPIC by default for C6X and provides the necessary architecture hooks for the generic loader. Signed-off-by: Mark Salter <msalter@redhat.com>
| * | C6X: change main arch kbuild symbolMark Salter2012-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the c6x architecture uses CONFIG_TMS320C6X as the main architecture symbol. Most architectures use a more intuitive name based on the architecture directory name. There are no current users of TMS320C6X so this patch simply changes CONFIG_TMS320C6X to the more intuitive CONFIG_C6X. Signed-off-by: Mark Salter <msalter@redhat.com> Acked-by: Mike Frysinger <vapier@gentoo.org>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2012-05-218-56/+173
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k Pull m68k updates from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Setup CROSS_COMPILE at the top m68k: Correct the Atari ALLOWINT definition m68k/video: Create <asm/vga.h> m68k: Make sure {read,write}s[bwl]() are always defined m68k/mm: Port OOM changes to do_page_fault() scsi/atari: Make more functions static scsi/atari: Revive "atascsi=" setup option net/ariadne: Improve debug prints m68k/atari: Change VME irq numbers from unsigned long to unsigned int m68k/amiga: Use arch_initcall() for registering platform devices m68k/amiga: Add error checks when registering platform devices m68k/amiga: Mark z_dev_present() __init m68k: Remove unused MAX_NOINT_IPL definition
| * | | m68k: Setup CROSS_COMPILE at the topGeert Uytterhoeven2012-05-161-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CROSS_COMPILE must be setup before using e.g. cc-option (and a few other as-*, cc-*, ld-* macros), else they will check against the wrong compiler when cross-compiling, and may invoke the cross compiler with wrong or suboptimal compiler options. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Greg Ungerer<gerg@uclinux.org>
| * | | m68k: Correct the Atari ALLOWINT definitionMikael Pettersson2012-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Booting a 3.2, 3.3, or 3.4-rc4 kernel on an Atari using the `nfeth' ethernet device triggers a WARN_ONCE() in generic irq handling code on the first irq for that device: WARNING: at kernel/irq/handle.c:146 handle_irq_event_percpu+0x134/0x142() irq 3 handler nfeth_interrupt+0x0/0x194 enabled interrupts Modules linked in: Call Trace: [<000299b2>] warn_slowpath_common+0x48/0x6a [<000299c0>] warn_slowpath_common+0x56/0x6a [<00029a4c>] warn_slowpath_fmt+0x2a/0x32 [<0005b34c>] handle_irq_event_percpu+0x134/0x142 [<0005b34c>] handle_irq_event_percpu+0x134/0x142 [<0000a584>] nfeth_interrupt+0x0/0x194 [<001ba0a8>] schedule_preempt_disabled+0x0/0xc [<0005b37a>] handle_irq_event+0x20/0x2c [<0005add4>] generic_handle_irq+0x2c/0x3a [<00002ab6>] do_IRQ+0x20/0x32 [<0000289e>] auto_irqhandler_fixup+0x4/0x6 [<00003144>] cpu_idle+0x22/0x2e [<001b8a78>] printk+0x0/0x18 [<0024d112>] start_kernel+0x37a/0x386 [<0003021d>] __do_proc_dointvec+0xb1/0x366 [<0003021d>] __do_proc_dointvec+0xb1/0x366 [<0024c31e>] _sinittext+0x31e/0x9c0 After invoking the irq's handler the kernel sees !irqs_disabled() and concludes that the handler erroneously enabled interrupts. However, debugging shows that !irqs_disabled() is true even before the handler is invoked, which indicates a problem in the platform code rather than the specific driver. The warning does not occur in 3.1 or older kernels. It turns out that the ALLOWINT definition for Atari is incorrect. The Atari definition of ALLOWINT is ~0x400, the stated purpose of that is to avoid taking HSYNC interrupts. irqs_disabled() returns true if the 3-bit ipl & 4 is non-zero. The nfeth interrupt runs at ipl 3 (it's autovector 3), but 3 & 4 is zero so irqs_disabled() is false, and the warning above is generated. When interrupts are explicitly disabled, ipl is set to 7. When they are enabled, ipl is masked with ALLOWINT. On Atari this will result in ipl = 3, which blocks interrupts at ipl 3 and below. So how come nfeth interrupts at ipl 3 are received at all? That's because ipl is reset to 2 by Atari-specific code in default_idle(), again with the stated purpose of blocking HSYNC interrupts. This discrepancy means that ipl 3 can remain blocked for longer than intended. Both default_idle() and falcon_hblhandler() identify HSYNC with ipl 2, and the "Atari ST/.../F030 Hardware Register Listing" agrees, but ALLOWINT is defined as if HSYNC was ipl 3. [As an experiment I modified default_idle() to reset ipl to 3, and as expected that resulted in all nfeth interrupts being blocked.] The fix is simple: define ALLOWINT as ~0x500 instead. This makes arch_local_irq_enable() consistent with default_idle(), and prevents the !irqs_disabled() problems for ipl 3 interrupts. Tested on Atari running in an Aranym VM. Signed-off-by: Mikael Pettersson <mikpe@it.uu.se> Tested-by: Michael Schmitz <schmitzmic@googlemail.com> (on Falcon/CT60) Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>