openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

atl1c: remove code related to rxq 1/2/3 

remove code related to rxq 1/2/3 since multi-q not support.
refine REG_RXQ_CTRL definition as well.

Signed-off-by: xiong <xiong@qca.qualcomm.com>
Tested-by: Liu David <dwliu@qca.qualcomm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Huang, Xiong 2012-04-17 19:32:31 +00:00 committed by David S. Miller
parent 0af4833670
commit 027392c2d6
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
View File

@ -493,26 +493,21 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
#define ASPM_THRUPUT_LIMIT_NO 0x00 #define ASPM_THRUPUT_LIMIT_NO 0x00
#define ASPM_THRUPUT_LIMIT_1M 0x01 #define ASPM_THRUPUT_LIMIT_1M 0x01
#define ASPM_THRUPUT_LIMIT_10M 0x02 #define ASPM_THRUPUT_LIMIT_10M 0x02
#define ASPM_THRUPUT_LIMIT_100M 0x04 #define ASPM_THRUPUT_LIMIT_100M 0x03
#define RXQ1_CTRL_EN 0x10 #define IPV6_CHKSUM_CTRL_EN BIT(7)
#define RXQ2_CTRL_EN 0x20
#define RXQ3_CTRL_EN 0x40
#define IPV6_CHKSUM_CTRL_EN 0x80
#define RSS_HASH_BITS_MASK 0x00FF
#define RSS_HASH_BITS_SHIFT 8
#define RSS_HASH_IPV4 0x10000
#define RSS_HASH_IPV4_TCP 0x20000
#define RSS_HASH_IPV6 0x40000
#define RSS_HASH_IPV6_TCP 0x80000
#define RXQ_RFD_BURST_NUM_MASK 0x003F #define RXQ_RFD_BURST_NUM_MASK 0x003F
#define RXQ_RFD_BURST_NUM_SHIFT 20 #define RXQ_RFD_BURST_NUM_SHIFT 20
#define RSS_MODE_MASK 0x0003 #define RXQ_NUM_RFD_PREF_DEF 8
#define RSS_MODE_MASK 3UL
#define RSS_MODE_SHIFT 26 #define RSS_MODE_SHIFT 26
#define RSS_NIP_QUEUE_SEL_MASK 0x1 #define RSS_MODE_DIS 0
#define RSS_NIP_QUEUE_SEL_SHIFT 28 #define RSS_MODE_SQSI 1
#define RRS_HASH_CTRL_EN 0x20000000 #define RSS_MODE_MQSI 2
#define RX_CUT_THRU_EN 0x40000000 #define RSS_MODE_MQMI 3
#define RXQ_CTRL_EN 0x80000000 #define RSS_NIP_QUEUE_SEL BIT(28) /* 0:q0, 1:table */
#define RRS_HASH_CTRL_EN BIT(29)
#define RX_CUT_THRU_EN BIT(30)
#define RXQ_CTRL_EN BIT(31)
#define REG_RFD_FREE_THRESH 0x15A4 #define REG_RFD_FREE_THRESH 0x15A4
#define RFD_FREE_THRESH_MASK 0x003F #define RFD_FREE_THRESH_MASK 0x003F

3
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
View File

@ -1137,8 +1137,7 @@ static int atl1c_stop_mac(struct atl1c_hw *hw)
u32 data; u32 data;
AT_READ_REG(hw, REG_RXQ_CTRL, &data); AT_READ_REG(hw, REG_RXQ_CTRL, &data);
data &= ~(RXQ1_CTRL_EN | RXQ2_CTRL_EN | data &= ~RXQ_CTRL_EN;
RXQ3_CTRL_EN | RXQ_CTRL_EN);
AT_WRITE_REG(hw, REG_RXQ_CTRL, data); AT_WRITE_REG(hw, REG_RXQ_CTRL, data);
AT_READ_REG(hw, REG_TXQ_CTRL, &data); AT_READ_REG(hw, REG_TXQ_CTRL, &data);