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

Pull more power management and ACPI updates from Rafael Wysocki:
 "The only new feature in this batch is support for the ACPI _CCA device
  configuration object, which it a pre-requisite for future ACPI PCI
  support on ARM64, but should not affect the other architectures.

  The rest is fixes and cleanups, mostly in cpufreq (including
  intel_pstate), the Operating Performace Points (OPP) framework and
  tools (cpupower and turbostat).

  Specifics:

   - Support for the ACPI _CCA configuration object intended to tell the
     OS whether or not a bus master device supports hardware managed
     cache coherency and a new set of functions to allow drivers to
     check the cache coherency support for devices in a platform
     firmware interface agnostic way (Suravee Suthikulpanit, Jeremy
     Linton).

   - ACPI backlight quirks for ESPRIMO Mobile M9410 and Dell XPS L421X
     (Aaron Lu, Hans de Goede).

   - Fixes for the arm_big_little and s5pv210-cpufreq cpufreq drivers
     (Jon Medhurst, Nicolas Pitre).

   - kfree()-related fixup for the recently introduced CPPC cpufreq
     frontend (Markus Elfring).

   - intel_pstate fix reducing kernel log noise on systems where
     P-states are managed by hardware (Prarit Bhargava).

   - intel_pstate maintainers information update (Srinivas Pandruvada).

   - cpufreq core optimization related to the handling of delayed work
     items used by governors (Viresh Kumar).

   - Locking fixes and cleanups of the Operating Performance Points
     (OPP) framework (Viresh Kumar).

   - Generic power domains framework cleanups (Lina Iyer).

   - cpupower tool updates (Jacob Tanenbaum, Sriram Raghunathan, Thomas
     Renninger).

   - turbostat tool updates (Len Brown)"

* tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
  PCI: ACPI: Add support for PCI device DMA coherency
  PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()
  of/pci: Fix pci_get_host_bridge_device leak
  device property: ACPI: Remove unused DMA APIs
  device property: ACPI: Make use of the new DMA Attribute APIs
  device property: Adding DMA Attribute APIs for Generic Devices
  ACPI: Adding DMA Attribute APIs for ACPI Device
  device property: Introducing enum dev_dma_attr
  ACPI: Honor ACPI _CCA attribute setting
  cpufreq: CPPC: Delete an unnecessary check before the function call kfree()
  PM / OPP: Add opp_rcu_lockdep_assert() to _find_device_opp()
  PM / OPP: Hold dev_opp_list_lock for writers
  PM / OPP: Protect updates to list_dev with mutex
  PM / OPP: Propagate error properly from dev_pm_opp_set_sharing_cpus()
  cpufreq: s5pv210-cpufreq: fix wrong do_div() usage
  MAINTAINERS: update for intel P-state driver
  Creating a common structure initialization pattern for struct option
  cpupower: Enable disabled Cstates if they are below max latency
  cpupower: Remove debug message when using cpupower idle-set -D switch
  cpupower: cpupower monitor reports uninitialized values for offline cpus
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/base/power/domain.c
index 80e29887038830a7bac36fe79d8c53912b828d81,f932058b5db68de07c4bb2dabfccf321a10d3ce6..e03b1ad25a906334078490786dbd1406ac9ca76b
--- 1/drivers/base/power/domain.c
--- 2/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@@ -1350,10 -1348,10 +1348,11 @@@ int pm_genpd_add_subdomain(struct gener
   out:
        mutex_unlock(&subdomain->lock);
        mutex_unlock(&genpd->lock);
- 
+       if (ret)
+               kfree(link);
        return ret;
  }
 +EXPORT_SYMBOL_GPL(pm_genpd_add_subdomain);
  
  /**
   * pm_genpd_remove_subdomain - Remove a subdomain from an I/O PM domain.

diff --cc drivers/base/power/opp/core.c
Simple merge

diff --cc drivers/of/of_pci.c
index ff27177f49edbdd3105b319c7deee29ed48da869,b66ee4ebf650dc9958ab53a9a8a6df2a2fa50fed..b1449f71601cb257f1057b77c217a943da92cab8
--- 1/drivers/of/of_pci.c
--- 2/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@@ -118,51 -117,6 +118,31 @@@ int of_get_pci_domain_nr(struct device_
  }
  EXPORT_SYMBOL_GPL(of_get_pci_domain_nr);
  
- /**
-  * of_pci_dma_configure - Setup DMA configuration
-  * @dev: ptr to pci_dev struct of the PCI device
-  *
-  * Function to update PCI devices's DMA configuration using the same
-  * info from the OF node of host bridge's parent (if any).
-  */
- void of_pci_dma_configure(struct pci_dev *pci_dev)
- {
-       struct device *dev = &pci_dev->dev;
-       struct device *bridge = pci_get_host_bridge_device(pci_dev);
- 
-       if (!bridge->parent)
-               return;
- 
-       of_dma_configure(dev, bridge->parent->of_node);
-       pci_put_host_bridge_device(bridge);
- }
- EXPORT_SYMBOL_GPL(of_pci_dma_configure);
- 
 +/**
 + * of_pci_check_probe_only - Setup probe only mode if linux,pci-probe-only
 + *                           is present and valid
 + */
 +void of_pci_check_probe_only(void)
 +{
 +      u32 val;
 +      int ret;
 +
 +      ret = of_property_read_u32(of_chosen, "linux,pci-probe-only", &val);
 +      if (ret) {
 +              if (ret == -ENODATA || ret == -EOVERFLOW)
 +                      pr_warn("linux,pci-probe-only without valid value, ignoring\n");
 +              return;
 +      }
 +
 +      if (val)
 +              pci_add_flags(PCI_PROBE_ONLY);
 +      else
 +              pci_clear_flags(PCI_PROBE_ONLY);
 +
 +      pr_info("PCI: PROBE_ONLY %sabled\n", val ? "en" : "dis");
 +}
 +EXPORT_SYMBOL_GPL(of_pci_check_probe_only);
 +
  #if defined(CONFIG_OF_ADDRESS)
  /**
   * of_pci_get_host_bridge_resources - Parse PCI host bridge resources from DT

diff --cc drivers/pci/probe.c
index f53b8e85f137902f6e8b0667ae9f0539c06537a1,0dac52633f012da93b1aeabc9f803e77fdfd57ca..e735c728e3b34aa441d1bc140e5473554af8385d
--- 1/drivers/pci/probe.c
--- 2/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -12,7 -13,7 +13,8 @@@
  #include <linux/module.h>
  #include <linux/cpumask.h>
  #include <linux/pci-aspm.h>
 +#include <linux/aer.h>
+ #include <linux/acpi.h>
  #include <asm-generic/pci-bridge.h>
  #include "pci.h"
  

diff --cc include/linux/acpi.h
Simple merge

diff --cc include/linux/of_pci.h
index 38c0533a33598bc8891af481589687c282739b37,ce0e5abeb4549d8fd7ef06ea5c46d6060389472a..2c51ee78b1c0e31074ee17eb9a341021ee3162e0
--- 1/include/linux/of_pci.h
--- 2/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@@ -16,8 -16,6 +16,7 @@@ int of_pci_get_devfn(struct device_nod
  int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
  int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
  int of_get_pci_domain_nr(struct device_node *node);
- void of_pci_dma_configure(struct pci_dev *pci_dev);
 +void of_pci_check_probe_only(void);
  #else
  static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)
  {
@@@ -52,10 -50,6 +51,8 @@@ of_get_pci_domain_nr(struct device_nod
  {
        return -1;
  }
- static inline void of_pci_dma_configure(struct pci_dev *pci_dev) { }
- 
 +
 +static inline void of_pci_check_probe_only(void) { }
  #endif
  
  #if defined(CONFIG_OF_ADDRESS)