OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r6040: use definitions for magic values in descriptor status 

Define all the descriptor status the MAC can set.

Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Florian Fainelli 2008-07-13 14:34:15 +02:00 committed by Jeff Garzik
parent 9ca28dc4c7
commit 32f565df9b
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/net/r6040.c
View File

@ -138,6 +138,21 @@
#define MBCR_DEFAULT 0x012A /* MAC Bus Control Register */ #define MBCR_DEFAULT 0x012A /* MAC Bus Control Register */
#define MCAST_MAX 4 /* Max number multicast addresses to filter */ #define MCAST_MAX 4 /* Max number multicast addresses to filter */
/* Descriptor status */
#define DSC_OWNER_MAC 0x8000 /* MAC is the owner of this descriptor */
#define DSC_RX_OK 0x4000 /* RX was successful */
#define DSC_RX_ERR 0x0800 /* RX PHY error */
#define DSC_RX_ERR_DRI 0x0400 /* RX dribble packet */
#define DSC_RX_ERR_BUF 0x0200 /* RX length exceeds buffer size */
#define DSC_RX_ERR_LONG 0x0100 /* RX length > maximum packet length */
#define DSC_RX_ERR_RUNT 0x0080 /* RX packet length < 64 byte */
#define DSC_RX_ERR_CRC 0x0040 /* RX CRC error */
#define DSC_RX_BCAST 0x0020 /* RX broadcast (no error) */
#define DSC_RX_MCAST 0x0010 /* RX multicast (no error) */
#define DSC_RX_MCH_HIT 0x0008 /* RX multicast hit in hash table (no error) */
#define DSC_RX_MIDH_HIT 0x0004 /* RX MID table hit (no error) */
#define DSC_RX_IDX_MID_MASK 3 /* RX mask for the index of matched MIDx */
/* PHY settings */ /* PHY settings */
#define ICPLUS_PHY_ID 0x0243 #define ICPLUS_PHY_ID 0x0243
@ -324,7 +339,7 @@ static int r6040_alloc_rxbufs(struct net_device *dev)
desc->buf = cpu_to_le32(pci_map_single(lp->pdev, desc->buf = cpu_to_le32(pci_map_single(lp->pdev,
desc->skb_ptr->data, desc->skb_ptr->data,
MAX_BUF_SIZE, PCI_DMA_FROMDEVICE)); MAX_BUF_SIZE, PCI_DMA_FROMDEVICE));
desc->status = 0x8000; desc->status = DSC_OWNER_MAC;
desc = desc->vndescp; desc = desc->vndescp;
} while (desc != lp->rx_ring); } while (desc != lp->rx_ring);
@ -541,25 +556,25 @@ static int r6040_rx(struct net_device *dev, int limit)
u16 err; u16 err;
/* Limit not reached and the descriptor belongs to the CPU */ /* Limit not reached and the descriptor belongs to the CPU */
while (count < limit && !(descptr->status & 0x8000)) { while (count < limit && !(descptr->status & DSC_OWNER_MAC)) {
/* Read the descriptor status */ /* Read the descriptor status */
err = descptr->status; err = descptr->status;
/* Global error status set */ /* Global error status set */
if (err & 0x0800) { if (err & DSC_RX_ERR) {
/* RX dribble */ /* RX dribble */
if (err & 0x0400) if (err & DSC_RX_ERR_DRI)
dev->stats.rx_frame_errors++; dev->stats.rx_frame_errors++;
/* Buffer lenght exceeded */ /* Buffer lenght exceeded */
if (err & 0x0200) if (err & DSC_RX_ERR_BUF)
dev->stats.rx_length_errors++; dev->stats.rx_length_errors++;
/* Packet too long */ /* Packet too long */
if (err & 0x0100) if (err & DSC_RX_ERR_LONG)
dev->stats.rx_length_errors++; dev->stats.rx_length_errors++;
/* Packet < 64 bytes */ /* Packet < 64 bytes */
if (err & 0x0080) if (err & DSC_RX_ERR_RUNT)
dev->stats.rx_length_errors++; dev->stats.rx_length_errors++;
/* CRC error */ /* CRC error */
if (err & 0x0040) { if (err & DSC_RX_ERR_CRC) {
spin_lock(&priv->lock); spin_lock(&priv->lock);
dev->stats.rx_crc_errors++; dev->stats.rx_crc_errors++;
spin_unlock(&priv->lock); spin_unlock(&priv->lock);
@ -596,7 +611,7 @@ static int r6040_rx(struct net_device *dev, int limit)
next_descr: next_descr:
/* put the descriptor back to the MAC */ /* put the descriptor back to the MAC */
descptr->status = 0x8000; descptr->status = DSC_OWNER_MAC;
descptr = descptr->vndescp; descptr = descptr->vndescp;
count++; count++;
} }
@ -624,7 +639,7 @@ static void r6040_tx(struct net_device *dev)
if (err & (0x2000 | 0x4000)) if (err & (0x2000 | 0x4000))
dev->stats.tx_carrier_errors++; dev->stats.tx_carrier_errors++;
if (descptr->status & 0x8000) if (descptr->status & DSC_OWNER_MAC)
break; /* Not complete */ break; /* Not complete */
skb_ptr = descptr->skb_ptr; skb_ptr = descptr->skb_ptr;
pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf), pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
@ -874,7 +889,7 @@ static int r6040_start_xmit(struct sk_buff *skb, struct net_device *dev)
descptr->skb_ptr = skb; descptr->skb_ptr = skb;
descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, descptr->buf = cpu_to_le32(pci_map_single(lp->pdev,
skb->data, skb->len, PCI_DMA_TODEVICE)); skb->data, skb->len, PCI_DMA_TODEVICE));
descptr->status = 0x8000; descptr->status = DSC_OWNER_MAC;
/* Trigger the MAC to check the TX descriptor */ /* Trigger the MAC to check the TX descriptor */
iowrite16(0x01, ioaddr + MTPR); iowrite16(0x01, ioaddr + MTPR);
lp->tx_insert_ptr = descptr->vndescp; lp->tx_insert_ptr = descptr->vndescp;