summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-06-09 16:09:36 -0400
committerDan Williams <dan.j.williams@intel.com>2015-06-24 21:24:10 -0400
commit4a826c83db4edc040da3a66dbefd53f0cfcf457d (patch)
treeff26d9df31e46d3f7d8ff12fa288982460beacc3 /drivers/nvdimm
parenteaf961536e1622ad21247ac8d44acd48ba65566e (diff)
libnvdimm: namespace indices: read and validate
This on media label format [1] consists of two index blocks followed by an array of labels. None of these structures are ever updated in place. A sequence number tracks the current active index and the next one to write, while labels are written to free slots. +------------+ | | | nsindex0 | | | +------------+ | | | nsindex1 | | | +------------+ | label0 | +------------+ | label1 | +------------+ | | ....nslot... | | +------------+ | labelN | +------------+ After reading valid labels, store the dpa ranges they claim into per-dimm resource trees. [1]: http://pmem.io/documents/NVDIMM_Namespace_Spec.pdf Cc: Neil Brown <neilb@suse.de> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r--drivers/nvdimm/Makefile1
-rw-r--r--drivers/nvdimm/dimm.c23
-rw-r--r--drivers/nvdimm/dimm_devs.c30
-rw-r--r--drivers/nvdimm/label.c290
-rw-r--r--drivers/nvdimm/label.h128
-rw-r--r--drivers/nvdimm/nd.h49
6 files changed, 520 insertions, 1 deletions
diff --git a/drivers/nvdimm/Makefile b/drivers/nvdimm/Makefile
index 4d2a27f52faa..abce98f87f16 100644
--- a/drivers/nvdimm/Makefile
+++ b/drivers/nvdimm/Makefile
@@ -10,3 +10,4 @@ libnvdimm-y += dimm.o
10libnvdimm-y += region_devs.o 10libnvdimm-y += region_devs.o
11libnvdimm-y += region.o 11libnvdimm-y += region.o
12libnvdimm-y += namespace_devs.o 12libnvdimm-y += namespace_devs.o
13libnvdimm-y += label.o
diff --git a/drivers/nvdimm/dimm.c b/drivers/nvdimm/dimm.c
index eb20fc2df32b..2df97c3c3b34 100644
--- a/drivers/nvdimm/dimm.c
+++ b/drivers/nvdimm/dimm.c
@@ -18,6 +18,7 @@
18#include <linux/slab.h> 18#include <linux/slab.h>
19#include <linux/mm.h> 19#include <linux/mm.h>
20#include <linux/nd.h> 20#include <linux/nd.h>
21#include "label.h"
21#include "nd.h" 22#include "nd.h"
22 23
23static void free_data(struct nvdimm_drvdata *ndd) 24static void free_data(struct nvdimm_drvdata *ndd)
@@ -42,6 +43,11 @@ static int nvdimm_probe(struct device *dev)
42 return -ENOMEM; 43 return -ENOMEM;
43 44
44 dev_set_drvdata(dev, ndd); 45 dev_set_drvdata(dev, ndd);
46 ndd->dpa.name = dev_name(dev);
47 ndd->ns_current = -1;
48 ndd->ns_next = -1;
49 ndd->dpa.start = 0;
50 ndd->dpa.end = -1;
45 ndd->dev = dev; 51 ndd->dev = dev;
46 52
47 rc = nvdimm_init_nsarea(ndd); 53 rc = nvdimm_init_nsarea(ndd);
@@ -54,6 +60,17 @@ static int nvdimm_probe(struct device *dev)
54 60
55 dev_dbg(dev, "config data size: %d\n", ndd->nsarea.config_size); 61 dev_dbg(dev, "config data size: %d\n", ndd->nsarea.config_size);
56 62
63 nvdimm_bus_lock(dev);
64 ndd->ns_current = nd_label_validate(ndd);
65 ndd->ns_next = nd_label_next_nsindex(ndd->ns_current);
66 nd_label_copy(ndd, to_next_namespace_index(ndd),
67 to_current_namespace_index(ndd));
68 rc = nd_label_reserve_dpa(ndd);
69 nvdimm_bus_unlock(dev);
70
71 if (rc)
72 goto err;
73
57 return 0; 74 return 0;
58 75
59 err: 76 err:
@@ -64,7 +81,13 @@ static int nvdimm_probe(struct device *dev)
64static int nvdimm_remove(struct device *dev) 81static int nvdimm_remove(struct device *dev)
65{ 82{
66 struct nvdimm_drvdata *ndd = dev_get_drvdata(dev); 83 struct nvdimm_drvdata *ndd = dev_get_drvdata(dev);
84 struct resource *res, *_r;
67 85
86 nvdimm_bus_lock(dev);
87 dev_set_drvdata(dev, NULL);
88 for_each_dpa_resource_safe(ndd, res, _r)
89 nvdimm_free_dpa(ndd, res);
90 nvdimm_bus_unlock(dev);
68 free_data(ndd); 91 free_data(ndd);
69 92
70 return 0; 93 return 0;
diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c
index bdf8241b6525..d2ef02e4be6c 100644
--- a/drivers/nvdimm/dimm_devs.c
+++ b/drivers/nvdimm/dimm_devs.c
@@ -92,8 +92,12 @@ int nvdimm_init_config_data(struct nvdimm_drvdata *ndd)
92 if (ndd->data) 92 if (ndd->data)
93 return 0; 93 return 0;
94 94
95 if (ndd->nsarea.status || ndd->nsarea.max_xfer == 0) 95 if (ndd->nsarea.status || ndd->nsarea.max_xfer == 0
96 || ndd->nsarea.config_size < ND_LABEL_MIN_SIZE) {
97 dev_dbg(ndd->dev, "failed to init config data area: (%d:%d)\n",
98 ndd->nsarea.max_xfer, ndd->nsarea.config_size);
96 return -ENXIO; 99 return -ENXIO;
100 }
97 101
98 ndd->data = kmalloc(ndd->nsarea.config_size, GFP_KERNEL); 102 ndd->data = kmalloc(ndd->nsarea.config_size, GFP_KERNEL);
99 if (!ndd->data) 103 if (!ndd->data)
@@ -243,6 +247,30 @@ struct nvdimm *nvdimm_create(struct nvdimm_bus *nvdimm_bus, void *provider_data,
243} 247}
244EXPORT_SYMBOL_GPL(nvdimm_create); 248EXPORT_SYMBOL_GPL(nvdimm_create);
245 249
250void nvdimm_free_dpa(struct nvdimm_drvdata *ndd, struct resource *res)
251{
252 WARN_ON_ONCE(!is_nvdimm_bus_locked(ndd->dev));
253 kfree(res->name);
254 __release_region(&ndd->dpa, res->start, resource_size(res));
255}
256
257struct resource *nvdimm_allocate_dpa(struct nvdimm_drvdata *ndd,
258 struct nd_label_id *label_id, resource_size_t start,
259 resource_size_t n)
260{
261 char *name = kmemdup(label_id, sizeof(*label_id), GFP_KERNEL);
262 struct resource *res;
263
264 if (!name)
265 return NULL;
266
267 WARN_ON_ONCE(!is_nvdimm_bus_locked(ndd->dev));
268 res = __request_region(&ndd->dpa, start, n, name, 0);
269 if (!res)
270 kfree(name);
271 return res;
272}
273
246static int count_dimms(struct device *dev, void *c) 274static int count_dimms(struct device *dev, void *c)
247{ 275{
248 int *count = c; 276 int *count = c;
diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
new file mode 100644
index 000000000000..db5d7492dc8d
--- /dev/null
+++ b/drivers/nvdimm/label.c
@@ -0,0 +1,290 @@
1/*
2 * Copyright(c) 2013-2015 Intel Corporation. All rights reserved.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of version 2 of the GNU General Public License as
6 * published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful, but
9 * WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11 * General Public License for more details.
12 */
13#include <linux/device.h>
14#include <linux/ndctl.h>
15#include <linux/io.h>
16#include <linux/nd.h>
17#include "nd-core.h"
18#include "label.h"
19#include "nd.h"
20
21static u32 best_seq(u32 a, u32 b)
22{
23 a &= NSINDEX_SEQ_MASK;
24 b &= NSINDEX_SEQ_MASK;
25
26 if (a == 0 || a == b)
27 return b;
28 else if (b == 0)
29 return a;
30 else if (nd_inc_seq(a) == b)
31 return b;
32 else
33 return a;
34}
35
36size_t sizeof_namespace_index(struct nvdimm_drvdata *ndd)
37{
38 u32 index_span;
39
40 if (ndd->nsindex_size)
41 return ndd->nsindex_size;
42
43 /*
44 * The minimum index space is 512 bytes, with that amount of
45 * index we can describe ~1400 labels which is less than a byte
46 * of overhead per label. Round up to a byte of overhead per
47 * label and determine the size of the index region. Yes, this
48 * starts to waste space at larger config_sizes, but it's
49 * unlikely we'll ever see anything but 128K.
50 */
51 index_span = ndd->nsarea.config_size / 129;
52 index_span /= NSINDEX_ALIGN * 2;
53 ndd->nsindex_size = index_span * NSINDEX_ALIGN;
54
55 return ndd->nsindex_size;
56}
57
58int nd_label_validate(struct nvdimm_drvdata *ndd)
59{
60 /*
61 * On media label format consists of two index blocks followed
62 * by an array of labels. None of these structures are ever
63 * updated in place. A sequence number tracks the current
64 * active index and the next one to write, while labels are
65 * written to free slots.
66 *
67 * +------------+
68 * | |
69 * | nsindex0 |
70 * | |
71 * +------------+
72 * | |
73 * | nsindex1 |
74 * | |
75 * +------------+
76 * | label0 |
77 * +------------+
78 * | label1 |
79 * +------------+
80 * | |
81 * ....nslot...
82 * | |
83 * +------------+
84 * | labelN |
85 * +------------+
86 */
87 struct nd_namespace_index *nsindex[] = {
88 to_namespace_index(ndd, 0),
89 to_namespace_index(ndd, 1),
90 };
91 const int num_index = ARRAY_SIZE(nsindex);
92 struct device *dev = ndd->dev;
93 bool valid[2] = { 0 };
94 int i, num_valid = 0;
95 u32 seq;
96
97 for (i = 0; i < num_index; i++) {
98 u32 nslot;
99 u8 sig[NSINDEX_SIG_LEN];
100 u64 sum_save, sum, size;
101
102 memcpy(sig, nsindex[i]->sig, NSINDEX_SIG_LEN);
103 if (memcmp(sig, NSINDEX_SIGNATURE, NSINDEX_SIG_LEN) != 0) {
104 dev_dbg(dev, "%s: nsindex%d signature invalid\n",
105 __func__, i);
106 continue;
107 }
108 sum_save = __le64_to_cpu(nsindex[i]->checksum);
109 nsindex[i]->checksum = __cpu_to_le64(0);
110 sum = nd_fletcher64(nsindex[i], sizeof_namespace_index(ndd), 1);
111 nsindex[i]->checksum = __cpu_to_le64(sum_save);
112 if (sum != sum_save) {
113 dev_dbg(dev, "%s: nsindex%d checksum invalid\n",
114 __func__, i);
115 continue;
116 }
117
118 seq = __le32_to_cpu(nsindex[i]->seq);
119 if ((seq & NSINDEX_SEQ_MASK) == 0) {
120 dev_dbg(dev, "%s: nsindex%d sequence: %#x invalid\n",
121 __func__, i, seq);
122 continue;
123 }
124
125 /* sanity check the index against expected values */
126 if (__le64_to_cpu(nsindex[i]->myoff)
127 != i * sizeof_namespace_index(ndd)) {
128 dev_dbg(dev, "%s: nsindex%d myoff: %#llx invalid\n",
129 __func__, i, (unsigned long long)
130 __le64_to_cpu(nsindex[i]->myoff));
131 continue;
132 }
133 if (__le64_to_cpu(nsindex[i]->otheroff)
134 != (!i) * sizeof_namespace_index(ndd)) {
135 dev_dbg(dev, "%s: nsindex%d otheroff: %#llx invalid\n",
136 __func__, i, (unsigned long long)
137 __le64_to_cpu(nsindex[i]->otheroff));
138 continue;
139 }
140
141 size = __le64_to_cpu(nsindex[i]->mysize);
142 if (size > sizeof_namespace_index(ndd)
143 || size < sizeof(struct nd_namespace_index)) {
144 dev_dbg(dev, "%s: nsindex%d mysize: %#llx invalid\n",
145 __func__, i, size);
146 continue;
147 }
148
149 nslot = __le32_to_cpu(nsindex[i]->nslot);
150 if (nslot * sizeof(struct nd_namespace_label)
151 + 2 * sizeof_namespace_index(ndd)
152 > ndd->nsarea.config_size) {
153 dev_dbg(dev, "%s: nsindex%d nslot: %u invalid, config_size: %#x\n",
154 __func__, i, nslot,
155 ndd->nsarea.config_size);
156 continue;
157 }
158 valid[i] = true;
159 num_valid++;
160 }
161
162 switch (num_valid) {
163 case 0:
164 break;
165 case 1:
166 for (i = 0; i < num_index; i++)
167 if (valid[i])
168 return i;
169 /* can't have num_valid > 0 but valid[] = { false, false } */
170 WARN_ON(1);
171 break;
172 default:
173 /* pick the best index... */
174 seq = best_seq(__le32_to_cpu(nsindex[0]->seq),
175 __le32_to_cpu(nsindex[1]->seq));
176 if (seq == (__le32_to_cpu(nsindex[1]->seq) & NSINDEX_SEQ_MASK))
177 return 1;
178 else
179 return 0;
180 break;
181 }
182
183 return -1;
184}
185
186void nd_label_copy(struct nvdimm_drvdata *ndd, struct nd_namespace_index *dst,
187 struct nd_namespace_index *src)
188{
189 if (dst && src)
190 /* pass */;
191 else
192 return;
193
194 memcpy(dst, src, sizeof_namespace_index(ndd));
195}
196
197static struct nd_namespace_label *nd_label_base(struct nvdimm_drvdata *ndd)
198{
199 void *base = to_namespace_index(ndd, 0);
200
201 return base + 2 * sizeof_namespace_index(ndd);
202}
203
204#define for_each_clear_bit_le(bit, addr, size) \
205 for ((bit) = find_next_zero_bit_le((addr), (size), 0); \
206 (bit) < (size); \
207 (bit) = find_next_zero_bit_le((addr), (size), (bit) + 1))
208
209/**
210 * preamble_current - common variable initialization for nd_label_* routines
211 * @ndd: dimm container for the relevant label set
212 * @nsindex_out: on return set to the currently active namespace index
213 * @free: on return set to the free label bitmap in the index
214 * @nslot: on return set to the number of slots in the label space
215 */
216static bool preamble_current(struct nvdimm_drvdata *ndd,
217 struct nd_namespace_index **nsindex_out,
218 unsigned long **free, u32 *nslot)
219{
220 struct nd_namespace_index *nsindex;
221
222 nsindex = to_current_namespace_index(ndd);
223 if (nsindex == NULL)
224 return false;
225
226 *free = (unsigned long *) nsindex->free;
227 *nslot = __le32_to_cpu(nsindex->nslot);
228 *nsindex_out = nsindex;
229
230 return true;
231}
232
233static char *nd_label_gen_id(struct nd_label_id *label_id, u8 *uuid, u32 flags)
234{
235 if (!label_id || !uuid)
236 return NULL;
237 snprintf(label_id->id, ND_LABEL_ID_SIZE, "%s-%pUb",
238 flags & NSLABEL_FLAG_LOCAL ? "blk" : "pmem", uuid);
239 return label_id->id;
240}
241
242static bool slot_valid(struct nd_namespace_label *nd_label, u32 slot)
243{
244 /* check that we are written where we expect to be written */
245 if (slot != __le32_to_cpu(nd_label->slot))
246 return false;
247
248 /* check that DPA allocations are page aligned */
249 if ((__le64_to_cpu(nd_label->dpa)
250 | __le64_to_cpu(nd_label->rawsize)) % SZ_4K)
251 return false;
252
253 return true;
254}
255
256int nd_label_reserve_dpa(struct nvdimm_drvdata *ndd)
257{
258 struct nd_namespace_index *nsindex;
259 unsigned long *free;
260 u32 nslot, slot;
261
262 if (!preamble_current(ndd, &nsindex, &free, &nslot))
263 return 0; /* no label, nothing to reserve */
264
265 for_each_clear_bit_le(slot, free, nslot) {
266 struct nd_namespace_label *nd_label;
267 struct nd_region *nd_region = NULL;
268 u8 label_uuid[NSLABEL_UUID_LEN];
269 struct nd_label_id label_id;
270 struct resource *res;
271 u32 flags;
272
273 nd_label = nd_label_base(ndd) + slot;
274
275 if (!slot_valid(nd_label, slot))
276 continue;
277
278 memcpy(label_uuid, nd_label->uuid, NSLABEL_UUID_LEN);
279 flags = __le32_to_cpu(nd_label->flags);
280 nd_label_gen_id(&label_id, label_uuid, flags);
281 res = nvdimm_allocate_dpa(ndd, &label_id,
282 __le64_to_cpu(nd_label->dpa),
283 __le64_to_cpu(nd_label->rawsize));
284 nd_dbg_dpa(nd_region, ndd, res, "reserve\n");
285 if (!res)
286 return -EBUSY;
287 }
288
289 return 0;
290}
diff --git a/drivers/nvdimm/label.h b/drivers/nvdimm/label.h
new file mode 100644
index 000000000000..d6aa0d5c6b4e
--- /dev/null
+++ b/drivers/nvdimm/label.h
@@ -0,0 +1,128 @@
1/*
2 * Copyright(c) 2013-2015 Intel Corporation. All rights reserved.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of version 2 of the GNU General Public License as
6 * published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful, but
9 * WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11 * General Public License for more details.
12 */
13#ifndef __LABEL_H__
14#define __LABEL_H__
15
16#include <linux/ndctl.h>
17#include <linux/sizes.h>
18#include <linux/io.h>
19
20enum {
21 NSINDEX_SIG_LEN = 16,
22 NSINDEX_ALIGN = 256,
23 NSINDEX_SEQ_MASK = 0x3,
24 NSLABEL_UUID_LEN = 16,
25 NSLABEL_NAME_LEN = 64,
26 NSLABEL_FLAG_ROLABEL = 0x1, /* read-only label */
27 NSLABEL_FLAG_LOCAL = 0x2, /* DIMM-local namespace */
28 NSLABEL_FLAG_BTT = 0x4, /* namespace contains a BTT */
29 NSLABEL_FLAG_UPDATING = 0x8, /* label being updated */
30 BTT_ALIGN = 4096, /* all btt structures */
31 BTTINFO_SIG_LEN = 16,
32 BTTINFO_UUID_LEN = 16,
33 BTTINFO_FLAG_ERROR = 0x1, /* error state (read-only) */
34 BTTINFO_MAJOR_VERSION = 1,
35 ND_LABEL_MIN_SIZE = 512 * 129, /* see sizeof_namespace_index() */
36 ND_LABEL_ID_SIZE = 50,
37};
38
39static const char NSINDEX_SIGNATURE[] = "NAMESPACE_INDEX\0";
40
41/**
42 * struct nd_namespace_index - label set superblock
43 * @sig: NAMESPACE_INDEX\0
44 * @flags: placeholder
45 * @seq: sequence number for this index
46 * @myoff: offset of this index in label area
47 * @mysize: size of this index struct
48 * @otheroff: offset of other index
49 * @labeloff: offset of first label slot
50 * @nslot: total number of label slots
51 * @major: label area major version
52 * @minor: label area minor version
53 * @checksum: fletcher64 of all fields
54 * @free[0]: bitmap, nlabel bits
55 *
56 * The size of free[] is rounded up so the total struct size is a
57 * multiple of NSINDEX_ALIGN bytes. Any bits this allocates beyond
58 * nlabel bits must be zero.
59 */
60struct nd_namespace_index {
61 u8 sig[NSINDEX_SIG_LEN];
62 __le32 flags;
63 __le32 seq;
64 __le64 myoff;
65 __le64 mysize;
66 __le64 otheroff;
67 __le64 labeloff;
68 __le32 nslot;
69 __le16 major;
70 __le16 minor;
71 __le64 checksum;
72 u8 free[0];
73};
74
75/**
76 * struct nd_namespace_label - namespace superblock
77 * @uuid: UUID per RFC 4122
78 * @name: optional name (NULL-terminated)
79 * @flags: see NSLABEL_FLAG_*
80 * @nlabel: num labels to describe this ns
81 * @position: labels position in set
82 * @isetcookie: interleave set cookie
83 * @lbasize: LBA size in bytes or 0 for pmem
84 * @dpa: DPA of NVM range on this DIMM
85 * @rawsize: size of namespace
86 * @slot: slot of this label in label area
87 * @unused: must be zero
88 */
89struct nd_namespace_label {
90 u8 uuid[NSLABEL_UUID_LEN];
91 u8 name[NSLABEL_NAME_LEN];
92 __le32 flags;
93 __le16 nlabel;
94 __le16 position;
95 __le64 isetcookie;
96 __le64 lbasize;
97 __le64 dpa;
98 __le64 rawsize;
99 __le32 slot;
100 __le32 unused;
101};
102
103/**
104 * struct nd_label_id - identifier string for dpa allocation
105 * @id: "{blk|pmem}-<namespace uuid>"
106 */
107struct nd_label_id {
108 char id[ND_LABEL_ID_SIZE];
109};
110
111/*
112 * If the 'best' index is invalid, so is the 'next' index. Otherwise,
113 * the next index is MOD(index+1, 2)
114 */
115static inline int nd_label_next_nsindex(int index)
116{
117 if (index < 0)
118 return -1;
119
120 return (index + 1) % 2;
121}
122
123struct nvdimm_drvdata;
124int nd_label_validate(struct nvdimm_drvdata *ndd);
125void nd_label_copy(struct nvdimm_drvdata *ndd, struct nd_namespace_index *dst,
126 struct nd_namespace_index *src);
127size_t sizeof_namespace_index(struct nvdimm_drvdata *ndd);
128#endif /* __LABEL_H__ */
diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index 0285e4588b03..401fa0d5b6ea 100644
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -16,11 +16,15 @@
16#include <linux/device.h> 16#include <linux/device.h>
17#include <linux/mutex.h> 17#include <linux/mutex.h>
18#include <linux/ndctl.h> 18#include <linux/ndctl.h>
19#include "label.h"
19 20
20struct nvdimm_drvdata { 21struct nvdimm_drvdata {
21 struct device *dev; 22 struct device *dev;
23 int nsindex_size;
22 struct nd_cmd_get_config_size nsarea; 24 struct nd_cmd_get_config_size nsarea;
23 void *data; 25 void *data;
26 int ns_current, ns_next;
27 struct resource dpa;
24}; 28};
25 29
26struct nd_region_namespaces { 30struct nd_region_namespaces {
@@ -28,6 +32,37 @@ struct nd_region_namespaces {
28 int active; 32 int active;
29}; 33};
30 34
35static inline struct nd_namespace_index *to_namespace_index(
36 struct nvdimm_drvdata *ndd, int i)
37{
38 if (i < 0)
39 return NULL;
40
41 return ndd->data + sizeof_namespace_index(ndd) * i;
42}
43
44static inline struct nd_namespace_index *to_current_namespace_index(
45 struct nvdimm_drvdata *ndd)
46{
47 return to_namespace_index(ndd, ndd->ns_current);
48}
49
50static inline struct nd_namespace_index *to_next_namespace_index(
51 struct nvdimm_drvdata *ndd)
52{
53 return to_namespace_index(ndd, ndd->ns_next);
54}
55
56#define nd_dbg_dpa(r, d, res, fmt, arg...) \
57 dev_dbg((r) ? &(r)->dev : (d)->dev, "%s: %.13s: %#llx @ %#llx " fmt, \
58 (r) ? dev_name((d)->dev) : "", res ? res->name : "null", \
59 (unsigned long long) (res ? resource_size(res) : 0), \
60 (unsigned long long) (res ? res->start : 0), ##arg)
61
62#define for_each_dpa_resource_safe(ndd, res, next) \
63 for (res = (ndd)->dpa.child, next = res ? res->sibling : NULL; \
64 res; res = next, next = next ? next->sibling : NULL)
65
31struct nd_region { 66struct nd_region {
32 struct device dev; 67 struct device dev;
33 u16 ndr_mappings; 68 u16 ndr_mappings;
@@ -39,6 +74,15 @@ struct nd_region {
39 struct nd_mapping mapping[0]; 74 struct nd_mapping mapping[0];
40}; 75};
41 76
77/*
78 * Lookup next in the repeating sequence of 01, 10, and 11.
79 */
80static inline unsigned nd_inc_seq(unsigned seq)
81{
82 static const unsigned next[] = { 0, 2, 3, 1 };
83
84 return next[seq & 3];
85}
42enum nd_async_mode { 86enum nd_async_mode {
43 ND_SYNC, 87 ND_SYNC,
44 ND_ASYNC, 88 ND_ASYNC,
@@ -58,4 +102,9 @@ int nd_region_register_namespaces(struct nd_region *nd_region, int *err);
58void nvdimm_bus_lock(struct device *dev); 102void nvdimm_bus_lock(struct device *dev);
59void nvdimm_bus_unlock(struct device *dev); 103void nvdimm_bus_unlock(struct device *dev);
60bool is_nvdimm_bus_locked(struct device *dev); 104bool is_nvdimm_bus_locked(struct device *dev);
105int nd_label_reserve_dpa(struct nvdimm_drvdata *ndd);
106void nvdimm_free_dpa(struct nvdimm_drvdata *ndd, struct resource *res);
107struct resource *nvdimm_allocate_dpa(struct nvdimm_drvdata *ndd,
108 struct nd_label_id *label_id, resource_size_t start,
109 resource_size_t n);
61#endif /* __ND_H__ */ 110#endif /* __ND_H__ */