Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ff19f48 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Dan Williams
Browse files

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: default avatarOliver O'Halloran <oohall@gmail.com>
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 60ce0f93

drivers/nvdimm/bus.c

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ struct nvdimm_bus *nvdimm_bus_register(struct device *parent, 
	nvdimm_bus->dev.release = nvdimm_bus_release;

	nvdimm_bus->dev.groups = nd_desc->attr_groups;

	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);

	rc = device_register(&nvdimm_bus->dev);

	if (rc) {

drivers/nvdimm/region_devs.c

+1 −0
Original line number Diff line number Diff line
@@ -1013,6 +1013,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, 
	dev->parent = &nvdimm_bus->dev;

	dev->type = dev_type;

	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_start = ndr_desc->res->start;

	nd_device_register(dev);

include/linux/libnvdimm.h

+3 −0
Original line number Diff line number Diff line
@@ -76,12 +76,14 @@ typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc, 
		struct nvdimm *nvdimm, unsigned int cmd, void *buf,

		unsigned int buf_len, int *cmd_rc);



struct device_node;

struct nvdimm_bus_descriptor {

	const struct attribute_group **attr_groups;

	unsigned long bus_dsm_mask;

	unsigned long cmd_mask;

	struct module *module;

	char *provider_name;

	struct device_node *of_node;

	ndctl_fn ndctl;

	int (*flush_probe)(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 numa_node;

	unsigned long flags;

	struct device_node *of_node;

};



struct device;