amd-xgbe: Interrupt summary bits are h/w version dependent

There is a difference in the bit position of the normal interrupt summary
enable (NIE) and abnormal interrupt summary enable (AIE) between revisions
of the hardware.  For older revisions the NIE and AIE bits are positions
16 and 15 respectively.  For newer revisions the NIE and AIE bits are
positions 15 and 14.  The effect in changing the bit position is that
newer hardware won't receive AIE interrupts in the current version of the
driver.  Specifically, the driver uses this interrupt to collect
statistics on when a receive buffer unavailable event occurs and to
restart the driver/device when a fatal bus error occurs.

Update the driver to set the interrupt enable bit based on the reported
version of the hardware.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
index 943133034879edb19f76b3537c36483b647f52bb..7ea72ef11a55d5a4425959da1d12c69b108676b2 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
@@ -210,11 +210,15 @@
 #define DMA_CH_CR_PBLX8_WIDTH          1
 #define DMA_CH_CR_SPH_INDEX            24
 #define DMA_CH_CR_SPH_WIDTH            1
-#define DMA_CH_IER_AIE_INDEX           15
+#define DMA_CH_IER_AIE20_INDEX         15
+#define DMA_CH_IER_AIE20_WIDTH         1
+#define DMA_CH_IER_AIE_INDEX           14
 #define DMA_CH_IER_AIE_WIDTH           1
 #define DMA_CH_IER_FBEE_INDEX          12
 #define DMA_CH_IER_FBEE_WIDTH          1
-#define DMA_CH_IER_NIE_INDEX           16
+#define DMA_CH_IER_NIE20_INDEX         16
+#define DMA_CH_IER_NIE20_WIDTH         1
+#define DMA_CH_IER_NIE_INDEX           15
 #define DMA_CH_IER_NIE_WIDTH           1
 #define DMA_CH_IER_RBUE_INDEX          7
 #define DMA_CH_IER_RBUE_WIDTH          1

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index 671203dbea3dcb93b78947c4438ae0d7dcaa90c9..e107e180e2c8e5e0071f38dd96557a13b64baae2 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -649,13 +649,15 @@ static void xgbe_config_flow_control(struct xgbe_prv_data *pdata)
 static void xgbe_enable_dma_interrupts(struct xgbe_prv_data *pdata)
 {
        struct xgbe_channel *channel;
-       unsigned int i;
+       unsigned int i, ver;
 
        /* Set the interrupt mode if supported */
        if (pdata->channel_irq_mode)
                XGMAC_IOWRITE_BITS(pdata, DMA_MR, INTM,
                                   pdata->channel_irq_mode);
 
+       ver = XGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER);
+
        for (i = 0; i < pdata->channel_count; i++) {
                channel = pdata->channel[i];
 
@@ -671,8 +673,13 @@ static void xgbe_enable_dma_interrupts(struct xgbe_prv_data *pdata)
                 *   AIE  - Abnormal Interrupt Summary Enable
                 *   FBEE - Fatal Bus Error Enable
                 */
-               XGMAC_SET_BITS(channel->curr_ier, DMA_CH_IER, NIE, 1);
-               XGMAC_SET_BITS(channel->curr_ier, DMA_CH_IER, AIE, 1);
+               if (ver < 0x21) {
+                       XGMAC_SET_BITS(channel->curr_ier, DMA_CH_IER, NIE20, 1);
+                       XGMAC_SET_BITS(channel->curr_ier, DMA_CH_IER, AIE20, 1);
+               } else {
+                       XGMAC_SET_BITS(channel->curr_ier, DMA_CH_IER, NIE, 1);
+                       XGMAC_SET_BITS(channel->curr_ier, DMA_CH_IER, AIE, 1);
+               }
                XGMAC_SET_BITS(channel->curr_ier, DMA_CH_IER, FBEE, 1);
 
                if (channel->tx_ring) {