Sync with FreeBSD's "em".

ok deraadt@

1 files changed, 254 insertions, 82 deletions

diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h
index f8167d415a9..032129a9923 100644
--- a/sys/dev/pci/if_em.h
+++ b/sys/dev/pci/if_em.h
@@ -1,39 +1,38 @@
 /**************************************************************************
 
-Copyright (c) 2001-2002 Intel Corporation
+Copyright (c) 2001-2003, Intel Corporation
 All rights reserved.
 
-Redistribution and use in source and binary forms of the Software, with or
-without modification, are permitted provided that the following conditions
-are met:
+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 of the Software may retain the above
-    copyright notice, this list of conditions and the following disclaimer.
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
 
- 2. Redistributions in binary form of the Software may reproduce the above
-    copyright notice, this list of conditions and the following disclaimer
-    in the documentation and/or other materials provided with the
-    distribution.
+ 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.
 
  3. Neither the name of the Intel Corporation nor the names of its
-    contributors shall be used to endorse or promote products derived from
-    this Software without specific prior written permission.
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
 
 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 INTEL OR ITS 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.
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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.
 
 ***************************************************************************/
 
-/*$FreeBSD$*/
+/*$FreeBSD: if_em.h,v 1.16 2003/06/05 17:51:38 pdeuskar Exp $*/
+/* $OpenBSD: if_em.h,v 1.2 2003/06/13 19:21:21 henric Exp $ */
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_
@@ -41,35 +40,149 @@ SUCH DAMAGE.
 #include <dev/pci/if_em_hw.h>
 
 /* Tunables */
-#define MAX_TXD                         256
-#define MAX_RXD                         256
-#define TX_CLEANUP_THRESHOLD            MAX_TXD / 8
-#define TIDV                            128     
-#define RIDV                            28      
-#define DO_AUTO_NEG                     1       
-#define WAIT_FOR_AUTO_NEG_DEFAULT       1       
-#define AUTONEG_ADV_DEFAULT             (ADVERTISE_10_HALF |	\
-					 ADVERTISE_10_FULL |	\
-                                         ADVERTISE_100_HALF |	\
-					 ADVERTISE_100_FULL |	\
-                                         ADVERTISE_1000_FULL)
-#define EM_REPORT_TX_EARLY              2
-#define EM_CHECKSUM_FEATURES            (CSUM_TCP | CSUM_UDP)
+
+/*
+ * TxDescriptors
+ * Valid Range: 80-256 for 82542 and 82543-based adapters
+ *              80-4096 for others
+ * Default Value: 256
+ *   This value is the number of transmit descriptors allocated by the driver.
+ *   Increasing this value allows the driver to queue more transmits. Each
+ *   descriptor is 16 bytes.
+ */
+#define EM_MAX_TXD                      256
+
+/*
+ * RxDescriptors
+ * Valid Range: 80-256 for 82542 and 82543-based adapters
+ *              80-4096 for others
+ * Default Value: 256
+ *   This value is the number of receive descriptors allocated by the driver.
+ *   Increasing this value allows the driver to buffer more incoming packets.
+ *   Each descriptor is 16 bytes.  A receive buffer is also allocated for each
+ *   descriptor. The maximum MTU size is 16110.
+ *
+ */
+#define EM_MAX_RXD                      256
+
+/*
+ * TxIntDelay
+ * Valid Range: 0-65535 (0=off)
+ * Default Value: 64
+ *   This value delays the generation of transmit interrupts in units of
+ *   1.024 microseconds. Transmit interrupt reduction can improve CPU
+ *   efficiency if properly tuned for specific network traffic. If the
+ *   system is reporting dropped transmits, this value may be set too high
+ *   causing the driver to run out of available transmit descriptors.
+ */
+#define EM_TIDV                         64
+
+/*
+ * TxAbsIntDelay (Not valid for 82542 and 82543)
+ * Valid Range: 0-65535 (0=off)
+ * Default Value: 64
+ *   This value, in units of 1.024 microseconds, limits the delay in which a
+ *   transmit interrupt is generated. Useful only if TxIntDelay is non-zero,
+ *   this value ensures that an interrupt is generated after the initial
+ *   packet is sent on the wire within the set amount of time.  Proper tuning,
+ *   along with TxIntDelay, may improve traffic throughput in specific
+ *   network conditions.
+ */
+#define EM_TADV                         64
+
+/*
+ * RxIntDelay
+ * Valid Range: 0-65535 (0=off)
+ * Default Value: 0
+ *   This value delays the generation of receive interrupts in units of 1.024
+ *   microseconds.  Receive interrupt reduction can improve CPU efficiency if
+ *   properly tuned for specific network traffic. Increasing this value adds
+ *   extra latency to frame reception and can end up decreasing the throughput
+ *   of TCP traffic. If the system is reporting dropped receives, this value
+ *   may be set too high, causing the driver to run out of available receive
+ *   descriptors.
+ *
+ *   CAUTION: When setting RxIntDelay to a value other than 0, adapters
+ *            may hang (stop transmitting) under certain network conditions.
+ *            If this occurs a WATCHDOG message is logged in the system event log.
+ *            In addition, the controller is automatically reset, restoring the
+ *            network connection. To eliminate the potential for the hang
+ *            ensure that RxIntDelay is set to 0.
+ */
+#define EM_RDTR                         0
+
+/*
+ * RxAbsIntDelay (Not valid for 82542 and 82543)
+ * Valid Range: 0-65535 (0=off)
+ * Default Value: 64
+ *   This value, in units of 1.024 microseconds, limits the delay in which a
+ *   receive interrupt is generated. Useful only if RxIntDelay is non-zero,
+ *   this value ensures that an interrupt is generated after the initial
+ *   packet is received within the set amount of time.  Proper tuning,
+ *   along with RxIntDelay, may improve traffic throughput in specific network
+ *   conditions.
+ */
+#define EM_RADV                         64
+
+
+/*
+ * This parameter controls the maximum no of times the driver will loop
+ * in the isr.
+ *           Minimum Value = 1
+ */
 #define EM_MAX_INTR                     3
+
+/*
+ * Inform the stack about transmit checksum offload capabilities.
+ */
+#define EM_CHECKSUM_FEATURES            (CSUM_TCP | CSUM_UDP)
+
+/*
+ * This parameter controls the duration of transmit watchdog timer.
+ */
 #define EM_TX_TIMEOUT                   5    /* set to 5 seconds */
 
+/*
+ * This parameter controls when the driver calls the routine to reclaim
+ * transmit descriptors.
+ */
+#define EM_TX_CLEANUP_THRESHOLD         EM_MAX_TXD / 8
+
+/*
+ * This parameter controls whether or not autonegotation is enabled.
+ *              0 - Disable autonegotiation
+ *              1 - Enable  autonegotiation
+ */
+#define DO_AUTO_NEG                     1
+
+/*
+ * This parameter control whether or not the driver will wait for
+ * autonegotiation to complete.
+ *              1 - Wait for autonegotiation to complete
+ *              0 - Don't wait for autonegotiation to complete
+ */
+#define WAIT_FOR_AUTO_NEG_DEFAULT       0
+
+
+/* Tunables -- End */
+
+#define AUTONEG_ADV_DEFAULT      (ADVERTISE_10_HALF | ADVERTISE_10_FULL | \
+                                  ADVERTISE_100_HALF | ADVERTISE_100_FULL | \
+                                  ADVERTISE_1000_FULL)
 
 #define EM_VENDOR_ID                    0x8086
 #define EM_MMBA                         0x0010 /* Mem base address */
 #define EM_ROUNDUP(size, unit) (((size) + (unit) - 1) & ~((unit) - 1))
+
 #define EM_JUMBO_PBA                    0x00000028
 #define EM_DEFAULT_PBA                  0x00000030
+#define EM_SMARTSPEED_DOWNSHIFT         3
+#define EM_SMARTSPEED_MAX               15
+
 
-#define IOCTL_CMD_TYPE                  u_long
 #define MAX_NUM_MULTICAST_ADDRESSES     128
 #define PCI_ANY_ID                      (~0U)
 #define ETHER_ALIGN                     2
-#define QTAG_TYPE                       0x8100
 
 /* Defines for printing debug information */
 #define DEBUG_INIT  0
@@ -93,23 +206,58 @@ SUCH DAMAGE.
 #define EM_RXBUFFER_8192        8192
 #define EM_RXBUFFER_16384      16384
 
-struct em_tx_buffer {
-	SIMPLEQ_ENTRY(em_tx_buffer) em_tx_entry;
-	struct mbuf    *m_head;
-	bus_dmamap_t	dmamap;
-	u_int32_t       num_tx_desc_used;
-};
+#define EM_MAX_SCATTER            64
 
+#ifdef __FreeBSD__
+#ifdef __alpha__
+       #undef vtophys
+       #define vtophys(va)     alpha_XXX_dmamap((vm_offset_t)(va))
+#endif /* __alpha__ */
+#endif /* __FreeBSD__ */
 
 /* ******************************************************************************
- * This structure stores information about the 2k aligned receive buffer
- * into which the E1000 DMA's frames. 
+ * vendor_info_array
+ *
+ * This array contains the list of Subvendor/Subdevice IDs on which the driver
+ * should load.
+ *
  * ******************************************************************************/
-struct em_rx_buffer {
-	SIMPLEQ_ENTRY(em_rx_buffer) em_rx_entry;
-	struct mbuf    *m_head;
-	bus_dmamap_t	dmamap;
-	u_int64_t	buffer_addr;
+#ifdef __FreeBSD__
+typedef struct _em_vendor_info_t {
+        unsigned int vendor_id;
+        unsigned int device_id;
+        unsigned int subvendor_id;
+        unsigned int subdevice_id;
+        unsigned int index;
+} em_vendor_info_t;
+#endif /* __FreeBSD__ */
+
+
+struct em_buffer {
+        struct mbuf    *m_head;
+	bus_dmamap_t	map;		/* bus_dma map for packet */
+};
+
+struct em_q {
+	bus_dmamap_t       map;         /* bus_dma map for packet */
+#ifdef __FreeBSD__
+	int                nsegs;       /* # of segments/descriptors */
+	bus_dma_segment_t  segs[EM_MAX_SCATTER];
+#endif /* __FreeBSD__ */
+};
+
+/*
+ * Bus dma allocation structure used by
+ * em_dma_malloc and em_dma_free.
+ */
+struct em_dma_alloc {
+	bus_addr_t              dma_paddr;
+	caddr_t                 dma_vaddr;
+	bus_dma_tag_t           dma_tag;
+	bus_dmamap_t            dma_map;
+	bus_dma_segment_t       dma_seg;
+	bus_size_t              dma_size;
+	int                     dma_nseg;
 };
 
 typedef enum _XSUM_CONTEXT_T {
@@ -121,68 +269,92 @@ typedef enum _XSUM_CONTEXT_T {
 /* Our adapter structure */
 struct em_softc {
 	struct device	sc_dv;
-	struct arpcom	arpcom;         /* interface info */
+	struct arpcom	interface_data;
+	struct em_softc *next;
+	struct em_softc *prev;
 	struct em_hw    hw;
 
 	/* FreeBSD operating-system-specific structures */
 	struct em_osdep osdep;
 
 	int             io_rid;
-	void                    *sc_intrhand;
+	void           *sc_intrhand;
 	struct ifmedia  media;
-	struct timeout	em_timeout;
+
+	struct timeout	em_intr_enable;
+	struct timeout	timer_handle;
+	struct timeout	tx_fifo_timer_handle;
 
 	/* Info about the board itself */
 	u_int32_t       part_num;
 	u_int8_t        link_active;
 	u_int16_t       link_speed;
 	u_int16_t       link_duplex;
+	u_int32_t       smartspeed;
 	u_int32_t       tx_int_delay;
+	u_int32_t	tx_abs_int_delay;
 	u_int32_t       rx_int_delay;
+	u_int32_t	rx_abs_int_delay;
 
 	XSUM_CONTEXT_T  active_checksum_context;
 
-	/* Transmit definitions */
-	struct em_tx_desc *first_tx_desc;
-	struct em_tx_desc *last_tx_desc;
-	struct em_tx_desc *next_avail_tx_desc;
-	struct em_tx_desc *oldest_used_tx_desc;
-	struct em_tx_desc *tx_desc_base;
-	volatile u_int16_t num_tx_desc_avail;
-	u_int16_t       num_tx_desc;
-	u_int32_t       txd_cmd;
-	struct em_tx_buffer   *tx_buffer_area;
-	SIMPLEQ_HEAD(__em_tx_buffer_free, em_tx_buffer)  free_tx_buffer_list;
-	SIMPLEQ_HEAD(__em_tx_buffer_used, em_tx_buffer)  used_tx_buffer_list;
-
-	/* Receive definitions */
-	struct em_rx_desc *first_rx_desc;
-	struct em_rx_desc *last_rx_desc;
-	struct em_rx_desc *next_rx_desc_to_check;
-	struct em_rx_desc *rx_desc_base;
-	u_int16_t       num_rx_desc;
-	u_int32_t       rx_buffer_len;
-	struct em_rx_buffer   *rx_buffer_area;
-	SIMPLEQ_HEAD(__em_rx_buffer, em_rx_buffer)  rx_buffer_list;
+        /*
+         * Transmit definitions
+         *
+         * We have an array of num_tx_desc descriptors (handled
+         * by the controller) paired with an array of tx_buffers
+         * (at tx_buffer_area).
+         * The index of the next available descriptor is next_avail_tx_desc.
+         * The number of remaining tx_desc is num_tx_desc_avail.
+         */
+	struct em_dma_alloc	txdma;		/* bus_dma glue for tx desc */
+	struct em_tx_desc	*tx_desc_base;
+	u_int32_t		next_avail_tx_desc;
+	u_int32_t		oldest_used_tx_desc;
+	volatile u_int16_t	num_tx_desc_avail;
+	u_int16_t		num_tx_desc;
+	u_int32_t		txd_cmd;
+	struct em_buffer	*tx_buffer_area;
+	bus_dma_tag_t		txtag;		/* dma tag for tx */
+
+        /*
+         * Receive definitions
+         *
+         * we have an array of num_rx_desc rx_desc (handled by the
+         * controller), and paired with an array of rx_buffers
+         * (at rx_buffer_area).
+         * The next pair to check on receive is at offset next_rx_desc_to_check
+         */
+	struct em_dma_alloc	rxdma;		/* bus_dma glue for rx desc */
+	struct em_rx_desc	*rx_desc_base;
+	u_int32_t		next_rx_desc_to_check;
+	u_int16_t		num_rx_desc;
+	u_int32_t		rx_buffer_len;
+	struct em_buffer	*rx_buffer_area;
+	bus_dma_tag_t		rxtag;
 
 	/* Jumbo frame */
-	struct mbuf     *fmp;
-	struct mbuf     *lmp;
+	struct mbuf        *fmp;
+	struct mbuf        *lmp;
+
+	u_int16_t          tx_fifo_head;
 
 	/* Misc stats maintained by the driver */
 	unsigned long   dropped_pkts;
 	unsigned long   mbuf_alloc_failed;
 	unsigned long   mbuf_cluster_failed;
-	unsigned long   xmit_pullup;
-	unsigned long   no_tx_desc_avail;
-	unsigned long   no_tx_buffer_avail1;
-	unsigned long   no_tx_buffer_avail2;
+	unsigned long   no_tx_desc_avail1;
+	unsigned long   no_tx_desc_avail2;
+	unsigned long   no_tx_map_avail;
+        unsigned long   no_tx_dma_setup;
+	u_int64_t       tx_fifo_reset;
+	u_int64_t       tx_fifo_wrk;
+
 #ifdef DBG_STATS
 	unsigned long   no_pkts_avail;
 	unsigned long   clean_tx_interrupts;
 
 #endif
-
 	struct em_hw_stats stats;
 };