Commit c823c17a authored Feb 27, 2020 by Rafael J. Wysocki

ACPI: EC: Avoid printing confusing messages in acpi_ec_setup()



It doesn't really make sense to pass ec->handle of the ECDT EC to
acpi_handle_info(), because it is set to ACPI_ROOT_OBJECT in
acpi_ec_ecdt_probe(), so rework acpi_ec_setup() to avoid using
acpi_handle_info() for printing messages.

First, notice that the "Used as first EC" message is not really
useful, because it is immediately followed by a more meaningful one
from either acpi_ec_ecdt_probe() or acpi_ec_dsdt_probe() (the latter
also includes the EC object path), so drop it altogether.

Second, use pr_info() for printing the EC configuration information.

While at it, make the code in question avoid printing invalid GPE or
IRQ numbers and make it print the GPE/IRQ information only when the
driver is ready to handle events.

Fixes: 72c77b7e ("ACPI / EC: Cleanup first_ec/boot_ec code")
Fixes: 406857f7 ("ACPI: EC: add support for hardware-reduced systems")
Cc: 5.5+ <stable@vger.kernel.org> # 5.5+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent f8788d86

drivers/acpi/ec.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -1584,14 +1584,19 @@ static int acpi_ec_setup(struct acpi_ec ec, struct acpi_device device,
		return ret;

		/* First EC capable of handling transactions */
		if (!first_ec) {
		if (!first_ec)
		first_ec = ec;
		acpi_handle_info(first_ec->handle, "Used as first EC\n");

		pr_info("EC_CMD/EC_SC=0x%lx, EC_DATA=0x%lx\n", ec->command_addr,
		ec->data_addr);

		if (test_bit(EC_FLAGS_EVENT_HANDLER_INSTALLED, &ec->flags)) {
		if (ec->gpe >= 0)
		pr_info("GPE=0x%x\n", ec->gpe);
		else
		pr_info("IRQ=%d\n", ec->irq);
		}

		acpi_handle_info(ec->handle,
		"GPE=0x%x, IRQ=%d, EC_CMD/EC_SC=0x%lx, EC_DATA=0x%lx\n",
		ec->gpe, ec->irq, ec->command_addr, ec->data_addr);
		return ret;
		}

Admin message