[TG3]: Add TG3_FLG2_IS_NIC flag.

Add Tg3_FLG2_IS_NIC flag to unambiguously determine whether the
device is NIC or onboard.  Previously, the EEPROM_WRITE_PROT flag was
overloaded to also mean onboard.  With the separation, we can
support some devices that are onboard but do not use eeprom write
protect.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 24 insertions, 13 deletions

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 5514828b7929..16bc05fe531f 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1062,7 +1062,7 @@ static void tg3_frob_aux_power(struct tg3 *tp)
 {
         struct tg3 *tp_peer = tp;
 
-        if ((tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) != 0)
+        if ((tp->tg3_flags2 & TG3_FLG2_IS_NIC) == 0)
                 return;
 
         if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
@@ -1213,8 +1213,8 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
                                       power_control);
                 udelay(100);    /* Delay after power state change */
 
-                /* Switch out of Vaux if it is not a LOM */
-                if (!(tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT))
+                /* 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;
@@ -6397,16 +6397,17 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
         udelay(40);
 
         /* tp->grc_local_ctrl is partially set up during tg3_get_invariants().
-         * If TG3_FLAG_EEPROM_WRITE_PROT is set, we should read the
+         * If TG3_FLG2_IS_NIC is zero, we should read the
          * register to preserve the GPIO settings for LOMs. The GPIOs,
          * whether used as inputs or outputs, are set by boot code after
          * reset.
          */
-        if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
+        if (!(tp->tg3_flags2 & TG3_FLG2_IS_NIC)) {
                 u32 gpio_mask;
 
-                gpio_mask = GRC_LCLCTRL_GPIO_OE0 | GRC_LCLCTRL_GPIO_OE2 |
-                            GRC_LCLCTRL_GPIO_OUTPUT0 | GRC_LCLCTRL_GPIO_OUTPUT2;
+                gpio_mask = GRC_LCLCTRL_GPIO_OE0 | GRC_LCLCTRL_GPIO_OE1 |
+                            GRC_LCLCTRL_GPIO_OE2 | GRC_LCLCTRL_GPIO_OUTPUT0 |
+                            GRC_LCLCTRL_GPIO_OUTPUT1 | GRC_LCLCTRL_GPIO_OUTPUT2;
 
                 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
                         gpio_mask |= GRC_LCLCTRL_GPIO_OE3 |
@@ -6418,8 +6419,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
                 tp->grc_local_ctrl |= tr32(GRC_LOCAL_CTRL) & gpio_mask;
 
                 /* GPIO1 must be driven high for eeprom write protect */
-                tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |
-                                       GRC_LCLCTRL_GPIO_OUTPUT1);
+                if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT)
+                        tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |
+                                               GRC_LCLCTRL_GPIO_OUTPUT1);
         }
         tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
         udelay(100);
@@ -9963,8 +9965,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
         tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
 
         if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
-                if (!(tr32(PCIE_TRANSACTION_CFG) & PCIE_TRANS_CFG_LOM))
+                if (!(tr32(PCIE_TRANSACTION_CFG) & PCIE_TRANS_CFG_LOM)) {
                         tp->tg3_flags &= ~TG3_FLAG_EEPROM_WRITE_PROT;
+                        tp->tg3_flags2 |= TG3_FLG2_IS_NIC;
+                }
                 return;
         }
 
@@ -10064,10 +10068,17 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                     tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL)
                         tp->led_ctrl = LED_CTRL_MODE_PHY_2;
 
-                if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP)
+                if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP) {
                         tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
-                else
+                        if ((tp->pdev->subsystem_vendor ==
+                             PCI_VENDOR_ID_ARIMA) &&
+                            (tp->pdev->subsystem_device == 0x205a ||
+                             tp->pdev->subsystem_device == 0x2063))
+                                tp->tg3_flags &= ~TG3_FLAG_EEPROM_WRITE_PROT;
+                } else {
                         tp->tg3_flags &= ~TG3_FLAG_EEPROM_WRITE_PROT;
+                        tp->tg3_flags2 |= TG3_FLG2_IS_NIC;
+                }
 
                 if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE) {
                         tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
@@ -10693,7 +10704,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                 tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
 
         /* Get eeprom hw config before calling tg3_set_power_state().
-         * In particular, the TG3_FLAG_EEPROM_WRITE_PROT flag must be
+         * In particular, the TG3_FLG2_IS_NIC flag must be
          * determined before calling tg3_set_power_state() so that
          * we know whether or not to switch out of Vaux power.
          * When the flag is set, it means that GPIO1 is used for eeprom