X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fbase%2Fcq_enet_desc.h;h=602ac22b658f627e7ac4edc32a8348c122e14ad1;hb=25ae7f1a5d9d127a46f8d62d1d689f77a78138fd;hp=e8410563a708e8c8bf7ec757b74aee56c3392c18;hpb=322b355f2183665f0b45faaa9a4df3452ee34349;p=dpdk.git diff --git a/drivers/net/enic/base/cq_enet_desc.h b/drivers/net/enic/base/cq_enet_desc.h index e8410563a7..602ac22b65 100644 --- a/drivers/net/enic/base/cq_enet_desc.h +++ b/drivers/net/enic/base/cq_enet_desc.h @@ -1,59 +1,33 @@ -/* - * Copyright 2008-2010 Cisco Systems, Inc. All rights reserved. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2008-2017 Cisco Systems, Inc. All rights reserved. * Copyright 2007 Nuova Systems, Inc. All rights reserved. - * - * Copyright (c) 2014, Cisco Systems, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * */ #ifndef _CQ_ENET_DESC_H_ #define _CQ_ENET_DESC_H_ +#include #include "cq_desc.h" /* Ethernet completion queue descriptor: 16B */ struct cq_enet_wq_desc { - __le16 completed_index; - __le16 q_number; - u8 reserved[11]; - u8 type_color; + uint16_t completed_index; + uint16_t q_number; + uint8_t reserved[11]; + uint8_t type_color; }; static inline void cq_enet_wq_desc_enc(struct cq_enet_wq_desc *desc, - u8 type, u8 color, u16 q_number, u16 completed_index) + uint8_t type, uint8_t color, uint16_t q_number, + uint16_t completed_index) { cq_desc_enc((struct cq_desc *)desc, type, color, q_number, completed_index); } static inline void cq_enet_wq_desc_dec(struct cq_enet_wq_desc *desc, - u8 *type, u8 *color, u16 *q_number, u16 *completed_index) + uint8_t *type, uint8_t *color, uint16_t *q_number, + uint16_t *completed_index) { cq_desc_dec((struct cq_desc *)desc, type, color, q_number, completed_index); @@ -61,27 +35,27 @@ static inline void cq_enet_wq_desc_dec(struct cq_enet_wq_desc *desc, /* Completion queue descriptor: Ethernet receive queue, 16B */ struct cq_enet_rq_desc { - __le16 completed_index_flags; - __le16 q_number_rss_type_flags; - __le32 rss_hash; - __le16 bytes_written_flags; - __le16 vlan; - __le16 checksum_fcoe; - u8 flags; - u8 type_color; + uint16_t completed_index_flags; + uint16_t q_number_rss_type_flags; + uint32_t rss_hash; + uint16_t bytes_written_flags; + uint16_t vlan; + uint16_t checksum_fcoe; + uint8_t flags; + uint8_t type_color; }; /* Completion queue descriptor: Ethernet receive queue, 16B */ struct cq_enet_rq_clsf_desc { - __le16 completed_index_flags; - __le16 q_number_rss_type_flags; - __le16 filter_id; - __le16 lif; - __le16 bytes_written_flags; - __le16 vlan; - __le16 checksum_fcoe; - u8 flags; - u8 type_color; + uint16_t completed_index_flags; + uint16_t q_number_rss_type_flags; + uint16_t filter_id; + uint16_t lif; + uint16_t bytes_written_flags; + uint16_t vlan; + uint16_t checksum_fcoe; + uint8_t flags; + uint8_t type_color; }; #define CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT (0x1 << 12) @@ -137,43 +111,46 @@ struct cq_enet_rq_clsf_desc { #define CQ_ENET_RQ_DESC_FLAGS_FCS_OK (0x1 << 7) static inline void cq_enet_rq_desc_enc(struct cq_enet_rq_desc *desc, - u8 type, u8 color, u16 q_number, u16 completed_index, - u8 ingress_port, u8 fcoe, u8 eop, u8 sop, u8 rss_type, u8 csum_not_calc, - u32 rss_hash, u16 bytes_written, u8 packet_error, u8 vlan_stripped, - u16 vlan, u16 checksum, u8 fcoe_sof, u8 fcoe_fc_crc_ok, - u8 fcoe_enc_error, u8 fcoe_eof, u8 tcp_udp_csum_ok, u8 udp, u8 tcp, - u8 ipv4_csum_ok, u8 ipv6, u8 ipv4, u8 ipv4_fragment, u8 fcs_ok) + uint8_t type, uint8_t color, uint16_t q_number, + uint16_t completed_index, uint8_t ingress_port, uint8_t fcoe, + uint8_t eop, uint8_t sop, uint8_t rss_type, uint8_t csum_not_calc, + uint32_t rss_hash, uint16_t bytes_written, uint8_t packet_error, + uint8_t vlan_stripped, uint16_t vlan, uint16_t checksum, + uint8_t fcoe_sof, uint8_t fcoe_fc_crc_ok, uint8_t fcoe_enc_error, + uint8_t fcoe_eof, uint8_t tcp_udp_csum_ok, uint8_t udp, uint8_t tcp, + uint8_t ipv4_csum_ok, uint8_t ipv6, uint8_t ipv4, uint8_t ipv4_fragment, + uint8_t fcs_ok) { cq_desc_enc((struct cq_desc *)desc, type, color, q_number, completed_index); - desc->completed_index_flags |= cpu_to_le16( - (ingress_port ? CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT : 0) | + desc->completed_index_flags |= rte_cpu_to_le_16 + ((ingress_port ? CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT : 0) | (fcoe ? CQ_ENET_RQ_DESC_FLAGS_FCOE : 0) | (eop ? CQ_ENET_RQ_DESC_FLAGS_EOP : 0) | (sop ? CQ_ENET_RQ_DESC_FLAGS_SOP : 0)); - desc->q_number_rss_type_flags |= cpu_to_le16( - ((rss_type & CQ_ENET_RQ_DESC_RSS_TYPE_MASK) << + desc->q_number_rss_type_flags |= rte_cpu_to_le_16 + (((rss_type & CQ_ENET_RQ_DESC_RSS_TYPE_MASK) << CQ_DESC_Q_NUM_BITS) | (csum_not_calc ? CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC : 0)); - desc->rss_hash = cpu_to_le32(rss_hash); + desc->rss_hash = rte_cpu_to_le_32(rss_hash); - desc->bytes_written_flags = cpu_to_le16( - (bytes_written & CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK) | + desc->bytes_written_flags = rte_cpu_to_le_16 + ((bytes_written & CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK) | (packet_error ? CQ_ENET_RQ_DESC_FLAGS_TRUNCATED : 0) | (vlan_stripped ? CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED : 0)); - desc->vlan = cpu_to_le16(vlan); + desc->vlan = rte_cpu_to_le_16(vlan); if (fcoe) { - desc->checksum_fcoe = cpu_to_le16( - (fcoe_sof & CQ_ENET_RQ_DESC_FCOE_SOF_MASK) | + desc->checksum_fcoe = rte_cpu_to_le_16 + ((fcoe_sof & CQ_ENET_RQ_DESC_FCOE_SOF_MASK) | ((fcoe_eof & CQ_ENET_RQ_DESC_FCOE_EOF_MASK) << CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT)); } else { - desc->checksum_fcoe = cpu_to_le16(checksum); + desc->checksum_fcoe = rte_cpu_to_le_16(checksum); } desc->flags = @@ -190,25 +167,27 @@ static inline void cq_enet_rq_desc_enc(struct cq_enet_rq_desc *desc, } static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc, - u8 *type, u8 *color, u16 *q_number, u16 *completed_index, - u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type, - u8 *csum_not_calc, u32 *rss_hash, u16 *bytes_written, u8 *packet_error, - u8 *vlan_stripped, u16 *vlan_tci, u16 *checksum, u8 *fcoe_sof, - u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error, u8 *fcoe_eof, - u8 *tcp_udp_csum_ok, u8 *udp, u8 *tcp, u8 *ipv4_csum_ok, - u8 *ipv6, u8 *ipv4, u8 *ipv4_fragment, u8 *fcs_ok) + uint8_t *type, uint8_t *color, uint16_t *q_number, + uint16_t *completed_index, uint8_t *ingress_port, uint8_t *fcoe, + uint8_t *eop, uint8_t *sop, uint8_t *rss_type, uint8_t *csum_not_calc, + uint32_t *rss_hash, uint16_t *bytes_written, uint8_t *packet_error, + uint8_t *vlan_stripped, uint16_t *vlan_tci, uint16_t *checksum, + uint8_t *fcoe_sof, uint8_t *fcoe_fc_crc_ok, uint8_t *fcoe_enc_error, + uint8_t *fcoe_eof, uint8_t *tcp_udp_csum_ok, uint8_t *udp, uint8_t *tcp, + uint8_t *ipv4_csum_ok, uint8_t *ipv6, uint8_t *ipv4, + uint8_t *ipv4_fragment, uint8_t *fcs_ok) { - u16 completed_index_flags; - u16 q_number_rss_type_flags; - u16 bytes_written_flags; + uint16_t completed_index_flags; + uint16_t q_number_rss_type_flags; + uint16_t bytes_written_flags; cq_desc_dec((struct cq_desc *)desc, type, color, q_number, completed_index); - completed_index_flags = le16_to_cpu(desc->completed_index_flags); + completed_index_flags = rte_le_to_cpu_16(desc->completed_index_flags); q_number_rss_type_flags = - le16_to_cpu(desc->q_number_rss_type_flags); - bytes_written_flags = le16_to_cpu(desc->bytes_written_flags); + rte_le_to_cpu_16(desc->q_number_rss_type_flags); + bytes_written_flags = rte_le_to_cpu_16(desc->bytes_written_flags); *ingress_port = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0; @@ -219,12 +198,12 @@ static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc, *sop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_SOP) ? 1 : 0; - *rss_type = (u8)((q_number_rss_type_flags >> CQ_DESC_Q_NUM_BITS) & + *rss_type = (uint8_t)((q_number_rss_type_flags >> CQ_DESC_Q_NUM_BITS) & CQ_ENET_RQ_DESC_RSS_TYPE_MASK); *csum_not_calc = (q_number_rss_type_flags & CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0; - *rss_hash = le32_to_cpu(desc->rss_hash); + *rss_hash = rte_le_to_cpu_32(desc->rss_hash); *bytes_written = bytes_written_flags & CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK; @@ -236,16 +215,16 @@ static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc, /* * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12) */ - *vlan_tci = le16_to_cpu(desc->vlan); + *vlan_tci = rte_le_to_cpu_16(desc->vlan); if (*fcoe) { - *fcoe_sof = (u8)(le16_to_cpu(desc->checksum_fcoe) & + *fcoe_sof = (uint8_t)(rte_le_to_cpu_16(desc->checksum_fcoe) & CQ_ENET_RQ_DESC_FCOE_SOF_MASK); *fcoe_fc_crc_ok = (desc->flags & CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0; *fcoe_enc_error = (desc->flags & CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0; - *fcoe_eof = (u8)((le16_to_cpu(desc->checksum_fcoe) >> + *fcoe_eof = (uint8_t)((rte_le_to_cpu_16(desc->checksum_fcoe) >> CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) & CQ_ENET_RQ_DESC_FCOE_EOF_MASK); *checksum = 0; @@ -254,7 +233,7 @@ static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc, *fcoe_fc_crc_ok = 0; *fcoe_enc_error = 0; *fcoe_eof = 0; - *checksum = le16_to_cpu(desc->checksum_fcoe); + *checksum = rte_le_to_cpu_16(desc->checksum_fcoe); } *tcp_udp_csum_ok =