diff options
author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-05-17 03:15:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-17 11:51:59 -0400 |
commit | 39eb7e9791866973dbb7a3a6d2061d70356c7d90 (patch) | |
tree | bfd4e74f43031fa0ae05636c215a3a60a7f5ae23 /fs/pstore | |
parent | 896fc1f0c4c6c19b270734f274be67cb0e8a24af (diff) |
pstore/ram: Add ECC support
This is now straightforward: just introduce a module parameter and pass
the needed value to persistent_ram_new().
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Acked-by: Marco Stornelli <marco.stornelli@gmail.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pstore')
-rw-r--r-- | fs/pstore/ram.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 62b13eda4691..9123cce28c1e 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c | |||
@@ -56,12 +56,18 @@ module_param(dump_oops, int, 0600); | |||
56 | MODULE_PARM_DESC(dump_oops, | 56 | MODULE_PARM_DESC(dump_oops, |
57 | "set to 1 to dump oopses, 0 to only dump panics (default 1)"); | 57 | "set to 1 to dump oopses, 0 to only dump panics (default 1)"); |
58 | 58 | ||
59 | static int ramoops_ecc; | ||
60 | module_param_named(ecc, ramoops_ecc, int, 0600); | ||
61 | MODULE_PARM_DESC(ramoops_ecc, | ||
62 | "set to 1 to enable ECC support"); | ||
63 | |||
59 | struct ramoops_context { | 64 | struct ramoops_context { |
60 | struct persistent_ram_zone **przs; | 65 | struct persistent_ram_zone **przs; |
61 | phys_addr_t phys_addr; | 66 | phys_addr_t phys_addr; |
62 | unsigned long size; | 67 | unsigned long size; |
63 | size_t record_size; | 68 | size_t record_size; |
64 | int dump_oops; | 69 | int dump_oops; |
70 | bool ecc; | ||
65 | unsigned int count; | 71 | unsigned int count; |
66 | unsigned int max_count; | 72 | unsigned int max_count; |
67 | unsigned int read_count; | 73 | unsigned int read_count; |
@@ -236,6 +242,7 @@ static int __init ramoops_probe(struct platform_device *pdev) | |||
236 | cxt->phys_addr = pdata->mem_address; | 242 | cxt->phys_addr = pdata->mem_address; |
237 | cxt->record_size = pdata->record_size; | 243 | cxt->record_size = pdata->record_size; |
238 | cxt->dump_oops = pdata->dump_oops; | 244 | cxt->dump_oops = pdata->dump_oops; |
245 | cxt->ecc = pdata->ecc; | ||
239 | 246 | ||
240 | cxt->przs = kzalloc(sizeof(*cxt->przs) * cxt->max_count, GFP_KERNEL); | 247 | cxt->przs = kzalloc(sizeof(*cxt->przs) * cxt->max_count, GFP_KERNEL); |
241 | if (!cxt->przs) { | 248 | if (!cxt->przs) { |
@@ -248,7 +255,7 @@ static int __init ramoops_probe(struct platform_device *pdev) | |||
248 | size_t sz = cxt->record_size; | 255 | size_t sz = cxt->record_size; |
249 | phys_addr_t start = cxt->phys_addr + sz * i; | 256 | phys_addr_t start = cxt->phys_addr + sz * i; |
250 | 257 | ||
251 | cxt->przs[i] = persistent_ram_new(start, sz, 0); | 258 | cxt->przs[i] = persistent_ram_new(start, sz, cxt->ecc); |
252 | if (IS_ERR(cxt->przs[i])) { | 259 | if (IS_ERR(cxt->przs[i])) { |
253 | err = PTR_ERR(cxt->przs[i]); | 260 | err = PTR_ERR(cxt->przs[i]); |
254 | dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n", | 261 | dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n", |
@@ -281,9 +288,10 @@ static int __init ramoops_probe(struct platform_device *pdev) | |||
281 | record_size = pdata->record_size; | 288 | record_size = pdata->record_size; |
282 | dump_oops = pdata->dump_oops; | 289 | dump_oops = pdata->dump_oops; |
283 | 290 | ||
284 | pr_info("attached 0x%lx@0x%llx (%ux0x%zx)\n", | 291 | pr_info("attached 0x%lx@0x%llx (%ux0x%zx), ecc: %s\n", |
285 | cxt->size, (unsigned long long)cxt->phys_addr, | 292 | cxt->size, (unsigned long long)cxt->phys_addr, |
286 | cxt->max_count, cxt->record_size); | 293 | cxt->max_count, cxt->record_size, |
294 | ramoops_ecc ? "on" : "off"); | ||
287 | 295 | ||
288 | return 0; | 296 | return 0; |
289 | 297 | ||
@@ -347,6 +355,7 @@ static int __init ramoops_init(void) | |||
347 | dummy_data->mem_address = mem_address; | 355 | dummy_data->mem_address = mem_address; |
348 | dummy_data->record_size = record_size; | 356 | dummy_data->record_size = record_size; |
349 | dummy_data->dump_oops = dump_oops; | 357 | dummy_data->dump_oops = dump_oops; |
358 | dummy_data->ecc = ramoops_ecc; | ||
350 | dummy = platform_create_bundle(&ramoops_driver, ramoops_probe, | 359 | dummy = platform_create_bundle(&ramoops_driver, ramoops_probe, |
351 | NULL, 0, dummy_data, | 360 | NULL, 0, dummy_data, |
352 | sizeof(struct ramoops_platform_data)); | 361 | sizeof(struct ramoops_platform_data)); |