patch-2.2.18 linux/drivers/net/sis900.c
Next file: linux/drivers/net/sis900.h
Previous file: linux/drivers/net/sdla.c
Back to the patch index
Back to the overall index
- Lines: 1646
- Date:
Wed Nov 1 17:32:31 2000
- Orig file:
v2.2.17/drivers/net/sis900.c
- Orig date:
Fri Apr 21 12:46:19 2000
diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/net/sis900.c linux/drivers/net/sis900.c
@@ -1,8 +1,8 @@
/* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.
Copyright 1999 Silicon Integrated System Corporation
- Revision: 1.05 Aug 7 1999
-
- Modified from the driver which is originally written by Donald Becker.
+ Revision: 1.06.05 Aug 24 2000
+
+ Modified from the driver which is originally written by Donald Becker.
This software may be used and distributed according to the terms
of the GNU Public License (GPL), incorporated herein by reference.
@@ -17,11 +17,13 @@
SiS 7014 Single Chip 100BASE-TX/10BASE-T Physical Layer Solution,
preliminary Rev. 1.0 Jan. 18, 1998
http://www.sis.com.tw/support/databook.htm
-
- Rev 1.06.02 Nov. 23 1999 Ollie Lho
+
+ Rev 1.06.05 Aug. 22 2000 Lei-Chun Chang (lcchang@sis.com.tw) modified 630E equalier workaroung rule
+ Rev 1.06.03 Dec. 23 1999 Ollie Lho Third release
+ Rev 1.06.02 Nov. 23 1999 Ollie Lho bug in mac probing fixed
Rev 1.06.01 Nov. 16 1999 Ollie Lho CRC calculation provide by Joseph Zbiciak (im14u2c@primenet.com)
Rev 1.06 Nov. 4 1999 Ollie Lho (ollie@sis.com.tw) Second release
- Rev 1.05.05 Oct. 29 1999 Ollie Lho (ollie@sis.com.tw) Single buffer Tx/Rx
+ Rev 1.05.05 Oct. 29 1999 Ollie Lho (ollie@sis.com.tw) Single buffer Tx/Rx
Chin-Shan Li (lcs@sis.com.tw) Added AMD Am79c901 HomePNA PHY support
Rev 1.05 Aug. 7 1999 Jim Huang (cmhuang@sis.com.tw) Initial release
*/
@@ -41,7 +43,7 @@
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
-#include <asm/processor.h> /* Processor type for cache alignment. */
+#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/bitops.h>
#include <asm/io.h>
#include <linux/delay.h>
@@ -49,22 +51,22 @@
#include "sis900.h"
static const char *version =
-"sis900.c: v1.06.03 12/23/99\n";
+"sis900.c: v1.06.05 08/24/00\n";
static int max_interrupt_work = 20;
+static int multicast_filter_limit = 128;
+
#define sis900_debug debug
static int sis900_debug = 0;
-static int multicast_filter_limit = 128;
-
/* Time in jiffies before concluding the transmitter is hung. */
#define TX_TIMEOUT (4*HZ)
struct mac_chip_info {
- const char *name;
- u16 vendor_id, device_id, flags;
- int io_size;
- struct device *(*probe) (struct mac_chip_info *mac, struct pci_dev * pci_dev,
+ const char *name;
+ u16 vendor_id, device_id, flags;
+ int io_size;
+ struct device *(*probe) (struct mac_chip_info *mac, struct pci_dev * pci_dev,
struct device * net_dev);
};
static struct device * sis900_mac_probe (struct mac_chip_info * mac, struct pci_dev * pci_dev,
@@ -75,7 +77,7 @@
PCI_COMMAND_IO|PCI_COMMAND_MASTER, SIS900_TOTAL_SIZE, sis900_mac_probe},
{ "SiS 7016 PCI Fast Ethernet",PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7016,
PCI_COMMAND_IO|PCI_COMMAND_MASTER, SIS900_TOTAL_SIZE, sis900_mac_probe},
- {0,}, /* 0 terminated list. */
+ {0,}, /* 0 terminated list. */
};
static void sis900_read_mode(struct device *net_dev, int phy_addr, int *speed, int *duplex);
@@ -102,37 +104,38 @@
};
typedef struct _BufferDesc {
- u32 link;
- u32 cmdsts;
- u32 bufptr;
+ u32 link;
+ u32 cmdsts;
+ u32 bufptr;
} BufferDesc;
struct sis900_private {
- struct device *next_module;
- struct net_device_stats stats;
+ struct device *next_module;
+ struct net_device_stats stats;
struct pci_dev * pci_dev;
struct mac_chip_info * mac;
struct mii_phy * mii;
unsigned int cur_phy;
- struct timer_list timer; /* Link status detection timer. */
- unsigned int cur_rx, dirty_rx;
- unsigned int cur_tx, dirty_tx;
+ struct timer_list timer; /* Link status detection timer. */
+
+ unsigned int cur_rx, dirty_rx; /* producer/comsumer pointers for Tx/Rx ring */
+ unsigned int cur_tx, dirty_tx;
- /* The saved address of a sent/receive-in-place packet buffer */
- struct sk_buff *tx_skbuff[NUM_TX_DESC];
+ /* The saved address of a sent/receive-in-place packet buffer */
+ struct sk_buff *tx_skbuff[NUM_TX_DESC];
struct sk_buff *rx_skbuff[NUM_RX_DESC];
- BufferDesc tx_ring[NUM_TX_DESC];
- BufferDesc rx_ring[NUM_RX_DESC];
- unsigned int tx_full; /* The Tx queue is full. */
+ BufferDesc tx_ring[NUM_TX_DESC];
+ BufferDesc rx_ring[NUM_RX_DESC];
- int LinkOn;
+ unsigned int tx_full; /* The Tx queue is full. */
+ int LinkOn;
};
#ifdef MODULE
#if LINUX_VERSION_CODE > 0x20115
-MODULE_AUTHOR("Jim Huang <cmhuang@sis.com.tw>");
+MODULE_AUTHOR("Jim Huang <cmhuang@sis.com.tw>, Ollie Lho <ollie@sis.com.tw>");
MODULE_DESCRIPTION("SiS 900 PCI Fast Ethernet driver");
MODULE_PARM(multicast_filter_limit, "i");
MODULE_PARM(max_interrupt_work, "i");
@@ -161,6 +164,7 @@
static u16 sis900_compute_hashtable_index(u8 *addr);
static void set_rx_mode(struct device *net_dev);
static void sis900_reset(struct device *net_dev);
+static void sis630e_set_eq(struct device *net_dev);
/* A list of all installed SiS900 devices, for removing the driver module. */
static struct device *root_sis900_dev = NULL;
@@ -170,10 +174,10 @@
{
int found = 0;
struct pci_dev * pci_dev = NULL;
-
+
if (!pci_present())
return -ENODEV;
-
+
while ((pci_dev = pci_find_class (PCI_CLASS_NETWORK_ETHERNET << 8, pci_dev)) != NULL) {
/* pci_dev contains all ethernet devices */
u32 pci_io_base;
@@ -185,23 +189,23 @@
pci_dev->device == mac->device_id)
break;
}
-
+
if (mac->vendor_id == 0)
/* pci_dev does not match any of our cards */
continue;
-
+
/* now, pci_dev should be either 900 or 7016 */
pci_io_base = pci_dev->base_address[0] & PCI_BASE_ADDRESS_IO_MASK;
- if ((mac->flags & PCI_COMMAND_IO ) &&
+ if ((mac->flags & PCI_COMMAND_IO ) &&
check_region(pci_io_base, mac->io_size))
continue;
-
+
/* setup various bits in PCI command register */
pci_set_master(pci_dev);
/* do the real low level jobs */
net_dev = mac->probe(mac, pci_dev, net_dev);
-
+
if (net_dev != NULL) {
found++;
}
@@ -210,15 +214,83 @@
return found ? 0 : -ENODEV;
}
-static struct device * sis900_mac_probe (struct mac_chip_info * mac, struct pci_dev * pci_dev,
+/* older SiS900 and friends, use EEPROM to store MAC address */
+static int sis900_get_mac_addr(struct pci_dev * pci_dev, struct device *net_dev)
+{
+ long ioaddr = pci_dev->base_address[0] & ~3;
+ u16 signature;
+ int i;
+
+ /* check to see if we have sane EEPROM */
+ signature = (u16) read_eeprom(ioaddr, EEPROMSignature);
+ if (signature == 0xffff || signature == 0x0000) {
+ printk (KERN_INFO "%s: Error EERPOM read %x\n",
+ net_dev->name, signature);
+ return 0;
+ }
+
+ /* get MAC address from EEPROM */
+ for (i = 0; i < 3; i++)
+ ((u16 *)(net_dev->dev_addr))[i] = read_eeprom(ioaddr, i+EEPROMMACAddr);
+
+ return 1;
+}
+
+/* SiS630E model, use APC CMOS RAM to store MAC address */
+static int sis630e_get_mac_addr(struct pci_dev * pci_dev, struct device *net_dev)
+{
+ struct pci_dev *isa_bridge = NULL;
+ u8 reg;
+ int i;
+
+ if ((isa_bridge = pci_find_device(0x1039, 0x0008, isa_bridge)) == NULL) {
+ printk("%s: Can not find ISA bridge\n", net_dev->name);
+ return 0;
+ }
+ pci_read_config_byte(isa_bridge, 0x48, ®);
+ pci_write_config_byte(isa_bridge, 0x48, reg | 0x40);
+
+ for (i = 0; i < 6; i++) {
+ outb(0x09 + i, 0x70);
+ ((u8 *)(net_dev->dev_addr))[i] = inb(0x71);
+ }
+ pci_write_config_byte(isa_bridge, 0x48, reg & ~0x40);
+
+ return 1;
+}
+
+/* SiS630E A1, The Mac address is hardcoded in the RFCR register so it is actually not necessary to
+ probe the MAC address */
+static int sis630ea1_get_mac_addr(struct pci_dev * pci_dev, struct device *net_dev)
+{
+ long ioaddr = pci_dev->base_address[0] & ~3;
+ u32 reg;
+ int i;
+
+ /* reload MAC address */
+ reg = inl(ioaddr + cr);
+ outl(reg | RELOAD, ioaddr + cr);
+
+ reg = inl(ioaddr + cr);
+ outl(reg & ~RELOAD, ioaddr + cr);
+
+ for (i = 0; i < 3; i++) {
+ outl((u32)(0x00000004+i) << RFADDR_shift, ioaddr + rfcr);
+ ((u16 *)(net_dev->dev_addr))[i] = inl(ioaddr + rfdr);
+ }
+
+ return 1;
+}
+
+static struct device * sis900_mac_probe (struct mac_chip_info * mac, struct pci_dev * pci_dev,
struct device * net_dev)
{
struct sis900_private *sis_priv;
long ioaddr = pci_dev->base_address[0] & ~3;
int irq = pci_dev->irq;
static int did_version = 0;
- u16 signature;
- int i;
+ u8 revision;
+ int i, ret = 0;
if (did_version++ == 0)
printk(KERN_INFO "%s", version);
@@ -226,21 +298,24 @@
if ((net_dev = init_etherdev(net_dev, 0)) == NULL)
return NULL;
- /* check to see if we have sane EEPROM */
- signature = (u16) read_eeprom(ioaddr, EEPROMSignature);
- if (signature == 0xffff || signature == 0x0000) {
- printk (KERN_INFO "%s: Error EEPROM read: %x\n",
- net_dev->name, signature);
+ pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &revision);
+ if (revision == SIS630E_REV)
+ ret = sis630e_get_mac_addr(pci_dev, net_dev);
+ else if (revision == SIS630EA1_REV) {
+ ret = sis630e_get_mac_addr(pci_dev, net_dev);
+ printk(KERN_INFO "using 630ea1\n");
+ }
+ else
+ ret = sis900_get_mac_addr(pci_dev, net_dev);
+
+ if (ret == 0) {
unregister_netdevice(net_dev);
return NULL;
}
+ /* print some information about our NIC */
printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ", net_dev->name, mac->name,
ioaddr, irq);
-
- /* get MAC address from EEPROM */
- for (i = 0; i < 3; i++)
- ((u16 *)(net_dev->dev_addr))[i] = read_eeprom(ioaddr, i+EEPROMMACAddr);
for (i = 0; i < 5; i++)
printk("%2.2x:", (u8)net_dev->dev_addr[i]);
printk("%2.2x.\n", net_dev->dev_addr[i]);
@@ -286,247 +361,268 @@
{
struct sis900_private * sis_priv = (struct sis900_private *)net_dev->priv;
int phy_addr;
-
+ u8 revision;
+
sis_priv->mii = NULL;
-
+
/* search for total of 32 possible mii phy addresses */
for (phy_addr = 0; phy_addr < 32; phy_addr++) {
u16 mii_status;
u16 phy_id0, phy_id1;
int i;
-
+
mii_status = mdio_read(net_dev, phy_addr, MII_STATUS);
if (mii_status == 0xffff || mii_status == 0x0000)
/* the mii is not accessable, try next one */
continue;
-
+
phy_id0 = mdio_read(net_dev, phy_addr, MII_PHY_ID0);
phy_id1 = mdio_read(net_dev, phy_addr, MII_PHY_ID1);
-
+
/* search our mii table for the current mii */
for (i = 0; mii_chip_table[i].phy_id1; i++)
if (phy_id0 == mii_chip_table[i].phy_id0) {
struct mii_phy * mii_phy;
-
- printk(KERN_INFO
+
+ printk(KERN_INFO
"%s: %s transceiver found at address %d.\n",
- net_dev->name, mii_chip_table[i].name,
+ net_dev->name, mii_chip_table[i].name,
phy_addr);;
if ((mii_phy = kmalloc(sizeof(struct mii_phy), GFP_KERNEL)) != NULL) {
mii_phy->chip_info = mii_chip_table+i;
mii_phy->phy_addr = phy_addr;
- mii_phy->status = mdio_read(net_dev, phy_addr,
+ mii_phy->status = mdio_read(net_dev, phy_addr,
MII_STATUS);
mii_phy->next = sis_priv->mii;
sis_priv->mii = mii_phy;
}
- /* the current mii is on our mii_info_table,
+ /* the current mii is on our mii_info_table,
try next address */
break;
}
}
-
+
if (sis_priv->mii == NULL) {
- printk(KERN_INFO "%s: No MII transceivers found!\n",
+ printk(KERN_INFO "%s: No MII transceivers found!\n",
net_dev->name);
return 0;
}
- /* arbitrary choose that last PHY and current PHY */
+ /* arbitrary choose that last PHY as current PHY */
sis_priv->cur_phy = sis_priv->mii->phy_addr;
printk(KERN_INFO "%s: Using %s as default\n", net_dev->name,
sis_priv->mii->chip_info->name);
- if (sis_priv->mii->status & MII_STAT_LINK)
+ pci_read_config_byte(sis_priv->pci_dev, PCI_CLASS_REVISION, &revision);
+ if (revision == SIS630E_REV) {
+ /* SiS 630E has some bugs on default value of PHY registers */
+ mdio_write(net_dev, sis_priv->cur_phy, MII_ANADV, 0x05e1);
+ mdio_write(net_dev, sis_priv->cur_phy, MII_CONFIG1, 0x22);
+ mdio_write(net_dev, sis_priv->cur_phy, MII_CONFIG2, 0xff00);
+ mdio_write(net_dev, sis_priv->cur_phy, MII_MASK, 0xffc0);
+ mdio_write(net_dev, sis_priv->cur_phy, MII_CONTROL, 0x1000);
+ }
+
+ if (sis_priv->mii->status & MII_STAT_LINK)
sis_priv->LinkOn = TRUE;
else
sis_priv->LinkOn = FALSE;
-
+
return 1;
}
/* Delay between EEPROM clock transitions. */
-#define eeprom_delay() inl(ee_addr)
+#define eeprom_delay() inl(ee_addr)
-/* Read Serial EEPROM through EEPROM Access Register, Note that location is
+/* Read Serial EEPROM through EEPROM Access Register, Note that location is
in word (16 bits) unit */
static u16 read_eeprom(long ioaddr, int location)
{
int i;
- u16 retval = 0;
- long ee_addr = ioaddr + mear;
- u32 read_cmd = location | EEread;
-
- outl(0, ee_addr);
- eeprom_delay();
- outl(EECLK, ee_addr);
- eeprom_delay();
-
- /* Shift the read command (9) bits out. */
- for (i = 8; i >= 0; i--) {
- u32 dataval = (read_cmd & (1 << i)) ? EEDI | EECS : EECS;
- outl(dataval, ee_addr);
- eeprom_delay();
- outl(dataval | EECLK, ee_addr);
- eeprom_delay();
- }
- outb(EECS, ee_addr);
- eeprom_delay();
+ u16 retval = 0;
+ long ee_addr = ioaddr + mear;
+ u32 read_cmd = location | EEread;
+
+ outl(0, ee_addr);
+ eeprom_delay();
+ outl(EECLK, ee_addr);
+ eeprom_delay();
+
+ /* Shift the read command (9) bits out. */
+ for (i = 8; i >= 0; i--) {
+ u32 dataval = (read_cmd & (1 << i)) ? EEDI | EECS : EECS;
+ outl(dataval, ee_addr);
+ eeprom_delay();
+ outl(dataval | EECLK, ee_addr);
+ eeprom_delay();
+ }
+ outb(EECS, ee_addr);
+ eeprom_delay();
/* read the 16-bits data in */
- for (i = 16; i > 0; i--) {
- outl(EECS, ee_addr);
- eeprom_delay();
- outl(EECS | EECLK, ee_addr);
- eeprom_delay();
- retval = (retval << 1) | ((inl(ee_addr) & EEDO) ? 1 : 0);
- eeprom_delay();
- }
-
- /* Terminate the EEPROM access. */
- outl(0, ee_addr);
- eeprom_delay();
- outl(EECLK, ee_addr);
+ for (i = 16; i > 0; i--) {
+ outl(EECS, ee_addr);
+ eeprom_delay();
+ outl(EECS | EECLK, ee_addr);
+ eeprom_delay();
+ retval = (retval << 1) | ((inl(ee_addr) & EEDO) ? 1 : 0);
+ eeprom_delay();
+ }
+
+ /* Terminate the EEPROM access. */
+ outl(0, ee_addr);
+ eeprom_delay();
+ outl(EECLK, ee_addr);
- return (retval);
+ return (retval);
}
/* Read and write the MII management registers using software-generated
serial MDIO protocol. Note that the command bits and data bits are
send out seperately */
-#define mdio_delay() inl(mdio_addr)
+#define mdio_delay() inl(mdio_addr)
static void mdio_idle(long mdio_addr)
{
- outl(MDIO | MDDIR, mdio_addr);
- mdio_delay();
- outl(MDIO | MDDIR | MDC, mdio_addr);
+ outl(MDIO | MDDIR, mdio_addr);
+ mdio_delay();
+ outl(MDIO | MDDIR | MDC, mdio_addr);
}
/* Syncronize the MII management interface by shifting 32 one bits out. */
static void mdio_reset(long mdio_addr)
{
- int i;
+ int i;
- for (i = 31; i >= 0; i--) {
- outl(MDDIR | MDIO, mdio_addr);
- mdio_delay();
- outl(MDDIR | MDIO | MDC, mdio_addr);
- mdio_delay();
- }
- return;
+ for (i = 31; i >= 0; i--) {
+ outl(MDDIR | MDIO, mdio_addr);
+ mdio_delay();
+ outl(MDDIR | MDIO | MDC, mdio_addr);
+ mdio_delay();
+ }
+ return;
}
static u16 mdio_read(struct device *net_dev, int phy_id, int location)
{
- long mdio_addr = net_dev->base_addr + mear;
- int mii_cmd = MIIread|(phy_id<<MIIpmdShift)|(location<<MIIregShift);
- u16 retval = 0;
- int i;
-
- mdio_reset(mdio_addr);
- mdio_idle(mdio_addr);
-
- for (i = 15; i >= 0; i--) {
- int dataval = (mii_cmd & (1 << i)) ? MDDIR | MDIO : MDDIR;
- outl(dataval, mdio_addr);
+ long mdio_addr = net_dev->base_addr + mear;
+ int mii_cmd = MIIread|(phy_id<<MIIpmdShift)|(location<<MIIregShift);
+ u16 retval = 0;
+ int i;
+
+ mdio_reset(mdio_addr);
+ mdio_idle(mdio_addr);
+
+ for (i = 15; i >= 0; i--) {
+ int dataval = (mii_cmd & (1 << i)) ? MDDIR | MDIO : MDDIR;
+ outl(dataval, mdio_addr);
mdio_delay();
- outl(dataval | MDC, mdio_addr);
+ outl(dataval | MDC, mdio_addr);
mdio_delay();
- }
+ }
- /* Read the 16 data bits. */
- for (i = 16; i > 0; i--) {
- outl(0, mdio_addr);
- mdio_delay();
- retval = (retval << 1) | ((inl(mdio_addr) & MDIO) ? 1 : 0);
- outl(MDC, mdio_addr);
- mdio_delay();
- }
- return retval;
+ /* Read the 16 data bits. */
+ for (i = 16; i > 0; i--) {
+ outl(0, mdio_addr);
+ mdio_delay();
+ retval = (retval << 1) | ((inl(mdio_addr) & MDIO) ? 1 : 0);
+ outl(MDC, mdio_addr);
+ mdio_delay();
+ }
+ outl(0x00, mdio_addr);
+
+ return retval;
}
static void mdio_write(struct device *net_dev, int phy_id, int location, int value)
{
- long mdio_addr = net_dev->base_addr + mear;
- int mii_cmd = MIIwrite|(phy_id<<MIIpmdShift)|(location<<MIIregShift);
- int i;
-
- mdio_reset(mdio_addr);
- mdio_idle(mdio_addr);
-
- /* Shift the command bits out. */
- for (i = 15; i >= 0; i--) {
- int dataval = (mii_cmd & (1 << i)) ? MDDIR | MDIO : MDDIR;
- outb(dataval, mdio_addr);
- mdio_delay();
- outb(dataval | MDC, mdio_addr);
- mdio_delay();
- }
- mdio_delay();
+ long mdio_addr = net_dev->base_addr + mear;
+ int mii_cmd = MIIwrite|(phy_id<<MIIpmdShift)|(location<<MIIregShift);
+ int i;
+
+ mdio_reset(mdio_addr);
+ mdio_idle(mdio_addr);
+
+ /* Shift the command bits out. */
+ for (i = 15; i >= 0; i--) {
+ int dataval = (mii_cmd & (1 << i)) ? MDDIR | MDIO : MDDIR;
+ outb(dataval, mdio_addr);
+ mdio_delay();
+ outb(dataval | MDC, mdio_addr);
+ mdio_delay();
+ }
+ mdio_delay();
/* Shift the value bits out. */
for (i = 15; i >= 0; i--) {
int dataval = (value & (1 << i)) ? MDDIR | MDIO : MDDIR;
- outl(dataval, mdio_addr);
- mdio_delay();
- outl(dataval | MDC, mdio_addr);
- mdio_delay();
+ outl(dataval, mdio_addr);
+ mdio_delay();
+ outl(dataval | MDC, mdio_addr);
+ mdio_delay();
}
mdio_delay();
-
- /* Clear out extra bits. */
- for (i = 2; i > 0; i--) {
- outb(0, mdio_addr);
- mdio_delay();
- outb(MDC, mdio_addr);
- mdio_delay();
- }
- return;
+
+ /* Clear out extra bits. */
+ for (i = 2; i > 0; i--) {
+ outb(0, mdio_addr);
+ mdio_delay();
+ outb(MDC, mdio_addr);
+ mdio_delay();
+ }
+ outl(0x00, mdio_addr);
+
+ return;
}
static int
sis900_open(struct device *net_dev)
{
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- long ioaddr = net_dev->base_addr;
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ long ioaddr = net_dev->base_addr;
+ u8 revision;
- /* Soft reset the chip. */
+ /* Soft reset the chip. */
sis900_reset(net_dev);
+
+ /* Equalizer workaroung Rule */
+ pci_read_config_byte(sis_priv->pci_dev, PCI_CLASS_REVISION, &revision);
+ if (revision == SIS630E_REV || revision == SIS630EA1_REV)
+ sis630e_set_eq(net_dev);
+
+ if (request_irq(net_dev->irq, &sis900_interrupt, SA_SHIRQ, net_dev->name, net_dev)) {
+ return -EAGAIN;
+ }
- if (request_irq(net_dev->irq, &sis900_interrupt, SA_SHIRQ, net_dev->name, net_dev)) {
- return -EAGAIN;
- }
-
- MOD_INC_USE_COUNT;
+ MOD_INC_USE_COUNT;
sis900_init_rxfilter(net_dev);
sis900_init_tx_ring(net_dev);
sis900_init_rx_ring(net_dev);
- set_rx_mode(net_dev);
+ set_rx_mode(net_dev);
- net_dev->tbusy = 0;
- net_dev->interrupt = 0;
- net_dev->start = 1;
+ net_dev->tbusy = 0;
+ net_dev->interrupt = 0;
+ net_dev->start = 1;
- /* Enable all known interrupts by setting the interrupt mask. */
+ /* Enable all known interrupts by setting the interrupt mask. */
outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
- outl(RxENA, ioaddr + cr);
- outl(IE, ioaddr + ier);
+ outl(RxENA, ioaddr + cr);
+ outl(IE, ioaddr + ier);
sis900_check_mode(net_dev, sis_priv->mii);
- /* Set the timer to switch to check for link beat and perhaps switch
- to an alternate media type. */
- init_timer(&sis_priv->timer);
- sis_priv->timer.expires = jiffies + HZ;
- sis_priv->timer.data = (unsigned long)net_dev;
- sis_priv->timer.function = &sis900_timer;
- add_timer(&sis_priv->timer);
+ /* Set the timer to switch to check for link beat and perhaps switch
+ to an alternate media type. */
+ init_timer(&sis_priv->timer);
+ sis_priv->timer.expires = jiffies + HZ;
+ sis_priv->timer.data = (unsigned long)net_dev;
+ sis_priv->timer.function = &sis900_timer;
+ add_timer(&sis_priv->timer);
- return 0;
+ return 0;
}
/* set receive filter address to our MAC address */
@@ -536,7 +632,7 @@
long ioaddr = net_dev->base_addr;
u32 rfcrSave;
u32 i;
-
+
rfcrSave = inl(rfcr + ioaddr);
/* disable packet filtering before setting filter */
@@ -564,38 +660,38 @@
static void
sis900_init_tx_ring(struct device *net_dev)
{
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- long ioaddr = net_dev->base_addr;
- int i;
-
- sis_priv->tx_full = 0;
- sis_priv->dirty_tx = sis_priv->cur_tx = 0;
-
- for (i = 0; i < NUM_TX_DESC; i++) {
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ long ioaddr = net_dev->base_addr;
+ int i;
+
+ sis_priv->tx_full = 0;
+ sis_priv->dirty_tx = sis_priv->cur_tx = 0;
+
+ for (i = 0; i < NUM_TX_DESC; i++) {
sis_priv->tx_skbuff[i] = NULL;
sis_priv->tx_ring[i].link = (u32) virt_to_bus(&sis_priv->tx_ring[i+1]);
- sis_priv->tx_ring[i].cmdsts = 0;
+ sis_priv->tx_ring[i].cmdsts = 0;
sis_priv->tx_ring[i].bufptr = 0;
- }
+ }
sis_priv->tx_ring[i-1].link = (u32) virt_to_bus(&sis_priv->tx_ring[0]);
/* load Transmit Descriptor Register */
- outl(virt_to_bus(&sis_priv->tx_ring[0]), ioaddr + txdp);
+ outl(virt_to_bus(&sis_priv->tx_ring[0]), ioaddr + txdp);
if (sis900_debug > 2)
- printk(KERN_INFO "%s: TX descriptor register loaded with: %8.8x\n",
+ printk(KERN_INFO "%s: TX descriptor register loaded with: %8.8x\n",
net_dev->name, inl(ioaddr + txdp));
}
-/* Initialize the Rx descriptor ring, pre-allocate recevie buffers */
+/* Initialize the Rx descriptor ring, pre-allocate recevie buffers */
static void
-sis900_init_rx_ring(struct device *net_dev)
-{
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- long ioaddr = net_dev->base_addr;
- int i;
-
- sis_priv->cur_rx = 0;
+sis900_init_rx_ring(struct device *net_dev)
+{
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ long ioaddr = net_dev->base_addr;
+ int i;
+
+ sis_priv->cur_rx = 0;
sis_priv->dirty_rx = 0;
/* init RX descriptor */
@@ -608,14 +704,14 @@
}
sis_priv->rx_ring[i-1].link = (u32) virt_to_bus(&sis_priv->rx_ring[0]);
- /* allocate sock buffers */
+ /* allocate sock buffers */
for (i = 0; i < NUM_RX_DESC; i++) {
struct sk_buff *skb;
if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) {
/* not enough memory for skbuff, this makes a "hole"
- on the buffer ring, it is not clear how the
- hardware will react to this kind of degenerated
+ on the buffer ring, it is not clear how the
+ hardware will react to this kind of degenerated
buffer */
break;
}
@@ -627,31 +723,97 @@
sis_priv->dirty_rx = (unsigned int) (i - NUM_RX_DESC);
/* load Receive Descriptor Register */
- outl(virt_to_bus(&sis_priv->rx_ring[0]), ioaddr + rxdp);
+ outl(virt_to_bus(&sis_priv->rx_ring[0]), ioaddr + rxdp);
if (sis900_debug > 2)
- printk(KERN_INFO "%s: RX descriptor register loaded with: %8.8x\n",
+ printk(KERN_INFO "%s: RX descriptor register loaded with: %8.8x\n",
net_dev->name, inl(ioaddr + rxdp));
}
+
+/* 630E equalizer workaroung rule(Cyrus Huang 08/15)
+ PHY register 14h(Test)
+ Bit 14: 0 -- Automatically dectect (default)
+ 1 -- Manually set Equalizer filter
+ Bit 13: 0 -- (Default)
+ 1 -- Speed up convergence of equalizer setting
+ Bit 9 : 0 -- (Default)
+ 1 -- Disable Baseline Wander
+ Bit 3~7 -- Equalizer filter setting
+
+ Link ON: Set Bit 9, 13 to 1, Bit 14 to 0
+ Then calculate equalizer value
+ Then set equalizer value, and set Bit 14 to 1, Bit 9 to 0
+ Link Off:Set Bit 13 to 1, Bit 14 to 0
+
+ Calculate Equalizer value:
+ When Link is ON and Bit 14 is 0, SIS900PHY will auto-dectect proper equalizer value.
+ When the equalizer is stable, this value is not a fixed value. It will be within
+ a small range(eg. 7~9). Then we get a minimum and a maximum value(eg. min=7, max=9)
+ 0 <= max <= 4 --> set equalizer to max
+ 5 <= max <= 14 --> set equalizer to max+1 or
+ set equalizer to max+2 if max == min
+ max >= 15 --> set equalizer to max+5 or
+ set equalizer to max+6 if max == min
+*/
+static void sis630e_set_eq(struct device *net_dev)
+{
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ u16 reg14h, eq_value, max_value=0, min_value=0;
+ int i, maxcount=10;
+
+ if (sis_priv->LinkOn == TRUE) {
+ reg14h=mdio_read(net_dev, sis_priv->cur_phy, MII_RESV);
+ mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, (0x2200 | reg14h) & 0xBFFF);
+ for (i=0; i < maxcount; i++) {
+ eq_value=(0x00F8 & mdio_read(net_dev, sis_priv->cur_phy, MII_RESV)) >> 3;
+ max_value=(eq_value > max_value) ? eq_value : max_value;
+ min_value=(eq_value < min_value) ? eq_value : min_value;
+ }
+ if (max_value < 5)
+ eq_value=max_value;
+ else if (max_value >= 5 && max_value < 15)
+ eq_value=(max_value == min_value) ? max_value+2 : max_value+1;
+ else if (max_value >= 15)
+ eq_value=(max_value == min_value) ? max_value+6 : max_value+5;
+ reg14h=mdio_read(net_dev, sis_priv->cur_phy, MII_RESV);
+ reg14h=(reg14h & 0xFF07) | ((eq_value << 3) & 0x00F8);
+ reg14h=(reg14h | 0x6000) & 0xFDFF;
+ mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, reg14h);
+ }
+ else {
+ reg14h=mdio_read(net_dev, sis_priv->cur_phy, MII_RESV);
+ mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, (reg14h | 0x2000) & 0xBFFF);
+ }
+ return;
+}
+
/* on each timer ticks we check two things, Link Status (ON/OFF) and
Link Mode (10/100/Full/Half)
*/
static void sis900_timer(unsigned long data)
{
- struct device *net_dev = (struct device *)data;
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ struct device *net_dev = (struct device *)data;
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
struct mii_phy *mii_phy = sis_priv->mii;
- static int next_tick = 5*HZ;
- u16 status;
+ static int next_tick = 5*HZ;
+ u16 status;
+ u8 revision;
status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS);
+ status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS);
/* current mii phy is failed to link, try another one */
- while (!(status & MII_STAT_LINK)) {
- if (mii_phy->next == NULL) {
+ while (!(status & MII_STAT_LINK)) {
+ if (mii_phy->next == NULL) {
if (sis_priv->LinkOn) {
/* link stat change from ON to OFF */
next_tick = HZ;
sis_priv->LinkOn = FALSE;
+
+ /* Equalizer workaroung Rule */
+ pci_read_config_byte(sis_priv->pci_dev, PCI_CLASS_REVISION, &revision);
+ if (revision == SIS630E_REV || revision == SIS630EA1_REV)
+ sis630e_set_eq(net_dev);
+
printk(KERN_INFO "%s: Media Link Off\n",
net_dev->name);
}
@@ -667,19 +829,28 @@
/* link stat change forn OFF to ON, read and report link mode */
sis_priv->LinkOn = TRUE;
next_tick = 5*HZ;
+
+ /* Equalizer workaroung Rule */
+ pci_read_config_byte(sis_priv->pci_dev, PCI_CLASS_REVISION, &revision);
+ if (revision == SIS630E_REV || revision == SIS630EA1_REV)
+ sis630e_set_eq(net_dev);
+
/* change what cur_phy means */
if (mii_phy->phy_addr != sis_priv->cur_phy) {
- printk(KERN_INFO "%s: Changing transceiver to %s\n", net_dev->name,
- mii_phy->chip_info->name);
+ printk(KERN_INFO "%s: Changing transceiver to %s\n",
+ net_dev->name, mii_phy->chip_info->name);
+ /* disable previous PHY */
status = mdio_read(net_dev, sis_priv->cur_phy, MII_CONTROL);
- mdio_write(net_dev, sis_priv->cur_phy,
+ mdio_write(net_dev, sis_priv->cur_phy,
MII_CONTROL, status | MII_CNTL_ISOLATE);
+ /* enable next PHY */
status = mdio_read(net_dev, mii_phy->phy_addr, MII_CONTROL);
- mdio_write(net_dev, mii_phy->phy_addr,
+ mdio_write(net_dev, mii_phy->phy_addr,
MII_CONTROL, status & ~MII_CNTL_ISOLATE);
sis_priv->cur_phy = mii_phy->phy_addr;
}
sis900_check_mode(net_dev, mii_phy);
+
}
sis_priv->timer.expires = jiffies + next_tick;
@@ -688,7 +859,7 @@
static void sis900_check_mode (struct device *net_dev, struct mii_phy *mii_phy)
{
struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- long ioaddr = net_dev->base_addr;
+ long ioaddr = net_dev->base_addr;
int speed, duplex;
u32 tx_flags = 0, rx_flags = 0;
@@ -718,7 +889,7 @@
{
int i = 0;
u32 status;
-
+
/* STSOUT register is Latched on Transition, read operation updates it */
while (i++ < 2)
status = mdio_read(net_dev, phy_addr, MII_STSOUT);
@@ -736,9 +907,9 @@
if (status & MII_STSOUT_LINK_FAIL)
printk(KERN_INFO "%s: Media Link Off\n", net_dev->name);
else
- printk(KERN_INFO "%s: Media Link On %s %s-duplex \n",
+ printk(KERN_INFO "%s: Media Link On %s %s-duplex \n",
net_dev->name,
- *speed == HW_SPEED_100_MBPS ?
+ *speed == HW_SPEED_100_MBPS ?
"100mbps" : "10mbps",
*duplex == FDX_CAPABLE_FULL_SELECTED ?
"full" : "half");
@@ -747,7 +918,7 @@
{
int i;
u16 status;
-
+
for (i = 0; i < 2; i++)
status = mdio_read(net_dev, phy_addr, MII_STATUS);
@@ -765,9 +936,9 @@
*duplex = FDX_CAPABLE_HALF_SELECTED;
if (status & MII_STSSUM_LINK)
- printk(KERN_INFO "%s: Media Link On %s %s-duplex \n",
+ printk(KERN_INFO "%s: Media Link On %s %s-duplex \n",
net_dev->name,
- *speed == HW_SPEED_100_MBPS ?
+ *speed == HW_SPEED_100_MBPS ?
"100mbps" : "10mbps",
*duplex == FDX_CAPABLE_FULL_SELECTED ?
"full" : "half");
@@ -779,7 +950,7 @@
*speed = HW_SPEED_HOME;
*duplex = FDX_CAPABLE_HALF_SELECTED;
if (status & MII_STAT_LINK)
- printk(KERN_INFO "%s: Media Link On 1mbps half-duplex \n",
+ printk(KERN_INFO "%s: Media Link On 1mbps half-duplex \n",
net_dev->name);
else
printk(KERN_INFO "%s: Media Link Off\n", net_dev->name);
@@ -787,188 +958,189 @@
}
static void sis900_tx_timeout(struct device *net_dev)
{
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- long ioaddr = net_dev->base_addr;
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ long ioaddr = net_dev->base_addr;
int i;
printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x \n",
net_dev->name, inl(ioaddr + cr), inl(ioaddr + isr));
-
- /* Disable interrupts by clearing the interrupt mask. */
- outl(0x0000, ioaddr + imr);
+
+ /* Disable interrupts by clearing the interrupt mask. */
+ outl(0x0000, ioaddr + imr);
/* discard unsent packets, should this code section be protected by
cli(), sti() ?? */
sis_priv->dirty_tx = sis_priv->cur_tx = 0;
for (i = 0; i < NUM_TX_DESC; i++) {
if (sis_priv->tx_skbuff[i] != NULL) {
- dev_kfree_skb(sis_priv->tx_skbuff[i]);
- sis_priv->tx_skbuff[i] = 0;
+ dev_kfree_skb(sis_priv->tx_skbuff[i]);
+ sis_priv->tx_skbuff[i] = 0;
sis_priv->tx_ring[i].cmdsts = 0;
sis_priv->tx_ring[i].bufptr = 0;
sis_priv->stats.tx_dropped++;
}
}
- net_dev->trans_start = jiffies;
+ net_dev->trans_start = jiffies;
net_dev->tbusy = sis_priv->tx_full = 0;
/* FIXME: Should we restart the transmission thread here ?? */
+ outl(TxENA, ioaddr + cr);
- /* Enable all known interrupts by setting the interrupt mask. */
+ /* Enable all known interrupts by setting the interrupt mask. */
outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
- return;
+ return;
}
static int
sis900_start_xmit(struct sk_buff *skb, struct device *net_dev)
{
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- long ioaddr = net_dev->base_addr;
- unsigned int entry;
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ long ioaddr = net_dev->base_addr;
+ unsigned int entry;
/* test tbusy to see if we have timeout situation then set it */
- if (test_and_set_bit(0, (void*)&net_dev->tbusy) != 0) {
- if (jiffies - net_dev->trans_start > TX_TIMEOUT)
+ if (test_and_set_bit(0, (void*)&net_dev->tbusy) != 0) {
+ if (jiffies - net_dev->trans_start > TX_TIMEOUT)
sis900_tx_timeout(net_dev);
- return 1;
- }
+ return 1;
+ }
- /* Calculate the next Tx descriptor entry. */
- entry = sis_priv->cur_tx % NUM_TX_DESC;
- sis_priv->tx_skbuff[entry] = skb;
+ /* Calculate the next Tx descriptor entry. */
+ entry = sis_priv->cur_tx % NUM_TX_DESC;
+ sis_priv->tx_skbuff[entry] = skb;
/* set the transmit buffer descriptor and enable Transmit State Machine */
sis_priv->tx_ring[entry].bufptr = virt_to_bus(skb->data);
- sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len);
- outl(TxENA, ioaddr + cr);
+ sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len);
+ outl(TxENA, ioaddr + cr);
- if (++sis_priv->cur_tx - sis_priv->dirty_tx < NUM_TX_DESC) {
+ if (++sis_priv->cur_tx - sis_priv->dirty_tx < NUM_TX_DESC) {
/* Typical path, clear tbusy to indicate more
transmission is possible */
- clear_bit(0, (void*)&net_dev->tbusy);
- } else {
+ clear_bit(0, (void*)&net_dev->tbusy);
+ } else {
/* no more transmit descriptor avaiable, tbusy remain set */
- sis_priv->tx_full = 1;
- }
+ sis_priv->tx_full = 1;
+ }
- net_dev->trans_start = jiffies;
+ net_dev->trans_start = jiffies;
- if (sis900_debug > 3)
- printk(KERN_INFO "%s: Queued Tx packet at %p size %d "
+ if (sis900_debug > 3)
+ printk(KERN_INFO "%s: Queued Tx packet at %p size %d "
"to slot %d.\n",
net_dev->name, skb->data, (int)skb->len, entry);
- return 0;
+ return 0;
}
/* The interrupt handler does all of the Rx thread work and cleans up
after the Tx thread. */
static void sis900_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
{
- struct device *net_dev = (struct device *)dev_instance;
- int boguscnt = max_interrupt_work;
+ struct device *net_dev = (struct device *)dev_instance;
+ int boguscnt = max_interrupt_work;
long ioaddr = net_dev->base_addr;
u32 status;
#if defined(__i386__)
- /* A lock to prevent simultaneous entry bug on Intel SMP machines. */
- if (test_and_set_bit(0, (void*)&net_dev->interrupt)) {
- printk(KERN_INFO "%s: SMP simultaneous entry of "
+ /* A lock to prevent simultaneous entry bug on Intel SMP machines. */
+ if (test_and_set_bit(0, (void*)&net_dev->interrupt)) {
+ printk(KERN_INFO "%s: SMP simultaneous entry of "
"an interrupt handler.\n", net_dev->name);
- net_dev->interrupt = 0; /* Avoid halting machine. */
- return;
- }
+ net_dev->interrupt = 0; /* Avoid halting machine. */
+ return;
+ }
#else
- if (net_dev->interrupt) {
- printk(KERN_INFO "%s: Re-entering the interrupt handler.\n",
+ if (net_dev->interrupt) {
+ printk(KERN_INFO "%s: Re-entering the interrupt handler.\n",
net_dev->name);
- return;
- }
- net_dev->interrupt = 1;
+ return;
+ }
+ net_dev->interrupt = 1;
#endif
- do {
- status = inl(ioaddr + isr);
-
+ do {
+ status = inl(ioaddr + isr);
+
if ((status & (HIBERR|TxURN|TxERR|TxIDLE|RxORN|RxERR|RxOK)) == 0)
/* nothing intresting happened */
- break;
+ break;
/* why dow't we break after Tx/Rx case ?? keyword: full-duplex */
- if (status & (RxORN | RxERR | RxOK))
+ if (status & (RxORN | RxERR | RxOK))
/* Rx interrupt */
- sis900_rx(net_dev);
+ sis900_rx(net_dev);
if (status & (TxURN | TxERR | TxIDLE))
/* Tx interrupt */
sis900_finish_xmit(net_dev);
- /* something strange happened !!! */
- if (status & HIBERR) {
+ /* something strange happened !!! */
+ if (status & HIBERR) {
printk(KERN_INFO "%s: Abnormal interrupt,"
"status %#8.8x.\n", net_dev->name, status);
break;
}
- if (--boguscnt < 0) {
- printk(KERN_INFO "%s: Too much work at interrupt, "
+ if (--boguscnt < 0) {
+ printk(KERN_INFO "%s: Too much work at interrupt, "
"interrupt status = %#8.8x.\n",
net_dev->name, status);
- break;
- }
- } while (1);
-
- if (sis900_debug > 3)
- printk(KERN_INFO "%s: exiting interrupt, "
+ break;
+ }
+ } while (1);
+
+ if (sis900_debug > 3)
+ printk(KERN_INFO "%s: exiting interrupt, "
"interrupt status = 0x%#8.8x.\n",
net_dev->name, inl(ioaddr + isr));
#if defined(__i386__)
- clear_bit(0, (void*)&net_dev->interrupt);
+ clear_bit(0, (void*)&net_dev->interrupt);
#else
- net_dev->interrupt = 0;
+ net_dev->interrupt = 0;
#endif
- return;
+ return;
}
/* Process receive interrupt events, put buffer to higher layer and refill buffer pool
Note: This fucntion is called by interrupt handler, don't do "too much" work here */
static int sis900_rx(struct device *net_dev)
{
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- long ioaddr = net_dev->base_addr;
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ long ioaddr = net_dev->base_addr;
unsigned int entry = sis_priv->cur_rx % NUM_RX_DESC;
- u32 rx_status = sis_priv->rx_ring[entry].cmdsts;
-
- if (sis900_debug > 3)
- printk(KERN_INFO "sis900_rx, cur_rx:%4.4d, dirty_rx:%4.4d "
+ u32 rx_status = sis_priv->rx_ring[entry].cmdsts;
+
+ if (sis900_debug > 3)
+ printk(KERN_INFO "sis900_rx, cur_rx:%4.4d, dirty_rx:%4.4d "
"status:0x%8.8x\n",
- sis_priv->cur_rx, sis_priv->dirty_rx,rx_status);
-
- while (rx_status & OWN) {
- unsigned int rx_size;
-
+ sis_priv->cur_rx, sis_priv->dirty_rx, rx_status);
+
+ while (rx_status & OWN) {
+ unsigned int rx_size;
+
rx_size = (rx_status & DSIZE) - CRC_SIZE;
-
+
if (rx_status & (ABORT|OVERRUN|TOOLONG|RUNT|RXISERR|CRCERR|FAERR)) {
/* corrupted packet received */
- if (sis900_debug > 3)
- printk(KERN_INFO "%s: Corrupted packet "
+ if (sis900_debug > 3)
+ printk(KERN_INFO "%s: Corrupted packet "
"received, buffer status = 0x%8.8x.\n",
net_dev->name, rx_status);
- sis_priv->stats.rx_errors++;
+ sis_priv->stats.rx_errors++;
if (rx_status & OVERRUN)
sis_priv->stats.rx_over_errors++;
if (rx_status & (TOOLONG|RUNT))
- sis_priv->stats.rx_length_errors++;
- if (rx_status & (RXISERR | FAERR))
- sis_priv->stats.rx_frame_errors++;
+ sis_priv->stats.rx_length_errors++;
+ if (rx_status & (RXISERR | FAERR))
+ sis_priv->stats.rx_frame_errors++;
if (rx_status & CRCERR)
sis_priv->stats.rx_crc_errors++;
/* reset buffer descriptor state */
sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE;
- } else {
+ } else {
struct sk_buff * skb;
-
+
/* This situation should never happen, but due to
some unknow bugs, it is possible that
we are working on NULL sk_buff :-( */
@@ -976,41 +1148,62 @@
printk(KERN_INFO "%s: NULL pointer "
"encountered in Rx ring, skipping\n",
net_dev->name);
- break;
+ break;
}
+
+ /* gvie the socket buffer to upper layers */
skb = sis_priv->rx_skbuff[entry];
- sis_priv->rx_skbuff[entry] = NULL;
- /* reset buffer descriptor state */
- sis_priv->rx_ring[entry].cmdsts = 0;
- sis_priv->rx_ring[entry].bufptr = 0;
-
skb_put(skb, rx_size);
- skb->protocol = eth_type_trans(skb, net_dev);
- netif_rx(skb);
-
+ skb->protocol = eth_type_trans(skb, net_dev);
+ netif_rx(skb);
+
+ /* some network statistics */
if ((rx_status & BCAST) == MCAST)
sis_priv->stats.multicast++;
net_dev->last_rx = jiffies;
- sis_priv->stats.rx_bytes += rx_size;
- sis_priv->stats.rx_packets++;
- }
- sis_priv->cur_rx++;
+ sis_priv->stats.rx_bytes += rx_size;
+ sis_priv->stats.rx_packets++;
+
+ /* refill the Rx buffer, what if there is not enought memory for
+ new socket buffer ?? */
+ if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) {
+ /* not enough memory for skbuff, this makes a "hole"
+ on the buffer ring, it is not clear how the
+ hardware will react to this kind of degenerated
+ buffer */
+ printk(KERN_INFO "%s: Memory squeeze,"
+ "deferring packet.\n",
+ net_dev->name);
+ sis_priv->rx_skbuff[entry] = NULL;
+ /* reset buffer descriptor state */
+ sis_priv->rx_ring[entry].cmdsts = 0;
+ sis_priv->rx_ring[entry].bufptr = 0;
+ sis_priv->stats.rx_dropped++;
+ break;
+ }
+ skb->dev = net_dev;
+ sis_priv->rx_skbuff[entry] = skb;
+ sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE;
+ sis_priv->rx_ring[entry].bufptr = virt_to_bus(skb->tail);
+ sis_priv->dirty_rx++;
+ }
+ sis_priv->cur_rx++;
entry = sis_priv->cur_rx % NUM_RX_DESC;
- rx_status = sis_priv->rx_ring[entry].cmdsts;
- } // while
-
+ rx_status = sis_priv->rx_ring[entry].cmdsts;
+ } // while
+
/* refill the Rx buffer, what if the rate of refilling is slower than
consuming ?? */
for (;sis_priv->cur_rx - sis_priv->dirty_rx > 0; sis_priv->dirty_rx++) {
struct sk_buff *skb;
-
+
entry = sis_priv->dirty_rx % NUM_RX_DESC;
-
+
if (sis_priv->rx_skbuff[entry] == NULL) {
if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) {
/* not enough memory for skbuff, this makes a "hole"
- on the buffer ring, it is not clear how the
- hardware will react to this kind of degenerated
+ on the buffer ring, it is not clear how the
+ hardware will react to this kind of degenerated
buffer */
printk(KERN_INFO "%s: Memory squeeze,"
"deferring packet.\n",
@@ -1024,10 +1217,11 @@
sis_priv->rx_ring[entry].bufptr = virt_to_bus(skb->tail);
}
}
+
/* re-enable the potentially idle receive state matchine */
outl(RxENA , ioaddr + cr );
-
- return 0;
+
+ return 0;
}
/* finish up transmission of packets, check for error condition and free skbuff etc.
@@ -1035,21 +1229,21 @@
static void sis900_finish_xmit (struct device *net_dev)
{
struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
-
+
for (; sis_priv->dirty_tx < sis_priv->cur_tx; sis_priv->dirty_tx++) {
unsigned int entry;
u32 tx_status;
-
+
entry = sis_priv->dirty_tx % NUM_TX_DESC;
- tx_status = sis_priv->tx_ring[entry].cmdsts;
-
+ tx_status = sis_priv->tx_ring[entry].cmdsts;
+
if (tx_status & OWN) {
/* The packet is not transmited yet (owned by hardware) !
Note: the interrupt is generated only when Tx Machine
is idle, so this is an almost impossible case */
break;
}
-
+
if (tx_status & (ABORT | UNDERRUN | OWCOLL)) {
/* packet unsuccessfully transmited */
if (sis900_debug > 3)
@@ -1077,7 +1271,7 @@
sis_priv->tx_ring[entry].bufptr = 0;
sis_priv->tx_ring[entry].cmdsts = 0;
}
-
+
if (sis_priv->tx_full && net_dev->tbusy &&
sis_priv->cur_tx - sis_priv->dirty_tx < NUM_TX_DESC - 4) {
/* The ring is no longer full, clear tbusy, tx_full and
@@ -1091,23 +1285,23 @@
static int
sis900_close(struct device *net_dev)
{
- long ioaddr = net_dev->base_addr;
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- int i;
-
- net_dev->start = 0;
- net_dev->tbusy = 1;
+ long ioaddr = net_dev->base_addr;
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ int i;
+
+ net_dev->start = 0;
+ net_dev->tbusy = 1;
- /* Disable interrupts by clearing the interrupt mask. */
- outl(0x0000, ioaddr + imr);
+ /* Disable interrupts by clearing the interrupt mask. */
+ outl(0x0000, ioaddr + imr);
outl(0x0000, ioaddr + ier);
- /* Stop the chip's Tx and Rx Status Machine */
- outl(RxDIS | TxDIS, ioaddr + cr);
+ /* Stop the chip's Tx and Rx Status Machine */
+ outl(RxDIS | TxDIS, ioaddr + cr);
- del_timer(&sis_priv->timer);
+ del_timer(&sis_priv->timer);
- free_irq(net_dev->irq, net_dev);
+ free_irq(net_dev->irq, net_dev);
/* Free Tx and RX skbuff */
for (i = 0; i < NUM_RX_DESC; i++) {
@@ -1115,47 +1309,47 @@
dev_kfree_skb(sis_priv->rx_skbuff[i]);
sis_priv->rx_skbuff[i] = 0;
}
- for (i = 0; i < NUM_TX_DESC; i++) {
- if (sis_priv->tx_skbuff[i] != NULL)
- dev_kfree_skb(sis_priv->tx_skbuff[i]);
- sis_priv->tx_skbuff[i] = 0;
- }
+ for (i = 0; i < NUM_TX_DESC; i++) {
+ if (sis_priv->tx_skbuff[i] != NULL)
+ dev_kfree_skb(sis_priv->tx_skbuff[i]);
+ sis_priv->tx_skbuff[i] = 0;
+ }
- /* Green! Put the chip in low-power mode. */
+ /* Green! Put the chip in low-power mode. */
- MOD_DEC_USE_COUNT;
+ MOD_DEC_USE_COUNT;
- return 0;
+ return 0;
}
static int mii_ioctl(struct device *net_dev, struct ifreq *rq, int cmd)
{
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- u16 *data = (u16 *)&rq->ifr_data;
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ u16 *data = (u16 *)&rq->ifr_data;
- switch(cmd) {
- case SIOCDEVPRIVATE: /* Get the address of the PHY in use. */
- data[0] = sis_priv->mii->phy_addr;
- /* Fall Through */
- case SIOCDEVPRIVATE+1: /* Read the specified MII register. */
- data[3] = mdio_read(net_dev, data[0] & 0x1f, data[1] & 0x1f);
- return 0;
- case SIOCDEVPRIVATE+2: /* Write the specified MII register */
- if (!suser())
- return -EPERM;
- mdio_write(net_dev, data[0] & 0x1f, data[1] & 0x1f, data[2]);
- return 0;
- default:
- return -EOPNOTSUPP;
- }
+ switch(cmd) {
+ case SIOCDEVPRIVATE: /* Get the address of the PHY in use. */
+ data[0] = sis_priv->mii->phy_addr;
+ /* Fall Through */
+ case SIOCDEVPRIVATE+1: /* Read the specified MII register. */
+ data[3] = mdio_read(net_dev, data[0] & 0x1f, data[1] & 0x1f);
+ return 0;
+ case SIOCDEVPRIVATE+2: /* Write the specified MII register */
+ if (!suser())
+ return -EPERM;
+ mdio_write(net_dev, data[0] & 0x1f, data[1] & 0x1f, data[2]);
+ return 0;
+ default:
+ return -EOPNOTSUPP;
+ }
}
static struct enet_statistics *
sis900_get_stats(struct device *net_dev)
{
- struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
+ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv;
- return &sis_priv->stats;
+ return &sis_priv->stats;
}
/* SiS 900 uses the most sigificant 7 bits to index a 128 bits multicast hash table, which makes
@@ -1183,49 +1377,49 @@
byte >>= 1;
}
}
- /* leave 7 most siginifant bits */
+ /* leave 7 most siginifant bits */
return ((int)(crc >> 25));
}
static void set_rx_mode(struct device *net_dev)
{
- long ioaddr = net_dev->base_addr;
- u16 mc_filter[8]; /* 128 bits multicast hash table */
- int i;
- u32 rx_mode;
+ long ioaddr = net_dev->base_addr;
+ u16 mc_filter[8]; /* 128 bits multicast hash table */
+ int i;
+ u32 rx_mode;
- if (net_dev->flags & IFF_PROMISC) {
+ if (net_dev->flags & IFF_PROMISC) {
/* Accept any kinds of packets */
rx_mode = RFPromiscuous;
- for (i = 0; i < 8; i++)
- mc_filter[i] = 0xffff;
- } else if ((net_dev->mc_count > multicast_filter_limit) ||
+ for (i = 0; i < 8; i++)
+ mc_filter[i] = 0xffff;
+ } else if ((net_dev->mc_count > multicast_filter_limit) ||
(net_dev->flags & IFF_ALLMULTI)) {
/* too many multicast addresses or accept all multicast packets */
- rx_mode = RFAAB | RFAAM;
- for (i = 0; i < 8; i++)
- mc_filter[i] = 0xffff;
- } else {
+ rx_mode = RFAAB | RFAAM;
+ for (i = 0; i < 8; i++)
+ mc_filter[i] = 0xffff;
+ } else {
/* Accept Broadcast packets, destination addresses match our MAC address,
use Receive Filter to reject unwanted MCAST packets */
- struct dev_mc_list *mclist;
- rx_mode = RFAAB;
- for (i = 0; i < 8; i++)
- mc_filter[i]=0;
- for (i = 0, mclist = net_dev->mc_list; mclist && i < net_dev->mc_count;
+ struct dev_mc_list *mclist;
+ rx_mode = RFAAB;
+ for (i = 0; i < 8; i++)
+ mc_filter[i]=0;
+ for (i = 0, mclist = net_dev->mc_list; mclist && i < net_dev->mc_count;
i++, mclist = mclist->next)
- set_bit(sis900_compute_hashtable_index(mclist->dmi_addr),
+ set_bit(sis900_compute_hashtable_index(mclist->dmi_addr),
mc_filter);
- }
+ }
/* update Multicast Hash Table in Receive Filter */
- for (i = 0; i < 8; i++) {
+ for (i = 0; i < 8; i++) {
/* why plus 0x04 ??, That makes the correct value for hash table. */
- outl((u32)(0x00000004+i) << RFADDR_shift, ioaddr + rfcr);
- outl(mc_filter[i], ioaddr + rfdr);
- }
+ outl((u32)(0x00000004+i) << RFADDR_shift, ioaddr + rfcr);
+ outl(mc_filter[i], ioaddr + rfdr);
+ }
- outl(RFEN | rx_mode, ioaddr + rfcr);
+ outl(RFEN | rx_mode, ioaddr + rfcr);
/* sis900 is capatable of looping back packet at MAC level for debugging purpose */
if (net_dev->flags & IFF_LOOPBACK) {
@@ -1240,33 +1434,33 @@
outl(cr_saved, ioaddr + cr);
}
- return;
+ return;
}
static void sis900_reset(struct device *net_dev)
{
- long ioaddr = net_dev->base_addr;
+ long ioaddr = net_dev->base_addr;
int i = 0;
u32 status = TxRCMP | RxRCMP;
- outl(0, ioaddr + ier);
- outl(0, ioaddr + imr);
- outl(0, ioaddr + rfcr);
+ outl(0, ioaddr + ier);
+ outl(0, ioaddr + imr);
+ outl(0, ioaddr + rfcr);
- outl(RxRESET | TxRESET | RESET, ioaddr + cr);
+ outl(RxRESET | TxRESET | RESET, ioaddr + cr);
/* Check that the chip has finished the reset. */
while (status && (i++ < 1000)) {
status ^= (inl(isr + ioaddr) & status);
- }
+ }
- outl(PESEL, ioaddr + cfg);
+ outl(PESEL, ioaddr + cfg);
}
#ifdef MODULE
int init_module(void)
{
- return sis900_probe(NULL);
+ return sis900_probe(NULL);
}
void
@@ -1277,7 +1471,7 @@
struct sis900_private *sis_priv =
(struct sis900_private *)root_sis900_dev->priv;
struct device *next_dev = sis_priv->next_module;
-
+
unregister_netdev(root_sis900_dev);
release_region(root_sis900_dev->base_addr,
sis_priv->mac->io_size);
@@ -1285,7 +1479,7 @@
kfree(root_sis900_dev);
root_sis900_dev = next_dev;
- }
+ }
}
-#endif /* MODULE */
+#endif /* MODULE */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)