From patchwork Thu Oct 17 12:43:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 176595 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp886371ill; Thu, 17 Oct 2019 06:00:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqyRsprpLvtpypD4NNytYDdFfV4d4ou91C2x+IlGKRsvuuwBDt4JFNEZHlHrQLV8yPnuZnQp X-Received: by 2002:aa7:c38d:: with SMTP id k13mr3649747edq.34.1571317217167; Thu, 17 Oct 2019 06:00:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571317217; cv=none; d=google.com; s=arc-20160816; b=Zbcg9ymsdo3ceVmjbKwDXe6MuqY4oW6OEPJSCL5yI3FdyaoB8ldYk08TGTZttqH/vI s1S7NZge4CKAkwfQSAW2gkiXbi+qpD9KfTiXrou5Be36uM83zA6YtCRBUtDlfDUu6px2 S/dFNYDlbOeu7fo7DSbShZVoN1xulnihoKGi9WiSxOTxxyEb8iUQalovnIty8oceQg7E sPvea4i2UibXeNxnm8CTcNwVZzCidE86bNLpvY5UEYDdNKkK3aMwWYT0eSXmFRp+Nccm iQ6HulJzFbkfVVmO7vcmqX5VSwjhrgEXZz6jOqL++iIj3RUVWgGk7uSs9VlpOz9bHizD Yctg== 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=PdK70NRUoeCSSZKsqwIqWe50gFjy3h9hzh4RyEe40cW5EiXH9S4g+7MJ4dNQvANBx3 Pnxu9ossipZo8cI2qB1O/LGrNzwl8xVtb//WpIPc7aUfmzpPJooGz+1xFw6S7YaUG9pJ 9BloSLRgLvOKRYaci+DYORTsoEJH3p63JioSBdUmSKFgsnAChbRzFh2grSRa9Z/ucW54 7H+XzMempkTIEf0bx9P6GiIwwEvyGPamjWNP3sQ5MQXqaXJDUNozGizzRt7fFTkZbyS3 dvlbBrcZ0H9fbVV/L2Np6tX38EHFyky3+41mCn+q/ugiEDfrS46ygqEIH69Mnei6wFvl RFHw== 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 f41si1465402edf.113.2019.10.17.06.00.16; Thu, 17 Oct 2019 06:00:17 -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 5F5901E9C6; Thu, 17 Oct 2019 14:59:59 +0200 (CEST) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id D13921E99A; Thu, 17 Oct 2019 14:59:51 +0200 (CEST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 8F207200676; Thu, 17 Oct 2019 14:59:51 +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 7FDD220011A; Thu, 17 Oct 2019 14:59:48 +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 525ED4030C; Thu, 17 Oct 2019 20:59:44 +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: Thu, 17 Oct 2019 18:13:57 +0530 Message-Id: <20191017124403.26734-4-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017124403.26734-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> <20191017124403.26734-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 3/9 v2] 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. */