staging: et131x: move et1310_tx.h contents into et131x.c
Move et1310_tx.h contents into et131x.c and delete et1310_tx.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark Einon
Greg Kroah-Hartman
parent
562550b02b
commit
17ec9ff32c
2 changed files with 86 additions and 151 deletions
|
|
@ -1,150 +0,0 @@
|
||||||
/*
|
|
||||||
* Agere Systems Inc.
|
|
||||||
* 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs
|
|
||||||
*
|
|
||||||
* Copyright © 2005 Agere Systems Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
* http://www.agere.com
|
|
||||||
*
|
|
||||||
*------------------------------------------------------------------------------
|
|
||||||
*
|
|
||||||
* et1310_tx.h - Defines, structs, enums, prototypes, etc. pertaining to data
|
|
||||||
* transmission.
|
|
||||||
*
|
|
||||||
*------------------------------------------------------------------------------
|
|
||||||
*
|
|
||||||
* SOFTWARE LICENSE
|
|
||||||
*
|
|
||||||
* This software is provided subject to the following terms and conditions,
|
|
||||||
* which you should read carefully before using the software. Using this
|
|
||||||
* software indicates your acceptance of these terms and conditions. If you do
|
|
||||||
* not agree with these terms and conditions, do not use the software.
|
|
||||||
*
|
|
||||||
* Copyright © 2005 Agere Systems Inc.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source or binary forms, with or without
|
|
||||||
* modifications, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* . Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following Disclaimer as comments in the code as
|
|
||||||
* well as in the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
*
|
|
||||||
* . 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.
|
|
||||||
*
|
|
||||||
* . Neither the name of Agere Systems Inc. nor the names of the contributors
|
|
||||||
* may be used to endorse or promote products derived from this software
|
|
||||||
* without specific prior written permission.
|
|
||||||
*
|
|
||||||
* Disclaimer
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
|
||||||
* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
|
|
||||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
|
|
||||||
* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
|
|
||||||
* RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. 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, INCLUDING, BUT NOT LIMITED TO, 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 __ET1310_TX_H__
|
|
||||||
#define __ET1310_TX_H__
|
|
||||||
|
|
||||||
|
|
||||||
/* Typedefs for Tx Descriptor Ring */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* word 2 of the control bits in the Tx Descriptor ring for the ET-1310
|
|
||||||
*
|
|
||||||
* 0-15: length of packet
|
|
||||||
* 16-27: VLAN tag
|
|
||||||
* 28: VLAN CFI
|
|
||||||
* 29-31: VLAN priority
|
|
||||||
*
|
|
||||||
* word 3 of the control bits in the Tx Descriptor ring for the ET-1310
|
|
||||||
*
|
|
||||||
* 0: last packet in the sequence
|
|
||||||
* 1: first packet in the sequence
|
|
||||||
* 2: interrupt the processor when this pkt sent
|
|
||||||
* 3: Control word - no packet data
|
|
||||||
* 4: Issue half-duplex backpressure : XON/XOFF
|
|
||||||
* 5: send pause frame
|
|
||||||
* 6: Tx frame has error
|
|
||||||
* 7: append CRC
|
|
||||||
* 8: MAC override
|
|
||||||
* 9: pad packet
|
|
||||||
* 10: Packet is a Huge packet
|
|
||||||
* 11: append VLAN tag
|
|
||||||
* 12: IP checksum assist
|
|
||||||
* 13: TCP checksum assist
|
|
||||||
* 14: UDP checksum assist
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* struct tx_desc represents each descriptor on the ring */
|
|
||||||
struct tx_desc {
|
|
||||||
u32 addr_hi;
|
|
||||||
u32 addr_lo;
|
|
||||||
u32 len_vlan; /* control words how to xmit the */
|
|
||||||
u32 flags; /* data (detailed above) */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The status of the Tx DMA engine it sits in free memory, and is pointed to
|
|
||||||
* by 0x101c / 0x1020. This is a DMA10 type
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* TCB (Transmit Control Block: Host Side) */
|
|
||||||
struct tcb {
|
|
||||||
struct tcb *next; /* Next entry in ring */
|
|
||||||
u32 flags; /* Our flags for the packet */
|
|
||||||
u32 count; /* Used to spot stuck/lost packets */
|
|
||||||
u32 stale; /* Used to spot stuck/lost packets */
|
|
||||||
struct sk_buff *skb; /* Network skb we are tied to */
|
|
||||||
u32 index; /* Ring indexes */
|
|
||||||
u32 index_start;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Structure representing our local reference(s) to the ring */
|
|
||||||
struct tx_ring {
|
|
||||||
/* TCB (Transmit Control Block) memory and lists */
|
|
||||||
struct tcb *tcb_ring;
|
|
||||||
|
|
||||||
/* List of TCBs that are ready to be used */
|
|
||||||
struct tcb *tcb_qhead;
|
|
||||||
struct tcb *tcb_qtail;
|
|
||||||
|
|
||||||
/* list of TCBs that are currently being sent. NOTE that access to all
|
|
||||||
* three of these (including used) are controlled via the
|
|
||||||
* TCBSendQLock. This lock should be secured prior to incementing /
|
|
||||||
* decrementing used, or any queue manipulation on send_head /
|
|
||||||
* tail
|
|
||||||
*/
|
|
||||||
struct tcb *send_head;
|
|
||||||
struct tcb *send_tail;
|
|
||||||
int used;
|
|
||||||
|
|
||||||
/* The actual descriptor ring */
|
|
||||||
struct tx_desc *tx_desc_ring;
|
|
||||||
dma_addr_t tx_desc_ring_pa;
|
|
||||||
|
|
||||||
/* send_idx indicates where we last wrote to in the descriptor ring. */
|
|
||||||
u32 send_idx;
|
|
||||||
|
|
||||||
/* The location of the write-back status block */
|
|
||||||
u32 *tx_status;
|
|
||||||
dma_addr_t tx_status_pa;
|
|
||||||
|
|
||||||
/* Packets since the last IRQ: used for interrupt coalescing */
|
|
||||||
int since_irq;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* __ET1310_TX_H__ */
|
|
||||||
|
|
@ -81,7 +81,6 @@
|
||||||
#include <linux/random.h>
|
#include <linux/random.h>
|
||||||
#include <linux/phy.h>
|
#include <linux/phy.h>
|
||||||
|
|
||||||
#include "et1310_tx.h"
|
|
||||||
#include "et131x.h"
|
#include "et131x.h"
|
||||||
|
|
||||||
MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>");
|
MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>");
|
||||||
|
|
@ -365,6 +364,92 @@ struct rx_ring {
|
||||||
struct kmem_cache *recv_lookaside;
|
struct kmem_cache *recv_lookaside;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* TX defines */
|
||||||
|
/*
|
||||||
|
* word 2 of the control bits in the Tx Descriptor ring for the ET-1310
|
||||||
|
*
|
||||||
|
* 0-15: length of packet
|
||||||
|
* 16-27: VLAN tag
|
||||||
|
* 28: VLAN CFI
|
||||||
|
* 29-31: VLAN priority
|
||||||
|
*
|
||||||
|
* word 3 of the control bits in the Tx Descriptor ring for the ET-1310
|
||||||
|
*
|
||||||
|
* 0: last packet in the sequence
|
||||||
|
* 1: first packet in the sequence
|
||||||
|
* 2: interrupt the processor when this pkt sent
|
||||||
|
* 3: Control word - no packet data
|
||||||
|
* 4: Issue half-duplex backpressure : XON/XOFF
|
||||||
|
* 5: send pause frame
|
||||||
|
* 6: Tx frame has error
|
||||||
|
* 7: append CRC
|
||||||
|
* 8: MAC override
|
||||||
|
* 9: pad packet
|
||||||
|
* 10: Packet is a Huge packet
|
||||||
|
* 11: append VLAN tag
|
||||||
|
* 12: IP checksum assist
|
||||||
|
* 13: TCP checksum assist
|
||||||
|
* 14: UDP checksum assist
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* struct tx_desc represents each descriptor on the ring */
|
||||||
|
struct tx_desc {
|
||||||
|
u32 addr_hi;
|
||||||
|
u32 addr_lo;
|
||||||
|
u32 len_vlan; /* control words how to xmit the */
|
||||||
|
u32 flags; /* data (detailed above) */
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The status of the Tx DMA engine it sits in free memory, and is pointed to
|
||||||
|
* by 0x101c / 0x1020. This is a DMA10 type
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* TCB (Transmit Control Block: Host Side) */
|
||||||
|
struct tcb {
|
||||||
|
struct tcb *next; /* Next entry in ring */
|
||||||
|
u32 flags; /* Our flags for the packet */
|
||||||
|
u32 count; /* Used to spot stuck/lost packets */
|
||||||
|
u32 stale; /* Used to spot stuck/lost packets */
|
||||||
|
struct sk_buff *skb; /* Network skb we are tied to */
|
||||||
|
u32 index; /* Ring indexes */
|
||||||
|
u32 index_start;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Structure representing our local reference(s) to the ring */
|
||||||
|
struct tx_ring {
|
||||||
|
/* TCB (Transmit Control Block) memory and lists */
|
||||||
|
struct tcb *tcb_ring;
|
||||||
|
|
||||||
|
/* List of TCBs that are ready to be used */
|
||||||
|
struct tcb *tcb_qhead;
|
||||||
|
struct tcb *tcb_qtail;
|
||||||
|
|
||||||
|
/* list of TCBs that are currently being sent. NOTE that access to all
|
||||||
|
* three of these (including used) are controlled via the
|
||||||
|
* TCBSendQLock. This lock should be secured prior to incementing /
|
||||||
|
* decrementing used, or any queue manipulation on send_head /
|
||||||
|
* tail
|
||||||
|
*/
|
||||||
|
struct tcb *send_head;
|
||||||
|
struct tcb *send_tail;
|
||||||
|
int used;
|
||||||
|
|
||||||
|
/* The actual descriptor ring */
|
||||||
|
struct tx_desc *tx_desc_ring;
|
||||||
|
dma_addr_t tx_desc_ring_pa;
|
||||||
|
|
||||||
|
/* send_idx indicates where we last wrote to in the descriptor ring. */
|
||||||
|
u32 send_idx;
|
||||||
|
|
||||||
|
/* The location of the write-back status block */
|
||||||
|
u32 *tx_status;
|
||||||
|
dma_addr_t tx_status_pa;
|
||||||
|
|
||||||
|
/* Packets since the last IRQ: used for interrupt coalescing */
|
||||||
|
int since_irq;
|
||||||
|
};
|
||||||
|
|
||||||
/* ADAPTER defines */
|
/* ADAPTER defines */
|
||||||
/*
|
/*
|
||||||
* Do not change these values: if changed, then change also in respective
|
* Do not change these values: if changed, then change also in respective
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue