The patch titled
powerpc/cell spidernet stop error printing patch
has been removed from the -mm tree. Its filename is
powerpc-cell-spidernet-stop-error-printing-patch.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: powerpc/cell spidernet stop error printing patch
From: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Turn off mis-interpretation of the queue-empty interrupt status bit as an
error. This bit is set as a part of the previous low-watermark patch.
Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx>
Signed-off-by: James K Lewis <jklewis@xxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/spider_net.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff -puN drivers/net/spider_net.c~powerpc-cell-spidernet-stop-error-printing-patch drivers/net/spider_net.c
--- a/drivers/net/spider_net.c~powerpc-cell-spidernet-stop-error-printing-patch
+++ a/drivers/net/spider_net.c
@@ -1282,12 +1282,15 @@ spider_net_handle_error_irq(struct spide
case SPIDER_NET_PHYINT:
case SPIDER_NET_GMAC2INT:
case SPIDER_NET_GMAC1INT:
- case SPIDER_NET_GIPSINT:
case SPIDER_NET_GFIFOINT:
case SPIDER_NET_DMACINT:
case SPIDER_NET_GSYSINT:
break; */
+ case SPIDER_NET_GIPSINT:
+ show_error = 0;
+ break;
+
case SPIDER_NET_GPWOPCMPINT:
/* PHY write operation completed */
show_error = 0;
@@ -1346,9 +1349,10 @@ spider_net_handle_error_irq(struct spide
case SPIDER_NET_GDTDCEINT:
/* chain end. If a descriptor should be sent, kick off
* tx dma
- if (card->tx_chain.tail == card->tx_chain.head)
+ if (card->tx_chain.tail != card->tx_chain.head)
spider_net_kick_tx_dma(card);
- show_error = 0; */
+ */
+ show_error = 0;
break;
/* case SPIDER_NET_G1TMCNTINT: not used. print a message */
@@ -1462,8 +1466,9 @@ spider_net_handle_error_irq(struct spide
}
if ((show_error) && (netif_msg_intr(card)))
- pr_err("Got error interrupt, GHIINT0STS = 0x%08x, "
+ pr_err("Got error interrupt on %s, GHIINT0STS = 0x%08x, "
"GHIINT1STS = 0x%08x, GHIINT2STS = 0x%08x\n",
+ card->netdev->name,
status_reg, error_reg1, error_reg2);
/* clear interrupt sources */
_
Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are
origin.patch
powerpc-cell-spidernet-stop-error-printing-patch.patch
powerpc-cell-spidernet-ethtool-i-version-number-info.patch
powerpc-cell-spidernet-ethtool-i-version-number.patch
powerpc-cell-spidernet-refine-locking.patch
git-powerpc.patch
pci-error-recovery-symbios-scsi-device-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
