Commit d38efdd6 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] skge: cleanup suspend/resume code 



The code for suspend/resume needs several fixes. The hardware lock
should be setup in probe only, not in resume. Interrupts should be
disabled during suspend, etc.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e981d47b

drivers/net/skge.c

+29 −20
Original line number Diff line number Diff line
@@ -3106,7 +3106,6 @@ static int skge_reset(struct skge_hw *hw) 
	else

		hw->ram_size = t8 * 4096;



	spin_lock_init(&hw->hw_lock);

	hw->intr_mask = IS_HW_ERR | IS_EXT_REG | IS_PORT_1;

	if (hw->ports > 1)

		hw->intr_mask |= IS_PORT_2;
@@ -3332,6 +3331,7 @@ static int __devinit skge_probe(struct pci_dev *pdev, 
	hw->pdev = pdev;

	mutex_init(&hw->phy_mutex);

	INIT_WORK(&hw->phy_work, skge_extirq, hw);

	spin_lock_init(&hw->hw_lock);



	hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);

	if (!hw->regs) {
@@ -3449,26 +3449,25 @@ static int skge_suspend(struct pci_dev *pdev, pm_message_t state) 
	struct skge_hw *hw  = pci_get_drvdata(pdev);

	int i, wol = 0;



	for (i = 0; i < 2; i++) {

	pci_save_state(pdev);

	for (i = 0; i < hw->ports; i++) {

		struct net_device *dev = hw->dev[i];



		if (dev) {

			struct skge_port *skge = netdev_priv(dev);

		if (netif_running(dev)) {

			struct skge_port *skge = netdev_priv(dev);



			netif_carrier_off(dev);

			if (skge->wol)

				netif_stop_queue(dev);

			else

				skge_down(dev);

			}

			netif_device_detach(dev);

			wol |= skge->wol;

		}

		netif_device_detach(dev);

	}



	pci_save_state(pdev);

	skge_write32(hw, B0_IMSK, 0);

	pci_enable_wake(pdev, pci_choose_state(pdev, state), wol);

	pci_disable_device(pdev);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));



	return 0;
@@ -3477,23 +3476,33 @@ static int skge_suspend(struct pci_dev *pdev, pm_message_t state) 
static int skge_resume(struct pci_dev *pdev)

{

	struct skge_hw *hw  = pci_get_drvdata(pdev);

	int i;

	int i, err;



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	pci_enable_wake(pdev, PCI_D0, 0);



	skge_reset(hw);

	err = skge_reset(hw);

	if (err)

		goto out;



	for (i = 0; i < 2; i++) {

	for (i = 0; i < hw->ports; i++) {

		struct net_device *dev = hw->dev[i];

		if (dev) {



		netif_device_attach(dev);

			if (netif_running(dev) && skge_up(dev))

		if (netif_running(dev)) {

			err = skge_up(dev);



			if (err) {

				printk(KERN_ERR PFX "%s: could not up: %d\n",

				       dev->name, err);

				dev_close(dev);

				goto out;

			}

		}

	return 0;

	}

out:

	return err;

}

#endif