From a3dd2c0d8cc8702cff4a7a4a6576e6e86076091a Mon Sep 17 00:00:00 2001 From: Hyacinthe Cartiaux Date: Mon, 1 Jul 2024 17:31:03 +0200 Subject: [PATCH] Import version 2.18.1 --- 50-usb-realtek-net.rules | 2 +- Makefile | 8 + ReadMe.txt | 3 + compatibility.h | 55 +- r8152.c | 14312 ++++++++++++++++++++++++------------- 5 files changed, 9412 insertions(+), 4968 deletions(-) diff --git a/50-usb-realtek-net.rules b/50-usb-realtek-net.rules index 9589b19..84cf1b3 100644 --- a/50-usb-realtek-net.rules +++ b/50-usb-realtek-net.rules @@ -9,7 +9,7 @@ ENV{REALTEK_MODE1}="1" ENV{REALTEK_MODE2}="3" # Realtek -ATTR{idVendor}=="0bda", ATTR{idProduct}=="815[2,3,5,6]", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}" +ATTR{idVendor}=="0bda", ATTR{idProduct}=="815[2,3,5,6,7]", ATTR{bConfigurationValue}!="$env{REALTEK_MODE1}", ATTR{bConfigurationValue}="$env{REALTEK_MODE1}" ATTR{idVendor}=="0bda", ATTR{idProduct}=="8053", ATTR{bcdDevice}=="e???", ATTR{bConfigurationValue}!="$env{REALTEK_MODE2}", ATTR{bConfigurationValue}="$env{REALTEK_MODE2}" # Samsung diff --git a/Makefile b/Makefile index 5e55bb5..e6db94e 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,17 @@ ifneq ($(KERNELRELEASE),) obj-m := r8152.o # EXTRA_CFLAGS += -DRTL8152_S5_WOL # EXTRA_CFLAGS += -DRTL8152_DEBUG + ifneq (,$(filter OFF off, $(CONFIG_CTAP_SHORT))) EXTRA_CFLAGS += -DCONFIG_CTAP_SHORT_OFF endif + + ifeq (TRUE, $(shell test $(VERSION) -lt 5 && echo "TRUE" || \ + test $(VERSION) -eq 5 && test $(PATCHLEVEL) -lt 12 && echo "TRUE")) + EXTRA_CFLAGS += -DLINUX_VERSION_MAJOR=$(VERSION) + EXTRA_CFLAGS += -DLINUX_VERSION_PATCHLEVEL=$(PATCHLEVEL) + EXTRA_CFLAGS += -DLINUX_VERSION_SUBLEVEL=$(SUBLEVEL) + endif else KERNELDIR ?= /lib/modules/$(shell uname -r)/build PWD :=$(shell pwd) diff --git a/ReadMe.txt b/ReadMe.txt index 78d07e6..9a62b77 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -24,6 +24,9 @@ 2.5G for kernel v4.10 and later # ethtool -s eth0 autoneg on advertise 0x80000000002f + 5G for kernel v4.10 and later (Couldn't be supported before kernel v4.10) + # ethtool -s eth0 autoneg on advertise 0x180000000002f + # ethtool -s eth0 autoneg on advertise 0x002f (1G) # ethtool -s eth0 autoneg on advertise 0x000f (100M full) # ethtool -s eth0 autoneg on advertise 0x0003 (10M full) diff --git a/compatibility.h b/compatibility.h index d1e044d..b33c894 100644 --- a/compatibility.h +++ b/compatibility.h @@ -25,6 +25,8 @@ #define TSO_LEGACY_MAX_SIZE 65536 #define netif_napi_add_weight netif_napi_add #define netif_set_tso_max_size netif_set_gso_max_size + #define netif_set_tso_max_segs netif_set_gso_max_segs +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0) #define PHY_MAC_INTERRUPT PHY_IGNORE_INTERRUPT @@ -57,15 +59,19 @@ # define fallthrough do {} while (0) /* fallthrough */ #endif - #define MDIO_EEE_2_5GT 0x0001 /* 2.5GT EEE cap */ + #define MDIO_EEE_2_5GT 0x0001 /* 2.5GT EEE cap */ + #define MDIO_EEE_5GT 0x0002 /* 5GT EEE cap */ #if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0) - #define MDIO_AN_10GBT_CTRL_ADV2_5G 0x0080 /* Advertise 2.5GBASE-T */ - #define MDIO_AN_10GBT_STAT_LP2_5G 0x0020 /* LP is 2.5GBT capable */ + #define MDIO_AN_10GBT_CTRL_ADV2_5G 0x0080 /* Advertise 2.5GBASE-T */ + #define MDIO_AN_10GBT_CTRL_ADV5G 0x0100 /* Advertise 5GBASE-T */ + #define MDIO_AN_10GBT_STAT_LP2_5G 0x0020 /* LP is 2.5GBT capable */ + #define MDIO_AN_10GBT_STAT_LP5G 0x0040 /* LP is 5GBT capable */ #if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0) #if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0) #define SPEED_2500 2500 + #define SPEED_5000 5000 #define SPEED_25000 25000 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0) #ifndef ETHTOOL_LINK_MODE_2500baseT_Full_BIT @@ -349,7 +355,7 @@ static inline void netif_napi_del(struct napi_struct *napi) { #ifdef CONFIG_NETPOLL - list_del(&napi->dev_list); + list_del(&napi->dev_list); #endif } #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) */ @@ -465,21 +471,21 @@ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) */ static inline __be16 vlan_get_protocol(const struct sk_buff *skb) { - __be16 protocol = 0; - - if (vlan_tx_tag_present(skb) || - skb->protocol != cpu_to_be16(ETH_P_8021Q)) - protocol = skb->protocol; - else { - __be16 proto, *protop; - protop = skb_header_pointer(skb, offsetof(struct vlan_ethhdr, - h_vlan_encapsulated_proto), - sizeof(proto), &proto); - if (likely(protop)) - protocol = *protop; - } + __be16 protocol = 0; + + if (vlan_tx_tag_present(skb) || + skb->protocol != cpu_to_be16(ETH_P_8021Q)) + protocol = skb->protocol; + else { + __be16 proto, *protop; + protop = skb_header_pointer(skb, offsetof(struct vlan_ethhdr, + h_vlan_encapsulated_proto), + sizeof(proto), &proto); + if (likely(protop)) + protocol = *protop; + } - return protocol; + return protocol; } #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) */ @@ -612,11 +618,24 @@ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,8,0) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,188) || LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0) + #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,251) || LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0) + #if LINUX_VERSION_MAJOR != 4 || LINUX_VERSION_PATCHLEVEL != 19 || LINUX_VERSION_SUBLEVEL < 291 static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr) { memcpy(dev->dev_addr, addr, 6); } + #endif /* LINUX_VERSION_MAJOR != 4 || LINUX_VERSION_PATCHLEVEL != 19 || LINUX_VERSION_SUBLEVEL < 291 */ + #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,4,251) || LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0) */ + #endif /*LINUX_VERSION_CODE < KERNEL_VERSION(5,10,188) || LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0) */ + static inline void netif_set_gso_max_segs(struct net_device *dev, + unsigned int segs) + { + /* dev->gso_max_segs is read locklessly from sk_setup_caps() */ + WRITE_ONCE(dev->gso_max_segs, segs); + } +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0) */ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0) */ #ifndef FALSE diff --git a/r8152.c b/r8152.c index 171e45a..ad96dd0 100644 --- a/r8152.c +++ b/r8152.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2023 Realtek Semiconductor Corp. All rights reserved. + * 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 @@ -25,20 +25,19 @@ #include #include #include -// Linux 6.4.10 added net/gso.h -#if defined __has_include -#if __has_include () -#include -#endif -#endif #include #include #include #include #include "compatibility.h" +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10) +#include +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10) */ + /* Version Information */ -#define DRIVER_VERSION "v2.17.1 (2023/06/13)" +#define DRIVER_SUFFIX +#define DRIVER_VERSION "v2.18.1"DRIVER_SUFFIX" (2024/05/20)" #define DRIVER_AUTHOR "Realtek nic sw " #define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters" #define MODULENAME "r8152" @@ -182,6 +181,12 @@ #define USB_U1U2_TIMER 0xd4da #define USB_FW_TASK 0xd4e8 /* RTL8153B */ #define USB_RX_AGGR_NUM 0xd4ee +#define USB_ADV_ADDR 0xd5d6 +#define USB_ADV_DATA 0xd5d8 +#define USB_ADV_CMD 0xd5dc +#define USB_TGPHY_ADDR 0xd630 +#define USB_TGPHY_DATA 0xd632 +#define USB_TGPHY_CMD 0xd634 #define USB_UPS_CTRL 0xd800 #define USB_POWER_CUT 0xd80a #define USB_MISC_0 0xd81a @@ -519,6 +524,16 @@ /* USB_RX_AGGR_NUM */ #define RX_AGGR_NUM_MASK 0x1ff +/* USB_ADV_CMD */ +#define ADV_CMD_BUSY BIT(0) +#define ADV_CMD_WR BIT(1) +#define ADV_CMD_BMU 0 +#define ADV_CMD_IP BIT(2) + +/* USB_TGPHY_CMD */ +#define TGPHY_CMD_BUSY BIT(0) +#define TGPHY_CMD_WR BIT(1) + /* USB_UPS_CTRL */ #define POWER_CUT 0x0100 @@ -640,6 +655,7 @@ enum spd_duplex { FORCE_100M_FULL, FORCE_1000M_FULL, NWAY_2500M_FULL, + NWAY_5000M_FULL, }; /* OCP_ALDPS_CONFIG */ @@ -752,6 +768,7 @@ enum spd_duplex { #define PHY_PATCH_LOCK 0x0001 enum rtl_register_content { + _5000bps = BIT(12), _2500bps = BIT(10), _1250bps = BIT(9), _500bps = BIT(8), @@ -770,8 +787,6 @@ enum rtl_register_content { #define RTL8152_MAX_TX 4 #define RTL8152_MAX_RX 10 #define INTBUFSIZE 2 -#define TX_ALIGN 4 -#define RX_ALIGN 8 #define RTL8152_RX_MAX_PENDING 4096 #define RTL8152_RXFG_HEADSZ 256 @@ -795,9 +810,8 @@ enum rtl_register_content { #define RTL8152_TX_TIMEOUT (5 * HZ) #define mtu_to_size(m) ((m) + VLAN_ETH_HLEN + ETH_FCS_LEN) #define size_to_mtu(s) ((s) - VLAN_ETH_HLEN - ETH_FCS_LEN) -#define rx_reserved_size(x) (mtu_to_size(x) + sizeof(struct rx_desc) + RX_ALIGN) -#define RTL_MAX_SG_NUM 64 +#define RTL_MAX_SG_NUM 16 /* rtl8152 flags */ enum rtl8152_flags { @@ -893,6 +907,40 @@ struct tx_desc { #define TX_VLAN_TAG BIT(16) }; +struct rx_desc_v2 { + __le32 opts1; +#define RX_LEN_MASK_2 0xfffe0000 +#define rx_v2_get_len(x) (((x) & RX_LEN_MASK_2) >> 17) +#define RX_VLAN_TAG_2 BIT(3) +#define RX_VER_MASK 0x3 + + __le32 opts2; + + __le32 opts3; +#define IPF_2 BIT(26) /* IP checksum fail */ +#define UDPF_2 BIT(25) /* UDP checksum fail */ +#define TCPF_2 BIT(24) /* TCP checksum fail */ +#define RD_IPV6_CS_2 BIT(15) +#define RD_IPV4_CS_2 BIT(14) +#define RD_UDP_CS_2 BIT(11) +#define RD_TCP_CS_2 BIT(10) + + __le32 opts4; +}; + +struct tx_desc_v2 { + __le32 opts1; + + __le32 opts2; +#define TCPHO_MAX_2 0x3ffU + + __le32 opts3; +#define tx_v2_set_len(x) ((x) << 4) + + __le32 opts4; +#define TX_SIG (0x15 << 27) +}; + struct r8152; struct rx_agg { @@ -912,6 +960,7 @@ struct tx_agg { void *head; u32 skb_num; u32 skb_len; + u32 skb_bytes; }; struct r8152 { @@ -944,11 +993,11 @@ struct r8152 { struct tasklet_struct tx_tl; struct rtl_ops { - void (*init)(struct r8152 *tp); + int (*init)(struct r8152 *tp); int (*enable)(struct r8152 *tp); - void (*disable)(struct r8152 *tp); - void (*up)(struct r8152 *tp); - void (*down)(struct r8152 *tp); + int (*disable)(struct r8152 *tp); + int (*up)(struct r8152 *tp); + int (*down)(struct r8152 *tp); void (*unload)(struct r8152 *tp); #if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) int (*eee_get)(struct r8152 *tp, struct ethtool_keee *eee); @@ -959,8 +1008,10 @@ struct r8152 { #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ bool (*in_nway)(struct r8152 *tp); void (*hw_phy_cfg)(struct r8152 *tp); - void (*autosuspend_en)(struct r8152 *tp, bool enable); - void (*change_mtu)(struct r8152 *tp); + int (*autosuspend_en)(struct r8152 *tp, bool enable); + int (*change_mtu)(struct r8152 *tp); + int (*phy_read)(struct r8152 *tp, u16 addr, u16 *data); + int (*phy_write)(struct r8152 *tp, u16 addr, u16 data); } rtl_ops; struct ups_info { @@ -981,6 +1032,19 @@ struct r8152 { u32 ctap_short_off:1; } ups_info; + struct desc_info { + bool (*vlan_tag)(struct r8152 *tp, void *desc, + struct sk_buff *skb); + int (*csum)(struct r8152 *tp, void *desc, struct sk_buff *skb); + void (*len)(struct r8152 *tp, void *desc, u32 *len); + u8 align; + u8 size; + } rx_desc, tx_desc; + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + void (*vlan_put_tag)(struct r8152 *tp, void *desc, struct sk_buff *skb); +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */ + atomic_t rx_count; bool eee_en; @@ -999,6 +1063,7 @@ struct r8152 { unsigned int pipe_in, pipe_out, pipe_intr, pipe_ctrl_in, pipe_ctrl_out; u32 support_2500full:1; + u32 support_5000full:1; u32 sg_use:1; // u32 dash_mode:1; u32 lenovo_macpassthru:1; @@ -1034,6 +1099,10 @@ enum rtl_version { RTL_VER_14, RTL_VER_15, + RTL_TEST_02, + RTL_VER_16, + RTL_VER_17, + RTL_VER_MAX }; @@ -1043,6 +1112,12 @@ enum tx_csum_stat { TX_CSUM_NONE }; +enum adv_access_type { + ADV_TYPE_BMU = 0, + ADV_TYPE_IP, + ADV_TYPE_MAX +}; + #define RTL_ADVERTISED_10_HALF BIT(0) #define RTL_ADVERTISED_10_FULL BIT(1) #define RTL_ADVERTISED_100_HALF BIT(2) @@ -1050,6 +1125,7 @@ enum tx_csum_stat { #define RTL_ADVERTISED_1000_HALF BIT(4) #define RTL_ADVERTISED_1000_FULL BIT(5) #define RTL_ADVERTISED_2500_FULL BIT(6) +#define RTL_ADVERTISED_5000_FULL BIT(7) /* 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. @@ -1057,7 +1133,7 @@ enum tx_csum_stat { static const int multicast_filter_limit = 32; static unsigned int agg_buf_sz = 16384; -#define RTL_LIMITED_TSO_SIZE (size_to_mtu(agg_buf_sz) - sizeof(struct tx_desc)) +#define RTL_LIMITED_TSO_SIZE (size_to_mtu(agg_buf_sz) - tp->tx_desc.size) static int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data) @@ -1071,7 +1147,7 @@ int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data) ret = usb_control_msg(tp->udev, tp->pipe_ctrl_in, RTL8152_REQ_GET_REGS, RTL8152_REQT_READ, - value, index, tmp, size, 500); + value, index, tmp, size, USB_CTRL_GET_TIMEOUT); if (ret < 0) memset(data, 0xff, size); else @@ -1079,9 +1155,6 @@ int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data) kfree(tmp); - if (ret < 0) - netif_err(tp, drv, tp->netdev, "get_registers %d\n", ret); - return ret; } @@ -1097,13 +1170,10 @@ int set_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data) ret = usb_control_msg(tp->udev, tp->pipe_ctrl_out, RTL8152_REQ_SET_REGS, RTL8152_REQT_WRITE, - value, index, tmp, size, 500); + value, index, tmp, size, USB_CTRL_SET_TIMEOUT); kfree(tmp); - if (ret < 0) - netif_err(tp, drv, tp->netdev, "set_registers %d\n", ret); - return ret; } @@ -1125,8 +1195,10 @@ static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size, return -ENODEV; /* both size and indix must be 4 bytes align */ - if ((size & 3) || !size || (index & 3) || !data) + if ((size & 3) || !size || (index & 3) || !data) { + WARN_ON_ONCE(1); return -EPERM; + } if ((u32)index + (u32)size > 0xffff) return -EPERM; @@ -1155,6 +1227,11 @@ static int generic_ocp_read(struct r8152 *tp, u16 index, u16 size, if (ret == -ENODEV) rtl_set_unplug(tp); + if (ret < 0) + dev_err(&tp->intf->dev, + "read type=0x%04x, index=0x%04x fail %d\n", + type, index, ret); + return ret; } @@ -1169,8 +1246,10 @@ static int generic_ocp_write(struct r8152 *tp, u16 index, u16 byteen, return -ENODEV; /* both size and indix must be 4 bytes align */ - if ((size & 3) || !size || (index & 3) || !data) + if ((size & 3) || !size || (index & 3) || !data) { + WARN_ON_ONCE(1); return -EPERM; + } if ((u32)index + (u32)size > 0xffff) return -EPERM; @@ -1232,6 +1311,11 @@ static int generic_ocp_write(struct r8152 *tp, u16 index, u16 byteen, if (ret == -ENODEV) rtl_set_unplug(tp); + if (ret < 0) + dev_err(&tp->intf->dev, + "write type=0x%04x, index=0x%04x fail %d\n", + type | byteen, index, ret); + return ret; } @@ -1259,148 +1343,221 @@ int usb_ocp_write(struct r8152 *tp, u16 index, u16 byteen, u16 size, void *data) return generic_ocp_write(tp, index, byteen, size, data, MCU_TYPE_USB); } -static u32 ocp_read_dword(struct r8152 *tp, u16 type, u16 index) +static int ocp_read_dword(struct r8152 *tp, u16 type, u16 index, u32 *value) { __le32 data; + int ret; + + ret = generic_ocp_read(tp, index, sizeof(data), &data, type); + WARN_ON_ONCE(ret != sizeof(data)); - generic_ocp_read(tp, index, sizeof(data), &data, type); + *value = __le32_to_cpu(data); - return __le32_to_cpu(data); + return ret; } -static void ocp_write_dword(struct r8152 *tp, u16 type, u16 index, u32 data) +static int ocp_write_dword(struct r8152 *tp, u16 type, u16 index, u32 data) { __le32 tmp = __cpu_to_le32(data); + int ret; - generic_ocp_write(tp, index, BYTE_EN_DWORD, sizeof(tmp), &tmp, type); + ret = generic_ocp_write(tp, index, BYTE_EN_DWORD, sizeof(tmp), &tmp, + type); + WARN_ON_ONCE(ret != sizeof(tmp)); + return ret; } -static u16 ocp_read_word(struct r8152 *tp, u16 type, u16 index) +static int ocp_read_word(struct r8152 *tp, u16 type, u16 index, u32 *value) { - u32 data; - __le32 tmp; u16 byen = BYTE_EN_WORD; u8 shift = index & 2; + __le32 tmp; + u32 data; + int ret; index &= ~3; byen <<= shift; - generic_ocp_read(tp, index, sizeof(tmp), &tmp, type | byen); + ret = generic_ocp_read(tp, index, sizeof(tmp), &tmp, type | byen); + WARN_ON_ONCE(ret != sizeof(tmp)); data = __le32_to_cpu(tmp); data >>= (shift * 8); data &= 0xffff; - return (u16)data; + *value = (u16)data; + + return ret; } -static void ocp_write_word(struct r8152 *tp, u16 type, u16 index, u32 data) +static int ocp_write_word(struct r8152 *tp, u16 type, u16 index, u32 data) { - u32 mask = 0xffff; - __le32 tmp; u16 byen = BYTE_EN_WORD; u8 shift = index & 2; + u32 mask = 0xffff; + __le32 tmp; + int ret; data &= mask; - if (index & 2) { + if (shift) { byen <<= shift; - mask <<= (shift * 8); data <<= (shift * 8); index &= ~3; } tmp = __cpu_to_le32(data); - generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type); + ret = generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type); + WARN_ON_ONCE(ret != sizeof(tmp)); + + return ret; } -static u8 ocp_read_byte(struct r8152 *tp, u16 type, u16 index) +static int ocp_read_byte(struct r8152 *tp, u16 type, u16 index, u32 *value) { - u32 data; - __le32 tmp; u8 shift = index & 3; + __le32 tmp; + u32 data; + int ret; index &= ~3; - generic_ocp_read(tp, index, sizeof(tmp), &tmp, type); + ret = generic_ocp_read(tp, index, sizeof(tmp), &tmp, type); + WARN_ON_ONCE(ret != sizeof(tmp)); data = __le32_to_cpu(tmp); data >>= (shift * 8); data &= 0xff; - return (u8)data; + *value = (u8)data; + + return ret; } -static void ocp_write_byte(struct r8152 *tp, u16 type, u16 index, u32 data) +static int ocp_write_byte(struct r8152 *tp, u16 type, u16 index, u32 data) { - u32 mask = 0xff; - __le32 tmp; u16 byen = BYTE_EN_BYTE; u8 shift = index & 3; + u32 mask = 0xff; + __le32 tmp; + int ret; data &= mask; - if (index & 3) { + if (shift) { byen <<= shift; - mask <<= (shift * 8); data <<= (shift * 8); index &= ~3; } tmp = __cpu_to_le32(data); - generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type); + ret = generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type); + WARN_ON_ONCE(ret != sizeof(tmp)); + + return ret; } -static u16 ocp_reg_read(struct r8152 *tp, u16 addr) +static int r8152_phy_read(struct r8152 *tp, u16 addr, u16 *data) { u16 ocp_base, ocp_index; + u32 ocp_data; + int ret; ocp_base = addr & 0xf000; if (ocp_base != tp->ocp_base) { - ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, + ocp_base); + if (ret < 0) { + tp->ocp_base = 0; + goto out; + } tp->ocp_base = ocp_base; } ocp_index = (addr & 0x0fff) | 0xb000; - return ocp_read_word(tp, MCU_TYPE_PLA, ocp_index); + ret = ocp_read_word(tp, MCU_TYPE_PLA, ocp_index, &ocp_data); + *data = (u16)ocp_data; + +out: + return ret; } -static void ocp_reg_write(struct r8152 *tp, u16 addr, u16 data) +static int r8152_phy_write(struct r8152 *tp, u16 addr, u16 data) { u16 ocp_base, ocp_index; + int ret; ocp_base = addr & 0xf000; if (ocp_base != tp->ocp_base) { - ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, + ocp_base); + if (ret < 0) { + tp->ocp_base = 0; + goto out; + } tp->ocp_base = ocp_base; } ocp_index = (addr & 0x0fff) | 0xb000; - ocp_write_word(tp, MCU_TYPE_PLA, ocp_index, data); + ret = ocp_write_word(tp, MCU_TYPE_PLA, ocp_index, data); + +out: + return ret; +} + +static int ocp_reg_read(struct r8152 *tp, u16 addr, u16 *data) +{ + return tp->rtl_ops.phy_read(tp, addr, data); +} + +static int ocp_reg_write(struct r8152 *tp, u16 addr, u16 data) +{ + return tp->rtl_ops.phy_write(tp, addr, data); } -static inline void r8152_mdio_write(struct r8152 *tp, u32 reg_addr, u32 value) +static int r8152_mdio_write(struct r8152 *tp, u32 reg_addr, u32 value) { - ocp_reg_write(tp, OCP_BASE_MII + reg_addr * 2, value); + return ocp_reg_write(tp, OCP_BASE_MII + reg_addr * 2, value); } -static inline int r8152_mdio_read(struct r8152 *tp, u32 reg_addr) +static int r8152_mdio_read(struct r8152 *tp, u32 reg_addr) { - return ocp_reg_read(tp, OCP_BASE_MII + reg_addr * 2); + int ret; + u16 var; + + ret = ocp_reg_read(tp, OCP_BASE_MII + reg_addr * 2, &var); + + return (ret < 0) ? ret : var; } -static void sram_write(struct r8152 *tp, u16 addr, u16 data) +static int sram_write(struct r8152 *tp, u16 addr, u16 data) { - ocp_reg_write(tp, OCP_SRAM_ADDR, addr); - ocp_reg_write(tp, OCP_SRAM_DATA, data); + int ret; + + ret = ocp_reg_write(tp, OCP_SRAM_ADDR, addr); + if (ret < 0) + goto out; + + ret = ocp_reg_write(tp, OCP_SRAM_DATA, data); + +out: + return ret; } -static u16 sram_read(struct r8152 *tp, u16 addr) +static int sram_read(struct r8152 *tp, u16 addr, u16 *data) { - ocp_reg_write(tp, OCP_SRAM_ADDR, addr); - return ocp_reg_read(tp, OCP_SRAM_DATA); + int ret; + + ret = ocp_reg_write(tp, OCP_SRAM_ADDR, addr); + if (ret < 0) + goto out; + + ret = ocp_reg_read(tp, OCP_SRAM_DATA, data); + +out: + return ret; } static int read_mii_word(struct net_device *netdev, int phy_id, int reg) @@ -1449,3138 +1606,4232 @@ void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val) } static int -r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags); +ocp_dword_w0w1(struct r8152 *tp, u16 type, u16 index, u32 clear, u32 set) +{ + u32 ocp_data; + int ret; -static int -rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex, - u32 advertising); + ret = ocp_read_dword(tp, type, index, &ocp_data); + if (ret < 0) + goto out; -static int __rtl8152_set_mac_address(struct net_device *netdev, void *p, - bool in_resume) -{ - struct r8152 *tp = netdev_priv(netdev); - struct sockaddr *addr = p; - int ret = -EADDRNOTAVAIL; + ocp_data = (ocp_data & ~clear) | set; + ret = ocp_write_dword(tp, type, index, ocp_data); - if (unlikely(tp->rtk_enable_diag)) - return -EBUSY; +out: + return ret; +} - if (!is_valid_ether_addr(addr->sa_data)) - goto out1; +static int +ocp_word_w0w1(struct r8152 *tp, u16 type, u16 index, u16 clear, u16 set) +{ + u32 ocp_data; + int ret; - if (!in_resume) { - ret = usb_autopm_get_interface(tp->intf); - if (ret < 0) - goto out1; - } + ret = ocp_read_word(tp, type, index, &ocp_data); + if (ret < 0) + goto out; - mutex_lock(&tp->control); + ocp_data = (ocp_data & ~clear) | set; + ret = ocp_write_word(tp, type, index, ocp_data); - eth_hw_addr_set(netdev, addr->sa_data); +out: + return ret; +} - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); - pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); +static int +ocp_byte_w0w1(struct r8152 *tp, u16 type, u16 index, u8 clear, u8 set) +{ + u32 ocp_data; + int ret; - mutex_unlock(&tp->control); + ret = ocp_read_byte(tp, type, index, &ocp_data); + if (ret < 0) + goto out; - if (!in_resume) - usb_autopm_put_interface(tp->intf); -out1: + ocp_data = (ocp_data & ~clear) | set; + ret = ocp_write_byte(tp, type, index, ocp_data); + +out: return ret; } -static int rtl8152_set_mac_address(struct net_device *netdev, void *p) +static int +ocp_dword_clr_bits(struct r8152 *tp, u16 type, u16 index, u32 clear) { - return __rtl8152_set_mac_address(netdev, p, false); + return ocp_dword_w0w1(tp, type, index, clear, 0); } -static int rtl_mapt_read(struct r8152 *tp, char *mac_obj_name, - acpi_object_type mac_obj_type, int mac_strlen, - struct sockaddr *sa) +static int +ocp_dword_set_bits(struct r8152 *tp, u16 type, u16 index, u32 set) { - struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; - union acpi_object *obj; - unsigned char buf[6]; - acpi_status status; - int ret = -EINVAL; + return ocp_dword_w0w1(tp, type, index, 0, set); +} - /* returns _AUXMAC_#AABBCCDDEEFF# */ - status = acpi_evaluate_object(NULL, mac_obj_name, NULL, &buffer); - obj = (union acpi_object *)buffer.pointer; - if (!ACPI_SUCCESS(status)) - return -ENODEV; - if (obj->type != mac_obj_type || obj->string.length != mac_strlen) { - netif_warn(tp, probe, tp->netdev, - "Invalid buffer for pass-thru MAC addr: (%d, %d)\n", - obj->type, obj->string.length); - goto amacout; - } +static int +ocp_word_clr_bits(struct r8152 *tp, u16 type, u16 index, u16 clear) +{ + return ocp_word_w0w1(tp, type, index, clear, 0); +} - if (strncmp(obj->string.pointer, "_AUXMAC_#", 9) != 0 || - strncmp(obj->string.pointer + 0x15, "#", 1) != 0) { - netif_warn(tp, probe, tp->netdev, - "Invalid header when reading pass-thru MAC addr\n"); - goto amacout; - } +static int +ocp_word_set_bits(struct r8152 *tp, u16 type, u16 index, u16 set) +{ + return ocp_word_w0w1(tp, type, index, 0, set); +} - ret = hex2bin(buf, obj->string.pointer + 9, sizeof(buf)); - if (!(ret == 0 && is_valid_ether_addr(buf))) { - netif_warn(tp, probe, tp->netdev, - "Invalid MAC for pass-thru MAC addr: %d, %pM\n", - ret, buf); - ret = -EINVAL; - goto amacout; - } +static int +ocp_word_test_and_clr_bits(struct r8152 *tp, u16 type, u16 index, u16 clear) +{ + u32 ocp_data; + int ret; - memcpy(sa->sa_data, buf, sizeof(buf)); - netif_info(tp, probe, tp->netdev, - "Using pass-thru MAC addr %pM\n", sa->sa_data); + ret = ocp_read_word(tp, type, index, &ocp_data); + if (ret < 0) + goto out; -amacout: - kfree(obj); + if (ocp_data & clear) { + ret = ocp_write_word(tp, type, index, ocp_data & ~clear); + if (ret < 0) + goto out; + } + ret = ocp_data & clear; + +out: return ret; } -/* Devices containing proper chips can support a persistent - * host system provided MAC address. - * Examples of this are Dell TB15 and Dell WD15 docks - */ -static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa) +static int +ocp_byte_clr_bits(struct r8152 *tp, u16 type, u16 index, u8 clear) { - int ret = -EOPNOTSUPP; - - if (tp->dell_macpassthru) - ret = rtl_mapt_read(tp, "\\_SB.AMAC", ACPI_TYPE_BUFFER, 0x17, - sa); - else if (tp->lenovo_macpassthru) - ret = rtl_mapt_read(tp, "\\MACA", ACPI_TYPE_STRING, 0x16, sa); + return ocp_byte_w0w1(tp, type, index, clear, 0); +} - return ret; +static int +ocp_byte_set_bits(struct r8152 *tp, u16 type, u16 index, u8 set) +{ + return ocp_byte_w0w1(tp, type, index, 0, set); } -static int rtl_hw_ether_addr(struct r8152 *tp, struct sockaddr *sa) +static int ocp_reg_w0w1(struct r8152 *tp, u16 addr, u16 clear, u16 set) { - u32 ocp_data = 0; + u16 data; int ret; - if (tp->version == RTL_VER_05) { - /* Determine the hardware default ethernet address. - * Check USB 0xcf0e bit 0 - * 1: read from USB 0xcf08 - * 0: read from PLA_BACKUP - */ - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, 0xcf0e); + ret = ocp_reg_read(tp, addr, &data); + if (ret < 0) + goto out; + data = (data & ~clear) | set; + ret = ocp_reg_write(tp, addr, data); - if (ocp_data & BIT(0)) - return usb_ocp_read(tp, 0xcf08, 8, sa->sa_data); +out: + return ret; +} - ocp_data |= BIT(0); - } +static int ocp_reg_clr_bits(struct r8152 *tp, u16 addr, u16 clear) +{ + return ocp_reg_w0w1(tp, addr, clear, 0); +} - ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa->sa_data); +static int ocp_reg_set_bits(struct r8152 *tp, u16 addr, u16 set) +{ + return ocp_reg_w0w1(tp, addr, 0, set); +} + +static int sram_write_w0w1(struct r8152 *tp, u16 addr, u16 clear, u16 set) +{ + u16 data; + int ret; + + ret = sram_read(tp, addr, &data); if (ret < 0) goto out; - if (tp->version == RTL_VER_05) { - /* Backup default ethernet address to USB 0xcf08. - * Set USB 0xcf0e bit 0 to 1. Then, next time, read the default - * ethernet address from USB 0xcf08 rather than PLA_BACKUP. - */ - usb_ocp_write(tp, 0xcf08, BYTE_EN_SIX_BYTES, 8, sa->sa_data); - ocp_write_byte(tp, MCU_TYPE_USB, 0xcf0e, ocp_data); - } + data = (data & ~clear) | set; + ret = ocp_reg_write(tp, OCP_SRAM_DATA, data); out: return ret; } -static int determine_ethernet_addr(struct r8152 *tp, struct sockaddr *sa) +static int sram_set_bits(struct r8152 *tp, u16 addr, u16 set) { - struct net_device *dev = tp->netdev; - int ret; - - sa->sa_family = dev->type; - - ret = eth_platform_get_mac_address(&tp->udev->dev, sa->sa_data); - if (ret < 0) { - if (tp->version == RTL_VER_01) { - ret = pla_ocp_read(tp, PLA_IDR, 8, sa->sa_data); - } else { - /* if device doesn't support MAC pass through this will - * be expected to be non-zero - */ - ret = vendor_mac_passthru_addr_read(tp, sa); - if (ret < 0) - ret = rtl_hw_ether_addr(tp, sa); - } - } - - if (ret < 0) { - netif_err(tp, probe, dev, "Get ether addr fail\n"); - } else if (!is_valid_ether_addr(sa->sa_data)) { - netif_err(tp, probe, dev, "Invalid ether addr %pM\n", - sa->sa_data); - eth_hw_addr_random(dev); - ether_addr_copy(sa->sa_data, dev->dev_addr); - netif_info(tp, probe, dev, "Random ether addr %pM\n", - sa->sa_data); - return 0; - } + return sram_write_w0w1(tp, addr, 0, set); +} - return ret; +static int sram_clr_bits(struct r8152 *tp, u16 addr, u16 clear) +{ + return sram_write_w0w1(tp, addr, clear, 0); } -static int set_ethernet_addr(struct r8152 *tp, bool in_resume) +static int r8152_mdio_set_bit(struct r8152 *tp, u16 addr, u16 set) { - struct net_device *dev = tp->netdev; - struct sockaddr sa; - int ret; + int data; - ret = determine_ethernet_addr(tp, &sa); - if (ret < 0) - return ret; + data = r8152_mdio_read(tp, addr); + if (data < 0) + goto out; - if (tp->version == RTL_VER_01) - eth_hw_addr_set(dev, sa.sa_data); - else - ret = __rtl8152_set_mac_address(dev, &sa, in_resume); + data = r8152_mdio_write(tp, addr, data | set); - return ret; +out: + return data; } -static inline struct net_device_stats *rtl8152_get_stats(struct net_device *dev) +static int r8152_mdio_clr_bit(struct r8152 *tp, u16 addr, u16 clear) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - struct rtl8152 *tp = netdev_priv(dev); + int data; - return (struct net_device_stats *)&tp->stats; -#else - return &dev->stats; -#endif + data = r8152_mdio_read(tp, addr); + if (data < 0) + goto out; + + data = r8152_mdio_write(tp, addr, data & ~clear); + +out: + return data; } -static void read_bulk_callback(struct urb *urb) +static int r8152_mdio_test_and_clr_bit(struct r8152 *tp, u16 addr, u16 clear) { - struct net_device *netdev; - int status = urb->status; - struct rx_agg *agg; - struct r8152 *tp; - unsigned long flags; - - agg = urb->context; - if (!agg) - return; + int data, ret; - tp = agg->context; - if (!tp) - return; + ret = r8152_mdio_read(tp, addr); + if (ret < 0) + goto out; - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + data = ret; + if (data & clear) { + data &= ~clear; + ret = r8152_mdio_write(tp, addr, data); + if (ret < 0) + goto out; + } - if (!test_bit(WORK_ENABLE, &tp->flags)) - return; + ret = !!(data & clear); - netdev = tp->netdev; +out: + return ret; +} - /* When link down, the driver would cancel all bulks. */ - /* This avoid the re-submitting bulk */ - if (!netif_carrier_ok(netdev)) - return; +static int wait_adv_cmd_ready(struct r8152 *tp) +{ + int i, ret; - usb_mark_last_busy(tp->udev); + for (i = 0; i < 10; i++) { + u32 ocp_data; - switch (status) { - case 0: - if (urb->actual_length < ETH_ZLEN) + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_ADV_CMD, &ocp_data); + if (ret < 0) break; - - spin_lock_irqsave(&tp->rx_lock, flags); - list_add_tail(&agg->list, &tp->rx_done); - spin_unlock_irqrestore(&tp->rx_lock, flags); - napi_schedule(&tp->napi); - return; - case -ESHUTDOWN: - rtl_set_unplug(tp); - netif_device_detach(tp->netdev); - return; - case -EPROTO: - urb->actual_length = 0; - spin_lock_irqsave(&tp->rx_lock, flags); - list_add_tail(&agg->list, &tp->rx_done); - spin_unlock_irqrestore(&tp->rx_lock, flags); - set_bit(RX_EPROTO, &tp->flags); - schedule_delayed_work(&tp->schedule, 1); - return; - case -ENOENT: - return; /* the urb is in unlink state */ - case -ETIME: - if (net_ratelimit()) - netif_warn(tp, rx_err, netdev, - "maybe reset is needed?\n"); - break; - default: - if (net_ratelimit()) - netif_warn(tp, rx_err, netdev, - "Rx status %d\n", status); - break; + else if (!(ocp_data & ADV_CMD_BUSY)) + break; + usleep_range(1000, 2000); } - r8152_submit_rx(tp, agg, GFP_ATOMIC); + if (i == 10) + ret = -ETIMEDOUT; + + return ret; } -static void write_bulk_callback(struct urb *urb) +static int +ocp_adv_access(struct r8152 *tp, int type, u16 addr, u32 *data, bool write) { - struct net_device_stats *stats; - struct net_device *netdev; - struct tx_agg *agg; - struct r8152 *tp; - unsigned long flags; - int status = urb->status; + u16 cmd; + int ret; - agg = urb->context; - if (!agg) - return; + switch (type) { + case ADV_TYPE_BMU: + cmd = ADV_CMD_BMU; + break; + case ADV_TYPE_IP: + cmd = ADV_CMD_IP; + break; + default: + WARN_ON_ONCE(1); + return -EPERM; + } - tp = agg->context; - if (!tp) - return; + ret = wait_adv_cmd_ready(tp); + if (ret < 0) + goto out; - netdev = tp->netdev; - stats = rtl8152_get_stats(netdev); - if (status) { - if (net_ratelimit()) - netif_warn(tp, tx_err, netdev, - "Tx status %d\n", status); - stats->tx_errors += agg->skb_num; - } else { - stats->tx_packets += agg->skb_num; - stats->tx_bytes += agg->skb_len; + if (write) { + cmd |= ADV_CMD_WR; + ret = ocp_write_dword(tp, MCU_TYPE_USB, USB_ADV_DATA, *data); + if (ret < 0) + goto out; } - spin_lock_irqsave(&tp->tx_lock, flags); - list_add_tail(&agg->list, &tp->tx_free); - spin_unlock_irqrestore(&tp->tx_lock, flags); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_ADV_ADDR, addr); + if (ret < 0) + goto out; - usb_autopm_put_interface_async(tp->intf); + cmd |= ADV_CMD_BUSY; + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_ADV_CMD, cmd); + if (ret < 0) + goto out; - if (!netif_carrier_ok(netdev)) - return; + if (!write) { + ret = wait_adv_cmd_ready(tp); + if (ret < 0) + goto out; - if (!test_bit(WORK_ENABLE, &tp->flags)) - return; + ret = ocp_read_dword(tp, MCU_TYPE_USB, USB_ADV_DATA, data); + } - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; +out: + return ret; +} - if (!skb_queue_empty(&tp->tx_queue)) - tasklet_schedule(&tp->tx_tl); +/* +static int rtl_bmu_read(struct r8152 *tp, u16 addr, u32 *data) +{ + return ocp_adv_access(tp, ADV_TYPE_BMU, addr, data, false); } -static void write_bulk_sg_callback(struct urb *urb) +static int rtl_bmu_write(struct r8152 *tp, u16 addr, u32 data) { - struct net_device *netdev; - struct tx_agg *agg; - struct r8152 *tp; - unsigned long flags; - int status = urb->status; + return ocp_adv_access(tp, ADV_TYPE_BMU, addr, &data, true); +} - agg = urb->context; - if (!agg) - return; +static int rtl_bmu_w0w1(struct r8152 *tp, u16 addr, u32 clear, u32 set) +{ + u32 bmu; + int ret; - tp = agg->context; - if (!tp) - return; + ret = rtl_bmu_read(tp, addr, &bmu); + if (ret < 0) + goto out; - netdev = tp->netdev; - if (status && net_ratelimit()) - netif_warn(tp, tx_err, netdev, "Tx status %d\n", status); + bmu = (bmu & ~clear) | set; + ret = rtl_bmu_write(tp, addr, bmu); - while (!skb_queue_empty(&agg->tx_skb)) { - struct sk_buff *skb = __skb_dequeue(&agg->tx_skb); - struct net_device_stats *stats = rtl8152_get_stats(netdev); +out: + return ret; +} - if (status) { - stats->tx_errors += skb_shinfo(skb)->gso_segs ?: 1; - dev_kfree_skb_any(skb); - } else { - stats->tx_packets += skb_shinfo(skb)->gso_segs ?: 1; - stats->tx_bytes += skb->len - skb->cb[0]; - dev_consume_skb_any(skb); - } - } +static int rtl_bmu_clr_bits(struct r8152 *tp, u16 addr, u32 clear) +{ + return rtl_bmu_w0w1(tp, addr, clear, 0); +} - spin_lock_irqsave(&tp->tx_lock, flags); - list_add_tail(&agg->list, &tp->tx_free); - spin_unlock_irqrestore(&tp->tx_lock, flags); +static int rtl_bmu_set_bits(struct r8152 *tp, u16 addr, u32 set) +{ + return rtl_bmu_w0w1(tp, addr, 0, set); +} +*/ - usb_autopm_put_interface_async(tp->intf); +static int rtl_ip_read(struct r8152 *tp, u16 addr, u32 *data) +{ + return ocp_adv_access(tp, ADV_TYPE_IP, addr, data, false); +} - if (!netif_carrier_ok(netdev)) - return; - - if (!test_bit(WORK_ENABLE, &tp->flags)) - return; - - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; - - if (!skb_queue_empty(&tp->tx_queue)) - tasklet_schedule(&tp->tx_tl); +static int rtl_ip_write(struct r8152 *tp, u16 addr, u32 data) +{ + return ocp_adv_access(tp, ADV_TYPE_IP, addr, &data, true); } -static void intr_callback(struct urb *urb) +static int rtl_ip_w0w1(struct r8152 *tp, u16 addr, u32 clear, u32 set) { - struct r8152 *tp; - __le16 *d; - int status = urb->status; - int res; - - tp = urb->context; - if (!tp) - return; - - if (!test_bit(WORK_ENABLE, &tp->flags)) - return; - - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + int ret; + u32 ip; - switch (status) { - case 0: /* success */ - break; - case -ECONNRESET: /* unlink */ - case -ESHUTDOWN: - netif_device_detach(tp->netdev); - fallthrough; - case -ENOENT: - case -EPROTO: - netif_info(tp, intr, tp->netdev, - "Stop submitting intr, status %d\n", status); - return; - case -EOVERFLOW: - if (net_ratelimit()) - netif_info(tp, intr, tp->netdev, - "intr status -EOVERFLOW\n"); - goto resubmit; - /* -EPIPE: should clear the halt */ - default: - netif_info(tp, intr, tp->netdev, "intr status %d\n", status); - goto resubmit; - } + ret = rtl_ip_read(tp, addr, &ip); + if (ret < 0) + goto out; - d = urb->transfer_buffer; - if (INTR_LINK & __le16_to_cpu(d[0])) { - if (!netif_carrier_ok(tp->netdev)) { - set_bit(RTL8152_LINK_CHG, &tp->flags); - schedule_delayed_work(&tp->schedule, 0); - } - } else { - if (netif_carrier_ok(tp->netdev)) { - netif_stop_queue(tp->netdev); - set_bit(RTL8152_LINK_CHG, &tp->flags); - schedule_delayed_work(&tp->schedule, 0); - } - } + ip = (ip & ~clear) | set; + ret = rtl_ip_write(tp, addr, ip); -resubmit: - res = usb_submit_urb(urb, GFP_ATOMIC); - if (res == -ENODEV) { - rtl_set_unplug(tp); - netif_device_detach(tp->netdev); - } else if (res) { - netif_err(tp, intr, tp->netdev, - "can't resubmit intr, status %d\n", res); - } +out: + return ret; } -static inline void *rx_agg_align(void *data) +static int rtl_ip_clr_bits(struct r8152 *tp, u16 addr, u32 clear) { - return (void *)ALIGN((uintptr_t)data, RX_ALIGN); + return rtl_ip_w0w1(tp, addr, clear, 0); } -static inline void *tx_agg_align(void *data) +static int rtl_ip_set_bits(struct r8152 *tp, u16 addr, u32 set) { - return (void *)ALIGN((uintptr_t)data, TX_ALIGN); + return rtl_ip_w0w1(tp, addr, 0, set); } -static void free_rx_agg(struct r8152 *tp, struct rx_agg *agg) +static int wait_tgphy_cmd_ready(struct r8152 *tp) { - list_del(&agg->info_list); + int i, ret; - usb_free_urb(agg->urb); - put_page(agg->page); - kfree(agg); + for (i = 0; i < 10; i++) { + u32 ocp_data; - atomic_dec(&tp->rx_count); + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_TGPHY_CMD, &ocp_data); + if (ret < 0) + break; + else if (!(ocp_data & TGPHY_CMD_BUSY)) + break; + usleep_range(1000, 2000); + } + + if (i == 10) + ret = -ETIMEDOUT; + + return ret; } -static struct rx_agg *alloc_rx_agg(struct r8152 *tp, gfp_t mflags) +static int rtl_tgphy_access(struct r8152 *tp, u16 addr, u16 *data, bool write) { - struct net_device *netdev = tp->netdev; - int node = netdev->dev.parent ? dev_to_node(netdev->dev.parent) : -1; - unsigned int order = get_order(tp->rx_buf_sz); - struct rx_agg *rx_agg; - unsigned long flags; + u16 cmd = 0; + int ret; - rx_agg = kmalloc_node(sizeof(*rx_agg), mflags, node); - if (!rx_agg) - return NULL; + ret = wait_tgphy_cmd_ready(tp); + if (ret < 0) + goto out; - rx_agg->page = alloc_pages(mflags | __GFP_COMP | __GFP_NOWARN, order); - if (!rx_agg->page) - goto free_rx; + if (write) { + cmd |= TGPHY_CMD_WR; + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_TGPHY_DATA, *data); + if (ret < 0) + goto out; + } - rx_agg->buffer = page_address(rx_agg->page); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_TGPHY_ADDR, addr); + if (ret < 0) + goto out; - rx_agg->urb = usb_alloc_urb(0, mflags); - if (!rx_agg->urb) - goto free_buf; + cmd |= TGPHY_CMD_BUSY; + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_TGPHY_CMD, cmd); + if (ret < 0) + goto out; - rx_agg->context = tp; + if (!write) { + u32 ocp_data; - INIT_LIST_HEAD(&rx_agg->list); - INIT_LIST_HEAD(&rx_agg->info_list); - spin_lock_irqsave(&tp->rx_lock, flags); - list_add_tail(&rx_agg->info_list, &tp->rx_info); - spin_unlock_irqrestore(&tp->rx_lock, flags); + ret = wait_tgphy_cmd_ready(tp); + if (ret < 0) + goto out; - atomic_inc(&tp->rx_count); + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_TGPHY_DATA, + &ocp_data); + if (ret < 0) + goto out; - return rx_agg; + *data = (u16)ocp_data; + } -free_buf: - __free_pages(rx_agg->page, order); -free_rx: - kfree(rx_agg); - return NULL; +out: + return ret; } -static void free_all_mem(struct r8152 *tp) +static int r8157_phy_read(struct r8152 *tp, u16 addr, u16 *data) { - struct rx_agg *agg, *agg_next; - unsigned long flags; - int i; + return rtl_tgphy_access(tp, addr, data, false); +} - spin_lock_irqsave(&tp->rx_lock, flags); +static int r8157_phy_write(struct r8152 *tp, u16 addr, u16 data) +{ + return rtl_tgphy_access(tp, addr, &data, true); +} - list_for_each_entry_safe(agg, agg_next, &tp->rx_info, info_list) - free_rx_agg(tp, agg); +static int +r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags); - spin_unlock_irqrestore(&tp->rx_lock, flags); +static int +rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex, + u32 advertising); - WARN_ON(atomic_read(&tp->rx_count)); +static int __rtl8152_set_mac_address(struct net_device *netdev, void *p, + bool in_resume) +{ + struct r8152 *tp = netdev_priv(netdev); + struct sockaddr *addr = p; + int ret = -EADDRNOTAVAIL; - for (i = 0; i < RTL8152_MAX_TX; i++) { - usb_free_urb(tp->tx_info[i].urb); - tp->tx_info[i].urb = NULL; + if (unlikely(tp->rtk_enable_diag)) + return -EBUSY; - kfree(tp->tx_info[i].buffer); - tp->tx_info[i].buffer = NULL; - tp->tx_info[i].head = NULL; + if (!is_valid_ether_addr(addr->sa_data)) + goto out1; + + if (!in_resume) { + ret = usb_autopm_get_interface(tp->intf); + if (ret < 0) + goto out1; } - usb_free_urb(tp->intr_urb); - tp->intr_urb = NULL; + mutex_lock(&tp->control); - kfree(tp->intr_buff); - tp->intr_buff = NULL; + eth_hw_addr_set(netdev, addr->sa_data); + + ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data); + ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); + + mutex_unlock(&tp->control); + + if (!in_resume) + usb_autopm_put_interface(tp->intf); +out1: + return ret; } -static int alloc_all_mem(struct r8152 *tp) +static int rtl8152_set_mac_address(struct net_device *netdev, void *p) { - struct net_device *netdev = tp->netdev; - struct usb_interface *intf = tp->intf; - struct usb_host_interface *alt = intf->cur_altsetting; - struct usb_host_endpoint *ep_intr = alt->endpoint + 2; - int node, i; + return __rtl8152_set_mac_address(netdev, p, false); +} - node = netdev->dev.parent ? dev_to_node(netdev->dev.parent) : -1; +static int rtl_mapt_read(struct r8152 *tp, char *mac_obj_name, + acpi_object_type mac_obj_type, int mac_strlen, + struct sockaddr *sa) +{ + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *obj; + unsigned char buf[6]; + acpi_status status; + int ret = -EINVAL; - spin_lock_init(&tp->rx_lock); - spin_lock_init(&tp->tx_lock); - INIT_LIST_HEAD(&tp->rx_info); - INIT_LIST_HEAD(&tp->tx_free); - INIT_LIST_HEAD(&tp->rx_done); - skb_queue_head_init(&tp->tx_queue); - skb_queue_head_init(&tp->rx_queue); - atomic_set(&tp->rx_count, 0); + /* returns _AUXMAC_#AABBCCDDEEFF# */ + status = acpi_evaluate_object(NULL, mac_obj_name, NULL, &buffer); + obj = (union acpi_object *)buffer.pointer; + if (!ACPI_SUCCESS(status)) + return -ENODEV; + if (obj->type != mac_obj_type || obj->string.length != mac_strlen) { + netif_warn(tp, probe, tp->netdev, + "Invalid buffer for pass-thru MAC addr: (%d, %d)\n", + obj->type, obj->string.length); + goto amacout; + } - for (i = 0; i < RTL8152_MAX_RX; i++) { - if (!alloc_rx_agg(tp, GFP_KERNEL)) - goto err1; + if (strncmp(obj->string.pointer, "_AUXMAC_#", 9) != 0 || + strncmp(obj->string.pointer + 0x15, "#", 1) != 0) { + netif_warn(tp, probe, tp->netdev, + "Invalid header when reading pass-thru MAC addr\n"); + goto amacout; } - for (i = 0; i < RTL8152_MAX_TX; i++) { - struct urb *urb; - u8 *buf; + ret = hex2bin(buf, obj->string.pointer + 9, sizeof(buf)); + if (!(ret == 0 && is_valid_ether_addr(buf))) { + netif_warn(tp, probe, tp->netdev, + "Invalid MAC for pass-thru MAC addr: %d, %pM\n", + ret, buf); + ret = -EINVAL; + goto amacout; + } - buf = kmalloc_node(agg_buf_sz, GFP_KERNEL, node); - if (!buf) - goto err1; + memcpy(sa->sa_data, buf, sizeof(buf)); + netif_info(tp, probe, tp->netdev, + "Using pass-thru MAC addr %pM\n", sa->sa_data); - if (buf != tx_agg_align(buf)) { - kfree(buf); - buf = kmalloc_node(agg_buf_sz + TX_ALIGN, GFP_KERNEL, - node); - if (!buf) - goto err1; - } - - urb = usb_alloc_urb(0, GFP_KERNEL); - if (!urb) { - kfree(buf); - goto err1; - } - - INIT_LIST_HEAD(&tp->tx_info[i].list); - tp->tx_info[i].context = tp; - tp->tx_info[i].urb = urb; - tp->tx_info[i].buffer = buf; - tp->tx_info[i].head = tx_agg_align(buf); - - list_add_tail(&tp->tx_info[i].list, &tp->tx_free); - skb_queue_head_init(&tp->tx_info[i].tx_skb); - } - - tp->intr_urb = usb_alloc_urb(0, GFP_KERNEL); - if (!tp->intr_urb) - goto err1; - - tp->intr_buff = kmalloc(INTBUFSIZE, GFP_KERNEL); - if (!tp->intr_buff) - goto err1; - - tp->intr_interval = (int)ep_intr->desc.bInterval; - usb_fill_int_urb(tp->intr_urb, tp->udev, tp->pipe_intr, - tp->intr_buff, INTBUFSIZE, intr_callback, - tp, tp->intr_interval); - - return 0; - -err1: - free_all_mem(tp); - return -ENOMEM; +amacout: + kfree(obj); + return ret; } -static struct tx_agg *r8152_get_tx_agg(struct r8152 *tp) +/* Devices containing proper chips can support a persistent + * host system provided MAC address. + * Examples of this are Dell TB15 and Dell WD15 docks + */ +static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa) { - struct tx_agg *agg = NULL; - unsigned long flags; - - if (list_empty(&tp->tx_free)) - return NULL; - - spin_lock_irqsave(&tp->tx_lock, flags); - if (!list_empty(&tp->tx_free)) { - struct list_head *cursor; + int ret = -EOPNOTSUPP; - cursor = tp->tx_free.next; - list_del_init(cursor); - agg = list_entry(cursor, struct tx_agg, list); - } - spin_unlock_irqrestore(&tp->tx_lock, flags); + if (tp->dell_macpassthru) + ret = rtl_mapt_read(tp, "\\_SB.AMAC", ACPI_TYPE_BUFFER, 0x17, + sa); + else if (tp->lenovo_macpassthru) + ret = rtl_mapt_read(tp, "\\MACA", ACPI_TYPE_STRING, 0x16, sa); - return agg; + return ret; } -/* r8152_csum_workaround() - * The hw limits the value of the transport offset. When the offset is out of - * range, calculate the checksum by sw. - */ -static void r8152_csum_workaround(struct r8152 *tp, struct sk_buff *skb, - struct sk_buff_head *list) +static int rtl_hw_ether_addr(struct r8152 *tp, struct sockaddr *sa) { - if (skb_shinfo(skb)->gso_size) { - netdev_features_t features = tp->netdev->features; - struct sk_buff *segs, *seg, *next; - struct sk_buff_head seg_list; + u32 ocp_data = 0; + int ret; - features &= ~(NETIF_F_SG | NETIF_F_IPV6_CSUM | NETIF_F_TSO6); - segs = skb_gso_segment(skb, features); - if (IS_ERR(segs) || !segs) - goto drop; + if (tp->version == RTL_VER_05) { + /* Determine the hardware default ethernet address. + * Check USB 0xcf0e bit 0 + * 1: read from USB 0xcf08 + * 0: read from PLA_BACKUP + */ + ret = ocp_read_byte(tp, MCU_TYPE_USB, 0xcf0e, &ocp_data); + if (ret < 0) + goto out; - __skb_queue_head_init(&seg_list); + if (ocp_data & BIT(0)) + return usb_ocp_read(tp, 0xcf08, 8, sa->sa_data); - skb_list_walk_safe(segs, seg, next) { - skb_mark_not_on_list(seg); - __skb_queue_tail(&seg_list, seg); - } + ocp_data |= BIT(0); + } - skb_queue_splice(&seg_list, list); - dev_kfree_skb(skb); - } else if (skb->ip_summed == CHECKSUM_PARTIAL) { - if (skb_checksum_help(skb) < 0) - goto drop; + ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa->sa_data); + if (ret < 0) + goto out; - __skb_queue_head(list, skb); - } else { - struct net_device_stats *stats; + if (tp->version == RTL_VER_05) { + /* Backup default ethernet address to USB 0xcf08. + * Set USB 0xcf0e bit 0 to 1. Then, next time, read the default + * ethernet address from USB 0xcf08 rather than PLA_BACKUP. + */ + ret = usb_ocp_write(tp, 0xcf08, BYTE_EN_SIX_BYTES, 8, + sa->sa_data); + if (ret < 0) + goto out; -drop: - stats = rtl8152_get_stats(tp->netdev); - stats->tx_dropped++; - dev_kfree_skb(skb); + ret = ocp_write_byte(tp, MCU_TYPE_USB, 0xcf0e, ocp_data); + if (ret < 0) + goto out; } + +out: + return ret; } -static inline void rtl_tx_vlan_tag(struct tx_desc *desc, struct sk_buff *skb) +static int determine_ethernet_addr(struct r8152 *tp, struct sockaddr *sa) { - if (skb_vlan_tag_present(skb)) { - u32 opts2; - - opts2 = TX_VLAN_TAG | swab16(skb_vlan_tag_get(skb)); - desc->opts2 |= cpu_to_le32(opts2); - } -} + struct net_device *dev = tp->netdev; + int ret; -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + sa->sa_family = dev->type; -static inline bool -rtl_rx_vlan_tag(struct r8152 *tp, struct rx_desc *desc, struct sk_buff *skb) -{ - u32 opts2 = le32_to_cpu(desc->opts2); + ret = eth_platform_get_mac_address(&tp->udev->dev, sa->sa_data); + if (ret < 0) { + if (tp->version == RTL_VER_01) { + ret = pla_ocp_read(tp, PLA_IDR, 8, sa->sa_data); + } else { + /* if device doesn't support MAC pass through this will + * be expected to be non-zero + */ + ret = vendor_mac_passthru_addr_read(tp, sa); + if (ret < 0) + ret = rtl_hw_ether_addr(tp, sa); + } + } - if (tp->vlgrp && (opts2 & RX_VLAN_TAG)) { - vlan_gro_receive(&tp->napi, tp->vlgrp, swab16(opts2 & 0xffff), - skb); - return true; + if (ret < 0) { + netif_err(tp, probe, dev, "Get ether addr fail\n"); + } else if (!is_valid_ether_addr(sa->sa_data)) { + netif_err(tp, probe, dev, "Invalid ether addr %pM\n", + sa->sa_data); + eth_hw_addr_random(dev); + ether_addr_copy(sa->sa_data, dev->dev_addr); + netif_info(tp, probe, dev, "Random ether addr %pM\n", + sa->sa_data); + return 0; } - return false; + return ret; } -static inline void -rtl_vlan_put_tag(struct r8152 *tp, struct rx_desc *desc, struct sk_buff *skb) +static int set_ethernet_addr(struct r8152 *tp, bool in_resume) { - u32 opts2 = le32_to_cpu(desc->opts2); + struct net_device *dev = tp->netdev; + struct sockaddr sa; + int ret; - if (tp->vlgrp && (opts2 & RX_VLAN_TAG)) - __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff)); + ret = determine_ethernet_addr(tp, &sa); + if (ret < 0) + return ret; + + if (tp->version == RTL_VER_01) + eth_hw_addr_set(dev, sa.sa_data); + else + ret = __rtl8152_set_mac_address(dev, &sa, in_resume); + + return ret; } -static inline __u16 -rtl_vlan_get_tag(struct sk_buff *skb) +static inline struct net_device_stats *rtl8152_get_stats(struct net_device *dev) { - __u16 tag; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + struct rtl8152 *tp = netdev_priv(dev); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) - __vlan_hwaccel_get_tag(skb, &tag); + return (struct net_device_stats *)&tp->stats; #else - tag = skb->vlan_tci; + return &dev->stats; #endif - - return tag; } -#else - -static inline void rtl_rx_vlan_tag(struct rx_desc *desc, struct sk_buff *skb) +static void read_bulk_callback(struct urb *urb) { - u32 opts2 = le32_to_cpu(desc->opts2); + struct net_device *netdev; + int status = urb->status; + struct rx_agg *agg; + struct r8152 *tp; + unsigned long flags; - if (opts2 & RX_VLAN_TAG) -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) - __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff)); -#else - __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), - swab16(opts2 & 0xffff)); -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */ -} + agg = urb->context; + if (!agg) + return; -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) */ + tp = agg->context; + if (!tp) + return; -static int r8152_tx_csum(struct r8152 *tp, struct tx_desc *desc, - struct sk_buff *skb, u32 len) -{ - u32 mss = skb_shinfo(skb)->gso_size; - u32 opts1, opts2 = 0; - int ret = TX_CSUM_SUCCESS; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return; - WARN_ON_ONCE(len > TX_LEN_MAX); + if (!test_bit(WORK_ENABLE, &tp->flags)) + return; - opts1 = len | TX_FS | TX_LS; + netdev = tp->netdev; - if (mss) { - u32 transport_offset = (u32)skb_transport_offset(skb); + /* When link down, the driver would cancel all bulks. */ + /* This avoid the re-submitting bulk */ + if (!netif_carrier_ok(netdev)) + return; - if (transport_offset > GTTCPHO_MAX) { - netif_warn(tp, tx_err, tp->netdev, - "Invalid transport offset 0x%x for TSO\n", - transport_offset); - ret = TX_CSUM_TSO; - goto unavailable; - } + usb_mark_last_busy(tp->udev); - switch (vlan_get_protocol(skb)) { - case htons(ETH_P_IP): - opts1 |= GTSENDV4; + switch (status) { + case 0: + if (urb->actual_length < ETH_ZLEN) break; - case htons(ETH_P_IPV6): - if (skb_cow_head(skb, 0)) { - ret = TX_CSUM_TSO; - goto unavailable; - } - tcp_v6_gso_csum_prep(skb); - opts1 |= GTSENDV6; - break; - - default: - WARN_ON_ONCE(1); - break; - } - - opts1 |= transport_offset << GTTCPHO_SHIFT; - opts2 |= min(mss, MSS_MAX) << MSS_SHIFT; - } else if (skb->ip_summed == CHECKSUM_PARTIAL) { - u32 transport_offset = (u32)skb_transport_offset(skb); - u8 ip_protocol; - - if (transport_offset > TCPHO_MAX) { - netif_warn(tp, tx_err, tp->netdev, - "Invalid transport offset 0x%x\n", - transport_offset); - ret = TX_CSUM_NONE; - goto unavailable; - } + spin_lock_irqsave(&tp->rx_lock, flags); + list_add_tail(&agg->list, &tp->rx_done); + spin_unlock_irqrestore(&tp->rx_lock, flags); + napi_schedule(&tp->napi); + return; + case -ESHUTDOWN: + rtl_set_unplug(tp); + netif_device_detach(tp->netdev); + return; + case -EPROTO: + urb->actual_length = 0; + spin_lock_irqsave(&tp->rx_lock, flags); + list_add_tail(&agg->list, &tp->rx_done); + spin_unlock_irqrestore(&tp->rx_lock, flags); + set_bit(RX_EPROTO, &tp->flags); + schedule_delayed_work(&tp->schedule, 1); + return; + case -ENOENT: + return; /* the urb is in unlink state */ + case -ETIME: + if (net_ratelimit()) + netif_warn(tp, rx_err, netdev, + "maybe reset is needed?\n"); + break; + default: + if (net_ratelimit()) + netif_warn(tp, rx_err, netdev, + "Rx status %d\n", status); + break; + } - switch (vlan_get_protocol(skb)) { - case htons(ETH_P_IP): - opts2 |= IPV4_CS; - ip_protocol = ip_hdr(skb)->protocol; - break; + r8152_submit_rx(tp, agg, GFP_ATOMIC); +} - case htons(ETH_P_IPV6): - opts2 |= IPV6_CS; - ip_protocol = ipv6_hdr(skb)->nexthdr; - break; +static void write_bulk_callback(struct urb *urb) +{ + struct net_device_stats *stats; + struct net_device *netdev; + struct tx_agg *agg; + struct r8152 *tp; + unsigned long flags; + int status = urb->status; - default: - ip_protocol = IPPROTO_RAW; - break; - } + agg = urb->context; + if (!agg) + return; - if (ip_protocol == IPPROTO_TCP) - opts2 |= TCP_CS; - else if (ip_protocol == IPPROTO_UDP) - opts2 |= UDP_CS; - else - WARN_ON_ONCE(1); + tp = agg->context; + if (!tp) + return; - opts2 |= transport_offset << TCPHO_SHIFT; + netdev = tp->netdev; + stats = rtl8152_get_stats(netdev); + if (status) { + if (net_ratelimit()) + netif_warn(tp, tx_err, netdev, + "Tx status %d\n", status); + stats->tx_errors += agg->skb_num; + } else { + stats->tx_packets += agg->skb_num; + stats->tx_bytes += agg->skb_bytes; } - desc->opts2 = cpu_to_le32(opts2); - desc->opts1 = cpu_to_le32(opts1); - -unavailable: - return ret; -} + netdev_completed_queue(netdev, agg->skb_num, agg->skb_bytes); -static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) -{ - struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue; - int remain, ret; - u8 *tx_data; + spin_lock_irqsave(&tp->tx_lock, flags); + list_add_tail(&agg->list, &tp->tx_free); + spin_unlock_irqrestore(&tp->tx_lock, flags); - __skb_queue_head_init(&skb_head); - spin_lock(&tx_queue->lock); - skb_queue_splice_init(tx_queue, &skb_head); - spin_unlock(&tx_queue->lock); + usb_autopm_put_interface_async(tp->intf); - tx_data = agg->head; - agg->skb_num = 0; - agg->skb_len = 0; - remain = agg_buf_sz; + if (!netif_carrier_ok(netdev)) + return; - while (remain >= ETH_ZLEN + sizeof(struct tx_desc)) { - struct tx_desc *tx_desc; - struct sk_buff *skb; - unsigned int len; + if (!test_bit(WORK_ENABLE, &tp->flags)) + return; - skb = __skb_dequeue(&skb_head); - if (!skb) - break; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return; - len = skb->len + sizeof(*tx_desc); + if (!skb_queue_empty(&tp->tx_queue)) + tasklet_schedule(&tp->tx_tl); +} - if (len > remain) { - __skb_queue_head(&skb_head, skb); - break; - } +static void write_bulk_sg_callback(struct urb *urb) +{ + struct net_device_stats *stats; + struct net_device *netdev; + int status = urb->status; + unsigned long flags; + struct tx_agg *agg; + struct r8152 *tp; - tx_data = tx_agg_align(tx_data); - tx_desc = (struct tx_desc *)tx_data; + agg = urb->context; + if (!agg) + return; - if (r8152_tx_csum(tp, tx_desc, skb, skb->len)) { - r8152_csum_workaround(tp, skb, &skb_head); - continue; - } + tp = agg->context; + if (!tp) + return; - rtl_tx_vlan_tag(tx_desc, skb); + netdev = tp->netdev; + if (status && net_ratelimit()) + netif_warn(tp, tx_err, netdev, "Tx status %d\n", status); - tx_data += sizeof(*tx_desc); + stats = rtl8152_get_stats(netdev); - len = skb->len; - if (skb_copy_bits(skb, 0, tx_data, len) < 0) { - struct net_device_stats *stats = &tp->netdev->stats; + while (!skb_queue_empty(&agg->tx_skb)) { + struct sk_buff *skb = __skb_dequeue(&agg->tx_skb); - stats->tx_dropped++; + if (status) dev_kfree_skb_any(skb); - tx_data -= sizeof(*tx_desc); - continue; - } - - tx_data += len; - agg->skb_len += len; - agg->skb_num += skb_shinfo(skb)->gso_segs ?: 1; - - dev_consume_skb_any(skb); - - remain = agg_buf_sz - (int)(tx_agg_align(tx_data) - agg->head); + else + dev_consume_skb_any(skb); } - if (!skb_queue_empty(&skb_head)) { - spin_lock(&tx_queue->lock); - skb_queue_splice(&skb_head, tx_queue); - spin_unlock(&tx_queue->lock); + if (status) { + stats->tx_errors += agg->skb_num; + } else { + stats->tx_packets += agg->skb_num; + stats->tx_bytes += agg->skb_bytes; } - netif_tx_lock(tp->netdev); - - if (netif_queue_stopped(tp->netdev) && - skb_queue_len(&tp->tx_queue) < tp->tx_qlen) - netif_wake_queue(tp->netdev); + netdev_completed_queue(netdev, agg->skb_num, agg->skb_bytes); - netif_tx_unlock(tp->netdev); + spin_lock_irqsave(&tp->tx_lock, flags); + list_add_tail(&agg->list, &tp->tx_free); + spin_unlock_irqrestore(&tp->tx_lock, flags); - ret = usb_autopm_get_interface_async(tp->intf); - if (ret < 0) - goto out_tx_fill; + usb_autopm_put_interface_async(tp->intf); - usb_fill_bulk_urb(agg->urb, tp->udev, tp->pipe_out, - agg->head, (int)(tx_data - (u8 *)agg->head), - (usb_complete_t)write_bulk_callback, agg); + if (!netif_carrier_ok(netdev)) + return; - agg->urb->sg = NULL; - agg->urb->num_sgs = 0; + if (!test_bit(WORK_ENABLE, &tp->flags)) + return; - ret = usb_submit_urb(agg->urb, GFP_ATOMIC); - if (ret < 0) - usb_autopm_put_interface_async(tp->intf); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return; -out_tx_fill: - return ret; + if (!skb_queue_empty(&tp->tx_queue)) + tasklet_schedule(&tp->tx_tl); } -static int r8152_tx_agg_sg_fill(struct r8152 *tp, struct tx_agg *agg) +static void intr_callback(struct urb *urb) { - struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue; - int max_sg_num, ret, sg_num; - struct scatterlist *sg; - int padding = 0; - - __skb_queue_head_init(&skb_head); - spin_lock(&tx_queue->lock); - skb_queue_splice_init(tx_queue, &skb_head); - spin_unlock(&tx_queue->lock); - - sg = agg->head; - max_sg_num = (agg_buf_sz / sizeof(*sg)) - 1; - max_sg_num = min_t(int, RTL_MAX_SG_NUM, max_sg_num); - sg_init_table(sg, max_sg_num + 1); - agg->skb_num = 0; - agg->skb_len = 0; - - for (sg_num = 0; sg_num < max_sg_num;) { - struct tx_desc tx_desc; - struct sk_buff *skb; - int num_sgs, headroom; - unsigned int len; - - skb = __skb_dequeue(&skb_head); - if (!skb) - break; + struct r8152 *tp; + __le16 *d; + int status = urb->status; + int res; - headroom = skb_headroom(skb) - padding - sizeof(tx_desc); + tp = urb->context; + if (!tp) + return; - if (skb_header_cloned(skb) || headroom < 0) { - struct sk_buff *tx_skb; + if (!test_bit(WORK_ENABLE, &tp->flags)) + return; - headroom = padding + sizeof(tx_desc); - tx_skb = skb_copy_expand(skb, headroom, 0, GFP_ATOMIC); - dev_kfree_skb_any(skb); - if (!tx_skb) { - struct net_device_stats *stats; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return; - stats = rtl8152_get_stats(tp->netdev); - stats->tx_dropped++; - netif_wake_queue(tp->netdev); - return NETDEV_TX_OK; - } - skb = tx_skb; - headroom = skb_headroom(skb) - headroom; + switch (status) { + case 0: /* success */ + break; + case -ECONNRESET: /* unlink */ + case -ESHUTDOWN: + netif_device_detach(tp->netdev); + fallthrough; + case -ENOENT: + case -EPROTO: + netif_info(tp, intr, tp->netdev, + "Stop submitting intr, status %d\n", status); + return; + case -EOVERFLOW: + if (net_ratelimit()) + netif_info(tp, intr, tp->netdev, + "intr status -EOVERFLOW\n"); + goto resubmit; + /* -EPIPE: should clear the halt */ + default: + netif_info(tp, intr, tp->netdev, "intr status %d\n", status); + goto resubmit; + } + + d = urb->transfer_buffer; + if (INTR_LINK & __le16_to_cpu(d[0])) { + if (!netif_carrier_ok(tp->netdev)) { + set_bit(RTL8152_LINK_CHG, &tp->flags); + schedule_delayed_work(&tp->schedule, 0); + } + } else { + if (netif_carrier_ok(tp->netdev)) { + netif_stop_queue(tp->netdev); + set_bit(RTL8152_LINK_CHG, &tp->flags); + schedule_delayed_work(&tp->schedule, 0); } + } - /* calculate the fragment numbers for skb */ - num_sgs = 1 + skb_shinfo(skb)->nr_frags; - len = skb->len; +resubmit: + res = usb_submit_urb(urb, GFP_ATOMIC); + if (res == -ENODEV) { + rtl_set_unplug(tp); + netif_device_detach(tp->netdev); + } else if (res) { + netif_err(tp, intr, tp->netdev, + "can't resubmit intr, status %d\n", res); + } +} - if ((num_sgs + sg_num) > max_sg_num) { - __skb_queue_head(&skb_head, skb); - break; - } +static void *rx_agg_align(struct r8152 *tp, void *data) +{ + return (void *)ALIGN((uintptr_t)data, tp->rx_desc.align); +} - if (r8152_tx_csum(tp, &tx_desc, skb, len)) { - r8152_csum_workaround(tp, skb, &skb_head); - continue; - } +static void *tx_agg_align(struct r8152 *tp, void *data) +{ + return (void *)ALIGN((uintptr_t)data, tp->tx_desc.align); +} - rtl_tx_vlan_tag(&tx_desc, skb); +static void free_rx_agg(struct r8152 *tp, struct rx_agg *agg) +{ + list_del(&agg->info_list); - WARN_ON(padding < 0); + usb_free_urb(agg->urb); + put_page(agg->page); + kfree(agg); - /* use skb_headroom for tx desc */ - skb->cb[0] = padding + sizeof(tx_desc); - memcpy(skb_push(skb, sizeof(tx_desc)), &tx_desc, - sizeof(tx_desc)); - if (padding) - memset(skb_push(skb, padding), 0, padding); + atomic_dec(&tp->rx_count); +} - num_sgs = skb_to_sgvec_nomark(skb, sg, 0, skb->len); - if (num_sgs < 0) { - netif_err(tp, tx_err, tp->netdev, - "skb_to_sgvec fail %d\n", num_sgs); - __skb_queue_head(&skb_head, skb); - break; - } +static struct rx_agg *alloc_rx_agg(struct r8152 *tp, gfp_t mflags) +{ + struct net_device *netdev = tp->netdev; + int node = netdev->dev.parent ? dev_to_node(netdev->dev.parent) : -1; + unsigned int order = get_order(tp->rx_buf_sz); + struct rx_agg *rx_agg; + unsigned long flags; - sg += num_sgs; + rx_agg = kmalloc_node(sizeof(*rx_agg), mflags, node); + if (!rx_agg) + return NULL; - __skb_queue_tail(&agg->tx_skb, skb); + rx_agg->page = alloc_pages(mflags | __GFP_COMP | __GFP_NOWARN, order); + if (!rx_agg->page) + goto free_rx; - sg_num += num_sgs; - agg->skb_len += skb->len; - padding = len + sizeof(tx_desc); + rx_agg->buffer = page_address(rx_agg->page); - agg->skb_num++; + rx_agg->urb = usb_alloc_urb(0, mflags); + if (!rx_agg->urb) + goto free_buf; - padding = ALIGN(padding, TX_ALIGN) - padding; - } + rx_agg->context = tp; - sg_mark_end(sg); + INIT_LIST_HEAD(&rx_agg->list); + INIT_LIST_HEAD(&rx_agg->info_list); + spin_lock_irqsave(&tp->rx_lock, flags); + list_add_tail(&rx_agg->info_list, &tp->rx_info); + spin_unlock_irqrestore(&tp->rx_lock, flags); - if (!skb_queue_empty(&skb_head)) { - spin_lock(&tx_queue->lock); - skb_queue_splice(&skb_head, tx_queue); - spin_unlock(&tx_queue->lock); - } + atomic_inc(&tp->rx_count); - netif_tx_lock(tp->netdev); + return rx_agg; - if (netif_queue_stopped(tp->netdev) && - skb_queue_len(&tp->tx_queue) < tp->tx_qlen) - netif_wake_queue(tp->netdev); +free_buf: + __free_pages(rx_agg->page, order); +free_rx: + kfree(rx_agg); + return NULL; +} - netif_tx_unlock(tp->netdev); +static void free_all_mem(struct r8152 *tp) +{ + struct rx_agg *agg, *agg_next; + unsigned long flags; + int i; - if (sg_num == 0) { - unsigned long flags; + spin_lock_irqsave(&tp->rx_lock, flags); - spin_lock_irqsave(&tp->tx_lock, flags); - list_add_tail(&agg->list, &tp->tx_free); - spin_unlock_irqrestore(&tp->tx_lock, flags); + list_for_each_entry_safe(agg, agg_next, &tp->rx_info, info_list) + free_rx_agg(tp, agg); - ret = 0; - goto out_tx_fill; - } + spin_unlock_irqrestore(&tp->rx_lock, flags); - ret = usb_autopm_get_interface_async(tp->intf); - if (ret < 0) - goto out_tx_fill; + WARN_ON(atomic_read(&tp->rx_count)); - usb_fill_bulk_urb(agg->urb, tp->udev, tp->pipe_out, - NULL, (int)agg->skb_len, - (usb_complete_t)write_bulk_sg_callback, agg); + for (i = 0; i < RTL8152_MAX_TX; i++) { + usb_free_urb(tp->tx_info[i].urb); + tp->tx_info[i].urb = NULL; - agg->urb->sg = agg->head; - agg->urb->num_sgs = sg_num; + kfree(tp->tx_info[i].buffer); + tp->tx_info[i].buffer = NULL; + tp->tx_info[i].head = NULL; + WARN_ON(!skb_queue_empty(&tp->tx_info[i].tx_skb)); + } - ret = usb_submit_urb(agg->urb, GFP_ATOMIC); - if (ret < 0) - usb_autopm_put_interface_async(tp->intf); + usb_free_urb(tp->intr_urb); + tp->intr_urb = NULL; -out_tx_fill: - return ret; + kfree(tp->intr_buff); + tp->intr_buff = NULL; } -static u8 r8152_rx_csum(struct r8152 *tp, struct rx_desc *rx_desc) +static int alloc_all_mem(struct r8152 *tp) { - u8 checksum = CHECKSUM_NONE; - u32 opts2, opts3; + struct net_device *netdev = tp->netdev; + struct usb_interface *intf = tp->intf; + struct usb_host_interface *alt = intf->cur_altsetting; + struct usb_host_endpoint *ep_intr = alt->endpoint + 2; + int node, i; - if (!(tp->netdev->features & NETIF_F_RXCSUM)) - goto return_result; + node = netdev->dev.parent ? dev_to_node(netdev->dev.parent) : -1; - opts2 = le32_to_cpu(rx_desc->opts2); - opts3 = le32_to_cpu(rx_desc->opts3); + spin_lock_init(&tp->rx_lock); + spin_lock_init(&tp->tx_lock); + INIT_LIST_HEAD(&tp->rx_info); + INIT_LIST_HEAD(&tp->tx_free); + INIT_LIST_HEAD(&tp->rx_done); + skb_queue_head_init(&tp->tx_queue); + skb_queue_head_init(&tp->rx_queue); + atomic_set(&tp->rx_count, 0); - if (opts2 & RD_IPV4_CS) { - if (opts3 & IPF) - checksum = CHECKSUM_NONE; - else if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF)) - checksum = CHECKSUM_UNNECESSARY; - else if ((opts2 & RD_TCP_CS) && !(opts3 & TCPF)) - checksum = CHECKSUM_UNNECESSARY; - } else if (opts2 & RD_IPV6_CS) { - if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF)) - checksum = CHECKSUM_UNNECESSARY; - else if ((opts2 & RD_TCP_CS) && !(opts3 & TCPF)) - checksum = CHECKSUM_UNNECESSARY; + for (i = 0; i < RTL8152_MAX_RX; i++) { + if (!alloc_rx_agg(tp, GFP_KERNEL)) + goto err1; } -return_result: - return checksum; -} - -static inline bool rx_count_exceed(struct r8152 *tp) -{ - return atomic_read(&tp->rx_count) > RTL8152_MAX_RX; -} - -static inline int agg_offset(struct rx_agg *agg, void *addr) -{ - return (int)(addr - agg->buffer); -} + for (i = 0; i < RTL8152_MAX_TX; i++) { + struct urb *urb; + u8 *buf; -static struct rx_agg *rtl_get_free_rx(struct r8152 *tp, gfp_t mflags) -{ - struct rx_agg *agg, *agg_next, *agg_free = NULL; - unsigned long flags; + buf = kmalloc_node(agg_buf_sz, GFP_KERNEL, node); + if (!buf) + goto err1; - spin_lock_irqsave(&tp->rx_lock, flags); + if (buf != tx_agg_align(tp, buf)) { + kfree(buf); + buf = kmalloc_node(agg_buf_sz + tp->tx_desc.align, + GFP_KERNEL, node); + if (!buf) + goto err1; + } - list_for_each_entry_safe(agg, agg_next, &tp->rx_used, list) { - if (page_count(agg->page) == 1) { - if (!agg_free) { - list_del_init(&agg->list); - agg_free = agg; - continue; - } - if (tp->rx_agg_free_ref) { - tp->rx_agg_free_ref--; - } else if (rx_count_exceed(tp)) { - list_del_init(&agg->list); - free_rx_agg(tp, agg); - } - break; + urb = usb_alloc_urb(0, GFP_KERNEL); + if (!urb) { + kfree(buf); + goto err1; } - } - spin_unlock_irqrestore(&tp->rx_lock, flags); + INIT_LIST_HEAD(&tp->tx_info[i].list); + tp->tx_info[i].context = tp; + tp->tx_info[i].urb = urb; + tp->tx_info[i].buffer = buf; + tp->tx_info[i].head = tx_agg_align(tp, buf); - if (!agg_free && atomic_read(&tp->rx_count) < tp->rx_pending) { - agg_free = alloc_rx_agg(tp, mflags); - tp->rx_agg_free_ref += RTL8152_MAX_RX; + list_add_tail(&tp->tx_info[i].list, &tp->tx_free); + skb_queue_head_init(&tp->tx_info[i].tx_skb); } - return agg_free; + tp->intr_urb = usb_alloc_urb(0, GFP_KERNEL); + if (!tp->intr_urb) + goto err1; + + tp->intr_buff = kmalloc(INTBUFSIZE, GFP_KERNEL); + if (!tp->intr_buff) + goto err1; + + tp->intr_interval = (int)ep_intr->desc.bInterval; + usb_fill_int_urb(tp->intr_urb, tp->udev, tp->pipe_intr, + tp->intr_buff, INTBUFSIZE, intr_callback, + tp, tp->intr_interval); + + return 0; + +err1: + free_all_mem(tp); + return -ENOMEM; } -static int rx_bottom(struct r8152 *tp, int budget) +static struct tx_agg *r8152_get_tx_agg(struct r8152 *tp) { + struct tx_agg *agg = NULL; unsigned long flags; - struct list_head *cursor, *next, rx_queue; - int ret = 0, work_done = 0; - struct napi_struct *napi = &tp->napi; - if (!skb_queue_empty(&tp->rx_queue)) { - while (work_done < budget) { - struct sk_buff *skb = __skb_dequeue(&tp->rx_queue); - struct net_device *netdev = tp->netdev; - struct net_device_stats *stats; - unsigned int pkt_len; -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) - u16 vlan_tci; -#endif + if (list_empty(&tp->tx_free)) + return NULL; - if (!skb) - break; + spin_lock_irqsave(&tp->tx_lock, flags); + if (!list_empty(&tp->tx_free)) { + struct list_head *cursor; - pkt_len = skb->len; - stats = rtl8152_get_stats(netdev); -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) - vlan_tci = rtl_vlan_get_tag(skb); + cursor = tp->tx_free.next; + list_del_init(cursor); + agg = list_entry(cursor, struct tx_agg, list); + } + spin_unlock_irqrestore(&tp->tx_lock, flags); - if (vlan_tci) - vlan_gro_receive(napi, tp->vlgrp, vlan_tci, - skb); - else - napi_gro_receive(napi, skb); -#else - napi_gro_receive(napi, skb); -#endif + return agg; +} - work_done++; +/* r8152_csum_workaround() + * The hw limits the value of the transport offset. When the offset is out of + * range, calculate the checksum by sw. + */ +static void r8152_csum_workaround(struct r8152 *tp, struct sk_buff *skb, + struct sk_buff_head *list) +{ + if (skb_shinfo(skb)->gso_size) { + netdev_features_t features = tp->netdev->features; + struct sk_buff *segs, *seg, *next; + struct sk_buff_head seg_list; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - netdev->last_rx = jiffies; -#endif - stats->rx_packets++; - stats->rx_bytes += pkt_len; - } - } + features &= ~(NETIF_F_SG | NETIF_F_IPV6_CSUM | NETIF_F_TSO6); + segs = skb_gso_segment(skb, features); + if (IS_ERR(segs) || !segs) + goto drop; - if (list_empty(&tp->rx_done)) - goto out1; + __skb_queue_head_init(&seg_list); - clear_bit(RX_EPROTO, &tp->flags); - INIT_LIST_HEAD(&rx_queue); - spin_lock_irqsave(&tp->rx_lock, flags); - list_splice_init(&tp->rx_done, &rx_queue); - spin_unlock_irqrestore(&tp->rx_lock, flags); + skb_list_walk_safe(segs, seg, next) { + skb_mark_not_on_list(seg); + netdev_sent_queue(tp->netdev, seg->len); + __skb_queue_tail(&seg_list, seg); + } - list_for_each_safe(cursor, next, &rx_queue) { - struct rx_desc *rx_desc; - struct rx_agg *agg, *agg_free; - int len_used = 0; - struct urb *urb; - u8 *rx_data; + skb_queue_splice(&seg_list, list); + netdev_completed_queue(tp->netdev, + skb_shinfo(skb)->gso_segs ?: 1, skb->len); + dev_kfree_skb(skb); + } else if (skb->ip_summed == CHECKSUM_PARTIAL) { + if (skb_checksum_help(skb) < 0) + goto drop; - list_del_init(cursor); + __skb_queue_head(list, skb); + } else { + struct net_device_stats *stats; - agg = list_entry(cursor, struct rx_agg, list); - urb = agg->urb; - if (urb->status != 0 || urb->actual_length < ETH_ZLEN) - goto submit; +drop: + stats = rtl8152_get_stats(tp->netdev); + stats->tx_dropped++; + dev_kfree_skb(skb); + } +} - agg_free = rtl_get_free_rx(tp, GFP_ATOMIC); +static void r8152_rx_len(struct r8152 *tp, void *desc, u32 *len) +{ + struct rx_desc *d = desc; - rx_desc = agg->buffer; - rx_data = agg->buffer; - len_used += sizeof(struct rx_desc); + *len = le32_to_cpu(d->opts1) & RX_LEN_MASK; +} - while (urb->actual_length > len_used) { - struct net_device *netdev = tp->netdev; - struct net_device_stats *stats; - unsigned int pkt_len, rx_frag_head_sz; - struct sk_buff *skb; +static bool r8152_tx_vlan_tag(struct r8152 *tp, void *d, struct sk_buff *skb) +{ + struct tx_desc *desc = d; - /* limit the skb numbers for rx_queue */ - if (unlikely(skb_queue_len(&tp->rx_queue) >= 1000)) - break; + if (skb_vlan_tag_present(skb)) { + u32 opts2; - pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK; - if (pkt_len < ETH_ZLEN) - break; + opts2 = TX_VLAN_TAG | swab16(skb_vlan_tag_get(skb)); + desc->opts2 |= cpu_to_le32(opts2); + return true; + } + return false; +} - len_used += pkt_len; - if (urb->actual_length < len_used) - break; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) - stats = rtl8152_get_stats(netdev); +static bool +r8152_rx_vlan_tag(struct r8152 *tp, void *d, struct sk_buff *skb) +{ + struct rx_desc *desc = d; + u32 opts2 = le32_to_cpu(desc->opts2); - pkt_len -= ETH_FCS_LEN; - rx_data += sizeof(struct rx_desc); + if (tp->vlgrp && (opts2 & RX_VLAN_TAG)) { + vlan_gro_receive(&tp->napi, tp->vlgrp, swab16(opts2 & 0xffff), + skb); + return true; + } - if (!agg_free || tp->rx_copybreak > pkt_len) - rx_frag_head_sz = pkt_len; - else - rx_frag_head_sz = tp->rx_copybreak; + return false; +} - skb = napi_alloc_skb(napi, rx_frag_head_sz); - if (!skb) { - stats->rx_dropped++; - goto find_next_rx; - } +static void +r8152_vlan_put_tag(struct r8152 *tp, void *d, struct sk_buff *skb) +{ + struct rx_desc *desc = d; + u32 opts2 = le32_to_cpu(desc->opts2); - skb->ip_summed = r8152_rx_csum(tp, rx_desc); - memcpy(skb->data, rx_data, rx_frag_head_sz); - skb_put(skb, rx_frag_head_sz); - pkt_len -= rx_frag_head_sz; - rx_data += rx_frag_head_sz; - if (pkt_len) { - skb_add_rx_frag(skb, 0, agg->page, - agg_offset(agg, rx_data), - pkt_len, - SKB_DATA_ALIGN(pkt_len)); - get_page(agg->page); - } + if (tp->vlgrp && (opts2 & RX_VLAN_TAG)) + __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff)); +} -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - skb->dev = netdev; -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ - skb->protocol = eth_type_trans(skb, netdev); +static inline __u16 +rtl_vlan_get_tag(struct sk_buff *skb) +{ + __u16 tag; -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) - if (work_done < budget) { - if (!rtl_rx_vlan_tag(tp, rx_desc, skb)) - napi_gro_receive(napi, skb); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - netdev->last_rx = jiffies; -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) */ - work_done++; - stats->rx_packets++; - stats->rx_bytes += skb->len; - } else { - rtl_vlan_put_tag(tp, rx_desc, skb); - __skb_queue_tail(&tp->rx_queue, skb); - } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) + __vlan_hwaccel_get_tag(skb, &tag); #else - rtl_rx_vlan_tag(rx_desc, skb); - if (work_done < budget) { - work_done++; - stats->rx_packets++; - stats->rx_bytes += skb->len; - napi_gro_receive(napi, skb); - } else { - __skb_queue_tail(&tp->rx_queue, skb); - } -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) */ - -find_next_rx: - rx_data = rx_agg_align(rx_data + pkt_len + ETH_FCS_LEN); - rx_desc = (struct rx_desc *)rx_data; - len_used = agg_offset(agg, rx_data); - len_used += sizeof(struct rx_desc); - } - - WARN_ON(!agg_free && page_count(agg->page) > 1); + tag = skb->vlan_tci; +#endif - if (agg_free) { - spin_lock_irqsave(&tp->rx_lock, flags); - if (page_count(agg->page) == 1) { - list_add(&agg_free->list, &tp->rx_used); - } else { - list_add_tail(&agg->list, &tp->rx_used); - agg = agg_free; - urb = agg->urb; - } - spin_unlock_irqrestore(&tp->rx_lock, flags); - } + return tag; +} -submit: - if (!ret) { - ret = r8152_submit_rx(tp, agg, GFP_ATOMIC); - } else { - urb->actual_length = 0; - list_add_tail(&agg->list, next); - } - } +#else +static bool +r8152_rx_vlan_tag(struct r8152 *tp, void *d, struct sk_buff *skb) +{ + struct rx_desc *desc = d; + u32 opts2 = le32_to_cpu(desc->opts2); - if (!list_empty(&rx_queue)) { - spin_lock_irqsave(&tp->rx_lock, flags); - list_splice_tail(&rx_queue, &tp->rx_done); - spin_unlock_irqrestore(&tp->rx_lock, flags); + if (opts2 & RX_VLAN_TAG) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) + __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff)); +#else + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), + swab16(opts2 & 0xffff)); +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */ + return true; } - -out1: - return work_done; + return false; } -static void tx_bottom(struct r8152 *tp) +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) */ + +static int r8152_tx_csum(struct r8152 *tp, void *tx_desc, struct sk_buff *skb) { - int res; + u32 mss = skb_shinfo(skb)->gso_size; + struct tx_desc *desc = tx_desc; + int ret = TX_CSUM_SUCCESS; + u32 opts1, opts2 = 0; - do { - struct net_device *netdev = tp->netdev; - struct tx_agg *agg; + opts1 = TX_FS | TX_LS; - if (skb_queue_empty(&tp->tx_queue)) - break; + if (mss) { + u32 transport_offset = (u32)skb_transport_offset(skb); - agg = r8152_get_tx_agg(tp); - if (!agg) - break; + if (transport_offset > GTTCPHO_MAX) { + netif_warn(tp, tx_err, tp->netdev, + "Invalid transport offset 0x%x for TSO\n", + transport_offset); + ret = TX_CSUM_TSO; + goto unavailable; + } - if (tp->sg_use) - res = r8152_tx_agg_sg_fill(tp, agg); - else - res = r8152_tx_agg_fill(tp, agg); + switch (vlan_get_protocol(skb)) { + case htons(ETH_P_IP): + opts1 |= GTSENDV4; + break; - if (!res) - continue; + case htons(ETH_P_IPV6): + if (skb_cow_head(skb, 0)) { + ret = TX_CSUM_TSO; + goto unavailable; + } + tcp_v6_gso_csum_prep(skb); + opts1 |= GTSENDV6; + break; - if (res == -ENODEV) { - rtl_set_unplug(tp); - netif_device_detach(netdev); - } else { - struct net_device_stats *stats = &netdev->stats; - unsigned long flags; + default: + WARN_ON_ONCE(1); + break; + } - netif_warn(tp, tx_err, netdev, - "failed tx_urb %d\n", res); - stats->tx_dropped += agg->skb_num; + opts1 |= transport_offset << GTTCPHO_SHIFT; + opts2 |= min(mss, MSS_MAX) << MSS_SHIFT; + } else if (skb->ip_summed == CHECKSUM_PARTIAL) { + u32 transport_offset = (u32)skb_transport_offset(skb); + u8 ip_protocol; - spin_lock_irqsave(&tp->tx_lock, flags); - list_add_tail(&agg->list, &tp->tx_free); - spin_unlock_irqrestore(&tp->tx_lock, flags); + if (transport_offset > TCPHO_MAX) { + netif_warn(tp, tx_err, tp->netdev, + "Invalid transport offset 0x%x\n", + transport_offset); + ret = TX_CSUM_NONE; + goto unavailable; } - } while (res == 0); -} -#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0) -static void bottom_half(unsigned long t) -#else -static void bottom_half(struct tasklet_struct *t) -#endif -{ - struct r8152 *tp = from_tasklet(tp, t, tx_tl); + switch (vlan_get_protocol(skb)) { + case htons(ETH_P_IP): + opts2 |= IPV4_CS; + ip_protocol = ip_hdr(skb)->protocol; + break; - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + case htons(ETH_P_IPV6): + opts2 |= IPV6_CS; + ip_protocol = ipv6_hdr(skb)->nexthdr; + break; - if (!test_bit(WORK_ENABLE, &tp->flags)) - return; + default: + ip_protocol = IPPROTO_RAW; + break; + } - /* When link down, the driver would cancel all bulks. */ - /* This avoid the re-submitting bulk */ - if (!netif_carrier_ok(tp->netdev)) - return; + if (ip_protocol == IPPROTO_TCP) + opts2 |= TCP_CS; + else if (ip_protocol == IPPROTO_UDP) + opts2 |= UDP_CS; + else + WARN_ON_ONCE(1); - clear_bit(SCHEDULE_TASKLET, &tp->flags); + opts2 |= transport_offset << TCPHO_SHIFT; + } - tx_bottom(tp); + desc->opts2 = cpu_to_le32(opts2); + desc->opts1 = cpu_to_le32(opts1); + +unavailable: + return ret; } -static inline int __r8152_poll(struct r8152 *tp, int budget) +static void r8152_tx_len(struct r8152 *tp, void *tx_desc, u32 *len) { - struct napi_struct *napi = &tp->napi; - int work_done; + struct tx_desc *desc = tx_desc; - work_done = rx_bottom(tp, budget); + desc->opts1 |= cpu_to_le32(*len); +} - if (work_done < budget) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0) - napi_complete_done(napi, work_done); -#else - if (!napi_complete_done(napi, work_done)) - goto out; -#endif - if (!list_empty(&tp->rx_done)) - napi_schedule(napi); - } +static void r8157_rx_len(struct r8152 *tp, void *desc, u32 *len) +{ + struct rx_desc_v2 *d = desc; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) -out: -#endif - return work_done; + *len = rx_v2_get_len(le32_to_cpu(d->opts1)); } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - -static int r8152_poll(struct net_device *dev, int *budget) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) +static bool +r8157_rx_vlan_tag(struct r8152 *tp, void *desc, struct sk_buff *skb) { - struct r8152 *tp = netdev_priv(dev); - int quota = min(dev->quota, *budget); - int work_done; - - work_done = __r8152_poll(tp, quota); + struct rx_desc_v2 *d = desc; + u32 opts1 = le32_to_cpu(d->opts1); - *budget -= work_done; - dev->quota -= work_done; + if (tp->vlgrp && (opts1 & RX_VLAN_TAG_2)) { + u32 opts2 = le32_to_cpu(d->opts2); - return (work_done >= quota); + vlan_gro_receive(&tp->napi, tp->vlgrp, + swab16((opts2 >> 16) & 0xffff), skb); + return true; + } + return false } -#else - -static int r8152_poll(struct napi_struct *napi, int budget) +static void +r8157_vlan_put_tag(struct r8152 *tp, void *desc, struct sk_buff *skb) { - struct r8152 *tp = container_of(napi, struct r8152, napi); + struct rx_desc_v2 *d = desc; + u32 opts1 = le32_to_cpu(d->opts1); - return __r8152_poll(tp, budget); -} + if (tp->vlgrp && (opts1 & RX_VLAN_TAG_2)) { + u32 opts2 = le32_to_cpu(d->opts2); -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) */ + __vlan_hwaccel_put_tag(skb, swab16((opts2 >> 16) & 0xffff)); + } +} -static -int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags) +#else +static bool +r8157_rx_vlan_tag(struct r8152 *tp, void *desc, struct sk_buff *skb) { - int ret; - - /* The rx would be stopped, so skip submitting */ - if (test_bit(RTL8152_UNPLUG, &tp->flags) || - !test_bit(WORK_ENABLE, &tp->flags) || !netif_carrier_ok(tp->netdev)) - return 0; + struct rx_desc_v2 *d = desc; + u32 opts1 = le32_to_cpu(d->opts1); - usb_fill_bulk_urb(agg->urb, tp->udev, tp->pipe_in, - agg->buffer, tp->rx_buf_sz, - (usb_complete_t)read_bulk_callback, agg); + if (opts1 & RX_VLAN_TAG_2) { + u32 opts2 = le32_to_cpu(d->opts2); - ret = usb_submit_urb(agg->urb, mem_flags); - if (ret == -ENODEV) { - rtl_set_unplug(tp); - netif_device_detach(tp->netdev); - } else if (ret) { - struct urb *urb = agg->urb; - unsigned long flags; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) + __vlan_hwaccel_put_tag(skb, swab16((opts2 >> 16) & 0xffff)); +#else + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), + swab16((opts2 >> 16) & 0xffff)); +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */ + return true; + } + return false; +} +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) */ - urb->actual_length = 0; - spin_lock_irqsave(&tp->rx_lock, flags); - list_add_tail(&agg->list, &tp->rx_done); - spin_unlock_irqrestore(&tp->rx_lock, flags); +static int r8157_tx_csum(struct r8152 *tp, void *tx_desc, struct sk_buff *skb) +{ + u32 mss = skb_shinfo(skb)->gso_size; + int ret = TX_CSUM_SUCCESS; - netif_err(tp, rx_err, tp->netdev, - "Couldn't submit rx[%p], ret = %d\n", agg, ret); + if (!mss && skb->ip_summed == CHECKSUM_PARTIAL) { + u32 transport_offset = (u32)skb_transport_offset(skb); - napi_schedule(&tp->napi); + if (transport_offset > TCPHO_MAX_2) { + netif_warn(tp, tx_err, tp->netdev, + "Invalid transport offset 0x%x\n", + transport_offset); + return TX_CSUM_NONE; + } } + ret = r8152_tx_csum(tp, tx_desc, skb); + return ret; } -static void rtl_drop_queued_tx(struct r8152 *tp) +static void r8157_tx_len(struct r8152 *tp, void *tx_desc, u32 *len) { - struct net_device_stats *stats = rtl8152_get_stats(tp->netdev); - struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue; - struct sk_buff *skb; + struct tx_desc_v2 *desc = tx_desc; - if (skb_queue_empty(tx_queue)) - return; - - __skb_queue_head_init(&skb_head); - spin_lock_bh(&tx_queue->lock); - skb_queue_splice_init(tx_queue, &skb_head); - spin_unlock_bh(&tx_queue->lock); - - while ((skb = __skb_dequeue(&skb_head))) { - dev_kfree_skb(skb); - stats->tx_dropped++; - } + desc->opts3 = cpu_to_le32(tx_v2_set_len(*len)); + desc->opts4 = cpu_to_le32(TX_SIG); } -#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) -static void rtl8152_tx_timeout(struct net_device *netdev) -#else -static void rtl8152_tx_timeout(struct net_device *netdev, unsigned int txqueue) -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) */ +static int rtl_tx_csum(struct r8152 *tp, void *desc, struct sk_buff *skb, + u32 len) { - struct r8152 *tp = netdev_priv(netdev); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - int i; -#endif + int ret = TX_CSUM_SUCCESS; - netif_warn(tp, tx_err, netdev, "Tx timeout\n"); + WARN_ON_ONCE(len > TX_LEN_MAX); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) - for (i = 0; i < RTL8152_MAX_TX; i++) - usb_unlink_urb(tp->tx_info[i].urb); -#else - usb_queue_reset_device(tp->intf); -#endif + ret = tp->tx_desc.csum(tp, desc, skb); + if (!ret) + tp->tx_desc.len(tp, desc, &len); + + return ret; } -static void rtl8152_set_rx_mode(struct net_device *netdev) +static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg) { - struct r8152 *tp = netdev_priv(netdev); - u32 mc_filter[2]; /* Multicast hash filter */ - __le32 tmp[2]; - u32 ocp_data; + struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue; + struct net_device *netdev = tp->netdev; + int remain, ret; + u8 *tx_data; - if (in_atomic()) { - if (netif_carrier_ok(netdev)) { - set_bit(RTL8152_SET_RX_MODE, &tp->flags); - schedule_delayed_work(&tp->schedule, 0); - } - return; - } + __skb_queue_head_init(&skb_head); + spin_lock(&tx_queue->lock); + skb_queue_splice_init(tx_queue, &skb_head); + spin_unlock(&tx_queue->lock); - clear_bit(RTL8152_SET_RX_MODE, &tp->flags); + tx_data = agg->head; + agg->skb_num = 0; + agg->skb_len = 0; + agg->skb_bytes = 0; + remain = agg_buf_sz; - if (!netif_carrier_ok(netdev)) - return; + while (remain >= ETH_ZLEN + tp->tx_desc.size) { + struct sk_buff *skb; + unsigned int len; + void *tx_desc; - netif_stop_queue(netdev); - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data &= ~RCR_ACPT_ALL; - ocp_data |= RCR_AB | RCR_APM; + skb = __skb_dequeue(&skb_head); + if (!skb) + break; - if (netdev->flags & IFF_PROMISC) { - /* Unconditionally log net taps. */ - netif_notice(tp, link, netdev, "Promiscuous mode enabled\n"); - ocp_data |= RCR_AM | RCR_AAP; - mc_filter[1] = 0xffffffff; - mc_filter[0] = 0xffffffff; - } else if ((netdev->flags & IFF_MULTICAST && - netdev_mc_count(netdev) > multicast_filter_limit) || - (netdev->flags & IFF_ALLMULTI)) { - /* Too many to filter perfectly -- accept all multicasts. */ - ocp_data |= RCR_AM; - mc_filter[1] = 0xffffffff; - mc_filter[0] = 0xffffffff; - } else { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) - struct dev_mc_list *mclist; - unsigned int i; + len = skb->len + tp->tx_desc.size; - mc_filter[1] = mc_filter[0] = 0; - for (i = 0, mclist = netdev->mc_list; - mclist && i < netdev->mc_count; - i++, mclist = mclist->next) { - int bit_nr; + if (len > remain) { + __skb_queue_head(&skb_head, skb); + break; + } - bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; - mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); - ocp_data |= RCR_AM; + tx_data = tx_agg_align(tp, tx_data); + tx_desc = (void *)tx_data; + + if (rtl_tx_csum(tp, tx_desc, skb, skb->len)) { + r8152_csum_workaround(tp, skb, &skb_head); + continue; } -#else - mc_filter[1] = 0; - mc_filter[0] = 0; - if (netdev->flags & IFF_MULTICAST) { - struct netdev_hw_addr *ha; + tp->tx_desc.vlan_tag(tp, tx_desc, skb); - netdev_for_each_mc_addr(ha, netdev) { - int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; + tx_data += tp->tx_desc.size; - mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); - ocp_data |= RCR_AM; - } + len = skb->len; + if (skb_copy_bits(skb, 0, tx_data, len) < 0) { + struct net_device_stats *stats = &netdev->stats; + + netdev_completed_queue(netdev, + skb_shinfo(skb)->gso_segs ?: 1, + len); + stats->tx_dropped++; + dev_kfree_skb_any(skb); + tx_data -= tp->tx_desc.size; + continue; } -#endif + + tx_data += len; + agg->skb_bytes += len; + agg->skb_num += skb_shinfo(skb)->gso_segs ?: 1; + + dev_consume_skb_any(skb); + + remain = agg_buf_sz - + (int)(tx_agg_align(tp, tx_data) - agg->head); } - tmp[0] = __cpu_to_le32(swab32(mc_filter[1])); - tmp[1] = __cpu_to_le32(swab32(mc_filter[0])); + if (!skb_queue_empty(&skb_head)) { + spin_lock(&tx_queue->lock); + skb_queue_splice(&skb_head, tx_queue); + spin_unlock(&tx_queue->lock); + } - pla_ocp_write(tp, PLA_MAR, BYTE_EN_DWORD, sizeof(tmp), tmp); - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); - netif_wake_queue(netdev); -} + netif_tx_lock(netdev); -static inline bool rtl_gso_check(struct net_device *dev, struct sk_buff *skb) -{ - struct r8152 *tp = netdev_priv(dev); + if (netif_queue_stopped(netdev) && + skb_queue_len(&tp->tx_queue) < tp->tx_qlen) + netif_wake_queue(netdev); - if (tp->sg_use) - return true; - else if ((skb->len + sizeof(struct tx_desc)) <= agg_buf_sz) - return true; - else - return false; -} + netif_tx_unlock(netdev); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,4) + ret = usb_autopm_get_interface_async(tp->intf); + if (ret < 0) + goto out_tx_fill; -static netdev_features_t -rtl8152_features_check(struct sk_buff *skb, struct net_device *dev, - netdev_features_t features) -{ - u32 mss = skb_shinfo(skb)->gso_size; - int max_offset = mss ? GTTCPHO_MAX : TCPHO_MAX; + usb_fill_bulk_urb(agg->urb, tp->udev, tp->pipe_out, + agg->head, (int)(tx_data - (u8 *)agg->head), + (usb_complete_t)write_bulk_callback, agg); - if ((mss || skb->ip_summed == CHECKSUM_PARTIAL) && - skb_transport_offset(skb) > max_offset) - features &= ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK); - else if (!rtl_gso_check(dev, skb)) - features &= ~NETIF_F_GSO_MASK; + agg->urb->sg = NULL; + agg->urb->num_sgs = 0; - return features; + ret = usb_submit_urb(agg->urb, GFP_ATOMIC); + if (ret < 0) + usb_autopm_put_interface_async(tp->intf); + +out_tx_fill: + if (ret < 0) + netdev_completed_queue(netdev, agg->skb_num, agg->skb_bytes); + + return ret; } -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,4) */ -static netdev_tx_t rtl8152_start_xmit(struct sk_buff *skb, - struct net_device *netdev) +static int r8152_tx_agg_sg_fill(struct r8152 *tp, struct tx_agg *agg) { - struct r8152 *tp = netdev_priv(netdev); - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,4) - if (unlikely(!rtl_gso_check(netdev, skb))) { - netdev_features_t features = netdev->features; - struct sk_buff *segs, *nskb; + struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue; + struct net_device *netdev = tp->netdev; + int max_sg_num, ret, sg_num; + struct scatterlist *sg; + int padding = 0; - features &= ~(NETIF_F_TSO | NETIF_F_TSO6); - segs = skb_gso_segment(skb, features); - if (IS_ERR(segs) || !segs) - goto free_skb; + __skb_queue_head_init(&skb_head); + spin_lock(&tx_queue->lock); + skb_queue_splice_init(tx_queue, &skb_head); + spin_unlock(&tx_queue->lock); - do { - nskb = segs; - segs = segs->next; - nskb->next = NULL; - rtl8152_start_xmit(nskb, netdev); - } while (segs); + sg = agg->head; + max_sg_num = (agg_buf_sz / sizeof(*sg)) - 1; + max_sg_num = min_t(int, RTL_MAX_SG_NUM, max_sg_num); + sg_init_table(sg, max_sg_num + 1); + agg->skb_num = 0; + agg->skb_len = 0; + agg->skb_bytes = 0; -free_skb: - dev_kfree_skb_any(skb); + for (sg_num = 0; sg_num < max_sg_num;) { + struct sk_buff *skb; + int num_sgs, headroom; + unsigned int len; + union { + struct tx_desc v1; + struct tx_desc_v2 v2; + } tx_desc; - return NETDEV_TX_OK; - } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) - netdev->trans_start = jiffies -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) */ -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,4) */ + skb = __skb_dequeue(&skb_head); + if (!skb) + break; - skb_tx_timestamp(skb); + headroom = skb_headroom(skb) - padding - tp->tx_desc.size; - skb_queue_tail(&tp->tx_queue, skb); + if (skb_header_cloned(skb) || headroom < 0) { + struct sk_buff *tx_skb; - if (!list_empty(&tp->tx_free)) { - if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) { - set_bit(SCHEDULE_TASKLET, &tp->flags); - schedule_delayed_work(&tp->schedule, 0); - } else { - usb_mark_last_busy(tp->udev); - tasklet_schedule(&tp->tx_tl); + headroom = padding + tp->tx_desc.size; + tx_skb = skb_copy_expand(skb, headroom, 0, GFP_ATOMIC); + if (!tx_skb) { + __skb_queue_head(&skb_head, skb); + break; + } + dev_kfree_skb_any(skb); + skb = tx_skb; + headroom = skb_headroom(skb) - headroom; } - } else if (skb_queue_len(&tp->tx_queue) > tp->tx_qlen) { - netif_stop_queue(netdev); - } - return NETDEV_TX_OK; -} + /* calculate the fragment numbers for skb */ + num_sgs = 1 + skb_shinfo(skb)->nr_frags; + len = skb->len; -static void r8152b_reset_packet_filter(struct r8152 *tp) -{ - u32 ocp_data; + if ((num_sgs + sg_num) > max_sg_num) { + __skb_queue_head(&skb_head, skb); + break; + } - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_FMC); - ocp_data &= ~FMC_FCR_MCU_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_FMC, ocp_data); - ocp_data |= FMC_FCR_MCU_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_FMC, ocp_data); -} + if (rtl_tx_csum(tp, &tx_desc, skb, len)) { + r8152_csum_workaround(tp, skb, &skb_head); + continue; + } -static void rtl8152_nic_reset(struct r8152 *tp) -{ - u32 ocp_data; - int i; + tp->tx_desc.vlan_tag(tp, &tx_desc, skb); - switch (tp->version) { - case RTL_TEST_01: - case RTL_VER_10: - case RTL_VER_11: - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR); - ocp_data &= ~CR_TE; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, ocp_data); + WARN_ON(padding < 0); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_BMU_RESET); - ocp_data &= ~BMU_RESET_EP_IN; - ocp_write_word(tp, MCU_TYPE_USB, USB_BMU_RESET, ocp_data); + /* use skb_headroom for tx desc */ + skb->cb[0] = padding + tp->tx_desc.size; + memcpy(skb_push(skb, tp->tx_desc.size), &tx_desc, + tp->tx_desc.size); + if (padding) + memset(skb_push(skb, padding), 0, padding); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); - ocp_data |= CDC_ECM_EN; - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); + num_sgs = skb_to_sgvec_nomark(skb, sg, 0, skb->len); + if (num_sgs < 0) { + netif_err(tp, tx_err, netdev, + "skb_to_sgvec fail %d\n", num_sgs); + __skb_queue_head(&skb_head, skb); + break; + } - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR); - ocp_data &= ~CR_RE; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, ocp_data); + sg += num_sgs; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_BMU_RESET); - ocp_data |= BMU_RESET_EP_IN; - ocp_write_word(tp, MCU_TYPE_USB, USB_BMU_RESET, ocp_data); + __skb_queue_tail(&agg->tx_skb, skb); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); - ocp_data &= ~CDC_ECM_EN; - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); - break; + sg_num += num_sgs; + agg->skb_len += skb->len; + agg->skb_bytes += len; + agg->skb_num += skb_shinfo(skb)->gso_segs ?: 1; - default: - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, CR_RST); + padding = len + tp->tx_desc.size; + padding = ALIGN(padding, tp->tx_desc.align) - padding; + } - for (i = 0; i < 1000; i++) { - if (!(ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR) & CR_RST)) - break; - usleep_range(100, 400); - } - break; + if (!skb_queue_empty(&skb_head)) { + spin_lock(&tx_queue->lock); + skb_queue_splice(&skb_head, tx_queue); + spin_unlock(&tx_queue->lock); } -} -static void set_tx_qlen(struct r8152 *tp) -{ - if (tp->sg_use) - tp->tx_qlen = RTL_MAX_SG_NUM; - else - tp->tx_qlen = agg_buf_sz / (mtu_to_size(tp->netdev->mtu) + sizeof(struct tx_desc)); -} + netif_tx_lock(netdev); -static inline u16 rtl8152_get_speed(struct r8152 *tp) -{ - return ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHYSTATUS); -} + if (netif_queue_stopped(netdev) && + skb_queue_len(&tp->tx_queue) < tp->tx_qlen) + netif_wake_queue(netdev); -static void rtl_eee_plus_en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; + netif_tx_unlock(netdev); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR); - if (enable) - ocp_data |= EEEP_CR_EEEP_TX; - else - ocp_data &= ~EEEP_CR_EEEP_TX; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR, ocp_data); -} + if (sg_num == 0) { + unsigned long flags; -static void rtl_set_eee_plus(struct r8152 *tp) -{ - if (rtl8152_get_speed(tp) & _10bps) - rtl_eee_plus_en(tp, true); - else - rtl_eee_plus_en(tp, false); -} + spin_lock_irqsave(&tp->tx_lock, flags); + list_add_tail(&agg->list, &tp->tx_free); + spin_unlock_irqrestore(&tp->tx_lock, flags); -static void rxdy_gated_en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1); - if (enable) - ocp_data |= RXDY_GATED_EN; - else - ocp_data &= ~RXDY_GATED_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data); -} - -static int rtl_start_rx(struct r8152 *tp) -{ - struct rx_agg *agg, *agg_next; - struct list_head tmp_list; - unsigned long flags; - int ret = 0, i = 0; - - INIT_LIST_HEAD(&tmp_list); + ret = 0; + goto out_tx_fill; + } - spin_lock_irqsave(&tp->rx_lock, flags); + ret = usb_autopm_get_interface_async(tp->intf); + if (ret < 0) + goto out_tx_fill; - INIT_LIST_HEAD(&tp->rx_done); - INIT_LIST_HEAD(&tp->rx_used); + sg_mark_end(sg); - list_splice_init(&tp->rx_info, &tmp_list); + usb_fill_bulk_urb(agg->urb, tp->udev, tp->pipe_out, + NULL, (int)agg->skb_len, + (usb_complete_t)write_bulk_sg_callback, agg); - spin_unlock_irqrestore(&tp->rx_lock, flags); + agg->urb->sg = agg->head; + agg->urb->num_sgs = sg_num; - list_for_each_entry_safe(agg, agg_next, &tmp_list, info_list) { - INIT_LIST_HEAD(&agg->list); + ret = usb_submit_urb(agg->urb, GFP_ATOMIC); + if (ret < 0) + usb_autopm_put_interface_async(tp->intf); - /* Only RTL8152_MAX_RX rx_agg need to be submitted. */ - if (++i > RTL8152_MAX_RX) { - spin_lock_irqsave(&tp->rx_lock, flags); - list_add_tail(&agg->list, &tp->rx_used); - spin_unlock_irqrestore(&tp->rx_lock, flags); - } else if (unlikely(ret < 0)) { - spin_lock_irqsave(&tp->rx_lock, flags); - list_add_tail(&agg->list, &tp->rx_done); - spin_unlock_irqrestore(&tp->rx_lock, flags); - } else { - ret = r8152_submit_rx(tp, agg, GFP_KERNEL); - } +out_tx_fill: + if (ret < 0) { + netdev_completed_queue(netdev, agg->skb_num, agg->skb_bytes); + while (!skb_queue_empty(&agg->tx_skb)) + dev_kfree_skb_any(__skb_dequeue(&agg->tx_skb)); } - spin_lock_irqsave(&tp->rx_lock, flags); - WARN_ON(!list_empty(&tp->rx_info)); - list_splice(&tmp_list, &tp->rx_info); - spin_unlock_irqrestore(&tp->rx_lock, flags); - return ret; } -static int rtl_stop_rx(struct r8152 *tp) +static int +r8152_rx_csum(struct r8152 *tp, void *d, struct sk_buff *skb) { - struct rx_agg *agg, *agg_next; - struct list_head tmp_list; - unsigned long flags; - - INIT_LIST_HEAD(&tmp_list); + struct rx_desc *rx_desc = d; + u8 checksum = CHECKSUM_NONE; + u32 opts2, opts3; - /* The usb_kill_urb() couldn't be used in atomic. - * Therefore, move the list of rx_info to a tmp one. - * Then, list_for_each_entry_safe could be used without - * spin lock. - */ + if (!(tp->netdev->features & NETIF_F_RXCSUM)) + goto return_result; - spin_lock_irqsave(&tp->rx_lock, flags); - list_splice_init(&tp->rx_info, &tmp_list); - spin_unlock_irqrestore(&tp->rx_lock, flags); + opts2 = le32_to_cpu(rx_desc->opts2); + opts3 = le32_to_cpu(rx_desc->opts3); - list_for_each_entry_safe(agg, agg_next, &tmp_list, info_list) { - /* At least RTL8152_MAX_RX rx_agg have the page_count being - * equal to 1, so the other ones could be freed safely. - */ - if (page_count(agg->page) > 1) - free_rx_agg(tp, agg); - else - usb_kill_urb(agg->urb); + if (opts2 & RD_IPV4_CS) { + if (opts3 & IPF) + checksum = CHECKSUM_NONE; + else if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF)) + checksum = CHECKSUM_UNNECESSARY; + else if ((opts2 & RD_TCP_CS) && !(opts3 & TCPF)) + checksum = CHECKSUM_UNNECESSARY; + } else if (opts2 & RD_IPV6_CS) { + if ((opts2 & RD_UDP_CS) && !(opts3 & UDPF)) + checksum = CHECKSUM_UNNECESSARY; + else if ((opts2 & RD_TCP_CS) && !(opts3 & TCPF)) + checksum = CHECKSUM_UNNECESSARY; } - /* Move back the list of temp to the rx_info */ - spin_lock_irqsave(&tp->rx_lock, flags); - WARN_ON(!list_empty(&tp->rx_info)); - list_splice(&tmp_list, &tp->rx_info); - spin_unlock_irqrestore(&tp->rx_lock, flags); - - while (!skb_queue_empty(&tp->rx_queue)) - dev_kfree_skb(__skb_dequeue(&tp->rx_queue)); +return_result: + skb->ip_summed = checksum; return 0; } -static void rtl_set_ifg(struct r8152 *tp, u16 speed) +static int +r8157_rx_csum(struct r8152 *tp, void *desc, struct sk_buff *skb) { - u32 ocp_data; + struct rx_desc_v2 *d = desc; + u8 checksum = CHECKSUM_NONE; + u32 opts3; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR1); - ocp_data &= ~IFG_MASK; - if ((speed & (_10bps | _100bps)) && !(speed & FULL_DUP)) { - ocp_data |= IFG_144NS; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TCR1, ocp_data); + if (!(tp->netdev->features & NETIF_F_RXCSUM)) + goto return_result; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4); - ocp_data &= ~TX10MIDLE_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, ocp_data); - } else { - ocp_data |= IFG_96NS; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TCR1, ocp_data); + opts3 = le32_to_cpu(d->opts3); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4); - ocp_data |= TX10MIDLE_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, ocp_data); + if ((opts3 & (RD_IPV4_CS_2 | IPF_2)) == (RD_IPV4_CS_2 | IPF_2)) { + checksum = CHECKSUM_NONE; + } else if (opts3 & (RD_IPV4_CS_2 | RD_IPV6_CS_2)) { + if ((opts3 & (RD_UDP_CS_2 | UDPF_2)) == RD_UDP_CS_2) + checksum = CHECKSUM_UNNECESSARY; + else if ((opts3 & (RD_TCP_CS_2 | TCPF_2)) == RD_TCP_CS_2) + checksum = CHECKSUM_UNNECESSARY; } + +return_result: + skb->ip_summed = checksum; + + return 0; } -static inline void r8153b_rx_agg_chg_indicate(struct r8152 *tp) +static inline bool rx_count_exceed(struct r8152 *tp) { - ocp_write_byte(tp, MCU_TYPE_USB, USB_UPT_RXDMA_OWN, - OWN_UPDATE | OWN_CLEAR); + return atomic_read(&tp->rx_count) > RTL8152_MAX_RX; } -static int rtl_enable(struct r8152 *tp) +static int agg_offset(struct rx_agg *agg, void *addr) { - u32 ocp_data; + WARN_ON_ONCE(agg->buffer > addr); + return (int)(addr - agg->buffer); +} - r8152b_reset_packet_filter(tp); +static struct rx_agg *rtl_get_free_rx(struct r8152 *tp, gfp_t mflags) +{ + struct rx_agg *agg, *agg_next, *agg_free = NULL; + unsigned long flags; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR); - ocp_data |= CR_RE | CR_TE; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, ocp_data); + spin_lock_irqsave(&tp->rx_lock, flags); - switch (tp->version) { - case RTL_VER_01: - case RTL_VER_02: - case RTL_VER_03: - case RTL_VER_04: - case RTL_VER_05: - case RTL_VER_06: - case RTL_VER_07: - break; - default: - r8153b_rx_agg_chg_indicate(tp); - break; + list_for_each_entry_safe(agg, agg_next, &tp->rx_used, list) { + if (page_count(agg->page) == 1) { + if (!agg_free) { + list_del_init(&agg->list); + agg_free = agg; + continue; + } + if (tp->rx_agg_free_ref) { + tp->rx_agg_free_ref--; + } else if (rx_count_exceed(tp)) { + list_del_init(&agg->list); + free_rx_agg(tp, agg); + } + break; + } } - rxdy_gated_en(tp, false); + spin_unlock_irqrestore(&tp->rx_lock, flags); - return 0; + if (!agg_free && atomic_read(&tp->rx_count) < tp->rx_pending) { + agg_free = alloc_rx_agg(tp, mflags); + tp->rx_agg_free_ref += RTL8152_MAX_RX; + } + + return agg_free; } -static int rtl8152_enable(struct r8152 *tp) +static int rx_bottom(struct r8152 *tp, int budget) { - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return -ENODEV; + unsigned long flags; + struct list_head *cursor, *next, rx_queue; + int ret = 0, work_done = 0; + struct napi_struct *napi = &tp->napi; - set_tx_qlen(tp); - rtl_set_eee_plus(tp); + if (!skb_queue_empty(&tp->rx_queue)) { + while (work_done < budget) { + struct sk_buff *skb = __skb_dequeue(&tp->rx_queue); + struct net_device *netdev = tp->netdev; + struct net_device_stats *stats; + unsigned int pkt_len; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + u16 vlan_tci; +#endif - return rtl_enable(tp); -} + if (!skb) + break; -static void r8153_set_rx_early_timeout(struct r8152 *tp) -{ - u32 ocp_data = tp->coalesce / 8; + pkt_len = skb->len; + stats = rtl8152_get_stats(netdev); +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + vlan_tci = rtl_vlan_get_tag(skb); - switch (tp->version) { - case RTL_VER_03: - case RTL_VER_04: - case RTL_VER_05: - case RTL_VER_06: - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_TIMEOUT, - ocp_data); - break; + if (vlan_tci) + vlan_gro_receive(napi, tp->vlgrp, vlan_tci, + skb); + else + napi_gro_receive(napi, skb); +#else + napi_gro_receive(napi, skb); +#endif - case RTL_VER_08: - case RTL_VER_09: - case RTL_VER_14: - /* The RTL8153B uses USB_RX_EXTRA_AGGR_TMR for rx timeout - * primarily. For USB_RX_EARLY_TIMEOUT, we fix it to 1264ns. + work_done++; + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) + netdev->last_rx = jiffies; +#endif + stats->rx_packets++; + stats->rx_bytes += pkt_len; + } + } + + if (list_empty(&tp->rx_done) || work_done >= budget) + goto out1; + + clear_bit(RX_EPROTO, &tp->flags); + INIT_LIST_HEAD(&rx_queue); + spin_lock_irqsave(&tp->rx_lock, flags); + list_splice_init(&tp->rx_done, &rx_queue); + spin_unlock_irqrestore(&tp->rx_lock, flags); + + list_for_each_safe(cursor, next, &rx_queue) { + struct rx_agg *agg, *agg_free; + int len_used = 0; + struct urb *urb; + void *rx_desc; + u8 *rx_data; + + /* A bulk transfer of USB may contain may packets, so the + * total packets may more than the budget. Deal with all + * packets in current bulk transfer, and stop to handle the + * next bulk transfer until next schedule, if budget is + * exhausted. */ - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_TIMEOUT, - 1264 / 8); - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EXTRA_AGGR_TMR, - ocp_data); - break; + if (work_done >= budget) + break; - case RTL_VER_10: - case RTL_VER_11: - case RTL_VER_12: - case RTL_VER_13: - case RTL_VER_15: - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_TIMEOUT, - 640 / 8); - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EXTRA_AGGR_TMR, - ocp_data); - break; + list_del_init(cursor); - default: - break; - } -} + agg = list_entry(cursor, struct rx_agg, list); + urb = agg->urb; + if (urb->status != 0 || urb->actual_length < ETH_ZLEN) + goto submit; -static void r8153_set_rx_early_size(struct r8152 *tp) -{ - u32 ocp_data = tp->rx_buf_sz - rx_reserved_size(tp->netdev->mtu); + agg_free = rtl_get_free_rx(tp, GFP_ATOMIC); - switch (tp->version) { - case RTL_VER_03: - case RTL_VER_04: - case RTL_VER_05: - case RTL_VER_06: - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, - ocp_data / 4); - break; - case RTL_VER_08: - case RTL_VER_09: - case RTL_VER_14: - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, - ocp_data / 8); - break; - case RTL_TEST_01: - case RTL_VER_10: - case RTL_VER_11: - case RTL_VER_12: - case RTL_VER_13: - case RTL_VER_15: - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, - ocp_data / 8); - break; - default: - WARN_ON_ONCE(1); - break; - } -} + rx_desc = agg->buffer; + rx_data = agg->buffer; + len_used += tp->rx_desc.size; -static int rtl8153_enable(struct r8152 *tp) -{ - u32 ocp_data; + while (urb->actual_length > len_used) { + struct net_device *netdev = tp->netdev; + struct net_device_stats *stats; + unsigned int pkt_len, rx_frag_head_sz, len; + struct sk_buff *skb; + bool use_frags; - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return -ENODEV; + WARN_ON_ONCE(skb_queue_len(&tp->rx_queue) >= 1000); - set_tx_qlen(tp); - rtl_set_eee_plus(tp); - r8153_set_rx_early_timeout(tp); - r8153_set_rx_early_size(tp); + tp->rx_desc.len(tp, rx_desc, &pkt_len); + if (pkt_len < ETH_ZLEN) + break; - rtl_set_ifg(tp, rtl8152_get_speed(tp)); + len_used += pkt_len; + if (urb->actual_length < len_used) + break; - switch (tp->version) { - case RTL_VER_14: - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK); - ocp_data &= ~FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); - usleep_range(1000, 2000); - ocp_data |= FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); - break; - default: - break; - } + stats = rtl8152_get_stats(netdev); - return rtl_enable(tp); -} + pkt_len -= ETH_FCS_LEN; + len = pkt_len; + rx_data += tp->rx_desc.size; -static void rtl_disable(struct r8152 *tp) -{ - u32 ocp_data; - int i; + if (!agg_free || tp->rx_copybreak > len) + use_frags = false; + else + use_frags = true; + + if (use_frags) { + /* If the budget is exhausted, the packet + * would be queued in the driver. That is, + * napi_gro_frags() wouldn't be called, so + * we couldn't use napi_get_frags(). + */ + if (work_done >= budget) { + rx_frag_head_sz = tp->rx_copybreak; + skb = napi_alloc_skb(napi, + rx_frag_head_sz); + } else { + rx_frag_head_sz = 0; + skb = napi_get_frags(napi); + } + } else { + rx_frag_head_sz = 0; + skb = napi_alloc_skb(napi, len); + } - if (test_bit(RTL8152_UNPLUG, &tp->flags)) { - rtl_drop_queued_tx(tp); - return; - } + if (!skb) { + stats->rx_dropped++; + goto find_next_rx; + } - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data &= ~RCR_ACPT_ALL; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); + tp->rx_desc.csum(tp, rx_desc, skb); +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + skb->dev = netdev; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ + tp->rx_desc.vlan_put_tag(tp, rx_desc, skb); +#else + tp->rx_desc.vlan_tag(tp, rx_desc, skb); +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) */ - rtl_drop_queued_tx(tp); + if (use_frags) { + if (rx_frag_head_sz) { + memcpy(skb->data, rx_data, + rx_frag_head_sz); + skb_put(skb, rx_frag_head_sz); + len -= rx_frag_head_sz; + rx_data += rx_frag_head_sz; + skb->protocol = eth_type_trans(skb, + netdev); + } - for (i = 0; i < RTL8152_MAX_TX; i++) - usb_kill_urb(tp->tx_info[i].urb); + skb_add_rx_frag(skb, 0, agg->page, + agg_offset(agg, rx_data), + len, SKB_DATA_ALIGN(len)); + get_page(agg->page); + } else { + memcpy(skb->data, rx_data, len); + skb_put(skb, len); + skb->protocol = eth_type_trans(skb, netdev); + } - rxdy_gated_en(tp, true); + if (work_done < budget) { + if (use_frags) + napi_gro_frags(napi); + else + napi_gro_receive(napi, skb); - for (i = 0; i < 1000; i++) { - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - if ((ocp_data & FIFO_EMPTY) == FIFO_EMPTY) - break; - usleep_range(1000, 2000); - } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) + netdev->last_rx = jiffies; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) */ + work_done++; + stats->rx_packets++; + stats->rx_bytes += pkt_len; + } else { + __skb_queue_tail(&tp->rx_queue, skb); + } - for (i = 0; i < 1000; i++) { - if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0) & TCR0_TX_EMPTY) - break; - usleep_range(1000, 2000); +find_next_rx: + rx_data = rx_agg_align(tp, rx_data + len + ETH_FCS_LEN); + rx_desc = rx_data; + len_used = agg_offset(agg, rx_data); + len_used += tp->rx_desc.size; + } + + WARN_ON(!agg_free && page_count(agg->page) > 1); + + if (agg_free) { + spin_lock_irqsave(&tp->rx_lock, flags); + if (page_count(agg->page) == 1) { + list_add(&agg_free->list, &tp->rx_used); + } else { + list_add_tail(&agg->list, &tp->rx_used); + agg = agg_free; + urb = agg->urb; + } + spin_unlock_irqrestore(&tp->rx_lock, flags); + } + +submit: + if (!ret) { + ret = r8152_submit_rx(tp, agg, GFP_ATOMIC); + } else { + urb->actual_length = 0; + list_add_tail(&agg->list, next); + } } - rtl_stop_rx(tp); + /* Splice the remained list back to rx_done for next schedule */ + if (!list_empty(&rx_queue)) { + spin_lock_irqsave(&tp->rx_lock, flags); + list_splice(&rx_queue, &tp->rx_done); + spin_unlock_irqrestore(&tp->rx_lock, flags); + } - rtl8152_nic_reset(tp); +out1: + return work_done; } -static void r8152_power_cut_en(struct r8152 *tp, bool enable) +static void tx_bottom(struct r8152 *tp) { - u32 ocp_data; + int res; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CTRL); - if (enable) - ocp_data |= POWER_CUT; - else - ocp_data &= ~POWER_CUT; - ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data); + do { + struct net_device *netdev = tp->netdev; + struct tx_agg *agg; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS); - ocp_data &= ~RESUME_INDICATE; - ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data); -} + if (skb_queue_empty(&tp->tx_queue)) + break; -static void rtl_rx_vlan_en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; + agg = r8152_get_tx_agg(tp); + if (!agg) + break; - switch (tp->version) { - case RTL_VER_01: - case RTL_VER_02: - case RTL_VER_03: - case RTL_VER_04: - case RTL_VER_05: - case RTL_VER_06: - case RTL_VER_07: - case RTL_VER_08: - case RTL_VER_09: - case RTL_VER_14: - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR); - if (enable) - ocp_data |= CPCR_RX_VLAN; + if (tp->sg_use) + res = r8152_tx_agg_sg_fill(tp, agg); else - ocp_data &= ~CPCR_RX_VLAN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data); - break; + res = r8152_tx_agg_fill(tp, agg); - case RTL_TEST_01: - case RTL_VER_10: - case RTL_VER_11: - case RTL_VER_12: - case RTL_VER_13: - case RTL_VER_15: - default: - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_RCR1); - if (enable) - ocp_data |= OUTER_VLAN | INNER_VLAN; - else - ocp_data &= ~(OUTER_VLAN | INNER_VLAN); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RCR1, ocp_data); - break; - } -} + if (!res) + continue; -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + if (res == -ENODEV) { + rtl_set_unplug(tp); + netif_device_detach(netdev); + } else { + struct net_device_stats *stats = &netdev->stats; + unsigned long flags; -static void -rtl8152_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) + netif_warn(tp, tx_err, netdev, + "failed tx_urb %d\n", res); + stats->tx_dropped += agg->skb_num; + + spin_lock_irqsave(&tp->tx_lock, flags); + list_add_tail(&agg->list, &tp->tx_free); + spin_unlock_irqrestore(&tp->tx_lock, flags); + } + } while (res == 0); +} + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0) +static void bottom_half(unsigned long t) +#else +static void bottom_half(struct tasklet_struct *t) +#endif { - struct r8152 *tp = netdev_priv(dev); + struct r8152 *tp = from_tasklet(tp, t, tx_tl); - if (unlikely(tp->rtk_enable_diag)) + if (test_bit(RTL8152_UNPLUG, &tp->flags)) return; - if (usb_autopm_get_interface(tp->intf) < 0) + if (!test_bit(WORK_ENABLE, &tp->flags)) return; - mutex_lock(&tp->control); + /* When link down, the driver would cancel all bulks. */ + /* This avoid the re-submitting bulk */ + if (!netif_carrier_ok(tp->netdev)) + return; - tp->vlgrp = grp; - if (tp->vlgrp) - rtl_rx_vlan_en(tp, true); - else - rtl_rx_vlan_en(tp, false); + clear_bit(SCHEDULE_TASKLET, &tp->flags); - mutex_unlock(&tp->control); + tx_bottom(tp); } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - -static void rtl8152_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) +static inline int __r8152_poll(struct r8152 *tp, int budget) { - struct r8152 *tp = netdev_priv(dev); + struct napi_struct *napi = &tp->napi; + int work_done; - vlan_group_set_device(tp->vlgrp, vid, NULL); -} + if (!budget) + return 0; -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ + work_done = rx_bottom(tp, budget); + if (work_done < budget) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0) + napi_complete_done(napi, work_done); #else + if (!napi_complete_done(napi, work_done)) + goto out; +#endif + if (!list_empty(&tp->rx_done)) + napi_schedule(napi); + } -static int rtl8152_set_features(struct net_device *dev, - netdev_features_t features) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) +out: +#endif + return work_done; +} + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + +static int r8152_poll(struct net_device *dev, int *budget) { - netdev_features_t changed = features ^ dev->features; struct r8152 *tp = netdev_priv(dev); - int ret; + int quota = min(dev->quota, *budget); + int work_done; - if (unlikely(tp->rtk_enable_diag)) - return -EBUSY; - - ret = usb_autopm_get_interface(tp->intf); - if (ret < 0) - goto out; + work_done = __r8152_poll(tp, quota); - mutex_lock(&tp->control); + *budget -= work_done; + dev->quota -= work_done; - if (changed & NETIF_F_HW_VLAN_CTAG_RX) { - if (features & NETIF_F_HW_VLAN_CTAG_RX) - rtl_rx_vlan_en(tp, true); - else - rtl_rx_vlan_en(tp, false); - } + return (work_done >= quota); +} - mutex_unlock(&tp->control); +#else - usb_autopm_put_interface(tp->intf); +static int r8152_poll(struct napi_struct *napi, int budget) +{ + struct r8152 *tp = container_of(napi, struct r8152, napi); -out: - return ret; + return __r8152_poll(tp, budget); } -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) */ - -#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST) +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) */ -static u32 __rtl_get_wol(struct r8152 *tp) +static +int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags) { - u32 ocp_data; - u32 wolopts = 0; + int ret; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); - if (ocp_data & LINK_ON_WAKE_EN) - wolopts |= WAKE_PHY; + /* The rx would be stopped, so skip submitting */ + if (test_bit(RTL8152_UNPLUG, &tp->flags) || + !test_bit(WORK_ENABLE, &tp->flags) || !netif_carrier_ok(tp->netdev)) + return 0; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5); - if (ocp_data & UWF_EN) - wolopts |= WAKE_UCAST; - if (ocp_data & BWF_EN) - wolopts |= WAKE_BCAST; - if (ocp_data & MWF_EN) - wolopts |= WAKE_MCAST; + usb_fill_bulk_urb(agg->urb, tp->udev, tp->pipe_in, + agg->buffer, tp->rx_buf_sz, + (usb_complete_t)read_bulk_callback, agg); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL); - if (ocp_data & MAGIC_EN) - wolopts |= WAKE_MAGIC; + ret = usb_submit_urb(agg->urb, mem_flags); + if (ret == -ENODEV) { + rtl_set_unplug(tp); + netif_device_detach(tp->netdev); + } else if (ret) { + struct urb *urb = agg->urb; + unsigned long flags; - return wolopts; -} + urb->actual_length = 0; + spin_lock_irqsave(&tp->rx_lock, flags); + list_add_tail(&agg->list, &tp->rx_done); + spin_unlock_irqrestore(&tp->rx_lock, flags); -static void __rtl_set_wol(struct r8152 *tp, u32 wolopts) -{ - u32 ocp_data; + netif_err(tp, rx_err, tp->netdev, + "Couldn't submit rx[%p], ret = %d\n", agg, ret); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + napi_schedule(&tp->napi); + } - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); - ocp_data &= ~LINK_ON_WAKE_EN; - if (wolopts & WAKE_PHY) - ocp_data |= LINK_ON_WAKE_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data); + return ret; +} - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5); - ocp_data &= ~(UWF_EN | BWF_EN | MWF_EN); - if (wolopts & WAKE_UCAST) - ocp_data |= UWF_EN; - if (wolopts & WAKE_BCAST) - ocp_data |= BWF_EN; - if (wolopts & WAKE_MCAST) - ocp_data |= MWF_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG5, ocp_data); +static void rtl_drop_queued_tx(struct r8152 *tp) +{ + struct net_device_stats *stats = rtl8152_get_stats(tp->netdev); + struct sk_buff_head skb_head, *tx_queue = &tp->tx_queue; + struct sk_buff *skb; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); + if (skb_queue_empty(tx_queue)) + return; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL); - ocp_data &= ~MAGIC_EN; - if (wolopts & WAKE_MAGIC) - ocp_data |= MAGIC_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL, ocp_data); + __skb_queue_head_init(&skb_head); + spin_lock_bh(&tx_queue->lock); + skb_queue_splice_init(tx_queue, &skb_head); + spin_unlock_bh(&tx_queue->lock); - if (wolopts & WAKE_ANY) - device_set_wakeup_enable(&tp->udev->dev, true); - else - device_set_wakeup_enable(&tp->udev->dev, false); + while ((skb = __skb_dequeue(&skb_head))) { + dev_kfree_skb(skb); + stats->tx_dropped++; + } } -static void r8153_mac_clk_speed_down(struct r8152 *tp, bool enable) +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) +static void rtl8152_tx_timeout(struct net_device *netdev) +#else +static void rtl8152_tx_timeout(struct net_device *netdev, unsigned int txqueue) +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) */ { - u32 ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2); + struct r8152 *tp = netdev_priv(netdev); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) + int i; +#endif - /* MAC clock speed down */ - if (enable) - ocp_data |= MAC_CLK_SPDWN_EN; - else - ocp_data &= ~MAC_CLK_SPDWN_EN; + netif_warn(tp, tx_err, netdev, "Tx timeout\n"); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, ocp_data); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) + for (i = 0; i < RTL8152_MAX_TX; i++) + usb_unlink_urb(tp->tx_info[i].urb); +#else + usb_queue_reset_device(tp->intf); +#endif } -static void r8156_mac_clk_spd(struct r8152 *tp, bool enable) +static void rtl8152_set_rx_mode(struct net_device *netdev) { + struct r8152 *tp = netdev_priv(netdev); + u32 mc_filter[2]; /* Multicast hash filter */ + __le32 tmp[2]; u32 ocp_data; - /* MAC clock speed down */ - if (enable) { - /* aldps_spdwn_ratio, tp10_spdwn_ratio */ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, - 0x0403); + if (in_atomic()) { + if (netif_carrier_ok(netdev)) { + set_bit(RTL8152_SET_RX_MODE, &tp->flags); + schedule_delayed_work(&tp->schedule, 0); + } + return; + } + + clear_bit(RTL8152_SET_RX_MODE, &tp->flags); + + if (!netif_carrier_ok(netdev)) + return; + + netif_stop_queue(netdev); + if (ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR, &ocp_data) < 0) + goto out; + + ocp_data &= ~RCR_ACPT_ALL; + ocp_data |= RCR_AB | RCR_APM; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2); - ocp_data &= ~EEE_SPDWN_RATIO_MASK; - ocp_data |= MAC_CLK_SPDWN_EN | 0x03; /* eee_spdwn_ratio */ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, ocp_data); + if (netdev->flags & IFF_PROMISC) { + /* Unconditionally log net taps. */ + netif_notice(tp, link, netdev, "Promiscuous mode enabled\n"); + ocp_data |= RCR_AM | RCR_AAP; + mc_filter[1] = 0xffffffff; + mc_filter[0] = 0xffffffff; + } else if ((netdev->flags & IFF_MULTICAST && + netdev_mc_count(netdev) > multicast_filter_limit) || + (netdev->flags & IFF_ALLMULTI)) { + /* Too many to filter perfectly -- accept all multicasts. */ + ocp_data |= RCR_AM; + mc_filter[1] = 0xffffffff; + mc_filter[0] = 0xffffffff; } else { - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2); - ocp_data &= ~MAC_CLK_SPDWN_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, ocp_data); - } -} +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) + struct dev_mc_list *mclist; + unsigned int i; -static void r8153_u1u2en(struct r8152 *tp, bool enable) -{ - u8 u1u2[8]; + mc_filter[1] = mc_filter[0] = 0; + for (i = 0, mclist = netdev->mc_list; + mclist && i < netdev->mc_count; + i++, mclist = mclist->next) { + int bit_nr; - if (enable) - memset(u1u2, 0xff, sizeof(u1u2)); - else - memset(u1u2, 0x00, sizeof(u1u2)); + bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; + mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); + ocp_data |= RCR_AM; + } +#else + mc_filter[1] = 0; + mc_filter[0] = 0; - usb_ocp_write(tp, USB_TOLERANCE, BYTE_EN_SIX_BYTES, sizeof(u1u2), u1u2); -} + if (netdev->flags & IFF_MULTICAST) { + struct netdev_hw_addr *ha; -static void r8153b_u1u2en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; + netdev_for_each_mc_addr(ha, netdev) { + int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_LPM_CONFIG); - if (enable) - ocp_data |= LPM_U1U2_EN; - else - ocp_data &= ~LPM_U1U2_EN; + mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); + ocp_data |= RCR_AM; + } + } +#endif + } - ocp_write_word(tp, MCU_TYPE_USB, USB_LPM_CONFIG, ocp_data); -} + tmp[0] = __cpu_to_le32(swab32(mc_filter[1])); + tmp[1] = __cpu_to_le32(swab32(mc_filter[0])); -static void r8153_u2p3en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; + pla_ocp_write(tp, PLA_MAR, BYTE_EN_DWORD, sizeof(tmp), tmp); + ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL); - if (enable) - ocp_data |= U2P3_ENABLE; - else - ocp_data &= ~U2P3_ENABLE; - ocp_write_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL, ocp_data); +out: /* to do */ + netif_wake_queue(netdev); } -static bool r8156b_flash_used(struct r8152 *tp) +static inline bool rtl_gso_check(struct net_device *dev, struct sk_buff *skb) { - if ((ocp_read_word(tp, MCU_TYPE_PLA, PLA_GPHY_CTRL) & GPHY_FLASH) && - !(ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL) & BYPASS_FLASH)) + struct r8152 *tp = netdev_priv(dev); + + if (tp->sg_use) + return true; + else if ((skb->len + tp->tx_desc.size) <= agg_buf_sz) return true; else return false; } -static void r8153b_ups_flags(struct r8152 *tp) -{ - u32 ups_flags = 0; - - if (tp->ups_info.green) - ups_flags |= UPS_FLAGS_EN_GREEN; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,4) - if (tp->ups_info.aldps) - ups_flags |= UPS_FLAGS_EN_ALDPS; +static netdev_features_t +rtl8152_features_check(struct sk_buff *skb, struct net_device *dev, + netdev_features_t features) +{ + u32 mss = skb_shinfo(skb)->gso_size; + int max_offset = mss ? GTTCPHO_MAX : TCPHO_MAX; - if (tp->ups_info.eee) - ups_flags |= UPS_FLAGS_EN_EEE; + if ((mss || skb->ip_summed == CHECKSUM_PARTIAL) && + skb_transport_offset(skb) > max_offset) + features &= ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK); + else if (!rtl_gso_check(dev, skb)) + features &= ~NETIF_F_GSO_MASK; - if (tp->ups_info.flow_control) - ups_flags |= UPS_FLAGS_EN_FLOW_CTR; + return features; +} +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,4) */ - if (tp->ups_info.eee_ckdiv) - ups_flags |= UPS_FLAGS_EN_EEE_CKDIV; +static netdev_tx_t rtl8152_start_xmit(struct sk_buff *skb, + struct net_device *netdev) +{ + struct r8152 *tp = netdev_priv(netdev); - if (tp->ups_info.eee_cmod_lv) - ups_flags |= UPS_FLAGS_EEE_CMOD_LV_EN; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,4) + if (unlikely(!rtl_gso_check(netdev, skb))) { + netdev_features_t features = netdev->features; + struct sk_buff *segs, *nskb; - if (tp->ups_info.r_tune) - ups_flags |= UPS_FLAGS_R_TUNE; + features &= ~(NETIF_F_TSO | NETIF_F_TSO6); + segs = skb_gso_segment(skb, features); + if (IS_ERR(segs) || !segs) + goto free_skb; - if (tp->ups_info._10m_ckdiv) - ups_flags |= UPS_FLAGS_EN_10M_CKDIV; + do { + nskb = segs; + segs = segs->next; + nskb->next = NULL; + rtl8152_start_xmit(nskb, netdev); + } while (segs); - if (tp->ups_info.eee_plloff_100) - ups_flags |= UPS_FLAGS_EEE_PLLOFF_100; +free_skb: + dev_kfree_skb_any(skb); - if (tp->ups_info.eee_plloff_giga) - ups_flags |= UPS_FLAGS_EEE_PLLOFF_GIGA; + return NETDEV_TX_OK; + } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) + netdev->trans_start = jiffies +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,18,4) */ - if (tp->ups_info._250m_ckdiv) - ups_flags |= UPS_FLAGS_250M_CKDIV; + skb_tx_timestamp(skb); - if (tp->ups_info.ctap_short_off) - ups_flags |= UPS_FLAGS_CTAP_SHORT_DIS; + skb_queue_tail(&tp->tx_queue, skb); + netdev_sent_queue(netdev, skb->len); - switch (tp->ups_info.speed_duplex) { - case NWAY_10M_HALF: - ups_flags |= ups_flags_speed(1); - break; - case NWAY_10M_FULL: - ups_flags |= ups_flags_speed(2); - break; - case NWAY_100M_HALF: - ups_flags |= ups_flags_speed(3); - break; - case NWAY_100M_FULL: - ups_flags |= ups_flags_speed(4); - break; - case NWAY_1000M_FULL: - ups_flags |= ups_flags_speed(5); - break; - case FORCE_10M_HALF: - ups_flags |= ups_flags_speed(6); - break; - case FORCE_10M_FULL: - ups_flags |= ups_flags_speed(7); - break; - case FORCE_100M_HALF: - ups_flags |= ups_flags_speed(8); - break; - case FORCE_100M_FULL: - ups_flags |= ups_flags_speed(9); - break; - default: - break; + if (!list_empty(&tp->tx_free)) { + if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) { + set_bit(SCHEDULE_TASKLET, &tp->flags); + schedule_delayed_work(&tp->schedule, 0); + } else { + usb_mark_last_busy(tp->udev); + tasklet_schedule(&tp->tx_tl); + } + } else if (skb_queue_len(&tp->tx_queue) > tp->tx_qlen) { + netif_stop_queue(netdev); } - ocp_write_dword(tp, MCU_TYPE_USB, USB_UPS_FLAGS, ups_flags); + return NETDEV_TX_OK; } -static void r8156_ups_flags(struct r8152 *tp) +static int r8152b_reset_packet_filter(struct r8152 *tp) { - u32 ups_flags = 0; + int ret; - if (tp->ups_info.green) - ups_flags |= UPS_FLAGS_EN_GREEN; + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_FMC, FMC_FCR_MCU_EN); + if (ret < 0) + goto out; - if (tp->ups_info.aldps) - ups_flags |= UPS_FLAGS_EN_ALDPS; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_FMC, FMC_FCR_MCU_EN); - if (tp->ups_info.eee) - ups_flags |= UPS_FLAGS_EN_EEE; +out: + return ret; +} - if (tp->ups_info.flow_control) - ups_flags |= UPS_FLAGS_EN_FLOW_CTR; +static int rtl8152_nic_reset(struct r8152 *tp) +{ + int i, ret; - if (tp->ups_info.eee_ckdiv) - ups_flags |= UPS_FLAGS_EN_EEE_CKDIV; + switch (tp->version) { + case RTL_TEST_01: + case RTL_VER_10: + case RTL_VER_11: + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_CR, CR_TE); + if (ret < 0) + goto out; - if (tp->ups_info._10m_ckdiv) - ups_flags |= UPS_FLAGS_EN_10M_CKDIV; + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_BMU_RESET, + BMU_RESET_EP_IN); + if (ret < 0) + goto out; - if (tp->ups_info.eee_plloff_100) - ups_flags |= UPS_FLAGS_EEE_PLLOFF_100; + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + CDC_ECM_EN); + if (ret < 0) + goto out; - if (tp->ups_info.eee_plloff_giga) - ups_flags |= UPS_FLAGS_EEE_PLLOFF_GIGA; + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_CR, CR_RE); + if (ret < 0) + goto out; - if (tp->ups_info._250m_ckdiv) - ups_flags |= UPS_FLAGS_250M_CKDIV; + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_BMU_RESET, + BMU_RESET_EP_IN); + if (ret < 0) + goto out; - switch (tp->ups_info.speed_duplex) { - case FORCE_10M_HALF: - ups_flags |= ups_flags_speed(0); - break; - case FORCE_10M_FULL: - ups_flags |= ups_flags_speed(1); - break; - case FORCE_100M_HALF: - ups_flags |= ups_flags_speed(2); - break; - case FORCE_100M_FULL: - ups_flags |= ups_flags_speed(3); - break; - case NWAY_10M_HALF: - ups_flags |= ups_flags_speed(4); - break; - case NWAY_10M_FULL: - ups_flags |= ups_flags_speed(5); - break; - case NWAY_100M_HALF: - ups_flags |= ups_flags_speed(6); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + CDC_ECM_EN); break; - case NWAY_100M_FULL: - ups_flags |= ups_flags_speed(7); - break; - case NWAY_1000M_FULL: - ups_flags |= ups_flags_speed(8); - break; - case NWAY_2500M_FULL: - ups_flags |= ups_flags_speed(9); - break; - default: - break; - } + case RTL_VER_01: + case RTL_VER_02: + case RTL_VER_03: + case RTL_VER_04: + case RTL_VER_05: + case RTL_VER_06: + case RTL_VER_07: + case RTL_VER_08: + case RTL_VER_09: + case RTL_VER_12: + case RTL_VER_13: + case RTL_VER_14: + case RTL_VER_15: + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, CR_RST); + if (ret < 0) + goto out; - switch (tp->ups_info.lite_mode) { - case 1: - ups_flags |= 0 << 5; - break; - case 2: - ups_flags |= 2 << 5; + for (i = 0; i < 1000; i++) { + u32 ocp_data; + + ret = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR, + &ocp_data); + if (ret < 0 || !(ocp_data & CR_RST)) + break; + usleep_range(100, 400); + } break; - case 0: + case RTL_VER_16: + case RTL_VER_17: default: - ups_flags |= 1 << 5; + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_CR, + CR_RE | CR_TE); break; - } - ocp_write_dword(tp, MCU_TYPE_USB, USB_UPS_FLAGS, ups_flags); + } +out: + return ret; } -static void rtl_green_en(struct r8152 *tp, bool enable) +static void set_tx_qlen(struct r8152 *tp) { - u16 data; - - data = sram_read(tp, SRAM_GREEN_CFG); - if (enable) - data |= GREEN_ETH_EN; + if (tp->sg_use) + tp->tx_qlen = RTL_MAX_SG_NUM; else - data &= ~GREEN_ETH_EN; - sram_write(tp, SRAM_GREEN_CFG, data); - - tp->ups_info.green = enable; + tp->tx_qlen = agg_buf_sz / (mtu_to_size(tp->netdev->mtu) + + tp->tx_desc.size); } -static void r8153b_green_en(struct r8152 *tp, bool enable) +static u16 rtl8152_get_speed(struct r8152 *tp) { - if (enable) { - sram_write(tp, 0x8045, 0); /* 10M abiq&ldvbias */ - sram_write(tp, 0x804d, 0x1222); /* 100M short abiq&ldvbias */ - sram_write(tp, 0x805d, 0x0022); /* 1000M short abiq&ldvbias */ - } else { - sram_write(tp, 0x8045, 0x2444); /* 10M abiq&ldvbias */ - sram_write(tp, 0x804d, 0x2444); /* 100M short abiq&ldvbias */ - sram_write(tp, 0x805d, 0x2444); /* 1000M short abiq&ldvbias */ - } + u32 ocp_data; - rtl_green_en(tp, true); + if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHYSTATUS, &ocp_data) < 0) + return 0; /* to do */ + else + return (u16)ocp_data; } -static u16 r8153_phy_status(struct r8152 *tp, u16 desired) +static int rtl_eee_plus_en(struct r8152 *tp, bool enable) { - u16 data; - int i; - - for (i = 0; i < 500; i++) { - data = ocp_reg_read(tp, OCP_PHY_STATUS); - data &= PHY_STAT_MASK; - if (desired) { - if (data == desired) - break; - } else if (data == PHY_STAT_LAN_ON || data == PHY_STAT_PWRDN || - data == PHY_STAT_EXT_INIT) { - break; - } - - msleep(20); - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - break; - } + if (enable) + return ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_EEEP_CR, + EEEP_CR_EEEP_TX); + else + return ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_EEEP_CR, + EEEP_CR_EEEP_TX); +} - return data; +static int rtl_set_eee_plus(struct r8152 *tp) +{ + if (rtl8152_get_speed(tp) & _10bps) + return rtl_eee_plus_en(tp, true); + else + return rtl_eee_plus_en(tp, false); } -static void r8153b_ups_en(struct r8152 *tp, bool enable) +static int rxdy_gated_en(struct r8152 *tp, bool enable) { - u32 ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_POWER_CUT); + if (enable) + return ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MISC_1, + RXDY_GATED_EN); + else + return ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_MISC_1, + RXDY_GATED_EN); +} - if (enable) { - r8153b_ups_flags(tp); +static int rtl_start_rx(struct r8152 *tp) +{ + struct rx_agg *agg, *agg_next; + struct list_head tmp_list; + unsigned long flags; + int ret = 0, i = 0; - ocp_data |= UPS_EN | USP_PREWAKE | PHASE2_EN; - ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); + INIT_LIST_HEAD(&tmp_list); - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_2); - ocp_data |= UPS_FORCE_PWR_DOWN; - ocp_write_byte(tp, MCU_TYPE_USB, USB_MISC_2, ocp_data); - } else { - ocp_data &= ~(UPS_EN | USP_PREWAKE); - ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); + spin_lock_irqsave(&tp->rx_lock, flags); - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_2); - ocp_data &= ~(UPS_FORCE_PWR_DOWN | UPS_NO_UPS); - ocp_write_byte(tp, MCU_TYPE_USB, USB_MISC_2, ocp_data); + INIT_LIST_HEAD(&tp->rx_done); + INIT_LIST_HEAD(&tp->rx_used); - if (ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0) & PCUT_STATUS) { - int i; + list_splice_init(&tp->rx_info, &tmp_list); - for (i = 0; i < 500; i++) { - if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & - AUTOLOAD_DONE) - break; - msleep(20); - } + spin_unlock_irqrestore(&tp->rx_lock, flags); - tp->rtl_ops.hw_phy_cfg(tp); + list_for_each_entry_safe(agg, agg_next, &tmp_list, info_list) { + INIT_LIST_HEAD(&agg->list); - rtl8152_set_speed(tp, tp->autoneg, tp->speed, - tp->duplex, tp->advertising); + /* Only RTL8152_MAX_RX rx_agg need to be submitted. */ + if (++i > RTL8152_MAX_RX) { + spin_lock_irqsave(&tp->rx_lock, flags); + list_add_tail(&agg->list, &tp->rx_used); + spin_unlock_irqrestore(&tp->rx_lock, flags); + } else if (unlikely(ret < 0)) { + spin_lock_irqsave(&tp->rx_lock, flags); + list_add_tail(&agg->list, &tp->rx_done); + spin_unlock_irqrestore(&tp->rx_lock, flags); + } else { + ret = r8152_submit_rx(tp, agg, GFP_KERNEL); } } + + spin_lock_irqsave(&tp->rx_lock, flags); + WARN_ON(!list_empty(&tp->rx_info)); + list_splice(&tmp_list, &tp->rx_info); + spin_unlock_irqrestore(&tp->rx_lock, flags); + + return ret; } -static void r8153c_ups_en(struct r8152 *tp, bool enable) +static int rtl_stop_rx(struct r8152 *tp) { - u32 ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_POWER_CUT); - - if (enable) { - r8153b_ups_flags(tp); - - ocp_data |= UPS_EN | USP_PREWAKE | PHASE2_EN; - ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_2); - ocp_data |= UPS_FORCE_PWR_DOWN; - ocp_data &= ~BIT(7); - ocp_write_byte(tp, MCU_TYPE_USB, USB_MISC_2, ocp_data); - } else { - ocp_data &= ~(UPS_EN | USP_PREWAKE); - ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_2); - ocp_data &= ~(UPS_FORCE_PWR_DOWN | UPS_NO_UPS); - ocp_write_byte(tp, MCU_TYPE_USB, USB_MISC_2, ocp_data); + struct rx_agg *agg, *agg_next; + struct list_head tmp_list; + unsigned long flags; - if (ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0) & PCUT_STATUS) { - int i; + INIT_LIST_HEAD(&tmp_list); - for (i = 0; i < 500; i++) { - if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & - AUTOLOAD_DONE) - break; - msleep(20); - } + /* The usb_kill_urb() couldn't be used in atomic. + * Therefore, move the list of rx_info to a tmp one. + * Then, list_for_each_entry_safe could be used without + * spin lock. + */ - tp->rtl_ops.hw_phy_cfg(tp); + spin_lock_irqsave(&tp->rx_lock, flags); + list_splice_init(&tp->rx_info, &tmp_list); + spin_unlock_irqrestore(&tp->rx_lock, flags); - rtl8152_set_speed(tp, tp->autoneg, tp->speed, - tp->duplex, tp->advertising); - } + list_for_each_entry_safe(agg, agg_next, &tmp_list, info_list) { + /* At least RTL8152_MAX_RX rx_agg have the page_count being + * equal to 1, so the other ones could be freed safely. + */ + if (page_count(agg->page) > 1) + free_rx_agg(tp, agg); + else + usb_kill_urb(agg->urb); + } - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + /* Move back the list of temp to the rx_info */ + spin_lock_irqsave(&tp->rx_lock, flags); + WARN_ON(!list_empty(&tp->rx_info)); + list_splice(&tmp_list, &tp->rx_info); + spin_unlock_irqrestore(&tp->rx_lock, flags); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); - ocp_data |= BIT(8); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data); + while (!skb_queue_empty(&tp->rx_queue)) + dev_kfree_skb(__skb_dequeue(&tp->rx_queue)); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); - } + return 0; } -static void r8156_ups_en(struct r8152 *tp, bool enable) +static int rtl_set_ifg(struct r8152 *tp, u16 speed) { - if (enable) { - u32 ocp_data; - - r8156_ups_flags(tp); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_POWER_CUT); - ocp_data |= UPS_EN | USP_PREWAKE | PHASE2_EN; - ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_2); - ocp_data |= UPS_FORCE_PWR_DOWN; - ocp_write_byte(tp, MCU_TYPE_USB, USB_MISC_2, ocp_data); - - switch (tp->version) { - case RTL_VER_13: - case RTL_VER_15: - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPHY_XTAL); - ocp_data &= ~OOBS_POLLING; - ocp_write_byte(tp, MCU_TYPE_USB, USB_UPHY_XTAL, ocp_data); + int ret; - if (r8156b_flash_used(tp)) { - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, - USB_GPHY_CTRL); - ocp_data &= ~GPHY_PATCH_DONE; - ocp_write_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL, - ocp_data); - } - break; - default: - break; - } + if ((speed & (_10bps | _100bps)) && !(speed & FULL_DUP)) { + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_TCR1, IFG_MASK, + IFG_144NS); + if (ret < 0) + goto out; + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, + TX10MIDLE_EN); } else { - u32 ocp_data; - - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_POWER_CUT); - ocp_data &= ~(UPS_EN | USP_PREWAKE); - ocp_write_byte(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_2); - ocp_data &= ~(UPS_FORCE_PWR_DOWN | UPS_NO_UPS); - ocp_write_byte(tp, MCU_TYPE_USB, USB_MISC_2, ocp_data); - - if (ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0) & PCUT_STATUS) { - tp->rtl_ops.hw_phy_cfg(tp); - - rtl8152_set_speed(tp, tp->autoneg, tp->speed, - tp->duplex, tp->advertising); - } else { - switch (tp->version) { - case RTL_VER_13: - case RTL_VER_15: - if (r8156b_flash_used(tp)) { - ocp_data = ocp_read_word(tp, - MCU_TYPE_USB, - USB_GPHY_CTRL); - ocp_data |= GPHY_PATCH_DONE; - ocp_write_word(tp, MCU_TYPE_USB, - USB_GPHY_CTRL, - ocp_data); - } - break; - default: - break; - } - } + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_TCR1, IFG_MASK, + IFG_96NS); + if (ret < 0) + goto out; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, + TX10MIDLE_EN); } -} - -static void r8153_power_cut_en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; - - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_POWER_CUT); - if (enable) - ocp_data |= PWR_EN | PHASE2_EN; - else - ocp_data &= ~(PWR_EN | PHASE2_EN); - ocp_write_word(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); - - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0); - ocp_data &= ~PCUT_STATUS; - ocp_write_word(tp, MCU_TYPE_USB, USB_MISC_0, ocp_data); -} - -static void r8153b_power_cut_en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_POWER_CUT); - if (enable) - ocp_data |= PWR_EN | PHASE2_EN; - else - ocp_data &= ~PWR_EN; - ocp_write_word(tp, MCU_TYPE_USB, USB_POWER_CUT, ocp_data); - - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0); - ocp_data &= ~PCUT_STATUS; - ocp_write_word(tp, MCU_TYPE_USB, USB_MISC_0, ocp_data); -} - -static void r8153_queue_wake(struct r8152 *tp, bool enable) -{ - u32 ocp_data; - - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_INDICATE_FALG); - if (enable) - ocp_data |= UPCOMING_RUNTIME_D3; - else - ocp_data &= ~UPCOMING_RUNTIME_D3; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_INDICATE_FALG, ocp_data); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_SUSPEND_FLAG); - ocp_data &= ~LINK_CHG_EVENT; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_SUSPEND_FLAG, ocp_data); - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); - ocp_data &= ~LINK_CHANGE_FLAG; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, ocp_data); +out: + return ret; } -static bool rtl_can_wakeup(struct r8152 *tp) +static inline void r8153b_rx_agg_chg_indicate(struct r8152 *tp) { - struct usb_device *udev = tp->udev; - - return (udev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_WAKEUP); + ocp_write_byte(tp, MCU_TYPE_USB, USB_UPT_RXDMA_OWN, + OWN_UPDATE | OWN_CLEAR); } -static void rtl_runtime_suspend_enable(struct r8152 *tp, bool enable) +static int rtl_enable(struct r8152 *tp) { - if (enable) { - u32 ocp_data; - - __rtl_set_wol(tp, WAKE_ANY); - - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); - ocp_data |= LINK_OFF_WAKE_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data); - - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); - } else { - u32 ocp_data; - - __rtl_set_wol(tp, tp->saved_wolopts); + int ret; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + ret = r8152b_reset_packet_filter(tp); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); - ocp_data &= ~LINK_OFF_WAKE_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_CR, CR_RE | CR_TE); + if (ret < 0) + goto out; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); + switch (tp->version) { + case RTL_VER_01: + case RTL_VER_02: + case RTL_VER_03: + case RTL_VER_04: + case RTL_VER_05: + case RTL_VER_06: + case RTL_VER_07: + break; + default: + r8153b_rx_agg_chg_indicate(tp); + break; } -} - -static void rtl8153_runtime_enable(struct r8152 *tp, bool enable) -{ - if (enable) { - if (tp->version == RTL_VER_06) - r8153_queue_wake(tp, true); - r8153_u1u2en(tp, false); - r8153_u2p3en(tp, false); - rtl_runtime_suspend_enable(tp, true); - } else { - if (tp->version == RTL_VER_06) - r8153_queue_wake(tp, false); - rtl_runtime_suspend_enable(tp, false); - - switch (tp->version) { - case RTL_VER_03: - case RTL_VER_04: - break; - case RTL_VER_05: - case RTL_VER_06: - default: - r8153_u2p3en(tp, true); - break; - } - r8153_u1u2en(tp, true); - } -} + ret = rxdy_gated_en(tp, false); -static void rtl8153b_runtime_enable(struct r8152 *tp, bool enable) -{ - if (enable) { - r8153_queue_wake(tp, true); - r8153b_u1u2en(tp, false); - r8153_u2p3en(tp, false); - rtl_runtime_suspend_enable(tp, true); - r8153b_ups_en(tp, true); - } else { - r8153b_ups_en(tp, false); - r8153_queue_wake(tp, false); - rtl_runtime_suspend_enable(tp, false); -// r8153_u2p3en(tp, true); - if (tp->udev->speed >= USB_SPEED_SUPER) - r8153b_u1u2en(tp, true); - } -} + netdev_reset_queue(tp->netdev); -static void rtl8153c_runtime_enable(struct r8152 *tp, bool enable) -{ - if (enable) { - r8153_queue_wake(tp, true); - r8153b_u1u2en(tp, false); - r8153_u2p3en(tp, false); - rtl_runtime_suspend_enable(tp, true); - r8153c_ups_en(tp, true); - } else { - r8153c_ups_en(tp, false); - r8153_queue_wake(tp, false); - rtl_runtime_suspend_enable(tp, false); -// r8153_u2p3en(tp, true); - r8153b_u1u2en(tp, true); - } +out: + return (ret < 0) ? ret : 0; } -static void rtl8156_runtime_enable(struct r8152 *tp, bool enable) +static int rtl8152_enable(struct r8152 *tp) { - if (enable) { - r8153_queue_wake(tp, true); - r8153b_u1u2en(tp, false); - r8153_u2p3en(tp, false); - rtl_runtime_suspend_enable(tp, true); -// if (tp->version != RTL_VER_10 || -// tp->udev->speed == USB_SPEED_HIGH) -// r8156_ups_en(tp, true); - } else { -// r8156_ups_en(tp, false); - r8153_queue_wake(tp, false); - rtl_runtime_suspend_enable(tp, false); - r8153_u2p3en(tp, true); - if (tp->udev->speed >= USB_SPEED_SUPER) - r8153b_u1u2en(tp, true); - } -} + int ret; -static int rtl_nway_restart(struct r8152 *tp) -{ - int r = -EINVAL; - int bmcr; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; - /* if autoneg is off, it's an error */ - bmcr = r8152_mdio_read(tp, MII_BMCR); + set_tx_qlen(tp); + ret = rtl_set_eee_plus(tp); + if (ret < 0) + goto out; - if (bmcr & BMCR_ANENABLE) { - bmcr |= BMCR_ANRESTART; - r8152_mdio_write(tp, MII_BMCR, bmcr); - r = 0; - } + ret = rtl_enable(tp); - return r; +out: + return ret; } -static void r8153_teredo_off(struct r8152 *tp) +static int r8153_set_rx_early_timeout(struct r8152 *tp) { - u32 ocp_data; + u32 ocp_data = tp->coalesce / 8; + int ret; switch (tp->version) { - case RTL_VER_01: - case RTL_VER_02: case RTL_VER_03: case RTL_VER_04: case RTL_VER_05: case RTL_VER_06: - case RTL_VER_07: - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG); - ocp_data &= ~(TEREDO_SEL | TEREDO_RS_EVENT_MASK | - OOB_TEREDO_EN); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, ocp_data); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_TIMEOUT, + ocp_data); break; case RTL_VER_08: case RTL_VER_09: - case RTL_TEST_01: + case RTL_VER_14: + /* The RTL8153B uses USB_RX_EXTRA_AGGR_TMR for rx timeout + * primarily. For USB_RX_EARLY_TIMEOUT, we fix it to 1264ns. + */ + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_TIMEOUT, + 1264 / 8); + if (ret < 0) + break; + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EXTRA_AGGR_TMR, + ocp_data); + break; + case RTL_VER_10: case RTL_VER_11: case RTL_VER_12: case RTL_VER_13: - case RTL_VER_14: case RTL_VER_15: + case RTL_VER_16: + case RTL_VER_17: + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_TIMEOUT, + 640 / 8); + if (ret < 0) + break; + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EXTRA_AGGR_TMR, + ocp_data); + break; + default: - /* The bit 0 ~ 7 are relative with teredo settings. They are - * W1C (write 1 to clear), so set all 1 to disable it. - */ - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, 0xff); + ret = -ENODEV; break; } - ocp_write_word(tp, MCU_TYPE_PLA, PLA_WDT6_CTRL, WDT6_SET_MODE); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_REALWOW_TIMER, 0); - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TEREDO_TIMER, 0); + return ret; } -static void rtl_reset_bmu(struct r8152 *tp) +static u32 rx_reserved_size(struct r8152 *tp, u32 mtu) { - u32 ocp_data; - - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_BMU_RESET); - ocp_data &= ~(BMU_RESET_EP_IN | BMU_RESET_EP_OUT); - ocp_write_byte(tp, MCU_TYPE_USB, USB_BMU_RESET, ocp_data); - ocp_data |= BMU_RESET_EP_IN | BMU_RESET_EP_OUT; - ocp_write_byte(tp, MCU_TYPE_USB, USB_BMU_RESET, ocp_data); + return mtu_to_size(mtu) + tp->rx_desc.size + tp->rx_desc.align; } -/* Clear the bp to stop the firmware before loading a new one */ -static void rtl_clear_bp(struct r8152 *tp, u16 type) +static int r8153_set_rx_early_size(struct r8152 *tp) { - u16 bp[16] = {0}; - u16 bp_num; + u32 ocp_data = tp->rx_buf_sz - rx_reserved_size(tp, tp->netdev->mtu); + int ret; switch (tp->version) { + case RTL_VER_03: + case RTL_VER_04: + case RTL_VER_05: + case RTL_VER_06: + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, + ocp_data / 4); + break; + case RTL_TEST_01: case RTL_VER_08: case RTL_VER_09: case RTL_VER_10: case RTL_VER_11: case RTL_VER_12: case RTL_VER_13: + case RTL_VER_14: case RTL_VER_15: - if (type == MCU_TYPE_USB) { - ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0); - bp_num = 16; - break; - } - fallthrough; - case RTL_VER_03: - case RTL_VER_04: - case RTL_VER_05: - case RTL_VER_06: - ocp_write_byte(tp, type, PLA_BP_EN, 0); - fallthrough; - case RTL_VER_01: - case RTL_VER_02: - case RTL_VER_07: - bp_num = 8; + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, + ocp_data / 8); + break; + case RTL_TEST_02: + case RTL_VER_16: + case RTL_VER_17: + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_RX_EARLY_SIZE, + ocp_data / 16); break; - case RTL_VER_14: default: - ocp_write_word(tp, type, USB_BP2_EN, 0); - bp_num = 16; + ret = -ENODEV; + WARN_ON_ONCE(1); break; } - generic_ocp_write(tp, PLA_BP_0, BYTE_EN_DWORD, bp_num << 1, bp, type); + return ret; +} - /* wait 3 ms to make sure the firmware is stopped */ - usleep_range(3000, 6000); - ocp_write_word(tp, type, PLA_BP_BA, 0); -} - -static bool rtl_check_fw_ver_ok(struct r8152 *tp, u16 index, u8 new_ver) +static int rtl8153_enable(struct r8152 *tp) { - if (!index || new_ver > ocp_read_byte(tp, MCU_TYPE_USB, index)) - return true; - else - return false; -} + int ret; -static inline void rtl_reset_ocp_base(struct r8152 *tp) -{ - tp->ocp_base = -1; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; + + set_tx_qlen(tp); + ret = rtl_set_eee_plus(tp); + if (ret < 0) + goto out; + ret = r8153_set_rx_early_timeout(tp); + if (ret < 0) + goto out; + ret = r8153_set_rx_early_size(tp); + if (ret < 0) + goto out; + + ret = rtl_set_ifg(tp, rtl8152_get_speed(tp)); + if (ret < 0) + goto out; + + switch (tp->version) { + case RTL_VER_14: + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_FW_TASK, + FC_PATCH_TASK); + if (ret < 0) + goto out; + usleep_range(1000, 2000); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_TASK, + FC_PATCH_TASK); + if (ret < 0) + goto out; + break; + default: + break; + } + + ret = rtl_enable(tp); + +out: + return ret; } -static int rtl_phy_patch_request(struct r8152 *tp, bool request, bool wait) +static int rtl_disable(struct r8152 *tp) { - u16 data, check; - int i; + int i, ret, err = 0; + u32 ocp_data; - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - if (request) { - data |= PATCH_REQUEST; - check = 0; - } else { - data &= ~PATCH_REQUEST; - check = PATCH_READY; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) { + rtl_drop_queued_tx(tp); + rtl_stop_rx(tp); + return -ENODEV; } - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); - for (i = 0; wait && i < 5000; i++) { - u32 ocp_data; + ret = ocp_dword_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR, RCR_ACPT_ALL); + if (ret < 0) + err = ret; - usleep_range(1000, 2000); - ocp_data = ocp_reg_read(tp, OCP_PHY_PATCH_STAT); - if ((ocp_data & PATCH_READY) ^ check) + rtl_drop_queued_tx(tp); + + for (i = 0; i < RTL8152_MAX_TX; i++) + usb_kill_urb(tp->tx_info[i].urb); + + ret = rxdy_gated_en(tp, true); + if (ret < 0) + err = ret; + + for (i = 0; i < 1000; i++) { + ret = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, &ocp_data); + if (ret < 0 || (ocp_data & FIFO_EMPTY) == FIFO_EMPTY) break; + usleep_range(1000, 2000); } - if (request && wait && - !(ocp_reg_read(tp, OCP_PHY_PATCH_STAT) & PATCH_READY)) { - dev_err(&tp->intf->dev, "PHY patch request fail\n"); - rtl_phy_patch_request(tp, false, false); - return -ETIME; - } else { - return 0; + for (i = 0; i < 1000; i++) { + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0, &ocp_data); + if (ret < 0 || (ocp_data & TCR0_TX_EMPTY)) + break; + usleep_range(1000, 2000); } + + rtl_stop_rx(tp); + + ret = rtl8152_nic_reset(tp); + + if (err < 0) + return err; + else + return ret; } -static void rtl_patch_key_set(struct r8152 *tp, u16 key_addr, u16 patch_key) +static int r8152_power_cut_en(struct r8152 *tp, bool enable) { - if (patch_key && key_addr) { - sram_write(tp, key_addr, patch_key); - sram_write(tp, SRAM_PHY_LOCK, PHY_PATCH_LOCK); - } else if (key_addr) { - u16 data; + int ret; - sram_write(tp, 0x0000, 0x0000); + if (enable) + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_UPS_CTRL, + POWER_CUT); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_UPS_CTRL, + POWER_CUT); + if (ret < 0) + goto out; - data = ocp_reg_read(tp, OCP_PHY_LOCK); - data &= ~PATCH_LOCK; - ocp_reg_write(tp, OCP_PHY_LOCK, data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, + RESUME_INDICATE); - sram_write(tp, key_addr, 0x0000); - } else { - WARN_ON_ONCE(1); +out: + return ret; +} + +static int rtl_rx_vlan_en(struct r8152 *tp, bool enable) +{ + int ret; + + switch (tp->version) { + case RTL_VER_01: + case RTL_VER_02: + case RTL_VER_03: + case RTL_VER_04: + case RTL_VER_05: + case RTL_VER_06: + case RTL_VER_07: + case RTL_VER_08: + case RTL_VER_09: + case RTL_VER_14: + if (enable) + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_CPCR, + CPCR_RX_VLAN); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_CPCR, + CPCR_RX_VLAN); + break; + + case RTL_TEST_01: + case RTL_VER_10: + case RTL_VER_11: + case RTL_VER_12: + case RTL_VER_13: + case RTL_VER_15: + case RTL_VER_16: + case RTL_VER_17: + default: + if (enable) + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_RCR1, + OUTER_VLAN | INNER_VLAN); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR1, + OUTER_VLAN | INNER_VLAN); + break; } + + return (ret < 0) ? ret : 0; } -static int -rtl_pre_ram_code(struct r8152 *tp, u16 key_addr, u16 patch_key, bool wait) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + +static void +rtl8152_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) { - if (rtl_phy_patch_request(tp, true, wait)) - return -ETIME; + struct r8152 *tp = netdev_priv(dev); - rtl_patch_key_set(tp, key_addr, patch_key); + if (unlikely(tp->rtk_enable_diag)) + return; - return 0; + if (usb_autopm_get_interface(tp->intf) < 0) + return; + + mutex_lock(&tp->control); + + tp->vlgrp = grp; + if (tp->vlgrp) + rtl_rx_vlan_en(tp, true); + else + rtl_rx_vlan_en(tp, false); + + mutex_unlock(&tp->control); } -static int rtl_post_ram_code(struct r8152 *tp, u16 key_addr, bool wait) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + +static void rtl8152_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) { - rtl_patch_key_set(tp, key_addr, 0); + struct r8152 *tp = netdev_priv(dev); - rtl_phy_patch_request(tp, false, wait); + vlan_group_set_device(tp->vlgrp, vid, NULL); +} - return 0; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) */ + +#else + +static int rtl8152_set_features(struct net_device *dev, + netdev_features_t features) +{ + netdev_features_t changed = features ^ dev->features; + struct r8152 *tp = netdev_priv(dev); + int ret; + + if (unlikely(tp->rtk_enable_diag)) + return -EBUSY; + + ret = usb_autopm_get_interface(tp->intf); + if (ret < 0) + goto out; + + mutex_lock(&tp->control); + + if (changed & NETIF_F_HW_VLAN_CTAG_RX) { + if (features & NETIF_F_HW_VLAN_CTAG_RX) + ret = rtl_rx_vlan_en(tp, true); + else + ret = rtl_rx_vlan_en(tp, false); + } + + mutex_unlock(&tp->control); + + usb_autopm_put_interface(tp->intf); + +out: + return ret; } -static void patch4(struct r8152 *tp) +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) */ + +#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST) + +static u32 __rtl_get_wol(struct r8152 *tp) { - u8 data; + u32 ocp_data; + u32 wolopts = 0; + int ret; - data = ocp_read_byte(tp, MCU_TYPE_USB, 0xd429); - data |= 0x80; - ocp_write_byte(tp, MCU_TYPE_USB, 0xd429, data); - ocp_write_word(tp, MCU_TYPE_USB, 0xc0ce, 0x0210); - data = ocp_read_byte(tp, MCU_TYPE_USB, 0xd429); - data &= ~0x80; - ocp_write_byte(tp, MCU_TYPE_USB, 0xd429, data); + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, &ocp_data); + if (ret < 0) + goto out; + + if (ocp_data & LINK_ON_WAKE_EN) + wolopts |= WAKE_PHY; + + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5, &ocp_data); + if (ret < 0) + goto out; + + if (ocp_data & UWF_EN) + wolopts |= WAKE_UCAST; + if (ocp_data & BWF_EN) + wolopts |= WAKE_BCAST; + if (ocp_data & MWF_EN) + wolopts |= WAKE_MCAST; + + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL, &ocp_data); + if (ret < 0) + goto out; + + if (ocp_data & MAGIC_EN) + wolopts |= WAKE_MAGIC; + +out: + return wolopts; } -static void r8152b_firmware(struct r8152 *tp) +static int __rtl_set_wol(struct r8152 *tp, u32 wolopts) { - if (tp->version == RTL_VER_01) { - int i; - static u8 pla_patch_a[] = { - 0x08, 0xe0, 0x40, 0xe0, - 0x78, 0xe0, 0x85, 0xe0, - 0x5d, 0xe1, 0xa1, 0xe1, - 0xa3, 0xe1, 0xab, 0xe1, - 0x31, 0xc3, 0x60, 0x72, - 0xa0, 0x49, 0x10, 0xf0, - 0xa4, 0x49, 0x0e, 0xf0, - 0x2c, 0xc3, 0x62, 0x72, - 0x26, 0x70, 0x80, 0x49, - 0x05, 0xf0, 0x2f, 0x48, - 0x62, 0x9a, 0x24, 0x70, - 0x60, 0x98, 0x24, 0xc3, - 0x60, 0x99, 0x23, 0xc3, - 0x00, 0xbb, 0x2c, 0x75, - 0xdc, 0x21, 0xbc, 0x25, - 0x04, 0x13, 0x0a, 0xf0, - 0x03, 0x13, 0x08, 0xf0, - 0x02, 0x13, 0x06, 0xf0, - 0x01, 0x13, 0x04, 0xf0, - 0x08, 0x13, 0x02, 0xf0, - 0x03, 0xe0, 0xd4, 0x49, - 0x04, 0xf1, 0x14, 0xc2, - 0x12, 0xc3, 0x00, 0xbb, - 0x12, 0xc3, 0x60, 0x75, - 0xd0, 0x49, 0x05, 0xf1, + u16 ocp_data; + int ret; + + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + if (ret < 0) + goto out; + + if (wolopts & WAKE_PHY) + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_CONFIG34, + LINK_ON_WAKE_EN); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_CONFIG34, + LINK_ON_WAKE_EN); + if (ret < 0) + goto out; + + ocp_data = 0; + if (wolopts & WAKE_UCAST) + ocp_data |= UWF_EN; + if (wolopts & WAKE_BCAST) + ocp_data |= BWF_EN; + if (wolopts & WAKE_MCAST) + ocp_data |= MWF_EN; + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_CONFIG5, + UWF_EN | BWF_EN | MWF_EN, ocp_data); + if (ret < 0) + goto out; + + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); + if (ret < 0) + goto out; + + if (wolopts & WAKE_MAGIC) + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_CFG_WOL, MAGIC_EN); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_CFG_WOL, MAGIC_EN); + if (ret < 0) + goto out; + + if (wolopts & WAKE_ANY) + device_set_wakeup_enable(&tp->udev->dev, true); + else + device_set_wakeup_enable(&tp->udev->dev, false); + +out: + return ret; +} + +static int r8153_mac_clk_speed_down(struct r8152 *tp, bool enable) +{ + int ret; + + /* MAC clock speed down */ + if (enable) + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, + MAC_CLK_SPDWN_EN); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, + MAC_CLK_SPDWN_EN); + + return ret; +} + +static int r8156_mac_clk_spd(struct r8152 *tp, bool enable) +{ + int ret; + + /* MAC clock speed down */ + if (enable) { + /* aldps_spdwn_ratio, tp10_spdwn_ratio */ + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, + 0x0403); + if (ret < 0) + goto out; + + /* eee_spdwn_ratio */ + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, + EEE_SPDWN_RATIO_MASK, + MAC_CLK_SPDWN_EN | 0x03); + } else { + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, + MAC_CLK_SPDWN_EN); + } + +out: + return ret; +} + +static int r8153_u1u2en(struct r8152 *tp, bool enable) +{ + u8 u1u2[8]; + + if (enable) + memset(u1u2, 0xff, sizeof(u1u2)); + else + memset(u1u2, 0x00, sizeof(u1u2)); + + return usb_ocp_write(tp, USB_TOLERANCE, BYTE_EN_SIX_BYTES, sizeof(u1u2), + u1u2); +} + +static int r8153b_u1u2en(struct r8152 *tp, bool enable) +{ + if (enable) + return ocp_word_set_bits(tp, MCU_TYPE_USB, USB_LPM_CONFIG, + LPM_U1U2_EN); + else + return ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_LPM_CONFIG, + LPM_U1U2_EN); +} + +static int r8153_u2p3en(struct r8152 *tp, bool enable) +{ + if (enable) + return ocp_word_set_bits(tp, MCU_TYPE_USB, USB_U2P3_CTRL, + U2P3_ENABLE); + else + return ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_U2P3_CTRL, + U2P3_ENABLE); +} + +static int r8157_u2p3en(struct r8152 *tp, bool enable) +{ + if (enable) + return rtl_ip_set_bits(tp, 0xc2c0, BIT(29)); + else + return rtl_ip_clr_bits(tp, 0xc2c0, BIT(29)); +} + +static bool r8156b_flash_used(struct r8152 *tp) +{ + u32 ocp_data; + int ret; + + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_GPHY_CTRL, &ocp_data); + if (ret < 0) + return false; + if (!(ocp_data & GPHY_FLASH)) + return false; + + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL, &ocp_data); + if (ret < 0) + return false; + if (!(ocp_data & BYPASS_FLASH)) + return true; + else + return false; +} + +static int r8153b_ups_flags(struct r8152 *tp) +{ + u32 ups_flags = 0; + + if (tp->ups_info.green) + ups_flags |= UPS_FLAGS_EN_GREEN; + + if (tp->ups_info.aldps) + ups_flags |= UPS_FLAGS_EN_ALDPS; + + if (tp->ups_info.eee) + ups_flags |= UPS_FLAGS_EN_EEE; + + if (tp->ups_info.flow_control) + ups_flags |= UPS_FLAGS_EN_FLOW_CTR; + + if (tp->ups_info.eee_ckdiv) + ups_flags |= UPS_FLAGS_EN_EEE_CKDIV; + + if (tp->ups_info.eee_cmod_lv) + ups_flags |= UPS_FLAGS_EEE_CMOD_LV_EN; + + if (tp->ups_info.r_tune) + ups_flags |= UPS_FLAGS_R_TUNE; + + if (tp->ups_info._10m_ckdiv) + ups_flags |= UPS_FLAGS_EN_10M_CKDIV; + + if (tp->ups_info.eee_plloff_100) + ups_flags |= UPS_FLAGS_EEE_PLLOFF_100; + + if (tp->ups_info.eee_plloff_giga) + ups_flags |= UPS_FLAGS_EEE_PLLOFF_GIGA; + + if (tp->ups_info._250m_ckdiv) + ups_flags |= UPS_FLAGS_250M_CKDIV; + + if (tp->ups_info.ctap_short_off) + ups_flags |= UPS_FLAGS_CTAP_SHORT_DIS; + + switch (tp->ups_info.speed_duplex) { + case NWAY_10M_HALF: + ups_flags |= ups_flags_speed(1); + break; + case NWAY_10M_FULL: + ups_flags |= ups_flags_speed(2); + break; + case NWAY_100M_HALF: + ups_flags |= ups_flags_speed(3); + break; + case NWAY_100M_FULL: + ups_flags |= ups_flags_speed(4); + break; + case NWAY_1000M_FULL: + ups_flags |= ups_flags_speed(5); + break; + case FORCE_10M_HALF: + ups_flags |= ups_flags_speed(6); + break; + case FORCE_10M_FULL: + ups_flags |= ups_flags_speed(7); + break; + case FORCE_100M_HALF: + ups_flags |= ups_flags_speed(8); + break; + case FORCE_100M_FULL: + ups_flags |= ups_flags_speed(9); + break; + default: + break; + } + + return ocp_write_dword(tp, MCU_TYPE_USB, USB_UPS_FLAGS, ups_flags); +} + +static int r8156_ups_flags(struct r8152 *tp) +{ + u32 ups_flags = 0; + + if (tp->ups_info.green) + ups_flags |= UPS_FLAGS_EN_GREEN; + + if (tp->ups_info.aldps) + ups_flags |= UPS_FLAGS_EN_ALDPS; + + if (tp->ups_info.eee) + ups_flags |= UPS_FLAGS_EN_EEE; + + if (tp->ups_info.flow_control) + ups_flags |= UPS_FLAGS_EN_FLOW_CTR; + + if (tp->ups_info.eee_ckdiv) + ups_flags |= UPS_FLAGS_EN_EEE_CKDIV; + + if (tp->ups_info._10m_ckdiv) + ups_flags |= UPS_FLAGS_EN_10M_CKDIV; + + if (tp->ups_info.eee_plloff_100) + ups_flags |= UPS_FLAGS_EEE_PLLOFF_100; + + if (tp->ups_info.eee_plloff_giga) + ups_flags |= UPS_FLAGS_EEE_PLLOFF_GIGA; + + if (tp->ups_info._250m_ckdiv) + ups_flags |= UPS_FLAGS_250M_CKDIV; + + switch (tp->ups_info.speed_duplex) { + case FORCE_10M_HALF: + ups_flags |= ups_flags_speed(0); + break; + case FORCE_10M_FULL: + ups_flags |= ups_flags_speed(1); + break; + case FORCE_100M_HALF: + ups_flags |= ups_flags_speed(2); + break; + case FORCE_100M_FULL: + ups_flags |= ups_flags_speed(3); + break; + case NWAY_10M_HALF: + ups_flags |= ups_flags_speed(4); + break; + case NWAY_10M_FULL: + ups_flags |= ups_flags_speed(5); + break; + case NWAY_100M_HALF: + ups_flags |= ups_flags_speed(6); + break; + case NWAY_100M_FULL: + ups_flags |= ups_flags_speed(7); + break; + case NWAY_1000M_FULL: + ups_flags |= ups_flags_speed(8); + break; + case NWAY_2500M_FULL: + ups_flags |= ups_flags_speed(9); + break; + default: + break; + } + + switch (tp->ups_info.lite_mode) { + case 1: + ups_flags |= 0 << 5; + break; + case 2: + ups_flags |= 2 << 5; + break; + case 0: + default: + ups_flags |= 1 << 5; + break; + } + + return ocp_write_dword(tp, MCU_TYPE_USB, USB_UPS_FLAGS, ups_flags); +} + +static int rtl_green_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) + ret = sram_set_bits(tp, SRAM_GREEN_CFG, GREEN_ETH_EN); + else + ret = sram_clr_bits(tp, SRAM_GREEN_CFG, GREEN_ETH_EN); + + tp->ups_info.green = enable; + + return ret; +} + +static int r8153b_green_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + /* 10M abiq&ldvbias */ + ret = sram_write(tp, 0x8045, 0); + if (ret < 0) + goto out; + + /* 100M short abiq&ldvbias */ + ret = sram_write(tp, 0x804d, 0x1222); + if (ret < 0) + goto out; + + /* 1000M short abiq&ldvbias */ + ret = sram_write(tp, 0x805d, 0x0022); + } else { + /* 10M abiq&ldvbias */ + ret = sram_write(tp, 0x8045, 0x2444); + if (ret < 0) + goto out; + + /* 100M short abiq&ldvbias */ + ret = sram_write(tp, 0x804d, 0x2444); + if (ret < 0) + goto out; + + /* 1000M short abiq&ldvbias */ + ret = sram_write(tp, 0x805d, 0x2444); + } + + if (ret < 0) + goto out; + + ret = rtl_green_en(tp, true); + +out: + return ret; +} + +static int r8153_phy_status(struct r8152 *tp, u16 desired) +{ + int i, ret; + u16 data; + + for (i = 0; i < 500; i++) { + ret = ocp_reg_read(tp, OCP_PHY_STATUS, &data); + if (ret < 0) + return ret; + + data &= PHY_STAT_MASK; + if (desired) { + if (data == desired) + break; + } else if (data == PHY_STAT_LAN_ON || data == PHY_STAT_PWRDN || + data == PHY_STAT_EXT_INIT) { + break; + } + + msleep(20); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + break; + } + + return data; +} + +static int r8153b_ups_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = r8153b_ups_flags(tp); + + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + UPS_EN | USP_PREWAKE | PHASE2_EN); + if (ret < 0) + goto out; + + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_MISC_2, + UPS_FORCE_PWR_DOWN); + } else { + u32 ocp_data; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + UPS_EN | USP_PREWAKE); + if (ret < 0) + goto out; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_MISC_2, + UPS_FORCE_PWR_DOWN | UPS_NO_UPS); + if (ret < 0) + goto out; + + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0, &ocp_data); + if (ret < 0) + goto out; + + if (ocp_data & PCUT_STATUS) { + int i; + + for (i = 0; i < 500; i++) { + ret = ocp_read_word(tp, MCU_TYPE_PLA, + PLA_BOOT_CTRL, &ocp_data); + if (ret < 0) + goto out; + if (ocp_data & AUTOLOAD_DONE) + break; + msleep(20); + } + + tp->rtl_ops.hw_phy_cfg(tp); + + ret = rtl8152_set_speed(tp, tp->autoneg, tp->speed, + tp->duplex, tp->advertising); + } + } + +out: + return ret; +} + +static int r8153c_ups_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = r8153b_ups_flags(tp); + if (ret < 0) + goto out; + + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + UPS_EN | USP_PREWAKE | PHASE2_EN); + if (ret < 0) + goto out; + + ret = ocp_byte_w0w1(tp, MCU_TYPE_USB, USB_MISC_2, BIT(7), + UPS_FORCE_PWR_DOWN); + } else { + u32 ocp_data; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + UPS_EN | USP_PREWAKE); + if (ret < 0) + goto out; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_MISC_2, + UPS_FORCE_PWR_DOWN | UPS_NO_UPS); + if (ret < 0) + goto out; + + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0, &ocp_data); + if (ret < 0) + goto out; + + if (ocp_data & PCUT_STATUS) { + int i; + + for (i = 0; i < 500; i++) { + ret = ocp_read_word(tp, MCU_TYPE_PLA, + PLA_BOOT_CTRL, &ocp_data); + if (ret < 0) + goto out; + if (ocp_data & AUTOLOAD_DONE) + break; + msleep(20); + } + + tp->rtl_ops.hw_phy_cfg(tp); + + ret = rtl8152_set_speed(tp, tp->autoneg, tp->speed, + tp->duplex, tp->advertising); + if (ret < 0) + goto out; + } + + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, + CRWECR_CONFIG); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_CONFIG34, BIT(8)); + if (ret < 0) + goto out; + + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, + CRWECR_NORAML); + } + +out: + return ret; +} + +static int r8156_ups_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = r8156_ups_flags(tp); + if (ret < 0) + goto out; + + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + UPS_EN | USP_PREWAKE | PHASE2_EN); + if (ret < 0) + goto out; + + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_MISC_2, + UPS_FORCE_PWR_DOWN); + if (ret < 0) + goto out; + + switch (tp->version) { + case RTL_VER_13: + case RTL_VER_15: + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_UPHY_XTAL, + OOBS_POLLING); + if (ret < 0) + goto out; + + if (r8156b_flash_used(tp)) + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, + USB_GPHY_CTRL, + GPHY_PATCH_DONE); + break; + default: + break; + } + } else { + u32 ocp_data; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + UPS_EN | USP_PREWAKE); + if (ret < 0) + goto out; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_MISC_2, + UPS_FORCE_PWR_DOWN | UPS_NO_UPS); + if (ret < 0) + goto out; + + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0, &ocp_data); + if (ret < 0) + goto out; + + if (ocp_data & PCUT_STATUS) { + tp->rtl_ops.hw_phy_cfg(tp); + + ret = rtl8152_set_speed(tp, tp->autoneg, tp->speed, + tp->duplex, tp->advertising); + } else { + switch (tp->version) { + case RTL_VER_13: + case RTL_VER_15: + if (r8156b_flash_used(tp)) + ret = ocp_word_set_bits(tp, + MCU_TYPE_USB, + USB_GPHY_CTRL, + GPHY_PATCH_DONE); + break; + default: + break; + } + } + } + +out: + return ret; +} + +static int r8153_power_cut_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + PWR_EN | PHASE2_EN); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + PWR_EN | PHASE2_EN); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_MISC_0, PCUT_STATUS); + +out: + return ret; +} + +static int r8153b_power_cut_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + PWR_EN | PHASE2_EN); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + PWR_EN); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_MISC_0, PCUT_STATUS); + +out: + return ret; +} + +static int r8157_power_cut_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + PWR_EN | PHASE2_EN); + if (ret < 0) + goto out; + + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_MISC_2, BIT(1)); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_UPHY_XTAL, + OOBS_POLLING); + } else { + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_POWER_CUT, + PWR_EN); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_MISC_0, + PCUT_STATUS); + if (ret < 0) + goto out; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_MISC_2, BIT(1)); + } + +out: + return ret; +} + +static int r8153_queue_wake(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) + ret = ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_INDICATE_FALG, + UPCOMING_RUNTIME_D3); + else + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_INDICATE_FALG, + UPCOMING_RUNTIME_D3); + if (ret < 0) + goto out; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_SUSPEND_FLAG, + LINK_CHG_EVENT); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + LINK_CHANGE_FLAG); + +out: + return ret; +} + +static bool rtl_can_wakeup(struct r8152 *tp) +{ + struct usb_device *udev = tp->udev; + + return (udev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_WAKEUP); +} + +static int rtl_runtime_suspend_enable(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = __rtl_set_wol(tp, WAKE_ANY); + if (ret < 0) + goto out; + + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, + CRWECR_CONFIG); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_CONFIG34, + LINK_OFF_WAKE_EN); + if (ret < 0) + goto out; + + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, + CRWECR_NORAML); + } else { + ret = __rtl_set_wol(tp, tp->saved_wolopts); + if (ret < 0) + goto out; + + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, + CRWECR_CONFIG); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_CONFIG34, + LINK_OFF_WAKE_EN); + if (ret < 0) + goto out; + + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, + CRWECR_NORAML); + } + +out: + return ret; +} + +static int rtl8153_runtime_enable(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + if (tp->version == RTL_VER_06) { + ret = r8153_queue_wake(tp, true); + if (ret < 0) + goto out; + } + ret = r8153_u1u2en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, true); + } else { + if (tp->version == RTL_VER_06) { + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; + } + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + + switch (tp->version) { + case RTL_VER_03: + case RTL_VER_04: + break; + case RTL_VER_05: + case RTL_VER_06: + default: + ret = r8153_u2p3en(tp, true); + if (ret < 0) + goto out; + break; + } + + ret = r8153_u1u2en(tp, true); + } + +out: + return ret; +} + +static int rtl8153b_runtime_enable(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = r8153_queue_wake(tp, true); + if (ret < 0) + goto out; + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, true); + if (ret < 0) + goto out; + + ret = r8153b_ups_en(tp, true); + } else { + ret = r8153b_ups_en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + +// ret = r8153_u2p3en(tp, true); +// if (ret < 0) +// goto out; + + if (tp->udev->speed >= USB_SPEED_SUPER) + ret = r8153b_u1u2en(tp, true); + } + +out: + return ret; +} + +static int rtl8153c_runtime_enable(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = r8153_queue_wake(tp, true); + if (ret < 0) + goto out; + + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, true); + if (ret < 0) + goto out; + + ret = r8153c_ups_en(tp, true); + } else { + ret = r8153c_ups_en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + +// ret = r8153_u2p3en(tp, true); +// if (ret < 0) +// goto out; + + ret = r8153b_u1u2en(tp, true); + } + +out: + return ret; +} + +static int rtl8156_runtime_enable(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = r8153_queue_wake(tp, true); + if (ret < 0) + goto out; + + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, true); +// if (tp->version != RTL_VER_10 || +// tp->udev->speed == USB_SPEED_HIGH) +// ret = r8156_ups_en(tp, true); + } else { +// r8156_ups_en(tp, false); +// if (ret < 0) +// goto out; + + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + + ret = r8153_u2p3en(tp, true); + if (ret < 0) + goto out; + + if (tp->udev->speed >= USB_SPEED_SUPER) + ret = r8153b_u1u2en(tp, true); + } + +out: + return ret; +} + +static int rtl8157_runtime_enable(struct r8152 *tp, bool enable) +{ + int ret; + + ret = r8153_queue_wake(tp, enable); + if (ret < 0) + goto out; + + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + + ret = r8157_u2p3en(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, enable); + +out: + return ret; +} + +static int rtl_nway_restart(struct r8152 *tp) +{ + int r; + + /* if autoneg is off, it's an error */ + r = r8152_mdio_read(tp, MII_BMCR); + if (r < 0) + goto out; + + if (r & BMCR_ANENABLE) + r = r8152_mdio_write(tp, MII_BMCR, r | BMCR_ANRESTART); + +out: + if (r < 0) + return r; + else + return 0; +} + +static int r8153_teredo_off(struct r8152 *tp) +{ + int ret; + + switch (tp->version) { + case RTL_VER_01: + case RTL_VER_02: + case RTL_VER_03: + case RTL_VER_04: + case RTL_VER_05: + case RTL_VER_06: + case RTL_VER_07: + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, + TEREDO_SEL | TEREDO_RS_EVENT_MASK | + OOB_TEREDO_EN); + if (ret < 0) + goto out; + break; + + case RTL_VER_08: + case RTL_VER_09: + case RTL_TEST_01: + case RTL_VER_10: + case RTL_VER_11: + case RTL_VER_12: + case RTL_VER_13: + case RTL_VER_14: + case RTL_VER_15: + case RTL_VER_16: + case RTL_VER_17: + default: + /* The bit 0 ~ 7 are relative with teredo settings. They are + * W1C (write 1 to clear), so set all 1 to disable it. + */ + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, 0xff); + if (ret < 0) + goto out; + break; + } + + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_WDT6_CTRL, WDT6_SET_MODE); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_REALWOW_TIMER, 0); + if (ret < 0) + goto out; + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TEREDO_TIMER, 0); + +out: + return ret; +} + +static int rtl_reset_bmu(struct r8152 *tp) +{ + int ret; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_BMU_RESET, + BMU_RESET_EP_IN | BMU_RESET_EP_OUT); + if (ret < 0) + goto out; + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_BMU_RESET, + BMU_RESET_EP_IN | BMU_RESET_EP_OUT); + +out: + return ret; +} + +/* Clear the bp to stop the firmware before loading a new one */ +static int rtl_clear_bp(struct r8152 *tp, u16 type) +{ + u16 bp[16] = {0}; + u16 bp_num; + int ret; + + switch (tp->version) { + case RTL_VER_08: + case RTL_VER_09: + case RTL_VER_10: + case RTL_VER_11: + case RTL_VER_12: + case RTL_VER_13: + case RTL_VER_15: + if (type == MCU_TYPE_USB) { + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0); + if (ret < 0) + goto out; + bp_num = 16; + break; + } + fallthrough; + case RTL_VER_03: + case RTL_VER_04: + case RTL_VER_05: + case RTL_VER_06: + ret = ocp_write_byte(tp, type, PLA_BP_EN, 0); + if (ret < 0) + goto out; + fallthrough; + case RTL_VER_01: + case RTL_VER_02: + case RTL_VER_07: + bp_num = 8; + break; + case RTL_VER_14: + case RTL_VER_16: + case RTL_VER_17: + default: + ret = ocp_write_word(tp, type, USB_BP2_EN, 0); + if (ret < 0) + goto out; + bp_num = 16; + break; + } + + ret = generic_ocp_write(tp, PLA_BP_0, BYTE_EN_DWORD, bp_num << 1, bp, + type); + if (ret < 0) + goto out; + + /* wait 3 ms to make sure the firmware is stopped */ + usleep_range(3000, 6000); + ret = ocp_write_word(tp, type, PLA_BP_BA, 0); + +out: + return ret; +} + +static bool rtl_check_fw_ver_ok(struct r8152 *tp, u16 index, u8 new_ver) +{ + u32 ocp_data; + + if (!index || ocp_read_byte(tp, MCU_TYPE_USB, index, &ocp_data) < 0) + return true; + if (new_ver > ocp_data) + return true; + else + return false; +} + +static inline void rtl_reset_ocp_base(struct r8152 *tp) +{ + tp->ocp_base = -1; +} + +static int rtl_phy_patch_request(struct r8152 *tp, bool request, bool wait) +{ + int i, ret; + u16 check; + + if (request) { + ret = ocp_reg_set_bits(tp, OCP_PHY_PATCH_CMD, PATCH_REQUEST); + check = 0; + } else { + ret = ocp_reg_clr_bits(tp, OCP_PHY_PATCH_CMD, PATCH_REQUEST); + check = PATCH_READY; + } + + if (ret < 0) + goto out; + + for (i = 0; wait && i < 5000; i++) { + u16 data; + + usleep_range(1000, 2000); + ret = ocp_reg_read(tp, OCP_PHY_PATCH_STAT, &data); + if (ret < 0 || (data & PATCH_READY) ^ check) + break; + } + + if (request && wait && i == 5000) { + dev_err(&tp->intf->dev, "PHY patch request fail\n"); + ocp_reg_clr_bits(tp, OCP_PHY_PATCH_CMD, PATCH_REQUEST); + return -ETIME; + } + +out: + return (ret < 0) ? ret : 0; +} + +static void rtl_patch_key_set(struct r8152 *tp, u16 key_addr, u16 patch_key) +{ + if (patch_key && key_addr) { + sram_write(tp, key_addr, patch_key); + sram_write(tp, SRAM_PHY_LOCK, PHY_PATCH_LOCK); + } else if (key_addr) { + sram_write(tp, 0x0000, 0x0000); + + ocp_reg_clr_bits(tp, OCP_PHY_LOCK, PATCH_LOCK); + + sram_write(tp, key_addr, 0x0000); + } else { + WARN_ON_ONCE(1); + } +} + +static int +rtl_pre_ram_code(struct r8152 *tp, u16 key_addr, u16 patch_key, bool wait) +{ + if (rtl_phy_patch_request(tp, true, wait)) + return -ETIME; + + rtl_patch_key_set(tp, key_addr, patch_key); + + return 0; +} + +static int rtl_post_ram_code(struct r8152 *tp, u16 key_addr, bool wait) +{ + rtl_patch_key_set(tp, key_addr, 0); + + rtl_phy_patch_request(tp, false, wait); + + return 0; +} + +static void patch4(struct r8152 *tp) +{ + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_USB_TIMER, BIT(15)); + ocp_write_word(tp, MCU_TYPE_USB, 0xc0ce, 0x0210); + ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_TIMER, BIT(15)); +} + +static void r8152b_firmware(struct r8152 *tp) +{ + if (tp->version == RTL_VER_01) { + int i; + static u8 pla_patch_a[] = { + 0x08, 0xe0, 0x40, 0xe0, + 0x78, 0xe0, 0x85, 0xe0, + 0x5d, 0xe1, 0xa1, 0xe1, + 0xa3, 0xe1, 0xab, 0xe1, + 0x31, 0xc3, 0x60, 0x72, + 0xa0, 0x49, 0x10, 0xf0, + 0xa4, 0x49, 0x0e, 0xf0, + 0x2c, 0xc3, 0x62, 0x72, + 0x26, 0x70, 0x80, 0x49, + 0x05, 0xf0, 0x2f, 0x48, + 0x62, 0x9a, 0x24, 0x70, + 0x60, 0x98, 0x24, 0xc3, + 0x60, 0x99, 0x23, 0xc3, + 0x00, 0xbb, 0x2c, 0x75, + 0xdc, 0x21, 0xbc, 0x25, + 0x04, 0x13, 0x0a, 0xf0, + 0x03, 0x13, 0x08, 0xf0, + 0x02, 0x13, 0x06, 0xf0, + 0x01, 0x13, 0x04, 0xf0, + 0x08, 0x13, 0x02, 0xf0, + 0x03, 0xe0, 0xd4, 0x49, + 0x04, 0xf1, 0x14, 0xc2, + 0x12, 0xc3, 0x00, 0xbb, + 0x12, 0xc3, 0x60, 0x75, + 0xd0, 0x49, 0x05, 0xf1, 0x50, 0x48, 0x60, 0x9d, 0x09, 0xc6, 0x00, 0xbe, 0xd0, 0x48, 0x60, 0x9d, @@ -5230,7 +6481,6 @@ static void r8152b_firmware(struct r8152 *tp) 0x02, 0xc0, 0x00, 0xb8, 0x3a, 0x4e, 0x02, 0xc0, 0x00, 0xb8, 0x3a, 0x4e }; - u32 ocp_data; rtl_clear_bp(tp, MCU_TYPE_PLA); @@ -5256,25 +6506,13 @@ static void r8152b_firmware(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_USB, 0xfc2c, 0x3303); ocp_write_word(tp, MCU_TYPE_USB, 0xfc2e, 0x0000); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xd428); - ocp_data |= BIT(15); - ocp_write_word(tp, MCU_TYPE_USB, 0xd428, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_USB_TIMER, BIT(15)); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xc4d4); - ocp_data |= BIT(0); - ocp_write_word(tp, MCU_TYPE_USB, 0xc4d4, ocp_data); - - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xc4d6); - ocp_data &= ~BIT(0); - ocp_write_word(tp, MCU_TYPE_USB, 0xc4d6, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, 0xc4d4, BIT(0)); + ocp_word_clr_bits(tp, MCU_TYPE_USB, 0xc4d6, BIT(0)); + ocp_word_set_bits(tp, MCU_TYPE_USB, 0xc5d4, BIT(2) | BIT(5)); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xc5d4); - ocp_data |= BIT(2) | BIT(5); - ocp_write_word(tp, MCU_TYPE_USB, 0xc5d4, ocp_data); - - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xd428); - ocp_data &= ~BIT(15); - ocp_write_word(tp, MCU_TYPE_USB, 0xd428, ocp_data); + ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_TIMER, BIT(15)); rtl_reset_ocp_base(tp); } @@ -5282,127 +6520,193 @@ static void r8152b_firmware(struct r8152 *tp) rtl_reset_ocp_base(tp); } -static void r8152_aldps_en(struct r8152 *tp, bool enable) +static int r8152_aldps_en(struct r8152 *tp, bool enable) { + int ret; + if (enable) { - ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPWRSAVE | ENPDNPS | - LINKENA | DIS_SDSAVE); + ret = ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPWRSAVE | ENPDNPS | + LINKENA | DIS_SDSAVE); } else { - ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPDNPS | LINKENA | - DIS_SDSAVE); + ret = ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPDNPS | LINKENA | + DIS_SDSAVE); msleep(20); } + return ret; } -static inline void r8152_mmd_indirect(struct r8152 *tp, u16 dev, u16 reg) +static int r8152_mmd_indirect(struct r8152 *tp, u16 dev, u16 reg) { - ocp_reg_write(tp, OCP_EEE_AR, FUN_ADDR | dev); - ocp_reg_write(tp, OCP_EEE_DATA, reg); - ocp_reg_write(tp, OCP_EEE_AR, FUN_DATA | dev); + int ret; + + ret = ocp_reg_write(tp, OCP_EEE_AR, FUN_ADDR | dev); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_DATA, reg); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_AR, FUN_DATA | dev); + +out: + return ret; } #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) -static u16 r8152_mmd_read(struct r8152 *tp, u16 dev, u16 reg) +static int r8152_mmd_read(struct r8152 *tp, u16 dev, u16 reg, u16 *data) { - u16 data; + int ret; - r8152_mmd_indirect(tp, dev, reg); - data = ocp_reg_read(tp, OCP_EEE_DATA); - ocp_reg_write(tp, OCP_EEE_AR, 0x0000); + ret = r8152_mmd_indirect(tp, dev, reg); + if (ret < 0) + goto out; + ret = ocp_reg_read(tp, OCP_EEE_DATA, data); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_AR, 0x0000); - return data; +out: + return ret; } #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ -static void r8152_mmd_write(struct r8152 *tp, u16 dev, u16 reg, u16 data) +static int r8152_mmd_write(struct r8152 *tp, u16 dev, u16 reg, u16 data) { - r8152_mmd_indirect(tp, dev, reg); - ocp_reg_write(tp, OCP_EEE_DATA, data); - ocp_reg_write(tp, OCP_EEE_AR, 0x0000); + int ret; + + ret = r8152_mmd_indirect(tp, dev, reg); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_DATA, data); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_AR, 0x0000); + +out: + return ret; } -static void r8152_eee_en(struct r8152 *tp, bool enable) +static int r8152_eee_en(struct r8152 *tp, bool enable) { - u16 config1, config2, config3; - u32 ocp_data; - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR); - config1 = ocp_reg_read(tp, OCP_EEE_CONFIG1) & ~sd_rise_time_mask; - config2 = ocp_reg_read(tp, OCP_EEE_CONFIG2); - config3 = ocp_reg_read(tp, OCP_EEE_CONFIG3) & ~fast_snr_mask; + int ret; if (enable) { - ocp_data |= EEE_RX_EN | EEE_TX_EN; - config1 |= EEE_10_CAP | EEE_NWAY_EN | TX_QUIET_EN | RX_QUIET_EN; - config1 |= sd_rise_time(1); - config2 |= RG_DACQUIET_EN | RG_LDVQUIET_EN; - config3 |= fast_snr(42); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_EEE_CR, + EEE_RX_EN | EEE_TX_EN); + if (ret < 0) + goto out; + ret = ocp_reg_w0w1(tp, OCP_EEE_CONFIG1, sd_rise_time_mask, + EEE_10_CAP | EEE_NWAY_EN | TX_QUIET_EN | + RX_QUIET_EN | sd_rise_time(1)); + if (ret < 0) + goto out; + ret = ocp_reg_set_bits(tp, OCP_EEE_CONFIG2, + RG_DACQUIET_EN | RG_LDVQUIET_EN); + if (ret < 0) + goto out; + ret = ocp_reg_w0w1(tp, OCP_EEE_CONFIG3, fast_snr_mask, + fast_snr(42)); } else { - ocp_data &= ~(EEE_RX_EN | EEE_TX_EN); - config1 &= ~(EEE_10_CAP | EEE_NWAY_EN | TX_QUIET_EN | - RX_QUIET_EN); - config1 |= sd_rise_time(7); - config2 &= ~(RG_DACQUIET_EN | RG_LDVQUIET_EN); - config3 |= fast_snr(511); + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_EEE_CR, + EEE_RX_EN | EEE_TX_EN); + if (ret < 0) + goto out; + ret = ocp_reg_w0w1(tp, OCP_EEE_CONFIG1, sd_rise_time_mask | + EEE_10_CAP | EEE_NWAY_EN | TX_QUIET_EN | + RX_QUIET_EN, sd_rise_time(7)); + if (ret < 0) + goto out; + ret = ocp_reg_clr_bits(tp, OCP_EEE_CONFIG2, + RG_DACQUIET_EN | RG_LDVQUIET_EN); + if (ret < 0) + goto out; + ret = ocp_reg_w0w1(tp, OCP_EEE_CONFIG3, fast_snr_mask, + fast_snr(511)); } - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data); - ocp_reg_write(tp, OCP_EEE_CONFIG1, config1); - ocp_reg_write(tp, OCP_EEE_CONFIG2, config2); - ocp_reg_write(tp, OCP_EEE_CONFIG3, config3); +out: + return ret; } -static void r8153_eee_en(struct r8152 *tp, bool enable) +static int r8153_eee_en(struct r8152 *tp, bool enable) { - u32 ocp_data; - u16 config; - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR); - config = ocp_reg_read(tp, OCP_EEE_CFG); + int ret; if (enable) { - ocp_data |= EEE_RX_EN | EEE_TX_EN; - config |= EEE10_EN; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_EEE_CR, + EEE_RX_EN | EEE_TX_EN); + if (ret < 0) + goto out; + ret = ocp_reg_set_bits(tp, OCP_EEE_CFG, EEE10_EN); } else { - ocp_data &= ~(EEE_RX_EN | EEE_TX_EN); - config &= ~EEE10_EN; + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_EEE_CR, + EEE_RX_EN | EEE_TX_EN); + if (ret < 0) + goto out; + ret = ocp_reg_clr_bits(tp, OCP_EEE_CFG, EEE10_EN); } - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data); - ocp_reg_write(tp, OCP_EEE_CFG, config); - tp->ups_info.eee = enable; + +out: + return ret; } -static void r8156_eee_en(struct r8152 *tp, bool enable) +static int r8156_eee_en(struct r8152 *tp, bool enable) { - u16 config; + int ret; + + ret = r8153_eee_en(tp, enable); + if (ret < 0) + goto out; + + if (enable) + ret = ocp_reg_set_bits(tp, OCP_EEE_ADV2, MDIO_EEE_2_5GT); + else + ret = ocp_reg_clr_bits(tp, OCP_EEE_ADV2, MDIO_EEE_2_5GT); - r8153_eee_en(tp, enable); +out: + return ret; +} + +static int r8157_eee_en(struct r8152 *tp, bool enable) +{ + int ret; - config = ocp_reg_read(tp, OCP_EEE_ADV2); + ret = r8153_eee_en(tp, enable); + if (ret < 0) + goto out; if (enable) - config |= MDIO_EEE_2_5GT; + ret = ocp_reg_set_bits(tp, OCP_EEE_ADV2, + MDIO_EEE_2_5GT | MDIO_EEE_5GT); else - config &= ~MDIO_EEE_2_5GT; + ret = ocp_reg_clr_bits(tp, OCP_EEE_ADV2, + MDIO_EEE_2_5GT | MDIO_EEE_5GT); - ocp_reg_write(tp, OCP_EEE_ADV2, config); +out: + return ret; } -static void rtl_eee_enable(struct r8152 *tp, bool enable) +static int rtl_eee_enable(struct r8152 *tp, bool enable) { + int ret; + switch (tp->version) { case RTL_VER_01: case RTL_VER_02: case RTL_VER_07: if (enable) { - r8152_eee_en(tp, true); - r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, - tp->eee_adv); + ret = r8152_eee_en(tp, true); + if (ret < 0) + goto out; + ret = r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, + tp->eee_adv); } else { - r8152_eee_en(tp, false); - r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0); + ret = r8152_eee_en(tp, false); + if (ret < 0) + goto out; + ret = r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, + 0); } break; case RTL_VER_03: @@ -5413,11 +6717,15 @@ static void rtl_eee_enable(struct r8152 *tp, bool enable) case RTL_VER_09: case RTL_VER_14: if (enable) { - r8153_eee_en(tp, true); - ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv); + ret = r8153_eee_en(tp, true); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv); } else { - r8153_eee_en(tp, false); - ocp_reg_write(tp, OCP_EEE_ADV, 0); + ret = r8153_eee_en(tp, false); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_ADV, 0); } break; case RTL_VER_10: @@ -5426,34 +6734,69 @@ static void rtl_eee_enable(struct r8152 *tp, bool enable) case RTL_VER_13: case RTL_VER_15: if (enable) { - r8156_eee_en(tp, true); - ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv); + ret = r8156_eee_en(tp, true); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv); + } else { + ret = r8156_eee_en(tp, false); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_ADV, 0); + } + break; + case RTL_VER_16: + case RTL_VER_17: + if (enable) { + ret = r8157_eee_en(tp, true); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv); } else { - r8156_eee_en(tp, false); - ocp_reg_write(tp, OCP_EEE_ADV, 0); + ret = r8157_eee_en(tp, false); + if (ret < 0) + goto out; + ret = ocp_reg_write(tp, OCP_EEE_ADV, 0); } break; default: + ret = 0; + WARN_ON_ONCE(1); break; } + +out: + return (ret < 0) ? ret : 0; } -static void r8152b_enable_fc(struct r8152 *tp) +static int r8152b_enable_fc(struct r8152 *tp) { - u16 anar; + int ret; - anar = r8152_mdio_read(tp, MII_ADVERTISE); - anar |= ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM; - r8152_mdio_write(tp, MII_ADVERTISE, anar); + ret = r8152_mdio_set_bit(tp, MII_ADVERTISE, + ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM); tp->ups_info.flow_control = true; + + return ret; } -static void rtl8152_disable(struct r8152 *tp) +static int rtl8152_disable(struct r8152 *tp) { - r8152_aldps_en(tp, false); - rtl_disable(tp); - r8152_aldps_en(tp, true); + int ret, err = 0; + + ret = r8152_aldps_en(tp, false); + if (ret < 0) + err = ret; + ret = rtl_disable(tp); + if (ret < 0) + err = ret; + ret = r8152_aldps_en(tp, true); + + if (err < 0) + return err; + else + return ret; } static void r8152b_hw_phy_cfg(struct r8152 *tp) @@ -5470,180 +6813,254 @@ static void r8152b_hw_phy_cfg(struct r8152 *tp) static void wait_oob_link_list_ready(struct r8152 *tp) { u32 ocp_data; - int i; + int i, ret; for (i = 0; i < 1000; i++) { - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - if (ocp_data & LINK_LIST_READY) + ret = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, &ocp_data); + if (ret < 0 || (ocp_data & LINK_LIST_READY)) break; usleep_range(1000, 2000); } } -static void r8156b_wait_loading_flash(struct r8152 *tp) +static int r8156b_wait_loading_flash(struct r8152 *tp) { + int ret = 0; + if (r8156b_flash_used(tp)) { int i; for (i = 0; i < 100; i++) { - if (ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL) & - GPHY_PATCH_DONE) + u32 ocp_data; + + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL, + &ocp_data); + if (ret < 0 || (ocp_data & GPHY_PATCH_DONE)) break; usleep_range(1000, 2000); } } + + return ret; } -static void r8152b_exit_oob(struct r8152 *tp) +static int r8152b_exit_oob(struct r8152 *tp) { - u32 ocp_data; + int ret; - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data &= ~RCR_ACPT_ALL; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); + ret = ocp_dword_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR, RCR_ACPT_ALL); + if (ret < 0) + goto out; - rxdy_gated_en(tp, true); - r8153_teredo_off(tp); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, 0x00); + ret = rxdy_gated_en(tp, true); + if (ret < 0) + goto out; + ret = r8153_teredo_off(tp); + if (ret < 0) + goto out; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); + if (ret < 0) + goto out; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, 0x00); + if (ret < 0) + goto out; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data &= ~NOW_IS_OOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data &= ~MCU_BORW_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, MCU_BORW_EN); + if (ret < 0) + goto out; wait_oob_link_list_ready(tp); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data |= RE_INIT_LL; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, RE_INIT_LL); + if (ret < 0) + goto out; wait_oob_link_list_ready(tp); - rtl8152_nic_reset(tp); + ret = rtl8152_nic_reset(tp); + if (ret < 0) + goto out; /* rx share fifo credit full threshold */ - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_NORMAL); + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_NORMAL); + if (ret < 0) + goto out; if (tp->udev->speed == USB_SPEED_FULL || tp->udev->speed == USB_SPEED_LOW) { /* rx share fifo credit near full threshold */ - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, - RXFIFO_THR2_FULL); - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, - RXFIFO_THR3_FULL); + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, + RXFIFO_THR2_FULL); + if (ret < 0) + goto out; + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, + RXFIFO_THR3_FULL); + if (ret < 0) + goto out; } else { /* rx share fifo credit near full threshold */ - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, - RXFIFO_THR2_HIGH); - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, - RXFIFO_THR3_HIGH); + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, + RXFIFO_THR2_HIGH); + if (ret < 0) + goto out; + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, + RXFIFO_THR3_HIGH); + if (ret < 0) + goto out; } /* TX share fifo free credit full threshold */ - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL2); + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL2); + if (ret < 0) + goto out; - ocp_write_byte(tp, MCU_TYPE_USB, USB_TX_AGG, TX_AGG_MAX_THRESHOLD); - ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_HIGH); - ocp_write_dword(tp, MCU_TYPE_USB, USB_TX_DMA, + ret = ocp_write_byte(tp, MCU_TYPE_USB, USB_TX_AGG, TX_AGG_MAX_THRESHOLD); + if (ret < 0) + goto out; + ret = ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_HIGH); + if (ret < 0) + goto out; + ret = ocp_write_dword(tp, MCU_TYPE_USB, USB_TX_DMA, TEST_MODE_DISABLE | TX_SIZE_ADJUST1); + if (ret < 0) + goto out; + + ret = rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); + if (ret < 0) + goto out; - rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS); + if (ret < 0) + goto out; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_TCR0, TCR0_AUTO_FIFO); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0); - ocp_data |= TCR0_AUTO_FIFO; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TCR0, ocp_data); +out: + return ret; } -static void r8152b_enter_oob(struct r8152 *tp) +static int r8152b_enter_oob(struct r8152 *tp) { - u32 ocp_data; + int ret, err = 0; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data &= ~NOW_IS_OOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + err = ret; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_OOB); - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_OOB); - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_OOB); + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, + RXFIFO_THR1_OOB); + if (ret < 0) + err = ret; + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, + RXFIFO_THR2_OOB); + if (ret < 0) + err = ret; + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, + RXFIFO_THR3_OOB); + if (ret < 0) + err = ret; - rtl_disable(tp); + ret = rtl_disable(tp); + if (ret < 0) + err = ret; wait_oob_link_list_ready(tp); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data |= RE_INIT_LL; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, RE_INIT_LL); + if (ret < 0) + err = ret; wait_oob_link_list_ready(tp); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS); + if (ret < 0) + err = ret; + + ret = rtl_rx_vlan_en(tp, true); + if (ret < 0) + err = ret; - rtl_rx_vlan_en(tp, true); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_BDC_CR, ALDPS_PROXY_MODE); + if (ret < 0) + err = ret; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BDC_CR); - ocp_data |= ALDPS_PROXY_MODE; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_BDC_CR, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, + NOW_IS_OOB | DIS_MCU_CLROOB); + if (ret < 0) + err = ret; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); + ret = rxdy_gated_en(tp, false); + if (ret < 0) + err = ret; - rxdy_gated_en(tp, false); + ret = ocp_dword_set_bits(tp, MCU_TYPE_PLA, PLA_RCR, + RCR_APM | RCR_AM | RCR_AB); - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data |= RCR_APM | RCR_AM | RCR_AB; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); + if (err < 0) + return err; + else + return ret; } static int r8156_lock_main(struct r8152 *tp, bool lock) { + int i, ret; u16 data; - int i; - data = ocp_reg_read(tp, 0xa46a); if (lock) - data |= BIT(1); + ret = ocp_reg_set_bits(tp, 0xa46a, BIT(1)); else - data &= ~BIT(1); - ocp_reg_write(tp, 0xa46a, data); + ret = ocp_reg_clr_bits(tp, 0xa46a, BIT(1)); + if (ret < 0) + goto out; if (lock) { for (i = 0; i < 100; i++) { usleep_range(1000, 2000); - data = ocp_reg_read(tp, 0xa730) & 0xff; + ret = ocp_reg_read(tp, 0xa730, &data); + if (ret < 0) + goto out; + data &= 0xff; if (data == 1) break; } } else { for (i = 0; i < 100; i++) { usleep_range(1000, 2000); - data = ocp_reg_read(tp, 0xa730) & 0xff; + ret = ocp_reg_read(tp, 0xa730, &data); + if (ret < 0) + goto out; + data &= 0xff; if (data != 1) break; } } if (i == 100) - return -ETIME; + ret = -ETIME; else - return 0; + ret = 0; + +out: + return ret; } static void r8153_wdt1_end(struct r8152 *tp) { - int i; + int i, ret; /* Wait till the WTD timer is ready. It would take at most 104 ms. */ for (i = 0; i < 104; i++) { - u32 ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_WDT1_CTRL); + u32 ocp_data; - if (!(ocp_data & WTD1_EN)) + ret = ocp_read_byte(tp, MCU_TYPE_USB, USB_WDT1_CTRL, &ocp_data); + if (ret < 0 || !(ocp_data & WTD1_EN)) break; usleep_range(1000, 2000); } @@ -5654,15 +7071,17 @@ static void r8153_wdt1_end(struct r8152 *tp) #define DGB_DRV_STATE_MASK (3 << 14) #define DGB_DRV_STATE_LOAD (2 << 14) #define DGB_DRV_STATE_UNLOAD (1 << 14) -static void rtl_set_dbg_info_init(struct r8152 *tp) + +static void rtl_set_dbg_info_init(struct r8152 *tp, u16 drv_version) { u32 counter; - counter = ocp_read_byte(tp, MCU_TYPE_USB, 0xcfcf); + if (ocp_read_byte(tp, MCU_TYPE_USB, 0xcfcf, &counter) < 0) + return; counter++; counter &= DBG_COUNTER_MASK; ocp_write_byte(tp, MCU_TYPE_USB, 0xcfcf, counter | DBG_DRV_RUNNING); - counter = (counter << 5) | 0xb; + counter = (counter << 5) | drv_version; ocp_write_word(tp, MCU_TYPE_USB, 0xcfd0, counter); } @@ -5670,7 +7089,8 @@ static void rtl_set_dbg_info_state(struct r8152 *tp, u16 state) { u32 ocp_data; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xcfd0); + if (ocp_read_word(tp, MCU_TYPE_USB, 0xcfd0, &ocp_data) < 0) + return; ocp_data &= ~DGB_DRV_STATE_MASK; ocp_write_word(tp, MCU_TYPE_USB, 0xcfd0, state | ocp_data); } @@ -5678,6 +7098,7 @@ static void rtl_set_dbg_info_state(struct r8152 *tp, u16 state) static void rtl_fw_ver_erase(struct r8152 *tp) { u16 outer_ver; + u32 ocp_data; switch (tp->version) { case RTL_VER_01: @@ -5701,7 +7122,10 @@ static void rtl_fw_ver_erase(struct r8152 *tp) break; } - if (!ocp_read_word(tp, MCU_TYPE_USB, outer_ver)) { + if (ocp_read_word(tp, MCU_TYPE_USB, outer_ver, &ocp_data) < 0) + return; + + if (ocp_data) { ocp_write_word(tp, MCU_TYPE_USB, outer_ver, 0); ocp_write_word(tp, MCU_TYPE_USB, USB_FW_PLA_VER, 0); } @@ -5709,6 +7133,9 @@ static void rtl_fw_ver_erase(struct r8152 *tp) static void r8153_firmware(struct r8152 *tp) { + u32 ocp_data; + int ret; + if (tp->version == RTL_VER_03) { rtl_reset_ocp_base(tp); @@ -6187,12 +7614,13 @@ static void r8153_firmware(struct r8152 *tp) * clearing PLA break points and before applying the PLA * firmware. */ - if (!(ocp_read_word(tp, MCU_TYPE_PLA, PLA_MACDBG_POST) & - DEBUG_OE)) { - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MACDBG_PRE, - DEBUG_LTSSM); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MACDBG_POST, - DEBUG_LTSSM); + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MACDBG_POST, + &ocp_data); + if (!(ocp_data & DEBUG_OE)) { + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_MACDBG_PRE, + DEBUG_LTSSM); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_MACDBG_POST, + DEBUG_LTSSM); } generic_ocp_write(tp, 0xf800, 0xff, sizeof(pla_patch_b), @@ -6213,7 +7641,6 @@ static void r8153_firmware(struct r8152 *tp) rtl_reset_ocp_base(tp); } else if (tp->version == RTL_VER_05) { - u32 ocp_data; static u8 usb_patch_c[] = { 0x08, 0xe0, 0x0a, 0xe0, 0x14, 0xe0, 0x58, 0xe0, @@ -6509,9 +7936,8 @@ static void r8153_firmware(struct r8152 *tp) r8153_wdt1_end(tp); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN0); - ocp_data &= ~FW_FIX_SUSPEND; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN0, ocp_data); + ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_FW_FIX_EN0, + FW_FIX_SUSPEND); rtl_clear_bp(tp, MCU_TYPE_USB); @@ -6522,7 +7948,8 @@ static void r8153_firmware(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_USB, 0xfc2a, 0x027c); ocp_write_word(tp, MCU_TYPE_USB, 0xfc2c, 0x15de); ocp_write_word(tp, MCU_TYPE_USB, 0xfc2e, 0x10ce); - if (ocp_read_byte(tp, MCU_TYPE_USB, USB_CSTMR) & FORCE_SUPER) + ret = ocp_read_byte(tp, MCU_TYPE_USB, USB_CSTMR, &ocp_data); + if (ocp_data & FORCE_SUPER) ocp_write_word(tp, MCU_TYPE_USB, 0xfc30, 0x1578); else ocp_write_word(tp, MCU_TYPE_USB, 0xfc30, 0x1adc); @@ -6553,17 +7980,14 @@ static void r8153_firmware(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, U3P3_CHECK_EN | 4); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN0); - ocp_data |= FW_FIX_SUSPEND; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN0, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_FIX_EN0, + FW_FIX_SUSPEND); - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_USB2PHY); - ocp_data |= USB2PHY_L1 | USB2PHY_SUSPEND; - ocp_write_byte(tp, MCU_TYPE_USB, USB_USB2PHY, ocp_data); + ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_USB2PHY, + USB2PHY_L1 | USB2PHY_SUSPEND); rtl_reset_ocp_base(tp); } else if (tp->version == RTL_VER_06) { - u32 ocp_data; static u8 usb_patch_d[] = { 0x08, 0xe0, 0x0e, 0xe0, 0x11, 0xe0, 0x24, 0xe0, @@ -6686,7 +8110,8 @@ static void r8153_firmware(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_USB, 0xfc32, 0x3C74); ocp_write_word(tp, MCU_TYPE_USB, 0xfc34, 0x0000); ocp_write_word(tp, MCU_TYPE_USB, 0xfc36, 0x0000); - if (ocp_read_byte(tp, MCU_TYPE_USB, USB_CSTMR) & FORCE_SUPER) + ret = ocp_read_byte(tp, MCU_TYPE_USB, USB_CSTMR, &ocp_data); + if (ocp_data & FORCE_SUPER) ocp_write_word(tp, MCU_TYPE_USB, USB_BP_EN, 0x003f); else ocp_write_word(tp, MCU_TYPE_USB, USB_BP_EN, 0x003e); @@ -6706,13 +8131,11 @@ static void r8153_firmware(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_PLA, 0xfc36, 0x0000); ocp_write_word(tp, MCU_TYPE_PLA, PLA_BP_EN, 0x0007); - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_USB2PHY); - ocp_data |= USB2PHY_L1 | USB2PHY_SUSPEND; - ocp_write_byte(tp, MCU_TYPE_USB, USB_USB2PHY, ocp_data); + ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_USB2PHY, + USB2PHY_L1 | USB2PHY_SUSPEND); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1); - ocp_data |= FW_IP_RESET_EN; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, + FW_IP_RESET_EN); rtl_reset_ocp_base(tp); } @@ -6722,8 +8145,10 @@ static void r8153_firmware(struct r8152 *tp) static void r8153b_firmware(struct r8152 *tp) { + u32 ocp_data; + int ret; + if (tp->version == RTL_VER_09) { - u32 ocp_data; static u8 usb_patch2_b[] = { 0x10, 0xe0, 0x5b, 0xe0, 0x7c, 0xe0, 0x9c, 0xe0, @@ -7192,37 +8617,32 @@ static void r8153b_firmware(struct r8152 *tp) ocp_write_byte(tp, MCU_TYPE_USB, USB_FW_PLA_VER, new_ver); - if (ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_1) & BND_MASK) { - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BP_EN); - ocp_data |= BIT(0); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_BP_EN, ocp_data); - } + ret = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_1, + &ocp_data); + if (ocp_data & BND_MASK) + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_BP_EN, + BIT(0)); } - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_CTRL); - ocp_data |= FLOW_CTRL_PATCH_OPT; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_CTRL, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_CTRL, + FLOW_CTRL_PATCH_OPT); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK); - ocp_data |= FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1); - ocp_data |= FW_IP_RESET_EN; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, + FW_IP_RESET_EN); rtl_reset_ocp_base(tp); } else if (tp->version == RTL_VER_14) { - u32 ocp_data; static u8 usb_patch3_a[] = { 0x10, 0xe0, 0x79, 0xe0, 0x97, 0xe0, 0x99, 0xe0, 0xa0, 0xe0, 0xa2, 0xe0, - 0xa4, 0xe0, 0xa6, 0xe0, - 0xa8, 0xe0, 0xaa, 0xe0, - 0xac, 0xe0, 0xae, 0xe0, - 0xb0, 0xe0, 0xb2, 0xe0, - 0xb4, 0xe0, 0xb6, 0xe0, + 0xc3, 0xe0, 0xe9, 0xe0, + 0xeb, 0xe0, 0xed, 0xe0, + 0xef, 0xe0, 0xf1, 0xe0, + 0xf3, 0xe0, 0xf5, 0xe0, + 0xf7, 0xe0, 0xf9, 0xe0, 0x01, 0xb4, 0x03, 0xb4, 0x04, 0xb4, 0x05, 0xb4, 0x07, 0xb4, 0x64, 0xc6, @@ -7298,11 +8718,46 @@ static void r8153b_firmware(struct r8152 *tp) 0x40, 0x88, 0x02, 0xc2, 0x00, 0xba, 0xf0, 0x1b, 0x02, 0xc0, 0x00, 0xb8, - 0x3a, 0x4e, 0x02, 0xc0, - 0x00, 0xb8, 0x3a, 0x4e, + 0x20, 0x24, 0x1c, 0xc6, + 0xc0, 0x61, 0x04, 0x11, + 0x15, 0xf1, 0x19, 0xc6, + 0xc0, 0x61, 0x9c, 0x20, + 0x9c, 0x24, 0x09, 0x11, + 0x0f, 0xf1, 0x14, 0xc6, + 0x01, 0x19, 0xc0, 0x89, + 0x13, 0xc1, 0x13, 0xc6, + 0x24, 0x9e, 0x00, 0x1e, + 0x26, 0x8e, 0x26, 0x76, + 0xef, 0x49, 0xfe, 0xf1, + 0x22, 0x76, 0x08, 0xc1, + 0x22, 0x9e, 0x07, 0xc6, + 0x02, 0xc1, 0x00, 0xb9, + 0x64, 0x09, 0x18, 0xb4, + 0x4a, 0xb4, 0xe0, 0xcc, + 0x80, 0xd4, 0x08, 0xdc, + 0x10, 0xe8, 0xfc, 0xc6, + 0xc0, 0x67, 0xf0, 0x49, + 0x1d, 0xf0, 0xf0, 0x48, + 0xc0, 0x8f, 0xc2, 0x77, + 0xf7, 0xc1, 0xf7, 0xc6, + 0x24, 0x9e, 0x22, 0x9f, + 0x8c, 0x1e, 0x26, 0x8e, + 0x26, 0x76, 0xef, 0x49, + 0xfe, 0xf1, 0xfb, 0x49, + 0x05, 0xf0, 0x11, 0xc6, + 0xc0, 0x61, 0x10, 0x48, + 0xc0, 0x89, 0x0e, 0xc6, + 0xc0, 0x71, 0x18, 0x48, + 0xc0, 0x99, 0x0b, 0xc1, + 0xcc, 0x99, 0x0a, 0xc6, + 0xc0, 0x61, 0x11, 0x48, + 0xc0, 0x89, 0x02, 0xc6, + 0x00, 0xbe, 0x46, 0x50, + 0x6c, 0xb4, 0x34, 0xd3, + 0x4b, 0x80, 0xe8, 0xd4, 0x02, 0xc0, 0x00, 0xb8, 0x3a, 0x4e, 0x02, 0xc0, - 0x00, 0xb8, 0x3a, 0x4e, + 0x00, 0xb8, 0x00, 0x00, 0x02, 0xc0, 0x00, 0xb8, 0x00, 0x00, 0x02, 0xc0, 0x00, 0xb8, 0x00, 0x00, @@ -7313,8 +8768,7 @@ static void r8153b_firmware(struct r8152 *tp) 0x00, 0x00, 0x02, 0xc0, 0x00, 0xb8, 0x00, 0x00, 0x02, 0xc0, 0x00, 0xb8, - 0x00, 0x00, 0x02, 0xc0, - 0x00, 0xb8, 0x00, 0x00 }; + 0x00, 0x00, 0x00, 0x00 }; static u8 pla_patch3_a[] = { 0x10, 0xe0, 0x12, 0xe0, 0x15, 0xe0, 0x1a, 0xe0, @@ -7395,7 +8849,7 @@ static void r8153b_firmware(struct r8152 *tp) new_ver); } - new_ver = 2; + new_ver = 5; if (rtl_check_fw_ver_ok(tp, USB_FW_USB_VER, new_ver)) { rtl_clear_bp(tp, MCU_TYPE_USB); @@ -7408,13 +8862,13 @@ static void r8153b_firmware(struct r8152 *tp) MCU_TYPE_USB); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_BA, 0xa000); - ocp_write_word(tp, MCU_TYPE_USB, USB_BP_0, 0x02ce); + ocp_write_word(tp, MCU_TYPE_USB, USB_BP_0, 0x20ce); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_1, 0x5cda); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_2, 0x0834); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_3, 0x1bec); - ocp_write_word(tp, MCU_TYPE_USB, USB_BP_4, 0x0000); - ocp_write_word(tp, MCU_TYPE_USB, USB_BP_5, 0x0000); - ocp_write_word(tp, MCU_TYPE_USB, USB_BP_6, 0x0000); + ocp_write_word(tp, MCU_TYPE_USB, USB_BP_4, 0x241e); + ocp_write_word(tp, MCU_TYPE_USB, USB_BP_5, 0x0962); + ocp_write_word(tp, MCU_TYPE_USB, USB_BP_6, 0x4f54); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_7, 0x0000); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_8, 0x0000); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_9, 0x0000); @@ -7424,19 +8878,16 @@ static void r8153b_firmware(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_USB, USB_BP_13, 0x0000); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_14, 0x0000); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_15, 0x0000); - ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0x000f); + ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0x007f); ocp_write_byte(tp, MCU_TYPE_USB, USB_FW_USB_VER, new_ver); } - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_CTRL); - ocp_data |= FLOW_CTRL_PATCH_2; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_CTRL, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_CTRL, + FLOW_CTRL_PATCH_2); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK); - ocp_data |= FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); rtl_reset_ocp_base(tp); } @@ -7452,7 +8903,6 @@ static void r8156_firmware(struct r8152 *tp) 0xf6, 0x65, 0x02, 0xc0, 0x00, 0xb8, 0x40, 0x03, 0x00, 0xd4, 0x00, 0x00 }; - u16 data; rtl_reset_ocp_base(tp); @@ -7475,14 +8925,9 @@ static void r8156_firmware(struct r8152 *tp) ocp_reg_write(tp, 0xac36, 0x0080); ocp_reg_write(tp, 0xac4a, 0xff00); - data = ocp_reg_read(tp, 0xac34); - data &= ~BIT(4); - data |= BIT(2) | BIT(3); - ocp_reg_write(tp, 0xac34, data); - - data = ocp_reg_read(tp, 0xac54); - data &= ~(BIT(9) | BIT(10)); - ocp_reg_write(tp, 0xac54, data); + ocp_reg_w0w1(tp, 0xac34, BIT(4), BIT(2) | BIT(3)); + + ocp_reg_clr_bits(tp, 0xac54, BIT(9) | BIT(10)); ocp_reg_write(tp, 0xb87c, 0x8099); ocp_reg_write(tp, 0xb87e, 0x2050); ocp_reg_write(tp, 0xb87c, 0x80a1); @@ -7491,10 +8936,7 @@ static void r8156_firmware(struct r8152 *tp) ocp_reg_write(tp, 0xb87e, 0x5010); ocp_reg_write(tp, 0xb87c, 0x80a2); ocp_reg_write(tp, 0xb87e, 0x500f); - data = ocp_reg_read(tp, 0xac34); - data &= ~BIT(5); - data |= BIT(6) | BIT(7); - ocp_reg_write(tp, 0xac34, data); + ocp_reg_w0w1(tp, 0xac34, BIT(5), BIT(6) | BIT(7)); if (rtl_phy_patch_request(tp, true, true)) { netif_err(tp, drv, tp->netdev, @@ -7502,9 +8944,7 @@ static void r8156_firmware(struct r8152 *tp) return; } - data = ocp_reg_read(tp, 0xb896); - data &= ~BIT(0); - ocp_reg_write(tp, 0xb896, data); + ocp_reg_clr_bits(tp, 0xb896, BIT(0)); ocp_reg_write(tp, 0xb892, 0x0000); ocp_reg_write(tp, 0xb88e, 0xc089); ocp_reg_write(tp, 0xb890, 0xc1d0); @@ -7585,16 +9025,12 @@ static void r8156_firmware(struct r8152 *tp) ocp_reg_write(tp, 0xb88e, 0xc03c); ocp_reg_write(tp, 0xb890, 0xdf00); - data = ocp_reg_read(tp, 0xb896); - data |= BIT(0); - ocp_reg_write(tp, 0xb896, data); + ocp_reg_set_bits(tp, 0xb896, BIT(0)); rtl_patch_key_set(tp, 0x8024, 0x0000); sram_write(tp, SRAM_PHY_LOCK, PHY_PATCH_LOCK); - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - data |= BIT(7); - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); + ocp_reg_set_bits(tp, OCP_PHY_PATCH_CMD, BIT(7)); /* nc0_patch_171220_loop_test_USB */ sram_write(tp, 0xA016, 0x0000); @@ -8553,1419 +9989,2142 @@ static void r8156_firmware(struct r8152 *tp) sram_write(tp, 0xb864, 0xffff); sram_write(tp, 0xb878, 0x0001); - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - data &= ~BIT(7); - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); + ocp_reg_clr_bits(tp, OCP_PHY_PATCH_CMD, BIT(7)); + + /* uc_patch_171212_customer_USB */ + sram_write(tp, 0x8586, 0xaf85); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x92af); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8598); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xaf85); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa1af); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x85a1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0285); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa1af); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0414); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0286); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x7e02); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1273); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xaf10); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1cf8); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf9e3); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x83ab); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0a6); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00e1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa601); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xef01); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0d04); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x580f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa008); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x4659); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0f9e); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x4239); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0aab); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x3ee0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xffcf); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xad26); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x07f7); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0ead); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2729); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xae02); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf60e); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe283); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xab1f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x239f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x28e0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb714); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe1b7); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x155c); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0c00); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x9fee); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0285); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfee0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xffcf); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xad26); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0af7); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0fe0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xffcf); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xac27); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfaf6); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0fe2); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x83ab); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1f23); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x9f03); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xaf85); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa6fd); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfc04); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf8f9); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfb02); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x866d); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1f77); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0b7); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2ee1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb72f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0286); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x4ce0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb72c); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe1b7); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2d02); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x864c); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0b7); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2ae1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb72b); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0286); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x4ce0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb728); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe1b7); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2902); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x864c); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0b7); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x26e1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb727); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0286); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x4cef); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x47d2); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb8e6); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb468); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe5b4); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x69d2); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xbce6); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb468); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe4b4); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x6902); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x866d); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfffd); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfc04); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf8f9); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfad2); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00ef); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x675e); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0001); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1f46); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0d71); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x5f7f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xffad); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2803); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x7fa0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x010d); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x4112); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa210); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe8fe); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfdfc); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x04f8); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0b4); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x62e1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb463); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x6901); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe4b4); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x62e5); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xb463); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfc04); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf8f9); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfaef); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x69e1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8016); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xad2d); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x3bbf); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x86fd); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x023f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x08ac); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2832); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xbf87); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0002); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x3f08); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xad28); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x29d2); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x03bf); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8703); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x023f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x080d); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x11f6); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2fef); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x31e0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8ff3); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0d01); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf627); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1b03); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xaa01); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x82e0); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8ff2); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0d01); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf627); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1b03); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xaa01); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8202); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x86ca); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xef69); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfefd); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfc04); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfbfa); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xef69); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf9f8); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xbf8f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf4e1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8fed); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1c21); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1a92); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe08f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xeee1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8fef); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xef74); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xe08f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xf0e1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8ff1); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xef64); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0217); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x70fc); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xfdef); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x96fe); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xff04); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x2087); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0620); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8709); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0087); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0cbb); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa880); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xeea8); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x8070); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa880); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x60a8); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x18e8); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xa818); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x60a8); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1a00); + sram_write(tp, 0xb818, 0x040e); + sram_write(tp, 0xb81a, 0x1019); + sram_write(tp, 0xb81c, 0xffff); + sram_write(tp, 0xb81e, 0xffff); + sram_write(tp, 0xb832, 0x0003); + + rtl_patch_key_set(tp, 0x8024, 0x0000); + ocp_reg_write(tp, 0xc414, 0x0200); + + rtl_phy_patch_request(tp, false, true); + + r8156_lock_main(tp, true); + + sram_write(tp, 0x80c9, 0x3478); + sram_write(tp, 0x80d0, 0xfe8f); + sram_write(tp, 0x80ca, 0x7843); + sram_write(tp, 0x80cb, 0x43b0); + sram_write(tp, 0x80cb, 0x4380); + sram_write(tp, 0x80cc, 0xb00b); + sram_write(tp, 0x80cd, 0x0ba1); + sram_write(tp, 0x80d8, 0x1078); + sram_write(tp, 0x8016, 0x3f00); + sram_write(tp, 0x8fed, 0x0386); + sram_write(tp, 0x8fee, 0x86f4); + sram_write(tp, 0x8fef, 0xf486); + sram_write(tp, 0x8ff0, 0x86fd); + sram_write(tp, 0x8ff1, 0xfd28); + sram_write(tp, 0x8ff2, 0x285a); + sram_write(tp, 0x8ff3, 0x5a70); + sram_write(tp, 0x8ff4, 0x7000); + sram_write(tp, 0x8ff5, 0x005d); + sram_write(tp, 0x8ff6, 0x5d77); + sram_write(tp, 0x8ff7, 0x7778); + sram_write(tp, 0x8ff8, 0x785f); + sram_write(tp, 0x8ff9, 0x5f74); + sram_write(tp, 0x8ffa, 0x7478); + sram_write(tp, 0x8ffb, 0x7858); + sram_write(tp, 0x8ffc, 0x5870); + sram_write(tp, 0x8ffd, 0x7078); + sram_write(tp, 0x8ffe, 0x7850); + sram_write(tp, 0x8fff, 0x5000); + sram_write(tp, 0x80dd, 0x34a4); + sram_write(tp, 0x80e4, 0xfe7f); + sram_write(tp, 0x80e6, 0x4a19); + sram_write(tp, 0x80de, 0xa443); + sram_write(tp, 0x80df, 0x43a0); + sram_write(tp, 0x80df, 0x43a0); + sram_write(tp, 0x80e0, 0xa00a); + sram_write(tp, 0x80e1, 0x0a00); + sram_write(tp, 0x80e8, 0x700c); + sram_write(tp, 0x80e2, 0x0007); + sram_write(tp, 0x80e3, 0x07fe); + sram_write(tp, 0x80ec, 0x0e78); + sram_write(tp, 0x80b5, 0x42f7); + sram_write(tp, 0x80bc, 0xfaa4); + sram_write(tp, 0x80bf, 0x1f80); + sram_write(tp, 0x80be, 0xff1f); + sram_write(tp, 0x80b7, 0x4280); + sram_write(tp, 0x80b6, 0xf742); + sram_write(tp, 0x80b8, 0x800f); + sram_write(tp, 0x80b9, 0x0fab); + sram_write(tp, 0x80c1, 0x1e0a); + sram_write(tp, 0x80c0, 0x801e); + sram_write(tp, 0x80bd, 0xa4ff); + sram_write(tp, 0x80bb, 0x0bfa); + sram_write(tp, 0x80ba, 0xab0b); + ocp_reg_write(tp, OCP_SRAM_ADDR, 0x818d); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x003d); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x009b); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00cb); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00e5); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00f2); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00f9); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00fd); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00ff); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00c2); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0065); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0034); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x001b); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x000e); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0007); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0003); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0002); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0001); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + sram_write(tp, 0x8163, 0xdb06); + sram_write(tp, 0x816a, 0xdb06); + sram_write(tp, 0x8171, 0xdb06); + + r8156_lock_main(tp, false); + + rtl_clear_bp(tp, MCU_TYPE_USB); + + generic_ocp_write(tp, 0xe600, 0xff, sizeof(usb3_patch_t), + usb3_patch_t, MCU_TYPE_USB); + + ocp_write_word(tp, MCU_TYPE_USB, USB_BP_BA, 0xa000); + ocp_write_word(tp, MCU_TYPE_USB, USB_BP_0, 0x033e); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_1, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_2, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_3, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_4, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_5, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_6, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_7, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_8, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_9, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_10, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_11, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_12, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_13, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_14, 0x0000); +// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_15, 0x0000); + ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0x0001); + } + + rtl_reset_ocp_base(tp); +} + +static int r8153_aldps_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) { + ret = ocp_reg_set_bits(tp, OCP_POWER_CFG, EN_ALDPS); + } else { + int i; + + ret = ocp_reg_clr_bits(tp, OCP_POWER_CFG, EN_ALDPS); + if (ret < 0) + goto out; + for (i = 0; i < 20; i++) { + u32 ocp_data; + + usleep_range(1000, 2000); + ret = ocp_read_word(tp, MCU_TYPE_PLA, 0xe000, + &ocp_data); + if (ret < 0 || (ocp_data & 0x0100)) + break; + } + } + + tp->ups_info.aldps = enable; + +out: + return ret; +} + +static int r8153b_mcu_spdown_en(struct r8152 *tp, bool enable) +{ + int ret; + + if (enable) + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, + PLA_MCU_SPDWN_EN); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, + PLA_MCU_SPDWN_EN); + + return ret; +} + +static void r8153_hw_phy_cfg(struct r8152 *tp) +{ + /* disable ALDPS before updating the PHY parameters */ + r8153_aldps_en(tp, false); + + /* disable EEE before updating the PHY parameters */ + rtl_eee_enable(tp, false); + + r8153_firmware(tp); + + if (tp->version == RTL_VER_03) + ocp_reg_clr_bits(tp, OCP_EEE_CFG, CTAP_SHORT_EN); + + ocp_reg_set_bits(tp, OCP_POWER_CFG, EEE_CLKDIV_EN); + + ocp_reg_set_bits(tp, OCP_DOWN_SPEED, EN_10M_BGOFF); + ocp_reg_set_bits(tp, OCP_POWER_CFG, EN_10M_PLLOFF); + sram_write(tp, SRAM_IMPEDANCE, 0x0b13); + + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_PHY_PWR, PFM_PWM_SWITCH); + + /* Enable LPF corner auto tune */ + sram_write(tp, SRAM_LPF_CFG, 0xf70f); + + /* Adjust 10M Amplitude */ + sram_write(tp, SRAM_10M_AMP1, 0x00af); + sram_write(tp, SRAM_10M_AMP2, 0x0208); + + if (tp->eee_en) + rtl_eee_enable(tp, true); + + r8153_aldps_en(tp, true); + r8152b_enable_fc(tp); + + switch (tp->version) { + case RTL_VER_03: + case RTL_VER_04: + break; + case RTL_VER_05: + case RTL_VER_06: + default: + r8153_u2p3en(tp, true); + break; + } + + set_bit(PHY_RESET, &tp->flags); +} + +static u32 r8152_efuse_read(struct r8152 *tp, u8 addr) +{ + u32 ocp_data, d2; + int ret; + + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_EFUSE_CMD, + EFUSE_READ_CMD | addr); + if (ret < 0) + return 0xffffffff; + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EFUSE_CMD, &ocp_data); + if (ret < 0) + return 0xffffffff; + ocp_data = (ocp_data & EFUSE_DATA_BIT16) << 9; /* data of bit16 */ + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EFUSE_DATA, &d2); + if (ret < 0) + return 0xffffffff; + ocp_data |= d2; + + return ocp_data; +} + +static void r8153b_hw_phy_cfg(struct r8152 *tp) +{ + u32 ocp_data; + u16 data; + int ret; + + ocp_word_test_and_clr_bits(tp, MCU_TYPE_USB, USB_MISC_0, PCUT_STATUS); + + /* disable ALDPS before updating the PHY parameters */ + r8153_aldps_en(tp, false); + + /* disable EEE before updating the PHY parameters */ + rtl_eee_enable(tp, false); + + /* U1/U2/L1 idle timer. 500 us */ + ocp_write_word(tp, MCU_TYPE_USB, USB_U1U2_TIMER, 500); + + ret = r8153_phy_status(tp, 0); + if (ret < 0) + return; + + switch (ret) { + case PHY_STAT_PWRDN: + case PHY_STAT_EXT_INIT: + r8153b_firmware(tp); + r8152_mdio_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + break; + case PHY_STAT_LAN_ON: + default: + r8153b_firmware(tp); + break; + } + + r8153b_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); + + sram_set_bits(tp, SRAM_GREEN_CFG, R_TUNE_EN); + ocp_reg_set_bits(tp, OCP_NCTL_CFG, PGA_RETURN_EN); - /* uc_patch_171212_customer_USB */ - sram_write(tp, 0x8586, 0xaf85); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x92af); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8598); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xaf85); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa1af); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x85a1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0285); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa1af); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0414); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0286); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x7e02); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1273); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xaf10); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1cf8); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf9e3); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x83ab); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0a6); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00e1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa601); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xef01); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0d04); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x580f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa008); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x4659); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0f9e); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x4239); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0aab); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x3ee0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xffcf); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xad26); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x07f7); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0ead); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2729); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xae02); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf60e); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe283); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xab1f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x239f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x28e0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb714); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe1b7); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x155c); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0c00); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x9fee); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0285); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfee0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xffcf); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xad26); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0af7); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0fe0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xffcf); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xac27); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfaf6); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0fe2); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x83ab); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1f23); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x9f03); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xaf85); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa6fd); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfc04); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf8f9); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfb02); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x866d); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1f77); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0b7); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2ee1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb72f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0286); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x4ce0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb72c); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe1b7); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2d02); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x864c); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0b7); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2ae1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb72b); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0286); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x4ce0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb728); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe1b7); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2902); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x864c); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0b7); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x26e1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb727); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0286); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x4cef); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x47d2); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb8e6); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb468); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe5b4); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x69d2); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xbce6); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb468); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe4b4); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x6902); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x866d); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfffd); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfc04); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf8f9); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfad2); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00ef); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x675e); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0001); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1f46); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0d71); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x5f7f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xffad); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2803); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x7fa0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x010d); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x4112); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa210); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe8fe); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfdfc); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x04f8); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe0b4); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x62e1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb463); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x6901); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe4b4); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x62e5); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xb463); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfc04); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf8f9); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfaef); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x69e1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8016); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xad2d); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x3bbf); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x86fd); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x023f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x08ac); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2832); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xbf87); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0002); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x3f08); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xad28); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x29d2); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x03bf); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8703); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x023f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x080d); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x11f6); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2fef); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x31e0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8ff3); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0d01); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf627); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1b03); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xaa01); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x82e0); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8ff2); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0d01); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf627); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1b03); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xaa01); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8202); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x86ca); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xef69); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfefd); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfc04); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfbfa); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xef69); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf9f8); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xbf8f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf4e1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8fed); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1c21); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1a92); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe08f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xeee1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8fef); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xef74); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xe08f); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xf0e1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8ff1); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xef64); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0217); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x70fc); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xfdef); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x96fe); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xff04); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x2087); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0620); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8709); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0087); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0cbb); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa880); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xeea8); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x8070); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa880); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x60a8); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x18e8); - ocp_reg_write(tp, OCP_SRAM_DATA, 0xa818); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x60a8); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x1a00); - sram_write(tp, 0xb818, 0x040e); - sram_write(tp, 0xb81a, 0x1019); - sram_write(tp, 0xb81c, 0xffff); - sram_write(tp, 0xb81e, 0xffff); - sram_write(tp, 0xb832, 0x0003); + /* ADC Bias Calibration: + * read efuse offset 0x7d to get a 17-bit data. Remove the dummy/fake + * bit (bit3) to rebuild the real 16-bit data. Write the data to the + * ADC ioffset. + */ + ocp_data = r8152_efuse_read(tp, 0x7d); + data = (u16)(((ocp_data & 0x1fff0) >> 1) | (ocp_data & 0x7)); + if (data != 0xffff) + ocp_reg_write(tp, OCP_ADC_IOFFSET, data); + + /* ups mode tx-link-pulse timing adjustment: + * rg_saw_cnt = OCP reg 0xC426 Bit[13:0] + * swr_cnt_1ms_ini = 16000000 / rg_saw_cnt + */ + ret = ocp_reg_read(tp, 0xc426, &data); + if (ret < 0) + return; + + ocp_data = data & 0x3fff; + if (ocp_data) { + u32 swr_cnt_1ms_ini; + + swr_cnt_1ms_ini = (16000000 / ocp_data) & SAW_CNT_1MS_MASK; + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_UPS_CFG, SAW_CNT_1MS_MASK, + swr_cnt_1ms_ini); + if (ret < 0) + return; + } + + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_PHY_PWR, PFM_PWM_SWITCH); + +#ifdef CONFIG_CTAP_SHORT_OFF + ocp_reg_clr_bits(tp, OCP_EEE_CFG, CTAP_SHORT_EN); + + tp->ups_info.ctap_short_off = true; +#endif + /* Advnace EEE */ + if (!rtl_phy_patch_request(tp, true, true)) { + ocp_reg_set_bits(tp, OCP_POWER_CFG, EEE_CLKDIV_EN); + tp->ups_info.eee_ckdiv = true; + + ocp_reg_set_bits(tp, OCP_DOWN_SPEED, + EN_EEE_CMODE | EN_EEE_1000 | EN_10M_CLKDIV); + tp->ups_info.eee_cmod_lv = true; + tp->ups_info._10m_ckdiv = true; + tp->ups_info.eee_plloff_giga = true; + + ocp_reg_write(tp, OCP_SYSCLK_CFG, 0); + ocp_reg_write(tp, OCP_SYSCLK_CFG, clk_div_expo(5)); + tp->ups_info._250m_ckdiv = true; + + rtl_phy_patch_request(tp, false, true); + } + + if (tp->eee_en) + rtl_eee_enable(tp, true); + + r8153_aldps_en(tp, true); + r8152b_enable_fc(tp); +// r8153_u2p3en(tp, true); + + set_bit(PHY_RESET, &tp->flags); + rtl_set_dbg_info_state(tp, DGB_DRV_STATE_LOAD); +} - rtl_patch_key_set(tp, 0x8024, 0x0000); - ocp_reg_write(tp, 0xc414, 0x0200); +static void r8153c_hw_phy_cfg(struct r8152 *tp) +{ + r8153b_hw_phy_cfg(tp); - rtl_phy_patch_request(tp, false, true); + tp->ups_info.r_tune = true; +} - r8156_lock_main(tp, true); +static int rtl8153_change_mtu(struct r8152 *tp) +{ + int ret; - sram_write(tp, 0x80c9, 0x3478); - sram_write(tp, 0x80d0, 0xfe8f); - sram_write(tp, 0x80ca, 0x7843); - sram_write(tp, 0x80cb, 0x43b0); - sram_write(tp, 0x80cb, 0x4380); - sram_write(tp, 0x80cc, 0xb00b); - sram_write(tp, 0x80cd, 0x0ba1); - sram_write(tp, 0x80d8, 0x1078); - sram_write(tp, 0x8016, 0x3f00); - sram_write(tp, 0x8fed, 0x0386); - sram_write(tp, 0x8fee, 0x86f4); - sram_write(tp, 0x8fef, 0xf486); - sram_write(tp, 0x8ff0, 0x86fd); - sram_write(tp, 0x8ff1, 0xfd28); - sram_write(tp, 0x8ff2, 0x285a); - sram_write(tp, 0x8ff3, 0x5a70); - sram_write(tp, 0x8ff4, 0x7000); - sram_write(tp, 0x8ff5, 0x005d); - sram_write(tp, 0x8ff6, 0x5d77); - sram_write(tp, 0x8ff7, 0x7778); - sram_write(tp, 0x8ff8, 0x785f); - sram_write(tp, 0x8ff9, 0x5f74); - sram_write(tp, 0x8ffa, 0x7478); - sram_write(tp, 0x8ffb, 0x7858); - sram_write(tp, 0x8ffc, 0x5870); - sram_write(tp, 0x8ffd, 0x7078); - sram_write(tp, 0x8ffe, 0x7850); - sram_write(tp, 0x8fff, 0x5000); - sram_write(tp, 0x80dd, 0x34a4); - sram_write(tp, 0x80e4, 0xfe7f); - sram_write(tp, 0x80e6, 0x4a19); - sram_write(tp, 0x80de, 0xa443); - sram_write(tp, 0x80df, 0x43a0); - sram_write(tp, 0x80df, 0x43a0); - sram_write(tp, 0x80e0, 0xa00a); - sram_write(tp, 0x80e1, 0x0a00); - sram_write(tp, 0x80e8, 0x700c); - sram_write(tp, 0x80e2, 0x0007); - sram_write(tp, 0x80e3, 0x07fe); - sram_write(tp, 0x80ec, 0x0e78); - sram_write(tp, 0x80b5, 0x42f7); - sram_write(tp, 0x80bc, 0xfaa4); - sram_write(tp, 0x80bf, 0x1f80); - sram_write(tp, 0x80be, 0xff1f); - sram_write(tp, 0x80b7, 0x4280); - sram_write(tp, 0x80b6, 0xf742); - sram_write(tp, 0x80b8, 0x800f); - sram_write(tp, 0x80b9, 0x0fab); - sram_write(tp, 0x80c1, 0x1e0a); - sram_write(tp, 0x80c0, 0x801e); - sram_write(tp, 0x80bd, 0xa4ff); - sram_write(tp, 0x80bb, 0x0bfa); - sram_write(tp, 0x80ba, 0xab0b); - ocp_reg_write(tp, OCP_SRAM_ADDR, 0x818d); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x003d); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x009b); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00cb); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00e5); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00f2); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00f9); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00fd); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00ff); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x00c2); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0065); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0034); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x001b); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x000e); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0007); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0003); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0002); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0001); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); - sram_write(tp, 0x8163, 0xdb06); - sram_write(tp, 0x816a, 0xdb06); - sram_write(tp, 0x8171, 0xdb06); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, + mtu_to_size(tp->netdev->mtu)); + if (ret < 0) + goto out; - r8156_lock_main(tp, false); + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_JUMBO); - rtl_clear_bp(tp, MCU_TYPE_USB); +out: + return ret; +} - generic_ocp_write(tp, 0xe600, 0xff, sizeof(usb3_patch_t), - usb3_patch_t, MCU_TYPE_USB); +static int r8153_lanwake_clr_en(struct r8152 *tp, bool enable) +{ + int ret; - ocp_write_word(tp, MCU_TYPE_USB, USB_BP_BA, 0xa000); - ocp_write_word(tp, MCU_TYPE_USB, USB_BP_0, 0x033e); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_1, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_2, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_3, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_4, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_5, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_6, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_7, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_8, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_9, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_10, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_11, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_12, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_13, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_14, 0x0000); -// ocp_write_word(tp, MCU_TYPE_USB, USB_BP_15, 0x0000); - ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0x0001); + if (enable) { + /* Enable the feature that the MCU could clear the lanwake */ + ret = ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_CONFIG6, + LANWAKE_CLR_EN); + if (ret < 0) + goto out; + + /* Clear lanwake */ + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_LWAKE_CTRL_REG, + LANWAKE_PIN); + } else { + /* Disable the feature that the MCU could clear the lanwake */ + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_CONFIG6, + LANWAKE_CLR_EN); } - rtl_reset_ocp_base(tp); +out: + return ret; } -static void r8153_aldps_en(struct r8152 *tp, bool enable) +static int r8153_first_init(struct r8152 *tp) { - u16 data; + int ret; + + ret = rxdy_gated_en(tp, true); + if (ret < 0) + goto out; + ret = r8153_teredo_off(tp); + if (ret < 0) + goto out; + + ret = ocp_dword_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR, RCR_ACPT_ALL); + if (ret < 0) + goto out; + + ret = rtl8152_nic_reset(tp); + if (ret < 0) + goto out; + ret = rtl_reset_bmu(tp); + if (ret < 0) + goto out; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, MCU_BORW_EN); + if (ret < 0) + goto out; + + wait_oob_link_list_ready(tp); + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, RE_INIT_LL); + if (ret < 0) + goto out; + + wait_oob_link_list_ready(tp); + + ret = rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); + if (ret < 0) + goto out; + + ret = rtl8153_change_mtu(tp); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_TCR0, TCR0_AUTO_FIFO); + if (ret < 0) + goto out; + + ret = rtl8152_nic_reset(tp); + if (ret < 0) + goto out; + + /* rx share fifo credit full threshold */ + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_NORMAL); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_NORMAL); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_NORMAL); + if (ret < 0) + goto out; + /* TX share fifo free credit full threshold */ + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL2); + if (ret < 0) + goto out; + + ret = r8153_lanwake_clr_en(tp, true); + +out: + return ret; +} + +static int r8153_enter_oob(struct r8152 *tp) +{ + int ret, err = 0; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + err = ret; + + /* RX FIFO settings for OOB */ + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_OOB); + if (ret < 0) + err = ret; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_OOB); + if (ret < 0) + err = ret; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_OOB); + if (ret < 0) + err = ret; + + ret = rtl_disable(tp); + if (ret < 0) + err = ret; + ret = rtl_reset_bmu(tp); + if (ret < 0) + err = ret; + + wait_oob_link_list_ready(tp); + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, RE_INIT_LL); + if (ret < 0) + err = ret; + + wait_oob_link_list_ready(tp); + + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, 1522); + if (ret < 0) + err = ret; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_DEFAULT); + if (ret < 0) + err = ret; + + switch (tp->version) { + case RTL_VER_03: + case RTL_VER_04: + case RTL_VER_05: + case RTL_VER_06: + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, + TEREDO_WAKE_MASK); + if (ret < 0) + err = ret; + break; + + case RTL_VER_08: + case RTL_VER_09: + case RTL_VER_14: + /* Clear teredo wake event. bit[15:8] is the teredo wakeup + * type. Set it to zero. bits[7:0] are the W1C bits about + * the events. Set them to all 1 to clear them. + */ + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_WAKE_BASE, + 0x00ff); + if (ret < 0) + err = ret; + break; + + default: + break; + } + + ret = rtl_rx_vlan_en(tp, true); + if (ret < 0) + err = ret; + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_BDC_CR, ALDPS_PROXY_MODE); + if (ret < 0) + err = ret; + + ret = ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, + NOW_IS_OOB | DIS_MCU_CLROOB); + if (ret < 0) + err = ret; - data = ocp_reg_read(tp, OCP_POWER_CFG); - if (enable) { - data |= EN_ALDPS; - ocp_reg_write(tp, OCP_POWER_CFG, data); - } else { - int i; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, MCU_BORW_EN); + if (ret < 0) + err = ret; - data &= ~EN_ALDPS; - ocp_reg_write(tp, OCP_POWER_CFG, data); - for (i = 0; i < 20; i++) { - usleep_range(1000, 2000); - if (ocp_read_word(tp, MCU_TYPE_PLA, 0xe000) & 0x0100) - break; - } - } + ret = rxdy_gated_en(tp, false); + if (ret < 0) + err = ret; - tp->ups_info.aldps = enable; -} + ret = ocp_dword_set_bits(tp, MCU_TYPE_PLA, PLA_RCR, + RCR_APM | RCR_AM | RCR_AB); + if (ret < 0) + err = ret; -static void r8153b_mcu_spdown_en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; + ret = r8153_lanwake_clr_en(tp, false); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3); - if (enable) - ocp_data |= PLA_MCU_SPDWN_EN; + if (err < 0) + return err; else - ocp_data &= ~PLA_MCU_SPDWN_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, ocp_data); + return ret; } -static void r8153_hw_phy_cfg(struct r8152 *tp) +static int rtl8153_disable(struct r8152 *tp) { - u32 ocp_data; - u16 data; + int ret, err = 0; - /* disable ALDPS before updating the PHY parameters */ - r8153_aldps_en(tp, false); + ret = r8153_aldps_en(tp, false); + if (ret < 0) + err = ret; + ret = rtl_disable(tp); + if (ret < 0) + err = ret; + ret = rtl_reset_bmu(tp); + if (ret < 0) + err = ret; + ret = r8153_aldps_en(tp, true); - /* disable EEE before updating the PHY parameters */ - rtl_eee_enable(tp, false); + if (err < 0) + return err; + else + return ret; +} - r8153_firmware(tp); +static u32 fc_pause_on_auto(struct r8152 *tp) +{ + return (ALIGN(mtu_to_size(tp->netdev->mtu), 1024) + 6 * 1024); +} - if (tp->version == RTL_VER_03) { - data = ocp_reg_read(tp, OCP_EEE_CFG); - data &= ~CTAP_SHORT_EN; - ocp_reg_write(tp, OCP_EEE_CFG, data); - } +static u32 fc_pause_off_auto(struct r8152 *tp) +{ + return (ALIGN(mtu_to_size(tp->netdev->mtu), 1024) + 14 * 1024); +} - data = ocp_reg_read(tp, OCP_POWER_CFG); - data |= EEE_CLKDIV_EN; - ocp_reg_write(tp, OCP_POWER_CFG, data); +static int r8156_fc_parameter(struct r8152 *tp) +{ + int ret; - data = ocp_reg_read(tp, OCP_DOWN_SPEED); - data |= EN_10M_BGOFF; - ocp_reg_write(tp, OCP_DOWN_SPEED, data); - data = ocp_reg_read(tp, OCP_POWER_CFG); - data |= EN_10M_PLLOFF; - ocp_reg_write(tp, OCP_POWER_CFG, data); - sram_write(tp, SRAM_IMPEDANCE, 0x0b13); + u32 pause_on = tp->fc_pause_on ? tp->fc_pause_on : fc_pause_on_auto(tp); + u32 pause_off = tp->fc_pause_off ? tp->fc_pause_off : fc_pause_off_auto(tp); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR); - ocp_data |= PFM_PWM_SWITCH; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, pause_on / 16); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, + pause_off / 16); - /* Enable LPF corner auto tune */ - sram_write(tp, SRAM_LPF_CFG, 0xf70f); +out: + return ret; +} - /* Adjust 10M Amplitude */ - sram_write(tp, SRAM_10M_AMP1, 0x00af); - sram_write(tp, SRAM_10M_AMP2, 0x0208); +static int rtl8156_enable(struct r8152 *tp) +{ + u16 speed; + int ret; - if (tp->eee_en) - rtl_eee_enable(tp, true); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; - r8153_aldps_en(tp, true); - r8152b_enable_fc(tp); + ret = r8156_fc_parameter(tp); + if (ret < 0) + goto out; + set_tx_qlen(tp); + ret = rtl_set_eee_plus(tp); + if (ret < 0) + goto out; + ret = r8153_set_rx_early_timeout(tp); + if (ret < 0) + goto out; + ret = r8153_set_rx_early_size(tp); + if (ret < 0) + goto out; switch (tp->version) { - case RTL_VER_03: - case RTL_VER_04: + case RTL_TEST_01: + ret = ocp_byte_w0w1(tp, MCU_TYPE_PLA, 0xe95a, 0xf, 5); + if (ret < 0) + goto out; + ret = ocp_byte_w0w1(tp, MCU_TYPE_PLA, 0xe940, 0x1f, 4); + if (ret < 0) + goto out; break; - case RTL_VER_05: - case RTL_VER_06: default: - r8153_u2p3en(tp, true); break; } - set_bit(PHY_RESET, &tp->flags); + speed = rtl8152_get_speed(tp); + ret = rtl_set_ifg(tp, speed); + if (ret < 0) + goto out; + + if (speed & _2500bps) + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, + IDLE_SPDWN_EN); + else + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, + IDLE_SPDWN_EN); + if (ret < 0) + goto out; + + if (speed & _1000bps) + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_TXTWSYS, 0x11); + else if (speed & _500bps) + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_TXTWSYS, 0x3d); + if (ret < 0) + goto out; + + if (tp->udev->speed == USB_SPEED_HIGH) { + /* USB 0xb45e[3:0] l1_nyet_hird */ + if (is_flow_control(speed)) + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_L1_CTRL, + 0xf, 0xf); + else + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_L1_CTRL, + 0xf, 0x1); + if (ret < 0) + goto out; + } + + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); + if (ret < 0) + goto out; + usleep_range(1000, 2000); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); + if (ret < 0) + goto out; + + ret = rtl_enable(tp); + +out: + return ret; } -static u32 r8152_efuse_read(struct r8152 *tp, u8 addr) +static int rtl8156_disable(struct r8152 *tp) { - u32 ocp_data; + int ret, err = 0; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EFUSE_CMD, EFUSE_READ_CMD | addr); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EFUSE_CMD); - ocp_data = (ocp_data & EFUSE_DATA_BIT16) << 9; /* data of bit16 */ - ocp_data |= ocp_read_word(tp, MCU_TYPE_PLA, PLA_EFUSE_DATA); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, 0); + if (ret < 0) + err = ret; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, 0); + if (ret < 0) + err = ret; - return ocp_data; + ret = rtl8153_disable(tp); + + if (err < 0) + return err; + else + return ret; } -static void r8153b_hw_phy_cfg(struct r8152 *tp) +static int rtl8156b_enable(struct r8152 *tp) { - u32 ocp_data; - u16 data; + u16 speed; + int ret; + + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; + + set_tx_qlen(tp); + ret = rtl_set_eee_plus(tp); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_RX_AGGR_NUM, + RX_AGGR_NUM_MASK); + if (ret < 0) + goto out; + + ret = r8153_set_rx_early_timeout(tp); + if (ret < 0) + goto out; + ret = r8153_set_rx_early_size(tp); + if (ret < 0) + goto out; + + speed = rtl8152_get_speed(tp); + ret = rtl_set_ifg(tp, speed); + if (ret < 0) + goto out; + + if (speed & _2500bps) + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, + IDLE_SPDWN_EN); + else + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, + IDLE_SPDWN_EN); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0); - if (ocp_data & PCUT_STATUS) { - ocp_data &= ~PCUT_STATUS; - ocp_write_word(tp, MCU_TYPE_USB, USB_MISC_0, ocp_data); + if (tp->udev->speed == USB_SPEED_HIGH) { + if (is_flow_control(speed)) + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_L1_CTRL, + 0xf, 0xf); + else + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_L1_CTRL, + 0xf, 0x1); + if (ret < 0) + goto out; } - /* disable ALDPS before updating the PHY parameters */ - r8153_aldps_en(tp, false); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); + if (ret < 0) + goto out; + usleep_range(1000, 2000); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); + if (ret < 0) + goto out; - /* disable EEE before updating the PHY parameters */ - rtl_eee_enable(tp, false); + ret = rtl_enable(tp); - /* U1/U2/L1 idle timer. 500 us */ - ocp_write_word(tp, MCU_TYPE_USB, USB_U1U2_TIMER, 500); +out: + return ret; +} + +static int rtl8157_enable(struct r8152 *tp) +{ + u16 speed; + int ret; - data = r8153_phy_status(tp, 0); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; - switch (data) { - case PHY_STAT_PWRDN: - case PHY_STAT_EXT_INIT: - r8153b_firmware(tp); + set_tx_qlen(tp); + ret = rtl_set_eee_plus(tp); + if (ret < 0) + goto out; - data = r8152_mdio_read(tp, MII_BMCR); - data &= ~BMCR_PDOWN; - r8152_mdio_write(tp, MII_BMCR, data); - break; - case PHY_STAT_LAN_ON: - default: - r8153b_firmware(tp); - break; + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_RX_AGGR_NUM, + RX_AGGR_NUM_MASK); + if (ret < 0) + goto out; + + ret = r8153_set_rx_early_timeout(tp); + if (ret < 0) + goto out; + ret = r8153_set_rx_early_size(tp); + if (ret < 0) + goto out; + + speed = rtl8152_get_speed(tp); + ret = rtl_set_ifg(tp, speed); + if (ret < 0) + goto out; + + if (tp->udev->speed == USB_SPEED_HIGH) { + if (is_flow_control(speed)) + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_L1_CTRL, + 0xf, 0xf); + else + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_L1_CTRL, + 0xf, 0x1); + if (ret < 0) + goto out; } - r8153b_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); + ret = rtl_enable(tp); - data = sram_read(tp, SRAM_GREEN_CFG); - data |= R_TUNE_EN; - sram_write(tp, SRAM_GREEN_CFG, data); - data = ocp_reg_read(tp, OCP_NCTL_CFG); - data |= PGA_RETURN_EN; - ocp_reg_write(tp, OCP_NCTL_CFG, data); +out: + return ret; +} - /* ADC Bias Calibration: - * read efuse offset 0x7d to get a 17-bit data. Remove the dummy/fake - * bit (bit3) to rebuild the real 16-bit data. Write the data to the - * ADC ioffset. - */ - ocp_data = r8152_efuse_read(tp, 0x7d); - data = (u16)(((ocp_data & 0x1fff0) >> 1) | (ocp_data & 0x7)); - if (data != 0xffff) - ocp_reg_write(tp, OCP_ADC_IOFFSET, data); +static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex, + u32 advertising) +{ + u16 bmcr; + int ret = 0; + + if (autoneg == AUTONEG_DISABLE) { + if (duplex != DUPLEX_HALF && duplex != DUPLEX_FULL) + return -EINVAL; + + switch (speed) { + case SPEED_10: + bmcr = BMCR_SPEED10; + if (duplex == DUPLEX_FULL) { + bmcr |= BMCR_FULLDPLX; + tp->ups_info.speed_duplex = FORCE_10M_FULL; + } else { + tp->ups_info.speed_duplex = FORCE_10M_HALF; + } + break; + case SPEED_100: + bmcr = BMCR_SPEED100; + if (duplex == DUPLEX_FULL) { + bmcr |= BMCR_FULLDPLX; + tp->ups_info.speed_duplex = FORCE_100M_FULL; + } else { + tp->ups_info.speed_duplex = FORCE_100M_HALF; + } + break; + case SPEED_1000: + if (tp->mii.supports_gmii) { + bmcr = BMCR_SPEED1000 | BMCR_FULLDPLX; + tp->ups_info.speed_duplex = NWAY_1000M_FULL; + break; + } + fallthrough; + default: + ret = -EINVAL; + goto out; + } - /* ups mode tx-link-pulse timing adjustment: - * rg_saw_cnt = OCP reg 0xC426 Bit[13:0] - * swr_cnt_1ms_ini = 16000000 / rg_saw_cnt - */ - ocp_data = ocp_reg_read(tp, 0xc426); - ocp_data &= 0x3fff; - if (ocp_data) { - u32 swr_cnt_1ms_ini; + if (duplex == DUPLEX_FULL) + tp->mii.full_duplex = 1; + else + tp->mii.full_duplex = 0; - swr_cnt_1ms_ini = (16000000 / ocp_data) & SAW_CNT_1MS_MASK; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CFG); - ocp_data = (ocp_data & ~SAW_CNT_1MS_MASK) | swr_cnt_1ms_ini; - ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CFG, ocp_data); - } + tp->mii.force_media = 1; + } else { + u16 orig, new1; + u32 support; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR); - ocp_data |= PFM_PWM_SWITCH; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data); + support = RTL_ADVERTISED_10_HALF | RTL_ADVERTISED_10_FULL | + RTL_ADVERTISED_100_HALF | RTL_ADVERTISED_100_FULL; -#ifdef CONFIG_CTAP_SHORT_OFF - data = ocp_reg_read(tp, OCP_EEE_CFG); - data &= ~CTAP_SHORT_EN; - ocp_reg_write(tp, OCP_EEE_CFG, data); + if (tp->mii.supports_gmii) + support |= RTL_ADVERTISED_1000_FULL; - tp->ups_info.ctap_short_off = true; -#endif - /* Advnace EEE */ - if (!rtl_phy_patch_request(tp, true, true)) { - data = ocp_reg_read(tp, OCP_POWER_CFG); - data |= EEE_CLKDIV_EN; - ocp_reg_write(tp, OCP_POWER_CFG, data); - tp->ups_info.eee_ckdiv = true; + if (tp->support_2500full) + support |= RTL_ADVERTISED_2500_FULL; - data = ocp_reg_read(tp, OCP_DOWN_SPEED); - data |= EN_EEE_CMODE | EN_EEE_1000 | EN_10M_CLKDIV; - ocp_reg_write(tp, OCP_DOWN_SPEED, data); - tp->ups_info.eee_cmod_lv = true; - tp->ups_info._10m_ckdiv = true; - tp->ups_info.eee_plloff_giga = true; + if (tp->support_5000full) + support |= RTL_ADVERTISED_5000_FULL; - ocp_reg_write(tp, OCP_SYSCLK_CFG, 0); - ocp_reg_write(tp, OCP_SYSCLK_CFG, clk_div_expo(5)); - tp->ups_info._250m_ckdiv = true; + if (!(advertising & support)) + return -EINVAL; - rtl_phy_patch_request(tp, false, true); - } + ret = r8152_mdio_read(tp, MII_ADVERTISE); + if (ret < 0) + goto out; - if (tp->eee_en) - rtl_eee_enable(tp, true); + orig = ret; + new1 = orig & ~(ADVERTISE_10HALF | ADVERTISE_10FULL | + ADVERTISE_100HALF | ADVERTISE_100FULL); + if (advertising & RTL_ADVERTISED_10_HALF) { + new1 |= ADVERTISE_10HALF; + tp->ups_info.speed_duplex = NWAY_10M_HALF; + } + if (advertising & RTL_ADVERTISED_10_FULL) { + new1 |= ADVERTISE_10FULL; + tp->ups_info.speed_duplex = NWAY_10M_FULL; + } - r8153_aldps_en(tp, true); - r8152b_enable_fc(tp); -// r8153_u2p3en(tp, true); + if (advertising & RTL_ADVERTISED_100_HALF) { + new1 |= ADVERTISE_100HALF; + tp->ups_info.speed_duplex = NWAY_100M_HALF; + } + if (advertising & RTL_ADVERTISED_100_FULL) { + new1 |= ADVERTISE_100FULL; + tp->ups_info.speed_duplex = NWAY_100M_FULL; + } - set_bit(PHY_RESET, &tp->flags); - rtl_set_dbg_info_state(tp, DGB_DRV_STATE_LOAD); -} + if (orig != new1) { + ret = r8152_mdio_write(tp, MII_ADVERTISE, new1); + if (ret < 0) + goto out; + tp->mii.advertising = new1; + } -static void r8153c_hw_phy_cfg(struct r8152 *tp) -{ - r8153b_hw_phy_cfg(tp); + if (tp->mii.supports_gmii) { + ret = r8152_mdio_read(tp, MII_CTRL1000); + if (ret < 0) + goto out; - tp->ups_info.r_tune = true; -} + orig = ret; + new1 = orig & ~(ADVERTISE_1000FULL | + ADVERTISE_1000HALF); -static void rtl8153_change_mtu(struct r8152 *tp) -{ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, mtu_to_size(tp->netdev->mtu)); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_JUMBO); -} + if (advertising & RTL_ADVERTISED_1000_FULL) { + new1 |= ADVERTISE_1000FULL; + tp->ups_info.speed_duplex = NWAY_1000M_FULL; + } -static void r8153_lanwake_clr_en(struct r8152 *tp, bool enable) -{ - u32 ocp_data; + if (orig != new1) { + ret = r8152_mdio_write(tp, MII_CTRL1000, new1); + if (ret < 0) + goto out; + } + } - if (enable) { - /* Enable the feature that the MCU could clear the lanwake */ - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CONFIG6); - ocp_data |= LANWAKE_CLR_EN; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CONFIG6, ocp_data); + if (tp->support_2500full || tp->support_5000full) { + ret = ocp_reg_read(tp, OCP_10GBT_CTRL, &orig); + if (ret < 0) + goto out; - /* Clear lanwake */ - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_LWAKE_CTRL_REG); - ocp_data &= ~LANWAKE_PIN; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_LWAKE_CTRL_REG, ocp_data); - } else { - /* Disable the feature that the MCU could clear the lanwake */ - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CONFIG6); - ocp_data &= ~LANWAKE_CLR_EN; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CONFIG6, ocp_data); - } -} + new1 = orig; + new1 &= ~(MDIO_AN_10GBT_CTRL_ADV2_5G | + MDIO_AN_10GBT_CTRL_ADV5G); -static void r8153_first_init(struct r8152 *tp) -{ - u32 ocp_data; + if (advertising & RTL_ADVERTISED_2500_FULL) { + new1 |= MDIO_AN_10GBT_CTRL_ADV2_5G; + tp->ups_info.speed_duplex = NWAY_2500M_FULL; + } - rxdy_gated_en(tp, true); - r8153_teredo_off(tp); + if (advertising & RTL_ADVERTISED_5000_FULL) { + new1 |= MDIO_AN_10GBT_CTRL_ADV5G; + tp->ups_info.speed_duplex = NWAY_5000M_FULL; + } - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data &= ~RCR_ACPT_ALL; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); + if (orig != new1) { + ret = ocp_reg_write(tp, OCP_10GBT_CTRL, new1); + if (ret < 0) + goto out; + } + } - rtl8152_nic_reset(tp); - rtl_reset_bmu(tp); + bmcr = BMCR_ANENABLE | BMCR_ANRESTART; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data &= ~NOW_IS_OOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); + tp->mii.force_media = 0; + } - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data &= ~MCU_BORW_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + if (test_and_clear_bit(PHY_RESET, &tp->flags)) + bmcr |= BMCR_RESET; - wait_oob_link_list_ready(tp); + ret = r8152_mdio_write(tp, MII_BMCR, bmcr); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data |= RE_INIT_LL; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + if (bmcr & BMCR_RESET) { + int i; - wait_oob_link_list_ready(tp); + for (i = 0; i < 50; i++) { + msleep(20); + ret = r8152_mdio_read(tp, MII_BMCR); + if (ret < 0) + goto out; + if ((ret & BMCR_RESET) == 0) + break; + } + } - rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); +out: + return (ret < 0) ? ret : 0; +} - rtl8153_change_mtu(tp); +static bool rtl_speed_down(struct r8152 *tp) +{ + bool ret = false; + int r; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0); - ocp_data |= TCR0_AUTO_FIFO; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TCR0, ocp_data); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return ret; - rtl8152_nic_reset(tp); + if (!(tp->saved_wolopts & WAKE_ANY)) { + switch (tp->version) { + case RTL_VER_01: + case RTL_VER_02: + set_bit(RECOVER_SPEED, &tp->flags); + ret = true; + r = r8152_mdio_set_bit(tp, MII_BMCR, BMCR_PDOWN); + if (r < 0) + goto out1; + break; + default: + break; + } + } else if (!(tp->saved_wolopts & WAKE_PHY)) { + u16 bmcr; - /* rx share fifo credit full threshold */ - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_NORMAL); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_NORMAL); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_NORMAL); - /* TX share fifo free credit full threshold */ - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL2); + r = r8152_mdio_read(tp, MII_BMCR); + if (r < 0) + goto out1; - r8153_lanwake_clr_en(tp, true); -} + bmcr = r; + r = r8152_mdio_read(tp, MII_EXPANSION); + if (r < 0) + goto out1; -static void r8153_enter_oob(struct r8152 *tp) -{ - u32 ocp_data; + if (netif_carrier_ok(tp->netdev) && (bmcr & BMCR_ANENABLE) && + (r & EXPANSION_NWAY)) { + u16 anar, gbcr = 0, lpa, gbcr2 = 0, lpa2, lpa3; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data &= ~NOW_IS_OOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); + r = r8152_mdio_read(tp, MII_ADVERTISE); + if (r < 0) + goto out1; - /* RX FIFO settings for OOB */ - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_OOB); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_OOB); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_OOB); + anar = r; + anar &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL | + ADVERTISE_100HALF | ADVERTISE_100FULL); - rtl_disable(tp); - rtl_reset_bmu(tp); + if (tp->mii.supports_gmii) { + r = r8152_mdio_read(tp, MII_CTRL1000); + if (r < 0) + goto out1; - wait_oob_link_list_ready(tp); + gbcr = r; + gbcr &= ~(ADVERTISE_1000FULL | + ADVERTISE_1000HALF); + } - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data |= RE_INIT_LL; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + if (tp->support_2500full || tp->support_5000full) { + r = ocp_reg_read(tp, OCP_10GBT_CTRL, &gbcr2); + if (r < 0) + goto out1; + gbcr2 &= ~(MDIO_AN_10GBT_CTRL_ADV2_5G | + MDIO_AN_10GBT_CTRL_ADV5G); + } - wait_oob_link_list_ready(tp); + r = r8152_mdio_read(tp, MII_LPA); + if (r < 0) + goto out1; + lpa = r; + r = r8152_mdio_read(tp, MII_STAT1000); + if (r < 0) + goto out1; + lpa2 = r; + r = r8152_mdio_read(tp, OCP_10GBT_STAT); + if (r < 0) + goto out1; + lpa3 = r; + if (lpa & (LPA_10HALF | LPA_10FULL)) { + anar |= ADVERTISE_10HALF | ADVERTISE_10FULL; + rtl_eee_plus_en(tp, true); + } else if (lpa & (LPA_100HALF | LPA_100FULL)) { + anar |= ADVERTISE_10HALF | ADVERTISE_10FULL | + ADVERTISE_100HALF | ADVERTISE_100FULL; + } else if (lpa2 & (LPA_1000HALF | LPA_1000FULL)) { + gbcr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF; + } else if (lpa3 & MDIO_AN_10GBT_STAT_LP2_5G) { + gbcr2 |= MDIO_AN_10GBT_CTRL_ADV2_5G; + } else if (lpa3 & MDIO_AN_10GBT_STAT_LP5G) { + gbcr2 |= MDIO_AN_10GBT_CTRL_ADV5G; + } else { + goto out1; + } - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, 1522); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_DEFAULT); + set_bit(RECOVER_SPEED, &tp->flags); + ret = true; - switch (tp->version) { - case RTL_VER_03: - case RTL_VER_04: - case RTL_VER_05: - case RTL_VER_06: - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG); - ocp_data &= ~TEREDO_WAKE_MASK; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_CFG, ocp_data); - break; + if (tp->mii.supports_gmii) { + r = r8152_mdio_write(tp, MII_CTRL1000, gbcr); + if (r < 0) + goto out1; + } - case RTL_VER_08: - case RTL_VER_09: - case RTL_VER_14: - /* Clear teredo wake event. bit[15:8] is the teredo wakeup - * type. Set it to zero. bits[7:0] are the W1C bits about - * the events. Set them to all 1 to clear them. - */ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_WAKE_BASE, 0x00ff); - break; + if (tp->support_2500full || tp->support_5000full) { + r = ocp_reg_write(tp, OCP_10GBT_CTRL, gbcr2); + if (r < 0) + goto out1; + } - default: - break; + r = r8152_mdio_write(tp, MII_ADVERTISE, anar); + if (r < 0) + goto out1; + r = r8152_mdio_write(tp, MII_BMCR, bmcr | BMCR_ANRESTART); + if (r < 0) + goto out1; + } } - rtl_rx_vlan_en(tp, true); - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BDC_CR); - ocp_data |= ALDPS_PROXY_MODE; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_BDC_CR, ocp_data); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); +out1: + return ret; +} - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data |= MCU_BORW_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); +static int rtl8152_up(struct r8152 *tp) +{ + int ret; - rxdy_gated_en(tp, false); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data |= RCR_APM | RCR_AM | RCR_AB; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); + ret = r8152_aldps_en(tp, false); + if (ret < 0) + goto out; + ret = r8152b_exit_oob(tp); + if (ret < 0) + goto out; + ret = r8152_aldps_en(tp, true); - r8153_lanwake_clr_en(tp, false); +out: + return ret; } -static void rtl8153_disable(struct r8152 *tp) +static int rtl8152_down(struct r8152 *tp) { - r8153_aldps_en(tp, false); - rtl_disable(tp); - rtl_reset_bmu(tp); - r8153_aldps_en(tp, true); -} + int ret, err = 0; -static u32 fc_pause_on_auto(struct r8152 *tp) -{ - return (ALIGN(mtu_to_size(tp->netdev->mtu), 1024) + 6 * 1024); -} + if (test_bit(RTL8152_UNPLUG, &tp->flags)) { + rtl_drop_queued_tx(tp); + rtl_stop_rx(tp); + return -ENODEV; + } -static u32 fc_pause_off_auto(struct r8152 *tp) -{ - return (ALIGN(mtu_to_size(tp->netdev->mtu), 1024) + 14 * 1024); -} + ret = r8152_power_cut_en(tp, false); + if (ret < 0) + err = ret; + ret = r8152_aldps_en(tp, false); + if (ret < 0) + err = ret; + ret = r8152b_enter_oob(tp); + if (ret < 0) + err = ret; + ret = r8152_aldps_en(tp, true); -static void r8156_fc_parameter(struct r8152 *tp) -{ - u32 pause_on = tp->fc_pause_on ? tp->fc_pause_on : fc_pause_on_auto(tp); - u32 pause_off = tp->fc_pause_off ? tp->fc_pause_off : fc_pause_off_auto(tp); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, pause_on / 16); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, pause_off / 16); + if (err < 0) + return err; + else + return ret; } -static int rtl8156_enable(struct r8152 *tp) +static int rtl8153_up(struct r8152 *tp) { - u32 ocp_data; - u16 speed; + int ret; + + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; + + ret = r8153_u1u2en(tp, false); + if (ret < 0) + goto out; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + goto out; + ret = r8153_first_init(tp); + if (ret < 0) + goto out; - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return -ENODEV; + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_SSPHYLINK1, + DELAY_PHY_PWR_CHG); + if (ret < 0) + goto out; - r8156_fc_parameter(tp); - set_tx_qlen(tp); - rtl_set_eee_plus(tp); - r8153_set_rx_early_timeout(tp); - r8153_set_rx_early_size(tp); + ret = r8153_aldps_en(tp, true); + if (ret < 0) + goto out; switch (tp->version) { - case RTL_TEST_01: - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, 0xe95a); - ocp_data &= ~0xf; - ocp_data |= 5; - ocp_write_byte(tp, MCU_TYPE_PLA, 0xe95a, ocp_data); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, 0xe940); - ocp_data &= ~0x1f; - ocp_data |= 4; - ocp_write_byte(tp, MCU_TYPE_PLA, 0xe940, ocp_data); + case RTL_VER_03: + case RTL_VER_04: break; + case RTL_VER_05: + case RTL_VER_06: default: + ret = r8153_u2p3en(tp, true); + if (ret < 0) + goto out; break; } - speed = rtl8152_get_speed(tp); - rtl_set_ifg(tp, speed); + ret = r8153_u1u2en(tp, true); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4); - if (speed & _2500bps) - ocp_data &= ~IDLE_SPDWN_EN; - else - ocp_data |= IDLE_SPDWN_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, ocp_data); +out: + return ret; +} - if (speed & _1000bps) - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_TXTWSYS, 0x11); - else if (speed & _500bps) - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_TXTWSYS, 0x3d); +static int rtl8153_down(struct r8152 *tp) +{ + int ret, err = 0; - if (tp->udev->speed == USB_SPEED_HIGH) { - /* USB 0xb45e[3:0] l1_nyet_hird */ - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_L1_CTRL); - ocp_data &= ~0xf; - if (is_flow_control(speed)) - ocp_data |= 0xf; - else - ocp_data |= 0x1; - ocp_write_word(tp, MCU_TYPE_USB, USB_L1_CTRL, ocp_data); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) { + rtl_drop_queued_tx(tp); + rtl_stop_rx(tp); + return -ENODEV; } - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK); - ocp_data &= ~FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); - usleep_range(1000, 2000); - ocp_data |= FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); - - return rtl_enable(tp); -} - -static void rtl8156_disable(struct r8152 *tp) -{ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, 0); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, 0); + ret = r8153_u1u2en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_power_cut_en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_enter_oob(tp); + if (ret < 0) + err = ret; + ret = r8153_aldps_en(tp, true); - rtl8153_disable(tp); + if (err < 0) + return err; + else + return ret; } -static int rtl8156b_enable(struct r8152 *tp) +static int rtl8153b_up(struct r8152 *tp) { - u32 ocp_data; - u16 speed; + int ret; if (test_bit(RTL8152_UNPLUG, &tp->flags)) return -ENODEV; - set_tx_qlen(tp); - rtl_set_eee_plus(tp); + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_RX_AGGR_NUM); - ocp_data &= ~RX_AGGR_NUM_MASK; -// ocp_data |= 2; - ocp_write_word(tp, MCU_TYPE_USB, USB_RX_AGGR_NUM, ocp_data); + ret = r8153_first_init(tp); + if (ret < 0) + goto out; + ret = ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_B); + if (ret < 0) + goto out; - r8153_set_rx_early_timeout(tp); - r8153_set_rx_early_size(tp); + ret = r8153b_mcu_spdown_en(tp, false); + if (ret < 0) + goto out; + ret = r8153_aldps_en(tp, true); + if (ret < 0) + goto out; +// ret = r8153_u2p3en(tp, true); +// if (ret < 0) +// goto out; + if (tp->udev->speed >= USB_SPEED_SUPER) + ret = r8153b_u1u2en(tp, true); - speed = rtl8152_get_speed(tp); - rtl_set_ifg(tp, speed); +out: + return ret; +} - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4); - if (speed & _2500bps) - ocp_data &= ~IDLE_SPDWN_EN; - else - ocp_data |= IDLE_SPDWN_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, ocp_data); +static int rtl8153b_down(struct r8152 *tp) +{ + int ret, err = 0; - if (tp->udev->speed == USB_SPEED_HIGH) { - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_L1_CTRL); - ocp_data &= ~0xf; - if (is_flow_control(speed)) - ocp_data |= 0xf; - else - ocp_data |= 0x1; - ocp_write_word(tp, MCU_TYPE_USB, USB_L1_CTRL, ocp_data); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) { + rtl_drop_queued_tx(tp); + rtl_stop_rx(tp); + return -ENODEV; } - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK); - ocp_data &= ~FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); - usleep_range(1000, 2000); - ocp_data |= FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); + ret = r8153b_mcu_spdown_en(tp, true); + if (ret < 0) + err = ret; + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + err = ret; + ret = r8153b_power_cut_en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_enter_oob(tp); + if (ret < 0) + err = ret; + ret = r8153_aldps_en(tp, true); - return rtl_enable(tp); + if (err < 0) + return err; + else + return ret; } -static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u32 speed, u8 duplex, - u32 advertising) +static int rtl8153c_change_mtu(struct r8152 *tp) { - u16 bmcr; - int ret = 0; - - if (autoneg == AUTONEG_DISABLE) { - if (duplex != DUPLEX_HALF && duplex != DUPLEX_FULL) - return -EINVAL; - - switch (speed) { - case SPEED_10: - bmcr = BMCR_SPEED10; - if (duplex == DUPLEX_FULL) { - bmcr |= BMCR_FULLDPLX; - tp->ups_info.speed_duplex = FORCE_10M_FULL; - } else { - tp->ups_info.speed_duplex = FORCE_10M_HALF; - } - break; - case SPEED_100: - bmcr = BMCR_SPEED100; - if (duplex == DUPLEX_FULL) { - bmcr |= BMCR_FULLDPLX; - tp->ups_info.speed_duplex = FORCE_100M_FULL; - } else { - tp->ups_info.speed_duplex = FORCE_100M_HALF; - } - break; - case SPEED_1000: - if (tp->mii.supports_gmii) { - bmcr = BMCR_SPEED1000 | BMCR_FULLDPLX; - tp->ups_info.speed_duplex = NWAY_1000M_FULL; - break; - } - fallthrough; - default: - ret = -EINVAL; - goto out; - } - - if (duplex == DUPLEX_FULL) - tp->mii.full_duplex = 1; - else - tp->mii.full_duplex = 0; - - tp->mii.force_media = 1; - } else { - u16 orig, new1; - u32 support; + int ret; - support = RTL_ADVERTISED_10_HALF | RTL_ADVERTISED_10_FULL | - RTL_ADVERTISED_100_HALF | RTL_ADVERTISED_100_FULL; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, + mtu_to_size(tp->netdev->mtu)); + if (ret < 0) + goto out; - if (tp->mii.supports_gmii) { - support |= RTL_ADVERTISED_1000_FULL; + ret = ocp_write_word(tp, MCU_TYPE_PLA, 0xe048, + mtu_to_size(tp->netdev->mtu)); + if (ret < 0) + goto out; - if (tp->support_2500full) - support |= RTL_ADVERTISED_2500_FULL; - } + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, 10 * 1024 / 64); + if (ret < 0) + goto out; - if (!(advertising & support)) - return -EINVAL; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, 512 / 64); + if (ret < 0) + goto out; - orig = r8152_mdio_read(tp, MII_ADVERTISE); - new1 = orig & ~(ADVERTISE_10HALF | ADVERTISE_10FULL | - ADVERTISE_100HALF | ADVERTISE_100FULL); - if (advertising & RTL_ADVERTISED_10_HALF) { - new1 |= ADVERTISE_10HALF; - tp->ups_info.speed_duplex = NWAY_10M_HALF; - } - if (advertising & RTL_ADVERTISED_10_FULL) { - new1 |= ADVERTISE_10FULL; - tp->ups_info.speed_duplex = NWAY_10M_FULL; - } + /* Adjust the tx fifo free credit full threshold, otherwise + * the fifo would be too small to send a jumbo frame packet. + */ + if (tp->netdev->mtu < 8000) + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_FULL, + 2048 / 8); + else + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_FULL, + 900 / 8); - if (advertising & RTL_ADVERTISED_100_HALF) { - new1 |= ADVERTISE_100HALF; - tp->ups_info.speed_duplex = NWAY_100M_HALF; - } - if (advertising & RTL_ADVERTISED_100_FULL) { - new1 |= ADVERTISE_100FULL; - tp->ups_info.speed_duplex = NWAY_100M_FULL; - } +out: + return ret; +} - if (orig != new1) { - r8152_mdio_write(tp, MII_ADVERTISE, new1); - tp->mii.advertising = new1; - } +static int rtl8153c_up(struct r8152 *tp) +{ + int ret; - if (tp->mii.supports_gmii) { - orig = r8152_mdio_read(tp, MII_CTRL1000); - new1 = orig & ~(ADVERTISE_1000FULL | - ADVERTISE_1000HALF); + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; - if (advertising & RTL_ADVERTISED_1000_FULL) { - new1 |= ADVERTISE_1000FULL; - tp->ups_info.speed_duplex = NWAY_1000M_FULL; - } + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + goto out; - if (orig != new1) - r8152_mdio_write(tp, MII_CTRL1000, new1); - } + ret = rxdy_gated_en(tp, true); + if (ret < 0) + goto out; + ret = r8153_teredo_off(tp); + if (ret < 0) + goto out; - if (tp->support_2500full) { - orig = ocp_reg_read(tp, OCP_10GBT_CTRL); - new1 = orig & ~MDIO_AN_10GBT_CTRL_ADV2_5G; + ret = ocp_dword_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR, RCR_ACPT_ALL); + if (ret < 0) + goto out; - if (advertising & RTL_ADVERTISED_2500_FULL) { - new1 |= MDIO_AN_10GBT_CTRL_ADV2_5G; - tp->ups_info.speed_duplex = NWAY_2500M_FULL; - } + ret = rtl8152_nic_reset(tp); + if (ret < 0) + goto out; + ret = rtl_reset_bmu(tp); + if (ret < 0) + goto out; - if (orig != new1) - ocp_reg_write(tp, OCP_10GBT_CTRL, new1); - } + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + goto out; - bmcr = BMCR_ANENABLE | BMCR_ANRESTART; + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, MCU_BORW_EN); + if (ret < 0) + goto out; - tp->mii.force_media = 0; - } + wait_oob_link_list_ready(tp); - if (test_and_clear_bit(PHY_RESET, &tp->flags)) - bmcr |= BMCR_RESET; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, RE_INIT_LL); + if (ret < 0) + goto out; - r8152_mdio_write(tp, MII_BMCR, bmcr); + wait_oob_link_list_ready(tp); - if (bmcr & BMCR_RESET) { - int i; + ret = rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); + if (ret < 0) + goto out; - for (i = 0; i < 50; i++) { - msleep(20); - if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0) - break; - } - } + ret = rtl8153c_change_mtu(tp); + if (ret < 0) + goto out; -out: - return ret; -} + ret = rtl8152_nic_reset(tp); + if (ret < 0) + goto out; -static bool rtl_speed_down(struct r8152 *tp) -{ - bool ret = false; + /* rx share fifo credit full threshold */ + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, 0x02); + if (ret < 0) + goto out; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, 0x08); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_NORMAL); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_NORMAL); + if (ret < 0) + goto out; - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return ret; + ret = ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_B); + if (ret < 0) + goto out; - if ((tp->saved_wolopts & WAKE_ANY) && !(tp->saved_wolopts & WAKE_PHY)) { - u16 bmcr; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + if (ret < 0) + goto out; - bmcr = r8152_mdio_read(tp, MII_BMCR); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_CONFIG34, BIT(8)); + if (ret < 0) + goto out; - if (netif_carrier_ok(tp->netdev) && (bmcr & BMCR_ANENABLE) && - (r8152_mdio_read(tp, MII_EXPANSION) & EXPANSION_NWAY)) { - u16 anar, gbcr = 0, lpa, gbcr2 = 0; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); + if (ret < 0) + goto out; - anar = r8152_mdio_read(tp, MII_ADVERTISE); - anar &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL | - ADVERTISE_100HALF | ADVERTISE_100FULL); + ret = r8153b_mcu_spdown_en(tp, false); + if (ret < 0) + goto out; - if (tp->mii.supports_gmii) { - gbcr = r8152_mdio_read(tp, MII_CTRL1000); - gbcr &= ~(ADVERTISE_1000FULL | - ADVERTISE_1000HALF); - if (tp->support_2500full) { - gbcr2 = ocp_reg_read(tp, 0xa5d4); - gbcr2 &= ~BIT(7); - } - } + ret = r8153_aldps_en(tp, true); + if (ret < 0) + goto out; +// ret = r8153_u2p3en(tp, true); +// if (ret < 0) +// goto out; + ret = r8153b_u1u2en(tp, true); - lpa = r8152_mdio_read(tp, MII_LPA); - if (lpa & (LPA_10HALF | LPA_10FULL)) { - anar |= ADVERTISE_10HALF | ADVERTISE_10FULL; - rtl_eee_plus_en(tp, true); - } else if (lpa & (LPA_100HALF | LPA_100FULL)) { - anar |= ADVERTISE_10HALF | ADVERTISE_10FULL | - ADVERTISE_100HALF | ADVERTISE_100FULL; - } else { - goto out1; - } +out: + return ret; +} - if (tp->mii.supports_gmii) { - r8152_mdio_write(tp, MII_CTRL1000, gbcr); - if (tp->support_2500full) - ocp_reg_write(tp, 0xa5d4, gbcr2); - } +static int rtl8156_change_mtu(struct r8152 *tp) +{ + u32 rx_max_size = mtu_to_size(tp->netdev->mtu); + int ret; - r8152_mdio_write(tp, MII_ADVERTISE, anar); - r8152_mdio_write(tp, MII_BMCR, bmcr | BMCR_ANRESTART); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, rx_max_size); + if (ret < 0) + goto out; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_JUMBO); + if (ret < 0) + goto out; + ret = r8156_fc_parameter(tp); + if (ret < 0) + goto out; - set_bit(RECOVER_SPEED, &tp->flags); - ret = true; - } - } + /* TX share fifo free credit full threshold */ + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, 512 / 64); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_FULL, + ALIGN(rx_max_size + tp->tx_desc.size, 1024) / 16); -out1: +out: return ret; } -static void rtl8152_up(struct r8152 *tp) +static int rtl8156_up(struct r8152 *tp) { + int ret; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + return -ENODEV; - r8152_aldps_en(tp, false); - r8152b_exit_oob(tp); - r8152_aldps_en(tp, true); -} + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + goto out; -static void rtl8152_down(struct r8152 *tp) -{ - if (test_bit(RTL8152_UNPLUG, &tp->flags)) { - rtl_drop_queued_tx(tp); - return; - } + ret = rxdy_gated_en(tp, true); + if (ret < 0) + goto out; + ret = r8153_teredo_off(tp); + if (ret < 0) + goto out; - r8152_power_cut_en(tp, false); - r8152_aldps_en(tp, false); - r8152b_enter_oob(tp); - r8152_aldps_en(tp, true); -} + ret = ocp_dword_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR, RCR_ACPT_ALL); + if (ret < 0) + goto out; -static void rtl8153_up(struct r8152 *tp) -{ - u32 ocp_data; + ret = rtl8152_nic_reset(tp); + if (ret < 0) + goto out; + ret = rtl_reset_bmu(tp); + if (ret < 0) + goto out; - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + goto out; - r8153_u1u2en(tp, false); - r8153_u2p3en(tp, false); - r8153_aldps_en(tp, false); - r8153_first_init(tp); + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, MCU_BORW_EN); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_SSPHYLINK1); - ocp_data &= ~DELAY_PHY_PWR_CHG; - ocp_write_word(tp, MCU_TYPE_USB, USB_SSPHYLINK1, ocp_data); + ret = rtl_rx_vlan_en(tp, + tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); + if (ret < 0) + goto out; - r8153_aldps_en(tp, true); + ret = rtl8156_change_mtu(tp); + if (ret < 0) + goto out; switch (tp->version) { - case RTL_VER_03: - case RTL_VER_04: + case RTL_TEST_01: + case RTL_VER_10: + case RTL_VER_11: + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_BMU_CONFIG, + ACT_ODMA); + if (ret < 0) + goto out; break; - case RTL_VER_05: - case RTL_VER_06: default: - r8153_u2p3en(tp, true); break; } - r8153_u1u2en(tp, true); -} + /* share FIFO settings */ + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, RXFIFO_FULL_MASK, + 0x08); + if (ret < 0) + goto out; -static void rtl8153_down(struct r8152 *tp) -{ - if (test_bit(RTL8152_UNPLUG, &tp->flags)) { - rtl_drop_queued_tx(tp); - return; - } + ret = r8153b_mcu_spdown_en(tp, false); + if (ret < 0) + goto out; - r8153_u1u2en(tp, false); - r8153_u2p3en(tp, false); - r8153_power_cut_en(tp, false); - r8153_aldps_en(tp, false); - r8153_enter_oob(tp); - r8153_aldps_en(tp, true); -} + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_SPEED_OPTION, + RG_PWRDN_EN | ALL_SPEED_OFF); + if (ret < 0) + goto out; -static void rtl8153b_up(struct r8152 *tp) -{ - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + ret = ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, 0x00600400); + if (ret < 0) + goto out; - r8153b_u1u2en(tp, false); - r8153_u2p3en(tp, false); - r8153_aldps_en(tp, false); + if (tp->saved_wolopts != __rtl_get_wol(tp)) { + netif_warn(tp, ifup, tp->netdev, "wol setting is changed\n"); + ret = __rtl_set_wol(tp, tp->saved_wolopts); + if (ret < 0) + goto out; + } - r8153_first_init(tp); - ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_B); + ret = r8153_aldps_en(tp, true); + if (ret < 0) + goto out; + ret = r8153_u2p3en(tp, true); + if (ret < 0) + goto out; - r8153b_mcu_spdown_en(tp, false); - r8153_aldps_en(tp, true); -// r8153_u2p3en(tp, true); if (tp->udev->speed >= USB_SPEED_SUPER) - r8153b_u1u2en(tp, true); + ret = r8153b_u1u2en(tp, true); + +out: + return ret; } -static void rtl8153b_down(struct r8152 *tp) +static int rtl8156_down(struct r8152 *tp) { + int ret, err = 0; + if (test_bit(RTL8152_UNPLUG, &tp->flags)) { rtl_drop_queued_tx(tp); - return; + rtl_stop_rx(tp); + return -ENODEV; } - r8153b_mcu_spdown_en(tp, true); - r8153b_u1u2en(tp, false); - r8153_u2p3en(tp, false); - r8153b_power_cut_en(tp, false); - r8153_aldps_en(tp, false); - r8153_enter_oob(tp); - r8153_aldps_en(tp, true); -} - -static void rtl8153c_change_mtu(struct r8152 *tp) -{ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, mtu_to_size(tp->netdev->mtu)); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, 10 * 1024 / 64); - - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, 512 / 64); - - /* Adjust the tx fifo free credit full threshold, otherwise - * the fifo would be too small to send a jumbo frame packet. - */ - if (tp->netdev->mtu < 8000) - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_FULL, 2048 / 8); - else - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_FULL, 900 / 8); -} - -static void rtl8153c_up(struct r8152 *tp) -{ - u32 ocp_data; - - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; - - r8153b_u1u2en(tp, false); - r8153_u2p3en(tp, false); - r8153_aldps_en(tp, false); - - rxdy_gated_en(tp, true); - r8153_teredo_off(tp); - - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data &= ~RCR_ACPT_ALL; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); - - rtl8152_nic_reset(tp); - rtl_reset_bmu(tp); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data &= ~NOW_IS_OOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data &= ~MCU_BORW_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); - - wait_oob_link_list_ready(tp); + ret = r8153b_mcu_spdown_en(tp, true); + if (ret < 0) + err = ret; + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + err = ret; + ret = r8153b_power_cut_en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + err = ret; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data |= RE_INIT_LL; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + err = ret; - wait_oob_link_list_ready(tp); + /* RX FIFO settings for OOB */ + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, 64 / 16); + if (ret < 0) + err = ret; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, 1024 / 16); + if (ret < 0) + err = ret; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, 4096 / 16); + if (ret < 0) + err = ret; - rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); + ret = rtl_disable(tp); + if (ret < 0) + err = ret; + ret = rtl_reset_bmu(tp); + if (ret < 0) + err = ret; - rtl8153c_change_mtu(tp); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, 1522); + if (ret < 0) + err = ret; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_DEFAULT); + if (ret < 0) + err = ret; - rtl8152_nic_reset(tp); + /* Clear teredo wake event. bit[15:8] is the teredo wakeup + * type. Set it to zero. bits[7:0] are the W1C bits about + * the events. Set them to all 1 to clear them. + */ + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_WAKE_BASE, 0x00ff); + if (ret < 0) + err = ret; - /* rx share fifo credit full threshold */ - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, 0x02); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, 0x08); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_NORMAL); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_NORMAL); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_BDC_CR, ALDPS_PROXY_MODE); + if (ret < 0) + err = ret; - ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_B); + ret = ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, + NOW_IS_OOB | DIS_MCU_CLROOB); + if (ret < 0) + err = ret; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, MCU_BORW_EN); + if (ret < 0) + err = ret; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG34); - ocp_data |= BIT(8); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG34, ocp_data); + ret = rtl_rx_vlan_en(tp, true); + if (ret < 0) + err = ret; + ret = rxdy_gated_en(tp, false); + if (ret < 0) + err = ret; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML); + ret = ocp_dword_set_bits(tp, MCU_TYPE_PLA, PLA_RCR, + RCR_APM | RCR_AM | RCR_AB); + if (ret < 0) + err = ret; - r8153b_mcu_spdown_en(tp, false); + ret = r8153_aldps_en(tp, true); - r8153_aldps_en(tp, true); -// r8153_u2p3en(tp, true); - r8153b_u1u2en(tp, true); + if (err < 0) + return err; + else + return ret; } -static void rtl8156_change_mtu(struct r8152 *tp) +static int rtl8157_change_mtu(struct r8152 *tp) { u32 rx_max_size = mtu_to_size(tp->netdev->mtu); + int ret; + + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, + mtu_to_size(tp->netdev->mtu)); + if (ret < 0) + goto out; + + /* 16 * 1024 / 64 = 0x100, so the max is 0xff for 8 bits data */ + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, 0xff); + if (ret < 0) + goto out; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, rx_max_size); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_JUMBO); - r8156_fc_parameter(tp); + ret = r8156_fc_parameter(tp); + if (ret < 0) + goto out; /* TX share fifo free credit full threshold */ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, 512 / 64); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_FULL, - ALIGN(rx_max_size + sizeof(struct tx_desc), 1024) / 16); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, 512 / 64); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TXFIFO_FULL, + ALIGN(rx_max_size + tp->tx_desc.size, 1024) / 16); + +out: + return ret; } -static void rtl8156_up(struct r8152 *tp) +static int rtl8157_up(struct r8152 *tp) { - u32 ocp_data; + int ret; if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + return -ENODEV; - r8153b_u1u2en(tp, false); - r8153_u2p3en(tp, false); - r8153_aldps_en(tp, false); + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + goto out; - rxdy_gated_en(tp, true); - r8153_teredo_off(tp); + ret = rxdy_gated_en(tp, true); + if (ret < 0) + goto out; + ret = r8153_teredo_off(tp); + if (ret < 0) + goto out; - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data &= ~RCR_ACPT_ALL; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); + ret = ocp_dword_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR, RCR_ACPT_ALL); + if (ret < 0) + goto out; - rtl8152_nic_reset(tp); - rtl_reset_bmu(tp); + ret = rtl8152_nic_reset(tp); + if (ret < 0) + goto out; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data &= ~NOW_IS_OOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data &= ~MCU_BORW_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, MCU_BORW_EN); + if (ret < 0) + goto out; - rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); + ret = rtl_rx_vlan_en(tp, + tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX); + if (ret < 0) + goto out; - rtl8156_change_mtu(tp); + ret = rtl8157_change_mtu(tp); + if (ret < 0) + goto out; - switch (tp->version) { - case RTL_TEST_01: - case RTL_VER_10: - case RTL_VER_11: - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_BMU_CONFIG); - ocp_data |= ACT_ODMA; - ocp_write_word(tp, MCU_TYPE_USB, USB_BMU_CONFIG, ocp_data); - break; - default: - break; - } + ret = rtl_reset_bmu(tp); + if (ret < 0) + goto out; /* share FIFO settings */ - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL); - ocp_data &= ~RXFIFO_FULL_MASK; - ocp_data |= 0x08; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, ocp_data); - - r8153b_mcu_spdown_en(tp, false); + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, RXFIFO_FULL_MASK, + 0x08); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_SPEED_OPTION); - ocp_data &= ~(RG_PWRDN_EN | ALL_SPEED_OFF); - ocp_write_word(tp, MCU_TYPE_USB, USB_SPEED_OPTION, ocp_data); + ret = r8153b_mcu_spdown_en(tp, false); + if (ret < 0) + goto out; - ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, 0x00600400); + ret = ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, 0x00600400); + if (ret < 0) + goto out; if (tp->saved_wolopts != __rtl_get_wol(tp)) { netif_warn(tp, ifup, tp->netdev, "wol setting is changed\n"); - __rtl_set_wol(tp, tp->saved_wolopts); + ret = __rtl_set_wol(tp, tp->saved_wolopts); + if (ret < 0) + goto out; } - r8153_aldps_en(tp, true); - r8153_u2p3en(tp, true); + ret = r8153_aldps_en(tp, true); + if (ret < 0) + goto out; +// ret = r8153_u2p3en(tp, true); +// if (ret < 0) +// goto out; +// +// if (tp->udev->speed >= USB_SPEED_SUPER) +// ret = r8153b_u1u2en(tp, true); - if (tp->udev->speed >= USB_SPEED_SUPER) - r8153b_u1u2en(tp, true); +out: + return ret; } -static void rtl8156_down(struct r8152 *tp) +static int rtl8157_down(struct r8152 *tp) { - u32 ocp_data; + int ret, err = 0; if (test_bit(RTL8152_UNPLUG, &tp->flags)) { rtl_drop_queued_tx(tp); - return; + rtl_stop_rx(tp); + return -ENODEV; } - r8153b_mcu_spdown_en(tp, true); - r8153b_u1u2en(tp, false); - r8153_u2p3en(tp, false); - r8153b_power_cut_en(tp, false); - r8153_aldps_en(tp, false); + ret = r8153b_mcu_spdown_en(tp, true); + if (ret < 0) + err = ret; + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_u2p3en(tp, false); + if (ret < 0) + err = ret; + ret = r8153_aldps_en(tp, false); + if (ret < 0) + err = ret; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data &= ~NOW_IS_OOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, NOW_IS_OOB); + if (ret < 0) + err = ret; /* RX FIFO settings for OOB */ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, 64 / 16); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, 1024 / 16); - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, 4096 / 16); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, 64 / 16); + if (ret < 0) + err = ret; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, 1024 / 16); + if (ret < 0) + err = ret; + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, 4096 / 16); + if (ret < 0) + err = ret; - rtl_disable(tp); - rtl_reset_bmu(tp); + ret = rtl_disable(tp); + if (ret < 0) + err = ret; + ret = rtl_reset_bmu(tp); + if (ret < 0) + err = ret; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, 1522); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, MTPS_DEFAULT); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, 1526); + if (ret < 0) + err = ret; + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_MTPS, 10 * 1024 / 64); + if (ret < 0) + err = ret; /* Clear teredo wake event. bit[15:8] is the teredo wakeup * type. Set it to zero. bits[7:0] are the W1C bits about * the events. Set them to all 1 to clear them. */ - ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_WAKE_BASE, 0x00ff); + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_TEREDO_WAKE_BASE, 0x00ff); + if (ret < 0) + err = ret; + + ret = rtl_rx_vlan_en(tp, true); + if (ret < 0) + err = ret; + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_BDC_CR, ALDPS_PROXY_MODE); + if (ret < 0) + err = ret; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BDC_CR); - ocp_data |= ALDPS_PROXY_MODE; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_BDC_CR, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, + NOW_IS_OOB | DIS_MCU_CLROOB); + if (ret < 0) + err = ret; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL); - ocp_data |= NOW_IS_OOB | DIS_MCU_CLROOB; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, MCU_BORW_EN); + if (ret < 0) + err = ret; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7); - ocp_data |= MCU_BORW_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data); + ret = rxdy_gated_en(tp, false); + if (ret < 0) + err = ret; - rtl_rx_vlan_en(tp, true); - rxdy_gated_en(tp, false); + ret = ocp_dword_set_bits(tp, MCU_TYPE_PLA, PLA_RCR, + RCR_APM | RCR_AM | RCR_AB); + if (ret < 0) + err = ret; - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data |= RCR_APM | RCR_AM | RCR_AB; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); + ret = r8153_aldps_en(tp, true); - r8153_aldps_en(tp, true); + if (err < 0) + return err; + else + return ret; } static bool rtl8152_in_nway(struct r8152 *tp) { - u16 nway_state; + u32 nway_state; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, 0x2000); + if (ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, 0x2000) < 0) { + rtl_reset_ocp_base(tp); + return false; + } tp->ocp_base = 0x2000; - ocp_write_byte(tp, MCU_TYPE_PLA, 0xb014, 0x4c); /* phy state */ - nway_state = ocp_read_word(tp, MCU_TYPE_PLA, 0xb01a); + + /* phy state */ + if (ocp_write_byte(tp, MCU_TYPE_PLA, 0xb014, 0x4c) < 0) + return false; + if (ocp_read_word(tp, MCU_TYPE_PLA, 0xb01a, &nway_state) < 0) + return false; /* bit 15: TXDIS_STATE, bit 14: ABD_STATE */ if (nway_state & 0xc000) @@ -9976,7 +12135,12 @@ static bool rtl8152_in_nway(struct r8152 *tp) static bool rtl8153_in_nway(struct r8152 *tp) { - u16 phy_state = ocp_reg_read(tp, OCP_PHY_STATE) & 0xff; + u16 phy_state; + + if (ocp_reg_read(tp, OCP_PHY_STATE, &phy_state) < 0) + return false; + + phy_state &= 0xff; if (phy_state == TXDIS_STATE || phy_state == ABD_STATE) return false; @@ -9984,19 +12148,13 @@ static bool rtl8153_in_nway(struct r8152 *tp) return true; } -static void r8156_mdio_force_mode(struct r8152 *tp) +static int r8156_mdio_force_mode(struct r8152 *tp) { - u16 data; - /* Select force mode through 0xa5b4 bit 15 * 0: MDIO force mode * 1: MMD force mode */ - data = ocp_reg_read(tp, 0xa5b4); - if (data & BIT(15)) { - data &= ~BIT(15); - ocp_reg_write(tp, 0xa5b4, data); - } + return ocp_reg_clr_bits(tp, 0xa5b4, BIT(15)); } static void set_carrier(struct r8152 *tp) @@ -10178,6 +12336,7 @@ static int rtl_s5_wol(struct r8152 *tp) { struct usb_device *udev = tp->udev; u32 ocp_data; + int ret; if (!tp->saved_wolopts) return -EOPNOTSUPP; @@ -10196,27 +12355,32 @@ static int rtl_s5_wol(struct r8152 *tp) break; } - if (!(ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5) & LAN_WAKE_EN)) + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5, &ocp_data); + if (ret < 0) + goto out; + if (!(ocp_data & LAN_WAKE_EN)) return -EOPNOTSUPP; - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_INDICATE_FALG); - ocp_data |= BIT(1); - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_INDICATE_FALG, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_INDICATE_FALG, BIT(1)); + if (ret < 0) + goto out; remote_wake: /* usb_enable_remote_wakeup */ if (udev->speed < USB_SPEED_SUPER) - return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), - USB_REQ_SET_FEATURE, USB_RECIP_DEVICE, - USB_DEVICE_REMOTE_WAKEUP, 0, NULL, 0, - USB_CTRL_SET_TIMEOUT); + ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), + USB_REQ_SET_FEATURE, USB_RECIP_DEVICE, + USB_DEVICE_REMOTE_WAKEUP, 0, NULL, 0, + USB_CTRL_SET_TIMEOUT); else - return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), - USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE, - USB_INTRF_FUNC_SUSPEND, - USB_INTRF_FUNC_SUSPEND_RW | - USB_INTRF_FUNC_SUSPEND_LP, - NULL, 0, USB_CTRL_SET_TIMEOUT); + ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), + USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE, + USB_INTRF_FUNC_SUSPEND, + USB_INTRF_FUNC_SUSPEND_RW | + USB_INTRF_FUNC_SUSPEND_LP, + NULL, 0, USB_CTRL_SET_TIMEOUT); +out: + return (ret < 0) ? ret : 0; } static @@ -10261,7 +12425,7 @@ static int rtk_disable_diag(struct r8152 *tp) tp->rtk_enable_diag--; rtl_reset_ocp_base(tp); - if (tp->support_2500full) + if (tp->support_2500full || tp->support_5000full) r8156_mdio_force_mode(tp); netif_info(tp, drv, tp->netdev, "disable rtk diag %d\n", @@ -10297,7 +12461,9 @@ static int rtl8152_open(struct net_device *netdev) mutex_lock(&tp->control); - tp->rtl_ops.up(tp); + res = tp->rtl_ops.up(tp); + if (res < 0) + goto out_unlock; netif_carrier_off(netdev); netif_start_queue(netdev); @@ -10315,7 +12481,7 @@ static int rtl8152_open(struct net_device *netdev) netif_device_detach(tp->netdev); netif_warn(tp, ifup, netdev, "intr_urb submit failed: %d\n", res); - goto out_unlock; + goto out_unwork; } napi_enable(&tp->napi); tasklet_enable(&tp->tx_tl); @@ -10333,6 +12499,8 @@ static int rtl8152_open(struct net_device *netdev) #endif /* defined(RTL8152_S5_WOL) && defined(CONFIG_PM) */ return 0; +out_unwork: + clear_bit(WORK_ENABLE, &tp->flags); out_unlock: mutex_unlock(&tp->control); usb_autopm_put_interface(tp->intf); @@ -10400,213 +12568,308 @@ static int rtl8152_close(struct net_device *netdev) return res; } -static void rtl_tally_reset(struct r8152 *tp) +static int rtl_tally_reset(struct r8152 *tp) { - u32 ocp_data; + return ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_RSTTALLY, TALLY_RESET); +} - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY); - ocp_data |= TALLY_RESET; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); +static int test_io_en(struct r8152 *tp, bool enable) +{ + if (enable) + return ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_PHY_PWR, + TEST_IO_OFF); + else + return ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_PHY_PWR, + TEST_IO_OFF); } -static void rtl_disable_spi(struct r8152 *tp) +static int rtl_disable_spi(struct r8152 *tp) { - u32 ocp_data; + int ret; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CONFIG5); - ocp_data &= ~SPI_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CONFIG5, ocp_data); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xcbf0); - ocp_data |= BIT(1); - ocp_write_word(tp, MCU_TYPE_USB, 0xcbf0, ocp_data); + ret = ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG); + if (ret < 0) + goto out; + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_CONFIG5, SPI_EN); + if (ret < 0) + goto out; + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, 0xcbf0, BIT(1)); + +out: + return ret; } -static void r8152b_init(struct r8152 *tp) +static int r8152b_init(struct r8152 *tp) { - u32 ocp_data; - u16 data; + int ret; if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + return -ENODEV; #if 0 /* Clear EP3 Fifo before using interrupt transfer */ - if (ocp_read_byte(tp, MCU_TYPE_USB, 0xb963) & 0x80) { - ocp_write_byte(tp, MCU_TYPE_USB, 0xb963, 0x08); - ocp_write_byte(tp, MCU_TYPE_USB, 0xb963, 0x40); - ocp_write_byte(tp, MCU_TYPE_USB, 0xb963, 0x00); - ocp_write_byte(tp, MCU_TYPE_USB, 0xb968, 0x00); - ocp_write_word(tp, MCU_TYPE_USB, 0xb010, 0x00e0); - ocp_write_byte(tp, MCU_TYPE_USB, 0xb963, 0x04); + ret = ocp_read_byte(tp, MCU_TYPE_USB, 0xb963, &ocp_data); + if (ret < 0) + goto out; + if (ocp_data & 0x80) { + ret = ocp_write_byte(tp, MCU_TYPE_USB, 0xb963, 0x08); + if (ret < 0) + goto out; + ret = ocp_write_byte(tp, MCU_TYPE_USB, 0xb963, 0x40); + if (ret < 0) + goto out; + ret = ocp_write_byte(tp, MCU_TYPE_USB, 0xb963, 0x00); + if (ret < 0) + goto out; + ret = ocp_write_byte(tp, MCU_TYPE_USB, 0xb968, 0x00); + if (ret < 0) + goto out; + ret = ocp_write_word(tp, MCU_TYPE_USB, 0xb010, 0x00e0); + if (ret < 0) + goto out; + ret = ocp_write_byte(tp, MCU_TYPE_USB, 0xb963, 0x04); + if (ret < 0) + goto out; } #endif - data = r8153_phy_status(tp, 0); + ret = r8153_phy_status(tp, 0); + if (ret < 0) + goto out; - data = r8152_mdio_read(tp, MII_BMCR); - if (data & BMCR_PDOWN) { - data &= ~BMCR_PDOWN; - r8152_mdio_write(tp, MII_BMCR, data); - } + ret = r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + if (ret < 0) + goto out; - r8152_aldps_en(tp, false); + ret = r8152_aldps_en(tp, false); + if (ret < 0) + goto out; if (tp->version == RTL_VER_01) { - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE); - ocp_data &= ~LED_MODE_MASK; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, + LED_MODE_MASK); + if (ret < 0) + goto out; } - r8152_power_cut_en(tp, false); - rtl_runtime_suspend_enable(tp, false); - - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR); - ocp_data |= TX_10M_IDLE_EN | PFM_PWM_SWITCH; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data); - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL); - ocp_data &= ~MCU_CLK_RATIO_MASK; - ocp_data |= MCU_CLK_RATIO | D3_CLK_GATED_EN; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ocp_data); - ocp_data = GPHY_STS_MSK | SPEED_DOWN_MSK | - SPDWN_RXDV_MSK | SPDWN_LINKCHG_MSK; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_GPHY_INTR_IMR, ocp_data); - - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_TIMER); - ocp_data |= BIT(15); - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_TIMER, ocp_data); - ocp_write_word(tp, MCU_TYPE_USB, 0xcbfc, 0x03e8); - ocp_data &= ~BIT(15); - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_TIMER, ocp_data); - - rtl_tally_reset(tp); + ret = r8152_power_cut_en(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_PHY_PWR, + TX_10M_IDLE_EN | PFM_PWM_SWITCH); + if (ret < 0) + goto out; + + ret = ocp_dword_w0w1(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, + MCU_CLK_RATIO_MASK, MCU_CLK_RATIO | + D3_CLK_GATED_EN); + if (ret < 0) + goto out; + + ret = ocp_write_word(tp, MCU_TYPE_PLA, PLA_GPHY_INTR_IMR, + GPHY_STS_MSK | SPEED_DOWN_MSK | SPDWN_RXDV_MSK | + SPDWN_LINKCHG_MSK); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_USB_TIMER, BIT(15)); + if (ret < 0) + goto out; + + /* MSC timer = 8s */ + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 8000 / 8); + if (ret < 0) + goto out; + + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_TIMER, BIT(15)); + if (ret < 0) + goto out; + + ret = rtl_tally_reset(tp); + if (ret < 0) + goto out; /* enable rx aggregation */ - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); - ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + RX_AGG_DISABLE | RX_ZERO_EN); + +out: + return (ret < 0) ? ret : 0; } -static void r8153_init(struct r8152 *tp) +static int r8153_init(struct r8152 *tp) { u32 ocp_data; - u16 data; - int i; + int i, ret; if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + return -ENODEV; - r8153_u1u2en(tp, false); + ret = r8153_u1u2en(tp, false); + if (ret < 0) + goto out; for (i = 0; i < 500; i++) { - if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & - AUTOLOAD_DONE) + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL, &ocp_data); + if (ret < 0) + goto out; + if (ocp_data & AUTOLOAD_DONE) break; msleep(20); - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - break; } - data = r8153_phy_status(tp, 0); + ret = r8153_phy_status(tp, 0); + if (ret < 0) + goto out; if (tp->version == RTL_VER_03 || tp->version == RTL_VER_04 || - tp->version == RTL_VER_05) - ocp_reg_write(tp, OCP_ADC_CFG, CKADSEL_L | ADC_EN | EN_EMI_L); - - data = r8152_mdio_read(tp, MII_BMCR); - if (data & BMCR_PDOWN) { - data &= ~BMCR_PDOWN; - r8152_mdio_write(tp, MII_BMCR, data); + tp->version == RTL_VER_05) { + ret = ocp_reg_write(tp, OCP_ADC_CFG, CKADSEL_L | ADC_EN | + EN_EMI_L); + if (ret < 0) + goto out; } - data = r8153_phy_status(tp, PHY_STAT_LAN_ON); + ret = r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + if (ret < 0) + goto out; + + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + goto out; - r8153_u2p3en(tp, false); + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; if (tp->version == RTL_VER_04) { - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_SSPHYLINK2); - ocp_data &= ~pwd_dn_scale_mask; - ocp_data |= pwd_dn_scale(96); - ocp_write_word(tp, MCU_TYPE_USB, USB_SSPHYLINK2, ocp_data); - - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_USB2PHY); - ocp_data |= USB2PHY_L1 | USB2PHY_SUSPEND; - ocp_write_byte(tp, MCU_TYPE_USB, USB_USB2PHY, ocp_data); + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_SSPHYLINK2, + pwd_dn_scale_mask, pwd_dn_scale(96)); + if (ret < 0) + goto out; + + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_USB2PHY, + USB2PHY_L1 | USB2PHY_SUSPEND); + if (ret < 0) + goto out; } else if (tp->version == RTL_VER_05) { - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_DMY_REG0); - ocp_data &= ~ECM_ALDPS; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_DMY_REG0, ocp_data); + ret = ocp_byte_clr_bits(tp, MCU_TYPE_PLA, PLA_DMY_REG0, ECM_ALDPS); + if (ret < 0) + goto out; + + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_BURST_SIZE, &ocp_data); + if (ret < 0) + goto out; - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY1); - if (ocp_read_word(tp, MCU_TYPE_USB, USB_BURST_SIZE) == 0) - ocp_data &= ~DYNAMIC_BURST; + if (ocp_data == 0) + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_CSR_DUMMY1, + DYNAMIC_BURST); else - ocp_data |= DYNAMIC_BURST; - ocp_write_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY1, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_CSR_DUMMY1, + DYNAMIC_BURST); + if (ret < 0) + goto out; } else if (tp->version == RTL_VER_06) { - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY1); - if (ocp_read_word(tp, MCU_TYPE_USB, USB_BURST_SIZE) == 0) - ocp_data &= ~DYNAMIC_BURST; + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_BURST_SIZE, &ocp_data); + if (ret < 0) + goto out; + + if (ocp_data == 0) + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, + USB_CSR_DUMMY1, + DYNAMIC_BURST); else - ocp_data |= DYNAMIC_BURST; - ocp_write_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY1, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, + USB_CSR_DUMMY1, + DYNAMIC_BURST); + if (ret < 0) + goto out; - r8153_queue_wake(tp, false); + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); if (rtl8152_get_speed(tp) & LINK_STATUS) - ocp_data |= CUR_LINK_OK; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, + PLA_EXTRA_STATUS, + CUR_LINK_OK | POLL_LINK_CHG); else - ocp_data &= ~CUR_LINK_OK; - - /* r8153_queue_wake() has set this bit */ - /* ocp_data &= ~BIT(8); */ - - ocp_data |= POLL_LINK_CHG; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, ocp_data); + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK, POLL_LINK_CHG); + if (ret < 0) + goto out; } - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY2); - ocp_data |= EP4_FULL_FC; - ocp_write_byte(tp, MCU_TYPE_USB, USB_CSR_DUMMY2, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_CSR_DUMMY2, EP4_FULL_FC); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_WDT11_CTRL); - ocp_data &= ~TIMER11_EN; - ocp_write_word(tp, MCU_TYPE_USB, USB_WDT11_CTRL, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_WDT11_CTRL, TIMER11_EN); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE); - ocp_data &= ~LED_MODE_MASK; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, + LED_MODE_MASK); + if (ret < 0) + goto out; - ocp_data = FIFO_EMPTY_1FB | ROK_EXIT_LPM; if (tp->version == RTL_VER_04 && tp->udev->speed < USB_SPEED_SUPER) - ocp_data |= LPM_TIMER_500MS; + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_LPM_CTRL, + FIFO_EMPTY_1FB | ROK_EXIT_LPM | + LPM_TIMER_500MS); else - ocp_data |= LPM_TIMER_500US; - ocp_write_byte(tp, MCU_TYPE_USB, USB_LPM_CTRL, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_LPM_CTRL, + FIFO_EMPTY_1FB | ROK_EXIT_LPM | + LPM_TIMER_500US); + if (ret < 0) + goto out; + + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_AFE_CTRL2, SEN_VAL_MASK, + SEN_VAL_NORMAL | SEL_RXIDLE); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_AFE_CTRL2); - ocp_data &= ~SEN_VAL_MASK; - ocp_data |= SEN_VAL_NORMAL | SEL_RXIDLE; - ocp_write_word(tp, MCU_TYPE_USB, USB_AFE_CTRL2, ocp_data); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_CONNECT_TIMER, 0x0001); + if (ret < 0) + goto out; + + ret = r8153_power_cut_en(tp, false); + if (ret < 0) + goto out; - ocp_write_word(tp, MCU_TYPE_USB, USB_CONNECT_TIMER, 0x0001); + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + + ret = r8153_mac_clk_speed_down(tp, false); + if (ret < 0) + goto out; + + ret = r8153_u1u2en(tp, true); + if (ret < 0) + goto out; - r8153_power_cut_en(tp, false); - rtl_runtime_suspend_enable(tp, false); - r8153_mac_clk_speed_down(tp, false); - r8153_u1u2en(tp, true); usb_enable_lpm(tp->udev); - r8153_lanwake_clr_en(tp, true); + ret = r8153_lanwake_clr_en(tp, true); + if (ret < 0) + goto out; /* rx aggregation */ - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); - ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + RX_AGG_DISABLE | RX_ZERO_EN); + if (ret < 0) + goto out; - rtl_tally_reset(tp); + ret = rtl_tally_reset(tp); + if (ret < 0) + goto out; switch (tp->udev->speed) { case USB_SPEED_SUPER: @@ -10622,176 +12885,250 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } + +out: + return (ret < 0) ? ret : 0; } -static void r8153b_init(struct r8152 *tp) +static int r8153b_init(struct r8152 *tp) { u32 ocp_data; - u16 data; - int i; + int i, ret; if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + return -ENODEV; + + rtl_set_dbg_info_init(tp, 0xb); + + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; - rtl_set_dbg_info_init(tp); - r8153b_u1u2en(tp, false); - rtl_disable_spi(tp); + ret = rtl_disable_spi(tp); + if (ret < 0) + goto out; for (i = 0; i < 500; i++) { - if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & - AUTOLOAD_DONE) + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL, &ocp_data); + + if (ret < 0) + goto out; + if (ocp_data & AUTOLOAD_DONE) break; msleep(20); - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - break; } - data = r8153_phy_status(tp, 0); + ret = r8153_phy_status(tp, 0); + if (ret < 0) + goto out; + + ret = r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + if (ret < 0) + goto out; + + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + goto out; + + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; - data = r8152_mdio_read(tp, MII_BMCR); - if (data & BMCR_PDOWN) { - data &= ~BMCR_PDOWN; - r8152_mdio_write(tp, MII_BMCR, data); - } + /* MSC timer = 0xfff * 8ms = 32760 ms */ + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + if (ret < 0) + goto out; - data = r8153_phy_status(tp, PHY_STAT_LAN_ON); + ret = r8153b_power_cut_en(tp, false); + if (ret < 0) + goto out; - r8153_u2p3en(tp, false); + ret = r8153b_ups_en(tp, false); + if (ret < 0) + goto out; - /* MSC timer = 0xfff * 8ms = 32760 ms */ - ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; - r8153b_power_cut_en(tp, false); - r8153b_ups_en(tp, false); - r8153_queue_wake(tp, false); - rtl_runtime_suspend_enable(tp, false); + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); if (rtl8152_get_speed(tp) & LINK_STATUS) - ocp_data |= CUR_LINK_OK; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK | POLL_LINK_CHG); else - ocp_data &= ~CUR_LINK_OK; - - /* r8153_queue_wake() has set this bit */ - /* ocp_data &= ~BIT(8); */ - - ocp_data |= POLL_LINK_CHG; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, ocp_data); + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK, POLL_LINK_CHG); + if (ret < 0) + goto out; - r8153_lanwake_clr_en(tp, true); + ret = r8153_lanwake_clr_en(tp, true); + if (ret < 0) + goto out; if (tp->udev->descriptor.idVendor == VENDOR_ID_LENOVO && tp->udev->descriptor.idProduct == 0x3069) ocp_write_word(tp, MCU_TYPE_USB, USB_SSPHYLINK2, 0x0c8c); -// if (tp->udev->speed >= USB_SPEED_SUPER) -// r8153b_u1u2en(tp, true); +// if (tp->udev->speed >= USB_SPEED_SUPER) { +// ret = r8153b_u1u2en(tp, true); +// if (ret < 0) +// goto out; +// } usb_enable_lpm(tp->udev); /* MAC clock speed down */ - r8153_mac_clk_speed_down(tp, false); + ret = r8153_mac_clk_speed_down(tp, false); + if (ret < 0) + goto out; - r8153b_mcu_spdown_en(tp, false); + ret = r8153b_mcu_spdown_en(tp, false); + if (ret < 0) + goto out; if (tp->version == RTL_VER_09) { /* Disable Test IO for 32QFN */ - if (ocp_read_byte(tp, MCU_TYPE_PLA, 0xdc00) & BIT(5)) { - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR); - ocp_data |= TEST_IO_OFF; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data); + ret = ocp_read_byte(tp, MCU_TYPE_PLA, 0xdc00, &ocp_data); + if (ret < 0) + goto out; + if (ocp_data & BIT(5)) { + ret = test_io_en(tp, false); + if (ret < 0) + goto out; } } set_bit(GREEN_ETHERNET, &tp->flags); /* rx aggregation */ - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); - ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + RX_AGG_DISABLE | RX_ZERO_EN); + if (ret < 0) + goto out; - rtl_tally_reset(tp); + ret = rtl_tally_reset(tp); + if (ret < 0) + goto out; tp->coalesce = 15000; /* 15 us */ + +out: + return (ret < 0) ? ret : 0; } -static void r8153c_init(struct r8152 *tp) +static int r8153c_init(struct r8152 *tp) { u32 ocp_data; - u16 data; - int i; + int i, ret; if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + return -ENODEV; + + rtl_set_dbg_info_init(tp, 0xa); - r8153b_u1u2en(tp, false); + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; - rtl_disable_spi(tp); + ret = rtl_disable_spi(tp); + if (ret < 0) + goto out; for (i = 0; i < 500; i++) { - if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & - AUTOLOAD_DONE) + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL, &ocp_data); + if (ret < 0) + goto out; + if (ocp_data & AUTOLOAD_DONE) break; msleep(20); - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; } - data = r8153_phy_status(tp, 0); + ret = r8153_phy_status(tp, 0); + if (ret < 0) + goto out; - data = r8152_mdio_read(tp, MII_BMCR); - if (data & BMCR_PDOWN) { - data &= ~BMCR_PDOWN; - r8152_mdio_write(tp, MII_BMCR, data); - } + ret = r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + if (ret < 0) + goto out; - data = r8153_phy_status(tp, PHY_STAT_LAN_ON); + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + goto out; - r8153_u2p3en(tp, false); + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; /* MSC timer = 0xfff * 8ms = 32760 ms */ - ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + if (ret < 0) + goto out; - r8153b_power_cut_en(tp, false); - r8153c_ups_en(tp, false); - r8153_queue_wake(tp, false); - rtl_runtime_suspend_enable(tp, false); + ret = r8153b_power_cut_en(tp, false); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); - if (rtl8152_get_speed(tp) & LINK_STATUS) - ocp_data |= CUR_LINK_OK; - else - ocp_data &= ~CUR_LINK_OK; + ret = r8153c_ups_en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; - /* r8153_queue_wake() has set this bit */ - /* ocp_data &= ~BIT(8); */ + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; - ocp_data |= POLL_LINK_CHG; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, ocp_data); + if (rtl8152_get_speed(tp) & LINK_STATUS) + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK | POLL_LINK_CHG); + else + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK, POLL_LINK_CHG); + if (ret < 0) + goto out; - r8153b_u1u2en(tp, true); + ret = r8153b_u1u2en(tp, true); + if (ret < 0) + goto out; usb_enable_lpm(tp->udev); /* MAC clock speed down */ - r8153_mac_clk_speed_down(tp, true); + ret = r8153_mac_clk_speed_down(tp, true); + if (ret < 0) + goto out; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_MISC_2, BIT(7)); + if (ret < 0) + goto out; - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_2); - ocp_data &= ~BIT(7); - ocp_write_byte(tp, MCU_TYPE_USB, USB_MISC_2, ocp_data); + ret = test_io_en(tp, false); + if (ret < 0) + goto out; set_bit(GREEN_ETHERNET, &tp->flags); /* rx aggregation */ - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); - ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + RX_AGG_DISABLE | RX_ZERO_EN); + if (ret < 0) + goto out; - rtl_tally_reset(tp); + ret = rtl_tally_reset(tp); + if (ret < 0) + goto out; tp->coalesce = 15000; /* 15 us */ + +out: + return (ret < 0) ? ret : 0; } static void r8156_patch_code(struct r8152 *tp) @@ -10827,7 +13164,6 @@ static void r8156_patch_code(struct r8152 *tp) // ocp_write_word(tp, MCU_TYPE_USB, USB_BP_15, 0x0000); ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0x0001); } else if (tp->version == RTL_VER_11) { - u32 ocp_data; static u8 usb_patch3_b[] = { 0x10, 0xe0, 0x12, 0xe0, 0x33, 0xe0, 0x7d, 0xe0, @@ -11371,9 +13707,8 @@ static void r8156_patch_code(struct r8152 *tp) new_ver); } - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1); - ocp_data |= FW_IP_RESET_EN; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, + FW_IP_RESET_EN); ocp_write_dword(tp, MCU_TYPE_USB, USB_UPHY3_MDCMDIO, 0x4026840e); ocp_write_dword(tp, MCU_TYPE_USB, USB_UPHY3_MDCMDIO, 0x4001acc9); @@ -11616,9 +13951,8 @@ static void r8156_patch_code(struct r8152 *tp) new_ver); } -// ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1); -// ocp_data |= FW_IP_RESET_EN; -// ocp_write_word(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, ocp_data); +// ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_FIX_EN1, +// FW_IP_RESET_EN); // ocp_write_dword(tp, MCU_TYPE_USB, 0xd480, 0x4026840e); // ocp_write_dword(tp, MCU_TYPE_USB, 0xd480, 0x4001acc9); @@ -12030,10 +14364,12 @@ static void r8156_patch_code(struct r8152 *tp) rtl_reset_ocp_base(tp); } -static void rtl_ram_code_speed_up(struct r8152 *tp, bool wait) +static int rtl_ram_code_speed_up(struct r8152 *tp, bool wait) { - u32 ocp_data, len = 0; + u16 fw_version, code_ver; + u32 len = 0, ocp_data; u8 *data = NULL; + int ret = 0; rtl_reset_ocp_base(tp); @@ -13011,58 +15347,1604 @@ static void rtl_ram_code_speed_up(struct r8152 *tp, bool wait) 0x38, 0xb4, 0xfd, 0x8f, 0x38, 0xb4, 0x54, 0xbf, 0x38, 0xb4, 0x02, 0x84, - 0x38, 0xb4, 0xc8, 0x52, - 0x38, 0xb4, 0x8f, 0xe4, - 0x38, 0xb4, 0xe5, 0xfe, - 0x38, 0xb4, 0xff, 0x8f, - 0x38, 0xb4, 0x53, 0xbf, - 0x38, 0xb4, 0x02, 0x22, - 0x38, 0xb4, 0xc8, 0x52, - 0x38, 0xb4, 0x31, 0xa1, - 0x38, 0xb4, 0xaf, 0x03, - 0x38, 0xb4, 0xa7, 0x85, - 0x38, 0xb4, 0x80, 0xd4, - 0x38, 0xb4, 0xbf, 0x00, - 0x38, 0xb4, 0x84, 0x86, - 0x38, 0xb4, 0x52, 0x02, - 0x38, 0xb4, 0xbf, 0xa9, - 0x38, 0xb4, 0x87, 0x86, - 0x38, 0xb4, 0x52, 0x02, - 0x38, 0xb4, 0xbf, 0xa9, - 0x38, 0xb4, 0x8a, 0x86, - 0x38, 0xb4, 0x52, 0x02, - 0x38, 0xb4, 0xbf, 0xa9, - 0x38, 0xb4, 0x8d, 0x86, - 0x38, 0xb4, 0x52, 0x02, - 0x38, 0xb4, 0xef, 0xa9, - 0x38, 0xb4, 0xfd, 0x95, + 0x38, 0xb4, 0xc8, 0x52, + 0x38, 0xb4, 0x8f, 0xe4, + 0x38, 0xb4, 0xe5, 0xfe, + 0x38, 0xb4, 0xff, 0x8f, + 0x38, 0xb4, 0x53, 0xbf, + 0x38, 0xb4, 0x02, 0x22, + 0x38, 0xb4, 0xc8, 0x52, + 0x38, 0xb4, 0x31, 0xa1, + 0x38, 0xb4, 0xaf, 0x03, + 0x38, 0xb4, 0xa7, 0x85, + 0x38, 0xb4, 0x80, 0xd4, + 0x38, 0xb4, 0xbf, 0x00, + 0x38, 0xb4, 0x84, 0x86, + 0x38, 0xb4, 0x52, 0x02, + 0x38, 0xb4, 0xbf, 0xa9, + 0x38, 0xb4, 0x87, 0x86, + 0x38, 0xb4, 0x52, 0x02, + 0x38, 0xb4, 0xbf, 0xa9, + 0x38, 0xb4, 0x8a, 0x86, + 0x38, 0xb4, 0x52, 0x02, + 0x38, 0xb4, 0xbf, 0xa9, + 0x38, 0xb4, 0x8d, 0x86, + 0x38, 0xb4, 0x52, 0x02, + 0x38, 0xb4, 0xef, 0xa9, + 0x38, 0xb4, 0xfd, 0x95, + 0x38, 0xb4, 0x04, 0xfc, + 0x38, 0xb4, 0xd1, 0xf0, + 0x38, 0xb4, 0xf0, 0x2a, + 0x38, 0xb4, 0x2c, 0xd1, + 0x38, 0xb4, 0xd1, 0xf0, + 0x38, 0xb4, 0xf0, 0x44, + 0x38, 0xb4, 0x46, 0xd1, + 0x38, 0xb4, 0x86, 0xbf, + 0x38, 0xb4, 0x02, 0xa1, + 0x38, 0xb4, 0xc8, 0x52, + 0x38, 0xb4, 0x86, 0xbf, + 0x38, 0xb4, 0x02, 0xa1, + 0x38, 0xb4, 0xc8, 0x52, + 0x38, 0xb4, 0x01, 0xd1, + 0x38, 0xb4, 0x06, 0xaf, + 0x38, 0xb4, 0x70, 0xa5, + 0x38, 0xb4, 0x42, 0xce, + 0x36, 0xb4, 0x18, 0xb8, + 0x38, 0xb4, 0x3d, 0x04, + 0x36, 0xb4, 0x1a, 0xb8, + 0x38, 0xb4, 0xa3, 0x06, + 0x36, 0xb4, 0x1c, 0xb8, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x1e, 0xb8, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x50, 0xb8, + 0xff, 0xff, 0xff, 0xff, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x52, 0xb8, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x78, 0xb8, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x84, 0xb8, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x32, 0xb8, + 0x38, 0xb4, 0x03, 0x00, + 0x36, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x36, 0xb4, 0x2e, 0xb8, + 0x38, 0xb4, 0x00, 0x00, + 0x36, 0xb4, 0x24, 0x80, + 0x38, 0xb4, 0x00, 0x00, + 0x36, 0xb4, 0x1e, 0x80, + 0x38, 0xb4, 0x21, 0x00, + 0x6c, 0xe8, 0x00, 0xb0, + 0x20, 0xb8, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff}; + + code_ver = 0x0021; + ret = sram_read(tp, SRAM_GPHY_FW_VER, &fw_version); + if (ret < 0) + goto out; + + if (fw_version < code_ver) { + data = ram13; + len = sizeof(ram13); + + if (r8156b_flash_used(tp)) { + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, + USB_GPHY_CTRL, + BYPASS_FLASH); + if (ret < 0) + goto out; + } + } + } else if (tp->version == RTL_VER_17) { + static u8 ram17[] = { + 0x6c, 0xe8, 0x00, 0xa0, + 0x36, 0xb4, 0x23, 0x80, + 0x38, 0xb4, 0x01, 0x47, + 0x36, 0xb4, 0x2e, 0xb8, + 0x38, 0xb4, 0x01, 0x00, + 0x6c, 0xe8, 0x00, 0xb0, + 0x20, 0xb8, 0x90, 0x00, + 0x6c, 0xe8, 0x00, 0xa0, + 0x36, 0xb4, 0x16, 0xa0, + 0x38, 0xb4, 0x00, 0x00, + 0x36, 0xb4, 0x12, 0xa0, + 0x38, 0xb4, 0x00, 0x00, + 0x36, 0xb4, 0x14, 0xa0, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x10, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x1a, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x2a, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x32, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x3a, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x3e, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x3e, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x3e, 0x80, + 0x38, 0xb4, 0x04, 0xd5, + 0x38, 0xb4, 0xb5, 0xc9, + 0x38, 0xb4, 0x00, 0xd5, + 0x38, 0xb4, 0x07, 0xd7, + 0x38, 0xb4, 0x70, 0x40, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x82, 0x10, + 0x38, 0xb4, 0x04, 0xd5, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x7a, 0x10, + 0x38, 0xb4, 0xd0, 0x61, + 0x38, 0xb4, 0x01, 0xd7, + 0x38, 0xb4, 0xa5, 0x60, + 0x38, 0xb4, 0x04, 0xd5, + 0x38, 0xb4, 0xb2, 0xc9, + 0x38, 0xb4, 0x00, 0xd5, + 0x38, 0xb4, 0x04, 0xf0, + 0x38, 0xb4, 0x04, 0xd5, + 0x38, 0xb4, 0xb1, 0xc9, + 0x38, 0xb4, 0x00, 0xd5, + 0x38, 0xb4, 0x07, 0xd7, + 0x38, 0xb4, 0x70, 0x60, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0xb0, 0x10, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0xc5, 0x10, + 0x38, 0xb4, 0x07, 0xd7, + 0x38, 0xb4, 0x05, 0x20, + 0x38, 0xb4, 0x30, 0x80, + 0x38, 0xb4, 0x5e, 0xd7, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x8c, 0x13, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0xff, 0x13, + 0x38, 0xb4, 0x04, 0xc5, + 0x38, 0xb4, 0x20, 0xce, + 0x38, 0xb4, 0x01, 0xcf, + 0x38, 0xb4, 0x0a, 0xd7, + 0x38, 0xb4, 0x05, 0x40, + 0x38, 0xb4, 0x02, 0xcf, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x99, 0x1b, + 0x38, 0xb4, 0x80, 0xa9, + 0x38, 0xb4, 0x00, 0xd5, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x4d, 0x14, + 0x36, 0xb4, 0x26, 0xa0, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x24, 0xa0, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x22, 0xa0, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x20, 0xa0, + 0x38, 0xb4, 0x4c, 0x14, + 0x36, 0xb4, 0x06, 0xa0, + 0x38, 0xb4, 0x98, 0x1b, + 0x36, 0xb4, 0x04, 0xa0, + 0x38, 0xb4, 0x8b, 0x13, + 0x36, 0xb4, 0x02, 0xa0, + 0x38, 0xb4, 0xc4, 0x10, + 0x36, 0xb4, 0x00, 0xa0, + 0x38, 0xb4, 0x79, 0x10, + 0x36, 0xb4, 0x08, 0xa0, + 0x38, 0xb4, 0x00, 0x1f, + 0x6c, 0xe8, 0x00, 0xa0, + 0x36, 0xb4, 0x16, 0xa0, + 0x38, 0xb4, 0x20, 0x00, + 0x36, 0xb4, 0x12, 0xa0, + 0x38, 0xb4, 0x00, 0x00, + 0x36, 0xb4, 0x14, 0xa0, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x10, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x1a, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x1a, 0x80, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x0a, 0x81, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x11, 0x81, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x41, 0x83, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x49, 0x83, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0xdf, 0x83, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0xa9, 0x60, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xa1, 0x60, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x62, 0x09, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x62, 0x09, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x82, 0x09, + 0x38, 0xb4, 0x0d, 0xd7, + 0x38, 0xb4, 0xfd, 0x40, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0xa0, 0x40, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x66, 0x40, + 0x38, 0xb4, 0x10, 0x87, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0x10, 0xa7, + 0x38, 0xb4, 0x80, 0x95, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x04, 0xa3, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x07, 0x0d, + 0x38, 0xb4, 0xc0, 0x8d, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xb5, 0x12, + 0x38, 0xb4, 0x81, 0xcb, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x82, 0x48, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x7a, 0x40, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x07, 0x48, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x5a, 0x40, + 0x38, 0xb4, 0x10, 0x89, + 0x38, 0xb4, 0x10, 0xa2, + 0x38, 0xb4, 0x04, 0xd7, + 0x38, 0xb4, 0x1c, 0x61, + 0x38, 0xb4, 0xc0, 0x0c, + 0x38, 0xb4, 0x80, 0x00, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x01, 0x01, + 0x38, 0xb4, 0xe0, 0x0c, + 0x38, 0xb4, 0xa0, 0x03, + 0x38, 0xb4, 0xb5, 0xcc, + 0x38, 0xb4, 0xc0, 0x0c, + 0x38, 0xb4, 0x80, 0x00, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x01, + 0x38, 0xb4, 0xe0, 0x0c, + 0x38, 0xb4, 0x40, 0x03, + 0x38, 0xb4, 0x52, 0xcc, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0xba, 0x42, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x1c, 0x0f, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0xb3, 0x5f, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x1f, 0x8f, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x33, 0x7f, + 0x38, 0xb4, 0x90, 0x81, + 0x38, 0xb4, 0x04, 0x82, + 0x38, 0xb4, 0x16, 0xf0, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x1b, 0x0f, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0xb3, 0x5f, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x1f, 0x8f, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x33, 0x7f, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x47, 0x60, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0x0c, 0xf0, + 0x38, 0xb4, 0x03, 0xd4, + 0x38, 0xb4, 0x82, 0xcb, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x03, 0x12, + 0x38, 0xb4, 0x0a, 0xd4, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x03, 0x12, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x47, 0x42, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x1d, 0x13, + 0x38, 0xb4, 0x40, 0x8a, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x0e, 0x12, + 0x38, 0xb4, 0x04, 0xa1, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x20, 0x12, + 0x38, 0xb4, 0x04, 0x81, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x17, 0x12, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x04, 0xa7, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x88, 0xcb, + 0x38, 0xb4, 0x12, 0xf0, + 0x38, 0xb4, 0x10, 0xa2, + 0x38, 0xb4, 0x0a, 0xa0, + 0x38, 0xb4, 0x40, 0xaa, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x0e, 0x12, + 0x38, 0xb4, 0x04, 0xa1, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x20, 0x12, + 0x38, 0xb4, 0x04, 0x81, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x17, 0x12, + 0x38, 0xb4, 0x90, 0xa1, + 0x38, 0xb4, 0x84, 0xa2, + 0x38, 0xb4, 0x04, 0xa4, + 0x38, 0xb4, 0x10, 0x8a, + 0x38, 0xb4, 0x80, 0x8a, + 0x38, 0xb4, 0x84, 0xcb, + 0x38, 0xb4, 0x3e, 0xd1, + 0x38, 0xb4, 0x5a, 0xd0, + 0x38, 0xb4, 0x3e, 0xd1, + 0x38, 0xb4, 0x6b, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x59, 0x35, + 0x38, 0xb4, 0xa8, 0x80, + 0x38, 0xb4, 0xfb, 0xff, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x4b, 0x60, + 0x38, 0xb4, 0x8a, 0xcb, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x59, 0x36, + 0x38, 0xb4, 0xb1, 0x80, + 0x38, 0xb4, 0xfb, 0xff, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x6b, 0x60, + 0x38, 0xb4, 0x8b, 0xcb, + 0x38, 0xb4, 0xeb, 0x5e, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x41, 0x60, + 0x38, 0xb4, 0x02, 0xa4, + 0x38, 0xb4, 0x8c, 0xcb, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x9a, 0x60, + 0x38, 0xb4, 0xb7, 0xd1, + 0x38, 0xb4, 0x49, 0xd0, + 0x38, 0xb4, 0x03, 0xf0, + 0x38, 0xb4, 0x60, 0xd1, + 0x38, 0xb4, 0x4b, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xb4, 0x5f, + 0x38, 0xb4, 0x8d, 0xcb, + 0x38, 0xb4, 0x10, 0x87, + 0x38, 0xb4, 0x1f, 0xd7, + 0x38, 0xb4, 0xd4, 0x5f, + 0x38, 0xb4, 0x20, 0xb9, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x1f, 0xd7, + 0x38, 0xb4, 0xb4, 0x7f, + 0x38, 0xb4, 0x20, 0x99, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x1f, 0xd7, + 0x38, 0xb4, 0x05, 0x61, + 0x38, 0xb4, 0x54, 0x60, + 0x38, 0xb4, 0xfb, 0xff, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xab, 0x5f, + 0x38, 0xb4, 0xf0, 0xff, + 0x38, 0xb4, 0x10, 0xa7, + 0x38, 0xb4, 0x20, 0xb8, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x1f, 0xd7, + 0x38, 0xb4, 0xa5, 0x7f, + 0x38, 0xb4, 0x20, 0x98, + 0x38, 0xb4, 0x14, 0xd1, + 0x38, 0xb4, 0x40, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xba, 0x5f, + 0x38, 0xb4, 0x04, 0xd7, + 0x38, 0xb4, 0x76, 0x5f, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x34, 0x5f, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x81, 0x60, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x5a, 0x40, + 0x38, 0xb4, 0x80, 0xa4, + 0x38, 0xb4, 0x86, 0xcb, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x9a, 0x60, + 0x38, 0xb4, 0xc8, 0xd1, + 0x38, 0xb4, 0x45, 0xd0, + 0x38, 0xb4, 0x03, 0xf0, + 0x38, 0xb4, 0x7a, 0xd1, + 0x38, 0xb4, 0x4b, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xb4, 0x5f, + 0x38, 0xb4, 0xc0, 0x0c, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x01, 0x01, + 0x38, 0xb4, 0xe0, 0x0c, + 0x38, 0xb4, 0x20, 0x03, + 0x38, 0xb4, 0x29, 0xcc, + 0x38, 0xb4, 0x08, 0xa2, + 0x38, 0xb4, 0x04, 0x82, + 0x38, 0xb4, 0x14, 0xd1, + 0x38, 0xb4, 0x40, 0xd0, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xf4, 0x5f, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x3e, 0x0c, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x9d, 0x60, + 0x38, 0xb4, 0x17, 0xd4, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x03, 0x12, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x2e, 0x0d, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0xa4, 0x5f, + 0x38, 0xb4, 0x06, 0xa7, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x8b, 0x40, + 0x38, 0xb4, 0x01, 0xa7, + 0x38, 0xb4, 0x02, 0xa5, + 0x38, 0xb4, 0x80, 0xa8, + 0x38, 0xb4, 0x01, 0x88, + 0x38, 0xb4, 0x01, 0x8e, + 0x38, 0xb4, 0x50, 0xca, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xb6, 0x81, + 0x38, 0xb4, 0x51, 0xca, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x10, 0x22, + 0x38, 0xb4, 0xb4, 0x81, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x84, 0x40, + 0x38, 0xb4, 0x05, 0xd7, + 0x38, 0xb4, 0xfd, 0x5e, + 0x38, 0xb4, 0x07, 0xf0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xc2, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0xa2, 0x5c, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x92, 0x16, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x5a, 0x60, + 0x38, 0xb4, 0x10, 0x9a, + 0x38, 0xb4, 0x40, 0x8e, + 0x38, 0xb4, 0x04, 0x84, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x27, 0x18, + 0x38, 0xb4, 0x80, 0x8e, + 0x38, 0xb4, 0x62, 0xca, + 0x38, 0xb4, 0x05, 0xd7, + 0x38, 0xb4, 0x84, 0x30, + 0x38, 0xb4, 0x96, 0x81, + 0x38, 0xb4, 0x10, 0xba, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x90, 0x82, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x00, 0x01, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x38, 0x46, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x44, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7c, 0x5f, + 0x38, 0xb4, 0x08, 0x81, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x07, 0x09, + 0x38, 0xb4, 0x40, 0x89, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xdb, 0x17, + 0x38, 0xb4, 0xc4, 0xa0, + 0x38, 0xb4, 0x10, 0x86, + 0x38, 0xb4, 0x30, 0x80, + 0x38, 0xb4, 0x06, 0x87, + 0x38, 0xb4, 0x07, 0x0c, + 0x38, 0xb4, 0x06, 0x0b, + 0x38, 0xb4, 0x10, 0x84, + 0x38, 0xb4, 0x80, 0xa9, + 0x38, 0xb4, 0x02, 0xa7, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x45, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7c, 0x5f, + 0x38, 0xb4, 0x07, 0x0c, + 0x38, 0xb4, 0x06, 0x0b, + 0x38, 0xb4, 0x30, 0xa0, + 0x38, 0xb4, 0x10, 0xa6, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x41, 0x60, + 0x38, 0xb4, 0x01, 0xa5, + 0x38, 0xb4, 0x08, 0xa1, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x45, 0xd0, + 0x38, 0xb4, 0x63, 0xca, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7c, 0x5f, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x78, 0x60, + 0x38, 0xb4, 0x20, 0x99, + 0x38, 0xb4, 0x03, 0xf0, + 0x38, 0xb4, 0x20, 0xb9, + 0x38, 0xb4, 0x80, 0xa8, + 0x38, 0xb4, 0x10, 0x9a, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x1f, 0xd7, + 0x38, 0xb4, 0x73, 0x5f, + 0x38, 0xb4, 0x11, 0xf0, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x9b, 0x40, + 0x38, 0xb4, 0x20, 0x99, + 0x38, 0xb4, 0x10, 0x9a, + 0x38, 0xb4, 0xf5, 0xff, + 0x38, 0xb4, 0xfe, 0x80, + 0x38, 0xb4, 0x10, 0x86, + 0x38, 0xb4, 0x01, 0x85, + 0x38, 0xb4, 0x80, 0x89, + 0x38, 0xb4, 0x02, 0x87, + 0x38, 0xb4, 0x10, 0xa4, + 0x38, 0xb4, 0x40, 0xa9, + 0x38, 0xb4, 0xc0, 0x81, + 0x38, 0xb4, 0x80, 0xae, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x3b, 0x81, + 0x38, 0xb4, 0x04, 0x88, + 0x38, 0xb4, 0x04, 0xa7, + 0x38, 0xb4, 0x88, 0x87, + 0x38, 0xb4, 0x80, 0xff, + 0x38, 0xb4, 0x08, 0xbb, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x8b, 0x03, + 0x38, 0xb4, 0x40, 0x89, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xdb, 0x17, + 0xff, 0xff, 0xff, 0xff, + 0x6c, 0xe8, 0x00, 0xa0, + 0x38, 0xb4, 0x01, 0x87, + 0x38, 0xb4, 0x02, 0x85, + 0x38, 0xb4, 0xf4, 0xa0, + 0x38, 0xb4, 0x10, 0xa6, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x61, 0x60, + 0x38, 0xb4, 0x02, 0xa0, + 0x38, 0xb4, 0x01, 0xa5, + 0x38, 0xb4, 0x06, 0x87, + 0x38, 0xb4, 0x10, 0x84, + 0x38, 0xb4, 0x80, 0xa9, + 0x38, 0xb4, 0x64, 0xca, + 0x38, 0xb4, 0x10, 0xd1, + 0x38, 0xb4, 0x40, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7c, 0x5f, + 0x38, 0xb4, 0x04, 0x88, + 0x38, 0xb4, 0x06, 0xa7, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x15, 0x81, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x7c, 0x14, + 0x38, 0xb4, 0x05, 0xd7, + 0x38, 0xb4, 0x5f, 0x40, + 0x38, 0xb4, 0x36, 0xf0, + 0x38, 0xb4, 0x05, 0xd7, + 0x38, 0xb4, 0x34, 0x62, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0xc6, 0x41, + 0x38, 0xb4, 0x0d, 0xd7, + 0x38, 0xb4, 0x9d, 0x41, + 0x38, 0xb4, 0x0d, 0xd7, + 0x38, 0xb4, 0x7e, 0x41, + 0x38, 0xb4, 0x04, 0xd7, + 0x38, 0xb4, 0x27, 0x61, + 0x38, 0xb4, 0x51, 0x29, + 0x38, 0xb4, 0xcb, 0x81, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x83, 0x40, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x81, 0x2e, + 0x38, 0xb4, 0xcb, 0x81, + 0x38, 0xb4, 0xc5, 0xf0, + 0x38, 0xb4, 0xfe, 0x80, + 0x38, 0xb4, 0x10, 0x86, + 0x38, 0xb4, 0x01, 0x85, + 0x38, 0xb4, 0x04, 0x87, + 0x38, 0xb4, 0x30, 0x0c, + 0x38, 0xb4, 0x10, 0x04, + 0x38, 0xb4, 0x01, 0xa7, + 0x38, 0xb4, 0x02, 0xac, + 0x38, 0xb4, 0x02, 0xa5, + 0x38, 0xb4, 0x80, 0x89, + 0x38, 0xb4, 0x60, 0xca, + 0x38, 0xb4, 0x04, 0xa0, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x65, 0x60, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0xdc, 0x81, + 0x38, 0xb4, 0x04, 0x80, + 0x38, 0xb4, 0x04, 0xa8, + 0x38, 0xb4, 0x0f, 0x0c, + 0x38, 0xb4, 0x02, 0x06, + 0x38, 0xb4, 0x70, 0x0c, + 0x38, 0xb4, 0x30, 0x07, + 0x38, 0xb4, 0x08, 0xa7, + 0x38, 0xb4, 0x04, 0xd7, + 0x38, 0xb4, 0x9c, 0x60, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x12, 0x09, + 0x38, 0xb4, 0x03, 0xf0, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x0e, 0x09, + 0x38, 0xb4, 0x40, 0xa9, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xdb, 0x17, + 0x38, 0xb4, 0x80, 0xa7, + 0x38, 0xb4, 0xa2, 0xf0, + 0x38, 0xb4, 0x04, 0xd7, + 0x38, 0xb4, 0xeb, 0x63, + 0x38, 0xb4, 0x05, 0xd7, + 0x38, 0xb4, 0xb1, 0x43, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x9c, 0x33, + 0x38, 0xb4, 0x8f, 0x82, + 0x38, 0xb4, 0x88, 0x87, + 0x38, 0xb4, 0x04, 0x87, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x07, 0x09, + 0x38, 0xb4, 0x40, 0x89, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xdb, 0x17, + 0x38, 0xb4, 0x10, 0x84, + 0x38, 0xb4, 0xf4, 0xa0, + 0x38, 0xb4, 0x10, 0xa6, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x61, 0x60, + 0x38, 0xb4, 0x02, 0xa0, + 0x38, 0xb4, 0x01, 0xa5, + 0x38, 0xb4, 0x06, 0xa7, + 0x38, 0xb4, 0x04, 0x88, + 0x38, 0xb4, 0x80, 0xa9, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x85, 0x60, + 0x38, 0xb4, 0x01, 0x87, + 0x38, 0xb4, 0x02, 0x85, + 0x38, 0xb4, 0x02, 0x8c, + 0x38, 0xb4, 0x01, 0xa7, + 0x38, 0xb4, 0x02, 0xa5, + 0x38, 0xb4, 0x82, 0xf0, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0xc5, 0x60, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x53, 0x60, + 0x38, 0xb4, 0x7d, 0xf0, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x8c, 0x82, + 0x38, 0xb4, 0x0d, 0xd7, + 0x38, 0xb4, 0x1b, 0x4d, + 0x38, 0xb4, 0x10, 0xba, + 0x38, 0xb4, 0x40, 0xae, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0xb4, 0x03, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0xb4, 0x05, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x44, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7c, 0x5f, + 0x38, 0xb4, 0x06, 0x87, + 0x38, 0xb4, 0x80, 0x82, + 0x38, 0xb4, 0xe0, 0xac, + 0x38, 0xb4, 0x80, 0xa6, + 0x38, 0xb4, 0x40, 0xa2, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x79, 0x5f, + 0x38, 0xb4, 0x40, 0x82, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x98, 0x68, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x57, 0x49, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x7e, 0x82, + 0x38, 0xb4, 0xc0, 0xa1, + 0x38, 0xb4, 0x3f, 0x0c, + 0x38, 0xb4, 0x20, 0x02, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x0c, 0x03, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x0c, 0x05, + 0x38, 0xb4, 0x08, 0x81, + 0x38, 0xb4, 0x40, 0x86, + 0x38, 0xb4, 0x20, 0xa1, + 0x38, 0xb4, 0x40, 0xa6, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x01, 0x01, + 0x38, 0xb4, 0x10, 0xa1, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x44, 0xd0, + 0x38, 0xb4, 0x84, 0xca, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7c, 0x5f, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0xfc, 0x60, + 0x38, 0xb4, 0x10, 0x82, + 0x38, 0xb4, 0xe0, 0x0c, + 0x38, 0xb4, 0x20, 0x03, + 0x38, 0xb4, 0xe0, 0x0c, + 0x38, 0xb4, 0x20, 0x05, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0x10, 0xa2, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x43, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7c, 0x5f, + 0x38, 0xb4, 0x33, 0x82, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x6c, 0x03, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x6c, 0x05, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x44, 0xd0, + 0x38, 0xb4, 0x85, 0xca, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7c, 0x5f, + 0x38, 0xb4, 0x80, 0xa6, + 0x38, 0xb4, 0x40, 0xa2, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x79, 0x5f, + 0x38, 0xb4, 0x40, 0x82, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x90, 0x03, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x90, 0x05, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x58, 0x60, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0xc7, 0xfe, + 0x38, 0xb4, 0xc0, 0x81, + 0x38, 0xb4, 0x80, 0x88, + 0x38, 0xb4, 0x06, 0x87, + 0x38, 0xb4, 0x61, 0xca, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x54, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x7d, 0x5f, + 0x38, 0xb4, 0x06, 0xa7, + 0x38, 0xb4, 0x04, 0xf0, + 0x38, 0xb4, 0x88, 0x87, + 0x38, 0xb4, 0x04, 0xa4, + 0x38, 0xb4, 0x02, 0x87, + 0x38, 0xb4, 0x00, 0x08, + 0x38, 0xb4, 0x43, 0x84, + 0x38, 0xb4, 0x03, 0x83, + 0x38, 0xb4, 0x80, 0x82, + 0x38, 0xb4, 0x20, 0x99, + 0x38, 0xb4, 0xe0, 0x8c, + 0x38, 0xb4, 0x04, 0x80, + 0x38, 0xb4, 0xc0, 0xa1, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x4a, 0x40, + 0x38, 0xb4, 0x80, 0xa2, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0xd0, 0x3b, + 0x38, 0xb4, 0xa0, 0x82, + 0x38, 0xb4, 0x3f, 0x0c, + 0x38, 0xb4, 0x23, 0x02, + 0x38, 0xb4, 0x03, 0xf0, + 0x38, 0xb4, 0x3f, 0x0c, + 0x38, 0xb4, 0x20, 0x02, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x08, 0x03, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x08, 0x05, + 0x38, 0xb4, 0x08, 0x81, + 0x38, 0xb4, 0x40, 0x86, + 0x38, 0xb4, 0x20, 0xa1, + 0x38, 0xb4, 0x40, 0xa6, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x77, 0x60, + 0x38, 0xb4, 0x03, 0x81, + 0x38, 0xb4, 0x03, 0xf0, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x01, 0x01, + 0x38, 0xb4, 0x10, 0xa1, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x77, 0x60, + 0x38, 0xb4, 0x08, 0xa1, + 0x38, 0xb4, 0x06, 0xf0, + 0x38, 0xb4, 0x04, 0xd7, + 0x38, 0xb4, 0x77, 0x60, + 0x38, 0xb4, 0x08, 0x81, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0x08, 0xa1, + 0x38, 0xb4, 0x93, 0xd1, + 0x38, 0xb4, 0x45, 0xd0, + 0x38, 0xb4, 0x82, 0xca, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x6a, 0x60, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x3c, 0x5f, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0xfc, 0x60, + 0x38, 0xb4, 0x10, 0x82, + 0x38, 0xb4, 0xe0, 0x0c, + 0x38, 0xb4, 0x20, 0x03, + 0x38, 0xb4, 0xe0, 0x0c, + 0x38, 0xb4, 0x20, 0x05, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0x10, 0xa2, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x43, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x6a, 0x60, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x3c, 0x5f, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0xd0, 0x3b, + 0x38, 0xb4, 0xde, 0x82, + 0x38, 0xb4, 0x3f, 0x0c, + 0x38, 0xb4, 0x0c, 0x02, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0x3f, 0x82, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x4c, 0x03, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x4c, 0x05, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x44, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x6a, 0x60, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x3c, 0x5f, + 0x38, 0xb4, 0x0c, 0x82, + 0x38, 0xb4, 0x60, 0xa3, + 0x38, 0xb4, 0x60, 0xa5, + 0x38, 0xb4, 0xc4, 0xd1, + 0x38, 0xb4, 0x43, 0xd0, + 0x38, 0xb4, 0x83, 0xca, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x6a, 0x60, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x3c, 0x5f, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x6a, 0x40, + 0x38, 0xb4, 0x80, 0x86, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0x80, 0xa6, + 0x38, 0xb4, 0x40, 0xa2, + 0x38, 0xb4, 0x0f, 0x0c, + 0x38, 0xb4, 0x04, 0x06, + 0x38, 0xb4, 0x70, 0x0c, + 0x38, 0xb4, 0x50, 0x07, + 0x38, 0xb4, 0x08, 0xa7, + 0x38, 0xb4, 0x04, 0xd7, + 0x38, 0xb4, 0x9c, 0x60, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x14, 0x09, + 0x38, 0xb4, 0x03, 0xf0, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x10, 0x09, + 0x38, 0xb4, 0x40, 0xa9, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xdb, 0x17, + 0x38, 0xb4, 0x80, 0xa7, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xbe, 0x17, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x6a, 0x60, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xe8, 0x17, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x9c, 0x39, + 0x38, 0xb4, 0x11, 0x83, + 0x38, 0xb4, 0x40, 0x82, + 0x38, 0xb4, 0x88, 0x87, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0xf8, 0x63, + 0x38, 0xb4, 0x05, 0xd7, + 0x38, 0xb4, 0x3c, 0x64, + 0x38, 0xb4, 0x02, 0xa4, + 0x38, 0xb4, 0x12, 0xf0, + 0x38, 0xb4, 0x02, 0x84, + 0x38, 0xb4, 0x05, 0xd7, + 0x38, 0xb4, 0x1b, 0x61, + 0x38, 0xb4, 0x01, 0xa4, + 0x38, 0xb4, 0x02, 0xa3, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x7d, 0x41, + 0x38, 0xb4, 0x40, 0xa4, + 0x38, 0xb4, 0x80, 0xa2, + 0x38, 0xb4, 0x08, 0xf0, + 0x38, 0xb4, 0x01, 0x84, + 0x38, 0xb4, 0x02, 0x83, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x60, 0x60, + 0x38, 0xb4, 0x01, 0xa3, + 0x38, 0xb4, 0x02, 0xf0, + 0x38, 0xb4, 0x01, 0x83, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x80, 0x40, + 0x38, 0xb4, 0x0e, 0xd7, + 0x38, 0xb4, 0x4a, 0x60, + 0x38, 0xb4, 0x5f, 0xff, + 0x38, 0xb4, 0x05, 0xd7, + 0x38, 0xb4, 0xdd, 0x3c, + 0x38, 0xb4, 0x40, 0x83, + 0x38, 0xb4, 0x5b, 0xff, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x90, 0x03, + 0x38, 0xb4, 0xfc, 0x0c, + 0x38, 0xb4, 0x90, 0x05, + 0x38, 0xb4, 0x00, 0x08, + 0x38, 0xb4, 0x50, 0xcb, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x10, 0xa3, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x5f, 0xcb, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x3e, 0x0d, + 0x38, 0xb4, 0x13, 0xcb, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x89, 0x60, + 0x38, 0xb4, 0xb8, 0xd1, + 0x38, 0xb4, 0x4a, 0xd0, + 0x38, 0xb4, 0x03, 0xf0, + 0x38, 0xb4, 0x1c, 0xd1, + 0x38, 0xb4, 0x4b, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x01, 0xd7, + 0x38, 0xb4, 0xd5, 0x67, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x74, 0x5f, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x0c, 0x61, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0x46, 0x68, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x7b, 0x64, + 0x38, 0xb4, 0xfa, 0xff, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x30, 0x13, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x1f, 0x0c, + 0x38, 0xb4, 0x16, 0x0f, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0xb3, 0x5f, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x15, + 0x38, 0xb4, 0x1f, 0x8f, + 0x38, 0xb4, 0x03, 0x95, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x0c, 0xd7, + 0x38, 0xb4, 0x33, 0x7f, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0xb5, 0x12, + 0x38, 0xb4, 0x07, 0x0c, + 0x38, 0xb4, 0x02, 0x0c, + 0x38, 0xb4, 0xc0, 0x0c, + 0x38, 0xb4, 0x80, 0x00, + 0x38, 0xb4, 0x4a, 0xd1, + 0x38, 0xb4, 0x48, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xb4, 0x5f, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x59, 0x83, + 0x38, 0xb4, 0x0a, 0x80, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x0e, 0x12, + 0x38, 0xb4, 0x04, 0xa0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x20, 0x12, + 0x38, 0xb4, 0x04, 0x80, + 0x38, 0xb4, 0x01, 0xa0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x20, 0x12, + 0x38, 0xb4, 0x01, 0x80, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x17, 0x12, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x09, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0xed, 0x04, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x1f, 0xd7, + 0x38, 0xb4, 0xab, 0x5f, + 0x38, 0xb4, 0x08, 0xba, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x1f, 0xd7, + 0xff, 0xff, 0xff, 0xff, + 0x38, 0xb4, 0x8b, 0x7f, + 0x6c, 0xe8, 0x00, 0xa0, + 0x38, 0xb4, 0x08, 0x9a, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x81, 0x05, + 0x38, 0xb4, 0x0a, 0x80, + 0x38, 0xb4, 0x02, 0xd7, + 0x38, 0xb4, 0x55, 0x65, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x0e, 0x12, + 0x38, 0xb4, 0x04, 0xa0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x20, 0x12, + 0x38, 0xb4, 0x04, 0x80, + 0x38, 0xb4, 0x01, 0xa0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x20, 0x12, + 0x38, 0xb4, 0x01, 0x80, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x17, 0x12, + 0x38, 0xb4, 0x0a, 0xa0, + 0x38, 0xb4, 0x80, 0xa7, + 0x38, 0xb4, 0x14, 0xcb, + 0x38, 0xb4, 0xb8, 0xd1, + 0x38, 0xb4, 0x4a, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xb4, 0x5f, + 0x38, 0xb4, 0x86, 0x62, + 0x38, 0xb4, 0x06, 0xd7, + 0x38, 0xb4, 0x5b, 0x5f, + 0x38, 0xb4, 0x0a, 0x80, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x0e, 0x12, + 0x38, 0xb4, 0x04, 0xa0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x20, 0x12, + 0x38, 0xb4, 0x04, 0x80, + 0x38, 0xb4, 0x01, 0xa0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x20, 0x12, + 0x38, 0xb4, 0x01, 0x80, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x17, 0x12, + 0x38, 0xb4, 0x03, 0x0c, + 0x38, 0xb4, 0x02, 0x09, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0xa1, 0x83, + 0x38, 0xb4, 0x0a, 0xa0, + 0x38, 0xb4, 0x08, 0x93, + 0x38, 0xb4, 0x10, 0xb2, + 0x38, 0xb4, 0x01, 0xb3, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x01, 0xd7, + 0x38, 0xb4, 0xa4, 0x5f, + 0x38, 0xb4, 0x02, 0xb3, + 0x38, 0xb4, 0x10, 0x92, + 0x38, 0xb4, 0x09, 0xd4, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x03, 0x12, + 0x38, 0xb4, 0x1e, 0xd1, + 0x38, 0xb4, 0x4c, 0xd0, + 0x38, 0xb4, 0x00, 0x10, + 0x38, 0xb4, 0x6b, 0x12, + 0x38, 0xb4, 0x00, 0xd7, + 0x38, 0xb4, 0xb4, 0x5f, + 0x38, 0xb4, 0x00, 0x18, + 0x38, 0xb4, 0x81, 0x05, + 0x36, 0xb4, 0x0e, 0xa1, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x0c, 0xa1, + 0x38, 0xb4, 0xf8, 0x04, + 0x36, 0xb4, 0x0a, 0xa1, + 0x38, 0xb4, 0x3d, 0x0d, + 0x36, 0xb4, 0x08, 0xa1, + 0x38, 0xb4, 0xfb, 0x15, + 0x36, 0xb4, 0x06, 0xa1, + 0x38, 0xb4, 0x2b, 0x0d, + 0x36, 0xb4, 0x04, 0xa1, + 0x38, 0xb4, 0xcb, 0x0e, + 0x36, 0xb4, 0x02, 0xa1, + 0x38, 0xb4, 0xca, 0x09, + 0x36, 0xb4, 0x00, 0xa1, + 0x38, 0xb4, 0x60, 0x09, + 0x36, 0xb4, 0x10, 0xa1, + 0x38, 0xb4, 0x7f, 0x00, + 0x6c, 0xe8, 0x00, 0xa0, + 0x36, 0xb4, 0x16, 0xa0, + 0x38, 0xb4, 0x20, 0x00, + 0x36, 0xb4, 0x12, 0xa0, + 0x38, 0xb4, 0xf8, 0x1f, + 0x36, 0xb4, 0x14, 0xa0, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x38, 0xb4, 0x00, 0x00, + 0x36, 0xb4, 0x64, 0xa1, + 0x38, 0xb4, 0xff, 0x3f, + 0x36, 0xb4, 0x66, 0xa1, + 0x38, 0xb4, 0xff, 0x3f, + 0x36, 0xb4, 0x68, 0xa1, + 0x38, 0xb4, 0xff, 0x3f, + 0x36, 0xb4, 0x6a, 0xa1, + 0x38, 0xb4, 0xff, 0x3f, + 0x36, 0xb4, 0x6c, 0xa1, + 0x38, 0xb4, 0xff, 0x3f, + 0x36, 0xb4, 0x6e, 0xa1, + 0x38, 0xb4, 0xff, 0x3f, + 0x36, 0xb4, 0x70, 0xa1, + 0x38, 0xb4, 0xff, 0x3f, + 0x36, 0xb4, 0x72, 0xa1, + 0x38, 0xb4, 0xff, 0x3f, + 0x36, 0xb4, 0x62, 0xa1, + 0x38, 0xb4, 0x00, 0x00, + 0x6c, 0xe8, 0x00, 0xa0, + 0x36, 0xb4, 0x7c, 0xb8, + 0x38, 0xb4, 0x63, 0x8a, + 0x36, 0xb4, 0x7e, 0xb8, + 0x38, 0xb4, 0x8a, 0xaf, + 0x38, 0xb4, 0xaf, 0x7b, + 0x38, 0xb4, 0xb6, 0x8a, + 0x38, 0xb4, 0x8a, 0xaf, + 0x38, 0xb4, 0xaf, 0xd6, + 0x38, 0xb4, 0xe4, 0x8a, + 0x38, 0xb4, 0x8a, 0xaf, + 0x38, 0xb4, 0xaf, 0xf2, + 0x38, 0xb4, 0x07, 0x8b, + 0x38, 0xb4, 0x8b, 0xaf, + 0x38, 0xb4, 0xaf, 0x07, + 0x38, 0xb4, 0x07, 0x8b, + 0x38, 0xb4, 0x35, 0xad, + 0x38, 0xb4, 0xbf, 0x27, + 0x38, 0xb4, 0x08, 0x73, + 0x38, 0xb4, 0x7b, 0x02, + 0x38, 0xb4, 0xac, 0x07, + 0x38, 0xb4, 0x0d, 0x28, + 0x38, 0xb4, 0x73, 0xbf, + 0x38, 0xb4, 0x02, 0x0b, + 0x38, 0xb4, 0x07, 0x7b, + 0x38, 0xb4, 0x28, 0xac, + 0x38, 0xb4, 0xd0, 0x04, + 0x38, 0xb4, 0xae, 0x05, + 0x38, 0xb4, 0xd0, 0x02, + 0x38, 0xb4, 0xd1, 0x01, + 0x38, 0xb4, 0xd3, 0x01, + 0x38, 0xb4, 0xee, 0x04, + 0x38, 0xb4, 0x40, 0x86, + 0x38, 0xb4, 0xee, 0x00, + 0x38, 0xb4, 0x41, 0x86, + 0x38, 0xb4, 0xaf, 0x00, + 0x38, 0xb4, 0xa6, 0x6a, + 0x38, 0xb4, 0x00, 0xd1, + 0x38, 0xb4, 0x00, 0xd3, + 0x38, 0xb4, 0x86, 0xee, + 0x38, 0xb4, 0x01, 0x40, + 0x38, 0xb4, 0x86, 0xee, + 0x38, 0xb4, 0x24, 0x41, + 0x38, 0xb4, 0x0f, 0xd0, + 0x38, 0xb4, 0x6a, 0xaf, + 0x38, 0xb4, 0xbf, 0xa6, + 0x38, 0xb4, 0x9e, 0x73, + 0x38, 0xb4, 0x7b, 0x02, + 0x38, 0xb4, 0xad, 0x07, + 0x38, 0xb4, 0x0b, 0x28, + 0x38, 0xb4, 0x8f, 0xe1, + 0x38, 0xb4, 0xad, 0xfd, + 0x38, 0xb4, 0x05, 0x28, + 0x38, 0xb4, 0x8f, 0xe0, + 0x38, 0xb4, 0xae, 0xfe, + 0x38, 0xb4, 0xe0, 0x03, + 0x38, 0xb4, 0xff, 0x8f, + 0x38, 0xb4, 0x89, 0xe4, + 0x38, 0xb4, 0xe0, 0xe7, + 0x38, 0xb4, 0xe7, 0x89, + 0x38, 0xb4, 0x67, 0xaf, + 0x38, 0xb4, 0xa0, 0x9f, + 0x38, 0xb4, 0x02, 0x94, + 0x38, 0xb4, 0x03, 0xae, + 0x38, 0xb4, 0xb5, 0xa0, + 0x38, 0xb4, 0xaf, 0x03, + 0x38, 0xb4, 0x89, 0x0d, + 0x38, 0xb4, 0x0d, 0xaf, + 0x38, 0xb4, 0xa0, 0xaf, + 0x38, 0xb4, 0x02, 0x94, + 0x38, 0xb4, 0x03, 0xae, + 0x38, 0xb4, 0xb5, 0xa0, + 0x38, 0xb4, 0xaf, 0x03, + 0x38, 0xb4, 0x64, 0x0c, + 0x38, 0xb4, 0x0c, 0xaf, + 0x38, 0xb4, 0xe0, 0xcc, + 0x38, 0xb4, 0x13, 0x80, + 0x38, 0xb4, 0x6b, 0x02, + 0x38, 0xb4, 0xad, 0xa4, + 0x38, 0xb4, 0x09, 0x21, + 0x38, 0xb4, 0x64, 0x02, + 0x38, 0xb4, 0xbf, 0x47, + 0x38, 0xb4, 0x9b, 0x76, + 0x38, 0xb4, 0x7a, 0x02, + 0x38, 0xb4, 0xaf, 0xbc, + 0x38, 0xb4, 0x62, 0x65, + 0x36, 0xb4, 0x5e, 0xb8, + 0x38, 0xb4, 0x7f, 0x6a, + 0x36, 0xb4, 0x60, 0xb8, + 0x38, 0xb4, 0x9c, 0x67, + 0x36, 0xb4, 0x62, 0xb8, + 0x38, 0xb4, 0x86, 0x0d, + 0x36, 0xb4, 0x64, 0xb8, + 0x38, 0xb4, 0x61, 0x0c, + 0x36, 0xb4, 0x86, 0xb8, + 0x38, 0xb4, 0x53, 0x65, + 0x36, 0xb4, 0x88, 0xb8, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x8a, 0xb8, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x8c, 0xb8, + 0x38, 0xb4, 0xff, 0xff, + 0x36, 0xb4, 0x38, 0xb8, + 0x38, 0xb4, 0x1f, 0x00, + 0x6c, 0xe8, 0x00, 0xb0, + 0x20, 0xb8, 0x10, 0x00, + 0x6c, 0xe8, 0x00, 0xa0, + 0x36, 0xb4, 0x29, 0x86, + 0x38, 0xb4, 0x86, 0xaf, + 0x38, 0xb4, 0xaf, 0x41, + 0x38, 0xb4, 0x44, 0x86, + 0x38, 0xb4, 0x88, 0xaf, + 0x38, 0xb4, 0xaf, 0x0c, + 0x38, 0xb4, 0x13, 0x88, + 0x38, 0xb4, 0x88, 0xaf, + 0x38, 0xb4, 0xaf, 0x13, + 0x38, 0xb4, 0x13, 0x88, + 0x38, 0xb4, 0x88, 0xaf, + 0x38, 0xb4, 0xaf, 0x13, + 0x38, 0xb4, 0x13, 0x88, + 0x38, 0xb4, 0x1d, 0xaf, + 0x38, 0xb4, 0x02, 0x8a, + 0x38, 0xb4, 0x4d, 0x86, + 0x38, 0xb4, 0x10, 0x02, + 0x38, 0xb4, 0xaf, 0x64, + 0x38, 0xb4, 0x52, 0x10, + 0x38, 0xb4, 0xfa, 0xf8, + 0x38, 0xb4, 0x69, 0xef, + 0x38, 0xb4, 0x80, 0xe0, + 0x38, 0xb4, 0xac, 0x4c, + 0x38, 0xb4, 0x17, 0x25, + 0x38, 0xb4, 0x80, 0xe0, + 0x38, 0xb4, 0xad, 0x40, + 0x38, 0xb4, 0x1a, 0x25, + 0x38, 0xb4, 0x86, 0x02, + 0x38, 0xb4, 0xe0, 0x7c, + 0x38, 0xb4, 0x40, 0x80, + 0x38, 0xb4, 0x25, 0xac, + 0x38, 0xb4, 0xbf, 0x11, + 0x38, 0xb4, 0xf4, 0x87, + 0x38, 0xb4, 0x77, 0x02, + 0x38, 0xb4, 0xae, 0xf6, + 0x38, 0xb4, 0x02, 0x09, + 0x38, 0xb4, 0xb3, 0x87, + 0x38, 0xb4, 0x87, 0x02, + 0x38, 0xb4, 0x02, 0xe9, + 0x38, 0xb4, 0xde, 0x87, + 0x38, 0xb4, 0x96, 0xef, + 0x38, 0xb4, 0xfc, 0xfe, + 0x38, 0xb4, 0xf8, 0x04, + 0x38, 0xb4, 0x80, 0xe0, + 0x38, 0xb4, 0xad, 0x18, + 0x38, 0xb4, 0x11, 0x26, + 0x38, 0xb4, 0x8f, 0xe0, + 0x38, 0xb4, 0xac, 0x9c, + 0x38, 0xb4, 0x05, 0x20, + 0x38, 0xb4, 0x86, 0x02, + 0x38, 0xb4, 0xae, 0x99, + 0x38, 0xb4, 0x02, 0x03, + 0x38, 0xb4, 0x07, 0x87, + 0x38, 0xb4, 0x87, 0x02, + 0x38, 0xb4, 0x02, 0x50, + 0x38, 0xb4, 0xde, 0x87, 0x38, 0xb4, 0x04, 0xfc, - 0x38, 0xb4, 0xd1, 0xf0, - 0x38, 0xb4, 0xf0, 0x2a, - 0x38, 0xb4, 0x2c, 0xd1, - 0x38, 0xb4, 0xd1, 0xf0, - 0x38, 0xb4, 0xf0, 0x44, - 0x38, 0xb4, 0x46, 0xd1, - 0x38, 0xb4, 0x86, 0xbf, - 0x38, 0xb4, 0x02, 0xa1, - 0x38, 0xb4, 0xc8, 0x52, - 0x38, 0xb4, 0x86, 0xbf, - 0x38, 0xb4, 0x02, 0xa1, - 0x38, 0xb4, 0xc8, 0x52, - 0x38, 0xb4, 0x01, 0xd1, - 0x38, 0xb4, 0x06, 0xaf, - 0x38, 0xb4, 0x70, 0xa5, - 0x38, 0xb4, 0x42, 0xce, + 0x38, 0xb4, 0xf9, 0xf8, + 0x38, 0xb4, 0x79, 0xef, + 0x38, 0xb4, 0xbf, 0xfb, + 0x38, 0xb4, 0xf7, 0x87, + 0x38, 0xb4, 0x78, 0x02, + 0x38, 0xb4, 0x5c, 0x38, + 0x38, 0xb4, 0x00, 0x20, + 0x38, 0xb4, 0x4d, 0x0d, + 0x38, 0xb4, 0x01, 0xa1, + 0x38, 0xb4, 0xbf, 0x51, + 0x38, 0xb4, 0xf7, 0x87, + 0x38, 0xb4, 0x78, 0x02, + 0x38, 0xb4, 0x5c, 0x38, + 0x38, 0xb4, 0xff, 0x07, + 0x38, 0xb4, 0x8f, 0xe3, + 0x38, 0xb4, 0x1b, 0x9d, + 0x38, 0xb4, 0x9f, 0x31, + 0x38, 0xb4, 0x0d, 0x41, + 0x38, 0xb4, 0xe3, 0x48, + 0x38, 0xb4, 0x9e, 0x8f, + 0x38, 0xb4, 0x31, 0x1b, + 0x38, 0xb4, 0x38, 0x9f, + 0x38, 0xb4, 0x87, 0xbf, + 0x38, 0xb4, 0x02, 0xfa, + 0x38, 0xb4, 0x38, 0x78, + 0x38, 0xb4, 0x07, 0x5c, + 0x38, 0xb4, 0xe3, 0xff, + 0x38, 0xb4, 0x9f, 0x8f, + 0x38, 0xb4, 0x31, 0x1b, + 0x38, 0xb4, 0x28, 0x9f, + 0x38, 0xb4, 0x48, 0x0d, + 0x38, 0xb4, 0x8f, 0xe3, + 0x38, 0xb4, 0x1b, 0xa0, + 0x38, 0xb4, 0x9f, 0x31, + 0x38, 0xb4, 0xbf, 0x1f, + 0x38, 0xb4, 0xfd, 0x87, + 0x38, 0xb4, 0x78, 0x02, + 0x38, 0xb4, 0x5c, 0x38, + 0x38, 0xb4, 0xff, 0x07, + 0x38, 0xb4, 0x8f, 0xe3, + 0x38, 0xb4, 0x1b, 0xa1, + 0x38, 0xb4, 0x9f, 0x31, + 0x38, 0xb4, 0x0d, 0x0f, + 0x38, 0xb4, 0xe3, 0x48, + 0x38, 0xb4, 0xa2, 0x8f, + 0x38, 0xb4, 0x31, 0x1b, + 0x38, 0xb4, 0x06, 0x9f, + 0x38, 0xb4, 0x8f, 0xee, + 0x38, 0xb4, 0x01, 0x9c, + 0x38, 0xb4, 0x04, 0xae, + 0x38, 0xb4, 0x8f, 0xee, + 0x38, 0xb4, 0x00, 0x9c, + 0x38, 0xb4, 0xef, 0xff, + 0x38, 0xb4, 0xfd, 0x97, + 0x38, 0xb4, 0x04, 0xfc, + 0x38, 0xb4, 0xf9, 0xf8, + 0x38, 0xb4, 0x79, 0xef, + 0x38, 0xb4, 0xbf, 0xfb, + 0x38, 0xb4, 0xf7, 0x87, + 0x38, 0xb4, 0x78, 0x02, + 0x38, 0xb4, 0x5c, 0x38, + 0x38, 0xb4, 0x00, 0x20, + 0x38, 0xb4, 0x4d, 0x0d, + 0x38, 0xb4, 0x00, 0xa1, + 0x38, 0xb4, 0xbf, 0x20, + 0x38, 0xb4, 0xf7, 0x87, + 0x38, 0xb4, 0x78, 0x02, + 0x38, 0xb4, 0x5c, 0x38, + 0x38, 0xb4, 0x00, 0x06, + 0x38, 0xb4, 0x49, 0x0d, + 0x38, 0xb4, 0x8f, 0xe3, + 0x38, 0xb4, 0x1b, 0xa3, + 0x38, 0xb4, 0x9f, 0x31, + 0x38, 0xb4, 0xbf, 0x0e, + 0x38, 0xb4, 0x00, 0x88, + 0x38, 0xb4, 0x77, 0x02, + 0x38, 0xb4, 0xbf, 0xf6, + 0x38, 0xb4, 0x06, 0x88, + 0x38, 0xb4, 0x77, 0x02, + 0x38, 0xb4, 0xae, 0xf6, + 0x38, 0xb4, 0xbf, 0x0c, + 0x38, 0xb4, 0x00, 0x88, + 0x38, 0xb4, 0x77, 0x02, + 0x38, 0xb4, 0xbf, 0xed, + 0x38, 0xb4, 0x06, 0x88, + 0x38, 0xb4, 0x77, 0x02, + 0x38, 0xb4, 0xee, 0xed, + 0x38, 0xb4, 0x9c, 0x8f, + 0x38, 0xb4, 0xff, 0x00, + 0x38, 0xb4, 0x97, 0xef, + 0x38, 0xb4, 0xfc, 0xfd, + 0x38, 0xb4, 0xf8, 0x04, + 0x38, 0xb4, 0xef, 0xf9, + 0x38, 0xb4, 0xfb, 0x79, + 0x38, 0xb4, 0x87, 0xbf, + 0x38, 0xb4, 0x02, 0xf7, + 0x38, 0xb4, 0x38, 0x78, + 0x38, 0xb4, 0x20, 0x5c, + 0x38, 0xb4, 0x0d, 0x00, + 0x38, 0xb4, 0xa1, 0x4d, + 0x38, 0xb4, 0x4a, 0x01, + 0x38, 0xb4, 0x87, 0xbf, + 0x38, 0xb4, 0x02, 0xf7, + 0x38, 0xb4, 0x38, 0x78, + 0x38, 0xb4, 0x07, 0x5c, + 0x38, 0xb4, 0xe3, 0xff, + 0x38, 0xb4, 0xa4, 0x8f, + 0x38, 0xb4, 0x31, 0x1b, + 0x38, 0xb4, 0x3a, 0x9f, + 0x38, 0xb4, 0x48, 0x0d, + 0x38, 0xb4, 0x8f, 0xe3, + 0x38, 0xb4, 0x1b, 0xa5, + 0x38, 0xb4, 0x9f, 0x31, + 0x38, 0xb4, 0xbf, 0x31, + 0x38, 0xb4, 0xfa, 0x87, + 0x38, 0xb4, 0x78, 0x02, + 0x38, 0xb4, 0xe3, 0x38, + 0x38, 0xb4, 0xa6, 0x8f, + 0x38, 0xb4, 0x31, 0x1b, + 0x38, 0xb4, 0x24, 0x9f, + 0x38, 0xb4, 0x48, 0x0d, + 0x38, 0xb4, 0x8f, 0xe3, + 0x38, 0xb4, 0x1b, 0xa7, + 0x38, 0xb4, 0x9f, 0x31, + 0x38, 0xb4, 0xbf, 0x1b, + 0x38, 0xb4, 0xfd, 0x87, + 0x38, 0xb4, 0x78, 0x02, + 0x38, 0xb4, 0xe3, 0x38, + 0x38, 0xb4, 0xa8, 0x8f, + 0x38, 0xb4, 0x31, 0x1b, + 0x38, 0xb4, 0x0e, 0x9f, + 0x38, 0xb4, 0x88, 0xbf, + 0x38, 0xb4, 0x02, 0x03, + 0x38, 0xb4, 0xf6, 0x77, + 0x38, 0xb4, 0x88, 0xbf, + 0x38, 0xb4, 0x02, 0x09, + 0x38, 0xb4, 0xf6, 0x77, + 0x38, 0xb4, 0x00, 0xae, + 0x38, 0xb4, 0xef, 0xff, + 0x38, 0xb4, 0xfd, 0x97, + 0x38, 0xb4, 0x04, 0xfc, + 0x38, 0xb4, 0xef, 0xf8, + 0x38, 0xb4, 0xfb, 0x79, + 0x38, 0xb4, 0x80, 0xe0, + 0x38, 0xb4, 0xad, 0x18, + 0x38, 0xb4, 0x1c, 0x26, + 0x38, 0xb4, 0x8f, 0xee, + 0x38, 0xb4, 0x00, 0x9c, + 0x38, 0xb4, 0x88, 0xbf, + 0x38, 0xb4, 0x02, 0x00, + 0x38, 0xb4, 0xed, 0x77, + 0x38, 0xb4, 0x88, 0xbf, + 0x38, 0xb4, 0x02, 0x06, + 0x38, 0xb4, 0xed, 0x77, + 0x38, 0xb4, 0x88, 0xbf, + 0x38, 0xb4, 0x02, 0x03, + 0x38, 0xb4, 0xed, 0x77, + 0x38, 0xb4, 0x88, 0xbf, + 0x38, 0xb4, 0x02, 0x09, + 0x38, 0xb4, 0xed, 0x77, + 0x38, 0xb4, 0xef, 0xff, + 0x38, 0xb4, 0xfc, 0x97, + 0x38, 0xb4, 0xf8, 0x04, + 0x38, 0xb4, 0x80, 0xe0, + 0x38, 0xb4, 0xf6, 0x40, + 0x38, 0xb4, 0xe4, 0x25, + 0x38, 0xb4, 0x40, 0x80, + 0x38, 0xb4, 0x04, 0xfc, + 0x38, 0xb4, 0xe0, 0xf8, + 0x38, 0xb4, 0x4c, 0x80, + 0x38, 0xb4, 0x25, 0xf6, + 0x38, 0xb4, 0x80, 0xe4, + 0x38, 0xb4, 0xfc, 0x4c, + 0x38, 0xb4, 0x55, 0x04, + 0x38, 0xb4, 0xba, 0xa4, + 0x38, 0xb4, 0xa6, 0xf0, + 0x38, 0xb4, 0xf0, 0x4a, + 0x38, 0xb4, 0x4c, 0xa6, + 0x38, 0xb4, 0xa6, 0xf0, + 0x38, 0xb4, 0x66, 0x4e, + 0x38, 0xb4, 0xb6, 0xa4, + 0x38, 0xb4, 0xa4, 0x55, + 0x38, 0xb4, 0x00, 0xb6, + 0x38, 0xb4, 0x56, 0xac, + 0x38, 0xb4, 0xac, 0x11, + 0x38, 0xb4, 0xee, 0x56, + 0x38, 0xb4, 0x4c, 0x80, + 0x38, 0xb4, 0xaf, 0x3a, + 0x38, 0xb4, 0x27, 0x06, 0x36, 0xb4, 0x18, 0xb8, - 0x38, 0xb4, 0x3d, 0x04, + 0x38, 0xb4, 0x84, 0x1d, 0x36, 0xb4, 0x1a, 0xb8, - 0x38, 0xb4, 0xa3, 0x06, + 0x38, 0xb4, 0x60, 0x10, 0x36, 0xb4, 0x1c, 0xb8, - 0x38, 0xb4, 0xff, 0xff, + 0x38, 0xb4, 0x23, 0x06, 0x36, 0xb4, 0x1e, 0xb8, 0x38, 0xb4, 0xff, 0xff, 0x36, 0xb4, 0x50, 0xb8, - 0xff, 0xff, 0xff, 0xff, 0x38, 0xb4, 0xff, 0xff, 0x36, 0xb4, 0x52, 0xb8, 0x38, 0xb4, 0xff, 0xff, @@ -13071,40 +16953,45 @@ static void rtl_ram_code_speed_up(struct r8152 *tp, bool wait) 0x36, 0xb4, 0x84, 0xb8, 0x38, 0xb4, 0xff, 0xff, 0x36, 0xb4, 0x32, 0xb8, - 0x38, 0xb4, 0x03, 0x00, + 0x38, 0xb4, 0x07, 0x00, 0x36, 0xb4, 0x00, 0x00, 0x38, 0xb4, 0x00, 0x00, - 0x36, 0xb4, 0x2e, 0xb8, - 0x38, 0xb4, 0x00, 0x00, - 0x36, 0xb4, 0x24, 0x80, + 0x6c, 0xe8, 0x00, 0xb0, + 0x2e, 0xb8, 0x00, 0x00, + 0x6c, 0xe8, 0x00, 0xa0, + 0x36, 0xb4, 0x23, 0x80, 0x38, 0xb4, 0x00, 0x00, 0x36, 0xb4, 0x1e, 0x80, - 0x38, 0xb4, 0x21, 0x00, + 0x38, 0xb4, 0x04, 0x00, 0x6c, 0xe8, 0x00, 0xb0, 0x20, 0xb8, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff}; - if (sram_read(tp, SRAM_GPHY_FW_VER) < 0x0021) { - data = ram13; - len = sizeof(ram13); + code_ver = 0x0004; + ret = sram_read(tp, SRAM_GPHY_FW_VER, &fw_version); + if (ret < 0) + goto out; - if (r8156b_flash_used(tp)) { - u32 ocp_data; + if (fw_version < code_ver) { + data = ram17; + len = sizeof(ram17); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, - USB_GPHY_CTRL); - ocp_data |= BYPASS_FLASH; - ocp_write_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL, - ocp_data); + if (r8156b_flash_used(tp)) { + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, + USB_GPHY_CTRL, + BYPASS_FLASH); + if (ret < 0) + goto out; } } } if (!data) - return; + return 0; - if (rtl_phy_patch_request(tp, true, wait)) - return; + ret = rtl_phy_patch_request(tp, true, wait); + if (ret < 0) + goto out; while (len) { u32 size; @@ -13115,47 +17002,71 @@ static void rtl_ram_code_speed_up(struct r8152 *tp, bool wait) else size = 2048; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL); - ocp_data |= GPHY_PATCH_DONE | BACKUP_RESTRORE; - ocp_write_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_GPHY_CTRL, + GPHY_PATCH_DONE | BACKUP_RESTRORE); + if (ret < 0) + goto out; - generic_ocp_write(tp, 0x9A00, 0xff, size, data, MCU_TYPE_USB); + ret = generic_ocp_write(tp, 0x9A00, 0xff, size, data, + MCU_TYPE_USB); + if (ret < 0) + goto out; data += size; len -= size; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL); - ocp_data |= POL_GPHY_PATCH; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL, + POL_GPHY_PATCH); + if (ret < 0) + goto out; for (i = 0; i < 1000; i++) { - if (!(ocp_read_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL) & POL_GPHY_PATCH)) + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL, + &ocp_data); + if (ret < 0) + goto out; + + if (!(ocp_data & POL_GPHY_PATCH)) break; } if (i == 1000) { - dev_err(&tp->intf->dev, "ram code speedup mode fail\n"); - break; + dev_err(&tp->intf->dev, + "ram code speedup mode timeout\n"); + ret = -ETIMEDOUT; + goto out; } } rtl_reset_ocp_base(tp); - rtl_phy_patch_request(tp, false, wait); + ret = rtl_phy_patch_request(tp, false, wait); + if (ret < 0) + goto out; + + if (sram_read(tp, SRAM_GPHY_FW_VER, &fw_version) < 0) + goto out; + else if (fw_version != code_ver) + dev_err(&tp->intf->dev, "ram code version is wrong %04x(%04x\n", + fw_version, code_ver); + +out: + if (ret < 0) + dev_err(&tp->intf->dev, "ram code speedup mode fail %d\n", ret); + + rtl_reset_ocp_base(tp); + + return ret; } static void r8156_ram_code(struct r8152 *tp, bool power_cut) { - u16 data; - rtl_reset_ocp_base(tp); if (tp->version == RTL_VER_10) { rtl_pre_ram_code(tp, 0x8024, 0x8600, !power_cut); - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - data |= BIT(7); - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); + ocp_reg_set_bits(tp, OCP_PHY_PATCH_CMD, BIT(7)); /* nc0_patch_180504_usb */ sram_write(tp, 0xA016, 0x0000); @@ -13934,17 +17845,13 @@ static void r8156_ram_code(struct r8152 *tp, bool power_cut) sram_write(tp, 0xb864, 0x34e7); sram_write(tp, 0xb878, 0x000f); - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - data &= ~BIT(7); - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); + ocp_reg_clr_bits(tp, OCP_PHY_PATCH_CMD, BIT(7)); rtl_post_ram_code(tp, 0x8024, !power_cut); } else if (tp->version == RTL_VER_11) { rtl_pre_ram_code(tp, 0x8024, 0x8601, !power_cut); - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - data |= BIT(7); - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); + ocp_reg_set_bits(tp, OCP_PHY_PATCH_CMD, BIT(7)); /* nc_patch */ sram_write(tp, 0xA016, 0x0000); @@ -14495,9 +18402,7 @@ static void r8156_ram_code(struct r8152 *tp, bool power_cut) ocp_reg_write(tp, OCP_SRAM_DATA, 0x19c0); ocp_reg_write(tp, OCP_SRAM_DATA, 0x1c26); - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - data &= ~BIT(7); - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); + ocp_reg_clr_bits(tp, OCP_PHY_PATCH_CMD, BIT(7)); rtl_post_ram_code(tp, 0x8024, !power_cut); @@ -14546,9 +18451,7 @@ static void r8156_ram_code(struct r8152 *tp, bool power_cut) } else if (tp->version == RTL_VER_12) { rtl_pre_ram_code(tp, 0x8024, 0x3700, !power_cut); - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - data |= BIT(7); - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); + ocp_reg_set_bits(tp, OCP_PHY_PATCH_CMD, BIT(7)); /* nc_patch */ sram_write(tp, 0xA016, 0x0000); @@ -16583,9 +20486,7 @@ static void r8156_ram_code(struct r8152 *tp, bool power_cut) sram_write(tp, 0xb88c, 0x3973); sram_write(tp, 0xb838, 0x00ff); - data = ocp_reg_read(tp, OCP_PHY_PATCH_CMD); - data &= ~BIT(7); - ocp_reg_write(tp, OCP_PHY_PATCH_CMD, data); + ocp_reg_clr_bits(tp, OCP_PHY_PATCH_CMD, BIT(7)); /* uc */ ocp_reg_write(tp, OCP_SRAM_ADDR, 0x8464); @@ -16942,27 +20843,33 @@ static void r8156_ram_code(struct r8152 *tp, bool power_cut) rtl_reset_ocp_base(tp); } +static int r8157_firmware(struct r8152 *tp, bool power_cut) +{ + int ret; + + ret = rtl_ram_code_speed_up(tp, !power_cut); + + return ret; +} + static void r8156_hw_phy_cfg(struct r8152 *tp) { u32 ocp_data; u16 data; + int ret; r8156_patch_code(tp); - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0); - if (ocp_data & PCUT_STATUS) { - ocp_data &= ~PCUT_STATUS; - ocp_write_word(tp, MCU_TYPE_USB, USB_MISC_0, ocp_data); - } + ocp_word_test_and_clr_bits(tp, MCU_TYPE_USB, USB_MISC_0, PCUT_STATUS); - data = r8153_phy_status(tp, 0); - switch (data) { + ret = r8153_phy_status(tp, 0); + if (ret < 0) + return; + + switch (ret) { case PHY_STAT_EXT_INIT: r8156_ram_code(tp, true); - - data = ocp_reg_read(tp, 0xa468); - data &= ~(BIT(3) | BIT(1)); - ocp_reg_write(tp, 0xa468, data); + ocp_reg_clr_bits(tp, 0xa468, BIT(3) | BIT(1)); break; case PHY_STAT_LAN_ON: case PHY_STAT_PWRDN: @@ -16977,163 +20884,67 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) /* disable EEE before updating the PHY parameters */ rtl_eee_enable(tp, false); - data = r8153_phy_status(tp, PHY_STAT_LAN_ON); - WARN_ON_ONCE(data != PHY_STAT_LAN_ON); + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + return; + WARN_ON_ONCE(ret != PHY_STAT_LAN_ON); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR); - ocp_data |= PFM_PWM_SWITCH; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_PHY_PWR, PFM_PWM_SWITCH); switch (tp->version) { case RTL_VER_10: - data = ocp_reg_read(tp, 0xad40); - data &= ~0x3ff; - data |= BIT(7) | BIT(2); - ocp_reg_write(tp, 0xad40, data); - - data = ocp_reg_read(tp, 0xad4e); - data |= BIT(4); - ocp_reg_write(tp, 0xad4e, data); - data = ocp_reg_read(tp, 0xad16); - data &= ~0x3ff; - data |= 0x6; - ocp_reg_write(tp, 0xad16, data); - data = ocp_reg_read(tp, 0xad32); - data &= ~0x3f; - data |= 6; - ocp_reg_write(tp, 0xad32, data); - data = ocp_reg_read(tp, 0xac08); - data &= ~(BIT(12) | BIT(8)); - ocp_reg_write(tp, 0xac08, data); - data = ocp_reg_read(tp, 0xac8a); - data |= BIT(12) | BIT(13) | BIT(14); - data &= ~BIT(15); - ocp_reg_write(tp, 0xac8a, data); - data = ocp_reg_read(tp, 0xad18); - data |= BIT(10); - ocp_reg_write(tp, 0xad18, data); - data = ocp_reg_read(tp, 0xad1a); - data |= 0x3ff; - ocp_reg_write(tp, 0xad1a, data); - data = ocp_reg_read(tp, 0xad1c); - data |= 0x3ff; - ocp_reg_write(tp, 0xad1c, data); - - data = sram_read(tp, 0x80ea); - data &= ~0xff00; - data |= 0xc400; - sram_write(tp, 0x80ea, data); - data = sram_read(tp, 0x80eb); - data &= ~0x0700; - data |= 0x0300; - sram_write(tp, 0x80eb, data); - data = sram_read(tp, 0x80f8); - data &= ~0xff00; - data |= 0x1c00; - sram_write(tp, 0x80f8, data); - data = sram_read(tp, 0x80f1); - data &= ~0xff00; - data |= 0x3000; - sram_write(tp, 0x80f1, data); - - data = sram_read(tp, 0x80fe); - data &= ~0xff00; - data |= 0xa500; - sram_write(tp, 0x80fe, data); - data = sram_read(tp, 0x8102); - data &= ~0xff00; - data |= 0x5000; - sram_write(tp, 0x8102, data); - data = sram_read(tp, 0x8015); - data &= ~0xff00; - data |= 0x3300; - sram_write(tp, 0x8015, data); - data = sram_read(tp, 0x8100); - data &= ~0xff00; - data |= 0x7000; - sram_write(tp, 0x8100, data); - data = sram_read(tp, 0x8014); - data &= ~0xff00; - data |= 0xf000; - sram_write(tp, 0x8014, data); - data = sram_read(tp, 0x8016); - data &= ~0xff00; - data |= 0x6500; - sram_write(tp, 0x8016, data); - data = sram_read(tp, 0x80dc); - data &= ~0xff00; - data |= 0xed00; - sram_write(tp, 0x80dc, data); - data = sram_read(tp, 0x80df); - data |= BIT(8); - sram_write(tp, 0x80df, data); - data = sram_read(tp, 0x80e1); - data &= ~BIT(8); - sram_write(tp, 0x80e1, data); - - data = ocp_reg_read(tp, 0xbf06); - data &= ~0x003f; - data |= 0x0038; - ocp_reg_write(tp, 0xbf06, data); + ocp_reg_w0w1(tp, 0xad40, 0x3ff, BIT(7) | BIT(2)); + + ocp_reg_set_bits(tp, 0xad4e, BIT(4)); + ocp_reg_w0w1(tp, 0xad16, 0x3ff, 0x6); + ocp_reg_w0w1(tp, 0xad32, 0x3f, 6); + ocp_reg_clr_bits(tp, 0xac08, BIT(12) | BIT(8)); + ocp_reg_w0w1(tp, 0xac8a, BIT(15), BIT(12) | BIT(13) | BIT(14)); + ocp_reg_set_bits(tp, 0xad18, BIT(10)); + ocp_reg_set_bits(tp, 0xad1a, 0x3ff); + ocp_reg_set_bits(tp, 0xad1c, 0x3ff); + + sram_write_w0w1(tp, 0x80ea, 0xff00, 0xc400); + sram_write_w0w1(tp, 0x80eb, 0x0700, 0x0300); + sram_write_w0w1(tp, 0x80f8, 0xff00, 0x1c00); + sram_write_w0w1(tp, 0x80f1, 0xff00, 0x3000); + + sram_write_w0w1(tp, 0x80fe, 0xff00, 0xa500); + sram_write_w0w1(tp, 0x8102, 0xff00, 0x5000); + sram_write_w0w1(tp, 0x8015, 0xff00, 0x3300); + sram_write_w0w1(tp, 0x8100, 0xff00, 0x7000); + sram_write_w0w1(tp, 0x8014, 0xff00, 0xf000); + sram_write_w0w1(tp, 0x8016, 0xff00, 0x6500); + sram_write_w0w1(tp, 0x80dc, 0xff00, 0xed00); + sram_set_bits(tp, 0x80df, BIT(8)); + sram_clr_bits(tp, 0x80e1, BIT(8)); + + ocp_reg_w0w1(tp, 0xbf06, 0x003f, 0x0038); sram_write(tp, 0x819f, 0xddb6); ocp_reg_write(tp, 0xbc34, 0x5555); - data = ocp_reg_read(tp, 0xbf0a); - data &= ~0x0e00; - data |= 0x0a00; - ocp_reg_write(tp, 0xbf0a, data); - - data = ocp_reg_read(tp, 0xbd2c); - data &= ~BIT(13); - ocp_reg_write(tp, 0xbd2c, data); + ocp_reg_w0w1(tp, 0xbf0a, 0x0e00, 0x0a00); + + ocp_reg_clr_bits(tp, 0xbd2c, BIT(13)); break; case RTL_VER_11: /* 2.5G INRX */ - data = ocp_reg_read(tp, 0xad16); - data |= 0x3ff; - ocp_reg_write(tp, 0xad16, data); - data = ocp_reg_read(tp, 0xad32); - data &= ~0x3f; - data |= 6; - ocp_reg_write(tp, 0xad32, data); - data = ocp_reg_read(tp, 0xac08); - data &= ~(BIT(12) | BIT(8)); - ocp_reg_write(tp, 0xac08, data); - data = ocp_reg_read(tp, 0xacc0); - data &= ~0x3; - data |= BIT(1); - ocp_reg_write(tp, 0xacc0, data); - data = ocp_reg_read(tp, 0xad40); - data &= ~0xe7; - data |= BIT(6) | BIT(2); - ocp_reg_write(tp, 0xad40, data); - data = ocp_reg_read(tp, 0xac14); - data &= ~BIT(7); - ocp_reg_write(tp, 0xac14, data); - data = ocp_reg_read(tp, 0xac80); - data &= ~(BIT(8) | BIT(9)); - ocp_reg_write(tp, 0xac80, data); - data = ocp_reg_read(tp, 0xac5e); - data &= ~0x7; - data |= BIT(1); - ocp_reg_write(tp, 0xac5e, data); + ocp_reg_set_bits(tp, 0xad16, 0x3ff); + ocp_reg_w0w1(tp, 0xad32, 0x3f, 6); + ocp_reg_clr_bits(tp, 0xac08, BIT(12) | BIT(8)); + ocp_reg_w0w1(tp, 0xacc0, 0x3, BIT(1)); + ocp_reg_w0w1(tp, 0xad40, 0xe7, BIT(6) | BIT(2)); + ocp_reg_clr_bits(tp, 0xac14, BIT(7)); + ocp_reg_clr_bits(tp, 0xac80, BIT(8) | BIT(9)); + ocp_reg_w0w1(tp, 0xac5e, 0x7, BIT(1)); ocp_reg_write(tp, 0xad4c, 0x00a8); ocp_reg_write(tp, 0xac5c, 0x01ff); - data = ocp_reg_read(tp, 0xac8a); - data &= ~0xf0; - data |= BIT(4) | BIT(5); - ocp_reg_write(tp, 0xac8a, data); + ocp_reg_w0w1(tp, 0xac8a, 0xf0, BIT(4) | BIT(5)); ocp_reg_write(tp, 0xb87c, 0x8157); - data = ocp_reg_read(tp, 0xb87e); - data &= ~0xff00; - data |= 0x0500; - ocp_reg_write(tp, 0xb87e, data); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0500); ocp_reg_write(tp, 0xb87c, 0x8159); - data = ocp_reg_read(tp, 0xb87e); - data &= ~0xff00; - data |= 0x0700; - ocp_reg_write(tp, 0xb87e, data); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0700); /* AAGC */ ocp_reg_write(tp, 0xb87c, 0x80a2); @@ -17144,9 +20955,8 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) /* EEE parameter */ ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_TXTWSYS_2P5G, 0x0056); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_USB_CFG); - ocp_data |= EN_XG_LIP | EN_G_LIP; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_USB_CFG, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_USB_CFG, + EN_XG_LIP | EN_G_LIP); sram_write(tp, 0x8257, 0x020f); /* XG PLL */ sram_write(tp, 0x80ea, 0x7843); /* GIGA Master */ @@ -17155,21 +20965,16 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) return; /* Advance EEE */ - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4); - ocp_data |= EEE_SPDWN_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, ocp_data); - - data = ocp_reg_read(tp, OCP_DOWN_SPEED); - data &= ~(EN_EEE_100 | EN_EEE_1000); - data |= EN_10M_CLKDIV; - ocp_reg_write(tp, OCP_DOWN_SPEED, data); + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, + EEE_SPDWN_EN); + + ocp_reg_w0w1(tp, OCP_DOWN_SPEED, EN_EEE_100 | EN_EEE_1000, + EN_10M_CLKDIV); tp->ups_info._10m_ckdiv = true; tp->ups_info.eee_plloff_100 = false; tp->ups_info.eee_plloff_giga = false; - data = ocp_reg_read(tp, OCP_POWER_CFG); - data &= ~EEE_CLKDIV_EN; - ocp_reg_write(tp, OCP_POWER_CFG, data); + ocp_reg_clr_bits(tp, OCP_POWER_CFG, EEE_CLKDIV_EN); tp->ups_info.eee_ckdiv = false; ocp_reg_write(tp, OCP_SYSCLK_CFG, 0); @@ -17179,49 +20984,45 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) rtl_phy_patch_request(tp, false, true); /* enable ADC Ibias Cal */ - data = ocp_reg_read(tp, 0xd068); - data |= BIT(13); - ocp_reg_write(tp, 0xd068, data); + ocp_reg_set_bits(tp, 0xd068, BIT(13)); /* enable Thermal Sensor */ - data = sram_read(tp, 0x81a2); - data &= ~BIT(8); - sram_write(tp, 0x81a2, data); - data = ocp_reg_read(tp, 0xb54c); - data &= ~0xff00; - data |= 0xdb00; - ocp_reg_write(tp, 0xb54c, data); + sram_clr_bits(tp, 0x81a2, BIT(8)); + ocp_reg_w0w1(tp, 0xb54c, 0xff00, 0xdb00); /* Nway 2.5G Lite */ - data = ocp_reg_read(tp, 0xa454); - data &= ~BIT(0); - ocp_reg_write(tp, 0xa454, data); + ocp_reg_clr_bits(tp, 0xa454, BIT(0)); /* CS DSP solution */ - data = ocp_reg_read(tp, OCP_10GBT_CTRL); - data |= RTL_ADV2_5G_F_R; - ocp_reg_write(tp, OCP_10GBT_CTRL, data); - data = ocp_reg_read(tp, 0xad4e); - data &= ~BIT(4); - ocp_reg_write(tp, 0xad4e, data); - data = ocp_reg_read(tp, 0xa86a); - data &= ~BIT(0); - ocp_reg_write(tp, 0xa86a, data); + ocp_reg_set_bits(tp, OCP_10GBT_CTRL, RTL_ADV2_5G_F_R); + ocp_reg_clr_bits(tp, 0xad4e, BIT(4)); + ocp_reg_clr_bits(tp, 0xa86a, BIT(0)); /* MDI SWAP */ - if ((ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CFG) & MID_REVERSE) && - (ocp_reg_read(tp, 0xd068) & BIT(1))) { + ret = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CFG, &ocp_data); + if (ret < 0) + return; + ret = ocp_reg_read(tp, 0xd068, &data); + if (ret < 0) + return; + if ((ocp_data & MID_REVERSE) && (data & BIT(1))) { u16 swap_a, swap_b; - data = ocp_reg_read(tp, 0xd068); + ret = ocp_reg_read(tp, 0xd068, &data); + if (ret < 0) + return; data &= ~0x1f; data |= 0x1; /* p0 */ ocp_reg_write(tp, 0xd068, data); - swap_a = ocp_reg_read(tp, 0xd06a); + ret = ocp_reg_read(tp, 0xd06a, &swap_a); + if (ret < 0) + return; data &= ~0x18; data |= 0x18; /* p3 */ ocp_reg_write(tp, 0xd068, data); - swap_b = ocp_reg_read(tp, 0xd06a); + ret = ocp_reg_read(tp, 0xd06a, &swap_b); + if (ret < 0) + return; data &= ~0x18; /* p0 */ ocp_reg_write(tp, 0xd068, data); ocp_reg_write(tp, 0xd06a, @@ -17233,11 +21034,15 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) data &= ~0x18; data |= 0x08; /* p1 */ ocp_reg_write(tp, 0xd068, data); - swap_a = ocp_reg_read(tp, 0xd06a); + ret = ocp_reg_read(tp, 0xd06a, &swap_a); + if (ret < 0) + return; data &= ~0x18; data |= 0x10; /* p2 */ ocp_reg_write(tp, 0xd068, data); - swap_b = ocp_reg_read(tp, 0xd06a); + ret = ocp_reg_read(tp, 0xd06a, &swap_b); + if (ret < 0) + return; data &= ~0x18; data |= 0x08; /* p1 */ ocp_reg_write(tp, 0xd068, data); @@ -17248,16 +21053,24 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) ocp_reg_write(tp, 0xd068, data); ocp_reg_write(tp, 0xd06a, (swap_b & ~0x7ff) | (swap_a & 0x7ff)); - swap_a = ocp_reg_read(tp, 0xbd5a); - swap_b = ocp_reg_read(tp, 0xbd5c); + ret = ocp_reg_read(tp, 0xbd5a, &swap_a); + if (ret < 0) + return; + ret = ocp_reg_read(tp, 0xbd5c, &swap_b); + if (ret < 0) + return; ocp_reg_write(tp, 0xbd5a, (swap_a & ~0x1f1f) | ((swap_b & 0x1f) << 8) | ((swap_b >> 8) & 0x1f)); ocp_reg_write(tp, 0xbd5c, (swap_b & ~0x1f1f) | ((swap_a & 0x1f) << 8) | ((swap_a >> 8) & 0x1f)); - swap_a = ocp_reg_read(tp, 0xbc18); - swap_b = ocp_reg_read(tp, 0xbc1a); + ret = ocp_reg_read(tp, 0xbc18, &swap_a); + if (ret < 0) + return; + ret = ocp_reg_read(tp, 0xbc1a, &swap_b); + if (ret < 0) + return; ocp_reg_write(tp, 0xbc18, (swap_a & ~0x1f1f) | ((swap_b & 0x1f) << 8) | ((swap_b >> 8) & 0x1f)); @@ -17267,9 +21080,7 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) } /* Notify the MAC when the speed is changed to force mode. */ - data = ocp_reg_read(tp, OCP_INTR_EN); - data |= INTR_SPEED_FORCE; - ocp_reg_write(tp, OCP_INTR_EN, data); + ocp_reg_set_bits(tp, OCP_INTR_EN, INTR_SPEED_FORCE); break; default: break; @@ -17277,12 +21088,8 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) rtl_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); - data = ocp_reg_read(tp, 0xa428); - data &= ~BIT(9); - ocp_reg_write(tp, 0xa428, data); - data = ocp_reg_read(tp, 0xa5ea); - data &= ~BIT(0); - ocp_reg_write(tp, 0xa5ea, data); + ocp_reg_clr_bits(tp, 0xa428, BIT(9)); + ocp_reg_clr_bits(tp, 0xa5ea, BIT(0)); tp->ups_info.lite_mode = 0; if (tp->eee_en) @@ -17297,29 +21104,19 @@ static void r8156_hw_phy_cfg(struct r8152 *tp) static void r8156b_hw_phy_cfg(struct r8152 *tp) { - u32 ocp_data; - u16 data; + int ret; r8156_patch_code(tp); switch (tp->version) { case RTL_VER_12: ocp_reg_write(tp, 0xbf86, 0x9000); - data = ocp_reg_read(tp, 0xc402); - data |= BIT(10); - ocp_reg_write(tp, 0xc402, data); - data &= ~BIT(10); - ocp_reg_write(tp, 0xc402, data); + ocp_reg_set_bits(tp, 0xc402, BIT(10)); + ocp_reg_clr_bits(tp, 0xc402, BIT(10)); ocp_reg_write(tp, 0xbd86, 0x1010); ocp_reg_write(tp, 0xbd88, 0x1010); - data = ocp_reg_read(tp, 0xbd4e); - data &= ~(BIT(10) | BIT(11)); - data |= BIT(11); - ocp_reg_write(tp, 0xbd4e, data); - data = ocp_reg_read(tp, 0xbf46); - data &= ~0xf00; - data |= 0x700; - ocp_reg_write(tp, 0xbf46, data); + ocp_reg_w0w1(tp, 0xbd4e, BIT(10) | BIT(11), BIT(11)); + ocp_reg_w0w1(tp, 0xbf46, 0xf00, 0x700); break; case RTL_VER_13: case RTL_VER_15: @@ -17329,24 +21126,17 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) break; } - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0); - if (ocp_data & PCUT_STATUS) { - ocp_data &= ~PCUT_STATUS; - ocp_write_word(tp, MCU_TYPE_USB, USB_MISC_0, ocp_data); - } + ocp_word_test_and_clr_bits(tp, MCU_TYPE_USB, USB_MISC_0, PCUT_STATUS); + + ret = r8153_phy_status(tp, 0); + if (ret < 0) + return; - data = r8153_phy_status(tp, 0); - switch (data) { + switch (ret) { case PHY_STAT_EXT_INIT: r8156_ram_code(tp, true); - - data = ocp_reg_read(tp, 0xa466); - data &= ~BIT(0); - ocp_reg_write(tp, 0xa466, data); - - data = ocp_reg_read(tp, 0xa468); - data &= ~(BIT(3) | BIT(1)); - ocp_reg_write(tp, 0xa468, data); + ocp_reg_clr_bits(tp, 0xa466, BIT(0)); + ocp_reg_clr_bits(tp, 0xa468, BIT(3) | BIT(1)); break; case PHY_STAT_LAN_ON: case PHY_STAT_PWRDN: @@ -17355,11 +21145,7 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) break; } - data = r8152_mdio_read(tp, MII_BMCR); - if (data & BMCR_PDOWN) { - data &= ~BMCR_PDOWN; - r8152_mdio_write(tp, MII_BMCR, data); - } + r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); /* disable ALDPS before updating the PHY parameters */ r8153_aldps_en(tp, false); @@ -17367,30 +21153,21 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) /* disable EEE before updating the PHY parameters */ rtl_eee_enable(tp, false); - data = r8153_phy_status(tp, PHY_STAT_LAN_ON); - WARN_ON_ONCE(data != PHY_STAT_LAN_ON); + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + return; + WARN_ON_ONCE(ret != PHY_STAT_LAN_ON); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR); - ocp_data |= PFM_PWM_SWITCH; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_PHY_PWR, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_PHY_PWR, PFM_PWM_SWITCH); switch (tp->version) { case RTL_VER_12: - data = ocp_reg_read(tp, 0xbc08); - data |= BIT(3) | BIT(2); - ocp_reg_write(tp, 0xbc08, data); - - data = sram_read(tp, 0x8fff); - data &= ~0xff00; - data |= 0x0400; - sram_write(tp, 0x8fff, data); - - data = ocp_reg_read(tp, 0xacda); - data |= 0xff00; - ocp_reg_write(tp, 0xacda, data); - data = ocp_reg_read(tp, 0xacde); - data |= 0xf000; - ocp_reg_write(tp, 0xacde, data); + ocp_reg_set_bits(tp, 0xbc08, BIT(3) | BIT(2)); + + sram_write_w0w1(tp, 0x8fff, 0xff00, 0x0400); + + ocp_reg_set_bits(tp, 0xacda, 0xff00); + ocp_reg_set_bits(tp, 0xacde, 0xf000); ocp_reg_write(tp, 0xac8c, 0x0ffc); ocp_reg_write(tp, 0xac46, 0xb7b4); ocp_reg_write(tp, 0xac50, 0x0fbc); @@ -17459,30 +21236,23 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) ocp_reg_write(tp, 0xb87c, 0x8fd8); ocp_reg_write(tp, 0xb87e, 0xf600); - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_USB_CFG); - ocp_data |= EN_XG_LIP | EN_G_LIP; - ocp_write_byte(tp, MCU_TYPE_PLA, PLA_USB_CFG, ocp_data); + ocp_byte_set_bits(tp, MCU_TYPE_PLA, PLA_USB_CFG, + EN_XG_LIP | EN_G_LIP); ocp_reg_write(tp, 0xb87c, 0x813d); ocp_reg_write(tp, 0xb87e, 0x390e); ocp_reg_write(tp, 0xb87c, 0x814f); ocp_reg_write(tp, 0xb87e, 0x790e); ocp_reg_write(tp, 0xb87c, 0x80b0); ocp_reg_write(tp, 0xb87e, 0x0f31); - data = ocp_reg_read(tp, 0xbf4c); - data |= BIT(1); - ocp_reg_write(tp, 0xbf4c, data); - data = ocp_reg_read(tp, 0xbcca); - data |= BIT(9) | BIT(8); - ocp_reg_write(tp, 0xbcca, data); + ocp_reg_set_bits(tp, 0xbf4c, BIT(1)); + ocp_reg_set_bits(tp, 0xbcca, BIT(9) | BIT(8)); ocp_reg_write(tp, 0xb87c, 0x8141); ocp_reg_write(tp, 0xb87e, 0x320e); ocp_reg_write(tp, 0xb87c, 0x8153); ocp_reg_write(tp, 0xb87e, 0x720e); ocp_reg_write(tp, 0xb87c, 0x8529); ocp_reg_write(tp, 0xb87e, 0x050e); - data = ocp_reg_read(tp, OCP_EEE_CFG); - data &= ~CTAP_SHORT_EN; - ocp_reg_write(tp, OCP_EEE_CFG, data); + ocp_reg_clr_bits(tp, OCP_EEE_CFG, CTAP_SHORT_EN); sram_write(tp, 0x816c, 0xc4a0); sram_write(tp, 0x8170, 0xc4a0); @@ -17515,64 +21285,33 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) ocp_reg_write(tp, 0xb87c, 0x817b); ocp_reg_write(tp, 0xb87e, 0x1d0a); - data = sram_read(tp, 0x8217); - data &= ~0xff00; - data |= 0x5000; - sram_write(tp, 0x8217, data); - data = sram_read(tp, 0x821a); - data &= ~0xff00; - data |= 0x5000; - sram_write(tp, 0x821a, data); + sram_write_w0w1(tp, 0x8217, 0xff00, 0x5000); + sram_write_w0w1(tp, 0x821a, 0xff00, 0x5000); sram_write(tp, 0x80da, 0x0403); - data = sram_read(tp, 0x80dc); - data &= ~0xff00; - data |= 0x1000; - sram_write(tp, 0x80dc, data); + sram_write_w0w1(tp, 0x80dc, 0xff00, 0x1000); sram_write(tp, 0x80b3, 0x0384); sram_write(tp, 0x80b7, 0x2007); - data = sram_read(tp, 0x80ba); - data &= ~0xff00; - data |= 0x6c00; - sram_write(tp, 0x80ba, data); + sram_write_w0w1(tp, 0x80ba, 0xff00, 0x6c00); sram_write(tp, 0x80b5, 0xf009); - data = sram_read(tp, 0x80bd); - data &= ~0xff00; - data |= 0x9f00; - sram_write(tp, 0x80bd, data); + sram_write_w0w1(tp, 0x80bd, 0xff00, 0x9f00); sram_write(tp, 0x80c7, 0xf083); sram_write(tp, 0x80dd, 0x03f0); - data = sram_read(tp, 0x80df); - data &= ~0xff00; - data |= 0x1000; - sram_write(tp, 0x80df, data); + sram_write_w0w1(tp, 0x80df, 0xff00, 0x1000); sram_write(tp, 0x80cb, 0x2007); - data = sram_read(tp, 0x80ce); - data &= ~0xff00; - data |= 0x6c00; - sram_write(tp, 0x80ce, data); + sram_write_w0w1(tp, 0x80ce, 0xff00, 0x6c00); sram_write(tp, 0x80c9, 0x8009); - data = sram_read(tp, 0x80d1); - data &= ~0xff00; - data |= 0x8000; - sram_write(tp, 0x80d1, data); + sram_write_w0w1(tp, 0x80d1, 0xff00, 0x8000); sram_write(tp, 0x80a3, 0x200a); sram_write(tp, 0x80a5, 0xf0ad); sram_write(tp, 0x809f, 0x6073); sram_write(tp, 0x80a1, 0x000b); - data = sram_read(tp, 0x80a9); - data &= ~0xff00; - data |= 0xc000; - sram_write(tp, 0x80a9, data); + sram_write_w0w1(tp, 0x80a9, 0xff00, 0xc000); if (rtl_phy_patch_request(tp, true, true)) return; - data = ocp_reg_read(tp, 0xb896); - data &= ~BIT(0); - ocp_reg_write(tp, 0xb896, data); - data = ocp_reg_read(tp, 0xb892); - data &= ~0xff00; - ocp_reg_write(tp, 0xb892, data); + ocp_reg_clr_bits(tp, 0xb896, BIT(0)); + ocp_reg_clr_bits(tp, 0xb892, 0xff00); ocp_reg_write(tp, 0xb88e, 0xc23e); ocp_reg_write(tp, 0xb890, 0x0000); ocp_reg_write(tp, 0xb88e, 0xc240); @@ -17587,41 +21326,25 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) ocp_reg_write(tp, 0xb890, 0x1012); ocp_reg_write(tp, 0xb88e, 0xc24a); ocp_reg_write(tp, 0xb890, 0x1416); - data = ocp_reg_read(tp, 0xb896); - data |= BIT(0); - ocp_reg_write(tp, 0xb896, data); + ocp_reg_set_bits(tp, 0xb896, BIT(0)); rtl_phy_patch_request(tp, false, true); - data = ocp_reg_read(tp, 0xa86a); - data |= BIT(0); - ocp_reg_write(tp, 0xa86a, data); - data = ocp_reg_read(tp, 0xa6f0); - data |= BIT(0); - ocp_reg_write(tp, 0xa6f0, data); + ocp_reg_set_bits(tp, 0xa86a, BIT(0)); + ocp_reg_set_bits(tp, 0xa6f0, BIT(0)); ocp_reg_write(tp, 0xbfa0, 0xd70d); ocp_reg_write(tp, 0xbfa2, 0x4100); ocp_reg_write(tp, 0xbfa4, 0xe868); ocp_reg_write(tp, 0xbfa6, 0xdc59); ocp_reg_write(tp, 0xb54c, 0x3c18); - data = ocp_reg_read(tp, 0xbfa4); - data &= ~BIT(5); - ocp_reg_write(tp, 0xbfa4, data); - data = sram_read(tp, 0x817d); - data |= BIT(12); - sram_write(tp, 0x817d, data); + ocp_reg_clr_bits(tp, 0xbfa4, BIT(5)); + sram_set_bits(tp, 0x817d, BIT(12)); break; case RTL_VER_13: /* 2.5G INRX */ - data = ocp_reg_read(tp, 0xac46); - data &= ~0x00f0; - data |= 0x0090; - ocp_reg_write(tp, 0xac46, data); - data = ocp_reg_read(tp, 0xad30); - data &= ~0x0003; - data |= 0x0001; - ocp_reg_write(tp, 0xad30, data); + ocp_reg_w0w1(tp, 0xac46, 0x00f0, 0x0090); + ocp_reg_w0w1(tp, 0xad30, 0x0003, 0x0001); fallthrough; case RTL_VER_15: /* EEE parameter */ @@ -17630,20 +21353,11 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) ocp_reg_write(tp, 0xb87c, 0x8107); ocp_reg_write(tp, 0xb87e, 0x360e); ocp_reg_write(tp, 0xb87c, 0x8551); - data = ocp_reg_read(tp, 0xb87e); - data &= ~0xff00; - data |= 0x0800; - ocp_reg_write(tp, 0xb87e, data); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0800); /* ADC_PGA parameter */ - data = ocp_reg_read(tp, 0xbf00); - data &= ~0xe000; - data |= 0xa000; - ocp_reg_write(tp, 0xbf00, data); - data = ocp_reg_read(tp, 0xbf46); - data &= ~0x0f00; - data |= 0x0300; - ocp_reg_write(tp, 0xbf46, data); + ocp_reg_w0w1(tp, 0xbf00, 0xe000, 0xa000); + ocp_reg_w0w1(tp, 0xbf46, 0x0f00, 0x0300); /* Green Table-PGA, 1G full viterbi */ sram_write(tp, 0x8044, 0x2417); @@ -17657,51 +21371,39 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) sram_write(tp, 0x8074, 0x2417); sram_write(tp, 0x807a, 0x2417); + /* Nway DACONB parameter */ + ocp_reg_w0w1(tp, 0xa4ca, 0x6000, 0x0040); + /* XG PLL */ - data = ocp_reg_read(tp, 0xbf84); - data &= ~0xe000; - data |= 0xa000; - ocp_reg_write(tp, 0xbf84, data); + ocp_reg_w0w1(tp, 0xbf84, 0xe000, 0xa000); break; default: break; } /* Notify the MAC when the speed is changed to force mode. */ - data = ocp_reg_read(tp, OCP_INTR_EN); - data |= INTR_SPEED_FORCE; - ocp_reg_write(tp, OCP_INTR_EN, data); + ocp_reg_set_bits(tp, OCP_INTR_EN, INTR_SPEED_FORCE); if (rtl_phy_patch_request(tp, true, true)) return; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4); - ocp_data |= EEE_SPDWN_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, ocp_data); + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, EEE_SPDWN_EN); - data = ocp_reg_read(tp, OCP_DOWN_SPEED); - data &= ~(EN_EEE_100 | EN_EEE_1000); - data |= EN_10M_CLKDIV; - ocp_reg_write(tp, OCP_DOWN_SPEED, data); + ocp_reg_w0w1(tp, OCP_DOWN_SPEED, EN_EEE_100 | EN_EEE_1000, + EN_10M_CLKDIV); tp->ups_info._10m_ckdiv = true; tp->ups_info.eee_plloff_100 = false; tp->ups_info.eee_plloff_giga = false; - data = ocp_reg_read(tp, OCP_POWER_CFG); - data &= ~EEE_CLKDIV_EN; - ocp_reg_write(tp, OCP_POWER_CFG, data); + ocp_reg_clr_bits(tp, OCP_POWER_CFG, EEE_CLKDIV_EN); tp->ups_info.eee_ckdiv = false; rtl_phy_patch_request(tp, false, true); rtl_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); - data = ocp_reg_read(tp, 0xa428); - data &= ~BIT(9); - ocp_reg_write(tp, 0xa428, data); - data = ocp_reg_read(tp, 0xa5ea); - data &= ~BIT(0); - ocp_reg_write(tp, 0xa5ea, data); + ocp_reg_clr_bits(tp, 0xa428, BIT(9)); + ocp_reg_clr_bits(tp, 0xa5ea, BIT(0)); tp->ups_info.lite_mode = 0; if (tp->eee_en) @@ -17716,8 +21418,8 @@ static void r8156b_hw_phy_cfg(struct r8152 *tp) static void r8156_hw_phy_cfg_test(struct r8152 *tp) { - u32 ocp_data; u16 data; + int ret; data = r8153_phy_status(tp, PHY_STAT_LAN_ON); @@ -17725,219 +21427,421 @@ static void r8156_hw_phy_cfg_test(struct r8152 *tp) r8153_aldps_en(tp, false); /* disable EEE before updating the PHY parameters */ - r8153_eee_en(tp, false); + if (r8153_eee_en(tp, false) < 0) + return; ocp_reg_write(tp, OCP_EEE_ADV, 0); r8156_firmware(tp); - data = ocp_reg_read(tp, 0xa5d4); - data |= BIT(7) | BIT(0); - ocp_reg_write(tp, 0xa5d4, data); - ocp_reg_write(tp, 0xa5e6, 0x6290); + ocp_reg_set_bits(tp, 0xa5d4, BIT(7) | BIT(0)); + ocp_reg_write(tp, 0xa5e6, 0x6290); + + ocp_reg_clr_bits(tp, 0xa5e8, BIT(3)); + ocp_reg_set_bits(tp, 0xa428, BIT(9)); + + ocp_reg_write(tp, 0xb636, 0x2c00); + ocp_reg_clr_bits(tp, 0xb460, BIT(13)); + ocp_reg_write(tp, 0xb83e, 0x00a9); + ocp_reg_write(tp, 0xb840, 0x0035); + ocp_reg_write(tp, 0xb680, 0x0022); + ocp_reg_write(tp, 0xb468, 0x10c0); + ocp_reg_write(tp, 0xb468, 0x90c0); + + ocp_reg_w0w1(tp, 0xb60a, 0xfff, 0xc0); + ocp_reg_w0w1(tp, 0xb628, 0xfff, 0xc0); + ocp_reg_w0w1(tp, 0xb62a, 0xfff, 0xc0); + + ret = ocp_reg_read(tp, 0xbc1e, &data); + data &= 0xf; + data |= (data << 4) | (data << 8) | (data << 12); + ocp_reg_write(tp, 0xbce0, data); + ocp_reg_clr_bits(tp, 0xbd42, BIT(8)); + + ocp_reg_w0w1(tp, 0xbf90, 0xf0, BIT(7)); + ocp_reg_w0w1(tp, 0xbf92, 0x3f, 0x3fc0); + + ocp_reg_set_bits(tp, 0xbf94, 0x3e00); + ocp_reg_w0w1(tp, 0xbf88, 0x3eff, 0x1e01); + + ocp_reg_clr_bits(tp, 0xbc58, BIT(1)); + ocp_reg_clr_bits(tp, 0xbd0c, 0x3f); + ocp_reg_clr_bits(tp, 0xbcc2, BIT(14)); + + ocp_reg_write(tp, 0xd098, 0x0427); + + ocp_reg_clr_bits(tp, 0xa430, BIT(12)); + + ocp_dword_set_bits(tp, MCU_TYPE_PLA, 0xe84c, BIT(6)); + + ocp_reg_clr_bits(tp, 0xbeb4, BIT(1)); + ocp_reg_w0w1(tp, 0xbf0c, BIT(13), BIT(12)); + ocp_reg_clr_bits(tp, 0xbd44, BIT(2)); + + ocp_reg_set_bits(tp, 0xa442, BIT(11)); + ocp_dword_set_bits(tp, MCU_TYPE_PLA, 0xe84c, BIT(7)); + + r8156_lock_main(tp, true); + ocp_reg_clr_bits(tp, 0xcc46, 0x700); + ocp_reg_clr_bits(tp, 0xcc46, 0x70); + ocp_reg_w0w1(tp, 0xcc46, 0x70, BIT(6) | BIT(4)); + r8156_lock_main(tp, false); + + ocp_reg_clr_bits(tp, 0xbd38, BIT(13)); + ocp_reg_set_bits(tp, 0xbd38, BIT(12)); + ocp_reg_write(tp, 0xbd36, 0x0fb4); + ocp_reg_set_bits(tp, 0xbd38, BIT(13)); + +// if (tp->eee_en) { +// r8153_eee_en(tp, true); +// ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv); +// } + + r8153_aldps_en(tp, true); + r8152b_enable_fc(tp); + r8153_u2p3en(tp, true); +} + +static void r8157_hw_phy_cfg(struct r8152 *tp) +{ + int ret; + + r8156b_wait_loading_flash(tp); + + ocp_word_test_and_clr_bits(tp, MCU_TYPE_USB, USB_MISC_0, PCUT_STATUS); + + ret = r8153_phy_status(tp, 0); + if (ret < 0) + return; + + switch (ret) { + case PHY_STAT_EXT_INIT: + r8157_firmware(tp, true); + ocp_reg_clr_bits(tp, 0xa466, BIT(0)); + ocp_reg_clr_bits(tp, 0xa468, BIT(3) | BIT(1)); + break; + case PHY_STAT_LAN_ON: + case PHY_STAT_PWRDN: + default: + r8157_firmware(tp, false); + break; + } + + r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + + /* disable ALDPS before updating the PHY parameters */ + r8153_aldps_en(tp, false); + + /* disable EEE before updating the PHY parameters */ + rtl_eee_enable(tp, false); + + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + return; + WARN_ON_ONCE(ret != PHY_STAT_LAN_ON); + + /* PFM mode */ + ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_PHY_PWR, PFM_PWM_SWITCH); + + /* advanced Power Saving paramater */ + ocp_reg_set_bits(tp, 0xa430, BIT(0) | BIT(1)); + + switch (tp->version) { + case RTL_VER_17: + /* XG_INRX parameter */ + sram_write_w0w1(tp, 0x8183, 0xff00, 0x5900); + + ocp_reg_set_bits(tp, 0xa654, BIT(11)); + ocp_reg_set_bits(tp, 0xb648, BIT(14)); + ocp_reg_clr_bits(tp, 0xad2c, BIT(15)); + ocp_reg_set_bits(tp, 0xad94, BIT(5)); + ocp_reg_set_bits(tp, 0xada0, BIT(1)); + ocp_reg_w0w1(tp, 0xae06, 0xfc00, 0x7c00); + + ocp_reg_write(tp, 0xb87c, 0x8647); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0xe600); + ocp_reg_write(tp, 0xb87c, 0x8036); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x3000); + ocp_reg_write(tp, 0xb87c, 0x8078); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x3000); + + /* green mode */ + ocp_reg_write(tp, 0xb87c, 0x89e9); + ocp_reg_clr_bits(tp, 0xb87e, 0xff00); + ocp_reg_write(tp, 0xb87c, 0x8ffd); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0100); + ocp_reg_write(tp, 0xb87c, 0x8ffe); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0200); + ocp_reg_write(tp, 0xb87c, 0x8fff); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0400); + + /* recognize AQC/Bcom function */ + sram_write_w0w1(tp, 0x8018, 0xff00, 0x7700); + ocp_reg_write(tp, OCP_SRAM_ADDR, 0x8f9c); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0005); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00ed); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0502); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0b00); + ocp_reg_write(tp, OCP_SRAM_DATA, 0xd401); + sram_write_w0w1(tp, 0x8fa8, 0xff00, 0x2900); + + /* RFI_corr_thd 5g */ + ocp_reg_write(tp, 0xb87c, 0x814b); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x1100); + ocp_reg_write(tp, 0xb87c, 0x814d); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x1100); + ocp_reg_write(tp, 0xb87c, 0x814f); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0b00); + ocp_reg_write(tp, 0xb87c, 0x8142); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0100); + ocp_reg_write(tp, 0xb87c, 0x8144); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0100); + ocp_reg_write(tp, 0xb87c, 0x8150); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0100); + /* RFI_corr_thd 2p5g */ + ocp_reg_write(tp, 0xb87c, 0x8118); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0700); + ocp_reg_write(tp, 0xb87c, 0x811a); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0700); + ocp_reg_write(tp, 0xb87c, 0x811c); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0500); + ocp_reg_write(tp, 0xb87c, 0x810f); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0100); + ocp_reg_write(tp, 0xb87c, 0x8111); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0100); + ocp_reg_write(tp, 0xb87c, 0x811d); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0100); + + /* RFI parameter */ + ocp_reg_clr_bits(tp, 0xad1c, BIT(8)); + ocp_reg_w0w1(tp, 0xade8, 0xffc0, 0x1400); + + ocp_reg_write(tp, 0xb87c, 0x864b); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x9d00); + ocp_reg_write(tp, 0xb87c, 0x862c); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x1200); + + ocp_reg_write(tp, OCP_SRAM_ADDR, 0x8566); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x003f); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x3f02); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x023c); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x3b0a); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x1c00); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + + /* RFI-color noise gen parameter 5g */ + ocp_reg_write(tp, 0xb87c, 0x8122); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0c00); + ocp_reg_write(tp, 0xb87c, 0x82c8); + ocp_reg_write(tp, 0xb87e, 0x03ed); + ocp_reg_write(tp, 0xb87e, 0x03ff); + ocp_reg_write(tp, 0xb87e, 0x0009); + ocp_reg_write(tp, 0xb87e, 0x03fe); + ocp_reg_write(tp, 0xb87e, 0x000b); + ocp_reg_write(tp, 0xb87e, 0x0021); + ocp_reg_write(tp, 0xb87e, 0x03f7); + ocp_reg_write(tp, 0xb87e, 0x03b8); + ocp_reg_write(tp, 0xb87e, 0x03e0); + ocp_reg_write(tp, 0xb87e, 0x0049); + ocp_reg_write(tp, 0xb87e, 0x0049); + ocp_reg_write(tp, 0xb87e, 0x03e0); + ocp_reg_write(tp, 0xb87e, 0x03b8); + ocp_reg_write(tp, 0xb87e, 0x03f7); + ocp_reg_write(tp, 0xb87e, 0x0021); + ocp_reg_write(tp, 0xb87e, 0x000b); + ocp_reg_write(tp, 0xb87e, 0x03fe); + ocp_reg_write(tp, 0xb87e, 0x0009); + ocp_reg_write(tp, 0xb87e, 0x03ff); + ocp_reg_write(tp, 0xb87e, 0x03ed); + /* RFI-color noise gen parameter 2p5g */ + ocp_reg_write(tp, 0xb87c, 0x80ef); + ocp_reg_w0w1(tp, 0xb87e, 0xff00, 0x0c00); + ocp_reg_write(tp, 0xb87c, 0x82a0); + ocp_reg_write(tp, 0xb87e, 0x000e); + ocp_reg_write(tp, 0xb87e, 0x03fe); + ocp_reg_write(tp, 0xb87e, 0x03ed); + ocp_reg_write(tp, 0xb87e, 0x0006); + ocp_reg_write(tp, 0xb87e, 0x001a); + ocp_reg_write(tp, 0xb87e, 0x03f1); + ocp_reg_write(tp, 0xb87e, 0x03d8); + ocp_reg_write(tp, 0xb87e, 0x0023); + ocp_reg_write(tp, 0xb87e, 0x0054); + ocp_reg_write(tp, 0xb87e, 0x0322); + ocp_reg_write(tp, 0xb87e, 0x00dd); + ocp_reg_write(tp, 0xb87e, 0x03ab); + ocp_reg_write(tp, 0xb87e, 0x03dc); + ocp_reg_write(tp, 0xb87e, 0x0027); + ocp_reg_write(tp, 0xb87e, 0x000e); + ocp_reg_write(tp, 0xb87e, 0x03e5); + ocp_reg_write(tp, 0xb87e, 0x03f9); + ocp_reg_write(tp, 0xb87e, 0x0012); + ocp_reg_write(tp, 0xb87e, 0x0001); + ocp_reg_write(tp, 0xb87e, 0x03f1); + + /* spdchg_gtx_shape_100M */ + ocp_reg_write(tp, OCP_SRAM_ADDR, 0x8188); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0032); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0064); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0098); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00ca); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00fe); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00fe); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00fe); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00fe); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x00cc); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x009a); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0066); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0034); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + ocp_reg_write(tp, OCP_SRAM_DATA, 0x0000); + break; + default: + break; + } - data = ocp_reg_read(tp, 0xa5e8); - data &= ~BIT(3); - ocp_reg_write(tp, 0xa5e8, data); - data = ocp_reg_read(tp, 0xa428); - data |= BIT(9); - ocp_reg_write(tp, 0xa428, data); + if (rtl_phy_patch_request(tp, true, true)) + return; - ocp_reg_write(tp, 0xb636, 0x2c00); - data = ocp_reg_read(tp, 0xb460); - data &= ~BIT(13); - ocp_reg_write(tp, 0xb460, data); - ocp_reg_write(tp, 0xb83e, 0x00a9); - ocp_reg_write(tp, 0xb840, 0x0035); - ocp_reg_write(tp, 0xb680, 0x0022); - ocp_reg_write(tp, 0xb468, 0x10c0); - ocp_reg_write(tp, 0xb468, 0x90c0); + ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, EEE_SPDWN_EN); - data = ocp_reg_read(tp, 0xb60a); - data &= ~0xfff; - data |= 0xc0; - ocp_reg_write(tp, 0xb60a, data); - data = ocp_reg_read(tp, 0xb628); - data &= ~0xfff; - data |= 0xc0; - ocp_reg_write(tp, 0xb628, data); - data = ocp_reg_read(tp, 0xb62a); - data &= ~0xfff; - data |= 0xc0; - ocp_reg_write(tp, 0xb62a, data); - - data = ocp_reg_read(tp, 0xbc1e); - data &= 0xf; - data |= (data << 4) | (data << 8) | (data << 12); - ocp_reg_write(tp, 0xbce0, data); - data = ocp_reg_read(tp, 0xbd42); - data &= ~BIT(8); - ocp_reg_write(tp, 0xbd42, data); - - data = ocp_reg_read(tp, 0xbf90); - data &= ~0xf0; - data |= BIT(7); - ocp_reg_write(tp, 0xbf90, data); - data = ocp_reg_read(tp, 0xbf92); - data &= ~0x3f; - data |= 0x3fc0; - ocp_reg_write(tp, 0xbf92, data); - - data = ocp_reg_read(tp, 0xbf94); - data |= 0x3e00; - ocp_reg_write(tp, 0xbf94, data); - data = ocp_reg_read(tp, 0xbf88); - data &= ~0x3eff; - data |= 0x1e01; - ocp_reg_write(tp, 0xbf88, data); - - data = ocp_reg_read(tp, 0xbc58); - data &= ~BIT(1); - ocp_reg_write(tp, 0xbc58, data); - - data = ocp_reg_read(tp, 0xbd0c); - data &= ~0x3f; - ocp_reg_write(tp, 0xbd0c, data); - - data = ocp_reg_read(tp, 0xbcc2); - data &= ~BIT(14); - ocp_reg_write(tp, 0xbcc2, data); + ocp_reg_w0w1(tp, OCP_DOWN_SPEED, EN_EEE_100 | EN_EEE_1000, + EN_10M_CLKDIV); + tp->ups_info._10m_ckdiv = true; + tp->ups_info.eee_plloff_100 = false; + tp->ups_info.eee_plloff_giga = false; - ocp_reg_write(tp, 0xd098, 0x0427); + ocp_reg_clr_bits(tp, OCP_POWER_CFG, EEE_CLKDIV_EN); + tp->ups_info.eee_ckdiv = false; - data = ocp_reg_read(tp, 0xa430); - data &= ~BIT(12); - ocp_reg_write(tp, 0xa430, data); - - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, 0xe84c); - ocp_data |= BIT(6); - ocp_write_dword(tp, MCU_TYPE_PLA, 0xe84c, ocp_data); - - data = ocp_reg_read(tp, 0xbeb4); - data &= ~BIT(1); - ocp_reg_write(tp, 0xbeb4, data); - data = ocp_reg_read(tp, 0xbf0c); - data &= ~BIT(13); - data |= BIT(12); - ocp_reg_write(tp, 0xbf0c, data); - data = ocp_reg_read(tp, 0xbd44); - data &= ~BIT(2); - ocp_reg_write(tp, 0xbd44, data); - - data = ocp_reg_read(tp, 0xa442); - data |= BIT(11); - ocp_reg_write(tp, 0xa442, data); - ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, 0xe84c); - ocp_data |= BIT(7); - ocp_write_dword(tp, MCU_TYPE_PLA, 0xe84c, ocp_data); + rtl_phy_patch_request(tp, false, true); - r8156_lock_main(tp, true); - data = ocp_reg_read(tp, 0xcc46); - data &= ~0x700; - ocp_reg_write(tp, 0xcc46, data); - data = ocp_reg_read(tp, 0xcc46); - data &= ~0x70; - ocp_reg_write(tp, 0xcc46, data); - data = ocp_reg_read(tp, 0xcc46); - data &= ~0x70; - data |= BIT(6) | BIT(4); - ocp_reg_write(tp, 0xcc46, data); - r8156_lock_main(tp, false); + rtl_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); - data = ocp_reg_read(tp, 0xbd38); - data &= ~BIT(13); - ocp_reg_write(tp, 0xbd38, data); - data = ocp_reg_read(tp, 0xbd38); - data |= BIT(12); - ocp_reg_write(tp, 0xbd38, data); - ocp_reg_write(tp, 0xbd36, 0x0fb4); - data = ocp_reg_read(tp, 0xbd38); - data |= BIT(13); - ocp_reg_write(tp, 0xbd38, data); + ocp_reg_clr_bits(tp, 0xa428, BIT(9)); + ocp_reg_clr_bits(tp, 0xa5ea, BIT(0) | BIT(1)); + tp->ups_info.lite_mode = 0; -// if (tp->eee_en) { -// r8153_eee_en(tp, true); -// ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv); -// } + if (tp->eee_en) + rtl_eee_enable(tp, true); r8153_aldps_en(tp, true); r8152b_enable_fc(tp); - r8153_u2p3en(tp, true); + + set_bit(PHY_RESET, &tp->flags); } -static void r8156_init(struct r8152 *tp) +static int r8156_init(struct r8152 *tp) { u32 ocp_data; - u16 data; - int i; + int i, ret; if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + return -ENODEV; - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_ECM_OP); - ocp_data &= ~EN_ALL_SPEED; - ocp_write_byte(tp, MCU_TYPE_USB, USB_ECM_OP, ocp_data); + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_ECM_OP, EN_ALL_SPEED); + if (ret < 0) + goto out; - ocp_write_word(tp, MCU_TYPE_USB, USB_SPEED_OPTION, 0); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_SPEED_OPTION, 0); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_ECM_OPTION); - ocp_data |= BYPASS_MAC_RESET; - ocp_write_word(tp, MCU_TYPE_USB, USB_ECM_OPTION, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_ECM_OPTION, + BYPASS_MAC_RESET); + if (ret < 0) + goto out; - r8153b_u1u2en(tp, false); + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; for (i = 0; i < 500; i++) { - if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & - AUTOLOAD_DONE) + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL, &ocp_data); + if (ret < 0) + goto out; + if (ocp_data & AUTOLOAD_DONE) break; msleep(20); - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; } - data = r8153_phy_status(tp, 0); - if (data == PHY_STAT_EXT_INIT) { - data = ocp_reg_read(tp, 0xa468); - data &= ~(BIT(3) | BIT(1)); - ocp_reg_write(tp, 0xa468, data); - } + ret = r8153_phy_status(tp, 0); + if (ret < 0) + goto out; - data = r8152_mdio_read(tp, MII_BMCR); - if (data & BMCR_PDOWN) { - data &= ~BMCR_PDOWN; - r8152_mdio_write(tp, MII_BMCR, data); + if (ret == PHY_STAT_EXT_INIT) { + ret = ocp_reg_clr_bits(tp, 0xa468, BIT(3) | BIT(1)); + if (ret < 0) + goto out; } - data = r8153_phy_status(tp, PHY_STAT_LAN_ON); - WARN_ON_ONCE(data != PHY_STAT_LAN_ON); + ret = r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + if (ret < 0) + goto out; + + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + goto out; + WARN_ON_ONCE(ret != PHY_STAT_LAN_ON); - r8153_u2p3en(tp, false); + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; /* MSC timer = 0xfff * 8ms = 32760 ms */ - ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + if (ret < 0) + goto out; /* U1/U2/L1 idle timer. 500 us */ - ocp_write_word(tp, MCU_TYPE_USB, USB_U1U2_TIMER, 500); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_U1U2_TIMER, 500); + if (ret < 0) + goto out; - r8153b_power_cut_en(tp, false); - r8156_ups_en(tp, false); - r8153_queue_wake(tp, false); - rtl_runtime_suspend_enable(tp, false); + ret = r8153b_power_cut_en(tp, false); + if (ret < 0) + goto out; - if (tp->udev->speed >= USB_SPEED_SUPER) - r8153b_u1u2en(tp, true); + ret = r8156_ups_en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + + if (tp->udev->speed >= USB_SPEED_SUPER) { + ret = r8153b_u1u2en(tp, true); + if (ret < 0) + goto out; + } usb_enable_lpm(tp->udev); -// ocp_data = ocp_read_word(tp, MCU_TYPE_USB, 0xd850) & 0xc000; +// ret = ocp_read_word(tp, MCU_TYPE_USB, 0xd850, &ocp_data); +// if (ret < 0) +// goto out; +// ocp_data &= 0xc000; // switch (ocp_data) { // case 0x4000: // tp->dash_mode = 1; -// r8156_mac_clk_spd(tp, false); +// ret = r8156_mac_clk_spd(tp, false); +// if (ret < 0) +// goto out; // break; // case 0x8000: // tp->dash_mode = 0; - r8156_mac_clk_spd(tp, false); + ret = r8156_mac_clk_spd(tp, false); + if (ret < 0) + goto out; // break; // default: // netif_warn(tp, drv, tp->netdev, "Invalid type %x\n", ocp_data); @@ -17945,186 +21849,425 @@ static void r8156_init(struct r8152 *tp) // } - r8153b_mcu_spdown_en(tp, false); + ret = r8153b_mcu_spdown_en(tp, false); + if (ret < 0) + goto out; /* enable fc timer and set timer to 1s. */ - ocp_write_word(tp, MCU_TYPE_USB, USB_FC_TIMER, - CTRL_TIMER_EN | (1000 / 8)); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_FC_TIMER, + CTRL_TIMER_EN | (1000 / 8)); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK); - ocp_data |= FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_CTRL); - ocp_data |= FLOW_CTRL_PATCH_OPT; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_CTRL, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_CTRL, + FLOW_CTRL_PATCH_OPT); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); if (rtl8152_get_speed(tp) & LINK_STATUS) - ocp_data |= CUR_LINK_OK; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK | POLL_LINK_CHG); else - ocp_data &= ~CUR_LINK_OK; - /* r8153_queue_wake() has cleared this bit */ - /* ocp_data &= ~BIT(8); */ - ocp_data |= POLL_LINK_CHG; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, ocp_data); + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK, POLL_LINK_CHG); + if (ret < 0) + goto out; set_bit(GREEN_ETHERNET, &tp->flags); /* rx aggregation */ - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); - ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + RX_AGG_DISABLE | RX_ZERO_EN); + if (ret < 0) + goto out; /* Set Rx aggregation parameters to default value - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, 0xd4c9); - ocp_data |= BIT(2); - ocp_write_byte(tp, MCU_TYPE_USB, 0xd4c9, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, 0xd4c9, BIT(2)); */ - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_BMU_CONFIG); - ocp_data |= ACT_ODMA; - ocp_write_byte(tp, MCU_TYPE_USB, USB_BMU_CONFIG, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, USB_BMU_CONFIG, ACT_ODMA); + if (ret < 0) + goto out; + + ret = r8156_mdio_force_mode(tp); + if (ret < 0) + goto out; - r8156_mdio_force_mode(tp); - rtl_tally_reset(tp); + ret = rtl_tally_reset(tp); + if (ret < 0) + goto out; tp->coalesce = 15000; /* 15 us */ + +out: + return (ret < 0) ? ret : 0; } -static void r8156b_init(struct r8152 *tp) +static int r8156b_init(struct r8152 *tp) { u32 ocp_data; - u16 data; - int i; + int i, ret; if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; + return -ENODEV; - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_ECM_OP); - ocp_data &= ~EN_ALL_SPEED; - ocp_write_byte(tp, MCU_TYPE_USB, USB_ECM_OP, ocp_data); + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_ECM_OP, EN_ALL_SPEED); + if (ret < 0) + goto out; - ocp_write_word(tp, MCU_TYPE_USB, USB_SPEED_OPTION, 0); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_SPEED_OPTION, 0); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_ECM_OPTION); - ocp_data |= BYPASS_MAC_RESET; - ocp_write_word(tp, MCU_TYPE_USB, USB_ECM_OPTION, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_ECM_OPTION, + BYPASS_MAC_RESET); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL); - ocp_data |= RX_DETECT8; - ocp_write_word(tp, MCU_TYPE_USB, USB_U2P3_CTRL, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_U2P3_CTRL, RX_DETECT8); + if (ret < 0) + goto out; - r8153b_u1u2en(tp, false); + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; switch (tp->version) { case RTL_VER_13: case RTL_VER_15: - r8156b_wait_loading_flash(tp); + ret = r8156b_wait_loading_flash(tp); + if (ret < 0) + goto out; break; default: break; } for (i = 0; i < 500; i++) { - if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) & - AUTOLOAD_DONE) + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL, &ocp_data); + if (ret < 0) + goto out; + if (ocp_data & AUTOLOAD_DONE) + break; + + msleep(20); + } + + ret = r8153_phy_status(tp, 0); + if (ret < 0) + goto out; + if (ret == PHY_STAT_EXT_INIT) { + ret = ocp_reg_clr_bits(tp, 0xa468, BIT(3) | BIT(1)); + if (ret < 0) + goto out; + + ret = ocp_reg_clr_bits(tp, 0xa466, BIT(0)); + if (ret < 0) + goto out; + } + + ret = r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + if (ret < 0) + goto out; + + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + goto out; + + ret = r8153_u2p3en(tp, false); + if (ret < 0) + goto out; + + /* MSC timer = 0xfff * 8ms = 32760 ms */ + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + if (ret < 0) + goto out; + + /* U1/U2/L1 idle timer. 500 us */ + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_U1U2_TIMER, 500); + if (ret < 0) + goto out; + + ret = r8153b_power_cut_en(tp, false); + if (ret < 0) + goto out; + + ret = r8156_ups_en(tp, false); + if (ret < 0) + goto out; + + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + + if (tp->udev->speed >= USB_SPEED_SUPER) { + ret = r8153b_u1u2en(tp, true); + if (ret < 0) + goto out; + } + + usb_enable_lpm(tp->udev); + + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR, SLOT_EN); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_CPCR, FLOW_CTRL_EN); + if (ret < 0) + goto out; + + /* enable fc timer and set timer to 600 ms. */ + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_FC_TIMER, + CTRL_TIMER_EN | (600 / 8)); + if (ret < 0) + goto out; + + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL, &ocp_data); + if (ret < 0) + goto out; + + if (!(ocp_data & DACK_DET_EN)) + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_FW_CTRL, AUTO_SPEEDUP, + FLOW_CTRL_PATCH_2); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_FW_CTRL, + AUTO_SPEEDUP); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); + if (ret < 0) + goto out; + + ret = r8156_mac_clk_spd(tp, false); + if (ret < 0) + goto out; + + ret = r8153b_mcu_spdown_en(tp, false); + if (ret < 0) + goto out; + + if (rtl8152_get_speed(tp) & LINK_STATUS) + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK | POLL_LINK_CHG); + else + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK, POLL_LINK_CHG); + if (ret < 0) + goto out; + + set_bit(GREEN_ETHERNET, &tp->flags); + + /* rx aggregation */ + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + RX_AGG_DISABLE | RX_ZERO_EN); + if (ret < 0) + goto out; + + /* Set Rx aggregation parameters to default value + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, 0xd4c9, BIT(2)); + if (ret < 0) + goto out; + */ + + ret = r8156_mdio_force_mode(tp); + if (ret < 0) + goto out; + + ret = rtl_tally_reset(tp); + if (ret < 0) + goto out; + + tp->coalesce = 15000; /* 15 us */ + +out: + return (ret < 0) ? ret : 0; +} + +static int r8157_init(struct r8152 *tp) +{ + u32 ocp_data; + int i, ret; + + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return -ENODEV; + + ret = ocp_byte_clr_bits(tp, MCU_TYPE_USB, USB_ECM_OP, EN_ALL_SPEED); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_ECM_OPTION, + BYPASS_MAC_RESET); + if (ret < 0) + goto out; + + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_U2P3_CTRL, RX_DETECT8); + if (ret < 0) + goto out; + + ret = r8153b_u1u2en(tp, false); + if (ret < 0) + goto out; + + for (i = 0; i < 500; i++) { + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL, &ocp_data); + if (ret < 0) + goto out; + else if (ocp_data & AUTOLOAD_DONE) break; msleep(20); - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - return; } - data = r8153_phy_status(tp, 0); - if (data == PHY_STAT_EXT_INIT) { - data = ocp_reg_read(tp, 0xa468); - data &= ~(BIT(3) | BIT(1)); - ocp_reg_write(tp, 0xa468, data); + ret = r8156b_wait_loading_flash(tp); + if (ret < 0) + goto out; - data = ocp_reg_read(tp, 0xa466); - data &= ~BIT(0); - ocp_reg_write(tp, 0xa466, data); - } + ret = r8153_phy_status(tp, 0); + if (ret < 0) + goto out; + if (ret == PHY_STAT_EXT_INIT) { + ret = ocp_reg_clr_bits(tp, 0xa468, BIT(3) | BIT(1)); + if (ret < 0) + goto out; - data = r8152_mdio_read(tp, MII_BMCR); - if (data & BMCR_PDOWN) { - data &= ~BMCR_PDOWN; - r8152_mdio_write(tp, MII_BMCR, data); + ret = ocp_reg_clr_bits(tp, 0xa466, BIT(0)); + if (ret < 0) + goto out; } - data = r8153_phy_status(tp, PHY_STAT_LAN_ON); + ret = r8152_mdio_test_and_clr_bit(tp, MII_BMCR, BMCR_PDOWN); + if (ret < 0) + goto out; + + ret = r8153_phy_status(tp, PHY_STAT_LAN_ON); + if (ret < 0) + goto out; - r8153_u2p3en(tp, false); + ret = r8157_u2p3en(tp, false); + if (ret < 0) + goto out; /* MSC timer = 0xfff * 8ms = 32760 ms */ - ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_MSC_TIMER, 0x0fff); + if (ret < 0) + goto out; /* U1/U2/L1 idle timer. 500 us */ - ocp_write_word(tp, MCU_TYPE_USB, USB_U1U2_TIMER, 500); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_U1U2_TIMER, 500); + if (ret < 0) + goto out; - r8153b_power_cut_en(tp, false); - r8156_ups_en(tp, false); - r8153_queue_wake(tp, false); - rtl_runtime_suspend_enable(tp, false); + ret = r8157_power_cut_en(tp, false); + if (ret < 0) + goto out; - if (tp->udev->speed >= USB_SPEED_SUPER) - r8153b_u1u2en(tp, true); +// ret = r8156_ups_en(tp, false); +// if (ret < 0) +// goto out; - usb_enable_lpm(tp->udev); + ret = r8153_queue_wake(tp, false); + if (ret < 0) + goto out; + + ret = rtl_runtime_suspend_enable(tp, false); + if (ret < 0) + goto out; + +// if (tp->udev->speed >= USB_SPEED_SUPER) { +// ret = r8153b_u1u2en(tp, true); +// if (ret < 0) +// goto out; +// } + + usb_disable_lpm(tp->udev); + usb_disable_ltm(tp->udev); - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_RCR); - ocp_data &= ~SLOT_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_PLA, PLA_RCR, SLOT_EN); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR); - ocp_data |= FLOW_CTRL_EN; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_CPCR, FLOW_CTRL_EN); + if (ret < 0) + goto out; /* enable fc timer and set timer to 600 ms. */ - ocp_write_word(tp, MCU_TYPE_USB, USB_FC_TIMER, - CTRL_TIMER_EN | (600 / 8)); + ret = ocp_write_word(tp, MCU_TYPE_USB, USB_FC_TIMER, + CTRL_TIMER_EN | (600 / 8)); + if (ret < 0) + goto out; + + ret = ocp_read_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL, &ocp_data); + if (ret < 0) + goto out; + + if (!(ocp_data & DACK_DET_EN)) + ret = ocp_word_w0w1(tp, MCU_TYPE_USB, USB_FW_CTRL, AUTO_SPEEDUP, + FLOW_CTRL_PATCH_2); + else + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_FW_CTRL, + AUTO_SPEEDUP); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_CTRL); - if (!(ocp_read_word(tp, MCU_TYPE_PLA, PLA_POL_GPIO_CTRL) & DACK_DET_EN)) - ocp_data |= FLOW_CTRL_PATCH_2; - ocp_data &= ~AUTO_SPEEDUP; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_CTRL, ocp_data); + ret = ocp_word_set_bits(tp, MCU_TYPE_USB, USB_FW_TASK, FC_PATCH_TASK); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK); - ocp_data |= FC_PATCH_TASK; - ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data); + ret = r8156_mac_clk_spd(tp, false); + if (ret < 0) + goto out; - r8156_mac_clk_spd(tp, false); - r8153b_mcu_spdown_en(tp, false); + ret = r8153b_mcu_spdown_en(tp, false); + if (ret < 0) + goto out; - ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS); if (rtl8152_get_speed(tp) & LINK_STATUS) - ocp_data |= CUR_LINK_OK; + ret = ocp_word_set_bits(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK | POLL_LINK_CHG); else - ocp_data &= ~CUR_LINK_OK; - /* r8153_queue_wake() has cleared this bit */ - /* ocp_data &= ~BIT(8); */ - ocp_data |= POLL_LINK_CHG; - ocp_write_word(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, ocp_data); + ret = ocp_word_w0w1(tp, MCU_TYPE_PLA, PLA_EXTRA_STATUS, + CUR_LINK_OK, POLL_LINK_CHG); + if (ret < 0) + goto out; set_bit(GREEN_ETHERNET, &tp->flags); /* rx aggregation */ - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); - ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); - ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); + ret = ocp_word_clr_bits(tp, MCU_TYPE_USB, USB_USB_CTRL, + RX_AGG_DISABLE | RX_ZERO_EN); + if (ret < 0) + goto out; /* Set Rx aggregation parameters to default value - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, 0xd4c9); - ocp_data |= BIT(2); - ocp_write_byte(tp, MCU_TYPE_USB, 0xd4c9, ocp_data); + ret = ocp_byte_set_bits(tp, MCU_TYPE_USB, 0xd4c9, BIT(2)); + if (ret < 0) + goto out; */ - r8156_mdio_force_mode(tp); - rtl_tally_reset(tp); + ret = r8156_mdio_force_mode(tp); + if (ret < 0) + goto out; + + ret = rtl_tally_reset(tp); + if (ret < 0) + goto out; tp->coalesce = 15000; /* 15 us */ + +out: + if (ret < 0) + return ret; + else + return 0; } static bool rtl_check_vendor_ok(struct usb_interface *intf) @@ -18441,18 +22584,28 @@ static int rtl8152_runtime_suspend(struct r8152 *tp) if (netif_carrier_ok(netdev)) { u32 ocp_data; - rcr = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); + ret = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR, &rcr); + if (ret < 0) + goto out2; ocp_data = rcr & ~RCR_ACPT_ALL; - ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); - rxdy_gated_en(tp, true); - ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, - PLA_OOB_CTRL); - if (!(ocp_data & RXFIFO_EMPTY)) { + ret = ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, + ocp_data); + if (ret < 0) + goto out3; + ret = rxdy_gated_en(tp, true); + if (ret < 0) + goto out3; + ret = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, + &ocp_data); + if (ret < 0 || !(ocp_data & RXFIFO_EMPTY)) { rxdy_gated_en(tp, false); +out3: ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, rcr); +out2: clear_bit(SELECTIVE_SUSPEND, &tp->flags); smp_mb__after_atomic(); - ret = -EBUSY; + if (ret >= 0) + ret = -EBUSY; goto out1; } } @@ -18481,7 +22634,7 @@ static int rtl8152_runtime_suspend(struct r8152 *tp) } out1: - return ret; + return (ret < 0) ? ret : 0; } static int rtl8152_system_suspend(struct r8152 *tp) @@ -18664,10 +22817,19 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) mutex_lock(&tp->control); - bmcr = r8152_mdio_read(tp, MII_BMCR); - bmsr = r8152_mdio_read(tp, MII_BMSR); + ret = r8152_mdio_read(tp, MII_BMCR); + if (ret < 0) + goto out1; + bmcr = ret; + ret = r8152_mdio_read(tp, MII_BMSR); + if (ret < 0) + goto out1; + bmsr = ret; - advert = r8152_mdio_read(tp, MII_ADVERTISE); + ret = r8152_mdio_read(tp, MII_ADVERTISE); + if (ret < 0) + goto out1; + advert = ret; if (advert & ADVERTISE_10HALF) cmd->advertising |= ADVERTISED_10baseT_Half; if (advert & ADVERTISE_10FULL) @@ -18681,18 +22843,30 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) if (advert & ADVERTISE_PAUSE_ASYM) cmd->advertising |= ADVERTISED_Asym_Pause; if (tp->mii.supports_gmii) { - u16 ctrl1000 = r8152_mdio_read(tp, MII_CTRL1000); + u16 ctrl1000; + + ret = r8152_mdio_read(tp, MII_CTRL1000); + if (ret < 0) + goto out1; + + ctrl1000 = ret; cmd->supported |= SUPPORTED_1000baseT_Full; if (tp->support_2500full) { - u16 data = ocp_reg_read(tp, 0xa5d4); + u16 data; + + ret = ocp_reg_read(tp, OCP_10GBT_CTRL, &data); + if (ret < 0) + goto out1; cmd->supported |= SUPPORTED_2500baseX_Full; - if (data & BIT(7)) + if (data & MDIO_AN_10GBT_CTRL_ADV2_5G) cmd->advertising |= ADVERTISED_2500baseX_Full; } + /* The legacy API couldn't support 5G speed */ + if (ctrl1000 & ADVERTISE_1000HALF) cmd->advertising |= ADVERTISED_1000baseT_Half; if (ctrl1000 & ADVERTISE_1000FULL) @@ -18701,7 +22875,10 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) if (bmsr & BMSR_ANEGCOMPLETE) { - advert = r8152_mdio_read(tp, MII_LPA); + ret = r8152_mdio_read(tp, MII_LPA); + if (ret < 0) + goto out1; + advert = ret; if (advert & LPA_LPACK) cmd->lp_advertising |= ADVERTISED_Autoneg; if (advert & ADVERTISE_10HALF) @@ -18718,8 +22895,13 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) ADVERTISED_100baseT_Full; if (tp->mii.supports_gmii) { - u16 stat1000 = r8152_mdio_read(tp, MII_STAT1000); + u16 stat1000; + + ret = r8152_mdio_read(tp, MII_STAT1000); + if (ret < 0) + goto out1; + stat1000 = ret; if (stat1000 & LPA_1000HALF) cmd->lp_advertising |= ADVERTISED_1000baseT_Half; @@ -18752,18 +22934,21 @@ int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) else if (tp->support_2500full && (speed & _2500bps)) cmd->speed = SPEED_2500; + /* The legacy API couldn't support 5G speed */ + cmd->duplex = (speed & FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF; } else { cmd->speed = SPEED_UNKNOWN; cmd->duplex = DUPLEX_UNKNOWN; } +out1: mutex_unlock(&tp->control); usb_autopm_put_interface(tp->intf); out: - return ret; + return (ret < 0) ? ret : 0; } static int rtl8152_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) @@ -18791,6 +22976,8 @@ static int rtl8152_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) if (cmd->advertising & ADVERTISED_2500baseX_Full) advertising |= RTL_ADVERTISED_2500_FULL; + /* The legacy API couldn't support 5G speed */ + mutex_lock(&tp->control); ret = rtl8152_set_speed(tp, cmd->autoneg, cmd->speed, cmd->duplex, @@ -18846,13 +23033,22 @@ static int rtl8152_get_link_ksettings(struct net_device *netdev, cmd->link_modes.supported, tp->mii.supports_gmii); linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, cmd->link_modes.supported, tp->support_2500full); + linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + cmd->link_modes.supported, tp->support_5000full); ret = mutex_lock_interruptible(&tp->control); if (ret < 0) goto out2; - bmcr = r8152_mdio_read(tp, MII_BMCR); - bmsr = r8152_mdio_read(tp, MII_BMSR); + ret = r8152_mdio_read(tp, MII_BMCR); + if (ret < 0) + goto out3; + bmcr = ret; + + ret = r8152_mdio_read(tp, MII_BMSR); + if (ret < 0) + goto out3; + bmsr = ret; linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, cmd->link_modes.advertising, bmcr & BMCR_ANENABLE); @@ -18862,7 +23058,11 @@ static int rtl8152_get_link_ksettings(struct net_device *netdev, else cmd->base.autoneg = AUTONEG_DISABLE; - advert = r8152_mdio_read(tp, MII_ADVERTISE); + ret = r8152_mdio_read(tp, MII_ADVERTISE); + if (ret < 0) + goto out3; + + advert = ret; linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, cmd->link_modes.advertising, advert & ADVERTISE_10HALF); @@ -18883,8 +23083,13 @@ static int rtl8152_get_link_ksettings(struct net_device *netdev, advert & ADVERTISE_PAUSE_ASYM); if (tp->mii.supports_gmii) { - u16 ctrl1000 = r8152_mdio_read(tp, MII_CTRL1000); + u16 ctrl1000; + + ret = r8152_mdio_read(tp, MII_CTRL1000); + if (ret < 0) + goto out3; + ctrl1000 = ret; linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, cmd->link_modes.advertising, ctrl1000 & ADVERTISE_1000HALF); @@ -18893,14 +23098,26 @@ static int rtl8152_get_link_ksettings(struct net_device *netdev, ctrl1000 & ADVERTISE_1000FULL); } - if (tp->support_2500full) { + if (tp->support_2500full || tp->support_5000full) { + u16 data; + + ret = ocp_reg_read(tp, OCP_10GBT_CTRL, &data); + if (ret < 0) + goto out3; linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, cmd->link_modes.advertising, - ocp_reg_read(tp, OCP_10GBT_CTRL) & MDIO_AN_10GBT_CTRL_ADV2_5G); + data & MDIO_AN_10GBT_CTRL_ADV2_5G); + linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + cmd->link_modes.advertising, + data & MDIO_AN_10GBT_CTRL_ADV5G); } if (bmsr & BMSR_ANEGCOMPLETE) { - advert = r8152_mdio_read(tp, MII_LPA); + ret = r8152_mdio_read(tp, MII_LPA); + if (ret < 0) + goto out3; + + advert = ret; linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, cmd->link_modes.lp_advertising, @@ -18919,7 +23136,13 @@ static int rtl8152_get_link_ksettings(struct net_device *netdev, advert & ADVERTISE_100FULL); if (tp->mii.supports_gmii) { - u16 stat1000 = r8152_mdio_read(tp, MII_STAT1000); + u16 stat1000; + + ret = r8152_mdio_read(tp, MII_STAT1000); + if (ret < 0) + goto out3; + + stat1000 = ret; linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, cmd->link_modes.lp_advertising, @@ -18929,12 +23152,18 @@ static int rtl8152_get_link_ksettings(struct net_device *netdev, stat1000 & LPA_1000FULL); } - if (tp->support_2500full) { - u16 data = ocp_reg_read(tp, OCP_10GBT_STAT); + if (tp->support_2500full || tp->support_5000full) { + u16 data; + ret = ocp_reg_read(tp, OCP_10GBT_STAT, &data); + if (ret < 0) + goto out3; linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, cmd->link_modes.lp_advertising, data & MDIO_AN_10GBT_STAT_LP2_5G); + linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + cmd->link_modes.lp_advertising, + data & MDIO_AN_10GBT_STAT_LP5G); } } @@ -18949,6 +23178,8 @@ static int rtl8152_get_link_ksettings(struct net_device *netdev, cmd->base.speed = SPEED_1000; else if (tp->support_2500full && (speed & _2500bps)) cmd->base.speed = SPEED_2500; + else if (tp->support_5000full && (speed & _5000bps)) + cmd->base.speed = SPEED_5000; cmd->base.duplex = (speed & FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF; @@ -18957,6 +23188,7 @@ static int rtl8152_get_link_ksettings(struct net_device *netdev, cmd->base.duplex = DUPLEX_UNKNOWN; } +out3: mutex_unlock(&tp->control); out2: @@ -19062,6 +23294,7 @@ static void rtl8152_get_ethtool_stats(struct net_device *dev, { struct r8152 *tp = netdev_priv(dev); struct tally_counter tally; + int ret; if (usb_autopm_get_interface(tp->intf) < 0) return; @@ -19071,12 +23304,16 @@ static void rtl8152_get_ethtool_stats(struct net_device *dev, return; } - generic_ocp_read(tp, PLA_TALLYCNT, sizeof(tally), &tally, MCU_TYPE_PLA); + ret = generic_ocp_read(tp, PLA_TALLYCNT, sizeof(tally), &tally, + MCU_TYPE_PLA); mutex_unlock(&tp->control); usb_autopm_put_interface(tp->intf); + if (ret < 0) + return; + data[0] = le64_to_cpu(tally.tx_packets); data[1] = le64_to_cpu(tally.rx_packets); data[2] = le64_to_cpu(tally.tx_errors); @@ -19109,15 +23346,25 @@ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee) #endif { u32 lp, adv, supported = 0; + int ret; u16 val; - val = r8152_mmd_read(tp, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE); + ret = r8152_mmd_read(tp, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE, &val); + if (ret < 0) + goto out; + supported = mmd_eee_cap_to_ethtool_sup_t(val); - val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV); + ret = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, &val); + if (ret < 0) + goto out; + adv = mmd_eee_adv_to_ethtool_adv_t(val); - val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE); + ret = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE, &val); + if (ret < 0) + goto out; + lp = mmd_eee_adv_to_ethtool_adv_t(val); eee->eee_enabled = tp->eee_en; @@ -19128,11 +23375,12 @@ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee) ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised, lp); #else eee->supported = supported; - eee->advertised = tp->eee_adv; + eee->advertised = mmd_eee_adv_to_ethtool_adv_t(tp->eee_adv); eee->lp_advertised = lp; #endif - return 0; +out: + return (ret < 0) ? ret : 0; } #if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) @@ -19152,9 +23400,7 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee) tp->eee_en = eee->eee_enabled; tp->eee_adv = val; - rtl_eee_enable(tp, tp->eee_en); - - return 0; + return rtl_eee_enable(tp, tp->eee_en); } #if LINUX_VERSION_CODE >= KERNEL_VERSION(6,9,0) @@ -19165,14 +23411,21 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee) { u32 lp, adv, supported = 0; u16 val; + int ret; - val = ocp_reg_read(tp, OCP_EEE_ABLE); + ret = ocp_reg_read(tp, OCP_EEE_ABLE, &val); + if (ret < 0) + goto out; supported = mmd_eee_cap_to_ethtool_sup_t(val); - val = ocp_reg_read(tp, OCP_EEE_ADV); + ret = ocp_reg_read(tp, OCP_EEE_ADV, &val); + if (ret < 0) + goto out; adv = mmd_eee_adv_to_ethtool_adv_t(val); - val = ocp_reg_read(tp, OCP_EEE_LPABLE); + ret = ocp_reg_read(tp, OCP_EEE_LPABLE, &val); + if (ret < 0) + goto out; lp = mmd_eee_adv_to_ethtool_adv_t(val); eee->eee_enabled = tp->eee_en; @@ -19183,11 +23436,12 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee) ethtool_convert_legacy_u32_to_link_mode(eee->lp_advertised, lp); #else eee->supported = supported; - eee->advertised = tp->eee_adv; + eee->advertised = mmd_eee_adv_to_ethtool_adv_t(tp->eee_adv); eee->lp_advertised = lp; #endif - return 0; +out: + return (ret < 0) ? ret : 0; } static int @@ -19467,7 +23721,7 @@ static int rtl8152_set_ringparam(struct net_device *netdev, static void rtl8152_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) { struct r8152 *tp = netdev_priv(netdev); - u16 bmcr, lcladv, rmtadv; + int bmcr, lcladv, rmtadv; u8 cap; if (usb_autopm_get_interface(tp->intf) < 0) @@ -19481,6 +23735,9 @@ static void rtl8152_get_pauseparam(struct net_device *netdev, struct ethtool_pau mutex_unlock(&tp->control); + if (bmcr < 0 || lcladv < 0 || rmtadv < 0) + return; + usb_autopm_put_interface(tp->intf); if (!(bmcr & BMCR_ANENABLE)) { @@ -19514,7 +23771,11 @@ static int rtl8152_set_pauseparam(struct net_device *netdev, struct ethtool_paus mutex_lock(&tp->control); - if (pause->autoneg && !(r8152_mdio_read(tp, MII_BMCR) & BMCR_ANENABLE)) { + ret = r8152_mdio_read(tp, MII_BMCR); + if (ret < 0) + goto out; + + if (pause->autoneg && !(ret & BMCR_ANENABLE)) { ret = -EINVAL; goto out; } @@ -19525,10 +23786,14 @@ static int rtl8152_set_pauseparam(struct net_device *netdev, struct ethtool_paus if (pause->tx_pause) cap |= FLOW_CTRL_TX; - old = r8152_mdio_read(tp, MII_ADVERTISE); + ret = r8152_mdio_read(tp, MII_ADVERTISE); + if (ret < 0) + goto out; + + old = ret; new1 = (old & ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) | mii_advertise_flowctrl(cap); if (old != new1) - r8152_mdio_write(tp, MII_ADVERTISE, new1); + ret = r8152_mdio_write(tp, MII_ADVERTISE, new1); if (new1 & (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM)) tp->ups_info.flow_control = true; @@ -19539,7 +23804,7 @@ static int rtl8152_set_pauseparam(struct net_device *netdev, struct ethtool_paus mutex_unlock(&tp->control); usb_autopm_put_interface(tp->intf); - return ret; + return (ret < 0) ? ret : 0; } static const struct ethtool_ops ops = { @@ -19845,7 +24110,9 @@ static int rtl8152_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) } mutex_lock(&tp->control); - r8152_mdio_write(tp, data->reg_num, data->val_in); + ret = r8152_mdio_write(tp, data->reg_num, data->val_in); + if (ret > 0) + ret = 0; mutex_unlock(&tp->control); break; @@ -20004,7 +24271,56 @@ static void rtl8153b_unload(struct r8152 *tp) if (test_bit(RTL8152_UNPLUG, &tp->flags)) return; - r8153b_power_cut_en(tp, false); + if (!r8153b_power_cut_en(tp, false)) + rtl_set_dbg_info_state(tp, DGB_DRV_STATE_UNLOAD); +} + +static int r8152_desc_init(struct r8152 *tp) +{ + tp->rx_desc.size = sizeof(struct rx_desc); + tp->rx_desc.align = 8; + tp->rx_desc.vlan_tag = r8152_rx_vlan_tag; + tp->rx_desc.csum = r8152_rx_csum; + tp->rx_desc.len = r8152_rx_len; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + tp->vlan_put_tag = r8152_vlan_put_tag; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */ + + tp->tx_desc.size = sizeof(struct tx_desc); + tp->tx_desc.align = 4; + tp->tx_desc.vlan_tag = r8152_tx_vlan_tag; + tp->tx_desc.csum = r8152_tx_csum; + tp->tx_desc.len = r8152_tx_len; + + return 0; +} + +static int r8157_desc_init(struct r8152 *tp) +{ + tp->rx_desc.size = sizeof(struct rx_desc_v2); + tp->rx_desc.align = 16; + tp->rx_desc.vlan_tag = r8157_rx_vlan_tag; + tp->rx_desc.csum = r8157_rx_csum; + tp->rx_desc.len = r8157_rx_len; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) + tp->vlan_put_tag = r8157_vlan_put_tag; +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */ + + tp->tx_desc.size = sizeof(struct tx_desc_v2); + tp->tx_desc.align = 16; + tp->tx_desc.vlan_tag = r8152_tx_vlan_tag; + tp->tx_desc.csum = r8157_tx_csum; + tp->tx_desc.len = r8157_tx_len; + + return 0; +} + +static void rtl8153c_unload(struct r8152 *tp) +{ + if (test_bit(RTL8152_UNPLUG, &tp->flags)) + return; + + r8153_power_cut_en(tp, false); rtl_set_dbg_info_state(tp, DGB_DRV_STATE_UNLOAD); } @@ -20030,9 +24346,12 @@ static int rtl_ops_init(struct r8152 *tp) ops->in_nway = rtl8152_in_nway; ops->hw_phy_cfg = r8152b_hw_phy_cfg; ops->autosuspend_en = rtl_runtime_suspend_enable; + ops->phy_read = r8152_phy_read; + ops->phy_write = r8152_phy_write; tp->rx_buf_sz = 16 * 1024; tp->eee_en = true; tp->eee_adv = MDIO_EEE_100TX; + r8152_desc_init(tp); break; case RTL_VER_03: @@ -20053,12 +24372,15 @@ static int rtl_ops_init(struct r8152 *tp) ops->hw_phy_cfg = r8153_hw_phy_cfg; ops->autosuspend_en = rtl8153_runtime_enable; ops->change_mtu = rtl8153_change_mtu; + ops->phy_read = r8152_phy_read; + ops->phy_write = r8152_phy_write; if (tp->udev->speed < USB_SPEED_SUPER) tp->rx_buf_sz = 16 * 1024; else tp->rx_buf_sz = 32 * 1024; tp->eee_en = true; tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX; + r8152_desc_init(tp); break; case RTL_VER_08: @@ -20077,9 +24399,12 @@ static int rtl_ops_init(struct r8152 *tp) ops->hw_phy_cfg = r8153b_hw_phy_cfg; ops->autosuspend_en = rtl8153b_runtime_enable; ops->change_mtu = rtl8153_change_mtu; + ops->phy_read = r8152_phy_read; + ops->phy_write = r8152_phy_write; tp->rx_buf_sz = 32 * 1024; tp->eee_en = true; tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX; + r8152_desc_init(tp); break; case RTL_TEST_01: @@ -20096,8 +24421,11 @@ static int rtl_ops_init(struct r8152 *tp) ops->in_nway = rtl8153_in_nway; ops->hw_phy_cfg = r8156_hw_phy_cfg_test; ops->autosuspend_en = rtl8156_runtime_enable; + ops->phy_read = r8152_phy_read; + ops->phy_write = r8152_phy_write; tp->rx_buf_sz = 48 * 1024; tp->support_2500full = 1; + r8152_desc_init(tp); break; case RTL_VER_11: @@ -20119,8 +24447,11 @@ static int rtl_ops_init(struct r8152 *tp) ops->hw_phy_cfg = r8156_hw_phy_cfg; ops->autosuspend_en = rtl8156_runtime_enable; ops->change_mtu = rtl8156_change_mtu; + ops->phy_read = r8152_phy_read; + ops->phy_write = r8152_phy_write; tp->rx_buf_sz = 48 * 1024; tp->support_2500full = 1; + r8152_desc_init(tp); break; case RTL_VER_12: @@ -20144,7 +24475,10 @@ static int rtl_ops_init(struct r8152 *tp) ops->hw_phy_cfg = r8156b_hw_phy_cfg; ops->autosuspend_en = rtl8156_runtime_enable; ops->change_mtu = rtl8156_change_mtu; + ops->phy_read = r8152_phy_read; + ops->phy_write = r8152_phy_write; tp->rx_buf_sz = 48 * 1024; + r8152_desc_init(tp); break; case RTL_VER_14: @@ -20153,7 +24487,7 @@ static int rtl_ops_init(struct r8152 *tp) ops->disable = rtl8153_disable; ops->up = rtl8153c_up; ops->down = rtl8153b_down; - ops->unload = rtl8153_unload; + ops->unload = rtl8153c_unload; #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) ops->eee_get = r8153_get_eee; ops->eee_set = r8152_set_eee; @@ -20162,9 +24496,39 @@ static int rtl_ops_init(struct r8152 *tp) ops->hw_phy_cfg = r8153c_hw_phy_cfg; ops->autosuspend_en = rtl8153c_runtime_enable; ops->change_mtu = rtl8153c_change_mtu; + ops->phy_read = r8152_phy_read; + ops->phy_write = r8152_phy_write; tp->rx_buf_sz = 32 * 1024; tp->eee_en = true; tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX; + r8152_desc_init(tp); + break; + +// case RTL_TEST_02: +// case RTL_VER_16: + case RTL_VER_17: + ops->init = r8157_init; + ops->enable = rtl8157_enable; + ops->disable = rtl8153_disable; + ops->up = rtl8157_up; + ops->down = rtl8157_down; + ops->unload = rtl8153_unload; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) + ops->eee_get = r8153_get_eee; + ops->eee_set = r8152_set_eee; +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */ + ops->in_nway = rtl8153_in_nway; + ops->hw_phy_cfg = r8157_hw_phy_cfg; + ops->autosuspend_en = rtl8157_runtime_enable; + ops->change_mtu = rtl8157_change_mtu; + ops->phy_read = r8157_phy_read; + ops->phy_write = r8157_phy_write; + tp->rx_buf_sz = 32 * 1024; + tp->eee_en = true; + tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX; + tp->support_2500full = 1; + tp->support_5000full = 1; + r8157_desc_init(tp); break; default: @@ -20189,7 +24553,8 @@ static u8 __rtl_get_hw_ver(struct usb_device *udev) ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), RTL8152_REQ_GET_REGS, RTL8152_REQT_READ, - PLA_TCR0, MCU_TYPE_PLA, tmp, sizeof(*tmp), 500); + PLA_TCR0, MCU_TYPE_PLA, tmp, sizeof(*tmp), + USB_CTRL_GET_TIMEOUT); if (ret > 0) ocp_data = (__le32_to_cpu(*tmp) >> 16) & VERSION_MASK; @@ -20244,6 +24609,15 @@ static u8 __rtl_get_hw_ver(struct usb_device *udev) case 0x7420: version = RTL_VER_15; break; +// case 0x1010: +// version = RTL_TEST_02; +// break; +// case 0x1020: +// version = RTL_VER_16; +// break; + case 0x1030: + version = RTL_VER_17; + break; default: version = RTL_VER_UNKNOWN; dev_info(&udev->dev, "Unknown version 0x%04x\n", ocp_data); @@ -20253,6 +24627,7 @@ static u8 __rtl_get_hw_ver(struct usb_device *udev) return version; } +u8 rtl8152_get_version(struct usb_interface *intf); u8 rtl8152_get_version(struct usb_interface *intf) { u8 version; @@ -20487,8 +24862,9 @@ static ssize_t ocp_store(struct device *dev, struct device_attribute *attr, struct r8152 *tp = netdev_priv(netdev); struct usb_interface *intf = tp->intf; u32 v1, v2, v3, v4; - u16 type; int num, ret; + u32 ocp_data; + u16 type; if (!strncmp(buf, "pla ", 4)) type = MCU_TYPE_PLA; @@ -20522,19 +24898,28 @@ static ssize_t ocp_store(struct device *dev, struct device_attribute *attr, case 2: switch (v1) { case 1: + ret = ocp_read_byte(tp, type, v2, &ocp_data); + if (ret < 0) + break; netif_info(tp, drv, netdev, "%s read byte %x = %x\n", type ? "PLA" : "USB", v2, - ocp_read_byte(tp, type, v2)); + ocp_data); break; case 2: + ret = ocp_read_word(tp, type, v2, &ocp_data); + if (ret < 0) + break; netif_info(tp, drv, netdev, "%s read word %x = %x\n", type ? "PLA" : "USB", v2, - ocp_read_word(tp, type, v2)); + ocp_data); break; case 4: + ret = ocp_read_dword(tp, type, v2, &ocp_data); + if (ret < 0) + break; netif_info(tp, drv, netdev, "%s read dword %x = %x\n", type ? "PLA" : "USB", v2, - ocp_read_dword(tp, type, v2)); + ocp_data); break; default: ret = -EINVAL; @@ -20546,17 +24931,17 @@ static ssize_t ocp_store(struct device *dev, struct device_attribute *attr, case 1: netif_info(tp, drv, netdev, "%s write byte %x = %x\n", type ? "PLA" : "USB", v2, v3); - ocp_write_byte(tp, type, v2, v3); + ret = ocp_write_byte(tp, type, v2, v3); break; case 2: netif_info(tp, drv, netdev, "%s write word %x = %x\n", type ? "PLA" : "USB", v2, v3); - ocp_write_word(tp, type, v2, v3); + ret = ocp_write_word(tp, type, v2, v3); break; case 4: netif_info(tp, drv, netdev, "%s write dword %x = %x\n", type ? "PLA" : "USB", v2, v3); - ocp_write_dword(tp, type, v2, v3); + ret = ocp_write_dword(tp, type, v2, v3); break; default: ret = -EINVAL; @@ -20891,21 +25276,23 @@ static ssize_t sg_en_store(struct device *dev, struct device_attribute *attr, { struct net_device *netdev = to_net_dev(dev); struct r8152 *tp = netdev_priv(netdev); - u32 tso_size; if (!strncmp(buf, "enable", 6) && - usb_device_no_sg_constraint(tp->udev)) { + usb_device_no_sg_constraint(tp->udev)) tp->sg_use = true; - tso_size = TSO_LEGACY_MAX_SIZE; - } else if (!strncmp(buf, "disable", 7)) { + else if (!strncmp(buf, "disable", 7)) tp->sg_use = false; - tso_size = RTL_LIMITED_TSO_SIZE; - } else { + else return -EINVAL; - } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) - netif_set_tso_max_size(netdev, tso_size); + if (tp->sg_use) { + netif_set_tso_max_segs(netdev, RTL_MAX_SG_NUM); + netif_set_tso_max_size(netdev, TSO_LEGACY_MAX_SIZE / 2); + } else { + netif_set_tso_max_segs(netdev, GSO_MAX_SEGS); + netif_set_tso_max_size(netdev, RTL_LIMITED_TSO_SIZE); + } #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ return count; @@ -20957,10 +25344,13 @@ static void rtl_get_mapt_ver(struct r8152 *tp) u32 ocp_data; /* test for -AD variant of RTL8153 */ - ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0); + if (ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0, &ocp_data) < 0) + return; + if ((ocp_data & AD_MASK) == 0x1000) { /* test for MAC address pass-through bit */ - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_EFUSE); + if (ocp_read_byte(tp, MCU_TYPE_USB, USB_EFUSE, &ocp_data) < 0) + return; if (ocp_data & PASS_THRU_MASK) { tp->dell_macpassthru = 1; return; @@ -20968,7 +25358,9 @@ static void rtl_get_mapt_ver(struct r8152 *tp) } /* test for RTL8153-BND and RTL8153-BD */ - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_1); + if (ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_1, &ocp_data) < 0) + return; + if ((ocp_data & BND_MASK) || (ocp_data & BD_MASK)) { tp->dell_macpassthru = 1; return; @@ -21099,8 +25491,13 @@ static int rtl8152_probe(struct usb_interface *intf, netdev->ethtool_ops = &ops; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) - if (!tp->sg_use) + if (tp->sg_use) { + netif_set_tso_max_segs(netdev, RTL_MAX_SG_NUM); + netif_set_tso_max_size(netdev, TSO_LEGACY_MAX_SIZE / 2); + } else { + netif_set_tso_max_segs(netdev, GSO_MAX_SEGS); netif_set_tso_max_size(netdev, RTL_LIMITED_TSO_SIZE); + } #else netdev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6); #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) */ @@ -21151,15 +25548,22 @@ static int rtl8152_probe(struct usb_interface *intf, tp->advertising = RTL_ADVERTISED_10_HALF | RTL_ADVERTISED_10_FULL | RTL_ADVERTISED_100_HALF | RTL_ADVERTISED_100_FULL; if (tp->mii.supports_gmii) { - if (tp->support_2500full && - tp->udev->speed >= USB_SPEED_SUPER) { + tp->speed = SPEED_1000; + tp->advertising |= RTL_ADVERTISED_1000_FULL; + } + + if (tp->udev->speed >= USB_SPEED_SUPER) { + if (tp->support_2500full) { tp->speed = SPEED_2500; tp->advertising |= RTL_ADVERTISED_2500_FULL; - } else { - tp->speed = SPEED_1000; } - tp->advertising |= RTL_ADVERTISED_1000_FULL; + + if (tp->support_5000full) { + tp->speed = SPEED_5000; + tp->advertising |= RTL_ADVERTISED_5000_FULL; + } } + tp->duplex = DUPLEX_FULL; tp->rx_copybreak = RTL8152_RXFG_HEADSZ; @@ -21172,19 +25576,25 @@ static int rtl8152_probe(struct usb_interface *intf, else tp->saved_wolopts = __rtl_get_wol(tp); - tp->rtl_ops.init(tp); + ret = tp->rtl_ops.init(tp); + if (ret < 0) + goto out1; + queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0); set_ethernet_addr(tp, false); usb_set_intfdata(intf, tp); - netif_napi_add_weight(netdev, &tp->napi, r8152_poll, - tp->support_2500full ? 256 : 64); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) + netif_napi_add_weight(netdev, &tp->napi, r8152_poll, NAPI_POLL_WEIGHT); +#else + netif_napi_add(netdev, &tp->napi, r8152_poll); +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) */ ret = register_netdev(netdev); if (ret != 0) { dev_err(&intf->dev, "couldn't register the device\n"); - goto out1; + goto out2; } if (tp->saved_wolopts) @@ -21199,29 +25609,31 @@ static int rtl8152_probe(struct usb_interface *intf, ret = sysfs_create_group(&netdev->dev.kobj, &rtk_adv_grp); if (ret < 0) { - netif_err(tp, probe, netdev, "creat rtk_adv_grp fail\n"); - goto out2; + netif_err(tp, probe, netdev, "create rtk_adv_grp fail\n"); + goto out3; } #ifdef RTL8152_DEBUG ret = sysfs_create_group(&netdev->dev.kobj, &rtk_dbg_grp); if (ret < 0) { - netif_err(tp, probe, netdev, "creat rtk_dbg_grp fail\n"); - goto out3; + netif_err(tp, probe, netdev, "create rtk_dbg_grp fail\n"); + goto out4; } #endif return 0; #ifdef RTL8152_DEBUG -out3: +out4: sysfs_remove_group(&netdev->dev.kobj, &rtk_adv_grp); #endif -out2: +out3: unregister_netdev(netdev); -out1: +out2: netif_napi_del(&tp->napi); +out1: tasklet_kill(&tp->tx_tl); + cancel_delayed_work_sync(&tp->hw_phy_work); usb_set_intfdata(intf, NULL); out: free_netdev(netdev); @@ -21273,6 +25685,7 @@ static const struct usb_device_id rtl8152_table[] = { REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153), REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8155), REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8156), + REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8157), /* Microsoft */ REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab), @@ -21373,6 +25786,7 @@ static int rtl8152_cfgselector_probe(struct usb_device *udev) c->desc.bConfigurationValue); return -ENODEV; } + return 0; }