NET: nps_enet: replace use of cause register

When interrupt is received we read directly from control
register for RX/TX instead of reading cause register
since this register fails to indicate TX done when
TX interrupt is "edge mode".

Signed-off-by: Noam Camus <noamc@ezchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index 24a85b292007c9e2b9e662e70b5036ae17c969d5..0e652b4fee8d6c235d94bc1370eea094234d2d50 100644 (file)
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -211,12 +211,13 @@ static irqreturn_t nps_enet_irq_handler(s32 irq, void *dev_instance)
 {
        struct net_device *ndev = dev_instance;
        struct nps_enet_priv *priv = netdev_priv(ndev);
-       struct nps_enet_buf_int_cause buf_int_cause;
+       struct nps_enet_rx_ctl rx_ctrl;
+       struct nps_enet_tx_ctl tx_ctrl;
 
-       buf_int_cause.value =
-                       nps_enet_reg_get(priv, NPS_ENET_REG_BUF_INT_CAUSE);
+       rx_ctrl.value = nps_enet_reg_get(priv, NPS_ENET_REG_RX_CTL);
+       tx_ctrl.value = nps_enet_reg_get(priv, NPS_ENET_REG_TX_CTL);
 
-       if (buf_int_cause.tx_done || buf_int_cause.rx_rdy)
+       if ((!tx_ctrl.ct && priv->tx_packet_sent) || rx_ctrl.cr)
                if (likely(napi_schedule_prep(&priv->napi))) {
                        nps_enet_reg_set(priv, NPS_ENET_REG_BUF_INT_ENABLE, 0);
                        __napi_schedule(&priv->napi);

diff --git a/drivers/net/ethernet/ezchip/nps_enet.h b/drivers/net/ethernet/ezchip/nps_enet.h
index fc45c9daa1c2dfb6310e210f49f1958f666cd28a..6703674d679c964c00cac0ea12e084267df1ee47 100644 (file)
--- a/drivers/net/ethernet/ezchip/nps_enet.h
+++ b/drivers/net/ethernet/ezchip/nps_enet.h
@@ -36,7 +36,6 @@
 #define NPS_ENET_REG_RX_CTL            0x810
 #define NPS_ENET_REG_RX_BUF            0x818
 #define NPS_ENET_REG_BUF_INT_ENABLE    0x8C0
-#define NPS_ENET_REG_BUF_INT_CAUSE     0x8C4
 #define NPS_ENET_REG_GE_MAC_CFG_0      0x1000
 #define NPS_ENET_REG_GE_MAC_CFG_1      0x1004
 #define NPS_ENET_REG_GE_MAC_CFG_2      0x1008
@@ -108,25 +107,6 @@ struct nps_enet_buf_int_enable {
        };
 };
 
-/* Interrupt cause for data buffer events register */
-struct nps_enet_buf_int_cause {
-       union {
-               /* tx_done: Interrupt in the case when current frame was
-                *          read from TX buffer.
-                * rx_rdy:  Interrupt in the case when new frame is ready
-                *          in RX buffer.
-                */
-               struct {
-                       u32
-                       __reserved:30,
-                       tx_done:1,
-                       rx_rdy:1;
-               };
-
-               u32 value;
-       };
-};
-
 /* Gbps Eth MAC Configuration 0 register */
 struct nps_enet_ge_mac_cfg_0 {
        union {