hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/nvdimm/e820.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Copyright (c) 2015, Christoph Hellwig.
34 * Copyright (c) 2015, Intel Corporation.
....@@ -6,17 +7,7 @@
67 #include <linux/memory_hotplug.h>
78 #include <linux/libnvdimm.h>
89 #include <linux/module.h>
9
-
10
-static const struct attribute_group *e820_pmem_attribute_groups[] = {
11
- &nvdimm_bus_attribute_group,
12
- NULL,
13
-};
14
-
15
-static const struct attribute_group *e820_pmem_region_attribute_groups[] = {
16
- &nd_region_attribute_group,
17
- &nd_device_attribute_group,
18
- NULL,
19
-};
10
+#include <linux/numa.h>
2011
2112 static int e820_pmem_remove(struct platform_device *pdev)
2213 {
....@@ -26,27 +17,16 @@
2617 return 0;
2718 }
2819
29
-#ifdef CONFIG_MEMORY_HOTPLUG
30
-static int e820_range_to_nid(resource_size_t addr)
31
-{
32
- return memory_add_physaddr_to_nid(addr);
33
-}
34
-#else
35
-static int e820_range_to_nid(resource_size_t addr)
36
-{
37
- return NUMA_NO_NODE;
38
-}
39
-#endif
40
-
4120 static int e820_register_one(struct resource *res, void *data)
4221 {
4322 struct nd_region_desc ndr_desc;
4423 struct nvdimm_bus *nvdimm_bus = data;
24
+ int nid = phys_to_target_node(res->start);
4525
4626 memset(&ndr_desc, 0, sizeof(ndr_desc));
4727 ndr_desc.res = res;
48
- ndr_desc.attr_groups = e820_pmem_region_attribute_groups;
49
- ndr_desc.numa_node = e820_range_to_nid(res->start);
28
+ ndr_desc.numa_node = numa_map_to_online_node(nid);
29
+ ndr_desc.target_node = nid;
5030 set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags);
5131 if (!nvdimm_pmem_region_create(nvdimm_bus, &ndr_desc))
5232 return -ENXIO;
....@@ -60,7 +40,6 @@
6040 struct nvdimm_bus *nvdimm_bus;
6141 int rc = -ENXIO;
6242
63
- nd_desc.attr_groups = e820_pmem_attribute_groups;
6443 nd_desc.provider_name = "e820";
6544 nd_desc.module = THIS_MODULE;
6645 nvdimm_bus = nvdimm_bus_register(dev, &nd_desc);