forked from Minki/linux
d76401ade0
There is currently a mismatch between the resources that will trigger
the e820_pmem driver to register/load and the resources that will
actually be surfaced as pmem ranges. register_e820_pmem() uses
walk_iomem_res_desc() which includes children and siblings. In contrast,
e820_pmem_probe() only considers top level resources. For example the
following resource tree results in the driver being loaded, but no
resources being registered:
398000000000-39bfffffffff : PCI Bus 0000:ae
39be00000000-39bf07ffffff : PCI Bus 0000:af
39be00000000-39beffffffff : 0000:af:00.0
39be10000000-39beffffffff : Persistent Memory (legacy)
Fix this up to allow definitions of "legacy" pmem ranges anywhere in
system-physical address space. Not that it is a recommended or safe to
define a pmem range in PCI space, but it is useful for debug /
experimentation, and the restriction on being a top-level resource was
arbitrary.
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
95 lines
2.3 KiB
C
95 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2015, Christoph Hellwig.
|
|
* Copyright (c) 2015, Intel Corporation.
|
|
*/
|
|
#include <linux/platform_device.h>
|
|
#include <linux/memory_hotplug.h>
|
|
#include <linux/libnvdimm.h>
|
|
#include <linux/module.h>
|
|
|
|
static const struct attribute_group *e820_pmem_attribute_groups[] = {
|
|
&nvdimm_bus_attribute_group,
|
|
NULL,
|
|
};
|
|
|
|
static const struct attribute_group *e820_pmem_region_attribute_groups[] = {
|
|
&nd_region_attribute_group,
|
|
&nd_device_attribute_group,
|
|
NULL,
|
|
};
|
|
|
|
static int e820_pmem_remove(struct platform_device *pdev)
|
|
{
|
|
struct nvdimm_bus *nvdimm_bus = platform_get_drvdata(pdev);
|
|
|
|
nvdimm_bus_unregister(nvdimm_bus);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
static int e820_range_to_nid(resource_size_t addr)
|
|
{
|
|
return memory_add_physaddr_to_nid(addr);
|
|
}
|
|
#else
|
|
static int e820_range_to_nid(resource_size_t addr)
|
|
{
|
|
return NUMA_NO_NODE;
|
|
}
|
|
#endif
|
|
|
|
static int e820_register_one(struct resource *res, void *data)
|
|
{
|
|
struct nd_region_desc ndr_desc;
|
|
struct nvdimm_bus *nvdimm_bus = data;
|
|
|
|
memset(&ndr_desc, 0, sizeof(ndr_desc));
|
|
ndr_desc.res = res;
|
|
ndr_desc.attr_groups = e820_pmem_region_attribute_groups;
|
|
ndr_desc.numa_node = e820_range_to_nid(res->start);
|
|
set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags);
|
|
if (!nvdimm_pmem_region_create(nvdimm_bus, &ndr_desc))
|
|
return -ENXIO;
|
|
return 0;
|
|
}
|
|
|
|
static int e820_pmem_probe(struct platform_device *pdev)
|
|
{
|
|
static struct nvdimm_bus_descriptor nd_desc;
|
|
struct device *dev = &pdev->dev;
|
|
struct nvdimm_bus *nvdimm_bus;
|
|
int rc = -ENXIO;
|
|
|
|
nd_desc.attr_groups = e820_pmem_attribute_groups;
|
|
nd_desc.provider_name = "e820";
|
|
nd_desc.module = THIS_MODULE;
|
|
nvdimm_bus = nvdimm_bus_register(dev, &nd_desc);
|
|
if (!nvdimm_bus)
|
|
goto err;
|
|
platform_set_drvdata(pdev, nvdimm_bus);
|
|
|
|
rc = walk_iomem_res_desc(IORES_DESC_PERSISTENT_MEMORY_LEGACY,
|
|
IORESOURCE_MEM, 0, -1, nvdimm_bus, e820_register_one);
|
|
if (rc)
|
|
goto err;
|
|
return 0;
|
|
err:
|
|
nvdimm_bus_unregister(nvdimm_bus);
|
|
dev_err(dev, "failed to register legacy persistent memory ranges\n");
|
|
return rc;
|
|
}
|
|
|
|
static struct platform_driver e820_pmem_driver = {
|
|
.probe = e820_pmem_probe,
|
|
.remove = e820_pmem_remove,
|
|
.driver = {
|
|
.name = "e820_pmem",
|
|
},
|
|
};
|
|
|
|
module_platform_driver(e820_pmem_driver);
|
|
|
|
MODULE_ALIAS("platform:e820_pmem*");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_AUTHOR("Intel Corporation");
|