Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (1232 commits)
  iucv: Fix bad merging.
  net_sched: Add size table for qdiscs
  net_sched: Add accessor function for packet length for qdiscs
  net_sched: Add qdisc_enqueue wrapper
  highmem: Export totalhigh_pages.
  ipv6 mcast: Omit redundant address family checks in ip6_mc_source().
  net: Use standard structures for generic socket address structures.
  ipv6 netns: Make several "global" sysctl variables namespace aware.
  netns: Use net_eq() to compare net-namespaces for optimization.
  ipv6: remove unused macros from net/ipv6.h
  ipv6: remove unused parameter from ip6_ra_control
  tcp: fix kernel panic with listening_get_next
  tcp: Remove redundant checks when setting eff_sacks
  tcp: options clean up
  tcp: Fix MD5 signatures for non-linear skbs
  sctp: Update sctp global memory limit allocations.
  sctp: remove unnecessary byteshifting, calculate directly in big-endian
  sctp: Allow only 1 listening socket with SO_REUSEADDR
  sctp: Do not leak memory on multiple listen() calls
  sctp: Support ipv6only AF_INET6 sockets.
  ...

1 files changed, 464 insertions, 0 deletions

diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
new file mode 100644
index 000000000000..e01e1c347715
--- /dev/null
+++ b/drivers/net/sh_eth.h
@@ -0,0 +1,464 @@
+/*
+ *  SuperH Ethernet device driver
+ *
+ *  Copyright (C) 2006-2008 Nobuhiro Iwamatsu
+ *  Copyright (C) 2008 Renesas Solutions Corp.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms and conditions of the GNU General Public License,
+ *  version 2, as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *  You should have received a copy of the GNU General Public License along with
+ *  this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  The full GNU General Public License is included in this distribution in
+ *  the file called "COPYING".
+ */
+
+#ifndef __SH_ETH_H__
+#define __SH_ETH_H__
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/workqueue.h>
+#include <linux/netdevice.h>
+#include <linux/phy.h>
+
+#define CARDNAME        "sh-eth"
+#define TX_TIMEOUT      (5*HZ)
+
+#define TX_RING_SIZE    128     /* Tx ring size */
+#define RX_RING_SIZE    128     /* Rx ring size */
+#define RX_OFFSET               2       /* skb offset */
+#define ETHERSMALL              60
+#define PKT_BUF_SZ              1538
+
+/* Chip Base Address */
+#define SH_TSU_ADDR 0xA7000804
+
+/* Chip Registers */
+/* E-DMAC */
+#define EDMR    0x0000
+#define EDTRR   0x0004
+#define EDRRR   0x0008
+#define TDLAR   0x000C
+#define RDLAR   0x0010
+#define EESR    0x0014
+#define EESIPR  0x0018
+#define TRSCER  0x001C
+#define RMFCR   0x0020
+#define TFTR    0x0024
+#define FDR             0x0028
+#define RMCR    0x002C
+#define EDOCR   0x0030
+#define FCFTR   0x0034
+#define RPADIR  0x0038
+#define TRIMD   0x003C
+#define RBWAR   0x0040
+#define RDFAR   0x0044
+#define TBRAR   0x004C
+#define TDFAR   0x0050
+/* Ether Register */
+#define ECMR    0x0160
+#define ECSR    0x0164
+#define ECSIPR  0x0168
+#define PIR             0x016C
+#define MAHR    0x0170
+#define MALR    0x0174
+#define RFLR    0x0178
+#define PSR             0x017C
+#define TROCR   0x0180
+#define CDCR    0x0184
+#define LCCR    0x0188
+#define CNDCR   0x018C
+#define CEFCR   0x0194
+#define FRECR   0x0198
+#define TSFRCR  0x019C
+#define TLFRCR  0x01A0
+#define RFCR    0x01A4
+#define MAFCR   0x01A8
+#define IPGR    0x01B4
+#if defined(CONFIG_CPU_SUBTYPE_SH7710)
+#define APR             0x01B8
+#define MPR     0x01BC
+#define TPAUSER 0x1C4
+#define BCFR    0x1CC
+#endif /* CONFIG_CPU_SH7710 */
+
+#define ARSTR   0x0800
+
+/* TSU */
+#define TSU_CTRST       0x004
+#define TSU_FWEN0       0x010
+#define TSU_FWEN1       0x014
+#define TSU_FCM         0x018
+#define TSU_BSYSL0      0x020
+#define TSU_BSYSL1      0x024
+#define TSU_PRISL0      0x028
+#define TSU_PRISL1      0x02C
+#define TSU_FWSL0       0x030
+#define TSU_FWSL1       0x034
+#define TSU_FWSLC       0x038
+#define TSU_QTAGM0      0x040
+#define TSU_QTAGM1      0x044
+#define TSU_ADQT0       0x048
+#define TSU_ADQT1       0x04C
+#define TSU_FWSR        0x050
+#define TSU_FWINMK      0x054
+#define TSU_ADSBSY      0x060
+#define TSU_TEN         0x064
+#define TSU_POST1       0x070
+#define TSU_POST2       0x074
+#define TSU_POST3       0x078
+#define TSU_POST4       0x07C
+#define TXNLCR0         0x080
+#define TXALCR0         0x084
+#define RXNLCR0         0x088
+#define RXALCR0         0x08C
+#define FWNLCR0         0x090
+#define FWALCR0         0x094
+#define TXNLCR1         0x0A0
+#define TXALCR1         0x0A4
+#define RXNLCR1         0x0A8
+#define RXALCR1         0x0AC
+#define FWNLCR1         0x0B0
+#define FWALCR1         0x0B4
+
+#define TSU_ADRH0       0x0100
+#define TSU_ADRL0       0x0104
+#define TSU_ADRL31      0x01FC
+
+/* Register's bits */
+
+/* EDMR */
+enum DMAC_M_BIT {
+        EDMR_DL1 = 0x20, EDMR_DL0 = 0x10, EDMR_SRST = 0x01,
+};
+
+/* EDTRR */
+enum DMAC_T_BIT {
+        EDTRR_TRNS = 0x01,
+};
+
+/* EDRRR*/
+enum EDRRR_R_BIT {
+        EDRRR_R = 0x01,
+};
+
+/* TPAUSER */
+enum TPAUSER_BIT {
+        TPAUSER_TPAUSE = 0x0000ffff,
+        TPAUSER_UNLIMITED = 0,
+};
+
+/* BCFR */
+enum BCFR_BIT {
+        BCFR_RPAUSE = 0x0000ffff,
+        BCFR_UNLIMITED = 0,
+};
+
+/* PIR */
+enum PIR_BIT {
+        PIR_MDI = 0x08, PIR_MDO = 0x04, PIR_MMD = 0x02, PIR_MDC = 0x01,
+};
+
+/* PSR */
+enum PHY_STATUS_BIT { PHY_ST_LINK = 0x01, };
+
+/* EESR */
+enum EESR_BIT {
+        EESR_TWB = 0x40000000, EESR_TABT = 0x04000000,
+        EESR_RABT = 0x02000000, EESR_RFRMER = 0x01000000,
+        EESR_ADE = 0x00800000, EESR_ECI = 0x00400000,
+        EESR_FTC = 0x00200000, EESR_TDE = 0x00100000,
+        EESR_TFE = 0x00080000, EESR_FRC = 0x00040000,
+        EESR_RDE = 0x00020000, EESR_RFE = 0x00010000,
+        EESR_TINT4 = 0x00000800, EESR_TINT3 = 0x00000400,
+        EESR_TINT2 = 0x00000200, EESR_TINT1 = 0x00000100,
+        EESR_RINT8 = 0x00000080, EESR_RINT5 = 0x00000010,
+        EESR_RINT4 = 0x00000008, EESR_RINT3 = 0x00000004,
+        EESR_RINT2 = 0x00000002, EESR_RINT1 = 0x00000001,
+};
+
+#define EESR_ERR_CHECK  (EESR_TWB | EESR_TABT | EESR_RABT | EESR_RDE \
+                | EESR_RFRMER | EESR_ADE | EESR_TFE | EESR_TDE | EESR_ECI)
+
+/* EESIPR */
+enum DMAC_IM_BIT {
+        DMAC_M_TWB = 0x40000000, DMAC_M_TABT = 0x04000000,
+        DMAC_M_RABT = 0x02000000,
+        DMAC_M_RFRMER = 0x01000000, DMAC_M_ADF = 0x00800000,
+        DMAC_M_ECI = 0x00400000, DMAC_M_FTC = 0x00200000,
+        DMAC_M_TDE = 0x00100000, DMAC_M_TFE = 0x00080000,
+        DMAC_M_FRC = 0x00040000, DMAC_M_RDE = 0x00020000,
+        DMAC_M_RFE = 0x00010000, DMAC_M_TINT4 = 0x00000800,
+        DMAC_M_TINT3 = 0x00000400, DMAC_M_TINT2 = 0x00000200,
+        DMAC_M_TINT1 = 0x00000100, DMAC_M_RINT8 = 0x00000080,
+        DMAC_M_RINT5 = 0x00000010, DMAC_M_RINT4 = 0x00000008,
+        DMAC_M_RINT3 = 0x00000004, DMAC_M_RINT2 = 0x00000002,
+        DMAC_M_RINT1 = 0x00000001,
+};
+
+/* Receive descriptor bit */
+enum RD_STS_BIT {
+        RD_RACT = 0x80000000, RC_RDEL = 0x40000000,
+        RC_RFP1 = 0x20000000, RC_RFP0 = 0x10000000,
+        RD_RFE = 0x08000000, RD_RFS10 = 0x00000200,
+        RD_RFS9 = 0x00000100, RD_RFS8 = 0x00000080,
+        RD_RFS7 = 0x00000040, RD_RFS6 = 0x00000020,
+        RD_RFS5 = 0x00000010, RD_RFS4 = 0x00000008,
+        RD_RFS3 = 0x00000004, RD_RFS2 = 0x00000002,
+        RD_RFS1 = 0x00000001,
+};
+#define RDF1ST  RC_RFP1
+#define RDFEND  RC_RFP0
+#define RD_RFP  (RC_RFP1|RC_RFP0)
+
+/* FCFTR */
+enum FCFTR_BIT {
+        FCFTR_RFF2 = 0x00040000, FCFTR_RFF1 = 0x00020000,
+        FCFTR_RFF0 = 0x00010000, FCFTR_RFD2 = 0x00000004,
+        FCFTR_RFD1 = 0x00000002, FCFTR_RFD0 = 0x00000001,
+};
+#define FIFO_F_D_RFF    (FCFTR_RFF2|FCFTR_RFF1|FCFTR_RFF0)
+#define FIFO_F_D_RFD    (FCFTR_RFD2|FCFTR_RFD1|FCFTR_RFD0)
+
+/* Transfer descriptor bit */
+enum TD_STS_BIT {
+        TD_TACT = 0x80000000, TD_TDLE = 0x40000000, TD_TFP1 = 0x20000000,
+        TD_TFP0 = 0x10000000,
+};
+#define TDF1ST  TD_TFP1
+#define TDFEND  TD_TFP0
+#define TD_TFP  (TD_TFP1|TD_TFP0)
+
+/* RMCR */
+enum RECV_RST_BIT { RMCR_RST = 0x01, };
+/* ECMR */
+enum FELIC_MODE_BIT {
+        ECMR_ZPF = 0x00080000, ECMR_PFR = 0x00040000, ECMR_RXF = 0x00020000,
+        ECMR_TXF = 0x00010000, ECMR_MCT = 0x00002000, ECMR_PRCEF = 0x00001000,
+        ECMR_PMDE = 0x00000200, ECMR_RE = 0x00000040, ECMR_TE = 0x00000020,
+        ECMR_ILB = 0x00000008, ECMR_ELB = 0x00000004, ECMR_DM = 0x00000002,
+        ECMR_PRM = 0x00000001,
+};
+
+/* ECSR */
+enum ECSR_STATUS_BIT {
+        ECSR_BRCRX = 0x20, ECSR_PSRTO = 0x10, ECSR_LCHNG = 0x04,
+        ECSR_MPD = 0x02, ECSR_ICD = 0x01,
+};
+
+/* ECSIPR */
+enum ECSIPR_STATUS_MASK_BIT {
+        ECSIPR_BRCRXIP = 0x20, ECSIPR_PSRTOIP = 0x10, ECSIPR_LCHNGIP = 0x04,
+        ECSIPR_MPDIP = 0x02, ECSIPR_ICDIP = 0x01,
+};
+
+/* APR */
+enum APR_BIT {
+        APR_AP = 0x00000001,
+};
+
+/* MPR */
+enum MPR_BIT {
+        MPR_MP = 0x00000001,
+};
+
+/* TRSCER */
+enum DESC_I_BIT {
+        DESC_I_TINT4 = 0x0800, DESC_I_TINT3 = 0x0400, DESC_I_TINT2 = 0x0200,
+        DESC_I_TINT1 = 0x0100, DESC_I_RINT8 = 0x0080, DESC_I_RINT5 = 0x0010,
+        DESC_I_RINT4 = 0x0008, DESC_I_RINT3 = 0x0004, DESC_I_RINT2 = 0x0002,
+        DESC_I_RINT1 = 0x0001,
+};
+
+/* RPADIR */
+enum RPADIR_BIT {
+        RPADIR_PADS1 = 0x20000, RPADIR_PADS0 = 0x10000,
+        RPADIR_PADR = 0x0003f,
+};
+
+/* FDR */
+enum FIFO_SIZE_BIT {
+        FIFO_SIZE_T = 0x00000700, FIFO_SIZE_R = 0x00000007,
+};
+enum phy_offsets {
+        PHY_CTRL = 0, PHY_STAT = 1, PHY_IDT1 = 2, PHY_IDT2 = 3,
+        PHY_ANA = 4, PHY_ANL = 5, PHY_ANE = 6,
+        PHY_16 = 16,
+};
+
+/* PHY_CTRL */
+enum PHY_CTRL_BIT {
+        PHY_C_RESET = 0x8000, PHY_C_LOOPBK = 0x4000, PHY_C_SPEEDSL = 0x2000,
+        PHY_C_ANEGEN = 0x1000, PHY_C_PWRDN = 0x0800, PHY_C_ISO = 0x0400,
+        PHY_C_RANEG = 0x0200, PHY_C_DUPLEX = 0x0100, PHY_C_COLT = 0x0080,
+};
+#define DM9161_PHY_C_ANEGEN 0   /* auto nego special */
+
+/* PHY_STAT */
+enum PHY_STAT_BIT {
+        PHY_S_100T4 = 0x8000, PHY_S_100X_F = 0x4000, PHY_S_100X_H = 0x2000,
+        PHY_S_10T_F = 0x1000, PHY_S_10T_H = 0x0800, PHY_S_ANEGC = 0x0020,
+        PHY_S_RFAULT = 0x0010, PHY_S_ANEGA = 0x0008, PHY_S_LINK = 0x0004,
+        PHY_S_JAB = 0x0002, PHY_S_EXTD = 0x0001,
+};
+
+/* PHY_ANA */
+enum PHY_ANA_BIT {
+        PHY_A_NP = 0x8000, PHY_A_ACK = 0x4000, PHY_A_RF = 0x2000,
+        PHY_A_FCS = 0x0400, PHY_A_T4 = 0x0200, PHY_A_FDX = 0x0100,
+        PHY_A_HDX = 0x0080, PHY_A_10FDX = 0x0040, PHY_A_10HDX = 0x0020,
+        PHY_A_SEL = 0x001f,
+};
+/* PHY_ANL */
+enum PHY_ANL_BIT {
+        PHY_L_NP = 0x8000, PHY_L_ACK = 0x4000, PHY_L_RF = 0x2000,
+        PHY_L_FCS = 0x0400, PHY_L_T4 = 0x0200, PHY_L_FDX = 0x0100,
+        PHY_L_HDX = 0x0080, PHY_L_10FDX = 0x0040, PHY_L_10HDX = 0x0020,
+        PHY_L_SEL = 0x001f,
+};
+
+/* PHY_ANE */
+enum PHY_ANE_BIT {
+        PHY_E_PDF = 0x0010, PHY_E_LPNPA = 0x0008, PHY_E_NPA = 0x0004,
+        PHY_E_PRX = 0x0002, PHY_E_LPANEGA = 0x0001,
+};
+
+/* DM9161 */
+enum PHY_16_BIT {
+        PHY_16_BP4B45 = 0x8000, PHY_16_BPSCR = 0x4000, PHY_16_BPALIGN = 0x2000,
+        PHY_16_BP_ADPOK = 0x1000, PHY_16_Repeatmode = 0x0800,
+        PHY_16_TXselect = 0x0400,
+        PHY_16_Rsvd = 0x0200, PHY_16_RMIIEnable = 0x0100,
+        PHY_16_Force100LNK = 0x0080,
+        PHY_16_APDLED_CTL = 0x0040, PHY_16_COLLED_CTL = 0x0020,
+        PHY_16_RPDCTR_EN = 0x0010,
+        PHY_16_ResetStMch = 0x0008, PHY_16_PreamSupr = 0x0004,
+        PHY_16_Sleepmode = 0x0002,
+        PHY_16_RemoteLoopOut = 0x0001,
+};
+
+#define POST_RX         0x08
+#define POST_FW         0x04
+#define POST0_RX        (POST_RX)
+#define POST0_FW        (POST_FW)
+#define POST1_RX        (POST_RX >> 2)
+#define POST1_FW        (POST_FW >> 2)
+#define POST_ALL        (POST0_RX | POST0_FW | POST1_RX | POST1_FW)
+
+/* ARSTR */
+enum ARSTR_BIT { ARSTR_ARSTR = 0x00000001, };
+
+/* TSU_FWEN0 */
+enum TSU_FWEN0_BIT {
+        TSU_FWEN0_0 = 0x00000001,
+};
+
+/* TSU_ADSBSY */
+enum TSU_ADSBSY_BIT {
+        TSU_ADSBSY_0 = 0x00000001,
+};
+
+/* TSU_TEN */
+enum TSU_TEN_BIT {
+        TSU_TEN_0 = 0x80000000,
+};
+
+/* TSU_FWSL0 */
+enum TSU_FWSL0_BIT {
+        TSU_FWSL0_FW50 = 0x1000, TSU_FWSL0_FW40 = 0x0800,
+        TSU_FWSL0_FW30 = 0x0400, TSU_FWSL0_FW20 = 0x0200,
+        TSU_FWSL0_FW10 = 0x0100, TSU_FWSL0_RMSA0 = 0x0010,
+};
+
+/* TSU_FWSLC */
+enum TSU_FWSLC_BIT {
+        TSU_FWSLC_POSTENU = 0x2000, TSU_FWSLC_POSTENL = 0x1000,
+        TSU_FWSLC_CAMSEL03 = 0x0080, TSU_FWSLC_CAMSEL02 = 0x0040,
+        TSU_FWSLC_CAMSEL01 = 0x0020, TSU_FWSLC_CAMSEL00 = 0x0010,
+        TSU_FWSLC_CAMSEL13 = 0x0008, TSU_FWSLC_CAMSEL12 = 0x0004,
+        TSU_FWSLC_CAMSEL11 = 0x0002, TSU_FWSLC_CAMSEL10 = 0x0001,
+};
+
+/*
+ * The sh ether Tx buffer descriptors.
+ * This structure should be 20 bytes.
+ */
+struct sh_eth_txdesc {
+        u32 status;             /* TD0 */
+#if defined(CONFIG_CPU_LITTLE_ENDIAN)
+        u16 pad0;               /* TD1 */
+        u16 buffer_length;      /* TD1 */
+#else
+        u16 buffer_length;      /* TD1 */
+        u16 pad0;               /* TD1 */
+#endif
+        u32 addr;               /* TD2 */
+        u32 pad1;               /* padding data */
+};
+
+/*
+ * The sh ether Rx buffer descriptors.
+ * This structure should be 20 bytes.
+ */
+struct sh_eth_rxdesc {
+        u32 status;             /* RD0 */
+#if defined(CONFIG_CPU_LITTLE_ENDIAN)
+        u16 frame_length;       /* RD1 */
+        u16 buffer_length;      /* RD1 */
+#else
+        u16 buffer_length;      /* RD1 */
+        u16 frame_length;       /* RD1 */
+#endif
+        u32 addr;               /* RD2 */
+        u32 pad0;               /* padding data */
+};
+
+struct sh_eth_private {
+        dma_addr_t rx_desc_dma;
+        dma_addr_t tx_desc_dma;
+        struct sh_eth_rxdesc *rx_ring;
+        struct sh_eth_txdesc *tx_ring;
+        struct sk_buff **rx_skbuff;
+        struct sk_buff **tx_skbuff;
+        struct net_device_stats stats;
+        struct timer_list timer;
+        spinlock_t lock;
+        u32 cur_rx, dirty_rx;   /* Producer/consumer ring indices */
+        u32 cur_tx, dirty_tx;
+        u32 rx_buf_sz;          /* Based on MTU+slack. */
+        /* MII transceiver section. */
+        u32 phy_id;                                     /* PHY ID */
+        struct mii_bus *mii_bus;        /* MDIO bus control */
+        struct phy_device *phydev;      /* PHY device control */
+        enum phy_state link;
+        int msg_enable;
+        int speed;
+        int duplex;
+        u32 rx_int_var, tx_int_var;     /* interrupt control variables */
+        char post_rx;           /* POST receive */
+        char post_fw;           /* POST forward */
+        struct net_device_stats tsu_stats;      /* TSU forward status */
+};
+
+static void swaps(char *src, int len)
+{
+#ifdef __LITTLE_ENDIAN__
+        u32 *p = (u32 *)src;
+        u32 *maxp;
+        maxp = p + ((len + sizeof(u32) - 1) / sizeof(u32));
+
+        for (; p < maxp; p++)
+                *p = swab32(*p);
+#endif
+}
+
+#endif