Merge tag 'pm-final-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (3fefc318) · Commits · 戴 / test

drivers/acpi/sleep.c

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -160,6 +160,14 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
	return 0;		return 0;
	}		}

			static bool acpi_sleep_no_lps0;

			static int __init init_no_lps0(const struct dmi_system_id *d)
			{
			acpi_sleep_no_lps0 = true;
			return 0;
			}

	static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {		static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
	{		{
	.callback = init_old_suspend_ordering,		.callback = init_old_suspend_ordering,
	@@ -343,6 +351,19 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
	DMI_MATCH(DMI_PRODUCT_NAME, "80E3"),		DMI_MATCH(DMI_PRODUCT_NAME, "80E3"),
	},		},
	},		},
			/*
			* https://bugzilla.kernel.org/show_bug.cgi?id=196907
			* Some Dell XPS13 9360 cannot do suspend-to-idle using the Low Power
			* S0 Idle firmware interface.
			*/
			{
			.callback = init_no_lps0,
			.ident = "Dell XPS13 9360",
			.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
			DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"),
			},
			},
	{},		{},
	};		};

	@@ -485,6 +506,7 @@ static void acpi_pm_end(void)
	}		}
	#else /* !CONFIG_ACPI_SLEEP */		#else /* !CONFIG_ACPI_SLEEP */
	#define acpi_target_sleep_state ACPI_STATE_S0		#define acpi_target_sleep_state ACPI_STATE_S0
			#define acpi_sleep_no_lps0 (false)
	static inline void acpi_sleep_dmi_check(void) {}		static inline void acpi_sleep_dmi_check(void) {}
	#endif /* CONFIG_ACPI_SLEEP */		#endif /* CONFIG_ACPI_SLEEP */

	@@ -863,6 +885,12 @@ static int lps0_device_attach(struct acpi_device *adev,
	if (lps0_device_handle)		if (lps0_device_handle)
	return 0;		return 0;

			if (acpi_sleep_no_lps0) {
			acpi_handle_info(adev->handle,
			"Low Power S0 Idle interface disabled\n");
			return 0;
			}

	if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))		if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
	return 0;		return 0;

kernel/sched/cpufreq_schedutil.c

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -649,6 +649,7 @@ static int sugov_start(struct cpufreq_policy *policy)
	struct sugov_cpu *sg_cpu = &per_cpu(sugov_cpu, cpu);		struct sugov_cpu *sg_cpu = &per_cpu(sugov_cpu, cpu);

	memset(sg_cpu, 0, sizeof(*sg_cpu));		memset(sg_cpu, 0, sizeof(*sg_cpu));
			sg_cpu->cpu = cpu;
	sg_cpu->sg_policy = sg_policy;		sg_cpu->sg_policy = sg_policy;
	sg_cpu->flags = SCHED_CPUFREQ_RT;		sg_cpu->flags = SCHED_CPUFREQ_RT;
	sg_cpu->iowait_boost_max = policy->cpuinfo.max_freq;		sg_cpu->iowait_boost_max = policy->cpuinfo.max_freq;
	@@ -714,11 +715,6 @@ struct cpufreq_governor *cpufreq_default_governor(void)

	static int __init sugov_register(void)		static int __init sugov_register(void)
	{		{
	int cpu;

	for_each_possible_cpu(cpu)
	per_cpu(sugov_cpu, cpu).cpu = cpu;

	return cpufreq_register_governor(&schedutil_gov);		return cpufreq_register_governor(&schedutil_gov);
	}		}
	fs_initcall(sugov_register);		fs_initcall(sugov_register);

Admin message