Eric Lee / smarc-fsl-linux-kernel

15 Jul, 2011

1 commit

14 Jul, 2011

1 commit

13 Jul, 2011

2 commits

12 Jul, 2011

3 commits

11 Jul, 2011

4 commits

10 Jul, 2011

1 commit

  • 7fc769362   Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printing
    ARM: 6987/1: l2x0: fix disabling function to avoid deadlock
    ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1
    ARM: 6980/1: mmci: use StartBitErr to detect bad connections
    ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion
    ARM: move memory layout sanity checking before meminfo initialization
    ARM: 6990/1: MAINTAINERS: add entry for ARM PMU profiling and debugging
    ARM: 6989/1: perf: do not start the PMU when no events are present
    ARM: dmabounce: fix map_single() error return value

    Linus Torvalds
     

09 Jul, 2011

2 commits

  • f1a04dbd1   Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/… ... Browse Code »

    …git/kgene/linux-samsung

    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
    ARM: S3C2440: fix section mismatch on mini2440
    ARM: S3C24XX: drop return codes in void function of dma.c
    ARM: S3C24XX: don't use uninitialized variable in dma.c
    ARM: EXYNOS4: Set appropriate I2C device variant
    ARM: S5PC100: Fix for compilation error
    spi/s3c64xx: Bug fix for SPI with different FIFO level
    ARM: SAMSUNG: Add tx_st_done variable
    ARM: EXYNOS4: Address a section mismatch w/ suspend issue.
    ARM: S5P: Fix bug on init of PWMTimers for HRTimer
    ARM: SAMSUNG: header file revised to prevent declaring duplicated
    ARM: EXYNOS4: fix improper gpio configuration
    ARM: EXYNOS4: Fix card detection for sdhci 0 and 2

    Linus Torvalds
     
  • c60ffcbb6   Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… ... Browse Code »

    …/git/tmlind/linux-omap-2.6

    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
    omap: drop __initdata tags from static struct platform_device declarations

    Linus Torvalds
     

08 Jul, 2011

8 commits

  • d34c1fcdd   ARM: S3C2440: fix section mismatch on mini2440 ... Browse Code »

    If mini2440_init() is in __init, mini2440_parse_features() should also
    be in __init. Fixes:

    (.text+0x9adc): Section mismatch in reference from the function mini2440_parse_features.clone.0() to the
    (unknown reference) .init.data:(unknown)
    The function mini2440_parse_features.clone.0() references the (unknown reference) __initdata (unknown).

    Signed-off-by: Wolfram Sang
    Cc: Michel Pollet
    Signed-off-by: Kukjin Kim

    Wolfram Sang
     
  • cb26a7b1c   ARM: S3C24XX: drop return codes in void function of dma.c ... Browse Code »

    Commit bb072c3c (ARM / Samsung: Use struct syscore_ops for "core" power
    management) turned s3c2410_dma_resume_chan() from int to void. So, drop
    the actual return values, too. Fixes:

    arch/arm/plat-s3c24xx/dma.c: In function 's3c2410_dma_resume_chan':
    arch/arm/plat-s3c24xx/dma.c:1238:3: warning: 'return' with a value, in function returning void
    arch/arm/plat-s3c24xx/dma.c:1250:2: warning: 'return' with a value, in function returning void

    Signed-off-by: Wolfram Sang
    Acked-by: Rafael J. Wysocki
    Signed-off-by: Kukjin Kim

    Wolfram Sang
     
  • 5838e9b8d   ARM: S3C24XX: don't use uninitialized variable in dma.c ... Browse Code »

    Commit 8970ef47 (S3C24XX: Remove hardware specific registers from DMA
    calls) removed the parameter dcon in s3c2410_dma_config() and calculates
    it on its own. So the debug-output for the old parameter can go, too.
    Fixes:

    arch/arm/plat-s3c24xx/dma.c: In function 's3c2410_dma_config':
    arch/arm/plat-s3c24xx/dma.c:1030:2: warning: 'dcon' is used uninitialized in this function

    Signed-off-by: Wolfram Sang
    Cc: Ben Dooks
    Signed-off-by: Kukjin Kim

    Wolfram Sang
     
  • 075d9db13   Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... Browse Code »

    * 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/pci: Move check for acpi_sci_override_gsi to xen_setup_acpi_sci.

    Linus Torvalds
     
  • e55f1b1c0   Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel… ... Browse Code »

    …/git/tip/linux-2.6-tip

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Don't use the EFI reboot method by default
    x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup
    x86, reboot: Acer Aspire One A110 reboot quirk
    x86-32, NUMA: Fix boot regression caused by NUMA init unification on highmem machines

    Linus Torvalds
     
  • 27a3b735b   Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgen… ... Browse Code »

    …t-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    debugobjects: Fix boot crash when kmemleak and debugobjects enabled

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    jump_label: Fix jump_label update for modules
    oprofile, x86: Fix race in nmi handler while starting counters

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: Disable (revert) SCHED_LOAD_SCALE increase
    sched, cgroups: Fix MIN_SHARES on 64-bit boxen

    Linus Torvalds
     
  • ee339fe63   xen/pci: Move check for acpi_sci_override_gsi to xen_setup_acpi_sci. ... Browse Code »

    Previously we would check for acpi_sci_override_gsi == gsi every time
    a PCI device was enabled. That works during early bootup, but later
    on it could lead to triggering unnecessarily the acpi_gsi_to_irq(..) lookup.
    The reason is that acpi_sci_override_gsi was declared in __initdata and
    after early bootup could contain bogus values.

    This patch moves the check for acpi_sci_override_gsi to the
    site where the ACPI SCI is preset.

    CC: stable@kernel.org
    Reported-by: Raghavendra D Prabhu
    Tested-by: Raghavendra D Prabhu
    [http://lists.xensource.com/archives/html/xen-devel/2011-07/msg00154.html]
    Suggested-by: Ian Campbell
    Signed-off-by: Konrad Rzeszutek Wilk

    Konrad Rzeszutek Wilk
     
  • 659fb32d1   genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd) ... Browse Code »

    This fixes a regression introduced by e59347a "arm: orion:
    Use generic irq chip".

    Depending on the device, interrupts acknowledgement is done by setting
    or by clearing a dedicated register. Replace irq_gc_ack() with some
    {set,clr}_bit variants allows to handle both cases.

    Note that this patch affects the following SoCs: Davinci, Samsung and
    Orion. Except for this last, the change is minor: irq_gc_ack() is just
    renamed into irq_gc_ack_set_bit().

    For the Orion SoCs, the edge GPIO interrupts support is currently
    broken. irq_gc_ack() try to acknowledge a such interrupt by setting
    the corresponding cause register bit. The Orion GPIO device expect the
    opposite. To fix this issue, the irq_gc_ack_clr_bit() variant is used.

    Tested on Network Space v2.

    Reported-by: Joey Oravec
    Signed-off-by: Simon Guinot
    Signed-off-by: Arnd Bergmann

    Simon Guinot
     

07 Jul, 2011

7 commits

  • d30e1521b   arm: mach-vt8500: add forgotten irq_data conversion ... Browse Code »

    This platform has not been converted to 'struct irq_data' when the big
    pile was done. It fails to compile nowadays, because the compatibility
    code has gone.

    CC arch/arm/mach-vt8500/irq.o
    arch/arm/mach-vt8500/irq.c:118:2: error: unknown field 'ack' specified in initializer
    arch/arm/mach-vt8500/irq.c:118:2: warning: initialization from incompatible pointer type
    arch/arm/mach-vt8500/irq.c:119:2: error: unknown field 'mask' specified in initializer
    arch/arm/mach-vt8500/irq.c:119:2: warning: initialization from incompatible pointer type
    arch/arm/mach-vt8500/irq.c:120:2: error: unknown field 'unmask' specified in initializer
    arch/arm/mach-vt8500/irq.c:120:2: warning: initialization from incompatible pointer type
    arch/arm/mach-vt8500/irq.c:121:2: error: unknown field 'set_type' specified in initializer
    arch/arm/mach-vt8500/irq.c:121:2: warning: initialization from incompatible pointer type
    make[1]: *** [arch/arm/mach-vt8500/irq.o] Error 1

    Add the missing conversion. Tested on a JayPC-Tablet.

    Signed-off-by: Wolfram Sang
    Acked-by: Alexey Charkov
    Cc: Russell King
    Cc: Thomas Gleixner
    Cc: Andrew Morton
    Signed-off-by: Arnd Bergmann

    Wolfram Sang
     
  • 90c5ffe59   ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printing ... Browse Code »

    To get hundredths of MHz the rate needs to be divided by 10'000.
    Here is an example:
    twd_timer_rate = 123456789
    Before the patch:
    twd_timer_rate / 1000000 = 123
    (twd_timer_rate / 1000000) % 100 = 23
    Result: 123.23MHz.
    After being fixed:
    twd_timer_rate / 1000000 = 123
    (twd_timer_rate / 10000) % 100 = 45
    Result: 123.45MHz.

    Signed-off-by: Vitaly Kuzmichev
    Signed-off-by: Russell King

    Vitaly Kuzmichev
     
  • f70e957cd   x86: Don't use the EFI reboot method by default ... Browse Code »

    Testing suggests that at least some Lenovos and some Intels will
    fail to reboot via EFI, attempting to jump to an unmapped
    physical address. In the long run we could handle this by
    providing a page table with a 1:1 mapping of physical addresses,
    but for now it's probably just easier to assume that ACPI or
    legacy methods will be present and reboot via those.

    Signed-off-by: Matthew Garrett
    Cc: Linus Torvalds
    Cc: Andrew Morton
    Cc: Alan Cox
    Link: http://lkml.kernel.org/r/1309985557-15350-1-git-send-email-mjg@redhat.com
    Signed-off-by: Ingo Molnar

    Matthew Garrett
     
  • 7a3136666   x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup ... Browse Code »

    Some BIOSes will reset the Intel MISC_ENABLE MSR (specifically the
    XD_DISABLE bit) when resuming from S3, which can interact poorly with
    ebba638ae723d8a8fc2f7abce5ec18b688b791d7. In 32bit PAE mode, this can
    lead to a fault when EFER is restored by the kernel wakeup routines,
    due to it setting the NX bit for a CPU that (thanks to the BIOS reset)
    now incorrectly thinks it lacks the NX feature. (64bit is not affected
    because it uses a common CPU bring-up that specifically handles the
    XD_DISABLE bit.)

    The need for MISC_ENABLE being restored so early is specific to the S3
    resume path. Normally, MISC_ENABLE is saved in save_processor_state(),
    but this happens after the resume header is created, so just reproduce
    the logic here. (acpi_suspend_lowlevel() creates the header, calls
    do_suspend_lowlevel, which calls save_processor_state(), so the saved
    processor context isn't available during resume header creation.)

    [ hpa: Consider for stable if OK in mainline ]

    Signed-off-by: Kees Cook
    Link: http://lkml.kernel.org/r/20110707011034.GA8523@outflux.net
    Signed-off-by: H. Peter Anvin
    Cc: Rafael J. Wysocki
    Cc: 2.6.38+

    Kees Cook
     
  • 38a8914f9   ARM: 6987/1: l2x0: fix disabling function to avoid deadlock ... Browse Code »

    The l2x0_disable function attempts to writel with the l2x0_lock held.
    This results in deadlock when the writel contains an outer_sync call
    for the platform since the l2x0_lock is already held by the disable
    function. A further problem is that disabling the L2 without flushing it
    first can lead to the spin_lock operation becoming visible after the
    spin_unlock, causing any subsequent L2 maintenance to deadlock.

    This patch replaces the writel with a call to writel_relaxed in the
    disabling code and adds a flush before disabling in the control
    register, preventing livelock from occurring.

    Acked-by: Catalin Marinas
    Signed-off-by: Will Deacon
    Signed-off-by: Russell King

    Will Deacon
     
  • 186dcaa44   ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1 ... Browse Code »

    It was discovered by Roberto Bergo, that RTS/DTR signals are inverted after
    the boot, because it was causing him problems with hardware controlled modem
    connected on ttyAM0. Todd Valentic came with this patch for the issue.

    Discussion: http://tech.groups.yahoo.com/group/ts-7000/message/20259

    Comments from Petr Štetiar:

    Sorry, but forget to add Acked-by[1]:

    1. https://patchwork.kernel.org/patch/873052/

    Cc: Ryan Mallon
    Cc: Hartley Sweeten
    Signed-off-by: Todd Valentic
    Tested-by: Roberto Bergo
    Signed-off-by: Petr Štetiar
    Acked-by: H Hartley Sweeten
    Signed-off-by: Russell King

    Petr Štetiar
     
  • 2eb5af44b   ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion ... Browse Code »

    This platform has not been converted to 'struct irq_data' when the big
    pile was done and fails to compile nowadays. Tested on a JayPC-Tablet.

    Signed-off-by: Wolfram Sang
    Acked-by: Alexey Charkov
    Signed-off-by: Russell King

    Wolfram Sang
     

06 Jul, 2011

11 commits