From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH RFC 03/18] r8168: remove magic register handling used on MAC version 05 and 06 only Date: Thu, 21 Dec 2017 21:50:12 +0100 Message-ID: <7cb7c104-9789-08e0-f709-9e8a56eae9ce@gmail.com> References: <83321b2e-8402-26c5-9703-3fe795cc893d@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: David Miller , "netdev@vger.kernel.org" To: Andrew Lunn , Realtek linux nic maintainers , Chun-Hao Lin Return-path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:33664 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755712AbdLUUvG (ORCPT ); Thu, 21 Dec 2017 15:51:06 -0500 Received: by mail-wm0-f65.google.com with SMTP id g130so21867746wme.0 for ; Thu, 21 Dec 2017 12:51:06 -0800 (PST) In-Reply-To: <83321b2e-8402-26c5-9703-3fe795cc893d@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Remove magic register handling used on MAC version 05 and 06 only. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8168.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8168.c b/drivers/net/ethernet/realtek/r8168.c index 468085f56..a80b7ce80 100644 --- a/drivers/net/ethernet/realtek/r8168.c +++ b/drivers/net/ethernet/realtek/r8168.c @@ -5312,31 +5312,6 @@ static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz) RTL_W16(RxMaxSize, rx_buf_sz + 1); } -static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version) -{ - static const struct rtl_cfg2_info { - u32 mac_version; - u32 clk; - u32 val; - } cfg2_info [] = { - { RTL_GIGA_MAC_VER_05, PCI_Clock_33MHz, 0x000fff00 }, // 8110SCd - { RTL_GIGA_MAC_VER_05, PCI_Clock_66MHz, 0x000fffff }, - { RTL_GIGA_MAC_VER_06, PCI_Clock_33MHz, 0x00ffff00 }, // 8110SCe - { RTL_GIGA_MAC_VER_06, PCI_Clock_66MHz, 0x00ffffff } - }; - const struct rtl_cfg2_info *p = cfg2_info; - unsigned int i; - u32 clk; - - clk = RTL_R8(Config2) & PCI_Clock_66MHz; - for (i = 0; i < ARRAY_SIZE(cfg2_info); i++, p++) { - if ((p->mac_version == mac_version) && (p->clk == clk)) { - RTL_W32(0x7c, p->val); - break; - } - } -} - static void rtl_set_rx_mode(struct net_device *dev) { struct rtl8169_private *tp = netdev_priv(dev); @@ -5404,8 +5379,6 @@ static void rtl_hw_start_8169(struct net_device *dev) RTL_W16(CPlusCmd, tp->cp_cmd); - rtl8169_set_magic_reg(ioaddr, tp->mac_version); - /* * Undocumented corner. Supposedly: * (TxTimer << 12) | (TxPackets << 8) | (RxTimer << 4) | RxPackets -- 2.15.1