Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

r8169: add r8169.h

In preparation of factoring out PHY configuration to a separate source
file move commonly used definitions to new header file r8169.h.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Heiner Kallweit and committed by
David S. Miller
2992bdfa 1c5be5e9

+84 -64
+78
drivers/net/ethernet/realtek/r8169.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0-only */ 2 + /* r8169.h: RealTek 8169/8168/8101 ethernet driver. 3 + * 4 + * Copyright (c) 2002 ShuChen <shuchen@realtek.com.tw> 5 + * Copyright (c) 2003 - 2007 Francois Romieu <romieu@fr.zoreil.com> 6 + * Copyright (c) a lot of people too. Please respect their work. 7 + * 8 + * See MAINTAINERS file for support contact information. 9 + */ 10 + 11 + #include <linux/types.h> 12 + #include <linux/phy.h> 13 + 14 + enum mac_version { 15 + /* support for ancient RTL_GIGA_MAC_VER_01 has been removed */ 16 + RTL_GIGA_MAC_VER_02, 17 + RTL_GIGA_MAC_VER_03, 18 + RTL_GIGA_MAC_VER_04, 19 + RTL_GIGA_MAC_VER_05, 20 + RTL_GIGA_MAC_VER_06, 21 + RTL_GIGA_MAC_VER_07, 22 + RTL_GIGA_MAC_VER_08, 23 + RTL_GIGA_MAC_VER_09, 24 + RTL_GIGA_MAC_VER_10, 25 + RTL_GIGA_MAC_VER_11, 26 + RTL_GIGA_MAC_VER_12, 27 + RTL_GIGA_MAC_VER_13, 28 + RTL_GIGA_MAC_VER_14, 29 + RTL_GIGA_MAC_VER_15, 30 + RTL_GIGA_MAC_VER_16, 31 + RTL_GIGA_MAC_VER_17, 32 + RTL_GIGA_MAC_VER_18, 33 + RTL_GIGA_MAC_VER_19, 34 + RTL_GIGA_MAC_VER_20, 35 + RTL_GIGA_MAC_VER_21, 36 + RTL_GIGA_MAC_VER_22, 37 + RTL_GIGA_MAC_VER_23, 38 + RTL_GIGA_MAC_VER_24, 39 + RTL_GIGA_MAC_VER_25, 40 + RTL_GIGA_MAC_VER_26, 41 + RTL_GIGA_MAC_VER_27, 42 + RTL_GIGA_MAC_VER_28, 43 + RTL_GIGA_MAC_VER_29, 44 + RTL_GIGA_MAC_VER_30, 45 + RTL_GIGA_MAC_VER_31, 46 + RTL_GIGA_MAC_VER_32, 47 + RTL_GIGA_MAC_VER_33, 48 + RTL_GIGA_MAC_VER_34, 49 + RTL_GIGA_MAC_VER_35, 50 + RTL_GIGA_MAC_VER_36, 51 + RTL_GIGA_MAC_VER_37, 52 + RTL_GIGA_MAC_VER_38, 53 + RTL_GIGA_MAC_VER_39, 54 + RTL_GIGA_MAC_VER_40, 55 + RTL_GIGA_MAC_VER_41, 56 + RTL_GIGA_MAC_VER_42, 57 + RTL_GIGA_MAC_VER_43, 58 + RTL_GIGA_MAC_VER_44, 59 + RTL_GIGA_MAC_VER_45, 60 + RTL_GIGA_MAC_VER_46, 61 + RTL_GIGA_MAC_VER_47, 62 + RTL_GIGA_MAC_VER_48, 63 + RTL_GIGA_MAC_VER_49, 64 + RTL_GIGA_MAC_VER_50, 65 + RTL_GIGA_MAC_VER_51, 66 + RTL_GIGA_MAC_VER_52, 67 + RTL_GIGA_MAC_VER_60, 68 + RTL_GIGA_MAC_VER_61, 69 + RTL_GIGA_MAC_NONE 70 + }; 71 + 72 + struct rtl8169_private; 73 + 74 + void r8169_apply_firmware(struct rtl8169_private *tp); 75 + u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp); 76 + u8 rtl8168d_efuse_read(struct rtl8169_private *tp, int reg_addr); 77 + void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev, 78 + enum mac_version ver);
+6 -64
drivers/net/ethernet/realtek/r8169_main.c
··· 31 31 #include <linux/ipv6.h> 32 32 #include <net/ip6_checksum.h> 33 33 34 + #include "r8169.h" 34 35 #include "r8169_firmware.h" 35 36 36 37 #define MODULENAME "r8169" ··· 84 83 #define RTL_R8(tp, reg) readb(tp->mmio_addr + (reg)) 85 84 #define RTL_R16(tp, reg) readw(tp->mmio_addr + (reg)) 86 85 #define RTL_R32(tp, reg) readl(tp->mmio_addr + (reg)) 87 - 88 - enum mac_version { 89 - /* support for ancient RTL_GIGA_MAC_VER_01 has been removed */ 90 - RTL_GIGA_MAC_VER_02, 91 - RTL_GIGA_MAC_VER_03, 92 - RTL_GIGA_MAC_VER_04, 93 - RTL_GIGA_MAC_VER_05, 94 - RTL_GIGA_MAC_VER_06, 95 - RTL_GIGA_MAC_VER_07, 96 - RTL_GIGA_MAC_VER_08, 97 - RTL_GIGA_MAC_VER_09, 98 - RTL_GIGA_MAC_VER_10, 99 - RTL_GIGA_MAC_VER_11, 100 - RTL_GIGA_MAC_VER_12, 101 - RTL_GIGA_MAC_VER_13, 102 - RTL_GIGA_MAC_VER_14, 103 - RTL_GIGA_MAC_VER_15, 104 - RTL_GIGA_MAC_VER_16, 105 - RTL_GIGA_MAC_VER_17, 106 - RTL_GIGA_MAC_VER_18, 107 - RTL_GIGA_MAC_VER_19, 108 - RTL_GIGA_MAC_VER_20, 109 - RTL_GIGA_MAC_VER_21, 110 - RTL_GIGA_MAC_VER_22, 111 - RTL_GIGA_MAC_VER_23, 112 - RTL_GIGA_MAC_VER_24, 113 - RTL_GIGA_MAC_VER_25, 114 - RTL_GIGA_MAC_VER_26, 115 - RTL_GIGA_MAC_VER_27, 116 - RTL_GIGA_MAC_VER_28, 117 - RTL_GIGA_MAC_VER_29, 118 - RTL_GIGA_MAC_VER_30, 119 - RTL_GIGA_MAC_VER_31, 120 - RTL_GIGA_MAC_VER_32, 121 - RTL_GIGA_MAC_VER_33, 122 - RTL_GIGA_MAC_VER_34, 123 - RTL_GIGA_MAC_VER_35, 124 - RTL_GIGA_MAC_VER_36, 125 - RTL_GIGA_MAC_VER_37, 126 - RTL_GIGA_MAC_VER_38, 127 - RTL_GIGA_MAC_VER_39, 128 - RTL_GIGA_MAC_VER_40, 129 - RTL_GIGA_MAC_VER_41, 130 - RTL_GIGA_MAC_VER_42, 131 - RTL_GIGA_MAC_VER_43, 132 - RTL_GIGA_MAC_VER_44, 133 - RTL_GIGA_MAC_VER_45, 134 - RTL_GIGA_MAC_VER_46, 135 - RTL_GIGA_MAC_VER_47, 136 - RTL_GIGA_MAC_VER_48, 137 - RTL_GIGA_MAC_VER_49, 138 - RTL_GIGA_MAC_VER_50, 139 - RTL_GIGA_MAC_VER_51, 140 - RTL_GIGA_MAC_VER_52, 141 - RTL_GIGA_MAC_VER_60, 142 - RTL_GIGA_MAC_VER_61, 143 - RTL_GIGA_MAC_NONE 144 - }; 145 86 146 87 #define JUMBO_1K ETH_DATA_LEN 147 88 #define JUMBO_4K (4*1024 - ETH_HLEN - 2) ··· 1305 1362 return RTL_R32(tp, EFUSEAR) & EFUSEAR_FLAG; 1306 1363 } 1307 1364 1308 - static u8 rtl8168d_efuse_read(struct rtl8169_private *tp, int reg_addr) 1365 + u8 rtl8168d_efuse_read(struct rtl8169_private *tp, int reg_addr) 1309 1366 { 1310 1367 RTL_W32(tp, EFUSEAR, (reg_addr & EFUSEAR_REG_MASK) << EFUSEAR_REG_SHIFT); 1311 1368 ··· 2230 2287 } 2231 2288 } 2232 2289 2233 - static void r8169_apply_firmware(struct rtl8169_private *tp) 2290 + void r8169_apply_firmware(struct rtl8169_private *tp) 2234 2291 { 2235 2292 /* TODO: release firmware if rtl_fw_write_firmware signals failure. */ 2236 2293 if (tp->rtl_fw) ··· 3121 3178 rtl8168h_config_eee_phy(phydev); 3122 3179 } 3123 3180 3124 - static u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp) 3181 + u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp) 3125 3182 { 3126 3183 u16 data1, data2, ioffset; 3127 3184 ··· 3453 3510 rtl8125_config_eee_phy(phydev); 3454 3511 } 3455 3512 3456 - static void r8169_hw_phy_config(struct rtl8169_private *tp, 3457 - struct phy_device *phydev, 3458 - enum mac_version ver) 3513 + void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev, 3514 + enum mac_version ver) 3459 3515 { 3460 3516 static const rtl_phy_cfg_fct phy_configs[] = { 3461 3517 /* PCI devices. */