Merge branch 'acpi-ec' into acpi-pm (6ed86005) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/acpi/ec.c

+31 −0

Original line number	Diff line number	Diff line
		@@ -151,6 +151,10 @@ static bool ec_freeze_events __read_mostly = false;
		module_param(ec_freeze_events, bool, 0644);
		MODULE_PARM_DESC(ec_freeze_events, "Disabling event handling during suspend/resume");

		static bool ec_no_wakeup __read_mostly;
		module_param(ec_no_wakeup, bool, 0644);
		MODULE_PARM_DESC(ec_no_wakeup, "Do not wake up from suspend-to-idle");

		struct acpi_ec_query_handler {
		struct list_head node;
		acpi_ec_query_func func;
		@@ -1880,6 +1884,32 @@ static int acpi_ec_suspend(struct device *dev)
		return 0;
		}

		static int acpi_ec_suspend_noirq(struct device *dev)
		{
		struct acpi_ec *ec = acpi_driver_data(to_acpi_device(dev));

		/*
		* The SCI handler doesn't run at this point, so the GPE can be
		* masked at the low level without side effects.
		*/
		if (ec_no_wakeup && test_bit(EC_FLAGS_STARTED, &ec->flags) &&
		ec->reference_count >= 1)
		acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE);

		return 0;
		}

		static int acpi_ec_resume_noirq(struct device *dev)
		{
		struct acpi_ec *ec = acpi_driver_data(to_acpi_device(dev));

		if (ec_no_wakeup && test_bit(EC_FLAGS_STARTED, &ec->flags) &&
		ec->reference_count >= 1)
		acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE);

		return 0;
		}

		static int acpi_ec_resume(struct device *dev)
		{
		struct acpi_ec *ec =
		@@ -1891,6 +1921,7 @@ static int acpi_ec_resume(struct device *dev)
		#endif

		static const struct dev_pm_ops acpi_ec_pm = {
		SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend_noirq, acpi_ec_resume_noirq)
		SET_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend, acpi_ec_resume)
		};