nfit: fix region registration vs block-data-window ranges
Commit1cf03c00e7
"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:1cf03c00e7
("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>
This commit is contained in:
parent
466d1493ea
commit
8d0d8ed335
|
@ -3018,15 +3018,21 @@ static void acpi_nfit_scrub(struct work_struct *work)
|
||||||
static int acpi_nfit_register_regions(struct acpi_nfit_desc *acpi_desc)
|
static int acpi_nfit_register_regions(struct acpi_nfit_desc *acpi_desc)
|
||||||
{
|
{
|
||||||
struct nfit_spa *nfit_spa;
|
struct nfit_spa *nfit_spa;
|
||||||
int rc;
|
|
||||||
|
|
||||||
list_for_each_entry(nfit_spa, &acpi_desc->spas, list)
|
list_for_each_entry(nfit_spa, &acpi_desc->spas, list) {
|
||||||
if (nfit_spa_type(nfit_spa->spa) == NFIT_SPA_DCR) {
|
int rc, type = nfit_spa_type(nfit_spa->spa);
|
||||||
/* BLK regions don't need to wait for ars results */
|
|
||||||
rc = acpi_nfit_register_region(acpi_desc, nfit_spa);
|
/* PMEM and VMEM will be registered by the ARS workqueue */
|
||||||
if (rc)
|
if (type == NFIT_SPA_PM || type == NFIT_SPA_VOLATILE)
|
||||||
return rc;
|
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;
|
acpi_desc->ars_start_flags = 0;
|
||||||
if (!acpi_desc->cancel)
|
if (!acpi_desc->cancel)
|
||||||
|
|
Loading…
Reference in New Issue