Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5177b324 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jeff Garzik
Browse files

skge: adapt skge to use reworked PCI PM 



Adapt the skge driver to the reworked PCI PM

* Use device_set_wakeup_enable() and friends as needed
* Remove an open-coded reference to the standard PCI PM registers
* Use pci_prepare_to_sleep() and pci_back_from_sleep() in the
  ->suspend() and ->resume() callbacks
* Use the observation that it is sufficient to call pci_enable_wake()
  once, unless it fails

Tested on Asus L5D (Yukon-Lite rev 7).

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c8db3fec

drivers/net/skge.c

+11 −27
Original line number Original line Diff line number Diff line
@@ -149,24 +149,6 @@ static u32 wol_supported(const struct skge_hw *hw) 
	return WAKE_MAGIC | WAKE_PHY;

	return WAKE_MAGIC | WAKE_PHY;

}

}





static u32 pci_wake_enabled(struct pci_dev *dev)

{

	int pm = pci_find_capability(dev, PCI_CAP_ID_PM);

	u16 value;



	/* If device doesn't support PM Capabilities, but request is to disable

	 * wake events, it's a nop; otherwise fail */

	if (!pm)

		return 0;



	pci_read_config_word(dev, pm + PCI_PM_PMC, &value);



	value &= PCI_PM_CAP_PME_MASK;

	value >>= ffs(PCI_PM_CAP_PME_MASK) - 1;   /* First bit of mask */



	return value != 0;

}



static void skge_wol_init(struct skge_port *skge)

static void skge_wol_init(struct skge_port *skge)

{

{

	struct skge_hw *hw = skge->hw;

	struct skge_hw *hw = skge->hw;
@@ -254,10 +236,14 @@ static int skge_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
	struct skge_port *skge = netdev_priv(dev);

	struct skge_port *skge = netdev_priv(dev);

	struct skge_hw *hw = skge->hw;

	struct skge_hw *hw = skge->hw;





	if (wol->wolopts & ~wol_supported(hw))

	if ((wol->wolopts & ~wol_supported(hw))

	    || !device_can_wakeup(&hw->pdev->dev))

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	skge->wol = wol->wolopts;

	skge->wol = wol->wolopts;



	device_set_wakeup_enable(&hw->pdev->dev, skge->wol);



	return 0;

	return 0;

}

}
@@ -3856,7 +3842,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port, 
	skge->speed = -1;

	skge->speed = -1;

	skge->advertising = skge_supported_modes(hw);

	skge->advertising = skge_supported_modes(hw);





	if (pci_wake_enabled(hw->pdev))

	if (device_may_wakeup(&hw->pdev->dev))

		skge->wol = wol_supported(hw) & WAKE_MAGIC;

		skge->wol = wol_supported(hw) & WAKE_MAGIC;





	hw->dev[port] = dev;

	hw->dev[port] = dev;
@@ -4081,8 +4067,8 @@ static int skge_suspend(struct pci_dev *pdev, pm_message_t state) 
	}

	}





	skge_write32(hw, B0_IMSK, 0);

	skge_write32(hw, B0_IMSK, 0);

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



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

	pci_prepare_to_sleep(pdev);





	return 0;

	return 0;

}

}
@@ -4095,7 +4081,7 @@ static int skge_resume(struct pci_dev *pdev) 
	if (!hw)

	if (!hw)

		return 0;

		return 0;





	err = pci_set_power_state(pdev, PCI_D0);

	err = pci_back_from_sleep(pdev);

	if (err)

	if (err)

		goto out;

		goto out;
@@ -4103,8 +4089,6 @@ static int skge_resume(struct pci_dev *pdev) 
	if (err)

	if (err)

		goto out;

		goto out;





	pci_enable_wake(pdev, PCI_D0, 0);



	err = skge_reset(hw);

	err = skge_reset(hw);

	if (err)

	if (err)

		goto out;

		goto out;
@@ -4145,8 +4129,8 @@ static void skge_shutdown(struct pci_dev *pdev) 
		wol |= skge->wol;

		wol |= skge->wol;

	}

	}





	if (pci_enable_wake(pdev, PCI_D3cold, wol))

		pci_enable_wake(pdev, PCI_D3hot, wol);

		pci_enable_wake(pdev, PCI_D3hot, wol);

	pci_enable_wake(pdev, PCI_D3cold, wol);





	pci_disable_device(pdev);

	pci_disable_device(pdev);

	pci_set_power_state(pdev, PCI_D3hot);

	pci_set_power_state(pdev, PCI_D3hot);