This commit adds generic function __ramoops_init_prz() to reduce redundancy
between ramoops_init_prz() and ramoops_init_przs().
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu...@hitachi.com>
Signed-off-by: Hiraku Toyooka <hiraku.toyooka...@hitachi.com>
Cc: Anton Vorontsov <an...@enomsg.org>
Cc: Colin Cross <ccr...@android.com>
Cc: Kees Cook <keesc...@chromium.org>
Cc: Mark Salyzyn <saly...@android.com>
Cc: Seiji Aguchi <seiji.aguchi...@hitachi.com>
Cc: Shuah Khan <shua...@osg.samsung.com>
Cc: Tony Luck <tony.l...@intel.com>
V5:
- No changes.
V4:
- Rebase.
V3:
- Rebase.
- Split patch.
---
fs/pstore/ram.c | 73 ++++++++++++++++++++++++++++++---------------------------
1 file changed, 38 insertions(+), 35 deletions(-)
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 8ad2d6d8cec2..48cfeef42cb6 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -520,6 +520,40 @@ static void ramoops_free_przs(struct persistent_ram_zone
**przs)
kfree(przs);
}
+static int __ramoops_init_prz(const char *name,
+ struct device *dev, struct ramoops_context *cxt,
+ struct persistent_ram_zone **prz,
+ phys_addr_t *paddr, size_t sz, u32 sig,
+ u32 flags, bool zap)
+{
+ if (!sz)
+ return 0;
+
+ if (zap && *paddr + sz - cxt->phys_addr > cxt->size) {
+ dev_err(dev, "no room for %s mem region (0x%zx@0x%llx) in
(0x%lx@0x%llx)\n",
+ name, sz, (unsigned long long)*paddr,
+ cxt->size, (unsigned long long)cxt->phys_addr);
+ return -ENOMEM;
+ }
+
+ *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info,
+ cxt->memtype, flags);
+ if (IS_ERR(*prz)) {
+ int err = PTR_ERR(*prz);
+
+ dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx):
%d\n",
+ name, sz, (unsigned long long)*paddr, err);
+ return err;
+ }
+
+ if (zap)
+ persistent_ram_zap(*prz);
+
+ *paddr += sz;
+
+ return 0;
+}
+
static int ramoops_init_przs(const char *name,
struct device *dev, struct ramoops_context *cxt,
struct persistent_ram_zone ***przs,
@@ -580,15 +614,9 @@ static int ramoops_init_przs(const char *name,
goto fail;
for (i = 0; i < *cnt; i++) {
- prz_ar[i] = persistent_ram_new(*paddr, zone_sz, sig,
- &cxt->ecc_info,
- cxt->memtype, flags);
- if (IS_ERR(prz_ar[i])) {
- err = PTR_ERR(prz_ar[i]);
- dev_err(dev, "failed to request %s mem region
(0x%zx@0x%llx): %d\n",
- name, record_size,
- (unsigned long long)*paddr, err);
-
+ err = __ramoops_init_prz(name, dev, cxt, &prz_ar[i], paddr,
+ zone_sz, sig, flags, false);
+ if (err) {
while (i > 0) {
i--;
persistent_ram_free(prz_ar[i]);
@@ -596,7 +624,6 @@ static int ramoops_init_przs(const char *name,
kfree(prz_ar);
goto fail;
}
- *paddr += zone_sz;
}
*przs = prz_ar;
@@ -612,31 +639,7 @@ static int ramoops_init_prz(const char *name,
struct persistent_ram_zone **prz,
phys_addr_t *paddr, size_t sz, u32 sig)
{
- if (!sz)
- return 0;
-
- if (*paddr + sz - cxt->phys_addr > cxt->size) {
- dev_err(dev, "no room for %s mem region (0x%zx@0x%llx) in
(0x%lx@0x%llx)\n",
- name, sz, (unsigned long long)*paddr,
- cxt->size, (unsigned long long)cxt->phys_addr);
- return -ENOMEM;
- }
-
- *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info,
- cxt->memtype, 0);
- if (IS_ERR(*prz)) {
- int err = PTR_ERR(*prz);
-
- dev_err(dev, "failed to request %s mem region (0x%zx@0x%llx):
%d\n",
- name, sz, (unsigned long long)*paddr, err);
- return err;
- }
-
- persistent_ram_zap(*prz);
-
- *paddr += sz;
-
- return 0;
+ return __ramoops_init_prz(name, dev, cxt, prz, paddr, sz, sig, 0, true);
}
static int ramoops_parse_dt_size(struct platform_device *pdev,
--
2.11.0
