Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into...

[sfrench/cifs-2.6.git] / fs / pstore / ram.c

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index dacfe78aee7e00574bfcf00eb371160dbb99fa56..288f068740f6f6e2eb02dea57ed9a5ab1a8b47b8 100644 (file)
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -132,9 +132,8 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max,
 }
 
 static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
-                                  struct timespec *time,
-                                  char **buf,
-                                  struct pstore_info *psi)
+                                  int *count, struct timespec *time,
+                                  char **buf, struct pstore_info *psi)
 {
        ssize_t size;
        struct ramoops_context *cxt = psi->data;
@@ -193,7 +192,7 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
                                            struct pstore_info *psi)
 {
        struct ramoops_context *cxt = psi->data;
-       struct persistent_ram_zone *prz = cxt->przs[cxt->dump_write_cnt];
+       struct persistent_ram_zone *prz;
        size_t hlen;
 
        if (type == PSTORE_TYPE_CONSOLE) {
@@ -230,6 +229,11 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
        if (part != 1)
                return -ENOSPC;
 
+       if (!cxt->przs)
+               return -ENOSPC;
+
+       prz = cxt->przs[cxt->dump_write_cnt];
+
        hlen = ramoops_write_kmsg_hdr(prz);
        if (size + hlen > prz->buffer_size)
                size = prz->buffer_size - hlen;
@@ -240,8 +244,8 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
        return 0;
 }
 
-static int ramoops_pstore_erase(enum pstore_type_id type, u64 id,
-                               struct pstore_info *psi)
+static int ramoops_pstore_erase(enum pstore_type_id type, u64 id, int count,
+                               struct timespec time, struct pstore_info *psi)
 {
        struct ramoops_context *cxt = psi->data;
        struct persistent_ram_zone *prz;
@@ -292,7 +296,7 @@ static void ramoops_free_przs(struct ramoops_context *cxt)
 }
 
 static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
-                             phys_addr_t *paddr, size_t dump_mem_sz)
+                            phys_addr_t *paddr, size_t dump_mem_sz)
 {
        int err = -ENOMEM;
        int i;
@@ -300,6 +304,11 @@ static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
        if (!cxt->record_size)
                return 0;
 
+       if (*paddr + dump_mem_sz - cxt->phys_addr > cxt->size) {
+               dev_err(dev, "no room for dumps\n");
+               return -ENOMEM;
+       }
+
        cxt->max_dump_cnt = dump_mem_sz / cxt->record_size;
        if (!cxt->max_dump_cnt)
                return -ENOMEM;
@@ -337,8 +346,12 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
        if (!sz)
                return 0;
 
-       if (*paddr + sz > *paddr + cxt->size)
+       if (*paddr + sz - cxt->phys_addr > cxt->size) {
+               dev_err(dev, "no room for mem region (0x%zx@0x%llx) in (0x%lx@0x%llx)\n",
+                       sz, (unsigned long long)*paddr,
+                       cxt->size, (unsigned long long)cxt->phys_addr);
                return -ENOMEM;
+       }
 
        *prz = persistent_ram_new(*paddr, sz, sig, cxt->ecc_size);
        if (IS_ERR(*prz)) {
@@ -356,7 +369,7 @@ static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
        return 0;
 }
 
-static int __devinit ramoops_probe(struct platform_device *pdev)
+static int ramoops_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct ramoops_platform_data *pdata = pdev->dev.platform_data;
@@ -378,10 +391,14 @@ static int __devinit ramoops_probe(struct platform_device *pdev)
                goto fail_out;
        }
 
-       pdata->mem_size = rounddown_pow_of_two(pdata->mem_size);
-       pdata->record_size = rounddown_pow_of_two(pdata->record_size);
-       pdata->console_size = rounddown_pow_of_two(pdata->console_size);
-       pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
+       if (!is_power_of_2(pdata->mem_size))
+               pdata->mem_size = rounddown_pow_of_two(pdata->mem_size);
+       if (!is_power_of_2(pdata->record_size))
+               pdata->record_size = rounddown_pow_of_two(pdata->record_size);
+       if (!is_power_of_2(pdata->console_size))
+               pdata->console_size = rounddown_pow_of_two(pdata->console_size);
+       if (!is_power_of_2(pdata->ftrace_size))
+               pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size);
 
        cxt->dump_read_cnt = 0;
        cxt->size = pdata->mem_size;