1 files changed, 106 insertions, 28 deletions

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 3a086d3a7cbf..bf9c05be347b 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -70,18 +70,15 @@
    VLAN:GSO + CKSUM + Data + skb_frags * DMA */
 #define MAX_SKB_TX_LE   (2 + (sizeof(dma_addr_t)/sizeof(u32))*(MAX_SKB_FRAGS+1))
 #define TX_MIN_PENDING          (MAX_SKB_TX_LE+1)
-#define TX_MAX_PENDING          4096
+#define TX_MAX_PENDING          1024
 #define TX_DEF_PENDING          127
 
-#define STATUS_RING_SIZE        2048    /* 2 ports * (TX + 2*RX) */
-#define STATUS_LE_BYTES         (STATUS_RING_SIZE*sizeof(struct sky2_status_le))
 #define TX_WATCHDOG             (5 * HZ)
 #define NAPI_WEIGHT             64
 #define PHY_RETRIES             1000
 
 #define SKY2_EEPROM_MAGIC       0x9955aabb
 
-
 #define RING_NEXT(x,s)  (((x)+1) & ((s)-1))
 
 static const u32 default_msg =
@@ -1132,7 +1129,7 @@ static int sky2_rx_map_skb(struct pci_dev *pdev, struct rx_ring_info *re,
         if (pci_dma_mapping_error(pdev, re->data_addr))
                 goto mapping_error;
 
-        pci_unmap_len_set(re, data_size, size);
+        dma_unmap_len_set(re, data_size, size);
 
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
@@ -1154,7 +1151,7 @@ map_page_error:
                                PCI_DMA_FROMDEVICE);
         }
 
-        pci_unmap_single(pdev, re->data_addr, pci_unmap_len(re, data_size),
+        pci_unmap_single(pdev, re->data_addr, dma_unmap_len(re, data_size),
                          PCI_DMA_FROMDEVICE);
 
 mapping_error:
@@ -1169,7 +1166,7 @@ static void sky2_rx_unmap_skb(struct pci_dev *pdev, struct rx_ring_info *re)
         struct sk_buff *skb = re->skb;
         int i;
 
-        pci_unmap_single(pdev, re->data_addr, pci_unmap_len(re, data_size),
+        pci_unmap_single(pdev, re->data_addr, dma_unmap_len(re, data_size),
                          PCI_DMA_FROMDEVICE);
 
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
@@ -1196,6 +1193,39 @@ static void rx_set_checksum(struct sky2_port *sky2)
                      ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
 }
 
+/* Enable/disable receive hash calculation (RSS) */
+static void rx_set_rss(struct net_device *dev)
+{
+        struct sky2_port *sky2 = netdev_priv(dev);
+        struct sky2_hw *hw = sky2->hw;
+        int i, nkeys = 4;
+
+        /* Supports IPv6 and other modes */
+        if (hw->flags & SKY2_HW_NEW_LE) {
+                nkeys = 10;
+                sky2_write32(hw, SK_REG(sky2->port, RSS_CFG), HASH_ALL);
+        }
+
+        /* Program RSS initial values */
+        if (dev->features & NETIF_F_RXHASH) {
+                u32 key[nkeys];
+
+                get_random_bytes(key, nkeys * sizeof(u32));
+                for (i = 0; i < nkeys; i++)
+                        sky2_write32(hw, SK_REG(sky2->port, RSS_KEY + i * 4),
+                                     key[i]);
+
+                /* Need to turn on (undocumented) flag to make hashing work  */
+                sky2_write32(hw, SK_REG(sky2->port, RX_GMF_CTRL_T),
+                             RX_STFW_ENA);
+
+                sky2_write32(hw, Q_ADDR(rxqaddr[sky2->port], Q_CSR),
+                             BMU_ENA_RX_RSS_HASH);
+        } else
+                sky2_write32(hw, Q_ADDR(rxqaddr[sky2->port], Q_CSR),
+                             BMU_DIS_RX_RSS_HASH);
+}
+
 /*
  * The RX Stop command will not work for Yukon-2 if the BMU does not
  * reach the end of packet and since we can't make sure that we have
@@ -1428,6 +1458,9 @@ static void sky2_rx_start(struct sky2_port *sky2)
         if (!(hw->flags & SKY2_HW_NEW_LE))
                 rx_set_checksum(sky2);
 
+        if (!(hw->flags & SKY2_HW_RSS_BROKEN))
+                rx_set_rss(sky2->netdev);
+
         /* submit Rx ring */
         for (i = 0; i < sky2->rx_pending; i++) {
                 re = sky2->rx_ring + i;
@@ -1662,12 +1695,12 @@ static unsigned tx_le_req(const struct sk_buff *skb)
 static void sky2_tx_unmap(struct pci_dev *pdev, struct tx_ring_info *re)
 {
         if (re->flags & TX_MAP_SINGLE)
-                pci_unmap_single(pdev, pci_unmap_addr(re, mapaddr),
-                                 pci_unmap_len(re, maplen),
+                pci_unmap_single(pdev, dma_unmap_addr(re, mapaddr),
+                                 dma_unmap_len(re, maplen),
                                  PCI_DMA_TODEVICE);
         else if (re->flags & TX_MAP_PAGE)
-                pci_unmap_page(pdev, pci_unmap_addr(re, mapaddr),
-                               pci_unmap_len(re, maplen),
+                pci_unmap_page(pdev, dma_unmap_addr(re, mapaddr),
+                               dma_unmap_len(re, maplen),
                                PCI_DMA_TODEVICE);
         re->flags = 0;
 }
@@ -1778,8 +1811,8 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
 
         re = sky2->tx_ring + slot;
         re->flags = TX_MAP_SINGLE;
-        pci_unmap_addr_set(re, mapaddr, mapping);
-        pci_unmap_len_set(re, maplen, len);
+        dma_unmap_addr_set(re, mapaddr, mapping);
+        dma_unmap_len_set(re, maplen, len);
 
         le = get_tx_le(sky2, &slot);
         le->addr = cpu_to_le32(lower_32_bits(mapping));
@@ -1807,8 +1840,8 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
 
                 re = sky2->tx_ring + slot;
                 re->flags = TX_MAP_PAGE;
-                pci_unmap_addr_set(re, mapaddr, mapping);
-                pci_unmap_len_set(re, maplen, frag->size);
+                dma_unmap_addr_set(re, mapaddr, mapping);
+                dma_unmap_len_set(re, maplen, frag->size);
 
                 le = get_tx_le(sky2, &slot);
                 le->addr = cpu_to_le32(lower_32_bits(mapping));
@@ -2537,6 +2570,14 @@ static void sky2_rx_checksum(struct sky2_port *sky2, u32 status)
         }
 }
 
+static void sky2_rx_hash(struct sky2_port *sky2, u32 status)
+{
+        struct sk_buff *skb;
+
+        skb = sky2->rx_ring[sky2->rx_next].skb;
+        skb->rxhash = le32_to_cpu(status);
+}
+
 /* Process status response ring */
 static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
 {
@@ -2558,7 +2599,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
                 if (!(opcode & HW_OWNER))
                         break;
 
-                hw->st_idx = RING_NEXT(hw->st_idx, STATUS_RING_SIZE);
+                hw->st_idx = RING_NEXT(hw->st_idx, hw->st_size);
 
                 port = le->css & CSS_LINK_BIT;
                 dev = hw->dev[port];
@@ -2609,6 +2650,10 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
                                 sky2_rx_checksum(sky2, status);
                         break;
 
+                case OP_RSS_HASH:
+                        sky2_rx_hash(sky2, status);
+                        break;
+
                 case OP_TXINDEXLE:
                         /* TX index reports status for both ports */
                         sky2_tx_done(hw->dev[0], status & 0xfff);
@@ -2963,6 +3008,8 @@ static int __devinit sky2_init(struct sky2_hw *hw)
         switch(hw->chip_id) {
         case CHIP_ID_YUKON_XL:
                 hw->flags = SKY2_HW_GIGABIT | SKY2_HW_NEWER_PHY;
+                if (hw->chip_rev < CHIP_REV_YU_XL_A2)
+                        hw->flags |= SKY2_HW_RSS_BROKEN;
                 break;
 
         case CHIP_ID_YUKON_EC_U:
@@ -2988,10 +3035,11 @@ static int __devinit sky2_init(struct sky2_hw *hw)
                         dev_err(&hw->pdev->dev, "unsupported revision Yukon-EC rev A1\n");
                         return -EOPNOTSUPP;
                 }
-                hw->flags = SKY2_HW_GIGABIT;
+                hw->flags = SKY2_HW_GIGABIT | SKY2_HW_RSS_BROKEN;
                 break;
 
         case CHIP_ID_YUKON_FE:
+                hw->flags = SKY2_HW_RSS_BROKEN;
                 break;
 
         case CHIP_ID_YUKON_FE_P:
@@ -3198,7 +3246,7 @@ static void sky2_reset(struct sky2_hw *hw)
         for (i = 0; i < hw->ports; i++)
                 sky2_gmac_reset(hw, i);
 
-        memset(hw->st_le, 0, STATUS_LE_BYTES);
+        memset(hw->st_le, 0, hw->st_size * sizeof(struct sky2_status_le));
         hw->st_idx = 0;
 
         sky2_write32(hw, STAT_CTRL, SC_STAT_RST_SET);
@@ -3208,7 +3256,7 @@ static void sky2_reset(struct sky2_hw *hw)
         sky2_write32(hw, STAT_LIST_ADDR_HI, (u64) hw->st_dma >> 32);
 
         /* Set the list last index */
-        sky2_write16(hw, STAT_LAST_IDX, STATUS_RING_SIZE - 1);
+        sky2_write16(hw, STAT_LAST_IDX, hw->st_size - 1);
 
         sky2_write16(hw, STAT_TX_IDX_TH, 10);
         sky2_write8(hw, STAT_FIFO_WM, 16);
@@ -4115,6 +4163,25 @@ static int sky2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom
         return sky2_vpd_write(sky2->hw, cap, data, eeprom->offset, eeprom->len);
 }
 
+static int sky2_set_flags(struct net_device *dev, u32 data)
+{
+        struct sky2_port *sky2 = netdev_priv(dev);
+
+        if (data & ~ETH_FLAG_RXHASH)
+                return -EOPNOTSUPP;
+
+        if (data & ETH_FLAG_RXHASH) {
+                if (sky2->hw->flags & SKY2_HW_RSS_BROKEN)
+                        return -EINVAL;
+
+                dev->features |= NETIF_F_RXHASH;
+        } else
+                dev->features &= ~NETIF_F_RXHASH;
+
+        rx_set_rss(dev);
+
+        return 0;
+}
 
 static const struct ethtool_ops sky2_ethtool_ops = {
         .get_settings   = sky2_get_settings,
@@ -4146,6 +4213,7 @@ static const struct ethtool_ops sky2_ethtool_ops = {
         .phys_id        = sky2_phys_id,
         .get_sset_count = sky2_get_sset_count,
         .get_ethtool_stats = sky2_get_ethtool_stats,
+        .set_flags      = sky2_set_flags,
 };
 
 #ifdef CONFIG_SKY2_DEBUG
@@ -4256,12 +4324,13 @@ static int sky2_debug_show(struct seq_file *seq, void *v)
         napi_disable(&hw->napi);
         last = sky2_read16(hw, STAT_PUT_IDX);
 
+        seq_printf(seq, "Status ring %u\n", hw->st_size);
         if (hw->st_idx == last)
                 seq_puts(seq, "Status ring (empty)\n");
         else {
                 seq_puts(seq, "Status ring\n");
-                for (idx = hw->st_idx; idx != last && idx < STATUS_RING_SIZE;
-                     idx = RING_NEXT(idx, STATUS_RING_SIZE)) {
+                for (idx = hw->st_idx; idx != last && idx < hw->st_size;
+                     idx = RING_NEXT(idx, hw->st_size)) {
                         const struct sky2_status_le *le = hw->st_le + idx;
                         seq_printf(seq, "[%d] %#x %d %#x\n",
                                    idx, le->opcode, le->length, le->status);
@@ -4498,6 +4567,10 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
         if (highmem)
                 dev->features |= NETIF_F_HIGHDMA;
 
+        /* Enable receive hashing unless hardware is known broken */
+        if (!(hw->flags & SKY2_HW_RSS_BROKEN))
+                dev->features |= NETIF_F_RXHASH;
+
 #ifdef SKY2_VLAN_TAG_USED
         /* The workaround for FE+ status conflicts with VLAN tag detection. */
         if (!(sky2->hw->chip_id == CHIP_ID_YUKON_FE_P &&
@@ -4689,15 +4762,17 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                 goto err_out_free_hw;
         }
 
-        /* ring for status responses */
-        hw->st_le = pci_alloc_consistent(pdev, STATUS_LE_BYTES, &hw->st_dma);
-        if (!hw->st_le)
-                goto err_out_iounmap;
-
         err = sky2_init(hw);
         if (err)
                 goto err_out_iounmap;
 
+        /* ring for status responses */
+        hw->st_size = hw->ports * roundup_pow_of_two(3*RX_MAX_PENDING + TX_MAX_PENDING);
+        hw->st_le = pci_alloc_consistent(pdev, hw->st_size * sizeof(struct sky2_status_le),
+                                         &hw->st_dma);
+        if (!hw->st_le)
+                goto err_out_reset;
+
         dev_info(&pdev->dev, "Yukon-2 %s chip revision %d\n",
                  sky2_name(hw->chip_id, buf1, sizeof(buf1)), hw->chip_rev);
 
@@ -4771,8 +4846,10 @@ err_out_unregister:
 err_out_free_netdev:
         free_netdev(dev);
 err_out_free_pci:
+        pci_free_consistent(pdev, hw->st_size * sizeof(struct sky2_status_le),
+                            hw->st_le, hw->st_dma);
+err_out_reset:
         sky2_write8(hw, B0_CTST, CS_RST_SET);
-        pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
 err_out_iounmap:
         iounmap(hw->regs);
 err_out_free_hw:
@@ -4810,7 +4887,8 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
         free_irq(pdev->irq, hw);
         if (hw->flags & SKY2_HW_USE_MSI)
                 pci_disable_msi(pdev);
-        pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
+        pci_free_consistent(pdev, hw->st_size * sizeof(struct sky2_status_le),
+                            hw->st_le, hw->st_dma);
         pci_release_regions(pdev);
         pci_disable_device(pdev);