diff options
author | Dan Williams <dan.j.williams@intel.com> | 2020-04-02 19:55:17 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2020-04-02 19:55:17 -0700 |
commit | f6d2b802f80d0ca89ee1f51c1781b3f79cdb25d5 (patch) | |
tree | fe4dfcaafe847b71ebd040f348c0a2ee8206b38a /arch/powerpc/platforms/pseries/papr_scm.c | |
parent | d3b88655c0a157c11370b8faf50e82ecb1c17d54 (diff) | |
parent | 4e4ced93794acb42adb19484132966defba8f3a6 (diff) |
Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next
- Introduce 'zero_page_range' as a dax operation. This facilitates
filesystem-dax operation without a block-device.
- Advertise a persistence-domain for of_pmem and papr_scm. The
persistence domain indicates where cpu-store cycles need to reach in
the platform-memory subsystem before the platform will consider them
power-fail protected.
- Fixup some flexible-array declarations.
Diffstat (limited to 'arch/powerpc/platforms/pseries/papr_scm.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/papr_scm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index 5499fc06ed5a..b642c4a2d822 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -342,8 +342,10 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) if (p->is_volatile) p->region = nvdimm_volatile_region_create(p->bus, &ndr_desc); - else + else { + set_bit(ND_REGION_PERSIST_MEMCTRL, &ndr_desc.flags); p->region = nvdimm_pmem_region_create(p->bus, &ndr_desc); + } if (!p->region) { dev_err(dev, "Error registering region %pR from %pOF\n", ndr_desc.res, p->dn); |