5 files changed, 219 insertions, 51 deletions

diff --git a/Documentation/devicetree/bindings/net/amd-xgbe.txt b/Documentation/devicetree/bindings/net/amd-xgbe.txt
index 41354f730beb..26efd526d16c 100644
--- a/Documentation/devicetree/bindings/net/amd-xgbe.txt
+++ b/Documentation/devicetree/bindings/net/amd-xgbe.txt
@@ -7,7 +7,10 @@ Required properties:
    - PCS registers
 - interrupt-parent: Should be the phandle for the interrupt controller
   that services interrupts for this device
-- interrupts: Should contain the amd-xgbe interrupt
+- interrupts: Should contain the amd-xgbe interrupt(s). The first interrupt
+  listed is required and is the general device interrupt. If the optional
+  amd,per-channel-interrupt property is specified, then one additional
+  interrupt for each DMA channel supported by the device should be specified
 - clocks:
    - DMA clock for the amd-xgbe device (used for calculating the
      correct Rx interrupt watchdog timer value on a DMA channel
@@ -23,6 +26,9 @@ Optional properties:
 - mac-address: mac address to be assigned to the device. Can be overridden
   by UEFI.
 - dma-coherent: Present if dma operations are coherent
+- amd,per-channel-interrupt: Indicates that Rx and Tx complete will generate
+  a unique interrupt for each DMA channel - this requires an additional
+  interrupt be configured for each DMA channel
 
 Example:
         xgbe@e0700000 {
@@ -30,7 +36,9 @@ Example:
                 reg = <0 0xe0700000 0 0x80000>,
                       <0 0xe0780000 0 0x80000>;
                 interrupt-parent = <&gic>;
-                interrupts = <0 325 4>;
+                interrupts = <0 325 4>,
+                             <0 326 1>, <0 327 1>, <0 328 1>, <0 329 1>;
+                amd,per-channel-interrupt;
                 clocks = <&xgbe_dma_clk>, <&xgbe_ptp_clk>;
                 clock-names = "dma_clk", "ptp_clk";
                 phy-handle = <&phy>;
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
index b3719f154637..ac3d319ffab3 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -481,17 +481,21 @@ static void xgbe_enable_dma_interrupts(struct xgbe_prv_data *pdata)
 
                 if (channel->tx_ring) {
                         /* Enable the following Tx interrupts
-                         *   TIE  - Transmit Interrupt Enable (unless polling)
+                         *   TIE  - Transmit Interrupt Enable (unless using
+                         *          per channel interrupts)
                          */
-                        XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TIE, 1);
+                        if (!pdata->per_channel_irq)
+                                XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, TIE, 1);
                 }
                 if (channel->rx_ring) {
                         /* Enable following Rx interrupts
                          *   RBUE - Receive Buffer Unavailable Enable
-                         *   RIE  - Receive Interrupt Enable
+                         *   RIE  - Receive Interrupt Enable (unless using
+                         *          per channel interrupts)
                          */
                         XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RBUE, 1);
-                        XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RIE, 1);
+                        if (!pdata->per_channel_irq)
+                                XGMAC_SET_BITS(dma_ch_ier, DMA_CH_IER, RIE, 1);
                 }
 
                 XGMAC_DMA_IOWRITE(channel, DMA_CH_IER, dma_ch_ier);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 07e2d216323a..c3533e104c61 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -114,6 +114,7 @@
  *     THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <linux/tcp.h>
 #include <linux/if_vlan.h>
@@ -126,7 +127,8 @@
 #include "xgbe.h"
 #include "xgbe-common.h"
 
-static int xgbe_poll(struct napi_struct *, int);
+static int xgbe_one_poll(struct napi_struct *, int);
+static int xgbe_all_poll(struct napi_struct *, int);
 static void xgbe_set_rx_mode(struct net_device *);
 
 static int xgbe_alloc_channels(struct xgbe_prv_data *pdata)
@@ -134,6 +136,7 @@ static int xgbe_alloc_channels(struct xgbe_prv_data *pdata)
         struct xgbe_channel *channel_mem, *channel;
         struct xgbe_ring *tx_ring, *rx_ring;
         unsigned int count, i;
+        int ret = -ENOMEM;
 
         count = max_t(unsigned int, pdata->tx_ring_count, pdata->rx_ring_count);
 
@@ -158,6 +161,19 @@ static int xgbe_alloc_channels(struct xgbe_prv_data *pdata)
                 channel->dma_regs = pdata->xgmac_regs + DMA_CH_BASE +
                                     (DMA_CH_INC * i);
 
+                if (pdata->per_channel_irq) {
+                        /* Get the DMA interrupt (offset 1) */
+                        ret = platform_get_irq(pdata->pdev, i + 1);
+                        if (ret < 0) {
+                                netdev_err(pdata->netdev,
+                                           "platform_get_irq %u failed\n",
+                                           i + 1);
+                                goto err_irq;
+                        }
+
+                        channel->dma_irq = ret;
+                }
+
                 if (i < pdata->tx_ring_count) {
                         spin_lock_init(&tx_ring->lock);
                         channel->tx_ring = tx_ring++;
@@ -168,9 +184,9 @@ static int xgbe_alloc_channels(struct xgbe_prv_data *pdata)
                         channel->rx_ring = rx_ring++;
                 }
 
-                DBGPR("  %s - queue_index=%u, dma_regs=%p, tx=%p, rx=%p\n",
+                DBGPR("  %s: queue=%u, dma_regs=%p, dma_irq=%d, tx=%p, rx=%p\n",
                       channel->name, channel->queue_index, channel->dma_regs,
-                      channel->tx_ring, channel->rx_ring);
+                      channel->dma_irq, channel->tx_ring, channel->rx_ring);
         }
 
         pdata->channel = channel_mem;
@@ -178,6 +194,9 @@ static int xgbe_alloc_channels(struct xgbe_prv_data *pdata)
 
         return 0;
 
+err_irq:
+        kfree(rx_ring);
+
 err_rx_ring:
         kfree(tx_ring);
 
@@ -185,9 +204,7 @@ err_tx_ring:
         kfree(channel_mem);
 
 err_channel:
-        netdev_err(pdata->netdev, "channel allocation failed\n");
-
-        return -ENOMEM;
+        return ret;
 }
 
 static void xgbe_free_channels(struct xgbe_prv_data *pdata)
@@ -287,11 +304,7 @@ static irqreturn_t xgbe_isr(int irq, void *data)
         if (!dma_isr)
                 goto isr_done;