bnx2x: Change to D3hot only on removal

This changes the PCI power management scheme of the bnx2x driver to be similar
to those of most network drivers - the driver will now changes the power state
into D3hot whenever the driver will be removed, instead of whenever an
interface is unloaded.

This change enables the driver to access its eeprom via ethtool callbacks
even when interfaces are unloaded (such access requires the function to be
in D0active).

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 24 insertions, 10 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 32aa88f520dc..263950cddfe2 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1381,12 +1381,28 @@ static int bnx2x_nvram_read32(struct bnx2x *bp, u32 offset, u32 *buf,
         return rc;
 }
 
+static bool bnx2x_is_nvm_accessible(struct bnx2x *bp)
+{
+        int rc = 1;
+        u16 pm = 0;
+        struct net_device *dev = pci_get_drvdata(bp->pdev);
+
+        if (bp->pm_cap)
+                rc = pci_read_config_word(bp->pdev,
+                                          bp->pm_cap + PCI_PM_CTRL, &pm);
+
+        if ((rc && !netif_running(dev)) || (!rc && ((pm & PCI_D0) != PCI_D0)))
+                return false;
+
+        return true;
+}
+
 static int bnx2x_get_eeprom(struct net_device *dev,
                             struct ethtool_eeprom *eeprom, u8 *eebuf)
 {
         struct bnx2x *bp = netdev_priv(dev);
 
-        if (!netif_running(dev)) {
+        if (!bnx2x_is_nvm_accessible(bp)) {
                 DP(BNX2X_MSG_ETHTOOL  | BNX2X_MSG_NVM,
                    "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
@@ -1411,7 +1427,7 @@ static int bnx2x_get_module_eeprom(struct net_device *dev,
         u8 *user_data = data;
         unsigned int start_addr = ee->offset, xfer_size = 0;
 
-        if (!netif_running(dev)) {
+        if (!bnx2x_is_nvm_accessible(bp)) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
@@ -1474,7 +1490,7 @@ static int bnx2x_get_module_info(struct net_device *dev,
         int phy_idx, rc;
         u8 sff8472_comp, diag_type;
 
-        if (!netif_running(dev)) {
+        if (!bnx2x_is_nvm_accessible(bp)) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
@@ -1676,7 +1692,8 @@ static int bnx2x_set_eeprom(struct net_device *dev,
         int port = BP_PORT(bp);
         int rc = 0;
         u32 ext_phy_config;
-        if (!netif_running(dev)) {
+
+        if (!bnx2x_is_nvm_accessible(bp)) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
@@ -2173,7 +2190,7 @@ static int bnx2x_test_registers(struct bnx2x *bp)
                 { BNX2X_CHIP_MASK_ALL, 0xffffffff, 0, 0x00000000 }
         };
 
-        if (!netif_running(bp->dev)) {
+        if (!bnx2x_is_nvm_accessible(bp)) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "cannot access eeprom when the interface is down\n");
                 return rc;
@@ -2277,7 +2294,7 @@ static int bnx2x_test_memory(struct bnx2x *bp)
                 { NULL, 0xffffffff, {0, 0, 0, 0} }
         };
 
-        if (!netif_running(bp->dev)) {
+        if (!bnx2x_is_nvm_accessible(bp)) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "cannot access eeprom when the interface is down\n");
                 return rc;
@@ -3140,7 +3157,7 @@ static int bnx2x_set_phys_id(struct net_device *dev,
 {
         struct bnx2x *bp = netdev_priv(dev);
 
-        if (!netif_running(dev)) {
+        if (!bnx2x_is_nvm_accessible(bp)) {
                 DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
                    "cannot access eeprom when the interface is down\n");
                 return -EAGAIN;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 13f814485a36..f6d0e209c44e 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -11643,9 +11643,6 @@ static int bnx2x_close(struct net_device *dev)
         /* Unload the driver, release IRQs */
         bnx2x_nic_unload(bp, UNLOAD_CLOSE, false);
 
-        /* Power off */
-        bnx2x_set_power_state(bp, PCI_D3hot);
-
         return 0;
 }