ソースを参照

libnvdimm: Add of_node to region and bus descriptors

We want to be able to cross reference the region and bus devices
with the device tree node that they were spawned from. libNVDIMM
handles creating the actual devices for these internally, so we
need to pass in a pointer to the relevant node in the descriptor.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Oliver O'Halloran 7 年 前
コミット
1ff19f487a
3 ファイル変更5 行追加0 行削除
  1. 1 0
      drivers/nvdimm/bus.c
  2. 1 0
      drivers/nvdimm/region_devs.c
  3. 3 0
      include/linux/libnvdimm.h

+ 1 - 0
drivers/nvdimm/bus.c

@@ -358,6 +358,7 @@ struct nvdimm_bus *nvdimm_bus_register(struct device *parent,
 	nvdimm_bus->dev.release = nvdimm_bus_release;
 	nvdimm_bus->dev.release = nvdimm_bus_release;
 	nvdimm_bus->dev.groups = nd_desc->attr_groups;
 	nvdimm_bus->dev.groups = nd_desc->attr_groups;
 	nvdimm_bus->dev.bus = &nvdimm_bus_type;
 	nvdimm_bus->dev.bus = &nvdimm_bus_type;
+	nvdimm_bus->dev.of_node = nd_desc->of_node;
 	dev_set_name(&nvdimm_bus->dev, "ndbus%d", nvdimm_bus->id);
 	dev_set_name(&nvdimm_bus->dev, "ndbus%d", nvdimm_bus->id);
 	rc = device_register(&nvdimm_bus->dev);
 	rc = device_register(&nvdimm_bus->dev);
 	if (rc) {
 	if (rc) {

+ 1 - 0
drivers/nvdimm/region_devs.c

@@ -1013,6 +1013,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,
 	dev->parent = &nvdimm_bus->dev;
 	dev->parent = &nvdimm_bus->dev;
 	dev->type = dev_type;
 	dev->type = dev_type;
 	dev->groups = ndr_desc->attr_groups;
 	dev->groups = ndr_desc->attr_groups;
+	dev->of_node = ndr_desc->of_node;
 	nd_region->ndr_size = resource_size(ndr_desc->res);
 	nd_region->ndr_size = resource_size(ndr_desc->res);
 	nd_region->ndr_start = ndr_desc->res->start;
 	nd_region->ndr_start = ndr_desc->res->start;
 	nd_device_register(dev);
 	nd_device_register(dev);

+ 3 - 0
include/linux/libnvdimm.h

@@ -76,12 +76,14 @@ typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc,
 		struct nvdimm *nvdimm, unsigned int cmd, void *buf,
 		struct nvdimm *nvdimm, unsigned int cmd, void *buf,
 		unsigned int buf_len, int *cmd_rc);
 		unsigned int buf_len, int *cmd_rc);
 
 
+struct device_node;
 struct nvdimm_bus_descriptor {
 struct nvdimm_bus_descriptor {
 	const struct attribute_group **attr_groups;
 	const struct attribute_group **attr_groups;
 	unsigned long bus_dsm_mask;
 	unsigned long bus_dsm_mask;
 	unsigned long cmd_mask;
 	unsigned long cmd_mask;
 	struct module *module;
 	struct module *module;
 	char *provider_name;
 	char *provider_name;
+	struct device_node *of_node;
 	ndctl_fn ndctl;
 	ndctl_fn ndctl;
 	int (*flush_probe)(struct nvdimm_bus_descriptor *nd_desc);
 	int (*flush_probe)(struct nvdimm_bus_descriptor *nd_desc);
 	int (*clear_to_send)(struct nvdimm_bus_descriptor *nd_desc,
 	int (*clear_to_send)(struct nvdimm_bus_descriptor *nd_desc,
@@ -123,6 +125,7 @@ struct nd_region_desc {
 	int num_lanes;
 	int num_lanes;
 	int numa_node;
 	int numa_node;
 	unsigned long flags;
 	unsigned long flags;
+	struct device_node *of_node;
 };
 };
 
 
 struct device;
 struct device;