diff options
author | Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> | 2011-06-30 06:02:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-01 20:36:04 -0400 |
commit | 5069ee555eb41192e7a5003ba3b1f91880cfec06 (patch) | |
tree | 3a7f3c8af4b117f173a3e55dfc32623a1465473a /drivers | |
parent | da92b393e0bfc8e6d056885453201b0e7d8190dd (diff) |
qlge: Fix printk priority so chip fatal errors are always reported.
Precedence of the printk should be at higher level so chip fatal
errors are always reported.
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 4fbefcf989a0..6b4ff970972b 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -2170,23 +2170,20 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev, | |||
2170 | return; | 2170 | return; |
2171 | 2171 | ||
2172 | case CAM_LOOKUP_ERR_EVENT: | 2172 | case CAM_LOOKUP_ERR_EVENT: |
2173 | netif_err(qdev, link, qdev->ndev, | 2173 | netdev_err(qdev->ndev, "Multiple CAM hits lookup occurred.\n"); |
2174 | "Multiple CAM hits lookup occurred.\n"); | 2174 | netdev_err(qdev->ndev, "This event shouldn't occur.\n"); |
2175 | netif_err(qdev, drv, qdev->ndev, | ||
2176 | "This event shouldn't occur.\n"); | ||
2177 | ql_queue_asic_error(qdev); | 2175 | ql_queue_asic_error(qdev); |
2178 | return; | 2176 | return; |
2179 | 2177 | ||
2180 | case SOFT_ECC_ERROR_EVENT: | 2178 | case SOFT_ECC_ERROR_EVENT: |
2181 | netif_err(qdev, rx_err, qdev->ndev, | 2179 | netdev_err(qdev->ndev, "Soft ECC error detected.\n"); |
2182 | "Soft ECC error detected.\n"); | ||
2183 | ql_queue_asic_error(qdev); | 2180 | ql_queue_asic_error(qdev); |
2184 | break; | 2181 | break; |
2185 | 2182 | ||
2186 | case PCI_ERR_ANON_BUF_RD: | 2183 | case PCI_ERR_ANON_BUF_RD: |
2187 | netif_err(qdev, rx_err, qdev->ndev, | 2184 | netdev_err(qdev->ndev, "PCI error occurred when reading " |
2188 | "PCI error occurred when reading anonymous buffers from rx_ring %d.\n", | 2185 | "anonymous buffers from rx_ring %d.\n", |
2189 | ib_ae_rsp->q_id); | 2186 | ib_ae_rsp->q_id); |
2190 | ql_queue_asic_error(qdev); | 2187 | ql_queue_asic_error(qdev); |
2191 | break; | 2188 | break; |
2192 | 2189 | ||
@@ -2441,11 +2438,10 @@ static irqreturn_t qlge_isr(int irq, void *dev_id) | |||
2441 | */ | 2438 | */ |
2442 | if (var & STS_FE) { | 2439 | if (var & STS_FE) { |
2443 | ql_queue_asic_error(qdev); | 2440 | ql_queue_asic_error(qdev); |
2444 | netif_err(qdev, intr, qdev->ndev, | 2441 | netdev_err(qdev->ndev, "Got fatal error, STS = %x.\n", var); |
2445 | "Got fatal error, STS = %x.\n", var); | ||
2446 | var = ql_read32(qdev, ERR_STS); | 2442 | var = ql_read32(qdev, ERR_STS); |
2447 | netif_err(qdev, intr, qdev->ndev, | 2443 | netdev_err(qdev->ndev, "Resetting chip. " |
2448 | "Resetting chip. Error Status Register = 0x%x\n", var); | 2444 | "Error Status Register = 0x%x\n", var); |
2449 | return IRQ_HANDLED; | 2445 | return IRQ_HANDLED; |
2450 | } | 2446 | } |
2451 | 2447 | ||