Message ID | 1308851544-25719-2-git-send-email-ron.mercer@qlogic.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, Jun 23, 2011 at 11:50:49AM -0700, Joe Perches wrote: > On Thu, 2011-06-23 at 10:52 -0700, Ron Mercer wrote: > > From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> > > Precedence of the printk should be at higher level so chip > > fatal errors are always reported. > > You probably want to use netdev_err then, not a masked > netif_err when it is optionally not reported. > Thanks. We will respin these after waiting a bit for more comments. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 2011-06-23 at 10:52 -0700, Ron Mercer wrote: > From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> > Precedence of the printk should be at higher level so chip > fatal errors are always reported. You probably want to use netdev_err then, not a masked netif_err when it is optionally not reported. > diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c [] > @@ -2170,7 +2170,7 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev, > return; > > case CAM_LOOKUP_ERR_EVENT: > - netif_err(qdev, link, qdev->ndev, > + netif_err(qdev, drv, qdev->ndev, > "Multiple CAM hits lookup occurred.\n"); netdev_err(qdev->ndev, "Multiple CAM hits lookup occurred\n"); > @@ -2178,13 +2178,13 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev, > return; > > case SOFT_ECC_ERROR_EVENT: > - netif_err(qdev, rx_err, qdev->ndev, > + netif_err(qdev, drv, qdev->ndev, > "Soft ECC error detected.\n"); netdev_err(qdev->ndev, "Soft ECC error detected\n"); etc... -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 4fbefcf..66274ab 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -2170,7 +2170,7 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev, return; case CAM_LOOKUP_ERR_EVENT: - netif_err(qdev, link, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "Multiple CAM hits lookup occurred.\n"); netif_err(qdev, drv, qdev->ndev, "This event shouldn't occur.\n"); @@ -2178,13 +2178,13 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev, return; case SOFT_ECC_ERROR_EVENT: - netif_err(qdev, rx_err, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "Soft ECC error detected.\n"); ql_queue_asic_error(qdev); break; case PCI_ERR_ANON_BUF_RD: - netif_err(qdev, rx_err, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "PCI error occurred when reading anonymous buffers from rx_ring %d.\n", ib_ae_rsp->q_id); ql_queue_asic_error(qdev); @@ -2441,10 +2441,10 @@ static irqreturn_t qlge_isr(int irq, void *dev_id) */ if (var & STS_FE) { ql_queue_asic_error(qdev); - netif_err(qdev, intr, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "Got fatal error, STS = %x.\n", var); var = ql_read32(qdev, ERR_STS); - netif_err(qdev, intr, qdev->ndev, + netif_err(qdev, drv, qdev->ndev, "Resetting chip. Error Status Register = 0x%x\n", var); return IRQ_HANDLED; }