From patchwork Mon Feb 24 02:10:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Delva X-Patchwork-Id: 204385 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF6DEC35677 for ; Mon, 24 Feb 2020 02:10:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2E2A2067D for ; Mon, 24 Feb 2020 02:10:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ewQZZzHb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727170AbgBXCKc (ORCPT ); Sun, 23 Feb 2020 21:10:32 -0500 Received: from mail-pg1-f202.google.com ([209.85.215.202]:55902 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727151AbgBXCKc (ORCPT ); Sun, 23 Feb 2020 21:10:32 -0500 Received: by mail-pg1-f202.google.com with SMTP id r10so3525557pgu.22 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=USoEZKoKMsi7bWjxAQR3q5t2U10Ib0hG63mRsUfa39YFYbMFv8IVDOaiVwJqttCscZ QUhgoD2bxF4b6+GIW2t6VKXXgmBz1WRrvlok1j2trlJ2IsbKgw4Eq4yJh5CK+klrdY1L gbCkxW8BXmxLTj3iXeu9kFI5pczQzfBx5Tbi1AQg9pP0acy6qmfrCkaRthI2pK7muI7F eDT4AJc9IMUFvvZBdDQJtpMwkjTFXyR+KypGWNRuVbKUsJRrIMFpyaWh01937jNTwZbV n0+RRvJZGJuQjPpfuBEC8Luqkjb52tYADD0E2p5q9n771fmK/z9yJr4a53fsJMVm4nHA Cr4w== X-Gm-Message-State: APjAAAXCnAHwmaopI1wxLl8TxDHUEQku5OOpunmcMgVTjuYZjXgoU+75 ExIWVoef2u3fjc+wAoH7iJ4hc1oZ9Fo= X-Google-Smtp-Source: APXvYqzh7LWx5FHfbXoqvdMOKLDRvpI9RTMgE9OYFl93HPIxPAzkWl5IGjaOk/mtBxp40jqIQkZIat3Is54= 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 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@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; From patchwork Mon Feb 24 02:10:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Delva X-Patchwork-Id: 204384 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A743FC3567A for ; Mon, 24 Feb 2020 02:10:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FC47206E0 for ; Mon, 24 Feb 2020 02:10:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="E+uXnhSN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727261AbgBXCKh (ORCPT ); Sun, 23 Feb 2020 21:10:37 -0500 Received: from mail-pj1-f74.google.com ([209.85.216.74]:37314 "EHLO mail-pj1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727169AbgBXCKh (ORCPT ); Sun, 23 Feb 2020 21:10:37 -0500 Received: by mail-pj1-f74.google.com with SMTP id dw15so5447196pjb.2 for ; Sun, 23 Feb 2020 18:10:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=em6XcUN6Sgd77WYEtwG8AuT1olj7PL/gGgbDqoXx92w=; b=E+uXnhSNXf534z3GjUH2lwNEjBXcWXn9RZ44ynGBLyGFBh6B4SCJ3rTdzfHM+o+Bno VxKLCAHwsdkWJHskFoD9Vkuqmf8sv3ORr03b21RmM6sK4B1dNgs7kHUsncaBgQsK20aP fSSiL3sHi6ZuSaLSU/ac+vt4cTkZWsOgFrQbnhYdCv8sXcHJm4YWmse1gk9vJvta74Pz CtGwlNEpDNXJrKiIYC7aOyrG6lp7JHG+ot6FFt32MXr6s5mwt6uR9xa3rNnYf88dZifz 0PMFwNS6V8oJBOtSVNut319Ez0TbFHLd2ElURqTOriDU/ubyPYQu44SBgjdg9OpeV/wF pVDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=em6XcUN6Sgd77WYEtwG8AuT1olj7PL/gGgbDqoXx92w=; b=QceFLlDI5HhAz6FNjVwF4PUxuZfCAwLyPPbqWGII4xyI493pB7jXQLmxiu+MG6oWDn r+XWKyz0u4L8JhX6lDZcIG0qOjehfRkD+McKBgoF5D9QOdHiSBW3WnYCXYDFq8KSZnKJ SlG+2rmHYSmU8qCd7DKLX9PQrr+F0+x2M5w709Kfa7TKoqzVWJZCplQjsVvOv1spNv2b xjgGfvEzW6jomM/OSZNefZScHGWov1axh3C53L5UWTMnWjmM41BhBkn2bA8owHlqgNVt xi90tLhgXb0Xyt/OhGNSg1ezg0KHaH7LoSvQB+QtdMTaiwcldcW1qOiA/YctoXkcAaJo wODw== X-Gm-Message-State: APjAAAVGAwNkfqPWdr9LdRYQXMJOZfbYsryDiMA2lDTZERd4lc3uJdFr 6nqPN4i3lu0vOL0rXhMdGk07cZKqKxA= X-Google-Smtp-Source: APXvYqz6s2e3jF7ohEb8JyMCoEHwTugiFEQk/Az/WnyXRnhPy25meta77iWUNz38j1pNY9KX9r6A5JnI984= X-Received: by 2002:a63:3407:: with SMTP id b7mr23541684pga.163.1582510236455; Sun, 23 Feb 2020 18:10:36 -0800 (PST) Date: Sun, 23 Feb 2020 18:10:29 -0800 In-Reply-To: <20200224021029.142701-1-adelva@google.com> Message-Id: <20200224021029.142701-3-adelva@google.com> Mime-Version: 1.0 References: <20200224021029.142701-1-adelva@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog Subject: [PATCH v3 3/3] dt-bindings: pmem-region: Document memory-region 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 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Kenny Root Add documentation and example for memory-region in pmem. Signed-off-by: Kenny Root Signed-off-by: Alistair Delva Cc: "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:"] .../devicetree/bindings/pmem/pmem-region.txt | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Documentation/devicetree/bindings/pmem/pmem-region.txt b/Documentation/devicetree/bindings/pmem/pmem-region.txt index 5cfa4f016a00..0ec87bd034e0 100644 --- a/Documentation/devicetree/bindings/pmem/pmem-region.txt +++ b/Documentation/devicetree/bindings/pmem/pmem-region.txt @@ -29,6 +29,18 @@ Required properties: in a separate device node. Having multiple address ranges in a node implies no special relationship between the two ranges. + This property may be replaced or supplemented with a + memory-region property. Only one of reg or memory-region + properties is required. + + - memory-region: + Reference to the reserved memory node. The reserved memory + node should be defined as per the bindings in + reserved-memory.txt + + This property may be replaced or supplemented with a reg + property. Only one of reg or memory-region is required. + Optional properties: - Any relevant NUMA assocativity properties for the target platform. @@ -63,3 +75,20 @@ Examples: volatile; }; + + /* + * This example uses a reserved-memory entry instead of + * specifying the memory region directly in the node. + */ + + reserved-memory { + pmem_1: pmem@5000 { + no-map; + reg = <0x00005000 0x00001000>; + }; + }; + + pmem@1 { + compatible = "pmem-region"; + memory-region = <&pmem_1>; + };