atl1: move common functions to atlx files

The future atl2 driver and the existing atl1 driver can share certain
functions and definitions.  Move these shareable functions and definitions
out of atl1-specific files and into atlx.c and atlx.h.  Some transitory
hackery will be present until atl2 is merged.

Reduce the number of source files by moving ethtool, hw, and param
functions from separate files into atl1_main.c, then rename it to just
atl1.c.

Move all atl1-specific definitions from atl1_hw.h to atl1.h.

Finally, clean up to make checkpatch.pl happy.

Signed-off-by: Chris Snook <csnook@redhat.com>
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 558 insertions, 45 deletions

diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index ff4765f6c3de..538948d5a184 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -1,6 +1,6 @@
 /*
  * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
- * Copyright(c) 2006 Chris Snook <csnook@redhat.com>
+ * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
  * Copyright(c) 2006 Jay Cliburn <jcliburn@gmail.com>
  *
  * Derived from Intel e1000 driver
@@ -21,26 +21,559 @@
  * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef _ATL1_H_
-#define _ATL1_H_
+#ifndef ATL1_H
+#define ATL1_H
 
-#include <linux/types.h>
+#include <linux/compiler.h>
+#include <linux/ethtool.h>
 #include <linux/if_vlan.h>
+#include <linux/mii.h>
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/spinlock.h>
+#include <linux/timer.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+
+#include "atlx.h"
+
+#define ATLX_DRIVER_NAME "atl1"
 
-#include "atl1_hw.h"
+MODULE_DESCRIPTION("Atheros L1 Gigabit Ethernet Driver");
+
+#define atlx_adapter            atl1_adapter
+#define atlx_check_for_link     atl1_check_for_link
+#define atlx_check_link         atl1_check_link
+#define atlx_hash_mc_addr       atl1_hash_mc_addr
+#define atlx_hash_set           atl1_hash_set
+#define atlx_hw                 atl1_hw
+#define atlx_mii_ioctl          atl1_mii_ioctl
+#define atlx_read_phy_reg       atl1_read_phy_reg
+#define atlx_set_mac            atl1_set_mac
+#define atlx_set_mac_addr       atl1_set_mac_addr
+
+struct atl1_adapter;
+struct atl1_hw;
 
 /* function prototypes needed by multiple files */
+s32 atl1_phy_setup_autoneg_adv(struct atl1_hw *hw);
+s32 atl1_write_phy_reg(struct atl1_hw *hw, u32 reg_addr, u16 phy_data);
+s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex);
+s32 atl1_read_mac_addr(struct atl1_hw *hw);
+s32 atl1_init_hw(struct atl1_hw *hw);
+s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex);
+s32 atl1_set_speed_and_duplex(struct atl1_hw *hw, u16 speed, u16 duplex);
+u32 atl1_hash_mc_addr(struct atl1_hw *hw, u8 *mc_addr);
+void atl1_hash_set(struct atl1_hw *hw, u32 hash_value);
+s32 atl1_read_phy_reg(struct atl1_hw *hw, u16 reg_addr, u16 *phy_data);
+void atl1_set_mac_addr(struct atl1_hw *hw);
+s32 atl1_phy_enter_power_saving(struct atl1_hw *hw);
+s32 atl1_reset_hw(struct atl1_hw *hw);
+void atl1_check_options(struct atl1_adapter *adapter);
+static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
+        int cmd);
+static u32 atl1_check_link(struct atl1_adapter *adapter);
 s32 atl1_up(struct atl1_adapter *adapter);
 void atl1_down(struct atl1_adapter *adapter);
 int atl1_reset(struct atl1_adapter *adapter);
-s32 atl1_setup_ring_resources(struct atl1_adapter *adapter);
-void atl1_free_ring_resources(struct atl1_adapter *adapter);
 
-extern char atl1_driver_name[];
-extern char atl1_driver_version[];
 extern const struct ethtool_ops atl1_ethtool_ops;
 
-struct atl1_adapter;
+/* hardware definitions specific to L1 */
+
+/* Block IDLE Status Register */
+#define IDLE_STATUS_RXMAC                       0x1
+#define IDLE_STATUS_TXMAC                       0x2
+#define IDLE_STATUS_RXQ                         0x4
+#define IDLE_STATUS_TXQ                         0x8
+#define IDLE_STATUS_DMAR                        0x10
+#define IDLE_STATUS_DMAW                        0x20
+#define IDLE_STATUS_SMB                         0x40
+#define IDLE_STATUS_CMB                         0x80
+
+/* MDIO Control Register */
+#define MDIO_WAIT_TIMES                         30
+
+/* MAC Control Register */
+#define MAC_CTRL_TX_PAUSE                       0x10000
+#define MAC_CTRL_SCNT                           0x20000
+#define MAC_CTRL_SRST_TX                        0x40000
+#define MAC_CTRL_TX_SIMURST                     0x80000
+#define MAC_CTRL_SPEED_SHIFT                    20
+#define MAC_CTRL_SPEED_MASK                     0x300000
+#define MAC_CTRL_SPEED_1000                     0x2
+#define MAC_CTRL_SPEED_10_100                   0x1
+#define MAC_CTRL_DBG_TX_BKPRESURE               0x400000
+#define MAC_CTRL_TX_HUGE                        0x800000
+#define MAC_CTRL_RX_CHKSUM_EN                   0x1000000
+#define MAC_CTRL_DBG                            0x8000000
+
+/* Wake-On-Lan control register */
+#define WOL_CLK_SWITCH_EN                       0x8000
+#define WOL_PT5_EN                              0x200000
+#define WOL_PT6_EN                              0x400000
+#define WOL_PT5_MATCH                           0x8000000
+#define WOL_PT6_MATCH                           0x10000000
+
+/* WOL Length ( 2 DWORD ) */
+#define REG_WOL_PATTERN_LEN                     0x14A4
+#define WOL_PT_LEN_MASK                         0x7F
+#define WOL_PT0_LEN_SHIFT                       0
+#define WOL_PT1_LEN_SHIFT                       8
+#define WOL_PT2_LEN_SHIFT                       16
+#define WOL_PT3_LEN_SHIFT                       24
+#define WOL_PT4_LEN_SHIFT                       0
+#define WOL_PT5_LEN_SHIFT                       8
+#define WOL_PT6_LEN_SHIFT                       16
+
+/* Internal SRAM Partition Registers, low 32 bits */
+#define REG_SRAM_RFD_LEN                        0x1504
+#define REG_SRAM_RRD_ADDR                       0x1508
+#define REG_SRAM_RRD_LEN                        0x150C
+#define REG_SRAM_TPD_ADDR                       0x1510
+#define REG_SRAM_TPD_LEN                        0x1514
+#define REG_SRAM_TRD_ADDR                       0x1518
+#define REG_SRAM_TRD_LEN                        0x151C
+#define REG_SRAM_RXF_ADDR                       0x1520
+#define REG_SRAM_RXF_LEN                        0x1524
+#define REG_SRAM_TXF_ADDR                       0x1528
+#define REG_SRAM_TXF_LEN                        0x152C
+#define REG_SRAM_TCPH_PATH_ADDR                 0x1530
+#define SRAM_TCPH_ADDR_MASK                     0xFFF
+#define SRAM_TCPH_ADDR_SHIFT                    0
+#define SRAM_PATH_ADDR_MASK                     0xFFF
+#define SRAM_PATH_ADDR_SHIFT                    16
+
+/* Load Ptr Register */
+#define REG_LOAD_PTR                            0x1534
+
+/* Descriptor Control registers, low 32 bits */
+#define REG_DESC_RFD_ADDR_LO                    0x1544
+#define REG_DESC_RRD_ADDR_LO                    0x1548
+#define REG_DESC_TPD_ADDR_LO                    0x154C
+#define REG_DESC_CMB_ADDR_LO                    0x1550
+#define REG_DESC_SMB_ADDR_LO                    0x1554
+#define REG_DESC_RFD_RRD_RING_SIZE              0x1558
+#define DESC_RFD_RING_SIZE_MASK                 0x7FF
+#define DESC_RFD_RING_SIZE_SHIFT                0
+#define DESC_RRD_RING_SIZE_MASK                 0x7FF
+#define DESC_RRD_RING_SIZE_SHIFT                16
+#define REG_DESC_TPD_RING_SIZE                  0x155C
+#define DESC_TPD_RING_SIZE_MASK                 0x3FF
+#define DESC_TPD_RING_SIZE_SHIFT                0
+
+/* TXQ Control Register */
+#define REG_TXQ_CTRL                            0x1580
+#define TXQ_CTRL_TPD_BURST_NUM_SHIFT            0
+#define TXQ_CTRL_TPD_BURST_NUM_MASK             0x1F
+#define TXQ_CTRL_EN                             0x20
+#define TXQ_CTRL_ENH_MODE                       0x40
+#define TXQ_CTRL_TPD_FETCH_TH_SHIFT             8
+#define TXQ_CTRL_TPD_FETCH_TH_MASK              0x3F
+#define TXQ_CTRL_TXF_BURST_NUM_SHIFT            16
+#define TXQ_CTRL_TXF_BURST_NUM_MASK             0xFFFF
+
+/* Jumbo packet Threshold for task offload */
+#define REG_TX_JUMBO_TASK_TH_TPD_IPG            0x1584
+#define TX_JUMBO_TASK_TH_MASK                   0x7FF
+#define TX_JUMBO_TASK_TH_SHIFT                  0
+#define TX_TPD_MIN_IPG_MASK                     0x1F
+#define TX_TPD_MIN_IPG_SHIFT                    16
+
+/* RXQ Control Register */
+#define REG_RXQ_CTRL                            0x15A0
+#define RXQ_CTRL_RFD_BURST_NUM_SHIFT            0
+#define RXQ_CTRL_RFD_BURST_NUM_MASK             0xFF
+#define RXQ_CTRL_RRD_BURST_THRESH_SHIFT         8
+#define RXQ_CTRL_RRD_BURST_THRESH_MASK          0xFF
+#define RXQ_CTRL_RFD_PREF_MIN_IPG_SHIFT         16
+#define RXQ_CTRL_RFD_PREF_MIN_IPG_MASK          0x1F
+#define RXQ_CTRL_CUT_THRU_EN                    0x40000000
+#define RXQ_CTRL_EN                             0x80000000
+
+/* Rx jumbo packet threshold and rrd  retirement timer */
+#define REG_RXQ_JMBOSZ_RRDTIM                   0x15A4
+#define RXQ_JMBOSZ_TH_MASK                      0x7FF
+#define RXQ_JMBOSZ_TH_SHIFT                     0
+#define RXQ_JMBO_LKAH_MASK                      0xF
+#define RXQ_JMBO_LKAH_SHIFT                     11
+#define RXQ_RRD_TIMER_MASK                      0xFFFF
+#define RXQ_RRD_TIMER_SHIFT                     16
+
+/* RFD flow control register */
+#define REG_RXQ_RXF_PAUSE_THRESH                0x15A8
+#define RXQ_RXF_PAUSE_TH_HI_SHIFT               16
+#define RXQ_RXF_PAUSE_TH_HI_MASK                0xFFF
+#define RXQ_RXF_PAUSE_TH_LO_SHIFT               0
+#define RXQ_RXF_PAUSE_TH_LO_MASK                0xFFF
+
+/* RRD flow control register */
+#define REG_RXQ_RRD_PAUSE_THRESH                0x15AC
+#define RXQ_RRD_PAUSE_TH_HI_SHIFT               0
+#define RXQ_RRD_PAUSE_TH_HI_MASK                0xFFF
+#define RXQ_RRD_PAUSE_TH_LO_SHIFT               16
+#define RXQ_RRD_PAUSE_TH_LO_MASK                0xFFF
+
+/* DMA Engine Control Register */
+#define REG_DMA_CTRL                            0x15C0
+#define DMA_CTRL_DMAR_IN_ORDER                  0x1
+#define DMA_CTRL_DMAR_ENH_ORDER                 0x2
+#define DMA_CTRL_DMAR_OUT_ORDER                 0x4
+#define DMA_CTRL_RCB_VALUE                      0x8
+#define DMA_CTRL_DMAR_BURST_LEN_SHIFT           4
+#define DMA_CTRL_DMAR_BURST_LEN_MASK            7
+#define DMA_CTRL_DMAW_BURST_LEN_SHIFT           7
+#define DMA_CTRL_DMAW_BURST_LEN_MASK            7
+#define DMA_CTRL_DMAR_EN                        0x400
+#define DMA_CTRL_DMAW_EN                        0x800
+
+/* CMB/SMB Control Register */
+#define REG_CSMB_CTRL                           0x15D0
+#define CSMB_CTRL_CMB_NOW                       1
+#define CSMB_CTRL_SMB_NOW                       2
+#define CSMB_CTRL_CMB_EN                        4
+#define CSMB_CTRL_SMB_EN                        8
+
+/* CMB DMA Write Threshold Register */
+#define REG_CMB_WRITE_TH                        0x15D4
+#define CMB_RRD_TH_SHIFT                        0
+#define CMB_RRD_TH_MASK                         0x7FF
+#define CMB_TPD_TH_SHIFT                        16
+#define CMB_TPD_TH_MASK                         0x7FF
+
+/* RX/TX count-down timer to trigger CMB-write. 2us resolution. */
+#define REG_CMB_WRITE_TIMER                     0x15D8
+#define CMB_RX_TM_SHIFT                         0
+#define CMB_RX_TM_MASK                          0xFFFF
+#define CMB_TX_TM_SHIFT                         16
+#define CMB_TX_TM_MASK                          0xFFFF
+
+/* Number of packet received since last CMB write */
+#define REG_CMB_RX_PKT_CNT                      0x15DC
+
+/* Number of packet transmitted since last CMB write */
+#define REG_CMB_TX_PKT_CNT                      0x15E0
+
+/* SMB auto DMA timer register */
+#define REG_SMB_TIMER                           0x15E4
+
+/* Mailbox Register */
+#define REG_MAILBOX                             0x15F0
+#define MB_RFD_PROD_INDX_SHIFT                  0
+#define MB_RFD_PROD_INDX_MASK                   0x7FF
+#define MB_RRD_CONS_INDX_SHIFT                  11
+#define MB_RRD_CONS_INDX_MASK                   0x7FF
+#define MB_TPD_PROD_INDX_SHIFT                  22
+#define MB_TPD_PROD_INDX_MASK                   0x3FF
+
+/* Interrupt Status Register */
+#define ISR_SMB                                 0x1
+#define ISR_TIMER                               0x2
+#define ISR_MANUAL                              0x4
+#define ISR_RXF_OV                              0x8
+#define ISR_RFD_UNRUN                           0x10
+#define ISR_RRD_OV                              0x20
+#define ISR_TXF_UNRUN                           0x40
+#define ISR_LINK                                0x80
+#define ISR_HOST_RFD_UNRUN                      0x100
+#define ISR_HOST_RRD_OV                         0x200
+#define ISR_DMAR_TO_RST                         0x400
+#define ISR_DMAW_TO_RST                         0x800
+#define ISR_GPHY                                0x1000
+#define ISR_RX_PKT                              0x10000
+#define ISR_TX_PKT                              0x20000
+#define ISR_TX_DMA                              0x40000
+#define ISR_RX_DMA                              0x80000
+#define ISR_CMB_RX                              0x100000
+#define ISR_CMB_TX                              0x200000
+#define ISR_MAC_RX                              0x400000
+#define ISR_MAC_TX                              0x800000
+#define ISR_DIS_SMB                             0x20000000
+#define ISR_DIS_DMA                             0x40000000
+
+/* Normal Interrupt mask  */
+#define IMR_NORMAL_MASK (\
+        ISR_SMB         |\
+        ISR_GPHY        |\
+        ISR_PHY_LINKDOWN|\
+        ISR_DMAR_TO_RST |\
+        ISR_DMAW_TO_RST |\
+        ISR_CMB_TX      |\
+        ISR_CMB_RX)
+
+/* Debug Interrupt Mask  (enable all interrupt) */
+#define IMR_DEBUG_MASK  (\
+        ISR_SMB         |\
+        ISR_TIMER       |\
+        ISR_MANUAL      |\
+        ISR_RXF_OV      |\
+        ISR_RFD_UNRUN   |\
+        ISR_RRD_OV      |\
+        ISR_TXF_UNRUN   |\
+        ISR_LINK        |\
+        ISR_CMB_TX      |\
+        ISR_CMB_RX      |\
+        ISR_RX_PKT      |\
+        ISR_TX_PKT      |\
+        ISR_MAC_RX      |\
+        ISR_MAC_TX)
+
+#define MEDIA_TYPE_1000M_FULL                   1
+#define MEDIA_TYPE_100M_FULL                    2
+#define MEDIA_TYPE_100M_HALF                    3
+#define MEDIA_TYPE_10M_FULL                     4
+#define MEDIA_TYPE_10M_HALF                     5
+
+#define AUTONEG_ADVERTISE_SPEED_DEFAULT         0x002F  /* All but 1000-Half */
+
+#define MAX_JUMBO_FRAME_SIZE                    10240
+
+#define ATL1_EEDUMP_LEN                         48
+
+/* Statistics counters collected by the MAC */
+struct stats_msg_block {
+        /* rx */
+        u32 rx_ok;              /* good RX packets */
+        u32 rx_bcast;           /* good RX broadcast packets */
+        u32 rx_mcast;           /* good RX multicast packets */
+        u32 rx_pause;           /* RX pause frames */
+        u32 rx_ctrl;            /* RX control packets other than pause frames */
+        u32 rx_fcs_err;         /* RX packets with bad FCS */
+        u32 rx_len_err;         /* RX packets with length != actual size */
+        u32 rx_byte_cnt;        /* good bytes received. FCS is NOT included */
+        u32 rx_runt;            /* RX packets < 64 bytes with good FCS */
+        u32 rx_frag;            /* RX packets < 64 bytes with bad FCS */
+        u32 rx_sz_64;           /* 64 byte RX packets */
+        u32 rx_sz_65_127;
+        u32 rx_sz_128_255;
+        u32 rx_sz_256_511;
+        u32 rx_sz_512_1023;
+        u32 rx_sz_1024_1518;
+        u32 rx_sz_1519_max;     /* 1519 byte to MTU RX packets */
+        u32 rx_sz_ov;           /* truncated RX packets > MTU */
+        u32 rx_rxf_ov;          /* frames dropped due to RX FIFO overflow */
+        u32 rx_rrd_ov;          /* frames dropped due to RRD overflow */
+        u32 rx_align_err;       /* alignment errors */
+        u32 rx_bcast_byte_cnt;  /* RX broadcast bytes, excluding FCS */
+        u32 rx_mcast_byte_cnt;  /* RX multicast bytes, excluding FCS */
+        u32 rx_err_addr;        /* packets dropped due to address filtering */
+
+        /* tx */
+        u32 tx_ok;              /* good TX packets */
+        u32 tx_bcast;           /* good TX broadcast packets */
+        u32 tx_mcast;           /* good TX multicast packets */
+        u32 tx_pause;           /* TX pause frames */
+        u32 tx_exc_defer;       /* TX packets deferred excessively */
+        u32 tx_ctrl;            /* TX control frames, excluding pause frames */
+        u32 tx_defer;           /* TX packets deferred */
+        u32 tx_byte_cnt;        /* bytes transmitted, FCS is NOT included */
+        u32 tx_sz_64;           /* 64 byte TX packets */
+        u32 tx_sz_65_127;
+        u32 tx_sz_128_255;
+        u32 tx_sz_256_511;
+        u32 tx_sz_512_1023;
+        u32 tx_sz_1024_1518;
+        u32 tx_sz_1519_max;     /* 1519 byte to MTU TX packets */
+        u32 tx_1_col;           /* packets TX after a single collision */
+        u32 tx_2_col;           /* packets TX after multiple collisions */
+        u32 tx_late_col;        /* TX packets with late collisions */
+        u32 tx_abort_col;       /* TX packets aborted w/excessive collisions */
+        u32 tx_underrun;        /* TX packets aborted due to TX FIFO underrun
+                                 * or TRD FIFO underrun */
+        u32 tx_rd_eop;          /* reads beyond the EOP into the next frame
+                                 * when TRD was not written timely */
+        u32 tx_len_err;         /* TX packets where length != actual size */
+        u32 tx_trunc;           /* TX packets truncated due to size > MTU */
+        u32 tx_bcast_byte;      /* broadcast bytes transmitted, excluding FCS */
+        u32 tx_mcast_byte;      /* multicast bytes transmitted, excluding FCS */
+        u32 smb_updated;        /* 1: SMB Updated. This is used by software to
+                                 * indicate the statistics update. Software
+                                 * should clear this bit after retrieving the
+                                 * statistics information. */
+};
+
+/* Coalescing Message Block */
+struct coals_msg_block {
+        u32 int_stats;          /* interrupt status */
+        u16 rrd_prod_idx;       /* TRD Producer Index. */
+        u16 rfd_cons_idx;       /* RFD Consumer Index. */
+        u16 update;             /* Selene sets this bit every time it DMAs the
+                                 * CMB to host memory. Software should clear
+                                 * this bit when CMB info is processed. */
+        u16 tpd_cons_idx;       /* TPD Consumer Index. */
+};
+
+/* RRD descriptor */
+struct rx_return_desc {
+        u8 num_buf;     /* Number of RFD buffers used by the received packet */
+        u8 resved;
+        u16 buf_indx;   /* RFD Index of the first buffer */
+        union {
+                u32 valid;
+                struct {
+                        u16 rx_chksum;
+                        u16 pkt_size;
+                } xsum_sz;
+        } xsz;
+
+        u16 pkt_flg;    /* Packet flags */
+        u16 err_flg;    /* Error flags */
+        u16 resved2;
+        u16 vlan_tag;   /* VLAN TAG */
+};
+
+#define PACKET_FLAG_ETH_TYPE    0x0080
+#define PACKET_FLAG_VLAN_INS    0x0100
+#define PACKET_FLAG_ERR         0x0200
+#define PACKET_FLAG_IPV4        0x0400
+#define PACKET_FLAG_UDP         0x0800
+#define PACKET_FLAG_TCP         0x1000
+#define PACKET_FLAG_BCAST       0x2000
+#define PACKET_FLAG_MCAST       0x4000
+#define PACKET_FLAG_PAUSE       0x8000
+
+#define ERR_FLAG_CRC            0x0001
+#define ERR_FLAG_CODE           0x0002
+#define ERR_FLAG_DRIBBLE        0x0004
+#define ERR_FLAG_RUNT           0x0008
+#define ERR_FLAG_OV             0x0010
+#define ERR_FLAG_TRUNC          0x0020
+#define ERR_FLAG_IP_CHKSUM      0x0040
+#define ERR_FLAG_L4_CHKSUM      0x0080
+#define ERR_FLAG_LEN            0x0100
+#define ERR_FLAG_DES_ADDR       0x0200
+
+/* RFD descriptor */
+struct rx_free_desc {
+        __le64 buffer_addr;     /* Address of the descriptor's data buffer */
+        __le16 buf_len;         /* Size of the receive buffer in host memory */
+        u16 coalese;            /* Update consumer index to host after the
+                                 * reception of this frame */
+        /* __attribute__ ((packed)) is required */
+} __attribute__ ((packed));
+
+/* tsopu defines */
+#define TSO_PARAM_BUFLEN_MASK           0x3FFF
+#define TSO_PARAM_BUFLEN_SHIFT          0
+#define TSO_PARAM_DMAINT_MASK           0x0001
+#define TSO_PARAM_DMAINT_SHIFT          14
+#define TSO_PARAM_PKTNT_MASK            0x0001
+#define TSO_PARAM_PKTINT_SHIFT          15
+#define TSO_PARAM_VLANTAG_MASK          0xFFFF
+#define TSO_PARAM_VLAN_SHIFT            16
+
+/* tsopl defines */
+#define TSO_PARAM_EOP_MASK              0x0001
+#define TSO_PARAM_EOP_SHIFT             0
+#define TSO_PARAM_COALESCE_MASK         0x0001
+#define TSO_PARAM_COALESCE_SHIFT        1
+#define TSO_PARAM_INSVLAG_MASK          0x0001
+#define TSO_PARAM_INSVLAG_SHIFT         2
+#define TSO_PARAM_CUSTOMCKSUM_MASK      0x0001
+#define TSO_PARAM_CUSTOMCKSUM_SHIFT     3
+#define TSO_PARAM_SEGMENT_MASK          0x0001
+#define TSO_PARAM_SEGMENT_SHIFT         4
+#define TSO_PARAM_IPCKSUM_MASK          0x0001
+#define TSO_PARAM_IPCKSUM_SHIFT         5
+#define TSO_PARAM_TCPCKSUM_MASK         0x0001
+#define TSO_PARAM_TCPCKSUM_SHIFT        6
+#define TSO_PARAM_UDPCKSUM_MASK         0x0001
+#define TSO_PARAM_UDPCKSUM_SHIFT        7
+#define TSO_PARAM_VLANTAGGED_MASK       0x0001
+#define TSO_PARAM_VLANTAGGED_SHIFT      8
+#define TSO_PARAM_ETHTYPE_MASK          0x0001
+#define TSO_PARAM_ETHTYPE_SHIFT         9
+#define TSO_PARAM_IPHL_MASK             0x000F
+#define TSO_PARAM_IPHL_SHIFT            10
+#define TSO_PARAM_TCPHDRLEN_MASK        0x000F
+#define TSO_PARAM_TCPHDRLEN_SHIFT       14
+#define TSO_PARAM_HDRFLAG_MASK          0x0001
+#define TSO_PARAM_HDRFLAG_SHIFT         18
+#define TSO_PARAM_MSS_MASK              0x1FFF
+#define TSO_PARAM_MSS_SHIFT             19
+
+/* csumpu defines */
+#define CSUM_PARAM_BUFLEN_MASK          0x3FFF
+#define CSUM_PARAM_BUFLEN_SHIFT         0
+#define CSUM_PARAM_DMAINT_MASK          0x0001
+#define CSUM_PARAM_DMAINT_SHIFT         14
+#define CSUM_PARAM_PKTINT_MASK          0x0001
+#define CSUM_PARAM_PKTINT_SHIFT         15
+#define CSUM_PARAM_VALANTAG_MASK        0xFFFF
+#define CSUM_PARAM_VALAN_SHIFT          16
+
+/* csumpl defines*/
+#define CSUM_PARAM_EOP_MASK             0x0001
+#define CSUM_PARAM_EOP_SHIFT            0
+#define CSUM_PARAM_COALESCE_MASK        0x0001
+#define CSUM_PARAM_COALESCE_SHIFT       1
+#define CSUM_PARAM_INSVLAG_MASK         0x0001
+#define CSUM_PARAM_INSVLAG_SHIFT        2
+#define CSUM_PARAM_CUSTOMCKSUM_MASK     0x0001
+#define CSUM_PARAM_CUSTOMCKSUM_SHIFT    3
+#define CSUM_PARAM_SEGMENT_MASK         0x0001
+#define CSUM_PARAM_SEGMENT_SHIFT        4
+#define CSUM_PARAM_IPCKSUM_MASK         0x0001
+#define CSUM_PARAM_IPCKSUM_SHIFT        5
+#define CSUM_PARAM_TCPCKSUM_MASK        0x0001
+#define CSUM_PARAM_TCPCKSUM_SHIFT       6
+#define CSUM_PARAM_UDPCKSUM_MASK        0x0001
+#define CSUM_PARAM_UDPCKSUM_SHIFT       7
+#define CSUM_PARAM_VLANTAGGED_MASK      0x0001
+#define CSUM_PARAM_VLANTAGGED_SHIFT     8
+#define CSUM_PARAM_ETHTYPE_MASK         0x0001
+#define CSUM_PARAM_ETHTYPE_SHIFT        9
+#define CSUM_PARAM_IPHL_MASK            0x000F
+#define CSUM_PARAM_IPHL_SHIFT           10
+#define CSUM_PARAM_PLOADOFFSET_MASK     0x00FF
+#define CSUM_PARAM_PLOADOFFSET_SHIFT    16
+#define CSUM_PARAM_XSUMOFFSET_MASK      0x00FF
+#define CSUM_PARAM_XSUMOFFSET_SHIFT     24
+
+/* TPD descriptor */
+struct tso_param {
+        /* The order of these declarations is important -- don't change it */
+        u32 tsopu;      /* tso_param upper word */
+        u32 tsopl;      /* tso_param lower word */
+};
+
+struct csum_param {
+        /* The order of these declarations is important -- don't change it */
+        u32 csumpu;     /* csum_param upper word */
+        u32 csumpl;     /* csum_param lower word */
+};
+
+union tpd_descr {
+        u64 data;
+        struct csum_param csum;
+        struct tso_param tso;
+};
+
+struct tx_packet_desc {
+        __le64 buffer_addr;
+        union tpd_descr desc;
+};
+
+/* DMA Order Settings */
+enum atl1_dma_order {
+        atl1_dma_ord_in = 1,
+        atl1_dma_ord_enh = 2,
+        atl1_dma_ord_out = 4
+};
+
+enum atl1_dma_rcb {
+        atl1_rcb_64 = 0,
+        atl1_rcb_128 = 1
+};
+
+enum atl1_dma_req_block {
+        atl1_dma_req_128 = 0,
+        atl1_dma_req_256 = 1,
+        atl1_dma_req_512 = 2,
+        atl1_dma_req_1024 = 3,
+        atl1_dma_req_2048 = 4,
+        atl1_dma_req_4096 = 5
+};
 
 #define ATL1_MAX_INTR           3
 #define ATL1_MAX_TX_BUF_LEN     0x3000  /* 12288 bytes */
@@ -58,19 +591,6 @@ struct atl1_adapter;
 #define ATL1_RRD_DESC(R, i)     ATL1_GET_DESC(R, i, struct rx_return_desc)
 
 /*
- * This detached comment is preserved for documentation purposes only.
- * It was originally attached to some code that got deleted, but seems
- * important enough to keep around...
- *
- * <begin detached comment>
- * Some workarounds require millisecond delays and are run during interrupt
- * context.  Most notably, when establishing link, the phy may need tweaking
- * but cannot process phy register reads/writes faster than millisecond
- * intervals...and we establish link due to a "link status change" interrupt.
- * <end detached comment>
- */
-
-/*
  * atl1_ring_header represents a single, contiguous block of DMA space
  * mapped for the three descriptor rings (tpd, rfd, rrd) and the two
  * message blocks (cmb, smb) described below
@@ -156,20 +676,15 @@ struct atl1_sft_stats {
         u64 tx_aborted_errors;
         u64 tx_window_errors;
         u64 tx_carrier_errors;
-        u64 tx_pause;           /* num pause packets transmitted. */
-        u64 excecol;            /* num tx packets w/ excessive collisions. */
-        u64 deffer;             /* num tx packets deferred */
-        u64 scc;                /* num packets subsequently transmitted
-                                 * successfully w/ single prior collision. */
-        u64 mcc;                /* num packets subsequently transmitted
-                                 * successfully w/ multiple prior collisions. */
-        u64 latecol;            /* num tx packets  w/ late collisions. */
-        u64 tx_underun;         /* num tx packets aborted due to transmit
-                                 * FIFO underrun, or TRD FIFO underrun */
-        u64 tx_trunc;           /* num tx packets truncated due to size
-                                 * exceeding MTU, regardless whether truncated
-                                 * by the chip or not. (The name doesn't really
-                                 * reflect the meaning in this case.) */
+        u64 tx_pause;           /* TX pause frames */
+        u64 excecol;            /* TX packets w/ excessive collisions */
+        u64 deffer;             /* TX packets deferred */
+        u64 scc;                /* packets TX after a single collision */
+        u64 mcc;                /* packets TX after multiple collisions */
+        u64 latecol;            /* TX packets w/ late collisions */
+        u64 tx_underun;         /* TX packets aborted due to TX FIFO underrun
+                                 * or TRD FIFO underrun */
+        u64 tx_trunc;           /* TX packets truncated due to size > MTU */
         u64 rx_pause;           /* num Pause packets received. */
         u64 rx_rrd_ov;
         u64 rx_trunc;
@@ -184,8 +699,7 @@ struct atl1_hw {
         enum atl1_dma_req_block dmar_block;
         enum atl1_dma_req_block dmaw_block;
         u8 preamble_len;
-        u8 max_retry;           /* Retransmission maximum, after which the
-                                 * packet will be discarded */
+        u8 max_retry;
         u8 jam_ipg;             /* IPG to start JAM for collision based flow
                                  * control in half-duplex mode. In units of
                                  * 8-bit time */
@@ -271,16 +785,15 @@ struct atl1_adapter {
         u64 hw_csum_err;
         u64 hw_csum_good;
 
-        u16 imt;        /* interrupt moderator timer (2us resolution */
-        u16 ict;        /* interrupt clear timer (2us resolution */
-        struct mii_if_info mii;         /* MII interface info */
+        u16 imt;                /* interrupt moderator timer (2us resolution) */
+        u16 ict;                /* interrupt clear timer (2us resolution */
+        struct mii_if_info mii; /* MII interface info */
 
-        /* structs defined in atl1_hw.h */
-        u32 bd_number;                  /* board number */
+        u32 bd_number;          /* board number */
         bool pci_using_64;
         struct atl1_hw hw;
         struct atl1_smb smb;
         struct atl1_cmb cmb;
 };
 
-#endif  /* _ATL1_H_ */
+#endif /* ATL1_H */