diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-04-02 16:49:30 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-04-02 16:49:30 -0700 |
| commit | 8d0d8ed3356aa9ed43b819aaedd39b08ca453007 (patch) | |
| tree | 12ea65fd3b4a177e9e503a527c0ff3571ca20bfe /drivers/acpi/nfit | |
| parent | 466d1493ea830789a2f063f478aaed2e324f0d3d (diff) | |
| download | linux-rpi-8d0d8ed3356aa9ed43b819aaedd39b08ca453007.tar.gz linux-rpi-8d0d8ed3356aa9ed43b819aaedd39b08ca453007.tar.bz2 linux-rpi-8d0d8ed3356aa9ed43b819aaedd39b08ca453007.zip | |
nfit: fix region registration vs block-data-window ranges
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>
Diffstat (limited to 'drivers/acpi/nfit')
| -rw-r--r-- | drivers/acpi/nfit/core.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 12fb414fa678..ea9f3e727fef 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -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) { 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) |