From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <Jerin.Jacob@cavium.com>
Received: from NAM03-CO1-obe.outbound.protection.outlook.com
 (mail-co1nam03on0040.outbound.protection.outlook.com [104.47.40.40])
 by dpdk.org (Postfix) with ESMTP id A64F8FA50
 for <dev@dpdk.org>; Tue, 17 Jan 2017 08:16:17 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version;
 bh=ijpMLn+OFuw4k2KaHcpSXmxX0mQLBGcaUyOUjV7dhxw=;
 b=C9SrDzfx7I4EaUdzex6w5FlMHM/ixCUn6D6ziMKV6mz7JBbmWRyWrO731PsYG/kO+X7syWXMqnLBT6gUV39KPP/OV/SgI3NZuzUFLSJUhuRALtC++fzZouSNxUZVCnGzfmqhjeZRjupKRb4w1WQqe3q2k0A+2bVgkuDUKSGIBT4=
Authentication-Results: spf=none (sender IP is )
 smtp.mailfrom=Jerin.Jacob@cavium.com; 
Received: from localhost.caveonetworks.com (111.93.218.67) by
 BY1PR0701MB1724.namprd07.prod.outlook.com (10.162.111.143) with Microsoft
 SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17
 Jan 2017 07:16:12 +0000
From: Jerin Jacob <jerin.jacob@caviumnetworks.com>
To: <dev@dpdk.org>
CC: <konstantin.ananyev@intel.com>, <thomas.monjalon@6wind.com>,
 <bruce.richardson@intel.com>, <jianbo.liu@linaro.org>,
 <viktorin@rehivetech.com>, <santosh.shukla@caviumnetworks.com>, Jing Chen
 <jing.d.chen@intel.com>, Jerin Jacob <jerin.jacob@caviumnetworks.com>
Date: Tue, 17 Jan 2017 12:43:57 +0530
Message-ID: <1484637244-7548-23-git-send-email-jerin.jacob@caviumnetworks.com>
X-Mailer: git-send-email 2.5.5
In-Reply-To: <1484637244-7548-1-git-send-email-jerin.jacob@caviumnetworks.com>
References: <1484212646-10338-1-git-send-email-jerin.jacob@caviumnetworks.com>
 <1484637244-7548-1-git-send-email-jerin.jacob@caviumnetworks.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [111.93.218.67]
X-ClientProxiedBy: PN1PR01CA0030.INDPRD01.PROD.OUTLOOK.COM (10.164.137.37) To
 BY1PR0701MB1724.namprd07.prod.outlook.com (10.162.111.143)
X-MS-Office365-Filtering-Correlation-Id: 75158e30-e25f-47be-0126-08d43ea8b98d
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001);
 SRVR:BY1PR0701MB1724; 
X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724;
 3:EuqrzjcKnWy03Q7EgY3xKeVaPcG1yKBtFab2Fo7AhKsrAjEgTAIVvtlXzoLKBfTLZ4Wf+KMKKlmGaNH8L4KjapdOIDFbL5qdhlrFd9LewXNLyHWugxPLHMWlQd0ryyym+DZcY/UZyJvVcKgUq+9WthGj9yXhcK14Cvoz0DWIi02Eu52UqZRRpkN3ZZjJy7e0/HH40hgOwsOuEncTxJ4JAvpF2whidgICQVNs9rI6DizOgEzMS8QgiktRh3p2K0J7RvgWe8wZIgLUQmKA1bzJhA==
X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724;
 25:FRg6r+rCMNkbd6XKdd9nrlkpxAJcZAXPPhjgZhCjtLmGYPg3SISfvUv4fh+GbbioH4gunyvMSor8ogwgfVQG2VMXUA4WCqNZj6v3HrevQxcRu5wJPG0yWLr6vLj56L4uJ8k6oBYv5CDldFkhH4xc5bLacTVGYK+BgbALMbpESbjtFFi76KEpjviZ+BXuqx8pyZ0RmBHRPFmOJIlCI20lh/WkqO/1b5D1NaJpAL8Rg5e7iWS8rDFV9zLFuv/CE9L03f9kMiOJC5COJdaPGe7VzqgzSYDNKaBnWXDlQuuf00aoCl6aIFfkEhirA780YmZ8jcgL5PQIXt5hQuPk1JXAvjU9sZ5TUP5NEHNn+qo8157WdJGRLC+c2RHWLJT7UC0OwOkN9vchCPdIHluTSig3ro1E9yf4NAwpj3LBxN+6rZzo/0dOflz7dU/b6IXFDx9XxGGB/J32abOEjd3EDCdy/JorMX/FIhaKBS5EO6YTtBefCybSWsLWBW4jqnFj8Ri4lve1lioR4NnX6j6KOp7e5Hn6Qi6fa9mWWFJIfAIpXLAId7m/OOodABCu/AB7TIOOYxNHv2YxZtvgoOPcQmOhX1k92dOXUUz/yhHFb41xW0CGY0lQH6jYI9ZRZoYOTAbZ30JlNDUotG9LMTzBvMH1SZhfzoVsOyowEKWpUUOGx1TtZWLrIOcKLxoh51jaEV0em22DAZwrx/Q/jkA0qw/I5AociRqXBheTZ3vm1Lb10+eGgrkyaWKrV2hIhVsRBp0dkODj7hqwwzGmP+VaqnWDHfgwmGm7cbkhsSdL/R5lyDQ=
X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724;
 31:bYl78BRDWF9RpC13Zf5lSPWWLY6zDh2ZX6aI/iQL/rl8PDaCdmL83GlG9kAQP86auDUZhPFtHAMA3T+Yun9sVU7FvdEurd/uNAG4QzjDCyCoukpV1p9PD26qpgqp03HxONjT67+n5el1YmhKd84Y8JavQH8fv2divoHHLmPI6/0MzPnZQtv4GNOaadf4qGfGn8r3eaufVhyGUjw3Z2u5JkidOQ7dkgA2fku9gXLhr5oH866Kr64fnzqTsgSXPOZNJ2HBJ5GPnDpALWRmXGCRvA==;
 20:RP+WE75scBPBjDHrNHQnQ7KEVK9ruUgZGECp2g6zh0lsDO3UBrEglvuT5BwNt76tabbkKthvN1PzEz6kg+Zc2PNuY9bIVMClym+a325ByCRlFrnpJ3UrabNITt+2L/typfzgnL6fEETaFVVwLP3BClykRfs6HlP0GCMIPY3VFm6SOprhDHm6DV2RdhQ8npLzIV95Xpb/bBPwsH4e8/TNa8BDDaO/b3Wno2J/OjwfsMemDqSCVOp+TJG9Z7XySnxjGyhADHXVt/ghxO0X18KHfABRXke5u9+lpqmnb3UC/6PBO4PQ9vyjB7GAh0cgRKKCX/q9nIoM5SJB2sbiwnhVfnh5BLRVXR4b6ErdZCxW1Nz/uH2lF7ZaoizyRIFqM/aDVuc2zasGA2A20fIyZF6V2S346iKsEqD21T/BIIvZADZxGZZqQsdxQuiREU+INhAgZIlhtDhzyQaS8XpZTZT7G5GyWpFzD4GwxUO7uTJyZ+H/ltBGeepeYusMJNspj+zRxMW2E6d0viBIPQb/ZLcToHUvcib+JeCspZpjCyfASu6tww2LTpwIvlPjFI9B5bNBPBXaULNRjxegi9meTwUL8w6smoEX8HiV+iYugE4R4JU=
X-Microsoft-Antispam-PRVS: <BY1PR0701MB17240A7EE93A4DFB174DFEA1817C0@BY1PR0701MB1724.namprd07.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(228905959029699);
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
 RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148);
 SRVR:BY1PR0701MB1724; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1724; 
X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724;
 4:3WN4XsbvVVuMyvk7OSBEpV547PDua0RCZCGPzu5tIRnJAIZNEUGhc+2oNPS1yGg0hNNT0Hejqy9gynj3Qv6bh4sh/Ljuh08bBkCEY+tNjau3xvpA0tDD5VDzv4aCc+OuRWMNnwyUYYkVWML9zfkU4Vyg+Y0ey9FrLYZHf+QwpIKjfe0I1jAtSK160WPHE12lSI6U6hL4jZigTxFz1IpnPogcwPCJFLr9zlZuflzSk3THFPkenmQa6EwZEut3OOpStBDrb3fMu7NsX06d+tb3/4KtLcXj2gA0tzSPpcuX7pJiyYpLo+NxnE2wz0ehkpbZifK3t3qA9z7zjXyXLsLTJ33lCaTHqoQQZdxQpT2UFe9mFoKbAiW+6WNydBR8quALn5foc++3hF3FnOTY6N/KOgXAl+vpYMwJy4jURyO0C+42VkeDWAD+7/cPMNK27+Yk0fpWGUStnkYMIOwnQaP/fFgdXdZVexWk9PbeCqf+Au/t05g2dFVdOajw147qjhP+te/fbmcvG9QfTyaWHK2UWw5F12wNhPvjy0aW4dsg7SB0Rc0mLv8gan5RH3qF8b00/tBa7OK+aESRELairNGQuirYAKJTouPPhH+VQk3Sz7/2YByjd4LynkY9NDxjMVtWuVB9Y4eEpn8ROYyUQv6Alw==
X-Forefront-PRVS: 01901B3451
X-Forefront-Antispam-Report: SFV:NSPM;
 SFS:(10009020)(4630300001)(6069001)(6009001)(7916002)(39450400003)(199003)(189002)(2906002)(4326007)(76506005)(107886002)(53416004)(189998001)(92566002)(106356001)(38730400001)(47776003)(25786008)(6486002)(54906002)(66066001)(6506006)(305945005)(7736002)(6512007)(5009440100003)(81156014)(3846002)(50226002)(5003940100001)(68736007)(4001430100002)(6116002)(76176999)(50986999)(2351001)(97736004)(81166006)(5660300001)(8676002)(105586002)(69596002)(42186005)(48376002)(6666003)(36756003)(33646002)(101416001)(2950100002)(6916009)(110136003)(50466002)(42882006)(30001)(7099028);
 DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1724; H:localhost.caveonetworks.com;
 FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; 
Received-SPF: None (protection.outlook.com: cavium.com does not designate
 permitted sender hosts)
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0701MB1724;
 23:5F0YzOzxbvzfUaYTCbsQ9pbuu3D5Lqv0+R0XxiT?=
 =?us-ascii?Q?2M0WwJHnNEVAdiTbAWy6c0y4GXCeuZxJ/kwCxht/oxZ40z2vVawe5zWw/5lk?=
 =?us-ascii?Q?OrF6Sor6IOhXEcQyGuEZ++Ee0fJGFY3tBxJaUWawE/Fbu5htC4VXxQjRjw4K?=
 =?us-ascii?Q?aRtGWkrJNJJyQMp1M/zaw1p4JKimB2t3hicDm3iQeWElz2d4sFU6s9pPSH97?=
 =?us-ascii?Q?QHFhvwXr+9yIdldhxXwP6aHXG5/Ga5WsiQbWbENDFpI0Z5YX60uyEXO4GoSI?=
 =?us-ascii?Q?CQbjqUOBMfqllAeOG2P2HYfz4QK2CTAWj1I1v9LCJ1I1F+WRob1EQP7AJUkF?=
 =?us-ascii?Q?f8D3nuVJkrFzaTg8xfdP3DtFtViQauQ397zlltZYT6SATmE2g5H6PdGAXvQR?=
 =?us-ascii?Q?Qaowkumsfp0o1zMeAMffiS2ewQHLR2+82B10YKec6Ym5hFvOBp0zTb/wAaM/?=
 =?us-ascii?Q?F5m/n1NUsIOGFqxCuTBSa+XHp7xuc4ZbTmh6DCgZ9RNRLi4cGRa8RIOCpRaF?=
 =?us-ascii?Q?honCQXXK40gX6c+flr1yKXkpiEUfKytpVl9PebKHi9KEMiB9OKSR3xOhcQgr?=
 =?us-ascii?Q?MapZ/F3UsOoNOI9Ui9p4SZdtrOV6huOtEQYnEZ2ZVr5Ry6EmZrAbNmXyfgmP?=
 =?us-ascii?Q?wRIKFYr4zCAg3Lfq4xA/Uto5dgVbRK7i4yUxXV8oO/V1vTa9Zy7Bxa4B1wEG?=
 =?us-ascii?Q?jRPF/g9VlX3TioNlVxKgWZOK6NtU5EHpIU8xTC1Yjq+iZ8dKBcPUZ5AZsErb?=
 =?us-ascii?Q?pEH2NOJDHm6cfDN/Nx4Aeknc5y8oxWb0KkUIFQ0XnzHyHlI6TwFpW1HJwVg6?=
 =?us-ascii?Q?Ap3R8c8/RmNfXGFokWiuAL+B1q3Xy8MGCwr0TPui7GYJWZcYwHdA5mjZTcWV?=
 =?us-ascii?Q?2TevzAaErVwcryhg+v6X5Tag6bb9ICTy/9OBImrnreeChwVDyyjPg07LgIwA?=
 =?us-ascii?Q?Vfq8Wt4KkBQ9l4jwsZdEaMMyTyU+yWz0IC7ZoztQ+1HYLIsw0aowQswxkshu?=
 =?us-ascii?Q?6H6s1vCWHgFxad4nnW0bKrtnYbwAD3E9fj5MZD7xZ3IWlt87g8oA48pB1qhL?=
 =?us-ascii?Q?y2w1avLmjt3JTITYM4WTQW6FY9HYh6/YuA/C/Wo82Xv5xADgWd2UMSDIo0uZ?=
 =?us-ascii?Q?cb+nNRH2bENsVwpsavEmlhRzJXT9xzpybAA8UVfGijCgOrF8gAtXG/5TrEqe?=
 =?us-ascii?Q?Ldij+Kdqw/CdV//qPinPV/sjRiXmGMbiwJtgDJU1sNAnlMrFizYnzDYijcob?=
 =?us-ascii?Q?Eo+/p4LtM/F+a7EMkxYvOUxps3VaOovRuWTwMXxKtKN9J0LzMFd45BS/8N9d?=
 =?us-ascii?Q?Z+NbYg16T5xWfsyhxz2uq5+c=3D?=
X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724;
 6:0Wc0YBRnaI0o03BODdRdP9LRoDVl7qbh2yk6NSapMQsUEJkoQkP1x0TJtzIwscY/392qzcemqdN8ZQ72jku0+9ZkwaFWUE6oRuwzA+bUEqYfQTUWMk5yZxfWc9cqNdv78p0lXNwKOUdt9ft5aO4fc9jrz3zKBwdgNRCdr3RW3gK/eVyTlbn1/iF1v7qWAAmjOPMMACSpLRaRHaxTor/V0L8le/HPadGes6zq8lxNBO9zkgz6fFoE2Wwgh8qND4fZiEkLwxxIT0+5bhPrBTAEpEg8YwRqSOK0z93JFHyDmrwSL/Uq286kdLtyYJ4HGMcHK84CLh6Zz1hLE5zPWs6AiRR/uMVjOOHmzH8V8kRtza9E5GzvAcNtvj0ZrUGuUnnOZYdq2mofg0J2Gye/P5Bh+WELViNWfEBAttfZYOw+5a8=;
 5:+Il5mycBGtZdi60/yRxOFB8uqTUnZc9KfS8OeDOEXBotIW7RSsxzV7THRRpx7btr7sjvc4e571Ki9e35jdJ0nEPc2qOnoSqBd8iChmEd3XjV5iTFu5UGV6D3TQMSN+gr1lx4RkEUAyoIFtvowNSCmg==;
 24:XTHKn7aA6MUstzJXuXw6JIeEcIu1IjyLlBCrfS9vKnuaDG2Xh8pU7pM72bBTjz23Gx/D213jC08MC5BRAUlX300YUzSrNlYYBi34OpzJx80=
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1724;
 7:ly6WBFv4r9IBgcSlYIUM27CDLOVUdRKGcX8g19+2fDB2YsGN5ri4NXSvSnCc6QAVjjWGhzHvauIgLqzml5Hd7r6TeXLEhAj1Zd0VNS6ePizyUp5waXNlT5P11YvdxvIC8HlRH9+aFYMsym9S0MS65J/PkTMuMkMQw9fCsXawc2DTjtoyVXBfT32XIOVhiAhPY/jr3pHZLI0SsiRpCehMGnvtlidaZgZtOgEZ9RwtWxuEtDkpU6UTrG8wmYup4x1nEW0fOGMKTuE/Wf5vwYD2G91HHGX9DAA2Ypo28WyfKbc42yh8gnVpHlY/fLJ9wI8+X5RDERvj7VxbXzPBqQ8ce0gjsA2/+xL0yCWvmK29cJlpT5mVQUbtpsrUiTVmigS+VQktHpvyJjzf38LhuRgk4fQqrvXF7UZ+CsUzYIn28/dW/1SjQM+brYV+osureY2MvPwaeTOKbzx4dWjglMYglQ==
X-OriginatorOrg: caviumnetworks.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 07:16:12.3531 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1724
Subject: [dpdk-dev] [PATCH v4 22/29] net/fm10k: use eal I/O device memory
	read/write API
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jan 2017 07:16:18 -0000

From: Santosh Shukla <santosh.shukla@caviumnetworks.com>

Replace the raw I/O device memory read/write access with eal
abstraction for I/O device memory read/write access to fix
portability issues across different architectures.

CC: Jing Chen <jing.d.chen@intel.com>
Signed-off-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---
 drivers/net/fm10k/base/fm10k_osdep.h | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/net/fm10k/base/fm10k_osdep.h b/drivers/net/fm10k/base/fm10k_osdep.h
index a21daa2..f07b678 100644
--- a/drivers/net/fm10k/base/fm10k_osdep.h
+++ b/drivers/net/fm10k/base/fm10k_osdep.h
@@ -39,6 +39,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <rte_atomic.h>
 #include <rte_byteorder.h>
 #include <rte_cycles.h>
+#include <rte_io.h>
+
 #include "../fm10k_logs.h"
 
 /* TODO: this does not look like it should be used... */
@@ -88,17 +90,16 @@ typedef int        bool;
 #endif
 
 /* offsets are WORD offsets, not BYTE offsets */
-#define FM10K_WRITE_REG(hw, reg, val)    \
-	((((volatile uint32_t *)(hw)->hw_addr)[(reg)]) = ((uint32_t)(val)))
-#define FM10K_READ_REG(hw, reg)          \
-	(((volatile uint32_t *)(hw)->hw_addr)[(reg)])
+#define FM10K_WRITE_REG(hw, reg, val)		\
+	rte_write32((val), ((hw)->hw_addr + (reg)))
+
+#define FM10K_READ_REG(hw, reg) rte_read32(((hw)->hw_addr + (reg)))
+
 #define FM10K_WRITE_FLUSH(a) FM10K_READ_REG(a, FM10K_CTRL)
 
-#define FM10K_PCI_REG(reg) (*((volatile uint32_t *)(reg)))
+#define FM10K_PCI_REG(reg) rte_read32(reg)
 
-#define FM10K_PCI_REG_WRITE(reg, value) do { \
-	FM10K_PCI_REG((reg)) = (value); \
-} while (0)
+#define FM10K_PCI_REG_WRITE(reg, value) rte_write32((value), (reg))
 
 /* not implemented */
 #define FM10K_READ_PCI_WORD(hw, reg)     0
-- 
2.5.5