Merge tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore

Pull pstore update from Anton Vorontsov:

 - A new platform data parameter to specify ECC configuration;

 - Rounding fixup to not waste memory in ecc_blocks;

 - Restore ECC information printouts;

 - A small code cleanup: use kmemdup where appropriate.

* tag 'for-v3.10' of git://git.infradead.org/users/cbou/linux-pstore:
  pstore/ram: Restore ecc information block
  pstore/ram: Allow specifying ecc parameters in platform data
  pstore/ram: Include ecc_size when calculating ecc_block
  pstore: Replace calls to kmalloc and memcpy with kmemdup

1 files changed, 17 insertions, 9 deletions

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 288f068740f6..32cbd7c8a90c 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -83,7 +83,7 @@ struct ramoops_context {
         size_t console_size;
         size_t ftrace_size;
         int dump_oops;
-        int ecc_size;
+        struct persistent_ram_ecc_info ecc_info;
         unsigned int max_dump_cnt;
         unsigned int dump_write_cnt;
         unsigned int dump_read_cnt;
@@ -136,6 +136,7 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
                                    char **buf, struct pstore_info *psi)
 {
         ssize_t size;
+        ssize_t ecc_notice_size;
         struct ramoops_context *cxt = psi->data;
         struct persistent_ram_zone *prz;
 
@@ -156,12 +157,18 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
         time->tv_nsec = 0;
 
         size = persistent_ram_old_size(prz);
-        *buf = kmalloc(size, GFP_KERNEL);
+
+        /* ECC correction notice */
+        ecc_notice_size = persistent_ram_ecc_string(prz, NULL, 0);
+
+        *buf = kmalloc(size + ecc_notice_size + 1, GFP_KERNEL);
         if (*buf == NULL)
                 return -ENOMEM;
+
         memcpy(*buf, persistent_ram_old(prz), size);
+        persistent_ram_ecc_string(prz, *buf + size, ecc_notice_size + 1);
 
-        return size;
+        return size + ecc_notice_size;
 }
 
 static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz)
@@ -323,7 +330,8 @@ static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
         for (i = 0; i < cxt->max_dump_cnt; i++) {
                 size_t sz = cxt->record_size;
 
-                cxt->przs[i] = persistent_ram_new(*paddr, sz, 0, cxt->ecc_size);
+                cxt->przs[i] = persistent_ram_new(*paddr, sz, 0,
+                                                  &cxt->ecc_info);
                 if (IS_ERR(cxt->przs[i])) {
                         err = PTR_ERR(cxt->przs[i]);
                         dev_err(dev, "failed to request mem region (0x%zx@0x%llx): %d\n",
@@ -353,7 +361,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
                 return -ENOMEM;
         }
 
-        *prz = persistent_ram_new(*paddr, sz, sig, cxt->ecc_size);
+        *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info);
         if (IS_ERR(*prz)) {
                 int err = PTR_ERR(*prz);
 
@@ -407,7 +415,7 @@ static int ramoops_probe(struct platform_device *pdev)
         cxt->console_size = pdata->console_size;
         cxt->ftrace_size = pdata->ftrace_size;
         cxt->dump_oops = pdata->dump_oops;
-        cxt->ecc_size = pdata->ecc_size;
+        cxt->ecc_info = pdata->ecc_info;
 
         paddr = cxt->phys_addr;
 
@@ -465,9 +473,9 @@ static int ramoops_probe(struct platform_device *pdev)
         record_size = pdata->record_size;
         dump_oops = pdata->dump_oops;
 
-        pr_info("attached 0x%lx@0x%llx, ecc: %d\n",
+        pr_info("attached 0x%lx@0x%llx, ecc: %d/%d\n",
                 cxt->size, (unsigned long long)cxt->phys_addr,
-                cxt->ecc_size);
+                cxt->ecc_info.ecc_size, cxt->ecc_info.block_size);
 
         return 0;
 
@@ -539,7 +547,7 @@ static void ramoops_register_dummy(void)
          * For backwards compatibility ramoops.ecc=1 means 16 bytes ECC
          * (using 1 byte for ECC isn't much of use anyway).
          */
-        dummy_data->ecc_size = ramoops_ecc == 1 ? 16 : ramoops_ecc;
+        dummy_data->ecc_info.ecc_size = ramoops_ecc == 1 ? 16 : ramoops_ecc;
 
         dummy = platform_device_register_data(NULL, "ramoops", -1,
                         dummy_data, sizeof(struct ramoops_platform_data));