tg3: Move power state transitions to init_one

The tg3 driver is going to require memory mapped register access much
sooner than before.  This patch makes sure the device is in the D0 power
state as soon as possible, and moves the code that enables the memory
arbiter outside tg3_get_eeprom_hw_cfg() where it can be more easily
monitored.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 34 insertions, 43 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 01d3a271a040..ecbc10fed1a6 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -12678,29 +12678,6 @@ static struct subsys_tbl_ent * __devinit tg3_lookup_by_subsys(struct tg3 *tp)
 static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 {
         u32 val;
-        u16 pmcsr;
-
-        /* On some early chips the SRAM cannot be accessed in D3hot state,
-         * so need make sure we're in D0.
-         */
-        pci_read_config_word(tp->pdev, tp->pm_cap + PCI_PM_CTRL, &pmcsr);
-        pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
-        pci_write_config_word(tp->pdev, tp->pm_cap + PCI_PM_CTRL, pmcsr);
-        msleep(1);
-
-        /* Make sure register accesses (indirect or otherwise)
-         * will function correctly.
-         */
-        pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
-                               tp->misc_host_ctrl);
-
-        /* The memory arbiter has to be enabled in order for SRAM accesses
-         * to succeed.  Normally on powerup the tg3 chip firmware will make
-         * sure it is enabled, but other entities such as system netboot
-         * code might disable it.
-         */
-        val = tr32(MEMARB_MODE);
-        tw32(MEMARB_MODE, val | MEMARB_MODE_ENABLE);
 
         tp->phy_id = TG3_PHY_ID_INVALID;
         tp->led_ctrl = LED_CTRL_MODE_PHY_1;
@@ -13498,14 +13475,17 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
         pci_cmd &= ~PCI_COMMAND_INVALIDATE;
         pci_write_config_word(tp->pdev, PCI_COMMAND, pci_cmd);
 
-        /* It is absolutely critical that TG3PCI_MISC_HOST_CTRL
-         * has the register indirect write enable bit set before
-         * we try to access any of the MMIO registers.  It is also
-         * critical that the PCI-X hw workaround situation is decided
-         * before that as well.
+        /* Important! -- Make sure register accesses are byteswapped
+         * correctly.  Also, for those chips that require it, make
+         * sure that indirect register accesses are enabled before
+         * the first operation.
          */
         pci_read_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
                               &misc_ctrl_reg);
+        tp->misc_host_ctrl |= (misc_ctrl_reg &
+                               MISC_HOST_CTRL_CHIPREV);
+        pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
+                               tp->misc_host_ctrl);
 
         tp->pci_chip_rev_id = (misc_ctrl_reg >>
                                MISC_HOST_CTRL_CHIPREV_SHIFT);
@@ -13661,12 +13641,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 } while (bridge);
         }
 
-        /* Initialize misc host control in PCI block. */
-        tp->misc_host_ctrl |= (misc_ctrl_reg &
-                               MISC_HOST_CTRL_CHIPREV);
-        pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
-                               tp->misc_host_ctrl);
-
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714 ||
             GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 ||
@@ -13851,6 +13825,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                                       tp->pci_lat_timer);
         }
 
+        /* Important! -- It is critical that the PCI-X hw workaround
+         * situation is decided before the first MMIO register access.
+         */
         if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5700_BX) {
                 /* 5700 BX chips need to have their TX producer index
                  * mailboxes written twice to workaround a bug.
@@ -13957,6 +13934,14 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
               GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
                 tg3_flag_set(tp, SRAM_USE_CONFIG);
 
+        /* The memory arbiter has to be enabled in order for SRAM accesses
+         * to succeed.  Normally on powerup the tg3 chip firmware will make
+         * sure it is enabled, but other entities such as system netboot
+         * code might disable it.
+         */
+        val = tr32(MEMARB_MODE);
+        tw32(MEMARB_MODE, val | MEMARB_MODE_ENABLE);
+
         /* Get eeprom hw config before calling tg3_set_power_state().
          * In particular, the TG3_FLAG_IS_NIC flag must be
          * determined before calling tg3_set_power_state() so that
@@ -13987,8 +13972,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
             tg3_flag(tp, 57765_PLUS))
                 tg3_flag_set(tp, CPMU_PRESENT);
 
-        /* Set up tp->grc_local_ctrl before calling tg3_power_up().
-         * GPIO1 driven high will bring 5700's external PHY out of reset.
+        /* Set up tp->grc_local_ctrl before calling
+         * tg3_pwrsrc_switch_to_vmain().  GPIO1 driven high
+         * will bring 5700's external PHY out of reset.
          * It is also used as eeprom write protect on LOMs.
          */
         tp->grc_local_ctrl = GRC_LCLCTRL_INT_ON_ATTN | GRC_LCLCTRL_AUTO_SEEPROM;
@@ -14017,12 +14003,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                                               GRC_LCLCTRL_GPIO_OUTPUT0;
         }
 
-        /* Force the chip into D0. */
-        err = tg3_power_up(tp);
-        if (err) {
-                dev_err(&tp->pdev->dev, "Transition to D0 failed\n");
-                return err;
-        }
+        /* Switch out of Vaux if it is a NIC */
+        tg3_pwrsrc_switch_to_vmain(tp);
 
         /* Derive initial jumbo mode from MTU assigned in
          * ether_setup() via the alloc_etherdev() call
@@ -15037,11 +15019,17 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 goto err_out_free_res;
         }
 
+        err = pci_set_power_state(pdev, PCI_D0);
+        if (err) {
+                dev_err(&pdev->dev, "Transition to D0 failed, aborting\n");
+                goto err_out_free_res;
+        }
+
         dev = alloc_etherdev_mq(sizeof(*tp), TG3_IRQ_MAX_VECS);
         if (!dev) {
                 dev_err(&pdev->dev, "Etherdev alloc failed, aborting\n");
                 err = -ENOMEM;
-                goto err_out_free_res;
+                goto err_out_power_down;
         }
 
         SET_NETDEV_DEV(dev, &pdev->dev);
@@ -15356,6 +15344,9 @@ err_out_iounmap:
 err_out_free_dev:
         free_netdev(dev);
 
+err_out_power_down:
+        pci_set_power_state(pdev, PCI_D3hot);
+
 err_out_free_res:
         pci_release_regions(pdev);