Commit cbda6df4 authored by Ralf Bächle's avatar Ralf Bächle

[PATCH] GT96100 update

Move GT-64240 NIC definitions which previously did live elsewhere into
a new header file.  Mostly cosmetic cleanup and microfixes for gt64240.c.
parent 8e231e72
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2001 Patton Electronics Company
* Copyright (C) 2002 Momentum Computer
*
* Copyright 2000 MontaVista Software Inc.
* Author: MontaVista Software, Inc.
* stevel@mvista.com or support@mvista.com
*
* This program is free software; you can distribute it and/or modify it
* under the terms 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.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*
* Ethernet driver definitions for the MIPS GT96100 Advanced
* Communication Controller.
*
* Modified for the Marvellous GT64240 Retarded Communication Controller.
*/
#ifndef _GT64240ETH_H
#define _GT64240ETH_H
#include <asm/gt64240.h>
#define ETHERNET_PORTS_DIFFERENCE_OFFSETS 0x400
/* Translate those weanie names from Galileo/VxWorks header files: */
#define GT64240_MRR MAIN_ROUTING_REGISTER
#define GT64240_CIU_ARBITER_CONFIG COMM_UNIT_ARBITER_CONFIGURATION_REGISTER
#define GT64240_CIU_ARBITER_CONTROL COMM_UNIT_ARBITER_CONTROL
#define GT64240_MAIN_LOW_CAUSE LOW_INTERRUPT_CAUSE_REGISTER
#define GT64240_MAIN_HIGH_CAUSE HIGH_INTERRUPT_CAUSE_REGISTER
#define GT64240_CPU_LOW_MASK CPU_INTERRUPT_MASK_REGISTER_LOW
#define GT64240_CPU_HIGH_MASK CPU_INTERRUPT_MASK_REGISTER_HIGH
#define GT64240_CPU_SELECT_CAUSE CPU_SELECT_CAUSE_REGISTER
#define GT64240_ETH_PHY_ADDR_REG ETHERNET_PHY_ADDRESS_REGISTER
#define GT64240_ETH_PORT_CONFIG ETHERNET0_PORT_CONFIGURATION_REGISTER
#define GT64240_ETH_PORT_CONFIG_EXT ETHERNET0_PORT_CONFIGURATION_EXTEND_REGISTER
#define GT64240_ETH_PORT_COMMAND ETHERNET0_PORT_COMMAND_REGISTER
#define GT64240_ETH_PORT_STATUS ETHERNET0_PORT_STATUS_REGISTER
#define GT64240_ETH_IO_SIZE ETHERNET_PORTS_DIFFERENCE_OFFSETS
#define GT64240_ETH_SMI_REG ETHERNET_SMI_REGISTER
#define GT64240_ETH_MIB_COUNT_BASE ETHERNET0_MIB_COUNTER_BASE
#define GT64240_ETH_SDMA_CONFIG ETHERNET0_SDMA_CONFIGURATION_REGISTER
#define GT64240_ETH_SDMA_COMM ETHERNET0_SDMA_COMMAND_REGISTER
#define GT64240_ETH_INT_MASK ETHERNET0_INTERRUPT_MASK_REGISTER
#define GT64240_ETH_INT_CAUSE ETHERNET0_INTERRUPT_CAUSE_REGISTER
#define GT64240_ETH_CURR_TX_DESC_PTR0 ETHERNET0_CURRENT_TX_DESCRIPTOR_POINTER0
#define GT64240_ETH_CURR_TX_DESC_PTR1 ETHERNET0_CURRENT_TX_DESCRIPTOR_POINTER1
#define GT64240_ETH_1ST_RX_DESC_PTR0 ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER0
#define GT64240_ETH_CURR_RX_DESC_PTR0 ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER0
#define GT64240_ETH_HASH_TBL_PTR ETHERNET0_HASH_TABLE_POINTER_REGISTER
/* Turn on NAPI by default */
#define GT64240_NAPI 1
/* Some 64240 settings that SHOULD eventually be setup in PROM monitor: */
/* (Board-specific to the DSL3224 Rev A board ONLY!) */
#define D3224_MPP_CTRL0_SETTING 0x66669900
#define D3224_MPP_CTRL1_SETTING 0x00000000
#define D3224_MPP_CTRL2_SETTING 0x00887700
#define D3224_MPP_CTRL3_SETTING 0x00000044
#define D3224_GPP_IO_CTRL_SETTING 0x0000e800
#define D3224_GPP_LEVEL_CTRL_SETTING 0xf001f703
#define D3224_GPP_VALUE_SETTING 0x00000000
/* Keep the ring sizes a power of two for efficiency. */
//-#define TX_RING_SIZE 16
#define TX_RING_SIZE 64 /* TESTING !!! */
#define RX_RING_SIZE 32
#define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer. */
#define RX_HASH_TABLE_SIZE 16384
#define HASH_HOP_NUMBER 12
#define NUM_INTERFACES 3
#define GT64240ETH_TX_TIMEOUT HZ/4
#define MIPS_GT64240_BASE 0xf4000000
#define GT64240_ETH0_BASE (MIPS_GT64240_BASE + GT64240_ETH_PORT_CONFIG)
#define GT64240_ETH1_BASE (GT64240_ETH0_BASE + GT64240_ETH_IO_SIZE)
#define GT64240_ETH2_BASE (GT64240_ETH1_BASE + GT64240_ETH_IO_SIZE)
#if defined(CONFIG_MIPS_DSL3224)
#define GT64240_ETHER0_IRQ 4
#define GT64240_ETHER1_IRQ 4
#else
#define GT64240_ETHER0_IRQ -1
#define GT64240_ETHER1_IRQ -1
#endif
#define REV_GT64240 0x1
#define REV_GT64240A 0x10
#define GT64240ETH_READ(gp, offset) \
GT_READ((gp)->port_offset + (offset))
#define GT64240ETH_WRITE(gp, offset, data) \
GT_WRITE((gp)->port_offset + (offset), (data))
#define GT64240ETH_SETBIT(gp, offset, bits) \
GT64240ETH_WRITE((gp), (offset), \
GT64240ETH_READ((gp), (offset)) | (bits))
#define GT64240ETH_CLRBIT(gp, offset, bits) \
GT64240ETH_WRITE((gp), (offset), \
GT64240ETH_READ((gp), (offset)) & ~(bits))
#define GT64240_READ(ofs) GT_READ(ofs)
#define GT64240_WRITE(ofs, data) GT_WRITE((ofs), (data))
/* Bit definitions of the SMI Reg */
enum {
smirDataMask = 0xffff,
smirPhyAdMask = 0x1f << 16,
smirPhyAdBit = 16,
smirRegAdMask = 0x1f << 21,
smirRegAdBit = 21,
smirOpCode = 1 << 26,
smirReadValid = 1 << 27,
smirBusy = 1 << 28
};
/* Bit definitions of the Port Config Reg */
enum pcr_bits {
pcrPM = 1 << 0,
pcrRBM = 1 << 1,
pcrPBF = 1 << 2,
pcrEN = 1 << 7,
pcrLPBKMask = 0x3 << 8,
pcrLPBKBit = 1 << 8,
pcrFC = 1 << 10,
pcrHS = 1 << 12,
pcrHM = 1 << 13,
pcrHDM = 1 << 14,
pcrHD = 1 << 15,
pcrISLMask = 0x7 << 28,
pcrISLBit = 28,
pcrACCS = 1 << 31
};
/* Bit definitions of the Port Config Extend Reg */
enum pcxr_bits {
pcxrIGMP = 1,
pcxrSPAN = 2,
pcxrPAR = 4,
pcxrPRIOtxMask = 0x7 << 3,
pcxrPRIOtxBit = 3,
pcxrPRIOrxMask = 0x3 << 6,
pcxrPRIOrxBit = 6,
pcxrPRIOrxOverride = 1 << 8,
pcxrDPLXen = 1 << 9,
pcxrFCTLen = 1 << 10,
pcxrFLP = 1 << 11,
pcxrFCTL = 1 << 12,
pcxrMFLMask = 0x3 << 14,
pcxrMFLBit = 14,
pcxrMIBclrMode = 1 << 16,
pcxrSpeed = 1 << 18,
pcxrSpeeden = 1 << 19,
pcxrRMIIen = 1 << 20,
pcxrDSCPen = 1 << 21
};
/* Bit definitions of the Port Command Reg */
enum pcmr_bits {
pcmrFJ = 1 << 15
};
/* Bit definitions of the Port Status Reg */
enum psr_bits {
psrSpeed = 1,
psrDuplex = 2,
psrFctl = 4,
psrLink = 8,
psrPause = 1 << 4,
psrTxLow = 1 << 5,
psrTxHigh = 1 << 6,
psrTxInProg = 1 << 7
};
/* Bit definitions of the SDMA Config Reg */
enum sdcr_bits {
sdcrRCMask = 0xf << 2,
sdcrRCBit = 2,
sdcrBLMR = 1 << 6,
sdcrBLMT = 1 << 7,
sdcrPOVR = 1 << 8,
sdcrRIFB = 1 << 9,
sdcrBSZMask = 0x3 << 12,
sdcrBSZBit = 12
};
/* Bit definitions of the SDMA Command Reg */
enum sdcmr_bits {
sdcmrERD = 1 << 7,
sdcmrAR = 1 << 15,
sdcmrSTDH = 1 << 16,
sdcmrSTDL = 1 << 17,
sdcmrTXDH = 1 << 23,
sdcmrTXDL = 1 << 24,
sdcmrAT = 1 << 31
};
/* Bit definitions of the Interrupt Cause Reg */
enum icr_bits {
icrRxBuffer = 1,
icrTxBufferHigh = 1 << 2,
icrTxBufferLow = 1 << 3,
icrTxEndHigh = 1 << 6,
icrTxEndLow = 1 << 7,
icrRxError = 1 << 8,
icrTxErrorHigh = 1 << 10,
icrTxErrorLow = 1 << 11,
icrRxOVR = 1 << 12,
icrTxUdr = 1 << 13,
icrRxBufferQ0 = 1 << 16,
icrRxBufferQ1 = 1 << 17,
icrRxBufferQ2 = 1 << 18,
icrRxBufferQ3 = 1 << 19,
icrRxErrorQ0 = 1 << 20,
icrRxErrorQ1 = 1 << 21,
icrRxErrorQ2 = 1 << 22,
icrRxErrorQ3 = 1 << 23,
icrMIIPhySTC = 1 << 28,
icrSMIdone = 1 << 29,
icrEtherIntSum = 1 << 31
};
/* The Rx and Tx descriptor lists. */
#ifdef __LITTLE_ENDIAN
typedef struct {
u32 cmdstat;
u16 reserved; //-prk21aug01 u32 reserved:16;
u16 byte_cnt; //-prk21aug01 u32 byte_cnt:16;
u32 buff_ptr;
u32 next;
} gt64240_td_t;
typedef struct {
u32 cmdstat;
u16 byte_cnt; //-prk21aug01 u32 byte_cnt:16;
u16 buff_sz; //-prk21aug01 u32 buff_sz:16;
u32 buff_ptr;
u32 next;
} gt64240_rd_t;
#elif defined(__BIG_ENDIAN)
typedef struct {
u16 byte_cnt; //-prk21aug01 u32 byte_cnt:16;
u16 reserved; //-prk21aug01 u32 reserved:16;
u32 cmdstat;
u32 next;
u32 buff_ptr;
} gt64240_td_t;
typedef struct {
u16 buff_sz; //-prk21aug01 u32 buff_sz:16;
u16 byte_cnt; //-prk21aug01 u32 byte_cnt:16;
u32 cmdstat;
u32 next;
u32 buff_ptr;
} gt64240_rd_t;
#else
#error Either __BIG_ENDIAN or __LITTLE_ENDIAN must be defined!
#endif
/* Values for the Tx command-status descriptor entry. */
enum td_cmdstat {
txOwn = 1 << 31,
txAutoMode = 1 << 30,
txEI = 1 << 23,
txGenCRC = 1 << 22,
txPad = 1 << 18,
txFirst = 1 << 17,
txLast = 1 << 16,
txErrorSummary = 1 << 15,
txReTxCntMask = 0x0f << 10,
txReTxCntBit = 10,
txCollision = 1 << 9,
txReTxLimit = 1 << 8,
txUnderrun = 1 << 6,
txLateCollision = 1 << 5
};
/* Values for the Rx command-status descriptor entry. */
enum rd_cmdstat {
rxOwn = 1 << 31,
rxAutoMode = 1 << 30,
rxEI = 1 << 23,
rxFirst = 1 << 17,
rxLast = 1 << 16,
rxErrorSummary = 1 << 15,
rxIGMP = 1 << 14,
rxHashExpired = 1 << 13,
rxMissedFrame = 1 << 12,
rxFrameType = 1 << 11,
rxShortFrame = 1 << 8,
rxMaxFrameLen = 1 << 7,
rxOverrun = 1 << 6,
rxCollision = 1 << 4,
rxCRCError = 1
};
/* Bit fields of a Hash Table Entry */
enum hash_table_entry {
hteValid = 1,
hteSkip = 2,
hteRD = 4
};
// The MIB counters
typedef struct {
u32 byteReceived;
u32 byteSent;
u32 framesReceived;
u32 framesSent;
u32 totalByteReceived;
u32 totalFramesReceived;
u32 broadcastFramesReceived;
u32 multicastFramesReceived;
u32 cRCError;
u32 oversizeFrames;
u32 fragments;
u32 jabber;
u32 collision;
u32 lateCollision;
u32 frames64;
u32 frames65_127;
u32 frames128_255;
u32 frames256_511;
u32 frames512_1023;
u32 frames1024_MaxSize;
u32 macRxError;
u32 droppedFrames;
u32 outMulticastFrames;
u32 outBroadcastFrames;
u32 undersizeFrames;
} mib_counters_t;
struct gt64240_private {
gt64240_rd_t *rx_ring;
gt64240_td_t *tx_ring;
// The Rx and Tx rings must be 16-byte aligned
dma_addr_t rx_ring_dma;
dma_addr_t tx_ring_dma;
char *hash_table;
// The Hash Table must be 8-byte aligned
dma_addr_t hash_table_dma;
int hash_mode;
// The Rx buffers must be 8-byte aligned
char *rx_buff;
dma_addr_t rx_buff_dma;
// Tx buffers (tx_skbuff[i]->data) with less than 8 bytes
// of payload must be 8-byte aligned
struct sk_buff *tx_skbuff[TX_RING_SIZE];
int rx_next_out; /* The next free ring entry to receive */
int tx_next_in; /* The next free ring entry to send */
int tx_next_out; /* The last ring entry the ISR processed */
int tx_count; /* current # of pkts waiting to be sent in Tx ring */
int intr_work_done; /* number of Rx and Tx pkts processed in the isr */
int tx_full; /* Tx ring is full */
mib_counters_t mib;
struct net_device_stats stats;
int io_size;
int port_num; // 0 or 1
u32 port_offset;
int phy_addr; // PHY address
u32 last_psr; // last value of the port status register
int options; /* User-settable misc. driver options. */
int drv_flags;
spinlock_t lock; /* Serialise access to device */
struct mii_if_info mii_if;
u32 msg_enable;
};
#endif /* _GT64240ETH_H */
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
* gt96100_cleanup_module(), and other general code cleanups * gt96100_cleanup_module(), and other general code cleanups
* <stevel@mvista.com>. * <stevel@mvista.com>.
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -66,10 +65,6 @@ static int gt96100_add_hash_entry(struct net_device *dev, ...@@ -66,10 +65,6 @@ static int gt96100_add_hash_entry(struct net_device *dev,
static void read_mib_counters(struct gt96100_private *gp); static void read_mib_counters(struct gt96100_private *gp);
static int read_MII(int phy_addr, u32 reg); static int read_MII(int phy_addr, u32 reg);
static int write_MII(int phy_addr, u32 reg, u16 data); static int write_MII(int phy_addr, u32 reg, u16 data);
#if 0
static void dump_tx_ring(struct net_device *dev);
static void dump_rx_ring(struct net_device *dev);
#endif
static int gt96100_init_module(void); static int gt96100_init_module(void);
static void gt96100_cleanup_module(void); static void gt96100_cleanup_module(void);
static void dump_MII(int dbg_lvl, struct net_device *dev); static void dump_MII(int dbg_lvl, struct net_device *dev);
...@@ -84,7 +79,7 @@ static void abort(struct net_device *dev, u32 abort_bits); ...@@ -84,7 +79,7 @@ static void abort(struct net_device *dev, u32 abort_bits);
static void hard_stop(struct net_device *dev); static void hard_stop(struct net_device *dev);
static void enable_ether_irq(struct net_device *dev); static void enable_ether_irq(struct net_device *dev);
static void disable_ether_irq(struct net_device *dev); static void disable_ether_irq(struct net_device *dev);
static int gt96100_probe1(int port_num); static int gt96100_probe1(struct pci_dev *pci, int port_num);
static void reset_tx(struct net_device *dev); static void reset_tx(struct net_device *dev);
static void reset_rx(struct net_device *dev); static void reset_rx(struct net_device *dev);
static int gt96100_check_tx_consistent(struct gt96100_private *gp); static int gt96100_check_tx_consistent(struct gt96100_private *gp);
...@@ -164,13 +159,11 @@ chip_name(int chip_rev) ...@@ -164,13 +159,11 @@ chip_name(int chip_rev)
/* /*
DMA memory allocation, derived from pci_alloc_consistent. DMA memory allocation, derived from pci_alloc_consistent.
*/ */
static void * static void * dmaalloc(size_t size, dma_addr_t *dma_handle)
dmaalloc(size_t size, dma_addr_t *dma_handle)
{ {
void *ret; void *ret;
ret = (void *)__get_free_pages(GFP_ATOMIC | GFP_DMA, ret = (void *)__get_free_pages(GFP_ATOMIC | GFP_DMA, get_order(size));
get_order(size));
if (ret != NULL) { if (ret != NULL) {
dma_cache_inv((unsigned long)ret, size); dma_cache_inv((unsigned long)ret, size);
...@@ -184,17 +177,13 @@ dmaalloc(size_t size, dma_addr_t *dma_handle) ...@@ -184,17 +177,13 @@ dmaalloc(size_t size, dma_addr_t *dma_handle)
return ret; return ret;
} }
static void static void dmafree(size_t size, void *vaddr)
dmafree(size_t size, void *vaddr)
{ {
vaddr = (void*)KSEG0ADDR(vaddr); vaddr = (void*)KSEG0ADDR(vaddr);
free_pages((unsigned long)vaddr, get_order(size)); free_pages((unsigned long)vaddr, get_order(size));
} }
static void gt96100_delay(int ms)
static void
gt96100_delay(int ms)
{ {
if (in_interrupt()) if (in_interrupt())
return; return;
...@@ -327,34 +316,6 @@ write_MII(int phy_addr, u32 reg, u16 data) ...@@ -327,34 +316,6 @@ write_MII(int phy_addr, u32 reg, u16 data)
return 0; return 0;
} }
#if 0
// These routines work, just disabled to avoid compile warnings
static void
dump_tx_ring(struct net_device *dev)
{
struct gt96100_private *gp = netdev_priv(dev);
int i;
dbg(0, "%s: txno/txni/cnt=%d/%d/%d\n", __FUNCTION__,
gp->tx_next_out, gp->tx_next_in, gp->tx_count);
for (i=0; i<TX_RING_SIZE; i++)
dump_tx_desc(0, dev, i);
}
static void
dump_rx_ring(struct net_device *dev)
{
struct gt96100_private *gp = netdev_priv(dev);
int i;
dbg(0, "%s: rxno=%d\n", __FUNCTION__, gp->rx_next_out);
for (i=0; i<RX_RING_SIZE; i++)
dump_rx_desc(0, dev, i);
}
#endif
static void static void
dump_MII(int dbg_lvl, struct net_device *dev) dump_MII(int dbg_lvl, struct net_device *dev)
{ {
...@@ -647,23 +608,19 @@ disable_ether_irq(struct net_device *dev) ...@@ -647,23 +608,19 @@ disable_ether_irq(struct net_device *dev)
/* /*
* Init GT96100 ethernet controller driver * Init GT96100 ethernet controller driver
*/ */
int gt96100_init_module(void) static int gt96100_init_module(void)
{ {
struct pci_dev *pci;
int i, retval=0; int i, retval=0;
u16 vendor_id, device_id;
u32 cpuConfig; u32 cpuConfig;
#ifndef CONFIG_MIPS_GT96100ETH /*
return -ENODEV; * Stupid probe because this really isn't a PCI device
#endif */
if (!(pci = pci_find_device(PCI_VENDOR_ID_MARVELL,
// probe for GT96100 by reading PCI0 vendor/device ID register PCI_DEVICE_ID_MARVELL_GT96100, NULL)) &&
pcibios_read_config_word(0, 0, PCI_VENDOR_ID, &vendor_id); !(pci = pci_find_device(PCI_VENDOR_ID_MARVELL,
pcibios_read_config_word(0, 0, PCI_DEVICE_ID, &device_id); PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) {
if (vendor_id != PCI_VENDOR_ID_MARVELL ||
(device_id != PCI_DEVICE_ID_MARVELL_GT96100 &&
device_id != PCI_DEVICE_ID_MARVELL_GT96100A)) {
printk(KERN_ERR __FILE__ ": GT96100 not found!\n"); printk(KERN_ERR __FILE__ ": GT96100 not found!\n");
return -ENODEV; return -ENODEV;
} }
...@@ -675,17 +632,13 @@ int gt96100_init_module(void) ...@@ -675,17 +632,13 @@ int gt96100_init_module(void)
return -ENODEV; return -ENODEV;
} }
for (i=0; i < NUM_INTERFACES; i++) { for (i=0; i < NUM_INTERFACES; i++)
retval |= gt96100_probe1(i); retval |= gt96100_probe1(pci, i);
}
return retval; return retval;
} }
static int __init gt96100_probe1(struct pci_dev *pci, int port_num)
static int __init
gt96100_probe1(int port_num)
{ {
struct gt96100_private *gp = NULL; struct gt96100_private *gp = NULL;
struct gt96100_if_t *gtif = &gt96100_iflist[port_num]; struct gt96100_if_t *gtif = &gt96100_iflist[port_num];
...@@ -696,19 +649,19 @@ gt96100_probe1(int port_num) ...@@ -696,19 +649,19 @@ gt96100_probe1(int port_num)
struct net_device *dev = NULL; struct net_device *dev = NULL;
if (gtif->irq < 0) { if (gtif->irq < 0) {
printk(KERN_ERR "%s: irq unknown - probing not supported\n", __FUNCTION_); printk(KERN_ERR "%s: irq unknown - probing not supported\n",
__FUNCTION__);
return -ENODEV; return -ENODEV;
} }
pcibios_read_config_byte(0, 0, PCI_REVISION_ID, &chip_rev); pci_read_config_byte(pci, PCI_REVISION_ID, &chip_rev);
if (chip_rev >= REV_GT96100A_1) { if (chip_rev >= REV_GT96100A_1) {
phyAD = GT96100_READ(GT96100_ETH_PHY_ADDR_REG); phyAD = GT96100_READ(GT96100_ETH_PHY_ADDR_REG);
phy_addr = (phyAD >> (5*port_num)) & 0x1f; phy_addr = (phyAD >> (5*port_num)) & 0x1f;
} else { } else {
/* /*
* not sure what's this about -- probably * not sure what's this about -- probably a gt bug
* a gt bug
*/ */
phy_addr = port_num; phy_addr = port_num;
phyAD = GT96100_READ(GT96100_ETH_PHY_ADDR_REG); phyAD = GT96100_READ(GT96100_ETH_PHY_ADDR_REG);
...@@ -831,6 +784,7 @@ gt96100_probe1(int port_num) ...@@ -831,6 +784,7 @@ gt96100_probe1(int port_num)
free_netdev (dev); free_netdev (dev);
out: out:
release_region(gtif->iobase, GT96100_ETH_IO_SIZE); release_region(gtif->iobase, GT96100_ETH_IO_SIZE);
err("%s failed. Returns %d\n", __FUNCTION__, retval); err("%s failed. Returns %d\n", __FUNCTION__, retval);
return retval; return retval;
} }
...@@ -1102,6 +1056,7 @@ gt96100_close(struct net_device *dev) ...@@ -1102,6 +1056,7 @@ gt96100_close(struct net_device *dev)
} }
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
return 0; return 0;
} }
...@@ -1312,10 +1267,11 @@ gt96100_tx_complete(struct net_device *dev, u32 status) ...@@ -1312,10 +1267,11 @@ gt96100_tx_complete(struct net_device *dev, u32 status)
cmdstat, nextOut); cmdstat, nextOut);
if (cmdstat & (u32)txOwn) { if (cmdstat & (u32)txOwn) {
//dump_tx_ring(dev); /*
// DMA is not finished writing descriptor??? * DMA is not finished writing descriptor???
// Leave and come back later to pick-up where * Leave and come back later to pick-up where
// we left off. * we left off.
*/
break; break;
} }
...@@ -1342,7 +1298,8 @@ gt96100_tx_complete(struct net_device *dev, u32 status) ...@@ -1342,7 +1298,8 @@ gt96100_tx_complete(struct net_device *dev, u32 status)
gp->tx_full = 0; gp->tx_full = 0;
if (gp->last_psr & psrLink) { if (gp->last_psr & psrLink) {
netif_wake_queue(dev); netif_wake_queue(dev);
dbg(2, "%s: Tx Ring was full, queue waked\n", __FUNCTION_); dbg(2, "%s: Tx Ring was full, queue waked\n",
__FUNCTION__);
} }
} }
...@@ -1425,12 +1382,12 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1425,12 +1382,12 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if ((psr & psrLink) && !gp->tx_full && if ((psr & psrLink) && !gp->tx_full &&
netif_queue_stopped(dev)) { netif_queue_stopped(dev)) {
dbg(0, ": Link up, waking queue.\n", dbg(0, "%s: Link up, waking queue.\n",
__FUNCTION_); __FUNCTION__);
netif_wake_queue(dev); netif_wake_queue(dev);
} else if (!(psr & psrLink) && } else if (!(psr & psrLink) &&
!netif_queue_stopped(dev)) { !netif_queue_stopped(dev)) {
dbg(0, "Link down, stopping queue.\n", dbg(0, "%s: Link down, stopping queue.\n",
__FUNCTION__); __FUNCTION__);
netif_stop_queue(dev); netif_stop_queue(dev);
} }
...@@ -1569,8 +1526,8 @@ static void gt96100_cleanup_module(void) ...@@ -1569,8 +1526,8 @@ static void gt96100_cleanup_module(void)
for (i=0; i<NUM_INTERFACES; i++) { for (i=0; i<NUM_INTERFACES; i++) {
struct gt96100_if_t *gtif = &gt96100_iflist[i]; struct gt96100_if_t *gtif = &gt96100_iflist[i];
if (gtif->dev != NULL) { if (gtif->dev != NULL) {
struct gt96100_private *gp = struct gt96100_private *gp = (struct gt96100_private *)
(struct gt96100_private *)gtif->dev->priv; netdev_priv(gtif->dev);
unregister_netdev(gtif->dev); unregister_netdev(gtif->dev);
dmafree(RX_HASH_TABLE_SIZE, gp->hash_table_dma); dmafree(RX_HASH_TABLE_SIZE, gp->hash_table_dma);
dmafree(PKT_BUF_SZ*RX_RING_SIZE, gp->rx_buff); dmafree(PKT_BUF_SZ*RX_RING_SIZE, gp->rx_buff);
...@@ -1583,9 +1540,6 @@ static void gt96100_cleanup_module(void) ...@@ -1583,9 +1540,6 @@ static void gt96100_cleanup_module(void)
} }
} }
#ifndef MODULE
static int __init gt96100_setup(char *options) static int __init gt96100_setup(char *options)
{ {
char *this_opt; char *this_opt;
...@@ -1610,9 +1564,6 @@ static int __init gt96100_setup(char *options) ...@@ -1610,9 +1564,6 @@ static int __init gt96100_setup(char *options)
__setup("gt96100eth=", gt96100_setup); __setup("gt96100eth=", gt96100_setup);
#endif /* !MODULE */
module_init(gt96100_init_module); module_init(gt96100_init_module);
module_exit(gt96100_cleanup_module); module_exit(gt96100_cleanup_module);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment