| Message ID | 155025983758.1043225.7069046151889688538.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | fa3ed4d981b1fc19acdd07fcb152a4bd3706892b |
| Headers | show |
| Series | nfit/ars: Improve polling and short-ARS execution | expand |
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 3d681a92ff7f..934be96dc149 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3004,11 +3004,12 @@ static int ars_register(struct acpi_nfit_desc *acpi_desc, { int rc; - if (no_init_ars || test_bit(ARS_FAILED, &nfit_spa->ars_state)) + if (test_bit(ARS_FAILED, &nfit_spa->ars_state)) return acpi_nfit_register_region(acpi_desc, nfit_spa); set_bit(ARS_REQ_SHORT, &nfit_spa->ars_state); - set_bit(ARS_REQ_LONG, &nfit_spa->ars_state); + if (!no_init_ars) + set_bit(ARS_REQ_LONG, &nfit_spa->ars_state); switch (acpi_nfit_query_poison(acpi_desc)) { case 0:
The no_init_ars option is meant to prevent long-ARS, but short-ARS should be allowed to grab any immediate results. Reported-by: Erwin Tsaur <erwin.tsaur@oracle.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/acpi/nfit/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)