Re: [PATCH] e1000e: fix use of pci_enable_pcie_error_reporting

From: Danny Feng
Date: Thu Aug 13 2009 - 00:30:00 EST


On 08/13/2009 11:46 AM, David Miller wrote:
From: Xiaotian Feng<dfeng@xxxxxxxxxx>
Date: Fri, 7 Aug 2009 17:36:14 +0800

commit 111b9dc5 introduces pcie aer support for e1000e, but it is not
reasonable to disable it in e1000_remove but enable it in e1000_resume.
This patch enables aer support in e1000_probe.

Signed-off-by: Xiaotian Feng<dfeng@xxxxxxxxxx>

In moving this block of code, you've corrupted the indentation,
making it more indented than it should be.

In any event, I expect the Intel folks to pick this up.
Yes, I agree.... but each time I resume from suspend or rmmod e1000e, there's a warning message like "pci_enable_pcie_error_reporting failed 0xfffffffb". Since some devices may not support aer, why not silence this kind of warning?

modprobe e1000e everything is as usual, but then rmmod e1000e, we'll see "pci_disable_pcie_error_reporting failed 0xfffffffb", it is so weird...

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 63415bb..e2f0304 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4670,14 +4670,6 @@ static int e1000_resume(struct pci_dev *pdev)
return err;
}

- /* AER (Advanced Error Reporting) hooks */
- err = pci_enable_pcie_error_reporting(pdev);
- if (err) {
- dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed "
- "0x%x\n", err);
- /* non-fatal, continue */
- }
-
pci_set_master(pdev);

pci_enable_wake(pdev, PCI_D3hot, 0);
@@ -4990,6 +4982,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
if (err)
goto err_pci_reg;

+ /* AER (Advanced Error Reporting) hooks */
+ err = pci_enable_pcie_error_reporting(pdev);
+ if (err) {
+ dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed "
+ "0x%x\n", err);
+ /* non-fatal, continue */
+ }
+
pci_set_master(pdev);
/* PCI config space info */
err = pci_save_state(pdev);
--
1.6.2.5


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/