Commit adf68957 authored by Dan Williams's avatar Dan Williams

acpi, nfit: fix health event notification

Integration testing with a BIOS that generates injected health event
notifications fails to communicate those events to userspace. The nfit
driver neglects to link the ACPI DIMM device with the necessary driver
data so acpi_nvdimm_notify() fails this lookup:

        nfit_mem = dev_get_drvdata(dev);
        if (nfit_mem && nfit_mem->flags_attr)
                sysfs_notify_dirent(nfit_mem->flags_attr);

Add the necessary linkage when installing the notification handler and
clean it up when the nfit driver instance is torn down.

Cc: <stable@vger.kernel.org>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Fixes: ba9c8dd3 ("acpi, nfit: add dimm device notification support")
Reported-by: default avatarDaniel Osawa <daniel.k.osawa@intel.com>
Tested-by: default avatarDaniel Osawa <daniel.k.osawa@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent ae64f9bd
...@@ -1670,6 +1670,11 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, ...@@ -1670,6 +1670,11 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc,
dev_name(&adev_dimm->dev)); dev_name(&adev_dimm->dev));
return -ENXIO; return -ENXIO;
} }
/*
* Record nfit_mem for the notification path to track back to
* the nfit sysfs attributes for this dimm device object.
*/
dev_set_drvdata(&adev_dimm->dev, nfit_mem);
/* /*
* Until standardization materializes we need to consider 4 * Until standardization materializes we need to consider 4
...@@ -1752,9 +1757,11 @@ static void shutdown_dimm_notify(void *data) ...@@ -1752,9 +1757,11 @@ static void shutdown_dimm_notify(void *data)
sysfs_put(nfit_mem->flags_attr); sysfs_put(nfit_mem->flags_attr);
nfit_mem->flags_attr = NULL; nfit_mem->flags_attr = NULL;
} }
if (adev_dimm) if (adev_dimm) {
acpi_remove_notify_handler(adev_dimm->handle, acpi_remove_notify_handler(adev_dimm->handle,
ACPI_DEVICE_NOTIFY, acpi_nvdimm_notify); ACPI_DEVICE_NOTIFY, acpi_nvdimm_notify);
dev_set_drvdata(&adev_dimm->dev, NULL);
}
} }
mutex_unlock(&acpi_desc->init_mutex); mutex_unlock(&acpi_desc->init_mutex);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment