Commit 245224d1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq' and 'pm-sleep' 

* pm-cpufreq:
  cpufreq: loongson2_cpufreq: adjust cpufreq uses of LOONGSON_CHIPCFG
  cpufreq: brcmstb-avs: fix imbalance of cpufreq policy refcount
  cpufreq: intel_pstate: fix spelling mistake: "Whethet" -> "Whether"
  cpufreq: s3c: fix unbalances of cpufreq policy refcount
  cpufreq: imx-cpufreq-dt: Add i.MX8MP support
  cpufreq: Use imx-cpufreq-dt for i.MX8MP's speed grading
  cpufreq: tegra186: convert to devm_platform_ioremap_resource
  cpufreq: kirkwood: convert to devm_platform_ioremap_resource
  cpufreq: CPPC: put ACPI table after using it
  cpufreq : CPPC: Break out if HiSilicon CPPC workaround is matched

* pm-sleep:
  PM: suspend: Add sysfs attribute to control the "sync on suspend" behavior
  PM: hibernate: fix spelling mistake "shapshot" -> "snapshot"
  PM: hibernate: Add more logging on hibernation failure
  PM: hibernate: improve arithmetic division in preallocate_highmem_fraction()
  PM: wakeup: Show statistics for deleted wakeup sources again
  PM: sleep: Switch to rtc_time64_to_tm()/rtc_tm_to_time64()
parents 5b82ba70 0a9db0a0 322e929d

Documentation/ABI/testing/sysfs-power

+13 −0
Original line number Diff line number Diff line
@@ -407,3 +407,16 @@ Contact: Kalesh Singh <kaleshsingh96@gmail.com> 
Description:

		The /sys/power/suspend_stats/last_failed_step file contains

		the last failed step in the suspend/resume path.



What:		/sys/power/sync_on_suspend

Date:		October 2019

Contact:	Jonas Meurer <jonas@freesources.org>

Description:

		This file controls whether or not the kernel will sync()

		filesystems during system suspend (after freezing user space

		and before suspending devices).



		Writing a "1" to this file enables the sync() and writing a "0"

		disables it.  Reads from the file return the current value.

		The default is "1" if the build-time "SUSPEND_SKIP_SYNC" config

		flag is unset, or "0" otherwise.

drivers/base/power/wakeup.c

+3 −0
Original line number Diff line number Diff line
@@ -1125,6 +1125,9 @@ static void *wakeup_sources_stats_seq_next(struct seq_file *m, 
		break;

	}



	if (!next_ws)

		print_wakeup_source_stats(m, &deleted_ws);



	return next_ws;

}

drivers/cpufreq/brcmstb-avs-cpufreq.c

+2 −0
Original line number Diff line number Diff line
@@ -455,6 +455,8 @@ static unsigned int brcm_avs_cpufreq_get(unsigned int cpu) 
	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);

	struct private_data *priv = policy->driver_data;



	cpufreq_cpu_put(policy);



	return brcm_avs_get_frequency(priv->base);

}

drivers/cpufreq/cppc_cpufreq.c

+6 −2
Original line number Diff line number Diff line
@@ -93,9 +93,13 @@ static void cppc_check_hisi_workaround(void) 
	for (i = 0; i < ARRAY_SIZE(wa_info); i++) {

		if (!memcmp(wa_info[i].oem_id, tbl->oem_id, ACPI_OEM_ID_SIZE) &&

		    !memcmp(wa_info[i].oem_table_id, tbl->oem_table_id, ACPI_OEM_TABLE_ID_SIZE) &&

		    wa_info[i].oem_revision == tbl->oem_revision)

		    wa_info[i].oem_revision == tbl->oem_revision) {

			apply_hisi_workaround = true;

			break;

		}

	}



	acpi_put_table(tbl);

}



/* Callback function used to retrieve the max frequency from DMI */

drivers/cpufreq/cpufreq-dt-platdev.c

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static const struct of_device_id blacklist[] __initconst = { 
	{ .compatible = "fsl,imx8mq", },

	{ .compatible = "fsl,imx8mm", },

	{ .compatible = "fsl,imx8mn", },

	{ .compatible = "fsl,imx8mp", },



	{ .compatible = "marvell,armadaxp", },

CRA Git | Maintained and supported by SUSTech CRA and CCSE