1. 28 Nov, 2013 5 commits
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · b7fe6bf7
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - Fix for a recent regression in the Tegra cpufreq driver causing
         excess error messages to be printed from Stephen Warren
      
       - ACPI-based device hotplug fix to prevent conflicting notify handlers
         from being installed for PCI host bridge objects.  From Toshi Kani
      
       - ACPICA update to upstream version 20131115.  This contains bug fixes
         mostly (loop termination fix for the get AML length function, fixes
         related to namespace node removal and debug output).  From Bob Moore,
         Tomasz Nowicki and Lv Zheng
      
       - Removal of incorrect inclusions of internal ACPICA header files by
         non-ACPICA code from Lv Zheng
      
       - Fixes for the ACPI sysfs interface exposing tables to user space from
         Daisuke Hatayama and Jeremy Compostella
      
       - Assorted ACPI and cpufreq cleanups from Sachin Kamat and Al Stone
      
       - cpupower tool fix and man page from Thomas Renninger
      
      * tag 'pm+acpi-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: Clean up incorrect inclusions of ACPICA headers
        tools: cpupower: fix wrong err msg not supported vs not available
        tools: cpupower: Add cpupower-idle-set(1) manpage
        ACPI / sysfs: Fix incorrect ACPI tables walk in acpi_tables_sysfs_init()
        ACPI / sysfs: Set file size for each exposed ACPI table
        ACPICA: Update version to 20131115.
        ACPICA: Add support to delete all objects attached to the root namespace node.
        ACPICA: Delete all attached data objects during namespace node deletion.
        ACPICA: Resources: Fix loop termination for the get AML length function.
        ACPICA: Tests: Add CHECKSUM_ABORT protection for test utilities.
        ACPICA: Debug output: Do not emit function nesting level for kernel build.
        ACPI / sleep: clean up compiler warning about uninitialized field
        cpufreq: exynos: Remove unwanted EXPORT_SYMBOL
        cpufreq: tegra: don't error target() when suspended
        ACPI / hotplug: Fix conflicted PCI bridge notify handlers
      b7fe6bf7
    • Nicolas Dichtel's avatar
      doc: fix generation of device-drivers · 96d5d9d9
      Nicolas Dichtel authored
      Since commit 7a6354e2 ("sched: Move wait.c into kernel/sched/"), the
      path of this file has changed.
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Acked-by: default avatarAndy Whitcroft <apw@canonical.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Ingo Molnar <mingo@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      96d5d9d9
    • Will Deacon's avatar
      lockref: include mutex.h rather than reinvent arch_mutex_cpu_relax · 14058d20
      Will Deacon authored
      arch_mutex_cpu_relax is already conditionally defined in mutex.h, so
      simply include that header rather than replicate the code here.
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      14058d20
    • Dave Jones's avatar
      remove obsolete references to powertweak · dad33750
      Dave Jones authored
      This tool hasn't been maintained in over a decade, and is pretty much
      useless these days.  Let's pretend it never happened.
      
      Also remove a long-dead email address.
      Signed-off-by: default avatarDave Jones <davej@fedoraproject.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dad33750
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · a456c0d9
      Linus Torvalds authored
      Pull powerpc fixes from Ben Herrenschmidt:
       "The main thing that caused problem was that CONFIG_CPU_LITTLE_ENDIAN
        got turned on with allyesconfig and such, which is not a very good
        idea especially since it requires a newer toolchain than what most
        people have.
      
        So we turned it into a choice instead that defaults to big endian"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/windfarm: Fix XServe G5 fan control Makefile issue
        arch/powerpc/kernel: Use %12.12s instead of %12s to avoid memory overflow
        powerpc/signals: Improved mark VSX not saved with small contexts fix
        powerpc/kdump: Adding symbols in vmcoreinfo to facilitate dump filtering
        powerpc: allyesconfig should not select CONFIG_CPU_LITTLE_ENDIAN
        powerpc: Fix error when cross building TAGS & cscope
        powerpc/booke: Only check for hugetlb in flush if vma != NULL
        powerpc/85xx: typo in dts: "interupt" (four devices)
        powerpc/8xx: mfspr SPRN_TBRx in lieu of mftb/mftbu is not supported
        powerpc/corenet64: compile with CONFIG_E{5,6}500_CPU well
      a456c0d9
  2. 27 Nov, 2013 6 commits
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v3.13-rc1' of... · 8ae516aa
      Linus Torvalds authored
      Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "This includes two fixes.
      
        1) is a bug fix that happens when root does the following:
      
           echo function_graph > current_tracer
           modprobe foo
           echo nop > current_tracer
      
         This causes the ftrace internal accounting to get screwed up and
         crashes ftrace, preventing the user from using the function tracer
         after that.
      
        2) if a TRACE_EVENT has a string field, and NULL is given for it.
      
         The internal trace event code does a strlen() and strcpy() on the
         source of field.  If it is NULL it causes the system to oops.
      
         This bug has been there since 2.6.31, but no TRACE_EVENT ever passed
         in a NULL to the string field, until now"
      
      * tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace: Fix function graph with loading of modules
        tracing: Allow events to have NULL strings
      8ae516aa
    • Linus Torvalds's avatar
      Merge branch 'for-linus-bugs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 4f9e5df2
      Linus Torvalds authored
      Pull ceph bug-fixes from Sage Weil:
       "These include a couple fixes to the new fscache code that went in
        during the last cycle (which will need to go stable@ shortly as well),
        a couple client-side directory fragmentation fixes, a fix for a race
        in the cap release queuing path, and a couple race fixes in the
        request abort and resend code.
      
        Obviously some of this could have gone into 3.12 final, but I
        preferred to overtest rather than send things in for a late -rc, and
        then my travel schedule intervened"
      
      * 'for-linus-bugs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        ceph: allocate non-zero page to fscache in readpage()
        ceph: wake up 'safe' waiters when unregistering request
        ceph: cleanup aborted requests when re-sending requests.
        ceph: handle race between cap reconnect and cap release
        ceph: set caps count after composing cap reconnect message
        ceph: queue cap release in __ceph_remove_cap()
        ceph: handle frag mismatch between readdir request and reply
        ceph: remove outdated frag information
        ceph: hung on ceph fscache invalidate in some cases
      4f9e5df2
    • Benjamin Herrenschmidt's avatar
      powerpc/windfarm: Fix XServe G5 fan control Makefile issue · 721cb59e
      Benjamin Herrenschmidt authored
      We are missing building windfarm_max6690_sensor.o when building
      CONFIG_WINDFARM_RM31. Usually all the windfarm drivers are built
      and thus this isn't a problem but some more "tailored" setups
      (Gentoo ?) building only that driver are not working because
      the require sensor module is missing.
      Reported-by: default avatarStanislav Ponomarev <devhexorg@gmail.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      721cb59e
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-tools' · b90f7b8a
      Rafael J. Wysocki authored
      * pm-tools:
        tools: cpupower: fix wrong err msg not supported vs not available
        tools: cpupower: Add cpupower-idle-set(1) manpage
      b90f7b8a
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-cpufreq' · db8fbb49
      Rafael J. Wysocki authored
      * pm-cpufreq:
        cpufreq: exynos: Remove unwanted EXPORT_SYMBOL
        cpufreq: tegra: don't error target() when suspended
      db8fbb49
    • Rafael J. Wysocki's avatar
      Merge branch 'acpica' · 2d304ba7
      Rafael J. Wysocki authored
      * acpica:
        ACPI: Clean up incorrect inclusions of ACPICA headers
        ACPICA: Update version to 20131115.
        ACPICA: Add support to delete all objects attached to the root namespace node.
        ACPICA: Delete all attached data objects during namespace node deletion.
        ACPICA: Resources: Fix loop termination for the get AML length function.
        ACPICA: Tests: Add CHECKSUM_ABORT protection for test utilities.
        ACPICA: Debug output: Do not emit function nesting level for kernel build.
      2d304ba7
  3. 26 Nov, 2013 8 commits
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 0e4b0743
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Mostly bugfixes and a few small code removals.  Worth pointing out is:
      
         - A handful of more fixes to get DT enablement working properly on
           OMAP, finding new breakage of things that don't work quite right
           yet without the traditional board files.  I expect a bit more of
           this to come in this release as people test on their hardware.
         - Implementation of power_down_finish() on vexpress, to make kexec
           work and to stop the MCPM core to produce a warning (the warning
           was new to 3.13-rc1).
         - A handful of minor fixes for various platforms"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: bcm2835: add missing #xxx-cells to I2C nodes
        ARM: dts: Add max77686 RTC interrupt to cros5250-common
        ARM: vexpress/TC2: Implement MCPM power_down_finish()
        ARM: tegra: Provide dummy powergate implementation
        ARM: omap: fix warning with LPAE build
        ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init
        ARM: OMAP2+: Remove legacy mux code for display.c
        ARM: OMAP2+: Fix undefined reference to set_cntfreq
        gpio: twl4030: Fix passing of pdata in the device tree case
        gpio: twl4030: Fix regression for twl gpio output
        ARM: OMAP2+: More randconfig fixes for reconfigure_io_chain
        ARM: dts: imx6qdl: disable spdif "rxtx5" clock option
        ARM: dts: Fix omap2 specific dtsi files by adding the missing entries
        ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x
        i2c: omap: Fix missing device tree flags for omap2
      0e4b0743
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 3af4977e
      Linus Torvalds authored
      Pull IMA fixes from James Morris:
       "These three patches fix regressions in the IMA code in your current
        tree.
      
        The first fixes a couple of bugs in template_desc_init_fields(), and
        the other two ensure that changes in this kernel don't break
        userspace"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: make a copy of template_fmt in template_desc_init_fields()
        ima: do not send field length to userspace for digest of ima template
        ima: do not include field length in template digest calc for ima template
      3af4977e
    • Linus Torvalds's avatar
      Merge tag 'ntb-3.13' of git://github.com/jonmason/ntb · b9548514
      Linus Torvalds authored
      Pull non-transparent bridge updates from Jon Mason:
       "NTB driver bug fixes to address a missed call to pci_enable_msix,
        NTB-RP Link Up issue, Xeon Doorbell errata workaround, ntb_transport
        link down race, and correct dmaengine_get/put usage.
      
        Also, clean-ups to remove duplicate defines and document a hardware
        errata.  Finally, some changes to improve performance"
      
      * tag 'ntb-3.13' of git://github.com/jonmason/ntb:
        NTB: Disable interrupts and poll under high load
        NTB: Enable Snoop on Primary Side
        NTB: Document HW errata
        NTB: remove duplicate defines
        NTB: correct dmaengine_get/put usage
        NTB: Fix ntb_transport link down race
        ntb: Fix missed call to pci_enable_msix()
        NTB: Fix NTB-RP Link Up
        NTB: Xeon Doorbell errata workaround
      b9548514
    • Steven Rostedt (Red Hat)'s avatar
      ftrace: Fix function graph with loading of modules · 8a56d776
      Steven Rostedt (Red Hat) authored
      Commit 8c4f3c3f "ftrace: Check module functions being traced on reload"
      fixed module loading and unloading with respect to function tracing, but
      it missed the function graph tracer. If you perform the following
      
       # cd /sys/kernel/debug/tracing
       # echo function_graph > current_tracer
       # modprobe nfsd
       # echo nop > current_tracer
      
      You'll get the following oops message:
      
       ------------[ cut here ]------------
       WARNING: CPU: 2 PID: 2910 at /linux.git/kernel/trace/ftrace.c:1640 __ftrace_hash_rec_update.part.35+0x168/0x1b9()
       Modules linked in: nfsd exportfs nfs_acl lockd ipt_MASQUERADE sunrpc ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_filter ip6_tables uinput snd_hda_codec_idt
       CPU: 2 PID: 2910 Comm: bash Not tainted 3.13.0-rc1-test #7
       Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./To be filled by O.E.M., BIOS SDBLI944.86P 05/08/2007
        0000000000000668 ffff8800787efcf8 ffffffff814fe193 ffff88007d500000
        0000000000000000 ffff8800787efd38 ffffffff8103b80a 0000000000000668
        ffffffff810b2b9a ffffffff81a48370 0000000000000001 ffff880037aea000
       Call Trace:
        [<ffffffff814fe193>] dump_stack+0x4f/0x7c
        [<ffffffff8103b80a>] warn_slowpath_common+0x81/0x9b
        [<ffffffff810b2b9a>] ? __ftrace_hash_rec_update.part.35+0x168/0x1b9
        [<ffffffff8103b83e>] warn_slowpath_null+0x1a/0x1c
        [<ffffffff810b2b9a>] __ftrace_hash_rec_update.part.35+0x168/0x1b9
        [<ffffffff81502f89>] ? __mutex_lock_slowpath+0x364/0x364
        [<ffffffff810b2cc2>] ftrace_shutdown+0xd7/0x12b
        [<ffffffff810b47f0>] unregister_ftrace_graph+0x49/0x78
        [<ffffffff810c4b30>] graph_trace_reset+0xe/0x10
        [<ffffffff810bf393>] tracing_set_tracer+0xa7/0x26a
        [<ffffffff810bf5e1>] tracing_set_trace_write+0x8b/0xbd
        [<ffffffff810c501c>] ? ftrace_return_to_handler+0xb2/0xde
        [<ffffffff811240a8>] ? __sb_end_write+0x5e/0x5e
        [<ffffffff81122aed>] vfs_write+0xab/0xf6
        [<ffffffff8150a185>] ftrace_graph_caller+0x85/0x85
        [<ffffffff81122dbd>] SyS_write+0x59/0x82
        [<ffffffff8150a185>] ftrace_graph_caller+0x85/0x85
        [<ffffffff8150a2d2>] system_call_fastpath+0x16/0x1b
       ---[ end trace 940358030751eafb ]---
      
      The above mentioned commit didn't go far enough. Well, it covered the
      function tracer by adding checks in __register_ftrace_function(). The
      problem is that the function graph tracer circumvents that (for a slight
      efficiency gain when function graph trace is running with a function
      tracer. The gain was not worth this).
      
      The problem came with ftrace_startup() which should always be called after
      __register_ftrace_function(), if you want this bug to be completely fixed.
      
      Anyway, this solution moves __register_ftrace_function() inside of
      ftrace_startup() and removes the need to call them both.
      Reported-by: default avatarDave Wysochanski <dwysocha@redhat.com>
      Fixes: ed926f9b ("ftrace: Use counters to enable functions to trace")
      Cc: stable@vger.kernel.org # 3.0+
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      8a56d776
    • Steven Rostedt (Red Hat)'s avatar
      tracing: Allow events to have NULL strings · 4e58e547
      Steven Rostedt (Red Hat) authored
      If an TRACE_EVENT() uses __assign_str() or __get_str on a NULL pointer
      then the following oops will happen:
      
      BUG: unable to handle kernel NULL pointer dereference at   (null)
      IP: [<c127a17b>] strlen+0x10/0x1a
      *pde = 00000000 ^M
      Oops: 0000 [#1] PREEMPT SMP
      Modules linked in:
      CPU: 1 PID: 0 Comm: swapper/1 Not tainted 3.13.0-rc1-test+ #2
      Hardware name:                  /DG965MQ, BIOS MQ96510J.86A.0372.2006.0605.1717 06/05/2006^M
      task: f5cde9f0 ti: f5e5e000 task.ti: f5e5e000
      EIP: 0060:[<c127a17b>] EFLAGS: 00210046 CPU: 1
      EIP is at strlen+0x10/0x1a
      EAX: 00000000 EBX: c2472da8 ECX: ffffffff EDX: c2472da8
      ESI: c1c5e5fc EDI: 00000000 EBP: f5e5fe84 ESP: f5e5fe80
       DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
      CR0: 8005003b CR2: 00000000 CR3: 01f32000 CR4: 000007d0
      Stack:
       f5f18b90 f5e5feb8 c10687a8 0759004f 00000005 00000005 00000005 00200046
       00000002 00000000 c1082a93 f56c7e28 c2472da8 c1082a93 f5e5fee4 c106bc61^M
       00000000 c1082a93 00000000 00000000 00000001 00200046 00200082 00000000
      Call Trace:
       [<c10687a8>] ftrace_raw_event_lock+0x39/0xc0
       [<c1082a93>] ? ktime_get+0x29/0x69
       [<c1082a93>] ? ktime_get+0x29/0x69
       [<c106bc61>] lock_release+0x57/0x1a5
       [<c1082a93>] ? ktime_get+0x29/0x69
       [<c10824dd>] read_seqcount_begin.constprop.7+0x4d/0x75
       [<c1082a93>] ? ktime_get+0x29/0x69^M
       [<c1082a93>] ktime_get+0x29/0x69
       [<c108a46a>] __tick_nohz_idle_enter+0x1e/0x426
       [<c10690e8>] ? lock_release_holdtime.part.19+0x48/0x4d
       [<c10bc184>] ? time_hardirqs_off+0xe/0x28
       [<c1068c82>] ? trace_hardirqs_off_caller+0x3f/0xaf
       [<c108a8cb>] tick_nohz_idle_enter+0x59/0x62
       [<c1079242>] cpu_startup_entry+0x64/0x192
       [<c102299c>] start_secondary+0x277/0x27c
      Code: 90 89 c6 89 d0 88 c4 ac 38 e0 74 09 84 c0 75 f7 be 01 00 00 00 89 f0 48 5e 5d c3 55 89 e5 57 66 66 66 66 90 83 c9 ff 89 c7 31 c0 <f2> ae f7 d1 8d 41 ff 5f 5d c3 55 89 e5 57 66 66 66 66 90 31 ff
      EIP: [<c127a17b>] strlen+0x10/0x1a SS:ESP 0068:f5e5fe80
      CR2: 0000000000000000
      ---[ end trace 01bc47bf519ec1b2 ]---
      
      New tracepoints have been added that have allowed for NULL pointers
      being assigned to strings. To fix this, change the TRACE_EVENT() code
      to check for NULL and if it is, it will assign "(null)" to it instead
      (similar to what glibc printf does).
      Reported-by: default avatarShuah Khan <shuah.kh@samsung.com>
      Reported-by: default avatarJovi Zhangwei <jovi.zhangwei@gmail.com>
      Link: http://lkml.kernel.org/r/CAGdX0WFeEuy+DtpsJzyzn0343qEEjLX97+o1VREFkUEhndC+5Q@mail.gmail.com
      Link: http://lkml.kernel.org/r/528D6972.9010702@samsung.com
      Fixes: 9cbf1176 ("tracing/events: provide string with undefined size support")
      Cc: stable@vger.kernel.org # 2.6.31+
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      4e58e547
    • Stephen Warren's avatar
      ARM: bcm2835: add missing #xxx-cells to I2C nodes · a31ab44e
      Stephen Warren authored
      The I2C controller node needs #address-cells and #size-cells properties,
      but these are currently missing. Add them. This allows child nodes to be
      parsed correctly.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarStephen Warren <swarren@wwwdotorg.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a31ab44e
    • Mattia Dongili's avatar
      sony-laptop: do not scribble keyboard backlight registers on resume · b975dc36
      Mattia Dongili authored
      Follow-up to commit 294d31e8 ("sony-laptop: don't change keyboard
      backlight settings"): avoid messing up the state on resume.  Leave it to
      what was before suspending as it's anyway likely that we still don't
      know what value we should write to the EC registers.  This fix is also
      required in 3.12
      
      Cc: stable@vger.kernel.org
      Tested-by: default avatarKarol Babioch <karol@babioch.de>
      Signed-off-by: default avatarMattia Dongili <malattia@linux.it>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b975dc36
    • James Morris's avatar
      Merge branch 'for-linus' of... · 6df025c1
      James Morris authored
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
      6df025c1
  4. 25 Nov, 2013 19 commits
    • Kevin Hilman's avatar
      Merge tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes · 192b4bcb
      Kevin Hilman authored
      The imx fixes for 3.13, part 2:
       - Disable S/PDIF "rxtx5" clock option to fix the clocksource breakage
         introduced by S/PDIF driver
      
      * tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: dts: imx6qdl: disable spdif "rxtx5" clock option
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      192b4bcb
    • Lv Zheng's avatar
      ACPI: Clean up incorrect inclusions of ACPICA headers · 91be0998
      Lv Zheng authored
      Header file <acpi/acpi.h> contains environemnt settings and architecture
      specific implementation that should be included before any other ACPICA
      headers in order to keep a consistent build environment for ACPICA users.
      The following internal ACPICA header files should be included from
      <acpi/acpi.h> and should not be included by other kernel files:
        <acpi/acpiosxf.h>
        <acpi/acpixf.h>
      
      Clean up incorrect inclusions of these files from non-ACPICA source
      files.
      
      [rjw: Subject and changelog]
      Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      91be0998
    • Doug Anderson's avatar
      ARM: dts: Add max77686 RTC interrupt to cros5250-common · c61248af
      Doug Anderson authored
      Without the interrupt you'll get problems if you enable
      CONFIG_RTC_DRV_MAX77686.  Setup the interrupt properly in the device
      tree.
      Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
      Tested-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Cc: stable@vger.kernel.org
      c61248af
    • Dave Martin's avatar
      ARM: vexpress/TC2: Implement MCPM power_down_finish() · 33cb667a
      Dave Martin authored
      This patch implements the power_down_finish() method for TC2, to
      enable the kernel to confirm when CPUs are safely powered down.
      
      The information required for determining when a CPU is parked
      cannot be obtained from any single place, so a few sources of
      information must be combined:
      
        * mcpm_cpu_power_down() must be pending for the CPU, so that we
          don't get confused by false STANDBYWFI positives arising from
          CPUidle.  This is detected by waiting for the tc2_pm use count
          for the target CPU to reach 0.
      
        * Either the SPC must report that the CPU has asserted
          STANDBYWFI, or the TC2 tile's reset control logic must be
          holding the CPU in reset.
      
          Just checking for STANDBYWFI is not sufficient, because this
          signal is not latched when the the cluster is clamped off and
          powered down: the relevant status bits just drop to zero.  This
          means that STANDBYWFI status cannot be used for reliable
          detection of the last CPU in a cluster reaching WFI.
      
      This patch is required in order for kexec to work with MCPM on TC2.
      
      MCPM code was changed in commit 0de0d646 ('ARM: 7848/1: mcpm:
      Implement cpu_kill() to synchronise on powerdown'), and since then it
      will hit a WARN_ON_ONCE() due to power_down_finish not being implemented
      on the TC2 platform.
      Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
      Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
      Reviewed-by: default avatarNicolas Pitre <nico@linaro.org>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      33cb667a
    • Thomas Renninger's avatar
      tools: cpupower: fix wrong err msg not supported vs not available · f4a5d17e
      Thomas Renninger authored
      idlestates in sysfs are counted from 0.
      
      This fixes a wrong error message.
      Current behavior on a machine with 4 sleep states is:
      
      cpupower idle-set -e 4
      Idlestate 4 enabled on CPU 0
      
      -----Wrong---------------------
      cpupower idle-set -e 5
      Idlestate enabling not supported by kernel
      -----Must and now will be -----
      cpupower idle-set -e 5
      Idlestate 6 not available on CPU 0
      -------------------------------
      
      cpupower idle-set -e 6
      Idlestate 6 not available on CPU 0
      Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      f4a5d17e
    • Thomas Renninger's avatar
      tools: cpupower: Add cpupower-idle-set(1) manpage · 5094d271
      Thomas Renninger authored
      The cpupower idle-set subcommand was introduce recently.
      This patch provides the missing manpage.
      
      If cpupower is properly installed it will show up automatically
      (similar to git), when invoking:
      cpupower help idle-set
      or
      cpupower idle-set --help
      
      Some parts have been taken over and adjusted from
      git commit 62d6ae88
      documentation submitted by Carsten Emde.
      Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      5094d271
    • Thierry Reding's avatar
      ARM: tegra: Provide dummy powergate implementation · 9886e1fd
      Thierry Reding authored
      In order to support increased build test coverage for drivers, implement
      dummies for the powergate implementation. This will allow the drivers to
      be built without requiring support for Tegra to be selected.
      
      This patch solves the following build errors, which can be triggered in
      v3.13-rc1 by selecting DRM_TEGRA without ARCH_TEGRA:
      
      drivers/built-in.o: In function `gr3d_remove':
      drivers/gpu/drm/tegra/gr3d.c:321: undefined reference to `tegra_powergate_power_off'
      drivers/gpu/drm/tegra/gr3d.c:325: undefined reference to `tegra_powergate_power_off'
      drivers/built-in.o: In function `gr3d_probe':
      drivers/gpu/drm/tegra/gr3d.c:266: undefined reference to `tegra_powergate_sequence_power_up'
      drivers/gpu/drm/tegra/gr3d.c:273: undefined reference to `tegra_powergate_sequence_power_up'
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      [swarren, updated commit description]
      Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      9886e1fd
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of... · 5c1f34c4
      Olof Johansson authored
      Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      From Tony Lindgren:
      Few more fixes for issues found booting older omaps using device tree.
      Also few randconfig build fixes and removal of some dead code for omap4
      as it no longer has legacy platform data based booting support.
      
      * tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init
        ARM: OMAP2+: Remove legacy mux code for display.c
        ARM: OMAP2+: Fix undefined reference to set_cntfreq
        gpio: twl4030: Fix passing of pdata in the device tree case
        gpio: twl4030: Fix regression for twl gpio output
        ARM: OMAP2+: More randconfig fixes for reconfigure_io_chain
        ARM: dts: Fix omap2 specific dtsi files by adding the missing entries
        ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x
        i2c: omap: Fix missing device tree flags for omap2
      5c1f34c4
    • Olof Johansson's avatar
      ARM: omap: fix warning with LPAE build · 6dd1e357
      Olof Johansson authored
      Some omap3 code is throwing a warning:
      arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context':
      arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from
        integer of different size [-Wint-to-pointer-cast]
      
      In reality this code will never actually execute with LPAE=y, since
      Cortex-A8 doesn't support it. So downcasting the __pa() is safe in
      this case.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      6dd1e357
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-hotplug', 'acpi-sysfs' and 'acpi-sleep' · 434a438a
      Rafael J. Wysocki authored
      * acpi-hotplug:
        ACPI / hotplug: Fix conflicted PCI bridge notify handlers
      
      * acpi-sysfs:
        ACPI / sysfs: Fix incorrect ACPI tables walk in acpi_tables_sysfs_init()
        ACPI / sysfs: Set file size for each exposed ACPI table
      
      * acpi-sleep:
        ACPI / sleep: clean up compiler warning about uninitialized field
      434a438a
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 8e45099e
      Linus Torvalds authored
      Pull regulator fixes from Mark Brown:
       "A bunch of fixes, a few driver specific ones and a framework fix for
        voltage enumeration on fixed voltage regulators which had previously
        worked but had been misplaced during some refactoring causing problems
        for users that needed to know the voltage"
      
      * tag 'regulator-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: arizona-micsupp: Correct wm5110 voltage selection
        regulator: pfuze100: allow misprogrammed ID
        regulator: fixed: fix regulator_list_voltage() for regression
        regulator: gpio-regulator: Don't oops on missing regulator-type property
      8e45099e
    • Roberto Sassu's avatar
      ima: make a copy of template_fmt in template_desc_init_fields() · dbc335d2
      Roberto Sassu authored
      This patch makes a copy of the 'template_fmt' function argument so that
      the latter will not be modified by strsep(), which does the splitting by
      replacing the given separator with '\0'.
      
       IMA: No TPM chip found, activating TPM-bypass!
       Unable to handle kernel pointer dereference at virtual kernel address 0000000000842000
       Oops: 0004 [#1] SMP
       Modules linked in:
       CPU: 3 PID: 1 Comm: swapper/0 Not tainted 3.12.0-rc2-00098-g3ce1217d #17
       task: 000000003ffa0000 ti: 000000003ff84000 task.ti: 000000003ff84000
       Krnl PSW : 0704e00180000000 000000000044bf88 (strsep+0x7c/0xa0)
                  R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 EA:3
       Krnl GPRS: 000000000000007c 000000000000007c 000000003ff87d90 0000000000821fd8
                  0000000000000000 000000000000007c 0000000000aa37e0 0000000000aa9008
                  0000000000000051 0000000000a114d8 0000000100000002 0000000000842bde
                  0000000000842bdf 00000000006f97f0 000000000040062c 000000003ff87cf0
       Krnl Code: 000000000044bf7c: a7f4000a           brc     15,44bf90
                  000000000044bf80: b90200cc           ltgr    %r12,%r12
                 #000000000044bf84: a7840006           brc     8,44bf90
                 >000000000044bf88: 9200c000           mvi     0(%r12),0
                  000000000044bf8c: 41c0c001           la      %r12,1(%r12)
                  000000000044bf90: e3c020000024       stg     %r12,0(%r2)
                  000000000044bf96: b904002b           lgr     %r2,%r11
                  000000000044bf9a: ebbcf0700004       lmg     %r11,%r12,112(%r15)
       Call Trace:
       ([<00000000004005fe>] ima_init_template+0xa2/0x1bc)
        [<0000000000a7c896>] ima_init+0x7a/0xa8
        [<0000000000a7c938>] init_ima+0x24/0x40
        [<00000000001000e8>] do_one_initcall+0x68/0x128
        [<0000000000a4eb56>] kernel_init_freeable+0x20a/0x2b4
        [<00000000006a1ff4>] kernel_init+0x30/0x178
        [<00000000006b69fe>] kernel_thread_starter+0x6/0xc
        [<00000000006b69f8>] kernel_thread_starter+0x0/0xc
       Last Breaking-Event-Address:
        [<000000000044bf42>] strsep+0x36/0xa0
      
      Fixes commit: adf53a77 ima: new templates management mechanism
      
      Changelog v1:
      - make template_fmt 'const char *' (reported-by James Morris)
      - fix kstrdup memory leak (reported-by James Morris)
      Reported-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      Tested-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      dbc335d2
    • Roberto Sassu's avatar
      ima: do not send field length to userspace for digest of ima template · 3e8e5503
      Roberto Sassu authored
      This patch defines a new value for the 'ima_show_type' enumerator
      (IMA_SHOW_BINARY_NO_FIELD_LEN) to prevent that the field length
      is transmitted through the 'binary_runtime_measurements' interface
      for the digest field of the 'ima' template.
      
      Fixes commit: 3ce1217 ima: define template fields library and new helpers
      Signed-off-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      3e8e5503
    • Roberto Sassu's avatar
      ima: do not include field length in template digest calc for ima template · b6f8f16f
      Roberto Sassu authored
      To maintain compatibility with userspace tools, the field length must not
      be included in the template digest calculation for the 'ima' template.
      
      Fixes commit: a71dc65d ima: switch to new template management mechanism
      Signed-off-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
      Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
      b6f8f16f
    • Chen Gang's avatar
      arch/powerpc/kernel: Use %12.12s instead of %12s to avoid memory overflow · e0513d9e
      Chen Gang authored
      for tmp_part->header.name:
          it is "Terminating null required only for names < 12 chars".
          so need to limit the %.12s for it in printk
      
        additional info:
      
          %12s  limit the width, not for the original string output length
                if name length is more than 12, it still can be fully displayed.
                if name length is less than 12, the ' ' will be filled before name.
      
          %.12s truly limit the original string output length (precision)
      Signed-off-by: default avatarChen Gang <gang.chen@asianux.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e0513d9e
    • Michael Neuling's avatar
      powerpc/signals: Improved mark VSX not saved with small contexts fix · ec67ad82
      Michael Neuling authored
      In a recent patch:
        commit c13f20ac
        Author: Michael Neuling <mikey@neuling.org>
        powerpc/signals: Mark VSX not saved with small contexts
      
      We fixed an issue but an improved solution was later discussed after the patch
      was merged.
      
      Firstly, this patch doesn't handle the 64bit signals case, which could also hit
      this issue (but has never been reported).
      
      Secondly, the original patch isn't clear what MSR VSX should be set to.  The
      new approach below always clears the MSR VSX bit (to indicate no VSX is in the
      context) and sets it only in the specific case where VSX is available (ie. when
      VSX has been used and the signal context passed has space to provide the
      state).
      
      This reverts the original patch and replaces it with the improved solution.  It
      also adds a 64 bit version.
      Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      ec67ad82
    • Hari Bathini's avatar
      powerpc/kdump: Adding symbols in vmcoreinfo to facilitate dump filtering · 8ff81271
      Hari Bathini authored
      When CONFIG_SPARSEMEM_VMEMMAP option is used in kernel, makedumpfile fails
      to filter vmcore dump as it fails to do vmemmap translations. So far
      dump filtering on ppc64 never had to deal with vmemmap addresses seperately
      as vmemmap regions where mapped in zone normal. But with the inclusion of
      CONFIG_SPARSEMEM_VMEMMAP config option in kernel, this vmemmap address
      translation support becomes necessary for dump filtering. For vmemmap adress
      translation, few kernel symbols are needed by dump filtering tool. This patch
      adds those symbols to vmcoreinfo, which a dump filtering tool can use for
      filtering the kernel dump. Tested this changes successfully with makedumpfile
      tool that supports vmemmap to physical address translation outside zone normal.
      
      [ Removed unneeded #ifdef as suggested by Michael Ellerman --BenH ]
      Signed-off-by: default avatarHari Bathini <hbathini@linux.vnet.ibm.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      8ff81271
    • Anton Blanchard's avatar
      powerpc: allyesconfig should not select CONFIG_CPU_LITTLE_ENDIAN · 962bc221
      Anton Blanchard authored
      Stephen reported a failure in an allyesconfig build.
      CONFIG_CPU_LITTLE_ENDIAN=y gets set but his toolchain is not
      new enough to support little endian. We really want to
      default to a big endian build; Ben suggested using a choice
      which defaults to CPU_BIG_ENDIAN.
      Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      962bc221
    • Michael Neuling's avatar
      powerpc: Fix error when cross building TAGS & cscope · 924dd50b
      Michael Neuling authored
      Currently if I cross build TAGS or cscope from x86 I get this:
        % make ARCH=powerpc TAGS
        gcc-4.8.real: error: unrecognized command line option ‘-mbig-endian’
        GEN     TAGS
        %
      
      I'm not setting CROSS_COMPILE= as logically I shouldn't need to and I
      haven't needed to in the past when building TAGS or cscope.  Also, the
      above completess correct as the error is not fatal to the build.
      
      This was caused by:
          commit d72b0801
          Author: Ian Munsie <imunsie@au1.ibm.com>
          powerpc: Add ability to build little endian kernels
      
      The below fixes this by testing for the -mbig-endian option before
      adding it.
      
      I've not done the same thing in the little endian case as if
      -mlittle-endian doesn't exist, we probably want to fail quickly as you
      probably have an old big endian compiler.
      Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      924dd50b
  5. 24 Nov, 2013 2 commits