15 Jun, 2015

2 commits

  • Pull more MIPS fixes from Ralf Baechle:
    "Another round of 4.1 MIPS fixes, one fix to a MIPS-specific #if
    condition in lib/mpi, one fix to the MIPS GIC irqchip driver and one
    SSB fix.

    Details:
    - fix handling of clock in chipco SSB driver.
    - fix two MIPS-specific #if conditions to correctly work for GCC 5.1.
    - fix damage to R6 pgtable bits done by XPA support.
    - fix possible crash due to unloading modules that contain statically
    defined platform devices.
    - fix disabling of the MSA ASE on context switch to also work
    correctly when a new thread/process has the CPU for the very first
    time.

    This is part of linux-next and has been beaten to death on
    Imagination's test farm.

    While things are not looking too grim this pull request also means the
    rate of fixes for 4.1 remains nearly constant so I'd not be unhappy if
    you'd delay the release"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MPI: MIPS: Fix compilation error with GCC 5.1
    IRQCHIP: mips-gic: Don't nest calls to do_IRQ()
    MIPS: MSA: bugfix - disable MSA correctly for new threads/processes.
    MIPS: Loongson: Do not register 8250 platform device from module.
    MIPS: Cobalt: Do not build MTD platform device registration code as module.
    SSB: Fix handling of ssb_pmu_get_alp_clock()
    MIPS: pgtable-bits: Fix XPA damage to R6 definitions.

    Linus Torvalds
     
  • Pull perf fixes from Ingo Molnar:
    "A regression fix for a crash, and a Intel HSW uncore PMU driver fix"

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    Revert "perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization"
    perf/x86/intel/uncore: Fix CBOX bit wide and UBOX reg on Haswell-EP

    Linus Torvalds
     

11 Jun, 2015

4 commits

  • …git/groeck/linux-staging

    Pull misc fixes from Guenter Roeck:
    "There are two patches here. One fixes a build error affecting the
    blackfin architecture, the other fixes a build error affecting the
    score architecture.

    The score maintainer (Lennox Wu) has a hard time sending you the score
    patch, and the blackfin maintainer (Steven Miao) has been silent since
    -rc1. Since 4.1 is about to be released, I figured it would be useful
    to get the patches upstream to avoid the related build failures in the
    final release"

    * tag 'misc-for-linus-4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    score: Fix exception handler label
    blackfin: Fix build error

    Linus Torvalds
     
  • Fix this compile issue with gcc-4.4.4:

    arch/x86/kvm/mmu.c: In function 'kvm_mmu_pte_write':
    arch/x86/kvm/mmu.c:4256: error: unknown field 'cr0_wp' specified in initializer
    arch/x86/kvm/mmu.c:4257: error: unknown field 'cr4_pae' specified in initializer
    arch/x86/kvm/mmu.c:4257: warning: excess elements in union initializer
    ...

    gcc-4.4.4 (at least) has issues when using anonymous unions in
    initializers.

    Fixes: edc90b7dc4ceef6 ("KVM: MMU: fix SMAP virtualization")
    Cc: Xiao Guangrong
    Cc: Paolo Bonzini
    Cc: Davidlohr Bueso
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • The latest version of modinfo fails to compile score architecture
    targets with the following error.

    FATAL: The relocation at __ex_table+0x634 references
    section "__ex_table" which is not executable, IOW
    the kernel will fault if it ever tries to
    jump to it. Something is seriously wrong
    and should be fixed.

    The probem is caused by a bad label in an __ex_table entry.

    Acked-by: Lennox Wu
    Cc: Quentin Casasnovas
    Signed-off-by: Guenter Roeck

    Guenter Roeck
     
  • Fix

    include/asm-generic/io.h: In function 'readb':
    include/asm-generic/io.h:113:2: error:
    implicit declaration of function 'bfin_read8'
    include/asm-generic/io.h: In function 'readw':
    include/asm-generic/io.h:121:2: error:
    implicit declaration of function 'bfin_read16'
    include/asm-generic/io.h: In function 'readl':
    include/asm-generic/io.h:129:2: error:
    implicit declaration of function 'bfin_read32'
    include/asm-generic/io.h: In function 'writeb':
    include/asm-generic/io.h:147:2: error:
    implicit declaration of function 'bfin_write8'
    include/asm-generic/io.h: In function 'writew':
    include/asm-generic/io.h:155:2: error:
    implicit declaration of function 'bfin_write16'
    include/asm-generic/io.h: In function 'writel':
    include/asm-generic/io.h:163:2: error:
    implicit declaration of function 'bfin_write32'

    Reported-by: Geert Uytterhoeven
    Fixes: 1a3372bc522ef ("blackfin: io: define __raw_readx/writex with
    bfin_readx/writex")
    Cc: Steven Miao
    Signed-off-by: Guenter Roeck

    Guenter Roeck
     

10 Jun, 2015

3 commits


09 Jun, 2015

5 commits

  • This reverts commit c05199e5a57a579fea1e8fa65e2b511ceb524ffc.

    Vince Weaver reported the following crash while perf fuzzing:

    [ 79.473121] kernel BUG at mm/vmalloc.c:1335!
    [ 79.694391] Call Trace:
    [ 79.696997]
    [ 79.699090] [] get_vm_area_caller+0x40/0x50
    [ 79.705505] [] ? snb_uncore_imc_init_box+0x6d/0x90
    [ 79.712414] [] __ioremap_caller+0x195/0x350
    [ 79.718610] [] ? snb_uncore_imc_init_box+0x6d/0x90
    [ 79.725462] [] ? debug_object_activate+0x14b/0x1e0
    [ 79.732346] [] ioremap_nocache+0x17/0x20
    [ 79.738283] [] snb_uncore_imc_init_box+0x6d/0x90
    [ 79.744945] [] snb_uncore_imc_event_start+0xb7/0x110
    [ 79.752020] [] snb_uncore_imc_event_add+0x47/0x60
    [ 79.758832] [] event_sched_in.isra.85+0xfb/0x330
    [ 79.765519] [] group_sched_in+0x6f/0x1e0
    [ 79.771481] [] ? native_sched_clock+0x2a/0x90
    [ 79.777858] [] __perf_event_enable+0x25c/0x2a0
    [ 79.784418] [] ? tick_nohz_irq_exit+0x29/0x30
    [ 79.790820] [] ? cpu_clock_event_start+0x40/0x40
    [ 79.797546] [] remote_function+0x50/0x60
    [ 79.803535] [] flush_smp_call_function_queue+0x81/0x180
    [ 79.810840] [] generic_smp_call_function_single_interrupt+0x13/0x60
    [ 79.819328] [] smp_trace_call_function_single_interrupt+0x38/0xc0
    [ 79.827614] [] trace_call_function_single_interrupt+0x6e/0x80
    [ 79.835465]
    [ 79.837543] [] ? cpuidle_enter_state+0x65/0x160
    [ 79.844377] [] ? cpuidle_enter_state+0x51/0x160
    [ 79.851015] [] cpuidle_enter+0x17/0x20
    [ 79.856791] [] cpu_startup_entry+0x399/0x440
    [ 79.863165] [] rest_init+0xbb/0xd0

    The offending commit is clearly confused as it moves heavy initialization
    work into IPI context.

    Revert it.

    Reported-by: Vince Weaver
    Acked-by: Peter Zijlstra (Intel)
    Cc: Kan Liang
    Cc: Arnaldo Carvalho de Melo
    Cc: Stephane Eranian
    Cc: Yan, Zheng
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • Commit be0c37c985ed ("MIPS: Rearrange PTE bits into fixed positions.")
    rearranged the PTE bits into fixed positions in preparation for the XPA
    support. However, this patch broke R6 since it only took R2 cores
    into consideration for the RI/XI bits leading to boot failures. We fix
    this by adding the missing CONFIG_CPU_MIPSR6 definitions

    Fixes: be0c37c985ed ("MIPS: Rearrange PTE bits into fixed positions.")
    Cc: Steven J. Hill
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/10208/
    Signed-off-by: Markos Chandras
    Signed-off-by: Ralf Baechle

    Markos Chandras
     
  • Pull networking fixes from David Miller:

    1) Fix stack allocation in s390 BPF JIT, from Michael Holzheu.

    2) Disable LRO on openvswitch paths, from Jiri Benc.

    3) UDP early demux doesn't handle multicast group membership properly,
    fix from Shawn Bohrer.

    4) Fix TX queue hang due to incorrect handling of mixed sized fragments
    and linearlization in i40e driver, from Anjali Singhai Jain.

    5) Cannot use disable_irq() in timer handler of AMD xgbe driver, from
    Thomas Lendacky.

    6) b2net driver improperly assumes pci_alloc_consistent() gives zero'd
    out memory, use dma_zalloc_coherent(). From Sriharsha Basavapatna.

    7) Fix use-after-free in MPLS and ipv6, from Robert Shearman.

    8) Missing neif_napi_del() calls in cleanup paths of b44 driver, from
    Hauke Mehrtens.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    net: replace last open coded skb_orphan_frags with function call
    net: bcmgenet: power on MII block for all MII modes
    ipv6: Fix protocol resubmission
    ipv6: fix possible use after free of dev stats
    b44: call netif_napi_del()
    bridge: disable softirqs around br_fdb_update to avoid lockup
    Revert "bridge: use _bh spinlock variant for br_fdb_update to avoid lockup"
    mpls: fix possible use after free of device
    be2net: Replace dma/pci_alloc_coherent() calls with dma_zalloc_coherent()
    bridge: use _bh spinlock variant for br_fdb_update to avoid lockup
    amd-xgbe: Use disable_irq_nosync from within timer function
    rhashtable: add missing import
    i40e: Make sure to be in VEB mode if SRIOV is enabled at probe
    i40e: start up in VEPA mode by default
    i40e/i40evf: Fix mixed size frags and linearization
    ipv4/udp: Verify multicast group is ours in upd_v4_early_demux()
    openvswitch: disable LRO
    s390/bpf: fix bpf frame pointer setup
    s390/bpf: fix stack allocation

    Linus Torvalds
     
  • Pull ARM SoC fixes from Kevin Hilman:
    "About 10 days worth of small bug fixes, and the (hopefully) final
    round fixes for from arm-soc land for the -rc cycle. Nothing special
    to note, but here's a brief summary of fixes by SoC type:

    - OMAP:
    small set of misc DT fixes; boot fix for THUMB2 kernel

    - mediatek:
    PMIC fixes; DT fix for model name

    - exynos:
    wakeup interupt fixes for 3250

    - mvebu:
    revert mbus patch which broke DMA masters

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage
    ARM: dts: AM35xx: fix system control module clocks
    arm64: dts: mt8173-evb: fix model name
    ARM: exynos: Fix wake-up interrupts for Exynos3250
    ARM: dts: Fix n900 dts file to work around 4.1 touchscreen regression on n900
    ARM: dts: Fix dm816x to use right compatible flag for MUSB
    ARM: OMAP3: Fix booting with thumb2 kernel
    Revert "bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window"
    bus: mvebu-mbus: do not set WIN_CTRL_SYNCBARRIER on non io-coherent platforms.
    ARM: mvebu: armada-xp-linksys-mamba: Disable internal RTC
    soc: mediatek: Add compile dependency to pmic-wrapper
    soc: mediatek: PMIC wrap: Fix register state machine handling
    soc: mediatek: PMIC wrap: Fix clock rate handling

    Linus Torvalds
     
  • …/git/tmlind/linux-omap into fixes

    Merge omap fixes for v4.1, urgent fix to avoid potential hardware damage From Tony Lindgren:

    Omap fixes for the -rc cycle, including a fix for potential hardware
    breakage on BeagleBones:

    - BeagleBones don't support RTC-only mode, it can cause hardware
    damage if system-power-controller is specified without
    ti,pmic-shutdown-controller

    - Fix a recent regression to am3517 SoCs caused by the recent clock
    move that was not noticed until now despite automated boot
    testing

    - Fix a regression for n900 touchscreen triggered by recent
    recent input changes

    - Fix compatible property for dm816x USB to avoid errors with
    USB Ethernet

    - Fix oops for omap3 when built with CONFIG_THUMB2_KERNEL

    * tag 'omap-for-v4.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage
    ARM: dts: AM35xx: fix system control module clocks
    ARM: dts: Fix n900 dts file to work around 4.1 touchscreen regression on n900
    ARM: dts: Fix dm816x to use right compatible flag for MUSB
    ARM: OMAP3: Fix booting with thumb2 kernel

    Kevin Hilman
     

08 Jun, 2015

1 commit

  • Pull MIPS updates from Ralf Baechle:
    "Eight fixes across arch/mips. Nothing stands particuarly out nor is
    complicated but fixes keep coming in at a higher than comfortable
    rate"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: KVM: Do not sign extend on unsigned MMIO load
    MIPS: BPF: Fix stack pointer allocation
    MIPS: Loongson-3: Fix a cpu-hotplug issue in loongson3_ipi_interrupt()
    MIPS: Fix enabling of DEBUG_STACKOVERFLOW
    MIPS: c-r4k: Fix typo in probe_scache()
    MIPS: Avoid an FPE exception in FCSR mask probing
    MIPS: ath79: Add a missing new line in log message
    MIPS: ralink: Fix clearing the illegal access interrupt

    Linus Torvalds
     

07 Jun, 2015

1 commit

  • CBOX counters are increased to 48b on HSX.

    Correct the MSR address for HSWEP_U_MSR_PMON_CTR0 and
    HSWEP_U_MSR_PMON_CTL0.

    See specification in:
    http://www.intel.com/content/www/us/en/processors/xeon/
    xeon-e5-v3-uncore-performance-monitoring.html

    Signed-off-by: Kan Liang
    Signed-off-by: Peter Zijlstra (Intel)
    Cc: Andrew Morton
    Cc: H. Peter Anvin
    Cc: Linus Torvalds
    Cc: Peter Zijlstra
    Cc: Thomas Gleixner
    Link: http://lkml.kernel.org/r/1432645835-7918-1-git-send-email-kan.liang@intel.com
    Signed-off-by: Ingo Molnar

    Kan Liang
     

06 Jun, 2015

7 commits

  • Fix possible unintended sign extension in unsigned MMIO loads by casting
    to uint16_t in the case of mmio_needed != 2.

    Signed-off-by: Nicholas Mc Guire
    Reviewed-by: James Hogan
    Tested-by: James Hogan
    Cc: Gleb Natapov
    Cc: Paolo Bonzini
    Cc: kvm@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/9985/
    Signed-off-by: Ralf Baechle

    Nicholas Mc Guire
     
  • Fix stack pointer offset which could potentially corrupt
    argument registers in the previous frame. The calculated offset
    reflects the size of all the registers we need to preserve so there
    is no need for this erroneous subtraction.

    [ralf@linux-mips.org: Fixed conflict due to only applying this fix part
    of the entire series as part of 4.1 fixes.]

    Signed-off-by: Markos Chandras
    Cc: netdev@vger.kernel.org
    Cc: "David S. Miller"
    Cc: Alexei Starovoitov
    Cc: Daniel Borkmann
    Cc: Hannes Frederic Sowa
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/10527/
    Signed-off-by: Ralf Baechle

    Markos Chandras
     
  • setup_per_cpu_areas() only setup __per_cpu_offset[] for each possible
    cpu, but loongson_sysconf.nr_cpus can be greater than possible cpus
    (due to reserved_cpus_mask). So in loongson3_ipi_interrupt(), percpu
    access will touch the original varible in .data..percpu section which
    has been freed. Without this patch, cpu-hotplug will cause memery
    corruption.

    Signed-off-by: Huacai Chen
    Cc: John Crispin
    Cc: Steven J. Hill
    Cc: linux-mips@linux-mips.org
    Cc: Fuxin Zhang
    Cc: Zhangjin Wu
    Patchwork: http://patchwork.linux-mips.org/patch/10524/
    Signed-off-by: Ralf Baechle

    Huacai Chen
     
  • Commit 334c86c494b9 ("MIPS: IRQ: Add stackoverflow detection") added
    kernel stack overflow detection, however it only enabled it conditional
    upon the preprocessor definition DEBUG_STACKOVERFLOW, which is never
    actually defined. The Kconfig option is called DEBUG_STACKOVERFLOW,
    which manifests to the preprocessor as CONFIG_DEBUG_STACKOVERFLOW, so
    switch it to using that definition instead.

    Fixes: 334c86c494b9 ("MIPS: IRQ: Add stackoverflow detection")
    Signed-off-by: James Hogan
    Cc: Ralf Baechle
    Cc: Adam Jiang
    Cc: linux-mips@linux-mips.org
    Cc: # 2.6.37+
    Patchwork: http://patchwork.linux-mips.org/patch/10531/
    Signed-off-by: Ralf Baechle

    James Hogan
     
  • Fixes a typo in arch/mips/mm/c-r4k.c's probe_scache().

    Signed-off-by: Joshua Kinard
    Signed-off-by: Ralf Baechle

    Joshua Kinard
     
  • Pull x86 fixes from Ingo Molnar:
    "Misc fixes:

    - early_idt_handlers[] fix that fixes the build with bleeding edge
    tooling

    - build warning fix on GCC 5.1

    - vm86 fix plus self-test to make it harder to break it again"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/asm/irq: Stop relying on magic JMP behavior for early_idt_handlers
    x86/asm/entry/32, selftests: Add a selftest for kernel entries from VM86 mode
    x86/boot: Add CONFIG_PARAVIRT_SPINLOCKS quirk to arch/x86/boot/compressed/misc.h
    x86/asm/entry/32: Really make user_mode() work correctly for VM86 mode

    Linus Torvalds
     
  • Pull perf fixes from Ingo Molnar:
    "The biggest chunk of the changes are two regression fixes: a HT
    workaround fix and an event-group scheduling fix. It's been verified
    with 5 days of fuzzer testing.

    Other fixes:

    - eBPF fix
    - a BIOS breakage detection fix
    - PMU driver fixes"

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf/x86/intel/pt: Fix a refactoring bug
    perf/x86: Tweak broken BIOS rules during check_hw_exists()
    perf/x86/intel/pt: Untangle pt_buffer_reset_markers()
    perf: Disallow sparse AUX allocations for non-SG PMUs in overwrite mode
    perf/x86: Improve HT workaround GP counter constraint
    perf/x86: Fix event/group validation
    perf: Fix race in BPF program unregister

    Linus Torvalds
     

04 Jun, 2015

3 commits

  • Commit 066450be41 ("perf/x86/intel/pt: Clean up the control flow
    in pt_pmu_hw_init()") changed attribute initialization so that
    only the first attribute gets initialized using
    sysfs_attr_init(), which upsets lockdep.

    This patch fixes the glitch so that all allocated attributes are
    properly initialized thus fixing the lockdep warning reported by
    Tvrtko and Imre.

    Reported-by: Tvrtko Ursulin
    Reported-by: Imre Deak
    Signed-off-by: Alexander Shishkin
    Cc:
    Cc: Andrew Morton
    Cc: H. Peter Anvin
    Cc: Linus Torvalds
    Cc: Peter Zijlstra
    Cc: Thomas Gleixner
    Signed-off-by: Ingo Molnar

    Alexander Shishkin
     
  • Currently the bpf frame pointer is set to the old r15. This is
    wrong because of packed stack. Fix this and adjust the frame pointer
    to respect packed stack. This now generates a prolog like the following:

    3ff8001c3fa: eb67f0480024 stmg %r6,%r7,72(%r15)
    3ff8001c400: ebcff0780024 stmg %r12,%r15,120(%r15)
    3ff8001c406: b904001f lgr %r1,%r15
    Acked-by: Heiko Carstens
    Signed-off-by: Alexei Starovoitov
    Signed-off-by: David S. Miller

    Michael Holzheu
     
  • On s390x we have to provide 160 bytes stack space before we can call
    the next function. From the 160 bytes that we got from the previous
    function we only use 11 * 8 bytes and have 160 - 11 * 8 bytes left.
    Currently for BPF we allocate additional 160 - 11 * 8 bytes for the
    next function. This is wrong because then the next function only gets:

    (160 - 11 * 8) + (160 - 11 * 8) = 2 * 72 = 144 bytes

    Fix this and allocate enough memory for the next function.

    Fixes: 054623105728 ("s390/bpf: Add s390x eBPF JIT compiler backend")
    Signed-off-by: Michael Holzheu
    Acked-by: Heiko Carstens
    Signed-off-by: Alexei Starovoitov
    Signed-off-by: David S. Miller

    Michael Holzheu
     

03 Jun, 2015

3 commits


02 Jun, 2015

5 commits

  • The memory setup log is missing a new line.

    Signed-off-by: Alban Bedel
    Cc: linux-mips@linux-mips.org
    Cc: Andrew Bresticker
    Cc: Qais Yousef
    Cc: Wolfram Sang
    Cc: Sergey Ryazanov
    Cc: Gabor Juhos
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/9771/
    Signed-off-by: Ralf Baechle

    Alban Bedel
     
  • The early_idt_handlers asm code generates an array of entry
    points spaced nine bytes apart. It's not really clear from that
    code or from the places that reference it what's going on, and
    the code only works in the first place because GAS never
    generates two-byte JMP instructions when jumping to global
    labels.

    Clean up the code to generate the correct array stride (member size)
    explicitly. This should be considerably more robust against
    screw-ups, as GAS will warn if a .fill directive has a negative
    count. Using '. =' to advance would have been even more robust
    (it would generate an actual error if it tried to move
    backwards), but it would pad with nulls, confusing anyone who
    tries to disassemble the code. The new scheme should be much
    clearer to future readers.

    While we're at it, improve the comments and rename the array and
    common code.

    Binutils may start relaxing jumps to non-weak labels. If so,
    this change will fix our build, and we may need to backport this
    change.

    Before, on x86_64:

    0000000000000000 :
    0: 6a 00 pushq $0x0
    2: 6a 00 pushq $0x0
    4: e9 00 00 00 00 jmpq 9
    5: R_X86_64_PC32 early_idt_handler-0x4
    ...
    48: 66 90 xchg %ax,%ax
    4a: 6a 08 pushq $0x8
    4c: e9 00 00 00 00 jmpq 51
    4d: R_X86_64_PC32 early_idt_handler-0x4
    ...
    117: 6a 00 pushq $0x0
    119: 6a 1f pushq $0x1f
    11b: e9 00 00 00 00 jmpq 120
    11c: R_X86_64_PC32 early_idt_handler-0x4

    After:

    0000000000000000 :
    0: 6a 00 pushq $0x0
    2: 6a 00 pushq $0x0
    4: e9 14 01 00 00 jmpq 11d
    ...
    48: 6a 08 pushq $0x8
    4a: e9 d1 00 00 00 jmpq 120
    4f: cc int3
    50: cc int3
    ...
    117: 6a 00 pushq $0x0
    119: 6a 1f pushq $0x1f
    11b: eb 03 jmp 120
    11d: cc int3
    11e: cc int3
    11f: cc int3

    Signed-off-by: Andy Lutomirski
    Acked-by: H. Peter Anvin
    Cc: Binutils
    Cc: Borislav Petkov
    Cc: H.J. Lu
    Cc: Jan Beulich
    Cc: Linus Torvalds
    Cc: Peter Zijlstra
    Cc: Thomas Gleixner
    Cc:
    Link: http://lkml.kernel.org/r/ac027962af343b0c599cbfcf50b945ad2ef3d7a8.1432336324.git.luto@kernel.org
    Signed-off-by: Ingo Molnar

    Andy Lutomirski
     
  • Pull Sparc fixes from David Miller:

    1) Setup the core/threads/sockets bitmaps correctly so that 'lscpus'
    and friends operate properly. Frtom Chris Hyser.

    2) The bit that normally means "Cached Virtually" on sun4v systems,
    actually changes meaning in M7 and later chips. Fix from Khalid
    Aziz.

    3) One some PCI-E systems we need to probe different OF properties to
    fill in the PCI slot information properly, from Eric Snowberg.

    4) Kill an extraneous memset after kzalloc(), from Christophe Jaillet.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
    sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE
    sparc64: pci slots information is not populated in sysfs
    sparc: kernel: GRPCI2: Remove a useless memset
    sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly

    Linus Torvalds
     
  • Avoid entering "RTC-only mode" at poweroff. It is unsupported by most
    versions of BeagleBone, and risks hardware damage.

    The damaging configuration is having system-power-controller
    without ti,pmic-shutdown-controller.

    Reported-by: Matthijs van Duin
    Tested-by: Matthijs van Duin
    Signed-off-by: Robert Nelson
    Cc: Tony Lindgren
    Cc: Felipe Balbi
    Cc: Johan Hovold
    [Matthijs van Duin: added explanatory comments]
    Signed-off-by: Matthijs van Duin
    Fixes: http://bugs.elinux.org/issues/143
    Cc: stable@vger.kernel.org # v3.12+
    [tony@atomide.com: updated comments with the hardware breaking info]
    Signed-off-by: Tony Lindgren

    Matthijs van Duin
     
  • New system control module layout for omap3 overlooked parts of the am35xx
    configuration. Basically the am35xx clocks were not converted to use the
    changed offsets, which caused weird boot warnings. The errors were not
    fatal so far, so they were not caught earlier. Fixed by applying the
    proper offsets for the AM35xx scm clocks.

    Fixes: b8845074cf ("ARM: dts: omap3: add minimal l4 bus layout with...")

    Signed-off-by: Tero Kristo
    Reported-by: Jeroen Hofstee
    Cc: Paul Walmsley
    Tested-by: Jeroen Hofstee
    Signed-off-by: Tony Lindgren

    Tero Kristo
     

01 Jun, 2015

6 commits

  • - dts: mt8173: fix compatible string

    * tag 'v4.1-next-arm64-fixes' of https://github.com/mbgg/linux-mediatek:
    arm64: dts: mt8173-evb: fix model name

    Arnd Bergmann
     
  • Merge "ARM: EXYNOS: Fix for 4.1, 4th" from Krzysztof Kozlowski:

    Fix for Exynos3250 RTC wake-up interrupts after converting PMU
    wakeup to stacked domains. This allows waking up the device from
    suspend to RAM using S3C RTC driver (the RTC on SoC).

    The patch should be applied some time ago, unfortunately
    it seems it slipped through fingers.

    * tag 'samsung-fixes-4.1-4' of https://github.com/krzk/linux:
    ARM: exynos: Fix wake-up interrupts for Exynos3250

    Arnd Bergmann
     
  • Merge "mvebu fixes for 4.1 (part 3)" from Gregory CLEMENT:

    Disable unused internal RTC for Mamba from linksys (Armada XP)
    And 2 commits fixing regressions on mvebu-mbus:
    - the first one for Kirkwood or Orion SoC
    - the second one for DMA when the platform have more than 4GB (only
    possible on Armada XP as far as I know)

    * tag 'mvebu-fixes-4.1-3' of git://git.infradead.org/linux-mvebu:
    Revert "bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window"
    bus: mvebu-mbus: do not set WIN_CTRL_SYNCBARRIER on non io-coherent platforms.
    ARM: mvebu: armada-xp-linksys-mamba: Disable internal RTC

    Arnd Bergmann
     
  • Model name in mt8173-evb.dts doesn't follow dts convention (it should
    be human readable model name). Fix it.

    Fixes: b3a372484157 ("arm64: dts: Add mediatek MT8173 SoC and evaluation board dts and Makefile")
    Cc: # v4.0+
    Signed-off-by: Yingjoe Chen
    Signed-off-by: Matthias Brugger

    Yingjoe Chen
     
  • Due to a typo the illegal access interrupt is never cleared in by
    the interupt handler, causing an effective deadlock on the first
    illegal access.

    This was broken since the code was introduced in 5433acd81e87 ("MIPS:
    ralink: add illegal access driver"), but only exposed when the Kconfig
    symbol was added, thus enabling the code.

    Cc: [3.18+]
    Fixes: a7b7aad383c ("MIPS: ralink: add missing symbol for RALINK_ILL_ACC")
    Signed-off-by: Jonas Gorski
    Cc: linux-mips@linux-mips.org
    Cc: John Crispin
    Patchwork: https://patchwork.linux-mips.org/patch/10172/
    Signed-off-by: Ralf Baechle

    Jonas Gorski
     
  • sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE

    Bit 9 of TTE is CV (Cacheable in V-cache) on sparc v9 processor while
    the same bit 9 is MCDE (Memory Corruption Detection Enable) on M7
    processor. This creates a conflicting usage of the same bit. Kernel
    sets TTE.cv bit on all pages for sun4v architecture which works well
    for sparc v9 but enables memory corruption detection on M7 processor
    which is not the intent. This patch adds code to determine if kernel
    is running on M7 processor and takes steps to not enable memory
    corruption detection in TTE erroneously.

    Signed-off-by: Khalid Aziz
    Signed-off-by: David S. Miller

    Khalid Aziz