Commit 3eba563e authored Apr 30, 2014 by Kieran Clancy Committed by Rafael J. Wysocki Apr 29, 2014

ACPI / EC: Process rather than discard events in acpi_ec_clear

Address a regression caused by commit ad332c8a:
(ACPI / EC: Clear stale EC events on Samsung systems)

After the earlier patch, there was found to be a race condition on some
earlier Samsung systems (N150/N210/N220). The function acpi_ec_clear was
sometimes discarding a new EC event before its GPE was triggered by the
system. In the case of these systems, this meant that the "lid open"
event was not registered on resume if that was the cause of the wake,
leading to problems when attempting to close the lid to suspend again.

After testing on a number of Samsung systems, both those affected by the
previous EC bug and those affected by the race condition, it seemed that
the best course of action was to process rather than discard the events.
On Samsung systems which accumulate stale EC events, there does not seem
to be any adverse side-effects of running the associated _Q methods.

This patch adds an argument to the static function acpi_ec_sync_query so
that it may be used within the acpi_ec_clear loop in place of
acpi_ec_query_unlocked which was used previously.

With thanks to Stefan Biereigel for reporting the issue, and for all the
people who helped test the new patch on affected systems.

Fixes: ad332c8a (ACPI / EC: Clear stale EC events on Samsung systems)
References: https://lkml.kernel.org/r/532FE3B2.9060808@biereigel-wb.de
References: https://bugzilla.kernel.org/show_bug.cgi?id=44161#c173

Reported-by: Stefan Biereigel <stefan@biereigel.de>
Signed-off-by: Kieran Clancy <clancy.kieran@gmail.com>
Tested-by: Stefan Biereigel <stefan@biereigel.de>
Tested-by: Dennis Jansen <dennis.jansen@web.de>
Tested-by: Nicolas Porcel <nicolasporcel06@gmail.com>
Tested-by: Maurizio D'Addona <mauritiusdadd@gmail.com>
Tested-by: Juan Manuel Cabo <juanmanuel.cabo@gmail.com>
Tested-by: Giannis Koutsou <giannis.koutsou@gmail.com>
Tested-by: Kieran Clancy <clancy.kieran@gmail.com>
Cc: 3.14+ <stable@vger.kernel.org> # 3.14+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent d1db0eea

drivers/acpi/ec.c

+12 −9

Original line number	Diff line number	Diff line
		@@ -206,13 +206,13 @@ unlock:
		spin_unlock_irqrestore(&ec->lock, flags);
		}

		static int acpi_ec_sync_query(struct acpi_ec *ec);
		static int acpi_ec_sync_query(struct acpi_ec ec, u8 data);

		static int ec_check_sci_sync(struct acpi_ec *ec, u8 state)
		{
		if (state & ACPI_EC_FLAG_SCI) {
		if (!test_and_set_bit(EC_FLAGS_QUERY_PENDING, &ec->flags))
		return acpi_ec_sync_query(ec);
		return acpi_ec_sync_query(ec, NULL);
		}
		return 0;
		}
		@@ -443,10 +443,8 @@ acpi_handle ec_get_handle(void)

		EXPORT_SYMBOL(ec_get_handle);

		static int acpi_ec_query_unlocked(struct acpi_ec ec, u8 data);

		/*
		* Clears stale _Q events that might have accumulated in the EC.
		* Process _Q events that might have accumulated in the EC.
		* Run with locked ec mutex.
		*/
		static void acpi_ec_clear(struct acpi_ec *ec)
		@@ -455,7 +453,7 @@ static void acpi_ec_clear(struct acpi_ec *ec)
		u8 value = 0;

		for (i = 0; i < ACPI_EC_CLEAR_MAX; i++) {
		status = acpi_ec_query_unlocked(ec, &value);
		status = acpi_ec_sync_query(ec, &value);
		if (status \|\| !value)
		break;
		}
		@@ -582,13 +580,18 @@ static void acpi_ec_run(void *cxt)
		kfree(handler);
		}

		static int acpi_ec_sync_query(struct acpi_ec *ec)
		static int acpi_ec_sync_query(struct acpi_ec ec, u8 data)
		{
		u8 value = 0;
		int status;
		struct acpi_ec_query_handler handler, copy;
		if ((status = acpi_ec_query_unlocked(ec, &value)))

		status = acpi_ec_query_unlocked(ec, &value);
		if (data)
		*data = value;
		if (status)
		return status;

		list_for_each_entry(handler, &ec->list, node) {
		if (value == handler->query_bit) {
		/* have custom handler for this bit */
		@@ -612,7 +615,7 @@ static void acpi_ec_gpe_query(void *ec_cxt)
		if (!ec)
		return;
		mutex_lock(&ec->mutex);
		acpi_ec_sync_query(ec);
		acpi_ec_sync_query(ec, NULL);
		mutex_unlock(&ec->mutex);
		}

Admin message