From patchwork Fri Oct 11 05:46:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175909 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp311665ill; Thu, 10 Oct 2019 23:02:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLUTQFHN9JaLlOqeql6IxlVvE7qVeGubfP9OGEODkhEo9dF8sCscHWP326lXjkEm0ML3yF X-Received: by 2002:a17:906:f42:: with SMTP id h2mr11974906ejj.39.1570773778740; Thu, 10 Oct 2019 23:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773778; cv=none; d=google.com; s=arc-20160816; b=JGoWVN/rSXmHUjgdG/VnWgbZVlAT3KKMxLPrQvzkzBtRY9Dl3PqpUNvZU/tuT4qFoI pceD5tjC/FlqpRgxF4+7uDp33EdWZirSqE5LLxRi0GFfgP8cLEqR1e0gj/SKjFi/2X/B ByRKEMmqOdUxYPbzmc0FA11/UFFN7TqNzPB75vZh8zR1rYnFQKaR5FsPkj8o+UBpiJfB fzklNEJ5OAgzR7cT61xPLe4KlqlU28OKav0nLqE63TyRwoHCIwe34YxTID5lnX6Gr+xw kSRcxTdd9iN4HJqqFRnWj5zyI9CmoLbkOCWHiOAkmcR+5tdF19uFP9ANotx1IIdc7XrW FR7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=usMVH81zX6+WfJeGvBcjjYMsDqypoCJwV6mzVyIGDqY=; b=RSDZ08grCWTHkgWrUNKt9qtqDhtLiBb3OGHUhNSgUhZ+aeyZ0xMlTbMIZoH1k+obgv 19DzAusk53pVZpPfH9+Ep4WwsrTehu+1YAByoviNvEEFSh21ZNLxEWlv5sOw2CpCtqhR qdT14IKn1edDbetsuuevd/Ju/ihA11okLi0S9Zu3bf0oaH8hKswa/KAf8xRiYSECmZ1v sQtW4SblkddoVCCHv8SNWKhBEKGsGiXPxSbEOOqbbLvA2U9G3JA8BSBrBSpSG8YNTUDi MUuSaMx03enrpLRwrSJJUy7CEJ4my+lC1O1vM7UpbAVoGa4edDHgHmiiJYqw4YE9IHLK Ut2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id p14si5126277edc.227.2019.10.10.23.02.58; Thu, 10 Oct 2019 23:02:58 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2678C1E96A; Fri, 11 Oct 2019 08:02:41 +0200 (CEST) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 56EC61E8ED; Fri, 11 Oct 2019 08:02:36 +0200 (CEST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 345DC2004F8; Fri, 11 Oct 2019 08:02:36 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 1FBCE200094; Fri, 11 Oct 2019 08:02:33 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 7BAF8402E4; Fri, 11 Oct 2019 14:02:28 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, stable@dpdk.org, Nipun Gupta Date: Fri, 11 Oct 2019 11:16:51 +0530 Message-Id: <20191011054657.21931-4-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 3/9] common/dpaax: fallback to check separate memory node for VM X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In Virtual Machine the memory node in the device tree is at '/proc/device-tree/memory/reg' which is separate from the memory node path on the host. This patch enables check on both the paths. Fixes: 2f3d633aa593 ("common/dpaax: add library for PA/VA translation table") Cc: stable@dpdk.org Signed-off-by: Nipun Gupta --- drivers/common/dpaax/dpaax_iova_table.c | 7 +++++-- drivers/common/dpaax/dpaax_iova_table.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/drivers/common/dpaax/dpaax_iova_table.c b/drivers/common/dpaax/dpaax_iova_table.c index 43c9c72e6..98b076e09 100644 --- a/drivers/common/dpaax/dpaax_iova_table.c +++ b/drivers/common/dpaax/dpaax_iova_table.c @@ -68,9 +68,12 @@ read_memory_node(unsigned int *count) *count = 0; ret = glob(MEM_NODE_PATH_GLOB, 0, NULL, &result); + if (ret != 0) + ret = glob(MEM_NODE_PATH_GLOB_VM, 0, NULL, &result); + if (ret != 0) { - DPAAX_DEBUG("Unable to glob device-tree memory node: (%s)(%d)", - MEM_NODE_PATH_GLOB, ret); + DPAAX_DEBUG("Unable to glob device-tree memory node (err: %d)", + ret); goto out; } diff --git a/drivers/common/dpaax/dpaax_iova_table.h b/drivers/common/dpaax/dpaax_iova_table.h index 138827e7b..fef97f6dd 100644 --- a/drivers/common/dpaax/dpaax_iova_table.h +++ b/drivers/common/dpaax/dpaax_iova_table.h @@ -45,6 +45,8 @@ extern struct dpaax_iova_table *dpaax_iova_table_p; * is SoC dependent, or even Uboot fixup dependent. */ #define MEM_NODE_PATH_GLOB "/proc/device-tree/memory[@0-9]*/reg" +/* For Virtual Machines memory node is at different path (below) */ +#define MEM_NODE_PATH_GLOB_VM "/proc/device-tree/memory/reg" /* Device file should be multiple of 16 bytes, each containing 8 byte of addr * and its length. Assuming max of 5 entries. */