Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-microblaze.git] / drivers / net / sky2.c

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index dd630cf..00bc65a 100644 (file)
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -256,6 +256,9 @@ static void sky2_power_on(struct sky2_hw *hw)
 
                sky2_read32(hw, B2_GP_IO);
        }
+
+       /* Turn on "driver loaded" LED */
+       sky2_write16(hw, B0_CTST, Y2_LED_STAT_ON);
 }
 
 static void sky2_power_aux(struct sky2_hw *hw)
@@ -269,11 +272,15 @@ static void sky2_power_aux(struct sky2_hw *hw)
                            Y2_CLK_GAT_LNK1_DIS | Y2_PCI_CLK_LNK2_DIS |
                            Y2_COR_CLK_LNK2_DIS | Y2_CLK_GAT_LNK2_DIS);
 
-       /* switch power to VAUX */
-       if (sky2_read16(hw, B0_CTST) & Y2_VAUX_AVAIL)
+       /* switch power to VAUX if supported and PME from D3cold */
+       if ( (sky2_read32(hw, B0_CTST) & Y2_VAUX_AVAIL) &&
+            pci_pme_capable(hw->pdev, PCI_D3cold))
                sky2_write8(hw, B0_POWER_CTRL,
                            (PC_VAUX_ENA | PC_VCC_ENA |
                             PC_VAUX_ON | PC_VCC_OFF));
+
+       /* turn off "driver loaded LED" */
+       sky2_write16(hw, B0_CTST, Y2_LED_STAT_OFF);
 }
 
 static void sky2_gmac_reset(struct sky2_hw *hw, unsigned port)
@@ -1207,9 +1214,6 @@ static int sky2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        }
 
        case SIOCSMIIREG:
-               if (!capable(CAP_NET_ADMIN))
-                       return -EPERM;
-
                spin_lock_bh(&sky2->phy_lock);
                err = gm_phy_write(hw, sky2->port, data->reg_num & 0x1f,
                                   data->val_in);
@@ -1399,6 +1403,61 @@ nomem:
        return -ENOMEM;
 }
 
+static int sky2_alloc_buffers(struct sky2_port *sky2)
+{
+       struct sky2_hw *hw = sky2->hw;
+
+       /* must be power of 2 */
+       sky2->tx_le = pci_alloc_consistent(hw->pdev,
+                                          sky2->tx_ring_size *
+                                          sizeof(struct sky2_tx_le),
+                                          &sky2->tx_le_map);
+       if (!sky2->tx_le)
+               goto nomem;
+
+       sky2->tx_ring = kcalloc(sky2->tx_ring_size, sizeof(struct tx_ring_info),
+                               GFP_KERNEL);
+       if (!sky2->tx_ring)
+               goto nomem;
+
+       sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
+                                          &sky2->rx_le_map);
+       if (!sky2->rx_le)
+               goto nomem;
+       memset(sky2->rx_le, 0, RX_LE_BYTES);
+
+       sky2->rx_ring = kcalloc(sky2->rx_pending, sizeof(struct rx_ring_info),
+                               GFP_KERNEL);
+       if (!sky2->rx_ring)
+               goto nomem;
+
+       return 0;
+nomem:
+       return -ENOMEM;
+}
+
+static void sky2_free_buffers(struct sky2_port *sky2)
+{
+       struct sky2_hw *hw = sky2->hw;
+
+       if (sky2->rx_le) {
+               pci_free_consistent(hw->pdev, RX_LE_BYTES,
+                                   sky2->rx_le, sky2->rx_le_map);
+               sky2->rx_le = NULL;
+       }
+       if (sky2->tx_le) {
+               pci_free_consistent(hw->pdev,
+                                   sky2->tx_ring_size * sizeof(struct sky2_tx_le),
+                                   sky2->tx_le, sky2->tx_le_map);
+               sky2->tx_le = NULL;
+       }
+       kfree(sky2->tx_ring);
+       kfree(sky2->rx_ring);
+
+       sky2->tx_ring = NULL;
+       sky2->rx_ring = NULL;
+}
+
 /* Bring up network interface. */
 static int sky2_up(struct net_device *dev)
 {
@@ -1406,7 +1465,7 @@ static int sky2_up(struct net_device *dev)
        struct sky2_hw *hw = sky2->hw;
        unsigned port = sky2->port;
        u32 imask, ramsize;
-       int cap, err = -ENOMEM;
+       int cap, err;
        struct net_device *otherdev = hw->dev[sky2->port^1];
 
        /*
@@ -1425,32 +1484,12 @@ static int sky2_up(struct net_device *dev)
 
        netif_carrier_off(dev);
 
-       /* must be power of 2 */
-       sky2->tx_le = pci_alloc_consistent(hw->pdev,
-                                          sky2->tx_ring_size *
-                                          sizeof(struct sky2_tx_le),
-                                          &sky2->tx_le_map);
-       if (!sky2->tx_le)
-               goto err_out;
-
-       sky2->tx_ring = kcalloc(sky2->tx_ring_size, sizeof(struct tx_ring_info),
-                               GFP_KERNEL);
-       if (!sky2->tx_ring)
+       err = sky2_alloc_buffers(sky2);
+       if (err)
                goto err_out;
 
        tx_init(sky2);
 
-       sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
-                                          &sky2->rx_le_map);
-       if (!sky2->rx_le)
-               goto err_out;
-       memset(sky2->rx_le, 0, RX_LE_BYTES);
-
-       sky2->rx_ring = kcalloc(sky2->rx_pending, sizeof(struct rx_ring_info),
-                               GFP_KERNEL);
-       if (!sky2->rx_ring)
-               goto err_out;
-
        sky2_mac_init(hw, port);
 
        /* Register is number of 4K blocks on internal RAM buffer. */
@@ -1507,22 +1546,7 @@ static int sky2_up(struct net_device *dev)
        return 0;
 
 err_out:
-       if (sky2->rx_le) {
-               pci_free_consistent(hw->pdev, RX_LE_BYTES,
-                                   sky2->rx_le, sky2->rx_le_map);
-               sky2->rx_le = NULL;
-       }
-       if (sky2->tx_le) {
-               pci_free_consistent(hw->pdev,
-                                   sky2->tx_ring_size * sizeof(struct sky2_tx_le),
-                                   sky2->tx_le, sky2->tx_le_map);
-               sky2->tx_le = NULL;
-       }
-       kfree(sky2->tx_ring);
-       kfree(sky2->rx_ring);
-
-       sky2->tx_ring = NULL;
-       sky2->rx_ring = NULL;
+       sky2_free_buffers(sky2);
        return err;
 }
 
@@ -1574,7 +1598,8 @@ static void sky2_tx_unmap(struct pci_dev *pdev,
  * the number of ring elements will probably be less than the number
  * of list elements used.
  */
-static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
+                                  struct net_device *dev)
 {
        struct sky2_port *sky2 = netdev_priv(dev);
        struct sky2_hw *hw = sky2->hw;
@@ -1866,9 +1891,6 @@ static int sky2_down(struct net_device *dev)
        sky2_phy_power_down(hw, port);
        spin_unlock_bh(&sky2->phy_lock);
 
-       /* turn off LED's */
-       sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);
-
        sky2_tx_reset(hw, port);
 
        /* Free any pending frames stuck in HW queue */
@@ -1876,20 +1898,7 @@ static int sky2_down(struct net_device *dev)
 
        sky2_rx_clean(sky2);
 
-       pci_free_consistent(hw->pdev, RX_LE_BYTES,
-                           sky2->rx_le, sky2->rx_le_map);
-       kfree(sky2->rx_ring);
-
-       pci_free_consistent(hw->pdev,
-                           sky2->tx_ring_size * sizeof(struct sky2_tx_le),
-                           sky2->tx_le, sky2->tx_le_map);
-       kfree(sky2->tx_ring);
-
-       sky2->tx_le = NULL;
-       sky2->rx_le = NULL;
-
-       sky2->rx_ring = NULL;
-       sky2->tx_ring = NULL;
+       sky2_free_buffers(sky2);
 
        return 0;
 }
@@ -2982,8 +2991,6 @@ static void sky2_reset(struct sky2_hw *hw)
        sky2_write8(hw, B2_TI_CTRL, TIM_STOP);
        sky2_write8(hw, B2_TI_CTRL, TIM_CLR_IRQ);
 
-       sky2_write8(hw, B0_Y2LED, LED_STAT_ON);
-
        /* Turn off descriptor polling */
        sky2_write32(hw, B28_DPT_CTRL, DPT_STOP);
 
@@ -4600,7 +4607,6 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
 
        sky2_power_aux(hw);
 
-       sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);
        sky2_write8(hw, B0_CTST, CS_RST_SET);
        sky2_read8(hw, B0_CTST);