On Monday, January 28, 2013 04:09:38 PM Bjorn Helgaas wrote:
> [+cc Rafael]
>
> On Fri, Jan 18, 2013 at 4:42 AM, Konstantin Khlebnikov
> <khlebnikov@xxxxxxxxxx> wrote:
> > __e1000_shutdown() calls pci_disable_device() at the end, thus __e1000_resume()
> > should call pci_enable_device_mem() to keep enable counter in balance.
> >
> > Bug was introduced in commit 23606cf5d1192c2b17912cb2ef6e62f9b11de133
> > ("e1000e / PCI / PM: Add basic runtime PM support (rev. 4)") in v2.6.35
> >
> > Signed-off-by: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxx>
> > Cc: e1000-devel@xxxxxxxxxxxxxxxxxxxxx
> > Cc: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
> > Cc: Bruce Allan <bruce.w.allan@xxxxxxxxx>
> > ---
> > drivers/net/ethernet/intel/e1000e/netdev.c | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> > index 2853c11..6bce796 100644
> > --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> > +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> > @@ -5598,6 +5598,13 @@ static int __e1000_resume(struct pci_dev *pdev)
> > pci_restore_state(pdev);
> > pci_save_state(pdev);
> >
> > + err = pci_enable_device_mem(pdev);
> > + if (err) {
> > + dev_err(&pdev->dev,
> > + "Cannot re-enable PCI device after suspend.\n");
> > + return err;
> > + }
>
> Reviewed-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>
> Seems right to me, and the other users I looked at (igb, azx,
> virtio_pci) call pci_disable_device() in .suspend() and call
> pci_enable_device() in .resume() as you propose to do here.
>
> I assume the e1000 folks will handle this patch (and the previous one).
>
OK, so this one looks like a genuine fix to me.
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Thanks,
Rafael
> > +
> > e1000e_set_interrupt_capability(adapter);
> > if (netif_running(netdev)) {
> > err = e1000_request_irq(adapter);
> >
> > --
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
