Commit 174ebece authored by Dan Williams's avatar Dan Williams Committed by Linus Torvalds

device-dax: move instance creation parameters to 'struct dev_dax_data'

In preparation for adding more parameters to instance creation, move
existing parameters to a new struct.
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brice Goglin <Brice.Goglin@inria.fr>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: David Hildenbrand <david@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Jia He <justin.he@arm.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Wei Yang <richard.weiyang@linux.alibaba.com>
Cc: Will Deacon <will@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Hulk Robot <hulkci@huawei.com>
Cc: Jason Yan <yanaijie@huawei.com>
Cc: "Jérôme Glisse" <jglisse@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/159643099411.4062302.1337305960720423895.stgit@dwillia2-desk3.amr.corp.intel.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ec826909
...@@ -395,9 +395,9 @@ static void unregister_dev_dax(void *dev) ...@@ -395,9 +395,9 @@ static void unregister_dev_dax(void *dev)
put_device(dev); put_device(dev);
} }
struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id, struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data)
struct dev_pagemap *pgmap, enum dev_dax_subsys subsys)
{ {
struct dax_region *dax_region = data->dax_region;
struct device *parent = dax_region->dev; struct device *parent = dax_region->dev;
struct dax_device *dax_dev; struct dax_device *dax_dev;
struct dev_dax *dev_dax; struct dev_dax *dev_dax;
...@@ -405,14 +405,14 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id, ...@@ -405,14 +405,14 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id,
struct device *dev; struct device *dev;
int rc = -ENOMEM; int rc = -ENOMEM;
if (id < 0) if (data->id < 0)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
dev_dax = kzalloc(sizeof(*dev_dax), GFP_KERNEL); dev_dax = kzalloc(sizeof(*dev_dax), GFP_KERNEL);
if (!dev_dax) if (!dev_dax)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
memcpy(&dev_dax->pgmap, pgmap, sizeof(*pgmap)); memcpy(&dev_dax->pgmap, data->pgmap, sizeof(struct dev_pagemap));
/* /*
* No 'host' or dax_operations since there is no access to this * No 'host' or dax_operations since there is no access to this
...@@ -438,13 +438,13 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id, ...@@ -438,13 +438,13 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id,
inode = dax_inode(dax_dev); inode = dax_inode(dax_dev);
dev->devt = inode->i_rdev; dev->devt = inode->i_rdev;
if (subsys == DEV_DAX_BUS) if (data->subsys == DEV_DAX_BUS)
dev->bus = &dax_bus_type; dev->bus = &dax_bus_type;
else else
dev->class = dax_class; dev->class = dax_class;
dev->parent = parent; dev->parent = parent;
dev->type = &dev_dax_type; dev->type = &dev_dax_type;
dev_set_name(dev, "dax%d.%d", dax_region->id, id); dev_set_name(dev, "dax%d.%d", dax_region->id, data->id);
rc = device_add(dev); rc = device_add(dev);
if (rc) { if (rc) {
...@@ -464,7 +464,7 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id, ...@@ -464,7 +464,7 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id,
return ERR_PTR(rc); return ERR_PTR(rc);
} }
EXPORT_SYMBOL_GPL(__devm_create_dev_dax); EXPORT_SYMBOL_GPL(devm_create_dev_dax);
static int match_always_count; static int match_always_count;
......
...@@ -13,18 +13,18 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id, ...@@ -13,18 +13,18 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id,
struct resource *res, int target_node, unsigned int align); struct resource *res, int target_node, unsigned int align);
enum dev_dax_subsys { enum dev_dax_subsys {
DEV_DAX_BUS, DEV_DAX_BUS = 0, /* zeroed dev_dax_data picks this by default */
DEV_DAX_CLASS, DEV_DAX_CLASS,
}; };
struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id, struct dev_dax_data {
struct dev_pagemap *pgmap, enum dev_dax_subsys subsys); struct dax_region *dax_region;
struct dev_pagemap *pgmap;
enum dev_dax_subsys subsys;
int id;
};
static inline struct dev_dax *devm_create_dev_dax(struct dax_region *dax_region, struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data);
int id, struct dev_pagemap *pgmap)
{
return __devm_create_dev_dax(dax_region, id, pgmap, DEV_DAX_BUS);
}
/* to be deleted when DEV_DAX_CLASS is removed */ /* to be deleted when DEV_DAX_CLASS is removed */
struct dev_dax *__dax_pmem_probe(struct device *dev, enum dev_dax_subsys subsys); struct dev_dax *__dax_pmem_probe(struct device *dev, enum dev_dax_subsys subsys);
......
...@@ -11,6 +11,7 @@ static int dax_hmem_probe(struct platform_device *pdev) ...@@ -11,6 +11,7 @@ static int dax_hmem_probe(struct platform_device *pdev)
struct dev_pagemap pgmap = { }; struct dev_pagemap pgmap = { };
struct dax_region *dax_region; struct dax_region *dax_region;
struct memregion_info *mri; struct memregion_info *mri;
struct dev_dax_data data;
struct dev_dax *dev_dax; struct dev_dax *dev_dax;
struct resource *res; struct resource *res;
...@@ -26,7 +27,12 @@ static int dax_hmem_probe(struct platform_device *pdev) ...@@ -26,7 +27,12 @@ static int dax_hmem_probe(struct platform_device *pdev)
if (!dax_region) if (!dax_region)
return -ENOMEM; return -ENOMEM;
dev_dax = devm_create_dev_dax(dax_region, 0, &pgmap); data = (struct dev_dax_data) {
.dax_region = dax_region,
.id = 0,
.pgmap = &pgmap,
};
dev_dax = devm_create_dev_dax(&data);
if (IS_ERR(dev_dax)) if (IS_ERR(dev_dax))
return PTR_ERR(dev_dax); return PTR_ERR(dev_dax);
......
...@@ -14,6 +14,7 @@ struct dev_dax *__dax_pmem_probe(struct device *dev, enum dev_dax_subsys subsys) ...@@ -14,6 +14,7 @@ struct dev_dax *__dax_pmem_probe(struct device *dev, enum dev_dax_subsys subsys)
resource_size_t offset; resource_size_t offset;
struct nd_pfn_sb *pfn_sb; struct nd_pfn_sb *pfn_sb;
struct dev_dax *dev_dax; struct dev_dax *dev_dax;
struct dev_dax_data data;
struct nd_namespace_io *nsio; struct nd_namespace_io *nsio;
struct dax_region *dax_region; struct dax_region *dax_region;
struct dev_pagemap pgmap = { }; struct dev_pagemap pgmap = { };
...@@ -57,7 +58,13 @@ struct dev_dax *__dax_pmem_probe(struct device *dev, enum dev_dax_subsys subsys) ...@@ -57,7 +58,13 @@ struct dev_dax *__dax_pmem_probe(struct device *dev, enum dev_dax_subsys subsys)
if (!dax_region) if (!dax_region)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
dev_dax = __devm_create_dev_dax(dax_region, id, &pgmap, subsys); data = (struct dev_dax_data) {
.dax_region = dax_region,
.id = id,
.pgmap = &pgmap,
.subsys = subsys,
};
dev_dax = devm_create_dev_dax(&data);
/* child dev_dax instances now own the lifetime of the dax_region */ /* child dev_dax instances now own the lifetime of the dax_region */
dax_region_put(dax_region); dax_region_put(dax_region);
......
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