linux-kernel - Re: [PATCH] e1000e: fix use of pci_enable_pcie_error

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <9929d2390908131600y330e4014se4f5955515cfc84d@mail.gmail.com>
Date:	Thu, 13 Aug 2009 16:00:08 -0700
From:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To:	Xiaotian Feng <dfeng@...hat.com>
Cc:	john.ronciak@...el.com, peter.p.waskiewicz.jr@...el.com,
	bruce.w.allan@...el.com, jesse.brandeburg@...el.com,
	davem@...emloft.net, e1000-devel@...ts.sourceforge.net,
	netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] e1000e: fix use of pci_enable_pcie_error_reporting

On Fri, Aug 7, 2009 at 02:36, Xiaotian Feng<dfeng@...hat.com> 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@...hat.com>
> ---
>  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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/