diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2019-02-13 09:01:13 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-23 20:11:14 +0100 |
| commit | 5fa9cb709adc46b52c25a45d919563b02c8fca6e (patch) | |
| tree | 3e729061b474d46ea6168e74c3afc3adf0faf11f | |
| parent | b3971c932d0d10f95c8d7c9e972276c3319941de (diff) | |
| download | blackbird-obmc-linux-5fa9cb709adc46b52c25a45d919563b02c8fca6e.tar.gz blackbird-obmc-linux-5fa9cb709adc46b52c25a45d919563b02c8fca6e.zip | |
nfit/ars: Attempt short-ARS even in the no_init_ars case
commit fa3ed4d981b1fc19acdd07fcb152a4bd3706892b upstream.
The no_init_ars option is meant to prevent long-ARS, but short-ARS
should be allowed to grab any immediate results.
Fixes: bc6ba8085842 ("nfit, address-range-scrub: rework and simplify ARS...")
Cc: <stable@vger.kernel.org>
Reported-by: Erwin Tsaur <erwin.tsaur@oracle.com>
Reviewed-by: Toshi Kani <toshi.kani@hpe.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/acpi/nfit/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 31fef86fb568..f75f8f870ce3 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3013,11 +3013,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: |
