Commit 7431d90c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpuidle', 'pm-opp' and 'pm-sleep' 

Merge cpuidle updates, OPP (operating performance points) library
updates, and updates related to system suspend and hibernation for
7.1-rc1:

 - Refine stopped tick handling in the menu cpuidle governor and
   rearrange stopped tick handling in the teo cpuidle governor (Rafael
   Wysocki)

 - Add Panther Lake C-states table to the intel_idle driver (Artem
   Bityutskiy)

 - Clean up dead dependencies on CPU_IDLE in Kconfig (Julian Braha)

 - Simplify cpuidle_register_device() with guard() (Huisong Li)

 - Use performance level if available to distinguish between rates in
   OPP debugfs (Manivannan Sadhasivam)

 - Fix scoped_guard in dev_pm_opp_xlate_required_opp() (Viresh Kumar)

 - Return -ENODATA if the snapshot image is not loaded (Alberto Garcia)

 - Remove inclusion of crypto/hash.h from hibernate_64.c on x86 (Eric
   Biggers)

* pm-cpuidle:
  cpuidle: Simplify cpuidle_register_device() with guard()
  cpuidle: clean up dead dependencies on CPU_IDLE in Kconfig
  intel_idle: Add Panther Lake C-states table
  cpuidle: governors: teo: Rearrange stopped tick handling
  cpuidle: governors: menu: Refine stopped tick handling

* pm-opp:
  OPP: Move break out of scoped_guard in dev_pm_opp_xlate_required_opp()
  OPP: debugfs: Use performance level if available to distinguish between rates

* pm-sleep:
  PM: hibernate: return -ENODATA if the snapshot image is not loaded
  PM: hibernate: x86: Remove inclusion of crypto/hash.h
parents 83e99031 629be87e e810f1f8 949a5ed0

arch/x86/power/hibernate_64.c

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include <linux/kdebug.h>

#include <linux/pgtable.h>



#include <crypto/hash.h>



#include <asm/e820/api.h>

#include <asm/init.h>

#include <asm/proto.h>

drivers/cpuidle/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ config HALTPOLL_CPUIDLE 
	 before halting in the guest (more efficient than polling in the

	 host via halt_poll_ns for some scenarios).



endif

endif # CPU_IDLE



config ARCH_NEEDS_CPU_IDLE_COUPLED

	def_bool n

drivers/cpuidle/Kconfig.mips

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

config MIPS_CPS_CPUIDLE

	bool "CPU Idle driver for MIPS CPS platforms"

	depends on CPU_IDLE && MIPS_CPS

	depends on MIPS_CPS

	depends on SYS_SUPPORTS_MIPS_CPS

	select ARCH_NEEDS_CPU_IDLE_COUPLED if MIPS_MT || CPU_MIPSR6

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP

drivers/cpuidle/Kconfig.powerpc

+0 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#

config PSERIES_CPUIDLE

	bool "Cpuidle driver for pSeries platforms"

	depends on CPU_IDLE

	depends on PPC_PSERIES

	default y

	help
@@ -13,7 +12,6 @@ config PSERIES_CPUIDLE 


config POWERNV_CPUIDLE

	bool "Cpuidle driver for powernv platforms"

	depends on CPU_IDLE

	depends on PPC_POWERNV

	default y

	help

drivers/cpuidle/cpuidle.c

+5 −7
Original line number Diff line number Diff line
@@ -679,16 +679,16 @@ int cpuidle_register_device(struct cpuidle_device *dev) 
	if (!dev)

		return -EINVAL;



	mutex_lock(&cpuidle_lock);

	guard(mutex)(&cpuidle_lock);



	if (dev->registered)

		goto out_unlock;

		return ret;



	__cpuidle_device_init(dev);



	ret = __cpuidle_register_device(dev);

	if (ret)

		goto out_unlock;

		return ret;



	ret = cpuidle_add_sysfs(dev);

	if (ret)
@@ -700,16 +700,14 @@ int cpuidle_register_device(struct cpuidle_device *dev) 


	cpuidle_install_idle_handler();



out_unlock:

	mutex_unlock(&cpuidle_lock);



	return ret;



out_sysfs:

	cpuidle_remove_sysfs(dev);

out_unregister:

	__cpuidle_unregister_device(dev);

	goto out_unlock;



	return ret;

}



EXPORT_SYMBOL_GPL(cpuidle_register_device);