Re: [PATCH] e1000e: fix use of pci_enable_pcie_error_reporting

[Jeff Kirsher]

On Fri, Aug 7, 2009 at 02:36, Xiaotian Feng<dfeng@xxxxxxxxxx> wrote:
> 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>
> ---
> Âdrivers/net/e1000e/netdev.c | Â 16 ++++++++--------
> Â1 files changed, 8 insertions(+), 8 deletions(-)
>
> 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
>
> --

This patch passed testing, I have added it to my queue of patches and
will push this out to Dave (with the whitespace corrected).

-- 
Cheers,
Jeff
--
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/