hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libnvdimm: convert NDD_ flags to use bitops, introduce NDD_LOCKED 

This is a preparation patch for handling locked nvdimm label regions, a
new concept as introduced by the latest DSM document on pmem.io [1]. A
future patch will leverage nvdimm_set_locked() at DIMM probe time to
flag regions that can not be enabled. There should be no functional
difference resulting from this change.

[1]: http://pmem.io/documents/NVDIMM_DSM_Interface_Example-V1.3.pdf

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2017-05-04 14:01:24 -07:00
parent 565851c972
commit 8f078b38dd
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/nfit/core.c
View File

@ -1512,7 +1512,7 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc)
} }
if (nfit_mem->bdw && nfit_mem->memdev_pmem) if (nfit_mem->bdw && nfit_mem->memdev_pmem)
flags |= NDD_ALIASING; set_bit(NDD_ALIASING, &flags);
/* collate flags across all memdevs for this dimm */ /* collate flags across all memdevs for this dimm */
list_for_each_entry(nfit_memdev, &acpi_desc->memdevs, list) { list_for_each_entry(nfit_memdev, &acpi_desc->memdevs, list) {
@ -1527,7 +1527,7 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc)
mem_flags = __to_nfit_memdev(nfit_mem)->flags; mem_flags = __to_nfit_memdev(nfit_mem)->flags;
if (mem_flags & ACPI_NFIT_MEM_NOT_ARMED) if (mem_flags & ACPI_NFIT_MEM_NOT_ARMED)
flags |= NDD_UNARMED; set_bit(NDD_UNARMED, &flags);
rc = acpi_nfit_add_dimm(acpi_desc, nfit_mem, device_handle); rc = acpi_nfit_add_dimm(acpi_desc, nfit_mem, device_handle);
if (rc) if (rc)

11
drivers/nvdimm/dimm_devs.c
View File

@ -34,7 +34,7 @@ int nvdimm_check_config_data(struct device *dev)
if (!nvdimm->cmd_mask || if (!nvdimm->cmd_mask ||
!test_bit(ND_CMD_GET_CONFIG_DATA, &nvdimm->cmd_mask)) { !test_bit(ND_CMD_GET_CONFIG_DATA, &nvdimm->cmd_mask)) {
if (nvdimm->flags & NDD_ALIASING) if (test_bit(NDD_ALIASING, &nvdimm->flags))
return -ENXIO; return -ENXIO;
else else
return -ENOTTY; return -ENOTTY;
@ -188,7 +188,14 @@ void nvdimm_set_aliasing(struct device *dev)
{ {
struct nvdimm *nvdimm = to_nvdimm(dev); struct nvdimm *nvdimm = to_nvdimm(dev);
nvdimm->flags |= NDD_ALIASING; set_bit(NDD_ALIASING, &nvdimm->flags);
}
void nvdimm_set_locked(struct device *dev)
{
struct nvdimm *nvdimm = to_nvdimm(dev);
set_bit(NDD_LOCKED, &nvdimm->flags);
} }
static void nvdimm_release(struct device *dev) static void nvdimm_release(struct device *dev)

2
drivers/nvdimm/namespace_devs.c
View File

@ -2240,7 +2240,7 @@ static int init_active_labels(struct nd_region *nd_region)
* being activated if it aliases DPA. * being activated if it aliases DPA.
*/ */
if (!ndd) { if (!ndd) {
if ((nvdimm->flags & NDD_ALIASING) == 0) if (!test_bit(NDD_ALIASING, &nvdimm->flags))
return 0; return 0;
dev_dbg(&nd_region->dev, "%s: is disabled, failing probe\n", dev_dbg(&nd_region->dev, "%s: is disabled, failing probe\n",
dev_name(&nd_mapping->nvdimm->dev)); dev_name(&nd_mapping->nvdimm->dev));

1
drivers/nvdimm/nd.h
View File

@ -240,6 +240,7 @@ int nvdimm_set_config_data(struct nvdimm_drvdata *ndd, size_t offset,
long nvdimm_clear_poison(struct device *dev, phys_addr_t phys, long nvdimm_clear_poison(struct device *dev, phys_addr_t phys,
unsigned int len); unsigned int len);
void nvdimm_set_aliasing(struct device *dev); void nvdimm_set_aliasing(struct device *dev);
void nvdimm_set_locked(struct device *dev);
struct nd_btt *to_nd_btt(struct device *dev); struct nd_btt *to_nd_btt(struct device *dev);
struct nd_gen_sb { struct nd_gen_sb {

4
drivers/nvdimm/region_devs.c
View File

@ -222,7 +222,7 @@ int nd_region_to_nstype(struct nd_region *nd_region)
struct nd_mapping *nd_mapping = &nd_region->mapping[i]; struct nd_mapping *nd_mapping = &nd_region->mapping[i];
struct nvdimm *nvdimm = nd_mapping->nvdimm; struct nvdimm *nvdimm = nd_mapping->nvdimm;
if (nvdimm->flags & NDD_ALIASING) if (test_bit(NDD_ALIASING, &nvdimm->flags))
alias++; alias++;
} }
if (alias) if (alias)
@ -881,7 +881,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,
return NULL; return NULL;
} }
if (nvdimm->flags & NDD_UNARMED) if (test_bit(NDD_UNARMED, &nvdimm->flags))
ro = 1; ro = 1;
} }

6
include/linux/libnvdimm.h
View File

@ -20,9 +20,11 @@
enum { enum {
/* when a dimm supports both PMEM and BLK access a label is required */ /* when a dimm supports both PMEM and BLK access a label is required */
NDD_ALIASING = 1 << 0, NDD_ALIASING = 0,
/* unarmed memory devices may not persist writes */ /* unarmed memory devices may not persist writes */
NDD_UNARMED = 1 << 1, NDD_UNARMED = 1,
/* locked memory devices should not be accessed */
NDD_LOCKED = 2,
/* need to set a limit somewhere, but yes, this is likely overkill */ /* need to set a limit somewhere, but yes, this is likely overkill */
ND_IOCTL_MAX_BUFLEN = SZ_4M, ND_IOCTL_MAX_BUFLEN = SZ_4M,