Skip to content

L
linux
Commit 4b903e30 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'r8152' 

Hayes Wang says:

====================
support new chip

Remove the trailing "/* CRC */" for patch #3.

Change the return value type of rtl_ops_init() from int to boolean
for patch #4.

Replace VENDOR_ID_SAMSUNG with SAMSUNG_VENDOR_ID for patch #6.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 63d515c3 43779f8d
Show whitespace changes
Inline Side-by-side
Showing with 742 additions and 83 deletions
drivers/net/usb/cdc_ether.c
View file @ 4b903e30
...@@ -486,6 +486,7 @@ static const struct driver_info wwan_info = { ...@@ -486,6 +486,7 @@ static const struct driver_info wwan_info = {
#define ZTE_VENDOR_ID 0x19D2 #define ZTE_VENDOR_ID 0x19D2
#define DELL_VENDOR_ID 0x413C #define DELL_VENDOR_ID 0x413C
#define REALTEK_VENDOR_ID 0x0bda #define REALTEK_VENDOR_ID 0x0bda
#define SAMSUNG_VENDOR_ID 0x04e8
static const struct usb_device_id products[] = { static const struct usb_device_id products[] = {
/* BLACKLIST !! /* BLACKLIST !!
...@@ -652,6 +653,15 @@ static const struct usb_device_id products[] = { ...@@ -652,6 +653,15 @@ static const struct usb_device_id products[] = {
.driver_info = 0, .driver_info = 0,
}, },
#if defined(CONFIG_USB_RTL8152) || defined(CONFIG_USB_RTL8152_MODULE)
/* Samsung USB Ethernet Adapters */
{
USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, 0xa101, USB_CLASS_COMM,
USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
.driver_info = 0,
},
#endif
/* WHITELIST!!! /* WHITELIST!!!
* *
* CDC Ether uses two interfaces, not necessarily consecutive. * CDC Ether uses two interfaces, not necessarily consecutive.
......
drivers/net/usb/r8152.c
View file @ 4b903e30
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/ipv6.h> #include <linux/ipv6.h>
/* Version Information */ /* Version Information */
#define DRIVER_VERSION "v1.02.0 (2013/10/28)" #define DRIVER_VERSION "v1.03.0 (2013/12/26)"
#define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>" #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
#define DRIVER_DESC "Realtek RTL8152 Based USB 2.0 Ethernet Adapters" #define DRIVER_DESC "Realtek RTL8152 Based USB 2.0 Ethernet Adapters"
#define MODULENAME "r8152" #define MODULENAME "r8152"
...@@ -39,15 +39,24 @@ ...@@ -39,15 +39,24 @@
#define PLA_RXFIFO_CTRL2 0xc0a8 #define PLA_RXFIFO_CTRL2 0xc0a8
#define PLA_FMC 0xc0b4 #define PLA_FMC 0xc0b4
#define PLA_CFG_WOL 0xc0b6 #define PLA_CFG_WOL 0xc0b6
#define PLA_TEREDO_CFG 0xc0bc
#define PLA_MAR 0xcd00 #define PLA_MAR 0xcd00
#define PLA_BACKUP 0xd000
#define PAL_BDC_CR 0xd1a0 #define PAL_BDC_CR 0xd1a0
#define PLA_TEREDO_TIMER 0xd2cc
#define PLA_REALWOW_TIMER 0xd2e8
#define PLA_LEDSEL 0xdd90 #define PLA_LEDSEL 0xdd90
#define PLA_LED_FEATURE 0xdd92 #define PLA_LED_FEATURE 0xdd92
#define PLA_PHYAR 0xde00 #define PLA_PHYAR 0xde00
#define PLA_BOOT_CTRL 0xe004
#define PLA_GPHY_INTR_IMR 0xe022 #define PLA_GPHY_INTR_IMR 0xe022
#define PLA_EEE_CR 0xe040 #define PLA_EEE_CR 0xe040
#define PLA_EEEP_CR 0xe080 #define PLA_EEEP_CR 0xe080
#define PLA_MAC_PWR_CTRL 0xe0c0 #define PLA_MAC_PWR_CTRL 0xe0c0
#define PLA_MAC_PWR_CTRL2 0xe0ca
#define PLA_MAC_PWR_CTRL3 0xe0cc
#define PLA_MAC_PWR_CTRL4 0xe0ce
#define PLA_WDT6_CTRL 0xe428
#define PLA_TCR0 0xe610 #define PLA_TCR0 0xe610
#define PLA_TCR1 0xe612 #define PLA_TCR1 0xe612
#define PLA_TXFIFO_CTRL 0xe618 #define PLA_TXFIFO_CTRL 0xe618
...@@ -73,16 +82,25 @@ ...@@ -73,16 +82,25 @@
#define PLA_BP_5 0xfc32 #define PLA_BP_5 0xfc32
#define PLA_BP_6 0xfc34 #define PLA_BP_6 0xfc34
#define PLA_BP_7 0xfc36 #define PLA_BP_7 0xfc36
#define PLA_BP_EN 0xfc38
#define USB_U2P3_CTRL 0xb460
#define USB_DEV_STAT 0xb808 #define USB_DEV_STAT 0xb808
#define USB_USB_CTRL 0xd406 #define USB_USB_CTRL 0xd406
#define USB_PHY_CTRL 0xd408 #define USB_PHY_CTRL 0xd408
#define USB_TX_AGG 0xd40a #define USB_TX_AGG 0xd40a
#define USB_RX_BUF_TH 0xd40c #define USB_RX_BUF_TH 0xd40c
#define USB_USB_TIMER 0xd428 #define USB_USB_TIMER 0xd428
#define USB_RX_EARLY_AGG 0xd42c
#define USB_PM_CTRL_STATUS 0xd432 #define USB_PM_CTRL_STATUS 0xd432
#define USB_TX_DMA 0xd434 #define USB_TX_DMA 0xd434
#define USB_TOLERANCE 0xd490
#define USB_LPM_CTRL 0xd41a
#define USB_UPS_CTRL 0xd800 #define USB_UPS_CTRL 0xd800
#define USB_MISC_0 0xd81a
#define USB_POWER_CUT 0xd80a
#define USB_AFE_CTRL2 0xd824
#define USB_WDT11_CTRL 0xe43c
#define USB_BP_BA 0xfc26 #define USB_BP_BA 0xfc26
#define USB_BP_0 0xfc28 #define USB_BP_0 0xfc28
#define USB_BP_1 0xfc2a #define USB_BP_1 0xfc2a
...@@ -92,14 +110,30 @@ ...@@ -92,14 +110,30 @@
#define USB_BP_5 0xfc32 #define USB_BP_5 0xfc32
#define USB_BP_6 0xfc34 #define USB_BP_6 0xfc34
#define USB_BP_7 0xfc36 #define USB_BP_7 0xfc36
#define USB_BP_EN 0xfc38
/* OCP Registers */ /* OCP Registers */
#define OCP_ALDPS_CONFIG 0x2010 #define OCP_ALDPS_CONFIG 0x2010
#define OCP_EEE_CONFIG1 0x2080 #define OCP_EEE_CONFIG1 0x2080
#define OCP_EEE_CONFIG2 0x2092 #define OCP_EEE_CONFIG2 0x2092
#define OCP_EEE_CONFIG3 0x2094 #define OCP_EEE_CONFIG3 0x2094
#define OCP_BASE_MII 0xa400
#define OCP_EEE_AR 0xa41a #define OCP_EEE_AR 0xa41a
#define OCP_EEE_DATA 0xa41c #define OCP_EEE_DATA 0xa41c
#define OCP_PHY_STATUS 0xa420
#define OCP_POWER_CFG 0xa430
#define OCP_EEE_CFG 0xa432
#define OCP_SRAM_ADDR 0xa436
#define OCP_SRAM_DATA 0xa438
#define OCP_DOWN_SPEED 0xa442
#define OCP_EEE_CFG2 0xa5d0
#define OCP_ADC_CFG 0xbc06
/* SRAM Register */
#define SRAM_LPF_CFG 0x8012
#define SRAM_10M_AMP1 0x8080
#define SRAM_10M_AMP2 0x8082
#define SRAM_IMPEDANCE 0x8084
/* PLA_RCR */ /* PLA_RCR */
#define RCR_AAP 0x00000001 #define RCR_AAP 0x00000001
...@@ -116,14 +150,17 @@ ...@@ -116,14 +150,17 @@
#define RXFIFO_THR2_FULL 0x00000060 #define RXFIFO_THR2_FULL 0x00000060
#define RXFIFO_THR2_HIGH 0x00000038 #define RXFIFO_THR2_HIGH 0x00000038
#define RXFIFO_THR2_OOB 0x0000004a #define RXFIFO_THR2_OOB 0x0000004a
#define RXFIFO_THR2_NORMAL 0x00a0
/* PLA_RXFIFO_CTRL2 */ /* PLA_RXFIFO_CTRL2 */
#define RXFIFO_THR3_FULL 0x00000078 #define RXFIFO_THR3_FULL 0x00000078
#define RXFIFO_THR3_HIGH 0x00000048 #define RXFIFO_THR3_HIGH 0x00000048
#define RXFIFO_THR3_OOB 0x0000005a #define RXFIFO_THR3_OOB 0x0000005a
#define RXFIFO_THR3_NORMAL 0x0110
/* PLA_TXFIFO_CTRL */ /* PLA_TXFIFO_CTRL */
#define TXFIFO_THR_NORMAL 0x00400008 #define TXFIFO_THR_NORMAL 0x00400008
#define TXFIFO_THR_NORMAL2 0x01000008
/* PLA_FMC */ /* PLA_FMC */
#define FMC_FCR_MCU_EN 0x0001 #define FMC_FCR_MCU_EN 0x0001
...@@ -131,6 +168,9 @@ ...@@ -131,6 +168,9 @@
/* PLA_EEEP_CR */ /* PLA_EEEP_CR */
#define EEEP_CR_EEEP_TX 0x0002 #define EEEP_CR_EEEP_TX 0x0002
/* PLA_WDT6_CTRL */
#define WDT6_SET_MODE 0x0010
/* PLA_TCR0 */ /* PLA_TCR0 */
#define TCR0_TX_EMPTY 0x0800 #define TCR0_TX_EMPTY 0x0800
#define TCR0_AUTO_FIFO 0x0080 #define TCR0_AUTO_FIFO 0x0080
...@@ -168,6 +208,12 @@ ...@@ -168,6 +208,12 @@
/* PLA_CFG_WOL */ /* PLA_CFG_WOL */
#define MAGIC_EN 0x0001 #define MAGIC_EN 0x0001
/* PLA_TEREDO_CFG */
#define TEREDO_SEL 0x8000
#define TEREDO_WAKE_MASK 0x7f00
#define TEREDO_RS_EVENT_MASK 0x00fe
#define OOB_TEREDO_EN 0x0001
/* PAL_BDC_CR */ /* PAL_BDC_CR */
#define ALDPS_PROXY_MODE 0x0001 #define ALDPS_PROXY_MODE 0x0001
...@@ -185,6 +231,25 @@ ...@@ -185,6 +231,25 @@
#define D3_CLK_GATED_EN 0x00004000 #define D3_CLK_GATED_EN 0x00004000
#define MCU_CLK_RATIO 0x07010f07 #define MCU_CLK_RATIO 0x07010f07
#define MCU_CLK_RATIO_MASK 0x0f0f0f0f #define MCU_CLK_RATIO_MASK 0x0f0f0f0f
#define ALDPS_SPDWN_RATIO 0x0f87
/* PLA_MAC_PWR_CTRL2 */
#define EEE_SPDWN_RATIO 0x8007
/* PLA_MAC_PWR_CTRL3 */
#define PKT_AVAIL_SPDWN_EN 0x0100
#define SUSPEND_SPDWN_EN 0x0004
#define U1U2_SPDWN_EN 0x0002
#define L1_SPDWN_EN 0x0001
/* PLA_MAC_PWR_CTRL4 */
#define PWRSAVE_SPDWN_EN 0x1000
#define RXDV_SPDWN_EN 0x0800
#define TX10MIDLE_EN 0x0100
#define TP100_SPDWN_EN 0x0020
#define TP500_SPDWN_EN 0x0010
#define TP1000_SPDWN_EN 0x0008
#define EEE_SPDWN_EN 0x0001
/* PLA_GPHY_INTR_IMR */ /* PLA_GPHY_INTR_IMR */
#define GPHY_STS_MSK 0x0001 #define GPHY_STS_MSK 0x0001
...@@ -199,6 +264,9 @@ ...@@ -199,6 +264,9 @@
#define EEE_RX_EN 0x0001 #define EEE_RX_EN 0x0001
#define EEE_TX_EN 0x0002 #define EEE_TX_EN 0x0002
/* PLA_BOOT_CTRL */
#define AUTOLOAD_DONE 0x0002
/* USB_DEV_STAT */ /* USB_DEV_STAT */
#define STAT_SPEED_MASK 0x0006 #define STAT_SPEED_MASK 0x0006
#define STAT_SPEED_HIGH 0x0000 #define STAT_SPEED_HIGH 0x0000
...@@ -208,7 +276,9 @@ ...@@ -208,7 +276,9 @@
#define TX_AGG_MAX_THRESHOLD 0x03 #define TX_AGG_MAX_THRESHOLD 0x03
/* USB_RX_BUF_TH */ /* USB_RX_BUF_TH */
#define RX_BUF_THR 0x7a120180 #define RX_THR_SUPPER 0x0c350180
#define RX_THR_HIGH 0x7a120180
#define RX_THR_SLOW 0xffff0180
/* USB_TX_DMA */ /* USB_TX_DMA */
#define TEST_MODE_DISABLE 0x00000001 #define TEST_MODE_DISABLE 0x00000001
...@@ -218,17 +288,55 @@ ...@@ -218,17 +288,55 @@
#define POWER_CUT 0x0100 #define POWER_CUT 0x0100
/* USB_PM_CTRL_STATUS */ /* USB_PM_CTRL_STATUS */
#define RWSUME_INDICATE 0x0001 #define RESUME_INDICATE 0x0001
/* USB_USB_CTRL */ /* USB_USB_CTRL */
#define RX_AGG_DISABLE 0x0010 #define RX_AGG_DISABLE 0x0010
/* USB_U2P3_CTRL */
#define U2P3_ENABLE 0x0001
/* USB_POWER_CUT */
#define PWR_EN 0x0001
#define PHASE2_EN 0x0008
/* USB_MISC_0 */
#define PCUT_STATUS 0x0001
/* USB_RX_EARLY_AGG */
#define EARLY_AGG_SUPPER 0x0e832981
#define EARLY_AGG_HIGH 0x0e837a12
#define EARLY_AGG_SLOW 0x0e83ffff
/* USB_WDT11_CTRL */
#define TIMER11_EN 0x0001
/* USB_LPM_CTRL */
#define LPM_TIMER_MASK 0x0c
#define LPM_TIMER_500MS 0x04 /* 500 ms */
#define LPM_TIMER_500US 0x0c /* 500 us */
/* USB_AFE_CTRL2 */
#define SEN_VAL_MASK 0xf800
#define SEN_VAL_NORMAL 0xa000
#define SEL_RXIDLE 0x0100
/* OCP_ALDPS_CONFIG */ /* OCP_ALDPS_CONFIG */
#define ENPWRSAVE 0x8000 #define ENPWRSAVE 0x8000
#define ENPDNPS 0x0200 #define ENPDNPS 0x0200
#define LINKENA 0x0100 #define LINKENA 0x0100
#define DIS_SDSAVE 0x0010 #define DIS_SDSAVE 0x0010
/* OCP_PHY_STATUS */
#define PHY_STAT_MASK 0x0007
#define PHY_STAT_LAN_ON 3
#define PHY_STAT_PWRDN 5
/* OCP_POWER_CFG */
#define EEE_CLKDIV_EN 0x8000
#define EN_ALDPS 0x0004
#define EN_10M_PLLOFF 0x0001
/* OCP_EEE_CONFIG1 */ /* OCP_EEE_CONFIG1 */
#define RG_TXLPI_MSK_HFDUP 0x8000 #define RG_TXLPI_MSK_HFDUP 0x8000
#define RG_MATCLR_EN 0x4000 #define RG_MATCLR_EN 0x4000
...@@ -263,7 +371,36 @@ ...@@ -263,7 +371,36 @@
#define EEE_ADDR 0x003C #define EEE_ADDR 0x003C
#define EEE_DATA 0x0002 #define EEE_DATA 0x0002
/* OCP_EEE_CFG */
#define CTAP_SHORT_EN 0x0040
#define EEE10_EN 0x0010
/* OCP_DOWN_SPEED */
#define EN_10M_BGOFF 0x0080
/* OCP_EEE_CFG2 */
#define MY1000_EEE 0x0004
#define MY100_EEE 0x0002
/* OCP_ADC_CFG */
#define CKADSEL_L 0x0100
#define ADC_EN 0x0080
#define EN_EMI_L 0x0040
/* SRAM_LPF_CFG */
#define LPF_AUTO_TUNE 0x8000
/* SRAM_10M_AMP1 */
#define GDAC_IB_UPALL 0x0008
/* SRAM_10M_AMP2 */
#define AMP_DN 0x0200
/* SRAM_IMPEDANCE */
#define RX_DRIVING_MASK 0x6000
enum rtl_register_content { enum rtl_register_content {
_1000bps = 0x10,
_100bps = 0x08, _100bps = 0x08,
_10bps = 0x04, _10bps = 0x04,
LINK_STATUS = 0x02, LINK_STATUS = 0x02,
...@@ -273,6 +410,9 @@ enum rtl_register_content { ...@@ -273,6 +410,9 @@ enum rtl_register_content {
#define RTL8152_MAX_TX 10 #define RTL8152_MAX_TX 10
#define RTL8152_MAX_RX 10 #define RTL8152_MAX_RX 10
#define INTBUFSIZE 2 #define INTBUFSIZE 2
#define CRC_SIZE 4
#define TX_ALIGN 4
#define RX_ALIGN 8
#define INTR_LINK 0x0004 #define INTR_LINK 0x0004
...@@ -302,6 +442,10 @@ enum rtl8152_flags { ...@@ -302,6 +442,10 @@ enum rtl8152_flags {
/* Define these values to match your device */ /* Define these values to match your device */
#define VENDOR_ID_REALTEK 0x0bda #define VENDOR_ID_REALTEK 0x0bda
#define PRODUCT_ID_RTL8152 0x8152 #define PRODUCT_ID_RTL8152 0x8152
#define PRODUCT_ID_RTL8153 0x8153
#define VENDOR_ID_SAMSUNG 0x04e8
#define PRODUCT_ID_SAMSUNG 0xa101
#define MCU_TYPE_PLA 0x0100 #define MCU_TYPE_PLA 0x0100
#define MCU_TYPE_USB 0x0000 #define MCU_TYPE_USB 0x0000
...@@ -363,6 +507,15 @@ struct r8152 { ...@@ -363,6 +507,15 @@ struct r8152 {
spinlock_t rx_lock, tx_lock; spinlock_t rx_lock, tx_lock;
struct delayed_work schedule; struct delayed_work schedule;
struct mii_if_info mii; struct mii_if_info mii;
struct rtl_ops {
void (*init)(struct r8152 *);
int (*enable)(struct r8152 *);
void (*disable)(struct r8152 *);
void (*down)(struct r8152 *);
void (*unload)(struct r8152 *);
} rtl_ops;
int intr_interval; int intr_interval;
u32 msg_enable; u32 msg_enable;
u32 tx_qlen; u32 tx_qlen;
...@@ -375,7 +528,11 @@ struct r8152 { ...@@ -375,7 +528,11 @@ struct r8152 {
enum rtl_version { enum rtl_version {
RTL_VER_UNKNOWN = 0, RTL_VER_UNKNOWN = 0,
RTL_VER_01, RTL_VER_01,
RTL_VER_02 RTL_VER_02,
RTL_VER_03,
RTL_VER_04,
RTL_VER_05,
RTL_VER_MAX
}; };
/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
...@@ -653,45 +810,54 @@ static void ocp_write_byte(struct r8152 *tp, u16 type, u16 index, u32 data) ...@@ -653,45 +810,54 @@ static void ocp_write_byte(struct r8152 *tp, u16 type, u16 index, u32 data)
generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type); generic_ocp_write(tp, index, byen, sizeof(tmp), &tmp, type);
} }
static void r8152_mdio_write(struct r8152 *tp, u32 reg_addr, u32 value) static u16 ocp_reg_read(struct r8152 *tp, u16 addr)
{ {
u32 ocp_data; u16 ocp_base, ocp_index;
int i;
ocp_data = PHYAR_FLAG | ((reg_addr & 0x1f) << 16) | ocp_base = addr & 0xf000;
(value & 0xffff); if (ocp_base != tp->ocp_base) {
ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base);
tp->ocp_base = ocp_base;
}
ocp_write_dword(tp, MCU_TYPE_PLA, PLA_PHYAR, ocp_data); ocp_index = (addr & 0x0fff) | 0xb000;
return ocp_read_word(tp, MCU_TYPE_PLA, ocp_index);
}
for (i = 20; i > 0; i--) { static void ocp_reg_write(struct r8152 *tp, u16 addr, u16 data)
udelay(25); {
ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_PHYAR); u16 ocp_base, ocp_index;
if (!(ocp_data & PHYAR_FLAG))
break; ocp_base = addr & 0xf000;
if (ocp_base != tp->ocp_base) {
ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base);
tp->ocp_base = ocp_base;
} }
udelay(20);
ocp_index = (addr & 0x0fff) | 0xb000;
ocp_write_word(tp, MCU_TYPE_PLA, ocp_index, data);
} }
static int r8152_mdio_read(struct r8152 *tp, u32 reg_addr) static inline void r8152_mdio_write(struct r8152 *tp, u32 reg_addr, u32 value)
{ {
u32 ocp_data; ocp_reg_write(tp, OCP_BASE_MII + reg_addr * 2, value);
int i; }
ocp_data = (reg_addr & 0x1f) << 16;
ocp_write_dword(tp, MCU_TYPE_PLA, PLA_PHYAR, ocp_data);
for (i = 20; i > 0; i--) { static inline int r8152_mdio_read(struct r8152 *tp, u32 reg_addr)
udelay(25); {
ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_PHYAR); return ocp_reg_read(tp, OCP_BASE_MII + reg_addr * 2);
if (ocp_data & PHYAR_FLAG) }
break;
}
udelay(20);
if (!(ocp_data & PHYAR_FLAG)) static void sram_write(struct r8152 *tp, u16 addr, u16 data)
return -EAGAIN; {
ocp_reg_write(tp, OCP_SRAM_ADDR, addr);
ocp_reg_write(tp, OCP_SRAM_DATA, data);
}
return (u16)(ocp_data & 0xffff); static u16 sram_read(struct r8152 *tp, u16 addr)
{
ocp_reg_write(tp, OCP_SRAM_ADDR, addr);
return ocp_reg_read(tp, OCP_SRAM_DATA);
} }
static int read_mii_word(struct net_device *netdev, int phy_id, int reg) static int read_mii_word(struct net_device *netdev, int phy_id, int reg)
...@@ -715,20 +881,6 @@ void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val) ...@@ -715,20 +881,6 @@ void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val)
r8152_mdio_write(tp, reg, val); r8152_mdio_write(tp, reg, val);
} }
static void ocp_reg_write(struct r8152 *tp, u16 addr, u16 data)
{
u16 ocp_base, ocp_index;
ocp_base = addr & 0xf000;
if (ocp_base != tp->ocp_base) {
ocp_write_word(tp, MCU_TYPE_PLA, PLA_OCP_GPHY_BASE, ocp_base);
tp->ocp_base = ocp_base;
}
ocp_index = (addr & 0x0fff) | 0xb000;
ocp_write_word(tp, MCU_TYPE_PLA, ocp_index, data);
}
static static
int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags); int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags);
...@@ -932,12 +1084,12 @@ static void intr_callback(struct urb *urb) ...@@ -932,12 +1084,12 @@ static void intr_callback(struct urb *urb)
static inline void *rx_agg_align(void *data) static inline void *rx_agg_align(void *data)
{ {
return (void *)ALIGN((uintptr_t)data, 8); return (void *)ALIGN((uintptr_t)data, RX_ALIGN);
} }
static inline void *tx_agg_align(void *data) static inline void *tx_agg_align(void *data)
{ {
return (void *)ALIGN((uintptr_t)data, 4); return (void *)ALIGN((uintptr_t)data, TX_ALIGN);
} }
static void free_all_mem(struct r8152 *tp) static void free_all_mem(struct r8152 *tp)
...@@ -1006,7 +1158,8 @@ static int alloc_all_mem(struct r8152 *tp) ...@@ -1006,7 +1158,8 @@ static int alloc_all_mem(struct r8152 *tp)
if (buf != rx_agg_align(buf)) { if (buf != rx_agg_align(buf)) {
kfree(buf); kfree(buf);
buf = kmalloc_node(rx_buf_sz + 8, GFP_KERNEL, node); buf = kmalloc_node(rx_buf_sz + RX_ALIGN, GFP_KERNEL,
node);
if (!buf) if (!buf)
goto err1; goto err1;
} }
...@@ -1031,7 +1184,8 @@ static int alloc_all_mem(struct r8152 *tp) ...@@ -1031,7 +1184,8 @@ static int alloc_all_mem(struct r8152 *tp)
if (buf != tx_agg_align(buf)) { if (buf != tx_agg_align(buf)) {
kfree(buf); kfree(buf);
buf = kmalloc_node(rx_buf_sz + 4, GFP_KERNEL, node); buf = kmalloc_node(rx_buf_sz + TX_ALIGN, GFP_KERNEL,
node);
if (!buf) if (!buf)
goto err1; goto err1;
} }
...@@ -1231,7 +1385,7 @@ static void rx_bottom(struct r8152 *tp) ...@@ -1231,7 +1385,7 @@ static void rx_bottom(struct r8152 *tp)
stats = rtl8152_get_stats(netdev); stats = rtl8152_get_stats(netdev);
pkt_len -= 4; /* CRC */ pkt_len -= CRC_SIZE;
rx_data += sizeof(struct rx_desc); rx_data += sizeof(struct rx_desc);
skb = netdev_alloc_skb_ip_align(netdev, pkt_len); skb = netdev_alloc_skb_ip_align(netdev, pkt_len);
...@@ -1246,7 +1400,7 @@ static void rx_bottom(struct r8152 *tp) ...@@ -1246,7 +1400,7 @@ static void rx_bottom(struct r8152 *tp)
stats->rx_packets++; stats->rx_packets++;
stats->rx_bytes += pkt_len; stats->rx_bytes += pkt_len;
rx_data = rx_agg_align(rx_data + pkt_len + 4); rx_data = rx_agg_align(rx_data + pkt_len + CRC_SIZE);
rx_desc = (struct rx_desc *)rx_data; rx_desc = (struct rx_desc *)rx_data;
len_used = (int)(rx_data - (u8 *)agg->head); len_used = (int)(rx_data - (u8 *)agg->head);
len_used += sizeof(struct rx_desc); len_used += sizeof(struct rx_desc);
...@@ -1449,13 +1603,11 @@ static inline u8 rtl8152_get_speed(struct r8152 *tp) ...@@ -1449,13 +1603,11 @@ static inline u8 rtl8152_get_speed(struct r8152 *tp)
return ocp_read_byte(tp, MCU_TYPE_PLA, PLA_PHYSTATUS); return ocp_read_byte(tp, MCU_TYPE_PLA, PLA_PHYSTATUS);
} }
static int rtl8152_enable(struct r8152 *tp) static void rtl_set_eee_plus(struct r8152 *tp)
{ {
u32 ocp_data; u32 ocp_data;
int i, ret;
u8 speed; u8 speed;
set_tx_qlen(tp);
speed = rtl8152_get_speed(tp); speed = rtl8152_get_speed(tp);
if (speed & _10bps) { if (speed & _10bps) {
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR); ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR);
...@@ -1466,6 +1618,12 @@ static int rtl8152_enable(struct r8152 *tp) ...@@ -1466,6 +1618,12 @@ static int rtl8152_enable(struct r8152 *tp)
ocp_data &= ~EEEP_CR_EEEP_TX; ocp_data &= ~EEEP_CR_EEEP_TX;
ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR, ocp_data); ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEEP_CR, ocp_data);
} }
}
static int rtl_enable(struct r8152 *tp)
{
u32 ocp_data;
int i, ret;
r8152b_reset_packet_filter(tp); r8152b_reset_packet_filter(tp);
...@@ -1487,6 +1645,47 @@ static int rtl8152_enable(struct r8152 *tp) ...@@ -1487,6 +1645,47 @@ static int rtl8152_enable(struct r8152 *tp)
return ret; return ret;
} }
static int rtl8152_enable(struct r8152 *tp)
{
set_tx_qlen(tp);
rtl_set_eee_plus(tp);
return rtl_enable(tp);
}
static void r8153_set_rx_agg(struct r8152 *tp)
{
u8 speed;
speed = rtl8152_get_speed(tp);
if (speed & _1000bps) {
if (tp->udev->speed == USB_SPEED_SUPER) {
ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH,
RX_THR_SUPPER);
ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
EARLY_AGG_SUPPER);
} else {
ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH,
RX_THR_HIGH);
ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
EARLY_AGG_HIGH);
}
} else {
ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_SLOW);
ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_EARLY_AGG,
EARLY_AGG_SLOW);
}
}
static int rtl8153_enable(struct r8152 *tp)
{
set_tx_qlen(tp);
rtl_set_eee_plus(tp);
r8153_set_rx_agg(tp);
return rtl_enable(tp);
}
static void rtl8152_disable(struct r8152 *tp) static void rtl8152_disable(struct r8152 *tp)
{ {
struct net_device_stats *stats = rtl8152_get_stats(tp->netdev); struct net_device_stats *stats = rtl8152_get_stats(tp->netdev);
...@@ -1596,7 +1795,7 @@ static void r8152b_exit_oob(struct r8152 *tp) ...@@ -1596,7 +1795,7 @@ static void r8152b_exit_oob(struct r8152 *tp)
ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL); ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TXFIFO_CTRL, TXFIFO_THR_NORMAL);
ocp_write_byte(tp, MCU_TYPE_USB, USB_TX_AGG, TX_AGG_MAX_THRESHOLD); 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_BUF_THR); ocp_write_dword(tp, MCU_TYPE_USB, USB_RX_BUF_TH, RX_THR_HIGH);
ocp_write_dword(tp, MCU_TYPE_USB, USB_TX_DMA, ocp_write_dword(tp, MCU_TYPE_USB, USB_TX_DMA,
TEST_MODE_DISABLE | TX_SIZE_ADJUST1); TEST_MODE_DISABLE | TX_SIZE_ADJUST1);
...@@ -1685,15 +1884,269 @@ static inline void r8152b_enable_aldps(struct r8152 *tp) ...@@ -1685,15 +1884,269 @@ static inline void r8152b_enable_aldps(struct r8152 *tp)
LINKENA | DIS_SDSAVE); LINKENA | DIS_SDSAVE);
} }
static void r8153_hw_phy_cfg(struct r8152 *tp)
{
u32 ocp_data;
u16 data;
ocp_reg_write(tp, OCP_ADC_CFG, CKADSEL_L | ADC_EN | EN_EMI_L);
r8152_mdio_write(tp, MII_BMCR, BMCR_ANENABLE);
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);
}
data = ocp_reg_read(tp, OCP_POWER_CFG);
data |= EEE_CLKDIV_EN;
ocp_reg_write(tp, OCP_POWER_CFG, data);
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);
data = sram_read(tp, SRAM_IMPEDANCE);
data &= ~RX_DRIVING_MASK;
sram_write(tp, SRAM_IMPEDANCE, data);
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);
data = sram_read(tp, SRAM_LPF_CFG);
data |= LPF_AUTO_TUNE;
sram_write(tp, SRAM_LPF_CFG, data);
data = sram_read(tp, SRAM_10M_AMP1);
data |= GDAC_IB_UPALL;
sram_write(tp, SRAM_10M_AMP1, data);
data = sram_read(tp, SRAM_10M_AMP2);
data |= AMP_DN;
sram_write(tp, SRAM_10M_AMP2, data);
}
static void r8153_u1u2en(struct r8152 *tp, int enable)
{
u8 u1u2[8];
if (enable)
memset(u1u2, 0xff, sizeof(u1u2));
else
memset(u1u2, 0x00, sizeof(u1u2));
usb_ocp_write(tp, USB_TOLERANCE, BYTE_EN_SIX_BYTES, sizeof(u1u2), u1u2);
}
static void r8153_u2p3en(struct r8152 *tp, int enable)
{
u32 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);
}
static void r8153_power_cut_en(struct r8152 *tp, int 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 r8153_teredo_off(struct r8152 *tp)
{
u32 ocp_data;
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);
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);
}
static void r8153_first_init(struct r8152 *tp)
{
u32 ocp_data;
int i;
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
ocp_data |= RXDY_GATED_EN;
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
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);
r8153_hw_phy_cfg(tp);
rtl8152_nic_reset(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);
for (i = 0; i < 1000; i++) {
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
}
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);
for (i = 0; i < 1000; i++) {
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
}
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR);
ocp_data &= ~CPCR_RX_VLAN;
ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data);
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
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);
rtl8152_nic_reset(tp);
/* 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);
// rx aggregation
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
ocp_data &= ~RX_AGG_DISABLE;
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
}
static void r8153_enter_oob(struct r8152 *tp)
{
u32 ocp_data;
int i;
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);
rtl8152_disable(tp);
for (i = 0; i < 1000; i++) {
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
}
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);
for (i = 0; i < 1000; i++) {
ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
if (ocp_data & LINK_LIST_READY)
break;
mdelay(1);
}
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL);
ocp_data |= MAGIC_EN;
ocp_write_word(tp, MCU_TYPE_PLA, PLA_CFG_WOL, ocp_data);
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);
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_CPCR);
ocp_data |= CPCR_RX_VLAN;
ocp_write_word(tp, MCU_TYPE_PLA, PLA_CPCR, ocp_data);
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PAL_BDC_CR);
ocp_data |= ALDPS_PROXY_MODE;
ocp_write_word(tp, MCU_TYPE_PLA, PAL_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);
ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CONFIG5, LAN_WAKE_EN);
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_MISC_1);
ocp_data &= ~RXDY_GATED_EN;
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MISC_1, ocp_data);
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);
}
static void r8153_disable_aldps(struct r8152 *tp)
{
u16 data;
data = ocp_reg_read(tp, OCP_POWER_CFG);
data &= ~EN_ALDPS;
ocp_reg_write(tp, OCP_POWER_CFG, data);
msleep(20);
}
static void r8153_enable_aldps(struct r8152 *tp)
{
u16 data;
data = ocp_reg_read(tp, OCP_POWER_CFG);
data |= EN_ALDPS;
ocp_reg_write(tp, OCP_POWER_CFG, data);
}
static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
{ {
u16 bmcr, anar; u16 bmcr, anar, gbcr;
int ret = 0; int ret = 0;
cancel_delayed_work_sync(&tp->schedule); cancel_delayed_work_sync(&tp->schedule);
anar = r8152_mdio_read(tp, MII_ADVERTISE); anar = r8152_mdio_read(tp, MII_ADVERTISE);
anar &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL | anar &= ~(ADVERTISE_10HALF | ADVERTISE_10FULL |
ADVERTISE_100HALF | ADVERTISE_100FULL); ADVERTISE_100HALF | ADVERTISE_100FULL);
if (tp->mii.supports_gmii) {
gbcr = r8152_mdio_read(tp, MII_CTRL1000);
gbcr &= ~(ADVERTISE_1000FULL | ADVERTISE_1000HALF);
} else {
gbcr = 0;
}
if (autoneg == AUTONEG_DISABLE) { if (autoneg == AUTONEG_DISABLE) {
if (speed == SPEED_10) { if (speed == SPEED_10) {
...@@ -1702,6 +2155,9 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) ...@@ -1702,6 +2155,9 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
} else if (speed == SPEED_100) { } else if (speed == SPEED_100) {
bmcr = BMCR_SPEED100; bmcr = BMCR_SPEED100;
anar |= ADVERTISE_100HALF | ADVERTISE_100FULL; anar |= ADVERTISE_100HALF | ADVERTISE_100FULL;
} else if (speed == SPEED_1000 && tp->mii.supports_gmii) {
bmcr = BMCR_SPEED1000;
gbcr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF;
} else { } else {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
...@@ -1723,6 +2179,16 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) ...@@ -1723,6 +2179,16 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
anar |= ADVERTISE_10HALF; anar |= ADVERTISE_10HALF;
anar |= ADVERTISE_100HALF; anar |= ADVERTISE_100HALF;
} }
} else if (speed == SPEED_1000 && tp->mii.supports_gmii) {
if (duplex == DUPLEX_FULL) {
anar |= ADVERTISE_10HALF | ADVERTISE_10FULL;
anar |= ADVERTISE_100HALF | ADVERTISE_100FULL;
gbcr |= ADVERTISE_1000FULL | ADVERTISE_1000HALF;
} else {
anar |= ADVERTISE_10HALF;
anar |= ADVERTISE_100HALF;
gbcr |= ADVERTISE_1000HALF;
}
} else { } else {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
...@@ -1731,6 +2197,9 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) ...@@ -1731,6 +2197,9 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
bmcr = BMCR_ANENABLE | BMCR_ANRESTART; bmcr = BMCR_ANENABLE | BMCR_ANRESTART;
} }
if (tp->mii.supports_gmii)
r8152_mdio_write(tp, MII_CTRL1000, gbcr);
r8152_mdio_write(tp, MII_ADVERTISE, anar); r8152_mdio_write(tp, MII_ADVERTISE, anar);
r8152_mdio_write(tp, MII_BMCR, bmcr); r8152_mdio_write(tp, MII_BMCR, bmcr);
...@@ -1752,6 +2221,15 @@ static void rtl8152_down(struct r8152 *tp) ...@@ -1752,6 +2221,15 @@ static void rtl8152_down(struct r8152 *tp)
r8152b_enable_aldps(tp); r8152b_enable_aldps(tp);
} }
static void rtl8153_down(struct r8152 *tp)
{
r8153_u1u2en(tp, 0);
r8153_power_cut_en(tp, 0);
r8153_disable_aldps(tp);
r8153_enter_oob(tp);
r8153_enable_aldps(tp);
}
static void set_carrier(struct r8152 *tp) static void set_carrier(struct r8152 *tp)
{ {
struct net_device *netdev = tp->netdev; struct net_device *netdev = tp->netdev;
...@@ -1762,7 +2240,7 @@ static void set_carrier(struct r8152 *tp) ...@@ -1762,7 +2240,7 @@ static void set_carrier(struct r8152 *tp)
if (speed & LINK_STATUS) { if (speed & LINK_STATUS) {
if (!(tp->speed & LINK_STATUS)) { if (!(tp->speed & LINK_STATUS)) {
rtl8152_enable(tp); tp->rtl_ops.enable(tp);
set_bit(RTL8152_SET_RX_MODE, &tp->flags); set_bit(RTL8152_SET_RX_MODE, &tp->flags);
netif_carrier_on(netdev); netif_carrier_on(netdev);
} }
...@@ -1770,7 +2248,7 @@ static void set_carrier(struct r8152 *tp) ...@@ -1770,7 +2248,7 @@ static void set_carrier(struct r8152 *tp)
if (tp->speed & LINK_STATUS) { if (tp->speed & LINK_STATUS) {
netif_carrier_off(netdev); netif_carrier_off(netdev);
tasklet_disable(&tp->tl); tasklet_disable(&tp->tl);
rtl8152_disable(tp); tp->rtl_ops.disable(tp);
tasklet_enable(&tp->tl); tasklet_enable(&tp->tl);
} }
} }
...@@ -1811,7 +2289,9 @@ static int rtl8152_open(struct net_device *netdev) ...@@ -1811,7 +2289,9 @@ static int rtl8152_open(struct net_device *netdev)
return res; return res;
} }
rtl8152_set_speed(tp, AUTONEG_ENABLE, SPEED_100, DUPLEX_FULL); rtl8152_set_speed(tp, AUTONEG_ENABLE,
tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,
DUPLEX_FULL);
tp->speed = 0; tp->speed = 0;
netif_carrier_off(netdev); netif_carrier_off(netdev);
netif_start_queue(netdev); netif_start_queue(netdev);
...@@ -1830,7 +2310,7 @@ static int rtl8152_close(struct net_device *netdev) ...@@ -1830,7 +2310,7 @@ static int rtl8152_close(struct net_device *netdev)
cancel_delayed_work_sync(&tp->schedule); cancel_delayed_work_sync(&tp->schedule);
netif_stop_queue(netdev); netif_stop_queue(netdev);
tasklet_disable(&tp->tl); tasklet_disable(&tp->tl);
rtl8152_disable(tp); tp->rtl_ops.disable(tp);
tasklet_enable(&tp->tl); tasklet_enable(&tp->tl);
return res; return res;
...@@ -1851,6 +2331,13 @@ static void rtl_clear_bp(struct r8152 *tp) ...@@ -1851,6 +2331,13 @@ static void rtl_clear_bp(struct r8152 *tp)
ocp_write_word(tp, MCU_TYPE_USB, USB_BP_BA, 0); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_BA, 0);
} }
static void r8153_clear_bp(struct r8152 *tp)
{
ocp_write_byte(tp, MCU_TYPE_PLA, PLA_BP_EN, 0);
ocp_write_byte(tp, MCU_TYPE_USB, USB_BP_EN, 0);
rtl_clear_bp(tp);
}
static void r8152b_enable_eee(struct r8152 *tp) static void r8152b_enable_eee(struct r8152 *tp)
{ {
u32 ocp_data; u32 ocp_data;
...@@ -1874,6 +2361,22 @@ static void r8152b_enable_eee(struct r8152 *tp) ...@@ -1874,6 +2361,22 @@ static void r8152b_enable_eee(struct r8152 *tp)
ocp_reg_write(tp, OCP_EEE_AR, 0x0000); ocp_reg_write(tp, OCP_EEE_AR, 0x0000);
} }
static void r8153_enable_eee(struct r8152 *tp)
{
u32 ocp_data;
u16 data;
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
ocp_data |= EEE_RX_EN | EEE_TX_EN;
ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);
data = ocp_reg_read(tp, OCP_EEE_CFG);
data |= EEE10_EN;
ocp_reg_write(tp, OCP_EEE_CFG, data);
data = ocp_reg_read(tp, OCP_EEE_CFG2);
data |= MY1000_EEE | MY100_EEE;
ocp_reg_write(tp, OCP_EEE_CFG2, data);
}
static void r8152b_enable_fc(struct r8152 *tp) static void r8152b_enable_fc(struct r8152 *tp)
{ {
u16 anar; u16 anar;
...@@ -1909,7 +2412,7 @@ static void r8152b_init(struct r8152 *tp) ...@@ -1909,7 +2412,7 @@ static void r8152b_init(struct r8152 *tp)
ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data); ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data);
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS); ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS);
ocp_data &= ~RWSUME_INDICATE; ocp_data &= ~RESUME_INDICATE;
ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data); ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data);
r8152b_exit_oob(tp); r8152b_exit_oob(tp);
...@@ -1943,6 +2446,75 @@ static void r8152b_init(struct r8152 *tp) ...@@ -1943,6 +2446,75 @@ static void r8152b_init(struct r8152 *tp)
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
} }
static void r8153_init(struct r8152 *tp)
{
u32 ocp_data;
int i;
r8153_u1u2en(tp, 0);
for (i = 0; i < 500; i++) {
if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) &
AUTOLOAD_DONE)
break;
msleep(20);
}
for (i = 0; i < 500; i++) {
ocp_data = ocp_reg_read(tp, OCP_PHY_STATUS) & PHY_STAT_MASK;
if (ocp_data == PHY_STAT_LAN_ON || ocp_data == PHY_STAT_PWRDN)
break;
msleep(20);
}
r8153_u2p3en(tp, 0);
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);
r8153_clear_bp(tp);
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);
ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_LPM_CTRL);
ocp_data &= ~LPM_TIMER_MASK;
if (tp->udev->speed == USB_SPEED_SUPER)
ocp_data |= LPM_TIMER_500US;
else
ocp_data |= LPM_TIMER_500MS;
ocp_write_byte(tp, MCU_TYPE_USB, USB_LPM_CTRL, ocp_data);
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);
r8153_power_cut_en(tp, 0);
r8153_u1u2en(tp, 1);
r8153_first_init(tp);
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, ALDPS_SPDWN_RATIO);
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, EEE_SPDWN_RATIO);
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3,
PKT_AVAIL_SPDWN_EN | SUSPEND_SPDWN_EN |
U1U2_SPDWN_EN | L1_SPDWN_EN);
ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4,
PWRSAVE_SPDWN_EN | RXDV_SPDWN_EN | TX10MIDLE_EN |
TP100_SPDWN_EN | TP500_SPDWN_EN | TP1000_SPDWN_EN |
EEE_SPDWN_EN);
r8153_enable_eee(tp);
r8153_enable_aldps(tp);
r8152b_enable_fc(tp);
r8152_mdio_write(tp, MII_BMCR, BMCR_RESET | BMCR_ANENABLE |
BMCR_ANRESTART);
}
static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message) static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
{ {
struct r8152 *tp = usb_get_intfdata(intf); struct r8152 *tp = usb_get_intfdata(intf);
...@@ -1956,7 +2528,7 @@ static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message) ...@@ -1956,7 +2528,7 @@ static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
tasklet_disable(&tp->tl); tasklet_disable(&tp->tl);
} }
rtl8152_down(tp); tp->rtl_ops.down(tp);
return 0; return 0;
} }
...@@ -1965,10 +2537,12 @@ static int rtl8152_resume(struct usb_interface *intf) ...@@ -1965,10 +2537,12 @@ static int rtl8152_resume(struct usb_interface *intf)
{ {
struct r8152 *tp = usb_get_intfdata(intf); struct r8152 *tp = usb_get_intfdata(intf);
r8152b_init(tp); tp->rtl_ops.init(tp);
netif_device_attach(tp->netdev); netif_device_attach(tp->netdev);
if (netif_running(tp->netdev)) { if (netif_running(tp->netdev)) {
rtl8152_set_speed(tp, AUTONEG_ENABLE, SPEED_100, DUPLEX_FULL); rtl8152_set_speed(tp, AUTONEG_ENABLE,
tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,
DUPLEX_FULL);
tp->speed = 0; tp->speed = 0;
netif_carrier_off(tp->netdev); netif_carrier_off(tp->netdev);
set_bit(WORK_ENABLE, &tp->flags); set_bit(WORK_ENABLE, &tp->flags);
...@@ -2072,6 +2646,18 @@ static void r8152b_get_version(struct r8152 *tp) ...@@ -2072,6 +2646,18 @@ static void r8152b_get_version(struct r8152 *tp)
case 0x4c10: case 0x4c10:
tp->version = RTL_VER_02; tp->version = RTL_VER_02;
break; break;
case 0x5c00:
tp->version = RTL_VER_03;
tp->mii.supports_gmii = 1;
break;
case 0x5c10:
tp->version = RTL_VER_04;
tp->mii.supports_gmii = 1;
break;
case 0x5c20:
tp->version = RTL_VER_05;
tp->mii.supports_gmii = 1;
break;
default: default:
netif_info(tp, probe, tp->netdev, netif_info(tp, probe, tp->netdev,
"Unknown version 0x%04x\n", version); "Unknown version 0x%04x\n", version);
...@@ -2079,6 +2665,77 @@ static void r8152b_get_version(struct r8152 *tp) ...@@ -2079,6 +2665,77 @@ static void r8152b_get_version(struct r8152 *tp)
} }
} }
static void rtl8152_unload(struct r8152 *tp)
{
u32 ocp_data;
if (tp->version != RTL_VER_01) {
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CTRL);
ocp_data |= POWER_CUT;
ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data);
}
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);
}
static void rtl8153_unload(struct r8152 *tp)
{
r8153_power_cut_en(tp, 1);
}
static bool rtl_ops_init(struct r8152 *tp, const struct usb_device_id *id)
{
struct rtl_ops *ops = &tp->rtl_ops;
bool ret = true;
switch (id->idVendor) {
case VENDOR_ID_REALTEK:
switch (id->idProduct) {
case PRODUCT_ID_RTL8152:
ops->init = r8152b_init;
ops->enable = rtl8152_enable;
ops->disable = rtl8152_disable;
ops->down = rtl8152_down;
ops->unload = rtl8152_unload;
break;
case PRODUCT_ID_RTL8153:
ops->init = r8153_init;
ops->enable = rtl8153_enable;
ops->disable = rtl8152_disable;
ops->down = rtl8153_down;
ops->unload = rtl8153_unload;
break;
default:
ret = -EFAULT;
break;
}
break;
case VENDOR_ID_SAMSUNG:
switch (id->idProduct) {
case PRODUCT_ID_SAMSUNG:
ops->init = r8153_init;
ops->enable = rtl8153_enable;
ops->disable = rtl8152_disable;
ops->down = rtl8153_down;
ops->unload = rtl8153_unload;
break;
default:
ret = false;
break;
}
break;
default:
ret = false;
break;
}
return ret;
}
static int rtl8152_probe(struct usb_interface *intf, static int rtl8152_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
...@@ -2102,6 +2759,11 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -2102,6 +2759,11 @@ static int rtl8152_probe(struct usb_interface *intf,
tp = netdev_priv(netdev); tp = netdev_priv(netdev);
tp->msg_enable = 0x7FFF; tp->msg_enable = 0x7FFF;
if (!rtl_ops_init(tp, id)) {
netif_err(tp, probe, netdev, "Unknown Device");
return -ENODEV;
}
tasklet_init(&tp->tl, bottom_half, (unsigned long)tp); tasklet_init(&tp->tl, bottom_half, (unsigned long)tp);
INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t); INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
...@@ -2124,7 +2786,7 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -2124,7 +2786,7 @@ static int rtl8152_probe(struct usb_interface *intf,
tp->mii.supports_gmii = 0; tp->mii.supports_gmii = 0;
r8152b_get_version(tp); r8152b_get_version(tp);
r8152b_init(tp); tp->rtl_ops.init(tp);
set_ethernet_addr(tp); set_ethernet_addr(tp);
ret = alloc_all_mem(tp); ret = alloc_all_mem(tp);
...@@ -2150,21 +2812,6 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -2150,21 +2812,6 @@ static int rtl8152_probe(struct usb_interface *intf,
return ret; return ret;
} }
static void rtl8152_unload(struct r8152 *tp)
{
u32 ocp_data;
if (tp->version != RTL_VER_01) {
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_UPS_CTRL);
ocp_data |= POWER_CUT;
ocp_write_word(tp, MCU_TYPE_USB, USB_UPS_CTRL, ocp_data);
}
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS);
ocp_data &= ~RWSUME_INDICATE;
ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data);
}
static void rtl8152_disconnect(struct usb_interface *intf) static void rtl8152_disconnect(struct usb_interface *intf)
{ {
struct r8152 *tp = usb_get_intfdata(intf); struct r8152 *tp = usb_get_intfdata(intf);
...@@ -2174,7 +2821,7 @@ static void rtl8152_disconnect(struct usb_interface *intf) ...@@ -2174,7 +2821,7 @@ static void rtl8152_disconnect(struct usb_interface *intf)
set_bit(RTL8152_UNPLUG, &tp->flags); set_bit(RTL8152_UNPLUG, &tp->flags);
tasklet_kill(&tp->tl); tasklet_kill(&tp->tl);
unregister_netdev(tp->netdev); unregister_netdev(tp->netdev);
rtl8152_unload(tp); tp->rtl_ops.unload(tp);
free_all_mem(tp); free_all_mem(tp);
free_netdev(tp->netdev); free_netdev(tp->netdev);
} }
...@@ -2183,6 +2830,8 @@ static void rtl8152_disconnect(struct usb_interface *intf) ...@@ -2183,6 +2830,8 @@ static void rtl8152_disconnect(struct usb_interface *intf)
/* table of devices that work with this driver */ /* table of devices that work with this driver */
static struct usb_device_id rtl8152_table[] = { static struct usb_device_id rtl8152_table[] = {
{USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8152)}, {USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8152)},
{USB_DEVICE(VENDOR_ID_REALTEK, PRODUCT_ID_RTL8153)},
{USB_DEVICE(VENDOR_ID_SAMSUNG, PRODUCT_ID_SAMSUNG)},
{} {}
}; };
......
drivers/net/usb/r815x.c
View file @ 4b903e30
...@@ -226,7 +226,7 @@ static const struct usb_device_id products[] = { ...@@ -226,7 +226,7 @@ static const struct usb_device_id products[] = {
{ {
USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8153, USB_CLASS_COMM, USB_DEVICE_AND_INTERFACE_INFO(REALTEK_VENDOR_ID, 0x8153, USB_CLASS_COMM,
USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
#if defined(CONFIG_USB_RTL8153) || defined(CONFIG_USB_RTL8153_MODULE) #if defined(CONFIG_USB_RTL8152) || defined(CONFIG_USB_RTL8152_MODULE)
.driver_info = 0, .driver_info = 0,
#else #else
.driver_info = (unsigned long) &r8153_info, .driver_info = (unsigned long) &r8153_info,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7