27 Oct, 2014

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "Another week, another small batch of fixes.

    Most of these make zynq, socfpga and sunxi platforms work a bit
    better:

    - due to new requirements for regulators, DWMMC on socfpga broke past
    v3.17
    - SMP spinup fix for socfpga
    - a few DT fixes for zynq
    - another option (FIXED_REGULATOR) for sunxi is needed that used to
    be selected by other options but no longer is.
    - a couple of small DT fixes for at91
    - ...and a couple for i.MX"

    * tag 'armsoc-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: dts: imx28-evk: Let i2c0 run at 100kHz
    ARM: i.MX6: Fix "emi" clock name typo
    ARM: multi_v7_defconfig: enable CONFIG_MMC_DW_ROCKCHIP
    ARM: sunxi_defconfig: enable CONFIG_REGULATOR_FIXED_VOLTAGE
    ARM: dts: socfpga: Add a 3.3V fixed regulator node
    ARM: dts: socfpga: Fix SD card detect
    ARM: dts: socfpga: rename gpio nodes
    ARM: at91/dt: sam9263: fix PLLB frequencies
    power: reset: at91-reset: fix power down register
    MAINTAINERS: add atmel ssc driver maintainer entry
    arm: socfpga: fix fetching cpu1start_addr for SMP
    ARM: zynq: DT: trivial: Fix mc node
    ARM: zynq: DT: Add cadence watchdog node
    ARM: zynq: DT: Add missing reference for memory-controller
    ARM: zynq: DT: Add missing reference for ADC
    ARM: zynq: DT: Add missing address for L2 pl310
    ARM: zynq: DT: Remove 222 MHz OPP
    ARM: zynq: DT: Fix GEM register area size

    Linus Torvalds
     

25 Oct, 2014

5 commits

  • Pull MIPS fixes from Ralf Baechle:
    "This is the first round of fixes and tying up loose ends for MIPS.

    - plenty of fixes for build errors in specific obscure configurations
    - remove redundant code on the Lantiq platform
    - removal of a useless SEAD I2C driver that was causing a build issue
    - fix an earlier TLB exeption handler fix to also work on Octeon.
    - fix ISA level dependencies in FPU emulator's instruction decoding.
    - don't hardcode kernel command line in Octeon software emulator.
    - fix an earlier fix for the Loondson 2 clock setting"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: SEAD3: Fix I2C device registration.
    MIPS: SEAD3: Nuke PIC32 I2C driver.
    MIPS: ftrace: Fix a microMIPS build problem
    MIPS: MSP71xx: Fix build error
    MIPS: Malta: Do not build the malta-amon.c file if CMP is not enabled
    MIPS: Prevent compiler warning from cop2_{save,restore}
    MIPS: Kconfig: Add missing MIPS_CPS dependencies to PM and cpuidle
    MIPS: idle: Remove leftover __pastwait symbol and its references
    MIPS: Sibyte: Include the swarm subdir to the sb1250 LittleSur builds
    MIPS: ptrace.h: Add a missing include
    MIPS: ath79: Fix compilation error when CONFIG_PCI is disabled
    MIPS: MSP71xx: Remove compilation error when CONFIG_MIPS_MT is present
    MIPS: Octeon: Remove special case for simulator command line.
    MIPS: tlbex: Properly fix HUGE TLB Refill exception handler
    MIPS: loongson2_cpufreq: Fix CPU clock rate setting mismerge
    pci: pci-lantiq: remove duplicate check on resource
    MIPS: Lasat: Add missing CONFIG_PROC_FS dependency to PICVUE_PROC
    MIPS: cp1emu: Fix ISA restrictions for cop1x_op instructions

    Linus Torvalds
     
  • Pull xen bug fixes from David Vrabel:

    - Fix regression in xen_clocksource_read() which caused all Xen guests
    to crash early in boot.
    - Several fixes for super rare race conditions in the p2m.
    - Assorted other minor fixes.

    * tag 'stable/for-linus-3.18-b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
    xen/pci: Allocate memory for physdev_pci_device_add's optarr
    x86/xen: panic on bad Xen-provided memory map
    x86/xen: Fix incorrect per_cpu accessor in xen_clocksource_read()
    x86/xen: avoid race in p2m handling
    x86/xen: delay construction of mfn_list_list
    x86/xen: avoid writing to freed memory after race in p2m handling
    xen/balloon: Don't continue ballooning when BP_ECANCELED is encountered

    Linus Torvalds
     
  • Pull /dev/random updates from Ted Ts'o:
    "This adds a memzero_explicit() call which is guaranteed not to be
    optimized away by GCC. This is important when we are wiping
    cryptographically sensitive material"

    * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
    crypto: memzero_explicit - make sure to clear out sensitive data
    random: add and use memzero_explicit() for clearing data

    Linus Torvalds
     
  • Pull ACPI and power management updates from Rafael Wysocki:
    "This is material that didn't make it to my 3.18-rc1 pull request for
    various reasons, mostly related to timing and travel (LinuxCon EU /
    LPC) plus a couple of fixes for recent bugs.

    The only really new thing here is the PM QoS class for memory
    bandwidth, but it is simple enough and users of it will be added in
    the next cycle. One major change in behavior is that platform devices
    enumerated by ACPI will use 32-bit DMA mask by default. Also included
    is an ACPICA update to a new upstream release, but that's mostly
    cleanups, changes in tools and similar. The rest is fixes and
    cleanups mostly.

    Specifics:

    - Fix for a recent PCI power management change that overlooked the
    fact that some IRQ chips might not be able to configure PCIe PME
    for system wakeup from Lucas Stach.

    - Fix for a bug introduced in 3.17 where acpi_device_wakeup() is
    called with a wrong ordering of arguments from Zhang Rui.

    - A bunch of intel_pstate driver fixes (all -stable candidates) from
    Dirk Brandewie, Gabriele Mazzotta and Pali Rohár.

    - Fixes for a rather long-standing problem with the OOM killer and
    the freezer that frozen processes killed by the OOM do not actually
    release any memory until they are thawed, so OOM-killing them is
    rather pointless, with a couple of cleanups on top (Michal Hocko,
    Cong Wang, Rafael J Wysocki).

    - ACPICA update to upstream release 20140926, inlcuding mostly
    cleanups reducing differences between the upstream ACPICA and the
    kernel code, tools changes (acpidump, acpiexec) and support for the
    _DDN object (Bob Moore, Lv Zheng).

    - New PM QoS class for memory bandwidth from Tomeu Vizoso.

    - Default 32-bit DMA mask for platform devices enumerated by ACPI
    (this change is mostly needed for some drivers development in
    progress targeted at 3.19) from Heikki Krogerus.

    - ACPI EC driver cleanups, mostly related to debugging, from Lv
    Zheng.

    - cpufreq-dt driver updates from Thomas Petazzoni.

    - powernv cpuidle driver update from Preeti U Murthy"

    * tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (34 commits)
    intel_pstate: Correct BYT VID values.
    intel_pstate: Fix BYT frequency reporting
    intel_pstate: Don't lose sysfs settings during cpu offline
    cpufreq: intel_pstate: Reflect current no_turbo state correctly
    cpufreq: expose scaling_cur_freq sysfs file for set_policy() drivers
    cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy
    PCI / PM: handle failure to enable wakeup on PCIe PME
    ACPI: invoke acpi_device_wakeup() with correct parameters
    PM / freezer: Clean up code after recent fixes
    PM: convert do_each_thread to for_each_process_thread
    OOM, PM: OOM killed task shouldn't escape PM suspend
    freezer: remove obsolete comments in __thaw_task()
    freezer: Do not freeze tasks killed by OOM killer
    ACPI / platform: provide default DMA mask
    cpuidle: powernv: Populate cpuidle state details by querying the device-tree
    cpufreq: cpufreq-dt: adjust message related to regulators
    cpufreq: cpufreq-dt: extend with platform_data
    cpufreq: allow driver-specific data
    ACPI / EC: Cleanup coding style.
    ACPI / EC: Refine event/query debugging messages.
    ...

    Linus Torvalds
     
  • Pull thermal management updates from Zhang Rui:
    "Sorry that I missed the merge window as there is a bug found in the
    last minute, and I have to fix it and wait for the code to be tested
    in linux-next tree for a few days. Now the buggy patch has been
    dropped entirely from my next branch. Thus I hope those changes can
    still be merged in 3.18-rc2 as most of them are platform thermal
    driver changes.

    Specifics:

    - introduce ACPI INT340X thermal drivers.

    Newer laptops and tablets may have thermal sensors and other
    devices with thermal control capabilities that are exposed for the
    OS to use via the ACPI INT340x device objects. Several drivers are
    introduced to expose the temperature information and cooling
    ability from these objects to user-space via the normal thermal
    framework.

    From: Lu Aaron, Lan Tianyu, Jacob Pan and Zhang Rui.

    - introduce a new thermal governor, which just uses a hysteresis to
    switch abruptly on/off a cooling device. This governor can be used
    to control certain fan devices that can not be throttled but just
    switched on or off. From: Peter Feuerer.

    - introduce support for some new thermal interrupt functions on
    i.MX6SX, in IMX thermal driver. From: Anson, Huang.

    - introduce tracing support on thermal framework. From: Punit
    Agrawal.

    - small fixes in OF thermal and thermal step_wise governor"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (25 commits)
    Thermal: int340x thermal: select ACPI fan driver
    Thermal: int3400_thermal: use acpi_thermal_rel parsing APIs
    Thermal: int340x_thermal: expose acpi thermal relationship tables
    Thermal: introduce int3403 thermal driver
    Thermal: introduce INT3402 thermal driver
    Thermal: move the KELVIN_TO_MILLICELSIUS macro to thermal.h
    ACPI / Fan: support INT3404 thermal device
    ACPI / Fan: add ACPI 4.0 style fan support
    ACPI / fan: convert to platform driver
    ACPI / fan: use acpi_device_xxx_power instead of acpi_bus equivelant
    ACPI / fan: remove no need check for device pointer
    ACPI / fan: remove unused macro
    Thermal: int3400 thermal: register to thermal framework
    Thermal: int3400 thermal: add capability to detect supporting UUIDs
    Thermal: introduce int3400 thermal driver
    ACPI: add ACPI_TYPE_LOCAL_REFERENCE support to acpi_extract_package()
    ACPI: make acpi_create_platform_device() an external API
    thermal: step_wise: fix: Prevent from binary overflow when trend is dropping
    ACPI: introduce ACPI int340x thermal scan handler
    thermal: Added Bang-bang thermal governor
    ...

    Linus Torvalds
     

24 Oct, 2014

15 commits

  • Pull x86 EFI updates from Peter Anvin:
    "This patchset falls under the "maintainers that grovel" clause in the
    v3.18-rc1 announcement. We had intended to push it late in the merge
    window since we got it into the -tip tree relatively late.

    Many of these are relatively simple things, but there are a couple of
    key bits, especially Ard's and Matt's patches"

    * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
    rtc: Disable EFI rtc for x86
    efi: rtc-efi: Export platform:rtc-efi as module alias
    efi: Delete the in_nmi() conditional runtime locking
    efi: Provide a non-blocking SetVariable() operation
    x86/efi: Adding efi_printks on memory allocationa and pci.reads
    x86/efi: Mark initialization code as such
    x86/efi: Update comment regarding required phys mapped EFI services
    x86/efi: Unexport add_efi_memmap variable
    x86/efi: Remove unused efi_call* macros
    efi: Resolve some shadow warnings
    arm64: efi: Format EFI memory type & attrs with efi_md_typeattr_format()
    ia64: efi: Format EFI memory type & attrs with efi_md_typeattr_format()
    x86: efi: Format EFI memory type & attrs with efi_md_typeattr_format()
    efi: Introduce efi_md_typeattr_format()
    efi: Add macro for EFI_MEMORY_UCE memory attribute
    x86/efi: Clear EFI_RUNTIME_SERVICES if failing to enter virtual mode
    arm64/efi: Do not enter virtual mode if booting with efi=noruntime or noefi
    arm64/efi: uefi_init error handling fix
    efi: Add kernel param efi=noruntime
    lib: Add a generic cmdline parse function parse_option_str
    ...

    Linus Torvalds
     
  • * pm-cpuidle:
    cpuidle: powernv: Populate cpuidle state details by querying the device-tree

    * pm-cpufreq:
    intel_pstate: Correct BYT VID values.
    intel_pstate: Fix BYT frequency reporting
    intel_pstate: Don't lose sysfs settings during cpu offline
    cpufreq: intel_pstate: Reflect current no_turbo state correctly
    cpufreq: expose scaling_cur_freq sysfs file for set_policy() drivers
    cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy
    cpufreq: cpufreq-dt: adjust message related to regulators
    cpufreq: cpufreq-dt: extend with platform_data
    cpufreq: allow driver-specific data

    Rafael J. Wysocki
     
  • * acpi-pm:
    ACPI: invoke acpi_device_wakeup() with correct parameters

    * pm-genirq:
    PCI / PM: handle failure to enable wakeup on PCIe PME

    Rafael J. Wysocki
     
  • * acpi-ec:
    ACPI / EC: Cleanup coding style.
    ACPI / EC: Refine event/query debugging messages.
    ACPI / EC: Add detailed command/query debugging information.
    ACPI / EC: Enhance the logs to apply to QR_EC transactions.
    ACPI / EC: Add CPU ID to debugging messages.

    * acpi-platform:
    ACPI / platform: provide default DMA mask

    Rafael J. Wysocki
     
  • Using a VID value that is not high enough for the requested P state can
    cause machine checks. Add a ceiling function to ensure calulated VIDs
    with fractional values are set to the next highest integer VID value.

    The algorythm for calculating the non-trubo VID from the BIOS writers
    guide is:
    vid_ratio = (vid_max - vid_min) / (max_pstate - min_pstate)
    vid = ceiling(vid_min + (req_pstate - min_pstate) * vid_ratio)

    Cc: All applicable
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Rafael J. Wysocki

    Dirk Brandewie
     
  • BYT has a different conversion from P state to frequency than the core
    processors. This causes the min/max and current frequency to be
    misreported on some BYT SKUs. Tested on BYT N2820, Ivybridge and
    Haswell processors.

    Link: https://bugzilla.yoctoproject.org/show_bug.cgi?id=6663
    Cc: All applicable
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Rafael J. Wysocki

    Dirk Brandewie
     
  • The user may have custom settings don't destroy them during suspend.

    Link: https://bugzilla.kernel.org/show_bug.cgi?id=80651
    Reported-by: Tobias Jakobi
    Cc: All applicable
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Rafael J. Wysocki

    Dirk Brandewie
     
  • Some BIOSes modify the state of MSR_IA32_MISC_ENABLE_TURBO_DISABLE
    based on the current power source for the system battery AC vs
    battery. Reflect the correct current state and ability to modify the
    no_turbo sysfs file based on current state of
    MSR_IA32_MISC_ENABLE_TURBO_DISABLE.

    Link: https://bugzilla.kernel.org/show_bug.cgi?id=83151
    Cc: All applicable
    Signed-off-by: Gabriele Mazzotta
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Rafael J. Wysocki

    Gabriele Mazzotta
     
  • Currently the core does not expose scaling_cur_freq for set_policy()
    drivers this breaks some userspace monitoring tools.
    Change the core to expose this file for all drivers and if the
    set_policy() driver supports the get() callback use it to retrieve the
    current frequency.

    Link: https://bugzilla.kernel.org/show_bug.cgi?id=73741
    Cc: All applicable
    Signed-off-by: Dirk Brandewie
    Signed-off-by: Rafael J. Wysocki

    Dirk Brandewie
     
  • Code which changes policy to powersave changes also max_policy_pct based on
    max_freq. Code which change max_perf_pct has upper limit base on value
    max_policy_pct. When policy is changing from powersave back to performance
    then max_policy_pct is not changed. Which means that changing max_perf_pct is
    not possible to high values if max_freq was too low in powersave policy.

    Test case:

    $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
    800000
    $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
    3300000
    $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
    performance
    $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
    100

    $ echo powersave > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
    $ echo 800000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
    $ echo 20 > /sys/devices/system/cpu/intel_pstate/max_perf_pct

    $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
    powersave
    $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
    800000
    $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
    20

    $ echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
    $ echo 3300000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
    $ echo 100 > /sys/devices/system/cpu/intel_pstate/max_perf_pct

    $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
    performance
    $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
    3300000
    $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
    24

    And now intel_pstate driver allows to set maximal value for max_perf_pct based
    on max_policy_pct which is 24 for previous powersave max_freq 800000.

    This patch will set default value for max_policy_pct when setting policy to
    performance so it will allow to set also max value for max_perf_pct.

    Signed-off-by: Pali Rohár
    Cc: All applicable
    Acked-by: Dirk Brandewie
    Signed-off-by: Rafael J. Wysocki

    Pali Rohár
     
  • …el/git/groeck/linux-staging

    Pull a hwmon fix from Guenter Roeck:
    "Fix potential compile problem for menf21bmc hwmon driver"

    * tag 'hwmon-for-linus-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    hwmon: (menf21bmc) Include linux/err.h

    Linus Torvalds
     
  • If the irqchip handling the PCIe PME interrupt is not able
    to enable interrupt wakeup we should properly reflect this
    in the PME suspend status.

    This fixes a kernel warning on resume, where it would try
    to disable the irq wakeup that failed to be activated while
    suspending, for example:

    WARNING: CPU: 0 PID: 609 at kernel/irq/manage.c:536 irq_set_irq_wake+0xc0/0xf8()
    Unbalanced IRQ 384 wake disable

    Fixes: 76cde7e49590 (PCI / PM: Make PCIe PME interrupts wake up from suspend-to-idle)
    Reported-and-tested-by: Richard Zhu
    Signed-off-by: Lucas Stach
    Signed-off-by: Rafael J. Wysocki

    Lucas Stach
     
  • Fix a bug that invokes acpi_device_wakeup() with wrong parameters.

    Fixes: f35cec255557 (ACPI / PM: Always enable wakeup GPEs when enabling device wakeup)
    Signed-off-by: Zhang Rui
    Cc: 3.17+ # 3.17+
    Signed-off-by: Rafael J. Wysocki

    Zhang Rui
     
  • Pull drm fixes from Dave Airlie:
    "Intel, nouveau, radeon and qxl.

    Mostly for bugs introduced in the merge window, nothing too shocking"

    [ And one cirrus fix added later and not mentioned in the pull request.. - Linus ]

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
    drm/cirrus: bind also to qemu-xen-traditional
    qxl: don't create too large primary surface
    drm/nouveau: fix regression on agp boards
    drm/gt215/gr: fix initialisation on gddr5 boards
    drm/radeon: reduce sparse false positive warnings
    drm/radeon: fix vm page table block size calculation
    drm/ttm: Don't evict BOs outside of the requested placement range
    drm/ttm: Don't skip fpfn check if lpfn is 0 in ttm_bo_mem_compat
    drm/radeon: use gart memory for DMA ring tests
    drm/radeon: fix speaker allocation setup
    drm/radeon: initialize sadb to NULL in the audio code
    drm/i915: fix short vs. long hpd detection
    drm/i915: Don't trust the DP_DETECT bit for eDP ports on CHV
    Revert "drm/radeon/dpm: drop clk/voltage dependency filters for SI"
    Revert "drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table"
    drm/i915: properly reenable gen8 pipe IRQs
    drm/i915: Move DIV_ROUND_CLOSEST_ULL macro to header
    drm/i915: intel_backlight scale() math WA

    Linus Torvalds
     
  • The MIPS_CPS_PM and MIPS_CPS_CPUIDLE implementation should depend
    on the MIPS_CPS symbol to avoid the following build problem

    arch/mips/kernel/pm-cps.c: In function 'cps_pm_enter_state':
    arch/mips/kernel/pm-cps.c:164:26: error: 'cpu_coherent_mask' undeclared
    (first use in this function)
    cpumask_clear_cpu(cpu, &cpu_coherent_mask);
    ^
    Signed-off-by: Markos Chandras
    Cc: Paul Burton
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/7798/
    Signed-off-by: Ralf Baechle

    Markos Chandras
     

23 Oct, 2014

3 commits

  • physdev_pci_device_add's optarr[] is a zero-sized array and therefore
    reference to add.optarr[0] is accessing memory that does not belong to
    the 'add' variable.

    Signed-off-by: Boris Ostrovsky
    Reviewed-by: Jan Beulich
    Signed-off-by: David Vrabel

    Boris Ostrovsky
     
  • Commit 3dcf63677d4e ("xen/balloon: cancel ballooning if adding new
    memory failed") makes reserve_additional_memory() return BP_ECANCELED
    when an error is encountered. This error, however, is ignored by the
    caller (balloon_process()) since it is overwritten by subsequent call
    to update_schedule(). This results in continuous attempts to add more
    memory, all of which are likely to fail again.

    We should stop trying to schedule next iteration of ballooning when
    the current one has failed.

    Signed-off-by: Boris Ostrovsky
    Reviewed-by: Daniel Kiper
    Signed-off-by: David Vrabel

    Boris Ostrovsky
     
  • qemu as used by xend/xm toolstack uses a different subvendor id.
    Bind the drm driver also to this emulated card.

    Signed-off-by: Olaf Hering
    cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie

    Olaf Hering
     

22 Oct, 2014

6 commits

  • In the case of at91sam9g45_restart(), the driver is writing
    AT91_DDRSDRC_LPCB_POWER_DOWN to AT91_DDRSDRC_RTR, this should actually be
    AT91_DDRSDRC_LPR.

    Signed-off-by: Alexandre Belloni
    Acked-by: Sebastian Reichel
    Signed-off-by: Nicolas Ferre

    Alexandre Belloni
     
  • Limit primary to qemu vgamem size, to avoid reaching
    qemu guest bug "requested primary larger than framebuffer"
    on resizing screen too large to fit.

    Remove unneeded and misleading variables.

    Related to:
    https://bugzilla.redhat.com/show_bug.cgi?id=1127552

    Signed-off-by: Marc-André Lureau
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie

    Marc-André Lureau
     
  • Most devices are configured for 32-bit DMA addresses.
    Setting the mask to 32-bit here removes the need for the
    drivers to do it separately.

    Signed-off-by: Heikki Krogerus
    Signed-off-by: Rafael J. Wysocki

    Heikki Krogerus
     
  • Pull SCSI target updates from Nicholas Bellinger:
    "Here are the target updates for v3.18-rc2 code. These where
    originally destined for -rc1, but due to the combination of travel
    last week for KVM Forum and my mistake of taking the three week merge
    window literally, the pull request slipped.. Apologies for that.

    Things where reasonably quiet this round. The highlights include:

    - New userspace backend driver (target_core_user.ko) by Shaohua Li
    and Andy Grover
    - A number of cleanups in target, iscsi-taret and qla_target code
    from Joern Engel
    - Fix an OOPs related to queue full handling with CHECK_CONDITION
    status from Quinn Tran
    - Fix to disable TX completion interrupt coalescing in iser-target,
    that was causing problems on some hardware
    - Fix for PR APTPL metadata handling with demo-mode ACLs

    I'm most excited about the new backend driver that uses UIO + shared
    memory ring to dispatch I/O and control commands into user-space.
    This was probably the most requested feature by users over the last
    couple of years, and opens up a new area of development + porting of
    existing user-space storage applications to LIO. Thanks to Shaohua +
    Andy for making this happen.

    Also another honorable mention, a new Xen PV SCSI driver was merged
    via the xen/tip.git tree recently, which puts us now at 10 target
    drivers in upstream! Thanks to David Vrabel + Juergen Gross for their
    work to get this code merged"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (40 commits)
    target/file: fix inclusive vfs_fsync_range() end
    iser-target: Disable TX completion interrupt coalescing
    target: Add force_pr_aptpl device attribute
    target: Fix APTPL metadata handling for dynamic MappedLUNs
    qla_target: don't delete changed nacls
    target/user: Recalculate pad size inside is_ring_space_avail()
    tcm_loop: Fixup tag handling
    iser-target: Fix smatch warning
    target/user: Fix up smatch warnings in tcmu_netlink_event
    target: Add a user-passthrough backstore
    target: Add documentation on the target userspace pass-through driver
    uio: Export definition of struct uio_device
    target: Remove unneeded check in sbc_parse_cdb
    target: Fix queue full status NULL pointer for SCF_TRANSPORT_TASK_SENSE
    qla_target: rearrange struct qla_tgt_prm
    qla_target: improve qlt_unmap_sg()
    qla_target: make some global functions static
    qla_target: remove unused parameter
    target: simplify core_tmr_abort_task
    target: encapsulate smp_mb__after_atomic()
    ...

    Linus Torvalds
     
  • Pull email address change from Boaz Harrosh.

    * 'for-linus' of git://git.open-osd.org/linux-open-osd:
    Boaz Harrosh - fix email in Documentation
    Boaz Harrosh - Fix broken email address
    MAINTAINERS: Change Boaz Harrosh's email

    Linus Torvalds
     
  • Pull mailbox framework from Jassi Brar:
    "A framework for Mailbox controllers and clients have been cooking for
    more than a year now.

    Everybody in the CC list had been copied on patchset revisions and
    most of them have made sounds of approval, though just one concrete
    Reviewed-by. The patchset has also been in linux-next for a couple of
    weeks now and no conflict has been reported. The framework has the
    backing of at least 5 platforms, though I can't say if/when they
    upstream their drivers (some businesses have 'changed')"

    (Further acked-by by Arnd Bergmann and Suman Anna in the pull request
    thread)

    * 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
    dt: mailbox: add generic bindings
    doc: add documentation for mailbox framework
    mailbox: Introduce framework for mailbox
    mailbox: rename pl320-ipc specific mailbox.h

    Linus Torvalds
     

21 Oct, 2014

10 commits

  • Pull watchdog updates from Wim Van Sebroeck:
    - new Cadence WDT driver
    - new Ricoh RN5T618 watchdog
    - new DA9063 PMIC watchdog driver
    - new Meson WDT driver
    - add restart handling code
    - fixes and improvements

    * git://www.linux-watchdog.org/linux-watchdog: (25 commits)
    watchdog: meson: remove magic value for reboot
    watchdog: Let XILINX_WATCHDOG and TEGRA_WATCHDOG depend on HAS_IOMEM
    watchdog: sunxi: Add A31 watchdog support
    watchdog: sunxi: support parameterized compatible strings
    watchdog: imx2_wdt: add restart handler support
    watchdog: qcom: register a restart notifier
    watchdog: s3c2410: add restart handler
    watchdog: dw_wdt: add restart handler support
    ARM: defconfig: update multi_v7_defconfig
    ARM: meson: add watchdog driver
    ARM: docs: add documentation binding for meson watchdog
    stmp3xxx_rtc_wdt: Add suspend/resume PM support
    watchdog: Add DA9063 PMIC watchdog driver.
    watchdog: add driver for Ricoh RN5T618 watchdog
    watchdog: s3c2410_wdt: Add support for Watchdog device on Exynos7
    watchdog: qcom: document device tree bindings
    watchdog: qcom: add support for KPSS WDT
    watchdog: dw_wdt: initialise TOP_INIT in dw_wdt_set_top()
    devicetree: Add Cadence WDT devicetree bindings documentation
    watchdog: Add Cadence WDT driver
    ...

    Linus Torvalds
     
  • Pull LED update from Bryan Wu:
    "Basically we have some bug fixing and clean up and one big thing is we
    start to merge patch to add support LED Flash class"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
    leds: gpio: cleanup the leds-gpio driver
    led: gpio: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
    led: gpio: Sort include headers alphabetically
    leds: Improve and export led_update_brightness
    leds: trigger: gpio: fix warning in gpio trigger for gpios whose accessor function may sleep
    leds: lp3944: fix sparse warning
    leds: avoid using DEVICE_ATTR macro for max_brightness attribute
    leds: make brightness type consistent across whole subsystem
    leds: Reorder include directives

    Linus Torvalds
     
  • …ierry.reding/linux-pwm

    Pull pwm changes from Thierry Reding:
    "There are no new drivers here, only a couple of fixes all over the
    place"

    * tag 'pwm/for-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
    pwm: Let PWM_CLPS711X depend on HAS_IOMEM
    pwm: atmel: Fix calculation of prescale value
    pwm: Fix uninitialized warnings in pwm_get()
    pwm: rockchip: Allow polarity invert on rk3288
    pwm: imx: Avoid sample FIFO overflow for i.MX PWM version2
    pwm: imx: Cleanup indentation for register definitions
    pwm: imx: Fix the macro MX3_PWMCR_PRESCALER(x) definition
    pwm: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
    pwm: lpss: make it buildable only on X86
    pwm: lpss: use c99 initializers in structures
    pwm: lpss: Fix build failure on PowerPC
    pwm: lpss: pci: Move to use pcim_enable_device()
    pwm: lpss: Properly split driver to parts
    pwm: lpss: Add ACPI and PCI IDs for Intel Braswell
    pwm: fsl-ftm: Select REGMAP_MMIO
    pwm: fsl-ftm: Document 'big-endian' property
    pwm: fsl-ftm: Convert to direct regmap API usage
    pwm: fsl-ftm: Clean up the code

    Linus Torvalds
     
  • Pull s390 updates from Martin Schwidefsky:
    "One patch to enable the BPF system call and three more bug fixes"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    s390/uprobes: fix kprobes dependency
    s390: wire up bpf syscall
    s390/mm: fixing calls of pte_unmap_unlock
    s390/hmcdrv: Restrict s390 HMC driver to S390 arch

    Linus Torvalds
     
  • We hard code the metrics relevant for cpuidle states in the kernel today.
    Instead pick them up from the device tree so that they remain relevant
    and updated for the system that the kernel is running on.

    Signed-off-by: Preeti U. Murthy
    Signed-off-by: Shreyas B. Prabhu
    Signed-off-by: Rafael J. Wysocki

    Preeti U. Murthy
     
  • The cpufreq-dt driver tries to get a regulator for each CPU. This
    regulator is optional, but when not present, a scary message "failed
    to get cpuX regulator" is displayed. To solve this, we reduce the
    severity of the message from dev_warn() to dev_dbg() and we reword the
    message to not be as scary.

    Signed-off-by: Thomas Petazzoni
    Acked-by: Viresh Kumar
    Signed-off-by: Rafael J. Wysocki

    Thomas Petazzoni
     
  • This commit extends the cpufreq-dt driver to take a platform_data
    structure. This structure is for now used to tell the cpufreq-dt
    driver the layout of the clocks on the platform, i.e whether all CPUs
    share the same clock or whether each CPU has a separate clock.

    Signed-off-by: Thomas Petazzoni
    Acked-by: Viresh Kumar
    Signed-off-by: Rafael J. Wysocki

    Thomas Petazzoni
     
  • This commit extends the cpufreq_driver structure with an additional
    'void *driver_data' field that can be filled by the ->probe() function
    of a cpufreq driver to pass additional custom information to the
    driver itself.

    A new function called cpufreq_get_driver_data() is added to allow a
    cpufreq driver to retrieve those driver data, since they are typically
    needed from a cpufreq_policy->init() callback, which does not have
    access to the cpufreq_driver structure. This function call is similar
    to the existing cpufreq_get_current_driver() function call.

    Signed-off-by: Thomas Petazzoni
    Acked-by: Viresh Kumar
    Signed-off-by: Rafael J. Wysocki

    Thomas Petazzoni
     
  • This patch cleans up the following coding style issues that are detected by
    scripts/checkpatch.pl:
    ERROR: code indent should use tabs where possible
    ERROR: "foo * bar" should be "foo *bar"
    WARNING: Missing a blank line after declarations
    WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
    WARNING: void function return statements are not generally useful
    WARNING: else is not generally useful after a break or return
    WARNING: break is not useful after a goto or return
    WARNING: braces {} are not necessary for single statement blocks
    WARNING: line over 80 characters
    WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt
    No functional changes.

    Signed-off-by: Lv Zheng
    Signed-off-by: Rafael J. Wysocki

    Lv Zheng
     
  • This patch refines event/query debugging messages to use a unified format
    as commands. Developers can clearly find different processes by checking
    different log seperators. No functional changes.

    Signed-off-by: Lv Zheng
    Signed-off-by: Rafael J. Wysocki

    Lv Zheng