aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinas Vepstas <linas@austin.ibm.com>2006-10-10 17:08:42 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-11 04:04:26 -0400
commit98b9040c747e50fe02ad616c9d5fee9aa4017cd1 (patch)
tree68a91127f33ee40e1a7e0b31ceffc5c8d1f52092 /drivers/net
parent37aad7500bf7064bf150ea1f234303f4173f7b24 (diff)
[PATCH] powerpc/cell spidernet stop error printing patch.
Turn off mis-interpretation of the queue-empty interrupt status bit as an error. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: James K Lewis <jklewis@us.ibm.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/spider_net.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 9d2ed04f9fd1..0eeff1add882 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1245,12 +1245,15 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
1245 case SPIDER_NET_PHYINT: 1245 case SPIDER_NET_PHYINT:
1246 case SPIDER_NET_GMAC2INT: 1246 case SPIDER_NET_GMAC2INT:
1247 case SPIDER_NET_GMAC1INT: 1247 case SPIDER_NET_GMAC1INT:
1248 case SPIDER_NET_GIPSINT:
1249 case SPIDER_NET_GFIFOINT: 1248 case SPIDER_NET_GFIFOINT:
1250 case SPIDER_NET_DMACINT: 1249 case SPIDER_NET_DMACINT:
1251 case SPIDER_NET_GSYSINT: 1250 case SPIDER_NET_GSYSINT:
1252 break; */ 1251 break; */
1253 1252
1253 case SPIDER_NET_GIPSINT:
1254 show_error = 0;
1255 break;
1256
1254 case SPIDER_NET_GPWOPCMPINT: 1257 case SPIDER_NET_GPWOPCMPINT:
1255 /* PHY write operation completed */ 1258 /* PHY write operation completed */
1256 show_error = 0; 1259 show_error = 0;
@@ -1309,9 +1312,10 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
1309 case SPIDER_NET_GDTDCEINT: 1312 case SPIDER_NET_GDTDCEINT:
1310 /* chain end. If a descriptor should be sent, kick off 1313 /* chain end. If a descriptor should be sent, kick off
1311 * tx dma 1314 * tx dma
1312 if (card->tx_chain.tail == card->tx_chain.head) 1315 if (card->tx_chain.tail != card->tx_chain.head)
1313 spider_net_kick_tx_dma(card); 1316 spider_net_kick_tx_dma(card);
1314 show_error = 0; */ 1317 */
1318 show_error = 0;
1315 break; 1319 break;
1316 1320
1317 /* case SPIDER_NET_G1TMCNTINT: not used. print a message */ 1321 /* case SPIDER_NET_G1TMCNTINT: not used. print a message */
@@ -1425,8 +1429,9 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
1425 } 1429 }
1426 1430
1427 if ((show_error) && (netif_msg_intr(card))) 1431 if ((show_error) && (netif_msg_intr(card)))
1428 pr_err("Got error interrupt, GHIINT0STS = 0x%08x, " 1432 pr_err("Got error interrupt on %s, GHIINT0STS = 0x%08x, "
1429 "GHIINT1STS = 0x%08x, GHIINT2STS = 0x%08x\n", 1433 "GHIINT1STS = 0x%08x, GHIINT2STS = 0x%08x\n",
1434 card->netdev->name,
1430 status_reg, error_reg1, error_reg2); 1435 status_reg, error_reg1, error_reg2);
1431 1436
1432 /* clear interrupt sources */ 1437 /* clear interrupt sources */