From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751737AbdB0BzU (ORCPT ); Sun, 26 Feb 2017 20:55:20 -0500 Received: from mail7.hitachi.co.jp ([133.145.228.42]:42183 "EHLO mail7.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299AbdB0ByR (ORCPT ); Sun, 26 Feb 2017 20:54:17 -0500 From: Nobuhiro Iwamatsu To: Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck Cc: linux-kernel@vger.kernel.org, Nobuhiro Iwamatsu , Hiraku Toyooka , Mark Salyzyn , Seiji Aguchi , Shuah Khan Subject: [PATCH v5 2/5] ramoops: Add __ramoops_init_prz() as generic function Date: Mon, 27 Feb 2017 10:53:56 +0900 Message-Id: <1488160439-7140-3-git-send-email-nobuhiro.iwamatsu.kw@hitachi.com> X-Mailer: git-send-email 2.8.1.windows.1 In-Reply-To: <1488160439-7140-1-git-send-email-nobuhiro.iwamatsu.kw@hitachi.com> References: <1488160439-7140-1-git-send-email-nobuhiro.iwamatsu.kw@hitachi.com> X-TM-AS-GCONF: 00 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This commit adds generic function __ramoops_init_prz() to reduce redundancy between ramoops_init_prz() and ramoops_init_przs(). Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Hiraku Toyooka Cc: Anton Vorontsov Cc: Colin Cross Cc: Kees Cook Cc: Mark Salyzyn Cc: Seiji Aguchi Cc: Shuah Khan Cc: Tony Luck 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