diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-26 20:38:08 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-08 02:11:09 +0200 |
| commit | ad9ac5e1957531a826ff6d71dc105f01fa665d2e (patch) | |
| tree | 30c3b4b356ae9c2d53077567673609d4e75bc6e6 /drivers/acpi | |
| parent | tools/testing/nvdimm: remove __wrap_devm_memremap_pages placeholder (diff) | |
| download | linux-ad9ac5e1957531a826ff6d71dc105f01fa665d2e.tar.xz linux-ad9ac5e1957531a826ff6d71dc105f01fa665d2e.zip | |
nfit: always associate flush hints
Before enabling use of flush hints for pmem regions, we need to make
sure they are always associated. Move the initialization of nfit_flush
out of the block-window specific init path to the general init path.
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/nfit.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index 3e54157f02cc..d79837b9d07e 100644 --- a/drivers/acpi/nfit.c +++ b/drivers/acpi/nfit.c @@ -614,7 +614,6 @@ static void nfit_mem_init_bdw(struct acpi_nfit_desc *acpi_desc, { u16 dcr = __to_nfit_memdev(nfit_mem)->region_index; struct nfit_memdev *nfit_memdev; - struct nfit_flush *nfit_flush; struct nfit_bdw *nfit_bdw; struct nfit_idt *nfit_idt; u16 idt_idx, range_index; @@ -647,14 +646,6 @@ static void nfit_mem_init_bdw(struct acpi_nfit_desc *acpi_desc, nfit_mem->idt_bdw = nfit_idt->idt; break; } - - list_for_each_entry(nfit_flush, &acpi_desc->flushes, list) { - if (nfit_flush->flush->device_handle != - nfit_memdev->memdev->device_handle) - continue; - nfit_mem->nfit_flush = nfit_flush; - break; - } break; } } @@ -675,6 +666,7 @@ static int nfit_mem_dcr_init(struct acpi_nfit_desc *acpi_desc, } list_for_each_entry(nfit_memdev, &acpi_desc->memdevs, list) { + struct nfit_flush *nfit_flush; struct nfit_dcr *nfit_dcr; u32 device_handle; u16 dcr; @@ -721,6 +713,13 @@ static int nfit_mem_dcr_init(struct acpi_nfit_desc *acpi_desc, break; } + list_for_each_entry(nfit_flush, &acpi_desc->flushes, list) { + if (nfit_flush->flush->device_handle != device_handle) + continue; + nfit_mem->nfit_flush = nfit_flush; + break; + } + if (dcr && !nfit_mem->dcr) { dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n", spa->range_index, dcr); |