r8152: support jumbo frame for RTL8153

The maximum jumbo frame size for RTL8153 is 9K bytes.
Change the max rx packet size to 9K.
Change the use of the shared fifo from 6K (default) to 12K for tx.

From http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=69b4b7a4148e94a3fe7f06f72ee70113a6c61837

Change-Id: Ibac731fdd34664b3a99e5a9c7019b8fbd5a355dd
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from upstream commit 69b4b7a4148e94a3fe7f06f72ee70113a6c61837)
Signed-off-by: Aly Hirani <ahirani@nvidia.com>
Reviewed-on: http://git-master/r/553394
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

1 files changed, 32 insertions, 4 deletions

diff --git a/drivers/net/usb/r8152_shield.c b/drivers/net/usb/r8152_shield.c
index 2ca77d2da..cd81f1bd1 100644
--- a/drivers/net/usb/r8152_shield.c
+++ b/drivers/net/usb/r8152_shield.c
@@ -60,6 +60,7 @@
 #define PLA_WDT6_CTRL           0xe428
 #define PLA_TCR0                0xe610
 #define PLA_TCR1                0xe612
+#define PLA_MTPS                0xe615
 #define PLA_TXFIFO_CTRL         0xe618
 #define PLA_RSTTALLY            0xe800
 #define PLA_CR                  0xe813
@@ -181,6 +182,10 @@
 /* PLA_TCR1 */
 #define VERSION_MASK            0x7cf0
 
+/* PLA_MTPS */
+#define MTPS_JUMBO              (12 * 1024 / 64)
+#define MTPS_DEFAULT            (6 * 1024 / 64)
+
 /* PLA_RSTTALLY */
 #define TALLY_RESET             0x0001
 
@@ -441,7 +446,10 @@ enum rtl_register_content {
 #define BYTE_EN_START_MASK      0x0f
 #define BYTE_EN_END_MASK        0xf0
 
+#define RTL8153_MAX_PACKET      9216 /* 9K */
+#define RTL8153_MAX_MTU         (RTL8153_MAX_PACKET - VLAN_ETH_HLEN - VLAN_HLEN)
 #define RTL8152_RMS             (VLAN_ETH_FRAME_LEN + VLAN_HLEN)
+#define RTL8153_RMS             RTL8153_MAX_PACKET
 #define RTL8152_TX_TIMEOUT      (5 * HZ)
 
 /* rtl8152 flags */
@@ -2559,7 +2567,8 @@ static void r8153_first_init(struct r8152 *tp)
         ocp_data &= ~CPCR_RX_VLAN;
         ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data);
 
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8153_RMS);
+        ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_JUMBO);
 
         ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0);
         ocp_data |= TCR0_AUTO_FIFO;
@@ -2609,7 +2618,7 @@ static void r8153_enter_oob(struct r8152 *tp)
                 mdelay(1);
         }
 
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8153_RMS);
 
         ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG);
         ocp_data &= ~TEREDO_WAKE_MASK;
@@ -3470,6 +3479,26 @@ out:
         return res;
 }
 
+static int rtl8152_change_mtu(struct net_device *dev, int new_mtu)
+{
+        struct r8152 *tp = netdev_priv(dev);
+
+        switch (tp->version) {
+        case RTL_VER_01:
+        case RTL_VER_02:
+                return eth_change_mtu(dev, new_mtu);
+        default:
+                break;
+        }
+
+        if (new_mtu < 68 || new_mtu > RTL8153_MAX_MTU)
+                return -EINVAL;
+
+        dev->mtu = new_mtu;
+
+        return 0;
+}
+
 static const struct net_device_ops rtl8152_netdev_ops = {
         .ndo_open               = rtl8152_open,
         .ndo_stop               = rtl8152_close,
@@ -3478,8 +3507,7 @@ static const struct net_device_ops rtl8152_netdev_ops = {
         .ndo_tx_timeout         = rtl8152_tx_timeout,
         .ndo_set_rx_mode        = rtl8152_set_rx_mode,
         .ndo_set_mac_address    = rtl8152_set_mac_address,
-
-        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_change_mtu         = rtl8152_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
 };