Merge tag 'pm+acpi-4.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull more power management and ACPI updates from Rafael Wysocki:
 "The second batch of power management and ACPI updates for v4.6.

  Included are fixups on top of the previous PM/ACPI pull request and
  other material that didn't make into it but still should go into 4.6.

  Among other things, there's a fix for an intel_pstate driver issue
  uncovered by recent cpufreq changes, a workaround for a boot hang on
  Skylake-H related to the handling of deep C-states by the platform and
  a PCI/ACPI fix for the handling of IO port resources on non-x86
  architectures plus some new device IDs and similar.

  Specifics:

   - Fix for an intel_pstate driver issue related to the handling of MSR
     updates uncovered by the recent cpufreq rework (Rafael Wysocki).

   - cpufreq core cleanups related to starting governors and frequency
     synchronization during resume from system suspend and a locking fix
     for cpufreq_quick_get() (Rafael Wysocki, Richard Cochran).

   - acpi-cpufreq and powernv cpufreq driver updates (Jisheng Zhang,
     Michael Neuling, Richard Cochran, Shilpasri Bhat).

   - intel_idle driver update preventing some Skylake-H systems from
     hanging during initialization by disabling deep C-states mishandled
     by the platform in the problematic configurations (Len Brown).

   - Intel Xeon Phi Processor x200 support for intel_idle
     (Dasaratharaman Chandramouli).

   - cpuidle menu governor updates to make it always honor PM QoS
     latency constraints (and prevent C1 from being used as the fallback
     C-state on x86 when they are set below its exit latency) and to
     restore the previous behavior to fall back to C1 if the next timer
     event is set far enough in the future that was changed in 4.4 which
     led to an energy consumption regression (Rik van Riel, Rafael
     Wysocki).

   - New device ID for a future AMD UART controller in the ACPI driver
     for AMD SoCs (Wang Hongcheng).

   - Rockchip rk3399 support for the rockchip-io-domain adaptive voltage
     scaling (AVS) driver (David Wu).

   - ACPI PCI resources management fix for the handling of IO space
     resources on architectures where the IO space is memory mapped
     (IA64 and ARM64) broken by the introduction of common ACPI
     resources parsing for PCI host bridges in 4.4 (Lorenzo Pieralisi).

   - Fix for the ACPI backend of the generic device properties API to
     make it parse non-device (data node only) children of an ACPI
     device correctly (Irina Tirdea).

   - Fixes for the handling of global suspend flags (introduced in 4.4)
     during hibernation and resume from it (Lukas Wunner).

   - Support for obtaining configuration information from Device Trees
     in the PM clocks framework (Jon Hunter).

   - ACPI _DSM helper code and devfreq framework cleanups (Colin Ian
     King, Geert Uytterhoeven)"

* tag 'pm+acpi-4.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (23 commits)
  PM / AVS: rockchip-io: add io selectors and supplies for rk3399
  intel_idle: Support for Intel Xeon Phi Processor x200 Product Family
  intel_idle: prevent SKL-H boot failure when C8+C9+C10 enabled
  ACPI / PM: Runtime resume devices when waking from hibernate
  PM / sleep: Clear pm_suspend_global_flags upon hibernate
  cpufreq: governor: Always schedule work on the CPU running update
  cpufreq: Always update current frequency before startig governor
  cpufreq: Introduce cpufreq_update_current_freq()
  cpufreq: Introduce cpufreq_start_governor()
  cpufreq: powernv: Add sysfs attributes to show throttle stats
  cpufreq: acpi-cpufreq: make Intel/AMD MSR access, io port access static
  PCI: ACPI: IA64: fix IO port generic range check
  ACPI / util: cast data to u64 before shifting to fix sign extension
  cpufreq: powernv: Define per_cpu chip pointer to optimize hot-path
  cpuidle: menu: Fall back to polling if next timer event is near
  cpufreq: acpi-cpufreq: Clean up hot plug notifier callback
  intel_pstate: Do not call wrmsrl_on_cpu() with disabled interrupts
  cpufreq: Make cpufreq_quick_get() safe to call
  ACPI / property: fix data node parsing in acpi_get_next_subnode()
  ACPI / APD: Add device HID for future AMD UART controller
  ...

2 files changed, 80 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index b683e8ee69ec..16501334b99f 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -271,3 +271,72 @@ Description:	Parameters for the CPU cache attributes
                         - WriteBack: data is written only to the cache line and
                                      the modified cache line is written to main
                                      memory only when it is replaced
+
+What:           /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats
+                /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/turbo_stat
+                /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/sub_turbo_stat
+                /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/unthrottle
+                /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/powercap
+                /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/overtemp
+                /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/supply_fault
+                /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/overcurrent
+                /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/occ_reset
+Date:           March 2016
+Contact:        Linux kernel mailing list <linux-kernel@vger.kernel.org>
+                Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>
+Description:    POWERNV CPUFreq driver's frequency throttle stats directory and
+                attributes
+
+                'cpuX/cpufreq/throttle_stats' directory contains the CPU frequency
+                throttle stat attributes for the chip. The throttle stats of a cpu
+                is common across all the cpus belonging to a chip. Below are the
+                throttle attributes exported in the 'throttle_stats' directory:
+
+                - turbo_stat : This file gives the total number of times the max
+                frequency is throttled to lower frequency in turbo (at and above
+                nominal frequency) range of frequencies.
+
+                - sub_turbo_stat : This file gives the total number of times the
+                max frequency is throttled to lower frequency in sub-turbo(below
+                nominal frequency) range of frequencies.
+
+                - unthrottle : This file gives the total number of times the max
+                frequency is unthrottled after being throttled.
+
+                - powercap : This file gives the total number of times the max
+                frequency is throttled due to 'Power Capping'.
+
+                - overtemp : This file gives the total number of times the max
+                frequency is throttled due to 'CPU Over Temperature'.
+
+                - supply_fault : This file gives the total number of times the
+                max frequency is throttled due to 'Power Supply Failure'.
+
+                - overcurrent : This file gives the total number of times the
+                max frequency is throttled due to 'Overcurrent'.
+
+                - occ_reset : This file gives the total number of times the max
+                frequency is throttled due to 'OCC Reset'.
+
+                The sysfs attributes representing different throttle reasons like
+                powercap, overtemp, supply_fault, overcurrent and occ_reset map to
+                the reasons provided by OCC firmware for throttling the frequency.
+
+What:           /sys/devices/system/cpu/cpufreq/policyX/throttle_stats
+                /sys/devices/system/cpu/cpufreq/policyX/throttle_stats/turbo_stat
+                /sys/devices/system/cpu/cpufreq/policyX/throttle_stats/sub_turbo_stat
+                /sys/devices/system/cpu/cpufreq/policyX/throttle_stats/unthrottle
+                /sys/devices/system/cpu/cpufreq/policyX/throttle_stats/powercap
+                /sys/devices/system/cpu/cpufreq/policyX/throttle_stats/overtemp
+                /sys/devices/system/cpu/cpufreq/policyX/throttle_stats/supply_fault
+                /sys/devices/system/cpu/cpufreq/policyX/throttle_stats/overcurrent
+                /sys/devices/system/cpu/cpufreq/policyX/throttle_stats/occ_reset
+Date:           March 2016
+Contact:        Linux kernel mailing list <linux-kernel@vger.kernel.org>
+                Linux for PowerPC mailing list <linuxppc-dev@ozlabs.org>
+Description:    POWERNV CPUFreq driver's frequency throttle stats directory and
+                attributes
+
+                'policyX/throttle_stats' directory and all the attributes are same as
+                the /sys/devices/system/cpu/cpuX/cpufreq/throttle_stats directory and
+                attributes which give the frequency throttle information of the chip.
diff --git a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
index b8627e763dba..c84fb47265eb 100644
--- a/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
+++ b/Documentation/devicetree/bindings/power/rockchip-io-domain.txt
@@ -35,6 +35,8 @@ Required properties:
   - "rockchip,rk3288-io-voltage-domain" for rk3288
   - "rockchip,rk3368-io-voltage-domain" for rk3368
   - "rockchip,rk3368-pmu-io-voltage-domain" for rk3368 pmu-domains
+  - "rockchip,rk3399-io-voltage-domain" for rk3399
+  - "rockchip,rk3399-pmu-io-voltage-domain" for rk3399 pmu-domains
 - rockchip,grf: phandle to the syscon managing the "general register files"
 
 
@@ -79,6 +81,15 @@ Possible supplies for rk3368 pmu-domains:
 - pmu-supply:    The supply connected to PMUIO_VDD.
 - vop-supply:    The supply connected to LCDC_VDD.
 
+Possible supplies for rk3399:
+- bt656-supply:  The supply connected to APIO2_VDD.
+- audio-supply:  The supply connected to APIO5_VDD.
+- sdmmc-supply:  The supply connected to SDMMC0_VDD.
+- gpio1830       The supply connected to APIO4_VDD.
+
+Possible supplies for rk3399 pmu-domains:
+- pmu1830-supply:The supply connected to PMUIO2_VDD.
+
 Example:
 
         io-domains {