Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1907152ybv; Sun, 23 Feb 2020 18:08:39 -0800 (PST) X-Google-Smtp-Source: APXvYqy1/KIJRMY3RGZoxntnPQg8WiHjDB3LKFXSy0NRAReau8IOPuPt2BnM0lnSjf9I37RkrUXZ X-Received: by 2002:a9d:20a:: with SMTP id 10mr37046423otb.319.1582510119820; Sun, 23 Feb 2020 18:08:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582510119; cv=none; d=google.com; s=arc-20160816; b=V8RG9kQzt/4D13uo0ibeT1KSryI5+phKTTgL1rwH4ugo5/fXgn1pTI++rqH20cdqeP 9UbKuNd+pG7RZgDU5Vz4JiJMt+fSabg+4ePuDr/SXZGnqoq/IdxtYfgV3ZPygdqnSUvM ynXTEoi/CHMKJxe7gK6YL9MdUXpK+g4/WNQokD5Xe1jjwV6yFgQFOH6X1rEzazpkAaBB 2zm0CMNEx6vckHexqLU09bAOM+N/yvdADKT/gXaXbwl7+5K2xQSsojEkCdnp3z2niejg xfSjWPTlWKgIdeyRA/vsLrSELJRRLacsTfUWCe0MnFh1bRKjbl2QA8ImeDCewyHIf/lp VJYQ== 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:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=e5neKRQE0Ylu70uQVNqG6CPXmoPxHODfaRvH7F2C0Pw=; b=OzTGnjWGeE+4rR9KR7bt1IxL2Z5hSA+6YazXDiCocvKfGGDxGWaQT8B4SVZDlje2Go 1mU/YpVn+UyBlrMdMPBld5txYXjyDwpmNhqUjnXpjGpuKg6flSpeRQh/aRTTxznqqKv8 Oi2zrRFvkBEDfHogW7NmCm4MX7PSuayKnVccyl3dXjGTowzL8bJmRrIg55/AGfAd8W87 etA9wD/xM0ldEdB7UGVqXfxtpuhvn3BtIp9P+PetQE9m7hC5svsJkmosjMQCM7MSky3L aogu3Zp+G9UZ7CUDxME/AI6X0oqXzfZ1P+x6k2Mtb8+f7joqAH9I6RfUyLkEomzpakRb xpzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="YHiXmus/"; 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 i11si5364833otc.105.2020.02.23.18.08.26; Sun, 23 Feb 2020 18:08:39 -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="YHiXmus/"; 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 S1727213AbgBXCIW (ORCPT + 99 others); Sun, 23 Feb 2020 21:08:22 -0500 Received: from mail-pf1-f201.google.com ([209.85.210.201]:52464 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727193AbgBXCIV (ORCPT ); Sun, 23 Feb 2020 21:08:21 -0500 Received: by mail-pf1-f201.google.com with SMTP id v26so5648895pfn.19 for ; Sun, 23 Feb 2020 18:08:21 -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=e5neKRQE0Ylu70uQVNqG6CPXmoPxHODfaRvH7F2C0Pw=; b=YHiXmus/EnjFAU6PeaWn5LwpzUc7PCFQI/d8yZl9grAa0B/xUi4r5vcOTDITCKIMoW makG0khPu6K/gEZosHvwYEmmd5qMT4sL+7dMkWgIbSHv/wa0qLv74DkUKsqsYKrbEmFq cz+79KiVOwo1hux6wHBTXNldhNPIpnpM0JKH8Hbaz7ocFT6PA43kqynKv4cGs9BnsHRT 3KjHFvgTMpihahJNCJ4GKPSuHch2mMMIGfseexNT7auHTeecCgYy6TSRwVT0jr0rUP13 8HcCPaDMPQPjZWzW/E6ZqvaP2GHWTPhtfMdx/01vxbjrzu9CsFbz6zPZr/Mps6xv0QQc x+7g== 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=e5neKRQE0Ylu70uQVNqG6CPXmoPxHODfaRvH7F2C0Pw=; b=TRtQzcW2HXq4d5ECud8nsY/MZao7cbqg1+sgQZYMLvVLDR2l4KKFv/i1J/waNuE1sD RkLw8pimuxLPrhoSu02Fg1CfbqmevE278ADg3C9hU+eZ3hesqWzVwkmCyZUpT6QZq1iR OY+XjZ9khCNec9bemIvLGgcQ9JVh0JU/zXAu6t/5QAKaWnLJVt8+GU+4Rr1rq+vZRBru 6Q5TtUHxCT5/s4oU6qpaEhd5S3um07upifWZOCBdY2DNdG+3AqZOVGD+xaZOHi4EomcS rKk28U8nEicTAulGSZzpM8F8nWh0jKvVlziKOrOj5kvWmQFptZM/JK7fxn6pnCdM7Llo HVpA== X-Gm-Message-State: APjAAAXSOEy9wj1XloHycRGSHXBZ5EgUZTWsEnurqlbNhguH3w1zzGAv Is7ni19L5aGjl1kwEQ376jpv7qNww6FYk46UqKtAKVyvRlbPZree8nc+cwUvLo36AEQB3KZhffn qruP1oBQ2lINdcqVixgY9F0DrNc+VC6ZrP6yX5hjDboCwklIJbSC2dpNd8zzRgaxz4F3cvw== X-Received: by 2002:a63:8b41:: with SMTP id j62mr2267520pge.18.1582510100578; Sun, 23 Feb 2020 18:08:20 -0800 (PST) Date: Sun, 23 Feb 2020 18:08:14 -0800 In-Reply-To: <20200224020815.139570-1-adelva@google.com> Message-Id: <20200224020815.139570-2-adelva@google.com> Mime-Version: 1.0 References: <20200224020815.139570-1-adelva@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog Subject: [PATCH v2 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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kenny Root 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 --- 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