Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-09 09:42:23 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-09 09:42:23 +0200
commitdeef1832a5deace965f02d54fafcb2ec29f91b9b (patch)
tree1271b2584625b0a8380cf540848f9cb30405e8e2
parenta6aaebc567263a5b2455f252d5a8a8332399adad (diff)
parent771d7faf2252b1d8cfdda9747c8acf27971a33a1 (diff)
Merge branch 'users/jthumshirn/SLE15/for-next' into SLE15
Pull nfit ARS fix from Johannes Thumshirn suse-commit: a6cfc5a6f2254dcb70b5ea3be5f6ac3ffe65c820
-rw-r--r--drivers/acpi/nfit/core.c8
-rw-r--r--drivers/acpi/nfit/nfit.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 1ae6eeb85ea1..2cfd9b68eea4 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1315,6 +1315,13 @@ static ssize_t scrub_show(struct device *dev,
busy = test_bit(ARS_BUSY, &acpi_desc->scrub_flags)
&& !test_bit(ARS_CANCEL, &acpi_desc->scrub_flags);
rc = sprintf(buf, "%d%s", acpi_desc->scrub_count, busy ? "+\n" : "\n");
+ /* Allow an admin to poll the busy state at a higher rate */
+ if (busy && capable(CAP_SYS_RAWIO) && !test_and_set_bit(ARS_POLL,
+ &acpi_desc->scrub_flags)) {
+ acpi_desc->scrub_tmo = 1;
+ mod_delayed_work(nfit_wq, &acpi_desc->dwork, HZ);
+ }
+
mutex_unlock(&acpi_desc->init_mutex);
device_unlock(dev);
return rc;
@@ -3080,6 +3087,7 @@ static void acpi_nfit_scrub(struct work_struct *work)
else
notify_ars_done(acpi_desc);
memset(acpi_desc->ars_status, 0, acpi_desc->max_ars);
+ clear_bit(ARS_POLL, &acpi_desc->scrub_flags);
mutex_unlock(&acpi_desc->init_mutex);
}
diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h
index fad47cd6e67e..92436a6bea0a 100644
--- a/drivers/acpi/nfit/nfit.h
+++ b/drivers/acpi/nfit/nfit.h
@@ -184,6 +184,7 @@ struct nfit_mem {
enum scrub_flags {
ARS_BUSY,
ARS_CANCEL,
+ ARS_POLL,
ARS_VALID,
};