1. 24 Apr, 2015 3 commits
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan' · e0155a99
      Rafael J. Wysocki authored
      * acpi-dock:
        MAINTAINERS: remove maintainship entry of docking station driver
      
      * acpi-ec:
        ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()
      
      * acpi-scan:
        ACPI / scan: Add a scan handler for PRP0001
        ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
      e0155a99
    • Rafael J. Wysocki's avatar
      ACPI / scan: Add a scan handler for PRP0001 · 7d284352
      Rafael J. Wysocki authored
      If the special PRP0001 device ID is present in the given device's list
      of ACPI/PNP IDs and the device has a valid "compatible" property in
      the _DSD, it should be enumerated using the default mechanism,
      unless some scan handlers match the IDs preceding PRP0001 in the
      device's list of ACPI/PNP IDs.  In addition to that, no scan handlers
      matching the IDs following PRP0001 in that list should be attached
      to the device.
      
      To make that happen, define a scan handler that will match PRP0001
      and trigger the default enumeration for the matching devices if the
      "compatible" property is present for them.
      
      Since that requires the check for platform_id and device->handler
      to be removed from acpi_default_enumeration(), move the fallback
      invocation of acpi_default_enumeration() to acpi_bus_attach()
      (after it's checked if there's a matching ACPI driver for the
      device), which is a better place to call it, and do the platform_id
      check in there too (device->handler is guaranteed to be unset at
      the point where the function is looking for a matching ACPI driver).
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Acked-by: default avatarDarren Hart <dvhart@linux.intel.com>
      7d284352
    • Rafael J. Wysocki's avatar
      ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline() · 4c533c80
      Rafael J. Wysocki authored
      acpi_scan_is_offline() may be called under the physical_node_lock
      lock of the given device object's parent, so prevent lockdep from
      complaining about that by annotating that instance with
      SINGLE_DEPTH_NESTING.
      
      Fixes: caa73ea1 (ACPI / hotplug / driver core: Handle containers in a special way)
      Reported-and-tested-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
      Reviewed-by: default avatarToshi Kani <toshi.kani@hp.com>
      Cc: 3.14+ <stable@vger.kernel.org> # 3.14+
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      4c533c80
  2. 22 Apr, 2015 1 commit
  3. 19 Apr, 2015 1 commit
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-cpufreq', 'powercap' and 'pm-tools' · 2363ccb5
      Rafael J. Wysocki authored
      * pm-cpufreq:
        cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
        intel_pstate: Change the setpoint for Atom params
      
      * powercap:
        powercap / RAPL: Add support for Intel Skylake processors
      
      * pm-tools:
        cpupower: fix breakage from libpci API change
      2363ccb5
  4. 17 Apr, 2015 35 commits