nfit: fix region registration vs block-data-window ranges

commit 8d0d8ed3356aa9ed43b819aaedd39b08ca453007 upstream.

Commit 1cf03c00e7c1 "nfit: scrub and register regions in a workqueue"
mistakenly attempts to register a region per BLK aperture. There is
nothing to register for individual apertures as they belong as a set to
a BLK aperture group that are registered with a corresponding
DIMM-control-region. Filter them for registration to prevent some
needless devm_kzalloc() allocations.

Cc: <stable@vger.kernel.org>
Fixes: 1cf03c00e7c1 ("nfit: scrub and register regions in a workqueue")
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index f14b4326e855bc5f55d77c195037b5ce3ca5312e..67a8607905603dd521cd0722cb99b503837fadcf 100644 (file)
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -2748,15 +2748,21 @@ static void acpi_nfit_scrub(struct work_struct *work)
 static int acpi_nfit_register_regions(struct acpi_nfit_desc *acpi_desc)
 {
        struct nfit_spa *nfit_spa;
-       int rc;
 
-       list_for_each_entry(nfit_spa, &acpi_desc->spas, list)
-               if (nfit_spa_type(nfit_spa->spa) == NFIT_SPA_DCR) {
-                       /* BLK regions don't need to wait for ars results */
-                       rc = acpi_nfit_register_region(acpi_desc, nfit_spa);
-                       if (rc)
-                               return rc;
-               }
+       list_for_each_entry(nfit_spa, &acpi_desc->spas, list) {
+               int rc, type = nfit_spa_type(nfit_spa->spa);
+
+               /* PMEM and VMEM will be registered by the ARS workqueue */
+               if (type == NFIT_SPA_PM || type == NFIT_SPA_VOLATILE)
+                       continue;
+               /* BLK apertures belong to BLK region registration below */
+               if (type == NFIT_SPA_BDW)
+                       continue;
+               /* BLK regions don't need to wait for ARS results */
+               rc = acpi_nfit_register_region(acpi_desc, nfit_spa);
+               if (rc)
+                       return rc;
+       }
 
        acpi_desc->ars_start_flags = 0;
        if (!acpi_desc->cancel)