Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 26 insertions, 11 deletions

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 11178f9dc838..24d367280ecf 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -31,7 +31,7 @@
 #define NETNEXT_VERSION         "08"
 
 /* Information for net */
-#define NET_VERSION             "3"
+#define NET_VERSION             "4"
 
 #define DRIVER_VERSION          "v1." NETNEXT_VERSION "." NET_VERSION
 #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
@@ -116,6 +116,7 @@
 #define USB_TX_DMA              0xd434
 #define USB_TOLERANCE           0xd490
 #define USB_LPM_CTRL            0xd41a
+#define USB_BMU_RESET           0xd4b0
 #define USB_UPS_CTRL            0xd800
 #define USB_MISC_0              0xd81a
 #define USB_POWER_CUT           0xd80a
@@ -338,6 +339,10 @@
 #define TEST_MODE_DISABLE       0x00000001
 #define TX_SIZE_ADJUST1         0x00000100
 
+/* USB_BMU_RESET */
+#define BMU_RESET_EP_IN         0x01
+#define BMU_RESET_EP_OUT        0x02
+
 /* USB_UPS_CTRL */
 #define POWER_CUT               0x0100
 
@@ -2173,7 +2178,7 @@ static void r8153_set_rx_early_timeout(struct r8152 *tp)
 static void r8153_set_rx_early_size(struct r8152 *tp)
 {
         u32 mtu = tp->netdev->mtu;
-        u32 ocp_data = (agg_buf_sz - mtu - VLAN_ETH_HLEN - VLAN_HLEN) / 4;
+        u32 ocp_data = (agg_buf_sz - mtu - VLAN_ETH_HLEN - VLAN_HLEN) / 8;
 
         ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, ocp_data);
 }
@@ -2460,6 +2465,17 @@ static void r8153_teredo_off(struct r8152 *tp)
         ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TEREDO_TIMER, 0);
 }
 
+static void rtl_reset_bmu(struct r8152 *tp)
+{
+        u32 ocp_data;
+
+        ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_BMU_RESET);
+        ocp_data &= ~(BMU_RESET_EP_IN | BMU_RESET_EP_OUT);
+        ocp_write_byte(tp, MCU_TYPE_USB, USB_BMU_RESET, ocp_data);
+        ocp_data |= BMU_RESET_EP_IN | BMU_RESET_EP_OUT;
+        ocp_write_byte(tp, MCU_TYPE_USB, USB_BMU_RESET, ocp_data);
+}
+
 static void r8152_aldps_en(struct r8152 *tp, bool enable)
 {
         if (enable) {
@@ -2681,6 +2697,7 @@ static void r8153_first_init(struct r8152 *tp)
         ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
 
         rtl8152_nic_reset(tp);
+        rtl_reset_bmu(tp);
 
         ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
         ocp_data &= ~NOW_IS_OOB;
@@ -2742,6 +2759,7 @@ static void r8153_enter_oob(struct r8152 *tp)
         ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);
 
         rtl_disable(tp);
+        rtl_reset_bmu(tp);
 
         for (i = 0; i < 1000; i++) {
                 ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
@@ -2803,6 +2821,7 @@ static void rtl8153_disable(struct r8152 *tp)
 {
         r8153_aldps_en(tp, false);
         rtl_disable(tp);
+        rtl_reset_bmu(tp);
         r8153_aldps_en(tp, true);
         usb_enable_lpm(tp->udev);
 }
@@ -3400,15 +3419,11 @@ static void r8153_init(struct r8152 *tp)
         r8153_power_cut_en(tp, false);
         r8153_u1u2en(tp, true);
 
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ALDPS_SPDWN_RATIO);
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, EEE_SPDWN_RATIO);
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3,
-                       PKT_AVAIL_SPDWN_EN | SUSPEND_SPDWN_EN |
-                       U1U2_SPDWN_EN | L1_SPDWN_EN);
-        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4,
-                       PWRSAVE_SPDWN_EN | RXDV_SPDWN_EN | TX10MIDLE_EN |
-                       TP100_SPDWN_EN | TP500_SPDWN_EN | TP1000_SPDWN_EN |
-                       EEE_SPDWN_EN);
+        /* MAC clock speed down */
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, 0);
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, 0);
+        ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, 0);
 
         r8153_enable_eee(tp);
         r8153_aldps_en(tp, true);