[Linux-mips-commits]CVS: linux/drivers/net banyan.c,NONE,1.1 banyan.h,NONE,1.1 Config.in,1.20,1.21 Makefile,1.11,1.12

[Steve L. <slo...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv16874/drivers/net

Modified Files:
	Config.in Makefile 
Added Files:
	banyan.c banyan.h 
Log Message:
Initial IDT 79EB355 support.


--- NEW FILE: banyan.c ---
/*
 * banyan.c
 *
 * Copyright 2002 MontaVista Software Inc.
 * Author: MontaVista Software, Inc.
 *         	st...@mv... or so...@mv...
 *
 * A driver for the IDT RC32355 on-chip ethernet controller.
 * 
 * This driver is modified from IDT:
 *
 * (C) 2001, IDT Inc.
 *
 * B Maruthanayakam  : Ported from sonic.c 
 * cgg               : Modified code.
 * P Sadik           : Applied filters.
 * st...@mv... :
 *   - Ported to MVL2.1 79EB355 lsp and brought forward to 2.4.17
 *     (Space.c obsolete, added module init/cleanup).
[...1204 lines suppressed...]
{
	/* no options yet */
	return 1;
}

static int __init banyan_setup_ethaddr(char *options)
{
	memcpy(mac, options, 17);
	mac[17]= '\0';
	return 1;
}

__setup("rc32355eth=", banyan_setup);

__setup("ethaddr=", banyan_setup_ethaddr);

#endif /* !MODULE */

module_init(banyan_init_module);
module_exit(banyan_cleanup_module);

--- NEW FILE: banyan.h ---
/*
 *
 * BRIEF MODULE DESCRIPTION
 *      Helpfile for banyan.c
 *
 * Copyright 2002 MontaVista Software Inc.
 * Author: MontaVista Software, Inc.
 *         	st...@mv... or so...@mv...
 *
 * Heavily modified from original version by:
 *
 * (C) 2001, IDT Inc.
 *
 * ########################################################################
 *
 *  This program is free software; you can redistribute  it and/or modify it
 *  under  the terms of  the GNU General  Public License as published by the
 *  Free Software Foundation;  either version 2 of the  License, or (at your
 *  option) any later version.
 *
 *  THIS  SOFTWARE  IS PROVIDED   ``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 AUTHOR  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.
 *
 *  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.,
 *  675 Mass Ave, Cambridge, MA 02139, USA.
 *
 * ########################################################################
 */

#ifndef BANYAN_H
#define BANYAN_H

#include <linux/config.h>

#ifdef BANYAN_DEBUG
#define dbg(lvl, format, arg...) \
    if (banyan_debug > lvl) \
        printk(KERN_INFO "%s: " format, dev->name , ## arg)
#else
#define dbg(lvl, format, arg...) do {} while (0)
#endif
#define err(format, arg...) \
    printk(KERN_ERR "%s: " format, dev->name , ## arg)
#define info(format, arg...) \
    printk(KERN_INFO "%s: " format, dev->name , ## arg)
#define warn(format, arg...) \
    printk(KERN_WARNING "%s: " format, dev->name , ## arg)

#define ETH_DMA_RX_IRQ   GROUP1_IRQ_BASE + 9
#define ETH_DMA_TX_IRQ   GROUP1_IRQ_BASE + 10
#define ETH_RX_OVR_IRQ   GROUP3_IRQ_BASE + 22

/* Index to functions, as function prototypes. */

static int banyan_open(struct net_device *dev);
static int banyan_send_packet(struct sk_buff *skb, struct net_device *dev);
static void ban_ovr_interrupt(int irq, void *dev_id,
			      struct pt_regs * regs);
static void ban_rx_dma_interrupt(int irq, void *dev_id,
				 struct pt_regs * regs);
static void ban_tx_dma_interrupt(int irq, void *dev_id,
				 struct pt_regs * regs);
static void banyan_rx(struct net_device *dev);
static void banyan_tx(struct net_device *dev);
static int  banyan_close(struct net_device *dev);
static struct net_device_stats *banyan_get_stats(struct net_device *dev);
static void banyan_multicast_list(struct net_device *dev);
static int  banyan_init(struct net_device *dev);
static void banyan_tx_timeout(struct net_device *dev);

/* cgg - the following must be powers of two */
#define BANYAN_NUM_RDS    32    /* number of receive descriptors */
#define BANYAN_NUM_TDS    32    /* number of transmit descriptors */

#define BANYAN_RBSIZE     1536  /* size of one resource buffer = Ether MTU */
#define BANYAN_RDS_MASK   (BANYAN_NUM_RDS-1)
#define BANYAN_TDS_MASK   (BANYAN_NUM_TDS-1)
#define RD_RING_SIZE (BANYAN_NUM_RDS * sizeof(rc32355_dma_desc_t))
#define TD_RING_SIZE (BANYAN_NUM_TDS * sizeof(rc32355_dma_desc_t))

#define BANYAN_TX_TIMEOUT HZ/4

/* Information that need to be kept for each board. */
struct banyan_local {
	rc32355_eth_regs_t* eth_regs;
	rc32355_dma_ch_t* rx_dma_regs;
	rc32355_dma_ch_t* tx_dma_regs;
 	volatile rc32355_dma_desc_t * td_ring;  /* transmit descriptor ring */ 
	volatile rc32355_dma_desc_t * rd_ring;  /* receive descriptor ring  */

	u8*     rba;               /* start of rx buffer areas */  
	struct sk_buff* tx_skb[BANYAN_NUM_TDS]; /* skbuffs for pkt to trans */
	int     rx_next_out;
	int     tx_next_in;    	   /* next trans packet */
	int     tx_next_out;       /* last packet processed by ISR */
	int     tx_count;          /* current # of pkts waiting to be sent */

	int     tx_full;

	int     rx_irq;
	int     tx_irq;
	int     ovr_irq;

	struct net_device_stats stats;
	spinlock_t lock; /* Serialise access to device */

#ifdef BANYAN_PROC_DEBUG
	/* debug /proc entry */
	struct proc_dir_entry *ps;
	int dma_halt_cnt;    u32 halt_tx_count;
	int dma_collide_cnt; u32 collide_tx_count;
	int dma_run_cnt;     u32 run_tx_count;
	int dma_race_cnt;    u32 race_tx_count;
#endif
};

#endif /* BANYAN_H */

Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Config.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Config.in	26 Feb 2002 19:03:29 -0000	1.20
+++ Config.in	29 Apr 2002 23:05:11 -0000	1.21
@@ -62,6 +62,9 @@
    if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
       bool '  MIPS AU1000 Ethernet support' CONFIG_MIPS_AU1000_ENET
    fi
+   if [ "$CONFIG_MIPS_RC32355" = "y" ]; then
+      bool '  IDT RC32355 Ethernet support' CONFIG_MIPS_RC32355_ETH
+   fi
    if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
       tristate '  SB1250 Ethernet support' CONFIG_NET_SB1250_MAC
    fi

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile	26 Feb 2002 19:03:29 -0000	1.11
+++ Makefile	29 Apr 2002 23:05:11 -0000	1.12
@@ -199,6 +199,7 @@
 obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
 obj-$(CONFIG_MIPS_GT96100ETH) += gt96100eth.o
 obj-$(CONFIG_MIPS_AU1000_ENET) += au1000_eth.o
+obj-$(CONFIG_MIPS_RC32355_ETH) += banyan.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
 obj-$(CONFIG_BAGETLANCE) += bagetlance.o
 obj-$(CONFIG_DECLANCE) += declance.o