20 Sep, 2013

6 commits

  • Pull ARM64 fixes from Catalin Marinas:
    - Compat register fault reporting fix
    - Documentation clarification on tagged pointers
    - hwcap widened to 64-bit (user space already reading it as 64-bit)

    * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
    arm64: Widen hwcap to be 64 bit
    arm64: Correctly report LR and SP for compat tasks
    arm64: documentation: tighten up tagged pointer documentation
    arm64: Make do_bad_area() function static

    Linus Torvalds
     
  • Under arm64 elf_hwcap is a 32 bit quantity, but it is stored in
    a 64 bit auxiliary ELF field and glibc reads hwcap as 64 bit.

    This patch widens elf_hwcap to be 64 bit.

    Signed-off-by: Steve Capper
    Signed-off-by: Catalin Marinas

    Steve Capper
     
  • When a task crashes and we print debugging information, ensure that
    compat tasks show the actual AArch32 LR and SP registers rather than the
    AArch64 ones.

    Signed-off-by: Catalin Marinas

    Catalin Marinas
     
  • This function is only called from arch/arm64/mm/fault.c.

    Signed-off-by: Catalin Marinas

    Catalin Marinas
     
  • Pull ARM SoC fixes from Olof Johansson:
    "A set of fixes for ARM platforms for 3.12. Among them:

    - A fix for build breakage in the MTD subsystem for some PXA devices.
    David Woodhouse has this patch in his for-next branch but has not
    been responding to our requests to send it up so here it is. I
    should have amended the commit message to describe the build
    failure for CONFIG_OF=n setups, but forgot and now it's down in the
    stack of commits.

    - Added device-tree for the BeagleBone Black. Turns out people have
    been using the older "regualar" bone DT for the newer boards, and
    there's risk of damaging hardware that way.

    - Misc DT and regular fixes for OMAP.

    - Fix to make the ST-Ericsson "snowball" boards boot with
    multi_v7_defconfig, and enable one of the ST-E reference boards on
    the same config.

    - Kconfig cleanup for u300 to hide submenus when the platform isn't
    enabled.

    - Enable ARM_ATAG_DTB_COMPAT to let firmware override command line
    when booting with an appended devicetree on non-DT-enabled firmware
    (needed to boot snowball)"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (26 commits)
    ARM: multi_v7: add HREFv60 to multi_v7 defconfig
    ARM: OMAP2+: mux: fix trivial typo in name
    ARM: OMAP4 SMP: Corrected a typo fucntions to functions
    ARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally
    mailbox: remove unnecessary platform_set_drvdata()
    ARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y
    ARM: OMAP: fix return value check in omap_device_build_from_dt()
    ARM: OMAP4: Fix clock_get error for GPMC during boot
    ARM: sa1100: collie.c: fall back to jedec_probe flash detection
    ARM: u300: hide submenus
    ARM: dts: igep00x0: Add pinmux configuration for MCBSP2
    ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze
    ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard
    mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF
    ARM: multi_v7_defconfig: enable ARM_ATAG_DTB_COMPAT
    ARM: ux500: disable outer cache debug
    ARM: dts: OMAP5: fix ocp2scp DTS data
    ARM: dts: OMAP5: fix reg property size
    ARM: dts: am335x-bone*: add DT for BeagleBone Black
    ARM: dts: omap3-beagle-xm: fix string error in compatible property
    ...

    Linus Torvalds
     
  • Pull MIPS updates from Ralf Baechle:
    - Minor updates and fixes to the Octeon ethernet driver in staging
    - A fix to VGA_MAP_MEM() for 64 bit platforms
    - Fix a workaround for 74K/1074K processors
    - The symlink arch/mips/boot/dts/include/dt-bindings was pointing to a
    a file with a name ending in \n. I think this may have been caused
    by a git bug with with patches sent by email
    - A build fix for VGA console on BCM1480-based systems
    - Fix PCI device access via "/sys/bus/pci/.../resource0" or similar
    work for Alchemy platforms
    - Fix potential data leak on MIPS R5 cores. This doesn't add proper
    support for any R5 features, just ensures a kernel without such
    support will be secure to run
    - Adding a macros for the CP0 Config5 register to be used by the R5 fix
    - Make get_cycles() actually return something useful where possible
    This also requires a preparatory patch for performance sake
    - Fix a warning about the use of smp_processor_id() in preemptible
    code. Again this includes a preparatory patch adding the
    infrastructure to be used by the actual patch
    - Finally remove pointless one-line comment

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: Fix invalid symbolic link file
    MIPS: PCI: pci-bcm1480: Include missing vt.h header
    MIPS: Disable usermode switching of the FR bit for MIPS R5 CPUs.
    MIPS: Add MIPS R5 config5 register.
    MIPS: PCI: Use pci_resource_to_user to map pci memory space properly
    MIPS: 74K/1074K: Correct erratum workaround.
    MIPS: Cleanup CP0 PRId and CP1 FPIR register access masks
    MIPS: Remove useless comment about kprobe from arch/mips/Makefile
    MIPS: Fix VGA_MAP_MEM macro.
    MIPS: Reimplement get_cycles().
    MIPS: Optimize current_cpu_type() for better code.
    MIPS: Fix accessing to per-cpu data when flushing the cache
    MIPS: Provide nice way to access boot CPU's data.
    staging: octeon-ethernet: rgmii: enable interrupts that we can handle
    staging: octeon-ethernet: remove skb alloc failure warnings
    staging: octeon-ethernet: make dropped packets to consume NAPI budget

    Linus Torvalds
     

19 Sep, 2013

19 commits

  • Commit 3b29aa5ba204c [MIPS: add symlink] created a symlink
    file in include/dt-bindings. Even though commit diff is fine, the symlink
    is invalid and ls -lb shows a newline character at the end of the filename:

    lrwxrwxrwx 1 maddy maddy 35 Sep 19 18:11 dt-bindings ->
    ../../../../../include/dt-bindings\n

    Signed-off-by: Madhavan Srinivasan
    Cc: steven.hill@imgtec.com
    Cc: mmarek@suse.cz
    Cc: swarren@nvidia.com
    Cc: linux-mips@linux-mips.org
    Cc: linux-kbuild@vger.kernel.org
    Cc: james.hogan@imgtec.com
    Patchwork: https://patchwork.linux-mips.org/patch/5859/
    Signed-off-by: Ralf Baechle

    Madhavan Srinivasan
     
  • It's needed for the MAX_NR_CONSOLES macro.

    Fixes the following build problem on a randconfig:

    arch/mips/pci/pci-bcm1480.c: In function 'bcm1480_pcibios_init':
    arch/mips/pci/pci-bcm1480.c:261:36: error: 'MAX_NR_CONSOLES'
    undeclared (first use in this function)
    arch/mips/pci/pci-bcm1480.c:261:36: note: each undeclared
    identifier is reported only once for each function it appears in
    make[1]: *** [arch/mips/pci/pci-bcm1480.o] Error 1

    Signed-off-by: Markos Chandras
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/5858/
    Signed-off-by: Ralf Baechle

    Markos Chandras
     
  • Currently the kernel will always use the FR=0 register model for O32. If
    an O32 application did enable FR=1 mode, some data from another application
    might be leaked in the extra registers becoming visible.

    Iow, this patch is meant to make the kernel MIPS R5 tolerant but leaves
    proper MIPS R5 support to a future patchset.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • [ralf@linux-mips.org: This only matters to Alchemy platforms. On other
    platforms fixup_bigphys_addr is just an identidy mapping.]

    Signed-off-by: Wolfgang Grandegger
    Cc: tiejun.chen
    Cc: Linux-MIPS
    Patchwork: https://patchwork.linux-mips.org/patch/1868/
    Signed-off-by: Ralf Baechle

    Wolfgang Grandegger
     
  • …/kernel/git/tmlind/linux-omap into fixes

    From Tony Lindgren, OMAP DT fixes for 3.12-rc1:

    OMAP device tree changes that are needed to fix regressions and avoid
    electrical issues on beaglebone black.

    Via Benoit Cousson <bcousson@baylibre.com>:

    Fix BBB LDO voltage to avoid HDMI destruction
    Fix OMAP5 wrong attribute
    Fix typo in beagle xM strings
    Fix missing pinmux and regulator for OMAP4 wifi
    Fix missing pinmux for igep headset

    * tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: dts: igep00x0: Add pinmux configuration for MCBSP2
    ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for blaze
    ARM: dts: Fix muxing and regulator for wl12xx on the SDIO bus for pandaboard
    ARM: dts: OMAP5: fix ocp2scp DTS data
    ARM: dts: OMAP5: fix reg property size
    ARM: dts: am335x-bone*: add DT for BeagleBone Black
    ARM: dts: omap3-beagle-xm: fix string error in compatible property

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • …rnel/git/tmlind/linux-omap into fixes

    From Tony Lindgren, fixes for 3.12-rc1:

    OMAP fixes for build warnings and cpuidle, and a few trivial typo fixes.

    * tag 'omap-for-v3.12/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: OMAP2+: mux: fix trivial typo in name
    ARM: OMAP4 SMP: Corrected a typo fucntions to functions
    ARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally
    mailbox: remove unnecessary platform_set_drvdata()
    ARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y
    ARM: OMAP: fix return value check in omap_device_build_from_dt()
    ARM: OMAP4: Fix clock_get error for GPMC during boot

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • This is just a standard board for the Ux500, include it in the
    v7 multiplatform defconfig.

    Signed-off-by: Linus Walleij
    Signed-off-by: Olof Johansson

    Linus Walleij
     
  • Fix trivial typo in name.

    Signed-off-by: Phil Carmody
    Signed-off-by: Tony Lindgren

    Phil Carmody
     
  • Corrected the functions spelling mistake in the OMAP4 SMP source file.

    Signed-off-by: Anoop Thomas Mathew
    Signed-off-by: Tony Lindgren

    Anoop Thomas Mathew
     
  • We call cpu_cluster_pm_enter for dev->cpu == 0 only, but
    cpu_cluster_pm_exit called without that check.

    Because of that unhandled page fault may happen:

    [ 3.803405] Unable to handle kernel paging request at virtual address 00002500
    [ 3.810974] pgd = c0004000
    [ 3.813812] [00002500] *pgd=00000000
    [ 3.817596] Internal error: Oops: 5 [#1] SMP ARM
    [ 3.822418] Modules linked in:
    [ 3.825653] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 3.11.0-rc6+ #21
    [ 3.832397] task: ed86ef40 ti: ed896000 task.ti: ed896000
    [ 3.838073] PC is at irq_notifier+0x234/0x25c
    [ 3.842651] LR is at irq_notifier+0x218/0x25c
    [ 3.847229] pc : [] lr : [] psr: 80000193
    [ 3.847229] sp : ed897ee8 ip : 00000005 fp : 00000001
    [ 3.859283] r10: c0b395f0 r9 : c0b30594 r8 : c0b8c2ac
    [ 3.864776] r7 : ffffffff r6 : 00000000 r5 : 00000005 r4 : 00000000
    [ 3.871643] r3 : 00002500 r2 : 00000000 r1 : 00000005 r0 : 44302244
    [ 3.878479] Flags: Nzcv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel
    [ 3.886260] Control: 10c5387d Table: 8000404a DAC: 00000015
    [ 3.892272] Process swapper/1 (pid: 0, stack limit = 0xed896240)
    [ 3.898590] Stack: (0xed897ee8 to 0xed898000)
    [ 3.903167] 7ee0: c0979c3a 00000001 ed897ef8 ed896000 c0014f7c 00000000
    [ 3.911743] 7f00: 00000005 00000000 ffffffff c0b8c2ac c0b395f0 c077c04c c0c94b48 c0b3953c
    [ 3.920318] 7f20: c0bcd928 00000002 c0b39524 c00cfad8 00000000 ffffffff 00000000 c00cfb10
    [ 3.928924] 7f40: c14e62c0 c002c1c8 c002c0ac c14e62c0 00000002 e251c37d 00000000 c0b39548
    [ 3.937499] 7f60: c0b395f0 c05a1bc4 e251c37d 00000000 00000005 c05a3870 edc90380 edc90380
    [ 3.946105] 7f80: edc90394 c14e62c0 c0b39548 00000002 c0784064 c05a3c78 c0b395e0 c14e62c0
    [ 3.954681] 7fa0: 00000002 c0b39548 c0bc9db8 00000000 00000001 c05a1dc0 ed896000 00000015
    [ 3.963287] 7fc0: c0bc9db8 ed896000 8000406a c0b30594 c0784064 c000e504 00000746 c007a528
    [ 3.971862] 7fe0: 00000001 0000001d 600001d3 c0bcc004 00000000 800086c4 ee0aa6a7 d2aabaa9
    [ 3.980499] [] (irq_notifier+0x234/0x25c) from [] (notifier_call_chain+0x38/0x68)
    [ 3.990173] [] (notifier_call_chain+0x38/0x68) from [] (cpu_pm_notify+0x20/0x38)
    [ 3.999786] [] (cpu_pm_notify+0x20/0x38) from [] (cpu_cluster_pm_exit+0x20/0x50)
    [ 4.009399] [] (cpu_cluster_pm_exit+0x20/0x50) from [] (omap_enter_idle_coupled+0x11c/0x14c)
    [ 4.020111] [] (omap_enter_idle_coupled+0x11c/0x14c) from [] (cpuidle_enter_state+0x40/0xec)
    [ 4.030822] [] (cpuidle_enter_state+0x40/0xec) from [] (cpuidle_enter_state_coupled+0x1f4/0x240)
    [ 4.041870] [] (cpuidle_enter_state_coupled+0x1f4/0x240) from [] (cpuidle_idle_call+0x150/0x228)
    [ 4.052947] [] (cpuidle_idle_call+0x150/0x228) from [] (arch_cpu_idle+0x8/0x38)
    [ 4.062499] [] (arch_cpu_idle+0x8/0x38) from [] (cpu_startup_entry+0x178/0x1e4)
    [ 4.071990] [] (cpu_startup_entry+0x178/0x1e4) from [] (0x800086c4)
    [ 4.080383] Code: e5922288 03a03b0a 13a03c25 e0823003 (e5932000)
    [ 4.086791] ---[ end trace d83954a84a6fa69e ]---

    It is supposed that sar_base is initialized in irq_save_context, which
    is called on CPU_CLUSTER_PM_ENTER notification. If this notification
    has been missed and CPU_CLUSTER_PM_EXIT is received sar_base is NULL.

    Fix it by calling CPU_CLUSTER_PM_{ENTER,EXIT} under the same condition.

    Signed-off-by: Vladimir Murzin
    Acked-by: Kevin Hilman
    Signed-off-by: Tony Lindgren

    Vladimir Murzin
     
  • When CONFIG_ARM_LPAE=y the following build warning is generated:

    arch/arm/mach-omap2/gpmc.c:1495:4: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' [-Wformat]

    According to Documentation/printk-formats.txt '%pa' can be used to properly
    print 'resource_size_t'.

    Reported-by: Kevin Hilman
    Signed-off-by: Fabio Estevam
    Acked-by: Kevin Hilman
    Signed-off-by: Tony Lindgren

    Fabio Estevam
     
  • In case of error, the function omap_device_alloc() returns ERR_PTR()
    and never returns NULL. The NULL test in the return value check
    should be replaced with IS_ERR().

    Signed-off-by: Wei Yongjun
    Acked-by: Kevin Hilman
    Signed-off-by: Tony Lindgren

    Wei Yongjun
     
  • Looks like we still have the legacy clock alias name for
    omap4 GPMC (General Purpose Memory Controller), so let's
    fix it for the device tree naming. There's no need to keep
    the legacy naming as omap4 is DT only nowadays.

    Without this fix we get the following error while booting:

    [ 0.440399] omap-gpmc 50000000.gpmc: error: clk_get

    Reported-by: Olof Johansson
    Cc: stable@vger.kernel.org # v3.11
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • Make sure 74K revision numbers are not applied to the 1074K. Also catch
    invalid usage.

    Signed-off-by: Maciej W. Rozycki
    Cc: Steven J. Hill
    Cc: Leonid Yegoshin
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/5857/
    Signed-off-by: Ralf Baechle

    Maciej W. Rozycki
     
  • Replace hardcoded CP0 PRId and CP1 FPIR register access masks throughout.
    The change does not touch places that use shifted or partial masks.

    Signed-off-by: Maciej W. Rozycki
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/5838/
    Signed-off-by: Ralf Baechle

    Maciej W. Rozycki
     
  • The commit c1bf207d6ee1eb72e9c10365edbdc7c9ff7fb9b0 (kernel.org) rsp.
    58e9ad32a48dce37ffeea912f55bd1c94b85ad7f (lmo) [MIPS: kprobe: Add support]
    introduced a useless comment.

    Signed-off-by: Wu Zhangjin
    Cc: linux-mips@linux-mips.org
    Cc: David Daney
    Patchwork: https://patchwork.linux-mips.org/patch/1765/
    Signed-off-by: Ralf Baechle

    Wu Zhangjin
     
  • Pull x86 fixes from Ingo Molnar:
    "Misc fixes"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/intel/lpss: Add pin control support to Intel low power subsystem
    perf/x86/intel: Mark MEM_LOAD_UOPS_MISS_RETIRED as precise on SNB
    x86: Remove now-unused save_rest()
    x86/smpboot: Fix announce_cpu() to printk() the last "OK" properly

    Linus Torvalds
     
  • Pull perf fixes from Ingo Molnar:
    "Two small fixes"

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf: Fix UAPI export of PERF_EVENT_IOC_ID
    perf/x86/intel: Fix Silvermont offcore masks

    Linus Torvalds
     

18 Sep, 2013

13 commits

  • Zaurus collie contains 2 LH28F640BFHE-PTTL90 (64M 4Mx16) and
    at the moment cfi will not detect the collie NOR.
    In the meanwhile we can revert to the jedec-probe map which has been
    fixed with following commit:

    mtd: jedec_probe: fix LH28F640BF definition
    fe2f4c8e0bf2756b670ee78fa9772613a2ea8495

    Somehow this is unsatisfactory because the flash is mounted READ ONLY
    (as from factory, with a RO cramfs)

    Signed-off-by: Andrea Adami
    Signed-off-by: Olof Johansson

    Andrea Adami
     
  • Right now the U300 submenus are showcased for everyone even if
    we're not on v5 multiplatforms. Hide this in the multiplatform
    configuration properly.

    Cc: arm@kernel.org
    Signed-off-by: Linus Walleij
    Signed-off-by: Olof Johansson

    Linus Walleij
     
  • Use the CKSEG1ADDR macro when calculating VGA_MAP_MEM.

    [ralf@linux-mips.org: Include
    Signed-off-by: Steven J. Hill
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/5814/
    Signed-off-by: Ralf Baechle

    Leonid Yegoshin
     
  • This essentially reverts commit efb9ca08b5a2374b29938cdcab417ce4feb14b54
    (kernel.org) / 58020a106879a8b372068741c81f0015c9b0b96dbv [[MIPS] Change
    get_cycles to always return 0.]

    Most users of get_cycles() invoke it as a timing interface. That's why
    in modern kernels it was never very much missed for. /dev/random however
    uses get_cycles() in the how the jitter in the interrupt timing contains
    some useful entropy.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Add pinmux configuration for MCBSP2 connected to the TDM interface.
    With this configuration the Headset modules works as expected.

    Signed-off-by: Enric Balletbo i Serra
    Acked-by: Javier Martinez Canillas
    Signed-off-by: Benoit Cousson

    Enric Balletbo i Serra
     
  • Commit 76787b3b (ARM: OMAP2+: Remove board-4430sdp.c)
    removed legacy booting in favor of device tree based booting
    for 4430sdp. That caused the WLAN to stop working as the
    related .dts entries fell through the cracks.

    I don't have the "1283 PG 2.21 connectivity device" on my 4430sdp,
    but the earlier version of this patch was tested by Luciano
    Coelho. This version has left out the input logic for MMC CLK
    line compared to the earlier version as that is not bidirectional,
    and should be safe to do.

    Cc: Rajendra Nayak
    Cc: Luciano Coelho
    Cc: Ruslan Bilovol
    Signed-off-by: Tony Lindgren
    Signed-off-by: Benoit Cousson

    Tony Lindgren
     
  • Commit b42b9181 (ARM: OMAP2+: Remove board-omap4panda.c)
    removed legacy booting in favor of device tree based booting
    for pandaboard. That caused the WLAN to stop working as the
    related .dts entries fell through the cracks.

    The legacy muxing was setting pulls for GPIO 48 and 49, so let's
    keep that behaviour for now to avoid further regressions for
    BT and FM. Also input logic was enabled for MMC CLK line, but
    I've verified that the input logic we don't need enabled for
    CLK line as it's not bidirectional.

    Also, we want to use non-removable instead of ti,non-removable
    as the ti,non-removable also sets no_regulator_off_init which
    is really not what we want as then wl12xx won't get powered
    up and down which is needed for resetting it.

    Note that looks like the WLAN interface fails to come up after
    a warm reset, but that most likely was also happening with
    the legacy booting and needs a separate fix.

    Cc: Paolo Pisati
    Cc: Rajendra Nayak
    Cc: Luciano Coelho
    Signed-off-by: Tony Lindgren
    Signed-off-by: Benoit Cousson

    Tony Lindgren
     
  • Pull KVM fixes from Gleb Natapov.

    * 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: VMX: set "blocked by NMI" flag if EPT violation happens during IRET from NMI
    kvm: free resources after canceling async_pf
    KVM: nEPT: reset PDPTR register cache on nested vmentry emulation
    KVM: mmu: allow page tables to be in read-only slots
    KVM: x86 emulator: emulate RETF imm

    Linus Torvalds
     
  • o Move current_cpu_type() to a separate header file
    o #ifdefing on supported CPU types lets modern GCC know that certain
    code in callers may be discarded ideally turning current_cpu_type() into
    a function returning a constant.
    o Use current_cpu_type() rather than direct access to struct cpuinfo_mips.

    Signed-off-by: Ralf Baechle
    Cc: Steven J. Hill
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/5833/

    Ralf Baechle
     
  • Set "blocked by NMI" flag if EPT violation happens during IRET from NMI
    otherwise NMI can be called recursively causing stack corruption.

    Signed-off-by: Gleb Natapov

    Gleb Natapov
     
  • From Shawn Guo, imx fixes for 3.12:

    * A couple of clock driver and device tree fixes
    * A bug fix for clk-fixup-mux to get imx6sl back to boot
    * A L2 cache setting fix for imx6q
    * One pinctrl macro fix for UART2 DTE entries

    * tag 'imx-fixes-3.12' of git://git.linaro.org/people/shawnguo/linux-2.6:
    ARM: dts: imx6q: fix the wrong offset of the Pad Mux register
    ARM: imx: i.mx6d/q: disable the double linefill feature of PL310
    ARM: imx51.dtsi: fix PATA device clock
    ARM: mach-imx: clk-imx51-imx53: Fix 'spdif1_pred' clock registration
    ARM: imx: initialize clk_init_data.flags for clk-fixup-mux
    ARM: imx27.dtsi: fix CSPI PER clock id

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • Without this, legacy platforms that can boot with a multiplatform
    kernel but that need the DTB to be appended, won't have a way to pass
    firmware-set bootargs to the kernel.

    This is needed to boot multi_v7_defconfig on snowball, for instance.

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • This fixes a multiplatform regression on the Ux500.

    When compiling the Ux500 platforms in multiplatform configurations
    both PL310_ERRATA_588369 and PL310_ERRATA_727915 would crash the
    platform when trying to launch the init process.

    The Ux500 cannot access the debug registers of the PL310, it will
    just crash if you try this. So disable this by setting the debug
    callback to NULL when initializing the l2x0 on this platform.

    Cc: Lee Jones
    Signed-off-by: Linus Walleij
    Signed-off-by: Olof Johansson

    Linus Walleij
     

17 Sep, 2013

2 commits

  • This fixes the following issue

    BUG: using smp_processor_id() in preemptible [00000000] code: kjournald/1761
    caller is blast_dcache32+0x30/0x254
    Call Trace:
    [] dump_stack+0x8/0x34
    [] debug_smp_processor_id+0xe0/0xf0
    [] blast_dcache32+0x30/0x254
    [] r4k_dma_cache_wback_inv+0x200/0x288
    [] mips_dma_map_sg+0x108/0x180
    [] ide_dma_prepare+0xf0/0x1b8
    [] do_rw_taskfile+0x1e8/0x33c
    [] ide_do_rw_disk+0x298/0x3e4
    [] do_ide_request+0x2e0/0x704
    [] __blk_run_queue+0x44/0x64
    [] queue_unplugged.isra.36+0x1c/0x54
    [] blk_flush_plug_list+0x18c/0x24c
    [] blk_finish_plug+0x18/0x48
    [] journal_commit_transaction+0x3b8/0x151c
    [] kjournald+0xec/0x238
    [] kthread+0xb8/0xc0
    [] ret_from_kernel_thread+0x14/0x1c

    Caches in most systems are identical - but not always, so we can't avoid
    the use of smp_call_function() by just looking at the boot CPU's data,
    have to fiddle with preemption instead.

    Signed-off-by: Ralf Baechle
    Cc: Markos Chandras
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/5835

    Ralf Baechle
     
  • Pull more tile architecture updates from Chris Metcalf:
    "This second batch of changes is just cleanup of various kinds from
    doing some tidying work in the sources.

    Some dead code is removed, comment typos fixed, whitespace and style
    issues cleaned up, and some header updates from our internal
    "upstream" architecture team"

    * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
    tile: remove stray blank space
    tile: header updates from upstream
    tile: improve gxio iorpc autogenerated code style
    tile: double default VMALLOC space
    tile: remove stale arch/tile/kernel/futex_64.S
    tile: remove HUGE_VMAP dead code
    tile: use pmd_pfn() instead of casting via pte_t
    tile: fix typos in comment in arch/tile/kernel/unaligned.c

    Linus Torvalds