Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d68935 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPI: EC: Workaround for optimized controllers 

Some controllers fail to send confirmation GPE after address write.
Detect this and don't expect such confirmation in future.
This is a generalization of previous workaround
(66c5f4e7), which did only read address.

http://bugzilla.kernel.org/show_bug.cgi?id=9327



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: default avatarRomano Giannetti <romano.giannetti@gmail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2ffbb837

drivers/acpi/ec.c

+22 −13
Original line number Original line Diff line number Diff line
@@ -75,7 +75,8 @@ enum { 
	EC_FLAGS_WAIT_GPE = 0,		/* Don't check status until GPE arrives */

	EC_FLAGS_WAIT_GPE = 0,		/* Don't check status until GPE arrives */

	EC_FLAGS_QUERY_PENDING,		/* Query is pending */

	EC_FLAGS_QUERY_PENDING,		/* Query is pending */

	EC_FLAGS_GPE_MODE,		/* Expect GPE to be sent for status change */

	EC_FLAGS_GPE_MODE,		/* Expect GPE to be sent for status change */

	EC_FLAGS_ONLY_IBF_GPE,		/* Expect GPE only for IBF = 0 event */

	EC_FLAGS_NO_ADDRESS_GPE,	/* Expect GPE only for non-address event */

	EC_FLAGS_ADDRESS,		/* Address is being written */

};

};





static int acpi_ec_remove(struct acpi_device *device, int type);

static int acpi_ec_remove(struct acpi_device *device, int type);
@@ -166,38 +167,45 @@ static inline int acpi_ec_check_status(struct acpi_ec *ec, enum ec_event event) 




static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)

static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)

{

{

	int ret = 0;

	if (unlikely(test_bit(EC_FLAGS_ADDRESS, &ec->flags) &&

		     test_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags)))

		force_poll = 1;

	if (likely(test_bit(EC_FLAGS_GPE_MODE, &ec->flags)) &&

	if (likely(test_bit(EC_FLAGS_GPE_MODE, &ec->flags)) &&

	    likely(!force_poll)) {

	    likely(!force_poll)) {

		if (wait_event_timeout(ec->wait, acpi_ec_check_status(ec, event),

		if (wait_event_timeout(ec->wait, acpi_ec_check_status(ec, event),

				       msecs_to_jiffies(ACPI_EC_DELAY)))

				       msecs_to_jiffies(ACPI_EC_DELAY)))

			return 0;

			goto end;

		clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);

		clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);

		if (acpi_ec_check_status(ec, event)) {

		if (acpi_ec_check_status(ec, event)) {

			if (event == ACPI_EC_EVENT_OBF_1) {

			if (test_bit(EC_FLAGS_ADDRESS, &ec->flags)) {

				/* miss OBF = 1 GPE, don't expect it anymore */

				/* miss address GPE, don't expect it anymore */

				printk(KERN_INFO PREFIX "missing OBF_1 confirmation,"

				printk(KERN_INFO PREFIX "missing address confirmation,"

					"switching to degraded mode.\n");

					"don't expect it any longer.\n");

				set_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags);

				set_bit(EC_FLAGS_NO_ADDRESS_GPE, &ec->flags);

			} else {

			} else {

				/* missing GPEs, switch back to poll mode */

				/* missing GPEs, switch back to poll mode */

				printk(KERN_INFO PREFIX "missing IBF_1 confirmations,"

				printk(KERN_INFO PREFIX "missing confirmations,"

					"switch off interrupt mode.\n");

					"switch off interrupt mode.\n");

				clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);

				clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);

			}

			}

			return 0;

			goto end;

		}

		}

	} else {

	} else {

		unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);

		unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);

		clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);

		clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);

		while (time_before(jiffies, delay)) {

		while (time_before(jiffies, delay)) {

			if (acpi_ec_check_status(ec, event))

			if (acpi_ec_check_status(ec, event))

				return 0;

				goto end;

		}

		}

	}

	}

	printk(KERN_ERR PREFIX "acpi_ec_wait timeout,"

	printk(KERN_ERR PREFIX "acpi_ec_wait timeout,"

			       " status = %d, expect_event = %d\n",

			       " status = %d, expect_event = %d\n",

			       acpi_ec_read_status(ec), event);

			       acpi_ec_read_status(ec), event);

	return -ETIME;

	ret = -ETIME;

      end:

	clear_bit(EC_FLAGS_ADDRESS, &ec->flags);

	return ret;

}

}





static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,

static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
@@ -216,6 +224,9 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command, 
			       "write_cmd timeout, command = %d\n", command);

			       "write_cmd timeout, command = %d\n", command);

			goto end;

			goto end;

		}

		}

		/* mark the address byte written to EC */

		if (rdata_len + wdata_len > 1)

			set_bit(EC_FLAGS_ADDRESS, &ec->flags);

		set_bit(EC_FLAGS_WAIT_GPE, &ec->flags);

		set_bit(EC_FLAGS_WAIT_GPE, &ec->flags);

		acpi_ec_write_data(ec, *(wdata++));

		acpi_ec_write_data(ec, *(wdata++));

	}

	}
@@ -231,8 +242,6 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command, 
		clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);

		clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);





	for (; rdata_len > 0; --rdata_len) {

	for (; rdata_len > 0; --rdata_len) {

		if (test_bit(EC_FLAGS_ONLY_IBF_GPE, &ec->flags))

			force_poll = 1;

		result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, force_poll);

		result = acpi_ec_wait(ec, ACPI_EC_EVENT_OBF_1, force_poll);

		if (result) {

		if (result) {

			printk(KERN_ERR PREFIX "read timeout, command = %d\n",

			printk(KERN_ERR PREFIX "read timeout, command = %d\n",