1 files changed, 65 insertions, 40 deletions

diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index 2c03f4e2ccc4..7373dafbb3f7 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -42,7 +42,6 @@
 #define ipg_r16(reg)            ioread16(ioaddr + (reg))
 #define ipg_r8(reg)             ioread8(ioaddr + (reg))
 
-#define JUMBO_FRAME_4k_ONLY
 enum {
         netdev_io_size = 128
 };
@@ -55,6 +54,14 @@ MODULE_DESCRIPTION("IC Plus IP1000 Gigabit Ethernet Adapter Linux Driver");
 MODULE_LICENSE("GPL");
 
 /*
+ * Defaults
+ */
+#define IPG_MAX_RXFRAME_SIZE    0x0600
+#define IPG_RXFRAG_SIZE         0x0600
+#define IPG_RXSUPPORT_SIZE      0x0600
+#define IPG_IS_JUMBO            false
+
+/*
  * Variable record -- index by leading revision/length
  * Revision/Length(=N*4), Address1, Data1, Address2, Data2,...,AddressN,DataN
  */
@@ -631,6 +638,7 @@ static void ipg_nic_set_multicast_list(struct net_device *dev)
 
 static int ipg_io_config(struct net_device *dev)
 {
+        struct ipg_nic_private *sp = netdev_priv(dev);
         void __iomem *ioaddr = ipg_ioaddr(dev);
         u32 origmacctrl;
         u32 restoremacctrl;
@@ -670,7 +678,7 @@ static int ipg_io_config(struct net_device *dev)
         /* Set RECEIVEMODE register. */
         ipg_nic_set_multicast_list(dev);
 
-        ipg_w16(IPG_MAX_RXFRAME_SIZE, MAX_FRAME_SIZE);
+        ipg_w16(sp->max_rxframe_size, MAX_FRAME_SIZE);
 
         ipg_w8(IPG_RXDMAPOLLPERIOD_VALUE,   RX_DMA_POLL_PERIOD);
         ipg_w8(IPG_RXDMAURGENTTHRESH_VALUE, RX_DMA_URGENT_THRESH);
@@ -730,7 +738,7 @@ static int ipg_get_rxbuff(struct net_device *dev, int entry)
 
         IPG_DEBUG_MSG("_get_rxbuff\n");
 
-        skb = netdev_alloc_skb(dev, IPG_RXSUPPORT_SIZE + NET_IP_ALIGN);
+        skb = netdev_alloc_skb(dev, sp->rxsupport_size + NET_IP_ALIGN);
         if (!skb) {
                 sp->rx_buff[entry] = NULL;
                 return -ENOMEM;
@@ -751,7 +759,7 @@ static int ipg_get_rxbuff(struct net_device *dev, int entry)
                 sp->rx_buf_sz, PCI_DMA_FROMDEVICE));
 
         /* Set the RFD fragment length. */
-        rxfragsize = IPG_RXFRAG_SIZE;
+        rxfragsize = sp->rxfrag_size;
         rxfd->frag_info |= cpu_to_le64((rxfragsize << 48) & IPG_RFI_FRAGLEN);
 
         return 0;
@@ -1076,8 +1084,6 @@ static int ipg_nic_rxrestore(struct net_device *dev)
         return 0;
 }
 
-#ifdef JUMBO_FRAME
-
 /* use jumboindex and jumbosize to control jumbo frame status
  * initial status is jumboindex=-1 and jumbosize=0
  * 1. jumboindex = -1 and jumbosize=0 : previous jumbo frame has been done.
@@ -1097,7 +1103,7 @@ enum {
         FRAME_WITH_START_WITH_END = 11
 };
 
-inline void ipg_nic_rx_free_skb(struct net_device *dev)
+static void ipg_nic_rx_free_skb(struct net_device *dev)
 {
         struct ipg_nic_private *sp = netdev_priv(dev);
         unsigned int entry = sp->rx_current % IPG_RFDLIST_LENGTH;
@@ -1113,7 +1119,7 @@ inline void ipg_nic_rx_free_skb(struct net_device *dev)
         }
 }
 
-inline int ipg_nic_rx_check_frame_type(struct net_device *dev)
+static int ipg_nic_rx_check_frame_type(struct net_device *dev)
 {
         struct ipg_nic_private *sp = netdev_priv(dev);
         struct ipg_rx *rxfd = sp->rxd + (sp->rx_current % IPG_RFDLIST_LENGTH);
@@ -1126,7 +1132,7 @@ inline int ipg_nic_rx_check_frame_type(struct net_device *dev)
         return type;
 }
 
-inline int ipg_nic_rx_check_error(struct net_device *dev)
+static int ipg_nic_rx_check_error(struct net_device *dev)
 {
         struct ipg_nic_private *sp = netdev_priv(dev);
         unsigned int entry = sp->rx_current % IPG_RFDLIST_LENGTH;
@@ -1209,8 +1215,8 @@ static void ipg_nic_rx_with_start_and_end(struct net_device *dev,
 
         /* accept this frame and send to upper layer */
         framelen = le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFRAMELEN;
-        if (framelen > IPG_RXFRAG_SIZE)
-                framelen = IPG_RXFRAG_SIZE;
+        if (framelen > sp->rxfrag_size)
+                framelen = sp->rxfrag_size;
 
         skb_put(skb, framelen);
         skb->protocol = eth_type_trans(skb, dev);
@@ -1243,10 +1249,10 @@ static void ipg_nic_rx_with_start(struct net_device *dev,
         pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN),
                          sp->rx_buf_sz, PCI_DMA_FROMDEVICE);
 
-        skb_put(skb, IPG_RXFRAG_SIZE);
+        skb_put(skb, sp->rxfrag_size);
 
         jumbo->found_start = 1;
-        jumbo->current_size = IPG_RXFRAG_SIZE;
+        jumbo->current_size = sp->rxfrag_size;
         jumbo->skb = skb;
 
         sp->rx_buff[entry] = NULL;
@@ -1272,11 +1278,7 @@ static void ipg_nic_rx_with_end(struct net_device *dev,
                         framelen = le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFRAMELEN;
 
                         endframelen = framelen - jumbo->current_size;
-                        /*
-                        if (framelen > IPG_RXFRAG_SIZE)
-                                framelen=IPG_RXFRAG_SIZE;
-                         */
-                        if (framelen > IPG_RXSUPPORT_SIZE)
+                        if (framelen > sp->rxsupport_size)
                                 dev_kfree_skb_irq(jumbo->skb);
                         else {
                                 memcpy(skb_put(jumbo->skb, endframelen),
@@ -1316,11 +1318,11 @@ static void ipg_nic_rx_no_start_no_end(struct net_device *dev,
 
                 if (skb) {
                         if (jumbo->found_start) {
-                                jumbo->current_size += IPG_RXFRAG_SIZE;
-                                if (jumbo->current_size <= IPG_RXSUPPORT_SIZE) {
+                                jumbo->current_size += sp->rxfrag_size;
+                                if (jumbo->current_size <= sp->rxsupport_size) {
                                         memcpy(skb_put(jumbo->skb,
-                                                       IPG_RXFRAG_SIZE),
-                                               skb->data, IPG_RXFRAG_SIZE);
+                                                       sp->rxfrag_size),
+                                               skb->data, sp->rxfrag_size);
                                 }
                         }
                         dev->last_rx = jiffies;
@@ -1334,7 +1336,7 @@ static void ipg_nic_rx_no_start_no_end(struct net_device *dev,
         }
 }
 
-static int ipg_nic_rx(struct net_device *dev)
+static int ipg_nic_rx_jumbo(struct net_device *dev)
 {
         struct ipg_nic_private *sp = netdev_priv(dev);
         unsigned int curr = sp->rx_current;
@@ -1382,7 +1384,6 @@ static int ipg_nic_rx(struct net_device *dev)
         return 0;
 }
 
-#else
 static int ipg_nic_rx(struct net_device *dev)
 {
         /* Transfer received Ethernet frames to higher network layers. */
@@ -1413,11 +1414,11 @@ static int ipg_nic_rx(struct net_device *dev)
                 /* Check for jumbo frame arrival with too small
                  * RXFRAG_SIZE.
                  */
-                if (framelen > IPG_RXFRAG_SIZE) {
+                if (framelen > sp->rxfrag_size) {
                         IPG_DEBUG_MSG
                             ("RFS FrameLen > allocated fragment size.\n");
 
-                        framelen = IPG_RXFRAG_SIZE;
+                        framelen = sp->rxfrag_size;
                 }
 
                 if ((IPG_DROP_ON_RX_ETH_ERRORS && (le64_to_cpu(rxfd->rfs) &
@@ -1556,7 +1557,6 @@ static int ipg_nic_rx(struct net_device *dev)
 
         return 0;
 }
-#endif
 
 static void ipg_reset_after_host_error(struct work_struct *work)
 {
@@ -1592,9 +1592,9 @@ static irqreturn_t ipg_interrupt_handler(int irq, void *dev_inst)
 
         IPG_DEBUG_MSG("_interrupt_handler\n");
 
-#ifdef JUMBO_FRAME
-        ipg_nic_rxrestore(dev);
-#endif
+        if (sp->is_jumbo)
+                ipg_nic_rxrestore(dev);
+
         spin_lock(&sp->lock);
 
         /* Get interrupt source information, and acknowledge
@@ -1650,7 +1650,10 @@ static irqreturn_t ipg_interrupt_handler(int irq, void *dev_inst)
                         sp->RFDListCheckedCount++;
 #endif
 
-                ipg_nic_rx(dev);
+                if (sp->is_jumbo)
+                        ipg_nic_rx_jumbo(dev);
+                else
+                        ipg_nic_rx(dev);
         }
 
         /* If TxDMAComplete interrupt, free used TFDs. */
@@ -1749,7 +1752,7 @@ static int ipg_nic_open(struct net_device *dev)
 
         IPG_DEBUG_MSG("_nic_open\n");
 
-        sp->rx_buf_sz = IPG_RXSUPPORT_SIZE;
+        sp->rx_buf_sz = sp->rxsupport_size;
 
         /* Check for interrupt line conflicts, and request interrupt
          * line for IPG.
@@ -1804,13 +1807,10 @@ static int ipg_nic_open(struct net_device *dev)
         if (ipg_config_autoneg(dev) < 0)
                 printk(KERN_INFO "%s: Auto-negotiation error.\n", dev->name);
 
-#ifdef JUMBO_FRAME
         /* initialize JUMBO Frame control variable */
         sp->jumbo.found_start = 0;
         sp->jumbo.current_size = 0;
         sp->jumbo.skb = NULL;
-        dev->mtu = IPG_TXFRAG_SIZE;
-#endif
 
         /* Enable transmit and receive operation of the IPG. */
         ipg_w32((ipg_r32(MAC_CTRL) | IPG_MC_RX_ENABLE | IPG_MC_TX_ENABLE) &
@@ -2119,6 +2119,9 @@ static int ipg_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
 static int ipg_nic_change_mtu(struct net_device *dev, int new_mtu)
 {
+        struct ipg_nic_private *sp = netdev_priv(dev);
+        int err;
+
         /* Function to accomodate changes to Maximum Transfer Unit
          * (or MTU) of IPG NIC. Cannot use default function since
          * the default will not allow for MTU > 1500 bytes.
@@ -2126,16 +2129,33 @@ static int ipg_nic_change_mtu(struct net_device *dev, int new_mtu)
 
         IPG_DEBUG_MSG("_nic_change_mtu\n");
 
-        /* Check that the new MTU value is between 68 (14 byte header, 46
-         * byte payload, 4 byte FCS) and IPG_MAX_RXFRAME_SIZE, which
-         * corresponds to the MAXFRAMESIZE register in the IPG.
+        /*
+         * Check that the new MTU value is between 68 (14 byte header, 46 byte
+         * payload, 4 byte FCS) and 10 KB, which is the largest supported MTU.
          */
-        if ((new_mtu < 68) || (new_mtu > IPG_MAX_RXFRAME_SIZE))
+        if (new_mtu < 68 || new_mtu > 10240)
                 return -EINVAL;
 
+        err = ipg_nic_stop(dev);
+        if (err)
+                return err;
+
         dev->mtu = new_mtu;
 
-        return 0;
+        sp->max_rxframe_size = new_mtu;
+
+        sp->rxfrag_size = new_mtu;
+        if (sp->rxfrag_size > 4088)
+                sp->rxfrag_size = 4088;
+
+        sp->rxsupport_size = sp->max_rxframe_size;
+
+        if (new_mtu > 0x0600)
+                sp->is_jumbo = true;
+        else
+                sp->is_jumbo = false;
+
+        return ipg_nic_open(dev);
 }
 
 static int ipg_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -2240,6 +2260,11 @@ static int __devinit ipg_probe(struct pci_dev *pdev,
         spin_lock_init(&sp->lock);
         mutex_init(&sp->mii_mutex);
 
+        sp->is_jumbo = IPG_IS_JUMBO;
+        sp->rxfrag_size = IPG_RXFRAG_SIZE;
+        sp->rxsupport_size = IPG_RXSUPPORT_SIZE;
+        sp->max_rxframe_size = IPG_MAX_RXFRAME_SIZE;
+
         /* Declare IPG NIC functions for Ethernet device methods.
          */
         dev->open = &ipg_nic_open;