aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-05-19MIPS: Netlogic: Cache, TLB support and feature overrides for XLRJayachandran C3-0/+4
CPU_XLR case added to mm/tlbex.c CPU_XLR case added to mm/c-r4k.c for PINDEX attribute Feature overrides for XLR cpu. Signed-off-by: Jayachandran C <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2333/ Signed-off-by: Ralf Baechle <[email protected]>
2011-05-19MIPS: Netlogic: mach-netlogic include filesJayachandran C3-0/+87
Add war.h and irq.h with XLR/XLS definitions. Signed-off-by: Jayachandran C <[email protected]> To: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2331/ Signed-off-by: Ralf Baechle <[email protected]>
2011-05-19MIPS: Netlogic XLR/XLS processor IDs.Jayachandran C2-0/+83
Add Netlogic Microsystems company ID and processor IDs for XLR and XLS processors for CPU probe. Add CPU_XLR to cpu_type_enum. Signed-off-by: Jayachandran C <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/2367/ Signed-off-by: Ralf Baechle <[email protected]>
2011-05-19powerpc: Remove last piece of GEMINISebastian Siewior1-13/+0
It seems that Adrian is getting old. He removed almost everything of GEMINI in commit c53653130 ("[POWERPC] Remove the broken Gemini support") except this piece. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19powerpc: Fix for Pegasos keyboard and mouseGabriel Paubert1-0/+4
[See http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-October/086424.html and followups. Part of the commit message is directly copied from that.] Commit 540c6c392f01887dcc96bef0a41e63e6c1334f01 tries to find i8042 IRQs in the device-tree but doesn't fall back to the old hardcoded 1 and 12 in all failure cases. Specifically, the case where the device-tree contains nothing matching pnpPNP,303 or pnpPNP,f03 doesn't seem to be handled well. It sort of falls through to the old code, but leaves the IRQs set to 0. Signed-off-by: Gabriel Paubert <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19powerpc: Make early memory scan more resilient to out of order nodesBenjamin Herrenschmidt1-5/+10
We keep track of the size of the lowest block of memory and call setup_initial_memory_limit() only after we've parsed them all Signed-off-by: Benjamin Herrenschmidt <[email protected]> Acked-by: Milton Miller <[email protected]>
2011-05-19params.c: Use new strtobool function to process boolean inputsJonathan Cameron1-10/+4
Signed-off-by: Jonathan Cameron <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19powerpc/pseries/iommu: Cleanup ddw namingMilton Miller1-23/+19
When using a property refering to the availibily of dynamic dma windows call it ddw_avail not ddr_avail. dupe_ddw_if_already_created does not dupilcate anything, it only finds and reuses the windows we already created, so rename it to find_existing_ddw. Also, it does not need the pci device node, so remove that argument. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19debugfs: move to new strtoboolJonathan Cameron1-13/+4
No functional changes requires that we eat errors from strtobool. If people want to not do this, then it should be fixed at a later date. V2: Simplification suggested by Rusty Russell removes the need for additional variable ret. Signed-off-by: Jonathan Cameron <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19powerpc/pseries/iommu: Find windows after kexec during bootMilton Miller1-28/+24
Move the discovery of windows previously setup from when the pci driver calls set_dma_mask to an arch_initcall. When kexecing into a kernel with dynamic dma windows allocated, we need to find the windows early so that memory hot remove will be able to delete the tces mapping the to be removed memory and memory hotplug add will map the new memory into the window. We should not wait for the driver to be loaded and the device to be probed. The iommu init hooks are before kmalloc is setup, so defer to arch_initcall. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19Add a strtobool function matching semantics of existing in kernel equivalentsJonathan Cameron2-0/+30
This is a rename of the usr_strtobool proposal, which was a renamed, relocated and fixed version of previous kstrtobool RFC Signed-off-by: Jonathan Cameron <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19modpost: Update 64k section support for binutils 2.18.50Anders Kaseorg2-29/+14
Binutils 2.18.50 made a backwards-incompatible change in the way it writes ELF objects with over 65280 sections, to improve conformance with the ELF specification and interoperability with other ELF tools. Specifically, it no longer adds 256 to section indices SHN_LORESERVE and higher to skip over the reserved range SHN_LORESERVE through SHN_HIRESERVE; those values are only considered special in the st_shndx field, and not in other places where section indices are stored. See: http://sourceware.org/bugzilla/show_bug.cgi?id=5900 http://groups.google.com/group/generic-abi/browse_thread/thread/e8bb63714b072e67/6c63738f12cc8a17 Signed-off-by: Anders Kaseorg <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19powerpc/pseries/iommu: Remove ddw property when destroying windowMilton Miller1-2/+10
If we destroy the window, we need to remove the property recording that we setup the window. Otherwise the next kernel we kexec will be confused. Also we should remove the property if even if we don't find the ibm,ddw-applicable window or if one of the property sizes is unexpected; presumably these came from a prior kernel via kexec, and we will not be maintaining the window with respect to memory hotplug. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19module: Use binary search in lookup_symbol()Alessio Igor Bogani1-5/+2
The function is_exported() with its helper function lookup_symbol() are used to verify if a provided symbol is effectively exported by the kernel or by the modules. Now that both have their symbols sorted we can replace a linear search with a binary search which provide a considerably speed-up. This work was supported by a hardware donation from the CE Linux Forum. Signed-off-by: Alessio Igor Bogani <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19powerpc/pseries/iommu: Add additional checks when changing iommu maskMilton Miller1-4/+11
Do not check dma supported until we have chosen the right dma ops. Check that the device is pci before treating it as such. Check the mask is supported by the selected dma ops before committing it. We only need to set iommu ops if it is not the current ops; this avoids searching the tree for the iommu table unnecessarily. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Nishanth Aravamudan <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19module: Use the binary search for symbols resolutionAlessio Igor Bogani1-5/+16
Takes advantage of the order and locates symbols using binary search. This work was supported by a hardware donation from the CE Linux Forum. Signed-off-by: Alessio Igor Bogani <[email protected]> Signed-off-by: Rusty Russell <[email protected]> Tested-by: Dirk Behme <[email protected]>
2011-05-19powerpc/pseries/iommu: Use correct return type in dupe_ddw_if_already_createdNishanth Aravamudan1-1/+1
Otherwise we get silent truncations. Signed-off-by: Nishanth Aravamudan <[email protected]> Cc: Anton Blanchard <[email protected]> Cc: Milton Miller <[email protected]> Cc: [email protected] Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19lib: Add generic binary search function to the kernel.Tim Abbott3-1/+64
There a large number hand-coded binary searches in the kernel (run "git grep search | grep binary" to find many of them). Since in my experience, hand-coding binary searches can be error-prone, it seems worth cleaning this up by providing a generic binary search function. This generic binary search implementation comes from Ksplice. It has the same basic API as the C library bsearch() function. Ksplice uses it in half a dozen places with 4 different comparison functions, and I think our code is substantially cleaner because of this. Signed-off-by: Tim Abbott <[email protected]> Extra-bikeshedding-by: Alan Jenkins <[email protected]> Extra-bikeshedding-by: AndrĂ© Goddard Rosa <[email protected]> Extra-bikeshedding-by: Rusty Russell <[email protected]> Signed-off-by: Rusty Russell <[email protected]> Signed-off-by: Alessio Igor Bogani <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19module: Sort exported symbolsAlessio Igor Bogani3-12/+23
This patch places every exported symbol in its own section (i.e. "___ksymtab+printk"). Thus the linker will use its SORT() directive to sort and finally merge all symbol in the right and final section (i.e. "__ksymtab"). The symbol prefixed archs use an underscore as prefix for symbols. To avoid collision we use a different character to create the temporary section names. This work was supported by a hardware donation from the CE Linux Forum. Signed-off-by: Alessio Igor Bogani <[email protected]> Signed-off-by: Rusty Russell <[email protected]> (folded in '+' fixup) Tested-by: Dirk Behme <[email protected]>
2011-05-19module: each_symbol_section instead of each_symbolRusty Russell2-17/+30
Instead of having a callback function for each symbol in the kernel, have a callback for each array of symbols. This eases the logic when we move to sorted symbols and binary search. Signed-off-by: Rusty Russell <[email protected]> Signed-off-by: Alessio Igor Bogani <[email protected]>
2011-05-19module: split unset_section_ro_nx function.Jan Glauber1-22/+23
Split the unprotect function into a function per section to make the code more readable and add the missing static declaration. Signed-off-by: Jan Glauber <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19module: undo module RONX protection correctly.Jan Glauber3-12/+19
While debugging I stumbled over two problems in the code that protects module pages. First issue is that disabling the protection before freeing init or unload of a module is not symmetric with the enablement. For instance, if pages are set to RO the page range from module_core to module_core + core_ro_size is protected. If a module is unloaded the page range from module_core to module_core + core_size is set back to RW. So pages that were not set to RO are also changed to RW. This is not critical but IMHO it should be symmetric. Second issue is that while set_memory_rw & set_memory_ro are used for RO/RW changes only set_memory_nx is involved for NX/X. One would await that the inverse function is called when the NX protection should be removed, which is not the case here, unless I'm missing something. Signed-off-by: Jan Glauber <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19module: zero mod->init_ro_size after init is freed.Jan Glauber1-0/+1
Reset mod->init_ro_size to zero after the init part of a module is unloaded. Otherwise we need to check if module->init is NULL in the unprotect functions in the next patch. Signed-off-by: Jan Glauber <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19minor ANSI prototype sparse fixDaniel J Blueman1-2/+2
Fix function prototype to be ANSI-C compliant, consistent with other function prototypes, addressing a sparse warning. Signed-off-by: Daniel J Blueman <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19module: reorder kparam_array to remove alignment padding on 64 bit buildsRichard Kennedy1-3/+4
Reorder structure kparam_array to remove 8 bytes of alignment padding on 64 bit builds, dropping its size from 40 to 32 bytes. Also update the macro module_param_array_named to initialise the structure using its member names to allow it to be changed without touching all its call sites. 'git grep' finds module_param_array in 1037 places so this patch will save a small amount of data space across many modules. Signed-off-by: Richard Kennedy <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19module: remove 64 bit alignment padding from struct module with CONFIG_TRACE*Richard Kennedy1-6/+7
Reorder struct module to remove 24 bytes of alignment padding on 64 bit builds when the CONFIG_TRACE options are selected. This allows the structure to fit into one fewer cache lines, and its size drops from 592 to 568 on x86_64. Signed-off-by: Richard Kennedy <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19module: do not hide __modver_version_show declaration behind ifdefDmitry Torokhov1-2/+3
Doing so prevents the following warning from sparse: CHECK kernel/params.c kernel/params.c:817:9: warning: symbol '__modver_version_show' was not declared. Should it be static? since kernel/params.c is never compiled with MODULE being set. Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19module: deal with alignment issues in built-in module versionsDmitry Torokhov2-8/+11
On m68k natural alignment is 2-byte boundary but we are trying to align structures in __modver section on sizeof(void *) boundary. This causes trouble when we try to access elements in this section in array-like fashion when create "version" attributes for built-in modules. Moreover, as DaveM said, we can't reliably put structures into independent objects, put them into a special section, and then expect array access over them (via the section boundaries) after linking the objects together to just "work" due to variable alignment choices in different situations. The only solution that seems to work reliably is to make an array of plain pointers to the objects in question and put those pointers in the special section. Reported-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
2011-05-19Merge branch 'merge' into nextBenjamin Herrenschmidt803-4458/+8396
2011-05-19powerpc: Remove unused/obsolete CONFIG_XICSBenjamin Herrenschmidt1-5/+0
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19misc: Add CARMA DATA-FPGA Programmer supportIra Snyder3-0/+1150
This adds support for programming the data processing FPGAs on the OVRO CARMA board. These FPGAs have a special programming sequence that requires that we program the Freescale DMA engine, which is only available inside the kernel. Signed-off-by: Ira W. Snyder <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19misc: Add CARMA DATA-FPGA Access DriverIra Snyder5-0/+1445
This driver allows userspace to access the data processing FPGAs on the OVRO CARMA board. It has two modes of operation: 1) random access This allows users to poke any DATA-FPGA registers by using mmap to map the address region directly into their memory map. 2) correlation dumping When correlating, the DATA-FPGA's have special requirements for getting the data out of their memory before the next correlation. This nominally happens at 64Hz (every 15.625ms). If the data is not dumped before the next correlation, data is lost. The data dumping driver handles buffering up to 1 second worth of correlation data from the FPGAs. This lowers the realtime scheduling requirements for the userspace process reading the device. Signed-off-by: Ira W. Snyder <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19powerpc: Make IRQ_NOREQUEST last to clear, first to setMilton Miller1-7/+7
When creating an irq, don't allow a concurent driver request until we have caled map, which will likley call set_chip_and_handler to change the irq_chip and its operations. Similarly, when tearing down an IRQ, make sure no new uses come along while we change the irq back to the nop chip and then reset the descriptor to freed status. Signed-off-by: Milton Miller <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-05-19powerpc: Integrated Flash controller device tree bindingsDipen Dudhat1-0/+76
Signed-off-by: Dipen Dudhat <[email protected]> Acked-By: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/85xx: Create dts of each core in CAMP mode for P1020RDBPrabhakar Kushwaha3-1/+362
Create the dts files for each core and splits the devices between the two cores for P1020RDB. Core0 has core0 to have memory, l2, i2c, spi, gpio, tdm, dma, usb, eth1, eth2, sdhc, crypto, global-util, message, pci0, pci1, msi. Core1 has l2, eth0, crypto. MPIC is shared between two cores but each core will protect its interrupts from other core by using "protected-sources" of mpic. Fix compatible property for global-util node of P1020si.dtsi. Signed-off-by: Prabhakar Kushwaha <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/85xx: Fix PCIe IDSEL for Px020RDBPrabhakar Kushwaha4-0/+48
PCIe device in legacy mode can trigger interrupts using the wires #INTA, #INTB ,#INTC and #INTD. PCI devices are obligated to use #INTx for interrupts under legacy mode. Each PCI slot or device is typically wired to different inputs on the interrupt controller. So, Define interrupt-map and interrupt-map-mask properties for device tree to of map each PCI interrupt signal to the inputs of the interrupt controller. Signed-off-by: Prabhakar Kushwaha <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/85xx: P2020 DTS: re-organize dts filesPrabhakar Kushwaha5-933/+564
Creates P2020si.dtsi, containing information for P2020 SoC. Modifies dts files for P2020 based systems to use dtsi file. Signed-off-by: Prabhakar Kushwaha <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/85xx: P1020 DTS : re-organize dts filesPrabhakar Kushwaha2-313/+380
Creates P1020si.dtsi, containing information for the P1020 SoC. Modifies dts files for P1020 based systems to use dtsi file Signed-off-by: Prabhakar Kushwaha <[email protected]> Acked-by: Grant Likely <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc: Adding bindings for flexcan controllerBhaskar Upadhaya1-0/+61
Signed-off-by: Bhaskar Upadhaya <[email protected]> Acked-By: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/fsl: enable verbose bug outputScott Wood10-10/+0
This debug option has no overhead other than a slight increase in kernel size, and makes bug reports more useful. While some end users may prefer to save the space, as a default on a kernel config aimed primarily at development on reference boards, it should be enabled. Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/e5500: add networking to defconfigScott Wood1-9/+29
Even though support for the p5020's on-chip ethernet is not yet upstream, it is not appropriate to disable all networking support (including loopback, unix domain sockets, external ethernet devices, etc) in the defconfig. The networking settings are taken from mpc85xx_smp_defconfig, minus the drivers for ethernet devices not found on any current e5500 chip. The other changes are the result of running "make savedefconfig". Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/mpic: add the mpic global timer supportScott Wood2-7/+88
Add support for MPIC timers as requestable interrupt sources. Based on http://patchwork.ozlabs.org/patch/20941/ by Dave Liu. Signed-off-by: Dave Liu <[email protected]> Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/mpic: parse 4-cell intspec types other than zeroScott Wood2-1/+38
Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/p1022ds: fix broken mpic timer nodeScott Wood1-47/+59
There is no hardware interrupt 0xf7. But now we can express the timer interrupt using 4-cell interrupts. This requires converting all of the other interrupt specifiers in the tree as well. Also add the second timer group, and fix the reg property to only describe the timer registers. Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc: Add fsl mpic timer bindingScott Wood2-1/+39
Update the existing example in the general mpic binding to have a separate TCRx region. Currently the example doesn't describe TCRx at all. The one upstream device tree with an mpic timer node (p1022ds) uses one large reg region to describe both, even though there are other unrelated registers in between. That device tree also contains a bogus interrupt specifier, and there's no upstream software that uses this yet, so changing this shouldn't be a problem. Add a full binding for the MPIC timer node, not just an example of 4-cell interrupts in the MPIC binding. Add fsl,available-ranges, similar to msi-available-ranges. Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/86xx: don't pretend that we support 8-bit pixels on the MPC8610 HPCDTimur Tabi1-33/+64
If the video mode is set to 16-, 24-, or 32-bit pixels, then the pixel data contains actual levels of red, blue, and green. However, if the video mode is set to 8-bit pixels, then the 8-bit value represents an index into color table. This is called "palette mode" on the Freescale DIU video controller. The DIU driver does not currently support palette mode, but the MPC8610 HPCD board file returned a non-zero (although incorrect) pixel format value for 8-bit mode. Signed-off-by: Timur Tabi <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/mpc8610_hpcd: Do not use "/" in interrupt namesGeert Uytterhoeven1-1/+1
It may trigger a warning in fs/proc/generic.c:__xlate_proc_name() when trying to add an entry for the interrupt handler to sysfs. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Timur Tabi <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/e5500: set non-base IVORsScott Wood3-0/+54
Without this, we attempt to use doorbells for IPIs, and end up branching to some bad address. Plus, even for the exceptions we don't implement, it's good to handle it and get a message out. Signed-off-by: Scott Wood <[email protected]> Signed-off-by: Kumar Gala <[email protected]>
2011-05-19powerpc/fsl-booke64: Add support for Debug Level exception handlerKumar Gala3-4/+73
Signed-off-by: Kumar Gala <[email protected]>
2011-05-19Merge remote branch 'benh/merge' into benh-nextKumar Gala803-4458/+8396