From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0047.outbound.protection.outlook.com [104.47.42.47]) by dpdk.org (Postfix) with ESMTP id DFEC92BB0 for ; Mon, 10 Apr 2017 21:45:08 +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=V8WWxRtt3TBGb42BpjFHZYwCSneZzZUYGtcTnBiigL0=; b=lfUvk8DbmoHhC5A4gsIkIW0KQLSkiO6ZHREy3FmNX36S2k8O4+HB64kZDEA6v1Kudd8kKfJlVnH49e0TfFtaLhEhXMMkxnz+NY0p85Cb+VQGYoUw7c4QRQ2aD7/UA0LDtUsZAkS3Djd2HDzH/Luem5ErcH+cu8ttLVqka6ooFfU= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost.localdomain (106.208.29.104) by CY1PR0701MB1727.namprd07.prod.outlook.com (10.163.21.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Mon, 10 Apr 2017 19:45:03 +0000 From: Jerin Jacob To: dev@dpdk.org Cc: thomas.monjalon@6wind.com, ferruh.yigit@intel.com, Jerin Jacob Date: Tue, 11 Apr 2017 01:14:34 +0530 Message-Id: <20170410194434.14453-1-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170406160651.15432-1-jerin.jacob@caviumnetworks.com> References: <20170406160651.15432-1-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [106.208.29.104] X-ClientProxiedBy: BMXPR01CA0017.INDPRD01.PROD.OUTLOOK.COM (10.174.214.155) To CY1PR0701MB1727.namprd07.prod.outlook.com (10.163.21.141) X-MS-Office365-Filtering-Correlation-Id: a5493bb0-8e99-45e3-7128-08d4804a16b0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY1PR0701MB1727; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 3:t+kU844vTE17ALTEy7IwoB9K8bGby/B9EChGbtFF9PHCAX8fOOIRic1aU/xLWlqcLibq4LYO1rrZc+awR/K4LItvz7nebTwZB7wYfA+hdRtghndzcpPpEgj6WpM3RMeIzpcs4Cbvk3GvQFcckDY0YLAFrp2aI1OrU1F7TyPtE9Ylq+exNByMbLA2955IEFXyS+XETws7LkJW7PN2eP7VAmZs4KktrU4nw8hqDgwVSnTEngfm8AIStqgV30dAOVXYC4AM8Fd69r9yFeOodwa2y+GunQu0B8Y+qdmqKvZd4G5duFuos+ISVQSysCs2jsDR9To/tXX8vXhBLUYnH4GwWQ==; 25:t7UYj1RySoTTzku0TdufB9waQbTqqK0A+BAEfUA6d5ket5JrdMGEy7S29SNPf6wSqN6+o/7pT8/7p5/fJG+5UpC78jChbbd3bon2VfpktZfyK/X0yCMZjjvSNYrKF6xCRAc1vPfDZShDzFksHi+NpXgqkuf/8LFPNUtLWhPX6z109fz7ANHHukd1R3eYtiEr6yi8Htiu8bwI2g/6J2QeXZJfRZ/8RaL3GTh8btRpV0P2oSU8Y4a+/UMmJ6D1z0D2S9LQaUrKIKhlruvUvho7j3K4hz8NNQK0MadikqZayP8g4BoW1U8nxzbypMXEdLivK5pFXZGG7hTeSANuiyW6oxz9blqdO2mVDOxUjoiDAvxvTui6D6jX7QG9ncel4QoP7wubtC1KmZ0mpNydNj3Te99LFwvN4A0PeE2CVZHPWJbJMEP3DIpOQPdecgAUtBvyY3DZct4ULyQG7+lCPQPTEw== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 31:9KcVa8n3j04wCJs6PZo02WmdM/YY4jHa8L4+0DzlaVMUCD704BXkv9Yfbjg/9/ufEo1GOkBmZgW5BTdeV7R7Y8sJnBg3Jk0npakcmGn+h3r7TCBQOwpsjjZ32zHoAsqIoMAW0lgKAoOn+4btzohtEM5q1r4Q9UjNx3aFIgpzoP/6vvmlCpB8JqLkJdpBMcZ7gON4AyAWEwnlUxSyeewXDv3U6ymESweONlXUqmdDzFOmH0SvAs27Do260cxERftioM6bh6CBga1kH2NUTP3gTw==; 20:TkkC/lnPkxZXtH5nlC704szYvFLw4/iN1qHPHtg/k9V0q24rEAOP+th+Ai5z1Fm0yr5WhLekNPyKCrY+GWu8GDo4itFuPpwj/U6QKVo6k2X+4GB19/t2rMLqb+l1+fg91KXaPkIq/16VEoG46q1EJxhY+g9IHiq6QFzj//bq/xUvBmsRkISVjzzctWa/ZuhLxkppXvGwArQ6+cgh65tzdk0LX5rOeWmhVuFvUHt9YC7c7ZmaTMyHxX66hmzA6Ag0v9ukA1iByotP9hBZ1fBYhp6lBprNhTuogSI57PYGolklaIzyZzwKiVbVdp7PY9e108hJN2Jok8ZOGcLmt4LQv47G0c/wYtu4+FVGrgpHNXOUyowxWPlZAwvdJZBVyoesLqAPKVYakRDuOCScNPuQ3xDN+VI9/EsyRlTpQIHmx3Y6M1pv/0V+2Cwbg9BMQ1sY/hyuiHKE/01xok0ZGXAUj4j2eLbcgU1DuUGseT3jV+Tzwbfi4GaaF96S8TI8oJ9QytmSOD8Uk44gZHW3VXgKZXC5EkIqrgVFvqaP+TAJUf7rnH5fd4qSCw5vvSrl8I3D02J+AtXmr7Y/swX8V3IFJruqIBlwafh8IYBDS7CArS0= 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)(93006095)(3002001)(6041248)(20161123562025)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(6072148); SRVR:CY1PR0701MB1727; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB1727; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 4:9gmq6UW23zYS9CiIHBsNCu2xtdetuxoyv29Jf1hfq0h/zKrLSss4j54eHTZq4aki+4y83eie97NPDeDWbiE4tCOmpRQe2JOu7X01/DopUseHNWA5S7/JwH5e85wWa0250u4IKdMQIi1WWiP+LNiKS2YlUV1eCa/ma4JauJWjDh+bBWOEPkFfYQHh/xfNBFiLP5b7gviUtPq/DUXSEOK4HYvEI44tJ/B1J5iDs5Z7vSJ74//HckMuWpNsiA1zrx16rV85eeR61EExn2gnPDahtCe7hxKqvPavsf0V8WErU4y60z65O3hlwxx+KIkArSO1SJvdBqxmle8YAnIrkPcfxAtb1+7VS3xEw97tdrGEKm05Q81fXpmDDYnllThwC9snNHFStzrhkDNTx5ZS2uAtOIKrEHtje4hmXRfpsn52gWhlTF3Ema8ydtxKKUlOyofw0ZckzH7AiVVLSYHwE04uQRdYnjxBVvMtaQPie/w2SmbjF4kP6lqzATbP3k8vHeF93mGZu2ONk+UP69CBGW1y9QYhqSDL+2sb9JVddmx9+9q6jb8tolKxgIVfTIIgcGmHR+OKBajpKEn4qPNfoEiHkPmawBNkkXFEnJGlCP8iWCFaNRoMdJFWr4xGghZqjlE7hvxBl6Ebiku/5Z+zn5sUZt/OEA1PaAmTRAarikPaNf0GGgGBtKIrXsD6I5YxW1ji X-Forefront-PRVS: 027367F73D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(39400400002)(39840400002)(39450400003)(39850400002)(39410400002)(5009440100003)(50986999)(76176999)(3846002)(6116002)(1076002)(4326008)(107886003)(110136004)(2906002)(36756003)(66066001)(33646002)(2351001)(2361001)(38730400002)(25786009)(8676002)(42186005)(189998001)(47776003)(48376002)(7736002)(305945005)(50466002)(5660300001)(5003940100001)(42882006)(2950100002)(6486002)(6916009)(6666003)(6506006)(6512007)(50226002)(53936002)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB1727; H:localhost.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0701MB1727; 23:ygcG7A00F6J/mTqAQsa33lJ419iqs8bbW3DXkBv?= =?us-ascii?Q?q0rw18GQvEg3eNsUxDSZ8jkZ/yYCNuMsCTesHBo164CxJ7v4TlRqpZtS49Qj?= =?us-ascii?Q?HNev+1BeROqwyhrUHtFdu2totgaw1UQtN32EMkRVIh3UarO79Ct1nJXnV965?= =?us-ascii?Q?3ZIR6tMa7X6V5Z/KKNWJhCgTLrADXjGFoatpH6SmRPb19dEIjBebnzSDAnNR?= =?us-ascii?Q?YePwaYN3T8c5yKuPynrkB1QbZ9j6ASdxm8wYei0c1vSvXPYgG5gsFH1TQgCx?= =?us-ascii?Q?Fyt7YA3Wq4s3FKOBsdZYBRyvLQS4HNeQz0xsxSuNCyxBIVU8EPs2NYTc4TJY?= =?us-ascii?Q?Vtam50u1MpWKszCVxHKinvY0tcg6VVA12xXbJfi1T9lZ2mloqm267H5ypJyd?= =?us-ascii?Q?VoaiLFtfptuqSqgWuyekBPQdWTqytk0P3Ou4/4jEHNrDUtmnhWFRz3wulwLm?= =?us-ascii?Q?ocRGb51Bs07coaSuFvgnDgC/756RN8Yy7PKKp08g9iW0G00g2L4ghsNYBLrh?= =?us-ascii?Q?0nfmBU32NVwQoXqiKpBtKo8sdeHGBtg+Ou5uhQ4e33e7tzrJ3lNYMkVjyWNH?= =?us-ascii?Q?k1NDySTnzb/tAmKVzOibhgxSHCUipOLuDqvPrYcjRVKjVyQZn6enGkCQ/78j?= =?us-ascii?Q?yYZyitT2FfJzrJbkuby0kb4jP799XTcTFJ4yCnXeimXzE6o36qj7Dl867tiV?= =?us-ascii?Q?+O3IJMWXlDbXf7ZojJTsYYkCoUz4dJboFIjEG9V2Zj2ZBtjmq0RFm5C9xOfo?= =?us-ascii?Q?ZhB/2AxdavqUYIEeQ0ksrmCUTP/RNRskfopmTLamvzQuUVTkvoRLwus6qP5S?= =?us-ascii?Q?Zew3zBAID/wY4AOhEEF71nD6DbFnK+BollfZgdmu18LigWcE5yQGKUAir4zN?= =?us-ascii?Q?p1ngtMYNH3AY+fC5B9udxW2n9pSdVIWZGDOZWa4O2ncdVLOgq1YSFDTDu1sn?= =?us-ascii?Q?t5Pj6ABYCHn7IfFYD6pAQRxrA8/qRn1FbX1N32R4YKb0msgN3XPU3kCIFl8g?= =?us-ascii?Q?FK2CMdbzskengF1OJIiTgABb2uTbQ1c0V/hXMPSsGPcRyjTjdlC/8EuiPvO7?= =?us-ascii?Q?/Esw70E9JlvAEHnceIDon6Uxo2v7zCF2ydBeeMoETZ0RYnyDmvCfat2c2EGO?= =?us-ascii?Q?lC4amp+1ILXhn2hzKpx1Umx0Prj6qda2q?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 6:pxgq2+h2xmWusNO0eVZ0m8RjfbEITkFb2J7JIxgiwDZOCvONdaGOLMHbgyDrCzQh9citDNJEqysm7Ru4ndITrEggCTiua9WOzr1LngWJbBs/uw7MPCV8gzTz5ybubZix0aOsv3PF/f8s6TL1HTybq+RhcZAwpum1EuggdxcvYwbUPoOMYfjJIcOjg68IyfZ5zH3cS2vAtcnF+Pb8WwacnDMcQmEdOHyQHzEjP1aCaAy/e+H+2tLonv2sTC9HZKM/KWsbu9ILSWabeKK5H+A7eDPeSGUjV2vNDs3MiRfx9m1PKQCUKhaGzCQ21KPBvVTdiY6d9stgSLNgMZA6fKYDEzrhNT1jsGfknqICZ32O5fqanYFAxqTKLne9kL8WwAV9XNRr9yqunBEOadPZ5RPhobyy0P7315rqg4Nnxh8bNvwAd+kt+zsPWZc/c2jM71Ta9u4D3OgpIyKd+6pY0qTIqw==; 5:AAGlyQukJX5dvQwpTZuxGtxtc6NuxBHme41BFZBKrgr0YYSZi6hDND76ex3zV7xMrV5vx4cD0FuuUeyt63yNL3qH0x+UptoszThn3I4QLQ/ZyxUg31dFHUeABaONaXclCjgrJzZzJfOd21SncCS3Xg==; 24:c2kKszkKFumoaogXJAS8ecuwMLdmHZXnQoS38yKO0qKb8oRHC//wxi35ehjPt+a9+SsS8upC+dZr7OK289JHz4/7QDg2ryX1GYIkeWmC4NM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1727; 7:eTaz0RRdnyVvVIgieug6SutMH+CVqSFXBldFMJULxafXRm5aMx71LTpNGWQfoZ0+/cCcCnqQ0qg80AM4J3hDVK2T+nFZxOyN074/JAHHw2Icny+oWp/IFLWgd9FkELMRtQkCNpjTm0wlx2Mhwvy3ZWzv4SQZKVK2j50iL3QwYl8frXqG+sRA4br1dJ5cL+GbdrEVgLst3J65WqpoBSDb5lhlolv/NOZ9k/5V1LTtU/qbnaJjnu/uXeSF1qBU5nHFP8fO8Jfr0wOxuitaG7IS4nqltoCpRwGJiTLQALXMGyWv7A30aFaOCQn38gINARmDieDQr1oREChNM+TLmGIZbA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 19:45:03.9084 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1727 Subject: [dpdk-dev] [PATCH v2] 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: Mon, 10 Apr 2017 19:45:09 -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 --- v2: Change a instance(drivers/net/thunderx/base/nicvf_mbox.c) of gcc macro usage (Ferruh) --- drivers/net/thunderx/base/nicvf_hw_defs.h | 58 +++++++++++++++---------------- drivers/net/thunderx/base/nicvf_mbox.c | 2 +- drivers/net/thunderx/base/nicvf_plat.h | 4 +++ 3 files changed, 33 insertions(+), 31 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_mbox.c b/drivers/net/thunderx/base/nicvf_mbox.c index 8b3477d5f..a072f19d1 100644 --- a/drivers/net/thunderx/base/nicvf_mbox.c +++ b/drivers/net/thunderx/base/nicvf_mbox.c @@ -328,7 +328,7 @@ nicvf_mbox_qset_config(struct nicvf *nic, struct pf_qs_cfg *qs_cfg) { struct nic_mbx mbx = { .msg = { 0 } }; -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#if NICVF_BYTE_ORDER == NICVF_BIG_ENDIAN qs_cfg->be = 1; #endif /* Send a mailbox msg to PF to config Qset */ 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