Packman Build Service PMBS

r8168.changes Changed

r8168.spec Changed

r8168-kernel_version.patch Changed

r8168-8.047.01.tar.bz2/src/r8168.h -> r8168-8.047.04.tar.bz2/src/r8168.h Changed

@@ -327,7 +327,7 @@
 #define DASH_SUFFIX ""
 #endif
 
-#define RTL8168_VERSION "8.047.01" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
+#define RTL8168_VERSION "8.047.04" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
 #define MODULENAME "r8168"
 #define PFX MODULENAME ": "
 
@@ -1576,6 +1576,8 @@
 
         u16 phy_reg_anlpar;
 
+        u32 HwPcieSNOffset;
+
         //Dash+++++++++++++++++
         u8 HwSuppDashVer;
         u8 DASH;
@@ -1665,6 +1667,9 @@
         //Realwow--------------
 #endif //ENABLE_REALWOW_SUPPORT
 
+        u32 eee_adv_t;
+        u8 eee_enabled;
+
 #ifdef ENABLE_R8168_PROCFS
         //Procfs support
         struct proc_dir_entry *proc_dir;
@@ -1749,7 +1754,7 @@
 #define NIC_RAMCODE_VERSION_CFG_METHOD_23 (0x0015)
 #define NIC_RAMCODE_VERSION_CFG_METHOD_26 (0x0012)
 #define NIC_RAMCODE_VERSION_CFG_METHOD_28 (0x0019)
-#define NIC_RAMCODE_VERSION_CFG_METHOD_29 (0x0018)
+#define NIC_RAMCODE_VERSION_CFG_METHOD_29 (0x0055)
 #define NIC_RAMCODE_VERSION_CFG_METHOD_31 (0x0003)
 
 //hwoptimize

r8168-8.047.01.tar.bz2/src/r8168_n.c -> r8168-8.047.04.tar.bz2/src/r8168_n.c Changed

@@ -2743,7 +2743,7 @@
 }
 
 static void
-rtl8168_clear_and_aet_other_fun_pci_bit(struct rtl8168_private *tp,
+rtl8168_clear_and_set_other_fun_pci_bit(struct rtl8168_private *tp,
                                         u8 multi_fun_sel_bit,
                                         u32 addr,
                                         u32 clearmask,
@@ -2776,7 +2776,7 @@
                 //0: UMAC, 1: TCR1, 2: TCR2, 3: KCS, 4: EHCI(Control by EHCI Driver)
                 for (i = 0; i < 8; i++) {
                         if (FunBit & multi_fun_sel_bit)
-                                rtl8168_clear_and_aet_other_fun_pci_bit(tp, i, addr, clearmask, setmask);
+                                rtl8168_clear_and_set_other_fun_pci_bit(tp, i, addr, clearmask, setmask);
 
                         FunBit <<= 1;
                 }
@@ -2797,7 +2797,7 @@
                                                 set_other_fun = FALSE;
                                 } else if (i == 5 || i == 6) {
                                         if (tp->DASH) {
-                                                TmpUlong = rtl8168_mac_ocp_read(tp, 0x184);
+                                                TmpUlong = rtl8168_ocp_read(tp, 0x184, 4);
 
                                                 if (TmpUlong & BIT_26)
                                                         set_other_fun = FALSE;
@@ -2807,7 +2807,7 @@
                                 }
 
                                 if (set_other_fun)
-                                        rtl8168_clear_and_aet_other_fun_pci_bit(tp, i, addr, clearmask, setmask);
+                                        rtl8168_clear_and_set_other_fun_pci_bit(tp, i, addr, clearmask, setmask);
                         }
 
                         FunBit <<= 1;
@@ -4316,6 +4316,10 @@
                 break;
         }
 
+#ifdef ENABLE_REALWOW_SUPPORT
+        rtl8168_set_realwow_d3_para(dev);
+#endif
+
         if (tp->mcfg == CFG_METHOD_18 || tp->mcfg == CFG_METHOD_19 || tp->mcfg == CFG_METHOD_20) {
                 rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
                 rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x0000002d, ERIAR_ExGMAC);
@@ -4355,6 +4359,7 @@
                         rtl8168_mdio_write(tp, 0x1F, 0x0000);
                 }
         }
+
         if (tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 rtl8168_set_dash_other_fun_dev_state_change(tp, 3, 0xFD);
         }
@@ -4366,7 +4371,8 @@
             tp->mcfg == CFG_METHOD_27 || tp->mcfg == CFG_METHOD_28 ||
             tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30 ||
             tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32)
-                rtl8168_disable_ocp_phy_power_saving(dev);
+                if (!tp->dash_printer_enabled)
+                        rtl8168_disable_ocp_phy_power_saving(dev);
 
         rtl8168_disable_rxdvgate(dev);
 }
@@ -4645,8 +4651,10 @@
         }
 
         switch (tp->mcfg) {
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
+        case CFG_METHOD_14 ... CFG_METHOD_15:
+                RTL_W8(0xD0, RTL_R8(0xD0) & ~BIT_6);
+                break;
+        case CFG_METHOD_16 ... CFG_METHOD_32:
                 RTL_W8(0xD0, RTL_R8(0xD0) & ~BIT_6);
                 RTL_W8(0xF2, RTL_R8(0xF2) & ~BIT_6);
                 break;
@@ -5203,7 +5211,7 @@
                     SUPPORTED_1000baseT_Full |
                     SUPPORTED_Autoneg |
                     SUPPORTED_TP |
-                    SUPPORTED_Pause	|
+                    SUPPORTED_Pause |
                     SUPPORTED_Asym_Pause;
 
         advertising = ADVERTISED_TP;
@@ -5595,192 +5603,6 @@
 }
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
-static int
-rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *eee)
-{
-        struct rtl8168_private *tp = netdev_priv(net);
-        void __iomem *ioaddr = tp->mmio_addr;
-        u32 lp, adv, supported = 0;
-        unsigned long flags;
-        u16 val;
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-                break;
-        default:
-                return -EOPNOTSUPP;
-        }
-
-        if (unlikely(tp->rtk_enable_diag))
-                return -EBUSY;
-
-        spin_lock_irqsave(&tp->lock, flags);
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0A5C);
-        val = rtl8168_mdio_read(tp, 0x12);
-        supported = mmd_eee_cap_to_ethtool_sup_t(val);
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0A5D);
-        val = rtl8168_mdio_read(tp, 0x10);
-        adv = mmd_eee_adv_to_ethtool_adv_t(val);
-
-        val = rtl8168_mdio_read(tp, 0x11);
-        lp = mmd_eee_adv_to_ethtool_adv_t(val);
-
-        val = rtl8168_eri_read(ioaddr, 0x1B0, 2, ERIAR_ExGMAC);
-        val &= BIT_1 | BIT_0;
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        spin_unlock_irqrestore(&tp->lock, flags);
-
-        eee->eee_enabled = !!val;
-        eee->eee_active = !!(supported & adv & lp);
-        eee->supported = supported;
-        eee->advertised = adv;
-        eee->lp_advertised = lp;
-
-        return 0;
-}
-
-static int
-rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *eee)
-{
-        struct rtl8168_private *tp = netdev_priv(net);
-        void __iomem *ioaddr = tp->mmio_addr;
-        unsigned long flags;
-        u32 data;
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-                break;
-        default:
-                return -EOPNOTSUPP;
-        }
-
-        spin_lock_irqsave(&tp->lock, flags);
-
-        if (unlikely(tp->rtk_enable_diag)) {
-                spin_unlock_irqrestore(&tp->lock, flags);
-                return -EBUSY;
-        }
-
-        data = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
-        if (eee->eee_enabled) {
-                data |= BIT_1 | BIT_0;
-                rtl8168_eri_write(ioaddr, 0x1B0, 4, data, ERIAR_ExGMAC);
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                data = rtl8168_mdio_read(tp, 0x11);
-                rtl8168_mdio_write(tp, 0x11, data | BIT_4);
-                data = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
-                rtl8168_mdio_write(tp, 0x1F, 0x0A5D);
-                rtl8168_mdio_write(tp, 0x10, data);
-        } else {
-                data &= ~(BIT_1 | BIT_0);
-                rtl8168_eri_write(ioaddr, 0x1B0, 4, data, ERIAR_ExGMAC);
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                data = rtl8168_mdio_read(tp, 0x11);
-                rtl8168_mdio_write(tp, 0x11, data & ~BIT_4);
-                rtl8168_mdio_write(tp, 0x1F, 0x0A5D);
-                rtl8168_mdio_write(tp, 0x10, 0x0000);
-        }
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-        data = rtl8168_mdio_read(tp, MII_BMCR);
-        data |= BMCR_RESET;
-        rtl8168_mdio_write(tp, MII_BMCR, data);
-
-        spin_unlock_irqrestore(&tp->lock, flags);
-
-        return 0;
-}
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */
-
-static int rtl_nway_reset(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        unsigned long flags;
-        int ret, bmcr;

r8168-8.047.01.tar.bz2/src/r8168_realwow.h -> r8168-8.047.04.tar.bz2/src/r8168_realwow.h Changed

Changes of Revision 12