aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-21Merge branch 'tracking-ll-v3.9-misc-fixes' into merge-linux-linarosamsung-lt-android-arndale-v3.9-rc3samsung-android-arndale-3.9-rc3-2013.04samsung-android-arndale-3.9-rc3-2013.03ll-20130321.0ll_20130321.0Andrey Konovalov
2013-03-21Merge branch 'tracking-panda-fix-usb' into merge-linux-linaroAndrey Konovalov
2013-03-21Merge branch 'tracking-perf-android' into merge-linux-linaroAndrey Konovalov
2013-03-21Merge branch 'tracking-samslt-all' into merge-linux-linaroAndrey Konovalov
2013-03-21perf tools: make perf to build in 3.9 kernel tree againtracking-ll-v3.9-misc-fixes-ll-20130321.0Fathi Boudra
Put the behaviour back to the same as in 3.8 kernel tree, but preserve compatibility with make version 3.80 Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
2013-03-21Merge branch 'tracking-armlt-arm64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20130327.1tracking-integration-linaro-vexpress-ll-20130327.0tracking-integration-linaro-vexpress-ll-20130325.0tracking-integration-linaro-vexpress-ll-20130321.0Jon Medhurst
Conflicts: drivers/clk/versatile/Makefile
2013-03-21Merge branch 'tracking-armlt-tc2-psci' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-tc2-pm-new-cpufreq' into ↵Jon Medhurst
integration-linaro-vexpress
2013-03-21Merge branch 'tracking-armlt-tc2-pm-new' into integration-linaro-vexpressJon Medhurst
Conflicts: arch/arm/mach-vexpress/Makefile
2013-03-21Merge branch 'tracking-armlt-tc2-pm' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-tc2' into integration-linaro-vexpressJon Medhurst
2013-03-21ARM: mcpm_platsmp: no need to call gic_secondary_init anymoreNicolas Pitre
2013-03-21Merge branch 'tracking-armlt-dcscb' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-cci' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-mcpm' into integration-linaro-vexpressJon Medhurst
Conflicts: arch/arm/common/Makefile
2013-03-21Merge branch 'tracking-armlt-misc-fixes' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-clcd' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-hdlcd' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-ve-updates' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-mmc' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-rtsm' into integration-linaro-vexpressJon Medhurst
2013-03-21Merge branch 'tracking-armlt-config' into integration-linaro-vexpressJon Medhurst
Conflicts: linaro/configs/vexpress.conf
2013-03-21CONFIG: ARNDALE: UBUNTU: Add default config filetracking-samslt-all-ll-20130322.0tracking-samslt-all-ll-20130321.0samsung-lt-v3.9-rc3-3Tushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
2013-03-21ARM: syscall: wire up sys_migrate_pages.Steve Capper
For NUMA support, the sys_migrate_pages syscall is required by userspace. This patch allocates #379 for this syscall and plumbs it in. Signed-off-by: Steve Capper <steve.capper@arm.com> [tushar.behera@linaro.org: Change to #380, increase __NR_syscalls] Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
2013-03-21ARM: mm: Add NUMA support.Steve Capper
This patch adds support for NUMA (running on either discontiguous and sparse memory). At the moment, the number of nodes has to be specified on the commandline. One can also, optionally, specify the memory size of each node. (Otherwise the memory range is split roughly equally between nodes). CPUs can be striped across nodes (cpu number modulo the number of nodes), or assigned to a node based on their topology_physical_package_id. So for instance on a TC2, the A7 cores can be grouped together in one node and the A15s grouped together in another node. Signed-off-by: Steve Capper <steve.capper@arm.com>
2013-03-21ARM: mm: Add discontiguous memory support.Steve Capper
This patch adds support for discontiguous memory, with a view to each discontiguous block being assigned to a NUMA node (in a future patch). Discontiguous memory should only be used to back NUMA on systems where sparse memory is not available. Signed-off-by: Steve Capper <steve.capper@arm.com>
2013-03-21ARM: Consider memblocks in mem_init and show_mem.Steve Capper
This is based on Michael Spang's patch [1]; and is my attempt at applying the feedback from Russell [2]. With discontiguous memory (a requirement for running NUMA on some systems), membanks may not necessarily be representable as contiguous blocks of struct page *s. This patch updates the page scanning code in mem_init and show_mem to consider pages in the intersection of membanks and memblocks instead. We can't consider memblocks solely as under sparse memory configurations, contiguous physical membanks won't necessarily have a contiguous memory map (but may be merged into the same memblock). Only memory blocks in the "memory" region were considered as the "reserved" region was found to always overlap "memory"; all the memory banks are added with memblock_add (which adds to "memory") and no instances were found where memory was added to "reserved" then removed from "memory". In mem_init we are running on one CPU, and I can't see the memblocks changing whilst being enumerated. In show_mem, we can be running on multiple CPUs; whilst the memblock manipulation functions are annotated as __init, this doesn't stop memblocks being manipulated during bootup. I can't see any place where memblocks are removed or merged other than driver initialisation (memblock_steal) or boot memory initialisation. One consequence of using memblocks in show_mem, is that we are unable to define ARCH_DISCARD_MEMBLOCK. Any feedback would be welcome. [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2012-October/127104.html [2] http://lists.infradead.org/pipermail/linux-arm-kernel/2012-November/135455.html Signed-off-by: Steve Capper <steve.capper@arm.com>
2013-03-21ARM: LPAE: accomodate >32-bit addresses for page table baseCyril Chemparathy
This patch redefines the early boot time use of the R4 register to steal a few low order bits (ARCH_PGD_SHIFT bits) on LPAE systems. This allows for up to 38-bit physical addresses. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
2013-03-21ARM: mm: clean up membank size limit checksCyril Chemparathy
This patch cleans up the highmem sanity check code by simplifying the range checks with a pre-calculated size_limit. This patch should otherwise have no functional impact on behavior. This patch also removes a redundant (bank->start < vmalloc_limit) check, since this is already covered by the !highmem condition. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
2013-03-21ARM: mm: cleanup checks for membank overlap with vmalloc areaCyril Chemparathy
On Keystone platforms, physical memory is entirely outside the 32-bit addressible range. Therefore, the (bank->start > ULONG_MAX) check below marks the entire system memory as highmem, and this causes unpleasentness all over. This patch eliminates the extra bank start check (against ULONG_MAX) by checking bank->start against the physical address corresponding to vmalloc_min instead. In the process, this patch also cleans up parts of the highmem sanity check code by removing what has now become a redundant check for banks that entirely overlap with the vmalloc range. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Acked-by: Nicolas Pitre <nico@linaro.org>
2013-03-21ARM: mm: use physical addresses in highmem sanity checksCyril Chemparathy
This patch modifies the highmem sanity checking code to use physical addresses instead. This change eliminates the wrap-around problems associated with the original virtual address based checks, and this simplifies the code a bit. The one constraint imposed here is that low physical memory must be mapped in a monotonically increasing fashion if there are multiple banks of memory, i.e., x < y must => pa(x) < pa(y). Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Acked-by: Nicolas Pitre <nico@linaro.org>
2013-03-21ARM: LPAE: factor out T1SZ and TTBR1 computationsCyril Chemparathy
This patch moves the TTBR1 offset calculation and the T1SZ calculation out of the TTB setup assembly code. This should not affect functionality in any way, but improves code readability as well as readability of subsequent patches in this series. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Acked-by: Nicolas Pitre <nico@linaro.org>
2013-03-21ARM: LPAE: define ARCH_LOW_ADDRESS_LIMIT for bootmemCyril Chemparathy
This patch adds an architecture defined override for ARCH_LOW_ADDRESS_LIMIT. On PAE systems, the absence of this override causes bootmem to incorrectly limit itself to 32-bit addressable physical memory. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
2013-03-21ARM: LPAE: use 64-bit accessors for TTBR registersCyril Chemparathy
This patch adds TTBR accessor macros, and modifies cpu_get_pgd() and the LPAE version of cpu_set_reserved_ttbr0() to use these instead. In the process, we also fix these functions to correctly handle cases where the physical address lies beyond the 4G limit of 32-bit addressing. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Acked-by: Nicolas Pitre <nico@linaro.org>
2013-03-21ARM: LPAE: use phys_addr_t in switch_mm()Cyril Chemparathy
This patch modifies the switch_mm() processor functions to use phys_addr_t. On LPAE systems, we now honor the upper 32-bits of the physical address that is being passed in, and program these into TTBR as expected. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com>
2013-03-21ARM: LPAE: use phys_addr_t for initrd location and sizeVitaly Andrianov
This patch fixes the initrd setup code to use phys_addr_t instead of assuming 32-bit addressing. Without this we cannot boot on systems where initrd is located above the 4G physical address limit. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Cyril Chemparathy <cyril@ti.com> Acked-by: Nicolas Pitre <nico@linaro.org>
2013-03-21ARM: LPAE: use phys_addr_t in free_memmap()Vitaly Andrianov
The free_memmap() was mistakenly using unsigned long type to represent physical addresses. This breaks on PAE systems where memory could be placed above the 32-bit addressible limit. This patch fixes this function to properly use phys_addr_t instead. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Cyril Chemparathy <cyril@ti.com> Acked-by: Nicolas Pitre <nico@linaro.org>
2013-03-21ARM: LPAE: use signed arithmetic for mask definitionsCyril Chemparathy
This patch applies to PAGE_MASK, PMD_MASK, and PGDIR_MASK, where forcing unsigned long math truncates the mask at the 32-bits. This clearly does bad things on PAE systems. This patch fixes this problem by defining these masks as signed quantities. We then rely on sign extension to do the right thing. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Reviewed-by: Nicolas Pitre <nico@linaro.org>
2013-03-21ARM: LPAE: support 64-bit virt_to_phys patchingCyril Chemparathy
This patch adds support for 64-bit physical addresses in virt_to_phys() patching. This does not do real 64-bit add/sub, but instead patches in the upper 32-bits of the phys_offset directly into the output of virt_to_phys. There is no corresponding change on the phys_to_virt() side, because computations on the upper 32-bits would be discarded anyway. Signed-off-by: Cyril Chemparathy <cyril@ti.com>
2013-03-21ARM: LPAE: use phys_addr_t on virt <--> phys conversionCyril Chemparathy
This patch fixes up the types used when converting back and forth between physical and virtual addresses. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Cyril Chemparathy <cyril@ti.com> Reviewed-by: Nicolas Pitre <nico@linaro.org>
2013-03-21ARM: use late patch framework for phys-virt patchingCyril Chemparathy
This patch replaces the original physical offset patching implementation with one that uses the newly added patching framework. Signed-off-by: Cyril Chemparathy <cyril@ti.com> [tushar.behera@linaro.org: export __pv_offset] Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
2013-03-21ARM: add self test for runtime patch mechanismCyril Chemparathy
This patch adds basic sanity tests to ensure that the instruction patching results in valid instruction encodings. This is done by verifying the output of the patch process against a vector of assembler generated instructions at init time. Signed-off-by: Cyril Chemparathy <cyril@ti.com>
2013-03-21ARM: add mechanism for late code patchingCyril Chemparathy
The original phys_to_virt/virt_to_phys patching implementation relied on early patching prior to MMU initialization. On PAE systems running out of >4G address space, this would have entailed an additional round of patching after switching over to the high address space. The approach implemented here conceptually extends the original PHYS_OFFSET patching implementation with the introduction of "early" patch stubs. Early patch code is required to be functional out of the box, even before the patch is applied. This is implemented by inserting functional (but inefficient) load code into the .runtime.patch.code init section. Having functional code out of the box then allows us to defer the init time patch application until later in the init sequence. In addition to fitting better with our need for physical address-space switch-over, this implementation should be somewhat more extensible by virtue of its more readable (and hackable) C implementation. This should prove useful for other similar init time specialization needs, especially in light of our multi-platform kernel initiative. This code has been boot tested in both ARM and Thumb-2 modes on an ARMv7 (Cortex-A8) device. Note: the obtuse use of stringified symbols in patch_stub() and early_patch_stub() is intentional. Theoretically this should have been accomplished with formal operands passed into the asm block, but this requires the use of the 'c' modifier for instantiating the long (e.g. .long %c0). However, the 'c' modifier has been found to ICE certain versions of GCC, and therefore we resort to stringified symbols here. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Reviewed-by: Nicolas Pitre <nico@linaro.org>
2013-03-21MFC: Add s_ctrl & g_ctrl to set and read SET_FRAME_TAG valuesSachin Kamat
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> [tushar.behera@linaro.org: CID uses V4L2_CID_PRIVATE_BASE] Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
2013-03-21CONFIG: ARNDALE: ANDROID: Enable framebuffer supportTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
2013-03-21ARM: EXYNOS: Add support for framebufferTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
2013-03-21ARM: dts: Add FIMD node to Arndale boardSachin Kamat
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
2013-03-21ARM: EXYNOS: Add FIMD support to DT machine fileSachin Kamat
Added auxdata and PA for FIMD. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
2013-03-21video: s3c-fb: Skip GPIO setting for Arndale boardTushar Behera
This is a hack to setup a dummy framebuffer. Arndale board doesn't have GPIO lines for RGB_DATA[23:0], so skip this. Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
2013-03-21video: s3c-fb: Add Overlay SupportSachin Kamat
Added pixel blending Support. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>