[PATCH] powerpc/cell spidernet fix error interrupt print

[linux-2.6-block.git] / drivers / net / spider_net.c

diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index cc240adb72690304c58b129abcf1fbef0af4b128..9d2ed04f9fd111eb5878f9f3879bc55811fa783e 100644 (file)
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -55,12 +55,13 @@ MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and Jens Osterkamp " \
              "<Jens.Osterkamp@de.ibm.com>");
 MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(VERSION);
 
 static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT;
 static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT;
 
-module_param(rx_descriptors, int, 0644);
-module_param(tx_descriptors, int, 0644);
+module_param(rx_descriptors, int, 0444);
+module_param(tx_descriptors, int, 0444);
 
 MODULE_PARM_DESC(rx_descriptors, "number of descriptors used " \
                 "in rx chains");
@@ -317,7 +318,7 @@ spider_net_init_chain(struct spider_net_card *card,
                                     SPIDER_NET_DESCR_SIZE,
                                     direction);
 
-               if (buf == DMA_ERROR_CODE)
+               if (pci_dma_mapping_error(buf))
                        goto iommu_error;
 
                descr->bus_addr = buf;
@@ -420,7 +421,7 @@ spider_net_prepare_rx_descr(struct spider_net_card *card,
        buf = pci_map_single(card->pdev, descr->skb->data,
                        SPIDER_NET_MAX_FRAME, PCI_DMA_FROMDEVICE);
        descr->buf_addr = buf;
-       if (buf == DMA_ERROR_CODE) {
+       if (pci_dma_mapping_error(buf)) {
                dev_kfree_skb_any(descr->skb);
                if (netif_msg_rx_err(card) && net_ratelimit())
                        pr_err("Could not iommu-map rx buffer\n");
@@ -647,18 +648,26 @@ spider_net_prepare_tx_descr(struct spider_net_card *card,
 {
        struct spider_net_descr *descr = card->tx_chain.head;
        dma_addr_t buf;
+       int length;
 
-       buf = pci_map_single(card->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
-       if (buf == DMA_ERROR_CODE) {
+       length = skb->len;
+       if (length < ETH_ZLEN) {
+               if (skb_pad(skb, ETH_ZLEN-length))
+                       return 0;
+               length = ETH_ZLEN;
+       }
+
+       buf = pci_map_single(card->pdev, skb->data, length, PCI_DMA_TODEVICE);
+       if (pci_dma_mapping_error(buf)) {
                if (netif_msg_tx_err(card) && net_ratelimit())
                        pr_err("could not iommu-map packet (%p, %i). "
-                                 "Dropping packet\n", skb->data, skb->len);
+                                 "Dropping packet\n", skb->data, length);
                card->spider_stats.tx_iommu_map_error++;
                return -ENOMEM;
        }
 
        descr->buf_addr = buf;
-       descr->buf_size = skb->len;
+       descr->buf_size = length;
        descr->next_descr_addr = 0;
        descr->skb = skb;
        descr->data_status = 0;
@@ -677,6 +686,7 @@ spider_net_prepare_tx_descr(struct spider_net_card *card,
 
        descr->prev->next_descr_addr = descr->bus_addr;
 
+       card->netdev->trans_start = jiffies; /* set netdev watchdog timer */
        return 0;
 }
 
@@ -692,13 +702,17 @@ spider_net_release_tx_descr(struct spider_net_card *card)
 {
        struct spider_net_descr *descr = card->tx_chain.tail;
        struct sk_buff *skb;
+       unsigned int len;
 
        card->tx_chain.tail = card->tx_chain.tail->next;
        descr->dmac_cmd_status |= SPIDER_NET_DESCR_NOT_IN_USE;
 
        /* unmap the skb */
        skb = descr->skb;
-       pci_unmap_single(card->pdev, descr->buf_addr, skb->len,
+       if (!skb)
+               return;
+       len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
+       pci_unmap_single(card->pdev, descr->buf_addr, len,
                        PCI_DMA_TODEVICE);
        dev_kfree_skb_any(skb);
 }
@@ -750,7 +764,8 @@ spider_net_release_tx_chain(struct spider_net_card *card, int brutal)
 
                default:
                        card->netdev_stats.tx_dropped++;
-                       return 1;
+                       if (!brutal)
+                               return 1;
                }
                spider_net_release_tx_descr(card);
        }
@@ -808,39 +823,25 @@ spider_net_xmit(struct sk_buff *skb, struct net_device *netdev)
        struct spider_net_descr_chain *chain = &card->tx_chain;
        struct spider_net_descr *descr = chain->head;
        unsigned long flags;
-       int result;
 
        spin_lock_irqsave(&chain->lock, flags);
 
        spider_net_release_tx_chain(card, 0);
 
-       if (chain->head->next == chain->tail->prev) {
-               card->netdev_stats.tx_dropped++;
-               result = NETDEV_TX_LOCKED;
-               goto out;
-       }
+       if ((chain->head->next == chain->tail->prev) ||
+          (spider_net_get_descr_status(descr) != SPIDER_NET_DESCR_NOT_IN_USE) ||
+          (spider_net_prepare_tx_descr(card, skb) != 0)) {
 
-       if (spider_net_get_descr_status(descr) != SPIDER_NET_DESCR_NOT_IN_USE) {
                card->netdev_stats.tx_dropped++;
-               result = NETDEV_TX_LOCKED;
-               goto out;
+               spin_unlock_irqrestore(&chain->lock, flags);
+               netif_stop_queue(netdev);
+               return NETDEV_TX_BUSY;
        }
 
-       if (spider_net_prepare_tx_descr(card, skb) != 0) {
-               card->netdev_stats.tx_dropped++;
-               result = NETDEV_TX_BUSY;
-               goto out;
-       }
-
-       result = NETDEV_TX_OK;
-
        spider_net_kick_tx_dma(card);
        card->tx_chain.head = card->tx_chain.head->next;
-
-out:
        spin_unlock_irqrestore(&chain->lock, flags);
-       netif_wake_queue(netdev);
-       return result;
+       return NETDEV_TX_OK;
 }
 
 /**
@@ -859,9 +860,10 @@ spider_net_cleanup_tx_ring(struct spider_net_card *card)
        spin_lock_irqsave(&card->tx_chain.lock, flags);
 
        if ((spider_net_release_tx_chain(card, 0) != 0) &&
-           (card->netdev->flags & IFF_UP))
+           (card->netdev->flags & IFF_UP)) {
                spider_net_kick_tx_dma(card);
-
+               netif_wake_queue(card->netdev);
+       }
        spin_unlock_irqrestore(&card->tx_chain.lock, flags);
 }
 
@@ -1354,7 +1356,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
                if (netif_msg_intr(card))
                        pr_err("got descriptor chain end interrupt, "
                               "restarting DMAC %c.\n",
-                              'D'+i-SPIDER_NET_GDDDCEINT);
+                              'D'-(i-SPIDER_NET_GDDDCEINT)/3);
                spider_net_refill_rx_chain(card);
                spider_net_enable_rxdmac(card);
                show_error = 0;
@@ -1445,7 +1447,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
  * interrupts for this device and makes the stack poll the driver
  */
 static irqreturn_t
-spider_net_interrupt(int irq, void *ptr, struct pt_regs *regs)
+spider_net_interrupt(int irq, void *ptr)
 {
        struct net_device *netdev = ptr;
        struct spider_net_card *card = netdev_priv(netdev);
@@ -1481,7 +1483,7 @@ static void
 spider_net_poll_controller(struct net_device *netdev)
 {
        disable_irq(netdev->irq);
-       spider_net_interrupt(netdev->irq, netdev, NULL);
+       spider_net_interrupt(netdev->irq, netdev);
        enable_irq(netdev->irq);
 }
 #endif /* CONFIG_NET_POLL_CONTROLLER */
@@ -1599,7 +1601,7 @@ spider_net_enable_card(struct spider_net_card *card)
                             SPIDER_NET_INT2_MASK_VALUE);
 
        spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
-                            SPIDER_NET_GDTDCEIDIS);
+                            SPIDER_NET_GDTBSTA | SPIDER_NET_GDTDCEIDIS);
 }
 
 /**
@@ -2252,6 +2254,8 @@ static struct pci_driver spider_net_driver = {
  */
 static int __init spider_net_init(void)
 {
+       printk(KERN_INFO "Spidernet version %s.\n", VERSION);
+
        if (rx_descriptors < SPIDER_NET_RX_DESCRIPTORS_MIN) {
                rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_MIN;
                pr_info("adjusting rx descriptors to %i.\n", rx_descriptors);