From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0074.outbound.protection.outlook.com [104.47.41.74]) by dpdk.org (Postfix) with ESMTP id 21F3D2B9B for ; Thu, 6 Apr 2017 18:07:18 +0200 (CEST) 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=3p5NQMmU/USM74sm5994c6mrXMC9qsMPzFu+PtmZ7wo=; b=mr5ysT4ERRPUZ8japIxfq2YrxUemBhB3cGSmuoHp/yxFhH6FtEReWyARVaiynvkW2unwxtvrH/AhOB+ouXE2qsVsTYU5/0Xjc3NmzPjv24Ta94hoin7I/kxsgTZOXttfrhoJhriC0Qvqa8Q2pJltUeUzDwjnBwQ8w5jIQSNeJbs= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from jerin.domain.name (111.93.218.67) by BN3PR0701MB1720.namprd07.prod.outlook.com (10.163.39.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Thu, 6 Apr 2017 16:07:14 +0000 From: Jerin Jacob To: dev@dpdk.org Cc: thomas.monjalon@6wind.com, ferruh.yigit@intel.com, Jerin Jacob Date: Thu, 6 Apr 2017 21:36:51 +0530 Message-Id: <20170406160651.15432-1-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: PN1PR01CA0099.INDPRD01.PROD.OUTLOOK.COM (10.174.144.15) To BN3PR0701MB1720.namprd07.prod.outlook.com (10.163.39.19) X-MS-Office365-Filtering-Correlation-Id: 1f67dc3b-35ef-4b0c-77fb-08d47d06fe86 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:BN3PR0701MB1720; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1720; 3:bMOzU0K8PqwgqK6s6F0LrwEPvF/LGJD8Z74BK7TeD/pNhNaS7qzjHOK5omdsLZXOfCJT62K/1bRpdnbPDdaZshEGWsblxiKyM1ZU10QogILExsjYBQAL7RqAy+7fh0aQrrSZuZJ6iIAGgUN03wkSAzs/X+VO6sPXR73J+RM2dhPFizMkjJOk0TFk9buZwBkg4CassYQP3fVpFBJLGHSQJXzP5cc5xBP2XU3HXvUPJ2apfoMPvK/2jj90b8C3pRYqfnYhQqMM8ms0FttM5ytW7bYOkxXkdD4btBdZEiknLBjr+YcE/B/Y3xxUQq7JuSKusM4mrQf+FoanxJ/E5sMjOA==; 25:uD3A4k0yoLk+2kBKPGSwz/YUSm1r0F0r+7FG4n/K80hnLMm0KewuLvdUPunbIRBX9b4YEnoyC5Pzje7A7taE970vP3Zlt4W9G6PXIjp3aoPKdxnjFUWhtepA1LpYr3D85F6T6kR8mS9KTUsiLynhnoih1NUH0sNCm1g204PhhideX+NN6hRyvO876BzcIR2gLo8N7G8PYuPgaDCxog2D2mHefbkNOxaiXKdmeKWJ7p9UBOe+C02k9iS87Qg18yMN0Gs1p5HOkZ4mr+KxqtCaUzh8vjFMuMrhBb9pOVx9cjAB5sm9JFA3U4R7hhXjm72ZQ4lmE2rD06Gi4BXqEXqQp/Y4oMOUMLWmVWGiE1Rz6gSYXwWTQkGDPYHIq42ymCntl8SufrP2dMKEndpzq078/Q3KvEVoE2HGe2zZg41bvkj4cs/sr9GDbUGEqQoXu5ItxSPxuMn8N/EehpQ0X8Ukmg== X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1720; 31:xNDg/xkjsbCEjRTJwL+/ds4z321SDQYIMVjuTDEPgKXxb/EkoGOOOckImsy+QhBeNJbq4UhoOcPcMVAX02XFEWTUCqkcr8WlmfKIAmGEpJI8aIwK17KXV6QSoYOgO7UKw2+7Su/jwwykcutM+0nPAqrxqFnxPseK8PP7R/swep7rKx2EbwjyKSsxaLT25cvdh57Hsk0fu+hV1+U+tRIzZW4NcdiOMserEdXBRQLfLYA=; 20:hePjUvQh6x4emUZ8Ok+b8F52GJSx2BFhkuLwOn2jcGPdZvwsRUmJH97sL00PnDTlIm6fv7rCPljGufb1jbiLQpUZO9zjmohdYhrRwh1gMtdzpHUr9Fl8r5H+KJCs170QhU0dXg/G4OY3M5GAeKy/YICt7pKZTQcUkgmHi3M/Fb/TQiygfl3MnEsknVpdTpFZZH4b5Ej9WXTY5Bz55QOCiwf/4uMewE/AzSWwVX0F8iD+TRbdjRvuBoO2lp0cLqFUbEZ9XkxEIyKaObhLAccH3rgLkpTSMZ8jVJjetqDmwhxpZKIWWpr1ubgg2Y5XFt+Dk/GXvTDdFfcb/CWxZZT2c8eve03L1CIZvWXf5h6SsJmmcZeZ3sMfFc8/fqq/CUJgi9hwdDs5KNaeF8hw8kLA+/GII062dZ8aWVC6C1R/6aqKjMQ/Ts0G8lNqA7IrCZzi9vqR1Xtd5Q0kzlVO6A/fZXRX8sY56WSiluW8jKOWAkOmNyDPmjEHlbdztFyxNkSmGXSlqxOrEX6xQp3Br6IKQkab//xuGu8ZADhSgWhWzcyYnnPABf8bZk3AL2/Mg1v+aE03yQTMqBi5KtN7a3dXIiDSQZiSFQSUDJ5h3effmic= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(6041248)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(20161123555025)(6072148); SRVR:BN3PR0701MB1720; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0701MB1720; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1720; 4:P+F7uJ9zFJNE88cZjahSi8pkmPAME/6PGrBkvFAuz+uf37sRdZPKDunD/JyvBtMQCKHyRDr1jFyuixvuVyFbSETcQUqlNpLKVWL/TpzNOc/BoPZ/0BfwB2YvfBD6+Lu7kxJQ+G7ADqgBtmFzxa/o3rKo8nq2F61yInxaoBUaQ+dYxp0HBfIgB26xY3Jj882VMOh5nNKOaT82SaEZq7YV5M8mNe37E2rKEjJhVJoSjN6/c1k33Qw1Bn3Q0zdn+zVkkDjU7YkrGzYpOjK/FjWUc3ZM9ern32m/aoQe+YGgXe/kJFiO5XJ5X/47bt8osGGEu7KLINYZpZczWnfnD0gvjAuDGlLqMGSyuP6VljPnxjUolysWcuE3iSyb3k5V1toVe/exnlsUBCseI27/JiBYKKBuIWf9cocOIi79Pzy+tF5nKm6Rk1GPcVATDxlOHyR1gf1KNdwX9wnxdaR3S/lPJoxWsHuu7+hXRV1ZR59Eggee0O14jgQhfL+wTRlwJJKvP23byiudCrCR3jMUimBE+ittKbV3H/c853sHYC3Fw6HiFzkd2IojLG6lghYtlAGU3W+FhAhG+LTqulmTmobEC3RLf+HQtTvzP26uqwezrrRgn0a4r+Li7GmOY30p0B1OynM5atJrsbK5nCMs0N+06OzoMh3ivWBiNqFJvSSPOdcF/gI+K7shv0+JnLzZrzjW X-Forefront-PRVS: 02698DF457 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39450400003)(36756003)(6916009)(42882006)(5003940100001)(6666003)(38730400002)(2361001)(50986999)(189998001)(42186005)(53416004)(33646002)(4326008)(25786009)(48376002)(2351001)(5660300001)(53936002)(7736002)(305945005)(6486002)(6506006)(2906002)(66066001)(47776003)(110136004)(3846002)(1076002)(5009440100003)(81166006)(6512007)(107886003)(6116002)(8676002)(50226002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0701MB1720; H:jerin.domain.name; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0701MB1720; 23:E8na0wybCU4Y3jMK1rp79R5mWSekAFOWR4hLXCr?= =?us-ascii?Q?uO5++lPx3XrU5EnlF5OobiaKa6pE9S/XDZkmy/svjgjJPRtvUVz0zjnIJNCB?= =?us-ascii?Q?vSfMyZPLI5xRLVEcb7N2iXlWemjd2+EWwXt/Cq7vABdSpK4VLUA+AjZvSUd0?= =?us-ascii?Q?OQHgrTlK2Pf33/YOsfmLKNiJZyCdfiy9Bi0ZA/TRJdcmuX8pGxMe8Pvn7Ds1?= =?us-ascii?Q?+AXHr7lT9GkMxqpSfMbnFnmZShHEJ5+RSGUBt1U62QeFPKeaoH0URrE5MQKV?= =?us-ascii?Q?9s+JwcK8k7srrQ4VJsB54aaPlKjfvKEsOkyLG3ljNFSTN4hcsJy2ilfx+c6J?= =?us-ascii?Q?SZXtn1i4CZR4kVwBGG0qmdQuDxcFDLtz8kw22GWvybmPGDMAmkAEF2XfHr52?= =?us-ascii?Q?9W9vQMweu43uWwM1LM2waJPgqMZmeMgUvicV2LZZktPxwjxFpitfz0W9ryQk?= =?us-ascii?Q?yUKemXfjhFlnAMLFefqSKUcz9egYXRdNn+es5MhvK1PZYzz/MWRKi/XCZAv2?= =?us-ascii?Q?aG/ooAZV1Fj12zc7uZSpCy1p/i7dOgUgX9tGhe7aPP0iWxceDr3x5k2NRle2?= =?us-ascii?Q?lfFAfac79HxzWViBGwa6h/Niwo5lpYJefO4tIKCIDJXHFzgAF0m5cLNA/VK1?= =?us-ascii?Q?BWKvT+DY5aVDI8r0CWkjWh1HmN/o7eRozAEXVy0qZpk25p6MG2YKqaowUO5W?= =?us-ascii?Q?ItvyvbXgYSSugrzsLLIe83hzpOoaRrlWNSOA7UyRhNBP7IWqljnViJlE4iXV?= =?us-ascii?Q?JzL+kr/3YhVbaDTmSBhGI3yYlwYmdFwOENS8a3Kf0UnNr4Q4zmxOhXo+O39S?= =?us-ascii?Q?ISIaI7NiYObypxsTx56c9yK5ycX25MoP8oTVgdgxxniy05QTZYrWyuT5BS2U?= =?us-ascii?Q?ZpYFbMcEPrdN6NssfcsJxi/DFGNYooKXnpZDZwBNi0AUGjj4PPMS7YNCltsA?= =?us-ascii?Q?Sq+1LB6Wdg2upkc30BdgZBIyb/VH6LRIlCAmtn3e2kxuRJoWPlMwADx5NbQw?= =?us-ascii?Q?W1T3YEz7cdQVjNhXocTRgB19WE4EknUN9Vrv8zvtWCPguswu9y56uibWSAc4?= =?us-ascii?Q?GRhPpZRg=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1720; 6:bj6tHcqj9a+apsqRwn1/0EwfiDbO8OLjQTsi8C4KN9vlqEEkX0C3YT3WiKoiQGpPLq+GcN/E2pl7xeoMP2uZxWBVDMd7BNAEF1TUX6iF8zxIS6zFes8vQGHRJULVlZ+47OnPFkzlM68kWFnU/hZc032suVcZAJfS7dqZsScoVEYj/43Po68YDITAyFOBJi3DNd8lpwY4dVXVFFF6Tq1o17Ig1JwZMH80kK/VtPd1rzbfIvNxxW8osz4c8dl89//b1H2CX+sFweSb2YTKl8x7yb7RH4wUF2B5Kw7ilGO/qlRuaRHk1aWFeQDfp8ZkY2H+4FxhikmCh4Frrx75JK1bgtv1b3Sa9TitVMIfu+IEQx2AVmo/4mk+DXVjTLiEdnrM9VAENNUQU6mXuCiiSTJkvA==; 5:gm/zf3CxurPfUZ2AKV5nuxuH0Wb4xEGdt5wLj2F/QvabhWFCNtkuoNOYKydRKLwfgYyMAXVNJPXQ36u9nKdJgBFnBnblvxYi1XBtF84/7d6C2rFH6jWfP544Dpk+GtjfOxDqydHI+IU/ODFZPPHFZA==; 24:RCxJvTR/tpfSW0D+bK/O4OYfcMLwmqUe9O+nV6cE39E0C4DKVpETz52P5rCSIiIThMxti4TTbWzeqQB9UyyzltHhxE5uJtZMbyF4IBsuI9g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR0701MB1720; 7:wV4RIG461XUM3ZIMnQ0ser5Sb7lLCGVGN7VlXTLusNz6fvYqsvnCoLlk/GQVJmoc+Uqz3fxVg9lhORTZocHAF7t27Yj/O10Jalqwt4dZph2W1JmxTOCBgn8NY4SO5CGyw4EDrKw4PAyznipT+C+4qzo9Y4jhb2vO8DnowNTGaLf/HigUMrW7M5ScTEqNsx8GsT3GOU7xPFUUUhNFKWurhN6uXJJEufFgpXcV84AaIXPOtXUfb6rm8t/ydM36CNC+wr8XgImEHrBbc3+kHMZXfzaasLMWuX1wpioIANdkRhOZDUUrrwjDyQmMWFJCoFxSqFl8d/rl9LHLBmp2FzRDXA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2017 16:07:14.1145 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0701MB1720 Subject: [dpdk-dev] [PATCH] net/thunderx: use rte version of byteorder.h 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: , X-List-Received-Date: Thu, 06 Apr 2017 16:07:18 -0000 The base code was using native GCC macros for endian detection. Change to portable rte_byteorder.h based endian detection. Fixes: 262d43fe20ee ("net/thunderx/base: add HW register definitions") Suggested-by: Thomas Monjalon Signed-off-by: Jerin Jacob --- drivers/net/thunderx/base/nicvf_hw_defs.h | 58 +++++++++++++++---------------- drivers/net/thunderx/base/nicvf_plat.h | 4 +++ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/drivers/net/thunderx/base/nicvf_hw_defs.h b/drivers/net/thunderx/base/nicvf_hw_defs.h index 00dd2feb9..79f83c8d9 100644 --- a/drivers/net/thunderx/base/nicvf_hw_defs.h +++ b/drivers/net/thunderx/base/nicvf_hw_defs.h @@ -36,6 +36,8 @@ #include #include +#include "nicvf_plat.h" + /* Virtual function register offsets */ #define NIC_VF_CFG (0x000020) @@ -213,10 +215,6 @@ typedef uint64_t nicvf_phys_addr_t; -#ifndef __BYTE_ORDER__ -#error __BYTE_ORDER__ not defined -#endif - /* vNIC HW Enumerations */ enum nic_send_ld_type_e { @@ -559,7 +557,7 @@ enum nic_stat_vnic_tx_e { typedef union { uint64_t u64; struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t cqe_type:4; uint64_t stdn_fault:1; uint64_t rsvd0:1; @@ -604,7 +602,7 @@ typedef union { typedef union { uint64_t u64; struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t pkt_len:16; uint64_t l2_ptr:8; uint64_t l3_ptr:8; @@ -629,7 +627,7 @@ typedef union { typedef union { uint64_t u64; struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t rss_tag:32; uint64_t vlan_tci:16; uint64_t vlan_ptr:8; @@ -646,7 +644,7 @@ typedef union { typedef union { uint64_t u64; struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint16_t rb3_sz; uint16_t rb2_sz; uint16_t rb1_sz; @@ -663,7 +661,7 @@ typedef union { typedef union { uint64_t u64; struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint16_t rb7_sz; uint16_t rb6_sz; uint16_t rb5_sz; @@ -680,7 +678,7 @@ typedef union { typedef union { uint64_t u64; struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint16_t rb11_sz; uint16_t rb10_sz; uint16_t rb9_sz; @@ -697,7 +695,7 @@ typedef union { typedef union { uint64_t u64; struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t vlan_found:1; uint64_t vlan_stripped:1; uint64_t vlan2_found:1; @@ -742,7 +740,7 @@ struct cqe_rx_t { }; struct cqe_rx_tcp_err_t { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t cqe_type:4; /* W0 */ uint64_t rsvd0:60; @@ -764,7 +762,7 @@ struct cqe_rx_tcp_err_t { }; struct cqe_rx_tcp_t { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t cqe_type:4; /* W0 */ uint64_t rsvd0:52; uint64_t cq_tcp_status:8; @@ -786,7 +784,7 @@ struct cqe_rx_tcp_t { }; struct cqe_send_t { -#if defined(__BIG_ENDIAN_BITFIELD) +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t cqe_type:4; /* W0 */ uint64_t rsvd0:4; uint64_t sqe_ptr:16; @@ -798,7 +796,7 @@ struct cqe_send_t { uint64_t send_status:8; uint64_t ptp_timestamp:64; /* W1 */ -#elif defined(__LITTLE_ENDIAN_BITFIELD) +#elif NICVF_BYTE_ORDER == NICVF_LITTLE_ENDIAN uint64_t send_status:8; uint64_t rsvd3:8; uint64_t sq_idx:3; @@ -814,7 +812,7 @@ struct cqe_send_t { }; struct cq_entry_type_t { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t cqe_type:4; uint64_t __pad:60; #else @@ -835,7 +833,7 @@ union cq_entry_t { NICVF_STATIC_ASSERT(sizeof(union cq_entry_t) == 512); struct rbdr_entry_t { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN union { struct { uint64_t rsvd0:15; @@ -860,7 +858,7 @@ NICVF_STATIC_ASSERT(sizeof(struct rbdr_entry_t) == sizeof(uint64_t)); /* TCP reassembly context */ struct rbe_tcp_cnxt_t { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t tcp_pkt_cnt:12; uint64_t rsvd1:4; uint64_t align_hdr_bytes:4; @@ -899,7 +897,7 @@ struct rx_hdr_t { }; struct sq_crc_subdesc { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t rsvd1:32; uint64_t crc_ival:32; uint64_t subdesc_type:4; @@ -921,7 +919,7 @@ struct sq_crc_subdesc { }; struct sq_gather_subdesc { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t subdesc_type:4; /* W0 */ uint64_t ld_type:2; uint64_t rsvd0:42; @@ -942,7 +940,7 @@ struct sq_gather_subdesc { /* SQ immediate subdescriptor */ struct sq_imm_subdesc { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t subdesc_type:4; /* W0 */ uint64_t rsvd0:46; uint64_t len:14; @@ -958,7 +956,7 @@ struct sq_imm_subdesc { }; struct sq_mem_subdesc { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t subdesc_type:4; /* W0 */ uint64_t mem_alg:4; uint64_t mem_dsz:2; @@ -982,7 +980,7 @@ struct sq_mem_subdesc { }; struct sq_hdr_subdesc { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t subdesc_type:4; uint64_t tso:1; uint64_t post_cqe:1; /* Post CQE on no error also */ @@ -1045,7 +1043,7 @@ NICVF_STATIC_ASSERT(sizeof(union sq_entry_t) == 16); /* Queue config register formats */ struct rq_cfg { union { struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t reserved_2_63:62; uint64_t ena:1; uint64_t reserved_0:1; @@ -1059,7 +1057,7 @@ struct rq_cfg { union { struct { }; }; struct cq_cfg { union { struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t reserved_43_63:21; uint64_t ena:1; uint64_t reset:1; @@ -1085,7 +1083,7 @@ struct cq_cfg { union { struct { }; }; struct sq_cfg { union { struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t reserved_20_63:44; uint64_t ena:1; uint64_t reserved_18_18:1; @@ -1111,7 +1109,7 @@ struct sq_cfg { union { struct { }; }; struct rbdr_cfg { union { struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t reserved_45_63:19; uint64_t ena:1; uint64_t reset:1; @@ -1139,7 +1137,7 @@ struct rbdr_cfg { union { struct { }; }; struct pf_qs_cfg { union { struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t reserved_32_63:32; uint64_t ena:1; uint64_t reserved_27_30:4; @@ -1169,7 +1167,7 @@ struct pf_qs_cfg { union { struct { }; }; struct pf_rq_cfg { union { struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t reserved1:1; uint64_t reserved0:34; uint64_t strip_pre_l2:1; @@ -1197,7 +1195,7 @@ struct pf_rq_cfg { union { struct { }; }; struct pf_rq_drop_cfg { union { struct { -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN uint64_t rbdr_red:1; uint64_t cq_red:1; uint64_t reserved3:14; diff --git a/drivers/net/thunderx/base/nicvf_plat.h b/drivers/net/thunderx/base/nicvf_plat.h index 3754e1b88..36da12009 100644 --- a/drivers/net/thunderx/base/nicvf_plat.h +++ b/drivers/net/thunderx/base/nicvf_plat.h @@ -65,6 +65,10 @@ #define nicvf_cpu_to_be_64(x) rte_cpu_to_be_64(x) #define nicvf_be_to_cpu_64(x) rte_be_to_cpu_64(x) +#define NICVF_BYTE_ORDER RTE_BYTE_ORDER +#define NICVF_BIG_ENDIAN RTE_BIG_ENDIAN +#define NICVF_LITTLE_ENDIAN RTE_LITTLE_ENDIAN + /* Constants */ #include #define NICVF_MAC_ADDR_SIZE ETHER_ADDR_LEN -- 2.12.2