|
@@ -197,6 +197,8 @@ static bool advance_transaction(struct acpi_ec *ec)
|
|
t->rdata[t->ri++] = acpi_ec_read_data(ec);
|
|
t->rdata[t->ri++] = acpi_ec_read_data(ec);
|
|
if (t->rlen == t->ri) {
|
|
if (t->rlen == t->ri) {
|
|
t->flags |= ACPI_EC_COMMAND_COMPLETE;
|
|
t->flags |= ACPI_EC_COMMAND_COMPLETE;
|
|
|
|
+ if (t->command == ACPI_EC_COMMAND_QUERY)
|
|
|
|
+ pr_debug("hardware QR_EC completion\n");
|
|
wakeup = true;
|
|
wakeup = true;
|
|
}
|
|
}
|
|
} else
|
|
} else
|
|
@@ -208,7 +210,20 @@ static bool advance_transaction(struct acpi_ec *ec)
|
|
}
|
|
}
|
|
return wakeup;
|
|
return wakeup;
|
|
} else {
|
|
} else {
|
|
- if ((status & ACPI_EC_FLAG_IBF) == 0) {
|
|
|
|
|
|
+ /*
|
|
|
|
+ * There is firmware refusing to respond QR_EC when SCI_EVT
|
|
|
|
+ * is not set, for which case, we complete the QR_EC
|
|
|
|
+ * without issuing it to the firmware.
|
|
|
|
+ * https://bugzilla.kernel.org/show_bug.cgi?id=86211
|
|
|
|
+ */
|
|
|
|
+ if (!(status & ACPI_EC_FLAG_SCI) &&
|
|
|
|
+ (t->command == ACPI_EC_COMMAND_QUERY)) {
|
|
|
|
+ t->flags |= ACPI_EC_COMMAND_POLL;
|
|
|
|
+ t->rdata[t->ri++] = 0x00;
|
|
|
|
+ t->flags |= ACPI_EC_COMMAND_COMPLETE;
|
|
|
|
+ pr_debug("software QR_EC completion\n");
|
|
|
|
+ wakeup = true;
|
|
|
|
+ } else if ((status & ACPI_EC_FLAG_IBF) == 0) {
|
|
acpi_ec_write_cmd(ec, t->command);
|
|
acpi_ec_write_cmd(ec, t->command);
|
|
t->flags |= ACPI_EC_COMMAND_POLL;
|
|
t->flags |= ACPI_EC_COMMAND_POLL;
|
|
} else
|
|
} else
|