@@ -1,4 +1,10 @@

 -------------------------------------------------------------------

+Tue Jun  2 07:17:12 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

+

+- Update to version 8.048.03

+- Drop 83b957b4.patch (fixed upstream)

+

+-------------------------------------------------------------------

 Tue Mar 31 06:40:50 UTC 2020 - Werner Fink <werner@suse.de>

 - Add patch 83b957b4.patch to get it build for kernel 5.6 

​

@@ -1,7 +1,7 @@

 #

 # spec file for package r8168

 #

-# Copyright (c) 2019 Packman Team <packman@links2linux.de>

+# Copyright (c) 2020 Packman Team <packman@links2linux.de>

 # Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.

 #

 # All modifications and additions to the file contributed by third parties

@@ -18,7 +18,7 @@

 #!BuildIgnore: enough-build-resources

 Name:           r8168

-Version:        8.048.00

+Version:        8.048.03

 Release:        0

 Summary:        Device driver for RealTek Gigabit Ethernet controllers

 License:        GPL-2.0-or-later

@@ -31,7 +31,6 @@

 Source2:        Module.supported

 Patch0:         r8168-kernel_version.patch

 Patch1:         r8168-configuration.patch

-Patch42:        83b957b4.patch

 BuildRequires:  kernel-source

 BuildRequires:  kernel-syms

 BuildRequires:  libelf-devel

@@ -60,7 +59,6 @@

 %setup -q

 %patch0 -b .p0

 %patch1 -b .p1

-%patch42 -p1 -b .p42

 cp %{S:1} .

 cp %{S:2} .

​

@@ -1,97 +0,0 @@

-From 83b957b43d320da29476c6782be55df1bfb62d94 Mon Sep 17 00:00:00 2001

-From: petehg <pherworth@gmail.com>

-Date: Sun, 1 Mar 2020 09:38:25 +0000

-Subject: [PATCH] added patch for kernel-5.6

-

----

- src/r8168_n.c | 33 +++++++++++++++++++++++++++------

- 1 file changed, 27 insertions(+), 6 deletions(-)

-

-diff --git a/src/r8168_n.c b/src/r8168_n.c

-index 0df6041..557823e 100755

---- a/src/r8168_n.c

-+++ b/src/r8168_n.c

-@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev);

- static void rtl8168_hw_start(struct net_device *dev);

- static int rtl8168_close(struct net_device *dev);

- static void rtl8168_set_rx_mode(struct net_device *dev);

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) 

-+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu);

-+#else

- static void rtl8168_tx_timeout(struct net_device *dev);

-+#endif

- static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);

- static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget);

- static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);

-@@ -1615,7 +1619,14 @@ static int rtl8168_proc_open(struct inode *inode, struct file *file)

- 

-         return single_open(file, show, dev);

- }

--

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)

-+static const struct proc_ops rtl8168_proc_ops = {

-+        .proc_open           = rtl8168_proc_open,

-+        .proc_read           = seq_read,

-+        .proc_lseek          = seq_lseek,

-+        .proc_release        = single_release,

-+};

-+#else

- static const struct file_operations rtl8168_proc_fops = {

-         .open           = rtl8168_proc_open,

-         .read           = seq_read,

-@@ -1623,6 +1634,7 @@ static const struct file_operations rtl8168_proc_fops = {

-         .release        = single_release,

- };

- #endif

-+#endif

- 

- /*

-  * Table of proc files we need to create.

-@@ -1665,9 +1677,15 @@ static void rtl8168_proc_init(struct net_device *dev)

-                 tp->proc_dir = dir;

-                 proc_init_num++;

- 

--                for (f = rtl8168_proc_files; f->name[0]; f++) {

--                        if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,

--                                              &rtl8168_proc_fops, f->show)) {

-+     for (f = rtl8168_proc_files; f->name[0]; f++) {

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)

-+         if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,

-+                                              &rtl8168_proc_ops, f->show)) 

-+#else        

-+         if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,

-+                                              &rtl8168_proc_fops, f->show))

-+#endif

-+         {

-                                 printk("Unable to initialize "

-                                        "/proc/net/%s/%s/%s\n",

-                                        MODULENAME, dev->name, f->name);

-@@ -25881,7 +25899,6 @@ rtl8168_init_one(struct pci_dev *pdev,

- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,22)

-         SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops);

- #endif

--

-         dev->watchdog_timeo = RTL8168_TX_TIMEOUT;

-         dev->irq = pdev->irq;

-         dev->base_addr = (unsigned long) ioaddr;

-@@ -27817,7 +27834,7 @@ static void rtl8168_reset_task(struct work_struct *work)

- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)

-         rtl8168_rx_interrupt(dev, tp, &budget);

- #else

--        rtl8168_rx_interrupt(dev, tp, budget);

-+        rtl8168_rx_interrupt(dev, tp, budget);      

- #endif  //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)

- 

-         spin_lock_irqsave(&tp->lock, flags);

-@@ -27844,7 +27861,11 @@ static void rtl8168_reset_task(struct work_struct *work)

- }

- 

- static void

-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)

-+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)

-+#else

- rtl8168_tx_timeout(struct net_device *dev)

-+#endif

- {

-         struct rtl8168_private *tp = netdev_priv(dev);

-         unsigned long flags;

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

@@ -335,12 +335,12 @@

 #define DASH_SUFFIX ""

 #endif

-#define RTL8168_VERSION "8.048.00" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX

+#define RTL8168_VERSION "8.048.03" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX

 #define MODULENAME "r8168"

 #define PFX MODULENAME ": "

 #define GPL_CLAIM "\

-r8168  Copyright (C) 2019  Realtek NIC software team <nicfae@realtek.com> \n \

+r8168  Copyright (C) 2020  Realtek NIC software team <nicfae@realtek.com> \n \

 This program comes with ABSOLUTELY NO WARRANTY; for details, please see <http://www.gnu.org/licenses/>. \n \

 This is free software, and you are welcome to redistribute it under certain conditions; see <http://www.gnu.org/licenses/>. \n"

@@ -359,9 +359,6 @@

 #define R8168_MSG_DEFAULT \

     (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN)

-#define TX_BUFFS_AVAIL(tp) \

-    (tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1)

-

 #ifdef CONFIG_R8168_NAPI

 #define rtl8168_rx_hwaccel_skb      vlan_hwaccel_receive_skb

 #define rtl8168_rx_quota(count, quota)  min(count, quota)

@@ -437,6 +434,8 @@

 #define SHORT_PACKET_PADDING_BUF_SIZE 256

+#define RTK_MAGIC_DEBUG_VALUE 0x0badbeef

+

 /* write/read MMIO register */

 #define RTL_W8(tp, reg, val8)  writeb((val8), tp->mmio_addr + (reg))

 #define RTL_W16(tp, reg, val16)    writew((val16), tp->mmio_addr + (reg))

@@ -1572,6 +1571,8 @@

         u32 HwFiberStat;

         u8 HwSwitchMdiToFiber;

+        u8 HwSuppSerDesPhyVer;

+

         u8 HwSuppPhyOcpVer;

         u16 NicCustLedValue;

@@ -1808,6 +1809,8 @@

 void rtl8168_hw_disable_mac_mcu_bps(struct net_device *dev);

 #define HW_SUPPORT_CHECK_PHY_DISABLE_MODE(_M)        ((_M)->HwSuppCheckPhyDisableModeVer > 0 )

+#define HW_SUPP_SERDES_PHY(_M)        ((_M)->HwSuppSerDesPhyVer > 0)

+#define HW_HAS_WRITE_PHY_MCU_RAM_CODE(_M)        (((_M)->HwHasWrRamCodeToMicroP == TRUE) ? 1 : 0)

 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)

 #define netdev_mc_count(dev) ((dev)->mc_count)

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

@@ -55,11 +55,12 @@

 void rtl8168_hw_init_fiber_nic(struct net_device *dev);

 void rtl8168_hw_fiber_nic_d3_para(struct net_device *dev);

 void rtl8168_hw_fiber_phy_config(struct net_device *dev);

-u32 rtl8168_hw_fiber_get_connect_status(struct net_device *dev);

 void rtl8168_hw_switch_mdi_to_fiber(struct net_device *dev);

 void rtl8168_hw_switch_mdi_to_nic(struct net_device *dev);

 unsigned int rtl8168_hw_fiber_link_ok(struct net_device *dev);

 void rtl8168_check_fiber_link_status(struct net_device *dev);

+void rtl8168_check_hw_fiber_mode_support(struct net_device *dev);

+void rtl8168_set_fiber_mode_software_variable(struct net_device *dev);

 #endif /* _LINUX_R8168_FIBER_H */

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

@@ -456,7 +456,11 @@

 static void rtl8168_hw_start(struct net_device *dev);

 static int rtl8168_close(struct net_device *dev);

 static void rtl8168_set_rx_mode(struct net_device *dev);

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)

+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);

+#else

 static void rtl8168_tx_timeout(struct net_device *dev);

+#endif

 static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);

 static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget);

 static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);

@@ -881,6 +885,7 @@

         seq_printf(m, "HwFiberModeVer\t0x%x\n", tp->HwFiberModeVer);

         seq_printf(m, "HwFiberStat\t0x%x\n", tp->HwFiberStat);

         seq_printf(m, "HwSwitchMdiToFiber\t0x%x\n", tp->HwSwitchMdiToFiber);

+        seq_printf(m, "HwSuppSerDesPhyVer\t0x%x\n", tp->HwSuppSerDesPhyVer);

         seq_printf(m, "NicCustLedValue\t0x%x\n", tp->NicCustLedValue);

         seq_printf(m, "RequiredSecLanDonglePatch\t0x%x\n", tp->RequiredSecLanDonglePatch);

         seq_printf(m, "HwSuppDashVer\t0x%x\n", tp->HwSuppDashVer);

@@ -1190,6 +1195,7 @@

                         "HwFiberModeVer\t0x%x\n"

                         "HwFiberStat\t0x%x\n"

                         "HwSwitchMdiToFiber\t0x%x\n"

+                        "HwSuppSerDesPhyVer\t0x%x\n"

                         "NicCustLedValue\t0x%x\n"

                         "RequiredSecLanDonglePatch\t0x%x\n"

                         "HwSuppDashVer\t0x%x\n"

@@ -1270,6 +1276,7 @@

                         tp->HwFiberModeVer,

                         tp->HwFiberStat,

                         tp->HwSwitchMdiToFiber,

+                        tp->HwSuppSerDesPhyVer,

                         tp->NicCustLedValue,

                         tp->RequiredSecLanDonglePatch,

                         tp->HwSuppDashVer,

@@ -1616,6 +1623,14 @@

         return single_open(file, show, dev);

 }

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)

+static const struct proc_ops rtl8168_proc_fops = {

+        .proc_open           = rtl8168_proc_open,

+        .proc_read           = seq_read,

+        .proc_lseek          = seq_lseek,

+        .proc_release        = single_release,

+};

+#else

 static const struct file_operations rtl8168_proc_fops = {

         .open           = rtl8168_proc_open,

         .read           = seq_read,

@@ -1624,6 +1639,8 @@

 };

 #endif

+#endif

+

 /*

  * Table of proc files we need to create.

  */

@@ -2088,6 +2105,52 @@

         return data16;

 }

+static void

+rtl8168_clear_and_set_mcu_ocp_bit(

+        struct rtl8168_private *tp,

+        u16   addr,

+        u16   clearmask,

+        u16   setmask

+)

+{

+        u16 RegValue;

+

+        RegValue = rtl8168_mac_ocp_read(tp, addr);

+        RegValue &= ~clearmask;

+        RegValue |= setmask;

+        rtl8168_mac_ocp_write(tp, addr, RegValue);

+}

+

+/*

+static void

+rtl8168_clear_mcu_ocp_bit(

+        struct rtl8168_private *tp,

+        u16   addr,

+        u16   mask

+)

+{

+        rtl8168_clear_and_set_mcu_ocp_bit(tp,

+                                          addr,

+                                          mask,

+                                          0

+                                         );

+}

+*/

+

+static void

+rtl8168_set_mcu_ocp_bit(

+        struct rtl8168_private *tp,

+        u16   addr,

+        u16   mask

+)

+{

+        rtl8168_clear_and_set_mcu_ocp_bit(tp,

+                                          addr,

+                                          0,

+                                          mask

+                                         );

+}

+

 static u32 real_ocp_read(struct rtl8168_private *tp, u16 addr, u8 len)

 {

         int i, val_shift, shift = 0;

@@ -3699,10 +3762,6 @@

         rtl8168_check_fiber_link_status(dev);

 #endif //ENABLE_FIBER_SUPPORT

-#ifdef ENABLE_FIBER_SUPPORT

-        rtl8168_check_fiber_link_status(dev);

-#endif //ENABLE_FIBER_SUPPORT

-

         link_status_on = tp->link_ok(dev);

         if (tp->mcfg == CFG_METHOD_11)

@@ -4483,7 +4542,7 @@

                 tp->wol_opts |= WAKE_MCAST;

 out_unlock:

-        tp->wol_enabled = (tp->wol_opts) ? WOL_ENABLED : WOL_DISABLED;

+        tp->wol_enabled = (tp->wol_opts || tp->dash_printer_enabled) ? WOL_ENABLED : WOL_DISABLED;

         spin_unlock_irqrestore(&tp->lock, flags);

 }

@@ -4529,6 +4588,9 @@

                 RTL_W8(tp, cfg[i].reg, options);

         }

+        if (tp->dash_printer_enabled)

+                RTL_W8(tp, Config5, RTL_R8(tp, Config5) | LanWake);

+

         rtl8168_disable_cfg9346_write(tp);

 }

@@ -4601,6 +4663,9 @@

                         rtl8168_disable_cfg9346_write(tp);

                 }

+                if (HW_SUPP_SERDES_PHY(tp))

+                        return;

+

                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

                 auto_nego = rtl8168_mdio_read(tp, MII_ADVERTISE);

                 auto_nego &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL

@@ -4760,11 +4825,11 @@

         tp->wol_opts = wol->wolopts;

-        tp->wol_enabled = (tp->wol_opts) ? WOL_ENABLED : WOL_DISABLED;

+        tp->wol_enabled = (tp->wol_opts || tp->dash_printer_enabled) ? WOL_ENABLED : WOL_DISABLED;

         spin_unlock_irqrestore(&tp->lock, flags);

-        device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);

+        device_set_wakeup_enable(&tp->pci_dev->dev, tp->wol_enabled);

         return 0;

 }

@@ -6205,6 +6270,9 @@

                 return -EOPNOTSUPP;

         }

+        if (HW_SUPP_SERDES_PHY(tp) || !HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp))

+                return -EOPNOTSUPP;

+

         spin_lock_irqsave(&tp->lock, flags);

         if (unlikely(tp->rtk_enable_diag)) {

@@ -6861,6 +6929,21 @@

 }

 static void

+rtl8168_switch_to_sgmii_mode(

+        struct rtl8168_private *tp

+)

+{

+        if (FALSE == HW_SUPP_SERDES_PHY(tp)) return;

+

+        switch (tp->HwSuppSerDesPhyVer) {

+        case 1:

+                rtl8168_mac_ocp_write(tp, 0xEB00, 0x2);

+                rtl8168_set_mcu_ocp_bit(tp, 0xEB16, BIT_1);

+                break;

+        }

+}

+

+static void

 rtl8168_exit_oob(struct net_device *dev)

 {

         struct rtl8168_private *tp = netdev_priv(dev);

@@ -6868,6 +6951,12 @@

         RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) & ~(AcceptErr | AcceptRunt | AcceptBroadcast | AcceptMulticast | AcceptMyPhys |  AcceptAllPhys));

+        if (HW_SUPP_SERDES_PHY(tp)) {

+                if (tp->HwSuppSerDesPhyVer == 1) {

+                        rtl8168_switch_to_sgmii_mode(tp);

+                }

+        }

+

         switch (tp->mcfg) {

         case CFG_METHOD_23:

         case CFG_METHOD_27:

@@ -9213,7 +9302,11 @@

         rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0B14);

         rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0BE4);

-        rtl8168_mac_ocp_write(tp, 0xFC38, 0x0006);

+        if (tp->HwSuppSerDesPhyVer == 1) {

+                rtl8168_mac_ocp_write(tp, 0xFC38, 0x0007);

+        } else {

+                rtl8168_mac_ocp_write(tp, 0xFC38, 0x0006);

+        }

 }

 static void

@@ -9714,6 +9807,7 @@

                 rtl8168_ephy_write(tp, 0x1E, 0x20EB);

                 rtl8168_ephy_write(tp, 0x0D, 0x1666);

                 ClearPCIePhyBit(tp, 0x0B, BIT_0);

+                SetPCIePhyBit(tp, 0x1D, BIT_14);

                 break;

         case CFG_METHOD_29:

@@ -22491,7 +22585,7 @@

                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

                                 rtl8168_mdio_write(tp, 0x15, 0x1006);

                         }

@@ -22779,7 +22873,7 @@

                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

                                 gphy_val = rtl8168_mdio_read(tp, 0x15);

                                 gphy_val |= BIT_12;

@@ -22787,7 +22881,7 @@

                         }

                 }

         } else if (tp->mcfg == CFG_METHOD_18) {

-                if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         rtl8168_mdio_write(tp, 0x1F, 0x0005);

                         rtl8168_mdio_write(tp, 0x05, 0x8b80);

                         gphy_val = rtl8168_mdio_read(tp, 0x06);

@@ -22866,7 +22960,7 @@

                 rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) & ~BIT_8);

                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

-                if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         rtl8168_mdio_write(tp, 0x1f, 0x0005);

                         rtl8168_mdio_write(tp, 0x05, 0x8b85);

                         rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) | BIT_15);

@@ -22874,7 +22968,7 @@

                 }

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

                                 gphy_val = rtl8168_mdio_read(tp, 0x15);

                                 gphy_val |= BIT_12;

@@ -22882,7 +22976,7 @@

                         }

                 }

         } else if (tp->mcfg == CFG_METHOD_19) {

-                if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         rtl8168_mdio_write(tp, 0x1F, 0x0005);

                         rtl8168_mdio_write(tp, 0x05, 0x8b80);

                         gphy_val = rtl8168_mdio_read(tp, 0x06);

@@ -22925,7 +23019,7 @@

                 rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) & ~BIT_8);

                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

-                if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         rtl8168_mdio_write(tp, 0x1f, 0x0005);

                         rtl8168_mdio_write(tp, 0x05, 0x8b85);

                         rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) | BIT_15);

@@ -22933,7 +23027,7 @@

                 }

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

                                 gphy_val = rtl8168_mdio_read(tp, 0x15);

                                 gphy_val |= BIT_12;

@@ -22942,7 +23036,7 @@

                 }

         } else if (tp->mcfg == CFG_METHOD_20) {

-                if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         rtl8168_mdio_write(tp, 0x1F, 0x0005);

                         rtl8168_mdio_write(tp, 0x05, 0x8b80);

                         gphy_val = rtl8168_mdio_read(tp, 0x06);

@@ -23017,7 +23111,7 @@

                 rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) & ~BIT_8);

                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

-                if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         rtl8168_mdio_write(tp, 0x1f, 0x0005);

                         rtl8168_mdio_write(tp, 0x05, 0x8b85);

                         rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) | BIT_15);

@@ -23025,7 +23119,7 @@

                 }

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);

                                 gphy_val = rtl8168_mdio_read(tp, 0x15);

                                 gphy_val |= BIT_12;

@@ -23087,7 +23181,7 @@

                 rtl8168_mdio_write(tp, 0x14, 0x9222);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);

                         }

@@ -23131,7 +23225,7 @@

                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);

                         }

@@ -23159,7 +23253,7 @@

                 rtl8168_mdio_write(tp, 0x11, gphy_val);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);

                         }

@@ -23231,7 +23325,7 @@

                 rtl8168_mdio_write(tp, 0x14, (rtl8168_mdio_read(tp, 0x14) & ~0xFF00) | 0x8400);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);

                         }

@@ -23303,7 +23397,7 @@

                 rtl8168_mdio_write(tp, 0x14, (rtl8168_mdio_read(tp, 0x14) & ~0xFF00) | 0x8400);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);

                         }

@@ -23378,7 +23472,7 @@

                                     );

                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

-                if (tp->HwHasWrRamCodeToMicroP) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         u16 dout_tapbin;

                         dout_tapbin = 0x0000;

@@ -23468,7 +23562,7 @@

                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                                 rtl8168_set_eth_phy_bit( tp, 0x10, BIT_2 );

                                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

@@ -23482,7 +23576,7 @@

                                       BIT_5 | BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0,

                                       0x0A );

-                if (tp->HwHasWrRamCodeToMicroP) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                         rtl8168_mdio_write(tp, 0x13, 0x8011);

                         rtl8168_set_eth_phy_bit(tp, 0x14, BIT_11);

@@ -23520,7 +23614,7 @@

                         rtl8168_mdio_write(tp, 0x1F, 0x0000);

                 }

-                if (tp->HwHasWrRamCodeToMicroP) {

+                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                         rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                         rtl8168_mdio_write(tp, 0x13, 0x85FE);

                         ClearAndSetEthPhyBit(

@@ -23543,7 +23637,7 @@

                 }

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                                 rtl8168_set_eth_phy_bit( tp, 0x10, BIT_2 );

                                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

@@ -23697,7 +23791,8 @@

                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

                 if (aspm) {

-                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+                        if (!HW_SUPP_SERDES_PHY(tp) &&

+                            HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);

                                 rtl8168_set_eth_phy_bit( tp, 0x10, BIT_2 );

                                 rtl8168_mdio_write(tp, 0x1F, 0x0000);

@@ -23746,7 +23841,7 @@

         rtl8168_mdio_write(tp, 0x1F, 0x0000);

-        if (tp->HwHasWrRamCodeToMicroP == TRUE) {

+        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {

                 if (tp->eee_enabled)

                         rtl8168_enable_EEE(tp);

                 else

@@ -23921,7 +24016,7 @@

                 break;

         }

-        if (HW_DASH_SUPPORT_TYPE_3(tp) && tp->HwPkgDet == 0x06)

+        if (HW_SUPP_SERDES_PHY(tp))

                 eee_enable = 0;

         switch (tp->mcfg) {

@@ -24186,28 +24281,22 @@

         }

 #ifdef ENABLE_FIBER_SUPPORT

+        rtl8168_check_hw_fiber_mode_support(dev);

+#endif //ENABLE_FIBER_SUPPORT

+

         switch(tp->mcfg) {

-        case CFG_METHOD_29:

-        case CFG_METHOD_30:

-                if ((pdev->subsystem_vendor == 0x1170 && pdev->subsystem_device == 0x0612) ||

-                    (pdev->subsystem_vendor == 0x1028 && pdev->subsystem_device == 0x080C) ||

-                    (pdev->subsystem_vendor == 0x107d && pdev->subsystem_device == 0x29b0) ||

-                    (pdev->subsystem_vendor == 0x107d && pdev->subsystem_device == 0x29b1) ||

-                    (pdev->subsystem_vendor == 0x107d && pdev->subsystem_device == 0x29b3) ||

-                    (pdev->subsystem_vendor == 0x107d && pdev->subsystem_device == 0x29b5))

-                        tp->HwFiberModeVer = FIBER_MODE_RTL8168H_RTL8211FS;

-                if((pdev->subsystem_vendor == 0x1d05 && pdev->subsystem_device == 0x2014))

-                        tp->HwFiberModeVer = FIBER_MODE_RTL8168H_MDI_SWITCH_RTL8211FS;

+        case CFG_METHOD_32:

+        case CFG_METHOD_33:

+                if (tp->HwPkgDet == 0x06) {

+                        u8 tmpUchar = rtl8168_eri_read(tp, 0xE6, 1, ERIAR_ExGMAC);

+                        if (tmpUchar == 0x02)

+                                tp->HwSuppSerDesPhyVer = 1;

+                        else if (tmpUchar == 0x00)

+                                tp->HwSuppSerDesPhyVer = 2;

+                }

                 break;

         }

-        if (HW_FIBER_MODE_ENABLED(tp))

-                tp->HwFiberStat = rtl8168_hw_fiber_get_connect_status(dev);

-

-        if (tp->HwFiberStat != FIBER_STAT_CONNECT)

-                tp->HwFiberModeVer = FIBER_MODE_NIC_ONLY;

-#endif //ENABLE_FIBER_SUPPORT

-

         if (pdev->subsystem_vendor == 0x144d) {

                 if (pdev->subsystem_device == 0xc098 ||

                     pdev->subsystem_device == 0xc0b1 ||

@@ -24229,14 +24318,6 @@

                         break;

                 }

         }

-#ifdef ENABLE_FIBER_SUPPORT

-        switch (tp->HwFiberModeVer) {

-        case FIBER_MODE_RTL8168H_RTL8211FS:

-        case FIBER_MODE_RTL8168H_MDI_SWITCH_RTL8211FS:

-                tp->RequiredSecLanDonglePatch = TRUE;

-                break;

-        }

-#endif //ENABLE_FIBER_SUPPORT

         switch (tp->mcfg) {

         case CFG_METHOD_16:

@@ -24379,6 +24460,11 @@

 #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)

         tp->eee_enabled = eee_enable;

         tp->eee_adv_t = MDIO_EEE_1000T | MDIO_EEE_100TX;

+

+#ifdef ENABLE_FIBER_SUPPORT

+        if (HW_FIBER_MODE_ENABLED(tp))

+                rtl8168_set_fiber_mode_software_variable(dev);

+#endif //ENABLE_FIBER_SUPPORT

 }

 static void

@@ -26431,7 +26517,7 @@

         case CFG_METHOD_32:

         case CFG_METHOD_33:

                 csi_tmp = rtl8168_eri_read(tp, 0xDE, 1, ERIAR_ExGMAC);

-                csi_tmp &= ~BIT_0;

+                csi_tmp &= BIT_0;

                 rtl8168_eri_write(tp, 0xDE, 1, csi_tmp, ERIAR_ExGMAC);

                 break;

         }

@@ -27057,17 +27143,22 @@

                 mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xE056);

                 mac_ocp_data &= ~(BIT_7 | BIT_6 | BIT_5 | BIT_4);

-                mac_ocp_data |= (BIT_6 | BIT_5 | BIT_4);

+                if (FALSE == HW_SUPP_SERDES_PHY(tp))

+                        mac_ocp_data |= (BIT_6 | BIT_5 | BIT_4);

                 rtl8168_mac_ocp_write(tp, 0xE056, mac_ocp_data);

-                rtl8168_mac_ocp_write(tp, 0xEA80, 0x0003);

+                if (FALSE == HW_SUPP_SERDES_PHY(tp))

+                        rtl8168_mac_ocp_write(tp, 0xEA80, 0x0003);

+                else

+                        rtl8168_mac_ocp_write(tp, 0xEA80, 0x0000);

                 rtl8168_oob_mutex_lock(tp);

                 mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xE052);

-                mac_ocp_data |= BIT_0;

-                if (tp->mcfg == CFG_METHOD_32 || tp->mcfg == CFG_METHOD_33)

-                        mac_ocp_data |= BIT_3;

-                else

-                        mac_ocp_data &= ~BIT_3;

+                mac_ocp_data &= ~(BIT_3 | BIT_0);

+                if (FALSE == HW_SUPP_SERDES_PHY(tp)) {

+                        mac_ocp_data |= BIT_0;

+                        if (tp->mcfg == CFG_METHOD_32 || tp->mcfg == CFG_METHOD_33)

+                                mac_ocp_data |= BIT_3;

+                }

                 rtl8168_mac_ocp_write(tp, 0xE052, mac_ocp_data);

                 rtl8168_oob_mutex_unlock(tp);

@@ -27090,16 +27181,24 @@

                 if (dev->mtu > ETH_DATA_LEN)

                         RTL_W8(tp, MTPS, 0x27);

-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_6);

-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_6);

-

-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_7);

+                if (FALSE == HW_SUPP_SERDES_PHY(tp)) {

+                        RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_6);

+                        RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_6);

+                        RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_7);

+                } else {

+                        RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) & ~BIT_6);

+                        RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) & ~BIT_6);

+                        RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) & ~BIT_7);

+                }

                 rtl8168_eri_write(tp, 0xC0, 2, 0x0000, ERIAR_ExGMAC);

                 rtl8168_eri_write(tp, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);

                 rtl8168_oob_mutex_lock(tp);

-                rtl8168_eri_write(tp, 0x5F0, 2, 0x4F87, ERIAR_ExGMAC);

+                if (FALSE == HW_SUPP_SERDES_PHY(tp))

+                        rtl8168_eri_write(tp, 0x5F0, 2, 0x4F87, ERIAR_ExGMAC);

+                else

+                        rtl8168_eri_write(tp, 0x5F0, 2, 0x4080, ERIAR_ExGMAC);

                 rtl8168_oob_mutex_unlock(tp);

                 csi_tmp = rtl8168_eri_read(tp, 0xD4, 4, ERIAR_ExGMAC);

@@ -27661,7 +27760,8 @@

         unsigned int len = tx_skb->len;

         dma_unmap_single(&pdev->dev, le64_to_cpu(desc->addr), len, DMA_TO_DEVICE);

-        desc->opts1 = 0x00;

+

+        desc->opts1 = cpu_to_le32(RTK_MAGIC_DEBUG_VALUE);

         desc->opts2 = 0x00;

         desc->addr = 0x00;

         tx_skb->len = 0;

@@ -27843,8 +27943,13 @@

         }

 }

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)

+static void

+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)

+#else

 static void

 rtl8168_tx_timeout(struct net_device *dev)

+#endif

 {

         struct rtl8168_private *tp = netdev_priv(dev);

         unsigned long flags;

@@ -28126,6 +28231,15 @@

 }

 #endif

+static bool rtl8168_tx_slots_avail(struct rtl8168_private *tp,

+                                   unsigned int nr_frags)

+{

+        unsigned int slots_avail = tp->dirty_tx + NUM_TX_DESC - tp->cur_tx;

+

+        /* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */

+        return slots_avail > nr_frags;

+}

+

 static int

 rtl8168_start_xmit(struct sk_buff *skb,

                    struct net_device *dev)

@@ -28143,7 +28257,7 @@

         spin_lock_irqsave(&tp->lock, flags);

-        if (unlikely(TX_BUFFS_AVAIL(tp) < skb_shinfo(skb)->nr_frags)) {

+        if (unlikely(!rtl8168_tx_slots_avail(tp, skb_shinfo(skb)->nr_frags))) {

                 if (netif_msg_drv(tp)) {

                         printk(KERN_ERR

                                "%s: BUG! Tx Ring full when queue awake!\n",

@@ -28155,8 +28269,14 @@

         entry = tp->cur_tx % NUM_TX_DESC;

         txd = tp->TxDescArray + entry;

-        if (unlikely(le32_to_cpu(txd->opts1) & DescOwn))

+        if (unlikely(le32_to_cpu(txd->opts1) & DescOwn)) {

+                if (netif_msg_drv(tp)) {

+                        printk(KERN_ERR

+                               "%s: BUG! Tx Desc is own by hardware!\n",

+                               dev->name);

+                }

                 goto err_stop;

+        }

         opts1 = DescOwn;

         opts2 = rtl8168_tx_vlan_tag(tp, skb);

@@ -28271,10 +28391,10 @@

         RTL_W8(tp, TxPoll, NPQ);    /* set polling bit */

-        if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) {

+        if (!rtl8168_tx_slots_avail(tp, MAX_SKB_FRAGS)) {

                 netif_stop_queue(dev);

                 smp_rmb();

-                if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)

+                if (rtl8168_tx_slots_avail(tp, MAX_SKB_FRAGS))

                         netif_wake_queue(dev);

         }

@@ -28346,7 +28466,7 @@

                 tp->dirty_tx = dirty_tx;

                 smp_wmb();

                 if (netif_queue_stopped(dev) &&

-                    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {

+                    (rtl8168_tx_slots_avail(tp, MAX_SKB_FRAGS))) {

                         netif_wake_queue(dev);

                 }

                 smp_rmb();

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​

@@ -4,7 +4,7 @@

 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet

 # controllers with PCI-Express interface.

 #

-# Copyright(c) 2019 Realtek Semiconductor Corp. All rights reserved.

+# Copyright(c) 2020 Realtek Semiconductor Corp. All rights reserved.

 #

 # This program is free software; you can redistribute it and/or modify it

 # under the terms of the GNU General Public License as published by the Free

​