Request 4597 (superseded)

This request is superseded by request 4601 (Show diff)

Overview

Request 4597 (superseded)

- Update to new version 8.047.04

- Update to new version 8.047.01

Created by bitstreamout about 5 years ago
In state superseded
Package maintainer: bitstreamout
Superseded by 4601

Submit r8168

Submit package home:bitstreamout:Essentials / r8168 to package Essentials / r8168

r8168.changes Changed

@@ -1,140 +1,4 @@
 -------------------------------------------------------------------
-Tue May 21 10:35:10 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Update to new version r8168-8.053.00
-- Remove patches now upstream
-  * r8168-gcc14.patch
-- Port patches
-  * r8168-kernel_version.patch
-  * r8168-support-dev0x8136.patch
-  * r8168-support-linux-5.19.patch
-- Add patch r8168-support-ethtool_keee.patch
-  * Port struct ethtool_eee to new kernel struct ethtool_eee
-    and hopefully this works
-
--------------------------------------------------------------------
-Thu Mar 28 12:50:15 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Use kernel version of the include diretory instead of the used
-  kernel
-
--------------------------------------------------------------------
-Wed Mar 13 12:12:43 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Update to new version r8168-8.052.01
-- Remove patches now upstream
-  * skb_gso_segment.patch
-  * r8168-support-linux-6.1.0.patch
-- Port patches
-  * r8168-configuration.patch
-  * r8168-kernel_version.patch
-  * r8168-support-dev0x8136.patch
-  * r8168-support-linux-5.19.patch
-  * r8168-support-linux-L15.5.patch
-- Add r8168.keyring and signature of tar ball to check tar ball
-- Add patch r8168-gcc14.patch
-  * Avoid gcc14 trouble
-  * Switch from deprecated strlcpy() to strscpy()
-
--------------------------------------------------------------------
-Wed Mar 13 11:26:04 UTC 2024 - Dr. Werner Fink <werner@suse.de>
-
-- Use %patch -P N instead of deprecated %patchN. 
-
--------------------------------------------------------------------
-Thu Oct 19 08:29:04 UTC 2023 - Dr. Werner Fink <werner@suse.de>
-
-- Dynamic adaption of patch skb_gso_segment.patch means if net/gso.h
-  exists correct kernel version check
-
--------------------------------------------------------------------
-Mon Aug 14 11:23:04 UTC 2023 - https://www.suse.com/
-
-- Add patch skb_gso_segment.patch to make it build with latest 6.4 
-
--------------------------------------------------------------------
-Wed May 10 10:55:42 UTC 2023 - https://www.suse.com/
-
-- For Leap 15.5 the kernel 5.14.0 behaves like a 5.17.0 at ethtool.h 
-
--------------------------------------------------------------------
-Wed Dec 14 13:42:47 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Update to new version r8168-8.051.02
-- Delete patch r8168-kernel_5.18.patch now upstream
-- Add patch r8168-support-linux-6.1.0.patch
-- Add patch r8168-support-dev0x8136.patch to support
-  Realtek Semiconductor Co.,
-  Ltd. RTL810xE PCI Express Fast Ethernet controller 10ec:8136 (rev 05)
-
--------------------------------------------------------------------
-Tue Dec  6 11:31:36 UTC 2022 - Werner Fink <werner.fink@opensuse.org>
-
-- Switch over to build require %kernel_module_package_buildreqs macro
-
--------------------------------------------------------------------
-Mon Dec  5 12:38:33 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Also pre require suse-module-tools-scriptlets 
-
--------------------------------------------------------------------
-Fri Dec  2 12:26:02 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Pre require suse-module-tools 
-
--------------------------------------------------------------------
-Fri Aug  5 13:40:01 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Update to new version 8.050.03
-- Add patch r8168-support-linux-5.19.patch to get it build with 5.19
-
--------------------------------------------------------------------
-Tue May 24 09:09:05 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Add upstream patch r8168-kernel_5.18.patch
-  * Make it build with kernel 5.18+ 
-
--------------------------------------------------------------------
-Tue May 10 10:30:35 UTC 2022 - Werner Fink <werner@suse.de>
-
-- Update to new version 8.050.00
-- Port patches r8168-kernel_version.patch and r8168-configuration.patch
-
--------------------------------------------------------------------
-Thu Jan 21 15:49:06 UTC 2021 - Werner Fink <werner@suse.de>
-
-- Now we change to github for basic download 
-- Configure exisxtence of linux/pci-aspm.h on the fly
-
--------------------------------------------------------------------
-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 
-
--------------------------------------------------------------------
-Mon Feb 10 11:38:00 UTC 2020 - Werner Fink <werner@suse.de>
-
-- Update to new version 8.048.00 
-- Modify patch r8168-kernel_version.patch as upstream now supports 5.4
-
--------------------------------------------------------------------
-Tue Nov 26 10:08:11 UTC 2019 - Werner Fink <werner@suse.de>
-
-- Update to new version 8.047.05
-- Modify patch r8168-kernel_version.patch to let it build with 5.4
-
--------------------------------------------------------------------
-Thu Oct 24 05:49:20 UTC 2019 - Werner Fink <werner@suse.de>
-
-- (Re)add #!BuildIgnore: enough-build-resources 
-
--------------------------------------------------------------------
 Tue Oct 22 06:36:13 UTC 2019 - Werner Fink <werner@suse.de>
 
 - Update to new version 8.047.04

r8168.spec Changed

@@ -16,30 +16,25 @@
 # Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
-#!BuildIgnore: enough-build-resources
+
 Name:           r8168
-Version:        8.053.00
+Version:        8.047.04
 Release:        0
 Summary:        Device driver for RealTek Gigabit Ethernet controllers
 License:        GPL-2.0-or-later
 Group:          System/Kernel
-URL:            https://github.com/mtorromeo/r8168
-Source0:        https://github.com/mtorromeo/r8168/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# Compare with https://github.com/mtorromeo/r8168 and
+# http://www.realtek.com.tw/Downloads/downloadsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false#2
+URL:            https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        preamble
 Source2:        Module.supported
-Source3:        https://github.com/mtorromeo/r8168/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
-Source4:        r8168.keyring
 Patch0:         r8168-kernel_version.patch
 Patch1:         r8168-configuration.patch
-Patch2:         r8168-support-linux-5.19.patch
-Patch3:         r8168-support-ethtool_keee.patch
-Patch4:         r8168-support-dev0x8136.patch
-Patch5:         r8168-support-linux-L15.5.patch
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
 BuildRequires:  libelf-devel
 BuildRequires:  module-init-tools
-BuildRequires:  %kernel_module_package_buildreqs
 Requires:       r8168-kmp
 ExclusiveArch:  %{ix86} x86_64
 %kernel_module_package -p preamble
@@ -62,51 +57,19 @@
 
 %prep
 %setup -q
-%patch -P 0 -b .p0
-%patch -P 1 -b .p1
-%patch -P 2 -p1 -b .p2
-%patch -P 4 -p1 -b .p4
-if test -e /usr/src/linux/include/linux/ethtool.h
-then
-    argc=$(sed -rn '/\*get_ringparam/,/;$/p' /usr/src/linux/include/linux/ethtool.h | wc -l)
-    if test -n "$argc" -a "$argc" -eq 4
-    then
-%patch -P 5 -b .p5
-    fi
-    argc=$(sed -rn '/ethtool_keee/p' /usr/src/linux/include/linux/ethtool.h | wc -l)
-    if test -n "$argc" -a "$argc" -eq 3
-    then
-%patch -P 3 -p1 -b .p3
-    fi
-fi
-if test -e /usr/src/linux/include/net/gso.h
-then
-    version=$(readlink /usr/src/linux | sed -r 's/linux-//;s/-.*//;s/\./,/g')
-     "$version" =~ 0-9+,0-9+,0-9+  || \
-    version=$(uname -r|sed -r 's/-.*//;s/\./,/g')
-    sed -ri "/KERNEL_VERSION/{s/$6,4,10$/(${version})/}" src/r8168_n.c
-fi
+%patch0 -b .p0
+%patch1 -b .p1
 cp %{S:1} .
 cp %{S:2} .
 
 %build
-#
-# SUSE kernel does include some patches/commits which do not increase
-# the kernel's version, there we test here if the linux/pci-acpi.h exits
-#
-if test -e /usr/src/linux/include/linux/pci-aspm.h
-then
-    sed -ri '/#define HAS_PCI_ASPM_H/{ s/@ASPM@/1/ }' src/r8168_n.c
-else
-    sed -ri '/#define HAS_PCI_ASPM_H/{ s/@ASPM@/0/ }' src/r8168_n.c
-fi
 ln -sf $(type -p kmod) modinfo
 mkdir obj
 for flavor in %{flavors_to_build}
 do
     rm   -rf obj/$flavor
     cp   -rp src obj/$flavor
-    make V=1 -C %{kernel_source $flavor} M=$PWD/obj/$flavor modules
+    make -C %{kernel_source $flavor} M=$PWD/obj/$flavor modules
     ./modinfo -F alias $(find $PWD/obj/$flavor/ -name '%{name}.ko')
 done

r8168-configuration.patch Changed

r8168-kernel_version.patch Changed

@@ -1,11 +1,11 @@
 ---
  src/r8168.h   |    4 ++++
- src/r8168_n.c |   15 ++++++++++++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
+ src/r8168_n.c |    2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 --- src/r8168.h
-+++ src/r8168.h	2024-03-13 11:51:59.011947503 +0000
-@@ -196,6 +196,10 @@ do { \
++++ src/r8168.h	2018-01-10 14:30:36.443694357 +0000
+@@ -116,6 +116,10 @@ do { \
  } while (0)
  #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
  
@@ -17,56 +17,13 @@
  #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
  #define vlan_tx_tag_present skb_vlan_tag_present
 --- src/r8168_n.c
-+++ src/r8168_n.c	2024-03-13 11:57:02.890342590 +0000
-@@ -61,11 +61,16 @@
- #include <linux/rtnetlink.h>
- #include <linux/completion.h>
++++ src/r8168_n.c	2018-01-10 14:33:25.348444039 +0000
+@@ -28476,7 +28476,7 @@ process_pkt:
  
-+#ifndef HAS_PCI_ASPM_H
-+#define HAS_PCI_ASPM_H @ASPM@
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
-+#if HAS_PCI_ASPM_H
- #include <linux/pci-aspm.h>
- #endif
- #endif
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
- #include <linux/prefetch.h>
- #endif
-@@ -586,8 +591,12 @@ static void rtl8168_set_rx_mode(struct n
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
- static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
- #else
-+#if !HAS_PCI_ASPM_H
-+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
-+#else
- static void rtl8168_tx_timeout(struct net_device *dev);
- #endif
-+#endif
- static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);
- static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, struct rtl8168_rx_ring *, napi_budget);
- #ifdef CONFIG_R8168_NAPI
-@@ -30897,8 +30906,12 @@ static void
- rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
- #else
- static void
-+#if !HAS_PCI_ASPM_H
-+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
-+#else
- rtl8168_tx_timeout(struct net_device *dev)
- #endif
-+#endif
- {
-         struct rtl8168_private *tp = netdev_priv(dev);
- 
-@@ -31636,7 +31649,7 @@ rtl8168_rx_interrupt(struct net_device *
- 
-                 if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
-                         rtl8168_rx_skb(tp, skb, ring_index);
+                         if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
+                                 rtl8168_rx_skb(tp, skb);
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,4,0)
-                 dev->last_rx = jiffies;
+                         dev->last_rx = jiffies;
  #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
-                 RTLDEV->stats.rx_bytes += pkt_size;
+                         RTLDEV->stats.rx_bytes += pkt_size;

r8168-support-dev0x8136.patch Deleted

r8168-support-ethtool_keee.patch Deleted

@@ -1,119 +0,0 @@
-From 94426e16197c244d03aad0434e3490acdaa830fe Mon Sep 17 00:00:00 2001
-From: Masato TOYOSHIMA <phoepsilonix@phoepsilonix.love>
-Date: Tue, 14 May 2024 14:52:58 +0900
-Subject: PATCH Linux 6.9 compat: change to ethtool_keee from ethtool_eee
-
-linux/include/linux/ethtool.h
-
-struct ethtool_ops
-    int (*get_eee)(struct net_device *dev, struct ethtool_keee *eee);
-    int (*set_eee)(struct net_device *dev, struct ethtool_keee *eee);
-
-change to ethtool_keee from ethtool_eee
-    rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
-    rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata)
----
- src/r8168_n.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 44 insertions(+)
-
-diff --git a/src/r8168_n.c b/src/r8168_n.c
-index ad63f42..3d67641 100755
---- a/src/r8168_n.c
-+++ b/src/r8168_n.c
-@@ -7941,7 +7941,11 @@ rtl8168_device_lpi_t_to_ethtool_lpi_t(struct rtl8168_private *tp , u32 lpi_timer
- }
- 
- static int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
-+rtl_ethtool_get_eee(struct net_device *net, struct ethtool_keee *edata)
-+#else
- rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
-+#endif
- {
-         struct rtl8168_private *tp = netdev_priv(net);
-         struct ethtool_eee *eee = &tp->eee;
-@@ -7975,9 +7979,15 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
- 
-         edata->eee_enabled = !!val;
-         edata->eee_active = !!(supported & adv & lp);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
-+        ethtool_convert_legacy_u32_to_link_mode(edata->supported, supported);
-+        ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv);
-+        ethtool_convert_legacy_u32_to_link_mode(edata->lp_advertised, lp);
-+#else
-         edata->supported = supported;
-         edata->advertised = adv;
-         edata->lp_advertised = lp;
-+#endif
-         edata->tx_lpi_enabled = edata->eee_enabled;
-         edata->tx_lpi_timer = tx_lpi_timer;
- 
-@@ -7985,11 +7995,19 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
- }
- 
- static int
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
-+rtl_ethtool_set_eee(struct net_device *net, struct ethtool_keee *edata)
-+#else
- rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
-+#endif
- {
-         struct rtl8168_private *tp = netdev_priv(net);
-         struct ethtool_eee *eee = &tp->eee;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
-+        u32 advertising, adv;
-+#else
-         u32 advertising;
-+#endif
-         int rc = 0;
- 
-         if (!rtl8168_support_eee(tp))
-@@ -8013,6 +8031,18 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
-         }
- 
-         advertising = tp->advertising;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
-+        ethtool_convert_link_mode_to_legacy_u32(&adv, edata->advertised);
-+        if (linkmode_empty(edata->advertised)) {
-+                adv = advertising & eee->supported;
-+                ethtool_convert_legacy_u32_to_link_mode(edata->advertised, adv);
-+        } else if (!linkmode_empty(edata->advertised) & ~advertising) {
-+                dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of autoneg advertised speeds %x\n",
-+                           adv, advertising);
-+                rc = -EINVAL;
-+                goto out;
-+        }
-+#else
-         if (!edata->advertised) {
-                 edata->advertised = advertising & eee->supported;
-         } else if (edata->advertised & ~advertising) {
-@@ -8021,15 +8051,29 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
-                 rc = -EINVAL;
-                 goto out;
-         }
-+#endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
-+        if (!linkmode_empty(edata->advertised) & ~eee->supported) {
-+                dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n",
-+                           adv, eee->supported);
-+                rc = -EINVAL;
-+                goto out;
-+        }
-+#else
-         if (edata->advertised & ~eee->supported) {
-                 dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n",
-                            edata->advertised, eee->supported);
-                 rc = -EINVAL;
-                 goto out;
-         }
-+#endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0)
-+        ethtool_convert_link_mode_to_legacy_u32(&eee->advertised, edata->advertised);
-+#else
-         eee->advertised = edata->advertised;
-+#endif
-         eee->eee_enabled = edata->eee_enabled;
- 
-         if (eee->eee_enabled)

r8168-support-linux-5.19.patch Deleted

r8168-support-linux-L15.5.patch Deleted

@@ -1,56 +0,0 @@
----
- src/r8168_n.c |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- src/r8168_n.c
-+++ src/r8168_n.c	2024-03-13 12:10:07.947820999 +0000
-@@ -7234,7 +7234,7 @@ rtl8168_set_ring_size(struct rtl8168_pri
- }
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0)
- static void rtl8168_get_ringparam(struct net_device *dev,
-                                   struct ethtool_ringparam *ring,
-                                   struct kernel_ethtool_ringparam *kernel_ring,
-@@ -7242,7 +7242,7 @@ static void rtl8168_get_ringparam(struct
- #else
- static void rtl8168_get_ringparam(struct net_device *dev,
-                                   struct ethtool_ringparam *ring)
--#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0)
- {
-         struct rtl8168_private *tp = netdev_priv(dev);
- 
-@@ -7252,7 +7252,7 @@ static void rtl8168_get_ringparam(struct
-         ring->tx_pending = tp->tx_ring0.num_tx_desc;
- }
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0)
- static int rtl8168_set_ringparam(struct net_device *dev,
-                                  struct ethtool_ringparam *ring,
-                                  struct kernel_ethtool_ringparam *kernel_ring,
-@@ -7260,7 +7260,7 @@ static int rtl8168_set_ringparam(struct
- #else
- static int rtl8168_set_ringparam(struct net_device *dev,
-                                  struct ethtool_ringparam *ring)
--#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0)
- {
-         struct rtl8168_private *tp = netdev_priv(dev);
-         u32 new_rx_count, new_tx_count;
-@@ -26737,11 +26737,11 @@ rtl8168_release_board(struct pci_dev *pd
- static void
- rtl8168_hw_address_set(struct net_device *dev, u8 mac_addrMAC_ADDR_LEN)
- {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0)
-         eth_hw_addr_set(dev, mac_addr);
- #else
-         memcpy(dev->dev_addr, mac_addr, MAC_ADDR_LEN);
--#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,14,0)
- }
- 
- static int

r8168-8.053.00.tar.gz/Makefile -> r8168-8.047.04.tar.bz2/Makefile Changed

r8168-8.053.00.tar.gz/README -> r8168-8.047.04.tar.bz2/README Changed

r8168-8.053.00.tar.gz/autorun.sh -> r8168-8.047.04.tar.bz2/autorun.sh Changed

r8168-8.053.00.tar.gz/src/Makefile -> r8168-8.047.04.tar.bz2/src/Makefile Changed

@@ -1,10 +1,9 @@
-# SPDX-License-Identifier: GPL-2.0-only
 ################################################################################
 #
 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet
 # controllers with PCI-Express interface.
 #
-# Copyright(c) 2024 Realtek Semiconductor Corp. All rights reserved.
+# Copyright(c) 2019 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
@@ -39,15 +38,8 @@
 CONFIG_ASPM = y
 ENABLE_S5WOL = y
 ENABLE_S5_KEEP_CURR_MAC = n
-ENABLE_EEE = y
+ENABLE_EEE = n
 ENABLE_S0_MAGIC_PACKET = n
-CONFIG_DYNAMIC_ASPM = y
-ENABLE_USE_FIRMWARE_FILE = n
-CONFIG_CTAP_SHORT_OFF = n
-ENABLE_MULTIPLE_TX_QUEUE = n
-ENABLE_RSS_SUPPORT = n
-ENABLE_LIB_SUPPORT = n
-DISABLE_WOL_SUPPORT = n
 
 ifneq ($(KERNELRELEASE),)
 	obj-m := r8168.o
@@ -71,9 +63,7 @@
 	    r8168-objs += r8168_dash.o
 		EXTRA_CFLAGS += -DENABLE_DASH_SUPPORT -DENABLE_DASH_PRINTER_SUPPORT
 	endif
-	ifneq ($(ENABLE_RSS_SUPPORT), y)
-		EXTRA_CFLAGS += -DCONFIG_R8168_NAPI
-	endif
+	EXTRA_CFLAGS += -DCONFIG_R8168_NAPI
 	EXTRA_CFLAGS += -DCONFIG_R8168_VLAN
 	ifeq ($(CONFIG_DOWN_SPEED_100), y)
 		EXTRA_CFLAGS += -DCONFIG_DOWN_SPEED_100
@@ -93,30 +83,6 @@
 	ifeq ($(ENABLE_S0_MAGIC_PACKET), y)
 		EXTRA_CFLAGS += -DENABLE_S0_MAGIC_PACKET
 	endif
-	ifeq ($(CONFIG_DYNAMIC_ASPM), y)
-		EXTRA_CFLAGS += -DCONFIG_DYNAMIC_ASPM
-	endif
-	ifeq ($(ENABLE_USE_FIRMWARE_FILE), y)
-		r8168-objs += r8168_firmware.o
-		EXTRA_CFLAGS += -DENABLE_USE_FIRMWARE_FILE
-	endif
-	ifeq ($(CONFIG_CTAP_SHORT_OFF), y)
-		EXTRA_CFLAGS += -DCONFIG_CTAP_SHORT_OFF
-	endif
-	ifeq ($(ENABLE_MULTIPLE_TX_QUEUE), y)
-		EXTRA_CFLAGS += -DENABLE_MULTIPLE_TX_QUEUE
-	endif
-	ifeq ($(ENABLE_RSS_SUPPORT), y)
-		r8168-objs += r8168_rss.o
-		EXTRA_CFLAGS += -DENABLE_RSS_SUPPORT
-	endif
-	ifeq ($(ENABLE_LIB_SUPPORT), y)
-		r8168-objs += r8168_lib.o
-		EXTRA_CFLAGS += -DENABLE_LIB_SUPPORT
-	endif
-	ifeq ($(DISABLE_WOL_SUPPORT), y)
-		EXTRA_CFLAGS += -DDISABLE_WOL_SUPPORT
-	endif
 else
 	BASEDIR := /lib/modules/$(shell uname -r)
 	KERNELDIR ?= $(BASEDIR)/build

r8168-8.053.00.tar.gz/src/Makefile_linux24x -> r8168-8.047.04.tar.bz2/src/Makefile_linux24x Changed

r8168-8.053.00.tar.gz/src/r8168.h -> r8168-8.047.04.tar.bz2/src/r8168.h Changed

@@ -1,11 +1,10 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
 /*
 ################################################################################
 #
 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet
 # controllers with PCI-Express interface.
 #
-# Copyright(c) 2024 Realtek Semiconductor Corp. All rights reserved.
+# Copyright(c) 2019 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
@@ -33,88 +32,9 @@
  ***********************************************************************************/
 
 #include <linux/ethtool.h>
-#include <linux/interrupt.h>
-#include <linux/version.h>
 #include "r8168_dash.h"
 #include "r8168_realwow.h"
 #include "r8168_fiber.h"
-#include "r8168_rss.h"
-#ifdef ENABLE_LIB_SUPPORT
-#include "r8168_lib.h"
-#endif
-
-/*
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)&& !defined(ENABLE_LIB_SUPPORT)
-#define RTL_USE_NEW_INTR_API
-#endif
-*/
-
-#ifndef fallthrough
-#define fallthrough
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
-static inline
-ssize_t strscpy(char *dest, const char *src, size_t count)
-{
-        long res = 0;
-
-        if (count == 0)
-                return -E2BIG;
-
-        while (count) {
-                char c;
-
-                c = srcres;
-                destres = c;
-                if (!c)
-                        return res;
-                res++;
-                count--;
-        }
-
-        /* Hit buffer length without finding a NUL; force NUL-termination. */
-        if (res)
-                destres-1 = '\0';
-
-        return -E2BIG;
-}
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0))
-static inline unsigned char *skb_checksum_start(const struct sk_buff *skb)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22))
-        return skb->head + skb->csum_start;
-#else /* < 2.6.22 */
-        return skb_transport_header(skb);
-#endif
-}
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
-static inline void netdev_tx_sent_queue(struct netdev_queue *dev_queue,
-                                        unsigned int bytes)
-{}
-static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue,
-                unsigned int pkts,
-                unsigned int bytes)
-{}
-static inline void netdev_tx_reset_queue(struct netdev_queue *q) {}
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
-#define netdev_xmit_more() (0)
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,8,0)
-#define netif_testing_on(dev)
-#define netif_testing_off(dev)
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
-typedef int netdev_tx_t;
-#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 #define skb_transport_offset(skb) (skb->h.raw - skb->data)
@@ -205,21 +125,14 @@
 #endif
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
 
-#define RTL_ALLOC_SKB_INTR(napi, length) dev_alloc_skb(length)
-#define R8168_USE_NAPI_ALLOC_SKB 0
+#define RTL_ALLOC_SKB_INTR(tp, length) dev_alloc_skb(length)
 #ifdef CONFIG_R8168_NAPI
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)
 #undef RTL_ALLOC_SKB_INTR
-#define RTL_ALLOC_SKB_INTR(napi, length) napi_alloc_skb(napi, length)
-#undef R8168_USE_NAPI_ALLOC_SKB
-#define R8168_USE_NAPI_ALLOC_SKB 1
+#define RTL_ALLOC_SKB_INTR(tp, length) napi_alloc_skb(&tp->napi, length)
 #endif
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
-#define eth_random_addr(addr) random_ether_addr(addr)
-#endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
 #define netdev_features_t  u32
@@ -238,10 +151,6 @@
 #define ENABLE_R8168_PROCFS
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#define ENABLE_R8168_SYSFS
-#endif
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
 #define NETIF_F_HW_VLAN_RX	NETIF_F_HW_VLAN_CTAG_RX
 #define NETIF_F_HW_VLAN_TX	NETIF_F_HW_VLAN_CTAG_TX
@@ -272,7 +181,7 @@
 #define NETIF_F_RXFCS  0
 #endif
 
-#if !defined(HAVE_FREE_NETDEV) && (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
+#ifndef HAVE_FREE_NETDEV
 #define free_netdev(x)  kfree(x)
 #endif
 
@@ -341,14 +250,6 @@
 #define SUPPORTED_Asym_Pause  (1 << 14)
 #endif
 
-#ifndef  MDIO_EEE_100TX
-#define  MDIO_EEE_100TX  0x0002
-#endif
-
-#ifndef  MDIO_EEE_1000T
-#define  MDIO_EEE_1000T  0x0004
-#endif
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
 #ifdef CONFIG_NET_POLL_CONTROLLER
 #define RTL_NET_POLL_CONTROLLER dev->poll_controller=rtl8168_netpoll
@@ -401,7 +302,7 @@
 #ifndef NET_IP_ALIGN
 #define NET_IP_ALIGN        2
 #endif
-#define RTK_RX_ALIGN        NET_IP_ALIGN
+#define RTK_RX_ALIGN        8
 
 #ifdef CONFIG_R8168_NAPI
 #define NAPI_SUFFIX "-NAPI"
@@ -425,25 +326,20 @@
 #else
 #define DASH_SUFFIX ""
 #endif
-#if defined(ENABLE_RSS_SUPPORT)
-#define RSS_SUFFIX "-RSS"
-#else
-#define RSS_SUFFIX ""
-#endif
 
-#define RTL8168_VERSION "8.053.00" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX RSS_SUFFIX
+#define RTL8168_VERSION "8.047.04" NAPI_SUFFIX FIBER_SUFFIX REALWOW_SUFFIX DASH_SUFFIX
 #define MODULENAME "r8168"
 #define PFX MODULENAME ": "
 
 #define GPL_CLAIM "\
-r8168  Copyright (C) 2024 Realtek NIC software team <nicfae@realtek.com> \n \
+r8168  Copyright (C) 2019  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"
 
 #ifdef RTL8168_DEBUG
 #define assert(expr) \
         if(!(expr)) {                   \
-            printk("Assertion failed! %s,%s,%s,line=%d\n", \
+            printk( "Assertion failed! %s,%s,%s,line=%d\n", \
             #expr,__FILE__,__FUNCTION__,__LINE__);      \
         }
 #define dprintk(fmt, args...)   do { printk(PFX fmt, ## args); } while (0)
@@ -455,6 +351,9 @@
 #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)
@@ -515,51 +414,28 @@
 #define R8168_PCI_REGS_SIZE  	(0x100)
 #define R8168_NAPI_WEIGHT   64
 
-#define R8168_MAX_MSIX_VEC   4
-
 #define RTL8168_TX_TIMEOUT  (6 * HZ)
 #define RTL8168_LINK_TIMEOUT    (1 * HZ)
 #define RTL8168_ESD_TIMEOUT (2 * HZ)
-#define RTL8168_DASH_TIMEOUT    (0)
-
-#define MAX_NUM_TX_DESC 1024    /* Maximum number of Tx descriptor registers */
-#define MAX_NUM_RX_DESC 1024    /* Maximum number of Rx descriptor registers */
-
-#define MIN_NUM_TX_DESC 32    /* Minimum number of Tx descriptor registers */
-#define MIN_NUM_RX_DESC 32    /* Minimum number of Rx descriptor registers */
 
 #define NUM_TX_DESC 1024    /* Number of Tx descriptor registers */
 #define NUM_RX_DESC 1024    /* Number of Rx descriptor registers */
 
-#define RX_BUF_SIZE 0x05F2  /* 0x05F2 = 1522bye */
-#define R8168_MAX_TX_QUEUES (2)
-#define R8168_MAX_RX_QUEUES (4)
-#define R8168_MAX_QUEUES R8168_MAX_RX_QUEUES
-#define R8168_MULTI_TX_Q(tp) (rtl8168_tot_tx_rings(tp) > 1)
-#define R8168_MULTI_RX_Q(tp) (rtl8168_tot_rx_rings(tp) > 1)
-#define R8168_MULTI_RX_4Q(tp) (rtl8168_tot_rx_rings(tp) > 3)
-#define R8168_MULTI_RSS_4Q(tp) (tp->num_hw_tot_en_rx_rings > 3)
-
-#define OCP_STD_PHY_BASE	0xa400
-
-//Channel Wait Count
-#define R8168_CHANNEL_WAIT_COUNT (20000)
-#define R8168_CHANNEL_WAIT_TIME (1)  // 1us
-#define R8168_CHANNEL_EXIT_DELAY_TIME (20)  //20us
+#define RX_BUF_SIZE 0x05F3  /* 0x05F3 = 1522bye + 1 */
+#define R8168_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc))
+#define R8168_RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc))
 
 #define NODE_ADDRESS_SIZE 6
 
 #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))
-#define RTL_W32(tp, reg, val32)	writel((val32), tp->mmio_addr + (reg))
-#define RTL_R8(tp, reg)		readb(tp->mmio_addr + (reg))
-#define RTL_R16(tp, reg)		readw(tp->mmio_addr + (reg))
-#define RTL_R32(tp, reg)		((unsigned long) readl(tp->mmio_addr + (reg)))
+#define RTL_W8(reg, val8)   writeb ((val8), ioaddr + (reg))
+#define RTL_W16(reg, val16) writew ((val16), ioaddr + (reg))
+#define RTL_W32(reg, val32) writel ((val32), ioaddr + (reg))
+#define RTL_R8(reg)     readb (ioaddr + (reg))
+#define RTL_R16(reg)        readw (ioaddr + (reg))
+#define RTL_R32(reg)        ((unsigned long) readl (ioaddr + (reg)))
 
 #ifndef DMA_64BIT_MASK
 #define DMA_64BIT_MASK  0xffffffffffffffffULL
@@ -609,16 +485,12 @@
 #define ADVERTISE_1000HALF  0x100
 #endif
 
-#ifndef ETH_MIN_MTU
-#define ETH_MIN_MTU  68
-#endif
-
 /*****************************************************************************/
 
 //#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,3)
-#if ((LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27)) || \
-     ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && \
-      (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,3))))
+#if (( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,27) ) || \
+     (( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) ) && \
+      ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,3) )))
 /* copied from linux kernel 2.6.20 include/linux/netdev.h */
 #define NETDEV_ALIGN        32
 #define NETDEV_ALIGN_CONST  (NETDEV_ALIGN - 1)
@@ -663,11 +535,7 @@
 typedef struct napi_struct *napi_ptr;
 typedef int napi_budget;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
-#define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add_weight(ndev, &priv->napi, function, weight)
-#else
 #define RTL_NAPI_CONFIG(ndev, priv, function, weight)   netif_napi_add(ndev, &priv->napi, function, weight)
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
 #define RTL_NAPI_QUOTA(budget, ndev)            min(budget, budget)
 #define RTL_GET_PRIV(stuct_ptr, priv_struct)        container_of(stuct_ptr, priv_struct, stuct_ptr)
 #define RTL_GET_NETDEV(priv_ptr)            struct net_device *dev = priv_ptr->dev;
@@ -704,23 +572,6 @@
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
 
 /*****************************************************************************/
-#ifdef CONFIG_R8168_NAPI
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
-#define RTL_NAPI_CONSUME_SKB_ANY(skb, budget)          napi_consume_skb(skb, budget)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
-#define RTL_NAPI_CONSUME_SKB_ANY(skb, budget)          dev_consume_skb_any(skb);
-#else
-#define RTL_NAPI_CONSUME_SKB_ANY(skb, budget)          dev_kfree_skb_any(skb);
-#endif  //LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0)
-#else   //CONFIG_R8168_NAPI
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
-#define RTL_NAPI_CONSUME_SKB_ANY(skb, budget)          dev_consume_skb_any(skb);
-#else
-#define RTL_NAPI_CONSUME_SKB_ANY(skb, budget)          dev_kfree_skb_any(skb);
-#endif
-#endif  //CONFIG_R8168_NAPI
-
-/*****************************************************************************/
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
 #ifdef __CHECKER__
 #define __iomem __attribute__((noderef, address_space(2)))
@@ -754,7 +605,7 @@
 
 /*****************************************************************************/
 /* 2.5.28 => 2.4.23 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28))
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28) )
 
 static inline void _kc_synchronize_irq(void)
 {
@@ -775,12 +626,12 @@
 
 /*****************************************************************************/
 /* 2.6.4 => 2.6.0 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4))
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,4) )
 #define MODULE_VERSION(_version) MODULE_INFO(version, _version)
 #endif /* 2.6.4 => 2.6.0 */
 /*****************************************************************************/
 /* 2.6.0 => 2.5.28 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) )
 #define MODULE_INFO(version, _version)
 #ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT
 #define CONFIG_E1000_DISABLE_PACKET_SPLIT 1
@@ -811,13 +662,13 @@
 
 /*****************************************************************************/
 /* 2.4.22 => 2.4.17 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,22))
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,22) )
 #define pci_name(x) ((x)->slot_name)
 #endif /* 2.4.22 => 2.4.17 */
 
 /*****************************************************************************/
 /* 2.6.5 => 2.6.0 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5))
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
 #define pci_dma_sync_single_for_cpu pci_dma_sync_single
 #define pci_dma_sync_single_for_device  pci_dma_sync_single_for_cpu
 #endif /* 2.6.5 => 2.6.0 */
@@ -1213,20 +1064,13 @@
         ERIAR           = 0x74,
         EPHY_RXER_NUM   = 0x7C,
         EPHYAR          = 0x80,
-        IntrMask1       = 0x84,
-        IntrMask2       = 0x85,
-        IntrStatus1     = 0x86,
-        IntrStatus2     = 0x87,
         TimeInt2        = 0x8C,
-        Rss_indir_tbl   = 0x90,
         OCPDR           = 0xB0,
         MACOCP          = 0xB0,
         OCPAR           = 0xB4,
         SecMAC0         = 0xB4,
         SecMAC4         = 0xB8,
         PHYOCP          = 0xB8,
-        IntrMask3       = 0xC0,
-        IntrStatus3     = 0xC1,
         DBG_reg         = 0xD1,
         TwiCmdReg       = 0xD2,
         MCUCmd_reg      = 0xD3,
@@ -1247,14 +1091,6 @@
         CMAC_IBIMR0     = 0xFA,
         CMAC_IBISR0     = 0xFB,
         FuncForceEvent  = 0xFC,
-
-        /* ERI */
-        RSS_KEY_8168    = 0x90,
-        RSS_CTRL_8168   = 0xB8,
-        Q_NUM_CTRL_8168 = 0xC0,
-
-        /* MAC OCP */
-        EEE_TXIDLE_TIMER_8168   = 0xe048,
 };
 
 enum RTL8168_register_content {
@@ -1270,8 +1106,6 @@
         TxOK        = 0x0004,
         RxErr       = 0x0002,
         RxOK        = 0x0001,
-        RxDU1       = 0x0002,
-        RxOK1       = 0x0001,
 
         /* RxStatusDesc */
         RxRWT = (1 << 22),
@@ -1316,7 +1150,6 @@
         RxCfg_fet_multi_en = (1 << 14),
         RxCfg_half_refetch = (1 << 13),
         RxCfg_9356SEL = (1 << 6),
-        RxCfg_rx_desc_v2_en = (1 << 24),
 
         /* TxConfigBits */
         TxInterFrameGapShift = 24,
@@ -1333,7 +1166,6 @@
         PMEnable    = (1 << 0), /* Power Management Enable */
 
         /* Config2 register */
-        ClkReqEn	= (1 << 7),	/* Clock Request Enable */
         PMSTS_En    = (1 << 5),
 
         /* Config3 register */
@@ -1355,7 +1187,6 @@
         UWF     = (1 << 4), /* Accept Unicast wakeup frame */
         LanWake     = (1 << 1), /* LanWake enable/disable */
         PMEStatus   = (1 << 0), /* PME status can be reset by PCI RST# */
-        ASPM_en	    = (1 << 0),	/* ASPM enable */
 
         /* CPlusCmd */
         EnableBist  = (1 << 15),
@@ -1528,7 +1359,6 @@
 enum features {
 //  RTL_FEATURE_WOL = (1 << 0),
         RTL_FEATURE_MSI = (1 << 1),
-        RTL_FEATURE_MSIX = (1 << 2),
 };
 
 enum wol_capability {
@@ -1571,17 +1401,6 @@
         BIT_31 = (1 << 31)
 };
 
-#define RTL8168_CP_NUM 4
-#define RTL8168_MAX_SUPPORT_CP_LEN 110
-
-enum rtl8168_cp_status {
-        rtl8168_cp_normal = 0,
-        rtl8168_cp_short,
-        rtl8168_cp_open,
-        rtl8168_cp_mismatch,
-        rtl8168_cp_unknown
-};
-
 enum effuse {
         EFUSE_NOT_SUPPORT = 0,
         EFUSE_SUPPORT_V1,
@@ -1602,34 +1421,9 @@
         u64 addr;
 };
 
-struct RxDescV2 {
-        u32 opts1;
-        u32 opts2;
-        u64 addr;
-        u32 rsvd1;
-        u32 RSSResult;
-        u64 rsvd2;
-};
-
-//Rx Desc Type
-enum rx_desc_ring_type {
-        RX_DESC_RING_TYPE_UNKNOWN=0,
-        RX_DESC_RING_TYPE_1,
-        RX_DESC_RING_TYPE_2,
-        RX_DESC_RING_TYPE_3,
-        RX_DESC_RING_TYPE_MAX
-};
-
-enum rx_desc_len {
-        RX_DESC_LEN_TYPE_1 = (sizeof(struct RxDesc)),
-        RX_DESC_LEN_TYPE_2 = (sizeof(struct RxDescV2))
-};
-
 struct ring_info {
         struct sk_buff  *skb;
         u32     len;
-        unsigned int   bytecount;
-        unsigned short gso_segs;
         u8      __padsizeof(void *) - sizeof(u32);
 };
 
@@ -1653,256 +1447,17 @@
         u32 pci_sn_h;
 };
 
-enum r8168_dash_req_flag {
-        R8168_RCV_REQ_SYS_OK = 0,
-        R8168_RCV_REQ_DASH_OK,
-        R8168_SEND_REQ_HOST_OK,
-        R8168_CMAC_RESET,
-        R8168_CMAC_DISALE_RX_FLAG_MAX,
-        R8168_DASH_REQ_FLAG_MAX
-};
-
-enum r8168_flag {
-        R8168_FLAG_DOWN = 0,
-        R8168_FLAG_TASK_RESET_PENDING,
-        R8168_FLAG_TASK_ESD_CHECK_PENDING,
-        R8168_FLAG_TASK_LINKCHG_CHECK_PENDING,
-        R8168_FLAG_TASK_DASH_CHECK_PENDING,
-        R8168_FLAG_MAX
-};
-
-enum r8168_sysfs_flag {
-        R8168_SYSFS_RTL_ADV = 0,
-        R8168_SYSFS_FLAG_MAX
-};
-
-/* Flow Control Settings */
-enum rtl8168_fc_mode {
-        rtl8168_fc_none = 0,
-        rtl8168_fc_rx_pause,
-        rtl8168_fc_tx_pause,
-        rtl8168_fc_full,
-        rtl8168_fc_default
-};
-
-struct rtl8168_tx_ring {
-        void* priv;
-        struct net_device *netdev;
-        u32 index;
-        u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */
-        u32 dirty_tx;
-        u32 num_tx_desc; /* Number of Tx descriptor registers */
-        u32 tdu; /* Tx descriptor unavailable count */
-        struct TxDesc *TxDescArray; /* 256-aligned Tx descriptor ring */
-        dma_addr_t TxPhyAddr;
-        u32 TxDescAllocSize;
-        struct ring_info tx_skbNUM_TX_DESC; /* Tx data buffers */
-
-        u16 tdsar_reg; /* Transmit Descriptor Start Address */
-};
-
-struct rtl8168_rx_ring {
-        void* priv;
-        struct net_device *netdev;
-        u32 index;
-        u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */
-        u32 dirty_rx;
-        u32 rdu; /* Rx descriptor unavailable count */
-        //struct RxDesc *RxDescArray; /* 256-aligned Rx descriptor ring */
-        //u32 RxDescAllocSize;
-        u64 RxDescPhyAddrMAX_NUM_RX_DESC; /* Rx desc physical address*/
-        //dma_addr_t RxPhyAddr;
-        struct sk_buff *Rx_skbuffMAX_NUM_RX_DESC; /* Rx data buffers */
-
-        //u16 rdsar_reg; /* Receive Descriptor Start Address */
-};
-
-struct r8168_napi {
+struct rtl8168_private {
+        void __iomem *mmio_addr;    /* memory map physical address */
+        struct pci_dev *pci_dev;    /* Index of PCI device */
+        struct net_device *dev;
 #ifdef CONFIG_R8168_NAPI
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
         struct napi_struct napi;
 #endif
 #endif
-        void* priv;
-        int index;
-};
-
-struct r8168_irq {
-        irq_handler_t	handler;
-        unsigned int	vector;
-        u8		requested;
-        char		nameIFNAMSIZ + 10;
-};
-
-#pragma pack(1)
-struct rtl8168_regs {
-        //00
-        u8 mac_id6;
-        u16 reg_06;
-        u8 mar8;
-        //10
-        u64 dtccr;
-        u16 ledsel0;
-        u16 legreg;
-        u32 tctr3;
-        //20
-        u32 txq0_dsc_st_addr_0;
-        u32 txq0_dsc_st_addr_2;
-        u64 reg_28;
-        //30
-        u16 rit;
-        u16 ritc;
-        u16 reg_34;
-        u8 reg_36;
-        u8 command;
-        u32 imr0;
-        u32 isr0;
-        //40
-        u32 tcr;
-        u32 rcr;
-        u32 tctr0;
-        u32 tctr1;
-        //50
-        u8 cr93c46;
-        u8 config0;
-        u8 config1;
-        u8 config2;
-        u8 config3;
-        u8 config4;
-        u8 config5;
-        u8 tdfnr;
-        u32 timer_int0;
-        u32 timer_int1;
-        //60
-        u32 gphy_mdcmdio;
-        u32 csidr;
-        u32 csiar;
-        u16 phy_status;
-        u8 config6;
-        u8 pmch;
-        //70
-        u32 eridr;
-        u32 eriar;
-        u16 config7;
-        u16 reg_7a;
-        u32 ephy_rxerr_cnt;
-        //80
-        u32 ephy_mdcmdio;
-        u16 ledsel2;
-        u16 ledsel1;
-        u32 tctr2;
-        u32 timer_int2;
-        //90
-        u8 tppoll0;
-        u8 reg_91;
-        u16 reg_92;
-        u16 led_feature;
-        u16 ledsel3;
-        u16 eee_led_config;
-        u16 reg_9a;
-        u32 reg_9c;
-        //a0
-        u32 reg_a0;
-        u32 reg_a4;
-        u32 reg_a8;
-        u32 reg_ac;
-        //b0
-        u32 patch_dbg;
-        u32 reg_b4;
-        u32 gphy_ocp;
-        u32 reg_bc;
-        //c0
-        u32 reg_c0;
-        u32 reg_c4;
-        u32 reg_c8;
-        u16 otp_cmd;
-        u16 otp_pg_config;
-        //d0
-        u16 phy_pwr;
-        u8 twsi_ctrl;
-        u8 oob_ctrl;
-        u16 mac_dbgo;
-        u16 mac_dbg;
-        u16 reg_d8;
-        u16 rms;
-        u32 efuse_data;
-        //e0
-        u16 cplus_cmd;
-        u16 reg_e2;
-        u32 rxq0_dsc_st_addr_0;
-        u32 rxq0_dsc_st_addr_2;
-        u16 reg_ec;
-        u16 tx10midle_cnt;
-        //f0
-        u16 misc0;
-        u16 misc1;
-        u32 timer_int3;
-        u32 cmac_ib;
-        u16 reg_fc;
-        u16 sw_rst;
-};
-#pragma pack()
-
-struct rtl8168_regs_save {
-        union {
-                u8 mac_ioR8168_MAC_REGS_SIZE;
-
-                struct rtl8168_regs mac_reg;
-        };
-        u16 pcie_phyR8168_EPHY_REGS_SIZE/2;
-        u16 eth_phyR8168_PHY_REGS_SIZE/2;
-        u32 eri_regR8168_ERI_REGS_SIZE/4;
-        u32 pci_regR8168_PCI_REGS_SIZE/4;
-
-        //ktime_t begin_ktime;
-        //ktime_t end_ktime;
-        //u64 duration_ns;
-
-
-        u16 int_miti_rxq0;
-
-        u8 int_config;
-        u32 imr_new;
-        u32 isr_new;
-
-        u8 tdu_status;
-        u16 rdu_status;
-
-        u32 rss_ctrl;
-        u8 rss_keyRTL8168_RSS_KEY_SIZE;
-        u8 rss_i_tableRTL8168_MAX_INDIRECTION_TABLE_ENTRIES;
-        u16 rss_queue_num_sel_r;
-};
-
-struct rtl8168_counters {
-        /* legacy */
-        u64 tx_packets;
-        u64 rx_packets;
-        u64 tx_errors;
-        u32 rx_errors;
-        u16 rx_missed;
-        u16 align_errors;
-        u32 tx_one_collision;
-        u32 tx_multi_collision;
-        u64 rx_unicast;
-        u64 rx_broadcast;
-        u32 rx_multicast;
-        u16 tx_aborted;
-        u16 tx_underrun;
-};
-
-struct rtl8168_private {
-        void __iomem *mmio_addr;    /* memory map physical address */
-        struct pci_dev *pci_dev;    /* Index of PCI device */
-        struct pci_dev *pdev_cmac;  /* Index of PCI device */
-        struct net_device *dev;
-        struct r8168_napi r8168napiR8168_MAX_MSIX_VEC;
-        struct r8168_irq irq_tblR8168_MAX_MSIX_VEC;
-        unsigned int irq_nvecs;
-        unsigned int max_irq_nvecs;
-        unsigned int min_irq_nvecs;
-        unsigned int hw_supp_irq_nvecs;
         struct net_device_stats stats;  /* statistics of net device */
+        spinlock_t lock;        /* spin lock flag */
         u32 msg_enable;
         u32 tx_tcp_csum_cmd;
         u32 tx_udp_csum_cmd;
@@ -1911,35 +1466,19 @@
         int max_jumbo_frame_size;
         int chipset;
         u32 mcfg;
-        //u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */
-        // u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */
-        //u32 dirty_rx;
-        //u32 dirty_tx;
-        u32 num_rx_desc; /* Number of Rx descriptor registers */
-        //u32 num_tx_desc; /* Number of Tx descriptor registers */
-        //struct TxDesc *TxDescArray; /* 256-aligned Tx descriptor ring */
+        u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */
+        u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */
+        u32 dirty_rx;
+        u32 dirty_tx;
+        struct TxDesc *TxDescArray; /* 256-aligned Tx descriptor ring */
         struct RxDesc *RxDescArray; /* 256-aligned Rx descriptor ring */
-        //dma_addr_t TxPhyAddr;
+        dma_addr_t TxPhyAddr;
         dma_addr_t RxPhyAddr;
-        //u32 TxDescAllocSize;
-        u32 RxDescAllocSize;
-        //struct sk_buff *Rx_skbuffMAX_NUM_RX_DESC; /* Rx data buffers */
-        //struct ring_info tx_skbMAX_NUM_TX_DESC;   /* Tx data buffers */
+        struct sk_buff *Rx_skbuffNUM_RX_DESC; /* Rx data buffers */
+        struct ring_info tx_skbNUM_TX_DESC;   /* Tx data buffers */
         unsigned rx_buf_sz;
-        u16 HwSuppNumTxQueues; // Number of tx ring that hardware can support
-        u16 HwSuppNumRxQueues; // Number of rx ring that hardware can support
-        unsigned int num_tx_rings; // Number of tx ring that non-ring-lib driver used
-        unsigned int num_rx_rings; // Number of rx ring that non-ring-lib driver used
-        struct rtl8168_tx_ring tx_ringR8168_MAX_TX_QUEUES; // non-ring-lib tx ring
-        struct rtl8168_rx_ring rx_ringR8168_MAX_RX_QUEUES; // non-ring-lib rx ring
-#ifdef ENABLE_LIB_SUPPORT
-        struct blocking_notifier_head lib_nh;
-        struct rtl8168_ring lib_tx_ringR8168_MAX_TX_QUEUES; // ring-lib tx ring
-        struct rtl8168_ring lib_rx_ringR8168_MAX_RX_QUEUES; // ring-lib rx ring
-#endif
-        u16 num_hw_tot_en_rx_rings; // Number of rx ring that hardware enabled
-        //struct timer_list esd_timer;
-        //struct timer_list link_timer;
+        struct timer_list esd_timer;
+        struct timer_list link_timer;
         struct pci_resource pci_cfg_space;
         unsigned int esd_flag;
         unsigned int pci_cfg_is_read;
@@ -1947,8 +1486,6 @@
         u16 cp_cmd;
         u16 intr_mask;
         u16 timer_intr_mask;
-        u16 isr_regR8168_MAX_MSIX_VEC;
-        u16 imr_regR8168_MAX_MSIX_VEC;
         int phy_auto_nego_reg;
         int phy_1000_ctrl_reg;
         u8 org_mac_addrNODE_ADDRESS_SIZE;
@@ -1966,7 +1503,6 @@
         u8  duplex;
         u32 speed;
         u32 advertising;
-        enum rtl8168_fc_mode fcpause;
         u16 eeprom_len;
         u16 cur_page;
         u32 bios_setting;
@@ -1981,17 +1517,10 @@
         unsigned int (*phy_reset_pending)(struct net_device *);
         unsigned int (*link_ok)(struct net_device *);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-        struct work_struct reset_task;
-        struct work_struct esd_task;
-        struct work_struct linkchg_task;
-        struct work_struct dash_task;
+        struct work_struct task;
 #else
-        struct delayed_work reset_task;
-        struct delayed_work esd_task;
-        struct delayed_work linkchg_task;
-        struct delayed_work dash_task;
+        struct delayed_work task;
 #endif
-        DECLARE_BITMAP(task_flags, R8168_FLAG_MAX);
         unsigned features;
 
         u8 org_pci_offset_99;
@@ -2018,6 +1547,9 @@
 
         u8 UseSwPaddingShortPkt;
 
+        void *ShortPacketEmptyBuffer;
+        dma_addr_t ShortPacketEmptyBufferPhy;
+
         u8 RequireAdcBiasPatch;
         u16 AdcBiasPatchIoffset;
 
@@ -2030,51 +1562,29 @@
 
         u32 HwFiberModeVer;
         u32 HwFiberStat;
-        u8 HwFiberLedMode;
         u8 HwSwitchMdiToFiber;
 
-        u8 HwSuppSerDesPhyVer;
-
-        u8 HwSuppPhyOcpVer;
-
-        u8 HwSuppAspmClkIntrLock;
-
         u16 NicCustLedValue;
 
-        u8 HwSuppUpsVer;
-
         u8 HwSuppMagicPktVer;
 
         u8 HwSuppCheckPhyDisableModeVer;
 
         u8 random_mac;
 
-        u16 phy_reg_aner;
+        u8 HwSuppGigaForceMode;
+
         u16 phy_reg_anlpar;
-        u16 phy_reg_gbsr;
 
         u32 HwPcieSNOffset;
 
-        u8 HwSuppEsdVer;
-        u8 TestPhyOcpReg;
-        u16 BackupPhyFuseDout_15_0;
-        u16 BackupPhyFuseDout_31_16;
-        u16 BackupPhyFuseDout_47_32;
-        u16 BackupPhyFuseDout_63_48;
-
-        u8 ring_lib_enabled;
-
-        const char *fw_name;
-        struct rtl8168_fw *rtl_fw;
-        u32 ocp_base;
-
         //Dash+++++++++++++++++
         u8 HwSuppDashVer;
         u8 DASH;
         u8 dash_printer_enabled;
         u8 HwPkgDet;
+        void __iomem *mapped_cmac_ioaddr; /* mapped cmac memory map physical address */
         void __iomem *cmac_ioaddr; /* cmac memory map physical address */
-        DECLARE_BITMAP(dash_req_flags, R8168_DASH_REQ_FLAG_MAX);
 
 #ifdef ENABLE_DASH_SUPPORT
         u16 AfterRecvFromFwBufLen;
@@ -2082,45 +1592,59 @@
         u16 AfterSendToFwBufLen;
         u8 AfterSendToFwBufSEND_TO_FW_BUF_SIZE;
         u16 SendToFwBufferLen;
-        u32 SizeOfSendToFwBuffer;
-        u32 SizeOfSendToFwBufferMemAlloc;
-        u32 NumOfSendToFwBuffer;
+        u32 SizeOfSendToFwBuffer ;
+        u32 SizeOfSendToFwBufferMemAlloc ;
+        u32 NumOfSendToFwBuffer ;
 
         u8 OobReq;
         u8 OobAck;
         u32 OobReqComplete;
         u32 OobAckComplete;
 
-        void *SendToFwBuffer;
-        dma_addr_t SendToFwBufferPhy;
+        u8 RcvFwReqSysOkEvt;
+        u8 RcvFwDashOkEvt;
+        u8 SendFwHostOkEvt;
+
+        u8 DashFwDisableRx;
+
+        void *UnalignedSendToFwBufferVa;
+        void *SendToFwBuffer ;
+        u64 SendToFwBufferPhy ;
         u8 SendingToFw;
+        dma_addr_t UnalignedSendToFwBufferPa;
         PTX_DASH_SEND_FW_DESC TxDashSendFwDesc;
-        dma_addr_t TxDashSendFwDescPhy;
+        u64 TxDashSendFwDescPhy;
+        u8 *UnalignedTxDashSendFwDescVa;
         u32 SizeOfTxDashSendFwDescMemAlloc;
-        u32 SizeOfTxDashSendFwDesc;
-        u32 NumTxDashSendFwDesc;
-        u32 CurrNumTxDashSendFwDesc;
-        u32 LastSendNumTxDashSendFwDesc;
-
-        u32 NumRecvFromFwBuffer;
-        u32 SizeOfRecvFromFwBuffer;
-        u32 SizeOfRecvFromFwBufferMemAlloc;
-        void *RecvFromFwBuffer;
-        dma_addr_t RecvFromFwBufferPhy;
-
+        u32 SizeOfTxDashSendFwDesc ;
+        u32 NumTxDashSendFwDesc ;
+        u32 CurrNumTxDashSendFwDesc ;
+        u32 LastSendNumTxDashSendFwDesc ;
+        dma_addr_t UnalignedTxDashSendFwDescPa;
+
+        u32 NumRecvFromFwBuffer ;
+        u32 SizeOfRecvFromFwBuffer ;
+        u32 SizeOfRecvFromFwBufferMemAlloc ;
+        void *RecvFromFwBuffer ;
+        u64 RecvFromFwBufferPhy ;
+
+        void *UnalignedRecvFromFwBufferVa;
+        dma_addr_t UnalignedRecvFromFwBufferPa;
         PRX_DASH_FROM_FW_DESC RxDashRecvFwDesc;
-        dma_addr_t RxDashRecvFwDescPhy;
+        u64 RxDashRecvFwDescPhy;
+        u8 *UnalignedRxDashRecvFwDescVa;
         u32 SizeOfRxDashRecvFwDescMemAlloc;
-        u32 SizeOfRxDashRecvFwDesc;
-        u32 NumRxDashRecvFwDesc;
-        u32 CurrNumRxDashRecvFwDesc;
+        u32 SizeOfRxDashRecvFwDesc ;
+        u32 NumRxDashRecvFwDesc ;
+        u32 CurrNumRxDashRecvFwDesc ;
+        dma_addr_t UnalignedRxDashRecvFwDescPa;
         u8 DashReqRegValue;
         u16 HostReqValue;
 
         u32 CmacResetIsrCounter;
-        u8 CmacResetIntr;
-        u8 CmacResetting;
-        u8 CmacOobIssueCmacReset;
+        u8 CmacResetIntr ;
+        u8 CmacResetting ;
+        u8 CmacOobIssueCmacReset ;
         u32 CmacResetbyFwCnt;
 
 #if defined(ENABLE_DASH_PRINTER_SUPPORT)
@@ -2143,151 +1667,14 @@
         //Realwow--------------
 #endif //ENABLE_REALWOW_SUPPORT
 
-        struct ethtool_eee eee;
-
-        u32 dynamic_aspm_packet_count;
+        u32 eee_adv_t;
+        u8 eee_enabled;
 
 #ifdef ENABLE_R8168_PROCFS
         //Procfs support
         struct proc_dir_entry *proc_dir;
-        struct proc_dir_entry *proc_dir_debug;
-        struct proc_dir_entry *proc_dir_test;
-#endif
-#ifdef ENABLE_R8168_SYSFS
-        //sysfs support
-        DECLARE_BITMAP(sysfs_flag, R8168_SYSFS_FLAG_MAX);
-        u32 testmode;
-#endif
-        u8 HwSuppRxDescType;
-        u8 InitRxDescType;
-        u16 RxDescLength; //V1 16 Byte V2 32 Bytes
-
-        u8 HwSuppRssVer;
-        u8 EnableRss;
-        u16 HwSuppIndirTblEntries;
-#ifdef ENABLE_RSS_SUPPORT
-        u32 rss_flags;
-        /* Receive Side Scaling settings */
-#define RTL8168_RSS_KEY_SIZE     40  /* size of RSS Hash Key in bytes */
-        u8 rss_keyRTL8168_RSS_KEY_SIZE;
-#define RTL8168_MAX_INDIRECTION_TABLE_ENTRIES 128
-        u8 rss_indir_tblRTL8168_MAX_INDIRECTION_TABLE_ENTRIES;
-        u32 rss_options;
-#endif
-        u32 rx_fifo_of; /* Rx fifo overflow count */
-};
-
-#ifdef ENABLE_LIB_SUPPORT
-static inline unsigned int
-rtl8168_num_lib_tx_rings(struct rtl8168_private *tp)
-{
-        int count, i;
-
-        for (count = 0, i = tp->num_tx_rings; i < tp->HwSuppNumTxQueues; i++)
-                if(tp->lib_tx_ringi.enabled)
-                        count++;
-
-        return count;
-}
-
-static inline unsigned int
-rtl8168_num_lib_rx_rings(struct rtl8168_private *tp)
-{
-        int count, i;
-
-        for (count = 0, i = 1; i < tp->HwSuppNumRxQueues; i++)
-                if(tp->lib_rx_ringi.enabled)
-                        count++;
-
-        return count;
-}
-
-static inline bool
-rtl8168_lib_tx_ring_released(struct rtl8168_private *tp)
-{
-        int i;
-        bool released = 0;
-
-        for (i = tp->num_tx_rings; i < tp->HwSuppNumTxQueues; i++) {
-                struct rtl8168_ring *ring = &tp->lib_tx_ringi;
-                if (ring->allocated)
-                        goto exit;
-        }
-
-        released = 1;
-
-exit:
-        return released;
-}
-
-static inline bool
-rtl8168_lib_rx_ring_released(struct rtl8168_private *tp)
-{
-        int i;
-        bool released = 0;
-
-        for (i = 1; i < tp->HwSuppNumRxQueues; i++) {
-                struct rtl8168_ring *ring = &tp->lib_rx_ringi;
-                if (ring->allocated)
-                        goto exit;
-        }
-
-        released = 1;
-
-exit:
-        return released;
-}
-
-#else
-
-static inline unsigned int
-rtl8168_num_lib_tx_rings(struct rtl8168_private *tp)
-{
-        return 0;
-}
-
-static inline unsigned int
-rtl8168_num_lib_rx_rings(struct rtl8168_private *tp)
-{
-        return 0;
-}
-
-static inline bool
-rtl8168_lib_tx_ring_released(struct rtl8168_private *tp)
-{
-        return 1;
-}
-
-static inline bool
-rtl8168_lib_rx_ring_released(struct rtl8168_private *tp)
-{
-        return 1;
-}
 #endif
-
-static inline unsigned int
-rtl8168_tot_tx_rings(struct rtl8168_private *tp)
-{
-        return tp->num_tx_rings + rtl8168_num_lib_tx_rings(tp);
-}
-
-static inline unsigned int
-rtl8168_tot_rx_rings(struct rtl8168_private *tp)
-{
-        return tp->num_rx_rings + rtl8168_num_lib_rx_rings(tp);
-}
-
-static inline struct netdev_queue *txring_txq(const struct rtl8168_tx_ring *ring)
-{
-        return netdev_get_tx_queue(ring->netdev, ring->index);
-}
-
-static inline bool
-rtl8168_lib_all_ring_released(struct rtl8168_private *tp)
-{
-        return (rtl8168_lib_tx_ring_released(tp) &&
-                rtl8168_lib_rx_ring_released(tp));
-}
+};
 
 enum eetype {
         EEPROM_TYPE_NONE=0,
@@ -2329,11 +1716,6 @@
         CFG_METHOD_30,
         CFG_METHOD_31,
         CFG_METHOD_32,
-        CFG_METHOD_33,
-        CFG_METHOD_34,
-        CFG_METHOD_35,
-        CFG_METHOD_36,
-        CFG_METHOD_37,
         CFG_METHOD_MAX,
         CFG_METHOD_DEFAULT = 0xFF
 };
@@ -2346,7 +1728,7 @@
 #define NIC_MAX_PHYS_BUF_COUNT_LSO2     (16*4)
 
 #define GTTCPHO_SHIFT                   18
-#define GTTCPHO_MAX                     0x70U
+#define GTTCPHO_MAX                     0x7fU
 #define GTPKTSIZE_MAX                   0x3ffffU
 #define TCPHO_SHIFT                     18
 #define TCPHO_MAX                       0x3ffU
@@ -2372,28 +1754,20 @@
 #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 (0x0083)
+#define NIC_RAMCODE_VERSION_CFG_METHOD_29 (0x0055)
 #define NIC_RAMCODE_VERSION_CFG_METHOD_31 (0x0003)
-#define NIC_RAMCODE_VERSION_CFG_METHOD_35 (0x0027)
-#define NIC_RAMCODE_VERSION_CFG_METHOD_36 (0x0000)
 
 //hwoptimize
 #define HW_PATCH_SOC_LAN (BIT_0)
 #define HW_PATCH_SAMSUNG_LAN_DONGLE (BIT_2)
 
-static const u8 other_q_intr_mask = (RxOK1 | RxDU1);
-
-#define HW_PHY_STATUS_INI       1
-#define HW_PHY_STATUS_EXT_INI   2
-#define HW_PHY_STATUS_LAN_ON    3
-
-void rtl8168_mdio_write(struct rtl8168_private *tp, u16 RegAddr, u16 value);
+void rtl8168_mdio_write(struct rtl8168_private *tp, u32 RegAddr, u32 value);
 void rtl8168_mdio_prot_write(struct rtl8168_private *tp, u32 RegAddr, u32 value);
 void rtl8168_mdio_prot_direct_write_phy_ocp(struct rtl8168_private *tp, u32 RegAddr, u32 value);
-u32 rtl8168_mdio_read(struct rtl8168_private *tp, u16 RegAddr);
+u32 rtl8168_mdio_read(struct rtl8168_private *tp, u32 RegAddr);
 u32 rtl8168_mdio_prot_read(struct rtl8168_private *tp, u32 RegAddr);
 u32 rtl8168_mdio_prot_direct_read_phy_ocp(struct rtl8168_private *tp, u32 RegAddr);
-void rtl8168_ephy_write(struct rtl8168_private *tp, int RegAddr, int value);
+void rtl8168_ephy_write(void __iomem *ioaddr, int RegAddr, int value);
 void rtl8168_mac_ocp_write(struct rtl8168_private *tp, u16 reg_addr, u16 value);
 u16 rtl8168_mac_ocp_read(struct rtl8168_private *tp, u16 reg_addr);
 void rtl8168_clear_eth_phy_bit(struct rtl8168_private *tp, u8 addr, u16 mask);
@@ -2401,15 +1775,16 @@
 void rtl8168_ocp_write(struct rtl8168_private *tp, u16 addr, u8 len, u32 data);
 void rtl8168_oob_notify(struct rtl8168_private *tp, u8 cmd);
 void rtl8168_init_ring_indexes(struct rtl8168_private *tp);
-int rtl8168_eri_write(struct rtl8168_private *tp, int addr, int len, u32 value, int type);
+int rtl8168_eri_write(void __iomem *ioaddr, int addr, int len, u32 value, int type);
 void rtl8168_oob_mutex_lock(struct rtl8168_private *tp);
+u32 rtl8168_mdio_read(struct rtl8168_private *tp, u32 RegAddr);
 u32 rtl8168_ocp_read(struct rtl8168_private *tp, u16 addr, u8 len);
 u32 rtl8168_ocp_read_with_oob_base_address(struct rtl8168_private *tp, u16 addr, u8 len, u32 base_address);
 u32 rtl8168_ocp_write_with_oob_base_address(struct rtl8168_private *tp, u16 addr, u8 len, u32 value, u32 base_address);
-u32 rtl8168_eri_read(struct rtl8168_private *tp, int addr, int len, int type);
-u32 rtl8168_eri_read_with_oob_base_address(struct rtl8168_private *tp, int addr, int len, int type, u32 base_address);
-int rtl8168_eri_write_with_oob_base_address(struct rtl8168_private *tp, int addr, int len, u32 value, int type, u32 base_address);
-u16 rtl8168_ephy_read(struct rtl8168_private *tp, int RegAddr);
+u32 rtl8168_eri_read(void __iomem *ioaddr, int addr, int len, int type);
+u32 rtl8168_eri_read_with_oob_base_address(void __iomem *ioaddr, int addr, int len, int type, u32 base_address);
+int rtl8168_eri_write_with_oob_base_address(void __iomem *ioaddr, int addr, int len, u32 value, int type, u32 base_address);
+u16 rtl8168_ephy_read(void __iomem *ioaddr, int RegAddr);
 void rtl8168_wait_txrx_fifo_empty(struct net_device *dev);
 void rtl8168_wait_ll_share_fifo_ready(struct net_device *dev);
 void rtl8168_enable_now_is_oob(struct rtl8168_private *tp);
@@ -2420,109 +1795,8 @@
 void rtl8168_dash2_disable_rx(struct rtl8168_private *tp);
 void rtl8168_dash2_enable_rx(struct rtl8168_private *tp);
 void rtl8168_hw_disable_mac_mcu_bps(struct net_device *dev);
-void rtl8168_mark_to_asic(struct RxDesc *desc, u32 rx_buf_sz);
-
-static inline struct RxDesc*
-rtl8168_get_rxdesc(struct rtl8168_private *tp, struct RxDesc *RxDescBase, u32 const cur_rx, u32 const q_num)
-{
-        u8 *desc = (u8*)RxDescBase;
-        u32 offset;
-
-        WARN_ON_ONCE(q_num >= tp->num_hw_tot_en_rx_rings);
-
-        if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)
-                offset = (cur_rx * tp->num_hw_tot_en_rx_rings) + q_num;
-        else
-                offset = cur_rx;
-
-        offset *= tp->RxDescLength;
-        desc += offset;
-
-        return (struct RxDesc*)desc;
-}
-
-#ifdef ENABLE_DASH_SUPPORT
-
-static inline void
-rtl8168_enable_dash2_interrupt(struct rtl8168_private *tp)
-{
-        if (!tp->DASH)
-                return;
-
-        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                RTL_CMAC_W8(tp, CMAC_IBIMR0, (ISRIMR_DASH_TYPE2_ROK | ISRIMR_DASH_TYPE2_TOK | ISRIMR_DASH_TYPE2_TDU | ISRIMR_DASH_TYPE2_RDU | ISRIMR_DASH_TYPE2_RX_DISABLE_IDLE));
-        }
-}
-
-static inline void
-rtl8168_disable_dash2_interrupt(struct rtl8168_private *tp)
-{
-        if (!tp->DASH)
-                return;
-
-        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                RTL_CMAC_W8(tp, CMAC_IBIMR0, 0);
-        }
-}
-#endif
-
-static inline void
-rtl8168_disable_interrupt_by_vector(struct rtl8168_private *tp,
-                                    u32 message_id)
-{
-        if (message_id >= R8168_MAX_MSIX_VEC)
-                return;
-
-        if (message_id == 0) {
-                RTL_W16(tp, tp->imr_reg0, 0x0000);
-#ifdef ENABLE_DASH_SUPPORT
-                if (tp->DASH)
-                        rtl8168_disable_dash2_interrupt(tp);
-#endif
-        } else
-                RTL_W8(tp, tp->imr_regmessage_id, 0x00);
-}
-
-static inline void
-rtl8168_enable_interrupt_by_vector(struct rtl8168_private *tp,
-                                   u32 message_id)
-{
-        if (message_id >= R8168_MAX_MSIX_VEC)
-                return;
-
-        if (message_id == 0) {
-                RTL_W16(tp, tp->imr_reg0, tp->intr_mask);
-#ifdef ENABLE_DASH_SUPPORT
-                if (tp->DASH)
-                        rtl8168_enable_dash2_interrupt(tp);
-#endif
-        } else {
-                RTL_W8(tp, tp->imr_regmessage_id, other_q_intr_mask);
-        }
-}
 
-int rtl8168_open(struct net_device *dev);
-int rtl8168_close(struct net_device *dev);
-void rtl8168_hw_config(struct net_device *dev);
-void rtl8168_hw_start(struct net_device *dev);
-void rtl8168_hw_reset(struct net_device *dev);
-void rtl8168_tx_clear(struct rtl8168_private *tp);
-void rtl8168_rx_clear(struct rtl8168_private *tp);
-int rtl8168_init_ring(struct net_device *dev);
-int rtl8168_dump_tally_counter(struct rtl8168_private *tp, dma_addr_t paddr);
-void rtl8168_enable_napi(struct rtl8168_private *tp);
-void _rtl8168_wait_for_quiescence(struct net_device *dev);
-
-#ifndef ENABLE_LIB_SUPPORT
-static inline void rtl8168_lib_reset_prepare(struct rtl8168_private *tp) { }
-static inline void rtl8168_lib_reset_complete(struct rtl8168_private *tp) { }
-#endif
-
-#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)
-#define HW_SUPPORT_UPS_MODE(_M)        ((_M)->HwSuppUpsVer > 0)
-#define HW_RSS_SUPPORT_RSS(_M)        ((_M)->HwSuppRssVer > 0)
+#define HW_SUPPORT_CHECK_PHY_DISABLE_MODE(_M)        ((_M)->HwSuppCheckPhyDisableModeVer > 0 )
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
 #define netdev_mc_count(dev) ((dev)->mc_count)

r8168-8.053.00.tar.gz/src/r8168_asf.c -> r8168-8.047.04.tar.bz2/src/r8168_asf.c Changed

r8168-8.053.00.tar.gz/src/r8168_asf.h -> r8168-8.047.04.tar.bz2/src/r8168_asf.h Changed

r8168-8.053.00.tar.gz/src/r8168_dash.h -> r8168-8.047.04.tar.bz2/src/r8168_dash.h Changed

r8168-8.053.00.tar.gz/src/r8168_fiber.h -> r8168-8.047.04.tar.bz2/src/r8168_fiber.h Changed

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

@@ -1,11 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0-only
 /*
 ################################################################################
 #
 # r8168 is the Linux device driver released for Realtek Gigabit Ethernet
 # controllers with PCI-Express interface.
 #
-# Copyright(c) 2024 Realtek Semiconductor Corp. All rights reserved.
+# Copyright(c) 2019 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
@@ -36,10 +35,6 @@
  * This driver is modified from r8169.c in Linux kernel 2.6.18
  */
 
-/* In Linux 5.4 asm_inline was introduced, but it's not supported by clang.
- * Redefine it to just asm to enable successful compilation.
- */
-
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/pci.h>
@@ -62,10 +57,8 @@
 #include <linux/completion.h>
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
 #include <linux/pci-aspm.h>
 #endif
-#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
 #include <linux/prefetch.h>
 #endif
@@ -81,10 +74,6 @@
 #include <linux/mdio.h>
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10)
-#include <net/gso.h>
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10) */
-
 #include <asm/io.h>
 #include <asm/irq.h>
 
@@ -92,79 +81,15 @@
 #include "r8168_asf.h"
 #include "rtl_eeprom.h"
 #include "rtltool.h"
-#include "r8168_firmware.h"
 
 #ifdef ENABLE_R8168_PROCFS
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #endif
 
-#define FIRMWARE_8168D_1    "rtl_nic/rtl8168d-1.fw"
-#define FIRMWARE_8168D_2    "rtl_nic/rtl8168d-2.fw"
-#define FIRMWARE_8168E_1    "rtl_nic/rtl8168e-1.fw"
-#define FIRMWARE_8168E_2    "rtl_nic/rtl8168e-2.fw"
-#define FIRMWARE_8168E_3    "rtl_nic/rtl8168e-3.fw"
-#define FIRMWARE_8168E_4    "rtl_nic/rtl8168e-4.fw"
-#define FIRMWARE_8168F_1    "rtl_nic/rtl8168f-1.fw"
-#define FIRMWARE_8168F_2    "rtl_nic/rtl8168f-2.fw"
-#define FIRMWARE_8411_1     "rtl_nic/rtl8411-1.fw"
-#define FIRMWARE_8411_2     "rtl_nic/rtl8411-2.fw"
-#define FIRMWARE_8168G_2    "rtl_nic/rtl8168g-2.fw"
-#define FIRMWARE_8168G_3    "rtl_nic/rtl8168g-3.fw"
-#define FIRMWARE_8168EP_1   "rtl_nic/rtl8168ep-1.fw"
-#define FIRMWARE_8168EP_2   "rtl_nic/rtl8168ep-2.fw"
-#define FIRMWARE_8168EP_3   "rtl_nic/rtl8168ep-3.fw"
-#define FIRMWARE_8168H_1    "rtl_nic/rtl8168h-1.fw"
-#define FIRMWARE_8168H_2    "rtl_nic/rtl8168h-2.fw"
-#define FIRMWARE_8168H_3    "rtl_nic/rtl8168h-3.fw"
-#define FIRMWARE_8168H_4    "rtl_nic/rtl8168h-4.fw"
-#define FIRMWARE_8168FP_3   "rtl_nic/rtl8168fp-3.fw"
-#define FIRMWARE_8168FP_4   "rtl_nic/rtl8168fp-4.fw"
-
-static const struct {
-        const char *name;
-        const char *fw_name;
-} rtl_chip_fw_infos = {
-        /* PCI-E devices. */
-        CFG_METHOD_1 = {"RTL8168B/8111",          },
-        CFG_METHOD_2 = {"RTL8168B/8111",          },
-        CFG_METHOD_3 = {"RTL8168B/8111",          },
-        CFG_METHOD_4 = {"RTL8168C/8111C",         },
-        CFG_METHOD_5 = {"RTL8168C/8111C",         },
-        CFG_METHOD_6 = {"RTL8168C/8111C",         },
-        CFG_METHOD_7 = {"RTL8168CP/8111CP",       },
-        CFG_METHOD_8 = {"RTL8168CP/8111CP",       },
-        CFG_METHOD_9 = {"RTL8168D/8111D",         FIRMWARE_8168D_1},
-        CFG_METHOD_10 = {"RTL8168D/8111D",        FIRMWARE_8168D_2},
-        CFG_METHOD_11 = {"RTL8168DP/8111DP",      },
-        CFG_METHOD_12 = {"RTL8168DP/8111DP",      },
-        CFG_METHOD_13 = {"RTL8168DP/8111DP",      },
-        CFG_METHOD_14 = {"RTL8168E/8111E",        FIRMWARE_8168E_1},
-        CFG_METHOD_15 = {"RTL8168E/8111E",        FIRMWARE_8168E_2},
-        CFG_METHOD_16 = {"RTL8168E-VL/8111E-VL",  FIRMWARE_8168E_3},
-        CFG_METHOD_17 = {"RTL8168E-VL/8111E-VL",  FIRMWARE_8168E_4},
-        CFG_METHOD_18 = {"RTL8168F/8111F",        FIRMWARE_8168F_1},
-        CFG_METHOD_19 = {"RTL8168F/8111F",        FIRMWARE_8168F_2},
-        CFG_METHOD_20 = {"RTL8411",               FIRMWARE_8411_1},
-        CFG_METHOD_21 = {"RTL8168G/8111G",        FIRMWARE_8168G_2},
-        CFG_METHOD_22 = {"RTL8168G/8111G",        },
-        CFG_METHOD_23 = {"RTL8168EP/8111EP",      FIRMWARE_8168EP_1},
-        CFG_METHOD_24 = {"RTL8168GU/8111GU",      },
-        CFG_METHOD_25 = {"RTL8168GU/8111GU",      FIRMWARE_8168G_3},
-        CFG_METHOD_26 = {"8411B",                 FIRMWARE_8411_2},
-        CFG_METHOD_27 = {"RTL8168EP/8111EP",      FIRMWARE_8168EP_2},
-        CFG_METHOD_28 = {"RTL8168EP/8111EP",      FIRMWARE_8168EP_3},
-        CFG_METHOD_29 = {"RTL8168H/8111H",        FIRMWARE_8168H_1},
-        CFG_METHOD_30 = {"RTL8168H/8111H",        FIRMWARE_8168H_2},
-        CFG_METHOD_31 = {"RTL8168FP/8111FP",      },
-        CFG_METHOD_32 = {"RTL8168FP/8111FP",      FIRMWARE_8168FP_3},
-        CFG_METHOD_33 = {"RTL8168FP/8111FP",      FIRMWARE_8168FP_4},
-        CFG_METHOD_34 = {"RTL8168FP/8111FP",      FIRMWARE_8168FP_4},
-        CFG_METHOD_35 = {"RTL8168H/8111H",        FIRMWARE_8168H_3},
-        CFG_METHOD_36 = {"RTL8168H/8111H",        FIRMWARE_8168H_4},
-        CFG_METHOD_37 = {"RTL8168M/8111M",        FIRMWARE_8168H_2},
-        CFG_METHOD_DEFAULT = {"Unknown",          },
-};
+/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
+   The RTL chips use a 64 element hash table based on the Ethernet CRC. */
+static const int multicast_filter_limit = 32;
 
 #define _R(NAME,MAC,RCR,MASK, JumFrameSz) \
     { .name = NAME, .mcfg = MAC, .RCR_Cfg = RCR, .RxConfigMask = MASK, .jumbo_frame_sz = JumFrameSz }
@@ -298,103 +223,73 @@
 
         _R("RTL8168G/8111G",
         CFG_METHOD_21,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168G/8111G",
         CFG_METHOD_22,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168EP/8111EP",
         CFG_METHOD_23,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168GU/8111GU",
         CFG_METHOD_24,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168GU/8111GU",
         CFG_METHOD_25,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("8411B",
         CFG_METHOD_26,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168EP/8111EP",
         CFG_METHOD_27,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168EP/8111EP",
         CFG_METHOD_28,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168H/8111H",
         CFG_METHOD_29,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168H/8111H",
         CFG_METHOD_30,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168FP/8111FP",
         CFG_METHOD_31,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
         _R("RTL8168FP/8111FP",
         CFG_METHOD_32,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
-        0xff7e5880,
-        Jumbo_Frame_9k),
-
-        _R("RTL8168FP/8111FP",
-        CFG_METHOD_33,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
-        0xff7e5880,
-        Jumbo_Frame_9k),
-
-        _R("RTL8168FP/8111FP",
-        CFG_METHOD_34,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
-        0xff7e5880,
-        Jumbo_Frame_9k),
-
-        _R("RTL8168H/8111H",
-        CFG_METHOD_35,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
-        0xff7e5880,
-        Jumbo_Frame_9k),
-
-        _R("RTL8168H/8111H",
-        CFG_METHOD_36,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
-        0xff7e5880,
-        Jumbo_Frame_9k),
-
-        _R("RTL8168M/8111M",
-        CFG_METHOD_37,
-        RxCfg_128_int_en | RxEarly_off_V2 | (RX_DMA_BURST << RxCfgDMAShift),
+        RxCfg_128_int_en | RxEarly_off_V2 | Rx_Single_fetch_V2 | (RX_DMA_BURST << RxCfgDMAShift),
         0xff7e5880,
         Jumbo_Frame_9k),
 
@@ -421,9 +316,9 @@
 
 MODULE_DEVICE_TABLE(pci, rtl8168_pci_tbl);
 
+static int rx_copybreak = 0;
 static int use_dac = 1;
 static int timer_count = 0x2600;
-static int dynamic_aspm_packet_threshold = 10;
 
 static struct {
         u32 msg_enable;
@@ -443,11 +338,6 @@
 #else
 static int aspm = 0;
 #endif
-#ifdef CONFIG_DYNAMIC_ASPM
-static int dynamic_aspm = 1;
-#else
-static int dynamic_aspm = 0;
-#endif
 #ifdef ENABLE_S5WOL
 static int s5wol = 1;
 #else
@@ -473,11 +363,6 @@
 #else
 static int s0_magic_packet = 0;
 #endif
-#ifdef DISABLE_WOL_SUPPORT
-static int disable_wol_support = 1;
-#else
-static int disable_wol_support = 0;
-#endif
 
 MODULE_AUTHOR("Realtek and the Linux r8168 crew <netdev@vger.kernel.org>");
 MODULE_DESCRIPTION("RealTek RTL-8168 Gigabit Ethernet driver");
@@ -497,15 +382,15 @@
 module_param(aspm, int, 0);
 MODULE_PARM_DESC(aspm, "Enable ASPM.");
 
-module_param(dynamic_aspm, int, 0);
-MODULE_PARM_DESC(aspm, "Enable Software Dynamic ASPM.");
-
 module_param(s5wol, int, 0);
 MODULE_PARM_DESC(s5wol, "Enable Shutdown Wake On Lan.");
 
 module_param(s5_keep_curr_mac, int, 0);
 MODULE_PARM_DESC(s5_keep_curr_mac, "Enable Shutdown Keep Current MAC Address.");
 
+module_param(rx_copybreak, int, 0);
+MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames");
+
 module_param(use_dac, int, 0);
 MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot.");
 
@@ -521,48 +406,18 @@
 module_param(s0_magic_packet, int, 0);
 MODULE_PARM_DESC(s0_magic_packet, "Enable S0 Magic Packet.");
 
-module_param(dynamic_aspm_packet_threshold, int, 0);
-MODULE_PARM_DESC(dynamic_aspm_packet_threshold, "Dynamic ASPM packet threshold.");
-
-module_param(disable_wol_support, int, 0);
-MODULE_PARM_DESC(disable_wol_support, "Disable PM support.");
-
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
 module_param_named(debug, debug.msg_enable, int, 0);
 MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)");
 #endif//LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
 
 MODULE_LICENSE("GPL");
-#ifdef ENABLE_USE_FIRMWARE_FILE
-MODULE_FIRMWARE(FIRMWARE_8168D_1);
-MODULE_FIRMWARE(FIRMWARE_8168D_2);
-MODULE_FIRMWARE(FIRMWARE_8168E_1);
-MODULE_FIRMWARE(FIRMWARE_8168E_2);
-MODULE_FIRMWARE(FIRMWARE_8168E_3);
-MODULE_FIRMWARE(FIRMWARE_8168E_4);
-MODULE_FIRMWARE(FIRMWARE_8168F_1);
-MODULE_FIRMWARE(FIRMWARE_8168F_2);
-MODULE_FIRMWARE(FIRMWARE_8411_1);
-MODULE_FIRMWARE(FIRMWARE_8411_2);
-MODULE_FIRMWARE(FIRMWARE_8168G_2);
-MODULE_FIRMWARE(FIRMWARE_8168G_3);
-MODULE_FIRMWARE(FIRMWARE_8168EP_1);
-MODULE_FIRMWARE(FIRMWARE_8168EP_2);
-MODULE_FIRMWARE(FIRMWARE_8168EP_3);
-MODULE_FIRMWARE(FIRMWARE_8168H_1);
-MODULE_FIRMWARE(FIRMWARE_8168H_2);
-MODULE_FIRMWARE(FIRMWARE_8168H_3);
-MODULE_FIRMWARE(FIRMWARE_8168H_4);
-MODULE_FIRMWARE(FIRMWARE_8168FP_3);
-MODULE_FIRMWARE(FIRMWARE_8168FP_4);
-#endif
 
 MODULE_VERSION(RTL8168_VERSION);
 
 static void rtl8168_sleep_rx_enable(struct net_device *dev);
 static void rtl8168_dsm(struct net_device *dev, int dev_state);
 
-/*
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 static void rtl8168_esd_timer(unsigned long __opaque);
 #else
@@ -573,43 +428,35 @@
 #else
 static void rtl8168_link_timer(struct timer_list *t);
 #endif
-*/
+static void rtl8168_tx_clear(struct rtl8168_private *tp);
+static void rtl8168_rx_clear(struct rtl8168_private *tp);
 
-static netdev_tx_t rtl8168_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static int rtl8168_open(struct net_device *dev);
+static int rtl8168_start_xmit(struct sk_buff *skb, struct net_device *dev);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 static irqreturn_t rtl8168_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
 #else
 static irqreturn_t rtl8168_interrupt(int irq, void *dev_instance);
 #endif
 static void rtl8168_rx_desc_offset0_init(struct rtl8168_private *, int);
+static int rtl8168_init_ring(struct net_device *dev);
+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 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 *, struct rtl8168_rx_ring *, napi_budget);
-#ifdef CONFIG_R8168_NAPI
-static int rtl8168_poll_msix_ring(napi_ptr napi, napi_budget budget);
-static int rtl8168_poll_msix_rx(napi_ptr napi, napi_budget budget);
-#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static irqreturn_t rtl8168_interrupt_msix(int irq, void *dev_instance, struct pt_regs *regs);
-#else
-static irqreturn_t rtl8168_interrupt_msix(int irq, void *dev_instance);
-#endif
-static void rtl8168_wait_for_quiescence(struct net_device *dev);
+static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, void __iomem *, napi_budget);
 static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);
 static void rtl8168_down(struct net_device *dev);
 
 static int rtl8168_set_mac_address(struct net_device *dev, void *p);
-void rtl8168_rar_set(struct rtl8168_private *tp, const u8 *addr);
+void rtl8168_rar_set(struct rtl8168_private *tp, uint8_t *addr);
 static void rtl8168_desc_addr_fill(struct rtl8168_private *);
 static void rtl8168_tx_desc_init(struct rtl8168_private *tp);
 static void rtl8168_rx_desc_init(struct rtl8168_private *tp);
 
-static u16 rtl8168_get_hw_phy_mcu_code_ver(struct rtl8168_private *tp);
+static void rtl8168_hw_reset(struct net_device *dev);
 
 static void rtl8168_phy_power_up(struct net_device *dev);
 static void rtl8168_phy_power_down(struct net_device *dev);
@@ -622,29 +469,6 @@
 static int rtl8168_poll(napi_ptr napi, napi_budget budget);
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void rtl8168_reset_task(void *_data);
-static void rtl8168_esd_task(void *_data);
-static void rtl8168_linkchg_task(void *_data);
-static void rtl8168_dash_task(void *_data);
-#else
-static void rtl8168_reset_task(struct work_struct *work);
-static void rtl8168_esd_task(struct work_struct *work);
-static void rtl8168_linkchg_task(struct work_struct *work);
-static void rtl8168_dash_task(struct work_struct *work);
-#endif
-static void rtl8168_schedule_reset_work(struct rtl8168_private *tp);
-static void rtl8168_schedule_esd_work(struct rtl8168_private *tp);
-static void rtl8168_schedule_linkchg_work(struct rtl8168_private *tp);
-void rtl8168_schedule_dash_work(struct rtl8168_private *tp);
-static void rtl8168_init_all_schedule_work(struct rtl8168_private *tp);
-static void rtl8168_cancel_all_schedule_work(struct rtl8168_private *tp);
-
-static inline struct device *tp_to_dev(struct rtl8168_private *tp)
-{
-        return &tp->pci_dev->dev;
-}
-
 #if ((LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) && \
      LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,00)))
 void ethtool_convert_legacy_u32_to_link_mode(unsigned long *dst,
@@ -790,7 +614,7 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
 #ifndef SET_ETHTOOL_OPS
 #define SET_ETHTOOL_OPS(netdev,ops) \
-         ((netdev)->ethtool_ops = (ops))
+         ( (netdev)->ethtool_ops = (ops) )
 #endif //SET_ETHTOOL_OPS
 #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
 
@@ -956,234 +780,21 @@
 }
 #endif  //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7)
 
-int rtl8168_dump_tally_counter(struct rtl8168_private *tp, dma_addr_t paddr)
-{
-        u32 cmd;
-        u32 WaitCnt;
-        int retval = -1;
-
-        RTL_W32(tp, CounterAddrHigh, (u64)paddr >> 32);
-        cmd = (u64)paddr & DMA_BIT_MASK(32);
-        RTL_W32(tp, CounterAddrLow, cmd);
-        RTL_W32(tp, CounterAddrLow, cmd | CounterDump);
-
-        WaitCnt = 0;
-        while (RTL_R32(tp, CounterAddrLow) & CounterDump) {
-                udelay(10);
-
-                WaitCnt++;
-                if (WaitCnt > 20)
-                        break;
-        }
-
-        if (WaitCnt <= 20)
-                retval = 0;
-
-        return retval;
-}
-
-static bool
-rtl8168_sysfs_testmode_on(struct rtl8168_private *tp)
-{
-#ifdef ENABLE_R8168_SYSFS
-        return !!tp->testmode;
-#else
-        return 1;
-#endif
-}
-
-static u32 rtl8168_convert_link_speed(u16 status)
-{
-        u32 speed = SPEED_UNKNOWN;
-
-        if (status & LinkStatus) {
-                if (status & _1000bpsF)
-                        speed = SPEED_1000;
-                else if (status & _100bps)
-                        speed = SPEED_100;
-                else if (status & _10bps)
-                        speed = SPEED_10;
-        }
-
-        return speed;
-}
-
-static int rtl8168_vcd_test(struct rtl8168_private *tp)
-{
-        u16 val;
-        u32 wait_cnt;
-        int ret = -1;
-
-        rtl8168_mdio_write(tp, 0x1f, 0x0a43);
-        rtl8168_mdio_write(tp, 0x13, 0x8169);
-        rtl8168_mdio_write(tp, 0x14, 0x18c1);
-        rtl8168_mdio_write(tp, 0x13, 0x816b);
-        rtl8168_mdio_write(tp, 0x14, 0xc7b0);
-        rtl8168_mdio_write(tp, 0x13, 0x816d);
-        rtl8168_mdio_write(tp, 0x14, 0x5933);
-        rtl8168_mdio_write(tp, 0x13, 0x816f);
-        rtl8168_mdio_write(tp, 0x14, 0xb920);
-        rtl8168_mdio_write(tp, 0x13, 0x8171);
-        rtl8168_mdio_write(tp, 0x14, 0xee07);
-        rtl8168_mdio_write(tp, 0x13, 0x8162);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x13, 0x8173);
-        rtl8168_mdio_write(tp, 0x14, 0x0304);
-        rtl8168_mdio_write(tp, 0x1f, 0x0000);
-
-        rtl8168_mdio_write(tp, 0x1f, 0x0a42);
-        rtl8168_clear_eth_phy_bit(tp, 0x11, BIT(0));
-        rtl8168_set_eth_phy_bit(tp, 0x11, 0x00f0);
-        rtl8168_set_eth_phy_bit(tp, 0x11, BIT(0));
-
-        wait_cnt = 0;
-        do {
-                mdelay(1);
-                val = rtl8168_mdio_read(tp, 0x11);
-                wait_cnt++;
-        } while (!(val & BIT_15) && (wait_cnt < 5000));
-
-        if (wait_cnt == 5000)
-                goto exit;
-
-        ret = 0;
-
-exit:
-        rtl8168_mdio_write(tp, 0x1f, 0x0000);
-
-        return ret;
-}
-
-static void rtl8168_get_cp_len(struct rtl8168_private *tp,
-                               int cp_lenRTL8168_CP_NUM)
-{
-        int i;
-        u16 status;
-        int tmp_cp_len;
-
-        status = RTL_R8(tp, PHYstatus);
-        if (status & LinkStatus) {
-                if (status & _10bps) {
-                        tmp_cp_len = -1;
-                } else if (status & (_100bps | _1000bpsF)) {
-                        rtl8168_mdio_write(tp, 0x1f, 0x0a88);
-                        tmp_cp_len = rtl8168_mdio_read(tp, 0x10);
-                } else
-                        tmp_cp_len = 0;
-        } else
-                tmp_cp_len = 0;
-
-        if (tmp_cp_len > 0)
-                tmp_cp_len &= 0xff;
-        for (i=0; i<RTL8168_CP_NUM; i++)
-                cp_leni = tmp_cp_len;
-
-        rtl8168_mdio_write(tp, 0x1f, 0x0000);
-
-        for (i=0; i<RTL8168_CP_NUM; i++)
-                if (cp_leni > RTL8168_MAX_SUPPORT_CP_LEN)
-                        cp_leni = RTL8168_MAX_SUPPORT_CP_LEN;
-
-        return;
-}
-
-static int __rtl8168_get_cp_status(u16 val)
-{
-        switch (val) {
-        case 0x0060:
-                return rtl8168_cp_normal;
-        case 0x0048:
-                return rtl8168_cp_open;
-        case 0x0050:
-                return rtl8168_cp_short;
-        case 0x0042:
-        case 0x0044:
-                return rtl8168_cp_mismatch;
-        default:
-                return rtl8168_cp_normal;
-        }
-}
-
-static int _rtl8168_get_cp_status(struct rtl8168_private *tp, u8 pair_num)
-{
-        u16 val;
-        int cp_status = rtl8168_cp_unknown;
-
-        if (pair_num > 3)
-                goto exit;
-
-        rtl8168_mdio_write(tp, 0x1f, 0x0a43);
-        rtl8168_mdio_write(tp, 0x13, 0x802b + 4 * pair_num);
-        val = rtl8168_mdio_read(tp, 0x14);
-        rtl8168_mdio_write(tp, 0x1f, 0x0000);
-
-        cp_status = __rtl8168_get_cp_status(val);
-
-exit:
-        return cp_status;
-}
-
-static const char * rtl8168_get_cp_status_string(int cp_status)
-{
-        switch(cp_status) {
-        case rtl8168_cp_normal:
-                return "normal  ";
-        case rtl8168_cp_short:
-                return "short   ";
-        case rtl8168_cp_open:
-                return "open    ";
-        case rtl8168_cp_mismatch:
-                return "mismatch";
-        default:
-                return "unknown ";
-        }
-}
-
-static u16 rtl8168_get_cp_pp(struct rtl8168_private *tp, u8 pair_num)
-{
-        u16 pp = 0;
-
-        if (pair_num > 3)
-                goto exit;
-
-        rtl8168_mdio_write(tp, 0x1f, 0x0a43);
-        rtl8168_mdio_write(tp, 0x13, 0x802d + 4 * pair_num);
-        pp = rtl8168_mdio_read(tp, 0x14);
-        rtl8168_mdio_write(tp, 0x1f, 0x0000);
-
-        pp &= 0x3fff;
-        pp /= 80;
-
-exit:
-        return pp;
-}
-
-static void rtl8168_get_cp_status(struct rtl8168_private *tp,
-                                  int cp_statusRTL8168_CP_NUM,
-                                  bool poe_mode)
-{
-        u16 status;
-        int i;
-
-        status = RTL_R8(tp, PHYstatus);
-        if (status & LinkStatus && !(status & (_10bps | _100bps))) {
-                for (i=0; i<RTL8168_CP_NUM; i++)
-                        cp_statusi = rtl8168_cp_normal;
-        } else {
-                /* cannot do vcd when link is on */
-                rtl8168_vcd_test(tp);
-
-                for (i=0; i<RTL8168_CP_NUM; i++)
-                        cp_statusi = _rtl8168_get_cp_status(tp, i);
-        }
-
-        if (poe_mode) {
-                for (i=0; i<RTL8168_CP_NUM; i++) {
-                        if (cp_statusi == rtl8168_cp_mismatch)
-                                cp_statusi = rtl8168_cp_normal;
-                }
-        }
-}
+struct rtl8168_counters {
+        u64 tx_packets;
+        u64 rx_packets;
+        u64 tx_errors;
+        u32 rx_errors;
+        u16 rx_missed;
+        u16 align_errors;
+        u32 tx_one_collision;
+        u32 tx_multi_collision;
+        u64 rx_unicast;
+        u64 rx_broadcast;
+        u32 rx_multicast;
+        u16 tx_aborted;
+        u16 tx_underun;
+};
 
 #ifdef ENABLE_R8168_PROCFS
 /****************************************************************************
@@ -1199,38 +810,23 @@
 {
         struct net_device *dev = m->private;
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
 
         seq_puts(m, "\nDump Driver Variable\n");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         seq_puts(m, "Variable\tValue\n----------\t-----\n");
         seq_printf(m, "MODULENAME\t%s\n", MODULENAME);
         seq_printf(m, "driver version\t%s\n", RTL8168_VERSION);
         seq_printf(m, "chipset\t%d\n", tp->chipset);
         seq_printf(m, "chipset_name\t%s\n", rtl_chip_infotp->chipset.name);
         seq_printf(m, "mtu\t%d\n", dev->mtu);
-        seq_printf(m, "num_rx_desc\t0x%x\n", tp->num_rx_desc);
-        seq_printf(m, "cur_rx0\t0x%x\n", tp->rx_ring0.cur_rx);
-        seq_printf(m, "dirty_rx0\t0x%x\n", tp->rx_ring0.dirty_rx);
-        seq_printf(m, "rdu0\t0x%x\n", tp->rx_ring0.rdu);
-        seq_printf(m, "cur_rx1\t0x%x\n", tp->rx_ring1.cur_rx);
-        seq_printf(m, "dirty_rx1\t0x%x\n", tp->rx_ring1.dirty_rx);
-        seq_printf(m, "rdu1\t0x%x\n", tp->rx_ring1.rdu);
-        seq_printf(m, "cur_rx2\t0x%x\n", tp->rx_ring2.cur_rx);
-        seq_printf(m, "dirty_rx2\t0x%x\n", tp->rx_ring2.dirty_rx);
-        seq_printf(m, "rdu2\t0x%x\n", tp->rx_ring2.rdu);
-        seq_printf(m, "cur_rx3\t0x%x\n", tp->rx_ring3.cur_rx);
-        seq_printf(m, "dirty_rx3\t0x%x\n", tp->rx_ring3.dirty_rx);
-        seq_printf(m, "rdu3\t0x%x\n", tp->rx_ring3.rdu);
-        seq_printf(m, "rx_fifo_of\t0x%x\n", tp->rx_fifo_of);
-        seq_printf(m, "num_tx_desc\t0x%x\n", tp->tx_ring0.num_tx_desc);
-        seq_printf(m, "cur_tx0\t0x%x\n", tp->tx_ring0.cur_tx);
-        seq_printf(m, "dirty_tx0\t0x%x\n", tp->tx_ring0.dirty_tx);
-        seq_printf(m, "tdu0\t0x%x\n", tp->tx_ring0.tdu);
-        seq_printf(m, "cur_tx1\t0x%x\n", tp->tx_ring1.cur_tx);
-        seq_printf(m, "dirty_tx1\t0x%x\n", tp->tx_ring1.dirty_tx);
-        seq_printf(m, "tdu1\t0x%x\n", tp->tx_ring1.tdu);
+        seq_printf(m, "NUM_RX_DESC\t0x%x\n", NUM_RX_DESC);
+        seq_printf(m, "cur_rx\t0x%x\n", tp->cur_rx);
+        seq_printf(m, "dirty_rx\t0x%x\n", tp->dirty_rx);
+        seq_printf(m, "NUM_TX_DESC\t0x%x\n", NUM_TX_DESC);
+        seq_printf(m, "cur_tx\t0x%x\n", tp->cur_tx);
+        seq_printf(m, "dirty_tx\t0x%x\n", tp->dirty_tx);
         seq_printf(m, "rx_buf_sz\t0x%x\n", tp->rx_buf_sz);
         seq_printf(m, "esd_flag\t0x%x\n", tp->esd_flag);
         seq_printf(m, "pci_cfg_is_read\t0x%x\n", tp->pci_cfg_is_read);
@@ -1273,7 +869,6 @@
         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);
@@ -1287,39 +882,21 @@
         seq_printf(m, "aspm\t0x%x\n", aspm);
         seq_printf(m, "s5wol\t0x%x\n", s5wol);
         seq_printf(m, "s5_keep_curr_mac\t0x%x\n", s5_keep_curr_mac);
-        seq_printf(m, "eee_enable\t0x%x\n", tp->eee.eee_enabled);
+        seq_printf(m, "eee_enable\t0x%x\n", eee_enable);
         seq_printf(m, "hwoptimize\t0x%lx\n", hwoptimize);
         seq_printf(m, "proc_init_num\t0x%x\n", proc_init_num);
         seq_printf(m, "s0_magic_packet\t0x%x\n", s0_magic_packet);
-        seq_printf(m, "disable_wol_support\t0x%x\n", disable_wol_support);
         seq_printf(m, "HwSuppMagicPktVer\t0x%x\n", tp->HwSuppMagicPktVer);
-        seq_printf(m, "HwSuppUpsVer\t0x%x\n", tp->HwSuppUpsVer);
-        seq_printf(m, "HwSuppEsdVer\t0x%x\n", tp->HwSuppEsdVer);
         seq_printf(m, "HwSuppCheckPhyDisableModeVer\t0x%x\n", tp->HwSuppCheckPhyDisableModeVer);
         seq_printf(m, "HwPkgDet\t0x%x\n", tp->HwPkgDet);
-        seq_printf(m, "InitRxDescType\t0x%x\n", tp->InitRxDescType);
-        seq_printf(m, "RxDescLength\t0x%x\n", tp->RxDescLength);
-        seq_printf(m, "num_rx_rings\t0x%x\n", tp->num_rx_rings);
-        seq_printf(m, "num_tx_rings\t0x%x\n", tp->num_tx_rings);
-        seq_printf(m, "tot_rx_rings\t0x%x\n", rtl8168_tot_rx_rings(tp));
-        seq_printf(m, "tot_tx_rings\t0x%x\n", rtl8168_tot_tx_rings(tp));
-        seq_printf(m, "HwSuppNumTxQueues\t0x%x\n", tp->HwSuppNumTxQueues);
-        seq_printf(m, "HwSuppNumRxQueues\t0x%x\n", tp->HwSuppNumRxQueues);
-        seq_printf(m, "num_hw_tot_en_rx_rings\t0x%x\n", tp->num_hw_tot_en_rx_rings);
-        seq_printf(m, "EnableRss\t0x%x\n", tp->EnableRss);
-        seq_printf(m, "min_irq_nvecs\t0x%x\n", tp->min_irq_nvecs);
-        seq_printf(m, "max_irq_nvecs\t0x%x\n", tp->max_irq_nvecs);
-        seq_printf(m, "irq_nvecs\t0x%x\n", tp->irq_nvecs);
-        seq_printf(m, "hw_supp_irq_nvecs\t0x%x\n", tp->hw_supp_irq_nvecs);
-        seq_printf(m, "ring_lib_enabled\t0x%x\n", tp->ring_lib_enabled);
+        seq_printf(m, "HwSuppGigaForceMode\t0x%x\n", tp->HwSuppGigaForceMode);
         seq_printf(m, "random_mac\t0x%x\n", tp->random_mac);
         seq_printf(m, "org_mac_addr\t%pM\n", tp->org_mac_addr);
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
         seq_printf(m, "perm_addr\t%pM\n", dev->perm_addr);
 #endif
         seq_printf(m, "dev_addr\t%pM\n", dev->dev_addr);
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         seq_putc(m, '\n');
         return 0;
@@ -1329,39 +906,53 @@
 {
         struct net_device *dev = m->private;
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         struct rtl8168_counters *counters;
         dma_addr_t paddr;
+        u32 cmd;
+        u32 WaitCnt;
+        unsigned long flags;
 
         seq_puts(m, "\nDump Tally Counter\n");
 
-        rtnl_lock();
+        //ASSERT_RTNL();
 
         counters = tp->tally_vaddr;
         paddr = tp->tally_paddr;
         if (!counters) {
                 seq_puts(m, "\nDump Tally Counter Fail\n");
-                goto out_unlock;
+                return 0;
         }
 
-        rtl8168_dump_tally_counter(tp, paddr);
+        spin_lock_irqsave(&tp->lock, flags);
+        RTL_W32(CounterAddrHigh, (u64)paddr >> 32);
+        cmd = (u64)paddr & DMA_BIT_MASK(32);
+        RTL_W32(CounterAddrLow, cmd);
+        RTL_W32(CounterAddrLow, cmd | CounterDump);
+
+        WaitCnt = 0;
+        while (RTL_R32(CounterAddrLow) & CounterDump) {
+                udelay(10);
+
+                WaitCnt++;
+                if (WaitCnt > 20)
+                        break;
+        }
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         seq_puts(m, "Statistics\tValue\n----------\t-----\n");
         seq_printf(m, "tx_packets\t%lld\n", le64_to_cpu(counters->tx_packets));
         seq_printf(m, "rx_packets\t%lld\n", le64_to_cpu(counters->rx_packets));
         seq_printf(m, "tx_errors\t%lld\n", le64_to_cpu(counters->tx_errors));
-        seq_printf(m, "rx_errors\t%d\n", le32_to_cpu(counters->rx_errors));
-        seq_printf(m, "rx_missed\t%d\n", le16_to_cpu(counters->rx_missed));
-        seq_printf(m, "align_errors\t%d\n", le16_to_cpu(counters->align_errors));
-        seq_printf(m, "tx_one_collision\t%d\n", le32_to_cpu(counters->tx_one_collision));
-        seq_printf(m, "tx_multi_collision\t%d\n", le32_to_cpu(counters->tx_multi_collision));
+        seq_printf(m, "rx_missed\t%lld\n", le64_to_cpu(counters->rx_missed));
+        seq_printf(m, "align_errors\t%lld\n", le64_to_cpu(counters->align_errors));
+        seq_printf(m, "tx_one_collision\t%lld\n", le64_to_cpu(counters->tx_one_collision));
+        seq_printf(m, "tx_multi_collision\t%lld\n", le64_to_cpu(counters->tx_multi_collision));
         seq_printf(m, "rx_unicast\t%lld\n", le64_to_cpu(counters->rx_unicast));
         seq_printf(m, "rx_broadcast\t%lld\n", le64_to_cpu(counters->rx_broadcast));
-        seq_printf(m, "rx_multicast\t%d\n", le32_to_cpu(counters->rx_multicast));
-        seq_printf(m, "tx_aborted\t%d\n", le16_to_cpu(counters->tx_aborted));
-        seq_printf(m, "tx_underrun\t%d\n", le16_to_cpu(counters->tx_underrun));
-
-out_unlock:
-        rtnl_unlock();
+        seq_printf(m, "rx_multicast\t%lld\n", le64_to_cpu(counters->rx_multicast));
+        seq_printf(m, "tx_aborted\t%lld\n", le64_to_cpu(counters->tx_aborted));
+        seq_printf(m, "tx_underun\t%lld\n", le64_to_cpu(counters->tx_underun));
 
         seq_putc(m, '\n');
         return 0;
@@ -1374,12 +965,12 @@
         u8 byte_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
 
         seq_puts(m, "\nDump MAC Registers\n");
         seq_puts(m, "Offset\tValue\n------\t-----\n");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         for (n = 0; n < max;) {
                 seq_printf(m, "\n0x%02x:\t", n);
 
@@ -1388,8 +979,7 @@
                         seq_printf(m, "%02x ", byte_rd);
                 }
         }
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         seq_putc(m, '\n');
         return 0;
@@ -1401,22 +991,22 @@
         int i, n, max = R8168_EPHY_REGS_SIZE/2;
         u16 word_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
 
         seq_puts(m, "\nDump PCIE PHY\n");
         seq_puts(m, "\nOffset\tValue\n------\t-----\n ");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         for (n = 0; n < max;) {
                 seq_printf(m, "\n0x%02x:\t", n);
 
                 for (i = 0; i < 8 && n < max; i++, n++) {
-                        word_rd = rtl8168_ephy_read(tp, n);
+                        word_rd = rtl8168_ephy_read(ioaddr, n);
                         seq_printf(m, "%04x ", word_rd);
                 }
         }
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         seq_putc(m, '\n');
         return 0;
@@ -1428,12 +1018,12 @@
         int i, n, max = R8168_PHY_REGS_SIZE/2;
         u16 word_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
 
         seq_puts(m, "\nDump Ethernet PHY\n");
         seq_puts(m, "\nOffset\tValue\n------\t-----\n ");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         seq_puts(m, "\n####################page 0##################\n ");
         rtl8168_mdio_write(tp, 0x1f, 0x0000);
         for (n = 0; n < max;) {
@@ -1444,8 +1034,7 @@
                         seq_printf(m, "%04x ", word_rd);
                 }
         }
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         seq_putc(m, '\n');
         return 0;
@@ -1457,6 +1046,8 @@
         int i, n, max = R8168_ERI_REGS_SIZE;
         u32 dword_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
 
         switch (tp->mcfg) {
         case CFG_METHOD_1:
@@ -1470,18 +1061,16 @@
         seq_puts(m, "\nDump Extended Registers\n");
         seq_puts(m, "\nOffset\tValue\n------\t-----\n ");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         for (n = 0; n < max;) {
                 seq_printf(m, "\n0x%02x:\t", n);
 
                 for (i = 0; i < 4 && n < max; i++, n+=4) {
-                        dword_rd = rtl8168_eri_read(tp, n, 4, ERIAR_ExGMAC);
+                        dword_rd = rtl8168_eri_read(ioaddr, n, 4, ERIAR_ExGMAC);
                         seq_printf(m, "%08x ", dword_rd);
                 }
         }
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         seq_putc(m, '\n');
         return 0;
@@ -1493,12 +1082,12 @@
         int i, n, max = R8168_PCI_REGS_SIZE;
         u32 dword_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
 
         seq_puts(m, "\nDump PCI Registers\n");
         seq_puts(m, "\nOffset\tValue\n------\t-----\n ");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         for (n = 0; n < max;) {
                 seq_printf(m, "\n0x%03x:\t", n);
 
@@ -1515,253 +1104,7 @@
         pci_read_config_dword(tp->pci_dev, n, &dword_rd);
         seq_printf(m, "\n0x%03x:\t%08x ", n, dword_rd);
 
-        rtnl_unlock();
-
-        seq_putc(m, '\n');
-        return 0;
-}
-
-static int _proc_get_cable_info(struct seq_file *m, void *v, bool poe_mode)
-{
-        int i;
-        u16 status;
-        int cp_statusRTL8168_CP_NUM = {0};
-        int cp_lenRTL8168_CP_NUM = {0};
-        struct net_device *dev = m->private;
-        struct rtl8168_private *tp = netdev_priv(dev);
-        const char *pair_strRTL8168_CP_NUM = {"1-2", "3-6", "4-5", "7-8"};
-        int ret;
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_30:
-                /* support */
-                break;
-        default:
-                ret = -EOPNOTSUPP;
-                goto error_out;
-        }
-
-        rtnl_lock();
-
-        if (!rtl8168_sysfs_testmode_on(tp)) {
-                seq_puts(m, "\nPlease turn on ""/sys/class/net/<iface>/rtk_adv/testmode"".\n\n");
-                ret = 0;
-                goto error_unlock;
-        }
-
-        rtl8168_mdio_write(tp, 0x1f, 0x0000);
-        if (rtl8168_mdio_read(tp, MII_BMCR) & BMCR_PDOWN) {
-                ret = -EIO;
-                goto error_unlock;
-        }
-
-        netif_testing_on(dev);
-
-        status = RTL_R8(tp, PHYstatus);
-        if (status & LinkStatus)
-                seq_printf(m, "\nlink speed:%d",
-                           rtl8168_convert_link_speed(status));
-        else
-                seq_puts(m, "\nlink status:off");
-
-        rtl8168_get_cp_len(tp, cp_len);
-
-        rtl8168_get_cp_status(tp, cp_status, poe_mode);
-
-        seq_puts(m, "\npair\tlength\tstatus   \tpp\n");
-
-        for (i=0; i<RTL8168_CP_NUM; i++) {
-                if (cp_leni < 0)
-                        seq_printf(m, "%s\t%s\t%s\t",
-                                   pair_stri, "none",
-                                   rtl8168_get_cp_status_string(cp_statusi));
-                else
-                        seq_printf(m, "%s\t%d\t%s\t",
-                                   pair_stri, cp_leni,
-                                   rtl8168_get_cp_status_string(cp_statusi));
-                if (cp_statusi == rtl8168_cp_normal)
-                        seq_printf(m, "none\n");
-                else
-                        seq_printf(m, "%dm\n", rtl8168_get_cp_pp(tp, i));
-        }
-
-        netif_testing_off(dev);
-
-        seq_putc(m, '\n');
-
-        ret = 0;
-
-error_unlock:
-        rtnl_unlock();
-
-error_out:
-        return ret;
-}
-
-static int proc_get_cable_info(struct seq_file *m, void *v)
-{
-        return _proc_get_cable_info(m, v, 0);
-}
-
-static int proc_get_poe_cable_info(struct seq_file *m, void *v)
-{
-        return _proc_get_cable_info(m, v, 1);
-}
-
-static int proc_dump_rx_desc(struct seq_file *m, void *v)
-{
-        int i;
-        u32 *pdword;
-        struct net_device *dev = m->private;
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        if (!tp->RxDescArray)
-                return -EOPNOTSUPP;
-
-        rtnl_lock();
-
-        seq_printf(m, "\ndump rx desc:%d\n", tp->num_rx_desc);
-
-        pdword = (u32*)tp->RxDescArray;
-        for (i=0; i<(tp->RxDescAllocSize/4); i++) {
-                if (!(i % 4))
-                        seq_printf(m, "\n%04x ", i);
-                seq_printf(m, "%08x ", pdwordi);
-        }
-
-        rtnl_unlock();
-
-        seq_putc(m, '\n');
-        return 0;
-}
-
-static int proc_dump_rx_desc_2(struct seq_file *m, void *v)
-{
-        int i, j, k;
-        u32 *pdword;
-        struct net_device *dev = m->private;
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        if (!tp->RxDescArray)
-                return -EOPNOTSUPP;
-
-        rtnl_lock();
-
-        for (k=0; k<tp->num_hw_tot_en_rx_rings; k++) {
-                seq_printf(m, "\ndump Q%d rx desc:%d\n", k, tp->num_rx_desc);
-                for (j=0; j<tp->num_rx_desc; j++) {
-                        pdword = (u32*)rtl8168_get_rxdesc(tp,
-                                                          tp->RxDescArray,
-                                                          j, k);
-                        for (i=0; i<(tp->RxDescLength/4); i++) {
-                                if (!(i % 4))
-                                        seq_printf(m, "\n%04llx ",
-                                                   ((u64)pdword + (i * 4) -
-                                                    (u64)tp->RxDescArray));
-                                seq_printf(m, "%08x ", pdwordi);
-                        }
-                }
-
-                seq_putc(m, '\n');
-        }
-
-        rtnl_unlock();
-
-        seq_putc(m, '\n');
-        return 0;
-}
-
-static void _proc_dump_tx_desc(struct seq_file *m, struct TxDesc *desc_base,
-                               u32 alloc_size, u32 num_desc)
-{
-        int i;
-        u32 *pdword;
-
-        if (desc_base == NULL ||
-            alloc_size == 0 ||
-            num_desc == 0)
-                return;
-
-        pdword = (u32*)desc_base;
-        for (i=0; i<(alloc_size/4); i++) {
-                if (!(i % 4))
-                        seq_printf(m, "\n%04x ", i);
-                seq_printf(m, "%08x ", pdwordi);
-        }
-
-        seq_putc(m, '\n');
-        return;
-}
-
-static int proc_dump_tx_desc(struct seq_file *m, void *v)
-{
-        int i;
-        struct net_device *dev = m->private;
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        rtnl_lock();
-
-        for (i=0; i<tp->HwSuppNumTxQueues; i++) {
-                struct rtl8168_tx_ring *ring = &tp->tx_ringi;
-                if (!ring->TxDescArray)
-                        continue;
-                seq_printf(m, "\ndump Q%d tx desc:%d\n", i, ring->num_tx_desc);
-                _proc_dump_tx_desc(m, ring->TxDescArray,
-                                   ring->TxDescAllocSize,
-                                   ring->num_tx_desc);
-        }
-
-#ifdef ENABLE_LIB_SUPPORT
-        for (i=0; i<tp->HwSuppNumTxQueues; i++) {
-                struct rtl8168_ring *ring = &tp->lib_tx_ringi;
-                if (!ring->desc_addr)
-                        continue;
-                seq_printf(m, "\ndump lib Q%d tx desc:%d\n", i, ring->ring_size);
-                _proc_dump_tx_desc(m, ring->desc_addr,
-                                   ring->desc_size,
-                                   ring->ring_size);
-        }
-#endif //ENABLE_LIB_SUPPORT
-
-        rtnl_unlock();
-
-        seq_putc(m, '\n');
-        return 0;
-}
-
-static int proc_dump_msix_tbl(struct seq_file *m, void *v)
-{
-        int i, j;
-        void __iomem *ioaddr;
-        struct net_device *dev = m->private;
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_1 ... CFG_METHOD_8:
-                return -EOPNOTSUPP;
-        default:
-                break;
-        }
-
-        /* ioremap MMIO region */
-        ioaddr = ioremap(pci_resource_start(tp->pci_dev, 4), pci_resource_len(tp->pci_dev, 4));
-        if (!ioaddr)
-                return -EFAULT;
-
-        rtnl_lock();
-
-        seq_printf(m, "\ndump MSI-X Table. Total Entry %d. \n", tp->hw_supp_irq_nvecs);
-
-        for (i=0; i<tp->hw_supp_irq_nvecs; i++) {
-                seq_printf(m, "\n%04x ", i);
-                for (j=0; j<4; j++)
-                        seq_printf(m, "%08x ",
-                                   readl(ioaddr + i*0x10 + 4*j));
-        }
-
-        rtnl_unlock();
-
-        iounmap(ioaddr);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         seq_putc(m, '\n');
         return 0;
@@ -1774,13 +1117,13 @@
 {
         struct net_device *dev = data;
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
         int len = 0;
 
         len += snprintf(page + len, count - len,
                         "\nDump Driver Driver\n");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         len += snprintf(page + len, count - len,
                         "Variable\tValue\n----------\t-----\n");
 
@@ -1790,27 +1133,12 @@
                         "chipset\t%d\n"
                         "chipset_name\t%s\n"
                         "mtu\t%d\n"
-                        "num_rx_desc\t0x%x\n"
-                        "cur_rx0\t0x%x\n"
-                        "dirty_rx0\t0x%x\n"
-                        "rdu0\t0x%x\n"
-                        "cur_rx1\t0x%x\n"
-                        "dirty_rx1\t0x%x\n"
-                        "rdu1\t0x%x\n"
-                        "cur_rx2\t0x%x\n"
-                        "dirty_rx2\t0x%x\n"
-                        "rdu2\t0x%x\n"
-                        "cur_rx3\t0x%x\n"
-                        "dirty_rx3\t0x%x\n"
-                        "rdu3\t0x%x\n"
-                        "rx_fifo_of\t0x%x\n"
-                        "num_tx_desc\t0x%x\n"
-                        "cur_tx0\t0x%x\n"
-                        "dirty_tx0\t0x%x\n"
-                        "tdu0\t0x%x\n"
-                        "cur_tx1\t0x%x\n"
-                        "dirty_tx1\t0x%x\n"
-                        "tdu0\t1x%x\n"
+                        "NUM_RX_DESC\t0x%x\n"
+                        "cur_rx\t0x%x\n"
+                        "dirty_rx\t0x%x\n"
+                        "NUM_TX_DESC\t0x%x\n"
+                        "cur_tx\t0x%x\n"
+                        "dirty_tx\t0x%x\n"
                         "rx_buf_sz\t0x%x\n"
                         "esd_flag\t0x%x\n"
                         "pci_cfg_is_read\t0x%x\n"
@@ -1853,7 +1181,6 @@
                         "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"
@@ -1871,28 +1198,10 @@
                         "hwoptimize\t0x%lx\n"
                         "proc_init_num\t0x%x\n"
                         "s0_magic_packet\t0x%x\n"
-                        "disable_wol_support\t0x%x\n"
                         "HwSuppMagicPktVer\t0x%x\n"
-                        "HwSuppUpsVer\t0x%x\n"
-                        "HwSuppEsdVer\t0x%x\n"
                         "HwSuppCheckPhyDisableModeVer\t0x%x\n"
                         "HwPkgDet\t0x%x\n"
-                        "InitRxDescType\t0x%x\n"
-                        "RxDescLength\t0x%x\n"
-                        "num_rx_rings\t0x%x\n"
-                        "num_tx_rings\t0x%x\n"
-                        "tot_rx_rings\t0x%x\n"
-                        "tot_tx_rings\t0x%x\n"
-                        "tot_rx_desc_rings\t0x%x\n"
-                        "HwSuppNumTxQueues\t0x%x\n"
-                        "HwSuppNumRxQueues\t0x%x\n"
-                        "num_hw_tot_en_rx_rings\t0x%x\n"
-                        "EnableRss\t0x%x\n"
-                        "min_irq_nvecs\t0x%x\n"
-                        "max_irq_nvecs\t0x%x\n"
-                        "irq_nvecs\t0x%x\n"
-                        "hw_supp_irq_nvecs\t0x%x\n"
-                        "ring_lib_enabled\t0x%x\n"
+                        "HwSuppGigaForceMode\t0x%x\n"
                         "random_mac\t0x%x\n"
                         "org_mac_addr\t%pM\n"
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
@@ -1904,27 +1213,12 @@
                         tp->chipset,
                         rtl_chip_infotp->chipset.name,
                         dev->mtu,
-                        tp->num_rx_desc,
-                        tp->rx_ring0.cur_rx,
-                        tp->rx_ring0.dirty_rx,
-                        tp->rx_ring0.rdu,
-                        tp->rx_ring1.cur_rx,
-                        tp->rx_ring1.dirty_rx,
-                        tp->rx_ring1.rdu,
-                        tp->rx_ring2.cur_rx,
-                        tp->rx_ring2.dirty_rx,
-                        tp->rx_ring2.rdu,
-                        tp->rx_ring3.cur_rx,
-                        tp->rx_ring3.dirty_rx,
-                        tp->rx_ring3.rdu,
-                        tp->rx_fifo_of,
-                        tp->tx_ring0.num_tx_desc,
-                        tp->tx_ring0.cur_tx,
-                        tp->tx_ring0.dirty_tx,
-                        tp->tx_ring0.tdu,
-                        tp->tx_ring1.cur_tx,
-                        tp->tx_ring1.dirty_tx,
-                        tp->tx_ring1.tdu,
+                        NUM_RX_DESC,
+                        tp->cur_rx,
+                        tp->dirty_rx,
+                        NUM_TX_DESC,
+                        tp->cur_tx,
+                        tp->dirty_tx,
                         tp->rx_buf_sz,
                         tp->esd_flag,
                         tp->pci_cfg_is_read,
@@ -1967,7 +1261,6 @@
                         tp->HwFiberModeVer,
                         tp->HwFiberStat,
                         tp->HwSwitchMdiToFiber,
-                        tp->HwSuppSerDesPhyVer,
                         tp->NicCustLedValue,
                         tp->RequiredSecLanDonglePatch,
                         tp->HwSuppDashVer,
@@ -1981,39 +1274,22 @@
                         aspm,
                         s5wol,
                         s5_keep_curr_mac,
-                        tp->eee.eee_enabled,
+                        eee_enable,
                         hwoptimize,
                         proc_init_num,
                         s0_magic_packet,
-                        disable_wol_support,
                         tp->HwSuppMagicPktVer,
-                        tp->HwSuppUpsVer,
-                        tp->HwSuppEsdVer,
                         tp->HwSuppCheckPhyDisableModeVer,
                         tp->HwPkgDet,
-                        tp->InitRxDescType,
-                        tp->RxDescLength,
-                        tp->num_rx_rings,
-                        tp->num_tx_rings,
-                        rtl8168_tot_rx_rings(tp),
-                        rtl8168_tot_tx_rings(tp),
-                        tp->HwSuppNumTxQueues,
-                        tp->HwSuppNumRxQueues,
-                        tp->num_hw_tot_en_rx_rings,
-                        tp->EnableRss,
-                        tp->min_irq_nvecs,
-                        tp->max_irq_nvecs,
-                        tp->irq_nvecs,
-                        tp->hw_supp_irq_nvecs,
-                        tp->ring_lib_enabled,
+                        tp->HwSuppGigaForceMode,
                         tp->random_mac,
                         tp->org_mac_addr,
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
                         dev->perm_addr,
 #endif
-                        dev->dev_addr);
-
-        rtnl_unlock();
+                        dev->dev_addr
+                       );
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         len += snprintf(page + len, count - len, "\n");
 
@@ -2027,26 +1303,42 @@
 {
         struct net_device *dev = data;
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         struct rtl8168_counters *counters;
         dma_addr_t paddr;
         u32 cmd;
         u32 WaitCnt;
+        unsigned long flags;
         int len = 0;
 
         len += snprintf(page + len, count - len,
                         "\nDump Tally Counter\n");
 
-        rtnl_lock();
+        //ASSERT_RTNL();
 
         counters = tp->tally_vaddr;
         paddr = tp->tally_paddr;
         if (!counters) {
                 len += snprintf(page + len, count - len,
                                 "\nDump Tally Counter Fail\n");
-                goto out_unlock;
+                goto out;
         }
 
-        rtl8168_dump_tally_counter(tp, paddr);
+        spin_lock_irqsave(&tp->lock, flags);
+        RTL_W32(CounterAddrHigh, (u64)paddr >> 32);
+        cmd = (u64)paddr & DMA_BIT_MASK(32);
+        RTL_W32(CounterAddrLow, cmd);
+        RTL_W32(CounterAddrLow, cmd | CounterDump);
+
+        WaitCnt = 0;
+        while (RTL_R32(CounterAddrLow) & CounterDump) {
+                udelay(10);
+
+                WaitCnt++;
+                if (WaitCnt > 20)
+                        break;
+        }
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         len += snprintf(page + len, count - len,
                         "Statistics\tValue\n----------\t-----\n");
@@ -2055,34 +1347,31 @@
                         "tx_packets\t%lld\n"
                         "rx_packets\t%lld\n"
                         "tx_errors\t%lld\n"
-                        "rx_errors\t%d\n"
-                        "rx_missed\t%d\n"
-                        "align_errors\t%d\n"
-                        "tx_one_collision\t%d\n"
-                        "tx_multi_collision\t%d\n"
+                        "rx_missed\t%lld\n"
+                        "align_errors\t%lld\n"
+                        "tx_one_collision\t%lld\n"
+                        "tx_multi_collision\t%lld\n"
                         "rx_unicast\t%lld\n"
                         "rx_broadcast\t%lld\n"
-                        "rx_multicast\t%d\n"
-                        "tx_aborted\t%d\n"
-                        "tx_underrun\t%d\n",
+                        "rx_multicast\t%lld\n"
+                        "tx_aborted\t%lld\n"
+                        "tx_underun\t%lld\n",
                         le64_to_cpu(counters->tx_packets),
                         le64_to_cpu(counters->rx_packets),
                         le64_to_cpu(counters->tx_errors),
-                        le32_to_cpu(counters->rx_errors),
-                        le16_to_cpu(counters->rx_missed),
-                        le16_to_cpu(counters->align_errors),
-                        le32_to_cpu(counters->tx_one_collision),
-                        le32_to_cpu(counters->tx_multi_collision),
+                        le64_to_cpu(counters->rx_missed),
+                        le64_to_cpu(counters->align_errors),
+                        le64_to_cpu(counters->tx_one_collision),
+                        le64_to_cpu(counters->tx_multi_collision),
                         le64_to_cpu(counters->rx_unicast),
                         le64_to_cpu(counters->rx_broadcast),
-                        le32_to_cpu(counters->rx_multicast),
-                        le16_to_cpu(counters->tx_aborted),
-                        le16_to_cpu(counters->tx_underrun));
+                        le64_to_cpu(counters->rx_multicast),
+                        le64_to_cpu(counters->tx_aborted),
+                        le64_to_cpu(counters->tx_underun)
+                       );
 
         len += snprintf(page + len, count - len, "\n");
-out_unlock:
-        rtnl_unlock();
-
+out:
         *eof = 1;
         return len;
 }
@@ -2096,14 +1385,14 @@
         u8 byte_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
         void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
         int len = 0;
 
         len += snprintf(page + len, count - len,
                         "\nDump MAC Registers\n"
                         "Offset\tValue\n------\t-----\n");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         for (n = 0; n < max;) {
                 len += snprintf(page + len, count - len,
                                 "\n0x%02x:\t",
@@ -2116,8 +1405,7 @@
                                         byte_rd);
                 }
         }
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         len += snprintf(page + len, count - len, "\n");
 
@@ -2133,28 +1421,28 @@
         int i, n, max = R8168_EPHY_REGS_SIZE/2;
         u16 word_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
         int len = 0;
 
         len += snprintf(page + len, count - len,
                         "\nDump PCIE PHY\n"
                         "Offset\tValue\n------\t-----\n");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         for (n = 0; n < max;) {
                 len += snprintf(page + len, count - len,
                                 "\n0x%02x:\t",
                                 n);
 
                 for (i = 0; i < 8 && n < max; i++, n++) {
-                        word_rd = rtl8168_ephy_read(tp, n);
+                        word_rd = rtl8168_ephy_read(ioaddr, n);
                         len += snprintf(page + len, count - len,
                                         "%04x ",
                                         word_rd);
                 }
         }
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         len += snprintf(page + len, count - len, "\n");
 
@@ -2170,14 +1458,14 @@
         int i, n, max = R8168_PHY_REGS_SIZE/2;
         u16 word_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
         int len = 0;
 
         len += snprintf(page + len, count - len,
                         "\nDump Ethernet PHY\n"
                         "Offset\tValue\n------\t-----\n");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         len += snprintf(page + len, count - len,
                         "\n####################page 0##################\n");
         rtl8168_mdio_write(tp, 0x1f, 0x0000);
@@ -2193,8 +1481,7 @@
                                         word_rd);
                 }
         }
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         len += snprintf(page + len, count - len, "\n");
 
@@ -2210,6 +1497,8 @@
         int i, n, max = R8168_ERI_REGS_SIZE;
         u32 dword_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
         int len = 0;
 
         switch (tp->mcfg) {
@@ -2227,22 +1516,20 @@
                         "\nDump Extended Registers\n"
                         "Offset\tValue\n------\t-----\n");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         for (n = 0; n < max;) {
                 len += snprintf(page + len, count - len,
                                 "\n0x%02x:\t",
                                 n);
 
                 for (i = 0; i < 4 && n < max; i++, n+=4) {
-                        dword_rd = rtl8168_eri_read(tp, n, 4, ERIAR_ExGMAC);
+                        dword_rd = rtl8168_eri_read(ioaddr, n, 4, ERIAR_ExGMAC);
                         len += snprintf(page + len, count - len,
                                         "%08x ",
                                         dword_rd);
                 }
         }
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         len += snprintf(page + len, count - len, "\n");
 out:
@@ -2258,14 +1545,14 @@
         int i, n, max = R8168_PCI_REGS_SIZE;
         u32 dword_rd;
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
         int len = 0;
 
         len += snprintf(page + len, count - len,
                         "\nDump PCI Registers\n"
                         "Offset\tValue\n------\t-----\n");
 
-        rtnl_lock();
-
+        spin_lock_irqsave(&tp->lock, flags);
         for (n = 0; n < max;) {
                 len += snprintf(page + len, count - len,
                                 "\n0x%03x:\t",
@@ -2291,371 +1578,14 @@
                         "\n0x%03x:\t%08x ",
                         n,
                         dword_rd);
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         len += snprintf(page + len, count - len, "\n");
 
         *eof = 1;
         return len;
 }
-
-static int _proc_get_cable_info(char *page, char **start,
-                                off_t offset, int count,
-                                int *eof, void *data,
-                                bool poe_mode)
-{
-        int i;
-        u16 status;
-        int len = 0;
-        struct net_device *dev = data;
-        int cp_statusRTL8168_CP_NUM = {0};
-        int cp_lenRTL8168_CP_NUM = {0};
-        struct rtl8168_private *tp = netdev_priv(dev);
-        const char *pair_strRTL8168_CP_NUM = {"1-2", "3-6", "4-5", "7-8"};
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_30:
-                /* support */
-                break;
-        default:
-                return -EOPNOTSUPP;
-        }
-
-        rtnl_lock();
-
-        if (!rtl8168_sysfs_testmode_on(tp)) {
-                len += snprintf(page + len, count - len,
-                                "\nPlease turn on ""/sys/class/net/<iface>/rtk_adv/testmode"".\n\n");
-                goto out_unlock;
-        }
-
-        status = RTL_R8(tp, PHYstatus);
-        if (status & LinkStatus)
-                len += snprintf(page + len, count - len,
-                                "\nlink speed:%d",
-                                rtl8168_convert_link_speed(status));
-        else
-                len += snprintf(page + len, count - len,
-                                "\nlink status:off");
-
-        rtl8168_get_cp_len(tp, cp_len);
-
-        rtl8168_get_cp_status(tp, cp_status, poe_mode);
-
-        len += snprintf(page + len, count - len,
-                        "\npair\tlength\tstatus   \tpp\n");
-
-        for (i=0; i<RTL8168_CP_NUM; i++) {
-                if (cp_leni < 0)
-                        len += snprintf(page + len, count - len,
-                                        "%s\t%s\t%s\t",
-                                        pair_stri, "none",
-                                        rtl8168_get_cp_status_string(cp_statusi));
-                else
-                        len += snprintf(page + len, count - len,
-                                        "%s\t%d\t%s\t",
-                                        pair_stri, cp_leni,
-                                        rtl8168_get_cp_status_string(cp_statusi));
-                if (cp_statusi == rtl8168_cp_normal)
-                        len += snprintf(page + len, count - len, "none\n");
-                else
-                        len += snprintf(page + len, count - len, "%dm\n",
-                                        rtl8168_get_cp_pp(tp, i));
-        }
-
-        len += snprintf(page + len, count - len, "\n");
-
-out_unlock:
-        rtnl_unlock();
-
-        *eof = 1;
-        return len;
-}
-
-static int proc_get_cable_info(char *page, char **start,
-                               off_t offset, int count,
-                               int *eof, void *data)
-{
-        return _proc_get_cable_info(page, start, offset, count, eof, data, 0);
-}
-
-static int proc_get_poe_cable_info(char *page, char **start,
-                                   off_t offset, int count,
-                                   int *eof, void *data)
-{
-        return _proc_get_cable_info(page, start, offset, count, eof, data, 1);
-}
-
-static int proc_dump_rx_desc(char *page, char **start,
-                             off_t offset, int count,
-                             int *eof, void *data)
-{
-        int i;
-        int len = 0;
-        u32 *pdword;
-        struct net_device *dev = data;
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        if (!tp->RxDescArray)
-                return -EOPNOTSUPP;
-
-        rtnl_lock();
-
-        len += snprintf(page + len, count - len,
-                        "\ndump rx desc:%d",
-                        tp->num_rx_desc);
-
-        pdword = (u32*)tp->RxDescArray;
-        for (i=0; i<(tp->RxDescAllocSize/4); i++) {
-                if (!(i % 4))
-                        len += snprintf(page + len, count - len,
-                                        "\n%04x ",
-                                        i);
-                len += snprintf(page + len, count - len,
-                                "%08x ",
-                                pdwordi);
-        }
-
-        rtnl_unlock();
-
-        len += snprintf(page + len, count - len, "\n");
-
-        *eof = 1;
-
-        return len;
-}
-
-static int proc_dump_rx_desc_2(char *page, char **start,
-                               off_t offset, int count,
-                               int *eof, void *data)
-{
-        int i, j, k;
-        int len = 0;
-        u32 *pdword;
-        struct net_device *dev = data;
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        if (!tp->RxDescArray)
-                return -EOPNOTSUPP;
-
-        rtnl_lock();
-
-        for (k=0; k<tp->num_hw_tot_en_rx_rings; k++) {
-                len += snprintf(page + len, count - len,
-                                "\ndump Q%d rx desc:%d",
-                                k,
-                                tp->num_rx_desc);
-                for (j=0; j<tp->num_rx_desc; j++) {
-                        pdword = (u32*)rtl8168_get_rxdesc(tp,
-                                                          tp->RxDescArray,
-                                                          j, k);
-                        for (i=0; i<(tp->RxDescLength/4); i++) {
-                                if (!(i % 4))
-                                        len += snprintf(page + len, count - len,
-                                                        "\n%04llx ",
-                                                        ((u64)pdword + (i * 4) -
-                                                         (u64)tp->RxDescArray));
-                                len += snprintf(page + len, count - len,
-                                                "%08x ",
-                                                pdwordi);
-                        }
-                }
-
-                len += snprintf(page + len, count - len, "\n");
-        }
-
-        rtnl_unlock();
-
-        len += snprintf(page + len, count - len, "\n");
-
-        *eof = 1;
-
-        return len;
-}
-
-void _proc_dump_tx_desc(char *page, int *page_len, int *count,
-                        struct TxDesc *desc_base,
-                        u32 alloc_size, u32 num_desc)
-{
-        int i;
-        int len = 0;
-        u32 *pdword;
-
-        if (desc_base == NULL ||
-            alloc_size == 0 ||
-            num_desc == 0)
-                return;
-
-        len = *page_len;
-        pdword = (u32*)desc_base;
-        for (i=0; i<(alloc_size/4); i++) {
-                if (!(i % 4))
-                        len += snprintf(page + len, *count - len,
-                                        "\n%04x ",
-                                        i);
-                len += snprintf(page + len, *count - len,
-                                "%08x ",
-                                pdwordi);
-        }
-
-        len += snprintf(page + len, count - len, "\n");
-
-        *page_len = len;
-        return;
-}
-
-static int proc_dump_tx_desc(char *page, char **start,
-                             off_t offset, int count,
-                             int *eof, void *data)
-{
-        int i;
-        int len = 0;
-        u32 *pdword;
-        struct net_device *dev = data;
-        struct rtl8168_private *tp = netdev_priv(dev);
-        struct rtl8168_tx_ring *ring = &tp->tx_ring0;
-
-        if (!ring->TxDescArray)
-                return -EOPNOTSUPP;
-
-        rtnl_lock();
-
-        for (i=0; i<tp->HwSuppNumTxQueues; i++) {
-                struct rtl8168_tx_ring *ring = &tp->tx_ringi;
-                if (!ring->TxDescArray)
-                        continue;
-                len += snprintf(page + len, count - len,
-                                "\ndump Q%d tx desc:%d",
-                                i,
-                                ring->num_tx_desc);
-                _proc_dump_tx_desc(page, &len, &count,
-                                   ring->TxDescArray,
-                                   ring->TxDescAllocSize,
-                                   ring->num_tx_desc);
-        }
-
-#ifdef ENABLE_LIB_SUPPORT
-        for (i=0; i<tp->HwSuppNumTxQueues; i++) {
-                struct rtl8168_ring *ring = &tp->lib_tx_ringi;
-                if (!ring->desc_addr)
-                        continue;
-                len += snprintf(page + len, count - len,
-                                "\ndump lib Q%d tx desc:%d",
-                                i,
-                                ring->ring_size);
-                _proc_dump_tx_desc(page, &len, ring->desc_addr,
-                                   ring->desc_size,
-                                   ring->ring_size);
-        }
-#endif //ENABLE_LIB_SUPPORT
-
-        rtnl_unlock();
-
-        len += snprintf(page + len, count - len, "\n");
-
-        *eof = 1;
-
-        return len;
-}
-
-static int proc_dump_tx_desc(char *page, char **start,
-                             off_t offset, int count,
-                             int *eof, void *data)
-{
-        int i;
-        struct net_device *dev = m->private;
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_1 ... CFG_METHOD_8:
-                return -EOPNOTSUPP;
-        default:
-                break;
-        }
-
-        rtnl_lock();
-
-        len += snprintf(page + len, count - len,
-                        "\ndump MSI-X Table. Total Entry %d. \n",
-                        R8168_MAX_MSIX_VEC);
-
-        for (i=0; i<R8168_MAX_MSIX_VEC; i++) {
-                len += snprintf(page + len, count - len,
-                                "\n%04x ",
-                                i);
-                len += snprintf(page + len, count - len,
-                                "%08x ",
-                                rtl8168_eri_read(tp, i*0x10, 4,
-                                                 ERIAR_MSIX));
-                len += snprintf(page + len, count - len,
-                                "%08x ",
-                                rtl8168_eri_read(tp, i*0x10 + 4, 4,
-                                                 ERIAR_MSIX));
-                len += snprintf(page + len, count - len,
-                                "%08x ",
-                                rtl8168_eri_read(tp, i*0x10 + 8, 4,
-                                                 ERIAR_MSIX));
-                len += snprintf(page + len, count - len,
-                                "%08x ",
-                                rtl8168_eri_read(tp, i*0x10 + 12, 4,
-                                                 ERIAR_MSIX));
-        }
-
-        rtnl_unlock();
-
-        len += snprintf(page + len, count - len, "\n");
-
-        *eof = 1;
-
-        return len;
-}
-
-static int proc_dump_msix_tbl(char *page, char **start,
-                              off_t offset, int count,
-                              int *eof, void *data)
-{
-        int i, j;
-        int len = 0;
-        void __iomem *ioaddr;
-        struct net_device *dev = data;
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_1 ... CFG_METHOD_8:
-                return -EOPNOTSUPP;
-        default:
-                break;
-        }
-
-        /* ioremap MMIO region */
-        ioaddr = ioremap(pci_resource_start(tp->pci_dev, 4), pci_resource_len(tp->pci_dev, 4));
-        if (!ioaddr)
-                return -EFAULT;
-
-        rtnl_lock();
-
-        len += snprintf(page + len, count - len,
-                        "\ndump MSI-X Table. Total Entry %d. \n",
-                        tp->hw_supp_irq_nvecs);
-
-        for (i=0; i<tp->hw_supp_irq_nvecs; i++) {
-                len += snprintf(page + len, count - len,
-                                "\n%04x ", i);
-                for (j=0; j<4; j++)
-                        len += snprintf(page + len, count - len, "%08x ",
-                                        readl(ioaddr + i*0x10 + 4*j));
-        }
-
-        rtnl_unlock();
-
-        len += snprintf(page + len, count - len, "\n");
-
-        *eof = 1;
-        return 0;
-}
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-
+#endif
 static void rtl8168_proc_module_init(void)
 {
         //create /proc/net/r8168
@@ -2675,23 +1605,11 @@
 static int rtl8168_proc_open(struct inode *inode, struct file *file)
 {
         struct net_device *dev = proc_get_parent_data(inode);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-        int (*show)(struct seq_file *, void *) = pde_data(inode);
-#else
         int (*show)(struct seq_file *, void *) = PDE_DATA(inode);
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
 
         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,
@@ -2700,13 +1618,11 @@
 };
 #endif
 
-#endif
-
 /*
  * Table of proc files we need to create.
  */
 struct rtl8168_proc_file {
-        char name16;
+        char name12;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
         int (*show)(struct seq_file *, void *);
 #else
@@ -2714,7 +1630,7 @@
 #endif
 };
 
-static const struct rtl8168_proc_file rtl8168_debug_proc_files = {
+static const struct rtl8168_proc_file rtl8168_proc_files = {
         { "driver_var", &proc_get_driver_variable },
         { "tally", &proc_get_tally_counter },
         { "registers", &proc_get_registers },
@@ -2722,134 +1638,58 @@
         { "eth_phy", &proc_get_eth_phy },
         { "ext_regs", &proc_get_extended_registers },
         { "pci_regs", &proc_get_pci_registers },
-        { "tx_desc", &proc_dump_tx_desc },
-        { "rx_desc", &proc_dump_rx_desc },
-        { "rx_desc_2", &proc_dump_rx_desc_2 },
-        { "msix_tbl", &proc_dump_msix_tbl },
-        { "" }
-};
-
-static const struct rtl8168_proc_file rtl8168_test_proc_files = {
-        { "cdt", &proc_get_cable_info },
-        { "cdt_poe", &proc_get_poe_cable_info },
         { "" }
 };
 
-#define R8168_PROC_DEBUG_DIR "debug"
-#define R8168_PROC_TEST_DIR "test"
-
 static void rtl8168_proc_init(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         const struct rtl8168_proc_file *f;
         struct proc_dir_entry *dir;
 
-        if (!rtl8168_proc)
-                return;
-
-        if (tp->proc_dir_debug || tp->proc_dir_test)
-                return;
-
+        if (rtl8168_proc && !tp->proc_dir) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-        dir = proc_mkdir_data(dev->name, 0, rtl8168_proc, dev);
-        if (!dir) {
-                printk("Unable to initialize /proc/net/%s/%s\n",
-                       MODULENAME, dev->name);
-                return;
-        }
-        tp->proc_dir = dir;
-        proc_init_num++;
-
-        /* create debug entry */
-        dir = proc_mkdir_data(R8168_PROC_DEBUG_DIR, 0, tp->proc_dir, dev);
-        if (!dir) {
-                printk("Unable to initialize /proc/net/%s/%s/%s\n",
-                       MODULENAME, dev->name, R8168_PROC_DEBUG_DIR);
-                return;
-        }
-
-        tp->proc_dir_debug = dir;
-        for (f = rtl8168_debug_proc_files; f->name0; f++) {
-                if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
-                                      &rtl8168_proc_fops, f->show)) {
-                        printk("Unable to initialize "
-                               "/proc/net/%s/%s/%s/%s\n",
-                               MODULENAME, dev->name, R8168_PROC_DEBUG_DIR,
-                               f->name);
+                dir = proc_mkdir_data(dev->name, 0, rtl8168_proc, dev);
+                if (!dir) {
+                        printk("Unable to initialize /proc/net/%s/%s\n",
+                               MODULENAME, dev->name);
                         return;
                 }
-        }
 
-        /* create test entry */
-        dir = proc_mkdir_data(R8168_PROC_TEST_DIR, 0, tp->proc_dir, dev);
-        if (!dir) {
-                printk("Unable to initialize /proc/net/%s/%s/%s\n",
-                       MODULENAME, dev->name, R8168_PROC_TEST_DIR);
-                return;
-        }
+                tp->proc_dir = dir;
+                proc_init_num++;
 
-        tp->proc_dir_test = dir;
-        for (f = rtl8168_test_proc_files; f->name0; f++) {
-                if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
-                                      &rtl8168_proc_fops, f->show)) {
-                        printk("Unable to initialize "
-                               "/proc/net/%s/%s/%s/%s\n",
-                               MODULENAME, dev->name, R8168_PROC_TEST_DIR,
-                               f->name);
-                        return;
+                for (f = rtl8168_proc_files; f->name0; f++) {
+                        if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
+                                              &rtl8168_proc_fops, f->show)) {
+                                printk("Unable to initialize "
+                                       "/proc/net/%s/%s/%s\n",
+                                       MODULENAME, dev->name, f->name);
+                                return;
+                        }
                 }
-        }
 #else
-        dir = proc_mkdir(dev->name, rtl8168_proc);
-        if (!dir) {
-                printk("Unable to initialize /proc/net/%s/%s\n",
-                       MODULENAME, dev->name);
-                return;
-        }
-
-        tp->proc_dir = dir;
-        proc_init_num++;
-
-        /* create debug entry */
-        dir = proc_mkdir(R8168_PROC_DEBUG_DIR, tp->proc_dir);
-        if (!dir) {
-                printk("Unable to initialize /proc/net/%s/%s/%s\n",
-                       MODULENAME, dev->name, R8168_PROC_DEBUG_DIR);
-                return;
-        }
-
-        tp->proc_dir_debug = dir;
-        for (f = rtl8168_debug_proc_files; f->name0; f++) {
-                if (!create_proc_read_entry(f->name, S_IFREG | S_IRUGO,
-                                            dir, f->show, dev)) {
-                        printk("Unable to initialize "
-                               "/proc/net/%s/%s/%s/%s\n",
-                               MODULENAME, dev->name, R8168_PROC_DEBUG_DIR,
-                               f->name);
+                dir = proc_mkdir(dev->name, rtl8168_proc);
+                if (!dir) {
+                        printk("Unable to initialize /proc/net/%s/%s\n",
+                               MODULENAME, dev->name);
                         return;
                 }
-        }
 
-        /* create test entry */
-        dir = proc_mkdir(R8168_PROC_TEST_DIR, tp->proc_dir);
-        if (!dir) {
-                printk("Unable to initialize /proc/net/%s/%s/%s\n",
-                       MODULENAME, dev->name, R8168_PROC_TEST_DIR);
-                return;
-        }
+                tp->proc_dir = dir;
+                proc_init_num++;
 
-        tp->proc_dir_test = dir;
-        for (f = rtl8168_test_proc_files; f->name0; f++) {
-                if (!create_proc_read_entry(f->name, S_IFREG | S_IRUGO,
-                                            dir, f->show, dev)) {
-                        printk("Unable to initialize "
-                               "/proc/net/%s/%s/%s/%s\n",
-                               MODULENAME, dev->name, R8168_PROC_TEST_DIR,
-                               f->name);
-                        return;
+                for (f = rtl8168_proc_files; f->name0; f++) {
+                        if (!create_proc_read_entry(f->name, S_IFREG | S_IRUGO,
+                                                    dir, f->show, dev)) {
+                                printk("Unable to initialize "
+                                       "/proc/net/%s/%s/%s\n",
+                                       MODULENAME, dev->name, f->name);
+                                return;
+                        }
                 }
-        }
 #endif
+        }
 }
 
 static void rtl8168_proc_remove(struct net_device *dev)
@@ -2859,119 +1699,33 @@
         if (tp->proc_dir) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
                 remove_proc_subtree(dev->name, rtl8168_proc);
+                proc_init_num--;
+
 #else
                 const struct rtl8168_proc_file *f;
                 struct rtl8168_private *tp = netdev_priv(dev);
 
-                if (tp->proc_dir_debug) {
-                        for (f = rtl8168_debug_proc_files; f->name0; f++)
-                                remove_proc_entry(f->name, tp->proc_dir_debug);
-                        remove_proc_entry(R8168_PROC_DEBUG_DIR, tp->proc_dir);
-                }
-
-                if (tp->proc_dir_test) {
-                        for (f = rtl8168_test_proc_files; f->name0; f++)
-                                remove_proc_entry(f->name, tp->proc_dir_test);
-                        remove_proc_entry(R8168_PROC_TEST_DIR, tp->proc_dir);
-                }
+                for (f = rtl8168_proc_files; f->name0; f++)
+                        remove_proc_entry(f->name, tp->proc_dir);
 
                 remove_proc_entry(dev->name, rtl8168_proc);
-#endif
                 proc_init_num--;
-
-                tp->proc_dir_debug = NULL;
-                tp->proc_dir_test = NULL;
+#endif
                 tp->proc_dir = NULL;
         }
 }
 
 #endif //ENABLE_R8168_PROCFS
 
-#ifdef ENABLE_R8168_SYSFS
-/****************************************************************************
-*   -----------------------------SYSFS STUFF-------------------------
-*****************************************************************************
-*/
-static ssize_t testmode_show(struct device *dev,
-                             struct device_attribute *attr, char *buf)
-{
-        struct net_device *netdev = to_net_dev(dev);
-        struct rtl8168_private *tp = netdev_priv(netdev);
-
-        sprintf(buf, "%u\n", tp->testmode);
-
-        return strlen(buf);
-}
-
-static ssize_t testmode_store(struct device *dev,
-                              struct device_attribute *attr,
-                              const char *buf, size_t count)
-{
-        struct net_device *netdev = to_net_dev(dev);
-        struct rtl8168_private *tp = netdev_priv(netdev);
-        u32 testmode;
-
-        if (sscanf(buf, "%u\n", &testmode) != 1)
-                return -EINVAL;
-
-        if (tp->testmode != testmode) {
-                rtnl_lock();
-                tp->testmode = testmode;
-                rtnl_unlock();
-        }
-
-        return count;
-}
-
-static DEVICE_ATTR_RW(testmode);
-
-static struct attribute *rtk_adv_attrs = {
-        &dev_attr_testmode.attr,
-        NULL
-};
-
-static struct attribute_group rtk_adv_grp = {
-        .name = "rtl_adv",
-        .attrs = rtk_adv_attrs,
-};
-
-static void rtl8168_sysfs_init(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        int ret;
-
-        /* init rtl_adv */
-#ifdef ENABLE_LIB_SUPPORT
-        tp->testmode = 0;
-#else
-        tp->testmode = 1;
-#endif //ENABLE_LIB_SUPPORT
-
-        ret = sysfs_create_group(&dev->dev.kobj, &rtk_adv_grp);
-        if (ret < 0)
-                netif_warn(tp, probe, dev, "create rtk_adv_grp fail\n");
-        else
-                set_bit(R8168_SYSFS_RTL_ADV, tp->sysfs_flag);
-}
-
-static void rtl8168_sysfs_remove(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        if (test_and_clear_bit(R8168_SYSFS_RTL_ADV, tp->sysfs_flag))
-                sysfs_remove_group(&dev->dev.kobj, &rtk_adv_grp);
-}
-#endif //ENABLE_R8168_SYSFS
-
 static inline u16 map_phy_ocp_addr(u16 PageNum, u8 RegNum)
 {
         u16 OcpPageNum = 0;
         u8 OcpRegNum = 0;
         u16 OcpPhyAddress = 0;
 
-        if (PageNum == 0) {
-                OcpPageNum = OCP_STD_PHY_BASE_PAGE + (RegNum / 8);
-                OcpRegNum = 0x10 + (RegNum % 8);
+        if ( PageNum == 0 ) {
+                OcpPageNum = OCP_STD_PHY_BASE_PAGE + ( RegNum / 8 );
+                OcpRegNum = 0x10 + ( RegNum % 8 );
         } else {
                 OcpPageNum = PageNum;
                 OcpRegNum = RegNum;
@@ -2979,7 +1733,7 @@
 
         OcpPageNum <<= 4;
 
-        if (OcpRegNum < 16) {
+        if ( OcpRegNum < 16 ) {
                 OcpPhyAddress = 0;
         } else {
                 OcpRegNum -= 16;
@@ -2996,12 +1750,10 @@
                 u32 RegAddr,
                 u32 value)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 data32;
         int i;
 
-        if (tp->HwSuppPhyOcpVer == 0)
-                goto out;
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
         WARN_ON_ONCE(RegAddr % 2);
 #endif
@@ -3009,23 +1761,20 @@
         data32 <<= OCPR_Addr_Reg_shift;
         data32 |= OCPR_Write | value;
 
-        RTL_W32(tp, PHYOCP, data32);
-        for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                udelay(R8168_CHANNEL_WAIT_TIME);
+        RTL_W32(PHYOCP, data32);
+        for (i = 0; i < 100; i++) {
+                udelay(1);
 
-                if (!(RTL_R32(tp, PHYOCP) & OCPR_Flag))
+                if (!(RTL_R32(PHYOCP) & OCPR_Flag))
                         break;
         }
-out:
-        return;
 }
 
 static void mdio_direct_write_phy_ocp(struct rtl8168_private *tp,
                                       u16 RegAddr,
                                       u16 value)
 {
-        if (tp->rtk_enable_diag)
-                return;
+        if (tp->rtk_enable_diag) return;
 
         mdio_real_direct_write_phy_ocp(tp, RegAddr, value);
 }
@@ -3037,8 +1786,7 @@
 {
         u16 ocp_addr;
 
-        if (tp->rtk_enable_diag)
-                return;
+        if (tp->rtk_enable_diag) return;
 
         ocp_addr = map_phy_ocp_addr(PageNum, RegAddr);
 
@@ -3061,59 +1809,63 @@
                             u32 RegAddr,
                             u32 value)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         int i;
 
-        if (RegAddr == 0x1F)
+        if (RegAddr == 0x1F) {
                 tp->cur_page = value;
+        }
 
         if (tp->mcfg == CFG_METHOD_11) {
-                RTL_W32(tp, OCPDR, OCPDR_Write |
+                RTL_W32(OCPDR, OCPDR_Write |
                         (RegAddr & OCPDR_Reg_Mask) << OCPDR_GPHY_Reg_shift |
                         (value & OCPDR_Data_Mask));
-                RTL_W32(tp, OCPAR, OCPAR_GPHY_Write);
-                RTL_W32(tp, EPHY_RXER_NUM, 0);
+                RTL_W32(OCPAR, OCPAR_GPHY_Write);
+                RTL_W32(EPHY_RXER_NUM, 0);
 
                 for (i = 0; i < 100; i++) {
                         mdelay(1);
-                        if (!(RTL_R32(tp, OCPAR) & OCPAR_Flag))
+                        if (!(RTL_R32(OCPAR) & OCPAR_Flag))
                                 break;
                 }
+        } else if (tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
+                   tp->mcfg == CFG_METHOD_23 || tp->mcfg == CFG_METHOD_24 ||
+                   tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
+                   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) {
+                if (RegAddr == 0x1F) {
+                        return;
+                }
+                rtl8168_mdio_real_write_phy_ocp(tp, tp->cur_page, RegAddr, value);
         } else {
-                if (tp->HwSuppPhyOcpVer > 0) {
-                        if (RegAddr == 0x1F) {
-                                return;
-                        }
-                        rtl8168_mdio_real_write_phy_ocp(tp, tp->cur_page, RegAddr, value);
-                } else {
-                        if (tp->mcfg == CFG_METHOD_12 || tp->mcfg == CFG_METHOD_13)
-                                RTL_W32(tp, 0xD0, RTL_R32(tp, 0xD0) & ~0x00020000);
+                if (tp->mcfg == CFG_METHOD_12 || tp->mcfg == CFG_METHOD_13)
+                        RTL_W32(0xD0, RTL_R32(0xD0) & ~0x00020000);
 
-                        RTL_W32(tp, PHYAR, PHYAR_Write |
-                                (RegAddr & PHYAR_Reg_Mask) << PHYAR_Reg_shift |
-                                (value & PHYAR_Data_Mask));
-
-                        for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                                udelay(R8168_CHANNEL_WAIT_TIME);
-
-                                /* Check if the RTL8168 has completed writing to the specified MII register */
-                                if (!(RTL_R32(tp, PHYAR) & PHYAR_Flag)) {
-                                        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
-                                        break;
-                                }
-                        }
+                RTL_W32(PHYAR, PHYAR_Write |
+                        (RegAddr & PHYAR_Reg_Mask) << PHYAR_Reg_shift |
+                        (value & PHYAR_Data_Mask));
 
-                        if (tp->mcfg == CFG_METHOD_12 || tp->mcfg == CFG_METHOD_13)
-                                RTL_W32(tp, 0xD0, RTL_R32(tp, 0xD0) | 0x00020000);
+                for (i = 0; i < 10; i++) {
+                        udelay(100);
+
+                        /* Check if the RTL8168 has completed writing to the specified MII register */
+                        if (!(RTL_R32(PHYAR) & PHYAR_Flag)) {
+                                udelay(20);
+                                break;
+                        }
                 }
+
+                if (tp->mcfg == CFG_METHOD_12 || tp->mcfg == CFG_METHOD_13)
+                        RTL_W32(0xD0, RTL_R32(0xD0) | 0x00020000);
         }
 }
 
 void rtl8168_mdio_write(struct rtl8168_private *tp,
-                        u16 RegAddr,
-                        u16 value)
+                        u32 RegAddr,
+                        u32 value)
 {
-        if (tp->rtk_enable_diag)
-                return;
+        if (tp->rtk_enable_diag) return;
 
         mdio_real_write(tp, RegAddr, value);
 }
@@ -3135,36 +1887,32 @@
 static u32 mdio_real_direct_read_phy_ocp(struct rtl8168_private *tp,
                 u32 RegAddr)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 data32;
         int i, value = 0;
 
-        if (tp->HwSuppPhyOcpVer == 0)
-                goto out;
-
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
         WARN_ON_ONCE(RegAddr % 2);
 #endif
         data32 = RegAddr/2;
         data32 <<= OCPR_Addr_Reg_shift;
 
-        RTL_W32(tp, PHYOCP, data32);
-        for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                udelay(R8168_CHANNEL_WAIT_TIME);
+        RTL_W32(PHYOCP, data32);
+        for (i = 0; i < 100; i++) {
+                udelay(1);
 
-                if (RTL_R32(tp, PHYOCP) & OCPR_Flag)
+                if (RTL_R32(PHYOCP) & OCPR_Flag)
                         break;
         }
-        value = RTL_R32(tp, PHYOCP) & OCPDR_Data_Mask;
+        value = RTL_R32(PHYOCP) & OCPDR_Data_Mask;
 
-out:
         return value;
 }
 
 static u32 mdio_direct_read_phy_ocp(struct rtl8168_private *tp,
                                     u16 RegAddr)
 {
-        if (tp->rtk_enable_diag)
-                return 0xffffffff;
+        if (tp->rtk_enable_diag) return 0xffffffff;
 
         return mdio_real_direct_read_phy_ocp(tp, RegAddr);
 }
@@ -3175,8 +1923,7 @@
 {
         u16 ocp_addr;
 
-        if (tp->rtk_enable_diag)
-                return 0xffffffff;
+        if (tp->rtk_enable_diag) return 0xffffffff;
 
         ocp_addr = map_phy_ocp_addr(PageNum, RegAddr);
 
@@ -3194,68 +1941,71 @@
         return mdio_real_direct_read_phy_ocp(tp, ocp_addr);
 }
 
-static u32 mdio_real_read(struct rtl8168_private *tp,
-                          u32 RegAddr)
+u32 mdio_real_read(struct rtl8168_private *tp,
+                   u32 RegAddr)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         int i, value = 0;
 
         if (tp->mcfg==CFG_METHOD_11) {
-                RTL_W32(tp, OCPDR, OCPDR_Read |
+                RTL_W32(OCPDR, OCPDR_Read |
                         (RegAddr & OCPDR_Reg_Mask) << OCPDR_GPHY_Reg_shift);
-                RTL_W32(tp, OCPAR, OCPAR_GPHY_Write);
-                RTL_W32(tp, EPHY_RXER_NUM, 0);
+                RTL_W32(OCPAR, OCPAR_GPHY_Write);
+                RTL_W32(EPHY_RXER_NUM, 0);
 
                 for (i = 0; i < 100; i++) {
                         mdelay(1);
-                        if (!(RTL_R32(tp, OCPAR) & OCPAR_Flag))
+                        if (!(RTL_R32(OCPAR) & OCPAR_Flag))
                                 break;
                 }
 
                 mdelay(1);
-                RTL_W32(tp, OCPAR, OCPAR_GPHY_Read);
-                RTL_W32(tp, EPHY_RXER_NUM, 0);
+                RTL_W32(OCPAR, OCPAR_GPHY_Read);
+                RTL_W32(EPHY_RXER_NUM, 0);
 
                 for (i = 0; i < 100; i++) {
                         mdelay(1);
-                        if (RTL_R32(tp, OCPAR) & OCPAR_Flag)
+                        if (RTL_R32(OCPAR) & OCPAR_Flag)
                                 break;
                 }
 
-                value = RTL_R32(tp, OCPDR) & OCPDR_Data_Mask;
+                value = RTL_R32(OCPDR) & OCPDR_Data_Mask;
+        } else if (tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
+                   tp->mcfg == CFG_METHOD_23 || tp->mcfg == CFG_METHOD_24 ||
+                   tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
+                   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) {
+                value = rtl8168_mdio_real_read_phy_ocp(tp, tp->cur_page, RegAddr);
         } else {
-                if (tp->HwSuppPhyOcpVer > 0) {
-                        value = rtl8168_mdio_real_read_phy_ocp(tp, tp->cur_page, RegAddr);
-                } else {
-                        if (tp->mcfg == CFG_METHOD_12 || tp->mcfg == CFG_METHOD_13)
-                                RTL_W32(tp, 0xD0, RTL_R32(tp, 0xD0) & ~0x00020000);
+                if (tp->mcfg == CFG_METHOD_12 || tp->mcfg == CFG_METHOD_13)
+                        RTL_W32(0xD0, RTL_R32(0xD0) & ~0x00020000);
 
-                        RTL_W32(tp, PHYAR,
-                                PHYAR_Read | (RegAddr & PHYAR_Reg_Mask) << PHYAR_Reg_shift);
+                RTL_W32(PHYAR,
+                        PHYAR_Read | (RegAddr & PHYAR_Reg_Mask) << PHYAR_Reg_shift);
 
-                        for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                                udelay(R8168_CHANNEL_WAIT_TIME);
+                for (i = 0; i < 10; i++) {
+                        udelay(100);
 
-                                /* Check if the RTL8168 has completed retrieving data from the specified MII register */
-                                if (RTL_R32(tp, PHYAR) & PHYAR_Flag) {
-                                        value = RTL_R32(tp, PHYAR) & PHYAR_Data_Mask;
-                                        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
-                                        break;
-                                }
+                        /* Check if the RTL8168 has completed retrieving data from the specified MII register */
+                        if (RTL_R32(PHYAR) & PHYAR_Flag) {
+                                value = RTL_R32(PHYAR) & PHYAR_Data_Mask;
+                                udelay(20);
+                                break;
                         }
-
-                        if (tp->mcfg == CFG_METHOD_12 || tp->mcfg == CFG_METHOD_13)
-                                RTL_W32(tp, 0xD0, RTL_R32(tp, 0xD0) | 0x00020000);
                 }
+
+                if (tp->mcfg == CFG_METHOD_12 || tp->mcfg == CFG_METHOD_13)
+                        RTL_W32(0xD0, RTL_R32(0xD0) | 0x00020000);
         }
 
         return value;
 }
 
 u32 rtl8168_mdio_read(struct rtl8168_private *tp,
-                      u16 RegAddr)
+                      u32 RegAddr)
 {
-        if (tp->rtk_enable_diag)
-                return 0xffffffff;
+        if (tp->rtk_enable_diag) return 0xffffffff;
 
         return mdio_real_read(tp, RegAddr);
 }
@@ -3288,19 +2038,22 @@
         ClearAndSetEthPhyBit(tp,
                              addr,
                              mask,
-                             0);
+                             0
+                            );
 }
 
-void rtl8168_set_eth_phy_bit(struct rtl8168_private *tp, u8  addr, u16  mask)
+void rtl8168_set_eth_phy_bit(struct rtl8168_private *tp,  u8  addr, u16  mask)
 {
         ClearAndSetEthPhyBit(tp,
                              addr,
                              0,
-                             mask);
+                             mask
+                            );
 }
 
 void rtl8168_mac_ocp_write(struct rtl8168_private *tp, u16 reg_addr, u16 value)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 data32;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
@@ -3312,11 +2065,12 @@
         data32 += value;
         data32 |= OCPR_Write;
 
-        RTL_W32(tp, MACOCP, data32);
+        RTL_W32(MACOCP, data32);
 }
 
 u16 rtl8168_mac_ocp_read(struct rtl8168_private *tp, u16 reg_addr)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 data32;
         u16 data16 = 0;
 
@@ -3327,73 +2081,15 @@
         data32 = reg_addr/2;
         data32 <<= OCPR_Addr_Reg_shift;
 
-        RTL_W32(tp, MACOCP, data32);
-        data16 = (u16)RTL_R32(tp, MACOCP);
+        RTL_W32(MACOCP, data32);
+        data16 = (u16)RTL_R32(MACOCP);
 
         return data16;
 }
 
-#ifdef ENABLE_USE_FIRMWARE_FILE
-static void mac_mcu_write(struct rtl8168_private *tp, u16 reg, u16 value)
-{
-        if (reg == 0x1f) {
-                tp->ocp_base = value << 4;
-                return;
-        }
-
-        rtl8168_mac_ocp_write(tp, tp->ocp_base + reg, value);
-}
-
-static u32 mac_mcu_read(struct rtl8168_private *tp, u16 reg)
-{
-        return rtl8168_mac_ocp_read(tp, tp->ocp_base + reg);
-}
-#endif
-
-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)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         int i, val_shift, shift = 0;
         u32 value1 = 0, value2 = 0, mask;
 
@@ -3404,11 +2100,11 @@
                 val_shift = addr % 4;
                 addr = addr & ~0x3;
 
-                RTL_W32(tp, OCPAR, (0x0F<<12) | (addr&0xFFF));
+                RTL_W32(OCPAR, (0x0F<<12) | (addr&0xFFF));
 
-                for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                        udelay(R8168_CHANNEL_WAIT_TIME);
-                        if (RTL_R32(tp, OCPAR) & OCPAR_Flag)
+                for (i = 0; i < 20; i++) {
+                        udelay(100);
+                        if (RTL_R32(OCPAR) & OCPAR_Flag)
                                 break;
                 }
 
@@ -3417,7 +2113,7 @@
                 else if (len == 3)  mask = (0xFFFFFF << (val_shift * 8)) & 0xFFFFFFFF;
                 else            mask = (0xFFFFFFFF << (val_shift * 8)) & 0xFFFFFFFF;
 
-                value1 = RTL_R32(tp, OCPDR) & mask;
+                value1 = RTL_R32(OCPDR) & mask;
                 value2 |= (value1 >> val_shift * 8) << shift * 8;
 
                 if (len <= 4 - val_shift) {
@@ -3429,14 +2125,16 @@
                 }
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 
         return value2;
 }
 
 u32 rtl8168_ocp_read_with_oob_base_address(struct rtl8168_private *tp, u16 addr, u8 len, const u32 base_address)
 {
-        return rtl8168_eri_read_with_oob_base_address(tp, addr, len, ERIAR_OOB, base_address);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return rtl8168_eri_read_with_oob_base_address(ioaddr, addr, len, ERIAR_OOB, base_address);
 }
 
 u32 rtl8168_ocp_read(struct rtl8168_private *tp, u16 addr, u8 len)
@@ -3455,6 +2153,7 @@
 
 static int real_ocp_write(struct rtl8168_private *tp, u16 addr, u8 len, u32 value)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         int i, val_shift, shift = 0;
         u32 value1 = 0, mask;
 
@@ -3473,14 +2172,14 @@
                 value1 = rtl8168_ocp_read(tp, addr, 4) & ~mask;
                 value1 |= ((value << val_shift * 8) >> shift * 8);
 
-                RTL_W32(tp, OCPDR, value1);
-                RTL_W32(tp, OCPAR, OCPAR_Flag | (0x0F<<12) | (addr&0xFFF));
+                RTL_W32(OCPDR, value1);
+                RTL_W32(OCPAR, OCPAR_Flag | (0x0F<<12) | (addr&0xFFF));
 
-                for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                        udelay(R8168_CHANNEL_WAIT_TIME);
+                for (i = 0; i < 10; i++) {
+                        udelay(100);
 
                         /* Check if the RTL8168 has completed ERI write */
-                        if (!(RTL_R32(tp, OCPAR) & OCPAR_Flag))
+                        if (!(RTL_R32(OCPAR) & OCPAR_Flag))
                                 break;
                 }
 
@@ -3493,14 +2192,16 @@
                 }
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 
         return 0;
 }
 
 u32 rtl8168_ocp_write_with_oob_base_address(struct rtl8168_private *tp, u16 addr, u8 len, u32 value, const u32 base_address)
 {
-        return rtl8168_eri_write_with_oob_base_address(tp, addr, len, value, ERIAR_OOB, base_address);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        return rtl8168_eri_write_with_oob_base_address(ioaddr, addr, len, value, ERIAR_OOB, base_address);
 }
 
 void rtl8168_ocp_write(struct rtl8168_private *tp, u16 addr, u8 len, u32 value)
@@ -3521,8 +2222,7 @@
         u16 ocp_reg_mutex_oob;
         u16 ocp_reg_mutex_prio;
 
-        if (!tp->DASH)
-                return;
+        if (!tp->DASH) return;
 
         switch (tp->mcfg) {
         case CFG_METHOD_11:
@@ -3541,8 +2241,6 @@
         case CFG_METHOD_28:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
         default:
                 ocp_reg_mutex_oob = 0x110;
                 ocp_reg_mutex_ib = 0x114;
@@ -3585,8 +2283,7 @@
         u16 ocp_reg_mutex_oob;
         u16 ocp_reg_mutex_prio;
 
-        if (!tp->DASH)
-                return;
+        if (!tp->DASH) return;
 
         switch (tp->mcfg) {
         case CFG_METHOD_11:
@@ -3605,8 +2302,6 @@
         case CFG_METHOD_28:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
         default:
                 ocp_reg_mutex_oob = 0x110;
                 ocp_reg_mutex_ib = 0x114;
@@ -3620,7 +2315,9 @@
 
 void rtl8168_oob_notify(struct rtl8168_private *tp, u8 cmd)
 {
-        rtl8168_eri_write(tp, 0xE8, 1, cmd, ERIAR_ExGMAC);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        rtl8168_eri_write(ioaddr, 0xE8, 1, cmd, ERIAR_ExGMAC);
 
         rtl8168_ocp_write(tp, 0x30, 1, 0x01);
 }
@@ -3649,59 +2346,58 @@
 
 void rtl8168_dash2_disable_tx(struct rtl8168_private *tp)
 {
-        if (!tp->DASH)
-                return;
+        if (!tp->DASH) return;
 
         if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
                 u16 WaitCnt;
                 u8 TmpUchar;
 
                 //Disable oob Tx
-                RTL_CMAC_W8(tp, CMAC_IBCR2, RTL_CMAC_R8(tp, CMAC_IBCR2) & ~(BIT_0));
+                RTL_CMAC_W8(CMAC_IBCR2, RTL_CMAC_R8(CMAC_IBCR2) & ~( BIT_0 ));
                 WaitCnt = 0;
 
                 //wait oob tx disable
                 do {
-                        TmpUchar = RTL_CMAC_R8(tp, CMAC_IBISR0);
+                        TmpUchar = RTL_CMAC_R8(CMAC_IBISR0);
 
-                        if (TmpUchar & ISRIMR_DASH_TYPE2_TX_DISABLE_IDLE) {
+                        if ( TmpUchar & ISRIMR_DASH_TYPE2_TX_DISABLE_IDLE ) {
                                 break;
                         }
 
-                        udelay(50);
+                        udelay( 50 );
                         WaitCnt++;
                 } while(WaitCnt < 2000);
 
                 //Clear ISRIMR_DASH_TYPE2_TX_DISABLE_IDLE
-                RTL_CMAC_W8(tp, CMAC_IBISR0, RTL_CMAC_R8(tp, CMAC_IBISR0) | ISRIMR_DASH_TYPE2_TX_DISABLE_IDLE);
+                RTL_CMAC_W8(CMAC_IBISR0, RTL_CMAC_R8(CMAC_IBISR0) | ISRIMR_DASH_TYPE2_TX_DISABLE_IDLE);
         }
 }
 
 void rtl8168_dash2_enable_tx(struct rtl8168_private *tp)
 {
-        if (!tp->DASH)
-                return;
+        if (!tp->DASH) return;
 
-        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp))
-                RTL_CMAC_W8(tp, CMAC_IBCR2, RTL_CMAC_R8(tp, CMAC_IBCR2) | BIT_0);
+        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
+                RTL_CMAC_W8(CMAC_IBCR2, RTL_CMAC_R8(CMAC_IBCR2) | BIT_0);
+        }
 }
 
 void rtl8168_dash2_disable_rx(struct rtl8168_private *tp)
 {
-        if (!tp->DASH)
-                return;
+        if (!tp->DASH) return;
 
-        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp))
-                RTL_CMAC_W8(tp, CMAC_IBCR0, RTL_CMAC_R8(tp, CMAC_IBCR0) & ~(BIT_0));
+        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
+                RTL_CMAC_W8(CMAC_IBCR0, RTL_CMAC_R8(CMAC_IBCR0) & ~( BIT_0 ));
+        }
 }
 
 void rtl8168_dash2_enable_rx(struct rtl8168_private *tp)
 {
-        if (!tp->DASH)
-                return;
+        if (!tp->DASH) return;
 
-        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp))
-                RTL_CMAC_W8(tp, CMAC_IBCR0, RTL_CMAC_R8(tp, CMAC_IBCR0) | BIT_0);
+        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
+                RTL_CMAC_W8(CMAC_IBCR0, RTL_CMAC_R8(CMAC_IBCR0) | BIT_0);
+        }
 }
 
 static void rtl8168_dash2_disable_txrx(struct net_device *dev)
@@ -3709,104 +2405,172 @@
         struct rtl8168_private *tp = netdev_priv(dev);
 
         if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                rtl8168_dash2_disable_tx(tp);
-                rtl8168_dash2_disable_rx(tp);
+                rtl8168_dash2_disable_tx( tp );
+                rtl8168_dash2_disable_rx( tp );
+        }
+}
+
+static void rtl8168_driver_start(struct rtl8168_private *tp)
+{
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        if (!tp->DASH)
+                return;
+
+        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
+                int timeout;
+                u32 tmp_value;
+
+                rtl8168_ocp_write(tp, 0x180, 1, OOB_CMD_DRIVER_START);
+                tmp_value = rtl8168_ocp_read(tp, 0x30, 1);
+                tmp_value |= BIT_0;
+                rtl8168_ocp_write(tp, 0x30, 1, tmp_value);
+
+                for (timeout = 0; timeout < 10; timeout++) {
+                        mdelay(10);
+                        if (rtl8168_ocp_read(tp, 0x124, 1) & BIT_0)
+                                break;
+                }
+        } else {
+                int timeout;
+                u32 reg;
+
+                if (tp->mcfg == CFG_METHOD_13) {
+                        RTL_W8(TwiCmdReg, RTL_R8(TwiCmdReg) | ( BIT_7 ));
+                }
+
+                rtl8168_oob_notify(tp, OOB_CMD_DRIVER_START);
+
+                if (tp->mcfg == CFG_METHOD_13)
+                        reg = 0xB8;
+                else
+                        reg = 0x10;
+
+                for (timeout = 0; timeout < 10; timeout++) {
+                        mdelay(10);
+                        if (rtl8168_ocp_read(tp, reg, 2) & BIT_11)
+                                break;
+                }
         }
 }
 
-static u8 rtl8168_check_ephy_addr(struct rtl8168_private *tp, int addr)
+static void rtl8168_driver_stop(struct rtl8168_private *tp)
 {
-        if (tp->mcfg != CFG_METHOD_35 && tp->mcfg != CFG_METHOD_36)
-                goto exit;
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        if (!tp->DASH)
+                return;
+
+        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
+                struct net_device *dev = tp->dev;
+                int timeout;
+                u32 tmp_value;
+
+                rtl8168_dash2_disable_txrx(dev);
+
+                rtl8168_ocp_write(tp, 0x180, 1, OOB_CMD_DRIVER_STOP);
+                tmp_value = rtl8168_ocp_read(tp, 0x30, 1);
+                tmp_value |= BIT_0;
+                rtl8168_ocp_write(tp, 0x30, 1, tmp_value);
+
+                for (timeout = 0; timeout < 10; timeout++) {
+                        mdelay(10);
+                        if (!(rtl8168_ocp_read(tp, 0x124, 1) & BIT_0))
+                                break;
+                }
+        } else {
+                int timeout;
+                u32 reg;
 
-        if (addr & (BIT_6 | BIT_5))
-                rtl8168_clear_and_set_mcu_ocp_bit(tp, 0xDE28,
-                                                  (BIT_1 | BIT_0),
-                                                  (addr >> 5) & (BIT_1 | BIT_0));
+                rtl8168_oob_notify(tp, OOB_CMD_DRIVER_STOP);
 
-        addr &= 0x1F;
+                if (tp->mcfg == CFG_METHOD_13)
+                        reg = 0xB8;
+                else
+                        reg = 0x10;
+
+                for (timeout = 0; timeout < 10; timeout++) {
+                        mdelay(10);
+                        if ((rtl8168_ocp_read(tp, reg, 2) & BIT_11) == 0)
+                                break;
+                }
 
-exit:
-        return addr;
+                if (tp->mcfg == CFG_METHOD_13) {
+                        RTL_W8(TwiCmdReg, RTL_R8(TwiCmdReg) & ~( BIT_7 ));
+                }
+        }
 }
 
-static void _rtl8168_ephy_write(struct rtl8168_private *tp, int addr, int value)
+void rtl8168_ephy_write(void __iomem *ioaddr, int RegAddr, int value)
 {
         int i;
 
-        RTL_W32(tp, EPHYAR,
+        RTL_W32(EPHYAR,
                 EPHYAR_Write |
-                (addr & EPHYAR_Reg_Mask) << EPHYAR_Reg_shift |
+                (RegAddr & EPHYAR_Reg_Mask) << EPHYAR_Reg_shift |
                 (value & EPHYAR_Data_Mask));
 
-        for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                udelay(R8168_CHANNEL_WAIT_TIME);
+        for (i = 0; i < 10; i++) {
+                udelay(100);
 
                 /* Check if the RTL8168 has completed EPHY write */
-                if (!(RTL_R32(tp, EPHYAR) & EPHYAR_Flag))
+                if (!(RTL_R32(EPHYAR) & EPHYAR_Flag))
                         break;
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
-}
-
-void rtl8168_ephy_write(struct rtl8168_private *tp, int addr, int value)
-{
-        _rtl8168_ephy_write(tp, rtl8168_check_ephy_addr(tp, addr), value);
+        udelay(20);
 }
 
-static u16 _rtl8168_ephy_read(struct rtl8168_private *tp, int addr)
+u16 rtl8168_ephy_read(void __iomem *ioaddr, int RegAddr)
 {
         int i;
         u16 value = 0xffff;
 
-        RTL_W32(tp, EPHYAR,
-                EPHYAR_Read | (addr & EPHYAR_Reg_Mask) << EPHYAR_Reg_shift);
+        RTL_W32(EPHYAR,
+                EPHYAR_Read | (RegAddr & EPHYAR_Reg_Mask) << EPHYAR_Reg_shift);
 
-        for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                udelay(R8168_CHANNEL_WAIT_TIME);
+        for (i = 0; i < 10; i++) {
+                udelay(100);
 
                 /* Check if the RTL8168 has completed EPHY read */
-                if (RTL_R32(tp, EPHYAR) & EPHYAR_Flag) {
-                        value = (u16) (RTL_R32(tp, EPHYAR) & EPHYAR_Data_Mask);
+                if (RTL_R32(EPHYAR) & EPHYAR_Flag) {
+                        value = (u16) (RTL_R32(EPHYAR) & EPHYAR_Data_Mask);
                         break;
                 }
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 
         return value;
 }
 
-u16 rtl8168_ephy_read(struct rtl8168_private *tp, int addr)
-{
-        return _rtl8168_ephy_read(tp, rtl8168_check_ephy_addr(tp, addr));
-}
-
 static void ClearAndSetPCIePhyBit(struct rtl8168_private *tp, u8 addr, u16 clearmask, u16 setmask)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u16 EphyValue;
 
-        EphyValue = rtl8168_ephy_read(tp, addr);
+        EphyValue = rtl8168_ephy_read( ioaddr, addr );
         EphyValue &= ~clearmask;
         EphyValue |= setmask;
-        rtl8168_ephy_write(tp, addr, EphyValue);
+        rtl8168_ephy_write( ioaddr, addr, EphyValue);
 }
 
 static void ClearPCIePhyBit(struct rtl8168_private *tp, u8 addr, u16 mask)
 {
-        ClearAndSetPCIePhyBit(tp,
-                              addr,
-                              mask,
-                              0);
+        ClearAndSetPCIePhyBit( tp,
+                               addr,
+                               mask,
+                               0
+                             );
 }
 
-static void SetPCIePhyBit(struct rtl8168_private *tp, u8 addr, u16 mask)
-{
-        ClearAndSetPCIePhyBit(tp,
-                              addr,
-                              0,
-                              mask);
+static void SetPCIePhyBit( struct rtl8168_private *tp, u8 addr, u16 mask)
+{
+        ClearAndSetPCIePhyBit( tp,
+                               addr,
+                               0,
+                               mask
+                             );
 }
 
 static u32
@@ -3814,6 +2578,7 @@
                            u8 multi_fun_sel_bit,
                            u32 addr)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 cmd;
         int i;
         u32 value = 0;
@@ -3823,29 +2588,29 @@
         if (tp->mcfg != CFG_METHOD_20 && tp->mcfg != CFG_METHOD_23 &&
             tp->mcfg != CFG_METHOD_26 && tp->mcfg != CFG_METHOD_27 &&
             tp->mcfg != CFG_METHOD_28 && tp->mcfg != CFG_METHOD_31 &&
-            tp->mcfg != CFG_METHOD_32 && tp->mcfg != CFG_METHOD_33 &&
-            tp->mcfg != CFG_METHOD_34) {
+            tp->mcfg != CFG_METHOD_32) {
                 multi_fun_sel_bit = 0;
         }
 
-        if (multi_fun_sel_bit > 7)
+        if ( multi_fun_sel_bit > 7 ) {
                 return 0xffffffff;
+        }
 
         cmd |= multi_fun_sel_bit << 16;
 
-        RTL_W32(tp, CSIAR, cmd);
+        RTL_W32(CSIAR, cmd);
 
-        for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                udelay(R8168_CHANNEL_WAIT_TIME);
+        for (i = 0; i < 10; i++) {
+                udelay(100);
 
                 /* Check if the RTL8168 has completed CSI read */
-                if (RTL_R32(tp, CSIAR) & CSIAR_Flag) {
-                        value = (u32)RTL_R32(tp, CSIDR);
+                if (RTL_R32(CSIAR) & CSIAR_Flag) {
+                        value = (u32)RTL_R32(CSIDR);
                         break;
                 }
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 
         return value;
 }
@@ -3856,34 +2621,36 @@
                             u32 addr,
                             u32 value)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 cmd;
         int i;
 
-        RTL_W32(tp, CSIDR, value);
+        RTL_W32(CSIDR, value);
         cmd = CSIAR_Write | CSIAR_ByteEn << CSIAR_ByteEn_shift | (addr & CSIAR_Addr_Mask);
         if (tp->mcfg != CFG_METHOD_20 && tp->mcfg != CFG_METHOD_23 &&
             tp->mcfg != CFG_METHOD_26 && tp->mcfg != CFG_METHOD_27 &&
             tp->mcfg != CFG_METHOD_28 && tp->mcfg != CFG_METHOD_31 &&
-            tp->mcfg != CFG_METHOD_32 && tp->mcfg != CFG_METHOD_33 &&
-            tp->mcfg != CFG_METHOD_34)
+            tp->mcfg != CFG_METHOD_32) {
                 multi_fun_sel_bit = 0;
+        }
 
-        if (multi_fun_sel_bit > 7)
+        if ( multi_fun_sel_bit > 7 ) {
                 return;
+        }
 
         cmd |= multi_fun_sel_bit << 16;
 
-        RTL_W32(tp, CSIAR, cmd);
+        RTL_W32(CSIAR, cmd);
 
-        for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                udelay(R8168_CHANNEL_WAIT_TIME);
+        for (i = 0; i < 10; i++) {
+                udelay(100);
 
                 /* Check if the RTL8168 has completed CSI write */
-                if (!(RTL_R32(tp, CSIAR) & CSIAR_Flag))
+                if (!(RTL_R32(CSIAR) & CSIAR_Flag))
                         break;
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 }
 
 static u32
@@ -3895,8 +2662,7 @@
         if (tp->mcfg == CFG_METHOD_20)
                 multi_fun_sel_bit = 2;
         else if (tp->mcfg == CFG_METHOD_26 || tp->mcfg == CFG_METHOD_31 ||
-                 tp->mcfg == CFG_METHOD_32 || tp->mcfg == CFG_METHOD_33 ||
-                 tp->mcfg == CFG_METHOD_34)
+                 tp->mcfg == CFG_METHOD_32)
                 multi_fun_sel_bit = 1;
         else
                 multi_fun_sel_bit = 0;
@@ -3914,8 +2680,7 @@
         if (tp->mcfg == CFG_METHOD_20)
                 multi_fun_sel_bit = 2;
         else if (tp->mcfg == CFG_METHOD_26 || tp->mcfg == CFG_METHOD_31 ||
-                 tp->mcfg == CFG_METHOD_32 || tp->mcfg == CFG_METHOD_33 ||
-                 tp->mcfg == CFG_METHOD_34)
+                 tp->mcfg == CFG_METHOD_32)
                 multi_fun_sel_bit = 1;
         else
                 multi_fun_sel_bit = 0;
@@ -3930,15 +2695,14 @@
         u8 RetVal = 0;
 
         if (tp->mcfg == CFG_METHOD_20 || tp->mcfg == CFG_METHOD_26 ||
-            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34) {
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 u32 TmpUlong;
                 u16 RegAlignAddr;
                 u8 ShiftByte;
 
                 RegAlignAddr = addr & ~(0x3);
                 ShiftByte = addr & (0x3);
-                TmpUlong = rtl8168_csi_other_fun_read(tp, 0, RegAlignAddr);
+                TmpUlong = rtl8168_csi_other_fun_read(tp, 0, addr);
                 TmpUlong >>= (8*ShiftByte);
                 RetVal = (u8)TmpUlong;
         } else {
@@ -3947,7 +2711,7 @@
                 pci_read_config_byte(pdev, addr, &RetVal);
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 
         return RetVal;
 }
@@ -3958,8 +2722,7 @@
                             u8 value)
 {
         if (tp->mcfg == CFG_METHOD_20 || tp->mcfg == CFG_METHOD_26 ||
-            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34) {
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 u32 TmpUlong;
                 u16 RegAlignAddr;
                 u8 ShiftByte;
@@ -3969,14 +2732,14 @@
                 TmpUlong = rtl8168_csi_other_fun_read(tp, 0, RegAlignAddr);
                 TmpUlong &= ~(0xFF << (8*ShiftByte));
                 TmpUlong |= (value << (8*ShiftByte));
-                rtl8168_csi_other_fun_write(tp, 0, RegAlignAddr, TmpUlong);
+                rtl8168_csi_other_fun_write( tp, 0, RegAlignAddr, TmpUlong );
         } else {
                 struct pci_dev *pdev = tp->pci_dev;
 
                 pci_write_config_byte(pdev, addr, value);
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 }
 
 static void
@@ -4005,52 +2768,51 @@
         u8 i;
         u8 FunBit;
 
-        for (i = 0; i < 8; i++) {
-                FunBit = (1 << i);
-                if (FunBit & multi_fun_sel_bit) {
-                        u8 set_other_fun = TRUE;
+        switch(tp->mcfg) {
+        case CFG_METHOD_23:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+                FunBit = 1;
+                //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_set_other_fun_pci_bit(tp, i, addr, clearmask, setmask);
 
-                        switch(tp->mcfg) {
-                        case CFG_METHOD_23:
-                        case CFG_METHOD_27:
-                        case CFG_METHOD_28:
-                                //0: UMAC, 1: TCR1, 2: TCR2, 3: KCS, 4: EHCI(Control by EHCI Driver)
-                                if (i < 5) {
+                        FunBit <<= 1;
+                }
+                break;
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                FunBit = 1;
+                for (i = 0; i < 8; i++) {
+                        if (FunBit & multi_fun_sel_bit) {
+                                u8 set_other_fun = TRUE;
+
+                                if (i == 3 || i == 4) {
                                         TmpUlong = rtl8168_csi_other_fun_read(tp, i, 0x00);
+
                                         if (TmpUlong == 0xFFFFFFFF)
                                                 set_other_fun = TRUE;
                                         else
                                                 set_other_fun = FALSE;
-                                }
-                                break;
-                        case CFG_METHOD_31:
-                        case CFG_METHOD_32:
-                        case CFG_METHOD_33:
-                        case CFG_METHOD_34:
-                                //0: BMC, 1: NIC, 2: TCR, 3: VGA/PCIE_TO_USB, 4: EHCI, 5: WIFI, 6: WIFI, 7: KCS
-                                if (i == 5 || i == 6) {
+                                } else if (i == 5 || i == 6) {
                                         if (tp->DASH) {
                                                 TmpUlong = rtl8168_ocp_read(tp, 0x184, 4);
+
                                                 if (TmpUlong & BIT_26)
                                                         set_other_fun = FALSE;
                                                 else
                                                         set_other_fun = TRUE;
                                         }
-                                } else { //function 0/1/2/3/4/7
-                                        TmpUlong = rtl8168_csi_other_fun_read(tp, i, 0x00);
-                                        if (TmpUlong == 0xFFFFFFFF)
-                                                set_other_fun = TRUE;
-                                        else
-                                                set_other_fun = FALSE;
                                 }
-                                break;
-                        default:
-                                return;
+
+                                if (set_other_fun)
+                                        rtl8168_clear_and_set_other_fun_pci_bit(tp, i, addr, clearmask, setmask);
                         }
 
-                        if (set_other_fun)
-                                rtl8168_clear_and_set_other_fun_pci_bit(tp, i, addr, clearmask, setmask);
+                        FunBit <<= 1;
                 }
+                break;
         }
 }
 
@@ -4099,7 +2861,6 @@
         rtl8168_other_fun_dev_pci_setting(tp, 0x80, clearmask, setmask, multi_fun_sel_bit);
 }
 
-/*
 static void
 rtl8168_set_dash_other_fun_dev_pci_cmd_register(struct rtl8168_private *tp,
                 u8 pci_cmd_reg,
@@ -4115,9 +2876,8 @@
 
         rtl8168_other_fun_dev_pci_setting(tp, 0x04, clearmask, setmask, multi_fun_sel_bit);
 }
-*/
 
-u32 rtl8168_eri_read_with_oob_base_address(struct rtl8168_private *tp, int addr, int len, int type, const u32 base_address)
+u32 rtl8168_eri_read_with_oob_base_address(void __iomem *ioaddr, int addr, int len, int type, const u32 base_address)
 {
         int i, val_shift, shift = 0;
         u32 value1 = 0, value2 = 0, mask;
@@ -4144,13 +2904,13 @@
                         eri_cmd |= (tmp << 20) & 0x00F00000;
                 }
 
-                RTL_W32(tp, ERIAR, eri_cmd);
+                RTL_W32(ERIAR, eri_cmd);
 
-                for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                        udelay(R8168_CHANNEL_WAIT_TIME);
+                for (i = 0; i < 10; i++) {
+                        udelay(100);
 
                         /* Check if the RTL8168 has completed ERI read */
-                        if (RTL_R32(tp, ERIAR) & ERIAR_Flag)
+                        if (RTL_R32(ERIAR) & ERIAR_Flag)
                                 break;
                 }
 
@@ -4159,7 +2919,7 @@
                 else if (len == 3)  mask = (0xFFFFFF << (val_shift * 8)) & 0xFFFFFFFF;
                 else            mask = (0xFFFFFFFF << (val_shift * 8)) & 0xFFFFFFFF;
 
-                value1 = RTL_R32(tp, ERIDR) & mask;
+                value1 = RTL_R32(ERIDR) & mask;
                 value2 |= (value1 >> val_shift * 8) << shift * 8;
 
                 if (len <= 4 - val_shift) {
@@ -4171,17 +2931,17 @@
                 }
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 
         return value2;
 }
 
-u32 rtl8168_eri_read(struct rtl8168_private *tp, int addr, int len, int type)
+u32 rtl8168_eri_read(void __iomem *ioaddr, int addr, int len, int type)
 {
-        return rtl8168_eri_read_with_oob_base_address(tp, addr, len, type, 0);
+        return rtl8168_eri_read_with_oob_base_address(ioaddr, addr, len, type, 0);
 }
 
-int rtl8168_eri_write_with_oob_base_address(struct rtl8168_private *tp, int addr, int len, u32 value, int type, const u32 base_address)
+int rtl8168_eri_write_with_oob_base_address(void __iomem *ioaddr, int addr, int len, u32 value, int type, const u32 base_address)
 {
         int i, val_shift, shift = 0;
         u32 value1 = 0, mask;
@@ -4200,10 +2960,10 @@
                 else if (len == 3)  mask = (0xFFFFFF << (val_shift * 8)) & 0xFFFFFFFF;
                 else            mask = (0xFFFFFFFF << (val_shift * 8)) & 0xFFFFFFFF;
 
-                value1 = rtl8168_eri_read_with_oob_base_address(tp, addr, 4, type, base_address) & ~mask;
+                value1 = rtl8168_eri_read_with_oob_base_address(ioaddr, addr, 4, type, base_address) & ~mask;
                 value1 |= ((value << val_shift * 8) >> shift * 8);
 
-                RTL_W32(tp, ERIDR, value1);
+                RTL_W32(ERIDR, value1);
 
                 eri_cmd = ERIAR_Write |
                           transformed_base_address |
@@ -4218,13 +2978,13 @@
                         eri_cmd |= (tmp << 20) & 0x00F00000;
                 }
 
-                RTL_W32(tp, ERIAR, eri_cmd);
+                RTL_W32(ERIAR, eri_cmd);
 
-                for (i = 0; i < R8168_CHANNEL_WAIT_COUNT; i++) {
-                        udelay(R8168_CHANNEL_WAIT_TIME);
+                for (i = 0; i < 10; i++) {
+                        udelay(100);
 
                         /* Check if the RTL8168 has completed ERI write */
-                        if (!(RTL_R32(tp, ERIAR) & ERIAR_Flag))
+                        if (!(RTL_R32(ERIAR) & ERIAR_Flag))
                                 break;
                 }
 
@@ -4237,20 +2997,21 @@
                 }
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 
         return 0;
 }
 
-int rtl8168_eri_write(struct rtl8168_private *tp, int addr, int len, u32 value, int type)
+int rtl8168_eri_write(void __iomem *ioaddr, int addr, int len, u32 value, int type)
 {
-        return rtl8168_eri_write_with_oob_base_address(tp, addr, len, value, type, NO_BASE_ADDRESS);
+        return rtl8168_eri_write_with_oob_base_address(ioaddr, addr, len, value, type, NO_BASE_ADDRESS);
 }
 
 static void
 rtl8168_enable_rxdvgate(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
 
         switch (tp->mcfg) {
         case CFG_METHOD_21:
@@ -4265,12 +3026,7 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_3);
+                RTL_W8(0xF2, RTL_R8(0xF2) | BIT_3);
                 mdelay(2);
                 break;
         }
@@ -4280,6 +3036,7 @@
 rtl8168_disable_rxdvgate(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
 
         switch (tp->mcfg) {
         case CFG_METHOD_21:
@@ -4294,12 +3051,7 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) & ~BIT_3);
+                RTL_W8(0xF2, RTL_R8(0xF2) & ~BIT_3);
                 mdelay(2);
                 break;
         }
@@ -4333,6 +3085,7 @@
 rtl8168_is_phy_disable_mode_enabled(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u8 phy_disable_mode_enabled = FALSE;
 
         switch (tp->HwSuppCheckPhyDisableModeVer) {
@@ -4342,7 +3095,7 @@
                 break;
         case 2:
         case 3:
-                if (RTL_R8(tp, 0xF2) & BIT_5)
+                if (RTL_R8(0xF2) & BIT_5)
                         phy_disable_mode_enabled = TRUE;
                 break;
         }
@@ -4367,10 +3120,51 @@
         return in_phy_disable_mode;
 }
 
+static void
+rtl8168_enable_phy_disable_mode(struct net_device *dev)
+{
+        struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        switch (tp->HwSuppCheckPhyDisableModeVer) {
+        case 1:
+                rtl8168_mac_ocp_write(tp, 0xDC20, rtl8168_mac_ocp_read(tp, 0xDC20) | BIT_1);
+                break;
+        case 2:
+        case 3:
+                RTL_W8(0xF2, RTL_R8(0xF2) | BIT_5);
+                break;
+        }
+
+        dprintk("enable phy disable mode.\n");
+}
+
+static void
+rtl8168_disable_phy_disable_mode(struct net_device *dev)
+{
+        struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        switch (tp->HwSuppCheckPhyDisableModeVer) {
+        case 1:
+                rtl8168_mac_ocp_write(tp, 0xDC20, rtl8168_mac_ocp_read(tp, 0xDC20) & ~BIT_1);
+                break;
+        case 2:
+        case 3:
+                RTL_W8(0xF2, RTL_R8(0xF2) & ~BIT_5);
+                break;
+        }
+
+        mdelay(1);
+
+        dprintk("disable phy disable mode.\n");
+}
+
 void
 rtl8168_wait_txrx_fifo_empty(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         int i;
 
         switch (tp->mcfg) {
@@ -4386,326 +3180,128 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 for (i = 0; i < 10; i++) {
                         udelay(100);
-                        if (RTL_R32(tp, TxConfig) & BIT_11)
+                        if (RTL_R32(TxConfig) & BIT_11)
                                 break;
                 }
 
                 for (i = 0; i < 10; i++) {
                         udelay(100);
-                        if ((RTL_R8(tp, MCUCmd_reg) & (Txfifo_empty | Rxfifo_empty)) == (Txfifo_empty | Rxfifo_empty))
+                        if ((RTL_R8(MCUCmd_reg) & (Txfifo_empty | Rxfifo_empty)) == (Txfifo_empty | Rxfifo_empty))
                                 break;
-                }
-
-                mdelay(1);
-                break;
-        }
-}
-
-static int rtl8168_wait_dash_fw_ready(struct rtl8168_private *tp)
-{
-        int rc = -1;
-
-        if (!HW_DASH_SUPPORT_DASH(tp))
-                goto out;
-
-        if (!tp->DASH)
-                goto out;
-
-        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                int timeout;
 
-                for (timeout = 0; timeout < 10; timeout++) {
-                        mdelay(10);
-                        if (rtl8168_ocp_read(tp, 0x124, 1) & BIT_0) {
-                                rc = 1;
-                                goto out;
-                        }
                 }
-        } else {
-                u32 reg;
-                int timeout;
-
-                if (tp->mcfg == CFG_METHOD_13)
-                        reg = 0xB8;
-                else
-                        reg = 0x10;
-
-                for (timeout = 0; timeout < 10; timeout++) {
-                        mdelay(10);
-                        if (rtl8168_ocp_read(tp, reg, 2) & BIT_11) {
-                                rc = 1;
-                                goto out;
-                        }
-                }
-        }
-
-        rc = 0;
-
-out:
-        return rc;
-}
-
-static void rtl8168_driver_start(struct rtl8168_private *tp)
-{
-        //change other device state to D0.
-        switch (tp->mcfg) {
-        case CFG_METHOD_23:
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-                rtl8168_set_dash_other_fun_dev_aspm_clkreq(tp, 3, 1, 0x1E);
-                rtl8168_set_dash_other_fun_dev_state_change(tp, 3, 0x1E);
-                break;
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-                rtl8168_set_dash_other_fun_dev_aspm_clkreq(tp, 3, 1, 0xFC);
-                rtl8168_set_dash_other_fun_dev_state_change(tp, 3, 0xFC);
                 break;
         }
-
-        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                u32 tmp_value;
-
-                rtl8168_ocp_write(tp, 0x180, 1, OOB_CMD_DRIVER_START);
-                tmp_value = rtl8168_ocp_read(tp, 0x30, 1);
-                tmp_value |= BIT_0;
-                rtl8168_ocp_write(tp, 0x30, 1, tmp_value);
-
-                rtl8168_wait_dash_fw_ready(tp);
-        } else {
-
-                if (tp->mcfg == CFG_METHOD_13)
-                        RTL_W8(tp, TwiCmdReg, RTL_R8(tp, TwiCmdReg) | (BIT_7));
-
-                rtl8168_oob_notify(tp, OOB_CMD_DRIVER_START);
-
-                rtl8168_wait_dash_fw_ready(tp);
-        }
 }
 
-static void rtl8168_driver_stop(struct rtl8168_private *tp)
-{
-        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                struct net_device *dev = tp->dev;
-                u32 tmp_value;
-
-                rtl8168_dash2_disable_txrx(dev);
-
-                rtl8168_ocp_write(tp, 0x180, 1, OOB_CMD_DRIVER_STOP);
-                tmp_value = rtl8168_ocp_read(tp, 0x30, 1);
-                tmp_value |= BIT_0;
-                rtl8168_ocp_write(tp, 0x30, 1, tmp_value);
-
-                rtl8168_wait_dash_fw_ready(tp);
-        } else {
-                rtl8168_oob_notify(tp, OOB_CMD_DRIVER_STOP);
-
-                rtl8168_wait_dash_fw_ready(tp);
-
-                if (tp->mcfg == CFG_METHOD_13)
-                        RTL_W8(tp, TwiCmdReg, RTL_R8(tp, TwiCmdReg) & ~(BIT_7));
-        }
-
-        //change other device state to D3.
-        switch (tp->mcfg) {
-        case CFG_METHOD_23:
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-                rtl8168_set_dash_other_fun_dev_state_change(tp, 3, 0x0E);
-                break;
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-                rtl8168_set_dash_other_fun_dev_state_change(tp, 3, 0xFD);
-                break;
-        }
-}
-
-
-static inline u16 rtl8168_get_isr_by_vector(struct rtl8168_private *tp,
-                u32 message_id)
-{
-        if (message_id >= R8168_MAX_MSIX_VEC)
-                return 0;
-
-        if (message_id == 0)
-                return RTL_R16(tp, tp->isr_reg0);
-        else
-                return RTL_R8(tp, tp->isr_regmessage_id);
-}
-
-static inline void rtl8168_clear_isr_by_vector(struct rtl8168_private *tp,
-                u32 message_id, u16 val)
-{
-        if (message_id >= R8168_MAX_MSIX_VEC)
-                return;
-
-        if (message_id == 0) {
-                RTL_W16(tp, tp->isr_reg0, val);
-
-                if (val & RxDescUnavail)
-                        tp->rx_ringmessage_id.rdu++;
-                if (val & TxDescUnavail)
-                        tp->tx_ringmessage_id.tdu++;
-        } else {
-                RTL_W8(tp, tp->isr_regmessage_id, val);
-
-                if (val & RxDU1)
-                        tp->rx_ringmessage_id.rdu++;
-        }
-}
+#ifdef ENABLE_DASH_SUPPORT
 
-static inline void rtl8168_self_clear_isr_by_vector(struct rtl8168_private *tp,
-                u32 message_id)
+inline void
+rtl8168_enable_dash2_interrupt(struct rtl8168_private *tp, void __iomem *ioaddr)
 {
-        u16 val;
-
-        if (message_id >= R8168_MAX_MSIX_VEC)
-                return;
-
-        val = rtl8168_get_isr_by_vector(tp, message_id);
-        if ((message_id == 0) && (val & RxFIFOOver))
-                tp->rx_fifo_of++;
+        if (!tp->DASH) return;
 
-        switch (tp->mcfg) {
-        case CFG_METHOD_9 ... CFG_METHOD_37:
-                /* RX_OVERFLOW RE-START mechanism now HW handles it automatically*/
-                if (message_id == 0)
-                        val &= ~RxFIFOOver;
-                break;
-        default:
-                break;
+        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
+                RTL_CMAC_W8(CMAC_IBIMR0, ( ISRIMR_DASH_TYPE2_ROK | ISRIMR_DASH_TYPE2_TOK | ISRIMR_DASH_TYPE2_TDU | ISRIMR_DASH_TYPE2_RDU | ISRIMR_DASH_TYPE2_RX_DISABLE_IDLE ));
         }
-        rtl8168_clear_isr_by_vector(tp, message_id, val);
-}
-
-static inline void
-rtl8168_enable_interrupt(struct rtl8168_private *tp)
-{
-        int i;
-        for (i=0; i<tp->num_rx_rings; i++)
-                rtl8168_enable_interrupt_by_vector(tp, i);
 }
 
 static inline void
-rtl8168_enable_lib_interrupt(struct rtl8168_private *tp)
+rtl8168_disable_dash2_interrupt(struct rtl8168_private *tp, void __iomem *ioaddr)
 {
-        int i;
+        if (!tp->DASH) return;
 
-        for (i=0; i<rtl8168_tot_rx_rings(tp); i++)
-                rtl8168_enable_interrupt_by_vector(tp, i);
+        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
+                RTL_CMAC_W8(CMAC_IBIMR0, 0);
+        }
 }
+#endif
 
 static inline void
-rtl8168_disable_interrupt(struct rtl8168_private *tp)
+rtl8168_enable_hw_interrupt(struct rtl8168_private *tp, void __iomem *ioaddr)
 {
-        int i;
+        RTL_W16(IntrMask, tp->intr_mask);
 
-        for (i=0; i<tp->num_rx_rings; i++)
-                rtl8168_disable_interrupt_by_vector(tp, i);
+#ifdef ENABLE_DASH_SUPPORT
+        if (tp->DASH)
+                rtl8168_enable_dash2_interrupt(tp, ioaddr);
+#endif
 }
 
 static inline void
-rtl8168_disable_lib_interrupt(struct rtl8168_private *tp)
+rtl8168_disable_hw_interrupt(struct rtl8168_private *tp, void __iomem *ioaddr)
 {
-        int i;
+        RTL_W16(IntrMask, 0x0000);
 
-        for (i=0; i<rtl8168_tot_rx_rings(tp); i++)
-                rtl8168_disable_interrupt_by_vector(tp, i);
+#ifdef ENABLE_DASH_SUPPORT
+        if (tp->DASH)
+                rtl8168_disable_dash2_interrupt(tp, ioaddr);
+#endif
 }
 
-static inline void
-rtl8168_disable_all_interrupt(struct rtl8168_private *tp)
-{
-        int i;
-
-        for (i=0; i<tp->hw_supp_irq_nvecs; i++)
-                rtl8168_disable_interrupt_by_vector(tp, i);
-}
 
 static inline void
-rtl8168_switch_to_hw_interrupt(struct rtl8168_private *tp)
+rtl8168_switch_to_hw_interrupt(struct rtl8168_private *tp, void __iomem *ioaddr)
 {
-        RTL_W32(tp, TimeInt0, 0x0000);
-
-        rtl8168_enable_interrupt(tp);
+        RTL_W32(TimeInt0, 0x0000);
 
-        rtl8168_enable_lib_interrupt(tp);
+        rtl8168_enable_hw_interrupt(tp, ioaddr);
 }
 
 static inline void
-rtl8168_switch_to_timer_interrupt(struct rtl8168_private *tp)
+rtl8168_switch_to_timer_interrupt(struct rtl8168_private *tp, void __iomem *ioaddr)
 {
         if (tp->use_timer_interrrupt) {
-                RTL_W32(tp, TimeInt0, timer_count);
-                RTL_W32(tp, TCTR, timer_count);
-                RTL_W16(tp, tp->imr_reg0, tp->timer_intr_mask);
+                RTL_W32(TimeInt0, timer_count);
+                RTL_W32(TCTR, timer_count);
+                RTL_W16(IntrMask, tp->timer_intr_mask);
 
 #ifdef ENABLE_DASH_SUPPORT
                 if (tp->DASH)
-                        rtl8168_enable_dash2_interrupt(tp);
+                        rtl8168_enable_dash2_interrupt(tp, ioaddr);
 #endif
         } else {
-                rtl8168_switch_to_hw_interrupt(tp);
+                rtl8168_switch_to_hw_interrupt(tp, ioaddr);
         }
 }
 
 static void
-rtl8168_irq_mask_and_ack(struct rtl8168_private *tp)
+rtl8168_irq_mask_and_ack(struct rtl8168_private *tp, void __iomem *ioaddr)
 {
-        rtl8168_disable_all_interrupt(tp);
+        rtl8168_disable_hw_interrupt(tp, ioaddr);
 #ifdef ENABLE_DASH_SUPPORT
         if (tp->DASH) {
                 if (tp->dash_printer_enabled) {
-                        rtl8168_clear_isr_by_vector(tp, 0,
-                                                    rtl8168_get_isr_by_vector(tp, 0) &
-                                                    ~(ISRIMR_DASH_INTR_EN | ISRIMR_DASH_INTR_CMAC_RESET));
+                        RTL_W16(IntrStatus, RTL_R16(IntrStatus) &
+                                ~(ISRIMR_DASH_INTR_EN | ISRIMR_DASH_INTR_CMAC_RESET));
                 } else {
                         if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                                RTL_CMAC_W8(tp, CMAC_IBISR0, RTL_CMAC_R8(tp, CMAC_IBISR0));
+                                RTL_CMAC_W8(CMAC_IBISR0, RTL_CMAC_R8(CMAC_IBISR0));
                         }
                 }
         } else {
-                rtl8168_self_clear_isr_by_vector(tp, 0);
+                RTL_W16(IntrStatus, RTL_R16(IntrStatus));
         }
 #else
-        rtl8168_self_clear_isr_by_vector(tp, 0);
+        RTL_W16(IntrStatus, RTL_R16(IntrStatus));
 #endif
-        if (tp->hw_supp_irq_nvecs > 1) {
-                int i;
-                for (i=1; i<tp->hw_supp_irq_nvecs; i++)
-                        rtl8168_self_clear_isr_by_vector(tp, i);
-        }
-}
-
-static void
-rtl8168_disable_rx_packet_filter(struct rtl8168_private *tp)
-{
-
-        RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) &
-                ~(AcceptErr | AcceptRunt |AcceptBroadcast | AcceptMulticast |
-                  AcceptMyPhys |  AcceptAllPhys));
 }
 
 static void
 rtl8168_nic_reset(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         int i;
 
-        rtl8168_disable_rx_packet_filter(tp);
+        RTL_W32(RxConfig, (RX_DMA_BURST << RxCfgDMAShift));
 
         rtl8168_enable_rxdvgate(dev);
 
+        rtl8168_wait_txrx_fifo_empty(dev);
+
         switch (tp->mcfg) {
         case CFG_METHOD_1:
         case CFG_METHOD_2:
@@ -4721,15 +3317,14 @@
         case CFG_METHOD_10:
         case CFG_METHOD_14:
         case CFG_METHOD_15:
-                RTL_W8(tp, ChipCmd, StopReq | CmdRxEnb | CmdTxEnb);
+                RTL_W8(ChipCmd, StopReq | CmdRxEnb | CmdTxEnb);
                 udelay(100);
                 break;
         case CFG_METHOD_11:
         case CFG_METHOD_12:
         case CFG_METHOD_13:
                 for (i = 0; i < 2000; i++) {
-                        if (!(RTL_R8(tp, TxPoll) & NPQ))
-                                break;
+                        if (!(RTL_R8(TxPoll) & NPQ)) break;
                         udelay(100);
                 }
                 break;
@@ -4745,11 +3340,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 mdelay(2);
                 break;
         default:
@@ -4757,15 +3347,13 @@
                 break;
         }
 
-        rtl8168_wait_txrx_fifo_empty(dev);
-
         /* Soft reset the chip. */
-        RTL_W8(tp, ChipCmd, CmdReset);
+        RTL_W8(ChipCmd, CmdReset);
 
         /* Check that the chip has finished the reset. */
         for (i = 100; i > 0; i--) {
                 udelay(100);
-                if ((RTL_R8(tp, ChipCmd) & CmdReset) == 0)
+                if ((RTL_R8(ChipCmd) & CmdReset) == 0)
                         break;
         }
 
@@ -4784,22 +3372,20 @@
                 }
 
                 for (i = 0; i < 5; i++) {
-                        if (rtl8168_ocp_read(tp, 0x034, 1) == 0)
+                        if ( rtl8168_ocp_read(tp, 0x034, 1) == 0)
                                 break;
                 }
                 break;
         }
-
-        /* reset rcr */
-        RTL_W32(tp, RxConfig, (RX_DMA_BURST << RxCfgDMAShift));
 }
 
 static void
 rtl8168_hw_clear_timer_int(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        RTL_W32(tp, TimeInt0, 0x0000);
+        RTL_W32(TimeInt0, 0x0000);
 
         switch (tp->mcfg) {
         case CFG_METHOD_4:
@@ -4807,7 +3393,7 @@
         case CFG_METHOD_6:
         case CFG_METHOD_7:
         case CFG_METHOD_8:
-                RTL_W32(tp, TimeInt1, 0x0000);
+                RTL_W32(TimeInt1, 0x0000);
                 break;
         case CFG_METHOD_9:
         case CFG_METHOD_10:
@@ -4833,48 +3419,30 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                RTL_W32(tp, TimeInt1, 0x0000);
-                RTL_W32(tp, TimeInt2, 0x0000);
-                RTL_W32(tp, TimeInt3, 0x0000);
+                RTL_W32(TimeInt1, 0x0000);
+                RTL_W32(TimeInt2, 0x0000);
+                RTL_W32(TimeInt3, 0x0000);
                 break;
         }
 }
 
-void
+static void
 rtl8168_hw_reset(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-
-        rtl8168_lib_reset_prepare(tp);
+        void __iomem *ioaddr = tp->mmio_addr;
 
         /* Disable interrupts */
-        rtl8168_irq_mask_and_ack(tp);
+        rtl8168_irq_mask_and_ack(tp, ioaddr);
 
         rtl8168_hw_clear_timer_int(dev);
 
         rtl8168_nic_reset(dev);
 }
 
-static void rtl8168_doorbell(struct rtl8168_tx_ring *ring)
-{
-        struct rtl8168_private *tp = ring->priv;
-
-        if (ring->index > 0)
-                RTL_W8(tp, TxPoll, HPQ);
-        else
-                RTL_W8(tp, TxPoll, NPQ);
-}
-
 static void rtl8168_mac_loopback_test(struct rtl8168_private *tp)
 {
-        struct rtl8168_tx_ring *tx_ring = &tp->tx_ring0;
-        struct rtl8168_rx_ring *rx_ring = &tp->rx_ring0;
-        struct pci_dev *pdev = tp->pci_dev;
+        void __iomem *ioaddr = tp->mmio_addr;
         struct net_device *dev = tp->dev;
         struct sk_buff *skb, *rx_skb;
         dma_addr_t mapping;
@@ -4892,15 +3460,15 @@
         pattern = 0x5A;
         len = 60;
         type = htons(ETH_P_IP);
-        txd = tx_ring->TxDescArray;
-        rxd = rtl8168_get_rxdesc(tp, tp->RxDescArray, 0, rx_ring->index);
-        rx_skb = rx_ring->Rx_skbuff0;
-        RTL_W32(tp, TxConfig, (RTL_R32(tp, TxConfig) & ~0x00060000) | 0x00020000);
+        txd = tp->TxDescArray;
+        rxd = tp->RxDescArray;
+        rx_skb = tp->Rx_skbuff0;
+        RTL_W32(TxConfig, (RTL_R32(TxConfig) & ~0x00060000) | 0x00020000);
 
         do {
                 skb = dev_alloc_skb(len + RTK_RX_ALIGN);
                 if (unlikely(!skb))
-                        dev_printk(KERN_NOTICE, tp_to_dev(tp), "-ENOMEM;\n");
+                        dev_printk(KERN_NOTICE, &tp->pci_dev->dev, "-ENOMEM;\n");
         } while (unlikely(skb == NULL));
         skb_reserve(skb, RTK_RX_ALIGN);
 
@@ -4909,22 +3477,22 @@
         memcpy(skb_put(skb, sizeof(type)), &type, sizeof(type));
         tmpAddr = skb_put(skb, len - 14);
 
-        mapping = dma_map_single(tp_to_dev(tp), skb->data, len, DMA_TO_DEVICE);
-        dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(mapping),
-                                len, DMA_TO_DEVICE);
+        mapping = pci_map_single(tp->pci_dev, skb->data, len, PCI_DMA_TODEVICE);
+        pci_dma_sync_single_for_cpu(tp->pci_dev, le64_to_cpu(mapping),
+                                    len, PCI_DMA_TODEVICE);
         txd->addr = cpu_to_le64(mapping);
         txd->opts2 = 0;
         while (1) {
                 memset(tmpAddr, pattern++, len - 14);
-                dma_sync_single_for_device(&tp->pci_dev->dev,
-                                           le64_to_cpu(mapping),
-                                           len, DMA_TO_DEVICE);
+                pci_dma_sync_single_for_device(tp->pci_dev,
+                                               le64_to_cpu(mapping),
+                                               len, PCI_DMA_TODEVICE);
                 txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len);
 
-                RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig)  | AcceptMyPhys);
+                RTL_W32(RxConfig, RTL_R32(RxConfig)  | AcceptMyPhys);
 
                 smp_wmb();
-                rtl8168_doorbell(tx_ring);    /* set polling bit */
+                RTL_W8(TxPoll, NPQ);    /* set polling bit */
 
                 for (i = 0; i < 50; i++) {
                         udelay(200);
@@ -4933,37 +3501,37 @@
                                 break;
                 }
 
-                rtl8168_disable_rx_packet_filter(tp);
+                RTL_W32(RxConfig, RTL_R32(RxConfig) & ~(AcceptErr | AcceptRunt | AcceptBroadcast | AcceptMulticast | AcceptMyPhys |  AcceptAllPhys));
 
                 rx_len = rx_cmd & 0x3FFF;
                 rx_len -= 4;
                 rxd->opts1 = cpu_to_le32(DescOwn | tp->rx_buf_sz);
 
-                dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(mapping), len, DMA_TO_DEVICE);
+                pci_dma_sync_single_for_cpu(tp->pci_dev, le64_to_cpu(mapping), len, PCI_DMA_TODEVICE);
 
                 if (rx_len == len) {
-                        dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+                        pci_dma_sync_single_for_cpu(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, PCI_DMA_FROMDEVICE);
                         i = memcmp(skb->data, rx_skb->data, rx_len);
-                        dma_sync_single_for_device(&tp->pci_dev->dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+                        pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, PCI_DMA_FROMDEVICE);
                         if (i == 0) {
-//              dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len);
+//              dev_printk(KERN_INFO, &tp->pci_dev->dev, "loopback test finished\n",rx_len,len);
                                 break;
                         }
                 }
 
                 rtl8168_hw_reset(dev);
                 rtl8168_disable_rxdvgate(dev);
-                RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
+                RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
         }
-        tx_ring->dirty_tx++;
-        rx_ring->dirty_rx++;
-        tx_ring->cur_tx++;
-        rx_ring->cur_rx++;
-        dma_unmap_single(&pdev->dev, le64_to_cpu(mapping),
-                         len, DMA_TO_DEVICE);
-        RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) & ~0x00060000);
+        tp->dirty_tx++;
+        tp->dirty_rx++;
+        tp->cur_tx++;
+        tp->cur_rx++;
+        pci_unmap_single(tp->pci_dev, le64_to_cpu(mapping),
+                         len, PCI_DMA_TODEVICE);
+        RTL_W32(TxConfig, RTL_R32(TxConfig) & ~0x00060000);
         dev_kfree_skb_any(skb);
-        rtl8168_clear_isr_by_vector(tp, 0, 0xFFBF);
+        RTL_W16(IntrStatus, 0xFFBF);
 }
 
 static unsigned int
@@ -4982,35 +3550,19 @@
 rtl8168_xmii_link_ok(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        u8 status;
-
-        status = RTL_R8(tp, PHYstatus);
-        if (status == 0xff)
-                return 0;
-
-        return (status & LinkStatus) ? 1 : 0;
-}
-
-static int
-rtl8168_wait_phy_reset_complete(struct rtl8168_private *tp)
-{
-        int i, val;
-
-        for (i = 0; i < 2500; i++) {
-                val = rtl8168_mdio_read(tp, MII_BMCR) & BMCR_RESET;
-                if (!val)
-                        return 0;
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned int retval;
 
-                mdelay(1);
-        }
+        retval = (RTL_R8(PHYstatus) & LinkStatus) ? 1 : 0;
 
-        return -1;
+        return retval;
 }
 
 static void
 rtl8168_xmii_reset_enable(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        int i, val = 0;
 
         if (rtl8168_is_in_phy_disable_mode(dev))
                 return;
@@ -5023,8 +3575,15 @@
                            ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL));
         rtl8168_mdio_write(tp, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
 
-        if (rtl8168_wait_phy_reset_complete(tp) == 0)
-                return;
+        for (i = 0; i < 2500; i++) {
+                val = rtl8168_mdio_read(tp, MII_BMCR) & BMCR_RESET;
+
+                if (!val) {
+                        return;
+                }
+
+                mdelay(1);
+        }
 
         if (netif_msg_link(tp))
                 printk(KERN_ERR "%s: PHY reset failed.\n", dev->name);
@@ -5034,7 +3593,8 @@
 rtl8168dp_10mbps_gphy_para(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        u8 status = RTL_R8(tp, PHYstatus);
+        void __iomem *ioaddr = tp->mmio_addr;
+        u8 status = RTL_R8(PHYstatus);
 
         if ((status & LinkStatus) && (status & _10bps)) {
                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
@@ -5047,47 +3607,16 @@
 
 void rtl8168_init_ring_indexes(struct rtl8168_private *tp)
 {
-        int i;
-
-        for (i = 0; i < tp->HwSuppNumTxQueues; i++) {
-                struct rtl8168_tx_ring *ring = &tp->tx_ringi;
-                ring->dirty_tx = ring->cur_tx = 0;
-                ring->index = i;
-                ring->priv = tp;
-                ring->netdev = tp->dev;
-
-                /* reset BQL for queue */
-                netdev_tx_reset_queue(txring_txq(ring));
-        }
-
-        for (i = 0; i < tp->HwSuppNumRxQueues; i++) {
-                struct rtl8168_rx_ring *ring = &tp->rx_ringi;
-                ring->dirty_rx = ring->cur_rx = 0;
-                ring->index = i;
-                ring->priv = tp;
-                ring->netdev = tp->dev;
-        }
-
-#ifdef ENABLE_LIB_SUPPORT
-        for (i = 0; i < tp->HwSuppNumTxQueues; i++) {
-                struct rtl8168_ring *ring = &tp->lib_tx_ringi;
-                ring->direction = RTL8168_CH_DIR_TX;
-                ring->queue_num = i;
-                ring->private = tp;
-        }
-
-        for (i = 0; i < tp->HwSuppNumRxQueues; i++) {
-                struct rtl8168_ring *ring = &tp->lib_rx_ringi;
-                ring->direction = RTL8168_CH_DIR_RX;
-                ring->queue_num = i;
-                ring->private = tp;
-        }
-#endif
+        tp->dirty_tx = 0;
+        tp->dirty_rx = 0;
+        tp->cur_tx = 0;
+        tp->cur_rx = 0;
 }
 
 static void
 rtl8168_issue_offset_99_event(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
         switch (tp->mcfg) {
@@ -5100,305 +3629,191 @@
         case CFG_METHOD_28:
                 if (tp->mcfg == CFG_METHOD_24 || tp->mcfg == CFG_METHOD_25 ||
                     tp->mcfg == CFG_METHOD_27 || tp->mcfg == CFG_METHOD_28) {
-                        rtl8168_eri_write(tp, 0x3FC, 4, 0x00000000, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0x3FC, 4, 0x00000000, ERIAR_ExGMAC);
                 } else {
-                        rtl8168_eri_write(tp, 0x3FC, 4, 0x083C083C, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0x3FC, 4, 0x083C083C, ERIAR_ExGMAC);
                 }
-                csi_tmp = rtl8168_eri_read(tp, 0x3F8, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x3F8, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0x3F8, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x3F8, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         case CFG_METHOD_29:
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0x1EA, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1EA, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0x1EA, 1, csi_tmp, ERIAR_ExGMAC);
-                break;
-        }
-}
-
-static void
-rtl8168_enable_cfg9346_write(struct rtl8168_private *tp)
-{
-        RTL_W8(tp, Cfg9346, RTL_R8(tp, Cfg9346) | Cfg9346_Unlock);
-}
-
-static void
-rtl8168_disable_cfg9346_write(struct rtl8168_private *tp)
-{
-        RTL_W8(tp, Cfg9346, RTL_R8(tp, Cfg9346) & ~Cfg9346_Unlock);
-}
-
-static void
-rtl8168_enable_exit_l1_mask(struct rtl8168_private *tp)
-{
-        u32 csi_tmp;
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_16:
-        case CFG_METHOD_17:
-        case CFG_METHOD_18:
-        case CFG_METHOD_19:
-                csi_tmp = rtl8168_eri_read(tp, 0xD4, 4, ERIAR_ExGMAC);
-                csi_tmp |= (BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
-                rtl8168_eri_write(tp, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
-                break;
-        case CFG_METHOD_20:
-                csi_tmp = rtl8168_eri_read(tp, 0xD4, 4, ERIAR_ExGMAC);
-                csi_tmp |= (BIT_10 | BIT_11);
-                rtl8168_eri_write(tp, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
-                break;
-        case CFG_METHOD_21 ... CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0xD4, 4, ERIAR_ExGMAC);
-                csi_tmp |= (BIT_7 | BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
-                rtl8168_eri_write(tp, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1EA, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 }
 
-static void
-rtl8168_disable_exit_l1_mask(struct rtl8168_private *tp)
-{
-        u32 csi_tmp;
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_16:
-        case CFG_METHOD_17:
-        case CFG_METHOD_18:
-        case CFG_METHOD_19:
-                csi_tmp = rtl8168_eri_read(tp, 0xD4, 4, ERIAR_ExGMAC);
-                csi_tmp &= ~(BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
-                rtl8168_eri_write(tp, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
-                break;
-        case CFG_METHOD_20:
-                csi_tmp = rtl8168_eri_read(tp, 0xD4, 4, ERIAR_ExGMAC);
-                csi_tmp &= ~(BIT_10 | BIT_11);
-                rtl8168_eri_write(tp, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
-                break;
-        case CFG_METHOD_21 ... CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0xD4, 4, ERIAR_ExGMAC);
-                csi_tmp &= ~(BIT_7 | BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
-                rtl8168_eri_write(tp, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
-                break;
-        }
-}
-
-static void
-rtl8168_hw_aspm_clkreq_enable(struct rtl8168_private *tp, bool enable)
-{
-        if (!tp->HwSuppAspmClkIntrLock)
-                return;
-
-        if (enable && aspm) {
-                RTL_W8(tp, Config5, RTL_R8(tp, Config5) | ASPM_en);
-                RTL_W8(tp, Config2, RTL_R8(tp, Config2) | ClkReqEn);
-        } else {
-                RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~ClkReqEn);
-                RTL_W8(tp, Config5, RTL_R8(tp, Config5) & ~ASPM_en);
-        }
-
-        udelay(10);
-}
-
 #ifdef ENABLE_DASH_SUPPORT
 static void
 NICChkTypeEnableDashInterrupt(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+
         if (tp->DASH) {
                 //
                 // even disconnected, enable 3 dash interrupt mask bits for in-band/out-band communication
                 //
                 if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                        rtl8168_enable_dash2_interrupt(tp);
-                        RTL_W16(tp, tp->imr_reg0, (ISRIMR_DASH_INTR_EN | ISRIMR_DASH_INTR_CMAC_RESET));
+                        rtl8168_enable_dash2_interrupt(tp, ioaddr);
+                        RTL_W16(IntrMask, (ISRIMR_DASH_INTR_EN | ISRIMR_DASH_INTR_CMAC_RESET));
                 } else {
-                        RTL_W16(tp, tp->imr_reg0, (ISRIMR_DP_DASH_OK | ISRIMR_DP_HOST_OK | ISRIMR_DP_REQSYS_OK));
+                        RTL_W16(IntrMask, (ISRIMR_DP_DASH_OK | ISRIMR_DP_HOST_OK | ISRIMR_DP_REQSYS_OK));
                 }
         }
 }
 #endif
 
 static void
-rtl8168_link_on_patch(struct net_device *dev)
+rtl8168_check_link_status(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        int link_status_on;
 
-        rtl8168_hw_config(dev);
-
-        if (tp->mcfg == CFG_METHOD_18 || tp->mcfg == CFG_METHOD_19 || tp->mcfg == CFG_METHOD_20) {
-                if (RTL_R8(tp, PHYstatus) & _1000bpsF) {
-                        rtl8168_eri_write(tp, 0x1bc, 4, 0x00000011, ERIAR_ExGMAC);
-                        rtl8168_eri_write(tp, 0x1dc, 4, 0x0000001f, ERIAR_ExGMAC);
-                } else if (RTL_R8(tp, PHYstatus) & _100bps) {
-                        rtl8168_eri_write(tp, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
-                        rtl8168_eri_write(tp, 0x1dc, 4, 0x0000001f, ERIAR_ExGMAC);
-                } else {
-                        rtl8168_eri_write(tp, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
-                        rtl8168_eri_write(tp, 0x1dc, 4, 0x0000002d, ERIAR_ExGMAC);
-                }
-        } else if ((tp->mcfg == CFG_METHOD_16 || tp->mcfg == CFG_METHOD_17) && netif_running(dev)) {
-                if (tp->mcfg == CFG_METHOD_16 && (RTL_R8(tp, PHYstatus) & _10bps)) {
-                        RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) | AcceptAllPhys);
-                } else if (tp->mcfg == CFG_METHOD_17) {
-                        if (RTL_R8(tp, PHYstatus) & _1000bpsF) {
-                                rtl8168_eri_write(tp, 0x1bc, 4, 0x00000011, ERIAR_ExGMAC);
-                                rtl8168_eri_write(tp, 0x1dc, 4, 0x00000005, ERIAR_ExGMAC);
-                        } else if (RTL_R8(tp, PHYstatus) & _100bps) {
-                                rtl8168_eri_write(tp, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
-                                rtl8168_eri_write(tp, 0x1dc, 4, 0x00000005, ERIAR_ExGMAC);
-                        } else {
-                                rtl8168_eri_write(tp, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
-                                rtl8168_eri_write(tp, 0x1dc, 4, 0x0000003f, ERIAR_ExGMAC);
-                        }
-                }
-        } else if ((tp->mcfg == CFG_METHOD_14 || tp->mcfg == CFG_METHOD_15) && tp->eee.eee_enabled == 1) {
-                /*Full -Duplex  mode*/
-                if (RTL_R8(tp, PHYstatus)&FullDup) {
-                        rtl8168_mdio_write(tp, 0x1F, 0x0006);
-                        rtl8168_mdio_write(tp, 0x00, 0x5a30);
-                        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                        if (RTL_R8(tp, PHYstatus) & (_10bps | _100bps))
-                                RTL_W32(tp, TxConfig, (RTL_R32(tp, TxConfig) & ~BIT_19) | BIT_25);
-
-                } else {
-                        rtl8168_mdio_write(tp, 0x1F, 0x0006);
-                        rtl8168_mdio_write(tp, 0x00, 0x5a00);
-                        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                        if (RTL_R8(tp, PHYstatus) & (_10bps | _100bps))
-                                RTL_W32(tp, TxConfig, (RTL_R32(tp, TxConfig) & ~BIT_19) | (InterFrameGap << TxInterFrameGapShift));
-                }
-        } else if ((tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
-                    tp->mcfg == CFG_METHOD_23 || tp->mcfg == CFG_METHOD_24 ||
-                    tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
-                    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 ||
-                    tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-                    tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-                    tp->mcfg == CFG_METHOD_37) && netif_running(dev)) {
-                if (RTL_R8(tp, PHYstatus)&FullDup)
-                        RTL_W32(tp, TxConfig, (RTL_R32(tp, TxConfig) | (BIT_24 | BIT_25)) & ~BIT_19);
-                else
-                        RTL_W32(tp, TxConfig, (RTL_R32(tp, TxConfig) | BIT_25) & ~(BIT_19 | BIT_24));
-        }
-
-        if (tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
-            tp->mcfg == CFG_METHOD_27 || tp->mcfg == CFG_METHOD_28 ||
-            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34) {
-                /*half mode*/
-                if (!(RTL_R8(tp, PHYstatus)&FullDup)) {
-                        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                        rtl8168_mdio_write(tp, MII_ADVERTISE, rtl8168_mdio_read(tp, MII_ADVERTISE)&~(ADVERTISE_PAUSE_CAP|ADVERTISE_PAUSE_ASYM));
-                }
-        }
+#ifdef ENABLE_FIBER_SUPPORT
+        rtl8168_check_fiber_link_status(dev);
+#endif //ENABLE_FIBER_SUPPORT
 
-        if ((tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-             tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34) &&
-            (RTL_R8(tp, PHYstatus) & _10bps)) {
-                u32 csi_tmp;
+#ifdef ENABLE_FIBER_SUPPORT
+        rtl8168_check_fiber_link_status(dev);
+#endif //ENABLE_FIBER_SUPPORT
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1D0, 1, ERIAR_ExGMAC);
-                csi_tmp |= BIT_1;
-                rtl8168_eri_write(tp, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
-        }
+        link_status_on = tp->link_ok(dev);
 
-        rtl8168_hw_start(dev);
+        if (tp->mcfg == CFG_METHOD_11)
+                rtl8168dp_10mbps_gphy_para(dev);
 
-        netif_carrier_on(dev);
+        if (netif_carrier_ok(dev) != link_status_on) {
+                if (link_status_on) {
+                        rtl8168_hw_config(dev);
 
-        netif_tx_wake_all_queues(dev);
+                        if (tp->mcfg == CFG_METHOD_18 || tp->mcfg == CFG_METHOD_19 || tp->mcfg == CFG_METHOD_20) {
+                                if (RTL_R8(PHYstatus) & _1000bpsF) {
+                                        rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x00000011, ERIAR_ExGMAC);
+                                        rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x0000001f, ERIAR_ExGMAC);
+                                } else if (RTL_R8(PHYstatus) & _100bps) {
+                                        rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
+                                        rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x0000001f, ERIAR_ExGMAC);
+                                } else {
+                                        rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
+                                        rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x0000002d, ERIAR_ExGMAC);
+                                }
+                        } else if ((tp->mcfg == CFG_METHOD_16 || tp->mcfg == CFG_METHOD_17) && netif_running(dev)) {
+                                if (tp->mcfg == CFG_METHOD_16 && (RTL_R8(PHYstatus) & _10bps)) {
+                                        RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptAllPhys);
+                                } else if (tp->mcfg == CFG_METHOD_17) {
+                                        if (RTL_R8(PHYstatus) & _1000bpsF) {
+                                                rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x00000011, ERIAR_ExGMAC);
+                                                rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x00000005, ERIAR_ExGMAC);
+                                        } else if (RTL_R8(PHYstatus) & _100bps) {
+                                                rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
+                                                rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x00000005, ERIAR_ExGMAC);
+                                        } else {
+                                                rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
+                                                rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x0000003f, ERIAR_ExGMAC);
+                                        }
+                                }
+                        } else if ((tp->mcfg == CFG_METHOD_14 || tp->mcfg == CFG_METHOD_15) && eee_enable ==1) {
+                                /*Full -Duplex  mode*/
+                                if (RTL_R8(PHYstatus)&FullDup) {
+                                        rtl8168_mdio_write(tp, 0x1F, 0x0006);
+                                        rtl8168_mdio_write(tp, 0x00, 0x5a30);
+                                        rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                                        if (RTL_R8(PHYstatus) & (_10bps | _100bps))
+                                                RTL_W32(TxConfig, (RTL_R32(TxConfig) & ~BIT_19) | BIT_25);
+
+                                } else {
+                                        rtl8168_mdio_write(tp, 0x1F, 0x0006);
+                                        rtl8168_mdio_write(tp, 0x00, 0x5a00);
+                                        rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                                        if (RTL_R8(PHYstatus) & (_10bps | _100bps))
+                                                RTL_W32(TxConfig, (RTL_R32(TxConfig) & ~BIT_19) | (InterFrameGap << TxInterFrameGapShift));
+                                }
+                        } else if ((tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
+                                    tp->mcfg == CFG_METHOD_23 || tp->mcfg == CFG_METHOD_24 ||
+                                    tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
+                                    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) &&
+                                   netif_running(dev)) {
+                                if (RTL_R8(PHYstatus)&FullDup)
+                                        RTL_W32(TxConfig, (RTL_R32(TxConfig) | (BIT_24 | BIT_25)) & ~BIT_19);
+                                else
+                                        RTL_W32(TxConfig, (RTL_R32(TxConfig) | BIT_25) & ~(BIT_19 | BIT_24));
+                        }
 
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-        tp->phy_reg_aner = rtl8168_mdio_read(tp, MII_EXPANSION);
-        tp->phy_reg_anlpar = rtl8168_mdio_read(tp, MII_LPA);
-        tp->phy_reg_gbsr = rtl8168_mdio_read(tp, MII_STAT1000);
-}
+                        if (tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
+                            tp->mcfg == CFG_METHOD_27 || tp->mcfg == CFG_METHOD_28 ||
+                            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
+                                /*half mode*/
+                                if (!(RTL_R8(PHYstatus)&FullDup)) {
+                                        rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                                        rtl8168_mdio_write(tp, MII_ADVERTISE, rtl8168_mdio_read(tp, MII_ADVERTISE)&~(ADVERTISE_PAUSE_CAP|ADVERTISE_PAUSE_ASYM));
+                                }
+                        }
 
-static void
-rtl8168_link_down_patch(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
+                        if ((tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) && (RTL_R8(PHYstatus) & _10bps)) {
+                                u32 csi_tmp;
 
-        tp->phy_reg_aner = 0;
-        tp->phy_reg_anlpar = 0;
-        tp->phy_reg_gbsr = 0;
+                                csi_tmp = rtl8168_eri_read(ioaddr, 0x1D0, 1, ERIAR_ExGMAC);
+                                csi_tmp |= BIT_1;
+                                rtl8168_eri_write(ioaddr, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
+                        }
 
-        netif_carrier_off(dev);
+                        rtl8168_hw_start(dev);
 
-        netif_tx_disable(dev);
+                        netif_carrier_on(dev);
 
-        rtl8168_hw_reset(dev);
+                        netif_wake_queue(dev);
 
-        rtl8168_tx_clear(tp);
+                        rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                        tp->phy_reg_anlpar = rtl8168_mdio_read(tp, MII_LPA);
 
-        rtl8168_rx_clear(tp);
+                        if (netif_msg_ifup(tp))
+                                printk(KERN_INFO PFX "%s: link up\n", dev->name);
+                } else {
+                        if (netif_msg_ifdown(tp))
+                                printk(KERN_INFO PFX "%s: link down\n", dev->name);
 
-        rtl8168_init_ring(dev);
+                        tp->phy_reg_anlpar = 0;
 
-        if (dynamic_aspm) {
-                rtl8168_enable_cfg9346_write(tp);
-                rtl8168_hw_aspm_clkreq_enable(tp, true);
-                rtl8168_disable_cfg9346_write(tp);
-        }
+                        netif_stop_queue(dev);
 
-        switch (tp->mcfg) {
-        case CFG_METHOD_21:
-        case CFG_METHOD_22:
-        case CFG_METHOD_23:
-        case CFG_METHOD_24:
-        case CFG_METHOD_25:
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-                if (tp->org_pci_offset_99 & BIT_2)
-                        tp->issue_offset_99_event = TRUE;
-                break;
-        }
+                        netif_carrier_off(dev);
 
-#ifdef ENABLE_DASH_SUPPORT
-        if (tp->DASH) {
-                NICChkTypeEnableDashInterrupt(tp);
-        }
-#endif
-}
-
-static void
-rtl8168_check_link_status(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        int link_status_on;
+                        rtl8168_hw_reset(dev);
 
-#ifdef ENABLE_FIBER_SUPPORT
-        rtl8168_check_fiber_link_status(tp);
-#endif //ENABLE_FIBER_SUPPORT
+                        rtl8168_tx_clear(tp);
 
-        link_status_on = tp->link_ok(dev);
+                        rtl8168_rx_clear(tp);
 
-        if (tp->mcfg == CFG_METHOD_11)
-                rtl8168dp_10mbps_gphy_para(dev);
+                        rtl8168_init_ring(dev);
 
-        if (netif_carrier_ok(dev) != link_status_on) {
-                if (link_status_on) {
-                        rtl8168_link_on_patch(dev);
+                        rtl8168_set_speed(dev, tp->autoneg, tp->speed, tp->duplex, tp->advertising);
 
-                        if (netif_msg_ifup(tp))
-                                printk(KERN_INFO PFX "%s: link up\n", dev->name);
-                } else {
-                        if (netif_msg_ifdown(tp))
-                                printk(KERN_INFO PFX "%s: link down\n", dev->name);
+                        switch (tp->mcfg) {
+                        case CFG_METHOD_21:
+                        case CFG_METHOD_22:
+                        case CFG_METHOD_23:
+                        case CFG_METHOD_24:
+                        case CFG_METHOD_25:
+                        case CFG_METHOD_27:
+                        case CFG_METHOD_28:
+                                if (tp->org_pci_offset_99 & BIT_2)
+                                        tp->issue_offset_99_event = TRUE;
+                                break;
+                        }
 
-                        rtl8168_link_down_patch(dev);
+#ifdef ENABLE_DASH_SUPPORT
+                        if (tp->DASH) {
+                                NICChkTypeEnableDashInterrupt(tp);
+                        }
+#endif
                 }
         }
 
@@ -5411,29 +3826,14 @@
                 case CFG_METHOD_25:
                 case CFG_METHOD_27:
                 case CFG_METHOD_28:
-                case CFG_METHOD_31:
-                case CFG_METHOD_32:
-                case CFG_METHOD_33:
-                case CFG_METHOD_34:
                         if (tp->issue_offset_99_event) {
-                                if (!(RTL_R8(tp, PHYstatus) & PowerSaveStatus)) {
+                                if (!(RTL_R8(PHYstatus) & PowerSaveStatus)) {
                                         tp->issue_offset_99_event = FALSE;
                                         rtl8168_issue_offset_99_event(tp);
                                 }
                         }
                         break;
                 }
-        } else {
-                if (dynamic_aspm) {
-                        bool enable_hw_aspm_clkreq = true;
-                        if (tp->dynamic_aspm_packet_count > dynamic_aspm_packet_threshold)
-                                enable_hw_aspm_clkreq = false;
-
-                        rtl8168_enable_cfg9346_write(tp);
-                        rtl8168_hw_aspm_clkreq_enable(tp, enable_hw_aspm_clkreq);
-                        rtl8168_disable_cfg9346_write(tp);
-                }
-                tp->dynamic_aspm_packet_count = 0;
         }
 }
 
@@ -5476,10 +3876,7 @@
         if (tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
             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 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-            tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-            tp->mcfg == CFG_METHOD_37) {
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 val = rtl8168_mdio_read_phy_ocp(tp, 0x0C41, 0x13);
                 if (val != 0x0050) {
                         rtl8168_set_phy_mcu_patch_request(tp);
@@ -5499,10 +3896,7 @@
         if (tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
             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 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-            tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-            tp->mcfg == CFG_METHOD_37) {
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 val = rtl8168_mdio_read_phy_ocp(tp, 0x0C41, 0x13);
                 if (val != 0x0500) {
                         rtl8168_set_phy_mcu_patch_request(tp);
@@ -5517,11 +3911,12 @@
 rtl8168_wait_ll_share_fifo_ready(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         int i;
 
         for (i = 0; i < 10; i++) {
                 udelay(100);
-                if (RTL_R16(tp, 0xD2) & BIT_9)
+                if (RTL_R16(0xD2) & BIT_9)
                         break;
         }
 }
@@ -5529,6 +3924,7 @@
 static void
 rtl8168_disable_pci_offset_99(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
         switch (tp->mcfg) {
@@ -5544,14 +3940,9 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0x3F2, 2, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x3F2, 2, ERIAR_ExGMAC);
                 csi_tmp &= ~(BIT_0 | BIT_1);
-                rtl8168_eri_write(tp, 0x3F2, 2, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x3F2, 2, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 
@@ -5563,11 +3954,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_csi_fun0_write_byte(tp, 0x99, 0x00);
                 break;
         }
@@ -5576,6 +3962,7 @@
 static void
 rtl8168_enable_pci_offset_99(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
         switch (tp->mcfg) {
@@ -5586,11 +3973,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_csi_fun0_write_byte(tp, 0x99, tp->org_pci_offset_99);
                 break;
         }
@@ -5608,18 +3990,13 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0x3F2, 2, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x3F2, 2, ERIAR_ExGMAC);
                 csi_tmp &= ~(BIT_0 | BIT_1);
-                if (tp->org_pci_offset_99 & (BIT_5 | BIT_6))
+                if (!(tp->org_pci_offset_99 & (BIT_5 | BIT_6)))
                         csi_tmp |= BIT_1;
-                if (tp->org_pci_offset_99 & BIT_2)
+                if (!(tp->org_pci_offset_99 & BIT_2))
                         csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0x3F2, 2, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x3F2, 2, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 }
@@ -5627,14 +4004,15 @@
 static void
 rtl8168_init_pci_offset_99(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
         switch (tp->mcfg) {
         case CFG_METHOD_26:
                 if (tp->org_pci_offset_99 & BIT_2) {
-                        csi_tmp = rtl8168_eri_read(tp, 0x5C2, 1, ERIAR_ExGMAC);
+                        csi_tmp = rtl8168_eri_read(ioaddr, 0x5C2, 1, ERIAR_ExGMAC);
                         csi_tmp &= ~BIT_1;
-                        rtl8168_eri_write(tp, 0x5C2, 1, csi_tmp, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0x5C2, 1, csi_tmp, ERIAR_ExGMAC);
                 }
                 break;
         }
@@ -5652,18 +4030,13 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0x3F2, 2, ERIAR_ExGMAC);
-                csi_tmp &= ~(BIT_8 | BIT_9  | BIT_10 | BIT_11  | BIT_12  | BIT_13  | BIT_14 | BIT_15);
-                csi_tmp |= (BIT_9 | BIT_10 | BIT_13  | BIT_14 | BIT_15);
-                rtl8168_eri_write(tp, 0x3F2, 2, csi_tmp, ERIAR_ExGMAC);
-                csi_tmp = rtl8168_eri_read(tp, 0x3F5, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x3F2, 2, ERIAR_ExGMAC);
+                csi_tmp &= ~( BIT_8 | BIT_9  | BIT_10 | BIT_11  | BIT_12  | BIT_13  | BIT_14 | BIT_15 );
+                csi_tmp |= ( BIT_9 | BIT_10 | BIT_13  | BIT_14 | BIT_15 );
+                rtl8168_eri_write(ioaddr, 0x3F2, 2, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x3F5, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_6 | BIT_7;
-                rtl8168_eri_write(tp, 0x3F5, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x3F5, 1, csi_tmp, ERIAR_ExGMAC);
                 rtl8168_mac_ocp_write(tp, 0xE02C, 0x1880);
                 rtl8168_mac_ocp_write(tp, 0xE02E, 0x4880);
                 break;
@@ -5671,40 +4044,35 @@
 
         switch (tp->mcfg) {
         case CFG_METHOD_26:
-                rtl8168_eri_write(tp, 0x5C0, 1, 0xFA, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x5C0, 1, 0xFA, ERIAR_ExGMAC);
                 break;
         }
 
         switch (tp->mcfg) {
         case CFG_METHOD_26:
                 if (tp->org_pci_offset_99 & BIT_2) {
-                        csi_tmp = rtl8168_eri_read(tp, 0x5C8, 1, ERIAR_ExGMAC);
+                        csi_tmp = rtl8168_eri_read(ioaddr, 0x5C8, 1, ERIAR_ExGMAC);
                         csi_tmp |= BIT_0;
-                        rtl8168_eri_write(tp, 0x5C8, 1, csi_tmp, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0x5C8, 1, csi_tmp, ERIAR_ExGMAC);
                 }
                 break;
         case CFG_METHOD_29:
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 if (tp->org_pci_offset_99 & BIT_2)
-                        rtl8168_mac_ocp_write(tp, 0xE0A2, rtl8168_mac_ocp_read(tp, 0xE0A2) | BIT_0);
+                        rtl8168_mac_ocp_write(tp, 0xE0A2,  rtl8168_mac_ocp_read(tp, 0xE0A2) | BIT_0);
                 break;
         }
 
         switch (tp->mcfg) {
         case CFG_METHOD_23:
-                rtl8168_eri_write(tp, 0x2E8, 2, 0x883C, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2EA, 2, 0x8C12, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2EC, 2, 0x9003, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2E2, 2, 0x883C, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2E4, 2, 0x8C12, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2E6, 2, 0x9003, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2E8, 2, 0x883C, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2EA, 2, 0x8C12, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2EC, 2, 0x9003, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2E2, 2, 0x883C, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2E4, 2, 0x8C12, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2E6, 2, 0x9003, ERIAR_ExGMAC);
                 break;
         case CFG_METHOD_21:
         case CFG_METHOD_22:
@@ -5717,17 +4085,12 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                rtl8168_eri_write(tp, 0x2E8, 2, 0x9003, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2EA, 2, 0x9003, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2EC, 2, 0x9003, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2E2, 2, 0x883C, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2E4, 2, 0x8C12, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x2E6, 2, 0x9003, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2E8, 2, 0x9003, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2EA, 2, 0x9003, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2EC, 2, 0x9003, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2E2, 2, 0x883C, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2E4, 2, 0x8C12, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2E6, 2, 0x9003, ERIAR_ExGMAC);
                 break;
         }
 
@@ -5739,9 +4102,9 @@
         case CFG_METHOD_26:
         case CFG_METHOD_27:
         case CFG_METHOD_28:
-                csi_tmp = rtl8168_eri_read(tp, 0x3FA, 2, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x3FA, 2, ERIAR_ExGMAC);
                 csi_tmp |= BIT_14;
-                rtl8168_eri_write(tp, 0x3FA, 2, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x3FA, 2, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 
@@ -5749,11 +4112,8 @@
         case CFG_METHOD_26:
         case CFG_METHOD_29:
         case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 if (tp->org_pci_offset_99 & BIT_2)
-                        RTL_W8(tp, 0xB6, RTL_R8(tp, 0xB6) | BIT_0);
+                        RTL_W8(0xB6, RTL_R8(0xB6) | BIT_0);
                 break;
         }
 
@@ -5763,6 +4123,7 @@
 static void
 rtl8168_disable_pci_offset_180(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
         switch (tp->mcfg) {
@@ -5775,20 +4136,15 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0x1E2, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1E2, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_2;
-                rtl8168_eri_write(tp, 0x1E2, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1E2, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 
         switch (tp->mcfg) {
         case CFG_METHOD_26:
-                rtl8168_eri_write(tp, 0x1E9, 1, 0x0A, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1E9, 1, 0x0A, ERIAR_ExGMAC);
                 break;
         }
 }
@@ -5796,46 +4152,31 @@
 static void
 rtl8168_enable_pci_offset_180(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
         switch (tp->mcfg) {
         case CFG_METHOD_25:
         case CFG_METHOD_28:
-                csi_tmp = rtl8168_eri_read(tp, 0x1E8, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1E8, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~(0x0000FF00);
                 csi_tmp |= (0x00006400);
-                rtl8168_eri_write(tp, 0x1E8, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1E8, 4, csi_tmp, ERIAR_ExGMAC);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1E4, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1E4, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~(0x0000FF00);
-                rtl8168_eri_write(tp, 0x1E4, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1E4, 4, csi_tmp, ERIAR_ExGMAC);
                 break;
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-                csi_tmp = rtl8168_eri_read(tp, 0x1E8, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1E8, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~(0x0000FFF0);
                 csi_tmp |= (0x00000640);
-                rtl8168_eri_write(tp, 0x1E8, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1E8, 4, csi_tmp, ERIAR_ExGMAC);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1E4, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1E4, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~(0x0000FF00);
-                rtl8168_eri_write(tp, 0x1E4, 4, csi_tmp, ERIAR_ExGMAC);
-                break;
-        }
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                csi_tmp = rtl8168_eri_read(tp, 0x1E8, 2, ERIAR_ExGMAC);
-                csi_tmp &= ~(0xFFF0);
-                csi_tmp |= 0x0640;
-                rtl8168_eri_write(tp,0x1E8, 2, csi_tmp, ERIAR_ExGMAC);
-
-                csi_tmp = rtl8168_eri_read(tp, 0x1E4, 2, ERIAR_ExGMAC);
-                csi_tmp &= ~(0xFF00);
-                rtl8168_eri_write(tp, 0x1E4, 2, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1E4, 4, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 
@@ -5847,18 +4188,15 @@
         case CFG_METHOD_28:
         case CFG_METHOD_29:
         case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0x1E2, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1E2, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_2;
-                rtl8168_eri_write(tp, 0x1E2, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1E2, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 
         switch (tp->mcfg) {
         case CFG_METHOD_26:
-                rtl8168_eri_write(tp, 0x1E9, 1, 0x64, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1E9, 1, 0x64, ERIAR_ExGMAC);
                 break;
         }
 
@@ -5868,7 +4206,10 @@
 static void
 rtl8168_init_pci_offset_180(struct rtl8168_private *tp)
 {
-        rtl8168_enable_pci_offset_180(tp);
+        if (tp->org_pci_offset_180 & (BIT_0|BIT_1))
+                rtl8168_enable_pci_offset_180(tp);
+        else
+                rtl8168_disable_pci_offset_180(tp);
 }
 
 static void
@@ -5888,18 +4229,27 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                if (tp->org_pci_offset_99 & BIT_2)
-                        rtl8168_issue_offset_99_event(tp);
-                rtl8168_disable_pci_offset_99(tp);
+                rtl8168_issue_offset_99_event(tp);
                 break;
         }
 
         switch (tp->mcfg) {
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_disable_pci_offset_99(tp);
+                break;
+        }
+        switch (tp->mcfg) {
         case CFG_METHOD_24:
         case CFG_METHOD_25:
         case CFG_METHOD_26:
@@ -5909,94 +4259,82 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_disable_pci_offset_180(tp);
                 break;
         }
 }
 
 static void
-rtl8168_set_rx_q_num(struct rtl8168_private *tp,
-                     unsigned int num_rx_queues)
+rtl8168_enable_cfg9346_write(struct rtl8168_private *tp)
 {
-        u16 q_ctrl;
-        u16 rx_q_num;
-
-        if (tp->HwSuppRxDescType != RX_DESC_RING_TYPE_2)
-                return;
-
-        if (num_rx_queues > tp->HwSuppNumRxQueues ||
-            num_rx_queues < 1)
-                num_rx_queues = 1;
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        rx_q_num = (u16)ilog2(num_rx_queues);
-        rx_q_num &= (BIT_0 | BIT_1 | BIT_2);
-        rx_q_num <<= 2;
-        q_ctrl = rtl8168_eri_read(tp, Q_NUM_CTRL_8168, 2, ERIAR_ExGMAC);
-        q_ctrl &= ~(BIT_2 | BIT_3 | BIT_4);
-        q_ctrl |= rx_q_num;
-        rtl8168_eri_write(tp, Q_NUM_CTRL_8168, 2, q_ctrl, ERIAR_ExGMAC);
+        RTL_W8(Cfg9346, RTL_R8(Cfg9346) | Cfg9346_Unlock);
 }
 
 static void
-rtl8168_set_rx_vlan_filter(struct rtl8168_private *tp)
+rtl8168_disable_cfg9346_write(struct rtl8168_private *tp)
 {
-        int i;
-
-        if (tp->HwSuppRxDescType != RX_DESC_RING_TYPE_2)
-                return;
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        for (i = 1; i < 16; i++) {
-                rtl8168_eri_write(tp, 0xf0 + 8*i, 4, 0xffff0000, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xf4 + 8*i, 4, 0xffffffff, ERIAR_ExGMAC);
-        }
+        RTL_W8(Cfg9346, RTL_R8(Cfg9346) & ~Cfg9346_Unlock);
 }
 
 static void
 rtl8168_hw_d3_para(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        switch (tp->mcfg) {
-        case CFG_METHOD_1 ... CFG_METHOD_26:
-                RTL_W16(tp, RxMaxSize, RX_BUF_SIZE + 1);
-                break;
-        default:
-                RTL_W16(tp, RxMaxSize, RX_BUF_SIZE);
-                break;
-        }
+        RTL_W16(RxMaxSize, RX_BUF_SIZE);
 
-        if (tp->HwSuppAspmClkIntrLock) {
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) & ~BIT_7);
+        switch (tp->mcfg) {
+        case CFG_METHOD_14:
+        case CFG_METHOD_15:
+        case CFG_METHOD_16:
+        case CFG_METHOD_17:
+        case CFG_METHOD_18:
+        case CFG_METHOD_19:
+        case CFG_METHOD_20:
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                RTL_W8(0xF1, RTL_R8(0xF1) & ~BIT_7);
                 rtl8168_enable_cfg9346_write(tp);
-                rtl8168_hw_aspm_clkreq_enable(tp, false);
+                RTL_W8(Config2, RTL_R8(Config2) & ~BIT_7);
+                RTL_W8(Config5, RTL_R8(Config5) & ~BIT_0);
                 rtl8168_disable_cfg9346_write(tp);
+                break;
         }
 
-        rtl8168_disable_exit_l1_mask(tp);
-
 #ifdef ENABLE_REALWOW_SUPPORT
         rtl8168_set_realwow_d3_para(dev);
 #endif
-        rtl8168_set_rx_q_num(tp, 1);
 
         if (tp->mcfg == CFG_METHOD_18 || tp->mcfg == CFG_METHOD_19 || tp->mcfg == CFG_METHOD_20) {
-                rtl8168_eri_write(tp, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x1dc, 4, 0x0000002d, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x0000002d, ERIAR_ExGMAC);
         } else if (tp->mcfg == CFG_METHOD_16) {
-                rtl8168_eri_write(tp, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0x1dc, 4, 0x0000003f, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1bc, 4, 0x0000001f, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1dc, 4, 0x0000003f, ERIAR_ExGMAC);
         }
 
         if (tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
             tp->mcfg == CFG_METHOD_23 || tp->mcfg == CFG_METHOD_24 ||
             tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
-            tp->mcfg == CFG_METHOD_27 || tp->mcfg == CFG_METHOD_28)
-                rtl8168_eri_write(tp, 0x2F8, 2, 0x0064, ERIAR_ExGMAC);
+            tp->mcfg == CFG_METHOD_27 || tp->mcfg == CFG_METHOD_28 ||
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
+                rtl8168_eri_write(ioaddr, 0x2F8, 2, 0x0064, ERIAR_ExGMAC);
+        }
 
         if (tp->bios_setting & BIT_28) {
                 if (tp->mcfg == CFG_METHOD_18 || tp->mcfg == CFG_METHOD_19 ||
@@ -6022,26 +4360,17 @@
                 }
         }
 
-        rtl8168_set_pci_99_180_exit_driver_para(dev);
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                rtl8168_set_mcu_ocp_bit(tp, 0xD438, BIT_3);
-                rtl8168_set_mcu_ocp_bit(tp, 0xD438, BIT_2);
-                rtl8168_clear_mcu_ocp_bit(tp, 0xDE28, (BIT_1 | BIT_0));
-                rtl8168_set_mcu_ocp_bit(tp, 0xD438, (BIT_1 | BIT_0));
-                break;
+        if (tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
+                rtl8168_set_dash_other_fun_dev_state_change(tp, 3, 0xFD);
         }
 
+        rtl8168_set_pci_99_180_exit_driver_para(dev);
+
         /*disable ocp phy power saving*/
         if (tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
             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 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-            tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-            tp->mcfg == CFG_METHOD_37)
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32)
                 if (!tp->dash_printer_enabled)
                         rtl8168_disable_ocp_phy_power_saving(dev);
 
@@ -6052,18 +4381,19 @@
 rtl8168_enable_magic_packet(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
         switch (tp->HwSuppMagicPktVer) {
         case WAKEUP_MAGIC_PACKET_V1:
                 rtl8168_enable_cfg9346_write(tp);
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) | MagicPacket);
+                RTL_W8(Config3, RTL_R8(Config3) | MagicPacket);
                 rtl8168_disable_cfg9346_write(tp);
                 break;
         case WAKEUP_MAGIC_PACKET_V2:
-                csi_tmp = rtl8168_eri_read(tp, 0xDE, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDE, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0xDE, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDE, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 }
@@ -6071,18 +4401,19 @@
 rtl8168_disable_magic_packet(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
         switch (tp->HwSuppMagicPktVer) {
         case WAKEUP_MAGIC_PACKET_V1:
                 rtl8168_enable_cfg9346_write(tp);
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~MagicPacket);
+                RTL_W8(Config3, RTL_R8(Config3) & ~MagicPacket);
                 rtl8168_disable_cfg9346_write(tp);
                 break;
         case WAKEUP_MAGIC_PACKET_V2:
-                csi_tmp = rtl8168_eri_read(tp, 0xDE, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDE, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_0;
-                rtl8168_eri_write(tp, 0xDE, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDE, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 }
@@ -6093,24 +4424,26 @@
 rtl8168_get_hw_wol(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u8 options;
         u32 csi_tmp;
+        unsigned long flags;
 
-        if (disable_wol_support)
-                goto out;
+
+        spin_lock_irqsave(&tp->lock, flags);
 
         tp->wol_opts = 0;
-        options = RTL_R8(tp, Config1);
+        options = RTL_R8(Config1);
         if (!(options & PMEnable))
-                goto out;
+                goto out_unlock;
 
-        options = RTL_R8(tp, Config3);
+        options = RTL_R8(Config3);
         if (options & LinkUp)
                 tp->wol_opts |= WAKE_PHY;
 
         switch (tp->HwSuppMagicPktVer) {
         case WAKEUP_MAGIC_PACKET_V2:
-                csi_tmp = rtl8168_eri_read(tp, 0xDE, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDE, 1, ERIAR_ExGMAC);
                 if (csi_tmp & BIT_0)
                         tp->wol_opts |= WAKE_MAGIC;
                 break;
@@ -6120,7 +4453,7 @@
                 break;
         }
 
-        options = RTL_R8(tp, Config5);
+        options = RTL_R8(Config5);
         if (options & UWF)
                 tp->wol_opts |= WAKE_UCAST;
         if (options & BWF)
@@ -6128,14 +4461,17 @@
         if (options & MWF)
                 tp->wol_opts |= WAKE_MCAST;
 
-out:
-        tp->wol_enabled = (tp->wol_opts || tp->dash_printer_enabled) ? WOL_ENABLED : WOL_DISABLED;
+out_unlock:
+        tp->wol_enabled = (tp->wol_opts) ? WOL_ENABLED : WOL_DISABLED;
+
+        spin_unlock_irqrestore(&tp->lock, flags);
 }
 
 static void
 rtl8168_set_hw_wol(struct net_device *dev, u32 wolopts)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         int i,tmp;
         static struct {
                 u32 opt;
@@ -6167,15 +4503,12 @@
         rtl8168_enable_cfg9346_write(tp);
 
         for (i = 0; i < tmp; i++) {
-                u8 options = RTL_R8(tp, cfgi.reg) & ~cfgi.mask;
+                u8 options = RTL_R8(cfgi.reg) & ~cfgi.mask;
                 if (wolopts & cfgi.opt)
                         options |= cfgi.mask;
-                RTL_W8(tp, cfgi.reg, options);
+                RTL_W8(cfgi.reg, options);
         }
 
-        if (tp->dash_printer_enabled)
-                RTL_W8(tp, Config5, RTL_R8(tp, Config5) | LanWake);
-
         rtl8168_disable_cfg9346_write(tp);
 }
 
@@ -6184,8 +4517,7 @@
 {
         struct rtl8168_private *tp = netdev_priv(dev);
 
-        if (rtl8168_is_in_phy_disable_mode(dev))
-                return;
+        if (rtl8168_is_in_phy_disable_mode(dev)) return;
 
         rtl8168_mdio_write(tp, 0x1F, 0x0000);
         rtl8168_mdio_write(tp, MII_BMCR, BMCR_RESET | BMCR_ANENABLE | BMCR_ANRESTART);
@@ -6197,8 +4529,7 @@
         struct rtl8168_private *tp = netdev_priv(dev);
         u16 bmcr_true_force = 0;
 
-        if (rtl8168_is_in_phy_disable_mode(dev))
-                return;
+        if (rtl8168_is_in_phy_disable_mode(dev)) return;
 
         if ((speed == SPEED_10) && (duplex == DUPLEX_HALF)) {
                 bmcr_true_force = BMCR_SPEED10;
@@ -6208,6 +4539,9 @@
                 bmcr_true_force = BMCR_SPEED100;
         } else if ((speed == SPEED_100) && (duplex == DUPLEX_FULL)) {
                 bmcr_true_force = BMCR_SPEED100 | BMCR_FULLDPLX;
+        } else if ((speed == SPEED_1000) && (duplex == DUPLEX_FULL) &&
+                   tp->HwSuppGigaForceMode) {
+                bmcr_true_force = BMCR_SPEED1000 | BMCR_FULLDPLX;
         } else {
                 netif_err(tp, drv, dev, "Failed to set phy force mode!\n");
                 return;
@@ -6218,118 +4552,21 @@
 }
 
 static void
-rtl8168_set_pci_pme(struct rtl8168_private *tp, int set)
-{
-        struct pci_dev *pdev = tp->pci_dev;
-        u16 pmc;
-
-        if (!pdev->pm_cap)
-                return;
-
-        pci_read_config_word(pdev, pdev->pm_cap + PCI_PM_CTRL, &pmc);
-        pmc |= PCI_PM_CTRL_PME_STATUS;
-        if (set)
-                pmc |= PCI_PM_CTRL_PME_ENABLE;
-        else
-                pmc &= ~PCI_PM_CTRL_PME_ENABLE;
-        pci_write_config_word(pdev, pdev->pm_cap + PCI_PM_CTRL, pmc);
-}
-
-static void
-rtl8168_set_wol_link_speed(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        int auto_nego;
-        int giga_ctrl;
-        u32 adv;
-        u16 anlpar;
-        u16 gbsr;
-        u16 aner;
-
-        if (tp->autoneg != AUTONEG_ENABLE)
-                goto exit;
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        auto_nego = rtl8168_mdio_read(tp, MII_ADVERTISE);
-        auto_nego &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL
-                       | ADVERTISE_100HALF | ADVERTISE_100FULL);
-
-        giga_ctrl = rtl8168_mdio_read(tp, MII_CTRL1000);
-        giga_ctrl &= ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);
-
-        aner = tp->phy_reg_aner;
-        anlpar = tp->phy_reg_anlpar;
-        gbsr = tp->phy_reg_gbsr;
-        if (tp->link_ok(dev)) {
-                aner = rtl8168_mdio_read(tp, MII_EXPANSION);
-                anlpar = rtl8168_mdio_read(tp, MII_LPA);
-                gbsr = rtl8168_mdio_read(tp, MII_STAT1000);
-        }
-
-        adv = tp->advertising;
-        if ((aner | anlpar | gbsr) == 0) {
-                int auto_nego_tmp = 0;
-
-                if (adv & ADVERTISED_10baseT_Half)
-                        auto_nego_tmp |= ADVERTISE_10HALF;
-                if (adv & ADVERTISED_10baseT_Full)
-                        auto_nego_tmp |= ADVERTISE_10FULL;
-                if (adv & ADVERTISED_100baseT_Half)
-                        auto_nego_tmp |= ADVERTISE_100HALF;
-                if (adv & ADVERTISED_100baseT_Full)
-                        auto_nego_tmp |= ADVERTISE_100FULL;
-
-                if (auto_nego_tmp == 0)
-                        goto exit;
-
-                auto_nego |= auto_nego_tmp;
-                goto skip_check_lpa;
-        }
-        if (!(aner & EXPANSION_NWAY))
-                goto exit;
-
-        if ((adv & ADVERTISED_10baseT_Half) && (anlpar & LPA_10HALF))
-                auto_nego |= ADVERTISE_10HALF;
-        else if ((adv & ADVERTISED_10baseT_Full) && (anlpar & LPA_10FULL))
-                auto_nego |= ADVERTISE_10FULL;
-        else if ((adv & ADVERTISED_100baseT_Half) && (anlpar & LPA_100HALF))
-                auto_nego |= ADVERTISE_100HALF;
-        else if ((adv & ADVERTISED_100baseT_Full) && (anlpar & LPA_100FULL))
-                auto_nego |= ADVERTISE_100FULL;
-        else if (adv & ADVERTISED_1000baseT_Half && (gbsr & LPA_1000HALF))
-                giga_ctrl |= ADVERTISE_1000HALF;
-        else if (adv & ADVERTISED_1000baseT_Full && (gbsr & LPA_1000FULL))
-                giga_ctrl |= ADVERTISE_1000FULL;
-        else
-                goto exit;
-
-skip_check_lpa:
-        if (tp->DASH)
-                auto_nego |= (ADVERTISE_100FULL | ADVERTISE_100HALF | ADVERTISE_10HALF | ADVERTISE_10FULL);
-
-        if (((tp->mcfg == CFG_METHOD_7) || (tp->mcfg == CFG_METHOD_8)) && (RTL_R16(tp, CPlusCmd) & ASF))
-                auto_nego |= (ADVERTISE_100FULL | ADVERTISE_100HALF | ADVERTISE_10HALF | ADVERTISE_10FULL);
-
-#ifdef CONFIG_DOWN_SPEED_100
-        auto_nego |= (ADVERTISE_100FULL | ADVERTISE_100HALF | ADVERTISE_10HALF | ADVERTISE_10FULL);
-#endif
-
-        rtl8168_mdio_write(tp, MII_ADVERTISE, auto_nego);
-        rtl8168_mdio_write(tp, MII_CTRL1000, giga_ctrl);
-
-        rtl8168_phy_restart_nway(dev);
-
-exit:
-        return;
-}
-
-static void
 rtl8168_powerdown_pll(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+#ifdef ENABLE_FIBER_SUPPORT
+        if (HW_FIBER_MODE_ENABLED(tp))
+                return;
+#endif //ENABLE_FIBER_SUPPORT
 
         if (tp->wol_enabled == WOL_ENABLED || tp->DASH || tp->EnableKCPOffload) {
+                int auto_nego;
+                int giga_ctrl;
+                u16 anlpar;
+
                 rtl8168_set_hw_wol(dev, tp->wol_opts);
 
                 if (tp->mcfg == CFG_METHOD_16 || tp->mcfg == CFG_METHOD_17 ||
@@ -6338,86 +4575,88 @@
                     tp->mcfg == CFG_METHOD_26 || tp->mcfg == CFG_METHOD_23 ||
                     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 ||
-                    tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-                    tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36) {
+                    tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                         rtl8168_enable_cfg9346_write(tp);
-                        RTL_W8(tp, Config2, RTL_R8(tp, Config2) | PMSTS_En);
+                        RTL_W8(Config2, RTL_R8(Config2) | PMSTS_En);
                         rtl8168_disable_cfg9346_write(tp);
                 }
 
-                /* Enable the PME and clear the status */
-                rtl8168_set_pci_pme(tp, 1);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                auto_nego = rtl8168_mdio_read(tp, MII_ADVERTISE);
+                auto_nego &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL
+                               | ADVERTISE_100HALF | ADVERTISE_100FULL);
 
-#ifdef ENABLE_FIBER_SUPPORT
-                if (HW_FIBER_MODE_ENABLED(tp))
-                        return;
-#endif //ENABLE_FIBER_SUPPORT
+                if (netif_running(dev))
+                        anlpar = tp->phy_reg_anlpar;
+                else
+                        anlpar = rtl8168_mdio_read(tp, MII_LPA);
 
-                if (HW_SUPP_SERDES_PHY(tp))
-                        return;
+#ifdef CONFIG_DOWN_SPEED_100
+                auto_nego |= (ADVERTISE_100FULL | ADVERTISE_100HALF | ADVERTISE_10HALF | ADVERTISE_10FULL);
+#else
+                if (anlpar & (LPA_10HALF | LPA_10FULL))
+                        auto_nego |= (ADVERTISE_10HALF | ADVERTISE_10FULL);
+                else
+                        auto_nego |= (ADVERTISE_100FULL | ADVERTISE_100HALF | ADVERTISE_10HALF | ADVERTISE_10FULL);
+#endif
 
-                rtl8168_set_wol_link_speed(dev);
+                if (tp->DASH)
+                        auto_nego |= (ADVERTISE_100FULL | ADVERTISE_100HALF | ADVERTISE_10HALF | ADVERTISE_10FULL);
 
-                RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) | AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
+                if (((tp->mcfg == CFG_METHOD_7) || (tp->mcfg == CFG_METHOD_8)) && (RTL_R16(CPlusCmd) & ASF))
+                        auto_nego |= (ADVERTISE_100FULL | ADVERTISE_100HALF | ADVERTISE_10HALF | ADVERTISE_10FULL);
 
-                return;
-        }
+                giga_ctrl = rtl8168_mdio_read(tp, MII_CTRL1000) & ~(ADVERTISE_1000HALF | ADVERTISE_1000FULL);
+                rtl8168_mdio_write(tp, MII_ADVERTISE, auto_nego);
+                rtl8168_mdio_write(tp, MII_CTRL1000, giga_ctrl);
+                rtl8168_phy_restart_nway(dev);
 
-        rtl8168_set_hw_wol(dev, 0);
+                RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
 
-#ifdef ENABLE_FIBER_SUPPORT
-        if (HW_FIBER_MODE_ENABLED(tp))
                 return;
-#endif //ENABLE_FIBER_SUPPORT
+        }
 
         if (tp->DASH)
                 return;
 
-        if (((tp->mcfg == CFG_METHOD_7) || (tp->mcfg == CFG_METHOD_8)) && (RTL_R16(tp, CPlusCmd) & ASF))
+        if (((tp->mcfg == CFG_METHOD_7) || (tp->mcfg == CFG_METHOD_8)) && (RTL_R16(CPlusCmd) & ASF))
                 return;
 
         rtl8168_phy_power_down(dev);
 
-        if (!tp->HwIcVerUnknown) {
-                switch (tp->mcfg) {
-                case CFG_METHOD_9:
-                case CFG_METHOD_10:
-                //case CFG_METHOD_11:
-                case CFG_METHOD_12:
-                case CFG_METHOD_13:
-                case CFG_METHOD_14:
-                case CFG_METHOD_15:
-                case CFG_METHOD_17:
-                case CFG_METHOD_18:
-                case CFG_METHOD_19:
-                case CFG_METHOD_21:
-                case CFG_METHOD_22:
-                case CFG_METHOD_24:
-                case CFG_METHOD_25:
-                case CFG_METHOD_26:
-                case CFG_METHOD_27:
-                case CFG_METHOD_28:
-                case CFG_METHOD_29:
-                case CFG_METHOD_30:
-                case CFG_METHOD_31:
-                case CFG_METHOD_32:
-                case CFG_METHOD_33:
-                case CFG_METHOD_34:
-                case CFG_METHOD_35:
-                case CFG_METHOD_36:
-                        RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~BIT_7);
-                        break;
-                }
+        switch (tp->mcfg) {
+        case CFG_METHOD_9:
+        case CFG_METHOD_10:
+        case CFG_METHOD_11:
+        case CFG_METHOD_12:
+        case CFG_METHOD_13:
+        case CFG_METHOD_14:
+        case CFG_METHOD_15:
+        case CFG_METHOD_17:
+        case CFG_METHOD_18:
+        case CFG_METHOD_19:
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                RTL_W8(PMCH, RTL_R8(PMCH) & ~BIT_7);
+                break;
         }
 
         switch (tp->mcfg) {
         case CFG_METHOD_14 ... CFG_METHOD_15:
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) & ~BIT_6);
+                RTL_W8(0xD0, RTL_R8(0xD0) & ~BIT_6);
                 break;
-        case CFG_METHOD_16 ... CFG_METHOD_36:
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) & ~BIT_6);
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) & ~BIT_6);
+        case CFG_METHOD_16 ... CFG_METHOD_32:
+                RTL_W8(0xD0, RTL_R8(0xD0) & ~BIT_6);
+                RTL_W8(0xF2, RTL_R8(0xF2) & ~BIT_6);
                 break;
         }
 }
@@ -6425,6 +4664,8 @@
 static void rtl8168_powerup_pll(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
 
         switch (tp->mcfg) {
         case CFG_METHOD_9:
@@ -6448,11 +4689,7 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) | BIT_7 | BIT_6);
+                RTL_W8(PMCH, RTL_R8(PMCH) | BIT_7 | BIT_6);
                 break;
         }
 
@@ -6465,20 +4702,29 @@
                 struct ethtool_wolinfo *wol)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u8 options;
+        unsigned long flags;
 
-        wol->wolopts = wol->supported = 0;
+        wol->wolopts = 0;
 
-        if (disable_wol_support)
+        if (tp->mcfg == CFG_METHOD_DEFAULT) {
+                wol->supported = 0;
                 return;
+        } else {
+                wol->supported = WAKE_ANY;
+        }
 
-        wol->supported = WAKE_ANY;
+        spin_lock_irqsave(&tp->lock, flags);
 
-        options = RTL_R8(tp, Config1);
+        options = RTL_R8(Config1);
         if (!(options & PMEnable))
-                return;
+                goto out_unlock;
 
         wol->wolopts = tp->wol_opts;
+
+out_unlock:
+        spin_unlock_irqrestore(&tp->lock, flags);
 }
 
 static int
@@ -6486,15 +4732,20 @@
                 struct ethtool_wolinfo *wol)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
 
-        if (disable_wol_support)
+        if (tp->mcfg == CFG_METHOD_DEFAULT)
                 return -EOPNOTSUPP;
 
+        spin_lock_irqsave(&tp->lock, flags);
+
         tp->wol_opts = wol->wolopts;
 
-        tp->wol_enabled = (tp->wol_opts || tp->dash_printer_enabled) ? WOL_ENABLED : WOL_DISABLED;
+        tp->wol_enabled = (tp->wol_opts) ? WOL_ENABLED : WOL_DISABLED;
+
+        spin_unlock_irqrestore(&tp->lock, flags);
 
-        device_set_wakeup_enable(tp_to_dev(tp), tp->wol_enabled);
+        device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);
 
         return 0;
 }
@@ -6504,17 +4755,12 @@
                     struct ethtool_drvinfo *info)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        struct rtl8168_fw *rtl_fw = tp->rtl_fw;
 
-        strscpy(info->driver, MODULENAME, sizeof(info->driver));
-        strscpy(info->version, RTL8168_VERSION, sizeof(info->version));
-        strscpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info));
+        strcpy(info->driver, MODULENAME);
+        strcpy(info->version, RTL8168_VERSION);
+        strcpy(info->bus_info, pci_name(tp->pci_dev));
         info->regdump_len = R8168_REGS_DUMP_SIZE;
         info->eedump_len = tp->eeprom_len;
-        BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version));
-        if (rtl_fw)
-                strscpy(info->fw_version, rtl_fw->version,
-                        sizeof(info->fw_version));
 }
 
 static int
@@ -6537,14 +4783,11 @@
         int rc = -EINVAL;
 
         if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30 ||
-            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-            tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36) {
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 //Disable Giga Lite
                 rtl8168_mdio_write(tp, 0x1F, 0x0A42);
                 rtl8168_clear_eth_phy_bit(tp, 0x14, BIT_9);
-                if (tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-                    tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34)
+                if (tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32)
                         rtl8168_clear_eth_phy_bit(tp, 0x14, BIT_7);
                 rtl8168_mdio_write(tp, 0x1F, 0x0A40);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
@@ -6581,16 +4824,8 @@
                         giga_ctrl |= ADVERTISE_1000FULL;
 
                 //flow control
-                switch (tp->mcfg) {
-                case CFG_METHOD_1 ... CFG_METHOD_20:
-                        if (dev->mtu <= ETH_DATA_LEN && tp->fcpause == rtl8168_fc_full)
-                                auto_nego |= ADVERTISE_PAUSE_CAP|ADVERTISE_PAUSE_ASYM;
-                        break;
-                default:
-                        if (tp->fcpause == rtl8168_fc_full)
-                                auto_nego |= ADVERTISE_PAUSE_CAP|ADVERTISE_PAUSE_ASYM;
-                        break;
-                }
+                if (dev->mtu <= ETH_DATA_LEN)
+                        auto_nego |= ADVERTISE_PAUSE_CAP|ADVERTISE_PAUSE_ASYM;
 
                 tp->phy_auto_nego_reg = auto_nego;
                 tp->phy_1000_ctrl_reg = giga_ctrl;
@@ -6602,9 +4837,11 @@
                 mdelay(20);
         } else {
                 /*true force*/
-                if (speed == SPEED_10 || speed == SPEED_100)
+                if (speed == SPEED_10 || speed == SPEED_100 ||
+                    (speed == SPEED_1000 && duplex == DUPLEX_FULL &&
+                     tp->HwSuppGigaForceMode)) {
                         rtl8168_phy_setup_force_mode(dev, speed, duplex);
-                else
+                } else
                         goto out;
         }
 
@@ -6646,7 +4883,9 @@
 #endif
                     )
 {
+        struct rtl8168_private *tp = netdev_priv(dev);
         int ret;
+        unsigned long flags;
         u8 autoneg;
         u32 speed;
         u8 duplex;
@@ -6671,7 +4910,9 @@
         if (advertising & ~supported)
                 return -EINVAL;
 
+        spin_lock_irqsave(&tp->lock, flags);
         ret = rtl8168_set_speed(dev, autoneg, speed, duplex, advertising);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         return ret;
 }
@@ -6682,12 +4923,15 @@
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         u32 ret;
+        unsigned long flags;
 
+        spin_lock_irqsave(&tp->lock, flags);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
         ret = ((dev->features & NETIF_F_IP_CSUM) != 0);
 #else
         ret = ((dev->features & (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)) != 0);
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         return ret;
 }
@@ -6697,8 +4941,11 @@
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         u32 ret;
+        unsigned long flags;
 
+        spin_lock_irqsave(&tp->lock, flags);
         ret = tp->cp_cmd & RxChkSum;
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         return ret;
 }
@@ -6708,10 +4955,13 @@
                     u32 data)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
 
         if (tp->mcfg == CFG_METHOD_DEFAULT)
                 return -EOPNOTSUPP;
 
+        spin_lock_irqsave(&tp->lock, flags);
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
         if (data)
                 dev->features |= NETIF_F_IP_CSUM;
@@ -6727,6 +4977,8 @@
                 dev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
 
+        spin_unlock_irqrestore(&tp->lock, flags);
+
         return 0;
 }
 
@@ -6735,16 +4987,22 @@
                     u32 data)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
 
         if (tp->mcfg == CFG_METHOD_DEFAULT)
                 return -EOPNOTSUPP;
 
+        spin_lock_irqsave(&tp->lock, flags);
+
         if (data)
                 tp->cp_cmd |= RxChkSum;
         else
                 tp->cp_cmd &= ~RxChkSum;
 
-        RTL_W16(tp, CPlusCmd, tp->cp_cmd);
+        RTL_W16(CPlusCmd, tp->cp_cmd);
+
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         return 0;
 }
@@ -6780,14 +5038,18 @@
                          struct vlan_group *grp)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+        unsigned long flags;
 
+        spin_lock_irqsave(&tp->lock, flags);
         tp->vlgrp = grp;
         if (tp->vlgrp)
                 tp->cp_cmd |= RxVlan;
         else
                 tp->cp_cmd &= ~RxVlan;
-        RTL_W16(tp, CPlusCmd, tp->cp_cmd);
-        RTL_R16(tp, CPlusCmd);
+        RTL_W16(CPlusCmd, tp->cp_cmd);
+        RTL_R16(CPlusCmd);
+        spin_unlock_irqrestore(&tp->lock, flags);
 }
 
 #endif
@@ -6798,13 +5060,16 @@
                          unsigned short vid)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
 
+        spin_lock_irqsave(&tp->lock, flags);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
         if (tp->vlgrp)
                 tp->vlgrp->vlan_devicesvid = NULL;
 #else
         vlan_group_set_device(tp->vlgrp, vid, NULL);
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
+        spin_unlock_irqrestore(&tp->lock, flags);
 }
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 
@@ -6858,12 +5123,17 @@
 static netdev_features_t rtl8168_fix_features(struct net_device *dev,
                 netdev_features_t features)
 {
+        struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
+
+        spin_lock_irqsave(&tp->lock, flags);
         if (dev->mtu > MSS_MAX)
                 features &= ~NETIF_F_ALL_TSO;
         if (dev->mtu > ETH_DATA_LEN) {
                 features &= ~NETIF_F_ALL_TSO;
                 features &= ~NETIF_F_ALL_CSUM;
         }
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         return features;
 }
@@ -6872,28 +5142,29 @@
                                    netdev_features_t features)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 rx_config;
 
-        rx_config = RTL_R32(tp, RxConfig);
+        rx_config = RTL_R32(RxConfig);
         if (features & NETIF_F_RXALL)
                 rx_config |= (AcceptErr | AcceptRunt);
         else
                 rx_config &= ~(AcceptErr | AcceptRunt);
 
-        RTL_W32(tp, RxConfig, rx_config);
+        RTL_W32(RxConfig, rx_config);
 
         if (features & NETIF_F_RXCSUM)
                 tp->cp_cmd |= RxChkSum;
         else
                 tp->cp_cmd &= ~RxChkSum;
 
-        if (features & NETIF_F_HW_VLAN_RX)
+        if (dev->features & NETIF_F_HW_VLAN_RX)
                 tp->cp_cmd |= RxVlan;
         else
                 tp->cp_cmd &= ~RxVlan;
 
-        RTL_W16(tp, CPlusCmd, tp->cp_cmd);
-        RTL_R16(tp, CPlusCmd);
+        RTL_W16(CPlusCmd, tp->cp_cmd);
+        RTL_R16(CPlusCmd);
 
         return 0;
 }
@@ -6901,42 +5172,21 @@
 static int rtl8168_set_features(struct net_device *dev,
                                 netdev_features_t features)
 {
+        struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
+
         features &= NETIF_F_RXALL | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_RX;
 
+        spin_lock_irqsave(&tp->lock, flags);
         if (features ^ dev->features)
                 rtl8168_hw_set_features(dev, features);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         return 0;
 }
 
 #endif
 
-static u8 rtl8168_get_mdi_status(struct rtl8168_private *tp)
-{
-        u32 val;
-
-        if (!tp->link_ok(tp->dev))
-                return ETH_TP_MDI_INVALID;
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_1 ... CFG_METHOD_20:
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                val = rtl8168_mdio_read(tp, 0x11);
-                if (val & BIT_6)
-                        return ETH_TP_MDI_X;
-                else
-                        return ETH_TP_MDI;
-        default:
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                val = rtl8168_mdio_read(tp, 0x1A);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                if (val & BIT_1)
-                        return ETH_TP_MDI;
-                else
-                        return ETH_TP_MDI_X;
-        };
-}
-
 static void rtl8168_gset_xmii(struct net_device *dev,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
                               struct ethtool_cmd *cmd
@@ -6946,11 +5196,13 @@
                              )
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u8 status;
         u8 autoneg, duplex;
         u32 speed = 0;
         u16 bmcr, bmsr, anlpar, ctrl1000 = 0, stat1000 = 0;
         u32 supported, advertising, lp_advertising;
+        unsigned long flags;
 
         supported = SUPPORTED_10baseT_Half |
                     SUPPORTED_10baseT_Full |
@@ -6964,12 +5216,14 @@
 
         advertising = ADVERTISED_TP;
 
+        spin_lock_irqsave(&tp->lock, flags);
         rtl8168_mdio_write(tp, 0x1F, 0x0000);
         bmcr = rtl8168_mdio_read(tp, MII_BMCR);
         bmsr = rtl8168_mdio_read(tp, MII_BMSR);
         anlpar = rtl8168_mdio_read(tp, MII_LPA);
         ctrl1000 = rtl8168_mdio_read(tp, MII_CTRL1000);
         stat1000 = rtl8168_mdio_read(tp, MII_STAT1000);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         if (bmcr & BMCR_ANENABLE) {
                 advertising |= ADVERTISED_Autoneg;
@@ -6998,7 +5252,7 @@
                 lp_advertising = 0;
         }
 
-        status = RTL_R8(tp, PHYstatus);
+        status = RTL_R8(PHYstatus);
 
         if (status & LinkStatus) {
                 /*link on*/
@@ -7033,7 +5287,6 @@
         cmd->speed = speed;
         cmd->duplex = duplex;
         cmd->port = PORT_TP;
-        cmd->eth_tp_mdix = rtl8168_get_mdi_status(tp);
 #else
         ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
                                                 supported);
@@ -7045,7 +5298,6 @@
         cmd->base.speed = speed;
         cmd->base.duplex = duplex;
         cmd->base.port = PORT_TP;
-        cmd->base.eth_tp_mdix = rtl8168_get_mdi_status(tp);
 #endif
 }
 
@@ -7073,12 +5325,14 @@
         void __iomem *ioaddr = tp->mmio_addr;
         unsigned int i;
         u8 *data = p;
+        unsigned long flags;
 
         if (regs->len < R8168_REGS_DUMP_SIZE)
                 return /* -EINVAL */;
 
         memset(p, 0, regs->len);
 
+        spin_lock_irqsave(&tp->lock, flags);
         for (i = 0; i < R8168_MAC_REGS_SIZE; i++)
                 *data++ = readb(ioaddr + i);
         data = (u8*)p + 256;
@@ -7091,7 +5345,7 @@
         data = (u8*)p + 256 * 2;
 
         for (i = 0; i < R8168_EPHY_REGS_SIZE/2; i++) {
-                *(u16*)data = rtl8168_ephy_read(tp, i);
+                *(u16*)data = rtl8168_ephy_read(ioaddr, i);
                 data += 2;
         }
         data = (u8*)p + 256 * 3;
@@ -7104,52 +5358,14 @@
                 break;
         default:
                 for (i = 0; i < R8168_ERI_REGS_SIZE; i+=4) {
-                        *(u32*)data = rtl8168_eri_read(tp, i , 4, ERIAR_ExGMAC);
+                        *(u32*)data = rtl8168_eri_read(ioaddr, i , 4, ERIAR_ExGMAC);
                         data += 4;
                 }
                 break;
         }
+        spin_unlock_irqrestore(&tp->lock, flags);
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-static void rtl8168_get_pauseparam(struct net_device *dev,
-                                   struct ethtool_pauseparam *pause)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        pause->autoneg = (tp->autoneg ? AUTONEG_ENABLE : AUTONEG_DISABLE);
-        if (tp->fcpause == rtl8168_fc_rx_pause)
-                pause->rx_pause = 1;
-        else if (tp->fcpause == rtl8168_fc_tx_pause)
-                pause->tx_pause = 1;
-        else if (tp->fcpause == rtl8168_fc_full) {
-                pause->rx_pause = 1;
-                pause->tx_pause = 1;
-        }
-}
-
-static int rtl8168_set_pauseparam(struct net_device *dev,
-                                  struct ethtool_pauseparam *pause)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        enum rtl8168_fc_mode newfc;
-
-        if (pause->tx_pause || pause->rx_pause)
-                newfc = rtl8168_fc_full;
-        else
-                newfc = rtl8168_fc_none;
-
-        if (tp->fcpause != newfc) {
-                tp->fcpause = newfc;
-
-                rtl8168_set_speed(dev, tp->autoneg, tp->speed, tp->duplex, tp->advertising);
-        }
-
-        return 0;
-
-}
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-
 static u32
 rtl8168_get_msglevel(struct net_device *dev)
 {
@@ -7201,80 +5417,7 @@
                 return -EOPNOTSUPP;
         }
 }
-#endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
-
-static void
-rtl8168_set_ring_size(struct rtl8168_private *tp, u32 rx, u32 tx)
-{
-        int i;
-
-        tp->num_rx_desc = rx;
-
-        for (i = 0; i < tp->num_tx_rings; i++)
-                tp->tx_ringi.num_tx_desc = tx;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-static void rtl8168_get_ringparam(struct net_device *dev,
-                                  struct ethtool_ringparam *ring,
-                                  struct kernel_ethtool_ringparam *kernel_ring,
-                                  struct netlink_ext_ack *extack)
-#else
-static void rtl8168_get_ringparam(struct net_device *dev,
-                                  struct ethtool_ringparam *ring)
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        ring->rx_max_pending = MAX_NUM_TX_DESC;
-        ring->tx_max_pending = MAX_NUM_RX_DESC;
-        ring->rx_pending = tp->num_rx_desc;
-        ring->tx_pending = tp->tx_ring0.num_tx_desc;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-static int rtl8168_set_ringparam(struct net_device *dev,
-                                 struct ethtool_ringparam *ring,
-                                 struct kernel_ethtool_ringparam *kernel_ring,
-                                 struct netlink_ext_ack *extack)
-#else
-static int rtl8168_set_ringparam(struct net_device *dev,
-                                 struct ethtool_ringparam *ring)
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        u32 new_rx_count, new_tx_count;
-        int rc = 0;
-
-        if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-                return -EINVAL;
-
-        new_tx_count = clamp_t(u32, ring->tx_pending,
-                               MIN_NUM_TX_DESC, MAX_NUM_TX_DESC);
-
-        new_rx_count = clamp_t(u32, ring->rx_pending,
-                               MIN_NUM_RX_DESC, MAX_NUM_RX_DESC);
-
-        if ((new_rx_count == tp->num_rx_desc) &&
-            (new_tx_count == tp->tx_ring0.num_tx_desc)) {
-                /* nothing to do */
-                return 0;
-        }
-
-        if (netif_running(dev)) {
-                rtl8168_wait_for_quiescence(dev);
-                rtl8168_close(dev);
-        }
-
-        rtl8168_set_ring_size(tp, new_rx_count, new_tx_count);
-
-        if (netif_running(dev))
-                rc = rtl8168_open(dev);
-
-        return rc;
-}
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#endif
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,22)
 static void
@@ -7283,8 +5426,12 @@
                           u64 *data)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         struct rtl8168_counters *counters;
         dma_addr_t paddr;
+        u32 cmd;
+        u32 WaitCnt;
+        unsigned long flags;
 
         ASSERT_RTNL();
 
@@ -7293,7 +5440,21 @@
         if (!counters)
                 return;
 
-        rtl8168_dump_tally_counter(tp, paddr);
+        spin_lock_irqsave(&tp->lock, flags);
+        RTL_W32(CounterAddrHigh, (u64)paddr >> 32);
+        cmd = (u64)paddr & DMA_BIT_MASK(32);
+        RTL_W32(CounterAddrLow, cmd);
+        RTL_W32(CounterAddrLow, cmd | CounterDump);
+
+        WaitCnt = 0;
+        while (RTL_R32(CounterAddrLow) & CounterDump) {
+                udelay(10);
+
+                WaitCnt++;
+                if (WaitCnt > 20)
+                        break;
+        }
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         data0 = le64_to_cpu(counters->tx_packets);
         data1 = le64_to_cpu(counters->rx_packets);
@@ -7307,7 +5468,7 @@
         data9 = le64_to_cpu(counters->rx_broadcast);
         data10 = le32_to_cpu(counters->rx_multicast);
         data11 = le16_to_cpu(counters->tx_aborted);
-        data12 = le16_to_cpu(counters->tx_underrun);
+        data12 = le16_to_cpu(counters->tx_underun);
 }
 
 static void
@@ -7317,11 +5478,11 @@
 {
         switch (stringset) {
         case ETH_SS_STATS:
-                memcpy(data, rtl8168_gstrings, sizeof(rtl8168_gstrings));
+                memcpy(data, *rtl8168_gstrings, sizeof(rtl8168_gstrings));
                 break;
         }
 }
-#endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,4,22)
+#endif //#LINUX_VERSION_CODE > KERNEL_VERSION(2,4,22)
 
 static int rtl_get_eeprom_len(struct net_device *dev)
 {
@@ -7340,10 +5501,10 @@
         u16 tmp;
 
         if (tp->eeprom_type == EEPROM_TYPE_NONE) {
-                dev_printk(KERN_DEBUG, tp_to_dev(tp), "Detect none EEPROM\n");
+                dev_printk(KERN_DEBUG, &tp->pci_dev->dev, "Detect none EEPROM\n");
                 return -EOPNOTSUPP;
         } else if (eeprom->len == 0 || (eeprom->offset+eeprom->len) > tp->eeprom_len) {
-                dev_printk(KERN_DEBUG, tp_to_dev(tp), "Invalid parameter\n");
+                dev_printk(KERN_DEBUG, &tp->pci_dev->dev, "Invalid parameter\n");
                 return -EINVAL;
         }
 
@@ -7442,171 +5603,12 @@
 }
 #endif
 
-static void
-rtl8168_set_eee_lpi_timer(struct rtl8168_private *tp)
-{
-        u16 dev_lpi_timer;
-
-        dev_lpi_timer = tp->eee.tx_lpi_timer;
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                rtl8168_mac_ocp_write(tp, EEE_TXIDLE_TIMER_8168, dev_lpi_timer);
-                break;
-        default:
-                break;
-        }
-}
-
-static bool rtl8168_is_adv_eee_enabled(struct rtl8168_private *tp)
-{
-        bool enabled = false;
-
-        switch (tp->mcfg) {
-        //case CFG_METHOD_24:
-        case CFG_METHOD_25:
-        case CFG_METHOD_26:
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                if (rtl8168_mdio_read(tp, 0x10) & BIT_15)
-                        enabled = true;
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                break;
-        default:
-                break;
-        }
-
-        return enabled;
-}
-
-static void rtl8168_disable_adv_eee(struct rtl8168_private *tp)
-{
-        bool lock_mutex;
-        bool lock_phy;
-        u16 data;
-
-        switch (tp->mcfg) {
-        //case CFG_METHOD_24:
-        case CFG_METHOD_25:
-        case CFG_METHOD_26:
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                break;
-        default:
-                return;
-        }
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_23:
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-                lock_mutex = true;
-                break;
-        default:
-                lock_mutex = false;
-                break;
-        }
-
-        if (lock_mutex)
-                rtl8168_oob_mutex_lock(tp);
-
-        if (rtl8168_is_adv_eee_enabled(tp))
-                lock_phy = true;
-        else
-                lock_phy = false;
-
-        if (lock_phy)
-                rtl8168_set_phy_mcu_patch_request(tp);
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_25:
-                rtl8168_eri_write(tp, 0x1EA, 1, 0x00, ERIAR_ExGMAC);
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A42);
-                data = rtl8168_mdio_read(tp, 0x16);
-                data &= ~(BIT_1);
-                rtl8168_mdio_write(tp, 0x16, data);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                break;
-        case CFG_METHOD_26:
-                data = rtl8168_mac_ocp_read(tp, 0xE052);
-                data &= ~(BIT_0);
-                rtl8168_mac_ocp_write(tp, 0xE052, data);
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A42);
-                data = rtl8168_mdio_read(tp, 0x16);
-                data &= ~(BIT_1);
-                rtl8168_mdio_write(tp, 0x16, data);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                break;
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-                data = rtl8168_mac_ocp_read(tp, 0xE052);
-                data &= ~(BIT_0);
-                rtl8168_mac_ocp_write(tp, 0xE052, data);
-                break;
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                data = rtl8168_mac_ocp_read(tp, 0xE052);
-                data &= ~(BIT_0);
-                rtl8168_mac_ocp_write(tp, 0xE052, data);
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                data = rtl8168_mdio_read(tp, 0x10) & ~(BIT_15);
-                rtl8168_mdio_write(tp, 0x10, data);
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A44);
-                data = rtl8168_mdio_read(tp, 0x11) & ~(BIT_12 | BIT_13 | BIT_14);
-                rtl8168_mdio_write(tp, 0x11, data);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                break;
-        }
-
-        if (lock_phy)
-                rtl8168_clear_phy_mcu_patch_request(tp);
-
-        if (lock_mutex)
-                rtl8168_oob_mutex_unlock(tp);
-}
-
-static int rtl8168_enable_eee(struct rtl8168_private *tp)
+static int rtl8168_enable_EEE(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         int ret;
         u16 data;
         u32 csi_tmp;
-        struct ethtool_eee *eee = &tp->eee;
-        u16 eee_adv_t = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
 
         ret = 0;
         switch (tp->mcfg) {
@@ -7628,10 +5630,10 @@
                 rtl8168_mdio_write(tp, 0x0D, 0x4007);
                 rtl8168_mdio_write(tp, 0x0E, 0x0006);
                 rtl8168_mdio_write(tp, 0x0D, 0x0000);
-                if ((RTL_R8(tp, Config4)&0x40) && (RTL_R8(tp, 0x6D) & BIT_7)) {
+                if ((RTL_R8(Config4)&0x40) && (RTL_R8(0x6D) & BIT_7)) {
                         rtl8168_mdio_write(tp, 0x1F, 0x0005);
                         rtl8168_mdio_write(tp, 0x05, 0x8AC8);
-                        rtl8168_mdio_write(tp, 0x06, RTL_R16(tp, tp->NicCustLedValue));
+                        rtl8168_mdio_write(tp, 0x06, RTL_R16(tp->NicCustLedValue));
                         rtl8168_mdio_write(tp, 0x05, 0x8B82);
                         data = rtl8168_mdio_read(tp, 0x06) | 0x0010;
                         rtl8168_mdio_write(tp, 0x05, 0x8B82);
@@ -7642,8 +5644,8 @@
 
         case CFG_METHOD_16:
         case CFG_METHOD_17:
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC) | 0x0003;
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC) | 0x0003;
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
                 rtl8168_mdio_write(tp,0x1F , 0x0004);
                 rtl8168_mdio_write(tp,0x1F , 0x0007);
                 rtl8168_mdio_write(tp,0x1E , 0x0020);
@@ -7665,9 +5667,9 @@
         case CFG_METHOD_18:
         case CFG_METHOD_19:
         case CFG_METHOD_20:
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
                 csi_tmp |= BIT_1 | BIT_0;
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
                 rtl8168_mdio_write(tp, 0x1F, 0x0007);
                 rtl8168_mdio_write(tp, 0x1e, 0x0020);
                 data = rtl8168_mdio_read(tp, 0x15);
@@ -7698,23 +5700,19 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
                 csi_tmp |= BIT_1 | BIT_0;
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, 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, eee_adv_t);
+                rtl8168_mdio_write(tp, 0x10, tp->eee_adv_t);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                 break;
 
         default:
-//      dev_printk(KERN_DEBUG, tp_to_dev(tp), "Not Support EEE\n");
+//      dev_printk(KERN_DEBUG, &tp->pci_dev->dev, "Not Support EEE\n");
                 ret = -EOPNOTSUPP;
                 break;
         }
@@ -7724,10 +5722,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
                 rtl8168_mdio_write(tp, 0x1F, 0x0A4A);
                 rtl8168_set_eth_phy_bit(tp, 0x11, BIT_9);
                 rtl8168_mdio_write(tp, 0x1F, 0x0A42);
@@ -7737,13 +5731,143 @@
         }
 
         /*Advanced EEE*/
-        rtl8168_disable_adv_eee(tp);
+        switch (tp->mcfg) {
+        case CFG_METHOD_23:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_oob_mutex_lock(tp);
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_set_phy_mcu_patch_request(tp);
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_25:
+                rtl8168_eri_write(ioaddr, 0x1EA, 1, 0xFA, ERIAR_ExGMAC);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                data = rtl8168_mdio_read(tp, 0x10);
+                if (data & BIT_10) {
+                        rtl8168_mdio_write(tp, 0x1F, 0x0A42);
+                        data = rtl8168_mdio_read(tp, 0x16);
+                        data &= ~(BIT_1);
+                        rtl8168_mdio_write(tp, 0x16, data);
+                } else {
+                        rtl8168_mdio_write(tp, 0x1F, 0x0A42);
+                        data = rtl8168_mdio_read(tp, 0x16);
+                        data |= BIT_1;
+                        rtl8168_mdio_write(tp, 0x16, data);
+                }
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                break;
+        case CFG_METHOD_26:
+                data = rtl8168_mac_ocp_read(tp, 0xE052);
+                data |= BIT_0;
+                rtl8168_mac_ocp_write(tp, 0xE052, data);
+                data = rtl8168_mac_ocp_read(tp, 0xE056);
+                data &= 0xFF0F;
+                data |= (BIT_4 | BIT_5 | BIT_6);
+                rtl8168_mac_ocp_write(tp, 0xE056, data);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                data = rtl8168_mdio_read(tp, 0x10);
+                if (data & BIT_10) {
+                        rtl8168_mdio_write(tp, 0x1F, 0x0A42);
+                        data = rtl8168_mdio_read(tp, 0x16);
+                        data &= ~(BIT_1);
+                        rtl8168_mdio_write(tp, 0x16, data);
+                } else {
+                        rtl8168_mdio_write(tp, 0x1F, 0x0A42);
+                        data = rtl8168_mdio_read(tp, 0x16);
+                        data |= BIT_1;
+                        rtl8168_mdio_write(tp, 0x16, data);
+                }
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                break;
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+                data = rtl8168_mac_ocp_read(tp, 0xE052);
+                data &= ~BIT_0;
+                rtl8168_mac_ocp_write(tp, 0xE052, data);
+                data = rtl8168_mac_ocp_read(tp, 0xE056);
+                data &= 0xFF0F;
+                data |= (BIT_4 | BIT_5 | BIT_6);
+                rtl8168_mac_ocp_write(tp, 0xE056, data);
+                break;
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+                data = rtl8168_mac_ocp_read(tp, 0xE052);
+                data |= BIT_0;
+                rtl8168_mac_ocp_write(tp, 0xE052, data);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                data = rtl8168_mdio_read(tp, 0x10) | BIT_15;
+                rtl8168_mdio_write(tp, 0x10, data);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A44);
+                data = rtl8168_mdio_read(tp, 0x11) | BIT_13 | BIT_14;
+                data &= ~(BIT_12);
+                rtl8168_mdio_write(tp, 0x11, data);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                break;
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                data = rtl8168_mac_ocp_read(tp, 0xE052);
+                data |= BIT_0;
+                rtl8168_mac_ocp_write(tp, 0xE052, data);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                data = rtl8168_mdio_read(tp, 0x10) | BIT_15;
+                rtl8168_mdio_write(tp, 0x10, data);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A44);
+                data = rtl8168_mdio_read(tp, 0x11) | BIT_13 | BIT_14;
+                data &= ~(BIT_12);
+                rtl8168_mdio_write(tp, 0x11, data);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_clear_phy_mcu_patch_request(tp);
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_23:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_oob_mutex_unlock(tp);
+                break;
+        }
 
         return ret;
 }
 
-static int rtl8168_disable_eee(struct rtl8168_private *tp)
+static int rtl8168_disable_EEE(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         int ret;
         u16 data;
         u32 csi_tmp;
@@ -7769,7 +5893,7 @@
                 rtl8168_mdio_write(tp, 0x0E, 0x0000);
                 rtl8168_mdio_write(tp, 0x0D, 0x0000);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                if (RTL_R8(tp, Config4) & 0x40) {
+                if (RTL_R8(Config4) & 0x40) {
                         rtl8168_mdio_write(tp, 0x1F, 0x0005);
                         rtl8168_mdio_write(tp, 0x05, 0x8B82);
                         data = rtl8168_mdio_read(tp, 0x06) & ~0x0010;
@@ -7781,8 +5905,8 @@
 
         case CFG_METHOD_16:
         case CFG_METHOD_17:
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0,4, ERIAR_ExGMAC)& ~0x0003;
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0,4, ERIAR_ExGMAC)& ~0x0003;
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
                 rtl8168_mdio_write(tp, 0x1F, 0x0005);
                 rtl8168_mdio_write(tp, 0x05, 0x8B85);
                 data = rtl8168_mdio_read(tp, 0x06) & ~0x2000;
@@ -7805,9 +5929,9 @@
         case CFG_METHOD_18:
         case CFG_METHOD_19:
         case CFG_METHOD_20:
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~(BIT_1 | BIT_0);
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
                 rtl8168_mdio_write(tp, 0x1F, 0x0005);
                 rtl8168_mdio_write(tp, 0x05, 0x8B85);
                 data = rtl8168_mdio_read(tp, 0x06);
@@ -7839,26 +5963,19 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~(BIT_1 | BIT_0);
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 data = rtl8168_mdio_read(tp, 0x11);
-                if (tp->mcfg == CFG_METHOD_36)
-                        rtl8168_mdio_write(tp, 0x11, data | BIT_4);
-                else
-                        rtl8168_mdio_write(tp, 0x11, data & ~BIT_4);
+                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);
                 break;
 
         default:
-//      dev_printk(KERN_DEBUG, tp_to_dev(tp), "Not Support EEE\n");
+//      dev_printk(KERN_DEBUG, &tp->pci_dev->dev, "Not Support EEE\n");
                 ret = -EOPNOTSUPP;
                 break;
         }
@@ -7866,8 +5983,6 @@
         switch (tp->mcfg) {
         case CFG_METHOD_29:
         case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
                 rtl8168_mdio_write(tp, 0x1F, 0x0A42);
                 rtl8168_clear_eth_phy_bit(tp, 0x14, BIT_7);
                 rtl8168_mdio_write(tp, 0x1F, 0x0A4A);
@@ -7877,7 +5992,95 @@
         }
 
         /*Advanced EEE*/
-        rtl8168_disable_adv_eee(tp);
+        switch (tp->mcfg) {
+        case CFG_METHOD_23:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_oob_mutex_lock(tp);
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_set_phy_mcu_patch_request(tp);
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_25:
+                rtl8168_eri_write(ioaddr, 0x1EA, 1, 0x00, ERIAR_ExGMAC);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A42);
+                data = rtl8168_mdio_read(tp, 0x16);
+                data &= ~(BIT_1);
+                rtl8168_mdio_write(tp, 0x16, data);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                break;
+        case CFG_METHOD_26:
+                data = rtl8168_mac_ocp_read(tp, 0xE052);
+                data &= ~(BIT_0);
+                rtl8168_mac_ocp_write(tp, 0xE052, data);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A42);
+                data = rtl8168_mdio_read(tp, 0x16);
+                data &= ~(BIT_1);
+                rtl8168_mdio_write(tp, 0x16, data);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                break;
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+                data = rtl8168_mac_ocp_read(tp, 0xE052);
+                data &= ~(BIT_0);
+                rtl8168_mac_ocp_write(tp, 0xE052, data);
+                break;
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                data = rtl8168_mac_ocp_read(tp, 0xE052);
+                data &= ~(BIT_0);
+                rtl8168_mac_ocp_write(tp, 0xE052, data);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                data = rtl8168_mdio_read(tp, 0x10) & ~(BIT_15);
+                rtl8168_mdio_write(tp, 0x10, data);
+
+                rtl8168_mdio_write(tp, 0x1F, 0x0A44);
+                data = rtl8168_mdio_read(tp, 0x11) & ~(BIT_12 | BIT_13 | BIT_14);
+                rtl8168_mdio_write(tp, 0x11, data);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_clear_phy_mcu_patch_request(tp);
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_23:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_oob_mutex_unlock(tp);
+                break;
+        }
 
         return ret;
 }
@@ -7885,11 +6088,14 @@
 static int rtl_nway_reset(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
         int ret, bmcr;
 
         if (unlikely(tp->rtk_enable_diag))
                 return -EBUSY;
 
+        spin_lock_irqsave(&tp->lock, flags);
+
         /* if autoneg is off, it's an error */
         rtl8168_mdio_write(tp, 0x1F, 0x0000);
         bmcr = rtl8168_mdio_read(tp, MII_BMCR);
@@ -7902,184 +6108,118 @@
                 ret = -EINVAL;
         }
 
+        spin_unlock_irqrestore(&tp->lock, flags);
+
         return ret;
 }
-static bool
-rtl8168_support_eee(struct rtl8168_private *tp)
-{
-        switch (tp->mcfg) {
-        case CFG_METHOD_21 ... CFG_METHOD_36:
-                return 1;
-        default:
-                return 0;
-        }
-}
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
-static u32
-rtl8168_device_lpi_t_to_ethtool_lpi_t(struct rtl8168_private *tp , u32 lpi_timer)
-{
-        u32 to_us;
-        u8 status;
-
-        //Giga: lpi_timer * 8ns
-        //100M : lpi_timer * 80ns
-        to_us = 0;
-        status = RTL_R8(tp, PHYstatus);
-        if (status & LinkStatus) {
-                /*link on*/
-                if (status & _1000bpsF)
-                        to_us = lpi_timer * 8;
-                else if (status & _100bps)
-                        to_us = lpi_timer * 80;
-        }
-
-        //ns to us
-        to_us /= 1000;
-
-        return to_us;
-}
-
 static int
-rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
+rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *eee)
 {
         struct rtl8168_private *tp = netdev_priv(net);
-        struct ethtool_eee *eee = &tp->eee;
-        u32 lp, adv, tx_lpi_timer, supported = 0;
+        void __iomem *ioaddr = tp->mmio_addr;
+        u32 lp, adv, supported = 0;
+        unsigned long flags;
         u16 val;
 
-        if (!rtl8168_support_eee(tp))
+        switch (tp->mcfg) {
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                break;
+        default:
                 return -EOPNOTSUPP;
+        }
 
         if (unlikely(tp->rtk_enable_diag))
                 return -EBUSY;
 
-        /* Get Supported EEE */
-        supported = eee->supported;
+        spin_lock_irqsave(&tp->lock, flags);
 
-        /* Get advertisement EEE */
-        adv = eee->advertised;
+        rtl8168_mdio_write(tp, 0x1F, 0x0A5C);
+        val = rtl8168_mdio_read(tp, 0x12);
+        supported = mmd_eee_cap_to_ethtool_sup_t(val);
 
-        /* Get LP advertisement EEE */
         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);
 
-        /* Get EEE Tx LPI timer*/
-        tx_lpi_timer = rtl8168_device_lpi_t_to_ethtool_lpi_t(tp, eee->tx_lpi_timer);
-
-        val = rtl8168_eri_read(tp, 0x1B0, 2, ERIAR_ExGMAC);
+        val = rtl8168_eri_read(ioaddr, 0x1B0, 2, ERIAR_ExGMAC);
         val &= BIT_1 | BIT_0;
 
         rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
-        edata->eee_enabled = !!val;
-        edata->eee_active = !!(supported & adv & lp);
-        edata->supported = supported;
-        edata->advertised = adv;
-        edata->lp_advertised = lp;
-        edata->tx_lpi_enabled = edata->eee_enabled;
-        edata->tx_lpi_timer = tx_lpi_timer;
+        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 *edata)
+rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *eee)
 {
         struct rtl8168_private *tp = netdev_priv(net);
-        struct ethtool_eee *eee = &tp->eee;
-        u32 advertising;
-        int rc = 0;
+        unsigned long flags;
 
-        if (!rtl8168_support_eee(tp))
-                return -EOPNOTSUPP;
-
-        if (HW_SUPP_SERDES_PHY(tp) ||
-            !HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp) ||
-            tp->DASH)
+        switch (tp->mcfg) {
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                break;
+        default:
                 return -EOPNOTSUPP;
-
-        if (unlikely(tp->rtk_enable_diag)) {
-                dev_printk(KERN_WARNING, tp_to_dev(tp), "Diag Enabled\n");
-                rc = -EBUSY;
-                goto out;
         }
 
-        if (tp->autoneg != AUTONEG_ENABLE) {
-                dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE requires autoneg\n");
-                rc = -EINVAL;
-                goto out;
-        }
+        spin_lock_irqsave(&tp->lock, flags);
 
-        advertising = tp->advertising;
-        if (!edata->advertised) {
-                edata->advertised = advertising & eee->supported;
-        } else if (edata->advertised & ~advertising) {
-                dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of autoneg advertised speeds %x\n",
-                           edata->advertised, advertising);
-                rc = -EINVAL;
-                goto out;
-        }
-
-        if (edata->advertised & ~eee->supported) {
-                dev_printk(KERN_WARNING, tp_to_dev(tp), "EEE advertised %x must be a subset of support %x\n",
-                           edata->advertised, eee->supported);
-                rc = -EINVAL;
-                goto out;
+        if (unlikely(tp->rtk_enable_diag)) {
+                spin_unlock_irqrestore(&tp->lock, flags);
+                return -EBUSY;
         }
 
-        eee->advertised = edata->advertised;
-        eee->eee_enabled = edata->eee_enabled;
+        tp->eee_enabled = eee->eee_enabled;
+        tp->eee_adv_t = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
 
-        if (eee->eee_enabled)
-                rtl8168_enable_eee(tp);
+        if (tp->eee_enabled)
+                rtl8168_enable_EEE(tp);
         else
-                rtl8168_disable_eee(tp);
-
-        rtl_nway_reset(net);
+                rtl8168_disable_EEE(tp);
 
-        return rc;
+        spin_unlock_irqrestore(&tp->lock, flags);
 
-out:
+        rtl_nway_reset(net);
 
-        return rc;
+        return 0;
 }
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
-static void rtl8168_get_channels(struct net_device *dev,
-                                 struct ethtool_channels *channel)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        channel->max_rx = tp->HwSuppNumRxQueues;
-        channel->max_tx = tp->HwSuppNumTxQueues;
-        channel->rx_count = tp->num_rx_rings;
-        channel->tx_count = tp->num_tx_rings;
-}
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) */
-
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,22)
 static const struct ethtool_ops rtl8168_ethtool_ops = {
         .get_drvinfo        = rtl8168_get_drvinfo,
         .get_regs_len       = rtl8168_get_regs_len,
-        .get_link           = ethtool_op_get_link,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-        .get_ringparam      = rtl8168_get_ringparam,
-        .set_ringparam      = rtl8168_set_ringparam,
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+        .get_link       = ethtool_op_get_link,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
         .get_settings       = rtl8168_get_settings,
         .set_settings       = rtl8168_set_settings,
 #else
         .get_link_ksettings       = rtl8168_get_settings,
         .set_link_ksettings       = rtl8168_set_settings,
-#endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-        .get_pauseparam     = rtl8168_get_pauseparam,
-        .set_pauseparam     = rtl8168_set_pauseparam,
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#endif
         .get_msglevel       = rtl8168_get_msglevel,
         .set_msglevel       = rtl8168_set_msglevel,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
@@ -8092,8 +6232,8 @@
 #ifdef NETIF_F_TSO
         .get_tso        = ethtool_op_get_tso,
         .set_tso        = ethtool_op_set_tso,
-#endif //NETIF_F_TSO
-#endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+#endif
+#endif
         .get_regs       = rtl8168_get_regs,
         .get_wol        = rtl8168_get_wol,
         .set_wol        = rtl8168_set_wol,
@@ -8102,7 +6242,7 @@
         .get_stats_count    = rtl8168_get_stats_count,
 #else
         .get_sset_count     = rtl8168_get_sset_count,
-#endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+#endif
         .get_ethtool_stats  = rtl8168_get_ethtool_stats,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
 #ifdef ETHTOOL_GPERMADDR
@@ -8111,14 +6251,6 @@
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
         .get_eeprom     = rtl_get_eeprom,
         .get_eeprom_len     = rtl_get_eeprom_len,
-#ifdef ENABLE_RSS_SUPPORT
-        .get_rxnfc		= rtl8168_get_rxnfc,
-        .set_rxnfc		= rtl8168_set_rxnfc,
-        .get_rxfh_indir_size	= rtl8168_rss_indir_size,
-        .get_rxfh_key_size	= rtl8168_get_rxfh_key_size,
-        .get_rxfh		= rtl8168_get_rxfh,
-        .set_rxfh		= rtl8168_set_rxfh,
-#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
         .get_ts_info        = ethtool_op_get_ts_info,
 #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
@@ -8126,19 +6258,175 @@
         .get_eee = rtl_ethtool_get_eee,
         .set_eee = rtl_ethtool_set_eee,
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
-        .get_channels		= rtl8168_get_channels,
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) */
         .nway_reset = rtl_nway_reset,
 };
 #endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,4,22)
 
-static void rtl8168_get_mac_version(struct rtl8168_private *tp)
+#if 0
+
+static int rtl8168_enable_green_feature(struct rtl8168_private *tp)
+{
+        u16 gphy_val;
+        unsigned long flags;
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_14:
+        case CFG_METHOD_15:
+                rtl8168_mdio_write(tp, 0x1F, 0x0003);
+                gphy_val = rtl8168_mdio_read(tp, 0x10) | 0x0400;
+                rtl8168_mdio_write(tp, 0x10, gphy_val);
+                gphy_val = rtl8168_mdio_read(tp, 0x19) | 0x0001;
+                rtl8168_mdio_write(tp, 0x19, gphy_val);
+                rtl8168_mdio_write(tp, 0x1F, 0x0005);
+                gphy_val = rtl8168_mdio_read(tp, 0x01) & ~0x0100;
+                rtl8168_mdio_write(tp, 0x01, gphy_val);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                rtl8168_mdio_write(tp, 0x00, 0x9200);
+                mdelay(20);
+                break;
+
+        case CFG_METHOD_17:
+        case CFG_METHOD_18:
+        case CFG_METHOD_19:
+        case CFG_METHOD_20:
+                rtl8168_mdio_write(tp, 0x1f, 0x0003);
+                gphy_val = rtl8168_mdio_read(tp, 0x10);
+                gphy_val |= BIT_10;
+                rtl8168_mdio_write(tp, 0x10, gphy_val);
+                gphy_val = rtl8168_mdio_read(tp, 0x19);
+                gphy_val |= BIT_0;
+                rtl8168_mdio_write(tp, 0x19, gphy_val);
+                rtl8168_mdio_write(tp, 0x1F, 0x0005);
+                gphy_val = rtl8168_mdio_read(tp, 0x01);
+                gphy_val |= BIT_8;
+                rtl8168_mdio_write(tp, 0x01, gphy_val);
+                rtl8168_mdio_write(tp, 0x1f, 0x0000);
+                rtl8168_mdio_write(tp, 0x00, 0x9200);
+                break;
+        case CFG_METHOD_21:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                rtl8168_mdio_write(tp, 0x13, 0x8011);
+                rtl8168_set_eth_phy_bit( tp, 0x14, BIT_14 );
+                rtl8168_mdio_write(tp, 0x1F, 0x0A40);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                rtl8168_mdio_write(tp, 0x00, 0x9200);
+                break;
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                rtl8168_mdio_write(tp, 0x13, 0x8045);
+                rtl8168_mdio_write(tp, 0x14, 0x0000);
+                rtl8168_mdio_write(tp, 0x13, 0x804d);
+                rtl8168_mdio_write(tp, 0x14, 0x1222);
+                rtl8168_mdio_write(tp, 0x13, 0x805d);
+                rtl8168_mdio_write(tp, 0x14, 0x0022);
+                rtl8168_mdio_write(tp, 0x13, 0x8011);
+                rtl8168_set_eth_phy_bit( tp, 0x14, BIT_15 );
+                rtl8168_mdio_write(tp, 0x1F, 0x0A40);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                rtl8168_mdio_write(tp, 0x00, 0x9200);
+                break;
+        default:
+                dev_printk(KERN_DEBUG, &tp->pci_dev->dev, "Not Support Green Feature\n");
+                break;
+        }
+
+        return 0;
+}
+
+static int rtl8168_disable_green_feature(struct rtl8168_private *tp)
+{
+        u16 gphy_val;
+        unsigned long flags;
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_14:
+        case CFG_METHOD_15:
+                rtl8168_mdio_write(tp, 0x1F, 0x0005);
+                gphy_val = rtl8168_mdio_read(tp, 0x01) | 0x0100;
+                rtl8168_mdio_write(tp, 0x01, gphy_val);
+                rtl8168_mdio_write(tp, 0x1F, 0x0003);
+                gphy_val = rtl8168_mdio_read(tp, 0x10) & ~0x0400;
+                rtl8168_mdio_write(tp, 0x10, gphy_val);
+                gphy_val = rtl8168_mdio_read(tp, 0x19) & ~0x0001;
+                rtl8168_mdio_write(tp, 0x19, gphy_val);
+                rtl8168_mdio_write(tp, 0x1F, 0x0002);
+                gphy_val = rtl8168_mdio_read(tp, 0x06) & ~0x7000;
+                gphy_val |= 0x3000;
+                rtl8168_mdio_write(tp, 0x06, gphy_val);
+                gphy_val = rtl8168_mdio_read(tp, 0x0D) & 0x0700;
+                gphy_val |= 0x0500;
+                rtl8168_mdio_write(tp, 0x0D, gphy_val);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                break;
+
+        case CFG_METHOD_17:
+        case CFG_METHOD_18:
+        case CFG_METHOD_19:
+        case CFG_METHOD_20:
+                rtl8168_mdio_write(tp, 0x1f, 0x0003);
+                gphy_val = rtl8168_mdio_read(tp, 0x19);
+                gphy_val &= ~BIT_0;
+                rtl8168_mdio_write(tp, 0x19, gphy_val);
+                gphy_val = rtl8168_mdio_read(tp, 0x10);
+                gphy_val &= ~BIT_10;
+                rtl8168_mdio_write(tp, 0x10, gphy_val);
+                rtl8168_mdio_write(tp, 0x1f, 0x0000);
+                break;
+        case CFG_METHOD_21:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                rtl8168_mdio_write(tp, 0x13, 0x8011);
+                rtl8168_clear_eth_phy_bit( tp, 0x14, BIT_14 );
+                rtl8168_mdio_write(tp, 0x1F, 0x0A40);
+                rtl8168_mdio_write(tp, 0x00, 0x9200);
+                break;
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                rtl8168_mdio_write(tp, 0x13, 0x8045);
+                rtl8168_mdio_write(tp, 0x14, 0x2444);
+                rtl8168_mdio_write(tp, 0x13, 0x804d);
+                rtl8168_mdio_write(tp, 0x14, 0x2444);
+                rtl8168_mdio_write(tp, 0x13, 0x805d);
+                rtl8168_mdio_write(tp, 0x14, 0x2444);
+                rtl8168_mdio_write(tp, 0x13, 0x8011);
+                rtl8168_set_eth_phy_bit( tp, 0x14, BIT_15 );
+                rtl8168_mdio_write(tp, 0x1F, 0x0A40);
+                rtl8168_mdio_write(tp, 0x1F, 0x0000);
+                rtl8168_mdio_write(tp, 0x00, 0x9200);
+                break;
+        default:
+                dev_printk(KERN_DEBUG, &tp->pci_dev->dev, "Not Support Green Feature\n");
+                break;
+        }
+
+        return 0;
+}
+
+#endif
+
+static void rtl8168_get_mac_version(struct rtl8168_private *tp, void __iomem *ioaddr)
 {
         u32 reg,val32;
         u32 ICVerID;
 
-        val32 = RTL_R32(tp, TxConfig);
+        val32 = RTL_R32(TxConfig);
         reg = val32 & 0x7c800000;
         ICVerID = val32 & 0x00700000;
 
@@ -8198,7 +6486,7 @@
                         tp->mcfg = CFG_METHOD_11;
                 } else if (ICVerID == 0x00200000) {
                         tp->mcfg = CFG_METHOD_12;
-                        RTL_W32(tp, 0xD0, RTL_R32(tp, 0xD0) | 0x00020000);
+                        RTL_W32(0xD0, RTL_R32(0xD0) | 0x00020000);
                 } else if (ICVerID == 0x00300000) {
                         tp->mcfg = CFG_METHOD_13;
                 } else {
@@ -8305,25 +6593,6 @@
                         tp->HwIcVerUnknown = TRUE;
                 }
 
-                if (tp->mcfg == CFG_METHOD_30) {
-                        if ((rtl8168_mac_ocp_read(tp, 0xD006) & 0xFF00) ==
-                            0x0100)
-                                tp->mcfg = CFG_METHOD_35;
-                        else if ((rtl8168_mac_ocp_read(tp, 0xD006) & 0xFF00) ==
-                                 0x0300)
-                                tp->mcfg = CFG_METHOD_36;
-                }
-
-                tp->efuse_ver = EFUSE_SUPPORT_V3;
-                break;
-        case 0x6C000000:
-                if (ICVerID == 0x00000000) {
-                        tp->mcfg = CFG_METHOD_37;
-                } else {
-                        tp->mcfg = CFG_METHOD_37;
-                        tp->HwIcVerUnknown = TRUE;
-                }
-
                 tp->efuse_ver = EFUSE_SUPPORT_V3;
                 break;
         case 0x54800000:
@@ -8331,12 +6600,8 @@
                         tp->mcfg = CFG_METHOD_31;
                 } else if (ICVerID == 0x00200000) {
                         tp->mcfg = CFG_METHOD_32;
-                } else if (ICVerID == 0x00300000) {
-                        tp->mcfg = CFG_METHOD_33;
-                } else if (ICVerID == 0x00400000) {
-                        tp->mcfg = CFG_METHOD_34;
                 } else {
-                        tp->mcfg = CFG_METHOD_34;
+                        tp->mcfg = CFG_METHOD_32;
                         tp->HwIcVerUnknown = TRUE;
                 }
 
@@ -8389,9 +6654,10 @@
 {
         u16 reg = (u16)((DwCmd & 0x00FE0000) >> 17);
         u32 DummyPos = rtl8168_calc_efuse_dummy_bit(reg);
-        u32 DeCodeDwCmd;
+        u32 DeCodeDwCmd = DwCmd;
         u32 Dw17BitData;
 
+
         if (tp->efuse_ver < 3) {
                 DeCodeDwCmd = (DwCmd>>(DummyPos+1))<<DummyPos;
                 if (DummyPos > 0) {
@@ -8414,6 +6680,7 @@
 
 static u8 rtl8168_efuse_read(struct rtl8168_private *tp, u16 reg)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         u8 efuse_data = 0;
         u32 temp;
         int cnt;
@@ -8423,36 +6690,36 @@
 
         if (tp->efuse_ver == EFUSE_SUPPORT_V1) {
                 temp = EFUSE_READ | ((reg & EFUSE_Reg_Mask) << EFUSE_Reg_Shift);
-                RTL_W32(tp, EFUSEAR, temp);
+                RTL_W32(EFUSEAR, temp);
 
                 cnt = 0;
                 do {
                         udelay(100);
-                        temp = RTL_R32(tp, EFUSEAR);
+                        temp = RTL_R32(EFUSEAR);
                         cnt++;
                 } while (!(temp & EFUSE_READ_OK) && (cnt < EFUSE_Check_Cnt));
 
                 if (cnt == EFUSE_Check_Cnt)
                         efuse_data = EFUSE_READ_FAIL;
                 else
-                        efuse_data = (u8)(RTL_R32(tp, EFUSEAR) & EFUSE_Data_Mask);
+                        efuse_data = (u8)(RTL_R32(EFUSEAR) & EFUSE_Data_Mask);
         } else  if (tp->efuse_ver == EFUSE_SUPPORT_V2) {
                 temp = (reg/2) & 0x03ff;
                 temp <<= 17;
                 temp |= EFUSE_READ;
-                RTL_W32(tp, EFUSEAR, temp);
+                RTL_W32(EFUSEAR, temp);
 
                 cnt = 0;
                 do {
                         udelay(100);
-                        temp = RTL_R32(tp, EFUSEAR);
+                        temp = RTL_R32(EFUSEAR);
                         cnt++;
                 } while (!(temp & EFUSE_READ_OK) && (cnt < EFUSE_Check_Cnt));
 
                 if (cnt == EFUSE_Check_Cnt) {
                         efuse_data = EFUSE_READ_FAIL;
                 } else {
-                        temp = RTL_R32(tp, EFUSEAR);
+                        temp = RTL_R32(EFUSEAR);
                         temp = rtl8168_decode_efuse_cmd(tp, temp);
 
                         if (reg%2) {
@@ -8466,19 +6733,19 @@
                 temp = (reg/2) & 0x03ff;
                 temp <<= 16;
                 temp |= EFUSE_READ_V3;
-                RTL_W32(tp, EFUSEAR, temp);
+                RTL_W32(EFUSEAR, temp);
 
                 cnt = 0;
                 do {
                         udelay(100);
-                        temp = RTL_R32(tp, EFUSEAR);
+                        temp = RTL_R32(EFUSEAR);
                         cnt++;
                 } while ((temp & BIT_31) && (cnt < EFUSE_Check_Cnt));
 
                 if (cnt == EFUSE_Check_Cnt) {
                         efuse_data = EFUSE_READ_FAIL;
                 } else {
-                        temp = RTL_R32(tp, EFUSEAR);
+                        temp = RTL_R32(EFUSEAR);
                         temp = rtl8168_decode_efuse_cmd(tp, temp);
 
                         if (reg%2) {
@@ -8490,7 +6757,7 @@
                 }
         }
 
-        udelay(R8168_CHANNEL_EXIT_DELAY_TIME);
+        udelay(20);
 
         return efuse_data;
 }
@@ -8498,277 +6765,29 @@
 static void
 rtl8168_tally_counter_addr_fill(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+
         if (!tp->tally_paddr)
                 return;
 
-        RTL_W32(tp, CounterAddrHigh, (u64)tp->tally_paddr >> 32);
-        RTL_W32(tp, CounterAddrLow, (u64)tp->tally_paddr & (DMA_BIT_MASK(32)));
+        RTL_W32(CounterAddrHigh, (u64)tp->tally_paddr >> 32);
+        RTL_W32(CounterAddrLow, (u64)tp->tally_paddr & (DMA_BIT_MASK(32)));
 }
 
 static void
 rtl8168_tally_counter_clear(struct rtl8168_private *tp)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
+
         if (tp->mcfg == CFG_METHOD_1 || tp->mcfg == CFG_METHOD_2 ||
-            tp->mcfg == CFG_METHOD_3)
+            tp->mcfg == CFG_METHOD_3 )
                 return;
 
         if (!tp->tally_paddr)
                 return;
 
-        RTL_W32(tp, CounterAddrHigh, (u64)tp->tally_paddr >> 32);
-        RTL_W32(tp, CounterAddrLow, ((u64)tp->tally_paddr & (DMA_BIT_MASK(32))) | CounterReset);
-}
-
-static
-u16
-rtl8168_get_phy_state(struct rtl8168_private *tp)
-{
-        u16 PhyState = 0xFF;
-
-        if (HW_SUPPORT_UPS_MODE(tp) == FALSE)
-                goto exit;
-
-        switch (tp->HwSuppUpsVer) {
-        case 1:
-                PhyState = rtl8168_mdio_read_phy_ocp(tp, 0x0A42, 0x10);
-                PhyState &= 0x7;  //bit2:0
-                break;
-        }
-
-exit:
-        return PhyState;
-}
-
-static
-bool
-rtl8168_wait_phy_state_ready(struct rtl8168_private *tp,
-                             u16 PhyState,
-                             u32 MicroSecondTimeout
-                            )
-{
-        u16 TmpPhyState;
-        u32 WaitCount;
-        u32 i = 0;
-        bool PhyStateReady = TRUE;
-
-        if (HW_SUPPORT_UPS_MODE(tp) == FALSE)
-                goto exit;
-
-        WaitCount = MicroSecondTimeout / 1000;
-        if (WaitCount == 0) WaitCount = 100;
-
-        do {
-                TmpPhyState = rtl8168_get_phy_state(tp);
-                mdelay(1);
-                i++;
-        } while ((i < WaitCount) && (TmpPhyState != PhyState));
-
-        PhyStateReady = (i == WaitCount && TmpPhyState != PhyState) ? FALSE : TRUE;
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-        WARN_ON_ONCE(i == WaitCount);
-#endif
-
-exit:
-        return PhyStateReady;
-}
-
-static
-bool
-rtl8168_test_phy_ocp_v2(struct rtl8168_private *tp)
-{
-        bool RestorePhyOcpReg = FALSE;
-
-        u16 PhyRegValue;
-        u8 ResetPhyType = 0;
-
-        if (HW_PHY_STATUS_INI == rtl8168_get_phy_state(tp)) {
-                ResetPhyType = 1;
-        } else {
-                rtl8168_mdio_write(tp, 0x1F, 0x0C40);
-                PhyRegValue = rtl8168_mdio_read(tp, 0x12);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                if ((PhyRegValue & 0x03) != 0x00) {
-                        ResetPhyType = 2;
-                }
-        }
-
-        if (ResetPhyType == 0)
-                goto exit;
-
-        netif_err(tp, drv, tp->dev, "test_phy_ocp ResetPhyType = 0x%02x\n.\n",
-                  ResetPhyType);
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0C41);
-        rtl8168_set_eth_phy_bit(tp, 0x14, BIT_0);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-        mdelay(24); //24ms
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0C40);
-        PhyRegValue = rtl8168_mdio_read(tp, 0x12);
-        if ((PhyRegValue & 0x03) != 0x00) {
-                u32 WaitCnt = 0;
-                while ((PhyRegValue & 0x03) != 0x00 && WaitCnt < 5) {
-                        rtl8168_mdio_write(tp, 0x1F, 0x0C40);
-                        rtl8168_set_eth_phy_bit(tp, 0x11, (BIT_15 | BIT_14));
-                        rtl8168_clear_eth_phy_bit(tp, 0x11, (BIT_15 | BIT_14));
-                        mdelay(100);
-                        rtl8168_mdio_write(tp, 0x1F, 0x0C40);
-                        PhyRegValue = rtl8168_mdio_read(tp, 0x12);
-                        WaitCnt++;
-                }
-        }
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0A46);
-        rtl8168_mdio_write(tp, 0x10, tp->BackupPhyFuseDout_15_0);
-        rtl8168_mdio_write(tp, 0x12, tp->BackupPhyFuseDout_47_32);
-        rtl8168_mdio_write(tp, 0x13, tp->BackupPhyFuseDout_63_48);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        rtl8168_wait_phy_state_ready(tp, HW_PHY_STATUS_INI, 5000000);
-        rtl8168_mdio_write(tp, 0x1F, 0x0A46);
-        rtl8168_set_eth_phy_bit(tp, 0x14, BIT_0);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-        rtl8168_wait_phy_state_ready(tp, HW_PHY_STATUS_LAN_ON, 500000);
-
-        tp->HwHasWrRamCodeToMicroP = FALSE;
-
-        RestorePhyOcpReg = TRUE;
-
-exit:
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        return RestorePhyOcpReg;
-}
-
-static
-bool
-rtl8168_test_phy_ocp_v3(struct rtl8168_private *tp)
-{
-        bool RestorePhyOcpReg = FALSE;
-
-        u16 PhyRegValue;
-        u8 ResetPhyType = 0;
-        u8 watch_dog = 0;
-        u8 uc_response;
-        u8 nctl_pc_range_fail;
-        u8 nctl_pc_stuck_fail;
-
-        if (FALSE == HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp))
-                goto exit;
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0B82);
-        uc_response = !!(rtl8168_mdio_read(tp, 0x10) & BIT_5);
-        rtl8168_mdio_write(tp, 0x1F, 0x0B84);
-        nctl_pc_range_fail = !!(rtl8168_mdio_read(tp, 0x11) & BIT_1);
-        nctl_pc_stuck_fail = !!(rtl8168_mdio_read(tp, 0x11) & BIT_2);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        if (uc_response || nctl_pc_range_fail || nctl_pc_stuck_fail) {
-                ResetPhyType = 3;
-        } else {
-                rtl8168_mdio_write(tp, 0x1F, 0x0C40);
-                PhyRegValue = rtl8168_mdio_read(tp, 0x12);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                if ((PhyRegValue & 0x03) != 0x00) {
-                        watch_dog = (u8)(PhyRegValue & 0x03);
-                        ResetPhyType = 2;
-                }
-        }
-
-        if (ResetPhyType == 0)
-                goto exit;
-
-        netif_err(tp, drv, tp->dev, "test_phy_ocp ResetPhyType = 0x%02x\n.\n",
-                  ResetPhyType);
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0C41);
-        rtl8168_set_eth_phy_bit(tp, 0x14, BIT_0);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-        mdelay(24000); //24ms
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0C40);
-        PhyRegValue = rtl8168_mdio_read(tp, 0x12);
-        if ((PhyRegValue & 0x03) != 0x00) {
-                u32 WaitCnt = 0;
-                while ((PhyRegValue & 0x03) != 0x00 && WaitCnt < 5) {
-                        rtl8168_mdio_write(tp, 0x1F, 0x0C40);
-                        rtl8168_set_eth_phy_bit(tp, 0x11, (BIT_15 | BIT_14));
-                        rtl8168_clear_eth_phy_bit(tp, 0x11, (BIT_15 | BIT_14));
-                        mdelay(100000);
-                        rtl8168_mdio_write(tp, 0x1F, 0x0C40);
-                        PhyRegValue = rtl8168_mdio_read(tp, 0x12);
-                        WaitCnt++;
-                }
-        }
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        //issue9
-        rtl8168_mdio_write(tp, 0x1F, 0x0A46);
-        rtl8168_mdio_write(tp, 0x10, tp->BackupPhyFuseDout_15_0);
-        rtl8168_mdio_write(tp, 0x11, tp->BackupPhyFuseDout_31_16);
-        rtl8168_mdio_write(tp, 0x12, tp->BackupPhyFuseDout_47_32);
-        rtl8168_mdio_write(tp, 0x13, tp->BackupPhyFuseDout_63_48);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        rtl8168_wait_phy_state_ready(tp, HW_PHY_STATUS_INI, 5000000);
-        rtl8168_mdio_write(tp, 0x1F, 0x0A46);
-        rtl8168_set_eth_phy_bit(tp, 0x14, BIT_0);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-        rtl8168_wait_phy_state_ready(tp, HW_PHY_STATUS_LAN_ON, 500000);
-
-        //record fail case
-        rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-        rtl8168_mdio_write(tp, 0x13, 0x801C);
-        PhyRegValue = watch_dog & 0x03;
-        PhyRegValue <<= 14;
-        if (uc_response) PhyRegValue |= BIT_13;
-        if (nctl_pc_range_fail) PhyRegValue |= BIT_12;
-        if (nctl_pc_stuck_fail) PhyRegValue |= BIT_11;
-        ClearAndSetEthPhyBit(tp,
-                             0x14,
-                             0xF800,
-                             PhyRegValue);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        tp->HwHasWrRamCodeToMicroP = FALSE;
-
-        RestorePhyOcpReg = TRUE;
-
-exit:
-        //set uc_response to 1 and gphy should auto clear it.
-        rtl8168_mdio_write(tp, 0x1F, 0x0B82);
-        rtl8168_set_eth_phy_bit(tp, 0x10, BIT_5);
-        rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-        return RestorePhyOcpReg;
-}
-
-static
-bool
-rtl8168_test_phy_ocp(struct rtl8168_private *tp)
-{
-        bool RestorePhyOcpReg = FALSE;
-
-        if (tp->TestPhyOcpReg == FALSE)
-                goto exit;
-
-        switch (tp->HwSuppEsdVer) {
-        case 2:
-                RestorePhyOcpReg = rtl8168_test_phy_ocp_v2(tp);
-                break;
-        case 3:
-                RestorePhyOcpReg = rtl8168_test_phy_ocp_v3(tp);
-                break;
-        default:
-                break;
-        }
-
-exit:
-        return RestorePhyOcpReg;
+        RTL_W32(CounterAddrHigh, (u64)tp->tally_paddr >> 32);
+        RTL_W32(CounterAddrLow, ((u64)tp->tally_paddr & (DMA_BIT_MASK(32))) | CounterReset);
 }
 
 static int
@@ -8792,7 +6811,7 @@
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         u16 TmpPhyState;
-        int i = 0;
+        int i=0;
 
         do {
                 TmpPhyState = rtl8168_mdio_read_phy_ocp(tp, 0x0A42, 0x10);
@@ -8809,30 +6828,20 @@
 void
 rtl8168_enable_now_is_oob(struct rtl8168_private *tp)
 {
-        if (tp->HwSuppNowIsOobVer == 1)
-                RTL_W8(tp, MCUCmd_reg, RTL_R8(tp, MCUCmd_reg) | Now_is_oob);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        if ( tp->HwSuppNowIsOobVer == 1 ) {
+                RTL_W8(MCUCmd_reg, RTL_R8(MCUCmd_reg) | Now_is_oob);
+        }
 }
 
 void
 rtl8168_disable_now_is_oob(struct rtl8168_private *tp)
 {
-        if (tp->HwSuppNowIsOobVer == 1)
-                RTL_W8(tp, MCUCmd_reg, RTL_R8(tp, MCUCmd_reg) & ~Now_is_oob);
-}
-
-static void
-rtl8168_switch_to_sgmii_mode(
-        struct rtl8168_private *tp
-)
-{
-        if (FALSE == HW_SUPP_SERDES_PHY(tp))
-                return;
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        switch (tp->HwSuppSerDesPhyVer) {
-        case 1:
-                rtl8168_mac_ocp_write(tp, 0xEB00, 0x2);
-                rtl8168_set_mcu_ocp_bit(tp, 0xEB16, BIT_1);
-                break;
+        if ( tp->HwSuppNowIsOobVer == 1 ) {
+                RTL_W8(MCUCmd_reg, RTL_R8(MCUCmd_reg) & ~Now_is_oob);
         }
 }
 
@@ -8840,17 +6849,24 @@
 rtl8168_exit_oob(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u16 data16;
 
-        rtl8168_disable_rx_packet_filter(tp);
+        RTL_W32(RxConfig, RTL_R32(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:
+        case CFG_METHOD_28:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_dash2_disable_txrx(dev);
+                break;
+        }
 
-        if (HW_DASH_SUPPORT_DASH(tp)) {
+        if (tp->DASH) {
+                rtl8168_driver_stop(tp);
                 rtl8168_driver_start(tp);
-                rtl8168_dash2_disable_txrx(dev);
 #ifdef ENABLE_DASH_SUPPORT
                 DashHwInit(dev);
 #endif
@@ -8860,24 +6876,24 @@
         switch (tp->mcfg) {
         case CFG_METHOD_18:
         case CFG_METHOD_19:
-                RTL_W32(tp, MACOCP, 0xE5A90000);
-                RTL_W32(tp, MACOCP, 0xF2100010);
+                RTL_W32(MACOCP, 0xE5A90000);
+                RTL_W32(MACOCP, 0xF2100010);
                 break;
         case CFG_METHOD_20:
-                RTL_W32(tp, MACOCP, 0xE5A90000);
-                RTL_W32(tp, MACOCP, 0xE4640000);
-                RTL_W32(tp, MACOCP, 0xF2100010);
+                RTL_W32(MACOCP, 0xE5A90000);
+                RTL_W32(MACOCP, 0xE4640000);
+                RTL_W32(MACOCP, 0xF2100010);
                 break;
         case CFG_METHOD_21:
         case CFG_METHOD_22:
-                RTL_W32(tp, MACOCP, 0x605E0000);
-                RTL_W32(tp, MACOCP, (0xE05E << 16) | (RTL_R32(tp, MACOCP) & 0xFFFE));
-                RTL_W32(tp, MACOCP, 0xE9720000);
-                RTL_W32(tp, MACOCP, 0xF2140010);
+                RTL_W32(MACOCP, 0x605E0000);
+                RTL_W32(MACOCP, (0xE05E << 16) | (RTL_R32(MACOCP) & 0xFFFE));
+                RTL_W32(MACOCP, 0xE9720000);
+                RTL_W32(MACOCP, 0xF2140010);
                 break;
         case CFG_METHOD_26:
-                RTL_W32(tp, MACOCP, 0xE05E00FF);
-                RTL_W32(tp, MACOCP, 0xE9720000);
+                RTL_W32(MACOCP, 0xE05E00FF);
+                RTL_W32(MACOCP, 0xE9720000);
                 rtl8168_mac_ocp_write(tp, 0xE428, 0x0010);
                 break;
         }
@@ -8888,7 +6904,7 @@
         switch (tp->mcfg) {
         case CFG_METHOD_21:
         case CFG_METHOD_22:
-                rtl8168_eri_write(tp, 0x174, 2, 0x0000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x174, 2, 0x0000, ERIAR_ExGMAC);
                 rtl8168_mac_ocp_write(tp, 0xE428, 0x0010);
                 break;
         case CFG_METHOD_24:
@@ -8897,21 +6913,16 @@
         case CFG_METHOD_28:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-                rtl8168_eri_write(tp, 0x174, 2, 0x00FF, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x174, 2, 0x00FF, ERIAR_ExGMAC);
                 rtl8168_mac_ocp_write(tp, 0xE428, 0x0010);
                 break;
         case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37: {
+        case CFG_METHOD_30: {
                 u32 csi_tmp;
-                csi_tmp = rtl8168_eri_read(tp, 0x174, 2, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x174, 2, ERIAR_ExGMAC);
                 csi_tmp &= ~(BIT_8);
                 csi_tmp |= (BIT_15);
-                rtl8168_eri_write(tp, 0x174, 2, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x174, 2, csi_tmp, ERIAR_ExGMAC);
                 rtl8168_mac_ocp_write(tp, 0xE428, 0x0010);
         }
         break;
@@ -8941,11 +6952,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_disable_now_is_oob(tp);
 
                 data16 = rtl8168_mac_ocp_read(tp, 0xE8DE) & ~BIT_14;
@@ -8960,27 +6966,50 @@
         }
 
         //wait ups resume (phy state 2)
-        if (HW_SUPPORT_UPS_MODE(tp))
+        switch (tp->mcfg) {
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
                 if (rtl8168_is_ups_resume(dev)) {
-                        rtl8168_wait_phy_ups_resume(dev, HW_PHY_STATUS_EXT_INI);
+                        rtl8168_wait_phy_ups_resume(dev, 2);
                         rtl8168_clear_ups_resume_bit(dev);
                 }
+                break;
+        };
 
 #ifdef ENABLE_FIBER_SUPPORT
         if (HW_FIBER_MODE_ENABLED(tp))
-                rtl8168_hw_init_fiber_nic(tp);
+                rtl8168_hw_init_fiber_nic(dev);
 #endif //ENABLE_FIBER_SUPPORT
+
+        tp->phy_reg_anlpar = 0;
 }
 
 void
 rtl8168_hw_disable_mac_mcu_bps(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
 
-        if (tp->HwSuppAspmClkIntrLock) {
+        switch (tp->mcfg) {
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
                 rtl8168_enable_cfg9346_write(tp);
-                rtl8168_hw_aspm_clkreq_enable(tp, false);
+                RTL_W8(Config5, RTL_R8(Config5) & ~BIT_0);
+                RTL_W8(Config2, RTL_R8(Config2) & ~BIT_7);
                 rtl8168_disable_cfg9346_write(tp);
+                break;
         }
 
         switch (tp->mcfg) {
@@ -8988,11 +7017,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_mac_ocp_write(tp, 0xFC38, 0x0000);
                 break;
         }
@@ -9010,11 +7034,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_mac_ocp_write(tp, 0xFC28, 0x0000);
                 rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0000);
                 rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0000);
@@ -9029,7 +7048,6 @@
         }
 }
 
-#ifndef ENABLE_USE_FIRMWARE_FILE
 static void
 rtl8168_set_mac_mcu_8168g_1(struct net_device *dev)
 {
@@ -9043,220 +7061,220 @@
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        rtl8168_mac_ocp_write(tp, 0xF800, 0xE008);
-        rtl8168_mac_ocp_write(tp, 0xF802, 0xE01B);
-        rtl8168_mac_ocp_write(tp, 0xF804, 0xE022);
-        rtl8168_mac_ocp_write(tp, 0xF806, 0xE094);
-        rtl8168_mac_ocp_write(tp, 0xF808, 0xE097);
-        rtl8168_mac_ocp_write(tp, 0xF80A, 0xE09A);
-        rtl8168_mac_ocp_write(tp, 0xF80C, 0xE0B3);
-        rtl8168_mac_ocp_write(tp, 0xF80E, 0xE0BA);
-        rtl8168_mac_ocp_write(tp, 0xF810, 0x49D2);
-        rtl8168_mac_ocp_write(tp, 0xF812, 0xF10D);
-        rtl8168_mac_ocp_write(tp, 0xF814, 0x766C);
-        rtl8168_mac_ocp_write(tp, 0xF816, 0x49E2);
-        rtl8168_mac_ocp_write(tp, 0xF818, 0xF00A);
-        rtl8168_mac_ocp_write(tp, 0xF81A, 0x1EC0);
-        rtl8168_mac_ocp_write(tp, 0xF81C, 0x8EE1);
-        rtl8168_mac_ocp_write(tp, 0xF81E, 0xC60A);
-        rtl8168_mac_ocp_write(tp, 0xF820, 0x77C0);
-        rtl8168_mac_ocp_write(tp, 0xF822, 0x4870);
-        rtl8168_mac_ocp_write(tp, 0xF824, 0x9FC0);
-        rtl8168_mac_ocp_write(tp, 0xF826, 0x1EA0);
-        rtl8168_mac_ocp_write(tp, 0xF828, 0xC707);
-        rtl8168_mac_ocp_write(tp, 0xF82A, 0x8EE1);
-        rtl8168_mac_ocp_write(tp, 0xF82C, 0x9D6C);
-        rtl8168_mac_ocp_write(tp, 0xF82E, 0xC603);
-        rtl8168_mac_ocp_write(tp, 0xF830, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF832, 0xB416);
-        rtl8168_mac_ocp_write(tp, 0xF834, 0x0076);
-        rtl8168_mac_ocp_write(tp, 0xF836, 0xE86C);
-        rtl8168_mac_ocp_write(tp, 0xF838, 0xC406);
-        rtl8168_mac_ocp_write(tp, 0xF83A, 0x7580);
-        rtl8168_mac_ocp_write(tp, 0xF83C, 0x4852);
-        rtl8168_mac_ocp_write(tp, 0xF83E, 0x8D80);
-        rtl8168_mac_ocp_write(tp, 0xF840, 0xC403);
-        rtl8168_mac_ocp_write(tp, 0xF842, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xF844, 0xD3E0);
-        rtl8168_mac_ocp_write(tp, 0xF846, 0x02C8);
-        rtl8168_mac_ocp_write(tp, 0xF848, 0x8918);
-        rtl8168_mac_ocp_write(tp, 0xF84A, 0xE815);
-        rtl8168_mac_ocp_write(tp, 0xF84C, 0x1100);
-        rtl8168_mac_ocp_write(tp, 0xF84E, 0xF011);
-        rtl8168_mac_ocp_write(tp, 0xF850, 0xE812);
-        rtl8168_mac_ocp_write(tp, 0xF852, 0x4990);
-        rtl8168_mac_ocp_write(tp, 0xF854, 0xF002);
-        rtl8168_mac_ocp_write(tp, 0xF856, 0xE817);
-        rtl8168_mac_ocp_write(tp, 0xF858, 0xE80E);
-        rtl8168_mac_ocp_write(tp, 0xF85A, 0x4992);
-        rtl8168_mac_ocp_write(tp, 0xF85C, 0xF002);
-        rtl8168_mac_ocp_write(tp, 0xF85E, 0xE80E);
-        rtl8168_mac_ocp_write(tp, 0xF860, 0xE80A);
-        rtl8168_mac_ocp_write(tp, 0xF862, 0x4993);
-        rtl8168_mac_ocp_write(tp, 0xF864, 0xF002);
-        rtl8168_mac_ocp_write(tp, 0xF866, 0xE818);
-        rtl8168_mac_ocp_write(tp, 0xF868, 0xE806);
-        rtl8168_mac_ocp_write(tp, 0xF86A, 0x4991);
-        rtl8168_mac_ocp_write(tp, 0xF86C, 0xF002);
-        rtl8168_mac_ocp_write(tp, 0xF86E, 0xE838);
-        rtl8168_mac_ocp_write(tp, 0xF870, 0xC25E);
-        rtl8168_mac_ocp_write(tp, 0xF872, 0xBA00);
-        rtl8168_mac_ocp_write(tp, 0xF874, 0xC056);
-        rtl8168_mac_ocp_write(tp, 0xF876, 0x7100);
-        rtl8168_mac_ocp_write(tp, 0xF878, 0xFF80);
-        rtl8168_mac_ocp_write(tp, 0xF87A, 0x7100);
-        rtl8168_mac_ocp_write(tp, 0xF87C, 0x4892);
-        rtl8168_mac_ocp_write(tp, 0xF87E, 0x4813);
-        rtl8168_mac_ocp_write(tp, 0xF880, 0x8900);
-        rtl8168_mac_ocp_write(tp, 0xF882, 0xE00A);
-        rtl8168_mac_ocp_write(tp, 0xF884, 0x7100);
-        rtl8168_mac_ocp_write(tp, 0xF886, 0x4890);
-        rtl8168_mac_ocp_write(tp, 0xF888, 0x4813);
-        rtl8168_mac_ocp_write(tp, 0xF88A, 0x8900);
-        rtl8168_mac_ocp_write(tp, 0xF88C, 0xC74B);
-        rtl8168_mac_ocp_write(tp, 0xF88E, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF890, 0x48C2);
-        rtl8168_mac_ocp_write(tp, 0xF892, 0x4841);
-        rtl8168_mac_ocp_write(tp, 0xF894, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF896, 0xC746);
-        rtl8168_mac_ocp_write(tp, 0xF898, 0x74FC);
-        rtl8168_mac_ocp_write(tp, 0xF89A, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF89C, 0xF120);
-        rtl8168_mac_ocp_write(tp, 0xF89E, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF8A0, 0xF11E);
-        rtl8168_mac_ocp_write(tp, 0xF8A2, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF8A4, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF8A6, 0xF01B);
-        rtl8168_mac_ocp_write(tp, 0xF8A8, 0x49C6);
-        rtl8168_mac_ocp_write(tp, 0xF8AA, 0xF119);
-        rtl8168_mac_ocp_write(tp, 0xF8AC, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF8AE, 0x49C4);
-        rtl8168_mac_ocp_write(tp, 0xF8B0, 0xF013);
-        rtl8168_mac_ocp_write(tp, 0xF8B2, 0xC536);
-        rtl8168_mac_ocp_write(tp, 0xF8B4, 0x74B0);
-        rtl8168_mac_ocp_write(tp, 0xF8B6, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF8B8, 0xF1FD);
-        rtl8168_mac_ocp_write(tp, 0xF8BA, 0xC537);
-        rtl8168_mac_ocp_write(tp, 0xF8BC, 0xC434);
-        rtl8168_mac_ocp_write(tp, 0xF8BE, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xF8C0, 0xC435);
-        rtl8168_mac_ocp_write(tp, 0xF8C2, 0x1C13);
-        rtl8168_mac_ocp_write(tp, 0xF8C4, 0x484F);
-        rtl8168_mac_ocp_write(tp, 0xF8C6, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xF8C8, 0xC52B);
-        rtl8168_mac_ocp_write(tp, 0xF8CA, 0x74B0);
-        rtl8168_mac_ocp_write(tp, 0xF8CC, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF8CE, 0xF1FD);
-        rtl8168_mac_ocp_write(tp, 0xF8D0, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF8D2, 0x48C4);
-        rtl8168_mac_ocp_write(tp, 0xF8D4, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF8D6, 0x7100);
-        rtl8168_mac_ocp_write(tp, 0xF8D8, 0x4893);
-        rtl8168_mac_ocp_write(tp, 0xF8DA, 0x8900);
-        rtl8168_mac_ocp_write(tp, 0xF8DC, 0xFF80);
-        rtl8168_mac_ocp_write(tp, 0xF8DE, 0xC520);
-        rtl8168_mac_ocp_write(tp, 0xF8E0, 0x74B0);
-        rtl8168_mac_ocp_write(tp, 0xF8E2, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF8E4, 0xF11C);
-        rtl8168_mac_ocp_write(tp, 0xF8E6, 0xC71E);
-        rtl8168_mac_ocp_write(tp, 0xF8E8, 0x74FC);
-        rtl8168_mac_ocp_write(tp, 0xF8EA, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF8EC, 0xF118);
-        rtl8168_mac_ocp_write(tp, 0xF8EE, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF8F0, 0xF116);
-        rtl8168_mac_ocp_write(tp, 0xF8F2, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF8F4, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF8F6, 0xF013);
-        rtl8168_mac_ocp_write(tp, 0xF8F8, 0x48C3);
-        rtl8168_mac_ocp_write(tp, 0xF8FA, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF8FC, 0xC516);
-        rtl8168_mac_ocp_write(tp, 0xF8FE, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xF900, 0x49CE);
-        rtl8168_mac_ocp_write(tp, 0xF902, 0xF1FE);
-        rtl8168_mac_ocp_write(tp, 0xF904, 0xC411);
-        rtl8168_mac_ocp_write(tp, 0xF906, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xF908, 0xC411);
-        rtl8168_mac_ocp_write(tp, 0xF90A, 0x1C13);
-        rtl8168_mac_ocp_write(tp, 0xF90C, 0x484F);
-        rtl8168_mac_ocp_write(tp, 0xF90E, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xF910, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xF912, 0x49CF);
-        rtl8168_mac_ocp_write(tp, 0xF914, 0xF1FE);
-        rtl8168_mac_ocp_write(tp, 0xF916, 0x7100);
-        rtl8168_mac_ocp_write(tp, 0xF918, 0x4891);
-        rtl8168_mac_ocp_write(tp, 0xF91A, 0x8900);
-        rtl8168_mac_ocp_write(tp, 0xF91C, 0xFF80);
-        rtl8168_mac_ocp_write(tp, 0xF91E, 0xE400);
-        rtl8168_mac_ocp_write(tp, 0xF920, 0xD3E0);
-        rtl8168_mac_ocp_write(tp, 0xF922, 0xE000);
-        rtl8168_mac_ocp_write(tp, 0xF924, 0x0481);
-        rtl8168_mac_ocp_write(tp, 0xF926, 0x0C81);
-        rtl8168_mac_ocp_write(tp, 0xF928, 0xDE20);
-        rtl8168_mac_ocp_write(tp, 0xF92A, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xF92C, 0x0992);
-        rtl8168_mac_ocp_write(tp, 0xF92E, 0x1B76);
-        rtl8168_mac_ocp_write(tp, 0xF930, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF932, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF934, 0x059C);
-        rtl8168_mac_ocp_write(tp, 0xF936, 0x1B76);
-        rtl8168_mac_ocp_write(tp, 0xF938, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF93A, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF93C, 0x065A);
-        rtl8168_mac_ocp_write(tp, 0xF93E, 0xB400);
-        rtl8168_mac_ocp_write(tp, 0xF940, 0x18DE);
-        rtl8168_mac_ocp_write(tp, 0xF942, 0x2008);
-        rtl8168_mac_ocp_write(tp, 0xF944, 0x4001);
-        rtl8168_mac_ocp_write(tp, 0xF946, 0xF10F);
-        rtl8168_mac_ocp_write(tp, 0xF948, 0x7342);
-        rtl8168_mac_ocp_write(tp, 0xF94A, 0x1880);
-        rtl8168_mac_ocp_write(tp, 0xF94C, 0x2008);
-        rtl8168_mac_ocp_write(tp, 0xF94E, 0x0009);
-        rtl8168_mac_ocp_write(tp, 0xF950, 0x4018);
-        rtl8168_mac_ocp_write(tp, 0xF952, 0xF109);
-        rtl8168_mac_ocp_write(tp, 0xF954, 0x7340);
-        rtl8168_mac_ocp_write(tp, 0xF956, 0x25BC);
-        rtl8168_mac_ocp_write(tp, 0xF958, 0x130F);
-        rtl8168_mac_ocp_write(tp, 0xF95A, 0xF105);
-        rtl8168_mac_ocp_write(tp, 0xF95C, 0xC00A);
-        rtl8168_mac_ocp_write(tp, 0xF95E, 0x7300);
-        rtl8168_mac_ocp_write(tp, 0xF960, 0x4831);
-        rtl8168_mac_ocp_write(tp, 0xF962, 0x9B00);
-        rtl8168_mac_ocp_write(tp, 0xF964, 0xB000);
-        rtl8168_mac_ocp_write(tp, 0xF966, 0x7340);
-        rtl8168_mac_ocp_write(tp, 0xF968, 0x8320);
-        rtl8168_mac_ocp_write(tp, 0xF96A, 0xC302);
-        rtl8168_mac_ocp_write(tp, 0xF96C, 0xBB00);
-        rtl8168_mac_ocp_write(tp, 0xF96E, 0x0C12);
-        rtl8168_mac_ocp_write(tp, 0xF970, 0xE860);
-        rtl8168_mac_ocp_write(tp, 0xF972, 0xC406);
-        rtl8168_mac_ocp_write(tp, 0xF974, 0x7580);
-        rtl8168_mac_ocp_write(tp, 0xF976, 0x4851);
-        rtl8168_mac_ocp_write(tp, 0xF978, 0x8D80);
-        rtl8168_mac_ocp_write(tp, 0xF97A, 0xC403);
-        rtl8168_mac_ocp_write(tp, 0xF97C, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xF97E, 0xD3E0);
-        rtl8168_mac_ocp_write(tp, 0xF980, 0x02C8);
-        rtl8168_mac_ocp_write(tp, 0xF982, 0xC406);
-        rtl8168_mac_ocp_write(tp, 0xF984, 0x7580);
-        rtl8168_mac_ocp_write(tp, 0xF986, 0x4850);
-        rtl8168_mac_ocp_write(tp, 0xF988, 0x8D80);
-        rtl8168_mac_ocp_write(tp, 0xF98A, 0xC403);
-        rtl8168_mac_ocp_write(tp, 0xF98C, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xF98E, 0xD3E0);
-        rtl8168_mac_ocp_write(tp, 0xF990, 0x0298);
-
-        rtl8168_mac_ocp_write(tp, 0xDE30, 0x0080);
-
-        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-        rtl8168_mac_ocp_write(tp, 0xFC28, 0x0075);
-        rtl8168_mac_ocp_write(tp, 0xFC2A, 0x02B1);
-        rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0991);
-        rtl8168_mac_ocp_write(tp, 0xFC2E, 0x059B);
-        rtl8168_mac_ocp_write(tp, 0xFC30, 0x0659);
-        rtl8168_mac_ocp_write(tp, 0xFC32, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xFC34, 0x02C7);
-        rtl8168_mac_ocp_write(tp, 0xFC36, 0x0279);
+        rtl8168_mac_ocp_write( tp, 0xF800, 0xE008 );
+        rtl8168_mac_ocp_write( tp, 0xF802, 0xE01B );
+        rtl8168_mac_ocp_write( tp, 0xF804, 0xE022 );
+        rtl8168_mac_ocp_write( tp, 0xF806, 0xE094 );
+        rtl8168_mac_ocp_write( tp, 0xF808, 0xE097 );
+        rtl8168_mac_ocp_write( tp, 0xF80A, 0xE09A );
+        rtl8168_mac_ocp_write( tp, 0xF80C, 0xE0B3 );
+        rtl8168_mac_ocp_write( tp, 0xF80E, 0xE0BA );
+        rtl8168_mac_ocp_write( tp, 0xF810, 0x49D2 );
+        rtl8168_mac_ocp_write( tp, 0xF812, 0xF10D );
+        rtl8168_mac_ocp_write( tp, 0xF814, 0x766C );
+        rtl8168_mac_ocp_write( tp, 0xF816, 0x49E2 );
+        rtl8168_mac_ocp_write( tp, 0xF818, 0xF00A );
+        rtl8168_mac_ocp_write( tp, 0xF81A, 0x1EC0 );
+        rtl8168_mac_ocp_write( tp, 0xF81C, 0x8EE1 );
+        rtl8168_mac_ocp_write( tp, 0xF81E, 0xC60A );
+        rtl8168_mac_ocp_write( tp, 0xF820, 0x77C0 );
+        rtl8168_mac_ocp_write( tp, 0xF822, 0x4870 );
+        rtl8168_mac_ocp_write( tp, 0xF824, 0x9FC0 );
+        rtl8168_mac_ocp_write( tp, 0xF826, 0x1EA0 );
+        rtl8168_mac_ocp_write( tp, 0xF828, 0xC707 );
+        rtl8168_mac_ocp_write( tp, 0xF82A, 0x8EE1 );
+        rtl8168_mac_ocp_write( tp, 0xF82C, 0x9D6C );
+        rtl8168_mac_ocp_write( tp, 0xF82E, 0xC603 );
+        rtl8168_mac_ocp_write( tp, 0xF830, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF832, 0xB416 );
+        rtl8168_mac_ocp_write( tp, 0xF834, 0x0076 );
+        rtl8168_mac_ocp_write( tp, 0xF836, 0xE86C );
+        rtl8168_mac_ocp_write( tp, 0xF838, 0xC406 );
+        rtl8168_mac_ocp_write( tp, 0xF83A, 0x7580 );
+        rtl8168_mac_ocp_write( tp, 0xF83C, 0x4852 );
+        rtl8168_mac_ocp_write( tp, 0xF83E, 0x8D80 );
+        rtl8168_mac_ocp_write( tp, 0xF840, 0xC403 );
+        rtl8168_mac_ocp_write( tp, 0xF842, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xF844, 0xD3E0 );
+        rtl8168_mac_ocp_write( tp, 0xF846, 0x02C8 );
+        rtl8168_mac_ocp_write( tp, 0xF848, 0x8918 );
+        rtl8168_mac_ocp_write( tp, 0xF84A, 0xE815 );
+        rtl8168_mac_ocp_write( tp, 0xF84C, 0x1100 );
+        rtl8168_mac_ocp_write( tp, 0xF84E, 0xF011 );
+        rtl8168_mac_ocp_write( tp, 0xF850, 0xE812 );
+        rtl8168_mac_ocp_write( tp, 0xF852, 0x4990 );
+        rtl8168_mac_ocp_write( tp, 0xF854, 0xF002 );
+        rtl8168_mac_ocp_write( tp, 0xF856, 0xE817 );
+        rtl8168_mac_ocp_write( tp, 0xF858, 0xE80E );
+        rtl8168_mac_ocp_write( tp, 0xF85A, 0x4992 );
+        rtl8168_mac_ocp_write( tp, 0xF85C, 0xF002 );
+        rtl8168_mac_ocp_write( tp, 0xF85E, 0xE80E );
+        rtl8168_mac_ocp_write( tp, 0xF860, 0xE80A );
+        rtl8168_mac_ocp_write( tp, 0xF862, 0x4993 );
+        rtl8168_mac_ocp_write( tp, 0xF864, 0xF002 );
+        rtl8168_mac_ocp_write( tp, 0xF866, 0xE818 );
+        rtl8168_mac_ocp_write( tp, 0xF868, 0xE806 );
+        rtl8168_mac_ocp_write( tp, 0xF86A, 0x4991 );
+        rtl8168_mac_ocp_write( tp, 0xF86C, 0xF002 );
+        rtl8168_mac_ocp_write( tp, 0xF86E, 0xE838 );
+        rtl8168_mac_ocp_write( tp, 0xF870, 0xC25E );
+        rtl8168_mac_ocp_write( tp, 0xF872, 0xBA00 );
+        rtl8168_mac_ocp_write( tp, 0xF874, 0xC056 );
+        rtl8168_mac_ocp_write( tp, 0xF876, 0x7100 );
+        rtl8168_mac_ocp_write( tp, 0xF878, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xF87A, 0x7100 );
+        rtl8168_mac_ocp_write( tp, 0xF87C, 0x4892 );
+        rtl8168_mac_ocp_write( tp, 0xF87E, 0x4813 );
+        rtl8168_mac_ocp_write( tp, 0xF880, 0x8900 );
+        rtl8168_mac_ocp_write( tp, 0xF882, 0xE00A );
+        rtl8168_mac_ocp_write( tp, 0xF884, 0x7100 );
+        rtl8168_mac_ocp_write( tp, 0xF886, 0x4890 );
+        rtl8168_mac_ocp_write( tp, 0xF888, 0x4813 );
+        rtl8168_mac_ocp_write( tp, 0xF88A, 0x8900 );
+        rtl8168_mac_ocp_write( tp, 0xF88C, 0xC74B );
+        rtl8168_mac_ocp_write( tp, 0xF88E, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF890, 0x48C2 );
+        rtl8168_mac_ocp_write( tp, 0xF892, 0x4841 );
+        rtl8168_mac_ocp_write( tp, 0xF894, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF896, 0xC746 );
+        rtl8168_mac_ocp_write( tp, 0xF898, 0x74FC );
+        rtl8168_mac_ocp_write( tp, 0xF89A, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF89C, 0xF120 );
+        rtl8168_mac_ocp_write( tp, 0xF89E, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF8A0, 0xF11E );
+        rtl8168_mac_ocp_write( tp, 0xF8A2, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF8A4, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8A6, 0xF01B );
+        rtl8168_mac_ocp_write( tp, 0xF8A8, 0x49C6 );
+        rtl8168_mac_ocp_write( tp, 0xF8AA, 0xF119 );
+        rtl8168_mac_ocp_write( tp, 0xF8AC, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF8AE, 0x49C4 );
+        rtl8168_mac_ocp_write( tp, 0xF8B0, 0xF013 );
+        rtl8168_mac_ocp_write( tp, 0xF8B2, 0xC536 );
+        rtl8168_mac_ocp_write( tp, 0xF8B4, 0x74B0 );
+        rtl8168_mac_ocp_write( tp, 0xF8B6, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF8B8, 0xF1FD );
+        rtl8168_mac_ocp_write( tp, 0xF8BA, 0xC537 );
+        rtl8168_mac_ocp_write( tp, 0xF8BC, 0xC434 );
+        rtl8168_mac_ocp_write( tp, 0xF8BE, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xF8C0, 0xC435 );
+        rtl8168_mac_ocp_write( tp, 0xF8C2, 0x1C13 );
+        rtl8168_mac_ocp_write( tp, 0xF8C4, 0x484F );
+        rtl8168_mac_ocp_write( tp, 0xF8C6, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xF8C8, 0xC52B );
+        rtl8168_mac_ocp_write( tp, 0xF8CA, 0x74B0 );
+        rtl8168_mac_ocp_write( tp, 0xF8CC, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF8CE, 0xF1FD );
+        rtl8168_mac_ocp_write( tp, 0xF8D0, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF8D2, 0x48C4 );
+        rtl8168_mac_ocp_write( tp, 0xF8D4, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF8D6, 0x7100 );
+        rtl8168_mac_ocp_write( tp, 0xF8D8, 0x4893 );
+        rtl8168_mac_ocp_write( tp, 0xF8DA, 0x8900 );
+        rtl8168_mac_ocp_write( tp, 0xF8DC, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xF8DE, 0xC520 );
+        rtl8168_mac_ocp_write( tp, 0xF8E0, 0x74B0 );
+        rtl8168_mac_ocp_write( tp, 0xF8E2, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF8E4, 0xF11C );
+        rtl8168_mac_ocp_write( tp, 0xF8E6, 0xC71E );
+        rtl8168_mac_ocp_write( tp, 0xF8E8, 0x74FC );
+        rtl8168_mac_ocp_write( tp, 0xF8EA, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF8EC, 0xF118 );
+        rtl8168_mac_ocp_write( tp, 0xF8EE, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8F0, 0xF116 );
+        rtl8168_mac_ocp_write( tp, 0xF8F2, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF8F4, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8F6, 0xF013 );
+        rtl8168_mac_ocp_write( tp, 0xF8F8, 0x48C3 );
+        rtl8168_mac_ocp_write( tp, 0xF8FA, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF8FC, 0xC516 );
+        rtl8168_mac_ocp_write( tp, 0xF8FE, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xF900, 0x49CE );
+        rtl8168_mac_ocp_write( tp, 0xF902, 0xF1FE );
+        rtl8168_mac_ocp_write( tp, 0xF904, 0xC411 );
+        rtl8168_mac_ocp_write( tp, 0xF906, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xF908, 0xC411 );
+        rtl8168_mac_ocp_write( tp, 0xF90A, 0x1C13 );
+        rtl8168_mac_ocp_write( tp, 0xF90C, 0x484F );
+        rtl8168_mac_ocp_write( tp, 0xF90E, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xF910, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xF912, 0x49CF );
+        rtl8168_mac_ocp_write( tp, 0xF914, 0xF1FE );
+        rtl8168_mac_ocp_write( tp, 0xF916, 0x7100 );
+        rtl8168_mac_ocp_write( tp, 0xF918, 0x4891 );
+        rtl8168_mac_ocp_write( tp, 0xF91A, 0x8900 );
+        rtl8168_mac_ocp_write( tp, 0xF91C, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xF91E, 0xE400 );
+        rtl8168_mac_ocp_write( tp, 0xF920, 0xD3E0 );
+        rtl8168_mac_ocp_write( tp, 0xF922, 0xE000 );
+        rtl8168_mac_ocp_write( tp, 0xF924, 0x0481 );
+        rtl8168_mac_ocp_write( tp, 0xF926, 0x0C81 );
+        rtl8168_mac_ocp_write( tp, 0xF928, 0xDE20 );
+        rtl8168_mac_ocp_write( tp, 0xF92A, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF92C, 0x0992 );
+        rtl8168_mac_ocp_write( tp, 0xF92E, 0x1B76 );
+        rtl8168_mac_ocp_write( tp, 0xF930, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF932, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF934, 0x059C );
+        rtl8168_mac_ocp_write( tp, 0xF936, 0x1B76 );
+        rtl8168_mac_ocp_write( tp, 0xF938, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF93A, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF93C, 0x065A );
+        rtl8168_mac_ocp_write( tp, 0xF93E, 0xB400 );
+        rtl8168_mac_ocp_write( tp, 0xF940, 0x18DE );
+        rtl8168_mac_ocp_write( tp, 0xF942, 0x2008 );
+        rtl8168_mac_ocp_write( tp, 0xF944, 0x4001 );
+        rtl8168_mac_ocp_write( tp, 0xF946, 0xF10F );
+        rtl8168_mac_ocp_write( tp, 0xF948, 0x7342 );
+        rtl8168_mac_ocp_write( tp, 0xF94A, 0x1880 );
+        rtl8168_mac_ocp_write( tp, 0xF94C, 0x2008 );
+        rtl8168_mac_ocp_write( tp, 0xF94E, 0x0009 );
+        rtl8168_mac_ocp_write( tp, 0xF950, 0x4018 );
+        rtl8168_mac_ocp_write( tp, 0xF952, 0xF109 );
+        rtl8168_mac_ocp_write( tp, 0xF954, 0x7340 );
+        rtl8168_mac_ocp_write( tp, 0xF956, 0x25BC );
+        rtl8168_mac_ocp_write( tp, 0xF958, 0x130F );
+        rtl8168_mac_ocp_write( tp, 0xF95A, 0xF105 );
+        rtl8168_mac_ocp_write( tp, 0xF95C, 0xC00A );
+        rtl8168_mac_ocp_write( tp, 0xF95E, 0x7300 );
+        rtl8168_mac_ocp_write( tp, 0xF960, 0x4831 );
+        rtl8168_mac_ocp_write( tp, 0xF962, 0x9B00 );
+        rtl8168_mac_ocp_write( tp, 0xF964, 0xB000 );
+        rtl8168_mac_ocp_write( tp, 0xF966, 0x7340 );
+        rtl8168_mac_ocp_write( tp, 0xF968, 0x8320 );
+        rtl8168_mac_ocp_write( tp, 0xF96A, 0xC302 );
+        rtl8168_mac_ocp_write( tp, 0xF96C, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF96E, 0x0C12 );
+        rtl8168_mac_ocp_write( tp, 0xF970, 0xE860 );
+        rtl8168_mac_ocp_write( tp, 0xF972, 0xC406 );
+        rtl8168_mac_ocp_write( tp, 0xF974, 0x7580 );
+        rtl8168_mac_ocp_write( tp, 0xF976, 0x4851 );
+        rtl8168_mac_ocp_write( tp, 0xF978, 0x8D80 );
+        rtl8168_mac_ocp_write( tp, 0xF97A, 0xC403 );
+        rtl8168_mac_ocp_write( tp, 0xF97C, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xF97E, 0xD3E0 );
+        rtl8168_mac_ocp_write( tp, 0xF980, 0x02C8 );
+        rtl8168_mac_ocp_write( tp, 0xF982, 0xC406 );
+        rtl8168_mac_ocp_write( tp, 0xF984, 0x7580 );
+        rtl8168_mac_ocp_write( tp, 0xF986, 0x4850 );
+        rtl8168_mac_ocp_write( tp, 0xF988, 0x8D80 );
+        rtl8168_mac_ocp_write( tp, 0xF98A, 0xC403 );
+        rtl8168_mac_ocp_write( tp, 0xF98C, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xF98E, 0xD3E0 );
+        rtl8168_mac_ocp_write( tp, 0xF990, 0x0298 );
+
+        rtl8168_mac_ocp_write( tp, 0xDE30, 0x0080 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC26, 0x8000 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC28, 0x0075 );
+        rtl8168_mac_ocp_write( tp, 0xFC2A, 0x02B1 );
+        rtl8168_mac_ocp_write( tp, 0xFC2C, 0x0991 );
+        rtl8168_mac_ocp_write( tp, 0xFC2E, 0x059B );
+        rtl8168_mac_ocp_write( tp, 0xFC30, 0x0659 );
+        rtl8168_mac_ocp_write( tp, 0xFC32, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xFC34, 0x02C7 );
+        rtl8168_mac_ocp_write( tp, 0xFC36, 0x0279 );
 }
 
 static void
@@ -9266,127 +7284,127 @@
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        rtl8168_mac_ocp_write(tp, 0xF800, 0xE008);
-        rtl8168_mac_ocp_write(tp, 0xF802, 0xE011);
-        rtl8168_mac_ocp_write(tp, 0xF804, 0xE015);
-        rtl8168_mac_ocp_write(tp, 0xF806, 0xE018);
-        rtl8168_mac_ocp_write(tp, 0xF808, 0xE01B);
-        rtl8168_mac_ocp_write(tp, 0xF80A, 0xE027);
-        rtl8168_mac_ocp_write(tp, 0xF80C, 0xE043);
-        rtl8168_mac_ocp_write(tp, 0xF80E, 0xE065);
-        rtl8168_mac_ocp_write(tp, 0xF810, 0x49E2);
-        rtl8168_mac_ocp_write(tp, 0xF812, 0xF005);
-        rtl8168_mac_ocp_write(tp, 0xF814, 0x49EA);
-        rtl8168_mac_ocp_write(tp, 0xF816, 0xF003);
-        rtl8168_mac_ocp_write(tp, 0xF818, 0xC404);
-        rtl8168_mac_ocp_write(tp, 0xF81A, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xF81C, 0xC403);
-        rtl8168_mac_ocp_write(tp, 0xF81E, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xF820, 0x0496);
-        rtl8168_mac_ocp_write(tp, 0xF822, 0x051A);
-        rtl8168_mac_ocp_write(tp, 0xF824, 0x1D01);
-        rtl8168_mac_ocp_write(tp, 0xF826, 0x8DE8);
-        rtl8168_mac_ocp_write(tp, 0xF828, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF82A, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF82C, 0x0206);
-        rtl8168_mac_ocp_write(tp, 0xF82E, 0x1B76);
-        rtl8168_mac_ocp_write(tp, 0xF830, 0xC202);
-        rtl8168_mac_ocp_write(tp, 0xF832, 0xBA00);
-        rtl8168_mac_ocp_write(tp, 0xF834, 0x058A);
-        rtl8168_mac_ocp_write(tp, 0xF836, 0x1B76);
-        rtl8168_mac_ocp_write(tp, 0xF838, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF83A, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF83C, 0x0648);
-        rtl8168_mac_ocp_write(tp, 0xF83E, 0x74E6);
-        rtl8168_mac_ocp_write(tp, 0xF840, 0x1B78);
-        rtl8168_mac_ocp_write(tp, 0xF842, 0x46DC);
-        rtl8168_mac_ocp_write(tp, 0xF844, 0x1300);
-        rtl8168_mac_ocp_write(tp, 0xF846, 0xF005);
-        rtl8168_mac_ocp_write(tp, 0xF848, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF84A, 0x48C3);
-        rtl8168_mac_ocp_write(tp, 0xF84C, 0x48C4);
-        rtl8168_mac_ocp_write(tp, 0xF84E, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF850, 0x64E7);
-        rtl8168_mac_ocp_write(tp, 0xF852, 0xC302);
-        rtl8168_mac_ocp_write(tp, 0xF854, 0xBB00);
-        rtl8168_mac_ocp_write(tp, 0xF856, 0x068E);
-        rtl8168_mac_ocp_write(tp, 0xF858, 0x74E4);
-        rtl8168_mac_ocp_write(tp, 0xF85A, 0x49C5);
-        rtl8168_mac_ocp_write(tp, 0xF85C, 0xF106);
-        rtl8168_mac_ocp_write(tp, 0xF85E, 0x49C6);
-        rtl8168_mac_ocp_write(tp, 0xF860, 0xF107);
-        rtl8168_mac_ocp_write(tp, 0xF862, 0x48C8);
-        rtl8168_mac_ocp_write(tp, 0xF864, 0x48C9);
-        rtl8168_mac_ocp_write(tp, 0xF866, 0xE011);
-        rtl8168_mac_ocp_write(tp, 0xF868, 0x48C9);
-        rtl8168_mac_ocp_write(tp, 0xF86A, 0x4848);
-        rtl8168_mac_ocp_write(tp, 0xF86C, 0xE00E);
-        rtl8168_mac_ocp_write(tp, 0xF86E, 0x4848);
-        rtl8168_mac_ocp_write(tp, 0xF870, 0x49C7);
-        rtl8168_mac_ocp_write(tp, 0xF872, 0xF00A);
-        rtl8168_mac_ocp_write(tp, 0xF874, 0x48C9);
-        rtl8168_mac_ocp_write(tp, 0xF876, 0xC60D);
-        rtl8168_mac_ocp_write(tp, 0xF878, 0x1D1F);
-        rtl8168_mac_ocp_write(tp, 0xF87A, 0x8DC2);
-        rtl8168_mac_ocp_write(tp, 0xF87C, 0x1D00);
-        rtl8168_mac_ocp_write(tp, 0xF87E, 0x8DC3);
-        rtl8168_mac_ocp_write(tp, 0xF880, 0x1D11);
-        rtl8168_mac_ocp_write(tp, 0xF882, 0x8DC0);
-        rtl8168_mac_ocp_write(tp, 0xF884, 0xE002);
-        rtl8168_mac_ocp_write(tp, 0xF886, 0x4849);
-        rtl8168_mac_ocp_write(tp, 0xF888, 0x94E5);
-        rtl8168_mac_ocp_write(tp, 0xF88A, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF88C, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF88E, 0x0238);
-        rtl8168_mac_ocp_write(tp, 0xF890, 0xE434);
-        rtl8168_mac_ocp_write(tp, 0xF892, 0x49D9);
-        rtl8168_mac_ocp_write(tp, 0xF894, 0xF01B);
-        rtl8168_mac_ocp_write(tp, 0xF896, 0xC31E);
-        rtl8168_mac_ocp_write(tp, 0xF898, 0x7464);
-        rtl8168_mac_ocp_write(tp, 0xF89A, 0x49C4);
-        rtl8168_mac_ocp_write(tp, 0xF89C, 0xF114);
-        rtl8168_mac_ocp_write(tp, 0xF89E, 0xC31B);
-        rtl8168_mac_ocp_write(tp, 0xF8A0, 0x6460);
-        rtl8168_mac_ocp_write(tp, 0xF8A2, 0x14FA);
-        rtl8168_mac_ocp_write(tp, 0xF8A4, 0xFA02);
-        rtl8168_mac_ocp_write(tp, 0xF8A6, 0xE00F);
-        rtl8168_mac_ocp_write(tp, 0xF8A8, 0xC317);
-        rtl8168_mac_ocp_write(tp, 0xF8AA, 0x7460);
-        rtl8168_mac_ocp_write(tp, 0xF8AC, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF8AE, 0xF10B);
-        rtl8168_mac_ocp_write(tp, 0xF8B0, 0xC311);
-        rtl8168_mac_ocp_write(tp, 0xF8B2, 0x7462);
-        rtl8168_mac_ocp_write(tp, 0xF8B4, 0x48C1);
-        rtl8168_mac_ocp_write(tp, 0xF8B6, 0x9C62);
-        rtl8168_mac_ocp_write(tp, 0xF8B8, 0x4841);
-        rtl8168_mac_ocp_write(tp, 0xF8BA, 0x9C62);
-        rtl8168_mac_ocp_write(tp, 0xF8BC, 0xC30A);
-        rtl8168_mac_ocp_write(tp, 0xF8BE, 0x1C04);
-        rtl8168_mac_ocp_write(tp, 0xF8C0, 0x8C60);
-        rtl8168_mac_ocp_write(tp, 0xF8C2, 0xE004);
-        rtl8168_mac_ocp_write(tp, 0xF8C4, 0x1C15);
-        rtl8168_mac_ocp_write(tp, 0xF8C6, 0xC305);
-        rtl8168_mac_ocp_write(tp, 0xF8C8, 0x8C60);
-        rtl8168_mac_ocp_write(tp, 0xF8CA, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF8CC, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF8CE, 0x0374);
-        rtl8168_mac_ocp_write(tp, 0xF8D0, 0xE434);
-        rtl8168_mac_ocp_write(tp, 0xF8D2, 0xE030);
-        rtl8168_mac_ocp_write(tp, 0xF8D4, 0xE61C);
-        rtl8168_mac_ocp_write(tp, 0xF8D6, 0xE906);
-        rtl8168_mac_ocp_write(tp, 0xF8D8, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF8DA, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF8DC, 0x0000);
-
-        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-        rtl8168_mac_ocp_write(tp, 0xFC28, 0x0493);
-        rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0205);
-        rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0589);
-        rtl8168_mac_ocp_write(tp, 0xFC2E, 0x0647);
-        rtl8168_mac_ocp_write(tp, 0xFC30, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xFC32, 0x0215);
-        rtl8168_mac_ocp_write(tp, 0xFC34, 0x0285);
+        rtl8168_mac_ocp_write( tp, 0xF800, 0xE008 );
+        rtl8168_mac_ocp_write( tp, 0xF802, 0xE011 );
+        rtl8168_mac_ocp_write( tp, 0xF804, 0xE015 );
+        rtl8168_mac_ocp_write( tp, 0xF806, 0xE018 );
+        rtl8168_mac_ocp_write( tp, 0xF808, 0xE01B );
+        rtl8168_mac_ocp_write( tp, 0xF80A, 0xE027 );
+        rtl8168_mac_ocp_write( tp, 0xF80C, 0xE043 );
+        rtl8168_mac_ocp_write( tp, 0xF80E, 0xE065 );
+        rtl8168_mac_ocp_write( tp, 0xF810, 0x49E2 );
+        rtl8168_mac_ocp_write( tp, 0xF812, 0xF005 );
+        rtl8168_mac_ocp_write( tp, 0xF814, 0x49EA );
+        rtl8168_mac_ocp_write( tp, 0xF816, 0xF003 );
+        rtl8168_mac_ocp_write( tp, 0xF818, 0xC404 );
+        rtl8168_mac_ocp_write( tp, 0xF81A, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xF81C, 0xC403 );
+        rtl8168_mac_ocp_write( tp, 0xF81E, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xF820, 0x0496 );
+        rtl8168_mac_ocp_write( tp, 0xF822, 0x051A );
+        rtl8168_mac_ocp_write( tp, 0xF824, 0x1D01 );
+        rtl8168_mac_ocp_write( tp, 0xF826, 0x8DE8 );
+        rtl8168_mac_ocp_write( tp, 0xF828, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF82A, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF82C, 0x0206 );
+        rtl8168_mac_ocp_write( tp, 0xF82E, 0x1B76 );
+        rtl8168_mac_ocp_write( tp, 0xF830, 0xC202 );
+        rtl8168_mac_ocp_write( tp, 0xF832, 0xBA00 );
+        rtl8168_mac_ocp_write( tp, 0xF834, 0x058A );
+        rtl8168_mac_ocp_write( tp, 0xF836, 0x1B76 );
+        rtl8168_mac_ocp_write( tp, 0xF838, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF83A, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF83C, 0x0648 );
+        rtl8168_mac_ocp_write( tp, 0xF83E, 0x74E6 );
+        rtl8168_mac_ocp_write( tp, 0xF840, 0x1B78 );
+        rtl8168_mac_ocp_write( tp, 0xF842, 0x46DC );
+        rtl8168_mac_ocp_write( tp, 0xF844, 0x1300 );
+        rtl8168_mac_ocp_write( tp, 0xF846, 0xF005 );
+        rtl8168_mac_ocp_write( tp, 0xF848, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF84A, 0x48C3 );
+        rtl8168_mac_ocp_write( tp, 0xF84C, 0x48C4 );
+        rtl8168_mac_ocp_write( tp, 0xF84E, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF850, 0x64E7 );
+        rtl8168_mac_ocp_write( tp, 0xF852, 0xC302 );
+        rtl8168_mac_ocp_write( tp, 0xF854, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF856, 0x068E );
+        rtl8168_mac_ocp_write( tp, 0xF858, 0x74E4 );
+        rtl8168_mac_ocp_write( tp, 0xF85A, 0x49C5 );
+        rtl8168_mac_ocp_write( tp, 0xF85C, 0xF106 );
+        rtl8168_mac_ocp_write( tp, 0xF85E, 0x49C6 );
+        rtl8168_mac_ocp_write( tp, 0xF860, 0xF107 );
+        rtl8168_mac_ocp_write( tp, 0xF862, 0x48C8 );
+        rtl8168_mac_ocp_write( tp, 0xF864, 0x48C9 );
+        rtl8168_mac_ocp_write( tp, 0xF866, 0xE011 );
+        rtl8168_mac_ocp_write( tp, 0xF868, 0x48C9 );
+        rtl8168_mac_ocp_write( tp, 0xF86A, 0x4848 );
+        rtl8168_mac_ocp_write( tp, 0xF86C, 0xE00E );
+        rtl8168_mac_ocp_write( tp, 0xF86E, 0x4848 );
+        rtl8168_mac_ocp_write( tp, 0xF870, 0x49C7 );
+        rtl8168_mac_ocp_write( tp, 0xF872, 0xF00A );
+        rtl8168_mac_ocp_write( tp, 0xF874, 0x48C9 );
+        rtl8168_mac_ocp_write( tp, 0xF876, 0xC60D );
+        rtl8168_mac_ocp_write( tp, 0xF878, 0x1D1F );
+        rtl8168_mac_ocp_write( tp, 0xF87A, 0x8DC2 );
+        rtl8168_mac_ocp_write( tp, 0xF87C, 0x1D00 );
+        rtl8168_mac_ocp_write( tp, 0xF87E, 0x8DC3 );
+        rtl8168_mac_ocp_write( tp, 0xF880, 0x1D11 );
+        rtl8168_mac_ocp_write( tp, 0xF882, 0x8DC0 );
+        rtl8168_mac_ocp_write( tp, 0xF884, 0xE002 );
+        rtl8168_mac_ocp_write( tp, 0xF886, 0x4849 );
+        rtl8168_mac_ocp_write( tp, 0xF888, 0x94E5 );
+        rtl8168_mac_ocp_write( tp, 0xF88A, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF88C, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF88E, 0x0238 );
+        rtl8168_mac_ocp_write( tp, 0xF890, 0xE434 );
+        rtl8168_mac_ocp_write( tp, 0xF892, 0x49D9 );
+        rtl8168_mac_ocp_write( tp, 0xF894, 0xF01B );
+        rtl8168_mac_ocp_write( tp, 0xF896, 0xC31E );
+        rtl8168_mac_ocp_write( tp, 0xF898, 0x7464 );
+        rtl8168_mac_ocp_write( tp, 0xF89A, 0x49C4 );
+        rtl8168_mac_ocp_write( tp, 0xF89C, 0xF114 );
+        rtl8168_mac_ocp_write( tp, 0xF89E, 0xC31B );
+        rtl8168_mac_ocp_write( tp, 0xF8A0, 0x6460 );
+        rtl8168_mac_ocp_write( tp, 0xF8A2, 0x14FA );
+        rtl8168_mac_ocp_write( tp, 0xF8A4, 0xFA02 );
+        rtl8168_mac_ocp_write( tp, 0xF8A6, 0xE00F );
+        rtl8168_mac_ocp_write( tp, 0xF8A8, 0xC317 );
+        rtl8168_mac_ocp_write( tp, 0xF8AA, 0x7460 );
+        rtl8168_mac_ocp_write( tp, 0xF8AC, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8AE, 0xF10B );
+        rtl8168_mac_ocp_write( tp, 0xF8B0, 0xC311 );
+        rtl8168_mac_ocp_write( tp, 0xF8B2, 0x7462 );
+        rtl8168_mac_ocp_write( tp, 0xF8B4, 0x48C1 );
+        rtl8168_mac_ocp_write( tp, 0xF8B6, 0x9C62 );
+        rtl8168_mac_ocp_write( tp, 0xF8B8, 0x4841 );
+        rtl8168_mac_ocp_write( tp, 0xF8BA, 0x9C62 );
+        rtl8168_mac_ocp_write( tp, 0xF8BC, 0xC30A );
+        rtl8168_mac_ocp_write( tp, 0xF8BE, 0x1C04 );
+        rtl8168_mac_ocp_write( tp, 0xF8C0, 0x8C60 );
+        rtl8168_mac_ocp_write( tp, 0xF8C2, 0xE004 );
+        rtl8168_mac_ocp_write( tp, 0xF8C4, 0x1C15 );
+        rtl8168_mac_ocp_write( tp, 0xF8C6, 0xC305 );
+        rtl8168_mac_ocp_write( tp, 0xF8C8, 0x8C60 );
+        rtl8168_mac_ocp_write( tp, 0xF8CA, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF8CC, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF8CE, 0x0374 );
+        rtl8168_mac_ocp_write( tp, 0xF8D0, 0xE434 );
+        rtl8168_mac_ocp_write( tp, 0xF8D2, 0xE030 );
+        rtl8168_mac_ocp_write( tp, 0xF8D4, 0xE61C );
+        rtl8168_mac_ocp_write( tp, 0xF8D6, 0xE906 );
+        rtl8168_mac_ocp_write( tp, 0xF8D8, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF8DA, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF8DC, 0x0000 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC26, 0x8000 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC28, 0x0493 );
+        rtl8168_mac_ocp_write( tp, 0xFC2A, 0x0205 );
+        rtl8168_mac_ocp_write( tp, 0xFC2C, 0x0589 );
+        rtl8168_mac_ocp_write( tp, 0xFC2E, 0x0647 );
+        rtl8168_mac_ocp_write( tp, 0xFC30, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xFC32, 0x0215 );
+        rtl8168_mac_ocp_write( tp, 0xFC34, 0x0285 );
 }
 
 static void
@@ -9396,426 +7414,426 @@
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        rtl8168_mac_ocp_write(tp, 0xF800, 0xE008);
-        rtl8168_mac_ocp_write(tp, 0xF802, 0xE00A);
-        rtl8168_mac_ocp_write(tp, 0xF804, 0xE00D);
-        rtl8168_mac_ocp_write(tp, 0xF806, 0xE02F);
-        rtl8168_mac_ocp_write(tp, 0xF808, 0xE031);
-        rtl8168_mac_ocp_write(tp, 0xF80A, 0xE038);
-        rtl8168_mac_ocp_write(tp, 0xF80C, 0xE03A);
-        rtl8168_mac_ocp_write(tp, 0xF80E, 0xE051);
-        rtl8168_mac_ocp_write(tp, 0xF810, 0xC202);
-        rtl8168_mac_ocp_write(tp, 0xF812, 0xBA00);
-        rtl8168_mac_ocp_write(tp, 0xF814, 0x0DFC);
-        rtl8168_mac_ocp_write(tp, 0xF816, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xF818, 0xC502);
-        rtl8168_mac_ocp_write(tp, 0xF81A, 0xBD00);
-        rtl8168_mac_ocp_write(tp, 0xF81C, 0x0A30);
-        rtl8168_mac_ocp_write(tp, 0xF81E, 0x49D9);
-        rtl8168_mac_ocp_write(tp, 0xF820, 0xF019);
-        rtl8168_mac_ocp_write(tp, 0xF822, 0xC520);
-        rtl8168_mac_ocp_write(tp, 0xF824, 0x64A5);
-        rtl8168_mac_ocp_write(tp, 0xF826, 0x1400);
-        rtl8168_mac_ocp_write(tp, 0xF828, 0xF007);
-        rtl8168_mac_ocp_write(tp, 0xF82A, 0x0C01);
-        rtl8168_mac_ocp_write(tp, 0xF82C, 0x8CA5);
-        rtl8168_mac_ocp_write(tp, 0xF82E, 0x1C15);
-        rtl8168_mac_ocp_write(tp, 0xF830, 0xC515);
-        rtl8168_mac_ocp_write(tp, 0xF832, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xF834, 0xE00F);
-        rtl8168_mac_ocp_write(tp, 0xF836, 0xC513);
-        rtl8168_mac_ocp_write(tp, 0xF838, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xF83A, 0x48C8);
-        rtl8168_mac_ocp_write(tp, 0xF83C, 0x48CA);
-        rtl8168_mac_ocp_write(tp, 0xF83E, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xF840, 0xC510);
-        rtl8168_mac_ocp_write(tp, 0xF842, 0x1B00);
-        rtl8168_mac_ocp_write(tp, 0xF844, 0x9BA0);
-        rtl8168_mac_ocp_write(tp, 0xF846, 0x1B1C);
-        rtl8168_mac_ocp_write(tp, 0xF848, 0x483F);
-        rtl8168_mac_ocp_write(tp, 0xF84A, 0x9BA2);
-        rtl8168_mac_ocp_write(tp, 0xF84C, 0x1B04);
-        rtl8168_mac_ocp_write(tp, 0xF84E, 0xC506);
-        rtl8168_mac_ocp_write(tp, 0xF850, 0x9BA0);
-        rtl8168_mac_ocp_write(tp, 0xF852, 0xC603);
-        rtl8168_mac_ocp_write(tp, 0xF854, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF856, 0x0298);
-        rtl8168_mac_ocp_write(tp, 0xF858, 0x03DE);
-        rtl8168_mac_ocp_write(tp, 0xF85A, 0xE434);
-        rtl8168_mac_ocp_write(tp, 0xF85C, 0xE096);
-        rtl8168_mac_ocp_write(tp, 0xF85E, 0xE860);
-        rtl8168_mac_ocp_write(tp, 0xF860, 0xDE20);
-        rtl8168_mac_ocp_write(tp, 0xF862, 0xD3C0);
-        rtl8168_mac_ocp_write(tp, 0xF864, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF866, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF868, 0x0A64);
-        rtl8168_mac_ocp_write(tp, 0xF86A, 0xC707);
-        rtl8168_mac_ocp_write(tp, 0xF86C, 0x1D00);
-        rtl8168_mac_ocp_write(tp, 0xF86E, 0x8DE2);
-        rtl8168_mac_ocp_write(tp, 0xF870, 0x48C1);
-        rtl8168_mac_ocp_write(tp, 0xF872, 0xC502);
-        rtl8168_mac_ocp_write(tp, 0xF874, 0xBD00);
-        rtl8168_mac_ocp_write(tp, 0xF876, 0x00AA);
-        rtl8168_mac_ocp_write(tp, 0xF878, 0xE0C0);
-        rtl8168_mac_ocp_write(tp, 0xF87A, 0xC502);
-        rtl8168_mac_ocp_write(tp, 0xF87C, 0xBD00);
-        rtl8168_mac_ocp_write(tp, 0xF87E, 0x0132);
-        rtl8168_mac_ocp_write(tp, 0xF880, 0xC50C);
-        rtl8168_mac_ocp_write(tp, 0xF882, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xF884, 0x49CE);
-        rtl8168_mac_ocp_write(tp, 0xF886, 0xF1FE);
-        rtl8168_mac_ocp_write(tp, 0xF888, 0x1C00);
-        rtl8168_mac_ocp_write(tp, 0xF88A, 0x9EA0);
-        rtl8168_mac_ocp_write(tp, 0xF88C, 0x1C1C);
-        rtl8168_mac_ocp_write(tp, 0xF88E, 0x484F);
-        rtl8168_mac_ocp_write(tp, 0xF890, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xF892, 0xC402);
-        rtl8168_mac_ocp_write(tp, 0xF894, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xF896, 0x0AFA);
-        rtl8168_mac_ocp_write(tp, 0xF898, 0xDE20);
-        rtl8168_mac_ocp_write(tp, 0xF89A, 0xE000);
-        rtl8168_mac_ocp_write(tp, 0xF89C, 0xE092);
-        rtl8168_mac_ocp_write(tp, 0xF89E, 0xE430);
-        rtl8168_mac_ocp_write(tp, 0xF8A0, 0xDE20);
-        rtl8168_mac_ocp_write(tp, 0xF8A2, 0xE0C0);
-        rtl8168_mac_ocp_write(tp, 0xF8A4, 0xE860);
-        rtl8168_mac_ocp_write(tp, 0xF8A6, 0xE84C);
-        rtl8168_mac_ocp_write(tp, 0xF8A8, 0xB400);
-        rtl8168_mac_ocp_write(tp, 0xF8AA, 0xB430);
-        rtl8168_mac_ocp_write(tp, 0xF8AC, 0xE410);
-        rtl8168_mac_ocp_write(tp, 0xF8AE, 0xC0AE);
-        rtl8168_mac_ocp_write(tp, 0xF8B0, 0xB407);
-        rtl8168_mac_ocp_write(tp, 0xF8B2, 0xB406);
-        rtl8168_mac_ocp_write(tp, 0xF8B4, 0xB405);
-        rtl8168_mac_ocp_write(tp, 0xF8B6, 0xB404);
-        rtl8168_mac_ocp_write(tp, 0xF8B8, 0xB403);
-        rtl8168_mac_ocp_write(tp, 0xF8BA, 0xB402);
-        rtl8168_mac_ocp_write(tp, 0xF8BC, 0xB401);
-        rtl8168_mac_ocp_write(tp, 0xF8BE, 0xC7EE);
-        rtl8168_mac_ocp_write(tp, 0xF8C0, 0x76F4);
-        rtl8168_mac_ocp_write(tp, 0xF8C2, 0xC2ED);
-        rtl8168_mac_ocp_write(tp, 0xF8C4, 0xC3ED);
-        rtl8168_mac_ocp_write(tp, 0xF8C6, 0xC1EF);
-        rtl8168_mac_ocp_write(tp, 0xF8C8, 0xC5F3);
-        rtl8168_mac_ocp_write(tp, 0xF8CA, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xF8CC, 0x49CD);
-        rtl8168_mac_ocp_write(tp, 0xF8CE, 0xF001);
-        rtl8168_mac_ocp_write(tp, 0xF8D0, 0xC5EE);
-        rtl8168_mac_ocp_write(tp, 0xF8D2, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xF8D4, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF8D6, 0xF105);
-        rtl8168_mac_ocp_write(tp, 0xF8D8, 0xC5E4);
-        rtl8168_mac_ocp_write(tp, 0xF8DA, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xF8DC, 0x49CE);
-        rtl8168_mac_ocp_write(tp, 0xF8DE, 0xF00B);
-        rtl8168_mac_ocp_write(tp, 0xF8E0, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xF8E2, 0x484B);
-        rtl8168_mac_ocp_write(tp, 0xF8E4, 0x9C44);
-        rtl8168_mac_ocp_write(tp, 0xF8E6, 0x1C10);
-        rtl8168_mac_ocp_write(tp, 0xF8E8, 0x9C62);
-        rtl8168_mac_ocp_write(tp, 0xF8EA, 0x1C11);
-        rtl8168_mac_ocp_write(tp, 0xF8EC, 0x8C60);
-        rtl8168_mac_ocp_write(tp, 0xF8EE, 0x1C00);
-        rtl8168_mac_ocp_write(tp, 0xF8F0, 0x9CF6);
-        rtl8168_mac_ocp_write(tp, 0xF8F2, 0xE0EC);
-        rtl8168_mac_ocp_write(tp, 0xF8F4, 0x49E7);
-        rtl8168_mac_ocp_write(tp, 0xF8F6, 0xF016);
-        rtl8168_mac_ocp_write(tp, 0xF8F8, 0x1D80);
-        rtl8168_mac_ocp_write(tp, 0xF8FA, 0x8DF4);
-        rtl8168_mac_ocp_write(tp, 0xF8FC, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF8FE, 0x4843);
-        rtl8168_mac_ocp_write(tp, 0xF900, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF902, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF904, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF906, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xF908, 0x48C8);
-        rtl8168_mac_ocp_write(tp, 0xF90A, 0x48C9);
-        rtl8168_mac_ocp_write(tp, 0xF90C, 0x48CA);
-        rtl8168_mac_ocp_write(tp, 0xF90E, 0x9C44);
-        rtl8168_mac_ocp_write(tp, 0xF910, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF912, 0x4844);
-        rtl8168_mac_ocp_write(tp, 0xF914, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF916, 0x1E01);
-        rtl8168_mac_ocp_write(tp, 0xF918, 0xE8DB);
-        rtl8168_mac_ocp_write(tp, 0xF91A, 0x7420);
-        rtl8168_mac_ocp_write(tp, 0xF91C, 0x48C1);
-        rtl8168_mac_ocp_write(tp, 0xF91E, 0x9C20);
-        rtl8168_mac_ocp_write(tp, 0xF920, 0xE0D5);
-        rtl8168_mac_ocp_write(tp, 0xF922, 0x49E6);
-        rtl8168_mac_ocp_write(tp, 0xF924, 0xF02A);
-        rtl8168_mac_ocp_write(tp, 0xF926, 0x1D40);
-        rtl8168_mac_ocp_write(tp, 0xF928, 0x8DF4);
-        rtl8168_mac_ocp_write(tp, 0xF92A, 0x74FC);
-        rtl8168_mac_ocp_write(tp, 0xF92C, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF92E, 0xF124);
-        rtl8168_mac_ocp_write(tp, 0xF930, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF932, 0xF122);
-        rtl8168_mac_ocp_write(tp, 0xF934, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF936, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF938, 0xF01F);
-        rtl8168_mac_ocp_write(tp, 0xF93A, 0xE8D3);
-        rtl8168_mac_ocp_write(tp, 0xF93C, 0x48C4);
-        rtl8168_mac_ocp_write(tp, 0xF93E, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF940, 0x1E00);
-        rtl8168_mac_ocp_write(tp, 0xF942, 0xE8C6);
-        rtl8168_mac_ocp_write(tp, 0xF944, 0xC5B1);
-        rtl8168_mac_ocp_write(tp, 0xF946, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xF948, 0x49C3);
-        rtl8168_mac_ocp_write(tp, 0xF94A, 0xF016);
-        rtl8168_mac_ocp_write(tp, 0xF94C, 0xC5AF);
-        rtl8168_mac_ocp_write(tp, 0xF94E, 0x74A4);
-        rtl8168_mac_ocp_write(tp, 0xF950, 0x49C2);
-        rtl8168_mac_ocp_write(tp, 0xF952, 0xF005);
-        rtl8168_mac_ocp_write(tp, 0xF954, 0xC5AA);
-        rtl8168_mac_ocp_write(tp, 0xF956, 0x74B2);
-        rtl8168_mac_ocp_write(tp, 0xF958, 0x49C9);
-        rtl8168_mac_ocp_write(tp, 0xF95A, 0xF10E);
-        rtl8168_mac_ocp_write(tp, 0xF95C, 0xC5A6);
-        rtl8168_mac_ocp_write(tp, 0xF95E, 0x74A8);
-        rtl8168_mac_ocp_write(tp, 0xF960, 0x4845);
-        rtl8168_mac_ocp_write(tp, 0xF962, 0x4846);
-        rtl8168_mac_ocp_write(tp, 0xF964, 0x4847);
-        rtl8168_mac_ocp_write(tp, 0xF966, 0x4848);
-        rtl8168_mac_ocp_write(tp, 0xF968, 0x9CA8);
-        rtl8168_mac_ocp_write(tp, 0xF96A, 0x74B2);
-        rtl8168_mac_ocp_write(tp, 0xF96C, 0x4849);
-        rtl8168_mac_ocp_write(tp, 0xF96E, 0x9CB2);
-        rtl8168_mac_ocp_write(tp, 0xF970, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xF972, 0x484F);
-        rtl8168_mac_ocp_write(tp, 0xF974, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xF976, 0xE0AA);
-        rtl8168_mac_ocp_write(tp, 0xF978, 0x49E4);
-        rtl8168_mac_ocp_write(tp, 0xF97A, 0xF018);
-        rtl8168_mac_ocp_write(tp, 0xF97C, 0x1D10);
-        rtl8168_mac_ocp_write(tp, 0xF97E, 0x8DF4);
-        rtl8168_mac_ocp_write(tp, 0xF980, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF982, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF984, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF986, 0x4843);
-        rtl8168_mac_ocp_write(tp, 0xF988, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF98A, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF98C, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF98E, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF990, 0x4844);
-        rtl8168_mac_ocp_write(tp, 0xF992, 0x4842);
-        rtl8168_mac_ocp_write(tp, 0xF994, 0x4841);
-        rtl8168_mac_ocp_write(tp, 0xF996, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF998, 0x1E01);
-        rtl8168_mac_ocp_write(tp, 0xF99A, 0xE89A);
-        rtl8168_mac_ocp_write(tp, 0xF99C, 0x7420);
-        rtl8168_mac_ocp_write(tp, 0xF99E, 0x4841);
-        rtl8168_mac_ocp_write(tp, 0xF9A0, 0x9C20);
-        rtl8168_mac_ocp_write(tp, 0xF9A2, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xF9A4, 0x4848);
-        rtl8168_mac_ocp_write(tp, 0xF9A6, 0x9C44);
-        rtl8168_mac_ocp_write(tp, 0xF9A8, 0xE091);
-        rtl8168_mac_ocp_write(tp, 0xF9AA, 0x49E5);
-        rtl8168_mac_ocp_write(tp, 0xF9AC, 0xF03E);
-        rtl8168_mac_ocp_write(tp, 0xF9AE, 0x1D20);
-        rtl8168_mac_ocp_write(tp, 0xF9B0, 0x8DF4);
-        rtl8168_mac_ocp_write(tp, 0xF9B2, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF9B4, 0x48C2);
-        rtl8168_mac_ocp_write(tp, 0xF9B6, 0x4841);
-        rtl8168_mac_ocp_write(tp, 0xF9B8, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF9BA, 0x1E01);
-        rtl8168_mac_ocp_write(tp, 0xF9BC, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xF9BE, 0x49CA);
-        rtl8168_mac_ocp_write(tp, 0xF9C0, 0xF103);
-        rtl8168_mac_ocp_write(tp, 0xF9C2, 0x49C2);
-        rtl8168_mac_ocp_write(tp, 0xF9C4, 0xF00C);
-        rtl8168_mac_ocp_write(tp, 0xF9C6, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF9C8, 0xF004);
-        rtl8168_mac_ocp_write(tp, 0xF9CA, 0x6447);
-        rtl8168_mac_ocp_write(tp, 0xF9CC, 0x2244);
-        rtl8168_mac_ocp_write(tp, 0xF9CE, 0xE002);
-        rtl8168_mac_ocp_write(tp, 0xF9D0, 0x1C01);
-        rtl8168_mac_ocp_write(tp, 0xF9D2, 0x9C62);
-        rtl8168_mac_ocp_write(tp, 0xF9D4, 0x1C11);
-        rtl8168_mac_ocp_write(tp, 0xF9D6, 0x8C60);
-        rtl8168_mac_ocp_write(tp, 0xF9D8, 0x1C00);
-        rtl8168_mac_ocp_write(tp, 0xF9DA, 0x9CF6);
-        rtl8168_mac_ocp_write(tp, 0xF9DC, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xF9DE, 0x49C8);
-        rtl8168_mac_ocp_write(tp, 0xF9E0, 0xF01D);
-        rtl8168_mac_ocp_write(tp, 0xF9E2, 0x74FC);
-        rtl8168_mac_ocp_write(tp, 0xF9E4, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF9E6, 0xF11A);
-        rtl8168_mac_ocp_write(tp, 0xF9E8, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xF9EA, 0xF118);
-        rtl8168_mac_ocp_write(tp, 0xF9EC, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF9EE, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF9F0, 0xF015);
-        rtl8168_mac_ocp_write(tp, 0xF9F2, 0x49C6);
-        rtl8168_mac_ocp_write(tp, 0xF9F4, 0xF113);
-        rtl8168_mac_ocp_write(tp, 0xF9F6, 0xE875);
-        rtl8168_mac_ocp_write(tp, 0xF9F8, 0x48C4);
-        rtl8168_mac_ocp_write(tp, 0xF9FA, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF9FC, 0x7420);
-        rtl8168_mac_ocp_write(tp, 0xF9FE, 0x48C1);
-        rtl8168_mac_ocp_write(tp, 0xFA00, 0x9C20);
-        rtl8168_mac_ocp_write(tp, 0xFA02, 0xC50A);
-        rtl8168_mac_ocp_write(tp, 0xFA04, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xFA06, 0x8CA5);
-        rtl8168_mac_ocp_write(tp, 0xFA08, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xFA0A, 0xC505);
-        rtl8168_mac_ocp_write(tp, 0xFA0C, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xFA0E, 0x1C11);
-        rtl8168_mac_ocp_write(tp, 0xFA10, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xFA12, 0xE00A);
-        rtl8168_mac_ocp_write(tp, 0xFA14, 0xE434);
-        rtl8168_mac_ocp_write(tp, 0xFA16, 0xD3C0);
-        rtl8168_mac_ocp_write(tp, 0xFA18, 0xDC00);
-        rtl8168_mac_ocp_write(tp, 0xFA1A, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xFA1C, 0x49CA);
-        rtl8168_mac_ocp_write(tp, 0xFA1E, 0xF004);
-        rtl8168_mac_ocp_write(tp, 0xFA20, 0x48CA);
-        rtl8168_mac_ocp_write(tp, 0xFA22, 0x9C44);
-        rtl8168_mac_ocp_write(tp, 0xFA24, 0xE855);
-        rtl8168_mac_ocp_write(tp, 0xFA26, 0xE052);
-        rtl8168_mac_ocp_write(tp, 0xFA28, 0x49E8);
-        rtl8168_mac_ocp_write(tp, 0xFA2A, 0xF024);
-        rtl8168_mac_ocp_write(tp, 0xFA2C, 0x1D01);
-        rtl8168_mac_ocp_write(tp, 0xFA2E, 0x8DF5);
-        rtl8168_mac_ocp_write(tp, 0xFA30, 0x7440);
-        rtl8168_mac_ocp_write(tp, 0xFA32, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xFA34, 0xF11E);
-        rtl8168_mac_ocp_write(tp, 0xFA36, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xFA38, 0x49C8);
-        rtl8168_mac_ocp_write(tp, 0xFA3A, 0xF01B);
-        rtl8168_mac_ocp_write(tp, 0xFA3C, 0x49CA);
-        rtl8168_mac_ocp_write(tp, 0xFA3E, 0xF119);
-        rtl8168_mac_ocp_write(tp, 0xFA40, 0xC5EC);
-        rtl8168_mac_ocp_write(tp, 0xFA42, 0x76A4);
-        rtl8168_mac_ocp_write(tp, 0xFA44, 0x49E3);
-        rtl8168_mac_ocp_write(tp, 0xFA46, 0xF015);
-        rtl8168_mac_ocp_write(tp, 0xFA48, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xFA4A, 0xF103);
-        rtl8168_mac_ocp_write(tp, 0xFA4C, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xFA4E, 0xF011);
-        rtl8168_mac_ocp_write(tp, 0xFA50, 0x4849);
-        rtl8168_mac_ocp_write(tp, 0xFA52, 0x9C44);
-        rtl8168_mac_ocp_write(tp, 0xFA54, 0x1C00);
-        rtl8168_mac_ocp_write(tp, 0xFA56, 0x9CF6);
-        rtl8168_mac_ocp_write(tp, 0xFA58, 0x7444);
-        rtl8168_mac_ocp_write(tp, 0xFA5A, 0x49C1);
-        rtl8168_mac_ocp_write(tp, 0xFA5C, 0xF004);
-        rtl8168_mac_ocp_write(tp, 0xFA5E, 0x6446);
-        rtl8168_mac_ocp_write(tp, 0xFA60, 0x1E07);
-        rtl8168_mac_ocp_write(tp, 0xFA62, 0xE003);
-        rtl8168_mac_ocp_write(tp, 0xFA64, 0x1C01);
-        rtl8168_mac_ocp_write(tp, 0xFA66, 0x1E03);
-        rtl8168_mac_ocp_write(tp, 0xFA68, 0x9C62);
-        rtl8168_mac_ocp_write(tp, 0xFA6A, 0x1C11);
-        rtl8168_mac_ocp_write(tp, 0xFA6C, 0x8C60);
-        rtl8168_mac_ocp_write(tp, 0xFA6E, 0xE830);
-        rtl8168_mac_ocp_write(tp, 0xFA70, 0xE02D);
-        rtl8168_mac_ocp_write(tp, 0xFA72, 0x49E9);
-        rtl8168_mac_ocp_write(tp, 0xFA74, 0xF004);
-        rtl8168_mac_ocp_write(tp, 0xFA76, 0x1D02);
-        rtl8168_mac_ocp_write(tp, 0xFA78, 0x8DF5);
-        rtl8168_mac_ocp_write(tp, 0xFA7A, 0xE79C);
-        rtl8168_mac_ocp_write(tp, 0xFA7C, 0x49E3);
-        rtl8168_mac_ocp_write(tp, 0xFA7E, 0xF006);
-        rtl8168_mac_ocp_write(tp, 0xFA80, 0x1D08);
-        rtl8168_mac_ocp_write(tp, 0xFA82, 0x8DF4);
-        rtl8168_mac_ocp_write(tp, 0xFA84, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xFA86, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xFA88, 0xE73A);
-        rtl8168_mac_ocp_write(tp, 0xFA8A, 0x49E1);
-        rtl8168_mac_ocp_write(tp, 0xFA8C, 0xF007);
-        rtl8168_mac_ocp_write(tp, 0xFA8E, 0x1D02);
-        rtl8168_mac_ocp_write(tp, 0xFA90, 0x8DF4);
-        rtl8168_mac_ocp_write(tp, 0xFA92, 0x1E01);
-        rtl8168_mac_ocp_write(tp, 0xFA94, 0xE7A7);
-        rtl8168_mac_ocp_write(tp, 0xFA96, 0xDE20);
-        rtl8168_mac_ocp_write(tp, 0xFA98, 0xE410);
-        rtl8168_mac_ocp_write(tp, 0xFA9A, 0x49E0);
-        rtl8168_mac_ocp_write(tp, 0xFA9C, 0xF017);
-        rtl8168_mac_ocp_write(tp, 0xFA9E, 0x1D01);
-        rtl8168_mac_ocp_write(tp, 0xFAA0, 0x8DF4);
-        rtl8168_mac_ocp_write(tp, 0xFAA2, 0xC5FA);
-        rtl8168_mac_ocp_write(tp, 0xFAA4, 0x1C00);
-        rtl8168_mac_ocp_write(tp, 0xFAA6, 0x8CA0);
-        rtl8168_mac_ocp_write(tp, 0xFAA8, 0x1C1B);
-        rtl8168_mac_ocp_write(tp, 0xFAAA, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xFAAC, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xFAAE, 0x49CF);
-        rtl8168_mac_ocp_write(tp, 0xFAB0, 0xF0FE);
-        rtl8168_mac_ocp_write(tp, 0xFAB2, 0xC5F3);
-        rtl8168_mac_ocp_write(tp, 0xFAB4, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xFAB6, 0x4849);
-        rtl8168_mac_ocp_write(tp, 0xFAB8, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xFABA, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xFABC, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xFABE, 0xF006);
-        rtl8168_mac_ocp_write(tp, 0xFAC0, 0x48C3);
-        rtl8168_mac_ocp_write(tp, 0xFAC2, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xFAC4, 0xE820);
-        rtl8168_mac_ocp_write(tp, 0xFAC6, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xFAC8, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xFACA, 0xC432);
-        rtl8168_mac_ocp_write(tp, 0xFACC, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xFACE, 0xC5E4);
-        rtl8168_mac_ocp_write(tp, 0xFAD0, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xFAD2, 0x49CE);
-        rtl8168_mac_ocp_write(tp, 0xFAD4, 0xF1FE);
-        rtl8168_mac_ocp_write(tp, 0xFAD6, 0x9EA0);
-        rtl8168_mac_ocp_write(tp, 0xFAD8, 0x1C1C);
-        rtl8168_mac_ocp_write(tp, 0xFADA, 0x484F);
-        rtl8168_mac_ocp_write(tp, 0xFADC, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xFADE, 0xFF80);
-        rtl8168_mac_ocp_write(tp, 0xFAE0, 0xB404);
-        rtl8168_mac_ocp_write(tp, 0xFAE2, 0xB405);
-        rtl8168_mac_ocp_write(tp, 0xFAE4, 0xC5D9);
-        rtl8168_mac_ocp_write(tp, 0xFAE6, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xFAE8, 0x49CE);
-        rtl8168_mac_ocp_write(tp, 0xFAEA, 0xF1FE);
-        rtl8168_mac_ocp_write(tp, 0xFAEC, 0xC41F);
-        rtl8168_mac_ocp_write(tp, 0xFAEE, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xFAF0, 0xC41C);
-        rtl8168_mac_ocp_write(tp, 0xFAF2, 0x1C13);
-        rtl8168_mac_ocp_write(tp, 0xFAF4, 0x484F);
-        rtl8168_mac_ocp_write(tp, 0xFAF6, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xFAF8, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xFAFA, 0x49CF);
-        rtl8168_mac_ocp_write(tp, 0xFAFC, 0xF1FE);
-        rtl8168_mac_ocp_write(tp, 0xFAFE, 0xB005);
-        rtl8168_mac_ocp_write(tp, 0xFB00, 0xB004);
-        rtl8168_mac_ocp_write(tp, 0xFB02, 0xFF80);
-        rtl8168_mac_ocp_write(tp, 0xFB04, 0xB404);
-        rtl8168_mac_ocp_write(tp, 0xFB06, 0xB405);
-        rtl8168_mac_ocp_write(tp, 0xFB08, 0xC5C7);
-        rtl8168_mac_ocp_write(tp, 0xFB0A, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xFB0C, 0x49CE);
-        rtl8168_mac_ocp_write(tp, 0xFB0E, 0xF1FE);
-        rtl8168_mac_ocp_write(tp, 0xFB10, 0xC40E);
-        rtl8168_mac_ocp_write(tp, 0xFB12, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xFB14, 0xC40A);
-        rtl8168_mac_ocp_write(tp, 0xFB16, 0x1C13);
-        rtl8168_mac_ocp_write(tp, 0xFB18, 0x484F);
-        rtl8168_mac_ocp_write(tp, 0xFB1A, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xFB1C, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xFB1E, 0x49CF);
-        rtl8168_mac_ocp_write(tp, 0xFB20, 0xF1FE);
-        rtl8168_mac_ocp_write(tp, 0xFB22, 0xB005);
-        rtl8168_mac_ocp_write(tp, 0xFB24, 0xB004);
-        rtl8168_mac_ocp_write(tp, 0xFB26, 0xFF80);
-        rtl8168_mac_ocp_write(tp, 0xFB28, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xFB2A, 0x0481);
-        rtl8168_mac_ocp_write(tp, 0xFB2C, 0x0C81);
-        rtl8168_mac_ocp_write(tp, 0xFB2E, 0x0AE0);
-
-
-        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-        rtl8168_mac_ocp_write(tp, 0xFC28, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0297);
-        rtl8168_mac_ocp_write(tp, 0xFC2E, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xFC30, 0x00A9);
-        rtl8168_mac_ocp_write(tp, 0xFC32, 0x012D);
-        rtl8168_mac_ocp_write(tp, 0xFC34, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xFC36, 0x08DF);
+        rtl8168_mac_ocp_write( tp, 0xF800, 0xE008 );
+        rtl8168_mac_ocp_write( tp, 0xF802, 0xE00A );
+        rtl8168_mac_ocp_write( tp, 0xF804, 0xE00D );
+        rtl8168_mac_ocp_write( tp, 0xF806, 0xE02F );
+        rtl8168_mac_ocp_write( tp, 0xF808, 0xE031 );
+        rtl8168_mac_ocp_write( tp, 0xF80A, 0xE038 );
+        rtl8168_mac_ocp_write( tp, 0xF80C, 0xE03A );
+        rtl8168_mac_ocp_write( tp, 0xF80E, 0xE051 );
+        rtl8168_mac_ocp_write( tp, 0xF810, 0xC202 );
+        rtl8168_mac_ocp_write( tp, 0xF812, 0xBA00 );
+        rtl8168_mac_ocp_write( tp, 0xF814, 0x0DFC );
+        rtl8168_mac_ocp_write( tp, 0xF816, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xF818, 0xC502 );
+        rtl8168_mac_ocp_write( tp, 0xF81A, 0xBD00 );
+        rtl8168_mac_ocp_write( tp, 0xF81C, 0x0A30 );
+        rtl8168_mac_ocp_write( tp, 0xF81E, 0x49D9 );
+        rtl8168_mac_ocp_write( tp, 0xF820, 0xF019 );
+        rtl8168_mac_ocp_write( tp, 0xF822, 0xC520 );
+        rtl8168_mac_ocp_write( tp, 0xF824, 0x64A5 );
+        rtl8168_mac_ocp_write( tp, 0xF826, 0x1400 );
+        rtl8168_mac_ocp_write( tp, 0xF828, 0xF007 );
+        rtl8168_mac_ocp_write( tp, 0xF82A, 0x0C01 );
+        rtl8168_mac_ocp_write( tp, 0xF82C, 0x8CA5 );
+        rtl8168_mac_ocp_write( tp, 0xF82E, 0x1C15 );
+        rtl8168_mac_ocp_write( tp, 0xF830, 0xC515 );
+        rtl8168_mac_ocp_write( tp, 0xF832, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xF834, 0xE00F );
+        rtl8168_mac_ocp_write( tp, 0xF836, 0xC513 );
+        rtl8168_mac_ocp_write( tp, 0xF838, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xF83A, 0x48C8 );
+        rtl8168_mac_ocp_write( tp, 0xF83C, 0x48CA );
+        rtl8168_mac_ocp_write( tp, 0xF83E, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xF840, 0xC510 );
+        rtl8168_mac_ocp_write( tp, 0xF842, 0x1B00 );
+        rtl8168_mac_ocp_write( tp, 0xF844, 0x9BA0 );
+        rtl8168_mac_ocp_write( tp, 0xF846, 0x1B1C );
+        rtl8168_mac_ocp_write( tp, 0xF848, 0x483F );
+        rtl8168_mac_ocp_write( tp, 0xF84A, 0x9BA2 );
+        rtl8168_mac_ocp_write( tp, 0xF84C, 0x1B04 );
+        rtl8168_mac_ocp_write( tp, 0xF84E, 0xC506 );
+        rtl8168_mac_ocp_write( tp, 0xF850, 0x9BA0 );
+        rtl8168_mac_ocp_write( tp, 0xF852, 0xC603 );
+        rtl8168_mac_ocp_write( tp, 0xF854, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF856, 0x0298 );
+        rtl8168_mac_ocp_write( tp, 0xF858, 0x03DE );
+        rtl8168_mac_ocp_write( tp, 0xF85A, 0xE434 );
+        rtl8168_mac_ocp_write( tp, 0xF85C, 0xE096 );
+        rtl8168_mac_ocp_write( tp, 0xF85E, 0xE860 );
+        rtl8168_mac_ocp_write( tp, 0xF860, 0xDE20 );
+        rtl8168_mac_ocp_write( tp, 0xF862, 0xD3C0 );
+        rtl8168_mac_ocp_write( tp, 0xF864, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF866, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF868, 0x0A64 );
+        rtl8168_mac_ocp_write( tp, 0xF86A, 0xC707 );
+        rtl8168_mac_ocp_write( tp, 0xF86C, 0x1D00 );
+        rtl8168_mac_ocp_write( tp, 0xF86E, 0x8DE2 );
+        rtl8168_mac_ocp_write( tp, 0xF870, 0x48C1 );
+        rtl8168_mac_ocp_write( tp, 0xF872, 0xC502 );
+        rtl8168_mac_ocp_write( tp, 0xF874, 0xBD00 );
+        rtl8168_mac_ocp_write( tp, 0xF876, 0x00AA );
+        rtl8168_mac_ocp_write( tp, 0xF878, 0xE0C0 );
+        rtl8168_mac_ocp_write( tp, 0xF87A, 0xC502 );
+        rtl8168_mac_ocp_write( tp, 0xF87C, 0xBD00 );
+        rtl8168_mac_ocp_write( tp, 0xF87E, 0x0132 );
+        rtl8168_mac_ocp_write( tp, 0xF880, 0xC50C );
+        rtl8168_mac_ocp_write( tp, 0xF882, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xF884, 0x49CE );
+        rtl8168_mac_ocp_write( tp, 0xF886, 0xF1FE );
+        rtl8168_mac_ocp_write( tp, 0xF888, 0x1C00 );
+        rtl8168_mac_ocp_write( tp, 0xF88A, 0x9EA0 );
+        rtl8168_mac_ocp_write( tp, 0xF88C, 0x1C1C );
+        rtl8168_mac_ocp_write( tp, 0xF88E, 0x484F );
+        rtl8168_mac_ocp_write( tp, 0xF890, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xF892, 0xC402 );
+        rtl8168_mac_ocp_write( tp, 0xF894, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xF896, 0x0AFA );
+        rtl8168_mac_ocp_write( tp, 0xF898, 0xDE20 );
+        rtl8168_mac_ocp_write( tp, 0xF89A, 0xE000 );
+        rtl8168_mac_ocp_write( tp, 0xF89C, 0xE092 );
+        rtl8168_mac_ocp_write( tp, 0xF89E, 0xE430 );
+        rtl8168_mac_ocp_write( tp, 0xF8A0, 0xDE20 );
+        rtl8168_mac_ocp_write( tp, 0xF8A2, 0xE0C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8A4, 0xE860 );
+        rtl8168_mac_ocp_write( tp, 0xF8A6, 0xE84C );
+        rtl8168_mac_ocp_write( tp, 0xF8A8, 0xB400 );
+        rtl8168_mac_ocp_write( tp, 0xF8AA, 0xB430 );
+        rtl8168_mac_ocp_write( tp, 0xF8AC, 0xE410 );
+        rtl8168_mac_ocp_write( tp, 0xF8AE, 0xC0AE );
+        rtl8168_mac_ocp_write( tp, 0xF8B0, 0xB407 );
+        rtl8168_mac_ocp_write( tp, 0xF8B2, 0xB406 );
+        rtl8168_mac_ocp_write( tp, 0xF8B4, 0xB405 );
+        rtl8168_mac_ocp_write( tp, 0xF8B6, 0xB404 );
+        rtl8168_mac_ocp_write( tp, 0xF8B8, 0xB403 );
+        rtl8168_mac_ocp_write( tp, 0xF8BA, 0xB402 );
+        rtl8168_mac_ocp_write( tp, 0xF8BC, 0xB401 );
+        rtl8168_mac_ocp_write( tp, 0xF8BE, 0xC7EE );
+        rtl8168_mac_ocp_write( tp, 0xF8C0, 0x76F4 );
+        rtl8168_mac_ocp_write( tp, 0xF8C2, 0xC2ED );
+        rtl8168_mac_ocp_write( tp, 0xF8C4, 0xC3ED );
+        rtl8168_mac_ocp_write( tp, 0xF8C6, 0xC1EF );
+        rtl8168_mac_ocp_write( tp, 0xF8C8, 0xC5F3 );
+        rtl8168_mac_ocp_write( tp, 0xF8CA, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xF8CC, 0x49CD );
+        rtl8168_mac_ocp_write( tp, 0xF8CE, 0xF001 );
+        rtl8168_mac_ocp_write( tp, 0xF8D0, 0xC5EE );
+        rtl8168_mac_ocp_write( tp, 0xF8D2, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xF8D4, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF8D6, 0xF105 );
+        rtl8168_mac_ocp_write( tp, 0xF8D8, 0xC5E4 );
+        rtl8168_mac_ocp_write( tp, 0xF8DA, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xF8DC, 0x49CE );
+        rtl8168_mac_ocp_write( tp, 0xF8DE, 0xF00B );
+        rtl8168_mac_ocp_write( tp, 0xF8E0, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xF8E2, 0x484B );
+        rtl8168_mac_ocp_write( tp, 0xF8E4, 0x9C44 );
+        rtl8168_mac_ocp_write( tp, 0xF8E6, 0x1C10 );
+        rtl8168_mac_ocp_write( tp, 0xF8E8, 0x9C62 );
+        rtl8168_mac_ocp_write( tp, 0xF8EA, 0x1C11 );
+        rtl8168_mac_ocp_write( tp, 0xF8EC, 0x8C60 );
+        rtl8168_mac_ocp_write( tp, 0xF8EE, 0x1C00 );
+        rtl8168_mac_ocp_write( tp, 0xF8F0, 0x9CF6 );
+        rtl8168_mac_ocp_write( tp, 0xF8F2, 0xE0EC );
+        rtl8168_mac_ocp_write( tp, 0xF8F4, 0x49E7 );
+        rtl8168_mac_ocp_write( tp, 0xF8F6, 0xF016 );
+        rtl8168_mac_ocp_write( tp, 0xF8F8, 0x1D80 );
+        rtl8168_mac_ocp_write( tp, 0xF8FA, 0x8DF4 );
+        rtl8168_mac_ocp_write( tp, 0xF8FC, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF8FE, 0x4843 );
+        rtl8168_mac_ocp_write( tp, 0xF900, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF902, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF904, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF906, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xF908, 0x48C8 );
+        rtl8168_mac_ocp_write( tp, 0xF90A, 0x48C9 );
+        rtl8168_mac_ocp_write( tp, 0xF90C, 0x48CA );
+        rtl8168_mac_ocp_write( tp, 0xF90E, 0x9C44 );
+        rtl8168_mac_ocp_write( tp, 0xF910, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF912, 0x4844 );
+        rtl8168_mac_ocp_write( tp, 0xF914, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF916, 0x1E01 );
+        rtl8168_mac_ocp_write( tp, 0xF918, 0xE8DB );
+        rtl8168_mac_ocp_write( tp, 0xF91A, 0x7420 );
+        rtl8168_mac_ocp_write( tp, 0xF91C, 0x48C1 );
+        rtl8168_mac_ocp_write( tp, 0xF91E, 0x9C20 );
+        rtl8168_mac_ocp_write( tp, 0xF920, 0xE0D5 );
+        rtl8168_mac_ocp_write( tp, 0xF922, 0x49E6 );
+        rtl8168_mac_ocp_write( tp, 0xF924, 0xF02A );
+        rtl8168_mac_ocp_write( tp, 0xF926, 0x1D40 );
+        rtl8168_mac_ocp_write( tp, 0xF928, 0x8DF4 );
+        rtl8168_mac_ocp_write( tp, 0xF92A, 0x74FC );
+        rtl8168_mac_ocp_write( tp, 0xF92C, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF92E, 0xF124 );
+        rtl8168_mac_ocp_write( tp, 0xF930, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF932, 0xF122 );
+        rtl8168_mac_ocp_write( tp, 0xF934, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF936, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF938, 0xF01F );
+        rtl8168_mac_ocp_write( tp, 0xF93A, 0xE8D3 );
+        rtl8168_mac_ocp_write( tp, 0xF93C, 0x48C4 );
+        rtl8168_mac_ocp_write( tp, 0xF93E, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF940, 0x1E00 );
+        rtl8168_mac_ocp_write( tp, 0xF942, 0xE8C6 );
+        rtl8168_mac_ocp_write( tp, 0xF944, 0xC5B1 );
+        rtl8168_mac_ocp_write( tp, 0xF946, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xF948, 0x49C3 );
+        rtl8168_mac_ocp_write( tp, 0xF94A, 0xF016 );
+        rtl8168_mac_ocp_write( tp, 0xF94C, 0xC5AF );
+        rtl8168_mac_ocp_write( tp, 0xF94E, 0x74A4 );
+        rtl8168_mac_ocp_write( tp, 0xF950, 0x49C2 );
+        rtl8168_mac_ocp_write( tp, 0xF952, 0xF005 );
+        rtl8168_mac_ocp_write( tp, 0xF954, 0xC5AA );
+        rtl8168_mac_ocp_write( tp, 0xF956, 0x74B2 );
+        rtl8168_mac_ocp_write( tp, 0xF958, 0x49C9 );
+        rtl8168_mac_ocp_write( tp, 0xF95A, 0xF10E );
+        rtl8168_mac_ocp_write( tp, 0xF95C, 0xC5A6 );
+        rtl8168_mac_ocp_write( tp, 0xF95E, 0x74A8 );
+        rtl8168_mac_ocp_write( tp, 0xF960, 0x4845 );
+        rtl8168_mac_ocp_write( tp, 0xF962, 0x4846 );
+        rtl8168_mac_ocp_write( tp, 0xF964, 0x4847 );
+        rtl8168_mac_ocp_write( tp, 0xF966, 0x4848 );
+        rtl8168_mac_ocp_write( tp, 0xF968, 0x9CA8 );
+        rtl8168_mac_ocp_write( tp, 0xF96A, 0x74B2 );
+        rtl8168_mac_ocp_write( tp, 0xF96C, 0x4849 );
+        rtl8168_mac_ocp_write( tp, 0xF96E, 0x9CB2 );
+        rtl8168_mac_ocp_write( tp, 0xF970, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xF972, 0x484F );
+        rtl8168_mac_ocp_write( tp, 0xF974, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xF976, 0xE0AA );
+        rtl8168_mac_ocp_write( tp, 0xF978, 0x49E4 );
+        rtl8168_mac_ocp_write( tp, 0xF97A, 0xF018 );
+        rtl8168_mac_ocp_write( tp, 0xF97C, 0x1D10 );
+        rtl8168_mac_ocp_write( tp, 0xF97E, 0x8DF4 );
+        rtl8168_mac_ocp_write( tp, 0xF980, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF982, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF984, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF986, 0x4843 );
+        rtl8168_mac_ocp_write( tp, 0xF988, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF98A, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF98C, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF98E, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF990, 0x4844 );
+        rtl8168_mac_ocp_write( tp, 0xF992, 0x4842 );
+        rtl8168_mac_ocp_write( tp, 0xF994, 0x4841 );
+        rtl8168_mac_ocp_write( tp, 0xF996, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF998, 0x1E01 );
+        rtl8168_mac_ocp_write( tp, 0xF99A, 0xE89A );
+        rtl8168_mac_ocp_write( tp, 0xF99C, 0x7420 );
+        rtl8168_mac_ocp_write( tp, 0xF99E, 0x4841 );
+        rtl8168_mac_ocp_write( tp, 0xF9A0, 0x9C20 );
+        rtl8168_mac_ocp_write( tp, 0xF9A2, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xF9A4, 0x4848 );
+        rtl8168_mac_ocp_write( tp, 0xF9A6, 0x9C44 );
+        rtl8168_mac_ocp_write( tp, 0xF9A8, 0xE091 );
+        rtl8168_mac_ocp_write( tp, 0xF9AA, 0x49E5 );
+        rtl8168_mac_ocp_write( tp, 0xF9AC, 0xF03E );
+        rtl8168_mac_ocp_write( tp, 0xF9AE, 0x1D20 );
+        rtl8168_mac_ocp_write( tp, 0xF9B0, 0x8DF4 );
+        rtl8168_mac_ocp_write( tp, 0xF9B2, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF9B4, 0x48C2 );
+        rtl8168_mac_ocp_write( tp, 0xF9B6, 0x4841 );
+        rtl8168_mac_ocp_write( tp, 0xF9B8, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF9BA, 0x1E01 );
+        rtl8168_mac_ocp_write( tp, 0xF9BC, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xF9BE, 0x49CA );
+        rtl8168_mac_ocp_write( tp, 0xF9C0, 0xF103 );
+        rtl8168_mac_ocp_write( tp, 0xF9C2, 0x49C2 );
+        rtl8168_mac_ocp_write( tp, 0xF9C4, 0xF00C );
+        rtl8168_mac_ocp_write( tp, 0xF9C6, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF9C8, 0xF004 );
+        rtl8168_mac_ocp_write( tp, 0xF9CA, 0x6447 );
+        rtl8168_mac_ocp_write( tp, 0xF9CC, 0x2244 );
+        rtl8168_mac_ocp_write( tp, 0xF9CE, 0xE002 );
+        rtl8168_mac_ocp_write( tp, 0xF9D0, 0x1C01 );
+        rtl8168_mac_ocp_write( tp, 0xF9D2, 0x9C62 );
+        rtl8168_mac_ocp_write( tp, 0xF9D4, 0x1C11 );
+        rtl8168_mac_ocp_write( tp, 0xF9D6, 0x8C60 );
+        rtl8168_mac_ocp_write( tp, 0xF9D8, 0x1C00 );
+        rtl8168_mac_ocp_write( tp, 0xF9DA, 0x9CF6 );
+        rtl8168_mac_ocp_write( tp, 0xF9DC, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xF9DE, 0x49C8 );
+        rtl8168_mac_ocp_write( tp, 0xF9E0, 0xF01D );
+        rtl8168_mac_ocp_write( tp, 0xF9E2, 0x74FC );
+        rtl8168_mac_ocp_write( tp, 0xF9E4, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF9E6, 0xF11A );
+        rtl8168_mac_ocp_write( tp, 0xF9E8, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xF9EA, 0xF118 );
+        rtl8168_mac_ocp_write( tp, 0xF9EC, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF9EE, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF9F0, 0xF015 );
+        rtl8168_mac_ocp_write( tp, 0xF9F2, 0x49C6 );
+        rtl8168_mac_ocp_write( tp, 0xF9F4, 0xF113 );
+        rtl8168_mac_ocp_write( tp, 0xF9F6, 0xE875 );
+        rtl8168_mac_ocp_write( tp, 0xF9F8, 0x48C4 );
+        rtl8168_mac_ocp_write( tp, 0xF9FA, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF9FC, 0x7420 );
+        rtl8168_mac_ocp_write( tp, 0xF9FE, 0x48C1 );
+        rtl8168_mac_ocp_write( tp, 0xFA00, 0x9C20 );
+        rtl8168_mac_ocp_write( tp, 0xFA02, 0xC50A );
+        rtl8168_mac_ocp_write( tp, 0xFA04, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xFA06, 0x8CA5 );
+        rtl8168_mac_ocp_write( tp, 0xFA08, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xFA0A, 0xC505 );
+        rtl8168_mac_ocp_write( tp, 0xFA0C, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xFA0E, 0x1C11 );
+        rtl8168_mac_ocp_write( tp, 0xFA10, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xFA12, 0xE00A );
+        rtl8168_mac_ocp_write( tp, 0xFA14, 0xE434 );
+        rtl8168_mac_ocp_write( tp, 0xFA16, 0xD3C0 );
+        rtl8168_mac_ocp_write( tp, 0xFA18, 0xDC00 );
+        rtl8168_mac_ocp_write( tp, 0xFA1A, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xFA1C, 0x49CA );
+        rtl8168_mac_ocp_write( tp, 0xFA1E, 0xF004 );
+        rtl8168_mac_ocp_write( tp, 0xFA20, 0x48CA );
+        rtl8168_mac_ocp_write( tp, 0xFA22, 0x9C44 );
+        rtl8168_mac_ocp_write( tp, 0xFA24, 0xE855 );
+        rtl8168_mac_ocp_write( tp, 0xFA26, 0xE052 );
+        rtl8168_mac_ocp_write( tp, 0xFA28, 0x49E8 );
+        rtl8168_mac_ocp_write( tp, 0xFA2A, 0xF024 );
+        rtl8168_mac_ocp_write( tp, 0xFA2C, 0x1D01 );
+        rtl8168_mac_ocp_write( tp, 0xFA2E, 0x8DF5 );
+        rtl8168_mac_ocp_write( tp, 0xFA30, 0x7440 );
+        rtl8168_mac_ocp_write( tp, 0xFA32, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xFA34, 0xF11E );
+        rtl8168_mac_ocp_write( tp, 0xFA36, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xFA38, 0x49C8 );
+        rtl8168_mac_ocp_write( tp, 0xFA3A, 0xF01B );
+        rtl8168_mac_ocp_write( tp, 0xFA3C, 0x49CA );
+        rtl8168_mac_ocp_write( tp, 0xFA3E, 0xF119 );
+        rtl8168_mac_ocp_write( tp, 0xFA40, 0xC5EC );
+        rtl8168_mac_ocp_write( tp, 0xFA42, 0x76A4 );
+        rtl8168_mac_ocp_write( tp, 0xFA44, 0x49E3 );
+        rtl8168_mac_ocp_write( tp, 0xFA46, 0xF015 );
+        rtl8168_mac_ocp_write( tp, 0xFA48, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xFA4A, 0xF103 );
+        rtl8168_mac_ocp_write( tp, 0xFA4C, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xFA4E, 0xF011 );
+        rtl8168_mac_ocp_write( tp, 0xFA50, 0x4849 );
+        rtl8168_mac_ocp_write( tp, 0xFA52, 0x9C44 );
+        rtl8168_mac_ocp_write( tp, 0xFA54, 0x1C00 );
+        rtl8168_mac_ocp_write( tp, 0xFA56, 0x9CF6 );
+        rtl8168_mac_ocp_write( tp, 0xFA58, 0x7444 );
+        rtl8168_mac_ocp_write( tp, 0xFA5A, 0x49C1 );
+        rtl8168_mac_ocp_write( tp, 0xFA5C, 0xF004 );
+        rtl8168_mac_ocp_write( tp, 0xFA5E, 0x6446 );
+        rtl8168_mac_ocp_write( tp, 0xFA60, 0x1E07 );
+        rtl8168_mac_ocp_write( tp, 0xFA62, 0xE003 );
+        rtl8168_mac_ocp_write( tp, 0xFA64, 0x1C01 );
+        rtl8168_mac_ocp_write( tp, 0xFA66, 0x1E03 );
+        rtl8168_mac_ocp_write( tp, 0xFA68, 0x9C62 );
+        rtl8168_mac_ocp_write( tp, 0xFA6A, 0x1C11 );
+        rtl8168_mac_ocp_write( tp, 0xFA6C, 0x8C60 );
+        rtl8168_mac_ocp_write( tp, 0xFA6E, 0xE830 );
+        rtl8168_mac_ocp_write( tp, 0xFA70, 0xE02D );
+        rtl8168_mac_ocp_write( tp, 0xFA72, 0x49E9 );
+        rtl8168_mac_ocp_write( tp, 0xFA74, 0xF004 );
+        rtl8168_mac_ocp_write( tp, 0xFA76, 0x1D02 );
+        rtl8168_mac_ocp_write( tp, 0xFA78, 0x8DF5 );
+        rtl8168_mac_ocp_write( tp, 0xFA7A, 0xE79C );
+        rtl8168_mac_ocp_write( tp, 0xFA7C, 0x49E3 );
+        rtl8168_mac_ocp_write( tp, 0xFA7E, 0xF006 );
+        rtl8168_mac_ocp_write( tp, 0xFA80, 0x1D08 );
+        rtl8168_mac_ocp_write( tp, 0xFA82, 0x8DF4 );
+        rtl8168_mac_ocp_write( tp, 0xFA84, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xFA86, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xFA88, 0xE73A );
+        rtl8168_mac_ocp_write( tp, 0xFA8A, 0x49E1 );
+        rtl8168_mac_ocp_write( tp, 0xFA8C, 0xF007 );
+        rtl8168_mac_ocp_write( tp, 0xFA8E, 0x1D02 );
+        rtl8168_mac_ocp_write( tp, 0xFA90, 0x8DF4 );
+        rtl8168_mac_ocp_write( tp, 0xFA92, 0x1E01 );
+        rtl8168_mac_ocp_write( tp, 0xFA94, 0xE7A7 );
+        rtl8168_mac_ocp_write( tp, 0xFA96, 0xDE20 );
+        rtl8168_mac_ocp_write( tp, 0xFA98, 0xE410 );
+        rtl8168_mac_ocp_write( tp, 0xFA9A, 0x49E0 );
+        rtl8168_mac_ocp_write( tp, 0xFA9C, 0xF017 );
+        rtl8168_mac_ocp_write( tp, 0xFA9E, 0x1D01 );
+        rtl8168_mac_ocp_write( tp, 0xFAA0, 0x8DF4 );
+        rtl8168_mac_ocp_write( tp, 0xFAA2, 0xC5FA );
+        rtl8168_mac_ocp_write( tp, 0xFAA4, 0x1C00 );
+        rtl8168_mac_ocp_write( tp, 0xFAA6, 0x8CA0 );
+        rtl8168_mac_ocp_write( tp, 0xFAA8, 0x1C1B );
+        rtl8168_mac_ocp_write( tp, 0xFAAA, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xFAAC, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xFAAE, 0x49CF );
+        rtl8168_mac_ocp_write( tp, 0xFAB0, 0xF0FE );
+        rtl8168_mac_ocp_write( tp, 0xFAB2, 0xC5F3 );
+        rtl8168_mac_ocp_write( tp, 0xFAB4, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xFAB6, 0x4849 );
+        rtl8168_mac_ocp_write( tp, 0xFAB8, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xFABA, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xFABC, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xFABE, 0xF006 );
+        rtl8168_mac_ocp_write( tp, 0xFAC0, 0x48C3 );
+        rtl8168_mac_ocp_write( tp, 0xFAC2, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xFAC4, 0xE820 );
+        rtl8168_mac_ocp_write( tp, 0xFAC6, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xFAC8, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xFACA, 0xC432 );
+        rtl8168_mac_ocp_write( tp, 0xFACC, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xFACE, 0xC5E4 );
+        rtl8168_mac_ocp_write( tp, 0xFAD0, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xFAD2, 0x49CE );
+        rtl8168_mac_ocp_write( tp, 0xFAD4, 0xF1FE );
+        rtl8168_mac_ocp_write( tp, 0xFAD6, 0x9EA0 );
+        rtl8168_mac_ocp_write( tp, 0xFAD8, 0x1C1C );
+        rtl8168_mac_ocp_write( tp, 0xFADA, 0x484F );
+        rtl8168_mac_ocp_write( tp, 0xFADC, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xFADE, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xFAE0, 0xB404 );
+        rtl8168_mac_ocp_write( tp, 0xFAE2, 0xB405 );
+        rtl8168_mac_ocp_write( tp, 0xFAE4, 0xC5D9 );
+        rtl8168_mac_ocp_write( tp, 0xFAE6, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xFAE8, 0x49CE );
+        rtl8168_mac_ocp_write( tp, 0xFAEA, 0xF1FE );
+        rtl8168_mac_ocp_write( tp, 0xFAEC, 0xC41F );
+        rtl8168_mac_ocp_write( tp, 0xFAEE, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xFAF0, 0xC41C );
+        rtl8168_mac_ocp_write( tp, 0xFAF2, 0x1C13 );
+        rtl8168_mac_ocp_write( tp, 0xFAF4, 0x484F );
+        rtl8168_mac_ocp_write( tp, 0xFAF6, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xFAF8, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xFAFA, 0x49CF );
+        rtl8168_mac_ocp_write( tp, 0xFAFC, 0xF1FE );
+        rtl8168_mac_ocp_write( tp, 0xFAFE, 0xB005 );
+        rtl8168_mac_ocp_write( tp, 0xFB00, 0xB004 );
+        rtl8168_mac_ocp_write( tp, 0xFB02, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xFB04, 0xB404 );
+        rtl8168_mac_ocp_write( tp, 0xFB06, 0xB405 );
+        rtl8168_mac_ocp_write( tp, 0xFB08, 0xC5C7 );
+        rtl8168_mac_ocp_write( tp, 0xFB0A, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xFB0C, 0x49CE );
+        rtl8168_mac_ocp_write( tp, 0xFB0E, 0xF1FE );
+        rtl8168_mac_ocp_write( tp, 0xFB10, 0xC40E );
+        rtl8168_mac_ocp_write( tp, 0xFB12, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xFB14, 0xC40A );
+        rtl8168_mac_ocp_write( tp, 0xFB16, 0x1C13 );
+        rtl8168_mac_ocp_write( tp, 0xFB18, 0x484F );
+        rtl8168_mac_ocp_write( tp, 0xFB1A, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xFB1C, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xFB1E, 0x49CF );
+        rtl8168_mac_ocp_write( tp, 0xFB20, 0xF1FE );
+        rtl8168_mac_ocp_write( tp, 0xFB22, 0xB005 );
+        rtl8168_mac_ocp_write( tp, 0xFB24, 0xB004 );
+        rtl8168_mac_ocp_write( tp, 0xFB26, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xFB28, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xFB2A, 0x0481 );
+        rtl8168_mac_ocp_write( tp, 0xFB2C, 0x0C81 );
+        rtl8168_mac_ocp_write( tp, 0xFB2E, 0x0AE0 );
+
+
+        rtl8168_mac_ocp_write( tp, 0xFC26, 0x8000 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC28, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xFC2A, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xFC2C, 0x0297 );
+        rtl8168_mac_ocp_write( tp, 0xFC2E, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xFC30, 0x00A9 );
+        rtl8168_mac_ocp_write( tp, 0xFC32, 0x012D );
+        rtl8168_mac_ocp_write( tp, 0xFC34, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xFC36, 0x08DF );
 }
 
 static void
@@ -9825,252 +7843,573 @@
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        rtl8168_mac_ocp_write(tp, 0xF800, 0xE008);
-        rtl8168_mac_ocp_write(tp, 0xF802, 0xE00A);
-        rtl8168_mac_ocp_write(tp, 0xF804, 0xE00C);
-        rtl8168_mac_ocp_write(tp, 0xF806, 0xE00E);
-        rtl8168_mac_ocp_write(tp, 0xF808, 0xE027);
-        rtl8168_mac_ocp_write(tp, 0xF80A, 0xE04F);
-        rtl8168_mac_ocp_write(tp, 0xF80C, 0xE05E);
-        rtl8168_mac_ocp_write(tp, 0xF80E, 0xE065);
-        rtl8168_mac_ocp_write(tp, 0xF810, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF812, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF814, 0x0000);
-        rtl8168_mac_ocp_write(tp, 0xF816, 0xC502);
-        rtl8168_mac_ocp_write(tp, 0xF818, 0xBD00);
-        rtl8168_mac_ocp_write(tp, 0xF81A, 0x074C);
-        rtl8168_mac_ocp_write(tp, 0xF81C, 0xC302);
-        rtl8168_mac_ocp_write(tp, 0xF81E, 0xBB00);
-        rtl8168_mac_ocp_write(tp, 0xF820, 0x080A);
-        rtl8168_mac_ocp_write(tp, 0xF822, 0x6420);
-        rtl8168_mac_ocp_write(tp, 0xF824, 0x48C2);
-        rtl8168_mac_ocp_write(tp, 0xF826, 0x8C20);
-        rtl8168_mac_ocp_write(tp, 0xF828, 0xC516);
-        rtl8168_mac_ocp_write(tp, 0xF82A, 0x64A4);
-        rtl8168_mac_ocp_write(tp, 0xF82C, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF82E, 0xF009);
-        rtl8168_mac_ocp_write(tp, 0xF830, 0x74A2);
-        rtl8168_mac_ocp_write(tp, 0xF832, 0x8CA5);
-        rtl8168_mac_ocp_write(tp, 0xF834, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xF836, 0xC50E);
-        rtl8168_mac_ocp_write(tp, 0xF838, 0x9CA2);
-        rtl8168_mac_ocp_write(tp, 0xF83A, 0x1C11);
-        rtl8168_mac_ocp_write(tp, 0xF83C, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xF83E, 0xE006);
-        rtl8168_mac_ocp_write(tp, 0xF840, 0x74F8);
-        rtl8168_mac_ocp_write(tp, 0xF842, 0x48C4);
-        rtl8168_mac_ocp_write(tp, 0xF844, 0x8CF8);
-        rtl8168_mac_ocp_write(tp, 0xF846, 0xC404);
-        rtl8168_mac_ocp_write(tp, 0xF848, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xF84A, 0xC403);
-        rtl8168_mac_ocp_write(tp, 0xF84C, 0xBC00);
-        rtl8168_mac_ocp_write(tp, 0xF84E, 0x0BF2);
-        rtl8168_mac_ocp_write(tp, 0xF850, 0x0C0A);
-        rtl8168_mac_ocp_write(tp, 0xF852, 0xE434);
-        rtl8168_mac_ocp_write(tp, 0xF854, 0xD3C0);
-        rtl8168_mac_ocp_write(tp, 0xF856, 0x49D9);
-        rtl8168_mac_ocp_write(tp, 0xF858, 0xF01F);
-        rtl8168_mac_ocp_write(tp, 0xF85A, 0xC526);
-        rtl8168_mac_ocp_write(tp, 0xF85C, 0x64A5);
-        rtl8168_mac_ocp_write(tp, 0xF85E, 0x1400);
-        rtl8168_mac_ocp_write(tp, 0xF860, 0xF007);
-        rtl8168_mac_ocp_write(tp, 0xF862, 0x0C01);
-        rtl8168_mac_ocp_write(tp, 0xF864, 0x8CA5);
-        rtl8168_mac_ocp_write(tp, 0xF866, 0x1C15);
-        rtl8168_mac_ocp_write(tp, 0xF868, 0xC51B);
-        rtl8168_mac_ocp_write(tp, 0xF86A, 0x9CA0);
-        rtl8168_mac_ocp_write(tp, 0xF86C, 0xE013);
-        rtl8168_mac_ocp_write(tp, 0xF86E, 0xC519);
-        rtl8168_mac_ocp_write(tp, 0xF870, 0x74A0);
-        rtl8168_mac_ocp_write(tp, 0xF872, 0x48C4);
-        rtl8168_mac_ocp_write(tp, 0xF874, 0x8CA0);
-        rtl8168_mac_ocp_write(tp, 0xF876, 0xC516);
-        rtl8168_mac_ocp_write(tp, 0xF878, 0x74A4);
-        rtl8168_mac_ocp_write(tp, 0xF87A, 0x48C8);
-        rtl8168_mac_ocp_write(tp, 0xF87C, 0x48CA);
-        rtl8168_mac_ocp_write(tp, 0xF87E, 0x9CA4);
-        rtl8168_mac_ocp_write(tp, 0xF880, 0xC512);
-        rtl8168_mac_ocp_write(tp, 0xF882, 0x1B00);
-        rtl8168_mac_ocp_write(tp, 0xF884, 0x9BA0);
-        rtl8168_mac_ocp_write(tp, 0xF886, 0x1B1C);
-        rtl8168_mac_ocp_write(tp, 0xF888, 0x483F);
-        rtl8168_mac_ocp_write(tp, 0xF88A, 0x9BA2);
-        rtl8168_mac_ocp_write(tp, 0xF88C, 0x1B04);
-        rtl8168_mac_ocp_write(tp, 0xF88E, 0xC508);
-        rtl8168_mac_ocp_write(tp, 0xF890, 0x9BA0);
-        rtl8168_mac_ocp_write(tp, 0xF892, 0xC505);
-        rtl8168_mac_ocp_write(tp, 0xF894, 0xBD00);
-        rtl8168_mac_ocp_write(tp, 0xF896, 0xC502);
-        rtl8168_mac_ocp_write(tp, 0xF898, 0xBD00);
-        rtl8168_mac_ocp_write(tp, 0xF89A, 0x0300);
-        rtl8168_mac_ocp_write(tp, 0xF89C, 0x051E);
-        rtl8168_mac_ocp_write(tp, 0xF89E, 0xE434);
-        rtl8168_mac_ocp_write(tp, 0xF8A0, 0xE018);
-        rtl8168_mac_ocp_write(tp, 0xF8A2, 0xE092);
-        rtl8168_mac_ocp_write(tp, 0xF8A4, 0xDE20);
-        rtl8168_mac_ocp_write(tp, 0xF8A6, 0xD3C0);
-        rtl8168_mac_ocp_write(tp, 0xF8A8, 0xC50F);
-        rtl8168_mac_ocp_write(tp, 0xF8AA, 0x76A4);
-        rtl8168_mac_ocp_write(tp, 0xF8AC, 0x49E3);
-        rtl8168_mac_ocp_write(tp, 0xF8AE, 0xF007);
-        rtl8168_mac_ocp_write(tp, 0xF8B0, 0x49C0);
-        rtl8168_mac_ocp_write(tp, 0xF8B2, 0xF103);
-        rtl8168_mac_ocp_write(tp, 0xF8B4, 0xC607);
-        rtl8168_mac_ocp_write(tp, 0xF8B6, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF8B8, 0xC606);
-        rtl8168_mac_ocp_write(tp, 0xF8BA, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF8BC, 0xC602);
-        rtl8168_mac_ocp_write(tp, 0xF8BE, 0xBE00);
-        rtl8168_mac_ocp_write(tp, 0xF8C0, 0x0C4C);
-        rtl8168_mac_ocp_write(tp, 0xF8C2, 0x0C28);
-        rtl8168_mac_ocp_write(tp, 0xF8C4, 0x0C2C);
-        rtl8168_mac_ocp_write(tp, 0xF8C6, 0xDC00);
-        rtl8168_mac_ocp_write(tp, 0xF8C8, 0xC707);
-        rtl8168_mac_ocp_write(tp, 0xF8CA, 0x1D00);
-        rtl8168_mac_ocp_write(tp, 0xF8CC, 0x8DE2);
-        rtl8168_mac_ocp_write(tp, 0xF8CE, 0x48C1);
-        rtl8168_mac_ocp_write(tp, 0xF8D0, 0xC502);
-        rtl8168_mac_ocp_write(tp, 0xF8D2, 0xBD00);
-        rtl8168_mac_ocp_write(tp, 0xF8D4, 0x00AA);
-        rtl8168_mac_ocp_write(tp, 0xF8D6, 0xE0C0);
-        rtl8168_mac_ocp_write(tp, 0xF8D8, 0xC502);
-        rtl8168_mac_ocp_write(tp, 0xF8DA, 0xBD00);
-        rtl8168_mac_ocp_write(tp, 0xF8DC, 0x0132);
-
-        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-        rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0743);
-        rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0801);
-        rtl8168_mac_ocp_write(tp, 0xFC2E, 0x0BE9);
-        rtl8168_mac_ocp_write(tp, 0xFC30, 0x02FD);
-        rtl8168_mac_ocp_write(tp, 0xFC32, 0x0C25);
-        rtl8168_mac_ocp_write(tp, 0xFC34, 0x00A9);
-        rtl8168_mac_ocp_write(tp, 0xFC36, 0x012D);
+        rtl8168_mac_ocp_write( tp, 0xF800, 0xE008 );
+        rtl8168_mac_ocp_write( tp, 0xF802, 0xE00A );
+        rtl8168_mac_ocp_write( tp, 0xF804, 0xE00C );
+        rtl8168_mac_ocp_write( tp, 0xF806, 0xE00E );
+        rtl8168_mac_ocp_write( tp, 0xF808, 0xE027 );
+        rtl8168_mac_ocp_write( tp, 0xF80A, 0xE04F );
+        rtl8168_mac_ocp_write( tp, 0xF80C, 0xE05E );
+        rtl8168_mac_ocp_write( tp, 0xF80E, 0xE065 );
+        rtl8168_mac_ocp_write( tp, 0xF810, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF812, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF814, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF816, 0xC502 );
+        rtl8168_mac_ocp_write( tp, 0xF818, 0xBD00 );
+        rtl8168_mac_ocp_write( tp, 0xF81A, 0x074C );
+        rtl8168_mac_ocp_write( tp, 0xF81C, 0xC302 );
+        rtl8168_mac_ocp_write( tp, 0xF81E, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF820, 0x080A );
+        rtl8168_mac_ocp_write( tp, 0xF822, 0x6420 );
+        rtl8168_mac_ocp_write( tp, 0xF824, 0x48C2 );
+        rtl8168_mac_ocp_write( tp, 0xF826, 0x8C20 );
+        rtl8168_mac_ocp_write( tp, 0xF828, 0xC516 );
+        rtl8168_mac_ocp_write( tp, 0xF82A, 0x64A4 );
+        rtl8168_mac_ocp_write( tp, 0xF82C, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF82E, 0xF009 );
+        rtl8168_mac_ocp_write( tp, 0xF830, 0x74A2 );
+        rtl8168_mac_ocp_write( tp, 0xF832, 0x8CA5 );
+        rtl8168_mac_ocp_write( tp, 0xF834, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xF836, 0xC50E );
+        rtl8168_mac_ocp_write( tp, 0xF838, 0x9CA2 );
+        rtl8168_mac_ocp_write( tp, 0xF83A, 0x1C11 );
+        rtl8168_mac_ocp_write( tp, 0xF83C, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xF83E, 0xE006 );
+        rtl8168_mac_ocp_write( tp, 0xF840, 0x74F8 );
+        rtl8168_mac_ocp_write( tp, 0xF842, 0x48C4 );
+        rtl8168_mac_ocp_write( tp, 0xF844, 0x8CF8 );
+        rtl8168_mac_ocp_write( tp, 0xF846, 0xC404 );
+        rtl8168_mac_ocp_write( tp, 0xF848, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xF84A, 0xC403 );
+        rtl8168_mac_ocp_write( tp, 0xF84C, 0xBC00 );
+        rtl8168_mac_ocp_write( tp, 0xF84E, 0x0BF2 );
+        rtl8168_mac_ocp_write( tp, 0xF850, 0x0C0A );
+        rtl8168_mac_ocp_write( tp, 0xF852, 0xE434 );
+        rtl8168_mac_ocp_write( tp, 0xF854, 0xD3C0 );
+        rtl8168_mac_ocp_write( tp, 0xF856, 0x49D9 );
+        rtl8168_mac_ocp_write( tp, 0xF858, 0xF01F );
+        rtl8168_mac_ocp_write( tp, 0xF85A, 0xC526 );
+        rtl8168_mac_ocp_write( tp, 0xF85C, 0x64A5 );
+        rtl8168_mac_ocp_write( tp, 0xF85E, 0x1400 );
+        rtl8168_mac_ocp_write( tp, 0xF860, 0xF007 );
+        rtl8168_mac_ocp_write( tp, 0xF862, 0x0C01 );
+        rtl8168_mac_ocp_write( tp, 0xF864, 0x8CA5 );
+        rtl8168_mac_ocp_write( tp, 0xF866, 0x1C15 );
+        rtl8168_mac_ocp_write( tp, 0xF868, 0xC51B );
+        rtl8168_mac_ocp_write( tp, 0xF86A, 0x9CA0 );
+        rtl8168_mac_ocp_write( tp, 0xF86C, 0xE013 );
+        rtl8168_mac_ocp_write( tp, 0xF86E, 0xC519 );
+        rtl8168_mac_ocp_write( tp, 0xF870, 0x74A0 );
+        rtl8168_mac_ocp_write( tp, 0xF872, 0x48C4 );
+        rtl8168_mac_ocp_write( tp, 0xF874, 0x8CA0 );
+        rtl8168_mac_ocp_write( tp, 0xF876, 0xC516 );
+        rtl8168_mac_ocp_write( tp, 0xF878, 0x74A4 );
+        rtl8168_mac_ocp_write( tp, 0xF87A, 0x48C8 );
+        rtl8168_mac_ocp_write( tp, 0xF87C, 0x48CA );
+        rtl8168_mac_ocp_write( tp, 0xF87E, 0x9CA4 );
+        rtl8168_mac_ocp_write( tp, 0xF880, 0xC512 );
+        rtl8168_mac_ocp_write( tp, 0xF882, 0x1B00 );
+        rtl8168_mac_ocp_write( tp, 0xF884, 0x9BA0 );
+        rtl8168_mac_ocp_write( tp, 0xF886, 0x1B1C );
+        rtl8168_mac_ocp_write( tp, 0xF888, 0x483F );
+        rtl8168_mac_ocp_write( tp, 0xF88A, 0x9BA2 );
+        rtl8168_mac_ocp_write( tp, 0xF88C, 0x1B04 );
+        rtl8168_mac_ocp_write( tp, 0xF88E, 0xC508 );
+        rtl8168_mac_ocp_write( tp, 0xF890, 0x9BA0 );
+        rtl8168_mac_ocp_write( tp, 0xF892, 0xC505 );
+        rtl8168_mac_ocp_write( tp, 0xF894, 0xBD00 );
+        rtl8168_mac_ocp_write( tp, 0xF896, 0xC502 );
+        rtl8168_mac_ocp_write( tp, 0xF898, 0xBD00 );
+        rtl8168_mac_ocp_write( tp, 0xF89A, 0x0300 );
+        rtl8168_mac_ocp_write( tp, 0xF89C, 0x051E );
+        rtl8168_mac_ocp_write( tp, 0xF89E, 0xE434 );
+        rtl8168_mac_ocp_write( tp, 0xF8A0, 0xE018 );
+        rtl8168_mac_ocp_write( tp, 0xF8A2, 0xE092 );
+        rtl8168_mac_ocp_write( tp, 0xF8A4, 0xDE20 );
+        rtl8168_mac_ocp_write( tp, 0xF8A6, 0xD3C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8A8, 0xC50F );
+        rtl8168_mac_ocp_write( tp, 0xF8AA, 0x76A4 );
+        rtl8168_mac_ocp_write( tp, 0xF8AC, 0x49E3 );
+        rtl8168_mac_ocp_write( tp, 0xF8AE, 0xF007 );
+        rtl8168_mac_ocp_write( tp, 0xF8B0, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8B2, 0xF103 );
+        rtl8168_mac_ocp_write( tp, 0xF8B4, 0xC607 );
+        rtl8168_mac_ocp_write( tp, 0xF8B6, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF8B8, 0xC606 );
+        rtl8168_mac_ocp_write( tp, 0xF8BA, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF8BC, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF8BE, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF8C0, 0x0C4C );
+        rtl8168_mac_ocp_write( tp, 0xF8C2, 0x0C28 );
+        rtl8168_mac_ocp_write( tp, 0xF8C4, 0x0C2C );
+        rtl8168_mac_ocp_write( tp, 0xF8C6, 0xDC00 );
+        rtl8168_mac_ocp_write( tp, 0xF8C8, 0xC707 );
+        rtl8168_mac_ocp_write( tp, 0xF8CA, 0x1D00 );
+        rtl8168_mac_ocp_write( tp, 0xF8CC, 0x8DE2 );
+        rtl8168_mac_ocp_write( tp, 0xF8CE, 0x48C1 );
+        rtl8168_mac_ocp_write( tp, 0xF8D0, 0xC502 );
+        rtl8168_mac_ocp_write( tp, 0xF8D2, 0xBD00 );
+        rtl8168_mac_ocp_write( tp, 0xF8D4, 0x00AA );
+        rtl8168_mac_ocp_write( tp, 0xF8D6, 0xE0C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8D8, 0xC502 );
+        rtl8168_mac_ocp_write( tp, 0xF8DA, 0xBD00 );
+        rtl8168_mac_ocp_write( tp, 0xF8DC, 0x0132 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC26, 0x8000 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC2A, 0x0743 );
+        rtl8168_mac_ocp_write( tp, 0xFC2C, 0x0801 );
+        rtl8168_mac_ocp_write( tp, 0xFC2E, 0x0BE9 );
+        rtl8168_mac_ocp_write( tp, 0xFC30, 0x02FD );
+        rtl8168_mac_ocp_write( tp, 0xFC32, 0x0C25 );
+        rtl8168_mac_ocp_write( tp, 0xFC34, 0x00A9 );
+        rtl8168_mac_ocp_write( tp, 0xFC36, 0x012D );
 }
 
 static void
 rtl8168_set_mac_mcu_8168ep_1(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        u16 i;
-        static const u16 mcu_patch_code_8168ep_1 = {
-                0xE008, 0xE0D3, 0xE0D6, 0xE0D9, 0xE0DB, 0xE0DD, 0xE0DF, 0xE0E1, 0xC251,
-                0x7340, 0x49B1, 0xF010, 0x1D02, 0x8D40, 0xC202, 0xBA00, 0x2C3A, 0xC0F0,
-                0xE8DE, 0x2000, 0x8000, 0xC0B6, 0x268C, 0x752C, 0x49D4, 0xF112, 0xE025,
-                0xC2F6, 0x7146, 0xC2F5, 0x7340, 0x49BE, 0xF103, 0xC7F2, 0xE002, 0xC7F1,
-                0x304F, 0x6226, 0x49A1, 0xF1F0, 0x7222, 0x49A0, 0xF1ED, 0x2525, 0x1F28,
-                0x3097, 0x3091, 0x9A36, 0x752C, 0x21DC, 0x25BC, 0xC6E2, 0x77C0, 0x1304,
-                0xF014, 0x1303, 0xF014, 0x1302, 0xF014, 0x1301, 0xF014, 0x49D4, 0xF103,
-                0xC3D7, 0xBB00, 0xC618, 0x67C6, 0x752E, 0x22D7, 0x26DD, 0x1505, 0xF013,
-                0xC60A, 0xBE00, 0xC309, 0xBB00, 0xC308, 0xBB00, 0xC307, 0xBB00, 0xC306,
-                0xBB00, 0x25C8, 0x25A6, 0x25AC, 0x25B2, 0x25B8, 0xCD08, 0x0000, 0xC0BC,
-                0xC2FF, 0x7340, 0x49B0, 0xF04E, 0x1F46, 0x308F, 0xC3F7, 0x1C04, 0xE84D,
-                0x1401, 0xF147, 0x7226, 0x49A7, 0xF044, 0x7222, 0x2525, 0x1F30, 0x3097,
-                0x3091, 0x7340, 0xC4EA, 0x401C, 0xF006, 0xC6E8, 0x75C0, 0x49D7, 0xF105,
-                0xE036, 0x1D08, 0x8DC1, 0x0208, 0x6640, 0x2764, 0x1606, 0xF12F, 0x6346,
-                0x133B, 0xF12C, 0x9B34, 0x1B18, 0x3093, 0xC32A, 0x1C10, 0xE82A, 0x1401,
-                0xF124, 0x1A36, 0x308A, 0x7322, 0x25B5, 0x0B0E, 0x1C00, 0xE82C, 0xC71F,
-                0x4027, 0xF11A, 0xE838, 0x1F42, 0x308F, 0x1B08, 0xE824, 0x7236, 0x7746,
-                0x1700, 0xF00D, 0xC313, 0x401F, 0xF103, 0x1F00, 0x9F46, 0x7744, 0x449F,
-                0x445F, 0xE817, 0xC70A, 0x4027, 0xF105, 0xC302, 0xBB00, 0x2E08, 0x2DC2,
-                0xC7FF, 0xBF00, 0xCDB8, 0xFFFF, 0x0C02, 0xA554, 0xA5DC, 0x402F, 0xF105,
-                0x1400, 0xF1FA, 0x1C01, 0xE002, 0x1C00, 0xFF80, 0x49B0, 0xF004, 0x0B01,
-                0xA1D3, 0xE003, 0x0B02, 0xA5D3, 0x3127, 0x3720, 0x0B02, 0xA5D3, 0x3127,
-                0x3720, 0x1300, 0xF1FB, 0xFF80, 0x7322, 0x25B5, 0x1E28, 0x30DE, 0x30D9,
-                0x7264, 0x1E11, 0x2368, 0x3116, 0xFF80, 0x1B7E, 0xC602, 0xBE00, 0x06A6,
-                0x1B7E, 0xC602, 0xBE00, 0x0764, 0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00,
-                0x0000, 0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00,
-                0x0000
-        };
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168ep_1); i++)
-                rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168ep_1i);
-
-        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-        rtl8168_mac_ocp_write(tp, 0xFC28, 0x2549);
-        rtl8168_mac_ocp_write(tp, 0xFC2A, 0x06A5);
-        rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0763);
-}
-
-static bool
-rtl8168_check_dash_other_fun_present(struct rtl8168_private *tp)
-{
-        //check if func 2 exist
-        if (rtl8168_csi_other_fun_read(tp, 2, 0x00) != 0xffffffff)
-                return true;
-
-        return false;
+        rtl8168_mac_ocp_write( tp, 0xF800, 0xE008 );
+        rtl8168_mac_ocp_write( tp, 0xF802, 0xE0D3 );
+        rtl8168_mac_ocp_write( tp, 0xF804, 0xE0D6 );
+        rtl8168_mac_ocp_write( tp, 0xF806, 0xE0D9 );
+        rtl8168_mac_ocp_write( tp, 0xF808, 0xE0DB );
+        rtl8168_mac_ocp_write( tp, 0xF80A, 0xE0DD );
+        rtl8168_mac_ocp_write( tp, 0xF80C, 0xE0DF );
+        rtl8168_mac_ocp_write( tp, 0xF80E, 0xE0E1 );
+        rtl8168_mac_ocp_write( tp, 0xF810, 0xC251 );
+        rtl8168_mac_ocp_write( tp, 0xF812, 0x7340 );
+        rtl8168_mac_ocp_write( tp, 0xF814, 0x49B1 );
+        rtl8168_mac_ocp_write( tp, 0xF816, 0xF010 );
+        rtl8168_mac_ocp_write( tp, 0xF818, 0x1D02 );
+        rtl8168_mac_ocp_write( tp, 0xF81A, 0x8D40 );
+        rtl8168_mac_ocp_write( tp, 0xF81C, 0xC202 );
+        rtl8168_mac_ocp_write( tp, 0xF81E, 0xBA00 );
+        rtl8168_mac_ocp_write( tp, 0xF820, 0x2C3A );
+        rtl8168_mac_ocp_write( tp, 0xF822, 0xC0F0 );
+        rtl8168_mac_ocp_write( tp, 0xF824, 0xE8DE );
+        rtl8168_mac_ocp_write( tp, 0xF826, 0x2000 );
+        rtl8168_mac_ocp_write( tp, 0xF828, 0x8000 );
+        rtl8168_mac_ocp_write( tp, 0xF82A, 0xC0B6 );
+        rtl8168_mac_ocp_write( tp, 0xF82C, 0x268C );
+        rtl8168_mac_ocp_write( tp, 0xF82E, 0x752C );
+        rtl8168_mac_ocp_write( tp, 0xF830, 0x49D4 );
+        rtl8168_mac_ocp_write( tp, 0xF832, 0xF112 );
+        rtl8168_mac_ocp_write( tp, 0xF834, 0xE025 );
+        rtl8168_mac_ocp_write( tp, 0xF836, 0xC2F6 );
+        rtl8168_mac_ocp_write( tp, 0xF838, 0x7146 );
+        rtl8168_mac_ocp_write( tp, 0xF83A, 0xC2F5 );
+        rtl8168_mac_ocp_write( tp, 0xF83C, 0x7340 );
+        rtl8168_mac_ocp_write( tp, 0xF83E, 0x49BE );
+        rtl8168_mac_ocp_write( tp, 0xF840, 0xF103 );
+        rtl8168_mac_ocp_write( tp, 0xF842, 0xC7F2 );
+        rtl8168_mac_ocp_write( tp, 0xF844, 0xE002 );
+        rtl8168_mac_ocp_write( tp, 0xF846, 0xC7F1 );
+        rtl8168_mac_ocp_write( tp, 0xF848, 0x304F );
+        rtl8168_mac_ocp_write( tp, 0xF84A, 0x6226 );
+        rtl8168_mac_ocp_write( tp, 0xF84C, 0x49A1 );
+        rtl8168_mac_ocp_write( tp, 0xF84E, 0xF1F0 );
+        rtl8168_mac_ocp_write( tp, 0xF850, 0x7222 );
+        rtl8168_mac_ocp_write( tp, 0xF852, 0x49A0 );
+        rtl8168_mac_ocp_write( tp, 0xF854, 0xF1ED );
+        rtl8168_mac_ocp_write( tp, 0xF856, 0x2525 );
+        rtl8168_mac_ocp_write( tp, 0xF858, 0x1F28 );
+        rtl8168_mac_ocp_write( tp, 0xF85A, 0x3097 );
+        rtl8168_mac_ocp_write( tp, 0xF85C, 0x3091 );
+        rtl8168_mac_ocp_write( tp, 0xF85E, 0x9A36 );
+        rtl8168_mac_ocp_write( tp, 0xF860, 0x752C );
+        rtl8168_mac_ocp_write( tp, 0xF862, 0x21DC );
+        rtl8168_mac_ocp_write( tp, 0xF864, 0x25BC );
+        rtl8168_mac_ocp_write( tp, 0xF866, 0xC6E2 );
+        rtl8168_mac_ocp_write( tp, 0xF868, 0x77C0 );
+        rtl8168_mac_ocp_write( tp, 0xF86A, 0x1304 );
+        rtl8168_mac_ocp_write( tp, 0xF86C, 0xF014 );
+        rtl8168_mac_ocp_write( tp, 0xF86E, 0x1303 );
+        rtl8168_mac_ocp_write( tp, 0xF870, 0xF014 );
+        rtl8168_mac_ocp_write( tp, 0xF872, 0x1302 );
+        rtl8168_mac_ocp_write( tp, 0xF874, 0xF014 );
+        rtl8168_mac_ocp_write( tp, 0xF876, 0x1301 );
+        rtl8168_mac_ocp_write( tp, 0xF878, 0xF014 );
+        rtl8168_mac_ocp_write( tp, 0xF87A, 0x49D4 );
+        rtl8168_mac_ocp_write( tp, 0xF87C, 0xF103 );
+        rtl8168_mac_ocp_write( tp, 0xF87E, 0xC3D7 );
+        rtl8168_mac_ocp_write( tp, 0xF880, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF882, 0xC618 );
+        rtl8168_mac_ocp_write( tp, 0xF884, 0x67C6 );
+        rtl8168_mac_ocp_write( tp, 0xF886, 0x752E );
+        rtl8168_mac_ocp_write( tp, 0xF888, 0x22D7 );
+        rtl8168_mac_ocp_write( tp, 0xF88A, 0x26DD );
+        rtl8168_mac_ocp_write( tp, 0xF88C, 0x1505 );
+        rtl8168_mac_ocp_write( tp, 0xF88E, 0xF013 );
+        rtl8168_mac_ocp_write( tp, 0xF890, 0xC60A );
+        rtl8168_mac_ocp_write( tp, 0xF892, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF894, 0xC309 );
+        rtl8168_mac_ocp_write( tp, 0xF896, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF898, 0xC308 );
+        rtl8168_mac_ocp_write( tp, 0xF89A, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF89C, 0xC307 );
+        rtl8168_mac_ocp_write( tp, 0xF89E, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF8A0, 0xC306 );
+        rtl8168_mac_ocp_write( tp, 0xF8A2, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF8A4, 0x25C8 );
+        rtl8168_mac_ocp_write( tp, 0xF8A6, 0x25A6 );
+        rtl8168_mac_ocp_write( tp, 0xF8A8, 0x25AC );
+        rtl8168_mac_ocp_write( tp, 0xF8AA, 0x25B2 );
+        rtl8168_mac_ocp_write( tp, 0xF8AC, 0x25B8 );
+        rtl8168_mac_ocp_write( tp, 0xF8AE, 0xCD08 );
+        rtl8168_mac_ocp_write( tp, 0xF8B0, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF8B2, 0xC0BC );
+        rtl8168_mac_ocp_write( tp, 0xF8B4, 0xC2FF );
+        rtl8168_mac_ocp_write( tp, 0xF8B6, 0x7340 );
+        rtl8168_mac_ocp_write( tp, 0xF8B8, 0x49B0 );
+        rtl8168_mac_ocp_write( tp, 0xF8BA, 0xF04E );
+        rtl8168_mac_ocp_write( tp, 0xF8BC, 0x1F46 );
+        rtl8168_mac_ocp_write( tp, 0xF8BE, 0x308F );
+        rtl8168_mac_ocp_write( tp, 0xF8C0, 0xC3F7 );
+        rtl8168_mac_ocp_write( tp, 0xF8C2, 0x1C04 );
+        rtl8168_mac_ocp_write( tp, 0xF8C4, 0xE84D );
+        rtl8168_mac_ocp_write( tp, 0xF8C6, 0x1401 );
+        rtl8168_mac_ocp_write( tp, 0xF8C8, 0xF147 );
+        rtl8168_mac_ocp_write( tp, 0xF8CA, 0x7226 );
+        rtl8168_mac_ocp_write( tp, 0xF8CC, 0x49A7 );
+        rtl8168_mac_ocp_write( tp, 0xF8CE, 0xF044 );
+        rtl8168_mac_ocp_write( tp, 0xF8D0, 0x7222 );
+        rtl8168_mac_ocp_write( tp, 0xF8D2, 0x2525 );
+        rtl8168_mac_ocp_write( tp, 0xF8D4, 0x1F30 );
+        rtl8168_mac_ocp_write( tp, 0xF8D6, 0x3097 );
+        rtl8168_mac_ocp_write( tp, 0xF8D8, 0x3091 );
+        rtl8168_mac_ocp_write( tp, 0xF8DA, 0x7340 );
+        rtl8168_mac_ocp_write( tp, 0xF8DC, 0xC4EA );
+        rtl8168_mac_ocp_write( tp, 0xF8DE, 0x401C );
+        rtl8168_mac_ocp_write( tp, 0xF8E0, 0xF006 );
+        rtl8168_mac_ocp_write( tp, 0xF8E2, 0xC6E8 );
+        rtl8168_mac_ocp_write( tp, 0xF8E4, 0x75C0 );
+        rtl8168_mac_ocp_write( tp, 0xF8E6, 0x49D7 );
+        rtl8168_mac_ocp_write( tp, 0xF8E8, 0xF105 );
+        rtl8168_mac_ocp_write( tp, 0xF8EA, 0xE036 );
+        rtl8168_mac_ocp_write( tp, 0xF8EC, 0x1D08 );
+        rtl8168_mac_ocp_write( tp, 0xF8EE, 0x8DC1 );
+        rtl8168_mac_ocp_write( tp, 0xF8F0, 0x0208 );
+        rtl8168_mac_ocp_write( tp, 0xF8F2, 0x6640 );
+        rtl8168_mac_ocp_write( tp, 0xF8F4, 0x2764 );
+        rtl8168_mac_ocp_write( tp, 0xF8F6, 0x1606 );
+        rtl8168_mac_ocp_write( tp, 0xF8F8, 0xF12F );
+        rtl8168_mac_ocp_write( tp, 0xF8FA, 0x6346 );
+        rtl8168_mac_ocp_write( tp, 0xF8FC, 0x133B );
+        rtl8168_mac_ocp_write( tp, 0xF8FE, 0xF12C );
+        rtl8168_mac_ocp_write( tp, 0xF900, 0x9B34 );
+        rtl8168_mac_ocp_write( tp, 0xF902, 0x1B18 );
+        rtl8168_mac_ocp_write( tp, 0xF904, 0x3093 );
+        rtl8168_mac_ocp_write( tp, 0xF906, 0xC32A );
+        rtl8168_mac_ocp_write( tp, 0xF908, 0x1C10 );
+        rtl8168_mac_ocp_write( tp, 0xF90A, 0xE82A );
+        rtl8168_mac_ocp_write( tp, 0xF90C, 0x1401 );
+        rtl8168_mac_ocp_write( tp, 0xF90E, 0xF124 );
+        rtl8168_mac_ocp_write( tp, 0xF910, 0x1A36 );
+        rtl8168_mac_ocp_write( tp, 0xF912, 0x308A );
+        rtl8168_mac_ocp_write( tp, 0xF914, 0x7322 );
+        rtl8168_mac_ocp_write( tp, 0xF916, 0x25B5 );
+        rtl8168_mac_ocp_write( tp, 0xF918, 0x0B0E );
+        rtl8168_mac_ocp_write( tp, 0xF91A, 0x1C00 );
+        rtl8168_mac_ocp_write( tp, 0xF91C, 0xE82C );
+        rtl8168_mac_ocp_write( tp, 0xF91E, 0xC71F );
+        rtl8168_mac_ocp_write( tp, 0xF920, 0x4027 );
+        rtl8168_mac_ocp_write( tp, 0xF922, 0xF11A );
+        rtl8168_mac_ocp_write( tp, 0xF924, 0xE838 );
+        rtl8168_mac_ocp_write( tp, 0xF926, 0x1F42 );
+        rtl8168_mac_ocp_write( tp, 0xF928, 0x308F );
+        rtl8168_mac_ocp_write( tp, 0xF92A, 0x1B08 );
+        rtl8168_mac_ocp_write( tp, 0xF92C, 0xE824 );
+        rtl8168_mac_ocp_write( tp, 0xF92E, 0x7236 );
+        rtl8168_mac_ocp_write( tp, 0xF930, 0x7746 );
+        rtl8168_mac_ocp_write( tp, 0xF932, 0x1700 );
+        rtl8168_mac_ocp_write( tp, 0xF934, 0xF00D );
+        rtl8168_mac_ocp_write( tp, 0xF936, 0xC313 );
+        rtl8168_mac_ocp_write( tp, 0xF938, 0x401F );
+        rtl8168_mac_ocp_write( tp, 0xF93A, 0xF103 );
+        rtl8168_mac_ocp_write( tp, 0xF93C, 0x1F00 );
+        rtl8168_mac_ocp_write( tp, 0xF93E, 0x9F46 );
+        rtl8168_mac_ocp_write( tp, 0xF940, 0x7744 );
+        rtl8168_mac_ocp_write( tp, 0xF942, 0x449F );
+        rtl8168_mac_ocp_write( tp, 0xF944, 0x445F );
+        rtl8168_mac_ocp_write( tp, 0xF946, 0xE817 );
+        rtl8168_mac_ocp_write( tp, 0xF948, 0xC70A );
+        rtl8168_mac_ocp_write( tp, 0xF94A, 0x4027 );
+        rtl8168_mac_ocp_write( tp, 0xF94C, 0xF105 );
+        rtl8168_mac_ocp_write( tp, 0xF94E, 0xC302 );
+        rtl8168_mac_ocp_write( tp, 0xF950, 0xBB00 );
+        rtl8168_mac_ocp_write( tp, 0xF952, 0x2E08 );
+        rtl8168_mac_ocp_write( tp, 0xF954, 0x2DC2 );
+        rtl8168_mac_ocp_write( tp, 0xF956, 0xC7FF );
+        rtl8168_mac_ocp_write( tp, 0xF958, 0xBF00 );
+        rtl8168_mac_ocp_write( tp, 0xF95A, 0xCDB8 );
+        rtl8168_mac_ocp_write( tp, 0xF95C, 0xFFFF );
+        rtl8168_mac_ocp_write( tp, 0xF95E, 0x0C02 );
+        rtl8168_mac_ocp_write( tp, 0xF960, 0xA554 );
+        rtl8168_mac_ocp_write( tp, 0xF962, 0xA5DC );
+        rtl8168_mac_ocp_write( tp, 0xF964, 0x402F );
+        rtl8168_mac_ocp_write( tp, 0xF966, 0xF105 );
+        rtl8168_mac_ocp_write( tp, 0xF968, 0x1400 );
+        rtl8168_mac_ocp_write( tp, 0xF96A, 0xF1FA );
+        rtl8168_mac_ocp_write( tp, 0xF96C, 0x1C01 );
+        rtl8168_mac_ocp_write( tp, 0xF96E, 0xE002 );
+        rtl8168_mac_ocp_write( tp, 0xF970, 0x1C00 );
+        rtl8168_mac_ocp_write( tp, 0xF972, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xF974, 0x49B0 );
+        rtl8168_mac_ocp_write( tp, 0xF976, 0xF004 );
+        rtl8168_mac_ocp_write( tp, 0xF978, 0x0B01 );
+        rtl8168_mac_ocp_write( tp, 0xF97A, 0xA1D3 );
+        rtl8168_mac_ocp_write( tp, 0xF97C, 0xE003 );
+        rtl8168_mac_ocp_write( tp, 0xF97E, 0x0B02 );
+        rtl8168_mac_ocp_write( tp, 0xF980, 0xA5D3 );
+        rtl8168_mac_ocp_write( tp, 0xF982, 0x3127 );
+        rtl8168_mac_ocp_write( tp, 0xF984, 0x3720 );
+        rtl8168_mac_ocp_write( tp, 0xF986, 0x0B02 );
+        rtl8168_mac_ocp_write( tp, 0xF988, 0xA5D3 );
+        rtl8168_mac_ocp_write( tp, 0xF98A, 0x3127 );
+        rtl8168_mac_ocp_write( tp, 0xF98C, 0x3720 );
+        rtl8168_mac_ocp_write( tp, 0xF98E, 0x1300 );
+        rtl8168_mac_ocp_write( tp, 0xF990, 0xF1FB );
+        rtl8168_mac_ocp_write( tp, 0xF992, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xF994, 0x7322 );
+        rtl8168_mac_ocp_write( tp, 0xF996, 0x25B5 );
+        rtl8168_mac_ocp_write( tp, 0xF998, 0x1E28 );
+        rtl8168_mac_ocp_write( tp, 0xF99A, 0x30DE );
+        rtl8168_mac_ocp_write( tp, 0xF99C, 0x30D9 );
+        rtl8168_mac_ocp_write( tp, 0xF99E, 0x7264 );
+        rtl8168_mac_ocp_write( tp, 0xF9A0, 0x1E11 );
+        rtl8168_mac_ocp_write( tp, 0xF9A2, 0x2368 );
+        rtl8168_mac_ocp_write( tp, 0xF9A4, 0x3116 );
+        rtl8168_mac_ocp_write( tp, 0xF9A6, 0xFF80 );
+        rtl8168_mac_ocp_write( tp, 0xF9A8, 0x1B7E );
+        rtl8168_mac_ocp_write( tp, 0xF9AA, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF9AC, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF9AE, 0x06A6 );
+        rtl8168_mac_ocp_write( tp, 0xF9B0, 0x1B7E );
+        rtl8168_mac_ocp_write( tp, 0xF9B2, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF9B4, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF9B6, 0x0764 );
+        rtl8168_mac_ocp_write( tp, 0xF9B8, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF9BA, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF9BC, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF9BE, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF9C0, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF9C2, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF9C4, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF9C6, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF9C8, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF9CA, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF9CC, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF9CE, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF9D0, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF9D2, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF9D4, 0x0000 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC26, 0x8000 );
+
+        rtl8168_mac_ocp_write( tp, 0xFC28, 0x2549 );
+        rtl8168_mac_ocp_write( tp, 0xFC2A, 0x06A5 );
+        rtl8168_mac_ocp_write( tp, 0xFC2C, 0x0763 );
 }
 
 static void
 rtl8168_set_mac_mcu_8168ep_2(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        u16 i;
-        static const u16 mcu_patch_code_8168ep_2 = {
-                0xE008, 0xE017, 0xE052, 0xE056, 0xE058, 0xE05A, 0xE05C, 0xE05E, 0xC50F,
-                0x76A4, 0x49E3, 0xF007, 0x49C0, 0xF103, 0xC607, 0xBE00, 0xC606, 0xBE00,
-                0xC602, 0xBE00, 0x0BDA, 0x0BB6, 0x0BBA, 0xDC00, 0xB400, 0xB401, 0xB402,
-                0xB403, 0xB404, 0xC02E, 0x7206, 0x49AE, 0xF1FE, 0xC12B, 0x9904, 0xC12A,
-                0x9906, 0x7206, 0x49AE, 0xF1FE, 0x7200, 0x49A0, 0xF117, 0xC123, 0xC223,
-                0xC323, 0xE808, 0xC322, 0xE806, 0xC321, 0xE804, 0xC320, 0xE802, 0xE00C,
-                0x740E, 0x49CE, 0xF1FE, 0x9908, 0x990A, 0x9A0C, 0x9B0E, 0x740E, 0x49CE,
-                0xF1FE, 0xFF80, 0xB004, 0xB003, 0xB002, 0xB001, 0xB000, 0xC604, 0xC002,
-                0xB800, 0x1FC8, 0xE000, 0xE8E0, 0xF128, 0x0002, 0xFFFF, 0xF000, 0x8001,
-                0x8002, 0x8003, 0x8004, 0x48C1, 0x48C2, 0xC502, 0xBD00, 0x0490, 0xC602,
-                0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000, 0xC602,
-                0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000
-        };
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168ep_2); i++)
-                rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168ep_2i);
+        rtl8168_mac_ocp_write( tp, 0xF800, 0xE008 );
+        rtl8168_mac_ocp_write( tp, 0xF802, 0xE017 );
+        rtl8168_mac_ocp_write( tp, 0xF804, 0xE019 );
+        rtl8168_mac_ocp_write( tp, 0xF806, 0xE01B );
+        rtl8168_mac_ocp_write( tp, 0xF808, 0xE01D );
+        rtl8168_mac_ocp_write( tp, 0xF80A, 0xE01F );
+        rtl8168_mac_ocp_write( tp, 0xF80C, 0xE021 );
+        rtl8168_mac_ocp_write( tp, 0xF80E, 0xE023 );
+        rtl8168_mac_ocp_write( tp, 0xF810, 0xC50F );
+        rtl8168_mac_ocp_write( tp, 0xF812, 0x76A4 );
+        rtl8168_mac_ocp_write( tp, 0xF814, 0x49E3 );
+        rtl8168_mac_ocp_write( tp, 0xF816, 0xF007 );
+        rtl8168_mac_ocp_write( tp, 0xF818, 0x49C0 );
+        rtl8168_mac_ocp_write( tp, 0xF81A, 0xF103 );
+        rtl8168_mac_ocp_write( tp, 0xF81C, 0xC607 );
+        rtl8168_mac_ocp_write( tp, 0xF81E, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF820, 0xC606 );
+        rtl8168_mac_ocp_write( tp, 0xF822, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF824, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF826, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF828, 0x0BDA );
+        rtl8168_mac_ocp_write( tp, 0xF82A, 0x0BB0 );
+        rtl8168_mac_ocp_write( tp, 0xF82C, 0x0BBA );
+        rtl8168_mac_ocp_write( tp, 0xF82E, 0xDC00 );
+        rtl8168_mac_ocp_write( tp, 0xF830, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF832, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF834, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF836, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF838, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF83A, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF83C, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF83E, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF840, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF842, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF844, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF846, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF848, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF84A, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF84C, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF84E, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF850, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF852, 0x0000 );
+        rtl8168_mac_ocp_write( tp, 0xF854, 0xC602 );
+        rtl8168_mac_ocp_write( tp, 0xF856, 0xBE00 );
+        rtl8168_mac_ocp_write( tp, 0xF858, 0x0000 );
 
-        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
+        rtl8168_mac_ocp_write( tp, 0xFC26, 0x8000 );
 
-        rtl8168_mac_ocp_write(tp, 0xFC28, 0x0BB3);
-        if (false == rtl8168_check_dash_other_fun_present(tp))
-                rtl8168_mac_ocp_write(tp, 0xFC2A, 0x1FC7);
-        //rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0485);
+        rtl8168_mac_ocp_write( tp, 0xFC28, 0x0BB3 );
 }
 
 static void
 rtl8168_set_mac_mcu_8168h_1(struct net_device *dev)
 {
-        rtl8168_hw_disable_mac_mcu_bps(dev);
-}
-
-static void
-rtl8168_set_mac_mcu_8168h_2(struct net_device *dev)
-{
         struct rtl8168_private *tp = netdev_priv(dev);
-        u16 i;
-        static const u16 mcu_patch_code_8168h_1 = {
-                0xE008, 0xE00F, 0xE011, 0xE047, 0xE049, 0xE073, 0xE075, 0xE07A, 0xC707,
-                0x1D00, 0x8DE2, 0x48C1, 0xC502, 0xBD00, 0x00E4, 0xE0C0, 0xC502, 0xBD00,
-                0x0216, 0xC634, 0x75C0, 0x49D3, 0xF027, 0xC631, 0x75C0, 0x49D3, 0xF123,
-                0xC627, 0x75C0, 0xB405, 0xC525, 0x9DC0, 0xC621, 0x75C8, 0x49D5, 0xF00A,
-                0x49D6, 0xF008, 0x49D7, 0xF006, 0x49D8, 0xF004, 0x75D2, 0x49D9, 0xF111,
-                0xC517, 0x9DC8, 0xC516, 0x9DD2, 0xC618, 0x75C0, 0x49D4, 0xF003, 0x49D0,
-                0xF104, 0xC60A, 0xC50E, 0x9DC0, 0xB005, 0xC607, 0x9DC0, 0xB007, 0xC602,
-                0xBE00, 0x1A06, 0xB400, 0xE86C, 0xA000, 0x01E1, 0x0200, 0x9200, 0xE84C,
-                0xE004, 0xE908, 0xC502, 0xBD00, 0x0B58, 0xB407, 0xB404, 0x2195, 0x25BD,
-                0x9BE0, 0x1C1C, 0x484F, 0x9CE2, 0x72E2, 0x49AE, 0xF1FE, 0x0B00, 0xF116,
-                0xC71C, 0xC419, 0x9CE0, 0x1C13, 0x484F, 0x9CE2, 0x74E2, 0x49CE, 0xF1FE,
-                0xC412, 0x9CE0, 0x1C13, 0x484F, 0x9CE2, 0x74E2, 0x49CE, 0xF1FE, 0xC70C,
-                0x74F8, 0x48C3, 0x8CF8, 0xB004, 0xB007, 0xC502, 0xBD00, 0x0F24, 0x0481,
-                0x0C81, 0xDE24, 0xE000, 0xC602, 0xBE00, 0x0CA4, 0x48C1, 0x48C2, 0x9C46,
-                0xC402, 0xBC00, 0x0578, 0xC602, 0xBE00, 0x0000
-        };
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168h_1); i++)
-                rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168h_1i);
+        rtl8168_mac_ocp_write(tp, 0xF800, 0xE008);
+        rtl8168_mac_ocp_write(tp, 0xF802, 0xE00F);
+        rtl8168_mac_ocp_write(tp, 0xF804, 0xE011);
+        rtl8168_mac_ocp_write(tp, 0xF806, 0xE047);
+        rtl8168_mac_ocp_write(tp, 0xF808, 0xE049);
+        rtl8168_mac_ocp_write(tp, 0xF80A, 0xE073);
+        rtl8168_mac_ocp_write(tp, 0xF80C, 0xE075);
+        rtl8168_mac_ocp_write(tp, 0xF80E, 0xE077);
+        rtl8168_mac_ocp_write(tp, 0xF810, 0xC707);
+        rtl8168_mac_ocp_write(tp, 0xF812, 0x1D00);
+        rtl8168_mac_ocp_write(tp, 0xF814, 0x8DE2);
+        rtl8168_mac_ocp_write(tp, 0xF816, 0x48C1);
+        rtl8168_mac_ocp_write(tp, 0xF818, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xF81A, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xF81C, 0x00E4);
+        rtl8168_mac_ocp_write(tp, 0xF81E, 0xE0C0);
+        rtl8168_mac_ocp_write(tp, 0xF820, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xF822, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xF824, 0x0216);
+        rtl8168_mac_ocp_write(tp, 0xF826, 0xC634);
+        rtl8168_mac_ocp_write(tp, 0xF828, 0x75C0);
+        rtl8168_mac_ocp_write(tp, 0xF82A, 0x49D3);
+        rtl8168_mac_ocp_write(tp, 0xF82C, 0xF027);
+        rtl8168_mac_ocp_write(tp, 0xF82E, 0xC631);
+        rtl8168_mac_ocp_write(tp, 0xF830, 0x75C0);
+        rtl8168_mac_ocp_write(tp, 0xF832, 0x49D3);
+        rtl8168_mac_ocp_write(tp, 0xF834, 0xF123);
+        rtl8168_mac_ocp_write(tp, 0xF836, 0xC627);
+        rtl8168_mac_ocp_write(tp, 0xF838, 0x75C0);
+        rtl8168_mac_ocp_write(tp, 0xF83A, 0xB405);
+        rtl8168_mac_ocp_write(tp, 0xF83C, 0xC525);
+        rtl8168_mac_ocp_write(tp, 0xF83E, 0x9DC0);
+        rtl8168_mac_ocp_write(tp, 0xF840, 0xC621);
+        rtl8168_mac_ocp_write(tp, 0xF842, 0x75C8);
+        rtl8168_mac_ocp_write(tp, 0xF844, 0x49D5);
+        rtl8168_mac_ocp_write(tp, 0xF846, 0xF00A);
+        rtl8168_mac_ocp_write(tp, 0xF848, 0x49D6);
+        rtl8168_mac_ocp_write(tp, 0xF84A, 0xF008);
+        rtl8168_mac_ocp_write(tp, 0xF84C, 0x49D7);
+        rtl8168_mac_ocp_write(tp, 0xF84E, 0xF006);
+        rtl8168_mac_ocp_write(tp, 0xF850, 0x49D8);
+        rtl8168_mac_ocp_write(tp, 0xF852, 0xF004);
+        rtl8168_mac_ocp_write(tp, 0xF854, 0x75D2);
+        rtl8168_mac_ocp_write(tp, 0xF856, 0x49D9);
+        rtl8168_mac_ocp_write(tp, 0xF858, 0xF111);
+        rtl8168_mac_ocp_write(tp, 0xF85A, 0xC517);
+        rtl8168_mac_ocp_write(tp, 0xF85C, 0x9DC8);
+        rtl8168_mac_ocp_write(tp, 0xF85E, 0xC516);
+        rtl8168_mac_ocp_write(tp, 0xF860, 0x9DD2);
+        rtl8168_mac_ocp_write(tp, 0xF862, 0xC618);
+        rtl8168_mac_ocp_write(tp, 0xF864, 0x75C0);
+        rtl8168_mac_ocp_write(tp, 0xF866, 0x49D4);
+        rtl8168_mac_ocp_write(tp, 0xF868, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF86A, 0x49D0);
+        rtl8168_mac_ocp_write(tp, 0xF86C, 0xF104);
+        rtl8168_mac_ocp_write(tp, 0xF86E, 0xC60A);
+        rtl8168_mac_ocp_write(tp, 0xF870, 0xC50E);
+        rtl8168_mac_ocp_write(tp, 0xF872, 0x9DC0);
+        rtl8168_mac_ocp_write(tp, 0xF874, 0xB005);
+        rtl8168_mac_ocp_write(tp, 0xF876, 0xC607);
+        rtl8168_mac_ocp_write(tp, 0xF878, 0x9DC0);
+        rtl8168_mac_ocp_write(tp, 0xF87A, 0xB007);
+        rtl8168_mac_ocp_write(tp, 0xF87C, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF87E, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF880, 0x1A06);
+        rtl8168_mac_ocp_write(tp, 0xF882, 0xB400);
+        rtl8168_mac_ocp_write(tp, 0xF884, 0xE86C);
+        rtl8168_mac_ocp_write(tp, 0xF886, 0xA000);
+        rtl8168_mac_ocp_write(tp, 0xF888, 0x01E1);
+        rtl8168_mac_ocp_write(tp, 0xF88A, 0x0200);
+        rtl8168_mac_ocp_write(tp, 0xF88C, 0x9200);
+        rtl8168_mac_ocp_write(tp, 0xF88E, 0xE84C);
+        rtl8168_mac_ocp_write(tp, 0xF890, 0xE004);
+        rtl8168_mac_ocp_write(tp, 0xF892, 0xE908);
+        rtl8168_mac_ocp_write(tp, 0xF894, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xF896, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xF898, 0x0B58);
+        rtl8168_mac_ocp_write(tp, 0xF89A, 0xB407);
+        rtl8168_mac_ocp_write(tp, 0xF89C, 0xB404);
+        rtl8168_mac_ocp_write(tp, 0xF89E, 0x2195);
+        rtl8168_mac_ocp_write(tp, 0xF8A0, 0x25BD);
+        rtl8168_mac_ocp_write(tp, 0xF8A2, 0x9BE0);
+        rtl8168_mac_ocp_write(tp, 0xF8A4, 0x1C1C);
+        rtl8168_mac_ocp_write(tp, 0xF8A6, 0x484F);
+        rtl8168_mac_ocp_write(tp, 0xF8A8, 0x9CE2);
+        rtl8168_mac_ocp_write(tp, 0xF8AA, 0x72E2);
+        rtl8168_mac_ocp_write(tp, 0xF8AC, 0x49AE);
+        rtl8168_mac_ocp_write(tp, 0xF8AE, 0xF1FE);
+        rtl8168_mac_ocp_write(tp, 0xF8B0, 0x0B00);
+        rtl8168_mac_ocp_write(tp, 0xF8B2, 0xF116);
+        rtl8168_mac_ocp_write(tp, 0xF8B4, 0xC71C);
+        rtl8168_mac_ocp_write(tp, 0xF8B6, 0xC419);
+        rtl8168_mac_ocp_write(tp, 0xF8B8, 0x9CE0);
+        rtl8168_mac_ocp_write(tp, 0xF8BA, 0x1C13);
+        rtl8168_mac_ocp_write(tp, 0xF8BC, 0x484F);
+        rtl8168_mac_ocp_write(tp, 0xF8BE, 0x9CE2);
+        rtl8168_mac_ocp_write(tp, 0xF8C0, 0x74E2);
+        rtl8168_mac_ocp_write(tp, 0xF8C2, 0x49CE);
+        rtl8168_mac_ocp_write(tp, 0xF8C4, 0xF1FE);
+        rtl8168_mac_ocp_write(tp, 0xF8C6, 0xC412);
+        rtl8168_mac_ocp_write(tp, 0xF8C8, 0x9CE0);
+        rtl8168_mac_ocp_write(tp, 0xF8CA, 0x1C13);
+        rtl8168_mac_ocp_write(tp, 0xF8CC, 0x484F);
+        rtl8168_mac_ocp_write(tp, 0xF8CE, 0x9CE2);
+        rtl8168_mac_ocp_write(tp, 0xF8D0, 0x74E2);
+        rtl8168_mac_ocp_write(tp, 0xF8D2, 0x49CE);
+        rtl8168_mac_ocp_write(tp, 0xF8D4, 0xF1FE);
+        rtl8168_mac_ocp_write(tp, 0xF8D6, 0xC70C);
+        rtl8168_mac_ocp_write(tp, 0xF8D8, 0x74F8);
+        rtl8168_mac_ocp_write(tp, 0xF8DA, 0x48C3);
+        rtl8168_mac_ocp_write(tp, 0xF8DC, 0x8CF8);
+        rtl8168_mac_ocp_write(tp, 0xF8DE, 0xB004);
+        rtl8168_mac_ocp_write(tp, 0xF8E0, 0xB007);
+        rtl8168_mac_ocp_write(tp, 0xF8E2, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xF8E4, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xF8E6, 0x0F24);
+        rtl8168_mac_ocp_write(tp, 0xF8E8, 0x0481);
+        rtl8168_mac_ocp_write(tp, 0xF8EA, 0x0C81);
+        rtl8168_mac_ocp_write(tp, 0xF8EC, 0xDE24);
+        rtl8168_mac_ocp_write(tp, 0xF8EE, 0xE000);
+        rtl8168_mac_ocp_write(tp, 0xF8F0, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF8F2, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF8F4, 0x0CA4);
+        rtl8168_mac_ocp_write(tp, 0xF8F6, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xF8F8, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xF8FA, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF8FC, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF8FE, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF900, 0x0000);
 
         rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
 
@@ -10080,340 +8419,782 @@
         rtl8168_mac_ocp_write(tp, 0xFC2E, 0x0B26);
         rtl8168_mac_ocp_write(tp, 0xFC30, 0x0F02);
         rtl8168_mac_ocp_write(tp, 0xFC32, 0x0CA0);
-        //rtl8168_mac_ocp_write(tp, 0xFC34, 0x056C);
 
         rtl8168_mac_ocp_write(tp, 0xFC38, 0x003F);
 }
 
 static void
-rtl8168_set_mac_mcu_8168h_3(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        u16 i;
-        static const u16 mcu_patch_code_8168h_3 = {
-                0xE008, 0xE00A, 0xE00C, 0xE00E, 0xE010, 0xE03E, 0xE040, 0xE069, 0xC602,
-                0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000, 0xC002, 0xB800, 0x0000, 0xC602,
-                0xBE00, 0x0000, 0xC72B, 0x76E2, 0x49EE, 0xF1FD, 0x1E00, 0x9EE0, 0x1E1C,
-                0x9EE2, 0x76E2, 0x49EE, 0xF1FE, 0xC621, 0x9EE0, 0x1E1D, 0x486F, 0x9EE2,
-                0x76E2, 0x49EE, 0xF1FE, 0xC71A, 0x76E0, 0x48E8, 0x48E9, 0x48EA, 0x48EB,
-                0x48EC, 0x9EE0, 0xC70D, 0xC60D, 0x9EF4, 0xC60C, 0x9EF6, 0xC70E, 0x76E0,
-                0x4863, 0x9EE0, 0xB007, 0xC602, 0xBE00, 0x0ACC, 0xE000, 0x03BF, 0x07FF,
-                0xDE24, 0x3200, 0xE096, 0xD438, 0xC602, 0xBE00, 0x0000, 0x8EE6, 0xC726,
-                0x76E2, 0x49EE, 0xF1FD, 0x1E00, 0x8EE0, 0x1E1C, 0x8EE2, 0x76E2, 0x49EE,
-                0xF1FE, 0xC61C, 0x8EE0, 0x1E1D, 0x486F, 0x8EE2, 0x76E2, 0x49EE, 0xF1FE,
-                0xC715, 0x76E0, 0x48E8, 0x48E9, 0x48EA, 0x48EB, 0x48EC, 0x9EE0, 0xC708,
-                0xC608, 0x9EF4, 0xC607, 0x9EF6, 0xC602, 0xBE00, 0x0ABE, 0xE000, 0x03BF,
-                0x07FF, 0xDE24, 0x3200, 0xE096, 0xC602, 0xBE00, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-                0x0000, 0x0000, 0x0000, 0x0000, 0x6838, 0x0A17, 0x0613, 0x0D26
-        };
-
-        rtl8168_hw_disable_mac_mcu_bps(dev);
-
-        for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168h_3); i++)
-                rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168h_3i);
-
-        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-        rtl8168_mac_ocp_write(tp, 0xFC30, 0x0ACA);
-
-        rtl8168_clear_mcu_ocp_bit(tp, 0xD438, BIT_3);
-
-        rtl8168_mac_ocp_write(tp, 0xFC38, 0x0010);
-}
-
-static void
-rtl8168_set_mac_mcu_8168h_4(struct net_device *dev)
-{
-        rtl8168_hw_disable_mac_mcu_bps(dev);
-}
-
-static void
 rtl8168_set_mac_mcu_8168fp_1(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        u16 i;
-        u16 breakPointEnabled = 0;
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        if(tp->HwPkgDet == 0x00 || tp->HwPkgDet == 0x0F) {
-                static const u16 mcu_patch_code_8168fp_1_1 = {
-                        0xE00A, 0xE0C1, 0xE104, 0xE108, 0xE10D, 0xE112, 0xE11C, 0xE121, 0xE000,
-                        0xE0C8, 0xB400, 0xC1FE, 0x49E2, 0xF04C, 0x49EA, 0xF04A, 0x74E6, 0xC246,
-                        0x7542, 0x73EC, 0x1800, 0x49C0, 0xF10D, 0x49C1, 0xF10B, 0x49C2, 0xF109,
-                        0x49B0, 0xF107, 0x49B1, 0xF105, 0x7220, 0x49A2, 0xF102, 0xE002, 0x4800,
-                        0x49D0, 0xF10A, 0x49D1, 0xF108, 0x49D2, 0xF106, 0x49D3, 0xF104, 0x49DF,
-                        0xF102, 0xE00C, 0x4801, 0x72E4, 0x49AD, 0xF108, 0xC225, 0x6741, 0x48F0,
-                        0x8F41, 0x4870, 0x8F41, 0xC7CF, 0x49B5, 0xF01F, 0x49B2, 0xF00B, 0x4980,
-                        0xF003, 0x484E, 0x94E7, 0x4981, 0xF004, 0x485E, 0xC212, 0x9543, 0xE071,
-                        0x49B6, 0xF003, 0x49B3, 0xF10F, 0x4980, 0xF003, 0x484E, 0x94E7, 0x4981,
-                        0xF004, 0x485E, 0xC204, 0x9543, 0xE005, 0xE000, 0xE0FC, 0xE0FA, 0xE065,
-                        0x49B7, 0xF007, 0x4980, 0xF005, 0x1A38, 0x46D4, 0x1200, 0xF109, 0x4981,
-                        0xF055, 0x49C3, 0xF105, 0x1A30, 0x46D5, 0x1200, 0xF04F, 0x7220, 0x49A2,
-                        0xF130, 0x49C1, 0xF12E, 0x49B0, 0xF12C, 0xC2E6, 0x7240, 0x49A8, 0xF003,
-                        0x49D0, 0xF126, 0x49A9, 0xF003, 0x49D1, 0xF122, 0x49AA, 0xF003, 0x49D2,
-                        0xF11E, 0x49AB, 0xF003, 0x49DF, 0xF11A, 0x49AC, 0xF003, 0x49D3, 0xF116,
-                        0x4980, 0xF003, 0x49C7, 0xF105, 0x4981, 0xF02C, 0x49D7, 0xF02A, 0x49C0,
-                        0xF00C, 0xC721, 0x62F4, 0x49A0, 0xF008, 0x49A4, 0xF106, 0x4824, 0x8AF4,
-                        0xC71A, 0x1A40, 0x9AE0, 0x49B6, 0xF017, 0x200E, 0xC7B8, 0x72E0, 0x4710,
-                        0x92E1, 0xC70E, 0x77E0, 0x49F0, 0xF112, 0xC70B, 0x77E0, 0x27FE, 0x1AFA,
-                        0x4317, 0xC705, 0x9AE2, 0x1A11, 0x8AE0, 0xE008, 0xE41C, 0xC0AE, 0xD23A,
-                        0xC7A2, 0x74E6, 0x484F, 0x94E7, 0xC79E, 0x8CE6, 0x8BEC, 0xC29C, 0x8D42,
-                        0x7220, 0xB000, 0xC502, 0xBD00, 0x0932, 0xB400, 0xC240, 0xC340, 0x7060,
-                        0x498F, 0xF014, 0x488F, 0x9061, 0x744C, 0x49C3, 0xF004, 0x7562, 0x485E,
-                        0x9563, 0x7446, 0x49C3, 0xF106, 0x7562, 0x1C30, 0x46E5, 0x1200, 0xF004,
-                        0x7446, 0x484F, 0x9447, 0xC32A, 0x7466, 0x49C0, 0xF00F, 0x48C0, 0x9C66,
-                        0x7446, 0x4840, 0x4841, 0x4842, 0x9C46, 0x744C, 0x4840, 0x9C4C, 0x744A,
-                        0x484A, 0x9C4A, 0xE013, 0x498E, 0xF011, 0x488E, 0x9061, 0x744C, 0x49C3,
-                        0xF004, 0x7446, 0x484E, 0x9447, 0x7446, 0x1D38, 0x46EC, 0x1500, 0xF004,
-                        0x7446, 0x484F, 0x9447, 0xB000, 0xC502, 0xBD00, 0x074C, 0xE000, 0xE0FC,
-                        0xE0C0, 0x4830, 0x4837, 0xC502, 0xBD00, 0x0978, 0x63E2, 0x4830, 0x4837,
-                        0xC502, 0xBD00, 0x09FE, 0x73E2, 0x4830, 0x8BE2, 0xC302, 0xBB00, 0x0A12,
-                        0x73E2, 0x48B0, 0x48B3, 0x48B4, 0x48B5, 0x48B6, 0x48B7, 0x8BE2, 0xC302,
-                        0xBB00, 0x0A5A, 0x73E2, 0x4830, 0x8BE2, 0xC302, 0xBB00, 0x0A6C, 0x73E2,
-                        0x4830, 0x4837, 0xC502, 0xBD00, 0x0A86
-                };
-
-                for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168fp_1_1); i++)
-                        rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168fp_1_1i);
-
-                rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-                rtl8168_mac_ocp_write(tp, 0xFC28, 0x0890);
-                rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0712);
-                rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0974);
-                rtl8168_mac_ocp_write(tp, 0xFC2E, 0x09FC);
-                rtl8168_mac_ocp_write(tp, 0xFC30, 0x0A0E);
-                rtl8168_mac_ocp_write(tp, 0xFC32, 0x0A56);
-                rtl8168_mac_ocp_write(tp, 0xFC34, 0x0A68);
-                rtl8168_mac_ocp_write(tp, 0xFC36, 0x0A84);
-
-        } else if (tp->HwPkgDet == 0x05 || tp->HwPkgDet == 0x06) {
-                static const u16 mcu_patch_code_8168fp_1_2 = {
-                        0xE008, 0xE00A, 0xE031, 0xE033, 0xE035, 0xE144, 0xE166, 0xE168, 0xC502,
-                        0xBD00, 0x0000, 0xC725, 0x75E0, 0x48D0, 0x9DE0, 0xC722, 0x75E0, 0x1C78,
-                        0x416C, 0x1530, 0xF111, 0xC71D, 0x75F6, 0x49D1, 0xF00D, 0x75E0, 0x1C1F,
-                        0x416C, 0x1502, 0xF108, 0x75FA, 0x49D3, 0xF005, 0x75EC, 0x9DE4, 0x4853,
-                        0x9DFA, 0xC70B, 0x75E0, 0x4852, 0x4850, 0x9DE0, 0xC602, 0xBE00, 0x04B8,
-                        0xE420, 0xE000, 0xE0FC, 0xE43C, 0xDC00, 0xEB00, 0xC202, 0xBA00, 0x0000,
-                        0xC002, 0xB800, 0x0000, 0xB401, 0xB402, 0xB403, 0xB404, 0xB405, 0xB406,
-                        0xC44D, 0xC54D, 0x1867, 0xE8A2, 0x2318, 0x276E, 0x1601, 0xF106, 0x1A07,
-                        0xE861, 0xE86B, 0xE873, 0xE037, 0x231E, 0x276E, 0x1602, 0xF10B, 0x1A07,
-                        0xE858, 0xE862, 0xC247, 0xC344, 0xE8E3, 0xC73B, 0x66E0, 0xE8B5, 0xE029,
-                        0x231A, 0x276C, 0xC733, 0x9EE0, 0x1866, 0xE885, 0x251C, 0x120F, 0xF011,
-                        0x1209, 0xF011, 0x2014, 0x240E, 0x1000, 0xF007, 0x120C, 0xF00D, 0x1203,
-                        0xF00D, 0x1200, 0xF00D, 0x120C, 0xF00D, 0x1203, 0xF00D, 0x1A03, 0xE00C,
-                        0x1A07, 0xE00A, 0x1A00, 0xE008, 0x1A01, 0xE006, 0x1A02, 0xE004, 0x1A04,
-                        0xE002, 0x1A05, 0xE829, 0xE833, 0xB006, 0xB005, 0xB004, 0xB003, 0xB002,
-                        0xB001, 0x60C4, 0xC702, 0xBF00, 0x2786, 0xDD00, 0xD030, 0xE0C4, 0xE0F8,
-                        0xDC42, 0xD3F0, 0x0000, 0x0004, 0x0007, 0x0014, 0x0090, 0x1000, 0x0F00,
-                        0x1004, 0x1008, 0x3000, 0x3004, 0x3008, 0x4000, 0x7777, 0x8000, 0x8001,
-                        0x8008, 0x8003, 0x8004, 0xC000, 0xC004, 0xF004, 0xFFFF, 0xB406, 0xB407,
-                        0xC6E5, 0x77C0, 0x27F3, 0x23F3, 0x47FA, 0x9FC0, 0xB007, 0xB006, 0xFF80,
-                        0xB405, 0xB407, 0xC7D8, 0x75E0, 0x48D0, 0x9DE0, 0xB007, 0xB005, 0xFF80,
-                        0xB401, 0xC0EA, 0xC2DC, 0xC3D8, 0xE865, 0xC0D3, 0xC1E0, 0xC2E3, 0xE861,
-                        0xE817, 0xC0CD, 0xC2CF, 0xE85D, 0xC0C9, 0xC1D6, 0xC2DB, 0xE859, 0xE80F,
-                        0xC1C7, 0xC2CE, 0xE855, 0xC0C0, 0xC1D1, 0xC2D3, 0xE851, 0xE807, 0xC0BE,
-                        0xC2C2, 0xE84D, 0xE803, 0xB001, 0xFF80, 0xB402, 0xC2C6, 0xE859, 0x499F,
-                        0xF1FE, 0xB002, 0xFF80, 0xB402, 0xB403, 0xB407, 0xE821, 0x8882, 0x1980,
-                        0x8983, 0xE81D, 0x7180, 0x218B, 0x25BB, 0x1310, 0xF014, 0x1310, 0xFB03,
-                        0x1F20, 0x38FB, 0x3288, 0x434B, 0x2491, 0x430B, 0x1F0F, 0x38FB, 0x4313,
-                        0x2121, 0x4353, 0x2521, 0x418A, 0x6282, 0x2527, 0x212F, 0x418A, 0xB007,
-                        0xB003, 0xB002, 0xFF80, 0x6183, 0x2496, 0x1100, 0xF1FD, 0xFF80, 0x4800,
-                        0x4801, 0xC213, 0xC313, 0xE815, 0x4860, 0x8EE0, 0xC210, 0xC310, 0xE822,
-                        0x481E, 0xC20C, 0xC30C, 0xE80C, 0xC206, 0x7358, 0x483A, 0x9B58, 0xFF80,
-                        0xE8E0, 0xE000, 0x1008, 0x0F00, 0x800C, 0x0F00, 0xB407, 0xB406, 0xB403,
-                        0xC7F7, 0x98E0, 0x99E2, 0x9AE4, 0x21B2, 0x4831, 0x483F, 0x9BE6, 0x66E7,
-                        0x49E6, 0xF1FE, 0xB003, 0xB006, 0xB007, 0xFF80, 0xB407, 0xB406, 0xB403,
-                        0xC7E5, 0x9AE4, 0x21B2, 0x4831, 0x9BE6, 0x66E7, 0x49E6, 0xF1FE, 0x70E0,
-                        0x71E2, 0xB003, 0xB006, 0xB007, 0xFF80, 0x4882, 0xB406, 0xB405, 0xC71E,
-                        0x76E0, 0x1D78, 0x4175, 0x1630, 0xF10C, 0xC715, 0x76E0, 0x4861, 0x9EE0,
-                        0xC713, 0x1EFF, 0x9EE2, 0x75E0, 0x4850, 0x9DE0, 0xE005, 0xC70B, 0x76E0,
-                        0x4865, 0x9EE0, 0xB005, 0xB006, 0xC708, 0xC102, 0xB900, 0x279E, 0xEB16,
-                        0xEB00, 0xE43C, 0xDC00, 0xD3EC, 0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00,
-                        0x0000
-                };
-
-                for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168fp_1_2); i++)
-                        rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168fp_1_2i);
-
-                rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-                rtl8168_mac_ocp_write(tp, 0xFC28, 0x0000);
-                rtl8168_mac_ocp_write(tp, 0xFC2A, 0x04b4);
-                rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0000);
-                rtl8168_mac_ocp_write(tp, 0xFC2E, 0x0000);
-                rtl8168_mac_ocp_write(tp, 0xFC30, 0x0000);
-                rtl8168_mac_ocp_write(tp, 0xFC32, 0x279C);
-                rtl8168_mac_ocp_write(tp, 0xFC34, 0x0000);
-                rtl8168_mac_ocp_write(tp, 0xFC36, 0x0000);
-        }
+        rtl8168_mac_ocp_write(tp, 0xF800, 0xE00A);
+        rtl8168_mac_ocp_write(tp, 0xF802, 0xE0C1);
+        rtl8168_mac_ocp_write(tp, 0xF804, 0xE104);
+        rtl8168_mac_ocp_write(tp, 0xF806, 0xE108);
+        rtl8168_mac_ocp_write(tp, 0xF808, 0xE10D);
+        rtl8168_mac_ocp_write(tp, 0xF80A, 0xE112);
+        rtl8168_mac_ocp_write(tp, 0xF80C, 0xE11C);
+        rtl8168_mac_ocp_write(tp, 0xF80E, 0xE121);
+        rtl8168_mac_ocp_write(tp, 0xF810, 0xE000);
+        rtl8168_mac_ocp_write(tp, 0xF812, 0xE0C8);
+        rtl8168_mac_ocp_write(tp, 0xF814, 0xB400);
+        rtl8168_mac_ocp_write(tp, 0xF816, 0xC1FE);
+        rtl8168_mac_ocp_write(tp, 0xF818, 0x49E2);
+        rtl8168_mac_ocp_write(tp, 0xF81A, 0xF04C);
+        rtl8168_mac_ocp_write(tp, 0xF81C, 0x49EA);
+        rtl8168_mac_ocp_write(tp, 0xF81E, 0xF04A);
+        rtl8168_mac_ocp_write(tp, 0xF820, 0x74E6);
+        rtl8168_mac_ocp_write(tp, 0xF822, 0xC246);
+        rtl8168_mac_ocp_write(tp, 0xF824, 0x7542);
+        rtl8168_mac_ocp_write(tp, 0xF826, 0x73EC);
+        rtl8168_mac_ocp_write(tp, 0xF828, 0x1800);
+        rtl8168_mac_ocp_write(tp, 0xF82A, 0x49C0);
+        rtl8168_mac_ocp_write(tp, 0xF82C, 0xF10D);
+        rtl8168_mac_ocp_write(tp, 0xF82E, 0x49C1);
+        rtl8168_mac_ocp_write(tp, 0xF830, 0xF10B);
+        rtl8168_mac_ocp_write(tp, 0xF832, 0x49C2);
+        rtl8168_mac_ocp_write(tp, 0xF834, 0xF109);
+        rtl8168_mac_ocp_write(tp, 0xF836, 0x49B0);
+        rtl8168_mac_ocp_write(tp, 0xF838, 0xF107);
+        rtl8168_mac_ocp_write(tp, 0xF83A, 0x49B1);
+        rtl8168_mac_ocp_write(tp, 0xF83C, 0xF105);
+        rtl8168_mac_ocp_write(tp, 0xF83E, 0x7220);
+        rtl8168_mac_ocp_write(tp, 0xF840, 0x49A2);
+        rtl8168_mac_ocp_write(tp, 0xF842, 0xF102);
+        rtl8168_mac_ocp_write(tp, 0xF844, 0xE002);
+        rtl8168_mac_ocp_write(tp, 0xF846, 0x4800);
+        rtl8168_mac_ocp_write(tp, 0xF848, 0x49D0);
+        rtl8168_mac_ocp_write(tp, 0xF84A, 0xF10A);
+        rtl8168_mac_ocp_write(tp, 0xF84C, 0x49D1);
+        rtl8168_mac_ocp_write(tp, 0xF84E, 0xF108);
+        rtl8168_mac_ocp_write(tp, 0xF850, 0x49D2);
+        rtl8168_mac_ocp_write(tp, 0xF852, 0xF106);
+        rtl8168_mac_ocp_write(tp, 0xF854, 0x49D3);
+        rtl8168_mac_ocp_write(tp, 0xF856, 0xF104);
+        rtl8168_mac_ocp_write(tp, 0xF858, 0x49DF);
+        rtl8168_mac_ocp_write(tp, 0xF85A, 0xF102);
+        rtl8168_mac_ocp_write(tp, 0xF85C, 0xE00C);
+        rtl8168_mac_ocp_write(tp, 0xF85E, 0x4801);
+        rtl8168_mac_ocp_write(tp, 0xF860, 0x72E4);
+        rtl8168_mac_ocp_write(tp, 0xF862, 0x49AD);
+        rtl8168_mac_ocp_write(tp, 0xF864, 0xF108);
+        rtl8168_mac_ocp_write(tp, 0xF866, 0xC225);
+        rtl8168_mac_ocp_write(tp, 0xF868, 0x6741);
+        rtl8168_mac_ocp_write(tp, 0xF86A, 0x48F0);
+        rtl8168_mac_ocp_write(tp, 0xF86C, 0x8F41);
+        rtl8168_mac_ocp_write(tp, 0xF86E, 0x4870);
+        rtl8168_mac_ocp_write(tp, 0xF870, 0x8F41);
+        rtl8168_mac_ocp_write(tp, 0xF872, 0xC7CF);
+        rtl8168_mac_ocp_write(tp, 0xF874, 0x49B5);
+        rtl8168_mac_ocp_write(tp, 0xF876, 0xF01F);
+        rtl8168_mac_ocp_write(tp, 0xF878, 0x49B2);
+        rtl8168_mac_ocp_write(tp, 0xF87A, 0xF00B);
+        rtl8168_mac_ocp_write(tp, 0xF87C, 0x4980);
+        rtl8168_mac_ocp_write(tp, 0xF87E, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF880, 0x484E);
+        rtl8168_mac_ocp_write(tp, 0xF882, 0x94E7);
+        rtl8168_mac_ocp_write(tp, 0xF884, 0x4981);
+        rtl8168_mac_ocp_write(tp, 0xF886, 0xF004);
+        rtl8168_mac_ocp_write(tp, 0xF888, 0x485E);
+        rtl8168_mac_ocp_write(tp, 0xF88A, 0xC212);
+        rtl8168_mac_ocp_write(tp, 0xF88C, 0x9543);
+        rtl8168_mac_ocp_write(tp, 0xF88E, 0xE071);
+        rtl8168_mac_ocp_write(tp, 0xF890, 0x49B6);
+        rtl8168_mac_ocp_write(tp, 0xF892, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF894, 0x49B3);
+        rtl8168_mac_ocp_write(tp, 0xF896, 0xF10F);
+        rtl8168_mac_ocp_write(tp, 0xF898, 0x4980);
+        rtl8168_mac_ocp_write(tp, 0xF89A, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF89C, 0x484E);
+        rtl8168_mac_ocp_write(tp, 0xF89E, 0x94E7);
+        rtl8168_mac_ocp_write(tp, 0xF8A0, 0x4981);
+        rtl8168_mac_ocp_write(tp, 0xF8A2, 0xF004);
+        rtl8168_mac_ocp_write(tp, 0xF8A4, 0x485E);
+        rtl8168_mac_ocp_write(tp, 0xF8A6, 0xC204);
+        rtl8168_mac_ocp_write(tp, 0xF8A8, 0x9543);
+        rtl8168_mac_ocp_write(tp, 0xF8AA, 0xE005);
+        rtl8168_mac_ocp_write(tp, 0xF8AC, 0xE000);
+        rtl8168_mac_ocp_write(tp, 0xF8AE, 0xE0FC);
+        rtl8168_mac_ocp_write(tp, 0xF8B0, 0xE0FA);
+        rtl8168_mac_ocp_write(tp, 0xF8B2, 0xE065);
+        rtl8168_mac_ocp_write(tp, 0xF8B4, 0x49B7);
+        rtl8168_mac_ocp_write(tp, 0xF8B6, 0xF007);
+        rtl8168_mac_ocp_write(tp, 0xF8B8, 0x4980);
+        rtl8168_mac_ocp_write(tp, 0xF8BA, 0xF005);
+        rtl8168_mac_ocp_write(tp, 0xF8BC, 0x1A38);
+        rtl8168_mac_ocp_write(tp, 0xF8BE, 0x46D4);
+        rtl8168_mac_ocp_write(tp, 0xF8C0, 0x1200);
+        rtl8168_mac_ocp_write(tp, 0xF8C2, 0xF109);
+        rtl8168_mac_ocp_write(tp, 0xF8C4, 0x4981);
+        rtl8168_mac_ocp_write(tp, 0xF8C6, 0xF055);
+        rtl8168_mac_ocp_write(tp, 0xF8C8, 0x49C3);
+        rtl8168_mac_ocp_write(tp, 0xF8CA, 0xF105);
+        rtl8168_mac_ocp_write(tp, 0xF8CC, 0x1A30);
+        rtl8168_mac_ocp_write(tp, 0xF8CE, 0x46D5);
+        rtl8168_mac_ocp_write(tp, 0xF8D0, 0x1200);
+        rtl8168_mac_ocp_write(tp, 0xF8D2, 0xF04F);
+        rtl8168_mac_ocp_write(tp, 0xF8D4, 0x7220);
+        rtl8168_mac_ocp_write(tp, 0xF8D6, 0x49A2);
+        rtl8168_mac_ocp_write(tp, 0xF8D8, 0xF130);
+        rtl8168_mac_ocp_write(tp, 0xF8DA, 0x49C1);
+        rtl8168_mac_ocp_write(tp, 0xF8DC, 0xF12E);
+        rtl8168_mac_ocp_write(tp, 0xF8DE, 0x49B0);
+        rtl8168_mac_ocp_write(tp, 0xF8E0, 0xF12C);
+        rtl8168_mac_ocp_write(tp, 0xF8E2, 0xC2E6);
+        rtl8168_mac_ocp_write(tp, 0xF8E4, 0x7240);
+        rtl8168_mac_ocp_write(tp, 0xF8E6, 0x49A8);
+        rtl8168_mac_ocp_write(tp, 0xF8E8, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF8EA, 0x49D0);
+        rtl8168_mac_ocp_write(tp, 0xF8EC, 0xF126);
+        rtl8168_mac_ocp_write(tp, 0xF8EE, 0x49A9);
+        rtl8168_mac_ocp_write(tp, 0xF8F0, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF8F2, 0x49D1);
+        rtl8168_mac_ocp_write(tp, 0xF8F4, 0xF122);
+        rtl8168_mac_ocp_write(tp, 0xF8F6, 0x49AA);
+        rtl8168_mac_ocp_write(tp, 0xF8F8, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF8FA, 0x49D2);
+        rtl8168_mac_ocp_write(tp, 0xF8FC, 0xF11E);
+        rtl8168_mac_ocp_write(tp, 0xF8FE, 0x49AB);
+        rtl8168_mac_ocp_write(tp, 0xF900, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF902, 0x49DF);
+        rtl8168_mac_ocp_write(tp, 0xF904, 0xF11A);
+        rtl8168_mac_ocp_write(tp, 0xF906, 0x49AC);
+        rtl8168_mac_ocp_write(tp, 0xF908, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF90A, 0x49D3);
+        rtl8168_mac_ocp_write(tp, 0xF90C, 0xF116);
+        rtl8168_mac_ocp_write(tp, 0xF90E, 0x4980);
+        rtl8168_mac_ocp_write(tp, 0xF910, 0xF003);
+        rtl8168_mac_ocp_write(tp, 0xF912, 0x49C7);
+        rtl8168_mac_ocp_write(tp, 0xF914, 0xF105);
+        rtl8168_mac_ocp_write(tp, 0xF916, 0x4981);
+        rtl8168_mac_ocp_write(tp, 0xF918, 0xF02C);
+        rtl8168_mac_ocp_write(tp, 0xF91A, 0x49D7);
+        rtl8168_mac_ocp_write(tp, 0xF91C, 0xF02A);
+        rtl8168_mac_ocp_write(tp, 0xF91E, 0x49C0);
+        rtl8168_mac_ocp_write(tp, 0xF920, 0xF00C);
+        rtl8168_mac_ocp_write(tp, 0xF922, 0xC721);
+        rtl8168_mac_ocp_write(tp, 0xF924, 0x62F4);
+        rtl8168_mac_ocp_write(tp, 0xF926, 0x49A0);
+        rtl8168_mac_ocp_write(tp, 0xF928, 0xF008);
+        rtl8168_mac_ocp_write(tp, 0xF92A, 0x49A4);
+        rtl8168_mac_ocp_write(tp, 0xF92C, 0xF106);
+        rtl8168_mac_ocp_write(tp, 0xF92E, 0x4824);
+        rtl8168_mac_ocp_write(tp, 0xF930, 0x8AF4);
+        rtl8168_mac_ocp_write(tp, 0xF932, 0xC71A);
+        rtl8168_mac_ocp_write(tp, 0xF934, 0x1A40);
+        rtl8168_mac_ocp_write(tp, 0xF936, 0x9AE0);
+        rtl8168_mac_ocp_write(tp, 0xF938, 0x49B6);
+        rtl8168_mac_ocp_write(tp, 0xF93A, 0xF017);
+        rtl8168_mac_ocp_write(tp, 0xF93C, 0x200E);
+        rtl8168_mac_ocp_write(tp, 0xF93E, 0xC7B8);
+        rtl8168_mac_ocp_write(tp, 0xF940, 0x72E0);
+        rtl8168_mac_ocp_write(tp, 0xF942, 0x4710);
+        rtl8168_mac_ocp_write(tp, 0xF944, 0x92E1);
+        rtl8168_mac_ocp_write(tp, 0xF946, 0xC70E);
+        rtl8168_mac_ocp_write(tp, 0xF948, 0x77E0);
+        rtl8168_mac_ocp_write(tp, 0xF94A, 0x49F0);
+        rtl8168_mac_ocp_write(tp, 0xF94C, 0xF112);
+        rtl8168_mac_ocp_write(tp, 0xF94E, 0xC70B);
+        rtl8168_mac_ocp_write(tp, 0xF950, 0x77E0);
+        rtl8168_mac_ocp_write(tp, 0xF952, 0x27FE);
+        rtl8168_mac_ocp_write(tp, 0xF954, 0x1AFA);
+        rtl8168_mac_ocp_write(tp, 0xF956, 0x4317);
+        rtl8168_mac_ocp_write(tp, 0xF958, 0xC705);
+        rtl8168_mac_ocp_write(tp, 0xF95A, 0x9AE2);
+        rtl8168_mac_ocp_write(tp, 0xF95C, 0x1A11);
+        rtl8168_mac_ocp_write(tp, 0xF95E, 0x8AE0);
+        rtl8168_mac_ocp_write(tp, 0xF960, 0xE008);
+        rtl8168_mac_ocp_write(tp, 0xF962, 0xE41C);
+        rtl8168_mac_ocp_write(tp, 0xF964, 0xC0AE);
+        rtl8168_mac_ocp_write(tp, 0xF966, 0xD23A);
+        rtl8168_mac_ocp_write(tp, 0xF968, 0xC7A2);
+        rtl8168_mac_ocp_write(tp, 0xF96A, 0x74E6);
+        rtl8168_mac_ocp_write(tp, 0xF96C, 0x484F);
+        rtl8168_mac_ocp_write(tp, 0xF96E, 0x94E7);
+        rtl8168_mac_ocp_write(tp, 0xF970, 0xC79E);
+        rtl8168_mac_ocp_write(tp, 0xF972, 0x8CE6);
+        rtl8168_mac_ocp_write(tp, 0xF974, 0x8BEC);
+        rtl8168_mac_ocp_write(tp, 0xF976, 0xC29C);
+        rtl8168_mac_ocp_write(tp, 0xF978, 0x8D42);
+        rtl8168_mac_ocp_write(tp, 0xF97A, 0x7220);
+        rtl8168_mac_ocp_write(tp, 0xF97C, 0xB000);
+        rtl8168_mac_ocp_write(tp, 0xF97E, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xF980, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xF982, 0x0932);
+        rtl8168_mac_ocp_write(tp, 0xF984, 0xB400);
+        rtl8168_mac_ocp_write(tp, 0xF986, 0xC240);
+        rtl8168_mac_ocp_write(tp, 0xF988, 0xC340);
+        rtl8168_mac_ocp_write(tp, 0xF98A, 0x7060);
+        rtl8168_mac_ocp_write(tp, 0xF98C, 0x498F);
+        rtl8168_mac_ocp_write(tp, 0xF98E, 0xF014);
+        rtl8168_mac_ocp_write(tp, 0xF990, 0x488F);
+        rtl8168_mac_ocp_write(tp, 0xF992, 0x9061);
+        rtl8168_mac_ocp_write(tp, 0xF994, 0x744C);
+        rtl8168_mac_ocp_write(tp, 0xF996, 0x49C3);
+        rtl8168_mac_ocp_write(tp, 0xF998, 0xF004);
+        rtl8168_mac_ocp_write(tp, 0xF99A, 0x7562);
+        rtl8168_mac_ocp_write(tp, 0xF99C, 0x485E);
+        rtl8168_mac_ocp_write(tp, 0xF99E, 0x9563);
+        rtl8168_mac_ocp_write(tp, 0xF9A0, 0x7446);
+        rtl8168_mac_ocp_write(tp, 0xF9A2, 0x49C3);
+        rtl8168_mac_ocp_write(tp, 0xF9A4, 0xF106);
+        rtl8168_mac_ocp_write(tp, 0xF9A6, 0x7562);
+        rtl8168_mac_ocp_write(tp, 0xF9A8, 0x1C30);
+        rtl8168_mac_ocp_write(tp, 0xF9AA, 0x46E5);
+        rtl8168_mac_ocp_write(tp, 0xF9AC, 0x1200);
+        rtl8168_mac_ocp_write(tp, 0xF9AE, 0xF004);
+        rtl8168_mac_ocp_write(tp, 0xF9B0, 0x7446);
+        rtl8168_mac_ocp_write(tp, 0xF9B2, 0x484F);
+        rtl8168_mac_ocp_write(tp, 0xF9B4, 0x9447);
+        rtl8168_mac_ocp_write(tp, 0xF9B6, 0xC32A);
+        rtl8168_mac_ocp_write(tp, 0xF9B8, 0x7466);
+        rtl8168_mac_ocp_write(tp, 0xF9BA, 0x49C0);
+        rtl8168_mac_ocp_write(tp, 0xF9BC, 0xF00F);
+        rtl8168_mac_ocp_write(tp, 0xF9BE, 0x48C0);
+        rtl8168_mac_ocp_write(tp, 0xF9C0, 0x9C66);
+        rtl8168_mac_ocp_write(tp, 0xF9C2, 0x7446);
+        rtl8168_mac_ocp_write(tp, 0xF9C4, 0x4840);
+        rtl8168_mac_ocp_write(tp, 0xF9C6, 0x4841);
+        rtl8168_mac_ocp_write(tp, 0xF9C8, 0x4842);
+        rtl8168_mac_ocp_write(tp, 0xF9CA, 0x9C46);
+        rtl8168_mac_ocp_write(tp, 0xF9CC, 0x744C);
+        rtl8168_mac_ocp_write(tp, 0xF9CE, 0x4840);
+        rtl8168_mac_ocp_write(tp, 0xF9D0, 0x9C4C);
+        rtl8168_mac_ocp_write(tp, 0xF9D2, 0x744A);
+        rtl8168_mac_ocp_write(tp, 0xF9D4, 0x484A);
+        rtl8168_mac_ocp_write(tp, 0xF9D6, 0x9C4A);
+        rtl8168_mac_ocp_write(tp, 0xF9D8, 0xE013);
+        rtl8168_mac_ocp_write(tp, 0xF9DA, 0x498E);
+        rtl8168_mac_ocp_write(tp, 0xF9DC, 0xF011);
+        rtl8168_mac_ocp_write(tp, 0xF9DE, 0x488E);
+        rtl8168_mac_ocp_write(tp, 0xF9E0, 0x9061);
+        rtl8168_mac_ocp_write(tp, 0xF9E2, 0x744C);
+        rtl8168_mac_ocp_write(tp, 0xF9E4, 0x49C3);
+        rtl8168_mac_ocp_write(tp, 0xF9E6, 0xF004);
+        rtl8168_mac_ocp_write(tp, 0xF9E8, 0x7446);
+        rtl8168_mac_ocp_write(tp, 0xF9EA, 0x484E);
+        rtl8168_mac_ocp_write(tp, 0xF9EC, 0x9447);
+        rtl8168_mac_ocp_write(tp, 0xF9EE, 0x7446);
+        rtl8168_mac_ocp_write(tp, 0xF9F0, 0x1D38);
+        rtl8168_mac_ocp_write(tp, 0xF9F2, 0x46EC);
+        rtl8168_mac_ocp_write(tp, 0xF9F4, 0x1500);
+        rtl8168_mac_ocp_write(tp, 0xF9F6, 0xF004);
+        rtl8168_mac_ocp_write(tp, 0xF9F8, 0x7446);
+        rtl8168_mac_ocp_write(tp, 0xF9FA, 0x484F);
+        rtl8168_mac_ocp_write(tp, 0xF9FC, 0x9447);
+        rtl8168_mac_ocp_write(tp, 0xF9FE, 0xB000);
+        rtl8168_mac_ocp_write(tp, 0xFA00, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xFA02, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xFA04, 0x074C);
+        rtl8168_mac_ocp_write(tp, 0xFA06, 0xE000);
+        rtl8168_mac_ocp_write(tp, 0xFA08, 0xE0FC);
+        rtl8168_mac_ocp_write(tp, 0xFA0A, 0xE0C0);
+        rtl8168_mac_ocp_write(tp, 0xFA0C, 0x4830);
+        rtl8168_mac_ocp_write(tp, 0xFA0E, 0x4837);
+        rtl8168_mac_ocp_write(tp, 0xFA10, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xFA12, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xFA14, 0x0978);
+        rtl8168_mac_ocp_write(tp, 0xFA16, 0x63E2);
+        rtl8168_mac_ocp_write(tp, 0xFA18, 0x4830);
+        rtl8168_mac_ocp_write(tp, 0xFA1A, 0x4837);
+        rtl8168_mac_ocp_write(tp, 0xFA1C, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xFA1E, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xFA20, 0x09FE);
+        rtl8168_mac_ocp_write(tp, 0xFA22, 0x73E2);
+        rtl8168_mac_ocp_write(tp, 0xFA24, 0x4830);
+        rtl8168_mac_ocp_write(tp, 0xFA26, 0x8BE2);
+        rtl8168_mac_ocp_write(tp, 0xFA28, 0xC302);
+        rtl8168_mac_ocp_write(tp, 0xFA2A, 0xBB00);
+        rtl8168_mac_ocp_write(tp, 0xFA2C, 0x0A12);
+        rtl8168_mac_ocp_write(tp, 0xFA2E, 0x73E2);
+        rtl8168_mac_ocp_write(tp, 0xFA30, 0x48B0);
+        rtl8168_mac_ocp_write(tp, 0xFA32, 0x48B3);
+        rtl8168_mac_ocp_write(tp, 0xFA34, 0x48B4);
+        rtl8168_mac_ocp_write(tp, 0xFA36, 0x48B5);
+        rtl8168_mac_ocp_write(tp, 0xFA38, 0x48B6);
+        rtl8168_mac_ocp_write(tp, 0xFA3A, 0x48B7);
+        rtl8168_mac_ocp_write(tp, 0xFA3C, 0x8BE2);
+        rtl8168_mac_ocp_write(tp, 0xFA3E, 0xC302);
+        rtl8168_mac_ocp_write(tp, 0xFA40, 0xBB00);
+        rtl8168_mac_ocp_write(tp, 0xFA42, 0x0A5A);
+        rtl8168_mac_ocp_write(tp, 0xFA44, 0x73E2);
+        rtl8168_mac_ocp_write(tp, 0xFA46, 0x4830);
+        rtl8168_mac_ocp_write(tp, 0xFA48, 0x8BE2);
+        rtl8168_mac_ocp_write(tp, 0xFA4A, 0xC302);
+        rtl8168_mac_ocp_write(tp, 0xFA4C, 0xBB00);
+        rtl8168_mac_ocp_write(tp, 0xFA4E, 0x0A6C);
+        rtl8168_mac_ocp_write(tp, 0xFA50, 0x73E2);
+        rtl8168_mac_ocp_write(tp, 0xFA52, 0x4830);
+        rtl8168_mac_ocp_write(tp, 0xFA54, 0x4837);
+        rtl8168_mac_ocp_write(tp, 0xFA56, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xFA58, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xFA5A, 0x0A86);
 
-        if (tp->HwPkgDet == 0x00)
-                breakPointEnabled = 0x00FC;
-        else if (tp->HwPkgDet == 0x0F)
-                breakPointEnabled = 0x00FF;
-        else if (tp->HwPkgDet == 0x05 || tp->HwPkgDet == 0x06)
-                breakPointEnabled = 0x0022;
+        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
 
-        rtl8168_mac_ocp_write(tp, 0xFC38, breakPointEnabled);
+        rtl8168_mac_ocp_write(tp, 0xFC28, 0x0890);
+        rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0712);
+        rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0974);
+        rtl8168_mac_ocp_write(tp, 0xFC2E, 0x09FC);
+        rtl8168_mac_ocp_write(tp, 0xFC30, 0x0A0E);
+        rtl8168_mac_ocp_write(tp, 0xFC32, 0x0A56);
+        rtl8168_mac_ocp_write(tp, 0xFC34, 0x0A68);
+        rtl8168_mac_ocp_write(tp, 0xFC36, 0x0A84);
+
+        if (tp->HwPkgDet == 0x0)
+                rtl8168_mac_ocp_write(tp, 0xFC38, 0x00FC);
+        else if(tp->HwPkgDet == 0xF)
+                rtl8168_mac_ocp_write(tp, 0xFC38, 0x00FF);
 }
 
 static void
-rtl8168_set_mac_mcu_8168fp_8116as_2(struct net_device *dev)
+rtl8168_set_mac_mcu_8168fp_2(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        u16 i;
-        static const u16 mcu_patch_code_8168fp_8116as_2 = {
-                0xE008, 0xE00A, 0xE00F, 0xE014, 0xE016, 0xE018, 0xE01A, 0xE01C, 0xC602,
-                0xBE00, 0x2AB2, 0x1BC0, 0x46EB, 0x1BFE, 0xC102, 0xB900, 0x0B1A, 0x1BC0,
-                0x46EB, 0x1B7E, 0xC102, 0xB900, 0x0BEA, 0xC602, 0xBE00, 0x0000, 0xC602,
-                0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000, 0xC602,
-                0xBE00, 0x0000
-        };
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168fp_8116as_2); i++)
-                rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168fp_8116as_2i);
+        rtl8168_mac_ocp_write(tp, 0xF800, 0xE008);
+        rtl8168_mac_ocp_write(tp, 0xF802, 0xE00A);
+        rtl8168_mac_ocp_write(tp, 0xF804, 0xE031);
+        rtl8168_mac_ocp_write(tp, 0xF806, 0xE033);
+        rtl8168_mac_ocp_write(tp, 0xF808, 0xE035);
+        rtl8168_mac_ocp_write(tp, 0xF80A, 0xE144);
+        rtl8168_mac_ocp_write(tp, 0xF80C, 0xE166);
+        rtl8168_mac_ocp_write(tp, 0xF80E, 0xE168);
+        rtl8168_mac_ocp_write(tp, 0xF810, 0xC502);
+        rtl8168_mac_ocp_write(tp, 0xF812, 0xBD00);
+        rtl8168_mac_ocp_write(tp, 0xF814, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF816, 0xC725);
+        rtl8168_mac_ocp_write(tp, 0xF818, 0x75E0);
+        rtl8168_mac_ocp_write(tp, 0xF81A, 0x48D0);
+        rtl8168_mac_ocp_write(tp, 0xF81C, 0x9DE0);
+        rtl8168_mac_ocp_write(tp, 0xF81E, 0xC722);
+        rtl8168_mac_ocp_write(tp, 0xF820, 0x75E0);
+        rtl8168_mac_ocp_write(tp, 0xF822, 0x1C78);
+        rtl8168_mac_ocp_write(tp, 0xF824, 0x416C);
+        rtl8168_mac_ocp_write(tp, 0xF826, 0x1530);
+        rtl8168_mac_ocp_write(tp, 0xF828, 0xF111);
+        rtl8168_mac_ocp_write(tp, 0xF82A, 0xC71D);
+        rtl8168_mac_ocp_write(tp, 0xF82C, 0x75F6);
+        rtl8168_mac_ocp_write(tp, 0xF82E, 0x49D1);
+        rtl8168_mac_ocp_write(tp, 0xF830, 0xF00D);
+        rtl8168_mac_ocp_write(tp, 0xF832, 0x75E0);
+        rtl8168_mac_ocp_write(tp, 0xF834, 0x1C1F);
+        rtl8168_mac_ocp_write(tp, 0xF836, 0x416C);
+        rtl8168_mac_ocp_write(tp, 0xF838, 0x1502);
+        rtl8168_mac_ocp_write(tp, 0xF83A, 0xF108);
+        rtl8168_mac_ocp_write(tp, 0xF83C, 0x75FA);
+        rtl8168_mac_ocp_write(tp, 0xF83E, 0x49D3);
+        rtl8168_mac_ocp_write(tp, 0xF840, 0xF005);
+        rtl8168_mac_ocp_write(tp, 0xF842, 0x75EC);
+        rtl8168_mac_ocp_write(tp, 0xF844, 0x9DE4);
+        rtl8168_mac_ocp_write(tp, 0xF846, 0x4853);
+        rtl8168_mac_ocp_write(tp, 0xF848, 0x9DFA);
+        rtl8168_mac_ocp_write(tp, 0xF84A, 0xC70B);
+        rtl8168_mac_ocp_write(tp, 0xF84C, 0x75E0);
+        rtl8168_mac_ocp_write(tp, 0xF84E, 0x4852);
+        rtl8168_mac_ocp_write(tp, 0xF850, 0x4850);
+        rtl8168_mac_ocp_write(tp, 0xF852, 0x9DE0);
+        rtl8168_mac_ocp_write(tp, 0xF854, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF856, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF858, 0x04B8);
+        rtl8168_mac_ocp_write(tp, 0xF85A, 0xE420);
+        rtl8168_mac_ocp_write(tp, 0xF85C, 0xE000);
+        rtl8168_mac_ocp_write(tp, 0xF85E, 0xE0FC);
+        rtl8168_mac_ocp_write(tp, 0xF860, 0xE43C);
+        rtl8168_mac_ocp_write(tp, 0xF862, 0xDC00);
+        rtl8168_mac_ocp_write(tp, 0xF864, 0xEB00);
+        rtl8168_mac_ocp_write(tp, 0xF866, 0xC202);
+        rtl8168_mac_ocp_write(tp, 0xF868, 0xBA00);
+        rtl8168_mac_ocp_write(tp, 0xF86A, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF86C, 0xC002);
+        rtl8168_mac_ocp_write(tp, 0xF86E, 0xB800);
+        rtl8168_mac_ocp_write(tp, 0xF870, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF872, 0xB401);
+        rtl8168_mac_ocp_write(tp, 0xF874, 0xB402);
+        rtl8168_mac_ocp_write(tp, 0xF876, 0xB403);
+        rtl8168_mac_ocp_write(tp, 0xF878, 0xB404);
+        rtl8168_mac_ocp_write(tp, 0xF87A, 0xB405);
+        rtl8168_mac_ocp_write(tp, 0xF87C, 0xB406);
+        rtl8168_mac_ocp_write(tp, 0xF87E, 0xC44D);
+        rtl8168_mac_ocp_write(tp, 0xF880, 0xC54D);
+        rtl8168_mac_ocp_write(tp, 0xF882, 0x1867);
+        rtl8168_mac_ocp_write(tp, 0xF884, 0xE8A2);
+        rtl8168_mac_ocp_write(tp, 0xF886, 0x2318);
+        rtl8168_mac_ocp_write(tp, 0xF888, 0x276E);
+        rtl8168_mac_ocp_write(tp, 0xF88A, 0x1601);
+        rtl8168_mac_ocp_write(tp, 0xF88C, 0xF106);
+        rtl8168_mac_ocp_write(tp, 0xF88E, 0x1A07);
+        rtl8168_mac_ocp_write(tp, 0xF890, 0xE861);
+        rtl8168_mac_ocp_write(tp, 0xF892, 0xE86B);
+        rtl8168_mac_ocp_write(tp, 0xF894, 0xE873);
+        rtl8168_mac_ocp_write(tp, 0xF896, 0xE037);
+        rtl8168_mac_ocp_write(tp, 0xF898, 0x231E);
+        rtl8168_mac_ocp_write(tp, 0xF89A, 0x276E);
+        rtl8168_mac_ocp_write(tp, 0xF89C, 0x1602);
+        rtl8168_mac_ocp_write(tp, 0xF89E, 0xF10B);
+        rtl8168_mac_ocp_write(tp, 0xF8A0, 0x1A07);
+        rtl8168_mac_ocp_write(tp, 0xF8A2, 0xE858);
+        rtl8168_mac_ocp_write(tp, 0xF8A4, 0xE862);
+        rtl8168_mac_ocp_write(tp, 0xF8A6, 0xC247);
+        rtl8168_mac_ocp_write(tp, 0xF8A8, 0xC344);
+        rtl8168_mac_ocp_write(tp, 0xF8AA, 0xE8E3);
+        rtl8168_mac_ocp_write(tp, 0xF8AC, 0xC73B);
+        rtl8168_mac_ocp_write(tp, 0xF8AE, 0x66E0);
+        rtl8168_mac_ocp_write(tp, 0xF8B0, 0xE8B5);
+        rtl8168_mac_ocp_write(tp, 0xF8B2, 0xE029);
+        rtl8168_mac_ocp_write(tp, 0xF8B4, 0x231A);
+        rtl8168_mac_ocp_write(tp, 0xF8B6, 0x276C);
+        rtl8168_mac_ocp_write(tp, 0xF8B8, 0xC733);
+        rtl8168_mac_ocp_write(tp, 0xF8BA, 0x9EE0);
+        rtl8168_mac_ocp_write(tp, 0xF8BC, 0x1866);
+        rtl8168_mac_ocp_write(tp, 0xF8BE, 0xE885);
+        rtl8168_mac_ocp_write(tp, 0xF8C0, 0x251C);
+        rtl8168_mac_ocp_write(tp, 0xF8C2, 0x120F);
+        rtl8168_mac_ocp_write(tp, 0xF8C4, 0xF011);
+        rtl8168_mac_ocp_write(tp, 0xF8C6, 0x1209);
+        rtl8168_mac_ocp_write(tp, 0xF8C8, 0xF011);
+        rtl8168_mac_ocp_write(tp, 0xF8CA, 0x2014);
+        rtl8168_mac_ocp_write(tp, 0xF8CC, 0x240E);
+        rtl8168_mac_ocp_write(tp, 0xF8CE, 0x1000);
+        rtl8168_mac_ocp_write(tp, 0xF8D0, 0xF007);
+        rtl8168_mac_ocp_write(tp, 0xF8D2, 0x120C);
+        rtl8168_mac_ocp_write(tp, 0xF8D4, 0xF00D);
+        rtl8168_mac_ocp_write(tp, 0xF8D6, 0x1203);
+        rtl8168_mac_ocp_write(tp, 0xF8D8, 0xF00D);
+        rtl8168_mac_ocp_write(tp, 0xF8DA, 0x1200);
+        rtl8168_mac_ocp_write(tp, 0xF8DC, 0xF00D);
+        rtl8168_mac_ocp_write(tp, 0xF8DE, 0x120C);
+        rtl8168_mac_ocp_write(tp, 0xF8E0, 0xF00D);
+        rtl8168_mac_ocp_write(tp, 0xF8E2, 0x1203);
+        rtl8168_mac_ocp_write(tp, 0xF8E4, 0xF00D);
+        rtl8168_mac_ocp_write(tp, 0xF8E6, 0x1A03);
+        rtl8168_mac_ocp_write(tp, 0xF8E8, 0xE00C);
+        rtl8168_mac_ocp_write(tp, 0xF8EA, 0x1A07);
+        rtl8168_mac_ocp_write(tp, 0xF8EC, 0xE00A);
+        rtl8168_mac_ocp_write(tp, 0xF8EE, 0x1A00);
+        rtl8168_mac_ocp_write(tp, 0xF8F0, 0xE008);
+        rtl8168_mac_ocp_write(tp, 0xF8F2, 0x1A01);
+        rtl8168_mac_ocp_write(tp, 0xF8F4, 0xE006);
+        rtl8168_mac_ocp_write(tp, 0xF8F6, 0x1A02);
+        rtl8168_mac_ocp_write(tp, 0xF8F8, 0xE004);
+        rtl8168_mac_ocp_write(tp, 0xF8FA, 0x1A04);
+        rtl8168_mac_ocp_write(tp, 0xF8FC, 0xE002);
+        rtl8168_mac_ocp_write(tp, 0xF8FE, 0x1A05);
+        rtl8168_mac_ocp_write(tp, 0xF900, 0xE829);
+        rtl8168_mac_ocp_write(tp, 0xF902, 0xE833);
+        rtl8168_mac_ocp_write(tp, 0xF904, 0xB006);
+        rtl8168_mac_ocp_write(tp, 0xF906, 0xB005);
+        rtl8168_mac_ocp_write(tp, 0xF908, 0xB004);
+        rtl8168_mac_ocp_write(tp, 0xF90A, 0xB003);
+        rtl8168_mac_ocp_write(tp, 0xF90C, 0xB002);
+        rtl8168_mac_ocp_write(tp, 0xF90E, 0xB001);
+        rtl8168_mac_ocp_write(tp, 0xF910, 0x60C4);
+        rtl8168_mac_ocp_write(tp, 0xF912, 0xC702);
+        rtl8168_mac_ocp_write(tp, 0xF914, 0xBF00);
+        rtl8168_mac_ocp_write(tp, 0xF916, 0x2786);
+        rtl8168_mac_ocp_write(tp, 0xF918, 0xDD00);
+        rtl8168_mac_ocp_write(tp, 0xF91A, 0xD030);
+        rtl8168_mac_ocp_write(tp, 0xF91C, 0xE0C4);
+        rtl8168_mac_ocp_write(tp, 0xF91E, 0xE0F8);
+        rtl8168_mac_ocp_write(tp, 0xF920, 0xDC42);
+        rtl8168_mac_ocp_write(tp, 0xF922, 0xD3F0);
+        rtl8168_mac_ocp_write(tp, 0xF924, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF926, 0x0004);
+        rtl8168_mac_ocp_write(tp, 0xF928, 0x0007);
+        rtl8168_mac_ocp_write(tp, 0xF92A, 0x0014);
+        rtl8168_mac_ocp_write(tp, 0xF92C, 0x0090);
+        rtl8168_mac_ocp_write(tp, 0xF92E, 0x1000);
+        rtl8168_mac_ocp_write(tp, 0xF930, 0x0F00);
+        rtl8168_mac_ocp_write(tp, 0xF932, 0x1004);
+        rtl8168_mac_ocp_write(tp, 0xF934, 0x1008);
+        rtl8168_mac_ocp_write(tp, 0xF936, 0x3000);
+        rtl8168_mac_ocp_write(tp, 0xF938, 0x3004);
+        rtl8168_mac_ocp_write(tp, 0xF93A, 0x3008);
+        rtl8168_mac_ocp_write(tp, 0xF93C, 0x4000);
+        rtl8168_mac_ocp_write(tp, 0xF93E, 0x7777);
+        rtl8168_mac_ocp_write(tp, 0xF940, 0x8000);
+        rtl8168_mac_ocp_write(tp, 0xF942, 0x8001);
+        rtl8168_mac_ocp_write(tp, 0xF944, 0x8008);
+        rtl8168_mac_ocp_write(tp, 0xF946, 0x8003);
+        rtl8168_mac_ocp_write(tp, 0xF948, 0x8004);
+        rtl8168_mac_ocp_write(tp, 0xF94A, 0xC000);
+        rtl8168_mac_ocp_write(tp, 0xF94C, 0xC004);
+        rtl8168_mac_ocp_write(tp, 0xF94E, 0xF004);
+        rtl8168_mac_ocp_write(tp, 0xF950, 0xFFFF);
+        rtl8168_mac_ocp_write(tp, 0xF952, 0xB406);
+        rtl8168_mac_ocp_write(tp, 0xF954, 0xB407);
+        rtl8168_mac_ocp_write(tp, 0xF956, 0xC6E5);
+        rtl8168_mac_ocp_write(tp, 0xF958, 0x77C0);
+        rtl8168_mac_ocp_write(tp, 0xF95A, 0x27F3);
+        rtl8168_mac_ocp_write(tp, 0xF95C, 0x23F3);
+        rtl8168_mac_ocp_write(tp, 0xF95E, 0x47FA);
+        rtl8168_mac_ocp_write(tp, 0xF960, 0x9FC0);
+        rtl8168_mac_ocp_write(tp, 0xF962, 0xB007);
+        rtl8168_mac_ocp_write(tp, 0xF964, 0xB006);
+        rtl8168_mac_ocp_write(tp, 0xF966, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xF968, 0xB405);
+        rtl8168_mac_ocp_write(tp, 0xF96A, 0xB407);
+        rtl8168_mac_ocp_write(tp, 0xF96C, 0xC7D8);
+        rtl8168_mac_ocp_write(tp, 0xF96E, 0x75E0);
+        rtl8168_mac_ocp_write(tp, 0xF970, 0x48D0);
+        rtl8168_mac_ocp_write(tp, 0xF972, 0x9DE0);
+        rtl8168_mac_ocp_write(tp, 0xF974, 0xB007);
+        rtl8168_mac_ocp_write(tp, 0xF976, 0xB005);
+        rtl8168_mac_ocp_write(tp, 0xF978, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xF97A, 0xB401);
+        rtl8168_mac_ocp_write(tp, 0xF97C, 0xC0EA);
+        rtl8168_mac_ocp_write(tp, 0xF97E, 0xC2DC);
+        rtl8168_mac_ocp_write(tp, 0xF980, 0xC3D8);
+        rtl8168_mac_ocp_write(tp, 0xF982, 0xE865);
+        rtl8168_mac_ocp_write(tp, 0xF984, 0xC0D3);
+        rtl8168_mac_ocp_write(tp, 0xF986, 0xC1E0);
+        rtl8168_mac_ocp_write(tp, 0xF988, 0xC2E3);
+        rtl8168_mac_ocp_write(tp, 0xF98A, 0xE861);
+        rtl8168_mac_ocp_write(tp, 0xF98C, 0xE817);
+        rtl8168_mac_ocp_write(tp, 0xF98E, 0xC0CD);
+        rtl8168_mac_ocp_write(tp, 0xF990, 0xC2CF);
+        rtl8168_mac_ocp_write(tp, 0xF992, 0xE85D);
+        rtl8168_mac_ocp_write(tp, 0xF994, 0xC0C9);
+        rtl8168_mac_ocp_write(tp, 0xF996, 0xC1D6);
+        rtl8168_mac_ocp_write(tp, 0xF998, 0xC2DB);
+        rtl8168_mac_ocp_write(tp, 0xF99A, 0xE859);
+        rtl8168_mac_ocp_write(tp, 0xF99C, 0xE80F);
+        rtl8168_mac_ocp_write(tp, 0xF99E, 0xC1C7);
+        rtl8168_mac_ocp_write(tp, 0xF9A0, 0xC2CE);
+        rtl8168_mac_ocp_write(tp, 0xF9A2, 0xE855);
+        rtl8168_mac_ocp_write(tp, 0xF9A4, 0xC0C0);
+        rtl8168_mac_ocp_write(tp, 0xF9A6, 0xC1D1);
+        rtl8168_mac_ocp_write(tp, 0xF9A8, 0xC2D3);
+        rtl8168_mac_ocp_write(tp, 0xF9AA, 0xE851);
+        rtl8168_mac_ocp_write(tp, 0xF9AC, 0xE807);
+        rtl8168_mac_ocp_write(tp, 0xF9AE, 0xC0BE);
+        rtl8168_mac_ocp_write(tp, 0xF9B0, 0xC2C2);
+        rtl8168_mac_ocp_write(tp, 0xF9B2, 0xE84D);
+        rtl8168_mac_ocp_write(tp, 0xF9B4, 0xE803);
+        rtl8168_mac_ocp_write(tp, 0xF9B6, 0xB001);
+        rtl8168_mac_ocp_write(tp, 0xF9B8, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xF9BA, 0xB402);
+        rtl8168_mac_ocp_write(tp, 0xF9BC, 0xC2C6);
+        rtl8168_mac_ocp_write(tp, 0xF9BE, 0xE859);
+        rtl8168_mac_ocp_write(tp, 0xF9C0, 0x499F);
+        rtl8168_mac_ocp_write(tp, 0xF9C2, 0xF1FE);
+        rtl8168_mac_ocp_write(tp, 0xF9C4, 0xB002);
+        rtl8168_mac_ocp_write(tp, 0xF9C6, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xF9C8, 0xB402);
+        rtl8168_mac_ocp_write(tp, 0xF9CA, 0xB403);
+        rtl8168_mac_ocp_write(tp, 0xF9CC, 0xB407);
+        rtl8168_mac_ocp_write(tp, 0xF9CE, 0xE821);
+        rtl8168_mac_ocp_write(tp, 0xF9D0, 0x8882);
+        rtl8168_mac_ocp_write(tp, 0xF9D2, 0x1980);
+        rtl8168_mac_ocp_write(tp, 0xF9D4, 0x8983);
+        rtl8168_mac_ocp_write(tp, 0xF9D6, 0xE81D);
+        rtl8168_mac_ocp_write(tp, 0xF9D8, 0x7180);
+        rtl8168_mac_ocp_write(tp, 0xF9DA, 0x218B);
+        rtl8168_mac_ocp_write(tp, 0xF9DC, 0x25BB);
+        rtl8168_mac_ocp_write(tp, 0xF9DE, 0x1310);
+        rtl8168_mac_ocp_write(tp, 0xF9E0, 0xF014);
+        rtl8168_mac_ocp_write(tp, 0xF9E2, 0x1310);
+        rtl8168_mac_ocp_write(tp, 0xF9E4, 0xFB03);
+        rtl8168_mac_ocp_write(tp, 0xF9E6, 0x1F20);
+        rtl8168_mac_ocp_write(tp, 0xF9E8, 0x38FB);
+        rtl8168_mac_ocp_write(tp, 0xF9EA, 0x3288);
+        rtl8168_mac_ocp_write(tp, 0xF9EC, 0x434B);
+        rtl8168_mac_ocp_write(tp, 0xF9EE, 0x2491);
+        rtl8168_mac_ocp_write(tp, 0xF9F0, 0x430B);
+        rtl8168_mac_ocp_write(tp, 0xF9F2, 0x1F0F);
+        rtl8168_mac_ocp_write(tp, 0xF9F4, 0x38FB);
+        rtl8168_mac_ocp_write(tp, 0xF9F6, 0x4313);
+        rtl8168_mac_ocp_write(tp, 0xF9F8, 0x2121);
+        rtl8168_mac_ocp_write(tp, 0xF9FA, 0x4353);
+        rtl8168_mac_ocp_write(tp, 0xF9FC, 0x2521);
+        rtl8168_mac_ocp_write(tp, 0xF9FE, 0x418A);
+        rtl8168_mac_ocp_write(tp, 0xFA00, 0x6282);
+        rtl8168_mac_ocp_write(tp, 0xFA02, 0x2527);
+        rtl8168_mac_ocp_write(tp, 0xFA04, 0x212F);
+        rtl8168_mac_ocp_write(tp, 0xFA06, 0x418A);
+        rtl8168_mac_ocp_write(tp, 0xFA08, 0xB007);
+        rtl8168_mac_ocp_write(tp, 0xFA0A, 0xB003);
+        rtl8168_mac_ocp_write(tp, 0xFA0C, 0xB002);
+        rtl8168_mac_ocp_write(tp, 0xFA0E, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xFA10, 0x6183);
+        rtl8168_mac_ocp_write(tp, 0xFA12, 0x2496);
+        rtl8168_mac_ocp_write(tp, 0xFA14, 0x1100);
+        rtl8168_mac_ocp_write(tp, 0xFA16, 0xF1FD);
+        rtl8168_mac_ocp_write(tp, 0xFA18, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xFA1A, 0x4800);
+        rtl8168_mac_ocp_write(tp, 0xFA1C, 0x4801);
+        rtl8168_mac_ocp_write(tp, 0xFA1E, 0xC213);
+        rtl8168_mac_ocp_write(tp, 0xFA20, 0xC313);
+        rtl8168_mac_ocp_write(tp, 0xFA22, 0xE815);
+        rtl8168_mac_ocp_write(tp, 0xFA24, 0x4860);
+        rtl8168_mac_ocp_write(tp, 0xFA26, 0x8EE0);
+        rtl8168_mac_ocp_write(tp, 0xFA28, 0xC210);
+        rtl8168_mac_ocp_write(tp, 0xFA2A, 0xC310);
+        rtl8168_mac_ocp_write(tp, 0xFA2C, 0xE822);
+        rtl8168_mac_ocp_write(tp, 0xFA2E, 0x481E);
+        rtl8168_mac_ocp_write(tp, 0xFA30, 0xC20C);
+        rtl8168_mac_ocp_write(tp, 0xFA32, 0xC30C);
+        rtl8168_mac_ocp_write(tp, 0xFA34, 0xE80C);
+        rtl8168_mac_ocp_write(tp, 0xFA36, 0xC206);
+        rtl8168_mac_ocp_write(tp, 0xFA38, 0x7358);
+        rtl8168_mac_ocp_write(tp, 0xFA3A, 0x483A);
+        rtl8168_mac_ocp_write(tp, 0xFA3C, 0x9B58);
+        rtl8168_mac_ocp_write(tp, 0xFA3E, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xFA40, 0xE8E0);
+        rtl8168_mac_ocp_write(tp, 0xFA42, 0xE000);
+        rtl8168_mac_ocp_write(tp, 0xFA44, 0x1008);
+        rtl8168_mac_ocp_write(tp, 0xFA46, 0x0F00);
+        rtl8168_mac_ocp_write(tp, 0xFA48, 0x800C);
+        rtl8168_mac_ocp_write(tp, 0xFA4A, 0x0F00);
+        rtl8168_mac_ocp_write(tp, 0xFA4C, 0xB407);
+        rtl8168_mac_ocp_write(tp, 0xFA4E, 0xB406);
+        rtl8168_mac_ocp_write(tp, 0xFA50, 0xB403);
+        rtl8168_mac_ocp_write(tp, 0xFA52, 0xC7F7);
+        rtl8168_mac_ocp_write(tp, 0xFA54, 0x98E0);
+        rtl8168_mac_ocp_write(tp, 0xFA56, 0x99E2);
+        rtl8168_mac_ocp_write(tp, 0xFA58, 0x9AE4);
+        rtl8168_mac_ocp_write(tp, 0xFA5A, 0x21B2);
+        rtl8168_mac_ocp_write(tp, 0xFA5C, 0x4831);
+        rtl8168_mac_ocp_write(tp, 0xFA5E, 0x483F);
+        rtl8168_mac_ocp_write(tp, 0xFA60, 0x9BE6);
+        rtl8168_mac_ocp_write(tp, 0xFA62, 0x66E7);
+        rtl8168_mac_ocp_write(tp, 0xFA64, 0x49E6);
+        rtl8168_mac_ocp_write(tp, 0xFA66, 0xF1FE);
+        rtl8168_mac_ocp_write(tp, 0xFA68, 0xB003);
+        rtl8168_mac_ocp_write(tp, 0xFA6A, 0xB006);
+        rtl8168_mac_ocp_write(tp, 0xFA6C, 0xB007);
+        rtl8168_mac_ocp_write(tp, 0xFA6E, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xFA70, 0xB407);
+        rtl8168_mac_ocp_write(tp, 0xFA72, 0xB406);
+        rtl8168_mac_ocp_write(tp, 0xFA74, 0xB403);
+        rtl8168_mac_ocp_write(tp, 0xFA76, 0xC7E5);
+        rtl8168_mac_ocp_write(tp, 0xFA78, 0x9AE4);
+        rtl8168_mac_ocp_write(tp, 0xFA7A, 0x21B2);
+        rtl8168_mac_ocp_write(tp, 0xFA7C, 0x4831);
+        rtl8168_mac_ocp_write(tp, 0xFA7E, 0x9BE6);
+        rtl8168_mac_ocp_write(tp, 0xFA80, 0x66E7);
+        rtl8168_mac_ocp_write(tp, 0xFA82, 0x49E6);
+        rtl8168_mac_ocp_write(tp, 0xFA84, 0xF1FE);
+        rtl8168_mac_ocp_write(tp, 0xFA86, 0x70E0);
+        rtl8168_mac_ocp_write(tp, 0xFA88, 0x71E2);
+        rtl8168_mac_ocp_write(tp, 0xFA8A, 0xB003);
+        rtl8168_mac_ocp_write(tp, 0xFA8C, 0xB006);
+        rtl8168_mac_ocp_write(tp, 0xFA8E, 0xB007);
+        rtl8168_mac_ocp_write(tp, 0xFA90, 0xFF80);
+        rtl8168_mac_ocp_write(tp, 0xFA92, 0x4882);
+        rtl8168_mac_ocp_write(tp, 0xFA94, 0xB406);
+        rtl8168_mac_ocp_write(tp, 0xFA96, 0xB405);
+        rtl8168_mac_ocp_write(tp, 0xFA98, 0xC71E);
+        rtl8168_mac_ocp_write(tp, 0xFA9A, 0x76E0);
+        rtl8168_mac_ocp_write(tp, 0xFA9C, 0x1D78);
+        rtl8168_mac_ocp_write(tp, 0xFA9E, 0x4175);
+        rtl8168_mac_ocp_write(tp, 0xFAA0, 0x1630);
+        rtl8168_mac_ocp_write(tp, 0xFAA2, 0xF10C);
+        rtl8168_mac_ocp_write(tp, 0xFAA4, 0xC715);
+        rtl8168_mac_ocp_write(tp, 0xFAA6, 0x76E0);
+        rtl8168_mac_ocp_write(tp, 0xFAA8, 0x4861);
+        rtl8168_mac_ocp_write(tp, 0xFAAA, 0x9EE0);
+        rtl8168_mac_ocp_write(tp, 0xFAAC, 0xC713);
+        rtl8168_mac_ocp_write(tp, 0xFAAE, 0x1EFF);
+        rtl8168_mac_ocp_write(tp, 0xFAB0, 0x9EE2);
+        rtl8168_mac_ocp_write(tp, 0xFAB2, 0x75E0);
+        rtl8168_mac_ocp_write(tp, 0xFAB4, 0x4850);
+        rtl8168_mac_ocp_write(tp, 0xFAB6, 0x9DE0);
+        rtl8168_mac_ocp_write(tp, 0xFAB8, 0xE005);
+        rtl8168_mac_ocp_write(tp, 0xFABA, 0xC70B);
+        rtl8168_mac_ocp_write(tp, 0xFABC, 0x76E0);
+        rtl8168_mac_ocp_write(tp, 0xFABE, 0x4865);
+        rtl8168_mac_ocp_write(tp, 0xFAC0, 0x9EE0);
+        rtl8168_mac_ocp_write(tp, 0xFAC2, 0xB005);
+        rtl8168_mac_ocp_write(tp, 0xFAC4, 0xB006);
+        rtl8168_mac_ocp_write(tp, 0xFAC6, 0xC708);
+        rtl8168_mac_ocp_write(tp, 0xFAC8, 0xC102);
+        rtl8168_mac_ocp_write(tp, 0xFACA, 0xB900);
+        rtl8168_mac_ocp_write(tp, 0xFACC, 0x279E);
+        rtl8168_mac_ocp_write(tp, 0xFACE, 0xEB16);
+        rtl8168_mac_ocp_write(tp, 0xFAD0, 0xEB00);
+        rtl8168_mac_ocp_write(tp, 0xFAD2, 0xE43C);
+        rtl8168_mac_ocp_write(tp, 0xFAD4, 0xDC00);
+        rtl8168_mac_ocp_write(tp, 0xFAD6, 0xD3EC);
+        rtl8168_mac_ocp_write(tp, 0xFAD8, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xFADA, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xFADC, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xFADE, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xFAE0, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xFAE2, 0x0000);
 
         rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
 
-        rtl8168_mac_ocp_write(tp, 0xFC28, 0x2AAC);
-        rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0B14);
-        rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0BE4);
+        rtl8168_mac_ocp_write(tp, 0xFC28, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xFC2A, 0x04B4);
+        rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xFC2E, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xFC30, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xFC32, 0x279C);
+        rtl8168_mac_ocp_write(tp, 0xFC34, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xFC36, 0x0000);
 
-        rtl8168_mac_ocp_write(tp, 0xFC38, 0x0007);
+        rtl8168_mac_ocp_write(tp, 0xFC38, 0x0022);
 }
 
 static void
-_rtl8168_set_mac_mcu_8168fp_2(struct net_device *dev)
+rtl8168_set_mac_mcu_8168fp_3(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        u16 i;
-        static const u16 mcu_patch_code_8168fp_2 = {
-                0xE008, 0xE00A, 0xE00F, 0xE014, 0xE05F, 0xE064, 0xE066, 0xE068, 0xC602,
-                0xBE00, 0x0000, 0x1BC0, 0x46EB, 0x1BFE, 0xC102, 0xB900, 0x0B1A, 0x1BC0,
-                0x46EB, 0x1B7E, 0xC102, 0xB900, 0x0BEA, 0xB400, 0xB401, 0xB402, 0xB403,
-                0xB404, 0xB405, 0xC03A, 0x7206, 0x49AE, 0xF1FE, 0xC137, 0x9904, 0xC136,
-                0x9906, 0x7206, 0x49AE, 0xF1FE, 0x7200, 0x49A0, 0xF10B, 0xC52F, 0xC12E,
-                0xC232, 0xC332, 0xE812, 0xC331, 0xE810, 0xC330, 0xE80E, 0xE018, 0xC126,
-                0xC229, 0xC525, 0xC328, 0xE808, 0xC523, 0xC326, 0xE805, 0xC521, 0xC324,
-                0xE802, 0xE00C, 0x740E, 0x49CE, 0xF1FE, 0x9908, 0x9D0A, 0x9A0C, 0x9B0E,
-                0x740E, 0x49CE, 0xF1FE, 0xFF80, 0xB005, 0xB004, 0xB003, 0xB002, 0xB001,
-                0xB000, 0xC604, 0xC002, 0xB800, 0x2A5E, 0xE000, 0xE8E0, 0xF128, 0x3DC2,
-                0xFFFF, 0x10EC, 0x816A, 0x816D, 0x816C, 0xF000, 0x8002, 0x8004, 0x8007,
-                0x48C1, 0x48C2, 0x9C46, 0xC402, 0xBC00, 0x07BC, 0xC602, 0xBE00, 0x0000,
-                0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000
-        };
 
         rtl8168_hw_disable_mac_mcu_bps(dev);
 
-        for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168fp_2); i++)
-                rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168fp_2i);
+        rtl8168_mac_ocp_write(tp, 0xF800, 0xE008);
+        rtl8168_mac_ocp_write(tp, 0xF802, 0xE00A);
+        rtl8168_mac_ocp_write(tp, 0xF804, 0xE00F);
+        rtl8168_mac_ocp_write(tp, 0xF806, 0xE014);
+        rtl8168_mac_ocp_write(tp, 0xF808, 0xE016);
+        rtl8168_mac_ocp_write(tp, 0xF80A, 0xE018);
+        rtl8168_mac_ocp_write(tp, 0xF80C, 0xE01A);
+        rtl8168_mac_ocp_write(tp, 0xF80E, 0xE01C);
+        rtl8168_mac_ocp_write(tp, 0xF810, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF812, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF814, 0x2AB2);
+        rtl8168_mac_ocp_write(tp, 0xF816, 0x1BC0);
+        rtl8168_mac_ocp_write(tp, 0xF818, 0x46EB);
+        rtl8168_mac_ocp_write(tp, 0xF81A, 0x1BFE);
+        rtl8168_mac_ocp_write(tp, 0xF81C, 0xC102);
+        rtl8168_mac_ocp_write(tp, 0xF81E, 0xB900);
+        rtl8168_mac_ocp_write(tp, 0xF820, 0x0B1A);
+        rtl8168_mac_ocp_write(tp, 0xF822, 0x1BC0);
+        rtl8168_mac_ocp_write(tp, 0xF824, 0x46EB);
+        rtl8168_mac_ocp_write(tp, 0xF826, 0x1B7E);
+        rtl8168_mac_ocp_write(tp, 0xF828, 0xC102);
+        rtl8168_mac_ocp_write(tp, 0xF82A, 0xB900);
+        rtl8168_mac_ocp_write(tp, 0xF82C, 0x0BEA);
+        rtl8168_mac_ocp_write(tp, 0xF82E, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF830, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF832, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF834, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF836, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF838, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF83A, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF83C, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF83E, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF840, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF842, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF844, 0x0000);
+        rtl8168_mac_ocp_write(tp, 0xF846, 0xC602);
+        rtl8168_mac_ocp_write(tp, 0xF848, 0xBE00);
+        rtl8168_mac_ocp_write(tp, 0xF84A, 0x0000);
 
         rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
 
         rtl8168_mac_ocp_write(tp, 0xFC28, 0x2AAC);
         rtl8168_mac_ocp_write(tp, 0xFC2A, 0x0B14);
         rtl8168_mac_ocp_write(tp, 0xFC2C, 0x0BE4);
-        rtl8168_mac_ocp_write(tp, 0xFC2E, 0x2A5C);
-        //rtl8168_mac_ocp_write(tp, 0xFC30, 0x07B0);
-
-        if (true == rtl8168_check_dash_other_fun_present(tp))
-                rtl8168_mac_ocp_write(tp, 0xFC38, 0x0006);
-        else
-                rtl8168_mac_ocp_write(tp, 0xFC38, 0x000E);
-}
-
-static void
-rtl8168_set_mac_mcu_8168fp_2(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        if (tp->HwSuppSerDesPhyVer == 1)
-                rtl8168_set_mac_mcu_8168fp_8116as_2(dev);
-        else
-                _rtl8168_set_mac_mcu_8168fp_2(dev);
-}
-
-static void
-rtl8168_set_mac_mcu_8168fp_3(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        u16 i;
-        static const u16 mcu_patch_code_8168fp_3 = {
-                0xE008, 0xE053, 0xE058, 0xE05A, 0xE05C, 0xE05E, 0xE060, 0xE062, 0xB400,
-                0xB401, 0xB402, 0xB403, 0xB404, 0xB405, 0xC03A, 0x7206, 0x49AE, 0xF1FE,
-                0xC137, 0x9904, 0xC136, 0x9906, 0x7206, 0x49AE, 0xF1FE, 0x7200, 0x49A0,
-                0xF10B, 0xC52F, 0xC12E, 0xC232, 0xC332, 0xE812, 0xC331, 0xE810, 0xC330,
-                0xE80E, 0xE018, 0xC126, 0xC229, 0xC525, 0xC328, 0xE808, 0xC523, 0xC326,
-                0xE805, 0xC521, 0xC324, 0xE802, 0xE00C, 0x740E, 0x49CE, 0xF1FE, 0x9908,
-                0x9D0A, 0x9A0C, 0x9B0E, 0x740E, 0x49CE, 0xF1FE, 0xFF80, 0xB005, 0xB004,
-                0xB003, 0xB002, 0xB001, 0xB000, 0xC604, 0xC002, 0xB800, 0x2B16, 0xE000,
-                0xE8E0, 0xF128, 0x3DC2, 0xFFFF, 0x10EC, 0x816A, 0x816D, 0x816C, 0xF000,
-                0x8002, 0x8004, 0x8007, 0x48C1, 0x48C2, 0x9C46, 0xC402, 0xBC00, 0x07BC,
-                0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000,
-                0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000, 0xC602, 0xBE00, 0x0000
-        };
-
-        rtl8168_hw_disable_mac_mcu_bps(dev);
-
-        for (i = 0; i < ARRAY_SIZE(mcu_patch_code_8168fp_3); i++)
-                rtl8168_mac_ocp_write(tp, 0xF800 + i * 2, mcu_patch_code_8168fp_3i);
 
-        rtl8168_mac_ocp_write(tp, 0xFC26, 0x8000);
-
-        rtl8168_mac_ocp_write(tp, 0xFC28, 0x2B14);
-        //rtl8168_mac_ocp_write(tp, 0xFC2A, 0x07B0);
-
-        if (true == rtl8168_check_dash_other_fun_present(tp))
-                rtl8168_mac_ocp_write(tp, 0xFC38, 0x0000);
-        else
-                rtl8168_mac_ocp_write(tp, 0xFC38, 0x0001);
+        rtl8168_mac_ocp_write(tp, 0xFC38, 0x0006);
 }
 
 static void
@@ -10421,8 +9202,7 @@
 {
         struct rtl8168_private *tp = netdev_priv(dev);
 
-        if (tp->NotWrMcuPatchCode == TRUE)
-                return;
+        if (tp->NotWrMcuPatchCode == TRUE) return;
 
         switch (tp->mcfg) {
         case CFG_METHOD_21:
@@ -10444,79 +9224,65 @@
                 rtl8168_set_mac_mcu_8168ep_2(dev);
                 break;
         case CFG_METHOD_29:
-                rtl8168_set_mac_mcu_8168h_1(dev);
-                break;
         case CFG_METHOD_30:
-        case CFG_METHOD_37:
-                rtl8168_set_mac_mcu_8168h_2(dev);
+                rtl8168_set_mac_mcu_8168h_1(dev);
                 break;
         case CFG_METHOD_31:
-                rtl8168_set_mac_mcu_8168fp_1(dev);
+                if (tp->HwPkgDet == 0x00 || tp->HwPkgDet == 0x0F)
+                        rtl8168_set_mac_mcu_8168fp_1(dev);
+                else if (tp->HwPkgDet == 0x06)
+                        rtl8168_set_mac_mcu_8168fp_2(dev);
                 break;
         case CFG_METHOD_32:
-                rtl8168_set_mac_mcu_8168fp_2(dev);
-                break;
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
                 rtl8168_set_mac_mcu_8168fp_3(dev);
                 break;
-        case CFG_METHOD_35:
-                rtl8168_set_mac_mcu_8168h_3(dev);
-                break;
-        case CFG_METHOD_36:
-                rtl8168_set_mac_mcu_8168h_4(dev);
-                break;
-        }
-}
-#endif
-
-#ifdef ENABLE_USE_FIRMWARE_FILE
-static void rtl8168_release_firmware(struct rtl8168_private *tp)
-{
-        if (tp->rtl_fw) {
-                rtl8168_fw_release_firmware(tp->rtl_fw);
-                kfree(tp->rtl_fw);
-                tp->rtl_fw = NULL;
         }
 }
 
-static void rtl8168_apply_firmware(struct rtl8168_private *tp)
-{
-        /* TODO: release firmware if rtl_fw_write_firmware signals failure. */
-        if (tp->rtl_fw) {
-                rtl8168_fw_write_firmware(tp, tp->rtl_fw);
-                /* At least one firmware doesn't reset tp->ocp_base. */
-                tp->ocp_base = OCP_STD_PHY_BASE;
-
-                /* PHY soft reset may still be in progress */
-                //phy_read_poll_timeout(tp->phydev, MII_BMCR, val,
-                //		      !(val & BMCR_RESET),
-                //		      50000, 600000, true);
-                rtl8168_wait_phy_reset_complete(tp);
-
-                tp->hw_ram_code_ver = rtl8168_get_hw_phy_mcu_code_ver(tp);
-                tp->sw_ram_code_ver = tp->hw_ram_code_ver;
-                tp->HwHasWrRamCodeToMicroP = TRUE;
-        }
-}
-#endif
-
 static void
 rtl8168_hw_init(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
-        if (tp->HwSuppAspmClkIntrLock) {
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) & ~BIT_7);
+        switch (tp->mcfg) {
+        case CFG_METHOD_14:
+        case CFG_METHOD_15:
+        case CFG_METHOD_16:
+        case CFG_METHOD_17:
+        case CFG_METHOD_18:
+        case CFG_METHOD_19:
+        case CFG_METHOD_20:
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
                 rtl8168_enable_cfg9346_write(tp);
-                rtl8168_hw_aspm_clkreq_enable(tp, false);
+                RTL_W8(Config5, RTL_R8(Config5) & ~BIT_0);
+                RTL_W8(Config2, RTL_R8(Config2) & ~BIT_7);
                 rtl8168_disable_cfg9346_write(tp);
+                RTL_W8(0xF1, RTL_R8(0xF1) & ~BIT_7);
+                break;
         }
 
         //Disable UPS
-        if (HW_SUPPORT_UPS_MODE(tp))
-                rtl8168_mac_ocp_write(tp, 0xD400, rtl8168_mac_ocp_read(tp, 0xD400) & ~(BIT_0));
+        switch (tp->mcfg) {
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_mac_ocp_write(tp, 0xD400, rtl8168_mac_ocp_read( tp, 0xD400) & ~(BIT_0));
+                break;
+        }
 
         //Disable DMA Aggregation
         switch (tp->mcfg) {
@@ -10524,14 +9290,9 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                rtl8168_mac_ocp_write(tp, 0xE63E, rtl8168_mac_ocp_read(tp, 0xE63E) & ~(BIT_3 | BIT_2 | BIT_1));
-                rtl8168_mac_ocp_write(tp, 0xE63E, rtl8168_mac_ocp_read(tp, 0xE63E) | (BIT_0));
-                rtl8168_mac_ocp_write(tp, 0xE63E, rtl8168_mac_ocp_read(tp, 0xE63E) & ~(BIT_0));
+                rtl8168_mac_ocp_write(tp, 0xE63E, rtl8168_mac_ocp_read( tp, 0xE63E) & ~(BIT_3 | BIT_2 | BIT_1));
+                rtl8168_mac_ocp_write(tp, 0xE63E, rtl8168_mac_ocp_read( tp, 0xE63E) | (BIT_0));
+                rtl8168_mac_ocp_write(tp, 0xE63E, rtl8168_mac_ocp_read( tp, 0xE63E) & ~(BIT_0));
                 rtl8168_mac_ocp_write(tp, 0xC094, 0x0);
                 rtl8168_mac_ocp_write(tp, 0xC09E, 0x0);
                 break;
@@ -10540,7 +9301,7 @@
         switch (tp->mcfg) {
         case CFG_METHOD_9:
         case CFG_METHOD_10:
-                RTL_W8(tp, DBG_reg, RTL_R8(tp, DBG_reg) | BIT_1 | BIT_7);
+                RTL_W8(DBG_reg, RTL_R8(DBG_reg) | BIT_1 | BIT_7);
                 break;
         }
 
@@ -10551,26 +9312,44 @@
         case CFG_METHOD_17:
         case CFG_METHOD_18:
         case CFG_METHOD_19:
-                RTL_W8(tp, 0xF2, (RTL_R8(tp, 0xF2) & ~(BIT_2 | BIT_1 | BIT_0)));
+                RTL_W8(0xF2, (RTL_R8(0xF2) & ~(BIT_2 | BIT_1 | BIT_0)));
+                break;
+        }
+
+        switch (tp->mcfg) {
+        case CFG_METHOD_16:
+        case CFG_METHOD_17:
+        case CFG_METHOD_18:
+        case CFG_METHOD_19:
+        case CFG_METHOD_20:
+                if (aspm) {
+                        RTL_W8(0x6E, RTL_R8(0x6E) | BIT_6);
+                        rtl8168_eri_write(ioaddr, 0x1AE, 2, 0x0403, ERIAR_ExGMAC);
+                }
+                break;
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+                if (aspm) {
+                        if ((rtl8168_mac_ocp_read(tp, 0xDC00) & BIT_3) || (RTL_R8(Config0) & 0x07)) {
+                                RTL_W8(0x6E, RTL_R8(0x6E) | BIT_6);
+                                rtl8168_eri_write(ioaddr, 0x1AE, 2, 0x0403, ERIAR_ExGMAC);
+                        }
+                }
                 break;
         }
 
         if (tp->mcfg == CFG_METHOD_10 || tp->mcfg == CFG_METHOD_14 || tp->mcfg == CFG_METHOD_15)
-                RTL_W8(tp, 0xF3, RTL_R8(tp, 0xF3) | BIT_2);
+                RTL_W8(0xF3, RTL_R8(0xF3) | BIT_2);
 
-#ifndef ENABLE_USE_FIRMWARE_FILE
-        if (!tp->rtl_fw)
-                rtl8168_hw_mac_mcu_config(dev);
-#endif
+        rtl8168_hw_mac_mcu_config(dev);
 
         /*disable ocp phy power saving*/
         if (tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
             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 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-            tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-            tp->mcfg == CFG_METHOD_37)
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32)
                 if (!tp->dash_printer_enabled)
                         rtl8168_disable_ocp_phy_power_saving(dev);
 
@@ -10584,51 +9363,41 @@
         case CFG_METHOD_22:
         case CFG_METHOD_23:
         case CFG_METHOD_24:
-                csi_tmp = rtl8168_eri_read(tp, 0x1AB, 1, ERIAR_ExGMAC);
-                csi_tmp |= (BIT_2 | BIT_3 | BIT_4 | BIT_5 | BIT_6 | BIT_7);
-                rtl8168_eri_write(tp, 0x1AB, 1, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1AB, 1, ERIAR_ExGMAC);
+                csi_tmp |= ( BIT_2 | BIT_3 | BIT_4 | BIT_5 | BIT_6 | BIT_7 );
+                rtl8168_eri_write(ioaddr, 0x1AB, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 
-        rtl8168_set_pci_pme(tp, 0);
-
         if (s0_magic_packet == 1)
                 rtl8168_enable_magic_packet(dev);
-        else
-                rtl8168_disable_magic_packet(dev);
-
-#ifdef ENABLE_USE_FIRMWARE_FILE
-        if (tp->rtl_fw &&
-            !(HW_DASH_SUPPORT_TYPE_3(tp) &&
-              tp->HwPkgDet == 0x06))
-                rtl8168_apply_firmware(tp);
-#endif
 }
 
 static void
 rtl8168_hw_ephy_config(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u16 ephy_data;
 
         switch (tp->mcfg) {
         case CFG_METHOD_4:
                 /*Set EPHY registers    begin*/
                 /*Set EPHY register offset 0x02 bit 11 to 0 and bit 12 to 1*/
-                ephy_data = rtl8168_ephy_read(tp, 0x02);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x02);
                 ephy_data &= ~BIT_11;
                 ephy_data |= BIT_12;
-                rtl8168_ephy_write(tp, 0x02, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x02, ephy_data);
 
                 /*Set EPHY register offset 0x03 bit 1 to 1*/
-                ephy_data = rtl8168_ephy_read(tp, 0x03);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x03);
                 ephy_data |= (1 << 1);
-                rtl8168_ephy_write(tp, 0x03, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x03, ephy_data);
 
                 /*Set EPHY register offset 0x06 bit 7 to 0*/
-                ephy_data = rtl8168_ephy_read(tp, 0x06);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x06);
                 ephy_data &= ~(1 << 7);
-                rtl8168_ephy_write(tp, 0x06, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x06, ephy_data);
                 /*Set EPHY registers    end*/
 
                 break;
@@ -10639,227 +9408,231 @@
                 ClearAndSetPCIePhyBit(tp,
                                       0x03,
                                       BIT_10,
-                                      BIT_5);
+                                      BIT_5
+                                     );
 
                 break;
         case CFG_METHOD_9:
                 /* set EPHY registers */
-                rtl8168_ephy_write(tp, 0x01, 0x7C7F);
-                rtl8168_ephy_write(tp, 0x02, 0x011F);
+                rtl8168_ephy_write(ioaddr, 0x01, 0x7C7F);
+                rtl8168_ephy_write(ioaddr, 0x02, 0x011F);
                 if (tp->eeprom_type != EEPROM_TYPE_NONE) {
                         ClearAndSetPCIePhyBit(tp,
                                               0x03,
                                               0xFFB0,
-                                              0x05B0);
+                                              0x05B0
+                                             );
                 } else {
                         ClearAndSetPCIePhyBit(tp,
                                               0x03,
                                               0xFFF0,
-                                              0x05F0);
+                                              0x05F0
+                                             );
                 }
-                rtl8168_ephy_write(tp, 0x06, 0xB271);
-                rtl8168_ephy_write(tp, 0x07, 0xCE00);
+                rtl8168_ephy_write(ioaddr, 0x06, 0xB271);
+                rtl8168_ephy_write(ioaddr, 0x07, 0xCE00);
 
                 break;
         case CFG_METHOD_10:
                 /* set EPHY registers */
-                rtl8168_ephy_write(tp, 0x01, 0x6C7F);
-                rtl8168_ephy_write(tp, 0x02, 0x011F);
+                rtl8168_ephy_write(ioaddr, 0x01, 0x6C7F);
+                rtl8168_ephy_write(ioaddr, 0x02, 0x011F);
                 ClearAndSetPCIePhyBit(tp,
                                       0x03,
                                       0xFFF0,
-                                      0x01B0);
-                rtl8168_ephy_write(tp, 0x1A, 0x0546);
-                rtl8168_ephy_write(tp, 0x1C, 0x80C4);
-                rtl8168_ephy_write(tp, 0x1D, 0x78E5);
-                rtl8168_ephy_write(tp, 0x0A, 0x8100);
+                                      0x01B0
+                                     );
+                rtl8168_ephy_write(ioaddr, 0x1A, 0x0546);
+                rtl8168_ephy_write(ioaddr, 0x1C, 0x80C4);
+                rtl8168_ephy_write(ioaddr, 0x1D, 0x78E5);
+                rtl8168_ephy_write(ioaddr, 0x0A, 0x8100);
 
                 break;
         case CFG_METHOD_12:
         case CFG_METHOD_13:
-                ephy_data = rtl8168_ephy_read(tp, 0x0B);
-                rtl8168_ephy_write(tp, 0x0B, ephy_data|0x48);
-                ephy_data = rtl8168_ephy_read(tp, 0x19);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0B);
+                rtl8168_ephy_write(ioaddr, 0x0B, ephy_data|0x48);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x19);
                 ephy_data &= ~0x20;
-                rtl8168_ephy_write(tp, 0x19, ephy_data|0x50);
-                ephy_data = rtl8168_ephy_read(tp, 0x0C);
+                rtl8168_ephy_write(ioaddr, 0x19, ephy_data|0x50);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0C);
                 ephy_data &= ~0x100;
-                rtl8168_ephy_write(tp, 0x0C, ephy_data|0x20);
-                ephy_data = rtl8168_ephy_read(tp, 0x10);
+                rtl8168_ephy_write(ioaddr, 0x0C, ephy_data|0x20);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x10);
                 ephy_data &= ~0x04;
-                rtl8168_ephy_write(tp, 0x10, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x10, ephy_data);
 
                 break;
         case CFG_METHOD_14:
         case CFG_METHOD_15:
                 /* set EPHY registers */
-                ephy_data = rtl8168_ephy_read(tp, 0x00) & ~0x0200;
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x00) & ~0x0200;
                 ephy_data |= 0x0100;
-                rtl8168_ephy_write(tp, 0x00, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x00, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x00);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x00);
                 ephy_data |= 0x0004;
-                rtl8168_ephy_write(tp, 0x00, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x00, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x06) & ~0x0002;
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x06) & ~0x0002;
                 ephy_data |= 0x0001;
-                rtl8168_ephy_write(tp, 0x06, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x06, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x06);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x06);
                 ephy_data |= 0x0030;
-                rtl8168_ephy_write(tp, 0x06, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x06, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x07);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x07);
                 ephy_data |= 0x2000;
-                rtl8168_ephy_write(tp, 0x07, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x07, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x00);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x00);
                 ephy_data |= 0x0020;
-                rtl8168_ephy_write(tp, 0x00, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x00, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x03) & ~0x5800;
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x03) & ~0x5800;
                 ephy_data |= 0x2000;
-                rtl8168_ephy_write(tp, 0x03, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x03, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x03);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x03);
                 ephy_data |= 0x0001;
-                rtl8168_ephy_write(tp, 0x03, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x03, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x01) & ~0x0800;
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x01) & ~0x0800;
                 ephy_data |= 0x1000;
-                rtl8168_ephy_write(tp, 0x01, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x01, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x07);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x07);
                 ephy_data |= 0x4000;
-                rtl8168_ephy_write(tp, 0x07, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x07, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x1E);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x1E);
                 ephy_data |= 0x2000;
-                rtl8168_ephy_write(tp, 0x1E, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x1E, ephy_data);
 
-                rtl8168_ephy_write(tp, 0x19, 0xFE6C);
+                rtl8168_ephy_write(ioaddr, 0x19, 0xFE6C);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x0A);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0A);
                 ephy_data |= 0x0040;
-                rtl8168_ephy_write(tp, 0x0A, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x0A, ephy_data);
 
                 break;
         case CFG_METHOD_16:
         case CFG_METHOD_17:
                 if (tp->mcfg == CFG_METHOD_16) {
-                        rtl8168_ephy_write(tp, 0x06, 0xF020);
-                        rtl8168_ephy_write(tp, 0x07, 0x01FF);
-                        rtl8168_ephy_write(tp, 0x00, 0x5027);
-                        rtl8168_ephy_write(tp, 0x01, 0x0003);
-                        rtl8168_ephy_write(tp, 0x02, 0x2D16);
-                        rtl8168_ephy_write(tp, 0x03, 0x6D49);
-                        rtl8168_ephy_write(tp, 0x08, 0x0006);
-                        rtl8168_ephy_write(tp, 0x0A, 0x00C8);
+                        rtl8168_ephy_write(ioaddr, 0x06, 0xF020);
+                        rtl8168_ephy_write(ioaddr, 0x07, 0x01FF);
+                        rtl8168_ephy_write(ioaddr, 0x00, 0x5027);
+                        rtl8168_ephy_write(ioaddr, 0x01, 0x0003);
+                        rtl8168_ephy_write(ioaddr, 0x02, 0x2D16);
+                        rtl8168_ephy_write(ioaddr, 0x03, 0x6D49);
+                        rtl8168_ephy_write(ioaddr, 0x08, 0x0006);
+                        rtl8168_ephy_write(ioaddr, 0x0A, 0x00C8);
                 }
 
-                ephy_data = rtl8168_ephy_read(tp, 0x09);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x09);
                 ephy_data |= BIT_7;
-                rtl8168_ephy_write(tp, 0x09, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x09, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x19);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x19);
                 ephy_data |= (BIT_2 | BIT_5 | BIT_9);
-                rtl8168_ephy_write(tp, 0x19, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x19, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x00);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x00);
                 ephy_data |= BIT_3;
-                rtl8168_ephy_write(tp, 0x00, ephy_data);
-                ephy_data = rtl8168_ephy_read(tp, 0x0C);
+                rtl8168_ephy_write(ioaddr, 0x00, ephy_data);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0C);
                 ephy_data &= ~(BIT_13 | BIT_12 | BIT_11 | BIT_10 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4);
                 ephy_data |= BIT_9;
-                rtl8168_ephy_write(tp, 0x0C, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x0C, ephy_data);
 
                 break;
         case CFG_METHOD_18:
         case CFG_METHOD_19:
                 if (tp->mcfg == CFG_METHOD_18) {
-                        ephy_data = rtl8168_ephy_read(tp, 0x06);
+                        ephy_data = rtl8168_ephy_read(ioaddr, 0x06);
                         ephy_data |= BIT_5;
                         ephy_data &= ~(BIT_7 | BIT_6);
-                        rtl8168_ephy_write(tp, 0x06, ephy_data);
+                        rtl8168_ephy_write(ioaddr, 0x06, ephy_data);
 
-                        ephy_data = rtl8168_ephy_read(tp, 0x08);
+                        ephy_data = rtl8168_ephy_read(ioaddr, 0x08);
                         ephy_data |= BIT_1;
                         ephy_data &= ~BIT_0;
-                        rtl8168_ephy_write(tp, 0x08, ephy_data);
+                        rtl8168_ephy_write(ioaddr, 0x08, ephy_data);
                 }
 
-                ephy_data = rtl8168_ephy_read(tp, 0x09);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x09);
                 ephy_data |= BIT_7;
-                rtl8168_ephy_write(tp, 0x09, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x09, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x19);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x19);
                 ephy_data |= (BIT_2 | BIT_5 | BIT_9);
-                rtl8168_ephy_write(tp, 0x19, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x19, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x00);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x00);
                 ephy_data |= BIT_3;
-                rtl8168_ephy_write(tp, 0x00, ephy_data);
-                ephy_data = rtl8168_ephy_read(tp, 0x0C);
+                rtl8168_ephy_write(ioaddr, 0x00, ephy_data);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0C);
                 ephy_data &= ~(BIT_13 | BIT_12 | BIT_11 | BIT_10 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4);
                 ephy_data |= BIT_9;
-                rtl8168_ephy_write(tp, 0x0C, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x0C, ephy_data);
 
                 break;
         case CFG_METHOD_20:
-                ephy_data = rtl8168_ephy_read(tp, 0x06);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x06);
                 ephy_data |= BIT_5;
                 ephy_data &= ~(BIT_7 | BIT_6);
-                rtl8168_ephy_write(tp, 0x06, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x06, ephy_data);
 
-                rtl8168_ephy_write(tp, 0x0f, 0x5200);
+                rtl8168_ephy_write(ioaddr, 0x0f, 0x5200);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x19);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x19);
                 ephy_data |= (BIT_2 | BIT_5 | BIT_9);
-                rtl8168_ephy_write(tp, 0x19, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x19, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x00);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x00);
                 ephy_data |= BIT_3;
-                rtl8168_ephy_write(tp, 0x00, ephy_data);
-                ephy_data = rtl8168_ephy_read(tp, 0x0C);
+                rtl8168_ephy_write(ioaddr, 0x00, ephy_data);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0C);
                 ephy_data &= ~(BIT_13 | BIT_12 | BIT_11 | BIT_10 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4);
                 ephy_data |= BIT_9;
-                rtl8168_ephy_write(tp, 0x0C, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x0C, ephy_data);
 
                 break;
         case CFG_METHOD_21:
         case CFG_METHOD_22:
 
-                ephy_data = rtl8168_ephy_read(tp, 0x00);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x00);
                 ephy_data &= ~(BIT_3);
-                rtl8168_ephy_write(tp, 0x00, ephy_data);
-                ephy_data = rtl8168_ephy_read(tp, 0x0C);
+                rtl8168_ephy_write(ioaddr, 0x00, ephy_data);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0C);
                 ephy_data &= ~(BIT_13 | BIT_12 | BIT_11 | BIT_10 | BIT_9 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4);
                 ephy_data |= (BIT_5 | BIT_11);
-                rtl8168_ephy_write(tp, 0x0C, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x0C, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x1E);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x1E);
                 ephy_data |= (BIT_0);
-                rtl8168_ephy_write(tp, 0x1E, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x1E, ephy_data);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x19);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x19);
                 ephy_data &= ~(BIT_15);
-                rtl8168_ephy_write(tp, 0x19, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x19, ephy_data);
 
                 break;
         case CFG_METHOD_25:
-                ephy_data = rtl8168_ephy_read(tp, 0x00);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x00);
                 ephy_data &= ~BIT_3;
-                rtl8168_ephy_write(tp, 0x00, ephy_data);
-                ephy_data = rtl8168_ephy_read(tp, 0x0C);
+                rtl8168_ephy_write(ioaddr, 0x00, ephy_data);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0C);
                 ephy_data &= ~(BIT_13 | BIT_12 | BIT_11 | BIT_10| BIT_9 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4);
                 ephy_data |= (BIT_5 | BIT_11);
-                rtl8168_ephy_write(tp, 0x0C, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x0C, ephy_data);
 
-                rtl8168_ephy_write(tp, 0x19, 0x7C00);
-                rtl8168_ephy_write(tp, 0x1E, 0x20EB);
-                rtl8168_ephy_write(tp, 0x0D, 0x1666);
-                rtl8168_ephy_write(tp, 0x00, 0x10A3);
-                rtl8168_ephy_write(tp, 0x06, 0xF050);
+                rtl8168_ephy_write(ioaddr, 0x19, 0x7C00);
+                rtl8168_ephy_write(ioaddr, 0x1E, 0x20EB);
+                rtl8168_ephy_write(ioaddr, 0x0D, 0x1666);
+                rtl8168_ephy_write(ioaddr, 0x00, 0x10A3);
+                rtl8168_ephy_write(ioaddr, 0x06, 0xF050);
 
                 SetPCIePhyBit(tp, 0x04, BIT_4);
                 ClearPCIePhyBit(tp, 0x1D, BIT_14);
@@ -10867,10 +9640,11 @@
                 break;
         case CFG_METHOD_26:
                 ClearPCIePhyBit(tp, 0x00, BIT_3);
-                ClearAndSetPCIePhyBit(tp,
-                                      0x0C,
-                                      (BIT_13 | BIT_12 | BIT_10 | BIT_9 | BIT_8 | BIT_7 | BIT_6 | BIT_4),
-                                      (BIT_5 | BIT_11));
+                ClearAndSetPCIePhyBit( tp,
+                                       0x0C,
+                                       (BIT_13 | BIT_12 | BIT_10 | BIT_9 | BIT_8 | BIT_7 | BIT_6 | BIT_4),
+                                       (BIT_5 | BIT_11)
+                                     );
                 SetPCIePhyBit(tp, 0x1E, BIT_0);
                 ClearPCIePhyBit(tp, 0x19, BIT_15);
 
@@ -10888,84 +9662,59 @@
 
                 break;
         case CFG_METHOD_23:
-                rtl8168_ephy_write(tp, 0x00, 0x10AB);
-                rtl8168_ephy_write(tp, 0x06, 0xf030);
-                rtl8168_ephy_write(tp, 0x08, 0x2006);
-                rtl8168_ephy_write(tp, 0x0D, 0x1666);
+                rtl8168_ephy_write(ioaddr, 0x00, 0x10AB);
+                rtl8168_ephy_write(ioaddr, 0x06, 0xf030);
+                rtl8168_ephy_write(ioaddr, 0x08, 0x2006);
+                rtl8168_ephy_write(ioaddr, 0x0D, 0x1666);
 
-                ephy_data = rtl8168_ephy_read(tp, 0x0C);
+                ephy_data = rtl8168_ephy_read(ioaddr, 0x0C);
                 ephy_data &= ~(BIT_13 | BIT_12 | BIT_11 | BIT_10 | BIT_9 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4);
-                rtl8168_ephy_write(tp, 0x0C, ephy_data);
+                rtl8168_ephy_write(ioaddr, 0x0C, ephy_data);
 
                 break;
         case CFG_METHOD_27:
-                rtl8168_ephy_write(tp, 0x00, 0x10A3);
-                rtl8168_ephy_write(tp, 0x19, 0xFC00);
-                rtl8168_ephy_write(tp, 0x1E, 0x20EA);
+                rtl8168_ephy_write(ioaddr, 0x00, 0x10A3);
+                rtl8168_ephy_write(ioaddr, 0x19, 0xFC00);
+                rtl8168_ephy_write(ioaddr, 0x1E, 0x20EA);
 
                 break;
         case CFG_METHOD_28:
-                rtl8168_ephy_write(tp, 0x00, 0x10AB);
-                rtl8168_ephy_write(tp, 0x19, 0xFC00);
-                rtl8168_ephy_write(tp, 0x1E, 0x20EB);
-                rtl8168_ephy_write(tp, 0x0D, 0x1666);
-                ClearPCIePhyBit(tp, 0x0B, BIT_0);
-                SetPCIePhyBit(tp, 0x1D, BIT_14);
+                SetPCIePhyBit(tp, 0x00, BIT_7);
                 ClearAndSetPCIePhyBit(tp,
-                                      0x0C,
-                                      BIT_13 | BIT_12 | BIT_11 | BIT_10 | BIT_8 | BIT_7 | BIT_6 | BIT_5,
-                                      BIT_9 | BIT_4);
+                                      0x0D,
+                                      BIT_8,
+                                      BIT_9
+                                     );
+                ClearPCIePhyBit(tp, 0x19, (BIT_15 | BIT_5 | BIT_0));
+                SetPCIePhyBit(tp, 0x1E, BIT_13);
 
                 break;
         case CFG_METHOD_29:
         case CFG_METHOD_30:
-        case CFG_METHOD_37:
                 ClearPCIePhyBit(tp, 0x1E, BIT_11);
 
                 SetPCIePhyBit(tp, 0x1E, BIT_0);
                 SetPCIePhyBit(tp, 0x1D, BIT_11);
 
-                rtl8168_ephy_write(tp, 0x05, 0x2089);
-                rtl8168_ephy_write(tp, 0x06, 0x5881);
+                rtl8168_ephy_write(ioaddr, 0x05, 0x2089);
+                rtl8168_ephy_write(ioaddr, 0x06, 0x5881);
 
-                rtl8168_ephy_write(tp, 0x04, 0x854A);
-                rtl8168_ephy_write(tp, 0x01, 0x068B);
+                rtl8168_ephy_write(ioaddr, 0x04, 0x854A);
+                rtl8168_ephy_write(ioaddr, 0x01, 0x068B);
 
                 break;
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
                 ClearAndSetPCIePhyBit(tp,
                                       0x19,
                                       BIT_6,
-                                      (BIT_12| BIT_8));
+                                      (BIT_12| BIT_8)
+                                     );
                 ClearAndSetPCIePhyBit(tp,
                                       0x59,
                                       BIT_6,
-                                      (BIT_12| BIT_8));
-
-                ClearPCIePhyBit(tp, 0x0C, BIT_4);
-                ClearPCIePhyBit(tp, 0x4C, BIT_4);
-                ClearPCIePhyBit(tp, 0x0B, BIT_0);
-
-                break;
-        case CFG_METHOD_35:
-                rtl8168_clear_mcu_ocp_bit(tp, 0xD438, BIT_2);
-
-                ClearPCIePhyBit(tp, 0x24, BIT_9);
-
-                rtl8168_clear_mcu_ocp_bit(tp, 0xDE28, (BIT_1 | BIT_0));
-
-                rtl8168_set_mcu_ocp_bit(tp, 0xD438, BIT_2);
-
-                break;
-        case CFG_METHOD_36:
-                rtl8168_clear_mcu_ocp_bit(tp, 0xD438, BIT_2);
-
-                rtl8168_clear_mcu_ocp_bit(tp, 0xDE28, (BIT_1 | BIT_0));
-
-                rtl8168_set_mcu_ocp_bit(tp, 0xD438, BIT_2);
+                                      (BIT_12| BIT_8)
+                                     );
 
                 break;
         }
@@ -10979,7 +9728,7 @@
         int retval = TRUE;
 
         switch (tp->mcfg) {
-        case CFG_METHOD_21 ... CFG_METHOD_37:
+        case CFG_METHOD_21 ... CFG_METHOD_32:
                 rtl8168_mdio_write(tp,0x1f, 0x0B82);
                 rtl8168_set_eth_phy_bit(tp, 0x10, BIT_4);
 
@@ -10987,12 +9736,14 @@
                 WaitCnt = 0;
                 do {
                         PhyRegValue = rtl8168_mdio_read(tp, 0x10);
+                        PhyRegValue &= 0x0040;
                         udelay(100);
                         WaitCnt++;
-                }  while (!(PhyRegValue & BIT_6) && (WaitCnt < 1000));
+                } while(PhyRegValue != 0x0040 && WaitCnt <1000);
 
-                if (!(PhyRegValue & BIT_6) && (WaitCnt == 1000))
+                if (WaitCnt == 1000) {
                         retval = FALSE;
+                }
 
                 rtl8168_mdio_write(tp,0x1f, 0x0000);
                 break;
@@ -11009,20 +9760,22 @@
         int retval = TRUE;
 
         switch (tp->mcfg) {
-        case CFG_METHOD_21 ... CFG_METHOD_37:
+        case CFG_METHOD_21 ... CFG_METHOD_32:
                 rtl8168_mdio_write(tp, 0x1f, 0x0B82);
                 rtl8168_clear_eth_phy_bit(tp, 0x10, BIT_4);
 
-                rtl8168_mdio_write(tp,0x1f, 0x0B80);
+                rtl8168_mdio_write(tp,0x1f, 0x0A22);
                 WaitCnt = 0;
                 do {
-                        PhyRegValue = rtl8168_mdio_read(tp, 0x10);
+                        PhyRegValue = rtl8168_mdio_read(tp, 0x12);
+                        PhyRegValue &= 0x0010;
                         udelay(100);
                         WaitCnt++;
-                } while ((PhyRegValue & BIT_6) && (WaitCnt < 1000));
+                } while(PhyRegValue != 0x0010 && WaitCnt <1000);
 
-                if ((PhyRegValue & BIT_6) && (WaitCnt == 1000))
+                if (WaitCnt == 1000) {
                         retval = FALSE;
+                }
 
                 rtl8168_mdio_write(tp,0x1f, 0x0000);
                 break;
@@ -11031,17 +9784,18 @@
         return retval;
 }
 
-static u16
-rtl8168_get_hw_phy_mcu_code_ver(struct rtl8168_private *tp)
+static int
+rtl8168_check_hw_phy_mcu_code_ver(struct net_device *dev)
 {
-        u16 hw_ram_code_ver = ~0;
+        struct rtl8168_private *tp = netdev_priv(dev);
+        int ram_code_ver_match = 0;
 
         switch (tp->mcfg) {
         case CFG_METHOD_14:
         case CFG_METHOD_15:
                 rtl8168_mdio_write(tp, 0x1F, 0x0005);
                 rtl8168_mdio_write(tp, 0x05, 0x8B60);
-                hw_ram_code_ver = rtl8168_mdio_read(tp, 0x06);
+                tp->hw_ram_code_ver = rtl8168_mdio_read(tp, 0x06);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                 break;
         case CFG_METHOD_16:
@@ -11051,7 +9805,7 @@
         case CFG_METHOD_20:
                 rtl8168_mdio_write(tp, 0x1F, 0x0005);
                 rtl8168_mdio_write(tp, 0x05, 0x8B30);
-                hw_ram_code_ver = rtl8168_mdio_read(tp, 0x06);
+                tp->hw_ram_code_ver = rtl8168_mdio_read(tp, 0x06);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                 break;
         case CFG_METHOD_21:
@@ -11066,14 +9820,9 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x801E);
-                hw_ram_code_ver = rtl8168_mdio_read(tp, 0x14);
+                tp->hw_ram_code_ver = rtl8168_mdio_read(tp, 0x14);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                 break;
         default:
@@ -11081,57 +9830,7 @@
                 break;
         }
 
-        return hw_ram_code_ver;
-}
-
-#ifndef ENABLE_USE_FIRMWARE_FILE
-static void
-rtl8168_enable_phy_disable_mode(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        switch (tp->HwSuppCheckPhyDisableModeVer) {
-        case 1:
-                rtl8168_mac_ocp_write(tp, 0xDC20, rtl8168_mac_ocp_read(tp, 0xDC20) | BIT_1);
-                break;
-        case 2:
-        case 3:
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_5);
-                break;
-        }
-
-        dprintk("enable phy disable mode.\n");
-}
-
-static void
-rtl8168_disable_phy_disable_mode(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        switch (tp->HwSuppCheckPhyDisableModeVer) {
-        case 1:
-                rtl8168_mac_ocp_write(tp, 0xDC20, rtl8168_mac_ocp_read(tp, 0xDC20) & ~BIT_1);
-                break;
-        case 2:
-        case 3:
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) & ~BIT_5);
-                break;
-        }
-
-        mdelay(1);
-
-        dprintk("disable phy disable mode.\n");
-}
-
-static int
-rtl8168_check_hw_phy_mcu_code_ver(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        int ram_code_ver_match = 0;
-
-        tp->hw_ram_code_ver = rtl8168_get_hw_phy_mcu_code_ver(tp);
-
-        if (tp->hw_ram_code_ver == tp->sw_ram_code_ver) {
+        if ( tp->hw_ram_code_ver == tp->sw_ram_code_ver) {
                 ram_code_ver_match = 1;
                 tp->HwHasWrRamCodeToMicroP = TRUE;
         }
@@ -11176,11 +9875,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x801E);
                 rtl8168_mdio_write(tp, 0x14, tp->sw_ram_code_ver);
@@ -11215,7 +9909,7 @@
                 PhyRegValue &= ~(BIT_11);
                 rtl8168_mdio_write(tp, 0x14, PhyRegValue);
 
-                rtl8168_set_phy_mcu_patch_request(tp);
+                retval = rtl8168_set_phy_mcu_patch_request(tp);
 
                 rtl8168_mdio_write(tp, 0x1f, 0x0A40);
                 rtl8168_mdio_write(tp, 0x10, 0x0140);
@@ -11236,7 +9930,7 @@
                 PhyRegValue |= (BIT_11|BIT_12);
                 rtl8168_mdio_write(tp, 0x11, PhyRegValue);
 
-                rtl8168_clear_phy_mcu_patch_request(tp);
+                retval = rtl8168_clear_phy_mcu_patch_request(tp);
 
                 rtl8168_mdio_write(tp, 0x1f, 0x0A40);
                 rtl8168_mdio_write(tp, 0x10, 0x1040);
@@ -11262,7 +9956,7 @@
                 PhyRegValue |= (BIT_11);
                 rtl8168_mdio_write(tp, 0x14, PhyRegValue);
 
-                rtl8168_set_phy_mcu_patch_request(tp);
+                retval = rtl8168_set_phy_mcu_patch_request(tp);
 
                 rtl8168_mdio_write(tp, 0x1f, 0x0A20);
                 PhyRegValue = rtl8168_mdio_read(tp, 0x13);
@@ -11272,7 +9966,7 @@
                         }
                 }
 
-                rtl8168_clear_phy_mcu_patch_request(tp);
+                retval = rtl8168_clear_phy_mcu_patch_request(tp);
 
                 mdelay(2);
                 break;
@@ -22076,7 +20770,7 @@
         rtl8168_mdio_write(tp, 0x13, 0x0000);
         rtl8168_mdio_write(tp, 0x14, 0x0000);
         rtl8168_mdio_write(tp, 0x1f, 0x0B82);
-        gphy_val = rtl8168_mdio_read(tp, 0x17);
+        gphy_val = rtl8168_mdio_read(tp,  0x17);
         gphy_val &= ~(BIT_0);
         rtl8168_mdio_write(tp, 0x17, gphy_val);
         rtl8168_mdio_write(tp, 0x1f, 0x0A43);
@@ -22109,45 +20803,23 @@
         rtl8168_mdio_write(tp, 0x13, 0xA014);
         rtl8168_mdio_write(tp, 0x14, 0x2c04);
         rtl8168_mdio_write(tp, 0x14, 0x2c09);
-        rtl8168_mdio_write(tp, 0x14, 0x2c0d);
-        rtl8168_mdio_write(tp, 0x14, 0x2c12);
+        rtl8168_mdio_write(tp, 0x14, 0x2c09);
+        rtl8168_mdio_write(tp, 0x14, 0x2c09);
         rtl8168_mdio_write(tp, 0x14, 0xad01);
         rtl8168_mdio_write(tp, 0x14, 0xad01);
         rtl8168_mdio_write(tp, 0x14, 0xad01);
         rtl8168_mdio_write(tp, 0x14, 0xad01);
         rtl8168_mdio_write(tp, 0x14, 0x236c);
-        rtl8168_mdio_write(tp, 0x14, 0xd03c);
-        rtl8168_mdio_write(tp, 0x14, 0xd1aa);
-        rtl8168_mdio_write(tp, 0x14, 0xc010);
-        rtl8168_mdio_write(tp, 0x14, 0x2745);
-        rtl8168_mdio_write(tp, 0x14, 0x33de);
-        rtl8168_mdio_write(tp, 0x14, 0x16ba);
-        rtl8168_mdio_write(tp, 0x14, 0x31ee);
-        rtl8168_mdio_write(tp, 0x14, 0x2712);
-        rtl8168_mdio_write(tp, 0x14, 0x274e);
-        rtl8168_mdio_write(tp, 0x14, 0xc2bb);
-        rtl8168_mdio_write(tp, 0x14, 0xd500);
-        rtl8168_mdio_write(tp, 0x14, 0xc426);
-        rtl8168_mdio_write(tp, 0x14, 0xd01d);
-        rtl8168_mdio_write(tp, 0x14, 0xd1c3);
-        rtl8168_mdio_write(tp, 0x14, 0x401c);
-        rtl8168_mdio_write(tp, 0x14, 0xd501);
-        rtl8168_mdio_write(tp, 0x14, 0xc2b3);
-        rtl8168_mdio_write(tp, 0x14, 0xd500);
-        rtl8168_mdio_write(tp, 0x14, 0xd00b);
-        rtl8168_mdio_write(tp, 0x14, 0xd1c3);
-        rtl8168_mdio_write(tp, 0x14, 0x401c);
-        rtl8168_mdio_write(tp, 0x14, 0x241a);
         rtl8168_mdio_write(tp, 0x13, 0xA01A);
         rtl8168_mdio_write(tp, 0x14, 0x0000);
         rtl8168_mdio_write(tp, 0x13, 0xA006);
-        rtl8168_mdio_write(tp, 0x14, 0x0414);
+        rtl8168_mdio_write(tp, 0x14, 0x0fff);
         rtl8168_mdio_write(tp, 0x13, 0xA004);
-        rtl8168_mdio_write(tp, 0x14, 0x074c);
+        rtl8168_mdio_write(tp, 0x14, 0x0fff);
         rtl8168_mdio_write(tp, 0x13, 0xA002);
-        rtl8168_mdio_write(tp, 0x14, 0x0744);
+        rtl8168_mdio_write(tp, 0x14, 0x0fff);
         rtl8168_mdio_write(tp, 0x13, 0xA000);
-        rtl8168_mdio_write(tp, 0x14, 0xf36b);
+        rtl8168_mdio_write(tp, 0x14, 0x136b);
         rtl8168_mdio_write(tp, 0x13, 0xB820);
         rtl8168_mdio_write(tp, 0x14, 0x0210);
 
@@ -22457,608 +21129,13 @@
 }
 
 static void
-rtl8168_set_phy_mcu_8168h_3(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        unsigned int gphy_val;
-
-        rtl8168_set_phy_mcu_patch_request(tp);
-
-
-        rtl8168_mdio_write(tp, 0x1f, 0x0A43);
-        rtl8168_mdio_write(tp, 0x13, 0x8042);
-        rtl8168_mdio_write(tp, 0x14, 0x3800);
-        rtl8168_mdio_write(tp, 0x13, 0xB82E);
-        rtl8168_mdio_write(tp, 0x14, 0x0001);
-
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-        rtl8168_mdio_write(tp, 0x13, 0xB820);
-        rtl8168_mdio_write(tp, 0x14, 0x0090);
-        rtl8168_mdio_write(tp, 0x13, 0xA016);
-        rtl8168_mdio_write(tp, 0x14, 0x0000);
-        rtl8168_mdio_write(tp, 0x13, 0xA012);
-        rtl8168_mdio_write(tp, 0x14, 0x0000);
-        rtl8168_mdio_write(tp, 0x13, 0xA014);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x8010);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x8014);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x8022);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x8022);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x8022);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x8022);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x8022);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x8022);
-        rtl8168_mdio_write(tp, 0x14, 0x2b5d);
-        rtl8168_mdio_write(tp, 0x14, 0x0c68);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x0b3c);
-        rtl8168_mdio_write(tp, 0x14, 0xc2bb);
-        rtl8168_mdio_write(tp, 0x14, 0xd500);
-        rtl8168_mdio_write(tp, 0x14, 0xc426);
-        rtl8168_mdio_write(tp, 0x14, 0xd01d);
-        rtl8168_mdio_write(tp, 0x14, 0xd1c3);
-        rtl8168_mdio_write(tp, 0x14, 0x401c);
-        rtl8168_mdio_write(tp, 0x14, 0xd501);
-        rtl8168_mdio_write(tp, 0x14, 0xc2b3);
-        rtl8168_mdio_write(tp, 0x14, 0xd500);
-        rtl8168_mdio_write(tp, 0x14, 0xd00b);
-        rtl8168_mdio_write(tp, 0x14, 0xd1c3);
-        rtl8168_mdio_write(tp, 0x14, 0x401c);
-        rtl8168_mdio_write(tp, 0x14, 0x1800);
-        rtl8168_mdio_write(tp, 0x14, 0x0478);
-        rtl8168_mdio_write(tp, 0x13, 0xA026);
-        rtl8168_mdio_write(tp, 0x14, 0x0fff);
-        rtl8168_mdio_write(tp, 0x13, 0xA024);
-        rtl8168_mdio_write(tp, 0x14, 0x0fff);
-        rtl8168_mdio_write(tp, 0x13, 0xA022);
-        rtl8168_mdio_write(tp, 0x14, 0x0fff);
-        rtl8168_mdio_write(tp, 0x13, 0xA020);
-        rtl8168_mdio_write(tp, 0x14, 0x0fff);
-        rtl8168_mdio_write(tp, 0x13, 0xA006);
-        rtl8168_mdio_write(tp, 0x14, 0x0fff);
-        rtl8168_mdio_write(tp, 0x13, 0xA004);
-        rtl8168_mdio_write(tp, 0x14, 0x0fff);
-        rtl8168_mdio_write(tp, 0x13, 0xA002);
-        rtl8168_mdio_write(tp, 0x14, 0x0472);
-        rtl8168_mdio_write(tp, 0x13, 0xA000);
-        rtl8168_mdio_write(tp, 0x14, 0x0b3a);
-        rtl8168_mdio_write(tp, 0x13, 0xA008);
-        rtl8168_mdio_write(tp, 0x14, 0x0300);
-        rtl8168_mdio_write(tp, 0x13, 0xB820);
-        rtl8168_mdio_write(tp, 0x14, 0x0010);
-
-
-        rtl8168_mdio_write(tp, 0x13, 0x83f3);
-        rtl8168_mdio_write(tp, 0x14, 0xaf84);
-        rtl8168_mdio_write(tp, 0x14, 0x0baf);
-        rtl8168_mdio_write(tp, 0x14, 0x8466);
-        rtl8168_mdio_write(tp, 0x14, 0xaf84);
-        rtl8168_mdio_write(tp, 0x14, 0xcdaf);
-        rtl8168_mdio_write(tp, 0x14, 0x873c);
-        rtl8168_mdio_write(tp, 0x14, 0xaf87);
-        rtl8168_mdio_write(tp, 0x14, 0x3faf);
-        rtl8168_mdio_write(tp, 0x14, 0x8760);
-        rtl8168_mdio_write(tp, 0x14, 0xaf87);
-        rtl8168_mdio_write(tp, 0x14, 0x60af);
-        rtl8168_mdio_write(tp, 0x14, 0x8760);
-        rtl8168_mdio_write(tp, 0x14, 0xef79);
-        rtl8168_mdio_write(tp, 0x14, 0xfb89);
-        rtl8168_mdio_write(tp, 0x14, 0xe987);
-        rtl8168_mdio_write(tp, 0x14, 0xffd7);
-        rtl8168_mdio_write(tp, 0x14, 0x0017);
-        rtl8168_mdio_write(tp, 0x14, 0xd400);
-        rtl8168_mdio_write(tp, 0x14, 0x051c);
-        rtl8168_mdio_write(tp, 0x14, 0x421a);
-        rtl8168_mdio_write(tp, 0x14, 0x741b);
-        rtl8168_mdio_write(tp, 0x14, 0x97e9);
-        rtl8168_mdio_write(tp, 0x14, 0x87fe);
-        rtl8168_mdio_write(tp, 0x14, 0xffef);
-        rtl8168_mdio_write(tp, 0x14, 0x97e0);
-        rtl8168_mdio_write(tp, 0x14, 0x82aa);
-        rtl8168_mdio_write(tp, 0x14, 0xa000);
-        rtl8168_mdio_write(tp, 0x14, 0x08ef);
-        rtl8168_mdio_write(tp, 0x14, 0x46dc);
-        rtl8168_mdio_write(tp, 0x14, 0x19dd);
-        rtl8168_mdio_write(tp, 0x14, 0xaf1a);
-        rtl8168_mdio_write(tp, 0x14, 0x37a0);
-        rtl8168_mdio_write(tp, 0x14, 0x012d);
-        rtl8168_mdio_write(tp, 0x14, 0xe082);
-        rtl8168_mdio_write(tp, 0x14, 0xa7ac);
-        rtl8168_mdio_write(tp, 0x14, 0x2013);
-        rtl8168_mdio_write(tp, 0x14, 0xe087);
-        rtl8168_mdio_write(tp, 0x14, 0xffe1);
-        rtl8168_mdio_write(tp, 0x14, 0x87fe);
-        rtl8168_mdio_write(tp, 0x14, 0xac27);
-        rtl8168_mdio_write(tp, 0x14, 0x05a1);
-        rtl8168_mdio_write(tp, 0x14, 0x0807);
-        rtl8168_mdio_write(tp, 0x14, 0xae0f);
-        rtl8168_mdio_write(tp, 0x14, 0xa107);
-        rtl8168_mdio_write(tp, 0x14, 0x02ae);
-        rtl8168_mdio_write(tp, 0x14, 0x0aef);
-        rtl8168_mdio_write(tp, 0x14, 0x4619);
-        rtl8168_mdio_write(tp, 0x14, 0x19dc);
-        rtl8168_mdio_write(tp, 0x14, 0x19dd);
-        rtl8168_mdio_write(tp, 0x14, 0xaf1a);
-        rtl8168_mdio_write(tp, 0x14, 0x37d8);
-        rtl8168_mdio_write(tp, 0x14, 0x19d9);
-        rtl8168_mdio_write(tp, 0x14, 0x19dc);
-        rtl8168_mdio_write(tp, 0x14, 0x19dd);
-        rtl8168_mdio_write(tp, 0x14, 0xaf1a);
-        rtl8168_mdio_write(tp, 0x14, 0x3719);
-        rtl8168_mdio_write(tp, 0x14, 0x19ae);
-        rtl8168_mdio_write(tp, 0x14, 0xcfbf);
-        rtl8168_mdio_write(tp, 0x14, 0x878a);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdc3c);
-        rtl8168_mdio_write(tp, 0x14, 0x0005);
-        rtl8168_mdio_write(tp, 0x14, 0xaaf5);
-        rtl8168_mdio_write(tp, 0x14, 0x0249);
-        rtl8168_mdio_write(tp, 0x14, 0xcaef);
-        rtl8168_mdio_write(tp, 0x14, 0x67d7);
-        rtl8168_mdio_write(tp, 0x14, 0x0014);
-        rtl8168_mdio_write(tp, 0x14, 0x0249);
-        rtl8168_mdio_write(tp, 0x14, 0xe5ad);
-        rtl8168_mdio_write(tp, 0x14, 0x50f7);
-        rtl8168_mdio_write(tp, 0x14, 0xd400);
-        rtl8168_mdio_write(tp, 0x14, 0x01bf);
-        rtl8168_mdio_write(tp, 0x14, 0x46a7);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0x98bf);
-        rtl8168_mdio_write(tp, 0x14, 0x465c);
-        rtl8168_mdio_write(tp, 0x14, 0x024a);
-        rtl8168_mdio_write(tp, 0x14, 0x5fd4);
-        rtl8168_mdio_write(tp, 0x14, 0x0003);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x9c02);
-        rtl8168_mdio_write(tp, 0x14, 0x4498);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x9902);
-        rtl8168_mdio_write(tp, 0x14, 0x4a5f);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x8d02);
-        rtl8168_mdio_write(tp, 0x14, 0x4a5f);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x9002);
-        rtl8168_mdio_write(tp, 0x14, 0x44dc);
-        rtl8168_mdio_write(tp, 0x14, 0xad28);
-        rtl8168_mdio_write(tp, 0x14, 0xf7bf);
-        rtl8168_mdio_write(tp, 0x14, 0x8796);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdcad);
-        rtl8168_mdio_write(tp, 0x14, 0x28f7);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x9302);
-        rtl8168_mdio_write(tp, 0x14, 0x4a5f);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x9302);
-        rtl8168_mdio_write(tp, 0x14, 0x4a56);
-        rtl8168_mdio_write(tp, 0x14, 0xbf46);
-        rtl8168_mdio_write(tp, 0x14, 0x5c02);
-        rtl8168_mdio_write(tp, 0x14, 0x4a56);
-        rtl8168_mdio_write(tp, 0x14, 0xbf45);
-        rtl8168_mdio_write(tp, 0x14, 0x21af);
-        rtl8168_mdio_write(tp, 0x14, 0x020e);
-        rtl8168_mdio_write(tp, 0x14, 0xee82);
-        rtl8168_mdio_write(tp, 0x14, 0x5000);
-        rtl8168_mdio_write(tp, 0x14, 0x0284);
-        rtl8168_mdio_write(tp, 0x14, 0xdd02);
-        rtl8168_mdio_write(tp, 0x14, 0x8521);
-        rtl8168_mdio_write(tp, 0x14, 0x0285);
-        rtl8168_mdio_write(tp, 0x14, 0x36af);
-        rtl8168_mdio_write(tp, 0x14, 0x03d2);
-        rtl8168_mdio_write(tp, 0x14, 0xf8f9);
-        rtl8168_mdio_write(tp, 0x14, 0xfafb);
-        rtl8168_mdio_write(tp, 0x14, 0xef59);
-        rtl8168_mdio_write(tp, 0x14, 0xbf45);
-        rtl8168_mdio_write(tp, 0x14, 0x3002);
-        rtl8168_mdio_write(tp, 0x14, 0x44dc);
-        rtl8168_mdio_write(tp, 0x14, 0x3c00);
-        rtl8168_mdio_write(tp, 0x14, 0x03aa);
-        rtl8168_mdio_write(tp, 0x14, 0x2cbf);
-        rtl8168_mdio_write(tp, 0x14, 0x8790);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdcad);
-        rtl8168_mdio_write(tp, 0x14, 0x2823);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x9602);
-        rtl8168_mdio_write(tp, 0x14, 0x44dc);
-        rtl8168_mdio_write(tp, 0x14, 0xad28);
-        rtl8168_mdio_write(tp, 0x14, 0x1a02);
-        rtl8168_mdio_write(tp, 0x14, 0x49ca);
-        rtl8168_mdio_write(tp, 0x14, 0xef67);
-        rtl8168_mdio_write(tp, 0x14, 0xd700);
-        rtl8168_mdio_write(tp, 0x14, 0x0202);
-        rtl8168_mdio_write(tp, 0x14, 0x49e5);
-        rtl8168_mdio_write(tp, 0x14, 0xad50);
-        rtl8168_mdio_write(tp, 0x14, 0xf7bf);
-        rtl8168_mdio_write(tp, 0x14, 0x8793);
-        rtl8168_mdio_write(tp, 0x14, 0x024a);
-        rtl8168_mdio_write(tp, 0x14, 0x5fbf);
-        rtl8168_mdio_write(tp, 0x14, 0x8793);
-        rtl8168_mdio_write(tp, 0x14, 0x024a);
-        rtl8168_mdio_write(tp, 0x14, 0x56ef);
-        rtl8168_mdio_write(tp, 0x14, 0x95ff);
-        rtl8168_mdio_write(tp, 0x14, 0xfefd);
-        rtl8168_mdio_write(tp, 0x14, 0xfc04);
-        rtl8168_mdio_write(tp, 0x14, 0xf8fa);
-        rtl8168_mdio_write(tp, 0x14, 0xef69);
-        rtl8168_mdio_write(tp, 0x14, 0xe080);
-        rtl8168_mdio_write(tp, 0x14, 0x15ad);
-        rtl8168_mdio_write(tp, 0x14, 0x2406);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x8702);
-        rtl8168_mdio_write(tp, 0x14, 0x4a56);
-        rtl8168_mdio_write(tp, 0x14, 0xef96);
-        rtl8168_mdio_write(tp, 0x14, 0xfefc);
-        rtl8168_mdio_write(tp, 0x14, 0x04f8);
-        rtl8168_mdio_write(tp, 0x14, 0xe087);
-        rtl8168_mdio_write(tp, 0x14, 0xf9e1);
-        rtl8168_mdio_write(tp, 0x14, 0x87fa);
-        rtl8168_mdio_write(tp, 0x14, 0x1b10);
-        rtl8168_mdio_write(tp, 0x14, 0x9f1e);
-        rtl8168_mdio_write(tp, 0x14, 0xee87);
-        rtl8168_mdio_write(tp, 0x14, 0xf900);
-        rtl8168_mdio_write(tp, 0x14, 0xe080);
-        rtl8168_mdio_write(tp, 0x14, 0x15ac);
-        rtl8168_mdio_write(tp, 0x14, 0x2606);
-        rtl8168_mdio_write(tp, 0x14, 0xee87);
-        rtl8168_mdio_write(tp, 0x14, 0xf700);
-        rtl8168_mdio_write(tp, 0x14, 0xae12);
-        rtl8168_mdio_write(tp, 0x14, 0x0286);
-        rtl8168_mdio_write(tp, 0x14, 0x9d02);
-        rtl8168_mdio_write(tp, 0x14, 0x8565);
-        rtl8168_mdio_write(tp, 0x14, 0x0285);
-        rtl8168_mdio_write(tp, 0x14, 0x9d02);
-        rtl8168_mdio_write(tp, 0x14, 0x8660);
-        rtl8168_mdio_write(tp, 0x14, 0xae04);
-        rtl8168_mdio_write(tp, 0x14, 0x10e4);
-        rtl8168_mdio_write(tp, 0x14, 0x87f9);
-        rtl8168_mdio_write(tp, 0x14, 0xfc04);
-        rtl8168_mdio_write(tp, 0x14, 0xf8f9);
-        rtl8168_mdio_write(tp, 0x14, 0xfaef);
-        rtl8168_mdio_write(tp, 0x14, 0x69fa);
-        rtl8168_mdio_write(tp, 0x14, 0xbf45);
-        rtl8168_mdio_write(tp, 0x14, 0x3002);
-        rtl8168_mdio_write(tp, 0x14, 0x44dc);
-        rtl8168_mdio_write(tp, 0x14, 0xa103);
-        rtl8168_mdio_write(tp, 0x14, 0x22e0);
-        rtl8168_mdio_write(tp, 0x14, 0x87eb);
-        rtl8168_mdio_write(tp, 0x14, 0xe187);
-        rtl8168_mdio_write(tp, 0x14, 0xecef);
-        rtl8168_mdio_write(tp, 0x14, 0x64bf);
-        rtl8168_mdio_write(tp, 0x14, 0x876f);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdc1b);
-        rtl8168_mdio_write(tp, 0x14, 0x46aa);
-        rtl8168_mdio_write(tp, 0x14, 0x0abf);
-        rtl8168_mdio_write(tp, 0x14, 0x8772);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdc1b);
-        rtl8168_mdio_write(tp, 0x14, 0x46ab);
-        rtl8168_mdio_write(tp, 0x14, 0x06bf);
-        rtl8168_mdio_write(tp, 0x14, 0x876c);
-        rtl8168_mdio_write(tp, 0x14, 0x024a);
-        rtl8168_mdio_write(tp, 0x14, 0x5ffe);
-        rtl8168_mdio_write(tp, 0x14, 0xef96);
-        rtl8168_mdio_write(tp, 0x14, 0xfefd);
-        rtl8168_mdio_write(tp, 0x14, 0xfc04);
-        rtl8168_mdio_write(tp, 0x14, 0xf8f9);
-        rtl8168_mdio_write(tp, 0x14, 0xef59);
-        rtl8168_mdio_write(tp, 0x14, 0xf9bf);
-        rtl8168_mdio_write(tp, 0x14, 0x4530);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdca1);
-        rtl8168_mdio_write(tp, 0x14, 0x0310);
-        rtl8168_mdio_write(tp, 0x14, 0xe087);
-        rtl8168_mdio_write(tp, 0x14, 0xf7ac);
-        rtl8168_mdio_write(tp, 0x14, 0x2605);
-        rtl8168_mdio_write(tp, 0x14, 0x0285);
-        rtl8168_mdio_write(tp, 0x14, 0xc9ae);
-        rtl8168_mdio_write(tp, 0x14, 0x0d02);
-        rtl8168_mdio_write(tp, 0x14, 0x8613);
-        rtl8168_mdio_write(tp, 0x14, 0xae08);
-        rtl8168_mdio_write(tp, 0x14, 0xe287);
-        rtl8168_mdio_write(tp, 0x14, 0xf7f6);
-        rtl8168_mdio_write(tp, 0x14, 0x36e6);
-        rtl8168_mdio_write(tp, 0x14, 0x87f7);
-        rtl8168_mdio_write(tp, 0x14, 0xfdef);
-        rtl8168_mdio_write(tp, 0x14, 0x95fd);
-        rtl8168_mdio_write(tp, 0x14, 0xfc04);
-        rtl8168_mdio_write(tp, 0x14, 0xf8f9);
-        rtl8168_mdio_write(tp, 0x14, 0xfafb);
-        rtl8168_mdio_write(tp, 0x14, 0xef79);
-        rtl8168_mdio_write(tp, 0x14, 0xfbbf);
-        rtl8168_mdio_write(tp, 0x14, 0x876f);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdcef);
-        rtl8168_mdio_write(tp, 0x14, 0x64e2);
-        rtl8168_mdio_write(tp, 0x14, 0x87e9);
-        rtl8168_mdio_write(tp, 0x14, 0xe387);
-        rtl8168_mdio_write(tp, 0x14, 0xea1b);
-        rtl8168_mdio_write(tp, 0x14, 0x659e);
-        rtl8168_mdio_write(tp, 0x14, 0x10e4);
-        rtl8168_mdio_write(tp, 0x14, 0x87e9);
-        rtl8168_mdio_write(tp, 0x14, 0xe587);
-        rtl8168_mdio_write(tp, 0x14, 0xeae2);
-        rtl8168_mdio_write(tp, 0x14, 0x87f7);
-        rtl8168_mdio_write(tp, 0x14, 0xf636);
-        rtl8168_mdio_write(tp, 0x14, 0xe687);
-        rtl8168_mdio_write(tp, 0x14, 0xf7ae);
-        rtl8168_mdio_write(tp, 0x14, 0x19e2);
-        rtl8168_mdio_write(tp, 0x14, 0x87f7);
-        rtl8168_mdio_write(tp, 0x14, 0xf736);
-        rtl8168_mdio_write(tp, 0x14, 0xe687);
-        rtl8168_mdio_write(tp, 0x14, 0xf700);
-        rtl8168_mdio_write(tp, 0x14, 0x00ae);
-        rtl8168_mdio_write(tp, 0x14, 0x0200);
-        rtl8168_mdio_write(tp, 0x14, 0x0002);
-        rtl8168_mdio_write(tp, 0x14, 0x49ca);
-        rtl8168_mdio_write(tp, 0x14, 0xef57);
-        rtl8168_mdio_write(tp, 0x14, 0xe687);
-        rtl8168_mdio_write(tp, 0x14, 0xe7e7);
-        rtl8168_mdio_write(tp, 0x14, 0x87e8);
-        rtl8168_mdio_write(tp, 0x14, 0xffef);
-        rtl8168_mdio_write(tp, 0x14, 0x97ff);
-        rtl8168_mdio_write(tp, 0x14, 0xfefd);
-        rtl8168_mdio_write(tp, 0x14, 0xfc04);
-        rtl8168_mdio_write(tp, 0x14, 0xf8f9);
-        rtl8168_mdio_write(tp, 0x14, 0xfafb);
-        rtl8168_mdio_write(tp, 0x14, 0xef79);
-        rtl8168_mdio_write(tp, 0x14, 0xfbe2);
-        rtl8168_mdio_write(tp, 0x14, 0x87e7);
-        rtl8168_mdio_write(tp, 0x14, 0xe387);
-        rtl8168_mdio_write(tp, 0x14, 0xe8ef);
-        rtl8168_mdio_write(tp, 0x14, 0x65e2);
-        rtl8168_mdio_write(tp, 0x14, 0x87fb);
-        rtl8168_mdio_write(tp, 0x14, 0xe387);
-        rtl8168_mdio_write(tp, 0x14, 0xfcef);
-        rtl8168_mdio_write(tp, 0x14, 0x7502);
-        rtl8168_mdio_write(tp, 0x14, 0x49e5);
-        rtl8168_mdio_write(tp, 0x14, 0xac50);
-        rtl8168_mdio_write(tp, 0x14, 0x1abf);
-        rtl8168_mdio_write(tp, 0x14, 0x876f);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdcef);
-        rtl8168_mdio_write(tp, 0x14, 0x64e2);
-        rtl8168_mdio_write(tp, 0x14, 0x87e9);
-        rtl8168_mdio_write(tp, 0x14, 0xe387);
-        rtl8168_mdio_write(tp, 0x14, 0xea1b);
-        rtl8168_mdio_write(tp, 0x14, 0x659e);
-        rtl8168_mdio_write(tp, 0x14, 0x16e4);
-        rtl8168_mdio_write(tp, 0x14, 0x87e9);
-        rtl8168_mdio_write(tp, 0x14, 0xe587);
-        rtl8168_mdio_write(tp, 0x14, 0xeaae);
-        rtl8168_mdio_write(tp, 0x14, 0x06bf);
-        rtl8168_mdio_write(tp, 0x14, 0x876c);
-        rtl8168_mdio_write(tp, 0x14, 0x024a);
-        rtl8168_mdio_write(tp, 0x14, 0x5fe2);
-        rtl8168_mdio_write(tp, 0x14, 0x87f7);
-        rtl8168_mdio_write(tp, 0x14, 0xf636);
-        rtl8168_mdio_write(tp, 0x14, 0xe687);
-        rtl8168_mdio_write(tp, 0x14, 0xf7ff);
-        rtl8168_mdio_write(tp, 0x14, 0xef97);
-        rtl8168_mdio_write(tp, 0x14, 0xfffe);
-        rtl8168_mdio_write(tp, 0x14, 0xfdfc);
-        rtl8168_mdio_write(tp, 0x14, 0x04f8);
-        rtl8168_mdio_write(tp, 0x14, 0xf9fa);
-        rtl8168_mdio_write(tp, 0x14, 0xef69);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x6602);
-        rtl8168_mdio_write(tp, 0x14, 0x44dc);
-        rtl8168_mdio_write(tp, 0x14, 0xad28);
-        rtl8168_mdio_write(tp, 0x14, 0x29bf);
-        rtl8168_mdio_write(tp, 0x14, 0x8763);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdcef);
-        rtl8168_mdio_write(tp, 0x14, 0x54bf);
-        rtl8168_mdio_write(tp, 0x14, 0x8760);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdcac);
-        rtl8168_mdio_write(tp, 0x14, 0x290d);
-        rtl8168_mdio_write(tp, 0x14, 0xac28);
-        rtl8168_mdio_write(tp, 0x14, 0x05a3);
-        rtl8168_mdio_write(tp, 0x14, 0x020c);
-        rtl8168_mdio_write(tp, 0x14, 0xae10);
-        rtl8168_mdio_write(tp, 0x14, 0xa303);
-        rtl8168_mdio_write(tp, 0x14, 0x07ae);
-        rtl8168_mdio_write(tp, 0x14, 0x0ba3);
-        rtl8168_mdio_write(tp, 0x14, 0x0402);
-        rtl8168_mdio_write(tp, 0x14, 0xae06);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x6c02);
-        rtl8168_mdio_write(tp, 0x14, 0x4a5f);
-        rtl8168_mdio_write(tp, 0x14, 0xef96);
-        rtl8168_mdio_write(tp, 0x14, 0xfefd);
-        rtl8168_mdio_write(tp, 0x14, 0xfc04);
-        rtl8168_mdio_write(tp, 0x14, 0xf8f9);
-        rtl8168_mdio_write(tp, 0x14, 0xfafb);
-        rtl8168_mdio_write(tp, 0x14, 0xef69);
-        rtl8168_mdio_write(tp, 0x14, 0xfae0);
-        rtl8168_mdio_write(tp, 0x14, 0x8015);
-        rtl8168_mdio_write(tp, 0x14, 0xad25);
-        rtl8168_mdio_write(tp, 0x14, 0x41d2);
-        rtl8168_mdio_write(tp, 0x14, 0x0002);
-        rtl8168_mdio_write(tp, 0x14, 0x86f3);
-        rtl8168_mdio_write(tp, 0x14, 0xe087);
-        rtl8168_mdio_write(tp, 0x14, 0xebe1);
-        rtl8168_mdio_write(tp, 0x14, 0x87ec);
-        rtl8168_mdio_write(tp, 0x14, 0x1b46);
-        rtl8168_mdio_write(tp, 0x14, 0xab26);
-        rtl8168_mdio_write(tp, 0x14, 0xd40b);
-        rtl8168_mdio_write(tp, 0x14, 0xff1b);
-        rtl8168_mdio_write(tp, 0x14, 0x46aa);
-        rtl8168_mdio_write(tp, 0x14, 0x1fac);
-        rtl8168_mdio_write(tp, 0x14, 0x3204);
-        rtl8168_mdio_write(tp, 0x14, 0xef32);
-        rtl8168_mdio_write(tp, 0x14, 0xae02);
-        rtl8168_mdio_write(tp, 0x14, 0xd304);
-        rtl8168_mdio_write(tp, 0x14, 0x0c31);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0xeb1a);
-        rtl8168_mdio_write(tp, 0x14, 0x93d8);
-        rtl8168_mdio_write(tp, 0x14, 0x19d9);
-        rtl8168_mdio_write(tp, 0x14, 0x1b46);
-        rtl8168_mdio_write(tp, 0x14, 0xab0e);
-        rtl8168_mdio_write(tp, 0x14, 0x19d8);
-        rtl8168_mdio_write(tp, 0x14, 0x19d9);
-        rtl8168_mdio_write(tp, 0x14, 0x1b46);
-        rtl8168_mdio_write(tp, 0x14, 0xaa06);
-        rtl8168_mdio_write(tp, 0x14, 0x12a2);
-        rtl8168_mdio_write(tp, 0x14, 0x08c9);
-        rtl8168_mdio_write(tp, 0x14, 0xae06);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x6902);
-        rtl8168_mdio_write(tp, 0x14, 0x4a5f);
-        rtl8168_mdio_write(tp, 0x14, 0xfeef);
-        rtl8168_mdio_write(tp, 0x14, 0x96ff);
-        rtl8168_mdio_write(tp, 0x14, 0xfefd);
-        rtl8168_mdio_write(tp, 0x14, 0xfc04);
-        rtl8168_mdio_write(tp, 0x14, 0xf8fb);
-        rtl8168_mdio_write(tp, 0x14, 0xef79);
-        rtl8168_mdio_write(tp, 0x14, 0xa200);
-        rtl8168_mdio_write(tp, 0x14, 0x05bf);
-        rtl8168_mdio_write(tp, 0x14, 0x876f);
-        rtl8168_mdio_write(tp, 0x14, 0xae33);
-        rtl8168_mdio_write(tp, 0x14, 0xa201);
-        rtl8168_mdio_write(tp, 0x14, 0x05bf);
-        rtl8168_mdio_write(tp, 0x14, 0x8772);
-        rtl8168_mdio_write(tp, 0x14, 0xae2b);
-        rtl8168_mdio_write(tp, 0x14, 0xa202);
-        rtl8168_mdio_write(tp, 0x14, 0x05bf);
-        rtl8168_mdio_write(tp, 0x14, 0x8775);
-        rtl8168_mdio_write(tp, 0x14, 0xae23);
-        rtl8168_mdio_write(tp, 0x14, 0xa203);
-        rtl8168_mdio_write(tp, 0x14, 0x05bf);
-        rtl8168_mdio_write(tp, 0x14, 0x8778);
-        rtl8168_mdio_write(tp, 0x14, 0xae1b);
-        rtl8168_mdio_write(tp, 0x14, 0xa204);
-        rtl8168_mdio_write(tp, 0x14, 0x05bf);
-        rtl8168_mdio_write(tp, 0x14, 0x877b);
-        rtl8168_mdio_write(tp, 0x14, 0xae13);
-        rtl8168_mdio_write(tp, 0x14, 0xa205);
-        rtl8168_mdio_write(tp, 0x14, 0x05bf);
-        rtl8168_mdio_write(tp, 0x14, 0x877e);
-        rtl8168_mdio_write(tp, 0x14, 0xae0b);
-        rtl8168_mdio_write(tp, 0x14, 0xa206);
-        rtl8168_mdio_write(tp, 0x14, 0x05bf);
-        rtl8168_mdio_write(tp, 0x14, 0x8781);
-        rtl8168_mdio_write(tp, 0x14, 0xae03);
-        rtl8168_mdio_write(tp, 0x14, 0xbf87);
-        rtl8168_mdio_write(tp, 0x14, 0x8402);
-        rtl8168_mdio_write(tp, 0x14, 0x44dc);
-        rtl8168_mdio_write(tp, 0x14, 0xef64);
-        rtl8168_mdio_write(tp, 0x14, 0xef97);
-        rtl8168_mdio_write(tp, 0x14, 0xfffc);
-        rtl8168_mdio_write(tp, 0x14, 0x04af);
-        rtl8168_mdio_write(tp, 0x14, 0x00ed);
-        rtl8168_mdio_write(tp, 0x14, 0x0220);
-        rtl8168_mdio_write(tp, 0x14, 0xa5f8);
-        rtl8168_mdio_write(tp, 0x14, 0xfaef);
-        rtl8168_mdio_write(tp, 0x14, 0x69bf);
-        rtl8168_mdio_write(tp, 0x14, 0x4554);
-        rtl8168_mdio_write(tp, 0x14, 0x0244);
-        rtl8168_mdio_write(tp, 0x14, 0xdce0);
-        rtl8168_mdio_write(tp, 0x14, 0x87ff);
-        rtl8168_mdio_write(tp, 0x14, 0x1f01);
-        rtl8168_mdio_write(tp, 0x14, 0x9e06);
-        rtl8168_mdio_write(tp, 0x14, 0xe587);
-        rtl8168_mdio_write(tp, 0x14, 0xff02);
-        rtl8168_mdio_write(tp, 0x14, 0x4b05);
-        rtl8168_mdio_write(tp, 0x14, 0xef96);
-        rtl8168_mdio_write(tp, 0x14, 0xfefc);
-        rtl8168_mdio_write(tp, 0x14, 0xaf03);
-        rtl8168_mdio_write(tp, 0x14, 0x8c54);
-        rtl8168_mdio_write(tp, 0x14, 0xa434);
-        rtl8168_mdio_write(tp, 0x14, 0x74a6);
-        rtl8168_mdio_write(tp, 0x14, 0x0022);
-        rtl8168_mdio_write(tp, 0x14, 0xa434);
-        rtl8168_mdio_write(tp, 0x14, 0x11b8);
-        rtl8168_mdio_write(tp, 0x14, 0x4222);
-        rtl8168_mdio_write(tp, 0x14, 0xb842);
-        rtl8168_mdio_write(tp, 0x14, 0xf0a2);
-        rtl8168_mdio_write(tp, 0x14, 0x00f0);
-        rtl8168_mdio_write(tp, 0x14, 0xa202);
-        rtl8168_mdio_write(tp, 0x14, 0xf0a2);
-        rtl8168_mdio_write(tp, 0x14, 0x04f0);
-        rtl8168_mdio_write(tp, 0x14, 0xa206);
-        rtl8168_mdio_write(tp, 0x14, 0xf0a2);
-        rtl8168_mdio_write(tp, 0x14, 0x08f0);
-        rtl8168_mdio_write(tp, 0x14, 0xa20a);
-        rtl8168_mdio_write(tp, 0x14, 0xf0a2);
-        rtl8168_mdio_write(tp, 0x14, 0x0cf0);
-        rtl8168_mdio_write(tp, 0x14, 0xa20e);
-        rtl8168_mdio_write(tp, 0x14, 0x55b8);
-        rtl8168_mdio_write(tp, 0x14, 0x20d9);
-        rtl8168_mdio_write(tp, 0x14, 0xc608);
-        rtl8168_mdio_write(tp, 0x14, 0xaac4);
-        rtl8168_mdio_write(tp, 0x14, 0x3000);
-        rtl8168_mdio_write(tp, 0x14, 0xc614);
-        rtl8168_mdio_write(tp, 0x14, 0x33c4);
-        rtl8168_mdio_write(tp, 0x14, 0x1a88);
-        rtl8168_mdio_write(tp, 0x14, 0xc42e);
-        rtl8168_mdio_write(tp, 0x14, 0x22c4);
-        rtl8168_mdio_write(tp, 0x14, 0x2e54);
-        rtl8168_mdio_write(tp, 0x14, 0xc41a);
-        rtl8168_mdio_write(tp, 0x13, 0xb818);
-        rtl8168_mdio_write(tp, 0x14, 0x1a01);
-        rtl8168_mdio_write(tp, 0x13, 0xb81a);
-        rtl8168_mdio_write(tp, 0x14, 0x020b);
-        rtl8168_mdio_write(tp, 0x13, 0xb81c);
-        rtl8168_mdio_write(tp, 0x14, 0x03ce);
-        rtl8168_mdio_write(tp, 0x13, 0xb81e);
-        rtl8168_mdio_write(tp, 0x14, 0x00e7);
-        rtl8168_mdio_write(tp, 0x13, 0xb846);
-        rtl8168_mdio_write(tp, 0x14, 0x0389);
-        rtl8168_mdio_write(tp, 0x13, 0xb848);
-        rtl8168_mdio_write(tp, 0x14, 0xffff);
-        rtl8168_mdio_write(tp, 0x13, 0xb84a);
-        rtl8168_mdio_write(tp, 0x14, 0xffff);
-        rtl8168_mdio_write(tp, 0x13, 0xb84c);
-        rtl8168_mdio_write(tp, 0x14, 0xffff);
-        rtl8168_mdio_write(tp, 0x13, 0xb832);
-        rtl8168_mdio_write(tp, 0x14, 0x001f);
-
-
-        rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-        rtl8168_mdio_write(tp, 0x13, 0x0000);
-        rtl8168_mdio_write(tp, 0x14, 0x0000);
-        rtl8168_mdio_write(tp, 0x1f, 0x0B82);
-        gphy_val = rtl8168_mdio_read(tp, 0x17);
-        gphy_val &= ~(BIT_0);
-        rtl8168_mdio_write(tp, 0x17, gphy_val);
-        rtl8168_mdio_write(tp, 0x1f, 0x0A43);
-        rtl8168_mdio_write(tp, 0x13, 0x8042);
-        rtl8168_mdio_write(tp, 0x14, 0x0000);
-
-
-        rtl8168_clear_phy_mcu_patch_request(tp);
-
-        if (tp->RequiredSecLanDonglePatch) {
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                gphy_val = rtl8168_mdio_read(tp, 0x11);
-                gphy_val &= ~BIT_6;
-                rtl8168_mdio_write(tp, 0x11, gphy_val);
-        }
-}
-
-static void
 rtl8168_init_hw_phy_mcu(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         u8 require_disable_phy_disable_mode = FALSE;
 
-        if (tp->NotWrRamCodeToMicroP == TRUE)
-                return;
-        if (rtl8168_check_hw_phy_mcu_code_ver(dev))
-                return;
+        if (tp->NotWrRamCodeToMicroP == TRUE) return;
+        if (rtl8168_check_hw_phy_mcu_code_ver(dev)) return;
 
         if (FALSE == rtl8168_phy_ram_code_check(dev)) {
                 rtl8168_set_phy_ram_code_check_fail_flag(dev);
@@ -23109,14 +21186,8 @@
                 rtl8168_set_phy_mcu_8168h_1(dev);
                 break;
         case CFG_METHOD_30:
-        case CFG_METHOD_37:
                 rtl8168_set_phy_mcu_8168h_2(dev);
                 break;
-        case CFG_METHOD_35:
-                rtl8168_set_phy_mcu_8168h_3(dev);
-                break;
-        case CFG_METHOD_36:
-                break;
         }
 
         if (require_disable_phy_disable_mode)
@@ -23128,7 +21199,6 @@
 
         tp->HwHasWrRamCodeToMicroP = TRUE;
 }
-#endif
 
 static void
 rtl8168_hw_phy_config(struct net_device *dev)
@@ -23140,14 +21210,9 @@
 
         tp->phy_reset_enable(dev);
 
-        if (HW_DASH_SUPPORT_TYPE_3(tp) && tp->HwPkgDet == 0x06)
-                return;
+        if (HW_DASH_SUPPORT_TYPE_3(tp) && tp->HwPkgDet == 0x06) return;
 
-#ifndef ENABLE_USE_FIRMWARE_FILE
-        if (!tp->rtl_fw) {
-                rtl8168_init_hw_phy_mcu(dev);
-        }
-#endif
+        rtl8168_init_hw_phy_mcu(dev);
 
         if (tp->mcfg == CFG_METHOD_1) {
                 rtl8168_mdio_write(tp, 0x1F, 0x0001);
@@ -24392,7 +22457,7 @@
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
                                 rtl8168_mdio_write(tp, 0x15, 0x1006);
                         }
@@ -24680,7 +22745,7 @@
                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
                                 gphy_val = rtl8168_mdio_read(tp, 0x15);
                                 gphy_val |= BIT_12;
@@ -24688,7 +22753,7 @@
                         }
                 }
         } else if (tp->mcfg == CFG_METHOD_18) {
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                         rtl8168_mdio_write(tp, 0x1F, 0x0005);
                         rtl8168_mdio_write(tp, 0x05, 0x8b80);
                         gphy_val = rtl8168_mdio_read(tp, 0x06);
@@ -24767,7 +22832,7 @@
                 rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) & ~BIT_8);
                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
 
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                         rtl8168_mdio_write(tp, 0x1f, 0x0005);
                         rtl8168_mdio_write(tp, 0x05, 0x8b85);
                         rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) | BIT_15);
@@ -24775,7 +22840,7 @@
                 }
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
                                 gphy_val = rtl8168_mdio_read(tp, 0x15);
                                 gphy_val |= BIT_12;
@@ -24783,7 +22848,7 @@
                         }
                 }
         } else if (tp->mcfg == CFG_METHOD_19) {
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                         rtl8168_mdio_write(tp, 0x1F, 0x0005);
                         rtl8168_mdio_write(tp, 0x05, 0x8b80);
                         gphy_val = rtl8168_mdio_read(tp, 0x06);
@@ -24826,14 +22891,7 @@
                 rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) & ~BIT_8);
                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
 
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0007);
-                rtl8168_mdio_write(tp, 0x1E, 0x0023);
-                rtl8168_clear_eth_phy_bit(tp, 0x17, BIT_1);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                         rtl8168_mdio_write(tp, 0x1f, 0x0005);
                         rtl8168_mdio_write(tp, 0x05, 0x8b85);
                         rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) | BIT_15);
@@ -24841,7 +22899,7 @@
                 }
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
                                 gphy_val = rtl8168_mdio_read(tp, 0x15);
                                 gphy_val |= BIT_12;
@@ -24850,7 +22908,7 @@
                 }
         } else if (tp->mcfg == CFG_METHOD_20) {
 
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                         rtl8168_mdio_write(tp, 0x1F, 0x0005);
                         rtl8168_mdio_write(tp, 0x05, 0x8b80);
                         gphy_val = rtl8168_mdio_read(tp, 0x06);
@@ -24925,7 +22983,7 @@
                 rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) & ~BIT_8);
                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
 
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                         rtl8168_mdio_write(tp, 0x1f, 0x0005);
                         rtl8168_mdio_write(tp, 0x05, 0x8b85);
                         rtl8168_mdio_write(tp, 0x06, rtl8168_mdio_read(tp, 0x06) | BIT_15);
@@ -24933,7 +22991,7 @@
                 }
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1f, 0x0000);
                                 gphy_val = rtl8168_mdio_read(tp, 0x15);
                                 gphy_val |= BIT_12;
@@ -24995,7 +23053,7 @@
                 rtl8168_mdio_write(tp, 0x14, 0x9222);
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);
                         }
@@ -25034,11 +23092,12 @@
                 ClearAndSetEthPhyBit(tp,
                                      0x11,
                                      BIT_13,
-                                     BIT_14);
+                                     BIT_14
+                                    );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);
                         }
@@ -25066,7 +23125,7 @@
                 rtl8168_mdio_write(tp, 0x11, gphy_val);
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);
                         }
@@ -25138,7 +23197,7 @@
                 rtl8168_mdio_write(tp, 0x14, (rtl8168_mdio_read(tp, 0x14) & ~0xFF00) | 0x8400);
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);
                         }
@@ -25210,7 +23269,7 @@
                 rtl8168_mdio_write(tp, 0x14, (rtl8168_mdio_read(tp, 0x14) & ~0xFF00) | 0x8400);
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                                 rtl8168_mdio_write(tp, 0x10, rtl8168_mdio_read(tp, 0x10) | BIT_2);
                         }
@@ -25218,110 +23277,124 @@
         } else if (tp->mcfg == CFG_METHOD_29) {
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x809b);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xF800 ,
-                                     0x8000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xF800 ,
+                                      0x8000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80A2);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x8000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x8000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80A4);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x8500);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x8500
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x809C);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0xbd00);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0xbd00
+                                    );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x80AD);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xF800 ,
-                                     0x7000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xF800 ,
+                                      0x7000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80B4);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x5000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x5000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80AC);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x4000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x4000
+                                    );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x808E);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x1200);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x1200
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x8090);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0xE500);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0xE500
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x8092);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x9F00);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x9F00
+                                    );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP) {
                         u16 dout_tapbin;
 
                         dout_tapbin = 0x0000;
-                        rtl8168_mdio_write(tp, 0x1F, 0x0A46);
-                        gphy_val = rtl8168_mdio_read(tp, 0x13);
+                        rtl8168_mdio_write( tp, 0x1F, 0x0A46 );
+                        gphy_val = rtl8168_mdio_read( tp, 0x13 );
                         gphy_val &= (BIT_1|BIT_0);
                         gphy_val <<= 2;
                         dout_tapbin |= gphy_val;
 
-                        gphy_val = rtl8168_mdio_read(tp, 0x12);
+                        gphy_val = rtl8168_mdio_read( tp, 0x12 );
                         gphy_val &= (BIT_15|BIT_14);
                         gphy_val >>= 14;
                         dout_tapbin |= gphy_val;
 
-                        dout_tapbin = ~(dout_tapbin^BIT_3);
+                        dout_tapbin = ~( dout_tapbin^BIT_3 );
                         dout_tapbin <<= 12;
                         dout_tapbin &= 0xF000;
 
-                        rtl8168_mdio_write(tp, 0x1F, 0x0A43);
+                        rtl8168_mdio_write( tp, 0x1F, 0x0A43 );
 
-                        rtl8168_mdio_write(tp, 0x13, 0x827A);
-                        ClearAndSetEthPhyBit(tp,
-                                             0x14,
-                                             BIT_15|BIT_14|BIT_13|BIT_12,
-                                             dout_tapbin);
-
-
-                        rtl8168_mdio_write(tp, 0x13, 0x827B);
-                        ClearAndSetEthPhyBit(tp,
-                                             0x14,
-                                             BIT_15|BIT_14|BIT_13|BIT_12,
-                                             dout_tapbin);
-
-
-                        rtl8168_mdio_write(tp, 0x13, 0x827C);
-                        ClearAndSetEthPhyBit(tp,
-                                             0x14,
-                                             BIT_15|BIT_14|BIT_13|BIT_12,
-                                             dout_tapbin);
-
-
-                        rtl8168_mdio_write(tp, 0x13, 0x827D);
-                        ClearAndSetEthPhyBit(tp,
-                                             0x14,
-                                             BIT_15|BIT_14|BIT_13|BIT_12,
-                                             dout_tapbin);
+                        rtl8168_mdio_write( tp, 0x13, 0x827A );
+                        ClearAndSetEthPhyBit( tp,
+                                              0x14,
+                                              BIT_15|BIT_14|BIT_13|BIT_12,
+                                              dout_tapbin
+                                            );
+
+
+                        rtl8168_mdio_write( tp, 0x13, 0x827B );
+                        ClearAndSetEthPhyBit( tp,
+                                              0x14,
+                                              BIT_15|BIT_14|BIT_13|BIT_12,
+                                              dout_tapbin
+                                            );
+
+
+                        rtl8168_mdio_write( tp, 0x13, 0x827C );
+                        ClearAndSetEthPhyBit( tp,
+                                              0x14,
+                                              BIT_15|BIT_14|BIT_13|BIT_12,
+                                              dout_tapbin
+                                            );
+
+
+                        rtl8168_mdio_write( tp, 0x13, 0x827D );
+                        ClearAndSetEthPhyBit( tp,
+                                              0x14,
+                                              BIT_15|BIT_14|BIT_13|BIT_12,
+                                              dout_tapbin
+                                            );
 
                         rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                         rtl8168_mdio_write(tp, 0x13, 0x8011);
@@ -25331,50 +23404,51 @@
                 }
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0A44);
-                rtl8168_set_eth_phy_bit(tp, 0x11, BIT_11);
+                rtl8168_set_eth_phy_bit( tp, 0x11, BIT_11 );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0BCA);
-                ClearAndSetEthPhyBit(tp,
-                                     0x17,
-                                     (BIT_13 | BIT_12) ,
-                                     BIT_14);
+                ClearAndSetEthPhyBit( tp,
+                                      0x17,
+                                      (BIT_13 | BIT_12) ,
+                                      BIT_14
+                                    );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x803F);
-                rtl8168_clear_eth_phy_bit(tp, 0x14, (BIT_13 | BIT_12));
+                rtl8168_clear_eth_phy_bit( tp, 0x14, (BIT_13 | BIT_12));
                 rtl8168_mdio_write(tp, 0x13, 0x8047);
-                rtl8168_clear_eth_phy_bit(tp, 0x14, (BIT_13 | BIT_12));
+                rtl8168_clear_eth_phy_bit( tp, 0x14, (BIT_13 | BIT_12));
                 rtl8168_mdio_write(tp, 0x13, 0x804F);
-                rtl8168_clear_eth_phy_bit(tp, 0x14, (BIT_13 | BIT_12));
+                rtl8168_clear_eth_phy_bit( tp, 0x14, (BIT_13 | BIT_12));
                 rtl8168_mdio_write(tp, 0x13, 0x8057);
-                rtl8168_clear_eth_phy_bit(tp, 0x14, (BIT_13 | BIT_12));
+                rtl8168_clear_eth_phy_bit( tp, 0x14, (BIT_13 | BIT_12));
                 rtl8168_mdio_write(tp, 0x13, 0x805F);
-                rtl8168_clear_eth_phy_bit(tp, 0x14, (BIT_13 | BIT_12));
-                rtl8168_mdio_write(tp, 0x13, 0x8067);
-                rtl8168_clear_eth_phy_bit(tp, 0x14, (BIT_13 | BIT_12));
-                rtl8168_mdio_write(tp, 0x13, 0x806F);
-                rtl8168_clear_eth_phy_bit(tp, 0x14, (BIT_13 | BIT_12));
+                rtl8168_clear_eth_phy_bit( tp, 0x14, (BIT_13 | BIT_12));
+                rtl8168_mdio_write(tp, 0x13, 0x8067 );
+                rtl8168_clear_eth_phy_bit( tp, 0x14, (BIT_13 | BIT_12));
+                rtl8168_mdio_write(tp, 0x13, 0x806F );
+                rtl8168_clear_eth_phy_bit( tp, 0x14, (BIT_13 | BIT_12));
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                                rtl8168_set_eth_phy_bit(tp, 0x10, BIT_2);
+                                rtl8168_set_eth_phy_bit( tp, 0x10, BIT_2 );
                                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                         }
                 }
-        } else if (tp->mcfg == CFG_METHOD_30 || tp->mcfg == CFG_METHOD_37) {
+        } else if (tp->mcfg == CFG_METHOD_30) {
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x808A);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     BIT_5 | BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0,
-                                     0x0A);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      BIT_5 | BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0,
+                                      0x0A );
 
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP) {
                         rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                         rtl8168_mdio_write(tp, 0x13, 0x8011);
                         rtl8168_set_eth_phy_bit(tp, 0x14, BIT_11);
@@ -25383,7 +23457,7 @@
                 }
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0A44);
-                rtl8168_set_eth_phy_bit(tp, 0x11, BIT_11);
+                rtl8168_set_eth_phy_bit( tp, 0x11, BIT_11 );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 if (tp->RequireAdcBiasPatch) {
@@ -25396,10 +23470,10 @@
                         u16 rlen;
 
                         rtl8168_mdio_write(tp, 0x1F, 0x0BCD);
-                        gphy_val = rtl8168_mdio_read(tp, 0x16);
+                        gphy_val = rtl8168_mdio_read( tp, 0x16 );
                         gphy_val &= 0x000F;
 
-                        if (gphy_val > 3) {
+                        if ( gphy_val > 3 ) {
                                 rlen = gphy_val - 3;
                         } else {
                                 rlen = 0;
@@ -25412,7 +23486,7 @@
                         rtl8168_mdio_write(tp, 0x1F, 0x0000);
                 }
 
-                if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                if (tp->HwHasWrRamCodeToMicroP) {
                         rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                         rtl8168_mdio_write(tp, 0x13, 0x85FE);
                         ClearAndSetEthPhyBit(
@@ -25434,139 +23508,148 @@
                                 BIT_12);
                 }
 
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0C41);
-                rtl8168_clear_eth_phy_bit(tp, 0x15, BIT_1);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                rtl8168_set_eth_phy_bit(tp, 0x10, BIT_0);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
                 if (aspm) {
-                        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                                rtl8168_set_eth_phy_bit(tp, 0x10, BIT_2);
+                                rtl8168_set_eth_phy_bit( tp, 0x10, BIT_2 );
                                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                         }
                 }
-        } else if (tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-                   tp->mcfg == CFG_METHOD_33 ||  tp->mcfg == CFG_METHOD_34) {
+        } else if (tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x808E);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x4800);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x4800
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x8090);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0xCC00);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0xCC00
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x8092);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0xB000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0xB000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x8088);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x6000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x6000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x808B);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0x3F00 ,
-                                     0x0B00);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0x3F00 ,
+                                      0x0B00
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x808D);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0x1F00 ,
-                                     0x0600);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0x1F00 ,
+                                      0x0600
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x808C);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0xB000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0xB000
+                                    );
 
                 rtl8168_mdio_write(tp, 0x13, 0x80A0);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x2800);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x2800
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80A2);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x5000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x5000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x809B);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xF800 ,
-                                     0xB000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xF800 ,
+                                      0xB000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x809A);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x4B00);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x4B00
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x809D);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0x3F00 ,
-                                     0x0800);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0x3F00 ,
+                                      0x0800
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80A1);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x7000);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x7000
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x809F);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0x1F00 ,
-                                     0x0300);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0x1F00 ,
+                                      0x0300
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x809E);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x8800);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x8800
+                                    );
 
                 rtl8168_mdio_write(tp, 0x13, 0x80B2);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x2200);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x2200
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80AD);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xF800 ,
-                                     0x9800);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xF800 ,
+                                      0x9800
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80AF);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0x3F00 ,
-                                     0x0800);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0x3F00 ,
+                                      0x0800
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80B3);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x6F00);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x6F00
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80B1);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0x1F00 ,
-                                     0x0300);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0x1F00 ,
+                                      0x0300
+                                    );
                 rtl8168_mdio_write(tp, 0x13, 0x80B0);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00 ,
-                                     0x9300);
+                ClearAndSetEthPhyBit( tp,
+                                      0x14,
+                                      0xFF00 ,
+                                      0x9300
+                                    );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
                 rtl8168_mdio_write(tp, 0x13, 0x8011);
-                rtl8168_clear_eth_phy_bit(tp, 0x14, BIT_11);
+                rtl8168_set_eth_phy_bit(tp, 0x14, BIT_11);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0A44);
@@ -25579,151 +23662,9 @@
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
                 if (aspm) {
-                        if (!HW_SUPP_SERDES_PHY(tp) &&
-                            HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
+                        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
                                 rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                                rtl8168_set_eth_phy_bit(tp, 0x10, BIT_2);
-                                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-                        }
-                }
-        } else if (tp->mcfg == CFG_METHOD_35) {
-                rtl8168_mdio_write(tp, 0x1F, 0x0A44);
-                rtl8168_set_eth_phy_bit(tp, 0x11, BIT_11);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A4C);
-                rtl8168_clear_eth_phy_bit(tp, 0x15, (BIT_14 | BIT_13));
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                rtl8168_mdio_write(tp, 0x13, 0x81B9);
-                rtl8168_mdio_write(tp, 0x14, 0x2000);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                rtl8168_mdio_write(tp, 0x13, 0x81D4);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00,
-                                     0x6600);
-                rtl8168_mdio_write(tp, 0x13, 0x81CB);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00,
-                                     0x3500);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A80);
-                ClearAndSetEthPhyBit(tp,
-                                     0x16,
-                                     0x000F,
-                                     0x0005);
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                rtl8168_mdio_write(tp, 0x13, 0x8016);
-                rtl8168_set_eth_phy_bit(tp, 0x14, BIT_13);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                rtl8168_mdio_write(tp, 0x13, 0x811E);
-                rtl8168_mdio_write(tp, 0x14, 0xDECA);
-
-                rtl8168_mdio_write(tp, 0x13, 0x811C);
-                rtl8168_mdio_write(tp, 0x14, 0x8008);
-                rtl8168_mdio_write(tp, 0x13, 0x8118);
-                rtl8168_mdio_write(tp, 0x14, 0xF8B4);
-                rtl8168_mdio_write(tp, 0x13, 0x811A);
-                rtl8168_mdio_write(tp, 0x14, 0x1A04);
-
-                rtl8168_mdio_write(tp, 0x13, 0x8134);
-                rtl8168_mdio_write(tp, 0x14, 0xDECA);
-                rtl8168_mdio_write(tp, 0x13, 0x8132);
-                rtl8168_mdio_write(tp, 0x14, 0xA008);
-                rtl8168_mdio_write(tp, 0x13, 0x812E);
-                rtl8168_mdio_write(tp, 0x14, 0x00B5);
-                rtl8168_mdio_write(tp, 0x13, 0x8130);
-                rtl8168_mdio_write(tp, 0x14, 0x1A04);
-
-                rtl8168_mdio_write(tp, 0x13, 0x8112);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00,
-                                     0x7300);
-                rtl8168_mdio_write(tp, 0x13, 0x8106);
-                rtl8168_mdio_write(tp, 0x14, 0xA209);
-                rtl8168_mdio_write(tp, 0x13, 0x8108);
-                rtl8168_mdio_write(tp, 0x14, 0x13B0);
-                rtl8168_mdio_write(tp, 0x13, 0x8103);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xF800,
-                                     0xB800);
-                rtl8168_mdio_write(tp, 0x13, 0x8105);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00,
-                                     0x0A00);
-
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                rtl8168_mdio_write(tp, 0x13, 0x87EB);
-                rtl8168_mdio_write(tp, 0x14, 0x0018);
-                rtl8168_mdio_write(tp, 0x13, 0x87EB);
-                rtl8168_mdio_write(tp, 0x14, 0x0018);
-                rtl8168_mdio_write(tp, 0x13, 0x87ED);
-                rtl8168_mdio_write(tp, 0x14, 0x0733);
-                rtl8168_mdio_write(tp, 0x13, 0x87EF);
-                rtl8168_mdio_write(tp, 0x14, 0x08DC);
-                rtl8168_mdio_write(tp, 0x13, 0x87F1);
-                rtl8168_mdio_write(tp, 0x14, 0x08DF);
-                rtl8168_mdio_write(tp, 0x13, 0x87F3);
-                rtl8168_mdio_write(tp, 0x14, 0x0C79);
-                rtl8168_mdio_write(tp, 0x13, 0x87F5);
-                rtl8168_mdio_write(tp, 0x14, 0x0D93);
-                rtl8168_mdio_write(tp, 0x13, 0x87F9);
-                rtl8168_mdio_write(tp, 0x14, 0x0010);
-                rtl8168_mdio_write(tp, 0x13, 0x87FB);
-                rtl8168_mdio_write(tp, 0x14, 0x0800);
-                rtl8168_mdio_write(tp, 0x13, 0x8015);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0x7000,
-                                     0x7000);
-
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0A43);
-                rtl8168_mdio_write(tp, 0x13, 0x8111);
-                ClearAndSetEthPhyBit(tp,
-                                     0x14,
-                                     0xFF00,
-                                     0x7C00);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-                if (aspm) {
-                        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);
-                        }
-                }
-        } else if (tp->mcfg == CFG_METHOD_36) {
-                rtl8168_mdio_write(tp, 0x1F, 0x0A44);
-                rtl8168_set_eth_phy_bit(tp, 0x11, BIT_11);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
-                rtl8168_mdio_write(tp, 0x1F, 0x0C41);
-                rtl8168_clear_eth_phy_bit(tp, 0x15, BIT_1);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-
-                if (aspm) {
-                        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_set_eth_phy_bit( tp, 0x10, BIT_2 );
                                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                         }
                 }
@@ -25731,7 +23672,7 @@
 
 #ifdef ENABLE_FIBER_SUPPORT
         if (HW_FIBER_MODE_ENABLED(tp))
-                rtl8168_hw_fiber_phy_config(tp);
+                rtl8168_hw_fiber_phy_config(dev);
 #endif //ENABLE_FIBER_SUPPORT
 
         //EthPhyPPSW
@@ -25750,12 +23691,10 @@
                 rtl8168_mdio_write(tp, 0x14, 0x1065);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
         } else if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30 ||
-                   tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-                   tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-                   tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36) {
+                   tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 //enable EthPhyPPSW
                 rtl8168_mdio_write(tp, 0x1F, 0x0A44);
-                rtl8168_set_eth_phy_bit(tp, 0x11, BIT_7);
+                rtl8168_set_eth_phy_bit( tp, 0x11, BIT_7 );
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
         }
 
@@ -25763,25 +23702,21 @@
         if (tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
             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 ||
-            tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34 ||
-            tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-            tp->mcfg == CFG_METHOD_37) {
+            tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 if (aspm)
                         rtl8168_enable_ocp_phy_power_saving(dev);
         }
 
         rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
-        if (HW_HAS_WRITE_PHY_MCU_RAM_CODE(tp)) {
-                if (tp->eee.eee_enabled)
-                        rtl8168_enable_eee(tp);
+        if (tp->HwHasWrRamCodeToMicroP == TRUE) {
+                if (tp->eee_enabled)
+                        rtl8168_enable_EEE(tp);
                 else
-                        rtl8168_disable_eee(tp);
+                        rtl8168_disable_EEE(tp);
         }
 }
 
-/*
 static inline void rtl8168_delete_esd_timer(struct net_device *dev, struct timer_list *timer)
 {
         del_timer_sync(timer);
@@ -25816,7 +23751,6 @@
 #endif
         mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT);
 }
-*/
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /*
@@ -25828,29 +23762,23 @@
 rtl8168_netpoll(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        int i;
-        for (i = 0; i < tp->irq_nvecs; i++) {
-                struct r8168_irq *irq = &tp->irq_tbli;
-                struct r8168_napi *r8168napi = &tp->r8168napii;
-
-                disable_irq(irq->vector);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
-                irq->handler(irq->vector, r8168napi);
-#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-                irq->handler(irq->vector, r8168napi, NULL);
+        struct pci_dev *pdev = tp->pci_dev;
+
+        disable_irq(pdev->irq);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+        rtl8168_interrupt(pdev->irq, dev, NULL);
 #else
-                irq->handler(irq->vector, r8168napi);
+        rtl8168_interrupt(pdev->irq, dev);
 #endif
-                enable_irq(irq->vector);
-        }
+        enable_irq(pdev->irq);
 }
-
-#endif //CONFIG_NET_POLL_CONTROLLER
+#endif
 
 static void
 rtl8168_get_bios_setting(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
 
         switch (tp->mcfg) {
         case CFG_METHOD_9:
@@ -25877,12 +23805,7 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                tp->bios_setting = RTL_R32(tp, 0x8c);
+                tp->bios_setting = RTL_R32(0x8c);
                 break;
         }
 }
@@ -25891,6 +23814,7 @@
 rtl8168_set_bios_setting(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
 
         switch (tp->mcfg) {
         case CFG_METHOD_9:
@@ -25917,49 +23841,20 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                RTL_W32(tp, 0x8C, tp->bios_setting);
+                RTL_W32(0x8C, tp->bios_setting);
                 break;
         }
 }
 
 static void
-rtl8168_setup_mqs_reg(struct rtl8168_private *tp)
-{
-        //tx
-        tp->tx_ring0.tdsar_reg = TxDescStartAddrLow;
-        tp->tx_ring1.tdsar_reg = TxHDescStartAddrLow;
-
-        tp->isr_reg0 = IntrStatus;
-        tp->isr_reg1 = IntrStatus1;
-        tp->isr_reg2 = IntrStatus2;
-        tp->isr_reg3 = IntrStatus3;
-
-        tp->imr_reg0 = IntrMask;
-        tp->imr_reg1 = IntrMask1;
-        tp->imr_reg2 = IntrMask2;
-        tp->imr_reg3 = IntrMask3;
-}
-
-static void
 rtl8168_init_software_variable(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         struct pci_dev *pdev = tp->pci_dev;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         rtl8168_get_bios_setting(dev);
 
-#ifdef ENABLE_LIB_SUPPORT
-        tp->ring_lib_enabled = 1;
-#endif
-
-        if (tp->mcfg == CFG_METHOD_DEFAULT)
-                disable_wol_support = 1;
-
         switch (tp->mcfg) {
         case CFG_METHOD_11:
         case CFG_METHOD_12:
@@ -25973,8 +23868,6 @@
                 break;
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
                 tp->HwSuppDashVer = 3;
                 break;
         default:
@@ -25985,14 +23878,12 @@
         switch (tp->mcfg) {
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
                 tp->HwPkgDet = rtl8168_mac_ocp_read(tp, 0xDC00);
                 tp->HwPkgDet = (tp->HwPkgDet >> 3) & 0x0F;
                 break;
         }
 
-        if (HW_SUPP_SERDES_PHY(tp))
+        if (HW_DASH_SUPPORT_TYPE_3(tp) && tp->HwPkgDet == 0x06)
                 eee_enable = 0;
 
         switch (tp->mcfg) {
@@ -26008,55 +23899,13 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 tp->HwSuppNowIsOobVer = 1;
                 break;
         }
 
         switch (tp->mcfg) {
-        case CFG_METHOD_21:
-        case CFG_METHOD_22:
-        case CFG_METHOD_23:
-        case CFG_METHOD_24:
-        case CFG_METHOD_25:
-        case CFG_METHOD_26:
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                tp->HwSuppPhyOcpVer = 1;
-                break;
-        }
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-                tp->HwSuppUpsVer = 1;
-                break;
-        }
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
                 tp->HwPcieSNOffset = 0x16C;
                 break;
         case CFG_METHOD_DEFAULT:
@@ -26067,38 +23916,6 @@
                 break;
         }
 
-        switch (tp->mcfg) {
-        case CFG_METHOD_14:
-        case CFG_METHOD_15:
-        case CFG_METHOD_16:
-        case CFG_METHOD_17:
-        case CFG_METHOD_18:
-        case CFG_METHOD_19:
-        case CFG_METHOD_20:
-        case CFG_METHOD_21:
-        case CFG_METHOD_22:
-        case CFG_METHOD_23:
-        case CFG_METHOD_24:
-        case CFG_METHOD_25:
-        case CFG_METHOD_26:
-        case CFG_METHOD_27:
-        case CFG_METHOD_28:
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                tp->HwSuppAspmClkIntrLock = 1;
-                break;
-        }
-
-        if (!aspm || !tp->HwSuppAspmClkIntrLock)
-                dynamic_aspm = 0;
-
 #ifdef ENABLE_REALWOW_SUPPORT
         rtl8168_get_realwow_hw_version(dev);
 #endif //ENABLE_REALWOW_SUPPORT
@@ -26112,46 +23929,31 @@
                 if (HW_DASH_SUPPORT_TYPE_3(tp)) {
                         u64 CmacMemPhysAddress;
                         void __iomem *cmac_ioaddr = NULL;
-                        struct pci_dev *pdev_cmac;
-                        int ret;
-
-                        pdev_cmac = pci_get_slot(pdev->bus, PCI_DEVFN(PCI_SLOT(pdev->devfn), 0));
-                        ret = pci_enable_device(pdev_cmac);
-                        if (ret < 0) {
-                                dev_err(&pdev_cmac->dev, "eable device fail %d\n", ret);
-                                goto err1;
-                        }
-
-                        ret = pci_request_regions(pdev_cmac, MODULENAME);
-                        if (ret < 0) {
-                                dev_err(&pdev_cmac->dev, "could not request regions %d\n", ret);
-                                goto err2;
-                        }
 
                         //map CMAC IO space
-                        CmacMemPhysAddress = pci_resource_start(pdev_cmac, 2);
-
-                        /* ioremap MMIO region */
-                        cmac_ioaddr = ioremap(CmacMemPhysAddress, R8168_REGS_SIZE);
+                        CmacMemPhysAddress = rtl8168_csi_other_fun_read(tp, 0, 0x18);
+                        if (!(CmacMemPhysAddress & BIT_0)) {
+                                if (CmacMemPhysAddress & BIT_2)
+                                        CmacMemPhysAddress |=  (u64)rtl8168_csi_other_fun_read(tp, 0, 0x1C) << 32;
+
+                                CmacMemPhysAddress &=  0xFFFFFFF0;
+                                /* ioremap MMIO region */
+                                cmac_ioaddr = ioremap(CmacMemPhysAddress, R8168_REGS_SIZE);
+                        }
 
                         if (cmac_ioaddr == NULL) {
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
                                 if (netif_msg_probe(tp))
                                         dev_err(&pdev->dev, "cannot remap CMAC MMIO, aborting\n");
 #endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-                                pci_release_regions(pdev_cmac);
-err2:
-                                pci_disable_device(pdev_cmac);
-err1:
+                        }
+
+                        if (cmac_ioaddr == NULL) {
                                 tp->DASH = 0;
                         } else {
-                                pci_set_master(pdev_cmac);
-                                tp->cmac_ioaddr = cmac_ioaddr;
-                                tp->pdev_cmac = pdev_cmac;
+                                tp->mapped_cmac_ioaddr = cmac_ioaddr;
                         }
                 }
-
-                eee_enable = 0;
         }
 
 #ifdef ENABLE_DASH_SUPPORT
@@ -26167,6 +23969,8 @@
 
         if (HW_DASH_SUPPORT_TYPE_2(tp))
                 tp->cmac_ioaddr = tp->mmio_addr;
+        else if (HW_DASH_SUPPORT_TYPE_3(tp))
+                tp->cmac_ioaddr = tp->mapped_cmac_ioaddr;
 
         switch (tp->mcfg) {
         case CFG_METHOD_1:
@@ -26188,11 +23992,11 @@
 #ifdef ENABLE_DASH_SUPPORT
         if (tp->DASH) {
                 if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
-                        tp->timer_intr_mask |= (ISRIMR_DASH_INTR_EN | ISRIMR_DASH_INTR_CMAC_RESET);
-                        tp->intr_mask |= (ISRIMR_DASH_INTR_EN | ISRIMR_DASH_INTR_CMAC_RESET);
+                        tp->timer_intr_mask |= ( ISRIMR_DASH_INTR_EN | ISRIMR_DASH_INTR_CMAC_RESET);
+                        tp->intr_mask |= ( ISRIMR_DASH_INTR_EN | ISRIMR_DASH_INTR_CMAC_RESET);
                 } else {
-                        tp->timer_intr_mask |= (ISRIMR_DP_DASH_OK | ISRIMR_DP_HOST_OK | ISRIMR_DP_REQSYS_OK);
-                        tp->intr_mask |= (ISRIMR_DP_DASH_OK | ISRIMR_DP_HOST_OK | ISRIMR_DP_REQSYS_OK);
+                        tp->timer_intr_mask |= ( ISRIMR_DP_DASH_OK | ISRIMR_DP_HOST_OK | ISRIMR_DP_REQSYS_OK );
+                        tp->intr_mask |= ( ISRIMR_DP_DASH_OK | ISRIMR_DP_HOST_OK | ISRIMR_DP_REQSYS_OK );
                 }
         }
 #endif
@@ -26210,11 +24014,6 @@
                 case CFG_METHOD_30:
                 case CFG_METHOD_31:
                 case CFG_METHOD_32:
-                case CFG_METHOD_33:
-                case CFG_METHOD_34:
-                case CFG_METHOD_35:
-                case CFG_METHOD_36:
-                case CFG_METHOD_37:
                         tp->org_pci_offset_99 = rtl8168_csi_fun0_read_byte(tp, 0x99);
                         tp->org_pci_offset_99 &= ~(BIT_5|BIT_6);
                         break;
@@ -26227,35 +24026,13 @@
                 case CFG_METHOD_28:
                 case CFG_METHOD_29:
                 case CFG_METHOD_30:
-                case CFG_METHOD_35:
-                case CFG_METHOD_36:
-                case CFG_METHOD_37:
                         tp->org_pci_offset_180 = rtl8168_csi_fun0_read_byte(tp, 0x180);
                         break;
                 case CFG_METHOD_31:
                 case CFG_METHOD_32:
-                case CFG_METHOD_33:
-                case CFG_METHOD_34:
                         tp->org_pci_offset_180 = rtl8168_csi_fun0_read_byte(tp, 0x214);
                         break;
                 }
-
-                switch (tp->mcfg) {
-                case CFG_METHOD_21:
-                case CFG_METHOD_22:
-                case CFG_METHOD_23:
-                case CFG_METHOD_24:
-                case CFG_METHOD_25:
-                case CFG_METHOD_27:
-                case CFG_METHOD_28:
-                case CFG_METHOD_31:
-                case CFG_METHOD_32:
-                case CFG_METHOD_33:
-                case CFG_METHOD_34:
-                        if (tp->org_pci_offset_99 & BIT_2)
-                                tp->issue_offset_99_event = TRUE;
-                        break;
-                }
         }
 
         pci_read_config_byte(pdev, 0x80, &tp->org_pci_offset_80);
@@ -26274,8 +24051,7 @@
         case CFG_METHOD_25:
         case CFG_METHOD_26:
         case CFG_METHOD_27:
-                if ((tp->features & (RTL_FEATURE_MSI | RTL_FEATURE_MSIX)) &&
-                    (tp->org_pci_offset_80 & BIT_1))
+                if ((tp->features & RTL_FEATURE_MSI) && (tp->org_pci_offset_80 & BIT_1))
                         tp->use_timer_interrrupt = FALSE;
                 else
                         tp->use_timer_interrrupt = TRUE;
@@ -26285,8 +24061,7 @@
                 break;
         }
 
-        if (timer_count == 0 || tp->mcfg == CFG_METHOD_DEFAULT ||
-            (tp->features & RTL_FEATURE_MSIX))
+        if (timer_count == 0 || tp->mcfg == CFG_METHOD_DEFAULT)
                 tp->use_timer_interrrupt = FALSE;
 
         switch (tp->mcfg) {
@@ -26303,23 +24078,22 @@
         }
 
         switch (tp->mcfg) {
-        case CFG_METHOD_30:
-        case CFG_METHOD_37: {
+        case CFG_METHOD_30: {
                 u16 ioffset_p3, ioffset_p2, ioffset_p1, ioffset_p0;
                 u16 TmpUshort;
 
-                rtl8168_mac_ocp_write(tp, 0xDD02, 0x807D);
-                TmpUshort = rtl8168_mac_ocp_read(tp, 0xDD02);
-                ioffset_p3 = ((TmpUshort & BIT_7) >>7);
+                rtl8168_mac_ocp_write( tp, 0xDD02, 0x807D);
+                TmpUshort = rtl8168_mac_ocp_read( tp, 0xDD02 );
+                ioffset_p3 = ( (TmpUshort & BIT_7) >>7 );
                 ioffset_p3 <<= 3;
-                TmpUshort = rtl8168_mac_ocp_read(tp, 0xDD00);
+                TmpUshort = rtl8168_mac_ocp_read( tp, 0xDD00 );
 
                 ioffset_p3 |= ((TmpUshort & (BIT_15 | BIT_14 | BIT_13))>>13);
 
                 ioffset_p2 = ((TmpUshort & (BIT_12|BIT_11|BIT_10|BIT_9))>>9);
                 ioffset_p1 = ((TmpUshort & (BIT_8|BIT_7|BIT_6|BIT_5))>>5);
 
-                ioffset_p0 = ((TmpUshort & BIT_4) >>4);
+                ioffset_p0 = ( (TmpUshort & BIT_4) >>4 );
                 ioffset_p0 <<= 3;
                 ioffset_p0 |= (TmpUshort & (BIT_2| BIT_1 | BIT_0));
 
@@ -26337,11 +24111,7 @@
         case CFG_METHOD_29:
         case CFG_METHOD_30:
         case CFG_METHOD_31:
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37: {
+        case CFG_METHOD_32: {
                 u16 rg_saw_cnt;
 
                 rtl8168_mdio_write(tp, 0x1F, 0x0C42);
@@ -26349,7 +24119,7 @@
                 rg_saw_cnt &= ~(BIT_15|BIT_14);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
 
-                if (rg_saw_cnt > 0) {
+                if ( rg_saw_cnt > 0) {
                         tp->SwrCnt1msIni = 16000000/rg_saw_cnt;
                         tp->SwrCnt1msIni &= 0x0FFF;
 
@@ -26360,23 +24130,28 @@
         }
 
 #ifdef ENABLE_FIBER_SUPPORT
-        rtl8168_check_hw_fiber_mode_support(tp);
-#endif //ENABLE_FIBER_SUPPORT
-
         switch(tp->mcfg) {
-        case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-                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;
-                }
+        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;
                 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 ||
@@ -26384,20 +24159,6 @@
                         hwoptimize |= HW_PATCH_SAMSUNG_LAN_DONGLE;
         }
 
-        switch (tp->mcfg) {
-        case CFG_METHOD_18:
-        case CFG_METHOD_19:
-                if (pdev->subsystem_vendor == 0x13fe) {
-                        if (pdev->subsystem_device == 0x00ec)
-                                hwoptimize |= HW_PATCH_SAMSUNG_LAN_DONGLE;
-                }
-                break;
-        }
-
-#ifdef CONFIG_CTAP_SHORT_OFF
-        hwoptimize |= HW_PATCH_SAMSUNG_LAN_DONGLE;
-#endif //CONFIG_CTAP_SHORT_OFF
-
         if (hwoptimize & HW_PATCH_SAMSUNG_LAN_DONGLE) {
                 switch (tp->mcfg) {
                 case CFG_METHOD_14:
@@ -26408,11 +24169,18 @@
                 case CFG_METHOD_19:
                 case CFG_METHOD_20:
                 case CFG_METHOD_30:
-                case CFG_METHOD_37:
                         tp->RequiredSecLanDonglePatch = TRUE;
                         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:
@@ -26431,11 +24199,6 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 tp->HwSuppMagicPktVer = WAKEUP_MAGIC_PACKET_V2;
                 break;
         case CFG_METHOD_DEFAULT:
@@ -26447,35 +24210,6 @@
         }
 
         switch (tp->mcfg) {
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-                tp->HwSuppEsdVer = 2;
-                break;
-        case CFG_METHOD_35:
-                tp->HwSuppEsdVer = 3;
-                break;
-        default:
-                tp->HwSuppEsdVer = 1;
-                break;
-        }
-
-        if (tp->HwSuppEsdVer == 2 ||
-            tp->HwSuppEsdVer == 3) {
-                rtl8168_mdio_write(tp, 0x1F, 0x0A46);
-                tp->BackupPhyFuseDout_15_0 = rtl8168_mdio_read(tp, 0x10);
-                tp->BackupPhyFuseDout_31_16 = rtl8168_mdio_read(tp, 0x11);
-                tp->BackupPhyFuseDout_47_32 = rtl8168_mdio_read(tp, 0x12);
-                tp->BackupPhyFuseDout_63_48 = rtl8168_mdio_read(tp, 0x13);
-                rtl8168_mdio_write(tp, 0x1F, 0x0000);
-
-                tp->TestPhyOcpReg = TRUE;
-#ifdef ENABLE_USE_FIRMWARE_FILE
-                if (tp->HwSuppEsdVer == 3)
-                        tp->TestPhyOcpReg = FALSE;
-#endif
-        }
-
-        switch (tp->mcfg) {
         case CFG_METHOD_16:
         case CFG_METHOD_17:
                 tp->HwSuppCheckPhyDisableModeVer = 1;
@@ -26489,9 +24223,6 @@
         case CFG_METHOD_26:
         case CFG_METHOD_29:
         case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 tp->HwSuppCheckPhyDisableModeVer = 2;
                 break;
         case CFG_METHOD_23:
@@ -26499,13 +24230,28 @@
         case CFG_METHOD_28:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
                 tp->HwSuppCheckPhyDisableModeVer = 3;
                 break;
         }
 
         switch (tp->mcfg) {
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                tp->HwSuppGigaForceMode = TRUE;
+                break;
+        }
+
+        switch (tp->mcfg) {
         case CFG_METHOD_14:
         case CFG_METHOD_15:
                 tp->sw_ram_code_ver = NIC_RAMCODE_VERSION_CFG_METHOD_14;
@@ -26541,21 +24287,12 @@
                 break;
         case CFG_METHOD_29:
         case CFG_METHOD_30:
-        case CFG_METHOD_37:
                 tp->sw_ram_code_ver = NIC_RAMCODE_VERSION_CFG_METHOD_29;
                 break;
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
                 tp->sw_ram_code_ver = NIC_RAMCODE_VERSION_CFG_METHOD_31;
                 break;
-        case CFG_METHOD_35:
-                tp->sw_ram_code_ver = NIC_RAMCODE_VERSION_CFG_METHOD_35;
-                break;
-        case CFG_METHOD_36:
-                tp->sw_ram_code_ver = NIC_RAMCODE_VERSION_CFG_METHOD_36;
-                break;
         }
 
         if (tp->HwIcVerUnknown) {
@@ -26563,84 +24300,7 @@
                 tp->NotWrMcuPatchCode = TRUE;
         }
 
-        switch (tp->mcfg) {
-        case CFG_METHOD_16 ... CFG_METHOD_37:
-                tp->HwSuppRxDescType = RX_DESC_RING_TYPE_2;
-                break;
-        default:
-                tp->HwSuppRxDescType = RX_DESC_RING_TYPE_1;
-                break;
-        }
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                tp->HwSuppNumTxQueues = 2;
-                tp->HwSuppNumRxQueues = 4;
-                break;
-        default:
-                tp->HwSuppNumTxQueues = 1;
-                tp->HwSuppNumRxQueues = 1;
-                break;
-        }
-
-        tp->num_tx_rings = 1;
-#ifdef ENABLE_MULTIPLE_TX_QUEUE
-#ifndef ENABLE_LIB_SUPPORT
-        tp->num_tx_rings = tp->HwSuppNumTxQueues;
-#endif
-#endif
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_29:
-        case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                tp->HwSuppRssVer = 2;
-                tp->HwSuppIndirTblEntries = RTL8168_MAX_INDIRECTION_TABLE_ENTRIES;
-                break;
-        }
-
-        tp->num_rx_rings = 1;
-#ifdef ENABLE_RSS_SUPPORT
-        if (HW_RSS_SUPPORT_RSS(tp)) {
-#ifdef ENABLE_LIB_SUPPORT
-                tp->EnableRss = 1;
-#else
-                u8 rss_queue_num = netif_get_num_default_rss_queues();
-                tp->num_rx_rings = (tp->HwSuppNumRxQueues > rss_queue_num)?
-                                   rss_queue_num : tp->HwSuppNumRxQueues;
-                if (tp->num_rx_rings >= 2)
-                        tp->EnableRss = 1;
-#endif
-        }
-#endif
-        if (!tp->EnableRss || tp->num_rx_rings < 1)
-                tp->num_rx_rings = 1;
-
-#ifdef ENABLE_LIB_SUPPORT
-        tp->num_hw_tot_en_rx_rings = 2;
-#else
-        tp->num_hw_tot_en_rx_rings = tp->num_rx_rings;
-#endif //ENABLE_LIB_SUPPORT
-
-        rtl8168_setup_mqs_reg(tp);
-
-        rtl8168_set_ring_size(tp, NUM_RX_DESC, NUM_TX_DESC);
-
-        tp->InitRxDescType = RX_DESC_RING_TYPE_1;
-        if (tp->EnableRss)
-                tp->InitRxDescType = RX_DESC_RING_TYPE_2;
-
-        tp->RxDescLength = RX_DESC_LEN_TYPE_1;
-        if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)
-                tp->RxDescLength = RX_DESC_LEN_TYPE_2;
-
-        tp->NicCustLedValue = RTL_R16(tp, CustomLED);
+        tp->NicCustLedValue = RTL_R16(CustomLED);
 
         rtl8168_get_hw_wol(dev);
 
@@ -26650,43 +24310,23 @@
         tp->speed = speed_mode;
         tp->duplex = duplex_mode;
         tp->advertising = advertising_mode;
-        tp->fcpause = rtl8168_fc_full;
 
         tp->max_jumbo_frame_size = rtl_chip_infotp->chipset.jumbo_frame_sz;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
         /* MTU range: 60 - hw-specific max */
-        dev->min_mtu = ETH_MIN_MTU;
+        dev->min_mtu = ETH_ZLEN;
         dev->max_mtu = tp->max_jumbo_frame_size;
 #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
-
-        if (rtl8168_support_eee(tp)) {
-                struct ethtool_eee *eee = &tp->eee;
-
-                eee->eee_enabled = eee_enable;
-                eee->supported  = SUPPORTED_100baseT_Full |
-                                  SUPPORTED_1000baseT_Full;
-                eee->advertised = mmd_eee_adv_to_ethtool_adv_t(MDIO_EEE_1000T | MDIO_EEE_100TX);
-                eee->tx_lpi_enabled = eee_enable;
-                eee->tx_lpi_timer = dev->mtu + ETH_HLEN + 0x20;
-        }
-
-#ifdef ENABLE_FIBER_SUPPORT
-        if (HW_FIBER_MODE_ENABLED(tp))
-                rtl8168_set_fiber_mode_software_variable(tp);
-#endif //ENABLE_FIBER_SUPPORT
-
-#ifdef ENABLE_RSS_SUPPORT
-        if (tp->EnableRss)
-                rtl8168_init_rss(tp);
-#endif
+        tp->eee_enabled = eee_enable;
+        tp->eee_adv_t = MDIO_EEE_1000T | MDIO_EEE_100TX;
 }
 
 static void
 rtl8168_release_board(struct pci_dev *pdev,
-                      struct net_device *dev)
+                      struct net_device *dev,
+                      void __iomem *ioaddr)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        void __iomem *ioaddr = tp->mmio_addr;
 
         rtl8168_set_bios_setting(dev);
         rtl8168_rar_set(tp, tp->org_mac_addr);
@@ -26700,40 +24340,25 @@
                 FreeAllocatedDashShareMemory(dev);
 #endif
 
-        if (tp->pdev_cmac) {
-                iounmap(tp->cmac_ioaddr);
-                pci_clear_master(tp->pdev_cmac);
-                pci_release_regions(tp->pdev_cmac);
-                pci_disable_device(tp->pdev_cmac);
-                tp->pdev_cmac = NULL;
-        }
+        if (tp->mapped_cmac_ioaddr != NULL)
+                iounmap(tp->mapped_cmac_ioaddr);
 
         iounmap(ioaddr);
         pci_release_regions(pdev);
-        pci_clear_mwi(pdev);
         pci_disable_device(pdev);
         free_netdev(dev);
 }
 
-static void
-rtl8168_hw_address_set(struct net_device *dev, u8 mac_addrMAC_ADDR_LEN)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-        eth_hw_addr_set(dev, mac_addr);
-#else
-        memcpy(dev->dev_addr, mac_addr, MAC_ADDR_LEN);
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-}
-
 static int
 rtl8168_get_mac_address(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         int i;
         u8 mac_addrMAC_ADDR_LEN;
 
         for (i = 0; i < MAC_ADDR_LEN; i++)
-                mac_addri = RTL_R8(tp, MAC0 + i);
+                mac_addri = RTL_R8(MAC0 + i);
 
         if (tp->mcfg == CFG_METHOD_18 ||
             tp->mcfg == CFG_METHOD_19 ||
@@ -26749,14 +24374,9 @@
             tp->mcfg == CFG_METHOD_29 ||
             tp->mcfg == CFG_METHOD_30 ||
             tp->mcfg == CFG_METHOD_31 ||
-            tp->mcfg == CFG_METHOD_32 ||
-            tp->mcfg == CFG_METHOD_33 ||
-            tp->mcfg == CFG_METHOD_34 ||
-            tp->mcfg == CFG_METHOD_35 ||
-            tp->mcfg == CFG_METHOD_36 ||
-            tp->mcfg == CFG_METHOD_37) {
-                *(u32*)&mac_addr0 = rtl8168_eri_read(tp, 0xE0, 4, ERIAR_ExGMAC);
-                *(u16*)&mac_addr4 = rtl8168_eri_read(tp, 0xE4, 2, ERIAR_ExGMAC);
+            tp->mcfg == CFG_METHOD_32) {
+                *(u32*)&mac_addr0 = rtl8168_eri_read(ioaddr, 0xE0, 4, ERIAR_ExGMAC);
+                *(u16*)&mac_addr4 = rtl8168_eri_read(ioaddr, 0xE4, 2, ERIAR_ExGMAC);
         } else {
                 if (tp->eeprom_type != EEPROM_TYPE_NONE) {
                         u16 *pUshort = (u16*)mac_addr;
@@ -26777,12 +24397,7 @@
                             tp->mcfg == CFG_METHOD_29 ||
                             tp->mcfg == CFG_METHOD_30 ||
                             tp->mcfg == CFG_METHOD_31 ||
-                            tp->mcfg == CFG_METHOD_32 ||
-                            tp->mcfg == CFG_METHOD_33 ||
-                            tp->mcfg == CFG_METHOD_34 ||
-                            tp->mcfg == CFG_METHOD_35 ||
-                            tp->mcfg == CFG_METHOD_36 ||
-                            tp->mcfg == CFG_METHOD_37) {
+                            tp->mcfg == CFG_METHOD_32) {
                                 *pUshort++ = rtl8168_eeprom_read_sc(tp, 1);
                                 *pUshort++ = rtl8168_eeprom_read_sc(tp, 2);
                                 *pUshort = rtl8168_eeprom_read_sc(tp, 3);
@@ -26797,21 +24412,24 @@
         if (!is_valid_ether_addr(mac_addr)) {
                 netif_err(tp, probe, dev, "Invalid ether addr %pM\n",
                           mac_addr);
-                eth_random_addr(mac_addr);
-                dev->addr_assign_type = NET_ADDR_RANDOM;
+                eth_hw_addr_random(dev);
+                ether_addr_copy(mac_addr, dev->dev_addr);
                 netif_info(tp, probe, dev, "Random ether addr %pM\n",
                            mac_addr);
                 tp->random_mac = 1;
         }
 
-        rtl8168_hw_address_set(dev, mac_addr);
         rtl8168_rar_set(tp, mac_addr);
 
-        /* keep the original MAC address */
-        memcpy(tp->org_mac_addr, dev->dev_addr, MAC_ADDR_LEN);
+        for (i = 0; i < MAC_ADDR_LEN; i++) {
+                dev->dev_addri = RTL_R8(MAC0 + i);
+                tp->org_mac_addri = dev->dev_addri; /* keep the original MAC address */
+        }
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-        memcpy(dev->perm_addr, dev->dev_addr, MAC_ADDR_LEN);
+        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 #endif
+//  memcpy(dev->dev_addr, dev->dev_addr, dev->addr_len);
+
         return 0;
 }
 
@@ -26828,14 +24446,19 @@
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         struct sockaddr *addr = p;
+        unsigned long flags;
 
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
 
-        rtl8168_hw_address_set(dev, addr->sa_data);
+        spin_lock_irqsave(&tp->lock, flags);
+
+        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
         rtl8168_rar_set(tp, dev->dev_addr);
 
+        spin_unlock_irqrestore(&tp->lock, flags);
+
         return 0;
 }
 
@@ -26847,8 +24470,9 @@
  *****************************************************************************/
 void
 rtl8168_rar_set(struct rtl8168_private *tp,
-                const u8 *addr)
+                uint8_t *addr)
 {
+        void __iomem *ioaddr = tp->mmio_addr;
         uint32_t rar_low = 0;
         uint32_t rar_high = 0;
 
@@ -26861,20 +24485,20 @@
                     ((uint32_t) addr5 << 8));
 
         rtl8168_enable_cfg9346_write(tp);
-        RTL_W32(tp, MAC0, rar_low);
-        RTL_W32(tp, MAC4, rar_high);
+        RTL_W32(MAC0, rar_low);
+        RTL_W32(MAC4, rar_high);
 
         switch (tp->mcfg) {
         case CFG_METHOD_14:
         case CFG_METHOD_15:
-                RTL_W32(tp, SecMAC0, rar_low);
-                RTL_W16(tp, SecMAC4, (uint16_t)rar_high);
+                RTL_W32(SecMAC0, rar_low);
+                RTL_W16(SecMAC4, (uint16_t)rar_high);
                 break;
         }
 
         if (tp->mcfg == CFG_METHOD_17) {
-                rtl8168_eri_write(tp, 0xf0, 4, rar_low << 16, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xf4, 4, rar_low >> 16 | rar_high << 16, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xf0, 4, rar_low << 16, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xf4, 4, rar_low >> 16 | rar_high << 16, ERIAR_ExGMAC);
         }
 
         rtl8168_disable_cfg9346_write(tp);
@@ -27540,72 +25164,6 @@
 }
 #endif //ETHTOOL_OPS_COMPAT
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,0)
-static int rtl8168_siocdevprivate(struct net_device *dev, struct ifreq *ifr,
-                                  void __user *data, int cmd)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        int ret = 0;
-
-        switch (cmd) {
-        case SIOCDEVPRIVATE_RTLASF:
-                if (!netif_running(dev)) {
-                        ret = -ENODEV;
-                        break;
-                }
-
-                ret = rtl8168_asf_ioctl(dev, ifr);
-                break;
-
-#ifdef ENABLE_DASH_SUPPORT
-        case SIOCDEVPRIVATE_RTLDASH:
-                if (!netif_running(dev)) {
-                        ret = -ENODEV;
-                        break;
-                }
-
-                if (!capable(CAP_NET_ADMIN)) {
-                        ret = -EPERM;
-                        break;
-                }
-
-                ret = rtl8168_dash_ioctl(dev, ifr);
-                break;
-#endif
-
-#ifdef ENABLE_REALWOW_SUPPORT
-        case SIOCDEVPRIVATE_RTLREALWOW:
-                if (!netif_running(dev)) {
-                        ret = -ENODEV;
-                        break;
-                }
-
-                if (!capable(CAP_NET_ADMIN)) {
-                        ret = -EPERM;
-                        break;
-                }
-
-                ret = rtl8168_realwow_ioctl(dev, ifr);
-                break;
-#endif
-
-        case SIOCRTLTOOL:
-                if (!capable(CAP_NET_ADMIN)) {
-                        ret = -EPERM;
-                        break;
-                }
-
-                ret = rtl8168_tool_ioctl(tp, ifr);
-                break;
-
-        default:
-                ret = -EOPNOTSUPP;
-        }
-
-        return ret;
-}
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,0)
-
 static int
 rtl8168_do_ioctl(struct net_device *dev,
                  struct ifreq *ifr,
@@ -27614,6 +25172,7 @@
         struct rtl8168_private *tp = netdev_priv(dev);
         struct mii_ioctl_data *data = if_mii(ifr);
         int ret;
+        unsigned long flags;
 
         ret = 0;
         switch (cmd) {
@@ -27622,15 +25181,19 @@
                 break;
 
         case SIOCGMIIREG:
+                spin_lock_irqsave(&tp->lock, flags);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                 data->val_out = rtl8168_mdio_read(tp, data->reg_num);
+                spin_unlock_irqrestore(&tp->lock, flags);
                 break;
 
         case SIOCSMIIREG:
                 if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
+                spin_lock_irqsave(&tp->lock, flags);
                 rtl8168_mdio_write(tp, 0x1F, 0x0000);
                 rtl8168_mdio_write(tp, data->reg_num, data->val_in);
+                spin_unlock_irqrestore(&tp->lock, flags);
                 break;
 
 #ifdef ETHTOOL_OPS_COMPAT
@@ -27669,21 +25232,11 @@
                         break;
                 }
 
-                if (!capable(CAP_NET_ADMIN)) {
-                        ret = -EPERM;
-                        break;
-                }
-
                 ret = rtl8168_realwow_ioctl(dev, ifr);
                 break;
 #endif
 
         case SIOCRTLTOOL:
-                if (!capable(CAP_NET_ADMIN)) {
-                        ret = -EPERM;
-                        break;
-                }
-
                 ret = rtl8168_tool_ioctl(tp, ifr);
                 break;
 
@@ -27733,29 +25286,31 @@
         }
 
         //wait ups resume (phy state 3)
-        if (HW_SUPPORT_UPS_MODE(tp))
-                rtl8168_wait_phy_ups_resume(dev, HW_PHY_STATUS_LAN_ON);
+        switch (tp->mcfg) {
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                rtl8168_wait_phy_ups_resume(dev, 3);
+                break;
+        };
 }
 
 static void
 rtl8168_phy_power_down(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 csi_tmp;
 
-#ifdef ENABLE_FIBER_SUPPORT
-        if (HW_FIBER_MODE_ENABLED(tp))
-                return;
-#endif //ENABLE_FIBER_SUPPORT
-
         switch (tp->mcfg) {
         case CFG_METHOD_21:
         case CFG_METHOD_22:
         case CFG_METHOD_23:
         case CFG_METHOD_24:
-                csi_tmp = rtl8168_eri_read(tp, 0x1AB, 1, ERIAR_ExGMAC);
-                csi_tmp &= ~(BIT_2 | BIT_3 | BIT_4 | BIT_5 | BIT_6 | BIT_7);
-                rtl8168_eri_write(tp, 0x1AB, 1, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1AB, 1, ERIAR_ExGMAC);
+                csi_tmp &= ~( BIT_2 | BIT_3 | BIT_4 | BIT_5 | BIT_6 | BIT_7 );
+                rtl8168_eri_write(ioaddr, 0x1AB, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 
@@ -27781,9 +25336,6 @@
         case CFG_METHOD_15:
         case CFG_METHOD_29:
         case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_mdio_write(tp, MII_BMCR, BMCR_ANENABLE | BMCR_PDOWN);
                 break;
         case CFG_METHOD_21:
@@ -27813,7 +25365,7 @@
         assert(ioaddr_out != NULL);
 
         /* dev zeroed in alloc_etherdev */
-        dev = alloc_etherdev_mq(sizeof (*tp), R8168_MAX_QUEUES);
+        dev = alloc_etherdev(sizeof (*tp));
         if (dev == NULL) {
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
                 if (netif_msg_drv(&debug))
@@ -27826,15 +25378,13 @@
         SET_NETDEV_DEV(dev, &pdev->dev);
         tp = netdev_priv(dev);
         tp->dev = dev;
-        tp->pci_dev = pdev;
         tp->msg_enable = netif_msg_init(debug.msg_enable, R8168_MSG_DEFAULT);
 
-        if (!aspm || tp->mcfg == CFG_METHOD_9) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+        if (!aspm || tp->mcfg == CFG_METHOD_9)
                 pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
                                        PCIE_LINK_STATE_CLKPM);
 #endif
-        }
 
         /* enable device (incl. PCI PM wakeup and hotplug setup) */
         rc = pci_enable_device(pdev);
@@ -27846,12 +25396,9 @@
                 goto err_out_free_dev;
         }
 
-        if (pci_set_mwi(pdev) < 0) {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-                if (netif_msg_drv(&debug))
-                        dev_info(&pdev->dev, "Mem-Wr-Inval unavailable.\n");
-#endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-        }
+        rc = pci_set_mwi(pdev);
+        if (rc < 0)
+                goto err_out_disable;
 
         /* save power state before pci_enable_device overwrites it */
         pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
@@ -27900,11 +25447,11 @@
 
         if ((sizeof(dma_addr_t) > 4) &&
             use_dac &&
-            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
-            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+            !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 dev->features |= NETIF_F_HIGHDMA;
         } else {
-                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc < 0) {
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
                         if (netif_msg_probe(tp))
@@ -27914,6 +25461,8 @@
                 }
         }
 
+        pci_set_master(pdev);
+
         /* ioremap MMIO region */
         ioaddr = ioremap(pci_resource_start(pdev, 2), R8168_REGS_SIZE);
         if (ioaddr == NULL) {
@@ -27925,10 +25474,8 @@
                 goto err_out_free_res;
         }
 
-        tp->mmio_addr = ioaddr;
-
         /* Identify chip attached to board */
-        rtl8168_get_mac_version(tp);
+        rtl8168_get_mac_version(tp, ioaddr);
 
         rtl8168_print_mac_version(tp);
 
@@ -27957,9 +25504,13 @@
 
 err_out_free_res:
         pci_release_regions(pdev);
+
 err_out_mwi:
         pci_clear_mwi(pdev);
+
+err_out_disable:
         pci_disable_device(pdev);
+
 err_out_free_dev:
         free_netdev(dev);
 err_out:
@@ -27969,10 +25520,24 @@
 }
 
 static void
-rtl8168_esd_checker(struct rtl8168_private *tp)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
+rtl8168_esd_timer(unsigned long __opaque)
+#else
+rtl8168_esd_timer(struct timer_list *t)
+#endif
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
+        struct net_device *dev = (struct net_device *)__opaque;
+        struct rtl8168_private *tp = netdev_priv(dev);
+        struct timer_list *timer = &tp->esd_timer;
+#else
+        struct rtl8168_private *tp = from_timer(tp, t, esd_timer);
         struct net_device *dev = tp->dev;
+        struct timer_list *timer = t;
+#endif
         struct pci_dev *pdev = tp->pci_dev;
+        unsigned long timeout = RTL8168_ESD_TIMEOUT;
+        unsigned long flags;
         u8 cmd;
         u16 io_base_l;
         u16 mem_base_l;
@@ -27989,8 +25554,7 @@
         u32 pci_sn_l;
         u32 pci_sn_h;
 
-        if (unlikely(tp->rtk_enable_diag))
-                goto exit;
+        spin_lock_irqsave(&tp->lock, flags);
 
         tp->esd_flag = 0;
 
@@ -27999,12 +25563,6 @@
                 printk(KERN_ERR "%s: cmd = 0x%02x, should be 0x%02x \n.", dev->name, cmd, tp->pci_cfg_space.cmd);
                 pci_write_config_byte(pdev, PCI_COMMAND, tp->pci_cfg_space.cmd);
                 tp->esd_flag |= BIT_0;
-
-                pci_read_config_byte(pdev, PCI_COMMAND, &cmd);
-                if (cmd == 0xff) {
-                        printk(KERN_ERR "%s: pci link is down \n.", dev->name);
-                        goto exit;
-                }
         }
 
         pci_read_config_word(pdev, PCI_BASE_ADDRESS_0, &io_base_l);
@@ -28107,13 +25665,10 @@
                 }
         }
 
-        if (tp->TestPhyOcpReg && rtl8168_test_phy_ocp(tp))
-                tp->esd_flag |= BIT_15;
-
         if (tp->esd_flag != 0) {
                 printk(KERN_ERR "%s: esd_flag = 0x%04x\n.\n", dev->name, tp->esd_flag);
+                netif_stop_queue(dev);
                 netif_carrier_off(dev);
-                netif_tx_disable(dev);
                 rtl8168_hw_reset(dev);
                 rtl8168_tx_clear(tp);
                 rtl8168_rx_clear(tp);
@@ -28126,35 +25681,11 @@
                 rtl8168_set_speed(dev, tp->autoneg, tp->speed, tp->duplex, tp->advertising);
                 tp->esd_flag = 0;
         }
-
-exit:
-        return;
-}
-
-/*
-static void
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
-rtl8168_esd_timer(unsigned long __opaque)
-#else
-rtl8168_esd_timer(struct timer_list *t)
-#endif
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
-        struct net_device *dev = (struct net_device *)__opaque;
-        struct rtl8168_private *tp = netdev_priv(dev);
-        struct timer_list *timer = &tp->esd_timer;
-#else
-        struct rtl8168_private *tp = from_timer(tp, t, esd_timer);
-        //struct net_device *dev = tp->dev;
-        struct timer_list *timer = t;
-#endif
-        rtl8168_esd_checker(tp);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         mod_timer(timer, jiffies + timeout);
 }
-*/
 
-/*
 static void
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 rtl8168_link_timer(unsigned long __opaque)
@@ -28171,73 +25702,21 @@
         struct net_device *dev = tp->dev;
         struct timer_list *timer = t;
 #endif
+        unsigned long flags;
+
+        spin_lock_irqsave(&tp->lock, flags);
         rtl8168_check_link_status(dev);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT);
 }
-*/
-
-#ifndef ENABLE_RSS_SUPPORT
-static int rtl8168_enable_msix(struct rtl8168_private *tp)
-{
-        int i, nvecs = 0;
-        struct msix_entry msix_entR8168_MAX_MSIX_VEC;
-        //struct net_device *dev = tp->dev;
-        //const int len = sizeof(tp->irq_tbl0.name);
-
-        for (i = 0; i < R8168_MAX_MSIX_VEC; i++) {
-                msix_enti.entry = i;
-                msix_enti.vector = 0;
-        }
-
-        nvecs = pci_enable_msix_range(tp->pci_dev, msix_ent,
-                                      tp->min_irq_nvecs, tp->max_irq_nvecs);
-        if (nvecs < 0)
-                goto out;
-
-        for (i = 0; i < nvecs; i++) {
-                struct r8168_irq *irq = &tp->irq_tbli;
-                irq->vector = msix_enti.vector;
-                //snprintf(irq->name, len, "%s-%d", dev->name, i);
-                //irq->handler = rtl8168_interrupt_msix;
-        }
-
-out:
-        return nvecs;
-}
-#endif /* !ENABLE_RSS_SUPPORT */
 
 /* Cfg9346_Unlock assumed. */
-static int rtl8168_try_msi(struct rtl8168_private *tp)
+static unsigned rtl8168_try_msi(struct pci_dev *pdev, struct rtl8168_private *tp)
 {
-        struct pci_dev *pdev = tp->pci_dev;
-        unsigned int hw_supp_irq_nvecs;
         unsigned msi = 0;
-        int nvecs = 1;
 
-        switch (tp->mcfg) {
-        case CFG_METHOD_4 ... CFG_METHOD_8:
-                hw_supp_irq_nvecs = 2;
-                break;
-        case CFG_METHOD_9 ... CFG_METHOD_37:
-                hw_supp_irq_nvecs = 4;
-                break;
-        default:
-                hw_supp_irq_nvecs = 1;
-                break;
-        }
-        tp->hw_supp_irq_nvecs = clamp_val(hw_supp_irq_nvecs, 1,
-                                          R8168_MAX_MSIX_VEC);
-
-        tp->max_irq_nvecs = 1;
-        tp->min_irq_nvecs = 1;
-
-#ifdef ENABLE_RSS_SUPPORT
-        if (!pci_enable_msi(pdev))
-                msi |= RTL_FEATURE_MSI;
-        else
-                dev_info(&pdev->dev, "Default use INTx.\n");
-#else
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
         switch (tp->mcfg) {
         case CFG_METHOD_1:
         case CFG_METHOD_2:
@@ -28250,55 +25729,25 @@
                 dev_info(&pdev->dev, "Default use INTx.\n");
                 break;
         default:
-#if defined(RTL_USE_NEW_INTR_API)
-                if ((nvecs = pci_alloc_irq_vectors(pdev, tp->min_irq_nvecs, tp->max_irq_nvecs, PCI_IRQ_MSIX)) > 0)
-                        msi |= RTL_FEATURE_MSIX;
-                else if ((nvecs = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES)) > 0 &&
-                         pci_dev_msi_enabled(pdev))
-                        msi |= RTL_FEATURE_MSI;
-#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-                if ((nvecs = rtl8168_enable_msix(tp)) > 0)
-                        msi |= RTL_FEATURE_MSIX;
-                else if (!pci_enable_msi(pdev))
+                if (pci_enable_msi(pdev))
+                        dev_info(&pdev->dev, "no MSI. Back to INTx.\n");
+                else
                         msi |= RTL_FEATURE_MSI;
-#endif
                 break;
         }
-#endif //ENABLE_RSS_SUPPORT
-        if (!(msi & (RTL_FEATURE_MSI | RTL_FEATURE_MSIX)))
-                dev_info(&pdev->dev, "no MSI. Back to INTx.\n");
-
-        if (!(msi & RTL_FEATURE_MSIX) || nvecs < 1)
-                nvecs = 1;
-
-        tp->irq_nvecs = nvecs;
-
-        tp->features |= msi;
+#endif
 
-        return nvecs;
+        return msi;
 }
 
 static void rtl8168_disable_msi(struct pci_dev *pdev, struct rtl8168_private *tp)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
-        if (tp->features & (RTL_FEATURE_MSI | RTL_FEATURE_MSIX))
-                pci_free_irq_vectors(pdev);
-#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
-        if (tp->features & (RTL_FEATURE_MSIX))
-                pci_disable_msix(pdev);
-        else if (tp->features & (RTL_FEATURE_MSI))
+        if (tp->features & RTL_FEATURE_MSI) {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
                 pci_disable_msi(pdev);
 #endif
-        tp->features &= ~(RTL_FEATURE_MSI | RTL_FEATURE_MSIX);
-}
-
-static int rtl8168_get_irq(struct pci_dev *pdev)
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
-        return pci_irq_vector(pdev, 0);
-#else
-        return pdev->irq;
-#endif
+                tp->features &= ~RTL_FEATURE_MSI;
+        }
 }
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
@@ -28310,12 +25759,7 @@
         .ndo_tx_timeout     = rtl8168_tx_timeout,
         .ndo_change_mtu     = rtl8168_change_mtu,
         .ndo_set_mac_address    = rtl8168_set_mac_address,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0)
         .ndo_do_ioctl       = rtl8168_do_ioctl,
-#else
-        .ndo_siocdevprivate = rtl8168_siocdevprivate,
-        .ndo_eth_ioctl      = rtl8168_do_ioctl,
-#endif //LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
         .ndo_set_multicast_list = rtl8168_set_rx_mode,
 #else
@@ -28335,82 +25779,6 @@
 };
 #endif
 
-#ifdef  CONFIG_R8168_NAPI
-
-void rtl8168_enable_napi(struct rtl8168_private *tp)
-{
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-        int i;
-
-        for (i = 0; i < tp->irq_nvecs; i++)
-                RTL_NAPI_ENABLE(tp->dev, &tp->r8168napii.napi);
-#endif
-}
-
-static void rtl8168_disable_napi(struct rtl8168_private *tp)
-{
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-        int i;
-
-        for (i = 0; i < tp->irq_nvecs; i++)
-                RTL_NAPI_DISABLE(tp->dev, &tp->r8168napii.napi);
-#endif
-}
-
-static void rtl8168_del_napi(struct rtl8168_private *tp)
-{
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-        int i;
-
-        for (i = 0; i < tp->irq_nvecs; i++)
-                RTL_NAPI_DEL((&tp->r8168napii));
-#endif
-}
-#endif //CONFIG_R8168_NAPI
-
-static void rtl8168_init_napi(struct rtl8168_private *tp)
-{
-        int i;
-
-        for (i=0; i<tp->irq_nvecs; i++) {
-                struct r8168_napi *r8168napi = &tp->r8168napii;
-#ifdef CONFIG_R8168_NAPI
-                int (*poll)(struct napi_struct *, int);
-
-                if (tp->features & RTL_FEATURE_MSIX) {
-                        if (i == 0)
-                                poll = rtl8168_poll_msix_ring;
-                        else
-                                poll = rtl8168_poll_msix_rx;
-                } else {
-                        poll = rtl8168_poll;
-                }
-
-                RTL_NAPI_CONFIG(tp->dev, r8168napi, poll, R8168_NAPI_WEIGHT);
-#endif
-
-                r8168napi->priv = tp;
-                r8168napi->index = i;
-        }
-}
-
-static int
-rtl8168_set_real_num_queue(struct rtl8168_private *tp)
-{
-        int retval = 0;
-
-        retval = netif_set_real_num_tx_queues(tp->dev, tp->num_tx_rings);
-        if (retval < 0)
-                goto exit;
-
-        retval = netif_set_real_num_rx_queues(tp->dev, tp->num_rx_rings);
-        if (retval < 0)
-                goto exit;
-
-exit:
-        return retval;
-}
-
 static int __devinit
 rtl8168_init_one(struct pci_dev *pdev,
                  const struct pci_device_id *ent)
@@ -28438,19 +25806,14 @@
         tp = netdev_priv(dev);
         assert(ioaddr != NULL);
 
+        tp->mmio_addr = ioaddr;
         tp->set_speed = rtl8168_set_speed_xmii;
         tp->get_settings = rtl8168_gset_xmii;
         tp->phy_reset_enable = rtl8168_xmii_reset_enable;
         tp->phy_reset_pending = rtl8168_xmii_reset_pending;
         tp->link_ok = rtl8168_xmii_link_ok;
 
-        rc = rtl8168_try_msi(tp);
-        if (rc < 0) {
-                dev_err(&pdev->dev, "Can't allocate interrupt\n");
-                goto err_out_1;
-        }
-
-        rtl8168_init_software_variable(dev);
+        tp->features |= rtl8168_try_msi(pdev, tp);
 
         RTL_NET_DEVICE_OPS(rtl8168_netdev_ops);
 
@@ -28459,50 +25822,37 @@
 #endif
 
         dev->watchdog_timeo = RTL8168_TX_TIMEOUT;
-        dev->irq = rtl8168_get_irq(pdev);
+        dev->irq = pdev->irq;
         dev->base_addr = (unsigned long) ioaddr;
 
-        rtl8168_init_napi(tp);
+#ifdef CONFIG_R8168_NAPI
+        RTL_NAPI_CONFIG(dev, tp, rtl8168_poll, R8168_NAPI_WEIGHT);
+#endif
 
 #ifdef CONFIG_R8168_VLAN
         if (tp->mcfg != CFG_METHOD_DEFAULT) {
-                dev->features |= NETIF_F_HW_VLAN_TX;
-#ifndef ENABLE_LIB_SUPPORT
-                dev->features |= NETIF_F_HW_VLAN_RX;
-#endif //!ENABLE_LIB_SUPPORT
+                dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
                 dev->vlan_rx_kill_vid = rtl8168_vlan_rx_kill_vid;
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
         }
 #endif
 
-        /* There has been a number of reports that using SG/TSO results in
-         * tx timeouts. However for a lot of people SG/TSO works fine.
-         * Therefore disable both features by default, but allow users to
-         * enable them. Use at own risk!
-         */
-        tp->cp_cmd |= RTL_R16(tp, CPlusCmd);
+        tp->cp_cmd |= RTL_R16(CPlusCmd);
         if (tp->mcfg != CFG_METHOD_DEFAULT) {
                 dev->features |= NETIF_F_IP_CSUM;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
                 tp->cp_cmd |= RxChkSum;
 #else
-                dev->features |= NETIF_F_RXCSUM;
+                dev->features |= NETIF_F_RXCSUM | NETIF_F_SG;
                 dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM |
                                    NETIF_F_RXCSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
                 dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM |
                                      NETIF_F_HIGHDMA;
                 if ((tp->mcfg != CFG_METHOD_16) && (tp->mcfg != CFG_METHOD_17)) {
+                        dev->features |= NETIF_F_TSO;
                         dev->hw_features |= NETIF_F_TSO;
                         dev->vlan_features |= NETIF_F_TSO;
-                        switch (tp->mcfg) {
-                        case CFG_METHOD_1 ... CFG_METHOD_26:
-                                /* nothing to do */
-                                break;
-                        default:
-                                dev->features |= NETIF_F_SG | NETIF_F_TSO;
-                                break;
-                        };
                 }
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
                 dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
@@ -28512,10 +25862,6 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
                 if ((tp->mcfg == CFG_METHOD_1) || (tp->mcfg == CFG_METHOD_2) || (tp->mcfg == CFG_METHOD_3)) {
                         dev->hw_features &= ~NETIF_F_IPV6_CSUM;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-                        netif_set_tso_max_size(dev, LSO_64K);
-                        netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO2);
-#else //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
                         netif_set_gso_max_size(dev, LSO_32K);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
                         dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO_64K;
@@ -28523,25 +25869,13 @@
                         dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
 #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
                 } else {
                         dev->hw_features |= NETIF_F_IPV6_CSUM;
                         dev->features |=  NETIF_F_IPV6_CSUM;
                         if ((tp->mcfg != CFG_METHOD_16) && (tp->mcfg != CFG_METHOD_17)) {
                                 dev->hw_features |= NETIF_F_TSO6;
-                                switch (tp->mcfg) {
-                                case CFG_METHOD_1 ... CFG_METHOD_26:
-                                        /* nothing to do */
-                                        break;
-                                default:
-                                        dev->features |=  NETIF_F_TSO6;
-                                        break;
-                                };
+                                dev->features |=  NETIF_F_TSO6;
                         }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-                        netif_set_tso_max_size(dev, LSO_64K);
-                        netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO2);
-#else //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
                         netif_set_gso_max_size(dev, LSO_64K);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
                         dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
@@ -28549,33 +25883,22 @@
                         dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
 #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
                 }
 #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
         }
 
-#ifdef ENABLE_RSS_SUPPORT
-        if (tp->EnableRss) {
-                dev->hw_features |= NETIF_F_RXHASH;
-                dev->features |=  NETIF_F_RXHASH;
-        }
-#endif
+        tp->pci_dev = pdev;
+
+        spin_lock_init(&tp->lock);
+
+        rtl8168_init_software_variable(dev);
 
 #ifdef ENABLE_DASH_SUPPORT
         if (tp->DASH)
                 AllocateDashShareMemory(dev);
 #endif
 
-#ifdef ENABLE_LIB_SUPPORT
-        BLOCKING_INIT_NOTIFIER_HEAD(&tp->lib_nh);
-#endif
-        rtl8168_init_all_schedule_work(tp);
-
-        rc = rtl8168_set_real_num_queue(tp);
-        if (rc < 0)
-                goto err_out;
-
         rtl8168_exit_oob(dev);
 
         rtl8168_hw_init(dev);
@@ -28585,29 +25908,24 @@
         /* Get production from EEPROM */
         if (((tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
               tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_29 ||
-              tp->mcfg == CFG_METHOD_30 || tp->mcfg == CFG_METHOD_35 ||
-              tp->mcfg == CFG_METHOD_36 || tp->mcfg == CFG_METHOD_37) &&
-             (rtl8168_mac_ocp_read(tp, 0xDC00) & BIT_3)) ||
+              tp->mcfg == CFG_METHOD_30) && (rtl8168_mac_ocp_read(tp, 0xDC00) & BIT_3)) ||
             ((tp->mcfg == CFG_METHOD_26) && (rtl8168_mac_ocp_read(tp, 0xDC00) & BIT_4)))
                 tp->eeprom_type = EEPROM_TYPE_NONE;
         else
                 rtl8168_eeprom_type(tp);
 
         if (tp->eeprom_type == EEPROM_TYPE_93C46 || tp->eeprom_type == EEPROM_TYPE_93C56)
-                rtl8168_set_eeprom_sel_low(tp);
+                rtl8168_set_eeprom_sel_low(ioaddr);
 
         rtl8168_get_mac_address(dev);
 
-        tp->fw_name = rtl_chip_fw_infostp->mcfg.fw_name;
-
 #if defined(ENABLE_DASH_PRINTER_SUPPORT)
         init_completion(&tp->fw_host_ok);
         init_completion(&tp->fw_ack);
         init_completion(&tp->fw_req);
 #endif
 
-        tp->tally_vaddr = dma_alloc_coherent(&pdev->dev, sizeof(*tp->tally_vaddr),
-                                             &tp->tally_paddr, GFP_KERNEL);
+        tp->tally_vaddr = pci_alloc_consistent(pdev, sizeof(*tp->tally_vaddr), &tp->tally_paddr);
         if (!tp->tally_vaddr) {
                 rc = -ENOMEM;
                 goto err_out;
@@ -28629,8 +25947,6 @@
 
         netif_carrier_off(dev);
 
-        rtl8168_sysfs_init(dev);
-
         printk("%s", GPL_CLAIM);
 
 out:
@@ -28638,18 +25954,16 @@
 
 err_out:
         if (tp->tally_vaddr != NULL) {
-                dma_free_coherent(&pdev->dev, sizeof(*tp->tally_vaddr), tp->tally_vaddr,
-                                  tp->tally_paddr);
+                pci_free_consistent(pdev, sizeof(*tp->tally_vaddr), tp->tally_vaddr,
+                                    tp->tally_paddr);
 
                 tp->tally_vaddr = NULL;
         }
 #ifdef  CONFIG_R8168_NAPI
-        rtl8168_del_napi(tp);
+        RTL_NAPI_DEL(tp);
 #endif
         rtl8168_disable_msi(pdev, tp);
-
-err_out_1:
-        rtl8168_release_board(pdev, dev);
+        rtl8168_release_board(pdev, dev, ioaddr);
 
         goto out;
 }
@@ -28663,246 +25977,40 @@
         assert(dev != NULL);
         assert(tp != NULL);
 
-        set_bit(R8168_FLAG_DOWN, tp->task_flags);
-
-        rtl8168_cancel_all_schedule_work(tp);
-
 #ifdef  CONFIG_R8168_NAPI
-        rtl8168_del_napi(tp);
+        RTL_NAPI_DEL(tp);
 #endif
-        if (HW_DASH_SUPPORT_DASH(tp))
+        if (tp->DASH)
                 rtl8168_driver_stop(tp);
 
-#ifdef ENABLE_R8168_SYSFS
-        rtl8168_sysfs_remove(dev);
-#endif //ENABLE_R8168_SYSFS
-
         unregister_netdev(dev);
         rtl8168_disable_msi(pdev, tp);
 #ifdef ENABLE_R8168_PROCFS
         rtl8168_proc_remove(dev);
 #endif
         if (tp->tally_vaddr != NULL) {
-                dma_free_coherent(&pdev->dev, sizeof(*tp->tally_vaddr), tp->tally_vaddr, tp->tally_paddr);
+                pci_free_consistent(pdev, sizeof(*tp->tally_vaddr), tp->tally_vaddr, tp->tally_paddr);
                 tp->tally_vaddr = NULL;
         }
 
-        rtl8168_release_board(pdev, dev);
-
-#ifdef ENABLE_USE_FIRMWARE_FILE
-        rtl8168_release_firmware(tp);
-#endif
-
+        rtl8168_release_board(pdev, dev, tp->mmio_addr);
         pci_set_drvdata(pdev, NULL);
 }
 
-static void rtl8168_free_irq(struct rtl8168_private *tp)
-{
-        int i;
-
-        for (i=0; i<tp->irq_nvecs; i++) {
-                struct r8168_irq *irq = &tp->irq_tbli;
-                struct r8168_napi *r8168napi = &tp->r8168napii;
-
-                if (irq->requested) {
-                        irq->requested = 0;
-#if defined(RTL_USE_NEW_INTR_API)
-                        pci_free_irq(tp->pci_dev, i, r8168napi);
-#else
-                        free_irq(irq->vector, r8168napi);
-#endif
-                }
-        }
-}
-
-static int rtl8168_alloc_irq(struct rtl8168_private *tp)
-{
-        struct net_device *dev = tp->dev;
-        int rc = 0;
-        struct r8168_irq *irq;
-        struct r8168_napi *r8168napi;
-        int i = 0;
-        const int len = sizeof(tp->irq_tbl0.name);
-
-#if defined(RTL_USE_NEW_INTR_API)
-        for (i=0; i<tp->irq_nvecs; i++) {
-                irq = &tp->irq_tbli;
-                if (tp->features & RTL_FEATURE_MSIX)
-                        irq->handler = rtl8168_interrupt_msix;
-                else
-                        irq->handler = rtl8168_interrupt;
-
-                r8168napi = &tp->r8168napii;
-                snprintf(irq->name, len, "%s-%d", dev->name, i);
-                rc = pci_request_irq(tp->pci_dev, i, irq->handler, NULL, r8168napi,
-                                     irq->name);
-                if (rc)
-                        break;
-
-                irq->vector = pci_irq_vector(tp->pci_dev, i);
-                irq->requested = 1;
-        }
-#else
-        unsigned long irq_flags = 0;
-#ifdef ENABLE_LIB_SUPPORT
-        if (tp->features & (RTL_FEATURE_MSI | RTL_FEATURE_MSIX))
-                irq_flags |= IRQF_NO_SUSPEND;
-#endif //ENABLE_LIB_SUPPORT
-        if (tp->features & RTL_FEATURE_MSIX) {
-                for (i=0; i<tp->irq_nvecs; i++) {
-                        irq = &tp->irq_tbli;
-                        irq->handler = rtl8168_interrupt_msix;
-                        r8168napi = &tp->r8168napii;
-                        snprintf(irq->name, len, "%s-%d", dev->name, i);
-                        rc = request_irq(irq->vector, irq->handler, irq_flags, irq->name, r8168napi);
-
-                        if (rc)
-                                break;
-
-                        irq->requested = 1;
-                }
-        } else {
-                irq = &tp->irq_tbl0;
-                irq->handler = rtl8168_interrupt;
-                r8168napi = &tp->r8168napi0;
-                snprintf(irq->name, len, "%s-0", dev->name);
-                irq->vector = dev->irq;
-                irq_flags |= (tp->features & (RTL_FEATURE_MSI | RTL_FEATURE_MSIX)) ? 0 : SA_SHIRQ;
-                rc = request_irq(irq->vector, irq->handler, irq_flags, irq->name, r8168napi);
-
-                if (rc == 0)
-                        irq->requested = 1;
-        }
-#endif
-        if (rc)
-                rtl8168_free_irq(tp);
-
-        return rc;
-}
-
 static void
 rtl8168_set_rxbufsize(struct rtl8168_private *tp,
                       struct net_device *dev)
 {
         unsigned int mtu = dev->mtu;
 
-        tp->rx_buf_sz = (mtu > ETH_DATA_LEN) ? mtu + ETH_HLEN + 8 : RX_BUF_SIZE;
-
-        switch (tp->mcfg) {
-        case CFG_METHOD_1 ... CFG_METHOD_26:
-                tp->rx_buf_sz += 1;
-                break;
-        default:
-                break;
-        }
-}
-
-static int rtl8168_alloc_tx_desc(struct rtl8168_private *tp)
-{
-        struct pci_dev *pdev = tp->pci_dev;
-        struct rtl8168_tx_ring *ring;
-        int i;
-
-        for (i = 0; i < tp->num_tx_rings; i++) {
-                ring = &tp->tx_ringi;
-                ring->TxDescAllocSize = (ring->num_tx_desc + 1) * sizeof(struct TxDesc);
-                ring->TxDescArray = dma_alloc_coherent(&pdev->dev,
-                                                       ring->TxDescAllocSize,
-                                                       &ring->TxPhyAddr,
-                                                       GFP_KERNEL);
-
-                if (!ring->TxDescArray)
-                        return -1;
-        }
-
-        return 0;
-}
-
-static int rtl8168_alloc_rx_desc(struct rtl8168_private *tp)
-{
-        struct pci_dev *pdev = tp->pci_dev;
-
-        if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)
-                tp->RxDescAllocSize = ((tp->num_rx_desc + 1) * tp->num_hw_tot_en_rx_rings)
-                                      * tp->RxDescLength;
-        else
-                tp->RxDescAllocSize = (tp->num_rx_desc + 1) * tp->RxDescLength;
-
-        tp->RxDescArray = dma_alloc_coherent(&pdev->dev, tp->RxDescAllocSize,
-                                             &tp->RxPhyAddr, GFP_KERNEL);
-        if (!tp->RxDescArray)
-                return -1;
-
-        return 0;
-}
-
-static void rtl8168_free_tx_desc(struct rtl8168_private *tp)
-{
-        struct rtl8168_tx_ring *ring;
-        struct pci_dev *pdev = tp->pci_dev;
-        int i;
-
-        for (i = 0; i < tp->num_tx_rings; i++) {
-                ring = &tp->tx_ringi;
-                if (ring->TxDescArray) {
-                        dma_free_coherent(&pdev->dev,
-                                          ring->TxDescAllocSize,
-                                          ring->TxDescArray,
-                                          ring->TxPhyAddr);
-                        ring->TxDescArray = NULL;
-                }
-        }
-}
-
-static void rtl8168_free_rx_desc(struct rtl8168_private *tp)
-{
-        struct pci_dev *pdev = tp->pci_dev;
-
-        if (tp->RxDescArray) {
-                dma_free_coherent(&pdev->dev, tp->RxDescAllocSize, tp->RxDescArray,
-                                  tp->RxPhyAddr);
-                tp->RxDescArray = NULL;
-        }
+        tp->rx_buf_sz = (mtu > ETH_DATA_LEN) ? mtu + ETH_HLEN + 8 + 1 : RX_BUF_SIZE;
 }
 
-static void rtl8168_free_alloc_resources(struct rtl8168_private *tp)
-{
-        rtl8168_free_rx_desc(tp);
-
-        rtl8168_free_tx_desc(tp);
-}
-
-#ifdef ENABLE_USE_FIRMWARE_FILE
-static void rtl8168_request_firmware(struct rtl8168_private *tp)
-{
-        struct rtl8168_fw *rtl_fw;
-
-        /* firmware loaded already or no firmware available */
-        if (tp->rtl_fw || !tp->fw_name)
-                return;
-
-        rtl_fw = kzalloc(sizeof(*rtl_fw), GFP_KERNEL);
-        if (!rtl_fw)
-                return;
-
-        rtl_fw->phy_write = rtl8168_mdio_write;
-        rtl_fw->phy_read = rtl8168_mdio_read;
-        rtl_fw->mac_mcu_write = mac_mcu_write;
-        rtl_fw->mac_mcu_read = mac_mcu_read;
-        rtl_fw->fw_name = tp->fw_name;
-        rtl_fw->dev = tp_to_dev(tp);
-
-        if (rtl8168_fw_request_firmware(rtl_fw))
-                kfree(rtl_fw);
-        else
-                tp->rtl_fw = rtl_fw;
-}
-#endif
-
-int rtl8168_open(struct net_device *dev)
+static int rtl8168_open(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         struct pci_dev *pdev = tp->pci_dev;
+        unsigned long flags;
         int retval;
 
         retval = -ENOMEM;
@@ -28912,18 +26020,30 @@
 #endif
         rtl8168_set_rxbufsize(tp, dev);
         /*
-        * Rx and Tx descriptors needs 256 bytes alignment.
-        * pci_alloc_consistent provides more.
-        */
-        if (rtl8168_alloc_tx_desc(tp) < 0 || rtl8168_alloc_rx_desc(tp) < 0)
+         * Rx and Tx descriptors needs 256 bytes alignment.
+         * pci_alloc_consistent provides more.
+         */
+        tp->TxDescArray = pci_alloc_consistent(pdev, R8168_TX_RING_BYTES,
+                                               &tp->TxPhyAddr);
+        if (!tp->TxDescArray)
                 goto err_free_all_allocated_mem;
 
-        retval = rtl8168_init_ring(dev);
-        if (retval < 0)
+        tp->RxDescArray = pci_alloc_consistent(pdev, R8168_RX_RING_BYTES,
+                                               &tp->RxPhyAddr);
+        if (!tp->RxDescArray)
                 goto err_free_all_allocated_mem;
 
-        retval = rtl8168_alloc_irq(tp);
-        if (retval<0)
+        if (tp->UseSwPaddingShortPkt) {
+                tp->ShortPacketEmptyBuffer = pci_alloc_consistent(pdev, SHORT_PACKET_PADDING_BUF_SIZE,
+                                             &tp->ShortPacketEmptyBufferPhy);
+                if (!tp->ShortPacketEmptyBuffer)
+                        goto err_free_all_allocated_mem;
+
+                memset(tp->ShortPacketEmptyBuffer, 0x0, SHORT_PACKET_PADDING_BUF_SIZE);
+        }
+
+        retval = rtl8168_init_ring(dev);
+        if (retval < 0)
                 goto err_free_all_allocated_mem;
 
         if (netif_msg_probe(tp)) {
@@ -28937,21 +26057,19 @@
                        dev->dev_addr4, dev->dev_addr5, dev->irq);
         }
 
-#ifdef ENABLE_USE_FIRMWARE_FILE
-        rtl8168_request_firmware(tp);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+        INIT_WORK(&tp->task, NULL, dev);
+#else
+        INIT_DELAYED_WORK(&tp->task, NULL);
 #endif
-        /*
-        #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-                INIT_WORK(&tp->task, rtl8168_reset_task, dev);
-        #else
-                INIT_DELAYED_WORK(&tp->task, rtl8168_reset_task);
-        #endif
-        */
-        pci_set_master(pdev);
 
 #ifdef  CONFIG_R8168_NAPI
-        rtl8168_enable_napi(tp);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+        RTL_NAPI_ENABLE(dev, &tp->napi);
+#endif
 #endif
+        spin_lock_irqsave(&tp->lock, flags);
+
         rtl8168_exit_oob(dev);
 
         rtl8168_hw_init(dev);
@@ -28968,24 +26086,41 @@
 
         rtl8168_dsm(dev, DSM_IF_UP);
 
-        clear_bit(R8168_FLAG_DOWN, tp->task_flags);
-
         rtl8168_set_speed(dev, tp->autoneg, tp->speed, tp->duplex, tp->advertising);
 
-        if (tp->esd_flag == 0) {
-                //rtl8168_request_esd_timer(dev);
-                rtl8168_schedule_esd_work(tp);
-        }
+        spin_unlock_irqrestore(&tp->lock, flags);
+
+        retval = request_irq(dev->irq, rtl8168_interrupt, (tp->features & RTL_FEATURE_MSI) ? 0 : SA_SHIRQ, dev->name, dev);
+        if (retval<0)
+                goto err_free_all_allocated_mem;
 
-        //rtl8168_request_link_timer(dev);
-        rtl8168_schedule_linkchg_work(tp);
+        if (tp->esd_flag == 0)
+                rtl8168_request_esd_timer(dev);
+
+        rtl8168_request_link_timer(dev);
 
 out:
 
         return retval;
 
 err_free_all_allocated_mem:
-        rtl8168_free_alloc_resources(tp);
+        if (tp->RxDescArray != NULL) {
+                pci_free_consistent(pdev, R8168_RX_RING_BYTES, tp->RxDescArray,
+                                    tp->RxPhyAddr);
+                tp->RxDescArray = NULL;
+        }
+
+        if (tp->TxDescArray != NULL) {
+                pci_free_consistent(pdev, R8168_TX_RING_BYTES, tp->TxDescArray,
+                                    tp->TxPhyAddr);
+                tp->TxDescArray = NULL;
+        }
+
+        if (tp->ShortPacketEmptyBuffer != NULL) {
+                pci_free_consistent(pdev, ETH_ZLEN, tp->ShortPacketEmptyBuffer,
+                                    tp->ShortPacketEmptyBufferPhy);
+                tp->ShortPacketEmptyBuffer = NULL;
+        }
 
         goto out;
 }
@@ -28994,28 +26129,36 @@
 rtl8168_dsm(struct net_device *dev, int dev_state)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-
-        if (!(tp->mcfg == CFG_METHOD_5) || (tp->mcfg == CFG_METHOD_6))
-                return;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         switch (dev_state) {
         case DSM_MAC_INIT:
-                if (RTL_R8(tp, MACDBG) & 0x80)
-                        RTL_W8(tp, GPIO, RTL_R8(tp, GPIO) | GPIO_en);
-                else
-                        RTL_W8(tp, GPIO, RTL_R8(tp, GPIO) & ~GPIO_en);
+                if ((tp->mcfg == CFG_METHOD_5) || (tp->mcfg == CFG_METHOD_6)) {
+                        if (RTL_R8(MACDBG) & 0x80)
+                                RTL_W8(GPIO, RTL_R8(GPIO) | GPIO_en);
+                        else
+                                RTL_W8(GPIO, RTL_R8(GPIO) & ~GPIO_en);
+                }
+
                 break;
         case DSM_NIC_GOTO_D3:
         case DSM_IF_DOWN:
-                if (RTL_R8(tp, MACDBG) & 0x80)
-                        RTL_W8(tp, GPIO, RTL_R8(tp, GPIO) & ~GPIO_en);
+                if ((tp->mcfg == CFG_METHOD_5) || (tp->mcfg == CFG_METHOD_6)) {
+                        if (RTL_R8(MACDBG) & 0x80)
+                                RTL_W8(GPIO, RTL_R8(GPIO) & ~GPIO_en);
+                }
                 break;
+
         case DSM_NIC_RESUME_D3:
         case DSM_IF_UP:
-                if (RTL_R8(tp, MACDBG) & 0x80)
-                        RTL_W8(tp, GPIO, RTL_R8(tp, GPIO) | GPIO_en);
+                if ((tp->mcfg == CFG_METHOD_5) || (tp->mcfg == CFG_METHOD_6)) {
+                        if (RTL_R8(MACDBG) & 0x80)
+                                RTL_W8(GPIO, RTL_R8(GPIO) | GPIO_en);
+                }
+
                 break;
         }
+
 }
 
 static void
@@ -29039,8 +26182,7 @@
         struct pci_dev *pdev = tp->pci_dev;
         u8 device_control;
 
-        if (hwoptimize & HW_PATCH_SOC_LAN)
-                return;
+        if (hwoptimize & HW_PATCH_SOC_LAN) return;
 
         pci_read_config_byte(pdev, 0x79, &device_control);
         device_control &= ~0x70;
@@ -29065,6 +26207,7 @@
 rtl8168_hw_set_rx_packet_filter(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         u32 mc_filter2;   /* Multicast hash filter */
         int rx_mode;
         u32 tmp = 0;
@@ -29079,8 +26222,9 @@
                         AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
                         AcceptAllPhys;
                 mc_filter1 = mc_filter0 = 0xffffffff;
-        } else if (dev->flags & IFF_ALLMULTI) {
-                /* accept all multicasts. */
+        } else if ((netdev_mc_count(dev) > multicast_filter_limit)
+                   || (dev->flags & IFF_ALLMULTI)) {
+                /* Too many to filter perfectly -- accept all multicasts. */
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
                 mc_filter1 = mc_filter0 = 0xffffffff;
         } else {
@@ -29117,35 +26261,31 @@
         mc_filter1 = swab32(tmp);
 
         tp->rtl8168_rx_config = rtl_chip_infotp->chipset.RCR_Cfg;
-        switch (tp->mcfg) {
-        case CFG_METHOD_21 ... CFG_METHOD_35:
-                if (tp->EnableRss)
-                        tp->rtl8168_rx_config &= ~Rx_Single_fetch_V2;
-                else
-                        tp->rtl8168_rx_config |= Rx_Single_fetch_V2;
-                break;
-        default:
-                break;
-        }
-        if (tp->InitRxDescType == RX_DESC_RING_TYPE_2)
-                tp->rtl8168_rx_config |= RxCfg_rx_desc_v2_en;
-        tmp = tp->rtl8168_rx_config | rx_mode | (RTL_R32(tp, RxConfig) & rtl_chip_infotp->chipset.RxConfigMask);
-
-        RTL_W32(tp, RxConfig, tmp);
-        RTL_W32(tp, MAR0 + 0, mc_filter0);
-        RTL_W32(tp, MAR0 + 4, mc_filter1);
+        tmp = tp->rtl8168_rx_config | rx_mode | (RTL_R32(RxConfig) & rtl_chip_infotp->chipset.RxConfigMask);
+
+        RTL_W32(RxConfig, tmp);
+        RTL_W32(MAR0 + 0, mc_filter0);
+        RTL_W32(MAR0 + 4, mc_filter1);
 }
 
 static void
 rtl8168_set_rx_mode(struct net_device *dev)
 {
+        struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
+
+        spin_lock_irqsave(&tp->lock, flags);
+
         rtl8168_hw_set_rx_packet_filter(dev);
+
+        spin_unlock_irqrestore(&tp->lock, flags);
 }
 
-void
+static void
 rtl8168_hw_config(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         struct pci_dev *pdev = tp->pci_dev;
         u8 device_control;
         u16 mac_ocp_data;
@@ -29158,18 +26298,38 @@
                 dev->features |= NETIF_F_IP_CSUM;
         }
 #endif
-        rtl8168_disable_rx_packet_filter(tp);
+
+        RTL_W32(RxConfig, (RX_DMA_BURST << RxCfgDMAShift));
 
         rtl8168_hw_reset(dev);
 
         rtl8168_enable_cfg9346_write(tp);
-        if (tp->HwSuppAspmClkIntrLock) {
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) & ~BIT_7);
-                rtl8168_hw_aspm_clkreq_enable(tp, false);
+        switch (tp->mcfg) {
+        case CFG_METHOD_14:
+        case CFG_METHOD_15:
+        case CFG_METHOD_16:
+        case CFG_METHOD_17:
+        case CFG_METHOD_18:
+        case CFG_METHOD_19:
+        case CFG_METHOD_20:
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                RTL_W8(0xF1, RTL_R8(0xF1) & ~BIT_7);
+                RTL_W8(Config2, RTL_R8(Config2) & ~BIT_7);
+                RTL_W8(Config5, RTL_R8(Config5) & ~BIT_0);
+                break;
         }
 
-        rtl8168_set_eee_lpi_timer(tp);
-
         //clear io_rdy_l23
         switch (tp->mcfg) {
         case CFG_METHOD_20:
@@ -29185,12 +26345,7 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~BIT_1);
+                RTL_W8(Config3, RTL_R8(Config3) & ~BIT_1);
                 break;
         }
 
@@ -29213,18 +26368,13 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                csi_tmp = rtl8168_eri_read(tp, 0xDE, 1, ERIAR_ExGMAC);
-                csi_tmp &= BIT_0;
-                rtl8168_eri_write(tp, 0xDE, 1, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDE, 1, ERIAR_ExGMAC);
+                csi_tmp &= ~BIT_0;
+                rtl8168_eri_write(ioaddr, 0xDE, 1, csi_tmp, ERIAR_ExGMAC);
                 break;
         }
 
-        RTL_W8(tp, MTPS, Reserved1_data);
+        RTL_W8(MTPS, Reserved1_data);
 
         tp->cp_cmd |= INTT_1;
         if (tp->use_timer_interrrupt)
@@ -29232,7 +26382,7 @@
         else
                 tp->cp_cmd &= ~PktCntrDisable;
 
-        RTL_W16(tp, IntrMitigate, 0x5f51);
+        RTL_W16(IntrMitigate, 0x5f51);
 
         rtl8168_tally_counter_addr_fill(tp);
 
@@ -29240,30 +26390,30 @@
 
         /* Set DMA burst size and Interframe Gap Time */
         if (tp->mcfg == CFG_METHOD_1)
-                RTL_W32(tp, TxConfig, (TX_DMA_BURST_512 << TxDMAShift) |
+                RTL_W32(TxConfig, (TX_DMA_BURST_512 << TxDMAShift) |
                         (InterFrameGap << TxInterFrameGapShift));
         else
-                RTL_W32(tp, TxConfig, (TX_DMA_BURST_unlimited << TxDMAShift) |
+                RTL_W32(TxConfig, (TX_DMA_BURST_unlimited << TxDMAShift) |
                         (InterFrameGap << TxInterFrameGapShift));
 
         if (tp->mcfg == CFG_METHOD_4) {
                 set_offset70F(tp, 0x27);
 
-                RTL_W8(tp, DBG_reg, (0x0E << 4) | Fix_Nak_1 | Fix_Nak_2);
+                RTL_W8(DBG_reg, (0x0E << 4) | Fix_Nak_1 | Fix_Nak_2);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
                 //disable clock request.
                 pci_write_config_byte(pdev, 0x81, 0x00);
 
                 if (dev->mtu > ETH_DATA_LEN) {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) | Jumbo_En1);
 
                         set_offset79(tp, 0x20);
                 } else {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) & ~Jumbo_En1);
 
                         set_offset79(tp, 0x50);
                 }
@@ -29282,19 +26432,19 @@
 
                 set_offset70F(tp, 0x27);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
                 //disable clock request.
                 pci_write_config_byte(pdev, 0x81, 0x00);
 
                 if (dev->mtu > ETH_DATA_LEN) {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) | Jumbo_En1);
 
                         set_offset79(tp, 0x20);
                 } else {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) & ~Jumbo_En1);
 
                         set_offset79(tp, 0x50);
                 }
@@ -29308,19 +26458,19 @@
         } else if (tp->mcfg == CFG_METHOD_6) {
                 set_offset70F(tp, 0x27);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
                 //disable clock request.
                 pci_write_config_byte(pdev, 0x81, 0x00);
 
                 if (dev->mtu > ETH_DATA_LEN) {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) | Jumbo_En1);
 
                         set_offset79(tp, 0x20);
                 } else {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) & ~Jumbo_En1);
 
                         set_offset79(tp, 0x50);
                 }
@@ -29334,21 +26484,21 @@
         } else if (tp->mcfg == CFG_METHOD_7) {
                 set_offset70F(tp, 0x27);
 
-                rtl8168_eri_write(tp, 0x1EC, 1, 0x07, ERIAR_ASF);
+                rtl8168_eri_write(ioaddr, 0x1EC, 1, 0x07, ERIAR_ASF);
 
                 //disable clock request.
                 pci_write_config_byte(pdev, 0x81, 0x00);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
                 if (dev->mtu > ETH_DATA_LEN) {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) | Jumbo_En1);
 
                         set_offset79(tp, 0x20);
                 } else {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) & ~Jumbo_En1);
 
 
                         set_offset79(tp, 0x50);
@@ -29357,23 +26507,23 @@
 
                 set_offset70F(tp, 0x27);
 
-                rtl8168_eri_write(tp, 0x1EC, 1, 0x07, ERIAR_ASF);
+                rtl8168_eri_write(ioaddr, 0x1EC, 1, 0x07, ERIAR_ASF);
 
                 //disable clock request.
                 pci_write_config_byte(pdev, 0x81, 0x00);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
-                RTL_W8(tp, 0xD1, 0x20);
+                RTL_W8(0xD1, 0x20);
 
                 if (dev->mtu > ETH_DATA_LEN) {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) | Jumbo_En1);
 
                         set_offset79(tp, 0x20);
                 } else {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) & ~Jumbo_En1);
 
                         set_offset79(tp, 0x50);
                 }
@@ -29383,43 +26533,43 @@
                 /* disable clock request. */
                 pci_write_config_byte(pdev, 0x81, 0x00);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~BIT_4);
-                RTL_W8(tp, DBG_reg, RTL_R8(tp, DBG_reg) | BIT_7 | BIT_1);
+                RTL_W8(Config3, RTL_R8(Config3) & ~BIT_4);
+                RTL_W8(DBG_reg, RTL_R8(DBG_reg) | BIT_7 | BIT_1);
 
                 if (dev->mtu > ETH_DATA_LEN) {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) | Jumbo_En1);
 
                         set_offset79(tp, 0x20);
                 } else {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) & ~Jumbo_En1);
 
                         set_offset79(tp, 0x50);
                 }
 
-                RTL_W8(tp, TDFNR, 0x8);
+                RTL_W8(TDFNR, 0x8);
 
         } else if (tp->mcfg == CFG_METHOD_10) {
                 set_offset70F(tp, 0x27);
 
-                RTL_W8(tp, DBG_reg, RTL_R8(tp, DBG_reg) | BIT_7 | BIT_1);
+                RTL_W8(DBG_reg, RTL_R8(DBG_reg) | BIT_7 | BIT_1);
 
                 if (dev->mtu > ETH_DATA_LEN) {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) | Jumbo_En1);
 
                         set_offset79(tp, 0x20);
                 } else {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~Jumbo_En1);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) & ~Jumbo_En1);
 
                         set_offset79(tp, 0x50);
                 }
 
-                RTL_W8(tp, TDFNR, 0x8);
+                RTL_W8(TDFNR, 0x8);
 
-                RTL_W8(tp, Config1, RTL_R8(tp, Config1) | 0x10);
+                RTL_W8(Config1, RTL_R8(Config1) | 0x10);
 
                 /* disable clock request. */
                 pci_write_config_byte(pdev, 0x81, 0x00);
@@ -29428,26 +26578,26 @@
                 set_offset79(tp, 0x50);
 
                 if (dev->mtu > ETH_DATA_LEN)
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
                 else
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
 
                 pci_write_config_byte(pdev, 0x81, 0x00);
 
-                RTL_W8(tp, Config1, RTL_R8(tp, Config1) | 0x10);
+                RTL_W8(Config1, RTL_R8(Config1) | 0x10);
 
         } else if (tp->mcfg == CFG_METHOD_12) {
                 set_offset70F(tp, 0x27);
                 set_offset79(tp, 0x50);
 
                 if (dev->mtu > ETH_DATA_LEN)
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
                 else
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
 
                 pci_write_config_byte(pdev, 0x81, 0x01);
 
-                RTL_W8(tp, Config1, RTL_R8(tp, Config1) | 0x10);
+                RTL_W8(Config1, RTL_R8(Config1) | 0x10);
 
         } else if (tp->mcfg == CFG_METHOD_14 || tp->mcfg == CFG_METHOD_15) {
 
@@ -29455,78 +26605,79 @@
                 set_offset79(tp, 0x50);
 
                 if (dev->mtu > ETH_DATA_LEN) {
-                        RTL_W8(tp, MTPS, 0x24);
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | 0x01);
+                        RTL_W8(MTPS, 0x24);
+                        RTL_W8(Config3, RTL_R8(Config3) | Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) | 0x01);
                 } else {
-                        RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~0x01);
+                        RTL_W8(Config3, RTL_R8(Config3) & ~Jumbo_En0);
+                        RTL_W8(Config4, RTL_R8(Config4) & ~0x01);
                 }
 
-                RTL_W8(tp, 0xF3, RTL_R8(tp, 0xF3) | BIT_5);
-                RTL_W8(tp, 0xF3, RTL_R8(tp, 0xF3) & ~BIT_5);
+                RTL_W8(0xF3, RTL_R8(0xF3) | BIT_5);
+                RTL_W8(0xF3, RTL_R8(0xF3) & ~BIT_5);
 
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_7 | BIT_6);
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_7 | BIT_6);
 
-                RTL_W8(tp, 0xD1, RTL_R8(tp, 0xD1) | BIT_2 | BIT_3);
+                RTL_W8(0xD1, RTL_R8(0xD1) | BIT_2 | BIT_3);
 
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) | BIT_6 | BIT_5 | BIT_4 | BIT_2 | BIT_1);
+                RTL_W8(0xF1, RTL_R8(0xF1) | BIT_6 | BIT_5 | BIT_4 | BIT_2 | BIT_1);
 
-                RTL_W8(tp, TDFNR, 0x8);
+                RTL_W8(TDFNR, 0x8);
 
-                /*
                 if (aspm)
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) | BIT_7);
-                */
+                        RTL_W8(0xF1, RTL_R8(0xF1) | BIT_7);
 
-                RTL_W8(tp, Config5, RTL_R8(tp, Config5) & ~BIT_3);
+                RTL_W8(Config5, RTL_R8(Config5) & ~BIT_3);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
-                RTL_W8(tp, Config1, RTL_R8(tp, Config1) & ~0x10);
+                RTL_W8(Config1, RTL_R8(Config1) & ~0x10);
         } else if (tp->mcfg == CFG_METHOD_16 || tp->mcfg == CFG_METHOD_17) {
                 set_offset70F(tp, 0x27);
                 set_offset79(tp, 0x50);
 
-                rtl8168_eri_write(tp, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xC8, 4, 0x00100002, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
-                csi_tmp = rtl8168_eri_read(tp, 0x1D0, 4, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC8, 4, 0x00100002, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xD4, 4, ERIAR_ExGMAC);
+                csi_tmp |= (BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
+                rtl8168_eri_write(ioaddr, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1D0, 4, ERIAR_ExGMAC);
                 csi_tmp |= BIT_1;
-                rtl8168_eri_write(tp, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
 
-                csi_tmp = rtl8168_eri_read(tp, 0xDC, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDC, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
 
-                RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) | BIT_7);
-                RTL_W8(tp, 0xD3, RTL_R8(tp, 0xD3) & ~BIT_7);
-                RTL_W8(tp, 0x1B, RTL_R8(tp, 0x1B) & ~0x07);
+                RTL_W32(TxConfig, RTL_R32(TxConfig) | BIT_7);
+                RTL_W8(0xD3, RTL_R8(0xD3) & ~BIT_7);
+                RTL_W8(0x1B, RTL_R8(0x1B) & ~0x07);
 
                 if (tp->mcfg == CFG_METHOD_16) {
-                        RTL_W32(tp, 0xB0, 0xEE480010);
-                        RTL_W8(tp, 0x1A, RTL_R8(tp, 0x1A) & ~(BIT_2|BIT_3));
-                        rtl8168_eri_write(tp, 0x1DC, 1, 0x64, ERIAR_ExGMAC);
+                        RTL_W32(0xB0, 0xEE480010);
+                        RTL_W8(0x1A, RTL_R8(0x1A) & ~(BIT_2|BIT_3));
+                        rtl8168_eri_write(ioaddr, 0x1DC, 1, 0x64, ERIAR_ExGMAC);
                 } else {
-                        csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC);
+                        csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
                         csi_tmp |= BIT_4;
-                        rtl8168_eri_write(tp, 0x1B0, 1, csi_tmp, ERIAR_ExGMAC);
-                        rtl8168_eri_write(tp, 0xCC, 4, 0x00000050, ERIAR_ExGMAC);
-                        rtl8168_eri_write(tp, 0xD0, 4, 0x07ff0060, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0x1B0, 1, csi_tmp, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0xCC, 4, 0x00000050, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0xD0, 4, 0x07ff0060, ERIAR_ExGMAC);
                 }
 
-                RTL_W8(tp, TDFNR, 0x8);
+                RTL_W8(TDFNR, 0x8);
 
-                RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~PMSTS_En);
+                RTL_W8(Config2, RTL_R8(Config2) & ~PMSTS_En);
 
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_6);
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_6);
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_6);
+                RTL_W8(0xF2, RTL_R8(0xF2) | BIT_6);
 
                 if (dev->mtu > ETH_DATA_LEN)
-                        RTL_W8(tp, MTPS, 0x27);
+                        RTL_W8(MTPS, 0x27);
 
                 /* disable clock request. */
                 pci_write_config_byte(pdev, 0x81, 0x00);
@@ -29535,113 +26686,106 @@
                 set_offset70F(tp, 0x27);
                 set_offset79(tp, 0x50);
 
-                rtl8168_eri_write(tp, 0xC8, 4, 0x00100002, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
-                RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) | BIT_7);
-                RTL_W8(tp, 0xD3, RTL_R8(tp, 0xD3) & ~BIT_7);
-                csi_tmp = rtl8168_eri_read(tp, 0xDC, 1, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC8, 4, 0x00100002, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
+                RTL_W32(TxConfig, RTL_R32(TxConfig) | BIT_7);
+                RTL_W8(0xD3, RTL_R8(0xD3) & ~BIT_7);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDC, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
 
-                /*
                 if (aspm)
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) | BIT_7);
-                */
+                        RTL_W8(0xF1, RTL_R8(0xF1) | BIT_7);
 
                 if (dev->mtu > ETH_DATA_LEN)
-                        RTL_W8(tp, MTPS, 0x27);
+                        RTL_W8(MTPS, 0x27);
 
-                RTL_W8(tp, TDFNR, 0x8);
+                RTL_W8(TDFNR, 0x8);
 
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_6);
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_6);
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_6);
+                RTL_W8(0xF2, RTL_R8(0xF2) | BIT_6);
 
-                rtl8168_eri_write(tp, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
-                RTL_W8(tp, 0x1B,RTL_R8(tp, 0x1B) & ~0x07);
+                rtl8168_eri_write(ioaddr, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xD4, 4, ERIAR_ExGMAC);
+                csi_tmp |= (BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
+                rtl8168_eri_write(ioaddr, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
+                RTL_W8(0x1B,RTL_R8(0x1B) & ~0x07);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_4;
-                rtl8168_eri_write(tp, 0x1B0, 1, csi_tmp, ERIAR_ExGMAC);
-                csi_tmp = rtl8168_eri_read(tp, 0x1d0, 1, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 1, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1d0, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_4 | BIT_1;
-                rtl8168_eri_write(tp, 0x1d0, 1, csi_tmp, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xCC, 4, 0x00000050, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xd0, 4, 0x00000060, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1d0, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xCC, 4, 0x00000050, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xd0, 4, 0x00000060, ERIAR_ExGMAC);
         } else if (tp->mcfg == CFG_METHOD_20) {
                 set_offset70F(tp, 0x27);
                 set_offset79(tp, 0x50);
 
-                rtl8168_eri_write(tp, 0xC8, 4, 0x00100002, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
-                RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) | BIT_7);
-                RTL_W8(tp, 0xD3, RTL_R8(tp, 0xD3) & ~BIT_7);
-                csi_tmp = rtl8168_eri_read(tp, 0xDC, 1, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC8, 4, 0x00100002, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
+                RTL_W32(TxConfig, RTL_R32(TxConfig) | BIT_7);
+                RTL_W8(0xD3, RTL_R8(0xD3) & ~BIT_7);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDC, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
 
-                /*
                 if (aspm)
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) | BIT_7);
-                */
+                        RTL_W8(0xF1, RTL_R8(0xF1) | BIT_7);
 
                 if (dev->mtu > ETH_DATA_LEN)
-                        RTL_W8(tp, MTPS, 0x27);
+                        RTL_W8(MTPS, 0x27);
 
-                RTL_W8(tp, TDFNR, 0x8);
+                RTL_W8(TDFNR, 0x8);
 
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_6);
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_6);
-                rtl8168_eri_write(tp, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_6);
+                RTL_W8(0xF2, RTL_R8(0xF2) | BIT_6);
+                rtl8168_eri_write(ioaddr, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xD4, 4, ERIAR_ExGMAC);
+                csi_tmp |= BIT_10 | BIT_11;
+                rtl8168_eri_write(ioaddr, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_4;
-                rtl8168_eri_write(tp, 0x1B0, 1, csi_tmp, ERIAR_ExGMAC);
-                csi_tmp = rtl8168_eri_read(tp, 0x1d0, 1, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 1, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1d0, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_4 | BIT_1;
-                rtl8168_eri_write(tp, 0x1d0, 1, csi_tmp, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xCC, 4, 0x00000050, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xd0, 4, 0x00000060, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1d0, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xCC, 4, 0x00000050, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xd0, 4, 0x00000060, ERIAR_ExGMAC);
         } else if (tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
                    tp->mcfg == CFG_METHOD_24 || tp->mcfg == CFG_METHOD_25 ||
                    tp->mcfg == CFG_METHOD_26 || tp->mcfg == CFG_METHOD_29 ||
-                   tp->mcfg == CFG_METHOD_30 || tp->mcfg == CFG_METHOD_35 ||
-                   tp->mcfg == CFG_METHOD_36 || tp->mcfg == CFG_METHOD_37) {
+                   tp->mcfg == CFG_METHOD_30) {
                 set_offset70F(tp, 0x27);
                 set_offset79(tp, 0x50);
                 if (tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22)
                         set_offset711(tp, 0x04);
 
-                rtl8168_eri_write(tp, 0xC8, 4, 0x00080002, ERIAR_ExGMAC);
-#ifdef ENABLE_LIB_SUPPORT
-                rtl8168_eri_write(tp, 0xCC, 1, 0x60, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xD0, 1, 0x70, ERIAR_ExGMAC);
-#else
-                rtl8168_eri_write(tp, 0xCC, 1, 0x38, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xD0, 1, 0x48, ERIAR_ExGMAC);
-#endif //ENABLE_LIB_SUPPORT
-                rtl8168_eri_write(tp, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC8, 4, 0x00080002, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xCC, 1, 0x38, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xD0, 1, 0x48, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
 
-                RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) | BIT_7);
+                RTL_W32(TxConfig, RTL_R32(TxConfig) | BIT_7);
 
-                csi_tmp = rtl8168_eri_read(tp, 0xDC, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDC, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
-
-                if (tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36)
-                        rtl8168_set_mcu_ocp_bit(tp, 0xD438, (BIT_1 | BIT_0));
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
 
                 if (tp->mcfg == CFG_METHOD_26) {
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD3C0);
                         mac_ocp_data &= ~(BIT_11 | BIT_10 | BIT_9 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0);
-                        mac_ocp_data |= 0x0FFF;
+                        mac_ocp_data |= 0x03A9;
                         rtl8168_mac_ocp_write(tp, 0xD3C0, mac_ocp_data);
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD3C2);
                         mac_ocp_data &= ~(BIT_7 | BIT_6 | BIT_5 | BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0);
@@ -29649,9 +26793,7 @@
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD3C4);
                         mac_ocp_data |= BIT_0;
                         rtl8168_mac_ocp_write(tp, 0xD3C4, mac_ocp_data);
-                } else if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30 ||
-                           tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-                           tp->mcfg == CFG_METHOD_37) {
+                } else if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30) {
 
                         if (tp->RequireAdjustUpsTxLinkPulseTiming) {
                                 mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD412);
@@ -29662,18 +26804,18 @@
 
                         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);
+                        mac_ocp_data |= (BIT_6 | BIT_5 | BIT_4);
                         rtl8168_mac_ocp_write(tp, 0xE056, mac_ocp_data);
 
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xE052);
-                        mac_ocp_data &= ~(BIT_15 | BIT_14 | BIT_13 | BIT_3);
+                        mac_ocp_data &= ~( BIT_14 | BIT_13);
                         mac_ocp_data |= BIT_15;
-                        //mac_ocp_data |= BIT_3;
+                        mac_ocp_data |= BIT_3;
                         rtl8168_mac_ocp_write(tp, 0xE052, mac_ocp_data);
 
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD420);
                         mac_ocp_data &= ~(BIT_11 | BIT_10 | BIT_9 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0);
-                        mac_ocp_data |= 0x45F;
+                        mac_ocp_data |= 0x47F;
                         rtl8168_mac_ocp_write(tp, 0xD420, mac_ocp_data);
 
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xE0D6);
@@ -29682,144 +26824,140 @@
                         rtl8168_mac_ocp_write(tp, 0xE0D6, mac_ocp_data);
                 }
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
-                RTL_W8(tp, 0x1B, RTL_R8(tp, 0x1B) & ~0x07);
+                RTL_W8(0x1B, RTL_R8(0x1B) & ~0x07);
 
-                RTL_W8(tp, TDFNR, 0x4);
+                RTL_W8(TDFNR, 0x4);
 
-                RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~PMSTS_En);
+                RTL_W8(Config2, RTL_R8(Config2) & ~PMSTS_En);
 
-                /*
                 if (aspm)
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) | BIT_7);
-                */
+                        RTL_W8(0xF1, RTL_R8(0xF1) | BIT_7);
 
                 if (dev->mtu > ETH_DATA_LEN)
-                        RTL_W8(tp, MTPS, 0x27);
+                        RTL_W8(MTPS, 0x27);
 
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_6);
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_6);
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_6);
+                RTL_W8(0xF2, RTL_R8(0xF2) | BIT_6);
 
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_7);
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_7);
 
-                rtl8168_eri_write(tp, RSS_CTRL_8168, 4, 0x00000000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
 
-                if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30 ||
-                    tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-                    tp->mcfg == CFG_METHOD_37) {
-                        rtl8168_mac_ocp_write(tp, 0xE054, 0x0000);
+                if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30)
+                        rtl8168_mac_ocp_write(tp, 0xE054, 0xFC01);
 
-                        rtl8168_eri_write(tp, 0x5F0, 2, 0x4000, ERIAR_ExGMAC);
-                } else {
-                        rtl8168_eri_write(tp, 0x5F0, 2, 0x4F87, ERIAR_ExGMAC);
-                }
+                rtl8168_eri_write(ioaddr, 0x5F0, 2, 0x4F87, ERIAR_ExGMAC);
+
+                if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30) {
+                        csi_tmp = rtl8168_eri_read(ioaddr, 0xD4, 4, ERIAR_ExGMAC);
+                        csi_tmp |= (BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
+                        rtl8168_eri_write(ioaddr, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
 
-                if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30 ||
-                    tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-                    tp->mcfg == CFG_METHOD_37) {
-                        csi_tmp = rtl8168_eri_read(tp, 0xDC, 4, ERIAR_ExGMAC);
+                        csi_tmp = rtl8168_eri_read(ioaddr, 0xDC, 4, ERIAR_ExGMAC);
                         csi_tmp |= (BIT_2 | BIT_3 | BIT_4);
-                        rtl8168_eri_write(tp, 0xDC, 4, csi_tmp, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0xDC, 4, csi_tmp, ERIAR_ExGMAC);
+                } else {
+                        csi_tmp = rtl8168_eri_read(ioaddr, 0xD4, 4, ERIAR_ExGMAC);
+                        csi_tmp |= (BIT_7 | BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
+                        rtl8168_eri_write(ioaddr, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
                 }
 
                 if (tp->mcfg == CFG_METHOD_21 || tp->mcfg == CFG_METHOD_22 ||
                     tp->mcfg == CFG_METHOD_24 || tp->mcfg == CFG_METHOD_25) {
                         rtl8168_mac_ocp_write(tp, 0xC140, 0xFFFF);
-                } else if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30 ||
-                           tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-                           tp->mcfg == CFG_METHOD_37) {
+                } else if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30) {
                         rtl8168_mac_ocp_write(tp, 0xC140, 0xFFFF);
                         rtl8168_mac_ocp_write(tp, 0xC142, 0xFFFF);
                 }
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_12;
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
 
-                if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30 ||
-                    tp->mcfg == CFG_METHOD_35 || tp->mcfg == CFG_METHOD_36 ||
-                    tp->mcfg == CFG_METHOD_37) {
-                        csi_tmp = rtl8168_eri_read(tp, 0x2FC, 1, ERIAR_ExGMAC);
+                if (tp->mcfg == CFG_METHOD_29 || tp->mcfg == CFG_METHOD_30) {
+                        csi_tmp = rtl8168_eri_read(ioaddr, 0x2FC, 1, ERIAR_ExGMAC);
                         csi_tmp &= ~(BIT_2);
-                        rtl8168_eri_write(tp, 0x2FC, 1, csi_tmp, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0x2FC, 1, csi_tmp, ERIAR_ExGMAC);
                 } else {
-                        csi_tmp = rtl8168_eri_read(tp, 0x2FC, 1, ERIAR_ExGMAC);
+                        csi_tmp = rtl8168_eri_read(ioaddr, 0x2FC, 1, ERIAR_ExGMAC);
                         csi_tmp &= ~(BIT_0 | BIT_1 | BIT_2);
                         csi_tmp |= BIT_0;
-                        rtl8168_eri_write(tp, 0x2FC, 1, csi_tmp, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0x2FC, 1, csi_tmp, ERIAR_ExGMAC);
                 }
 
-                if (tp->mcfg != CFG_METHOD_37) {
-                        csi_tmp = rtl8168_eri_read(tp, 0x1D0, 1, ERIAR_ExGMAC);
-                        csi_tmp |= BIT_1;
-                        rtl8168_eri_write(tp, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
-                }
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1D0, 1, ERIAR_ExGMAC);
+                csi_tmp |= BIT_1;
+                rtl8168_eri_write(ioaddr, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
         } else if (tp->mcfg == CFG_METHOD_23 || tp->mcfg == CFG_METHOD_27 ||
                    tp->mcfg == CFG_METHOD_28) {
                 set_offset70F(tp, 0x27);
                 set_offset79(tp, 0x50);
 
-                rtl8168_eri_write(tp, 0xC8, 4, 0x00080002, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xCC, 1, 0x2F, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xD0, 1, 0x5F, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC8, 4, 0x00080002, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xCC, 1, 0x2F, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xD0, 1, 0x5F, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
 
-                RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) | BIT_7);
+                RTL_W32(TxConfig, RTL_R32(TxConfig) | BIT_7);
 
-                csi_tmp = rtl8168_eri_read(tp, 0xDC, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDC, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_6);
-                RTL_W8(tp, 0xF2, RTL_R8(tp, 0xF2) | BIT_6);
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_6);
+                RTL_W8(0xF2, RTL_R8(0xF2) | BIT_6);
 
-                RTL_W8(tp, 0xD0, RTL_R8(tp, 0xD0) | BIT_7);
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_7);
 
-                rtl8168_eri_write(tp, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
-                RTL_W8(tp, 0x1B, RTL_R8(tp, 0x1B) & ~0x07);
+                rtl8168_eri_write(ioaddr, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
+                RTL_W8(0x1B, RTL_R8(0x1B) & ~0x07);
 
-                RTL_W8(tp, TDFNR, 0x4);
+                RTL_W8(TDFNR, 0x4);
 
-                /*
                 if (aspm)
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) | BIT_7);
-                */
+                        RTL_W8(0xF1, RTL_R8(0xF1) | BIT_7);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_12;
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x2FC, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x2FC, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~(BIT_0 | BIT_1 | BIT_2);
-                csi_tmp |= (BIT_0 | BIT_1);
-                rtl8168_eri_write(tp, 0x2FC, 1, csi_tmp, ERIAR_ExGMAC);
+                csi_tmp |= BIT_0;
+                rtl8168_eri_write(ioaddr, 0x2FC, 1, csi_tmp, ERIAR_ExGMAC);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1D0, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1D0, 1, ERIAR_ExGMAC);
                 csi_tmp |= BIT_1;
-                rtl8168_eri_write(tp, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
 
                 if (dev->mtu > ETH_DATA_LEN)
-                        RTL_W8(tp, MTPS, 0x27);
+                        RTL_W8(MTPS, 0x27);
 
                 if (tp->mcfg == CFG_METHOD_27 || tp->mcfg == CFG_METHOD_28) {
                         rtl8168_oob_mutex_lock(tp);
-                        rtl8168_eri_write(tp, 0x5F0, 2, 0x4F87, ERIAR_ExGMAC);
+                        rtl8168_eri_write(ioaddr, 0x5F0, 2, 0x4F87, ERIAR_ExGMAC);
                         rtl8168_oob_mutex_unlock(tp);
                 }
 
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xD4, 4, ERIAR_ExGMAC);
+                csi_tmp  |= ( BIT_7 | BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12 );
+                rtl8168_eri_write(ioaddr, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
+
                 rtl8168_mac_ocp_write(tp, 0xC140, 0xFFFF);
                 rtl8168_mac_ocp_write(tp, 0xC142, 0xFFFF);
 
                 if (tp->mcfg == CFG_METHOD_28) {
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD3E2);
                         mac_ocp_data &= 0xF000;
-                        mac_ocp_data |= 0xAFD;
+                        mac_ocp_data |= 0x3A9;
                         rtl8168_mac_ocp_write(tp, 0xD3E2, mac_ocp_data);
 
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD3E4);
@@ -29830,23 +26968,26 @@
                         mac_ocp_data |= BIT_7;
                         rtl8168_mac_ocp_write(tp, 0xE860, mac_ocp_data);
                 }
-        } else if (tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32 ||
-                   tp->mcfg == CFG_METHOD_33 || tp->mcfg == CFG_METHOD_34) {
+
+                rtl8168_set_dash_other_fun_dev_pci_cmd_register(tp, 0x07, 0x0E);
+                rtl8168_set_dash_other_fun_dev_aspm_clkreq(tp, 3, 1, 0x0E);
+                rtl8168_set_dash_other_fun_dev_state_change(tp, 0, 0x0E);
+        } else if (tp->mcfg == CFG_METHOD_31 || tp->mcfg == CFG_METHOD_32) {
                 set_offset70F(tp, 0x27);
                 set_offset79(tp, 0x50);
 
-                rtl8168_eri_write(tp, 0xC8, 4, 0x00080002, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xCC, 1, 0x2F, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xD0, 1, 0x5F, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC8, 4, 0x00080002, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xCC, 1, 0x2F, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xD0, 1, 0x5F, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xE8, 4, 0x00100006, ERIAR_ExGMAC);
 
-                RTL_W32(tp, TxConfig, RTL_R32(tp, TxConfig) | BIT_7);
+                RTL_W32(TxConfig, RTL_R32(TxConfig) | BIT_7);
 
-                csi_tmp = rtl8168_eri_read(tp, 0xDC, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xDC, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xDC, 1, csi_tmp, ERIAR_ExGMAC);
 
                 if (tp->RequireAdjustUpsTxLinkPulseTiming) {
                         mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD412);
@@ -29857,91 +26998,82 @@
 
                 mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xE056);
                 mac_ocp_data &= ~(BIT_7 | BIT_6 | BIT_5 | BIT_4);
-                if (tp->HwPkgDet == 0x0F)
-                        mac_ocp_data |= (BIT_6 | BIT_5 | BIT_4);
+                mac_ocp_data |= (BIT_6 | BIT_5 | BIT_4);
                 rtl8168_mac_ocp_write(tp, 0xE056, mac_ocp_data);
-                if (tp->HwPkgDet == 0x0F)
-                        rtl8168_mac_ocp_write(tp, 0xEA80, 0x0003);
-                else
-                        rtl8168_mac_ocp_write(tp, 0xEA80, 0x0000);
+                rtl8168_mac_ocp_write(tp, 0xEA80, 0x0003);
 
                 rtl8168_oob_mutex_lock(tp);
                 mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xE052);
-                mac_ocp_data &= ~(BIT_3 | BIT_0);
-                if (tp->HwPkgDet == 0x0F)
-                        mac_ocp_data |= BIT_0;
+                mac_ocp_data |= BIT_0;
+                if (tp->mcfg == CFG_METHOD_32)
+                        mac_ocp_data |= BIT_3;
+                else
+                        mac_ocp_data &= ~BIT_3;
                 rtl8168_mac_ocp_write(tp, 0xE052, mac_ocp_data);
                 rtl8168_oob_mutex_unlock(tp);
 
                 mac_ocp_data = rtl8168_mac_ocp_read(tp, 0xD420);
                 mac_ocp_data &= ~(BIT_11 | BIT_10 | BIT_9 | BIT_8 | BIT_7 | BIT_6 | BIT_5 | BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0);
-                mac_ocp_data |= 0x45F;
+                mac_ocp_data |= 0x47F;
                 rtl8168_mac_ocp_write(tp, 0xD420, mac_ocp_data);
 
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
-                RTL_W8(tp, 0x1B, RTL_R8(tp, 0x1B) & ~0x07);
+                RTL_W8(0x1B, RTL_R8(0x1B) & ~0x07);
 
-                RTL_W8(tp, TDFNR, 0x4);
+                RTL_W8(TDFNR, 0x4);
 
-                RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~PMSTS_En);
+                RTL_W8(Config2, RTL_R8(Config2) & ~PMSTS_En);
 
-                /*
                 if (aspm)
-                RTL_W8(tp, 0xF1, RTL_R8(tp, 0xF1) | BIT_7);
-                */
+                        RTL_W8(0xF1, RTL_R8(0xF1) | BIT_7);
 
                 if (dev->mtu > ETH_DATA_LEN)
-                        RTL_W8(tp, MTPS, 0x27);
+                        RTL_W8(MTPS, 0x27);
 
-                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);
-                }
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_6);
+                RTL_W8(0xF2, RTL_R8(0xF2) | BIT_6);
+
+                RTL_W8(0xD0, RTL_R8(0xD0) | BIT_7);
 
-                rtl8168_eri_write(tp, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
-                rtl8168_eri_write(tp, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xC0, 2, 0x0000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0xB8, 4, 0x00000000, ERIAR_ExGMAC);
 
                 rtl8168_oob_mutex_lock(tp);
-                if (tp->HwPkgDet == 0x0F)
-                        rtl8168_eri_write(tp, 0x5F0, 2, 0x4F00, ERIAR_ExGMAC);
-                else
-                        rtl8168_eri_write(tp, 0x5F0, 2, 0x4000, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x5F0, 2, 0x4F87, ERIAR_ExGMAC);
                 rtl8168_oob_mutex_unlock(tp);
 
-                csi_tmp = rtl8168_eri_read(tp, 0xDC, 4, ERIAR_ExGMAC);
-                csi_tmp |= (BIT_2 | BIT_3);
-                rtl8168_eri_write(tp, 0xDC, 4, csi_tmp, ERIAR_ExGMAC);
-
-                if (tp->mcfg == CFG_METHOD_32 || tp->mcfg == CFG_METHOD_33 ||
-                    tp->mcfg == CFG_METHOD_34) {
-                        csi_tmp = rtl8168_eri_read(tp, 0xD4, 4, ERIAR_ExGMAC);
-                        csi_tmp |= BIT_4;
-                        rtl8168_eri_write(tp, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
-                }
+                csi_tmp = rtl8168_eri_read(ioaddr, 0xD4, 4, ERIAR_ExGMAC);
+                csi_tmp |= (BIT_7 | BIT_8 | BIT_9 | BIT_10 | BIT_11 | BIT_12);
+                if (tp->mcfg == CFG_METHOD_32) csi_tmp|= BIT_4;
+                rtl8168_eri_write(ioaddr, 0xD4, 4, csi_tmp, ERIAR_ExGMAC);
 
                 rtl8168_mac_ocp_write(tp, 0xC140, 0xFFFF);
                 rtl8168_mac_ocp_write(tp, 0xC142, 0xFFFF);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1B0, 4, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1B0, 4, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_12;
-                rtl8168_eri_write(tp, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1B0, 4, csi_tmp, ERIAR_ExGMAC);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x2FC, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x2FC, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~(BIT_0 | BIT_1);
                 csi_tmp |= BIT_0;
-                rtl8168_eri_write(tp, 0x2FC, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2FC, 1, csi_tmp, ERIAR_ExGMAC);
 
-                csi_tmp = rtl8168_eri_read(tp, 0x1D0, 1, ERIAR_ExGMAC);
+                csi_tmp = rtl8168_eri_read(ioaddr, 0x1D0, 1, ERIAR_ExGMAC);
                 csi_tmp &= ~BIT_1;
-                rtl8168_eri_write(tp, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x1D0, 1, csi_tmp, ERIAR_ExGMAC);
+
+                rtl8168_set_dash_other_fun_dev_aspm_clkreq(tp, 2, 1, 0xED);
+                rtl8168_set_dash_other_fun_dev_state_change(tp, 3, 0x78);
+                if (tp->DASH) {
+                        rtl8168_set_dash_other_fun_dev_state_change(tp, 0, 0x85);
+                        rtl8168_set_dash_other_fun_dev_pci_cmd_register(tp, 0x07, 0x85);
+                } else {
+                        rtl8168_set_dash_other_fun_dev_state_change(tp, 3, 0x85);
+                }
         } else if (tp->mcfg == CFG_METHOD_1) {
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
                 if (dev->mtu > ETH_DATA_LEN) {
                         pci_read_config_byte(pdev, 0x69, &device_control);
@@ -29955,7 +27087,7 @@
                         pci_write_config_byte(pdev, 0x69, device_control);
                 }
         } else if (tp->mcfg == CFG_METHOD_2) {
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
                 if (dev->mtu > ETH_DATA_LEN) {
                         pci_read_config_byte(pdev, 0x69, &device_control);
@@ -29963,17 +27095,17 @@
                         device_control |= 0x28;
                         pci_write_config_byte(pdev, 0x69, device_control);
 
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | (1 << 0));
+                        RTL_W8(Config4, RTL_R8(Config4) | (1 << 0));
                 } else {
                         pci_read_config_byte(pdev, 0x69, &device_control);
                         device_control &= ~0x70;
                         device_control |= 0x58;
                         pci_write_config_byte(pdev, 0x69, device_control);
 
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~(1 << 0));
+                        RTL_W8(Config4, RTL_R8(Config4) & ~(1 << 0));
                 }
         } else if (tp->mcfg == CFG_METHOD_3) {
-                RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
+                RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
 
                 if (dev->mtu > ETH_DATA_LEN) {
                         pci_read_config_byte(pdev, 0x69, &device_control);
@@ -29981,14 +27113,14 @@
                         device_control |= 0x28;
                         pci_write_config_byte(pdev, 0x69, device_control);
 
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) | (1 << 0));
+                        RTL_W8(Config4, RTL_R8(Config4) | (1 << 0));
                 } else {
                         pci_read_config_byte(pdev, 0x69, &device_control);
                         device_control &= ~0x70;
                         device_control |= 0x58;
                         pci_write_config_byte(pdev, 0x69, device_control);
 
-                        RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~(1 << 0));
+                        RTL_W8(Config4, RTL_R8(Config4) & ~(1 << 0));
                 }
         }
 
@@ -30012,7 +27144,7 @@
             tp->mcfg == CFG_METHOD_23 || tp->mcfg == CFG_METHOD_24 ||
             tp->mcfg == CFG_METHOD_25 || tp->mcfg == CFG_METHOD_26 ||
             tp->mcfg == CFG_METHOD_27 || tp->mcfg == CFG_METHOD_28)
-                rtl8168_eri_write(tp, 0x2F8, 2, 0x1D8F, ERIAR_ExGMAC);
+                rtl8168_eri_write(ioaddr, 0x2F8, 2, 0x1D8F, ERIAR_ExGMAC);
 
         if (tp->bios_setting & BIT_28) {
                 if (tp->mcfg == CFG_METHOD_18 || tp->mcfg == CFG_METHOD_19 ||
@@ -30033,21 +27165,8 @@
                 }
         }
 
-        rtl8168_set_rx_q_num(tp, tp->num_hw_tot_en_rx_rings);
-
-        rtl8168_set_rx_vlan_filter(tp);
-#ifdef ENABLE_RSS_SUPPORT
-#ifdef ENABLE_LIB_SUPPORT
-        /* if lib queue not exist, default use rx queue 0 */
-        if (rtl8168_num_lib_rx_rings(tp) == 0)
-                memset(tp->rss_indir_tbl, 0x0, sizeof(tp->rss_indir_tbl));
-#endif //ENABLE_LIB_SUPPORT
-        rtl8168_config_rss(tp);
-#endif //ENABLE_RSS_SUPPORT
         rtl8168_hw_clear_timer_int(dev);
 
-        rtl8168_enable_exit_l1_mask(tp);
-
         switch (tp->mcfg) {
         case CFG_METHOD_25:
                 rtl8168_mac_ocp_write(tp, 0xD3C0, 0x0B00);
@@ -30055,15 +27174,10 @@
                 break;
         case CFG_METHOD_29:
         case CFG_METHOD_30:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
                 rtl8168_mac_ocp_write(tp, 0xE098, 0x0AA2);
                 break;
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
                 rtl8168_mac_ocp_write(tp, 0xE098, 0xC302);
                 break;
         }
@@ -30081,15 +27195,8 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                rtl8168_disable_pci_offset_99(tp);
                 if (aspm) {
-                        if (tp->org_pci_offset_99 & (BIT_2 | BIT_5 | BIT_6))
-                                rtl8168_init_pci_offset_99(tp);
+                        rtl8168_init_pci_offset_99(tp);
                 }
                 break;
         }
@@ -30103,15 +27210,8 @@
         case CFG_METHOD_30:
         case CFG_METHOD_31:
         case CFG_METHOD_32:
-        case CFG_METHOD_33:
-        case CFG_METHOD_34:
-        case CFG_METHOD_35:
-        case CFG_METHOD_36:
-        case CFG_METHOD_37:
-                rtl8168_disable_pci_offset_180(tp);
                 if (aspm) {
-                        if (tp->org_pci_offset_180 & (BIT_0|BIT_1))
-                                rtl8168_init_pci_offset_180(tp);
+                        rtl8168_init_pci_offset_180(tp);
                 }
                 break;
         }
@@ -30121,7 +27221,7 @@
                         ASF | Macdbgo_sel);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
-        RTL_W16(tp, CPlusCmd, tp->cp_cmd);
+        RTL_W16(CPlusCmd, tp->cp_cmd);
 #else
         rtl8168_hw_set_features(dev, dev->features);
 #endif
@@ -30134,12 +27234,19 @@
         case CFG_METHOD_20:
         case CFG_METHOD_21:
         case CFG_METHOD_22:
+        case CFG_METHOD_23:
         case CFG_METHOD_24:
         case CFG_METHOD_25:
-        case CFG_METHOD_26: {
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32: {
                 int timeout;
                 for (timeout = 0; timeout < 10; timeout++) {
-                        if ((rtl8168_eri_read(tp, 0x1AE, 2, ERIAR_ExGMAC) & BIT_13)==0)
+                        if ((rtl8168_eri_read(ioaddr, 0x1AE, 2, ERIAR_ExGMAC) & BIT_13)==0)
                                 break;
                         mdelay(1);
                 }
@@ -30147,7 +27254,7 @@
         break;
         }
 
-        RTL_W16(tp, RxMaxSize, tp->rx_buf_sz);
+        RTL_W16(RxMaxSize, tp->rx_buf_sz);
 
         rtl8168_disable_rxdvgate(dev);
 
@@ -30187,71 +27294,103 @@
                 NICChkTypeEnableDashInterrupt(tp);
 #endif
 
-        if (tp->HwSuppAspmClkIntrLock)
-                rtl8168_hw_aspm_clkreq_enable(tp, true);
+        switch (tp->mcfg) {
+        case CFG_METHOD_14:
+        case CFG_METHOD_15:
+        case CFG_METHOD_16:
+        case CFG_METHOD_17:
+        case CFG_METHOD_18:
+        case CFG_METHOD_19:
+        case CFG_METHOD_20:
+        case CFG_METHOD_21:
+        case CFG_METHOD_22:
+        case CFG_METHOD_23:
+        case CFG_METHOD_24:
+        case CFG_METHOD_25:
+        case CFG_METHOD_26:
+        case CFG_METHOD_27:
+        case CFG_METHOD_28:
+        case CFG_METHOD_29:
+        case CFG_METHOD_30:
+        case CFG_METHOD_31:
+        case CFG_METHOD_32:
+                if (aspm) {
+                        RTL_W8(Config5, RTL_R8(Config5) | BIT_0);
+                        RTL_W8(Config2, RTL_R8(Config2) | BIT_7);
+                } else {
+                        RTL_W8(Config2, RTL_R8(Config2) & ~BIT_7);
+                        RTL_W8(Config5, RTL_R8(Config5) & ~BIT_0);
+                }
+                break;
+        }
 
         rtl8168_disable_cfg9346_write(tp);
 
         udelay(10);
 }
 
-void
+static void
 rtl8168_hw_start(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
 
-#ifdef ENABLE_LIB_SUPPORT
-        rtl8168_init_lib_ring(tp);
-#endif
-
-        RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
-
-        rtl8168_enable_interrupt(tp);
+        RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
 
-        rtl8168_lib_reset_complete(tp);
+        rtl8168_enable_hw_interrupt(tp, ioaddr);
 }
 
+
 static int
 rtl8168_change_mtu(struct net_device *dev,
                    int new_mtu)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         int ret = 0;
+        unsigned long flags;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
-        if (new_mtu < ETH_MIN_MTU)
+        if (new_mtu < ETH_ZLEN)
                 return -EINVAL;
         else if (new_mtu > tp->max_jumbo_frame_size)
                 new_mtu = tp->max_jumbo_frame_size;
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
 
+        spin_lock_irqsave(&tp->lock, flags);
         dev->mtu = new_mtu;
-
-        tp->eee.tx_lpi_timer = dev->mtu + ETH_HLEN + 0x20;
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         if (!netif_running(dev))
                 goto out;
 
         rtl8168_down(dev);
 
+        spin_lock_irqsave(&tp->lock, flags);
+
         rtl8168_set_rxbufsize(tp, dev);
 
         ret = rtl8168_init_ring(dev);
 
-        if (ret < 0)
+        if (ret < 0) {
+                spin_unlock_irqrestore(&tp->lock, flags);
                 goto err_out;
+        }
 
 #ifdef CONFIG_R8168_NAPI
-        rtl8168_enable_napi(tp);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+        RTL_NAPI_ENABLE(dev, &tp->napi);
+#endif
 #endif//CONFIG_R8168_NAPI
 
-        if (tp->link_ok(dev))
-                rtl8168_link_on_patch(dev);
-        else
-                rtl8168_link_down_patch(dev);
+        netif_stop_queue(dev);
+        netif_carrier_off(dev);
+        rtl8168_hw_config(dev);
+        spin_unlock_irqrestore(&tp->lock, flags);
+
+        rtl8168_set_speed(dev, tp->autoneg, tp->speed, tp->duplex, tp->advertising);
 
-        //mod_timer(&tp->esd_timer, jiffies + RTL8168_ESD_TIMEOUT);
-        //mod_timer(&tp->link_timer, jiffies + RTL8168_LINK_TIMEOUT);
+        mod_timer(&tp->esd_timer, jiffies + RTL8168_ESD_TIMEOUT);
+        mod_timer(&tp->link_timer, jiffies + RTL8168_LINK_TIMEOUT);
 out:
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
         netdev_update_features(dev);
@@ -30270,37 +27409,32 @@
 
 static void
 rtl8168_free_rx_skb(struct rtl8168_private *tp,
-                    struct rtl8168_rx_ring *ring,
                     struct sk_buff **sk_buff,
-                    struct RxDesc *desc,
-                    const u32 cur_rx)
+                    struct RxDesc *desc)
 {
         struct pci_dev *pdev = tp->pci_dev;
 
-        dma_unmap_single(&pdev->dev, ring->RxDescPhyAddrcur_rx, tp->rx_buf_sz,
-                         DMA_FROM_DEVICE);
+        pci_unmap_single(pdev, le64_to_cpu(desc->addr), tp->rx_buf_sz,
+                         PCI_DMA_FROMDEVICE);
         dev_kfree_skb(*sk_buff);
         *sk_buff = NULL;
         rtl8168_make_unusable_by_asic(desc);
 }
 
-void
+static inline void
 rtl8168_mark_to_asic(struct RxDesc *desc,
                      u32 rx_buf_sz)
 {
         u32 eor = le32_to_cpu(desc->opts1) & RingEnd;
 
-        WRITE_ONCE(desc->opts1, cpu_to_le32(DescOwn | eor | rx_buf_sz));
+        desc->opts1 = cpu_to_le32(DescOwn | eor | rx_buf_sz);
 }
 
 static inline void
 rtl8168_map_to_asic(struct RxDesc *desc,
-                    struct rtl8168_rx_ring *ring,
                     dma_addr_t mapping,
-                    u32 rx_buf_sz,
-                    const u32 cur_rx)
+                    u32 rx_buf_sz)
 {
-        ring->RxDescPhyAddrcur_rx = mapping;
         desc->addr = cpu_to_le64(mapping);
         wmb();
         rtl8168_mark_to_asic(desc, rx_buf_sz);
@@ -30308,11 +27442,9 @@
 
 static int
 rtl8168_alloc_rx_skb(struct rtl8168_private *tp,
-                     struct rtl8168_rx_ring *ring,
                      struct sk_buff **sk_buff,
                      struct RxDesc *desc,
                      int rx_buf_sz,
-                     const u32 cur_rx,
                      u8 in_intr)
 {
         struct sk_buff *skb;
@@ -30320,27 +27452,25 @@
         int ret = 0;
 
         if (in_intr)
-                skb = RTL_ALLOC_SKB_INTR(&tp->r8168napiring->index.napi,
-                                         rx_buf_sz + RTK_RX_ALIGN);
+                skb = RTL_ALLOC_SKB_INTR(tp, rx_buf_sz + RTK_RX_ALIGN);
         else
                 skb = dev_alloc_skb(rx_buf_sz + RTK_RX_ALIGN);
 
         if (unlikely(!skb))
                 goto err_out;
 
-        if (!in_intr || !R8168_USE_NAPI_ALLOC_SKB)
-                skb_reserve(skb, RTK_RX_ALIGN);
+        skb_reserve(skb, RTK_RX_ALIGN);
 
-        mapping = dma_map_single(tp_to_dev(tp), skb->data, rx_buf_sz,
-                                 DMA_FROM_DEVICE);
-        if (unlikely(dma_mapping_error(tp_to_dev(tp), mapping))) {
+        mapping = pci_map_single(tp->pci_dev, skb->data, rx_buf_sz,
+                                 PCI_DMA_FROMDEVICE);
+        if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping))) {
                 if (unlikely(net_ratelimit()))
                         netif_err(tp, drv, tp->dev, "Failed to map RX DMA!\n");
                 goto err_out;
         }
 
         *sk_buff = skb;
-        rtl8168_map_to_asic(desc, ring, mapping, rx_buf_sz, cur_rx);
+        rtl8168_map_to_asic(desc, mapping, rx_buf_sz);
 out:
         return ret;
 
@@ -30353,37 +27483,19 @@
 }
 
 static void
-_rtl8168_rx_clear(struct rtl8168_private *tp, struct rtl8168_rx_ring *ring)
-{
-        int i;
-
-        for (i = 0; i < tp->num_rx_desc; i++) {
-                if (ring->Rx_skbuffi) {
-                        rtl8168_free_rx_skb(tp,
-                                            ring,
-                                            ring->Rx_skbuff + i,
-                                            rtl8168_get_rxdesc(tp,
-                                                               tp->RxDescArray,
-                                                               i,
-                                                               ring->index),
-                                            i);
-                        ring->Rx_skbuffi = NULL;
-                }
-        }
-}
-
-void
 rtl8168_rx_clear(struct rtl8168_private *tp)
 {
         int i;
 
-        for (i = 0; i < tp->num_rx_rings; i++)
-                _rtl8168_rx_clear(tp, &tp->rx_ringi);
+        for (i = 0; i < NUM_RX_DESC; i++) {
+                if (tp->Rx_skbuffi)
+                        rtl8168_free_rx_skb(tp, tp->Rx_skbuff + i,
+                                            tp->RxDescArray + i);
+        }
 }
 
 static u32
 rtl8168_rx_fill(struct rtl8168_private *tp,
-                struct rtl8168_rx_ring *ring,
                 struct net_device *dev,
                 u32 start,
                 u32 end,
@@ -30392,19 +27504,14 @@
         u32 cur;
 
         for (cur = start; end - cur > 0; cur++) {
-                int ret, i = cur % tp->num_rx_desc;
+                int ret, i = cur % NUM_RX_DESC;
 
-                if (ring->Rx_skbuffi)
+                if (tp->Rx_skbuffi)
                         continue;
 
-                ret = rtl8168_alloc_rx_skb(tp,
-                                           ring,
-                                           ring->Rx_skbuff + i,
-                                           rtl8168_get_rxdesc(tp,
-                                                           tp->RxDescArray,
-                                                           i, ring->index),
+                ret = rtl8168_alloc_rx_skb(tp, tp->Rx_skbuff + i,
+                                           tp->RxDescArray + i,
                                            tp->rx_buf_sz,
-                                           i,
                                            in_intr);
                 if (ret < 0)
                         break;
@@ -30421,112 +27528,70 @@
 static void
 rtl8168_desc_addr_fill(struct rtl8168_private *tp)
 {
-        int i;
-
-        for (i = 0; i < tp->num_tx_rings; i++) {
-                struct rtl8168_tx_ring *ring = &tp->tx_ringi;
-                RTL_W32(tp, ring->tdsar_reg, ((u64)ring->TxPhyAddr & DMA_BIT_MASK(32)));
-                RTL_W32(tp, ring->tdsar_reg + 4, ((u64)ring->TxPhyAddr >> 32));
-        }
+        void __iomem *ioaddr = tp->mmio_addr;
 
-#ifdef ENABLE_LIB_SUPPORT
-        /*
-         * The lib tx q1 polling may be set after tx is disabled. If lib tx q1
-         * is released, after enable tx, device will try to access invalid tx q1
-         * desc base address. Set tx q1 desc base address to tx q0 desc base
-         * address to let device to access the valid address and clear tx q1
-         * polling bit after enable tx.
-         */
-        if (rtl8168_lib_tx_ring_released(tp)) {
-                struct rtl8168_tx_ring *ring = &tp->tx_ring0;
-                u16 tdsar_reg = TxHDescStartAddrLow;
-                RTL_W32(tp, tdsar_reg, ((u64)ring->TxPhyAddr & DMA_BIT_MASK(32)));
-                RTL_W32(tp, tdsar_reg + 4, ((u64)ring->TxPhyAddr >> 32));
-        }
-#endif
+        if (!tp->TxPhyAddr || !tp->RxPhyAddr)
+                return;
 
-        RTL_W32(tp, RxDescAddrLow, ((u64) tp->RxPhyAddr & DMA_BIT_MASK(32)));
-        RTL_W32(tp, RxDescAddrLow + 4, ((u64) tp->RxPhyAddr >> 32));
+        RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr & DMA_BIT_MASK(32)));
+        RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr >> 32));
+        RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr & DMA_BIT_MASK(32)));
+        RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr >> 32));
 }
 
 static void
 rtl8168_tx_desc_init(struct rtl8168_private *tp)
 {
-        int i;
+        int i = 0;
 
-        for (i = 0; i < tp->num_tx_rings; i++) {
-                struct rtl8168_tx_ring *ring = &tp->tx_ringi;
-                memset(ring->TxDescArray, 0x0, ring->TxDescAllocSize);
+        memset(tp->TxDescArray, 0x0, NUM_TX_DESC * sizeof(struct TxDesc));
 
-                ring->TxDescArrayring->num_tx_desc - 1.opts1 = cpu_to_le32(RingEnd);
+        for (i = 0; i < NUM_TX_DESC; i++) {
+                if (i == (NUM_TX_DESC - 1))
+                        tp->TxDescArrayi.opts1 = cpu_to_le32(RingEnd);
         }
 }
 
 static void
 rtl8168_rx_desc_offset0_init(struct rtl8168_private *tp, int own)
 {
-        struct rtl8168_rx_ring *ring = &tp->rx_ring0;
-        struct RxDesc *desc;
+        int i = 0;
         int ownbit = 0;
-        int i;
-
-        if (tp->RxDescArray == NULL)
-                return;
 
         if (own)
                 ownbit = DescOwn;
 
-        for (i = 0; i < tp->num_rx_desc; i++) {
-                desc = rtl8168_get_rxdesc(tp, tp->RxDescArray, i,
-                                          ring->index);
-                if (i == (tp->num_rx_desc - 1))
-                        desc->opts1 = cpu_to_le32((ownbit | RingEnd) | (unsigned long)tp->rx_buf_sz);
+        for (i = 0; i < NUM_RX_DESC; i++) {
+                if (i == (NUM_RX_DESC - 1))
+                        tp->RxDescArrayi.opts1 = cpu_to_le32((ownbit | RingEnd) | (unsigned long)tp->rx_buf_sz);
                 else
-                        desc->opts1 = cpu_to_le32(ownbit | (unsigned long)tp->rx_buf_sz);
+                        tp->RxDescArrayi.opts1 = cpu_to_le32(ownbit | (unsigned long)tp->rx_buf_sz);
         }
 }
 
 static void
 rtl8168_rx_desc_init(struct rtl8168_private *tp)
 {
-        if (!tp->RxDescArray)
-                return;
-
-        if (rtl8168_num_lib_rx_rings(tp) > 0)
-                return;
-
-        memset(tp->RxDescArray, 0x0, tp->RxDescAllocSize);
+        memset(tp->RxDescArray, 0x0, NUM_RX_DESC * sizeof(struct RxDesc));
 }
 
-int
+static int
 rtl8168_init_ring(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        int i;
 
         rtl8168_init_ring_indexes(tp);
 
+        memset(tp->tx_skb, 0x0, NUM_TX_DESC * sizeof(struct ring_info));
+        memset(tp->Rx_skbuff, 0x0, NUM_RX_DESC * sizeof(struct sk_buff *));
+
         rtl8168_tx_desc_init(tp);
         rtl8168_rx_desc_init(tp);
 
-        for (i = 0; i < tp->num_tx_rings; i++) {
-                struct rtl8168_tx_ring *ring = &tp->tx_ringi;
-                memset(ring->tx_skb, 0x0, sizeof(ring->tx_skb));
-        }
-
-        for (i = 0; i < tp->num_rx_rings; i++) {
-                struct rtl8168_rx_ring *ring = &tp->rx_ringi;
-
-                memset(ring->Rx_skbuff, 0x0, sizeof(ring->Rx_skbuff));
-                if (rtl8168_rx_fill(tp, ring, dev, 0, tp->num_rx_desc, 0) != tp->num_rx_desc)
-                        goto err_out;
-
-                rtl8168_mark_as_last_descriptor(rtl8168_get_rxdesc(tp,
-                                                tp->RxDescArray,
-                                                tp->num_rx_desc - 1,
-                                                ring->index));
-        }
+        if (rtl8168_rx_fill(tp, dev, 0, NUM_RX_DESC, 0) != NUM_RX_DESC)
+                goto err_out;
 
+        rtl8168_mark_as_last_descriptor(tp->RxDescArray + NUM_RX_DESC - 1);
 
         return 0;
 
@@ -30542,19 +27607,15 @@
 {
         unsigned int len = tx_skb->len;
 
-        dma_unmap_single(&pdev->dev, le64_to_cpu(desc->addr), len, DMA_TO_DEVICE);
-
-        desc->opts1 = cpu_to_le32(RTK_MAGIC_DEBUG_VALUE);
+        pci_unmap_single(pdev, le64_to_cpu(desc->addr), len, PCI_DMA_TODEVICE);
+        desc->opts1 = 0x00;
         desc->opts2 = 0x00;
         desc->addr = 0x00;
         tx_skb->len = 0;
 }
 
-static void
-rtl8168_tx_clear_range(struct rtl8168_private *tp,
-                       struct rtl8168_tx_ring *ring,
-                       u32 start,
-                       unsigned int n)
+static void rtl8168_tx_clear_range(struct rtl8168_private *tp, u32 start,
+                                   unsigned int n)
 {
         unsigned int i;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
@@ -30562,15 +27623,15 @@
 #endif
 
         for (i = 0; i < n; i++) {
-                unsigned int entry = (start + i) % ring->num_tx_desc;
-                struct ring_info *tx_skb = ring->tx_skb + entry;
+                unsigned int entry = (start + i) % NUM_TX_DESC;
+                struct ring_info *tx_skb = tp->tx_skb + entry;
                 unsigned int len = tx_skb->len;
 
                 if (len) {
                         struct sk_buff *skb = tx_skb->skb;
 
                         rtl8168_unmap_tx_skb(tp->pci_dev, tx_skb,
-                                             ring->TxDescArray + entry);
+                                             tp->TxDescArray + entry);
                         if (skb) {
                                 RTLDEV->stats.tx_dropped++;
                                 dev_kfree_skb_any(skb);
@@ -30580,369 +27641,189 @@
         }
 }
 
-void
+static void
 rtl8168_tx_clear(struct rtl8168_private *tp)
 {
-        int i;
-
-        for (i = 0; i < tp->num_tx_rings; i++) {
-                struct rtl8168_tx_ring *ring = &tp->tx_ringi;
-                rtl8168_tx_clear_range(tp, ring, ring->dirty_tx, ring->num_tx_desc);
-                ring->cur_tx = ring->dirty_tx = 0;
-        }
+        rtl8168_tx_clear_range(tp, tp->dirty_tx, NUM_TX_DESC);
+        tp->cur_tx = tp->dirty_tx = 0;
 }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void rtl8168_schedule_reset_work(struct rtl8168_private *tp)
+static void rtl8168_schedule_work(struct net_device *dev, void (*task)(void *))
 {
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-        set_bit(R8168_FLAG_TASK_RESET_PENDING, tp->task_flags);
-        schedule_delayed_work(&tp->reset_task, 4);
-#endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-}
-
-static void rtl8168_schedule_esd_work(struct rtl8168_private *tp)
-{
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-        set_bit(R8168_FLAG_TASK_ESD_CHECK_PENDING, tp->task_flags);
-        schedule_delayed_work(&tp->esd_task, RTL8168_ESD_TIMEOUT);
-#endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-}
-
-static void rtl8168_schedule_linkchg_work(struct rtl8168_private *tp)
-{
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-        set_bit(R8168_FLAG_TASK_LINKCHG_CHECK_PENDING, tp->task_flags);
-        schedule_delayed_work(&tp->linkchg_task, RTL8168_LINK_TIMEOUT);
-#endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-}
+        struct rtl8168_private *tp = netdev_priv(dev);
 
-void rtl8168_schedule_dash_work(struct rtl8168_private *tp)
-{
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
-        set_bit(R8168_FLAG_TASK_DASH_CHECK_PENDING, tp->task_flags);
-        schedule_delayed_work(&tp->dash_task, RTL8168_DASH_TIMEOUT);
+        INIT_WORK(&tp->task, task, dev);
+        schedule_delayed_work(&tp->task, 4);
 #endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
 }
 
-#define rtl8168_cancel_schedule_reset_work(a)
-#define rtl8168_cancel_schedule_esd_work(a)
-#define rtl8168_cancel_schedule_linkchg_work(a)
-#define rtl8168_cancel_schedule_dash_work(a)
+#define rtl8168_cancel_schedule_work(a)
 
 #else
-static void rtl8168_schedule_reset_work(struct rtl8168_private *tp)
+static void rtl8168_schedule_work(struct net_device *dev, work_func_t task)
 {
-        set_bit(R8168_FLAG_TASK_RESET_PENDING, tp->task_flags);
-        schedule_delayed_work(&tp->reset_task, 4);
-}
-
-static void rtl8168_cancel_schedule_reset_work(struct rtl8168_private *tp)
-{
-        struct work_struct *work = &tp->reset_task.work;
-
-        if (!work->func)
-                return;
-
-        cancel_delayed_work_sync(&tp->reset_task);
-}
-
-static void rtl8168_schedule_esd_work(struct rtl8168_private *tp)
-{
-        set_bit(R8168_FLAG_TASK_ESD_CHECK_PENDING, tp->task_flags);
-        schedule_delayed_work(&tp->esd_task, RTL8168_ESD_TIMEOUT);
-}
-
-static void rtl8168_cancel_schedule_esd_work(struct rtl8168_private *tp)
-{
-        struct work_struct *work = &tp->esd_task.work;
-
-        if (!work->func)
-                return;
-
-        cancel_delayed_work_sync(&tp->esd_task);
-}
-
-static void rtl8168_schedule_linkchg_work(struct rtl8168_private *tp)
-{
-        set_bit(R8168_FLAG_TASK_LINKCHG_CHECK_PENDING, tp->task_flags);
-        schedule_delayed_work(&tp->linkchg_task, RTL8168_LINK_TIMEOUT);
-}
-
-static void rtl8168_cancel_schedule_linkchg_work(struct rtl8168_private *tp)
-{
-        struct work_struct *work = &tp->linkchg_task.work;
-
-        if (!work->func)
-                return;
-
-        cancel_delayed_work_sync(&tp->linkchg_task);
-}
+        struct rtl8168_private *tp = netdev_priv(dev);
 
-void rtl8168_schedule_dash_work(struct rtl8168_private *tp)
-{
-        set_bit(R8168_FLAG_TASK_DASH_CHECK_PENDING, tp->task_flags);
-        schedule_delayed_work(&tp->dash_task, RTL8168_DASH_TIMEOUT);
+        INIT_DELAYED_WORK(&tp->task, task);
+        schedule_delayed_work(&tp->task, 4);
 }
 
-static void rtl8168_cancel_schedule_dash_work(struct rtl8168_private *tp)
+static void rtl8168_cancel_schedule_work(struct net_device *dev)
 {
-        struct work_struct *work = &tp->dash_task.work;
-
-        if (!work->func)
-                return;
+        struct rtl8168_private *tp = netdev_priv(dev);
 
-        cancel_delayed_work_sync(&tp->dash_task);
+        cancel_delayed_work_sync(&tp->task);
 }
 #endif
 
-static void rtl8168_init_all_schedule_work(struct rtl8168_private *tp)
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-        INIT_WORK(&tp->reset_task, rtl8168_reset_task, dev);
-        INIT_WORK(&tp->esd_task, rtl8168_esd_task, dev);
-        INIT_WORK(&tp->linkchg_task, rtl8168_linkchg_task, dev);
-        INIT_WORK(&tp->dash_task, rtl8168_dash_task, dev);
-#else
-        INIT_DELAYED_WORK(&tp->reset_task, rtl8168_reset_task);
-        INIT_DELAYED_WORK(&tp->esd_task, rtl8168_esd_task);
-        INIT_DELAYED_WORK(&tp->linkchg_task, rtl8168_linkchg_task);
-        INIT_DELAYED_WORK(&tp->dash_task, rtl8168_dash_task);
-#endif
-}
-
-static void rtl8168_cancel_all_schedule_work(struct rtl8168_private *tp)
-{
-        rtl8168_cancel_schedule_reset_work(tp);
-        rtl8168_cancel_schedule_esd_work(tp);
-        rtl8168_cancel_schedule_linkchg_work(tp);
-        rtl8168_cancel_schedule_dash_work(tp);
-}
-
 static void
-rtl8168_wait_for_irq_complete(struct rtl8168_private *tp)
-{
-        if (tp->features & RTL_FEATURE_MSIX) {
-                int i;
-                for (i = 0; i < tp->irq_nvecs; i++)
-                        synchronize_irq(tp->irq_tbli.vector);
-        } else {
-                synchronize_irq(tp->dev->irq);
-        }
-}
-
-void
-_rtl8168_wait_for_quiescence(struct net_device *dev)
+rtl8168_wait_for_quiescence(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
+
+        synchronize_irq(dev->irq);
 
         /* Wait for any pending NAPI task to complete */
 #ifdef CONFIG_R8168_NAPI
-        rtl8168_disable_napi(tp);
-#endif//CONFIG_R8168_NAPI
-
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67)
-        /* Give a racing hard_start_xmit a few cycles to complete. */
-        synchronize_net();
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+        RTL_NAPI_DISABLE(dev, &tp->napi);
 #endif
-        rtl8168_irq_mask_and_ack(tp);
-
-        rtl8168_wait_for_irq_complete(tp);
-}
-
-static void
-rtl8168_wait_for_quiescence(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        //suppress unused variable
-        (void)(tp);
+#endif//CONFIG_R8168_NAPI
 
-        _rtl8168_wait_for_quiescence(dev);
+        rtl8168_irq_mask_and_ack(tp, ioaddr);
 
 #ifdef CONFIG_R8168_NAPI
-        rtl8168_enable_napi(tp);
-#endif //CONFIG_R8168_NAPI
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+        RTL_NAPI_ENABLE(dev, &tp->napi);
+#endif
+#endif//CONFIG_R8168_NAPI
 }
 
+#if 0
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void rtl8168_reset_task(void *_data)
-{
-        struct net_device *dev = _data;
-        struct rtl8168_private *tp = netdev_priv(dev);
+static void rtl8168_reinit_task(void *_data)
 #else
-static void rtl8168_reset_task(struct work_struct *work)
-{
-        struct rtl8168_private *tp =
-                container_of(work, struct rtl8168_private, reset_task.work);
-        struct net_device *dev = tp->dev;
+static void rtl8168_reinit_task(struct work_struct *work)
 #endif
-        int i;
-
-        rtnl_lock();
-
-        if (!netif_running(dev) ||
-            test_bit(R8168_FLAG_DOWN, tp->task_flags) ||
-            !test_and_clear_bit(R8168_FLAG_TASK_RESET_PENDING, tp->task_flags))
-                goto out_unlock;
-
-        netdev_err(dev, "Device reseting!\n");
-
-        netif_carrier_off(dev);
-        netif_tx_disable(dev);
-        _rtl8168_wait_for_quiescence(dev);
-        rtl8168_hw_reset(dev);
-
-        rtl8168_tx_clear(tp);
-
-        rtl8168_init_ring_indexes(tp);
-
-        rtl8168_tx_desc_init(tp);
-        for (i = 0; i < tp->num_rx_desc; i++)
-                rtl8168_mark_to_asic(tp->RxDescArray + i, tp->rx_buf_sz);
-
-#ifdef CONFIG_R8168_NAPI
-        rtl8168_enable_napi(tp);
-#endif //CONFIG_R8168_NAPI
-
-        rtl8168_set_speed(dev, tp->autoneg, tp->speed, tp->duplex, tp->advertising);
-
-out_unlock:
-        rtnl_unlock();
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void rtl8168_esd_task(void *_data)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
         struct net_device *dev = _data;
-        struct rtl8168_private *tp = netdev_priv(dev);
 #else
-static void rtl8168_esd_task(struct work_struct *work)
-{
         struct rtl8168_private *tp =
-                container_of(work, struct rtl8168_private, esd_task.work);
+                container_of(work, struct rtl8168_private, task.work);
         struct net_device *dev = tp->dev;
 #endif
-        rtnl_lock();
-
-        if (!netif_running(dev) ||
-            test_bit(R8168_FLAG_DOWN, tp->task_flags) ||
-            !test_and_clear_bit(R8168_FLAG_TASK_ESD_CHECK_PENDING, tp->task_flags))
-                goto out_unlock;
-
-        rtl8168_esd_checker(tp);
+        int ret;
 
-        rtl8168_schedule_esd_work(tp);
+        if (netif_running(dev)) {
+                rtl8168_wait_for_quiescence(dev);
+                rtl8168_close(dev);
+        }
 
-out_unlock:
-        rtnl_unlock();
+        ret = rtl8168_open(dev);
+        if (unlikely(ret < 0)) {
+                if (unlikely(net_ratelimit())) {
+                        struct rtl8168_private *tp = netdev_priv(dev);
+
+                        if (netif_msg_drv(tp)) {
+                                printk(PFX KERN_ERR
+                                       "%s: reinit failure (status = %d)."
+                                       " Rescheduling.\n", dev->name, ret);
+                        }
+                }
+                rtl8168_schedule_work(dev, rtl8168_reinit_task);
+        }
 }
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void rtl8168_linkchg_task(void *_data)
+static void rtl8168_reset_task(void *_data)
 {
         struct net_device *dev = _data;
-        //struct rtl8168_private *tp = netdev_priv(dev);
+        struct rtl8168_private *tp = netdev_priv(dev);
 #else
-static void rtl8168_linkchg_task(struct work_struct *work)
+static void rtl8168_reset_task(struct work_struct *work)
 {
         struct rtl8168_private *tp =
-                container_of(work, struct rtl8168_private, linkchg_task.work);
+                container_of(work, struct rtl8168_private, task.work);
         struct net_device *dev = tp->dev;
 #endif
-        rtnl_lock();
-
-        if (!netif_running(dev) ||
-            test_bit(R8168_FLAG_DOWN, tp->task_flags) ||
-            !test_and_clear_bit(R8168_FLAG_TASK_LINKCHG_CHECK_PENDING, tp->task_flags))
-                goto out_unlock;
-
-        rtl8168_check_link_status(dev);
+        u32 budget = ~(u32)0;
+        unsigned long flags;
 
-        rtl8168_schedule_linkchg_work(tp);
+        if (!netif_running(dev))
+                return;
 
-out_unlock:
-        rtnl_unlock();
-}
+        rtl8168_wait_for_quiescence(dev);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void rtl8168_dash_task(void *_data)
-{
-        struct net_device *dev = _data;
-        //struct rtl8168_private *tp = netdev_priv(dev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+        rtl8168_rx_interrupt(dev, tp, tp->mmio_addr, &budget);
 #else
-static void rtl8168_dash_task(struct work_struct *work)
-{
-        struct rtl8168_private *tp =
-                container_of(work, struct rtl8168_private, dash_task.work);
-        struct net_device *dev = tp->dev;
-#endif
-        rtnl_lock();
+        rtl8168_rx_interrupt(dev, tp, tp->mmio_addr, budget);
+#endif  //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
 
-        if (!netif_running(dev) ||
-            test_bit(R8168_FLAG_DOWN, tp->task_flags) ||
-            !test_and_clear_bit(R8168_FLAG_TASK_DASH_CHECK_PENDING, tp->task_flags))
-                goto out_unlock;
+        spin_lock_irqsave(&tp->lock, flags);
 
-#ifdef ENABLE_DASH_SUPPORT
-        HandleDashInterrupt(dev);
-#endif
+        rtl8168_tx_clear(tp);
 
-out_unlock:
-        rtnl_unlock();
+        if (tp->dirty_rx == tp->cur_rx) {
+                rtl8168_rx_clear(tp);
+                rtl8168_init_ring(dev);
+                rtl8168_set_speed(dev, tp->autoneg, tp->speed, tp->duplex, tp->advertising);
+                spin_unlock_irqrestore(&tp->lock, flags);
+        } else {
+                spin_unlock_irqrestore(&tp->lock, flags);
+                if (unlikely(net_ratelimit())) {
+                        struct rtl8168_private *tp = netdev_priv(dev);
+
+                        if (netif_msg_intr(tp)) {
+                                printk(PFX KERN_EMERG
+                                       "%s: Rx buffers shortage\n", dev->name);
+                        }
+                }
+                rtl8168_schedule_work(dev, rtl8168_reset_task);
+        }
 }
 
-#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;
 
-        netdev_err(dev, "Transmit timeout reset Device!\n");
+        spin_lock_irqsave(&tp->lock, flags);
+        netif_stop_queue(dev);
+        netif_carrier_off(dev);
+        rtl8168_hw_reset(dev);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         /* Let's wait a bit while any (async) irq lands on */
-        rtl8168_schedule_reset_work(tp);
-}
-
-static u32
-rtl8168_get_txd_opts1(struct rtl8168_tx_ring *ring,
-                      u32 opts1,
-                      u32 len,
-                      unsigned int entry)
-{
-        u32 status = opts1 | len;
-
-        if (entry == ring->num_tx_desc - 1)
-                status |= RingEnd;
-
-        return status;
+        rtl8168_schedule_work(dev, rtl8168_reset_task);
 }
 
 static int
 rtl8168_xmit_frags(struct rtl8168_private *tp,
-                   struct rtl8168_tx_ring *ring,
                    struct sk_buff *skb,
-                   const u32 *opts)
+                   u32 opts1,
+                   u32 opts2)
 {
         struct skb_shared_info *info = skb_shinfo(skb);
         unsigned int cur_frag, entry;
         struct TxDesc *txd = NULL;
-        const unsigned char nr_frags = info->nr_frags;
 
-        entry = ring->cur_tx;
-        for (cur_frag = 0; cur_frag < nr_frags; cur_frag++) {
+        entry = tp->cur_tx;
+        for (cur_frag = 0; cur_frag < info->nr_frags; cur_frag++) {
                 skb_frag_t *frag = info->frags + cur_frag;
                 dma_addr_t mapping;
                 u32 status, len;
                 void *addr;
 
-                entry = (entry + 1) % ring->num_tx_desc;
+                entry = (entry + 1) % NUM_TX_DESC;
 
-                txd = ring->TxDescArray + entry;
+                txd = tp->TxDescArray + entry;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
                 len = frag->size;
                 addr = ((void *) page_address(frag->page)) + frag->page_offset;
@@ -30950,9 +27831,9 @@
                 len = skb_frag_size(frag);
                 addr = skb_frag_address(frag);
 #endif
-                mapping = dma_map_single(tp_to_dev(tp), addr, len, DMA_TO_DEVICE);
+                mapping = pci_map_single(tp->pci_dev, addr, len, PCI_DMA_TODEVICE);
 
-                if (unlikely(dma_mapping_error(tp_to_dev(tp), mapping))) {
+                if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping))) {
                         if (unlikely(net_ratelimit()))
                                 netif_err(tp, drv, tp->dev,
                                           "Failed to map TX fragments DMA!\n");
@@ -30960,32 +27841,32 @@
                 }
 
                 /* anti gcc 2.95.3 bugware (sic) */
-                status = rtl8168_get_txd_opts1(ring, opts0, len, entry);
-                if (cur_frag == (nr_frags - 1))
-                        status |= LastFrag;
+                status = opts1 | len | (RingEnd * !((entry + 1) % NUM_TX_DESC));
 
                 txd->addr = cpu_to_le64(mapping);
 
-                ring->tx_skbentry.len = len;
+                tp->tx_skbentry.len = len;
 
-                txd->opts2 = cpu_to_le32(opts1);
-                wmb();
                 txd->opts1 = cpu_to_le32(status);
+                txd->opts2 = cpu_to_le32(opts2);
+        }
+
+        if (cur_frag) {
+                tp->tx_skbentry.skb = skb;
+                wmb();
+                txd->opts1 |= cpu_to_le32(LastFrag);
         }
 
         return cur_frag;
 
 err_out:
-        rtl8168_tx_clear_range(tp, ring, ring->cur_tx + 1, cur_frag);
+        rtl8168_tx_clear_range(tp, tp->cur_tx + 1, cur_frag);
         return -EIO;
 }
 
 static inline
 __be16 get_protocol(struct sk_buff *skb)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
-        return vlan_get_protocol(skb);
-#else
         __be16 protocol;
 
         if (skb->protocol == htons(ETH_P_8021Q))
@@ -30994,25 +27875,11 @@
                 protocol = skb->protocol;
 
         return protocol;
-#endif
 }
 
-static bool rtl8168_skb_pad(struct sk_buff *skb)
-{
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
-        if (skb_padto(skb, ETH_ZLEN))
-                return false;
-        skb_put(skb, ETH_ZLEN - skb->len);
-        return true;
-#else
-        return !eth_skb_pad(skb);
-#endif
-}
-
-static inline bool
+static inline u32
 rtl8168_tx_csum(struct sk_buff *skb,
-                struct net_device *dev,
-                u32 *opts)
+                struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
         u32 csum_cmd = 0;
@@ -31042,10 +27909,11 @@
                         break;
                 case  __constant_htons(ETH_P_IPV6):
                         if (dev->features & NETIF_F_IPV6_CSUM) {
-                                if (skb_transport_offset(skb) > 0 && skb_transport_offset(skb) <= TCPHO_MAX) {
+                                u32 transport_offset = (u32)skb_transport_offset(skb);
+                                if (transport_offset > 0 && transport_offset <= TCPHO_MAX) {
                                         ip_protocol = ipv6_hdr(skb)->nexthdr;
                                         csum_cmd = tp->tx_ipv6_csum_cmd;
-                                        csum_cmd |= skb_transport_offset(skb) << TCPHO_SHIFT;
+                                        csum_cmd |= transport_offset << TCPHO_SHIFT;
                                 }
                         }
                         break;
@@ -31068,22 +27936,8 @@
                 }
         }
 
-        if (csum_cmd != 0) {
-                if (tp->ShortPacketSwChecksum && skb->len < ETH_ZLEN) {
-                        sw_calc_csum = TRUE;
-                        if (!rtl8168_skb_pad(skb))
-                                return false;
-                } else {
-                        if ((tp->mcfg == CFG_METHOD_1) || (tp->mcfg == CFG_METHOD_2) || (tp->mcfg == CFG_METHOD_3))
-                                opts0 |= csum_cmd;
-                        else
-                                opts1 |= csum_cmd;
-                }
-        }
-
-        if (tp->UseSwPaddingShortPkt && skb->len < ETH_ZLEN)
-                if (!rtl8168_skb_pad(skb))
-                        return false;
+        if (tp->ShortPacketSwChecksum && skb->len < 60 && csum_cmd != 0)
+                sw_calc_csum = TRUE;
 
         if (sw_calc_csum) {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
@@ -31093,12 +27947,96 @@
 #else
                 skb_checksum_help(skb);
 #endif
+                csum_cmd = 0;
         }
 
-        return true;
+        return csum_cmd;
+}
+
+static int
+rtl8168_sw_padding_short_pkt(struct rtl8168_private *tp,
+                             struct sk_buff *skb,
+                             u32 opts1,
+                             u32 opts2)
+{
+        unsigned int entry;
+        dma_addr_t mapping;
+        u32 status, len;
+        void *addr;
+        struct TxDesc *txd = NULL;
+        int ret = 0;
+
+        if (skb->len >= ETH_ZLEN)
+                goto out;
+
+        entry = tp->cur_tx;
+
+        entry = (entry + 1) % NUM_TX_DESC;
+
+        txd = tp->TxDescArray + entry;
+        len = ETH_ZLEN - skb->len;
+        addr = tp->ShortPacketEmptyBuffer;
+        mapping = pci_map_single(tp->pci_dev, addr, len, PCI_DMA_TODEVICE);
+        if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping))) {
+                if (unlikely(net_ratelimit()))
+                        netif_err(tp, drv, tp->dev,
+                                  "Failed to map Short Packet Buffer DMA!\n");
+                ret = -ENOMEM;
+                goto out;
+        }
+        status = opts1 | len | (RingEnd * !((entry + 1) % NUM_TX_DESC));
+
+        txd->addr = cpu_to_le64(mapping);
+
+        txd->opts1 = cpu_to_le32(status);
+        txd->opts2 = cpu_to_le32(opts2);
+
+        wmb();
+        txd->opts1 |= cpu_to_le32(LastFrag);
+out:
+        return ret;
 }
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+/* r8169_csum_workaround()
+  * The hw limites the value the transport offset. When the offset is out of the
+  * range, calculate the checksum by sw.
+  */
+static void r8168_csum_workaround(struct rtl8168_private *tp,
+                                  struct sk_buff *skb)
+{
+        if (skb_shinfo(skb)->gso_size) {
+                netdev_features_t features = tp->dev->features;
+                struct sk_buff *segs, *nskb;
+
+                features &= ~(NETIF_F_SG | NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+                segs = skb_gso_segment(skb, features);
+                if (IS_ERR(segs) || !segs)
+                        goto drop;
+
+                do {
+                        nskb = segs;
+                        segs = segs->next;
+                        nskb->next = NULL;
+                        rtl8168_start_xmit(nskb, tp->dev);
+                } while (segs);
+
+                dev_consume_skb_any(skb);
+        } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                if (skb_checksum_help(skb) < 0)
+                        goto drop;
+
+                rtl8168_start_xmit(skb, tp->dev);
+        } else {
+                struct net_device_stats *stats;
+
+drop:
+                stats = &tp->dev->stats;
+                stats->tx_dropped++;
+                dev_kfree_skb_any(skb);
+        }
+}
+
 /* msdn_giant_send_check()
  * According to the document of microsoft, the TCP Pseudo Header excludes the
  * packet length for IPv6 TCP large packets.
@@ -31123,42 +28061,25 @@
 }
 #endif
 
-static bool rtl8168_tx_slots_avail(struct rtl8168_private *tp,
-                                   struct rtl8168_tx_ring *ring)
-{
-        unsigned int slots_avail = READ_ONCE(ring->dirty_tx) + ring->num_tx_desc
-                                   - READ_ONCE(ring->cur_tx);
-
-        /* A skbuff with nr_frags needs nr_frags+1 entries in the tx queue */
-        return slots_avail > MAX_SKB_FRAGS;
-}
-
-static netdev_tx_t
+static int
 rtl8168_start_xmit(struct sk_buff *skb,
                    struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-        unsigned int   bytecount;
-        unsigned short gso_segs;
-        struct ring_info *last;
-        unsigned int last_entry;
         unsigned int entry;
         struct TxDesc *txd;
+        void __iomem *ioaddr = tp->mmio_addr;
         dma_addr_t mapping;
         u32 len;
-        u32 opts2;
-        netdev_tx_t ret = NETDEV_TX_OK;
-        unsigned long large_send;
+        u32 opts1;
+        u32 opts2;
+        int ret = NETDEV_TX_OK;
+        unsigned long flags, large_send;
         int frags;
-        const u16 queue_mapping = skb_get_queue_mapping(skb);
-        struct rtl8168_tx_ring *ring;
-        bool stop_queue;
-
-        assert(queue_mapping < tp->num_tx_rings);
 
-        ring = &tp->tx_ringqueue_mapping;
+        spin_lock_irqsave(&tp->lock, flags);
 
-        if (unlikely(!rtl8168_tx_slots_avail(tp, ring))) {
+        if (unlikely(TX_BUFFS_AVAIL(tp) < skb_shinfo(skb)->nr_frags)) {
                 if (netif_msg_drv(tp)) {
                         printk(KERN_ERR
                                "%s: BUG! Tx Ring full when queue awake!\n",
@@ -31167,23 +28088,14 @@
                 goto err_stop;
         }
 
-        entry = ring->cur_tx % ring->num_tx_desc;
-        txd = ring->TxDescArray + entry;
+        entry = tp->cur_tx % NUM_TX_DESC;
+        txd = tp->TxDescArray + entry;
 
-        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);
-                }
+        if (unlikely(le32_to_cpu(txd->opts1) & DescOwn))
                 goto err_stop;
-        }
-
-        bytecount = skb->len;
-        gso_segs = 1;
 
-        opts0 = DescOwn;
-        opts1 = rtl8168_tx_vlan_tag(tp, skb);
+        opts1 = DescOwn;
+        opts2 = rtl8168_tx_vlan_tag(tp, skb);
 
         large_send = 0;
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
@@ -31196,47 +28108,34 @@
 
                 /* TCP Segmentation Offload (or TCP Large Send) */
                 if (mss) {
-                        union {
-                                struct iphdr *v4;
-                                struct ipv6hdr *v6;
-                                unsigned char *hdr;
-                        } ip;
-                        union {
-                                struct tcphdr *tcp;
-                                struct udphdr *udp;
-                                unsigned char *hdr;
-                        } l4;
-                        u32 l4_offset, hdr_len;
-
-                        ip.hdr = skb_network_header(skb);
-                        l4.hdr = skb_checksum_start(skb);
-
-                        l4_offset = skb_transport_offset(skb);
-                        assert((l4_offset%2) == 0);
                         if ((tp->mcfg == CFG_METHOD_1) ||
                             (tp->mcfg == CFG_METHOD_2) ||
                             (tp->mcfg == CFG_METHOD_3)) {
-                                opts0 |= LargeSend | (min(mss, MSS_MAX) << 16);
+                                opts1 |= LargeSend | (min(mss, MSS_MAX) << 16);
                                 large_send = 1;
                         } else {
+                                u32 transport_offset = (u32)skb_transport_offset(skb);
                                 switch (get_protocol(skb)) {
                                 case __constant_htons(ETH_P_IP):
-                                        if (l4_offset <= GTTCPHO_MAX) {
-                                                opts0 |= GiantSendv4;
-                                                opts0 |= l4_offset << GTTCPHO_SHIFT;
-                                                opts1 |= min(mss, MSS_MAX) << 18;
+                                        if (transport_offset <= 128) {
+                                                opts1 |= GiantSendv4;
+                                                opts1 |= transport_offset << GTTCPHO_SHIFT;
+                                                opts2 |= min(mss, MSS_MAX) << 18;
                                                 large_send = 1;
                                         }
                                         break;
                                 case __constant_htons(ETH_P_IPV6):
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
-                                        if (msdn_giant_send_check(skb))
-                                                goto err_dma_0;
+                                        if (msdn_giant_send_check(skb)) {
+                                                spin_unlock_irqrestore(&tp->lock, flags);
+                                                r8168_csum_workaround(tp, skb);
+                                                goto out;
+                                        }
 #endif
-                                        if (l4_offset <= GTTCPHO_MAX) {
-                                                opts0 |= GiantSendv6;
-                                                opts0 |= l4_offset << GTTCPHO_SHIFT;
-                                                opts1 |= min(mss, MSS_MAX) << 18;
+                                        if (transport_offset <= 128) {
+                                                opts1 |= GiantSendv6;
+                                                opts1 |= transport_offset << GTTCPHO_SHIFT;
+                                                opts2 |= min(mss, MSS_MAX) << 18;
                                                 large_send = 1;
                                         }
                                         break;
@@ -31249,55 +28148,53 @@
 
                         if (large_send == 0)
                                 goto err_dma_0;
-
-                        /* compute length of segmentation header */
-                        hdr_len = (l4.tcp->doff * 4) + l4_offset;
-                        /* update gso size and bytecount with header size */
-                        gso_segs = skb_shinfo(skb)->gso_segs;
-                        bytecount += (gso_segs - 1) * hdr_len;
                 }
         }
 #endif //LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
 
         if (large_send == 0) {
-                if (unlikely(!rtl8168_tx_csum(skb, dev, opts)))
-                        goto err_dma_0;
+                if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                        if ((tp->mcfg == CFG_METHOD_1) || (tp->mcfg == CFG_METHOD_2) || (tp->mcfg == CFG_METHOD_3))
+                                opts1 |= rtl8168_tx_csum(skb, dev);
+                        else
+                                opts2 |= rtl8168_tx_csum(skb, dev);
+                }
         }
 
-        frags = rtl8168_xmit_frags(tp, ring, skb, opts);
+        frags = rtl8168_xmit_frags(tp, skb, opts1, opts2);
         if (unlikely(frags < 0))
                 goto err_dma_0;
         if (frags) {
                 len = skb_headlen(skb);
-                opts0 |= FirstFrag;
+                opts1 |= FirstFrag;
         } else {
                 len = skb->len;
-                opts0 |= FirstFrag | LastFrag;
+
+                tp->tx_skbentry.skb = skb;
+
+                if (tp->UseSwPaddingShortPkt && len < 60) {
+                        if (unlikely(rtl8168_sw_padding_short_pkt(tp, skb, opts1, opts2)))
+                                goto err_dma_1;
+                        opts1 |= FirstFrag;
+                        frags++;
+                } else {
+                        opts1 |= FirstFrag | LastFrag;
+                }
         }
 
-        opts0 = rtl8168_get_txd_opts1(ring, opts0, len, entry);
-        mapping = dma_map_single(tp_to_dev(tp), skb->data, len, DMA_TO_DEVICE);
-        if (unlikely(dma_mapping_error(tp_to_dev(tp), mapping))) {
+        opts1 |= len | (RingEnd * !((entry + 1) % NUM_TX_DESC));
+        mapping = pci_map_single(tp->pci_dev, skb->data, len, PCI_DMA_TODEVICE);
+        if (unlikely(dma_mapping_error(&tp->pci_dev->dev, mapping))) {
                 if (unlikely(net_ratelimit()))
                         netif_err(tp, drv, dev, "Failed to map TX DMA!\n");
                 goto err_dma_1;
         }
-        /* set first fragment's length */
-        ring->tx_skbentry.len = len;
-
-        /* set skb to last fragment */
-        last_entry = (entry + frags) % ring->num_tx_desc;
-        last = &ring->tx_skblast_entry;
-        last->skb = skb;
-        last->gso_segs = gso_segs;
-        last->bytecount = bytecount;
-
+        tp->tx_skbentry.len = len;
         txd->addr = cpu_to_le64(mapping);
-        txd->opts2 = cpu_to_le32(opts1);
+        txd->opts2 = cpu_to_le32(opts2);
+        txd->opts1 = cpu_to_le32(opts1&~DescOwn);
         wmb();
-        txd->opts1 = cpu_to_le32(opts0);
-
-        netdev_tx_sent_queue(txring_txq(ring), bytecount);
+        txd->opts1 = cpu_to_le32(opts1);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
         dev->trans_start = jiffies;
@@ -31305,132 +28202,98 @@
         skb_tx_timestamp(skb);
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
 
-        /* rtl_tx needs to see descriptor changes before updated ring->cur_tx */
-        smp_wmb();
+        tp->cur_tx += frags + 1;
 
-        WRITE_ONCE(ring->cur_tx, ring->cur_tx + frags + 1);
-
-        stop_queue = !rtl8168_tx_slots_avail(tp, ring);
-        if (unlikely(stop_queue)) {
-                /* Avoid wrongly optimistic queue wake-up: rtl_tx thread must
-                 * not miss a ring update when it notices a stopped queue.
-                 */
-                smp_wmb();
-                netif_stop_subqueue(dev, queue_mapping);
-        }
+        wmb();
 
-        if (netif_xmit_stopped(txring_txq(ring)) || !netdev_xmit_more())
-                rtl8168_doorbell(ring);    /* set polling bit */
+        RTL_W8(TxPoll, NPQ);    /* set polling bit */
 
-        if (unlikely(stop_queue)) {
-                /* Sync with rtl_tx:
-                 * - publish queue status and cur_tx ring index (write barrier)
-                 * - refresh dirty_tx ring index (read barrier).
-                 * May the current thread have a pessimistic view of the ring
-                 * status and forget to wake up queue, a racing rtl_tx thread
-                 * can't.
-                 */
-                smp_mb();
-                if (rtl8168_tx_slots_avail(tp, ring))
-                        netif_start_subqueue(dev, queue_mapping);
+        if (TX_BUFFS_AVAIL(tp) < MAX_SKB_FRAGS) {
+                netif_stop_queue(dev);
+                smp_rmb();
+                if (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)
+                        netif_wake_queue(dev);
         }
 
+        spin_unlock_irqrestore(&tp->lock, flags);
 out:
         return ret;
 err_dma_1:
-        rtl8168_tx_clear_range(tp, ring, ring->cur_tx + 1, frags);
+        tp->tx_skbentry.skb = NULL;
+        rtl8168_tx_clear_range(tp, tp->cur_tx + 1, frags);
 err_dma_0:
         RTLDEV->stats.tx_dropped++;
+        spin_unlock_irqrestore(&tp->lock, flags);
         dev_kfree_skb_any(skb);
         ret = NETDEV_TX_OK;
         goto out;
 err_stop:
-        netif_tx_disable(dev);
+        netif_stop_queue(dev);
         ret = NETDEV_TX_BUSY;
         RTLDEV->stats.tx_dropped++;
+
+        spin_unlock_irqrestore(&tp->lock, flags);
         goto out;
 }
 
 static void
-rtl8168_tx_interrupt(struct rtl8168_tx_ring *ring, int budget)
+rtl8168_tx_interrupt(struct net_device *dev,
+                     struct rtl8168_private *tp,
+                     void __iomem *ioaddr)
 {
-        unsigned int total_bytes = 0, total_packets = 0;
-        struct rtl8168_private *tp = ring->priv;
-        struct net_device *dev = tp->dev;
         unsigned int dirty_tx, tx_left;
 
         assert(dev != NULL);
         assert(tp != NULL);
+        assert(ioaddr != NULL);
 
-#ifdef ENABLE_LIB_SUPPORT
-        if (ring->index > 0) {
-                rtl8168_lib_tx_interrupt(tp);
-                return;
-        }
-#endif
-        dirty_tx = ring->dirty_tx;
+        dirty_tx = tp->dirty_tx;
         smp_rmb();
-        tx_left = READ_ONCE(ring->cur_tx) - dirty_tx;
-        tp->dynamic_aspm_packet_count += tx_left;
+        tx_left = tp->cur_tx - dirty_tx;
 
         while (tx_left > 0) {
-                unsigned int entry = dirty_tx % ring->num_tx_desc;
-                struct ring_info *tx_skb = ring->tx_skb + entry;
+                unsigned int entry = dirty_tx % NUM_TX_DESC;
+                struct ring_info *tx_skb = tp->tx_skb + entry;
+                u32 len = tx_skb->len;
                 u32 status;
 
                 rmb();
-                status = le32_to_cpu(ring->TxDescArrayentry.opts1);
+                status = le32_to_cpu(tp->TxDescArrayentry.opts1);
                 if (status & DescOwn)
                         break;
 
+                RTLDEV->stats.tx_bytes += len;
+                RTLDEV->stats.tx_packets++;
+
                 rtl8168_unmap_tx_skb(tp->pci_dev,
                                      tx_skb,
-                                     ring->TxDescArray + entry);
-
-                if (tx_skb->skb != NULL) {
-                        /* update the statistics for this packet */
-                        total_bytes += tx_skb->bytecount;
-                        total_packets += tx_skb->gso_segs;
+                                     tp->TxDescArray + entry);
 
-                        RTL_NAPI_CONSUME_SKB_ANY(tx_skb->skb, budget);
+                if (tx_skb->skb!=NULL) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+                        dev_consume_skb_any(tx_skb->skb);
+#else
+                        dev_kfree_skb_any(tx_skb->skb);
+#endif
                         tx_skb->skb = NULL;
                 }
                 dirty_tx++;
                 tx_left--;
         }
 
-        if (total_packets) {
-                netdev_tx_completed_queue(txring_txq(ring),
-                                          total_packets, total_bytes);
-
-                RTLDEV->stats.tx_bytes += total_bytes;
-                RTLDEV->stats.tx_packets += total_packets;
-        }
-
-        tp->dynamic_aspm_packet_count -= tx_left;
-
-        if (ring->dirty_tx != dirty_tx) {
-                WRITE_ONCE(ring->dirty_tx, dirty_tx);
+        if (tp->dirty_tx != dirty_tx) {
+                tp->dirty_tx = dirty_tx;
                 smp_wmb();
                 if (netif_queue_stopped(dev) &&
-                    (rtl8168_tx_slots_avail(tp, ring))) {
-                        netif_start_subqueue(dev, ring->index);
+                    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
+                        netif_wake_queue(dev);
                 }
                 smp_rmb();
-                if (ring->cur_tx != dirty_tx)
-                        rtl8168_doorbell(ring);
+                if (tp->cur_tx != dirty_tx)
+                        RTL_W8(TxPoll, NPQ);
         }
 }
 
-static void
-rtl8168_tx_all_interrupt(struct rtl8168_private *tp, int budget)
-{
-        int i;
-
-        for (i = 0; i < rtl8168_tot_tx_rings(tp); i++)
-                rtl8168_tx_interrupt(&tp->tx_ringi, budget);
-}
-
 static inline int
 rtl8168_fragmented_frame(u32 status)
 {
@@ -31469,10 +28332,8 @@
         }
 }
 
-/*
 static inline int
 rtl8168_try_rx_copy(struct rtl8168_private *tp,
-                    struct rtl8168_rx_ring *ring,
                     struct sk_buff **sk_buff,
                     int pkt_size,
                     struct RxDesc *desc,
@@ -31480,38 +28341,36 @@
 {
         int ret = -1;
 
-        struct sk_buff *skb;
+        if (pkt_size < rx_copybreak) {
+                struct sk_buff *skb;
 
-        skb = RTL_ALLOC_SKB_INTR(&tp->r8168napiring->index.napi,
-                                 pkt_size + RTK_RX_ALIGN);
-        if (skb) {
-                u8 *data;
+                skb = RTL_ALLOC_SKB_INTR(tp, pkt_size + RTK_RX_ALIGN);
+                if (skb) {
+                        u8 *data;
 
-                data = sk_buff0->data;
-                skb_reserve(skb, RTK_RX_ALIGN);
+                        data = sk_buff0->data;
+                        skb_reserve(skb, RTK_RX_ALIGN);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
-                prefetch(data - RTK_RX_ALIGN);
+                        prefetch(data - RTK_RX_ALIGN);
 #endif
-                eth_copy_and_sum(skb, data, pkt_size, 0);
-                *sk_buff = skb;
-                rtl8168_mark_to_asic(desc, rx_buf_sz);
-                ret = 0;
+                        eth_copy_and_sum(skb, data, pkt_size, 0);
+                        *sk_buff = skb;
+                        rtl8168_mark_to_asic(desc, rx_buf_sz);
+                        ret = 0;
+                }
         }
-
         return ret;
 }
-*/
 
 static inline void
 rtl8168_rx_skb(struct rtl8168_private *tp,
-               struct sk_buff *skb,
-               u32 ring_index)
+               struct sk_buff *skb)
 {
 #ifdef CONFIG_R8168_NAPI
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
         netif_receive_skb(skb);
 #else
-        napi_gro_receive(&tp->r8168napiring_index.napi, skb);
+        napi_gro_receive(&tp->napi, skb);
 #endif
 #else
         netif_rx(skb);
@@ -31521,48 +28380,34 @@
 static int
 rtl8168_rx_interrupt(struct net_device *dev,
                      struct rtl8168_private *tp,
-                     struct rtl8168_rx_ring *ring,
-                     napi_budget budget)
+                     void __iomem *ioaddr, napi_budget budget)
 {
         unsigned int cur_rx, rx_left;
-        unsigned int count = 0;
-        u32 ring_index = ring->index;
+        unsigned int delta, count = 0;
         unsigned int entry;
         struct RxDesc *desc;
         u32 status;
         u32 rx_quota;
-        u64 rx_buf_phy_addr;
 
         assert(dev != NULL);
         assert(tp != NULL);
+        assert(ioaddr != NULL);
 
-        if (!tp->RxDescArray)
+        if ((tp->RxDescArray == NULL) || (tp->Rx_skbuff == NULL))
                 goto rx_out;
 
-#ifdef ENABLE_LIB_SUPPORT
-        if (tp->num_rx_rings == 0 && ring->index == 0) {
-                rtl8168_lib_rx_interrupt(tp);
-                goto rx_out;
-        }
-#endif
         rx_quota = RTL_RX_QUOTA(budget);
-        cur_rx = ring->cur_rx;
-        rx_left = tp->num_rx_desc + ring->dirty_rx - cur_rx;
+        cur_rx = tp->cur_rx;
+        entry = cur_rx % NUM_RX_DESC;
+        desc = tp->RxDescArray + entry;
+        rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
         rx_left = rtl8168_rx_quota(rx_left, (u32)rx_quota);
 
-        for (; rx_left > 0; rx_left--, cur_rx++) {
-                int pkt_size;
-                const void *rx_buf;
-                struct sk_buff *skb;
-
-                entry = cur_rx % tp->num_rx_desc;
-                desc = rtl8168_get_rxdesc(tp, tp->RxDescArray, entry, ring_index);
+        for (; rx_left > 0; rx_left--) {
+                rmb();
                 status = le32_to_cpu(desc->opts1);
                 if (status & DescOwn)
                         break;
-
-                rmb();
-
                 if (unlikely(status & RxRES)) {
                         if (netif_msg_rx_err(tp)) {
                                 printk(KERN_INFO
@@ -31576,81 +28421,93 @@
                                 RTLDEV->stats.rx_length_errors++;
                         if (status & RxCRC)
                                 RTLDEV->stats.rx_crc_errors++;
+                        if (dev->features & NETIF_F_RXALL)
+                                goto process_pkt;
 
-                        if (!(dev->features & NETIF_F_RXALL))
-                                goto release_descriptor;
-                }
-
-                pkt_size = status & 0x00003fff;
-                if (likely(!(dev->features & NETIF_F_RXFCS)))
-                        pkt_size -= ETH_FCS_LEN;
+                        rtl8168_mark_to_asic(desc, tp->rx_buf_sz);
+                } else {
+                        struct sk_buff *skb;
+                        int pkt_size;
+                        void (*pci_action)(struct pci_dev *, dma_addr_t,
+                                           size_t, int);
+
+process_pkt:
+                        if (likely(!(dev->features & NETIF_F_RXFCS)))
+                                pkt_size = (status & 0x00003fff) - 4;
+                        else
+                                pkt_size = status & 0x00003fff;
 
-                /*
-                 * The driver does not support incoming fragmented
-                 * frames. They are seen as a symptom of over-mtu
-                 * sized frames.
-                 */
-                if (unlikely(rtl8168_fragmented_frame(status)) ||
-                    unlikely(pkt_size > tp->rx_buf_sz)) {
-                        RTLDEV->stats.rx_dropped++;
-                        RTLDEV->stats.rx_length_errors++;
-                        goto release_descriptor;
-                }
-
-                skb = RTL_ALLOC_SKB_INTR(&tp->r8168napiring_index.napi, pkt_size + RTK_RX_ALIGN);
-                if (!skb) {
-                        RTLDEV->stats.rx_dropped++;
-                        RTLDEV->stats.rx_length_errors++;
-                        //netdev_err(tp->dev, "Failed to allocate RX skb!\n");
-                        goto release_descriptor;
-                }
-
-                rx_buf_phy_addr = ring->RxDescPhyAddrentry;
-                dma_sync_single_for_cpu(tp_to_dev(tp),
-                                        rx_buf_phy_addr, tp->rx_buf_sz,
-                                        DMA_FROM_DEVICE);
+                        /*
+                         * The driver does not support incoming fragmented
+                         * frames. They are seen as a symptom of over-mtu
+                         * sized frames.
+                         */
+                        if (unlikely(rtl8168_fragmented_frame(status))) {
+                                RTLDEV->stats.rx_dropped++;
+                                RTLDEV->stats.rx_length_errors++;
+                                rtl8168_mark_to_asic(desc, tp->rx_buf_sz);
+                                continue;
+                        }
 
-                rx_buf = ring->Rx_skbuffentry->data;
-                if (!R8168_USE_NAPI_ALLOC_SKB)
-                        skb_reserve(skb, RTK_RX_ALIGN);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
-                prefetch(rx_buf);
-#endif
-                eth_copy_and_sum(skb, rx_buf, pkt_size, 0);
+                        skb = tp->Rx_skbuffentry;
+                        if (tp->cp_cmd & RxChkSum)
+                                rtl8168_rx_csum(tp, skb, desc);
+
+                        pci_dma_sync_single_for_cpu(tp->pci_dev,
+                                                    le64_to_cpu(desc->addr), tp->rx_buf_sz,
+                                                    PCI_DMA_FROMDEVICE);
+
+                        pci_action = pci_dma_sync_single_for_device;
+                        if (rtl8168_try_rx_copy(tp, &skb, pkt_size,
+                                                desc, tp->rx_buf_sz)) {
+                                pci_action = pci_unmap_single;
+                                tp->Rx_skbuffentry = NULL;
+                        }
 
-                dma_sync_single_for_device(tp_to_dev(tp), rx_buf_phy_addr,
-                                           tp->rx_buf_sz, DMA_FROM_DEVICE);
+                        pci_action(tp->pci_dev, le64_to_cpu(desc->addr),
+                                   tp->rx_buf_sz, PCI_DMA_FROMDEVICE);
 
-#ifdef ENABLE_RSS_SUPPORT
-                rtl8168_rx_hash(tp, (struct RxDescV2 *)desc, skb);
-#endif
-                if (tp->cp_cmd & RxChkSum)
-                        rtl8168_rx_csum(tp, skb, desc);
+                        skb->dev = dev;
+                        skb_put(skb, pkt_size);
+                        skb->protocol = eth_type_trans(skb, dev);
 
-                skb->dev = dev;
-                skb_put(skb, pkt_size);
-                skb->protocol = eth_type_trans(skb, dev);
+                        if (skb->pkt_type == PACKET_MULTICAST)
+                                RTLDEV->stats.multicast++;
 
-                if (skb->pkt_type == PACKET_MULTICAST)
-                        RTLDEV->stats.multicast++;
-
-                if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
-                        rtl8168_rx_skb(tp, skb, ring_index);
+                        if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
+                                rtl8168_rx_skb(tp, skb);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
-                dev->last_rx = jiffies;
+                        dev->last_rx = jiffies;
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
-                RTLDEV->stats.rx_bytes += pkt_size;
-                RTLDEV->stats.rx_packets++;
+                        RTLDEV->stats.rx_bytes += pkt_size;
+                        RTLDEV->stats.rx_packets++;
+                }
 
-release_descriptor:
-                rtl8168_mark_to_asic(desc, tp->rx_buf_sz);
+                cur_rx++;
+                entry = cur_rx % NUM_RX_DESC;
+                desc = tp->RxDescArray + entry;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
+                prefetch(desc);
+#endif
         }
 
-        count = cur_rx - ring->cur_rx;
-        ring->cur_rx = cur_rx;
-        ring->dirty_rx += count;
+        count = cur_rx - tp->cur_rx;
+        tp->cur_rx = cur_rx;
 
-        tp->dynamic_aspm_packet_count += count;
+        delta = rtl8168_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx, 1);
+        if (!delta && count && netif_msg_intr(tp))
+                printk(KERN_INFO "%s: no Rx buffer allocated\n", dev->name);
+        tp->dirty_rx += delta;
+
+        /*
+         * FIXME: until there is periodic timer to try and refill the ring,
+         * a temporary shortage may definitely kill the Rx process.
+         * - disable the asic to try and avoid an overflow and kick it again
+         *   after refill ?
+         * - how do others driver handle this condition (Uh oh...).
+         */
+        if ((tp->dirty_rx + NUM_RX_DESC == tp->cur_rx) && netif_msg_intr(tp))
+                printk(KERN_EMERG "%s: Rx buffers exhausted\n", dev->name);
 
 rx_out:
         return count;
@@ -31666,51 +28523,65 @@
 static irqreturn_t rtl8168_interrupt(int irq, void *dev_instance)
 #endif
 {
-        struct r8168_napi *r8168napi = dev_instance;
-        struct rtl8168_private *tp = r8168napi->priv;
-        struct net_device *dev = tp->dev;
-        u8 other_q_status = 0;
-        int handled = 0;
+        struct net_device *dev = (struct net_device *) dev_instance;
+        struct rtl8168_private *tp = netdev_priv(dev);
+        void __iomem *ioaddr = tp->mmio_addr;
         int status;
-        int i;
+        int handled = 0;
 
         do {
-                status = RTL_R16(tp, tp->isr_reg0);
-#ifdef ENABLE_RSS_SUPPORT
-                if (R8168_MULTI_RX_Q(tp)) {
-                        for (i=1; i<rtl8168_tot_rx_rings(tp); i++)
-                                other_q_status |= RTL_R8(tp, tp->isr_regi);
-                }
-#endif
-                if (!(tp->features & (RTL_FEATURE_MSI | RTL_FEATURE_MSIX))) {
+                status = RTL_R16(IntrStatus);
+
+                if (!(tp->features & RTL_FEATURE_MSI)) {
                         /* hotplug/major error/no more work/shared irq */
-                        if ((status == 0xFFFF) || (!status && !other_q_status))
+                        if ((status == 0xFFFF) || !status)
                                 break;
 
-                        if (!(status & (tp->intr_mask | tp->timer_intr_mask)) &&
-                            !(other_q_status & other_q_intr_mask))
+                        if (!(status & (tp->intr_mask | tp->timer_intr_mask)))
                                 break;
                 }
 
                 handled = 1;
 
-                rtl8168_disable_interrupt(tp);
-                rtl8168_disable_lib_interrupt(tp);
+                rtl8168_disable_hw_interrupt(tp, ioaddr);
 
                 switch (tp->mcfg) {
-                case CFG_METHOD_9 ... CFG_METHOD_37:
+                case CFG_METHOD_9:
+                case CFG_METHOD_10:
+                case CFG_METHOD_11:
+                case CFG_METHOD_12:
+                case CFG_METHOD_13:
+                case CFG_METHOD_14:
+                case CFG_METHOD_15:
+                case CFG_METHOD_16:
+                case CFG_METHOD_17:
+                case CFG_METHOD_18:
+                case CFG_METHOD_19:
+                case CFG_METHOD_20:
+                case CFG_METHOD_21:
+                case CFG_METHOD_22:
+                case CFG_METHOD_23:
+                case CFG_METHOD_24:
+                case CFG_METHOD_25:
+                case CFG_METHOD_26:
+                case CFG_METHOD_27:
+                case CFG_METHOD_28:
+                case CFG_METHOD_29:
+                case CFG_METHOD_30:
+                case CFG_METHOD_31:
+                case CFG_METHOD_32:
                         /* RX_OVERFLOW RE-START mechanism now HW handles it automatically*/
-                        rtl8168_clear_isr_by_vector(tp, 0, status&~RxFIFOOver);
+                        RTL_W16(IntrStatus, status&~RxFIFOOver);
                         break;
                 default:
-                        rtl8168_clear_isr_by_vector(tp, 0, status);
+                        RTL_W16(IntrStatus, status);
                         break;
                 }
 
                 //Work around for rx fifo overflow
                 if (unlikely(status & RxFIFOOver)) {
                         if (tp->mcfg == CFG_METHOD_1) {
-                                netif_tx_disable(dev);
+                                netif_stop_queue(dev);
                                 udelay(300);
                                 rtl8168_hw_reset(dev);
                                 rtl8168_tx_clear(tp);
@@ -31718,65 +28589,83 @@
                                 rtl8168_init_ring(dev);
                                 rtl8168_hw_config(dev);
                                 rtl8168_hw_start(dev);
-                                netif_tx_wake_all_queues(dev);
+                                netif_wake_queue(dev);
                         }
-                        tp->rx_fifo_of++;
-                }
-
-                if (other_q_status) {
-                        for (i=1; i<rtl8168_tot_rx_rings(tp); i++)
-                                rtl8168_clear_isr_by_vector(tp, i, other_q_status);
                 }
 
 #ifdef ENABLE_DASH_SUPPORT
-                if (CheckDashInterrupt(dev, status))
-                        rtl8168_schedule_dash_work(tp);
+                if ( tp->DASH ) {
+                        if (HW_DASH_SUPPORT_TYPE_2(tp) || HW_DASH_SUPPORT_TYPE_3(tp)) {
+                                u8 DashIntType2Status;
+
+                                if (status & ISRIMR_DASH_INTR_CMAC_RESET)
+                                        tp->CmacResetIntr = TRUE;
+
+                                DashIntType2Status = RTL_CMAC_R8(CMAC_IBISR0);
+                                if (DashIntType2Status & ISRIMR_DASH_TYPE2_ROK) {
+                                        tp->RcvFwDashOkEvt = TRUE;
+                                }
+                                if (DashIntType2Status & ISRIMR_DASH_TYPE2_TOK) {
+                                        tp->SendFwHostOkEvt = TRUE;
+                                }
+                                if (DashIntType2Status & ISRIMR_DASH_TYPE2_RX_DISABLE_IDLE) {
+                                        tp->DashFwDisableRx = TRUE;
+                                }
+
+                                RTL_CMAC_W8(CMAC_IBISR0, DashIntType2Status);
+                        } else {
+                                if (status & ISRIMR_DP_REQSYS_OK) {
+                                        tp->RcvFwReqSysOkEvt = TRUE;
+                                }
+                                if (status & ISRIMR_DP_DASH_OK) {
+                                        tp->RcvFwDashOkEvt = TRUE;
+                                }
+                                if (status & ISRIMR_DP_HOST_OK) {
+                                        tp->SendFwHostOkEvt = TRUE;
+                                }
+                        }
+                }
 #endif
 
 #ifdef CONFIG_R8168_NAPI
-                if ((status & tp->intr_mask) ||
-                    (other_q_status & other_q_intr_mask) ||
-                    tp->keep_intr_cnt-- > 0) {
-                        if ((status & tp->intr_mask) ||
-                            (other_q_status & other_q_intr_mask))
+                if (status & tp->intr_mask || tp->keep_intr_cnt-- > 0) {
+                        if (status & tp->intr_mask)
                                 tp->keep_intr_cnt = RTK_KEEP_INTERRUPT_COUNT;
 
-                        if (likely(RTL_NETIF_RX_SCHEDULE_PREP(dev, &tp->r8168napi0.napi)))
-                                __RTL_NETIF_RX_SCHEDULE(dev, &tp->r8168napi0.napi);
+                        if (likely(RTL_NETIF_RX_SCHEDULE_PREP(dev, &tp->napi)))
+                                __RTL_NETIF_RX_SCHEDULE(dev, &tp->napi);
                         else if (netif_msg_intr(tp))
                                 printk(KERN_INFO "%s: interrupt %04x in poll\n",
                                        dev->name, status);
                 } else {
                         tp->keep_intr_cnt = RTK_KEEP_INTERRUPT_COUNT;
-                        rtl8168_switch_to_hw_interrupt(tp);
+                        rtl8168_switch_to_hw_interrupt(tp, ioaddr);
                 }
 #else
-                if ((status & tp->intr_mask) ||
-                    (other_q_status & other_q_intr_mask) ||
-                    tp->keep_intr_cnt-- > 0) {
-                        u32 const max_rx_queue =
-                                (other_q_status & other_q_intr_mask) > 0 ?
-                                rtl8168_tot_rx_rings(tp) : 1;
+                if (status & tp->intr_mask || tp->keep_intr_cnt-- > 0) {
                         u32 budget = ~(u32)0;
 
-                        if ((status & tp->intr_mask) ||
-                            (other_q_status & other_q_intr_mask))
+                        if (status & tp->intr_mask)
                                 tp->keep_intr_cnt = RTK_KEEP_INTERRUPT_COUNT;
-
-                        rtl8168_tx_all_interrupt(tp, budget);
-
-                        for (i = 0; i < max_rx_queue; i++) {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-                                rtl8168_rx_interrupt(dev, tp, &tp->rx_ringi, &budget);
+                        rtl8168_rx_interrupt(dev, tp, tp->mmio_addr, &budget);
 #else
-                                rtl8168_rx_interrupt(dev, tp, &tp->rx_ringi, budget);
-#endif	//LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+                        rtl8168_rx_interrupt(dev, tp, tp->mmio_addr, budget);
+#endif  //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+                        rtl8168_tx_interrupt(dev, tp, ioaddr);
+
+#ifdef ENABLE_DASH_SUPPORT
+                        if ( tp->DASH ) {
+                                struct net_device *dev = tp->dev;
+
+                                HandleDashInterrupt(dev);
                         }
+#endif
 
-                        rtl8168_switch_to_timer_interrupt(tp);
+                        rtl8168_switch_to_timer_interrupt(tp, ioaddr);
                 } else {
                         tp->keep_intr_cnt = RTK_KEEP_INTERRUPT_COUNT;
-                        rtl8168_switch_to_hw_interrupt(tp);
+                        rtl8168_switch_to_hw_interrupt(tp, ioaddr);
                 }
 #endif
 
@@ -31785,142 +28674,37 @@
         return IRQ_RETVAL(handled);
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static irqreturn_t rtl8168_interrupt_msix(int irq, void *dev_instance, struct pt_regs *regs)
-#else
-static irqreturn_t rtl8168_interrupt_msix(int irq, void *dev_instance)
-#endif
-{
-        struct r8168_napi *r8168napi = dev_instance;
-        struct rtl8168_private *tp = r8168napi->priv;
-        struct net_device *dev = tp->dev;
-        int message_id = r8168napi->index;
-#ifndef CONFIG_R8168_NAPI
-        u32 budget = ~(u32)0;
-#endif
-
-        do {
-#if defined(RTL_USE_NEW_INTR_API)
-                if (!tp->irq_tblmessage_id.requested)
-                        break;
-#endif
-                /*
-                 * Other rx queue may incur interrupt due to rdu.
-                 * Skip its interrupt here or its queue will be initialized
-                 * incorrectly.
-                 */
-                if (message_id >= tp->num_hw_tot_en_rx_rings)
-                        break;
-
-#ifdef ENABLE_DASH_SUPPORT
-                if (message_id == 0 &&
-                    CheckDashInterrupt(dev, rtl8168_get_isr_by_vector(tp, 0)))
-                        rtl8168_schedule_dash_work(tp);
-#endif
-
-#ifdef CONFIG_R8168_NAPI
-                if (likely(RTL_NETIF_RX_SCHEDULE_PREP(dev, &r8168napi->napi))) {
-                        rtl8168_disable_interrupt_by_vector(tp, message_id);
-                        __RTL_NETIF_RX_SCHEDULE(dev, &r8168napi->napi);
-                } else if (netif_msg_intr(tp))
-                        printk(KERN_INFO "%s: interrupt message id %d in poll_msix\n",
-                               dev->name, message_id);
-                rtl8168_self_clear_isr_by_vector(tp, message_id);
-#else
-                rtl8168_disable_interrupt_by_vector(tp, message_id);
-
-                rtl8168_self_clear_isr_by_vector(tp, message_id);
-
-                if (message_id == 0)
-                        rtl8168_tx_all_interrupt(tp, budget);
-
-                if (message_id < tp->num_hw_tot_en_rx_rings) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-                        rtl8168_rx_interrupt(dev, tp, &tp->rx_ringmessage_id, &budget);
-#else
-                        rtl8168_rx_interrupt(dev, tp, &tp->rx_ringmessage_id, budget);
-#endif	//LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
-                }
-
-                rtl8168_enable_interrupt_by_vector(tp, message_id);
-#endif
-
-        } while (false);
-
-        return IRQ_HANDLED;
-}
-
 #ifdef CONFIG_R8168_NAPI
-static int rtl8168_poll_vector(napi_ptr napi, napi_budget budget, bool all_rx_q)
+static int rtl8168_poll(napi_ptr napi, napi_budget budget)
 {
-        struct r8168_napi *r8168napi = RTL_GET_PRIV(napi, struct r8168_napi);
-        struct rtl8168_private *tp = r8168napi->priv;
-        const int message_id = r8168napi->index;
+        struct rtl8168_private *tp = RTL_GET_PRIV(napi, struct rtl8168_private);
+        void __iomem *ioaddr = tp->mmio_addr;
         RTL_GET_NETDEV(tp)
         unsigned int work_to_do = RTL_NAPI_QUOTA(budget, dev);
-        unsigned int work_done = 0;
-        int i;
+        unsigned int work_done;
+        unsigned long flags;
 
-        if (message_id == 0)
-                rtl8168_tx_all_interrupt(tp, budget);
+        work_done = rtl8168_rx_interrupt(dev, tp, ioaddr, budget);
 
-        if (all_rx_q)
-                for (i = 0; i < tp->num_hw_tot_en_rx_rings; i++)
-                        work_done += rtl8168_rx_interrupt(dev, tp, &tp->rx_ringi, budget);
-        else
-                work_done += rtl8168_rx_interrupt(dev, tp, &tp->rx_ringmessage_id, budget);
+        spin_lock_irqsave(&tp->lock, flags);
+        rtl8168_tx_interrupt(dev, tp, ioaddr);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         RTL_NAPI_QUOTA_UPDATE(dev, work_done, budget);
 
         if (work_done < work_to_do) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
-                if (RTL_NETIF_RX_COMPLETE(dev, napi, work_done) == FALSE)
-                        return RTL_NAPI_RETURN_VALUE;
-#else
-                RTL_NETIF_RX_COMPLETE(dev, napi, work_done);
-#endif
-                /*
-                 * 20040426: the barrier is not strictly required but the
-                 * behavior of the irq handler could be less predictable
-                 * without it. Btw, the lack of flush for the posted pci
-                 * write is safe - FR
-                 */
-                smp_wmb();
-                //if (message_id == 0)
-                //        rtl8168_switch_to_timer_interrupt(tp);
-                //else
-                rtl8168_enable_interrupt_by_vector(tp, message_id);
-        }
-
-        return RTL_NAPI_RETURN_VALUE;
-}
-
-static int rtl8168_poll(napi_ptr napi, napi_budget budget)
-{
-        return rtl8168_poll_vector(napi, budget, 1);
-}
-
-static int rtl8168_poll_msix_ring(napi_ptr napi, napi_budget budget)
-{
-        return rtl8168_poll_vector(napi, budget, 0);
-}
-static int rtl8168_poll_msix_rx(napi_ptr napi, napi_budget budget)
-{
-        struct r8168_napi *r8168napi = RTL_GET_PRIV(napi, struct r8168_napi);
-        struct rtl8168_private *tp = r8168napi->priv;
-        const int message_id = r8168napi->index;
-        RTL_GET_NETDEV(tp)
-        unsigned int work_to_do = RTL_NAPI_QUOTA(budget, dev);
-        unsigned int work_done = 0;
-
-        work_done += rtl8168_rx_interrupt(dev, tp, &tp->rx_ringmessage_id, budget);
+#ifdef ENABLE_DASH_SUPPORT
+                if ( tp->DASH ) {
+                        struct net_device *dev = tp->dev;
 
-        RTL_NAPI_QUOTA_UPDATE(dev, work_done, budget);
+                        spin_lock_irqsave(&tp->lock, flags);
+                        HandleDashInterrupt(dev);
+                        spin_unlock_irqrestore(&tp->lock, flags);
+                }
+#endif
 
-        if (work_done < work_to_do) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
-                if (RTL_NETIF_RX_COMPLETE(dev, napi, work_done) == FALSE)
-                        return RTL_NAPI_RETURN_VALUE;
+                if (RTL_NETIF_RX_COMPLETE(dev, napi, work_done) == FALSE) return RTL_NAPI_RETURN_VALUE;
 #else
                 RTL_NETIF_RX_COMPLETE(dev, napi, work_done);
 #endif
@@ -31931,10 +28715,8 @@
                  * write is safe - FR
                  */
                 smp_wmb();
-                //if (message_id == 0)
-                //        rtl8168_switch_to_timer_interrupt(tp);
-                //else
-                rtl8168_enable_interrupt_by_vector(tp, message_id);
+
+                rtl8168_switch_to_timer_interrupt(tp, ioaddr);
         }
 
         return RTL_NAPI_RETURN_VALUE;
@@ -31944,81 +28726,105 @@
 static void rtl8168_sleep_rx_enable(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
-
-        if (tp->wol_enabled != WOL_ENABLED)
-                return;
+        void __iomem *ioaddr = tp->mmio_addr;
 
         if ((tp->mcfg == CFG_METHOD_1) || (tp->mcfg == CFG_METHOD_2)) {
-                RTL_W8(tp, ChipCmd, CmdReset);
+                RTL_W8(ChipCmd, CmdReset);
                 rtl8168_rx_desc_offset0_init(tp, 0);
-                RTL_W8(tp, ChipCmd, CmdRxEnb);
+                RTL_W8(ChipCmd, CmdRxEnb);
         } else if (tp->mcfg == CFG_METHOD_14 || tp->mcfg == CFG_METHOD_15) {
-                rtl8168_ephy_write(tp, 0x19, 0xFF64);
-                RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) | AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
+                rtl8168_ephy_write(ioaddr, 0x19, 0xFF64);
+                RTL_W32(RxConfig, RTL_R32(RxConfig) | AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
         }
 }
 
 static void rtl8168_down(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
 
-        //rtl8168_delete_esd_timer(dev, &tp->esd_timer);
-        //rtl8168_delete_link_timer(dev, &tp->link_timer);
+        rtl8168_delete_esd_timer(dev, &tp->esd_timer);
 
-        netif_carrier_off(dev);
+        rtl8168_delete_link_timer(dev, &tp->link_timer);
+
+#ifdef CONFIG_R8168_NAPI
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+        RTL_NAPI_DISABLE(dev, &tp->napi);
+#endif
+#endif//CONFIG_R8168_NAPI
+
+        netif_stop_queue(dev);
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,11)
+        /* Give a racing hard_start_xmit a few cycles to complete. */
+        synchronize_rcu();  /* FIXME: should this be synchronize_irq()? */
+#endif
 
-        netif_tx_disable(dev);
+        spin_lock_irqsave(&tp->lock, flags);
+
+        netif_carrier_off(dev);
 
-        _rtl8168_wait_for_quiescence(dev);
+        rtl8168_dsm(dev, DSM_IF_DOWN);
 
         rtl8168_hw_reset(dev);
 
-        rtl8168_tx_clear(tp);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
-        rtl8168_rx_clear(tp);
-}
+        synchronize_irq(dev->irq);
 
-static int rtl8168_resource_freed(struct rtl8168_private *tp)
-{
-        int i;
+        spin_lock_irqsave(&tp->lock, flags);
 
-        for (i = 0; i < tp->num_tx_rings; i++)
-                if (tp->tx_ringi.TxDescArray)
-                        return 0;
+        rtl8168_tx_clear(tp);
 
-        if (tp->RxDescArray)
-                return 0;
+        rtl8168_rx_clear(tp);
+
+        rtl8168_sleep_rx_enable(dev);
 
-        return 1;
+        spin_unlock_irqrestore(&tp->lock, flags);
 }
 
-int rtl8168_close(struct net_device *dev)
+static int rtl8168_close(struct net_device *dev)
 {
         struct rtl8168_private *tp = netdev_priv(dev);
+        struct pci_dev *pdev = tp->pci_dev;
+        unsigned long flags;
 
-        if (!rtl8168_resource_freed(tp)) {
-                set_bit(R8168_FLAG_DOWN, tp->task_flags);
+        if (tp->TxDescArray!=NULL && tp->RxDescArray!=NULL) {
+                rtl8168_cancel_schedule_work(dev);
 
                 rtl8168_down(dev);
 
-                pci_clear_master(tp->pci_dev);
+                spin_lock_irqsave(&tp->lock, flags);
 
                 rtl8168_hw_d3_para(dev);
 
                 rtl8168_powerdown_pll(dev);
 
-                rtl8168_sleep_rx_enable(dev);
+                spin_unlock_irqrestore(&tp->lock, flags);
+
+                free_irq(dev->irq, dev);
 
-                rtl8168_free_irq(tp);
+                pci_free_consistent(pdev, R8168_RX_RING_BYTES, tp->RxDescArray,
+                                    tp->RxPhyAddr);
+                pci_free_consistent(pdev, R8168_TX_RING_BYTES, tp->TxDescArray,
+                                    tp->TxPhyAddr);
+                tp->TxDescArray = NULL;
+                tp->RxDescArray = NULL;
 
-                rtl8168_free_alloc_resources(tp);
+                if (tp->ShortPacketEmptyBuffer != NULL) {
+                        pci_free_consistent(pdev, SHORT_PACKET_PADDING_BUF_SIZE, tp->ShortPacketEmptyBuffer,
+                                            tp->ShortPacketEmptyBufferPhy);
+                        tp->ShortPacketEmptyBuffer = NULL;
+                }
         } else {
+                spin_lock_irqsave(&tp->lock, flags);
+
                 rtl8168_hw_d3_para(dev);
 
                 rtl8168_powerdown_pll(dev);
-        }
 
-        rtl8168_dsm(dev, DSM_IF_DOWN);
+                spin_unlock_irqrestore(&tp->lock, flags);
+        }
 
         return 0;
 }
@@ -32029,9 +28835,7 @@
         struct net_device *dev = pci_get_drvdata(pdev);
         struct rtl8168_private *tp = netdev_priv(dev);
 
-        rtnl_lock();
-
-        if (HW_DASH_SUPPORT_DASH(tp))
+        if (tp->DASH)
                 rtl8168_driver_stop(tp);
 
         rtl8168_set_bios_setting(dev);
@@ -32039,7 +28843,7 @@
                 rtl8168_rar_set(tp, tp->org_mac_addr);
 
 #ifdef ENABLE_FIBER_SUPPORT
-        rtl8168_hw_fiber_nic_d3_para(tp);
+        rtl8168_hw_fiber_nic_d3_para(dev);
 #endif  //ENABLE_FIBER_SUPPORT
 
         if (s5wol == 0)
@@ -32047,15 +28851,6 @@
 
         rtl8168_close(dev);
         rtl8168_disable_msi(pdev, tp);
-
-        rtnl_unlock();
-
-        if (system_state == SYSTEM_POWER_OFF) {
-                pci_clear_master(tp->pci_dev);
-                rtl8168_sleep_rx_enable(dev);
-                pci_wake_from_d3(pdev, tp->wol_enabled);
-                pci_set_power_state(pdev, PCI_D3hot);
-        }
 }
 #endif
 
@@ -32071,6 +28866,11 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
         struct rtl8168_private *tp = netdev_priv(dev);
 #endif
+        if (netif_running(dev)) {
+//      spin_lock_irqsave(&tp->lock, flags);
+//      spin_unlock_irqrestore(&tp->lock, flags);
+        }
+
         return &RTLDEV->stats;
 }
 
@@ -32079,104 +28879,80 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
 static int
 rtl8168_suspend(struct pci_dev *pdev, u32 state)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
-static int
-rtl8168_suspend(struct device *device)
 #else
 static int
 rtl8168_suspend(struct pci_dev *pdev, pm_message_t state)
 #endif
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
-        struct pci_dev *pdev = to_pci_dev(device);
-#endif
         struct net_device *dev = pci_get_drvdata(pdev);
         struct rtl8168_private *tp = netdev_priv(dev);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
         u32 pci_pm_state = pci_choose_state(pdev, state);
 #endif
+        unsigned long flags;
+
         if (!netif_running(dev))
                 goto out;
 
-        //rtl8168_cancel_schedule_work(dev);
+        rtl8168_cancel_schedule_work(dev);
 
-        //rtl8168_delete_esd_timer(dev, &tp->esd_timer);
+        rtl8168_delete_esd_timer(dev, &tp->esd_timer);
 
-        //rtl8168_delete_link_timer(dev, &tp->link_timer);
+        rtl8168_delete_link_timer(dev, &tp->link_timer);
 
-        rtnl_lock();
-
-        set_bit(R8168_FLAG_DOWN, tp->task_flags);
+        netif_stop_queue(dev);
 
         netif_carrier_off(dev);
 
-        netif_tx_disable(dev);
-
         netif_device_detach(dev);
 
+        spin_lock_irqsave(&tp->lock, flags);
+
         rtl8168_dsm(dev, DSM_NIC_GOTO_D3);
 
         rtl8168_hw_reset(dev);
 
-        pci_clear_master(pdev);
+        rtl8168_sleep_rx_enable(dev);
 
         rtl8168_hw_d3_para(dev);
 
 #ifdef ENABLE_FIBER_SUPPORT
-        rtl8168_hw_fiber_nic_d3_para(tp);
+        rtl8168_hw_fiber_nic_d3_para(dev);
 #endif  //ENABLE_FIBER_SUPPORT
 
         rtl8168_powerdown_pll(dev);
 
-        rtl8168_sleep_rx_enable(dev);
-
-        rtnl_unlock();
+        spin_unlock_irqrestore(&tp->lock, flags);
 
 out:
-        if (HW_DASH_SUPPORT_DASH(tp))
+        if (tp->DASH) {
+                spin_lock_irqsave(&tp->lock, flags);
                 rtl8168_driver_stop(tp);
-
-        pci_disable_device(pdev);
+                spin_unlock_irqrestore(&tp->lock, flags);
+        }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
         pci_save_state(pdev, &pci_pm_state);
 #else
         pci_save_state(pdev);
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
         pci_enable_wake(pdev, pci_choose_state(pdev, state), tp->wol_enabled);
-#endif
-
-        pci_prepare_to_sleep(pdev);
+//  pci_set_power_state(pdev, pci_choose_state(pdev, state));
 
         return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
 static int
 rtl8168_resume(struct pci_dev *pdev)
-#else
-static int
-rtl8168_resume(struct device *device)
-#endif
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
-        struct pci_dev *pdev = to_pci_dev(device);
-#endif
         struct net_device *dev = pci_get_drvdata(pdev);
         struct rtl8168_private *tp = netdev_priv(dev);
+        unsigned long flags;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
         u32 pci_pm_state = PCI_D0;
 #endif
-        int err;
 
-        rtnl_lock();
-
-        err = pci_enable_device(pdev);
-        if (err) {
-                dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n");
-                goto out_unlock;
-        }
+        pci_set_power_state(pdev, PCI_D0);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
         pci_restore_state(pdev, &pci_pm_state);
 #else
@@ -32184,16 +28960,23 @@
 #endif
         pci_enable_wake(pdev, PCI_D0, 0);
 
+        spin_lock_irqsave(&tp->lock, flags);
+
         /* restore last modified mac address */
         rtl8168_rar_set(tp, dev->dev_addr);
 
+        spin_unlock_irqrestore(&tp->lock, flags);
+
         if (!netif_running(dev)) {
-                if (HW_DASH_SUPPORT_DASH(tp))
+                if (tp->DASH) {
+                        spin_lock_irqsave(&tp->lock, flags);
                         rtl8168_driver_start(tp);
-                goto out_unlock;
+                        spin_unlock_irqrestore(&tp->lock, flags);
+                }
+                goto out;
         }
 
-        pci_set_master(pdev);
+        spin_lock_irqsave(&tp->lock, flags);
 
         rtl8168_exit_oob(dev);
 
@@ -32207,45 +28990,18 @@
 
         rtl8168_hw_phy_config(dev);
 
-        rtl8168_hw_config(dev);
-
-        clear_bit(R8168_FLAG_DOWN, tp->task_flags);
-
-        rtl8168_schedule_reset_work(tp);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
-        rtl8168_schedule_esd_work(tp);
+        rtl8168_schedule_work(dev, rtl8168_reset_task);
 
-        rtl8168_schedule_linkchg_work(tp);
-
-        //mod_timer(&tp->esd_timer, jiffies + RTL8168_ESD_TIMEOUT);
-        //mod_timer(&tp->link_timer, jiffies + RTL8168_LINK_TIMEOUT);
-out_unlock:
         netif_device_attach(dev);
 
-        rtnl_unlock();
-
-        return err;
+        mod_timer(&tp->esd_timer, jiffies + RTL8168_ESD_TIMEOUT);
+        mod_timer(&tp->link_timer, jiffies + RTL8168_LINK_TIMEOUT);
+out:
+        return 0;
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
-
-static struct dev_pm_ops rtl8168_pm_ops = {
-        .suspend = rtl8168_suspend,
-        .resume = rtl8168_resume,
-        .freeze = rtl8168_suspend,
-        .thaw = rtl8168_resume,
-        .poweroff = rtl8168_suspend,
-        .restore = rtl8168_resume,
-};
-
-#define RTL8168_PM_OPS (&rtl8168_pm_ops)
-
-#endif
-
-#else /* !CONFIG_PM */
-
-#define RTL8168_PM_OPS NULL
-
 #endif /* CONFIG_PM */
 
 static struct pci_driver rtl8168_pci_driver = {
@@ -32257,13 +29013,9 @@
         .shutdown   = rtl8168_shutdown,
 #endif
 #ifdef CONFIG_PM
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
         .suspend    = rtl8168_suspend,
         .resume     = rtl8168_resume,
-#else /* CONFIG_PM */
-        .driver.pm  = RTL8168_PM_OPS,
 #endif
-#endif /* CONFIG_PM */
 };
 
 static int __init

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

r8168-8.053.00.tar.gz/src/rtl_eeprom.c -> r8168-8.047.04.tar.bz2/src/rtl_eeprom.c Changed

r8168-8.053.00.tar.gz/src/rtl_eeprom.h -> r8168-8.047.04.tar.bz2/src/rtl_eeprom.h Changed

r8168-8.053.00.tar.gz/src/rtltool.c -> r8168-8.047.04.tar.bz2/src/rtltool.c Changed

r8168-8.053.00.tar.gz/src/rtltool.h -> r8168-8.047.04.tar.bz2/src/rtltool.h Changed

r8168-8.053.00.tar.gz.asc Deleted

r8168-8.053.00.tar.gz/src/r8168_firmware.c Deleted

@@ -1,264 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
-################################################################################
-#
-# r8168 is the Linux device driver released for Realtek Gigabit Ethernet
-# controllers with PCI-Express interface.
-#
-# Copyright(c) 2024 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
-# Software Foundation; either version 2 of the License, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# Author:
-# Realtek NIC software team <nicfae@realtek.com>
-# No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300, Taiwan
-#
-################################################################################
-*/
-
-/************************************************************************************
- *  This product is covered by one or more of the following patents:
- *  US6,570,884, US6,115,776, and US6,327,625.
- ***********************************************************************************/
-
-#include <linux/version.h>
-#include <linux/delay.h>
-#include <linux/firmware.h>
-
-#include "r8168_firmware.h"
-
-enum rtl_fw_opcode {
-        PHY_READ		= 0x0,
-        PHY_DATA_OR		= 0x1,
-        PHY_DATA_AND		= 0x2,
-        PHY_BJMPN		= 0x3,
-        PHY_MDIO_CHG		= 0x4,
-        PHY_CLEAR_READCOUNT	= 0x7,
-        PHY_WRITE		= 0x8,
-        PHY_READCOUNT_EQ_SKIP	= 0x9,
-        PHY_COMP_EQ_SKIPN	= 0xa,
-        PHY_COMP_NEQ_SKIPN	= 0xb,
-        PHY_WRITE_PREVIOUS	= 0xc,
-        PHY_SKIPN		= 0xd,
-        PHY_DELAY_MS		= 0xe,
-};
-
-struct fw_info {
-        u32	magic;
-        char	versionRTL8168_VER_SIZE;
-        __le32	fw_start;
-        __le32	fw_len;
-        u8	chksum;
-} __packed;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,16,0)
-#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER))
-#endif
-#define FW_OPCODE_SIZE sizeof_field(struct rtl8168_fw_phy_action, code0)
-
-static bool rtl8168_fw_format_ok(struct rtl8168_fw *rtl_fw)
-{
-        const struct firmware *fw = rtl_fw->fw;
-        struct fw_info *fw_info = (struct fw_info *)fw->data;
-        struct rtl8168_fw_phy_action *pa = &rtl_fw->phy_action;
-
-        if (fw->size < FW_OPCODE_SIZE)
-                return false;
-
-        if (!fw_info->magic) {
-                size_t i, size, start;
-                u8 checksum = 0;
-
-                if (fw->size < sizeof(*fw_info))
-                        return false;
-
-                for (i = 0; i < fw->size; i++)
-                        checksum += fw->datai;
-                if (checksum != 0)
-                        return false;
-
-                start = le32_to_cpu(fw_info->fw_start);
-                if (start > fw->size)
-                        return false;
-
-                size = le32_to_cpu(fw_info->fw_len);
-                if (size > (fw->size - start) / FW_OPCODE_SIZE)
-                        return false;
-
-                strscpy(rtl_fw->version, fw_info->version, RTL8168_VER_SIZE);
-
-                pa->code = (__le32 *)(fw->data + start);
-                pa->size = size;
-        } else {
-                if (fw->size % FW_OPCODE_SIZE)
-                        return false;
-
-                strscpy(rtl_fw->version, rtl_fw->fw_name, RTL8168_VER_SIZE);
-
-                pa->code = (__le32 *)fw->data;
-                pa->size = fw->size / FW_OPCODE_SIZE;
-        }
-
-        return true;
-}
-
-static bool rtl8168_fw_data_ok(struct rtl8168_fw *rtl_fw)
-{
-        struct rtl8168_fw_phy_action *pa = &rtl_fw->phy_action;
-        size_t index;
-
-        for (index = 0; index < pa->size; index++) {
-                u32 action = le32_to_cpu(pa->codeindex);
-                u32 val = action & 0x0000ffff;
-                u32 regno = (action & 0x0fff0000) >> 16;
-
-                switch (action >> 28) {
-                case PHY_READ:
-                case PHY_DATA_OR:
-                case PHY_DATA_AND:
-                case PHY_CLEAR_READCOUNT:
-                case PHY_WRITE:
-                case PHY_WRITE_PREVIOUS:
-                case PHY_DELAY_MS:
-                        break;
-
-                case PHY_MDIO_CHG:
-                        if (val > 1)
-                                goto out;
-                        break;
-
-                case PHY_BJMPN:
-                        if (regno > index)
-                                goto out;
-                        break;
-                case PHY_READCOUNT_EQ_SKIP:
-                        if (index + 2 >= pa->size)
-                                goto out;
-                        break;
-                case PHY_COMP_EQ_SKIPN:
-                case PHY_COMP_NEQ_SKIPN:
-                case PHY_SKIPN:
-                        if (index + 1 + regno >= pa->size)
-                                goto out;
-                        break;
-
-                default:
-                        dev_err(rtl_fw->dev, "Invalid action 0x%08x\n", action);
-                        return false;
-                }
-        }
-
-        return true;
-out:
-        dev_err(rtl_fw->dev, "Out of range of firmware\n");
-        return false;
-}
-
-void rtl8168_fw_write_firmware(struct rtl8168_private *tp, struct rtl8168_fw *rtl_fw)
-{
-        struct rtl8168_fw_phy_action *pa = &rtl_fw->phy_action;
-        rtl8168_fw_write_t fw_write = rtl_fw->phy_write;
-        rtl8168_fw_read_t fw_read = rtl_fw->phy_read;
-        int predata = 0, count = 0;
-        size_t index;
-
-        for (index = 0; index < pa->size; index++) {
-                u32 action = le32_to_cpu(pa->codeindex);
-                u32 data = action & 0x0000ffff;
-                u32 regno = (action & 0x0fff0000) >> 16;
-                enum rtl_fw_opcode opcode = action >> 28;
-
-                if (!action)
-                        break;
-
-                switch (opcode) {
-                case PHY_READ:
-                        predata = fw_read(tp, regno);
-                        count++;
-                        break;
-                case PHY_DATA_OR:
-                        predata |= data;
-                        break;
-                case PHY_DATA_AND:
-                        predata &= data;
-                        break;
-                case PHY_BJMPN:
-                        index -= (regno + 1);
-                        break;
-                case PHY_MDIO_CHG:
-                        if (data) {
-                                fw_write = rtl_fw->mac_mcu_write;
-                                fw_read = rtl_fw->mac_mcu_read;
-                        } else {
-                                fw_write = rtl_fw->phy_write;
-                                fw_read = rtl_fw->phy_read;
-                        }
-
-                        break;
-                case PHY_CLEAR_READCOUNT:
-                        count = 0;
-                        break;
-                case PHY_WRITE:
-                        fw_write(tp, regno, data);
-                        break;
-                case PHY_READCOUNT_EQ_SKIP:
-                        if (count == data)
-                                index++;
-                        break;
-                case PHY_COMP_EQ_SKIPN:
-                        if (predata == data)
-                                index += regno;
-                        break;
-                case PHY_COMP_NEQ_SKIPN:
-                        if (predata != data)
-                                index += regno;
-                        break;
-                case PHY_WRITE_PREVIOUS:
-                        fw_write(tp, regno, predata);
-                        break;
-                case PHY_SKIPN:
-                        index += regno;
-                        break;
-                case PHY_DELAY_MS:
-                        mdelay(data);
-                        break;
-                }
-        }
-}
-
-void rtl8168_fw_release_firmware(struct rtl8168_fw *rtl_fw)
-{
-        release_firmware(rtl_fw->fw);
-}
-
-int rtl8168_fw_request_firmware(struct rtl8168_fw *rtl_fw)
-{
-        int rc;
-
-        rc = request_firmware(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
-        if (rc < 0)
-                goto out;
-
-        if (!rtl8168_fw_format_ok(rtl_fw) || !rtl8168_fw_data_ok(rtl_fw)) {
-                release_firmware(rtl_fw->fw);
-                rc = -EINVAL;
-                goto out;
-        }
-
-        return 0;
-out:
-        dev_err(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
-                rtl_fw->fw_name, rc);
-        return rc;
-}

r8168-8.053.00.tar.gz/src/r8168_firmware.h Deleted

@@ -1,68 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
-################################################################################
-#
-# r8168 is the Linux device driver released for Realtek 2.5Gigabit Ethernet
-# controllers with PCI-Express interface.
-#
-# Copyright(c) 2024 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
-# Software Foundation; either version 2 of the License, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# Author:
-# Realtek NIC software team <nicfae@realtek.com>
-# No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300, Taiwan
-#
-################################################################################
-*/
-
-/************************************************************************************
- *  This product is covered by one or more of the following patents:
- *  US6,570,884, US6,115,776, and US6,327,625.
- ***********************************************************************************/
-
-#ifndef _LINUX_RTL8168_FIRMWARE_H
-#define _LINUX_RTL8168_FIRMWARE_H
-
-#include <linux/device.h>
-#include <linux/firmware.h>
-
-struct rtl8168_private;
-typedef void (*rtl8168_fw_write_t)(struct rtl8168_private *tp, u16 reg, u16 val);
-typedef u32 (*rtl8168_fw_read_t)(struct rtl8168_private *tp, u16 reg);
-
-#define RTL8168_VER_SIZE		32
-
-struct rtl8168_fw {
-        rtl8168_fw_write_t phy_write;
-        rtl8168_fw_read_t phy_read;
-        rtl8168_fw_write_t mac_mcu_write;
-        rtl8168_fw_read_t mac_mcu_read;
-        const struct firmware *fw;
-        const char *fw_name;
-        struct device *dev;
-
-        char versionRTL8168_VER_SIZE;
-
-        struct rtl8168_fw_phy_action {
-                __le32 *code;
-                size_t size;
-        } phy_action;
-};
-
-int rtl8168_fw_request_firmware(struct rtl8168_fw *rtl_fw);
-void rtl8168_fw_release_firmware(struct rtl8168_fw *rtl_fw);
-void rtl8168_fw_write_firmware(struct rtl8168_private *tp, struct rtl8168_fw *rtl_fw);
-
-#endif /* _LINUX_RTL8168_FIRMWARE_H */

r8168-8.053.00.tar.gz/src/r8168_rss.c Deleted

@@ -1,500 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
-################################################################################
-#
-# r8168 is the Linux device driver released for Realtek Gigabit Ethernet
-# controllers with PCI-Express interface.
-#
-# Copyright(c) 2024 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
-# Software Foundation; either version 2 of the License, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# Author:
-# Realtek NIC software team <nicfae@realtek.com>
-# No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300, Taiwan
-#
-################################################################################
-*/
-
-/************************************************************************************
- *  This product is covered by one or more of the following patents:
- *  US6,570,884, US6,115,776, and US6,327,625.
- ***********************************************************************************/
-
-#include <linux/version.h>
-#include "r8168.h"
-
-enum rtl8168_rss_register_content {
-        /* RSS */
-        RSS_CTRL_TCP_IPV4_SUPP = (1 << 0),
-        RSS_CTRL_IPV4_SUPP  = (1 << 1),
-        RSS_CTRL_TCP_IPV6_SUPP  = (1 << 2),
-        RSS_CTRL_IPV6_SUPP  = (1 << 3),
-        RSS_CTRL_IPV6_EXT_SUPP  = (1 << 4),
-        RSS_CTRL_TCP_IPV6_EXT_SUPP  = (1 << 5),
-        RSS_HALF_SUPP  = (1 << 7),
-        RSS_QUAD_CPU_EN  = (1 << 16),
-        RSS_HQ_Q_SUP_R  = (1 << 31),
-};
-
-static int rtl8168_get_rss_hash_opts(struct rtl8168_private *tp,
-                                     struct ethtool_rxnfc *cmd)
-{
-        cmd->data = 0;
-
-        /* Report default options for RSS */
-        switch (cmd->flow_type) {
-        case TCP_V4_FLOW:
-                cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
-                fallthrough;
-        case IPV4_FLOW:
-                cmd->data |= RXH_IP_SRC | RXH_IP_DST;
-                break;
-        case TCP_V6_FLOW:
-                cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;
-                fallthrough;
-        case IPV6_FLOW:
-                cmd->data |= RXH_IP_SRC | RXH_IP_DST;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-int rtl8168_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
-                      u32 *rule_locs)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        int ret = -EOPNOTSUPP;
-
-        netif_info(tp, drv, tp->dev, "rss get rxnfc\n");
-
-        if (!(dev->features & NETIF_F_RXHASH))
-                return ret;
-
-        switch (cmd->cmd) {
-        case ETHTOOL_GRXRINGS:
-                cmd->data = rtl8168_tot_rx_rings(tp);
-                ret = 0;
-                break;
-        case ETHTOOL_GRXFH:
-                ret = rtl8168_get_rss_hash_opts(tp, cmd);
-                break;
-        default:
-                break;
-        }
-
-        return ret;
-}
-
-u32 rtl8168_rss_indir_tbl_entries(struct rtl8168_private *tp)
-{
-        return tp->HwSuppIndirTblEntries;
-}
-
-#define RSS_MASK_BITS_OFFSET (8)
-static int _rtl8168_set_rss_hash_opt(struct rtl8168_private *tp)
-{
-        u32 hash_mask_len;
-        u32 rss_ctrl;
-
-        /* Perform hash on these packet types */
-        rss_ctrl = RSS_CTRL_TCP_IPV4_SUPP
-                   | RSS_CTRL_IPV4_SUPP
-                   | RSS_CTRL_IPV6_SUPP
-                   | RSS_CTRL_IPV6_EXT_SUPP
-                   | RSS_CTRL_TCP_IPV6_SUPP
-                   | RSS_CTRL_TCP_IPV6_EXT_SUPP;
-
-        if (R8168_MULTI_RSS_4Q(tp))
-                rss_ctrl |= RSS_QUAD_CPU_EN;
-
-        hash_mask_len = ilog2(rtl8168_rss_indir_tbl_entries(tp));
-        hash_mask_len &= (BIT_0 | BIT_1 | BIT_2);
-        rss_ctrl |= hash_mask_len << RSS_MASK_BITS_OFFSET;
-
-        rtl8168_eri_write(tp, RSS_CTRL_8168, 4, rss_ctrl, ERIAR_ExGMAC);
-
-        return 0;
-}
-
-static int rtl8168_set_rss_hash_opt(struct rtl8168_private *tp,
-                                    struct ethtool_rxnfc *nfc)
-{
-        u32 rss_flags = tp->rss_flags;
-
-        netif_info(tp, drv, tp->dev, "rss set hash\n");
-
-        /*
-         * RSS does not support anything other than hashing
-         * to queues on src and dst IPs and ports
-         */
-        if (nfc->data & ~(RXH_IP_SRC | RXH_IP_DST |
-                          RXH_L4_B_0_1 | RXH_L4_B_2_3))
-                return -EINVAL;
-
-        switch (nfc->flow_type) {
-        case TCP_V4_FLOW:
-        case TCP_V6_FLOW:
-                if (!(nfc->data & RXH_IP_SRC) ||
-                    !(nfc->data & RXH_IP_DST) ||
-                    !(nfc->data & RXH_L4_B_0_1) ||
-                    !(nfc->data & RXH_L4_B_2_3))
-                        return -EINVAL;
-                break;
-        case SCTP_V4_FLOW:
-        case AH_ESP_V4_FLOW:
-        case AH_V4_FLOW:
-        case ESP_V4_FLOW:
-        case SCTP_V6_FLOW:
-        case AH_ESP_V6_FLOW:
-        case AH_V6_FLOW:
-        case ESP_V6_FLOW:
-        case IP_USER_FLOW:
-        case ETHER_FLOW:
-                /* RSS is not supported for these protocols */
-                if (nfc->data) {
-                        netif_err(tp, drv, tp->dev, "Command parameters not supported\n");
-                        return -EINVAL;
-                }
-                return 0;
-        default:
-                return -EINVAL;
-        }
-
-        /* if we changed something we need to update flags */
-        if (rss_flags != tp->rss_flags) {
-                u32 rss_ctrl = rtl8168_eri_read(tp, RSS_CTRL_8168, 4, ERIAR_ExGMAC);
-
-                tp->rss_flags = rss_flags;
-
-                /* Perform hash on these packet types */
-                rss_ctrl |= RSS_CTRL_TCP_IPV4_SUPP
-                            | RSS_CTRL_IPV4_SUPP
-                            | RSS_CTRL_IPV6_SUPP
-                            | RSS_CTRL_IPV6_EXT_SUPP
-                            | RSS_CTRL_TCP_IPV6_SUPP
-                            | RSS_CTRL_TCP_IPV6_EXT_SUPP;
-
-                if (R8168_MULTI_RSS_4Q(tp))
-                        rss_ctrl |= RSS_QUAD_CPU_EN;
-                else
-                        rss_ctrl &= ~RSS_QUAD_CPU_EN;
-
-                rtl8168_eri_write(tp, RSS_CTRL_8168, 4, rss_ctrl, ERIAR_ExGMAC);
-        }
-
-        return 0;
-}
-
-int rtl8168_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        int ret = -EOPNOTSUPP;
-
-        netif_info(tp, drv, tp->dev, "rss set rxnfc\n");
-
-        if (!(dev->features & NETIF_F_RXHASH))
-                return ret;
-
-        switch (cmd->cmd) {
-        case ETHTOOL_SRXFH:
-                ret = rtl8168_set_rss_hash_opt(tp, cmd);
-                break;
-        default:
-                break;
-        }
-
-        return ret;
-}
-
-static u32 _rtl8168_get_rxfh_key_size(struct rtl8168_private *tp)
-{
-        return sizeof(tp->rss_key);
-}
-
-u32 rtl8168_get_rxfh_key_size(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        netif_info(tp, drv, tp->dev, "rss get key size\n");
-
-        if (!(dev->features & NETIF_F_RXHASH))
-                return 0;
-
-        return _rtl8168_get_rxfh_key_size(tp);
-}
-
-u32 rtl8168_rss_indir_size(struct net_device *dev)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        netif_info(tp, drv, tp->dev, "rss get indir tbl size\n");
-
-        if (!(dev->features & NETIF_F_RXHASH))
-                return 0;
-
-        return rtl8168_rss_indir_tbl_entries(tp);
-}
-
-static void rtl8168_get_reta(struct rtl8168_private *tp, u32 *indir)
-{
-        int i, reta_size = rtl8168_rss_indir_tbl_entries(tp);
-
-        for (i = 0; i < reta_size; i++)
-                indiri = tp->rss_indir_tbli;
-}
-
-static u32 rtl8168_rss_key_reg(struct rtl8168_private *tp)
-{
-        return RSS_KEY_8168;
-}
-
-static u32 rtl8168_rss_indir_tbl_reg(struct rtl8168_private *tp)
-{
-        return Rss_indir_tbl;
-}
-
-static void rtl8168_store_reta(struct rtl8168_private *tp)
-{
-        u32 reta_entries = rtl8168_rss_indir_tbl_entries(tp);
-        u16 indir_tbl_reg = rtl8168_rss_indir_tbl_reg(tp);
-        u32 hw_indirRTL8168_RSS_INDIR_TBL_SIZE = {0};
-        u8 *indir = tp->rss_indir_tbl;
-        u32 bit_on_cnt = 0x00000001;
-        u32 i, j;
-
-        /* Mapping redirection table to HW */
-        for (i = 0, j = 0; i < reta_entries; i++) {
-                if ((indiri & 2) && R8168_MULTI_RSS_4Q(tp))
-                        hw_indirj + 4 |= bit_on_cnt;
-                if (indiri & 1)
-                        hw_indirj |= bit_on_cnt;
-
-                if (bit_on_cnt == 0x80000000) {
-                        bit_on_cnt = 0x00000001;
-                        j++;
-                        continue;
-                }
-                bit_on_cnt <<= 1;
-        }
-
-        /* Write redirection table to HW */
-        for (i = 0; i < RTL8168_RSS_INDIR_TBL_SIZE; i++)
-                RTL_W32(tp, indir_tbl_reg + i*4, hw_indiri);
-}
-
-static void rtl8168_store_rss_key(struct rtl8168_private *tp)
-{
-        const u16 rss_key_reg = rtl8168_rss_key_reg(tp);
-        u32 i, rss_key_size = _rtl8168_get_rxfh_key_size(tp);
-        u32 *rss_key = (u32*)tp->rss_key;
-
-        /* Write redirection table to HW */
-        for (i = 0; i < rss_key_size; i+=4)
-                rtl8168_eri_write(tp, rss_key_reg + i, 4, *rss_key++, ERIAR_ExGMAC);
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0)
-int rtl8168_get_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxfh)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        netif_info(tp, drv, tp->dev, "rss get rxfh\n");
-
-        if (!(dev->features & NETIF_F_RXHASH))
-                return -EOPNOTSUPP;
-
-        rxfh->hfunc = ETH_RSS_HASH_TOP;
-
-        if (rxfh->indir)
-                rtl8168_get_reta(tp, rxfh->indir);
-
-        if (rxfh->key)
-                memcpy(rxfh->key, tp->rss_key, RTL8168_RSS_KEY_SIZE);
-
-        return 0;
-}
-
-int rtl8168_set_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxfh,
-                     struct netlink_ext_ack *extack)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        u32 reta_entries = rtl8168_rss_indir_tbl_entries(tp);
-        int i;
-
-        netif_info(tp, drv, tp->dev, "rss set rxfh\n");
-
-        /* We require at least one supported parameter to be changed and no
-         * change in any of the unsupported parameters
-         */
-        if (rxfh->hfunc != ETH_RSS_HASH_NO_CHANGE && rxfh->hfunc != ETH_RSS_HASH_TOP)
-                return -EOPNOTSUPP;
-
-        /* Fill out the redirection table */
-        if (rxfh->indir) {
-                int max_queues = tp->num_rx_rings;
-
-                /* Verify user input. */
-                for (i = 0; i < reta_entries; i++)
-                        if (rxfh->indiri >= max_queues)
-                                return -EINVAL;
-
-                for (i = 0; i < reta_entries; i++)
-                        tp->rss_indir_tbli = rxfh->indiri;
-        }
-
-        /* Fill out the rss hash key */
-        if (rxfh->key)
-                memcpy(tp->rss_key, rxfh->key, RTL8168_RSS_KEY_SIZE);
-
-        rtl8168_store_reta(tp);
-
-        rtl8168_store_rss_key(tp);
-
-        return 0;
-}
-#else
-int rtl8168_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,
-                     u8 *hfunc)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-
-        netif_info(tp, drv, tp->dev, "rss get rxfh\n");
-
-        if (!(dev->features & NETIF_F_RXHASH))
-                return -EOPNOTSUPP;
-
-        if (hfunc)
-                *hfunc = ETH_RSS_HASH_TOP;
-
-        if (indir)
-                rtl8168_get_reta(tp, indir);
-
-        if (key)
-                memcpy(key, tp->rss_key, RTL8168_RSS_KEY_SIZE);
-
-        return 0;
-}
-
-int rtl8168_set_rxfh(struct net_device *dev, const u32 *indir,
-                     const u8 *key, const u8 hfunc)
-{
-        struct rtl8168_private *tp = netdev_priv(dev);
-        u32 reta_entries = rtl8168_rss_indir_tbl_entries(tp);
-        int i;
-
-        netif_info(tp, drv, tp->dev, "rss set rxfh\n");
-
-        /* We require at least one supported parameter to be changed and no
-         * change in any of the unsupported parameters
-         */
-        if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
-                return -EOPNOTSUPP;
-
-        /* Fill out the redirection table */
-        if (indir) {
-                int max_queues = tp->num_rx_rings;
-
-                /* Verify user input. */
-                for (i = 0; i < reta_entries; i++)
-                        if (indiri >= max_queues)
-                                return -EINVAL;
-
-                for (i = 0; i < reta_entries; i++)
-                        tp->rss_indir_tbli = indiri;
-        }
-
-        /* Fill out the rss hash key */
-        if (key)
-                memcpy(tp->rss_key, key, RTL8168_RSS_KEY_SIZE);
-
-        rtl8168_store_reta(tp);
-
-        rtl8168_store_rss_key(tp);
-
-        return 0;
-}
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) */
-
-static u32 rtl8168_get_rx_desc_hash(struct rtl8168_private *tp,
-                                    struct RxDescV2 *desc)
-{
-        if (!desc->RSSResult)
-                udelay(1);
-        return le32_to_cpu(desc->RSSResult);
-}
-
-#define RXS_8168_RSS_IPV4 BIT(17)
-#define RXS_8168_RSS_IPV6 BIT(18)
-#define RXS_8168_RSS_TCP BIT(19)
-#define RTL8168_RXS_RSS_L3_TYPE_MASK (RXS_8168_RSS_IPV4 | RXS_8168_RSS_IPV6)
-#define RTL8168_RXS_RSS_L4_TYPE_MASK (RXS_8168_RSS_TCP)
-void rtl8168_rx_hash(struct rtl8168_private *tp,
-                     struct RxDescV2 *desc,
-                     struct sk_buff *skb)
-{
-        u32 rss_header_info;
-
-        if (!(tp->dev->features & NETIF_F_RXHASH))
-                return;
-
-        rss_header_info = le32_to_cpu(desc->opts2);
-
-        if (!(rss_header_info & RTL8168_RXS_RSS_L3_TYPE_MASK))
-                return;
-
-        skb_set_hash(skb, rtl8168_get_rx_desc_hash(tp, desc),
-                     (RTL8168_RXS_RSS_L4_TYPE_MASK & rss_header_info) ?
-                     PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3);
-}
-
-void rtl8168_disable_rss(struct rtl8168_private *tp)
-{
-        rtl8168_eri_write(tp, RSS_CTRL_8168, 4, 0x00000000, ERIAR_ExGMAC);
-}
-
-void _rtl8168_config_rss(struct rtl8168_private *tp)
-{
-        _rtl8168_set_rss_hash_opt(tp);
-
-        rtl8168_store_reta(tp);
-
-        rtl8168_store_rss_key(tp);
-}
-
-void rtl8168_config_rss(struct rtl8168_private *tp)
-{
-        if (!HW_RSS_SUPPORT_RSS(tp))
-                return;
-
-        if (!tp->EnableRss) {
-                rtl8168_disable_rss(tp);
-                return;
-        }
-
-        _rtl8168_config_rss(tp);
-}
-
-void rtl8168_init_rss(struct rtl8168_private *tp)
-{
-        int i;
-
-        for (i = 0; i < rtl8168_rss_indir_tbl_entries(tp); i++)
-                tp->rss_indir_tbli = ethtool_rxfh_indir_default(i, tp->num_rx_rings);
-
-        netdev_rss_key_fill(tp->rss_key, RTL8168_RSS_KEY_SIZE);
-}

r8168-8.053.00.tar.gz/src/r8168_rss.h Deleted

@@ -1,72 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
-################################################################################
-#
-# r8125 is the Linux device driver released for Realtek 2.5Gigabit Ethernet
-# controllers with PCI-Express interface.
-#
-# Copyright(c) 2024 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
-# Software Foundation; either version 2 of the License, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, see <http://www.gnu.org/licenses/>.
-#
-# Author:
-# Realtek NIC software team <nicfae@realtek.com>
-# No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300, Taiwan
-#
-################################################################################
-*/
-
-/************************************************************************************
- *  This product is covered by one or more of the following patents:
- *  US6,570,884, US6,115,776, and US6,327,625.
- ***********************************************************************************/
-
-#ifndef _LINUX_RTL8168_RSS_H
-#define _LINUX_RTL8168_RSS_H
-
-#include <linux/netdevice.h>
-#include <linux/types.h>
-
-#define RTL8168_RSS_INDIR_TBL_SIZE 8
-#define RTL8168_RSS_KEY_SIZE     40  /* size of RSS Hash Key in bytes */
-#define RTL8168_MAX_INDIRECTION_TABLE_ENTRIES 128
-
-struct rtl8168_private;
-struct RxDescV2;
-
-int rtl8168_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
-                      u32 *rule_locs);
-int rtl8168_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd);
-u32 rtl8168_get_rxfh_key_size(struct net_device *netdev);
-u32 rtl8168_rss_indir_size(struct net_device *netdev);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0)
-int rtl8168_get_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxfh);
-int rtl8168_set_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxfh,
-                     struct netlink_ext_ack *extack);
-#else
-int rtl8168_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,
-                     u8 *hfunc);
-int rtl8168_set_rxfh(struct net_device *netdev, const u32 *indir,
-                     const u8 *key, const u8 hfunc);
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0) */
-void rtl8168_rx_hash(struct rtl8168_private *tp,
-                     struct RxDescV2 *desc,
-                     struct sk_buff *skb);
-void _rtl8168_config_rss(struct rtl8168_private *tp);
-void rtl8168_config_rss(struct rtl8168_private *tp);
-void rtl8168_init_rss(struct rtl8168_private *tp);
-u32 rtl8168_rss_indir_tbl_entries(struct rtl8168_private *tp);
-void rtl8168_disable_rss(struct rtl8168_private *tp);
-
-#endif /* _LINUX_RTL8168_RSS_H */

r8168.keyring Deleted

@@ -1,19 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEWjorXBYJKwYBBAHaRw8BAQdAjGKRKfCsgqRDija1BdhFQyhl7v8ooFB9n0+B
-fFFwIUq0N01hc3NpbWlsaWFubyBUb3Jyb21lbyA8bWFzc2ltaWxpYW5vLnRvcnJv
-bWVvQGdtYWlsLmNvbT6I0AQTFggAeAIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIX
-gAUJEJ7XDhYhBAytqs9w9kxlThMbMRFnXHQ0Kd3vBQJjhKA5ORSAAAAAABAAIHBy
-b29mQGFyaWFkbmUuaWRodHRwczovL2Zvc3N0b2Rvbi5vcmcvQG10b3Jyb21lbwAK
-CRARZ1x0NCnd74sYAP9cd+GQFHYUdC8h5rinC8zlLfCSRmK4RmpynORvNUoHlwD/
-VHc1QKQygGJHkGUR/BzBwhvy9V8VFUXLHEkix/5EAgy4MwRaOiyTFgkrBgEEAdpH
-DwEBB0ALDo3UpmTEMnSfibzebWay/yHw5PQ3M6dikohuznLdD4h+BBgWCAAmAhsg
-FiEEDK2qz3D2TGVOExsxEWdcdDQp3e8FAmFzE3sFCRCe6GgACgkQEWdcdDQp3e+l
-MgEAqNJOWIvlmwvgDUnM49o9Xy+ev0ApfCcpd+M9Viv3HmwA/RFNVLW5Q3ClhUPd
-RHRSgOI/txQSMCX24h1R4g5Ck3kPuDgEWjorXBIKKwYBBAGXVQEFAQEHQG8U6zt8
-dY35U3jMoulSJrEfc2IawNGNum7hdNwGarUhAwEIB4h+BBgWCAAmAhsMFiEEDK2q
-z3D2TGVOExsxEWdcdDQp3e8FAmFzE3sFCRCe6Z8ACgkQEWdcdDQp3e/FnQD/ROjp
-SAtLo4A2PbQ9Awk4V/dW2iSGXT+c946xwd6v+toA/R3VhNaxQpVjqpwLYYhV2T+E
-8i1/tU0JWRZh4/DUvY0P
-=mnMt
------END PGP PUBLIC KEY BLOCK-----

Build Results
RPM Lint

Refresh

Comments for request 4597 0

Request History

bitstreamout created request about 5 years ago

- Update to new version 8.047.04

- Update to new version 8.047.01

olh declined request about 5 years ago

this pkg will do nothing without enough-build-resources for Kernel:Stable / Factory

bitstreamout superseded request about 5 years ago

superseded by 4601