Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1908728ybv; Sun, 23 Feb 2020 18:10:52 -0800 (PST) X-Google-Smtp-Source: APXvYqyqVRZLzvGjx5Ggi24J3txw4EVu24ntWG21NHCUsE0veRK573Y1rnhAdn0+y2uXzrf8mzeZ X-Received: by 2002:a05:6830:1e2d:: with SMTP id t13mr39679566otr.128.1582510252064; Sun, 23 Feb 2020 18:10:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582510252; cv=none; d=google.com; s=arc-20160816; b=MqvKeDSnXIYdSxyijyap7vayu0b+JUS3A4aGu9ZztbJTae+EFFmRmWlD/AfxylZ+xJ xVkk4PFrDOWQMZtUDTpvpUH+RczPNc1RAT3Obng+gyzrBHXMIoc0g9oRtyjBUfapIFAf d9+bJeqXr1vG5Odng5wJXopbCC/CQ5/moQO4r7bwKcMYUbqbn5in3H3YWFWY/57AlgRI 6n1lSdfFdQnoGi67mRy5y+PmDhMJl9kvJ6yjqD6V4jyvqdi1D8Ymgu3771mrQeplNmby SBlnpmnCZ4zbmrBaQBDrAlwqWr84JS0+3QtgINl49b3OD4357uUVSga6I9PdDwCm8p/V 2YOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:mime-version :message-id:date:dkim-signature; bh=xXnVPSTtq6JKEca5i5uwLN/shdFSGa9fDblOik0nzOE=; b=qCbr1SyB6jleFFe2/kGksK1mKxcRK8QISC94Rjo47F70VaEB66djRLGFXPz3LV3M/z xOUyUkgQJg7/rRmemFThXFcAIJPTqV3wN63ntpUX2jBTPp6otLLoKhqoPvvib1P6gAhy YCWDzkv38NPBLK/GEUBuhBZa7tZlcjmdtcbyi19dhshJXaGS25+tbqFkt3H7V8++b6gI PmuQ+1JVUUYYNZXRySa1DfNdJ/oISHf1zb4ZkA8a7NfLByjH968RvCiD1DcaaFzNHwEu gjKvyRJCtN/NTmTGEf+ZBBFiN2fDRPlLmK2kcmLQhaQ7gDC+tAdfnTGtXrRuC2Uxnajq 8Btg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ewQZZzHb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r4si5415432otq.188.2020.02.23.18.10.40; Sun, 23 Feb 2020 18:10:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ewQZZzHb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727193AbgBXCKc (ORCPT + 99 others); Sun, 23 Feb 2020 21:10:32 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:37438 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727169AbgBXCKc (ORCPT ); Sun, 23 Feb 2020 21:10:32 -0500 Received: by mail-pf1-f202.google.com with SMTP id x10so5665286pfn.4 for ; Sun, 23 Feb 2020 18:10:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=xXnVPSTtq6JKEca5i5uwLN/shdFSGa9fDblOik0nzOE=; b=ewQZZzHbAIm9IaVDu9F0bc2esO1BNMP2dV5Rp45y8mFa8Z0HBz43i3HohNjPmgKnZF iGvAM0Z71h7ZTE66msAdaRCfRpaOSuKti3gKQcx16Iza8AaubCFm30jx7F0Y8VJdz56P p5JifXyJlkxxvdhB0WTwuFfXVQ90hE8ZMGORE/RZCHHPnqei3atfgwfHGcNA3I1FZ18h 0Iuvr5oHofTsZzrJmhJipc5xrmilXc5ctdxC6HQ5QgYDVHvMWu4d5abZXY/KvQjNxha7 Hkur+YO1PRIZeqbJcGRVm8AwuZFnIei1lXZgQF++GRM57usyRdsHLq5QnO0h2KmhgnQA RitA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=xXnVPSTtq6JKEca5i5uwLN/shdFSGa9fDblOik0nzOE=; b=cP4a0idI9lHLHPs9565NAMisNPp1GkkW8mSg1JdsnLRwomZIr3Asow+DfwaOWOaTD9 1//DX2fOfWpxvObaE1N5StTqsZXym1qm+Dpri869FmZOjJgPyyDlD+pHmomZOOKjQq0L FTsN7Ligh96MvjPK1HW4yGFNgoQMrEF0upY83vQf2lye802SNq2toC3E2da7tzae4dib XLXEOrJLmHXaToqWlCxHDT9eMB7+s4f9nv9qCCk1HwnPXHvEJL7rVEz5/bGq4AVQpZBK Dg7cD7dFaCKuo0RfiwJm8loGWaAb5Z6XLPSFKXyqLJ8h+99yb+ufRzvGaJC1+ZhhBw7J 84Gg== X-Gm-Message-State: APjAAAUcqGN4gyFVpoQN5lZvYjxMhRTwrBbzgoMxpuT1NcQgZnvbNAVv BcjESh+iIWm6+ovJzKeuUivb/PmqRsMc6F60d3l1vPoIIwOZH0nToH8ydh3KON9kRzbE2o2OJ8G 6niS0FocLuoggYM+tiIu9kwnMjAYxReIObM6dAtHKPR/hREAbpdEMpnnltwoC+ByPXf6sxw== X-Received: by 2002:a63:8743:: with SMTP id i64mr49147206pge.243.1582510231389; Sun, 23 Feb 2020 18:10:31 -0800 (PST) Date: Sun, 23 Feb 2020 18:10:27 -0800 Message-Id: <20200224021029.142701-1-adelva@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog Subject: [PATCH v3 1/3] libnvdimm/of_pmem: factor out region registration From: Alistair Delva To: linux-kernel@vger.kernel.org Cc: Kenny Root , "Oliver O'Halloran" , Rob Herring , Dan Williams , Vishal Verma , Dave Jiang , Ira Weiny , devicetree@vger.kernel.org, linux-nvdimm@lists.01.org, kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kenny Root Factor out region registration for 'reg' node. A follow-up change will use of_pmem_register_region() to handle memory-region nodes too. Signed-off-by: Kenny Root Signed-off-by: Alistair Delva Reviewed-by: "Oliver O'Halloran" Cc: Rob Herring Cc: Dan Williams Cc: Vishal Verma Cc: Dave Jiang Cc: Ira Weiny Cc: devicetree@vger.kernel.org Cc: linux-nvdimm@lists.01.org Cc: kernel-team@android.com --- [v3: adelva: remove duplicate "From:"] drivers/nvdimm/of_pmem.c | 60 +++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c index 8224d1431ea9..fdf54494e8c9 100644 --- a/drivers/nvdimm/of_pmem.c +++ b/drivers/nvdimm/of_pmem.c @@ -14,6 +14,39 @@ struct of_pmem_private { struct nvdimm_bus *bus; }; +static void of_pmem_register_region(struct platform_device *pdev, + struct nvdimm_bus *bus, + struct device_node *np, + struct resource *res, bool is_volatile) +{ + struct nd_region_desc ndr_desc; + struct nd_region *region; + + /* + * NB: libnvdimm copies the data from ndr_desc into it's own + * structures so passing a stack pointer is fine. + */ + memset(&ndr_desc, 0, sizeof(ndr_desc)); + ndr_desc.numa_node = dev_to_node(&pdev->dev); + ndr_desc.target_node = ndr_desc.numa_node; + ndr_desc.res = res; + ndr_desc.of_node = np; + set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); + + if (is_volatile) + region = nvdimm_volatile_region_create(bus, &ndr_desc); + else + region = nvdimm_pmem_region_create(bus, &ndr_desc); + + if (!region) + dev_warn(&pdev->dev, + "Unable to register region %pR from %pOF\n", + ndr_desc.res, np); + else + dev_dbg(&pdev->dev, "Registered region %pR from %pOF\n", + ndr_desc.res, np); +} + static int of_pmem_region_probe(struct platform_device *pdev) { struct of_pmem_private *priv; @@ -46,31 +79,8 @@ static int of_pmem_region_probe(struct platform_device *pdev) is_volatile ? "volatile" : "non-volatile", np); for (i = 0; i < pdev->num_resources; i++) { - struct nd_region_desc ndr_desc; - struct nd_region *region; - - /* - * NB: libnvdimm copies the data from ndr_desc into it's own - * structures so passing a stack pointer is fine. - */ - memset(&ndr_desc, 0, sizeof(ndr_desc)); - ndr_desc.numa_node = dev_to_node(&pdev->dev); - ndr_desc.target_node = ndr_desc.numa_node; - ndr_desc.res = &pdev->resource[i]; - ndr_desc.of_node = np; - set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); - - if (is_volatile) - region = nvdimm_volatile_region_create(bus, &ndr_desc); - else - region = nvdimm_pmem_region_create(bus, &ndr_desc); - - if (!region) - dev_warn(&pdev->dev, "Unable to register region %pR from %pOF\n", - ndr_desc.res, np); - else - dev_dbg(&pdev->dev, "Registered region %pR from %pOF\n", - ndr_desc.res, np); + of_pmem_register_region(pdev, bus, np, &pdev->resource[i], + is_volatile); } return 0; -- 2.25.0.265.gbab2e86ba0-goog