1. 13 Jan, 2014 4 commits
  2. 26 Nov, 2013 8 commits
  3. 25 Nov, 2013 10 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
    • 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
    • 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
    • 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
  4. 24 Nov, 2013 9 commits
  5. 23 Nov, 2013 1 commit
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · 2e7babfa
      Linus Torvalds authored
      Pull x86 platform driver updates from Matthew Garrett:
       "A moderate diffstat, but it's almost entirely just moving the
        chromebook driver into its own directory in order to ease ARM support,
        adding back rfkill support to the one Dell laptop model where it's
        expected to work, updates to the Intel IPC driver for hardware I've
        never actually seen and the usual set of small fixes"
      
      [ This actually came in before the merge window closed, and I had just
        missed it because it didn't match my git pull email pattern.  - Linus ]
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (24 commits)
        x86, wmi fix modalias_show return values
        ipc: Added support for IPC interrupt mode
        ipc: Handle error conditions in ipc command
        ipc: Enabled ipc support for additional intel platforms
        ipc: Added platform data structure
        thinkpad_acpi: Fix build error when CONFIG_SND_MAX_CARDS > 32
        platform: add chrome platform directory
        hp-wmi: detect "2009 BIOS or later" flag by WMI 0x0d for wireless cmd
        dell-wmi: Add KEY_MICMUTE to bios_to_linux_keycode
        platform:x86: Remove OOM message after input_allocate_device
        sony-laptop: fixe typos in sony_laptop_input_keycode_map
        sony-laptop: warn on multiple KBD backlight handles
        dell-laptop: Only enable rfkill functionality on laptops with a hw killswitch
        dell-laptop: Add a force_rfkill module parameter
        dell-laptop: Wait less long before updating rfkill after an rfkill keypress
        dell-laptop: Do not skip setting blocked bit rfkill_set while hw-blocked
        dell-laptop: Sync current block state to BIOS on hw switch change
        dell-laptop: Allow changing the sw_state while the radio is blocked by hw
        dell-laptop: Don't read-back sw_state on machines with a hardware switch
        dell-laptop: Don't set sw_state from the query callback
        ...
      2e7babfa
  6. 22 Nov, 2013 8 commits
    • Dmitry Torokhov's avatar
      Merge branch 'next' into for-linus · 5cf0eb98
      Dmitry Torokhov authored
      Second round of input updates for 3.13.
      5cf0eb98
    • Linus Torvalds's avatar
      Linux 3.13-rc1 · 6ce4eac1
      Linus Torvalds authored
      6ce4eac1
    • Linus Torvalds's avatar
      Merge tag 'ecryptfs-3.13-rc1-quiet-checkers' of... · 57498f9c
      Linus Torvalds authored
      Merge tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
      
      Pull minor eCryptfs fix from Tyler Hicks:
       "Quiet static checkers by removing unneeded conditionals"
      
      * tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
        eCryptfs: file->private_data is always valid
      57498f9c
    • Linus Torvalds's avatar
      Merge tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · e48f88a3
      Linus Torvalds authored
      Pull second set of sound fixes from Takashi Iwai:
       "A collection of small fixes in HD-audio quirks and runtime PM, ASoC
        rcar, abs8500 and other codecs.  Most of commits are for stable
        kernels, too"
      
      * tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janitorial)
        ALSA: hda - Provide missing pin configs for VAIO with ALC260
        ALSA: hda - Add headset quirk for Dell Inspiron 3135
        ALSA: hda - Fix the headphone jack detection on Sony VAIO TX
        ALSA: hda - Fix missing bass speaker on ASUS N550
        ALSA: hda - Fix unbalanced runtime PM notification at resume
        ASoC: arizona: Set FLL to free-run before disabling
        ALSA: hda - A casual Dell Headset quirk
        ASoC: rcar: fixup dma_async_issue_pending() timing
        ASoC: rcar: off by one in rsnd_scu_set_route()
        ASoC: wm5110: Add post SYSCLK register patch for rev D chip
        ASoC: ab8500: Revert to using custom I/O functions
        ALSA: hda - Also enable mute/micmute LED control for "Lenovo dock" fixup
        ALSA: firewire-lib: include sound/asound.h to refer to snd_pcm_format_t
        ALSA: hda - Select FW_LOADER from CONFIG_SND_HDA_CODEC_CA0132_DSP
        ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Realtek codec
        ASoC: rcar: fixup mod access before checking
      e48f88a3
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · aecde27c
      Linus Torvalds authored
      Pull DRM fixes from Dave Airlie:
       "I was going to leave this until post -rc1 but sysfs fixes broke
        hotplug in userspace, so I had to fix it harder, otherwise a set of
        pulls from intel, radeon and vmware,
      
        The vmware/ttm changes are bit larger but since its early and they are
        unlikely to break anything else I put them in, it lets vmware work
        with dri3"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (36 commits)
        drm/sysfs: fix hotplug regression since lifetime changes
        drm/exynos: g2d: fix memory leak to userptr
        drm/i915: Fix gen3 self-refresh watermarks
        drm/ttm: Remove set_need_resched from the ttm fault handler
        drm/ttm: Don't move non-existing data
        drm/radeon: hook up backlight functions for CI and KV family.
        drm/i915: Replicate BIOS eDP bpp clamping hack for hsw
        drm/i915: Do not enable package C8 on unsupported hardware
        drm/i915: Hold pc8 lock around toggling pc8.gpu_idle
        drm/i915: encoder->get_config is no longer optional
        drm/i915/tv: add ->get_config callback
        drm/radeon/cik: Add macrotile mode array query
        drm/radeon/cik: Return backend map information to userspace
        drm/vmwgfx: Make vmwgfx dma buffers prime aware
        drm/vmwgfx: Make surfaces prime-aware
        drm/vmwgfx: Hook up the prime ioctls
        drm/ttm: Add a minimal prime implementation for ttm base objects
        drm/vmwgfx: Fix false lockdep warning
        drm/ttm: Allow execbuf util reserves without ticket
        drm/i915: restore the early forcewake cleanup
        ...
      aecde27c
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · e3414786
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "Miscellaneous
         - Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
         - Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)"
      
      * tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
        PCI: Fix whitespace, capitalization, and spelling errors
      e3414786
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · b0e3636f
      Linus Torvalds authored
      Pull SCSI target updates from Nicholas Bellinger:
       "Things have been quiet this round with mostly bugfixes, percpu
        conversions, and other minor iscsi-target conformance testing changes.
      
        The highlights include:
      
         - Add demo_mode_discovery attribute for iscsi-target (Thomas)
         - Convert tcm_fc(FCoE) to use percpu-ida pre-allocation
         - Add send completion interrupt coalescing for ib_isert
         - Convert target-core to use percpu-refcounting for se_lun
         - Fix mutex_trylock usage bug in iscsit_increment_maxcmdsn
         - tcm_loop updates (Hannes)
         - target-core ALUA cleanups + prep for v3.14 SCSI Referrals support (Hannes)
      
        v3.14 is currently shaping to be a busy development cycle in target
        land, with initial support for T10 Referrals and T10 DIF currently on
        the roadmap"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (40 commits)
        iscsi-target: chap auth shouldn't match username with trailing garbage
        iscsi-target: fix extract_param to handle buffer length corner case
        iscsi-target: Expose default_erl as TPG attribute
        target_core_configfs: split up ALUA supported states
        target_core_alua: Make supported states configurable
        target_core_alua: Store supported ALUA states
        target_core_alua: Rename ALUA_ACCESS_STATE_OPTIMIZED
        target_core_alua: spellcheck
        target core: rename (ex,im)plict -> (ex,im)plicit
        percpu-refcount: Add percpu-refcount.o to obj-y
        iscsi-target: Do not reject non-immediate CmdSNs exceeding MaxCmdSN
        iscsi-target: Convert iscsi_session statistics to atomic_long_t
        target: Convert se_device statistics to atomic_long_t
        target: Fix delayed Task Aborted Status (TAS) handling bug
        iscsi-target: Reject unsupported multi PDU text command sequence
        ib_isert: Avoid duplicate iscsit_increment_maxcmdsn call
        iscsi-target: Fix mutex_trylock usage in iscsit_increment_maxcmdsn
        target: Core does not need blkdev.h
        target: Pass through I/O topology for block backstores
        iser-target: Avoid using FRMR for single dma entry requests
        ...
      b0e3636f
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 0032cdef
      Linus Torvalds authored
      Pull hwmon fixes from Guenter Roeck:
       - acpi_power_meter: Fix return value check from call to
         acpi_bus_get_device
       - nct6775: Fix/improve NCT6791 support
       - lm75: Add support for GMT G751
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (acpi_power_meter) Fix acpi_bus_get_device() return value check
        hwmon: (nct6775) NCT6791 supports weight control only for CPUFAN
        hwmon: (nct6775) Monitor additional temperature registers
        hwmon: (lm75) Add support for GMT G751 chip
      0032cdef