From mboxrd@z Thu Jan 1 00:00:00 1970 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=unavailable 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 5C292C35677 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 349822067D 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="OEZCOSfq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727253AbgBXCKg (ORCPT ); Sun, 23 Feb 2020 21:10:36 -0500 Received: from mail-pf1-f201.google.com ([209.85.210.201]:56325 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727219AbgBXCKf (ORCPT ); Sun, 23 Feb 2020 21:10:35 -0500 Received: by mail-pf1-f201.google.com with SMTP id r29so5647826pfl.23 for ; Sun, 23 Feb 2020 18:10:34 -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=U9x1EVLhqUbvxZ1MWzxoNmpwHOpemfs+Xxa6i1IJDww=; b=OEZCOSfqHyCH0n82I//mUildBSBEUUWtDcYiq5Oo5rR6qwCUGmKPZzbMBisxmcQAbs TwUoh4G1YcGAerITwUuZ71yplkGbaMvFWpjDhsl44azfyp7P/KC4RBOS12hgxQY8jm8M ldIXaMtQFvHvaRURHKQJFJiIDj0VeJ4hObpDLPxHCrY4fTUWKMlQ2GNmcvZ8TYBqHV9C VILHHGsrHmqLJFAja4WXRD36IvuFwZ9qn2f1/Ybes/BbOLiEuQ7gbF3HMSYDNIZzN2Wl 0+OLRiZL+3uLGxhSCLaFIvMWKj4va4dyktRr9Xz0/bsQkUhkikLjtVzf/ATL1C/LX4K+ hhyg== 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=U9x1EVLhqUbvxZ1MWzxoNmpwHOpemfs+Xxa6i1IJDww=; b=Wr26IB5bwMsNjCYpQtNQ/EWUQrrilaShEq5L04zcDoFCTTJQpRgc5L5lJE9K+85HUZ ZVenNFRtTdvCEkRUgZ3CupyrqT0rai3oMr+X1XncQDGo/dZqiJaVxg6JCJAgrdE6Uarj yEnYBppwnNGOPXhMm1cMwTzNrgXnZ0wos6da1S70XiKBK14o1LVLQE5ekKYShzXoS9uL iQe5pzs1lwEfGp/TSy9W+Yrb/D1zYA+NXWyXUbH+1XKd2/zvDPQ9hEuuMHng+GASVQWl Mn1ywVH9LeB/I1DFpckCUQCuXdqQZ6VuGASE07O3GPZ1wBk5gxI+sdkOih814U5Fo2Hf Vyzw== X-Gm-Message-State: APjAAAXJ9pfOzLRj46ZkeZOEioWFuyrsi8wwboS3p1Hcb7WwdUfgCinp mYp1S0bkXKByF0R90d1M5AeiiScqXdI= X-Google-Smtp-Source: APXvYqyTwjxCwbxReORBQcuv6XOeQhdEylhMml37cUwzX0Kd3xXx05FTdjuoUaIZYSsoX4pIMCxjPJwMRp0= X-Received: by 2002:a63:2e42:: with SMTP id u63mr49471649pgu.137.1582510233602; Sun, 23 Feb 2020 18:10:33 -0800 (PST) Date: Sun, 23 Feb 2020 18:10:28 -0800 In-Reply-To: <20200224021029.142701-1-adelva@google.com> Message-Id: <20200224021029.142701-2-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 2/3] libnvdimm/of_pmem: handle memory-region in DT 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: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Kenny Root Add support for parsing the 'memory-region' DT property in addition to the 'reg' DT property. This enables use cases where the pmem region is not in I/O address space or dedicated memory (e.g. a bootloader carveout). 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 | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c index fdf54494e8c9..cff47cc5fc4a 100644 --- a/drivers/nvdimm/of_pmem.c +++ b/drivers/nvdimm/of_pmem.c @@ -49,11 +49,12 @@ static void of_pmem_register_region(struct platform_device *pdev, static int of_pmem_region_probe(struct platform_device *pdev) { + struct device_node *mr_np, *np; struct of_pmem_private *priv; - struct device_node *np; struct nvdimm_bus *bus; + struct resource res; bool is_volatile; - int i; + int i, ret; np = dev_of_node(&pdev->dev); if (!np) @@ -83,6 +84,21 @@ static int of_pmem_region_probe(struct platform_device *pdev) is_volatile); } + i = 0; + while ((mr_np = of_parse_phandle(np, "memory-region", i++))) { + ret = of_address_to_resource(mr_np, 0, &res); + if (ret) { + dev_warn( + &pdev->dev, + "Unable to acquire memory-region from %pOF: %d\n", + mr_np, ret); + } else { + of_pmem_register_region(pdev, bus, np, &res, + is_volatile); + } + of_node_put(mr_np); + } + return 0; } -- 2.25.0.265.gbab2e86ba0-goog