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

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

ACPI / EC: Enhance the logs to apply to QR_EC transactions. 



Currently some logs are applied to new transactions, but QR_EC transactions
are not included. This patch merges the code path to make the logs also
applying to the QR_EC transactions.

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

drivers/acpi/ec.c

+3 −3
Original line number Diff line number Diff line
@@ -303,12 +303,15 @@ 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);

	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");

	ec->curr = NULL;

	spin_unlock_irqrestore(&ec->lock, tmp);

	return ret;
@@ -334,8 +337,6 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t) 
			goto unlock;

		}

	}

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

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

	/* disable GPE during transaction if storm is detected */

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

		/* It has to be disabled, so that it doesn't trigger. */
@@ -356,7 +357,6 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t) 
			t->irq_count);

		set_bit(EC_FLAGS_GPE_STORM, &ec->flags);

	}

	pr_debug("transaction end\n");

	if (ec->global_lock)

		acpi_release_global_lock(glk);

unlock: