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>

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
index ca45fadb2d5593c82fc417efff70e229b8cb65ae..18c1f189b6b3a229614a394f20bf612ef57ed57b 100644 (file)
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
@@ -493,26 +493,21 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define ASPM_THRUPUT_LIMIT_NO          0x00
 #define ASPM_THRUPUT_LIMIT_1M          0x01
 #define ASPM_THRUPUT_LIMIT_10M         0x02
-#define ASPM_THRUPUT_LIMIT_100M                0x04
-#define RXQ1_CTRL_EN                   0x10
-#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 ASPM_THRUPUT_LIMIT_100M                0x03
+#define IPV6_CHKSUM_CTRL_EN            BIT(7)
 #define RXQ_RFD_BURST_NUM_MASK         0x003F
 #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_NIP_QUEUE_SEL_MASK         0x1
-#define RSS_NIP_QUEUE_SEL_SHIFT                28
-#define RRS_HASH_CTRL_EN               0x20000000
-#define RX_CUT_THRU_EN                 0x40000000
-#define RXQ_CTRL_EN                    0x80000000
+#define RSS_MODE_DIS                   0
+#define RSS_MODE_SQSI                  1
+#define RSS_MODE_MQSI                  2
+#define RSS_MODE_MQMI                  3
+#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 RFD_FREE_THRESH_MASK           0x003F

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 74203ea9ae18b3e033cb35a59b2e674d11205c54..00c8bd1c791d61f724c66046f0da22c458f1fb7c 100644 (file)
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1137,8 +1137,7 @@ static int atl1c_stop_mac(struct atl1c_hw *hw)
        u32 data;
 
        AT_READ_REG(hw, REG_RXQ_CTRL, &data);
-       data &= ~(RXQ1_CTRL_EN | RXQ2_CTRL_EN |
-                 RXQ3_CTRL_EN | RXQ_CTRL_EN);
+       data &= ~RXQ_CTRL_EN;
        AT_WRITE_REG(hw, REG_RXQ_CTRL, data);
 
        AT_READ_REG(hw, REG_TXQ_CTRL, &data);