Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 027392c2 authored by Huang, Xiong's avatar Huang, Xiong Committed by David S. Miller
Browse files

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: default avatarxiong <xiong@qca.qualcomm.com>
Tested-by: default avatarLiu David <dwliu@qca.qualcomm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0af48336

drivers/net/ethernet/atheros/atl1c/atl1c_hw.h

+12 −17
Original line number Original line Diff line number Diff line
@@ -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

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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);