X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fbase%2Fwq_enet_desc.h;h=e1ad1879871e5f0e05403b834b27bd6ea741e163;hb=a001f09d11fac91b760c038cf69af7b041bc983c;hp=db41d00e14472c10349930076081b69973e6a24a;hpb=da44259fbf272bcd0b17a64709280454eb402b62;p=dpdk.git diff --git a/drivers/net/enic/base/wq_enet_desc.h b/drivers/net/enic/base/wq_enet_desc.h index db41d00e14..e1ad187987 100644 --- a/drivers/net/enic/base/wq_enet_desc.h +++ b/drivers/net/enic/base/wq_enet_desc.h @@ -1,47 +1,20 @@ -/* - * 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 _WQ_ENET_DESC_H_ #define _WQ_ENET_DESC_H_ +#include + /* Ethernet work queue descriptor: 16B */ struct wq_enet_desc { - __le64 address; - __le16 length; - __le16 mss_loopback; - __le16 header_length_flags; - __le16 vlan_tag; + uint64_t address; + uint16_t length; + uint16_t mss_loopback; + uint16_t header_length_flags; + uint16_t vlan_tag; }; #define WQ_ENET_ADDR_BITS 64 @@ -66,48 +39,51 @@ struct wq_enet_desc { #define WQ_ENET_OFFLOAD_MODE_TSO 3 static inline void wq_enet_desc_enc(struct wq_enet_desc *desc, - u64 address, u16 length, u16 mss, u16 header_length, - u8 offload_mode, u8 eop, u8 cq_entry, u8 fcoe_encap, - u8 vlan_tag_insert, u16 vlan_tag, u8 loopback) + uint64_t address, uint16_t length, uint16_t mss, uint16_t header_length, + uint8_t offload_mode, uint8_t eop, uint8_t cq_entry, uint8_t fcoe_encap, + uint8_t vlan_tag_insert, uint16_t vlan_tag, uint8_t loopback) { - desc->address = cpu_to_le64(address); - desc->length = cpu_to_le16(length & WQ_ENET_LEN_MASK); - desc->mss_loopback = cpu_to_le16((mss & WQ_ENET_MSS_MASK) << + desc->address = rte_cpu_to_le_64(address); + desc->length = rte_cpu_to_le_16(length & WQ_ENET_LEN_MASK); + desc->mss_loopback = rte_cpu_to_le_16((mss & WQ_ENET_MSS_MASK) << WQ_ENET_MSS_SHIFT | (loopback & 1) << WQ_ENET_LOOPBACK_SHIFT); - desc->header_length_flags = cpu_to_le16( - (header_length & WQ_ENET_HDRLEN_MASK) | + desc->header_length_flags = rte_cpu_to_le_16 + ((header_length & WQ_ENET_HDRLEN_MASK) | (offload_mode & WQ_ENET_FLAGS_OM_MASK) << WQ_ENET_HDRLEN_BITS | (eop & 1) << WQ_ENET_FLAGS_EOP_SHIFT | (cq_entry & 1) << WQ_ENET_FLAGS_CQ_ENTRY_SHIFT | (fcoe_encap & 1) << WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT | (vlan_tag_insert & 1) << WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT); - desc->vlan_tag = cpu_to_le16(vlan_tag); + desc->vlan_tag = rte_cpu_to_le_16(vlan_tag); } static inline void wq_enet_desc_dec(struct wq_enet_desc *desc, - u64 *address, u16 *length, u16 *mss, u16 *header_length, - u8 *offload_mode, u8 *eop, u8 *cq_entry, u8 *fcoe_encap, - u8 *vlan_tag_insert, u16 *vlan_tag, u8 *loopback) + uint64_t *address, uint16_t *length, uint16_t *mss, + uint16_t *header_length, uint8_t *offload_mode, uint8_t *eop, + uint8_t *cq_entry, uint8_t *fcoe_encap, uint8_t *vlan_tag_insert, + uint16_t *vlan_tag, uint8_t *loopback) { - *address = le64_to_cpu(desc->address); - *length = le16_to_cpu(desc->length) & WQ_ENET_LEN_MASK; - *mss = (le16_to_cpu(desc->mss_loopback) >> WQ_ENET_MSS_SHIFT) & + *address = rte_le_to_cpu_64(desc->address); + *length = rte_le_to_cpu_16(desc->length) & WQ_ENET_LEN_MASK; + *mss = (rte_le_to_cpu_16(desc->mss_loopback) >> WQ_ENET_MSS_SHIFT) & WQ_ENET_MSS_MASK; - *loopback = (u8)((le16_to_cpu(desc->mss_loopback) >> + *loopback = (uint8_t)((rte_le_to_cpu_16(desc->mss_loopback) >> WQ_ENET_LOOPBACK_SHIFT) & 1); - *header_length = le16_to_cpu(desc->header_length_flags) & + *header_length = rte_le_to_cpu_16(desc->header_length_flags) & WQ_ENET_HDRLEN_MASK; - *offload_mode = (u8)((le16_to_cpu(desc->header_length_flags) >> + *offload_mode = + (uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >> WQ_ENET_HDRLEN_BITS) & WQ_ENET_FLAGS_OM_MASK); - *eop = (u8)((le16_to_cpu(desc->header_length_flags) >> + *eop = (uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >> WQ_ENET_FLAGS_EOP_SHIFT) & 1); - *cq_entry = (u8)((le16_to_cpu(desc->header_length_flags) >> + *cq_entry = (uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >> WQ_ENET_FLAGS_CQ_ENTRY_SHIFT) & 1); - *fcoe_encap = (u8)((le16_to_cpu(desc->header_length_flags) >> + *fcoe_encap = (uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >> WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT) & 1); - *vlan_tag_insert = (u8)((le16_to_cpu(desc->header_length_flags) >> + *vlan_tag_insert = + (uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >> WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT) & 1); - *vlan_tag = le16_to_cpu(desc->vlan_tag); + *vlan_tag = rte_le_to_cpu_16(desc->vlan_tag); } #endif /* _WQ_ENET_DESC_H_ */