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

Commit e34c0e2b authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPI / EC: Add detailed command/query debugging information. 



Developers really don't need to translate EC commands in mind. This patch
adds detailed debugging information for the EC commands.
The address can be found in the follow-up sequential EC_DATA(W) accesses,
thus this patch also removes some of the redundant address information.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 459572a7

drivers/acpi/ec.c

+29 −5
Original line number Diff line number Diff line
@@ -164,6 +164,27 @@ static inline void acpi_ec_write_data(struct acpi_ec *ec, u8 data) 
	outb(data, ec->data_addr);

}



#ifdef DEBUG

static const char *acpi_ec_cmd_string(u8 cmd)

{

	switch (cmd) {

	case 0x80:

		return "RD_EC";

	case 0x81:

		return "WR_EC";

	case 0x82:

		return "BE_EC";

	case 0x83:

		return "BD_EC";

	case 0x84:

		return "QR_EC";

	}

	return "UNKNOWN";

}

#else

#define acpi_ec_cmd_string(cmd)		"UNDEF"

#endif



static int ec_transaction_completed(struct acpi_ec *ec)

{

	unsigned long flags;
@@ -199,7 +220,8 @@ static bool advance_transaction(struct acpi_ec *ec) 
				if (t->rlen == t->ri) {

					t->flags |= ACPI_EC_COMMAND_COMPLETE;

					if (t->command == ACPI_EC_COMMAND_QUERY)

						pr_debug("hardware QR_EC completion\n");

						pr_debug("***** Command(%s) hardware completion *****\n",

							 acpi_ec_cmd_string(t->command));

					wakeup = true;

				}

			} else
@@ -222,7 +244,8 @@ static bool advance_transaction(struct acpi_ec *ec) 
			t->flags |= ACPI_EC_COMMAND_POLL;

			t->rdata[t->ri++] = 0x00;

			t->flags |= ACPI_EC_COMMAND_COMPLETE;

			pr_debug("software QR_EC completion\n");

			pr_debug("***** Command(%s) software completion *****\n",

				 acpi_ec_cmd_string(t->command));

			wakeup = true;

		} else if ((status & ACPI_EC_FLAG_IBF) == 0) {

			acpi_ec_write_cmd(ec, t->command);
@@ -303,15 +326,16 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, 
	spin_lock_irqsave(&ec->lock, tmp);

	/* following two actions should be kept atomic */

	ec->curr = t;

	pr_debug("transaction start (cmd=0x%02x, addr=0x%02x)\n",

			t->command, t->wdata ? t->wdata[0] : 0);

	pr_debug("***** Command(%s) started *****\n",

		 acpi_ec_cmd_string(t->command));

	start_transaction(ec);

	spin_unlock_irqrestore(&ec->lock, tmp);

	ret = ec_poll(ec);

	spin_lock_irqsave(&ec->lock, tmp);

	if (ec->curr->command == ACPI_EC_COMMAND_QUERY)

		clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);

	pr_debug("transaction end\n");

	pr_debug("***** Command(%s) stopped *****\n",

		 acpi_ec_cmd_string(t->command));

	ec->curr = NULL;

	spin_unlock_irqrestore(&ec->lock, tmp);

	return ret;