tg3: Do not use legacy PCI power management
The tg3 driver uses the legacy PCI power management, so it has to do some PCI-specific things in its ->suspend() and ->resume() callbacks, which isn't necessary and should better be done by the PCI sybsystem-level power management code. Convert tg3 to the new PCI power management framework and make it let the PCI subsystem take care of all the PCI-specific aspects of device handling during system power transitions. Tested on HP nx6325 with a NetXtreme BCM5788 adapter. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rafael J. Wysocki
David S. Miller
parent
f5260f02e7
commit
c866b7eac0
@ -2551,39 +2551,35 @@ static void __tg3_set_mac_addr(struct tg3 *tp, int skip_mac_1)
|
||||
tw32(MAC_TX_BACKOFF_SEED, addr_high);
|
||||
}
|
||||
|
||||
static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
|
||||
static void tg3_enable_register_access(struct tg3 *tp)
|
||||
{
|
||||
/*
|
||||
* Make sure register accesses (indirect or otherwise) will function
|
||||
* correctly.
|
||||
*/
|
||||
pci_write_config_dword(tp->pdev,
|
||||
TG3PCI_MISC_HOST_CTRL, tp->misc_host_ctrl);
|
||||
}
|
||||
|
||||
static int tg3_power_up(struct tg3 *tp)
|
||||
{
|
||||
tg3_enable_register_access(tp);
|
||||
|
||||
pci_set_power_state(tp->pdev, PCI_D0);
|
||||
|
||||
/* Switch out of Vaux if it is a NIC */
|
||||
if (tp->tg3_flags2 & TG3_FLG2_IS_NIC)
|
||||
tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl, 100);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tg3_power_down_prepare(struct tg3 *tp)
|
||||
{
|
||||
u32 misc_host_ctrl;
|
||||
bool device_should_wake, do_low_power;
|
||||
|
||||
/* Make sure register accesses (indirect or otherwise)
|
||||
* will function correctly.
|
||||
*/
|
||||
pci_write_config_dword(tp->pdev,
|
||||
TG3PCI_MISC_HOST_CTRL,
|
||||
tp->misc_host_ctrl);
|
||||
|
||||
switch (state) {
|
||||
case PCI_D0:
|
||||
pci_enable_wake(tp->pdev, state, false);
|
||||
pci_set_power_state(tp->pdev, PCI_D0);
|
||||
|
||||
/* Switch out of Vaux if it is a NIC */
|
||||
if (tp->tg3_flags2 & TG3_FLG2_IS_NIC)
|
||||
tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl, 100);
|
||||
|
||||
return 0;
|
||||
|
||||
case PCI_D1:
|
||||
case PCI_D2:
|
||||
case PCI_D3hot:
|
||||
break;
|
||||
|
||||
default:
|
||||
netdev_err(tp->dev, "Invalid power state (D%d) requested\n",
|
||||
state);
|
||||
return -EINVAL;
|
||||
}
|
||||
tg3_enable_register_access(tp);
|
||||
|
||||
/* Restore the CLKREQ setting. */
|
||||
if (tp->tg3_flags3 & TG3_FLG3_CLKREQ_BUG) {
|
||||
@ -2602,8 +2598,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
|
||||
tw32(TG3PCI_MISC_HOST_CTRL,
|
||||
misc_host_ctrl | MISC_HOST_CTRL_MASK_PCI_INT);
|
||||
|
||||
device_should_wake = pci_pme_capable(tp->pdev, state) &&
|
||||
device_may_wakeup(&tp->pdev->dev) &&
|
||||
device_should_wake = device_may_wakeup(&tp->pdev->dev) &&
|
||||
(tp->tg3_flags & TG3_FLAG_WOL_ENABLE);
|
||||
|
||||
if (tp->tg3_flags3 & TG3_FLG3_USE_PHYLIB) {
|
||||
@ -2823,15 +2818,17 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
|
||||
|
||||
tg3_write_sig_post_reset(tp, RESET_KIND_SHUTDOWN);
|
||||
|
||||
if (device_should_wake)
|
||||
pci_enable_wake(tp->pdev, state, true);
|
||||
|
||||
/* Finally, set the new power state. */
|
||||
pci_set_power_state(tp->pdev, state);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void tg3_power_down(struct tg3 *tp)
|
||||
{
|
||||
tg3_power_down_prepare(tp);
|
||||
|
||||
pci_wake_from_d3(tp->pdev, tp->tg3_flags & TG3_FLAG_WOL_ENABLE);
|
||||
pci_set_power_state(tp->pdev, PCI_D3hot);
|
||||
}
|
||||
|
||||
static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 *duplex)
|
||||
{
|
||||
switch (val & MII_TG3_AUX_STAT_SPDMASK) {
|
||||
@ -9137,7 +9134,7 @@ static int tg3_open(struct net_device *dev)
|
||||
|
||||
netif_carrier_off(tp->dev);
|
||||
|
||||
err = tg3_set_power_state(tp, PCI_D0);
|
||||
err = tg3_power_up(tp);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
@ -9302,7 +9299,7 @@ static int tg3_close(struct net_device *dev)
|
||||
|
||||
tg3_free_consistent(tp);
|
||||
|
||||
tg3_set_power_state(tp, PCI_D3hot);
|
||||
tg3_power_down(tp);
|
||||
|
||||
netif_carrier_off(tp->dev);
|
||||
|
||||
@ -11104,7 +11101,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
|
||||
struct tg3 *tp = netdev_priv(dev);
|
||||
|
||||
if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
|
||||
tg3_set_power_state(tp, PCI_D0);
|
||||
tg3_power_up(tp);
|
||||
|
||||
memset(data, 0, sizeof(u64) * TG3_NUM_TEST);
|
||||
|
||||
@ -11172,7 +11169,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,
|
||||
tg3_phy_start(tp);
|
||||
}
|
||||
if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)
|
||||
tg3_set_power_state(tp, PCI_D3hot);
|
||||
tg3_power_down(tp);
|
||||
|
||||
}
|
||||
|
||||
@ -13621,7 +13618,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
|
||||
(tp->tg3_flags3 & TG3_FLG3_5717_PLUS))
|
||||
tp->tg3_flags |= TG3_FLAG_CPMU_PRESENT;
|
||||
|
||||
/* Set up tp->grc_local_ctrl before calling tg3_set_power_state().
|
||||
/* Set up tp->grc_local_ctrl before calling tg_power_up().
|
||||
* GPIO1 driven high will bring 5700's external PHY out of reset.
|
||||
* It is also used as eeprom write protect on LOMs.
|
||||
*/
|
||||
@ -13652,7 +13649,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
|
||||
}
|
||||
|
||||
/* Force the chip into D0. */
|
||||
err = tg3_set_power_state(tp, PCI_D0);
|
||||
err = tg3_power_up(tp);
|
||||
if (err) {
|
||||
dev_err(&tp->pdev->dev, "Transition to D0 failed\n");
|
||||
return err;
|
||||
@ -15055,19 +15052,13 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev)
|
||||
}
|
||||
}
|
||||
|
||||
static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
|
||||
static int tg3_suspend(struct device *device)
|
||||
{
|
||||
struct pci_dev *pdev = to_pci_dev(device);
|
||||
struct net_device *dev = pci_get_drvdata(pdev);
|
||||
struct tg3 *tp = netdev_priv(dev);
|
||||
pci_power_t target_state;
|
||||
int err;
|
||||
|
||||
/* PCI register 4 needs to be saved whether netif_running() or not.
|
||||
* MSI address and data need to be saved if using MSI and
|
||||
* netif_running().
|
||||
*/
|
||||
pci_save_state(pdev);
|
||||
|
||||
if (!netif_running(dev))
|
||||
return 0;
|
||||
|
||||
@ -15088,9 +15079,7 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
|
||||
tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
|
||||
tg3_full_unlock(tp);
|
||||
|
||||
target_state = pdev->pm_cap ? pci_target_state(pdev) : PCI_D3hot;
|
||||
|
||||
err = tg3_set_power_state(tp, target_state);
|
||||
err = tg3_power_down_prepare(tp);
|
||||
if (err) {
|
||||
int err2;
|
||||
|
||||
@ -15117,21 +15106,16 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int tg3_resume(struct pci_dev *pdev)
|
||||
static int tg3_resume(struct device *device)
|
||||
{
|
||||
struct pci_dev *pdev = to_pci_dev(device);
|
||||
struct net_device *dev = pci_get_drvdata(pdev);
|
||||
struct tg3 *tp = netdev_priv(dev);
|
||||
int err;
|
||||
|
||||
pci_restore_state(tp->pdev);
|
||||
|
||||
if (!netif_running(dev))
|
||||
return 0;
|
||||
|
||||
err = tg3_set_power_state(tp, PCI_D0);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
netif_device_attach(dev);
|
||||
|
||||
tg3_full_lock(tp, 0);
|
||||
@ -15155,13 +15139,14 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(tg3_pm_ops, tg3_suspend, tg3_resume);
|
||||
|
||||
static struct pci_driver tg3_driver = {
|
||||
.name = DRV_MODULE_NAME,
|
||||
.id_table = tg3_pci_tbl,
|
||||
.probe = tg3_init_one,
|
||||
.remove = __devexit_p(tg3_remove_one),
|
||||
.suspend = tg3_suspend,
|
||||
.resume = tg3_resume
|
||||
.driver.pm = &tg3_pm_ops,
|
||||
};
|
||||
|
||||
static int __init tg3_init(void)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user