Commit adbb6829 authored by Dan Williams's avatar Dan Williams

libnvdimm: Move nd_device_attribute_group to device_type

A 'struct device_type' instance can carry default attributes for the
device. Use this facility to remove the export of
nd_device_attribute_group and put the responsibility on the core rather
than leaf implementations to define this attribute.

For regions this creates a new nd_region_attribute_groups[] added to the
per-region device-type instances.

Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: "Oliver O'Halloran" <oohall@gmail.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Link: https://lore.kernel.org/r/157309901138.1582359.12909354140826530394.stgit@dwillia2-desk3.amr.corp.intel.comSigned-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent cb719d5f
...@@ -286,7 +286,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, ...@@ -286,7 +286,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,
static const struct attribute_group *region_attr_groups[] = { static const struct attribute_group *region_attr_groups[] = {
&nd_region_attribute_group, &nd_region_attribute_group,
&nd_device_attribute_group,
&nd_mapping_attribute_group, &nd_mapping_attribute_group,
&nd_numa_attribute_group, &nd_numa_attribute_group,
NULL, NULL,
...@@ -299,7 +298,6 @@ static const struct attribute_group *bus_attr_groups[] = { ...@@ -299,7 +298,6 @@ static const struct attribute_group *bus_attr_groups[] = {
static const struct attribute_group *papr_scm_dimm_groups[] = { static const struct attribute_group *papr_scm_dimm_groups[] = {
&nvdimm_attribute_group, &nvdimm_attribute_group,
&nd_device_attribute_group,
NULL, NULL,
}; };
......
...@@ -1699,7 +1699,6 @@ static const struct attribute_group acpi_nfit_dimm_attribute_group = { ...@@ -1699,7 +1699,6 @@ static const struct attribute_group acpi_nfit_dimm_attribute_group = {
static const struct attribute_group *acpi_nfit_dimm_attribute_groups[] = { static const struct attribute_group *acpi_nfit_dimm_attribute_groups[] = {
&nvdimm_attribute_group, &nvdimm_attribute_group,
&nd_device_attribute_group,
&acpi_nfit_dimm_attribute_group, &acpi_nfit_dimm_attribute_group,
NULL, NULL,
}; };
...@@ -2199,7 +2198,6 @@ static const struct attribute_group acpi_nfit_region_attribute_group = { ...@@ -2199,7 +2198,6 @@ static const struct attribute_group acpi_nfit_region_attribute_group = {
static const struct attribute_group *acpi_nfit_region_attribute_groups[] = { static const struct attribute_group *acpi_nfit_region_attribute_groups[] = {
&nd_region_attribute_group, &nd_region_attribute_group,
&nd_mapping_attribute_group, &nd_mapping_attribute_group,
&nd_device_attribute_group,
&nd_numa_attribute_group, &nd_numa_attribute_group,
&acpi_nfit_region_attribute_group, &acpi_nfit_region_attribute_group,
NULL, NULL,
......
...@@ -669,10 +669,9 @@ static struct attribute *nd_device_attributes[] = { ...@@ -669,10 +669,9 @@ static struct attribute *nd_device_attributes[] = {
/* /*
* nd_device_attribute_group - generic attributes for all devices on an nd bus * nd_device_attribute_group - generic attributes for all devices on an nd bus
*/ */
struct attribute_group nd_device_attribute_group = { const struct attribute_group nd_device_attribute_group = {
.attrs = nd_device_attributes, .attrs = nd_device_attributes,
}; };
EXPORT_SYMBOL_GPL(nd_device_attribute_group);
static ssize_t numa_node_show(struct device *dev, static ssize_t numa_node_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
......
...@@ -202,9 +202,15 @@ static void nvdimm_release(struct device *dev) ...@@ -202,9 +202,15 @@ static void nvdimm_release(struct device *dev)
kfree(nvdimm); kfree(nvdimm);
} }
static struct device_type nvdimm_device_type = { static const struct attribute_group *nvdimm_attribute_groups[] = {
&nd_device_attribute_group,
NULL,
};
static const struct device_type nvdimm_device_type = {
.name = "nvdimm", .name = "nvdimm",
.release = nvdimm_release, .release = nvdimm_release,
.groups = nvdimm_attribute_groups,
}; };
bool is_nvdimm(struct device *dev) bool is_nvdimm(struct device *dev)
......
...@@ -15,7 +15,6 @@ static const struct attribute_group *e820_pmem_attribute_groups[] = { ...@@ -15,7 +15,6 @@ static const struct attribute_group *e820_pmem_attribute_groups[] = {
static const struct attribute_group *e820_pmem_region_attribute_groups[] = { static const struct attribute_group *e820_pmem_region_attribute_groups[] = {
&nd_region_attribute_group, &nd_region_attribute_group,
&nd_device_attribute_group,
NULL, NULL,
}; };
......
...@@ -239,6 +239,7 @@ int __init nd_label_init(void); ...@@ -239,6 +239,7 @@ int __init nd_label_init(void);
void nvdimm_exit(void); void nvdimm_exit(void);
void nd_region_exit(void); void nd_region_exit(void);
struct nvdimm; struct nvdimm;
extern const struct attribute_group nd_device_attribute_group;
struct nvdimm_drvdata *to_ndd(struct nd_mapping *nd_mapping); struct nvdimm_drvdata *to_ndd(struct nd_mapping *nd_mapping);
int nvdimm_check_config_data(struct device *dev); int nvdimm_check_config_data(struct device *dev);
int nvdimm_init_nsarea(struct nvdimm_drvdata *ndd); int nvdimm_init_nsarea(struct nvdimm_drvdata *ndd);
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
static const struct attribute_group *region_attr_groups[] = { static const struct attribute_group *region_attr_groups[] = {
&nd_region_attribute_group, &nd_region_attribute_group,
&nd_device_attribute_group,
NULL, NULL,
}; };
......
...@@ -763,19 +763,27 @@ struct attribute_group nd_region_attribute_group = { ...@@ -763,19 +763,27 @@ struct attribute_group nd_region_attribute_group = {
}; };
EXPORT_SYMBOL_GPL(nd_region_attribute_group); EXPORT_SYMBOL_GPL(nd_region_attribute_group);
static struct device_type nd_blk_device_type = { static const struct attribute_group *nd_region_attribute_groups[] = {
&nd_device_attribute_group,
NULL,
};
static const struct device_type nd_blk_device_type = {
.name = "nd_blk", .name = "nd_blk",
.release = nd_region_release, .release = nd_region_release,
.groups = nd_region_attribute_groups,
}; };
static struct device_type nd_pmem_device_type = { static const struct device_type nd_pmem_device_type = {
.name = "nd_pmem", .name = "nd_pmem",
.release = nd_region_release, .release = nd_region_release,
.groups = nd_region_attribute_groups,
}; };
static struct device_type nd_volatile_device_type = { static const struct device_type nd_volatile_device_type = {
.name = "nd_volatile", .name = "nd_volatile",
.release = nd_region_release, .release = nd_region_release,
.groups = nd_region_attribute_groups,
}; };
bool is_nd_pmem(struct device *dev) bool is_nd_pmem(struct device *dev)
...@@ -931,8 +939,8 @@ void nd_region_release_lane(struct nd_region *nd_region, unsigned int lane) ...@@ -931,8 +939,8 @@ void nd_region_release_lane(struct nd_region *nd_region, unsigned int lane)
EXPORT_SYMBOL(nd_region_release_lane); EXPORT_SYMBOL(nd_region_release_lane);
static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,
struct nd_region_desc *ndr_desc, struct device_type *dev_type, struct nd_region_desc *ndr_desc,
const char *caller) const struct device_type *dev_type, const char *caller)
{ {
struct nd_region *nd_region; struct nd_region *nd_region;
struct device *dev; struct device *dev;
......
...@@ -67,7 +67,6 @@ enum { ...@@ -67,7 +67,6 @@ enum {
extern struct attribute_group nvdimm_bus_attribute_group; extern struct attribute_group nvdimm_bus_attribute_group;
extern struct attribute_group nvdimm_attribute_group; extern struct attribute_group nvdimm_attribute_group;
extern struct attribute_group nd_device_attribute_group;
extern struct attribute_group nd_numa_attribute_group; extern struct attribute_group nd_numa_attribute_group;
extern struct attribute_group nd_region_attribute_group; extern struct attribute_group nd_region_attribute_group;
extern struct attribute_group nd_mapping_attribute_group; extern struct attribute_group nd_mapping_attribute_group;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment