ralink: fix hw status almost full not work on mt7620 and mt7621

the old FE_INT_STATUS register becomes two registers.
FE_INT_STATUS and INT_STATUS. so the hw status almost full
must change to read from FE_INT_STATUS register.
tx/rx done read from INT_STATUS register.

mt7620 datasheet define CNT_GDM1_AF at BIT(29).
but after test it should be BIT(13). why?

Signed-off-by: michael lee <igvtee@gmail.com>
SVN-Revision: 44371

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c
index 14a950a003d2843b859ae2011d1c2944e769ef9a..3a8475a63ddc7b06921f9f19d610c67d62cc15b8 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.c
@@ -923,26 +923,33 @@ static int fe_poll(struct napi_struct *napi, int budget)
        struct fe_priv *priv = container_of(napi, struct fe_priv, rx_napi);
        struct fe_hw_stats *hwstat = priv->hw_stats;
        int tx_done, rx_done;
-       u32 status, mask;
-       u32 tx_intr, rx_intr;
+       u32 status, fe_status, status_reg, mask;
+       u32 tx_intr, rx_intr, status_intr;
 
-       status = fe_reg_r32(FE_REG_FE_INT_STATUS);
+       fe_status = status = fe_reg_r32(FE_REG_FE_INT_STATUS);
        tx_intr = priv->soc->tx_int;
        rx_intr = priv->soc->rx_int;
+       status_intr = priv->soc->status_int;
        tx_done = rx_done = 0;
 
+       if (fe_reg_table[FE_REG_FE_INT_STATUS2]) {
+               fe_status = fe_reg_r32(FE_REG_FE_INT_STATUS2);
+               status_reg = FE_REG_FE_INT_STATUS2;
+       } else
+               status_reg = FE_REG_FE_INT_STATUS;
+
        if (status & tx_intr)
                tx_done = fe_poll_tx(priv, budget, tx_intr);
 
        if (status & rx_intr)
                rx_done = fe_poll_rx(napi, budget, priv, rx_intr);
 
-       if (unlikely(hwstat && (status & FE_CNT_GDM_AF))) {
-               if (spin_trylock(&hwstat->stats_lock)) {
+       if (unlikely(fe_status & status_intr)) {
+               if (hwstat && spin_trylock(&hwstat->stats_lock)) {
                        fe_stats_update(priv);
                        spin_unlock(&hwstat->stats_lock);
                }
-               fe_reg_w32(FE_CNT_GDM_AF, FE_REG_FE_INT_STATUS);
+               fe_reg_w32(status_intr, status_reg);
        }
 
        if (unlikely(netif_msg_intr(priv))) {

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h
index a193a564c59715768cdb9be8d5f9c41a6efdcf69..bf2a999f609fadb38677e13548e56cc1a00351d0 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h
@@ -49,6 +49,7 @@ enum fe_reg {
        FE_REG_FE_DMA_VID_BASE,
        FE_REG_FE_COUNTER_BASE,
        FE_REG_FE_RST_GL,
+       FE_REG_FE_INT_STATUS2,
        FE_REG_COUNT
 };
 
@@ -407,6 +408,7 @@ struct fe_soc_data
        u32 pdma_glo_cfg;
        u32 rx_int;
        u32 tx_int;
+       u32 status_int;
        u32 checksum_bit;
 };
 

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
index 6e2fbdf645d9ed44ffda8885f81806cf4b83e3d4..3d610ec38ac0250f6561bd1e336d02d99af61542 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
@@ -62,6 +62,15 @@
 #define GSW_REG_GDMA1_MAC_ADRH 0x50C
 
 #define MT7621_FE_RST_GL       (FE_FE_OFFSET + 0x04)
+#define MT7620_FE_INT_STATUS2  (FE_FE_OFFSET + 0x08)
+
+/*
+ * FE_INT_STATUS reg on mt7620 define CNT_GDM1_AF at BIT(29)
+ * but after test it should be BIT(13).
+ */
+#define MT7620_FE_GDM1_AF      BIT(13)
+#define MT7621_FE_GDM1_AF      BIT(28)
+#define MT7621_FE_GDM2_AF      BIT(29)
 
 static const u32 mt7620_reg_table[FE_REG_COUNT] = {
        [FE_REG_PDMA_GLO_CFG] = RT5350_PDMA_GLO_CFG,
@@ -80,6 +89,7 @@ static const u32 mt7620_reg_table[FE_REG_COUNT] = {
        [FE_REG_FE_DMA_VID_BASE] = MT7620_DMA_VID,
        [FE_REG_FE_COUNTER_BASE] = MT7620_GDM1_TX_GBCNT,
        [FE_REG_FE_RST_GL] = MT7621_FE_RST_GL,
+       [FE_REG_FE_INT_STATUS2] = MT7620_FE_INT_STATUS2,
 };
 
 static const u32 mt7621_reg_table[FE_REG_COUNT] = {
@@ -99,6 +109,7 @@ static const u32 mt7621_reg_table[FE_REG_COUNT] = {
        [FE_REG_FE_DMA_VID_BASE] = 0,
        [FE_REG_FE_COUNTER_BASE] = MT7621_GDM1_TX_GBCNT,
        [FE_REG_FE_RST_GL] = MT7621_FE_RST_GL,
+       [FE_REG_FE_INT_STATUS2] = MT7620_FE_INT_STATUS2,
 };
 
 static void mt7620_fe_reset(void)
@@ -231,6 +242,7 @@ static struct fe_soc_data mt7620_data = {
        .pdma_glo_cfg = FE_PDMA_SIZE_16DWORDS,
        .rx_int = RT5350_RX_DONE_INT,
        .tx_int = RT5350_TX_DONE_INT,
+       .status_int = MT7620_FE_GDM1_AF,
        .checksum_bit = MT7620_L4_VALID,
        .has_carrier = mt7620a_has_carrier,
        .mdio_read = mt7620_mdio_read,
@@ -251,6 +263,7 @@ static struct fe_soc_data mt7621_data = {
        .pdma_glo_cfg = FE_PDMA_SIZE_16DWORDS,
        .rx_int = RT5350_RX_DONE_INT,
        .tx_int = RT5350_TX_DONE_INT,
+       .status_int = (MT7621_FE_GDM1_AF | MT7621_FE_GDM2_AF),
        .checksum_bit = MT7621_L4_VALID,
        .has_carrier = mt7620a_has_carrier,
        .mdio_read = mt7620_mdio_read,

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c
index ebe85b9a6af5f72c1e39ff16065cc85d1b47ec93..715221b100eb90f3264fe75a5ca36ba6fed86807 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt2880.c
@@ -65,6 +65,7 @@ struct fe_soc_data rt2880_data = {
        .checksum_bit = RX_DMA_L4VALID,
        .rx_int = FE_RX_DONE_INT,
        .tx_int = FE_TX_DONE_INT,
+       .status_int = FE_CNT_GDM_AF,
        .mdio_read = rt2880_mdio_read,
        .mdio_write = rt2880_mdio_write,
        .mdio_adjust_link = rt2880_mdio_link_adjust,

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c
index 5bb244f6a5a9a51826827fd9bcbf816edd4bd192..4c04ca5f5b0cf68efaad6976f95b759b285a0bc5 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt305x.c
@@ -133,6 +133,7 @@ static struct fe_soc_data rt3050_data = {
        .checksum_bit = RX_DMA_L4VALID,
        .rx_int = FE_RX_DONE_INT,
        .tx_int = FE_TX_DONE_INT,
+       .status_int = FE_CNT_GDM_AF,
 };
 
 static struct fe_soc_data rt5350_data = {

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3883.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3883.c
index 4e4dcdbb944d950da89a1fb317b0fdaafa197e24..5d540c2c1eb9d76d9389099cf13972942ddba44f 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3883.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_rt3883.c
@@ -63,6 +63,7 @@ static struct fe_soc_data rt3883_data = {
        .pdma_glo_cfg = FE_PDMA_SIZE_8DWORDS,
        .rx_int = FE_RX_DONE_INT,
        .tx_int = FE_TX_DONE_INT,
+       .status_int = FE_CNT_GDM_AF,
        .checksum_bit = RX_DMA_L4VALID,
        .mdio_read = rt2880_mdio_read,
        .mdio_write = rt2880_mdio_write,