driver: net: ethernet: davinci_cpdma: add support for directed packet and source port detection

* Introduced parameter to add port number for directed packet in cpdma_chan_submit
* Source port detection macro with DMA descriptor status

Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index f8629186afbe..198cf18dc7fc 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -60,6 +60,9 @@
 #define CPDMA_DESC_EOQ          BIT(28)
 #define CPDMA_DESC_TD_COMPLETE  BIT(27)
 #define CPDMA_DESC_PASS_CRC     BIT(26)
+#define CPDMA_DESC_TO_PORT_EN   BIT(20)
+#define CPDMA_TO_PORT_SHIFT     16
+#define CPDMA_DESC_PORT_MASK    (BIT(18) | BIT(17) | BIT(16))
 
 #define CPDMA_TEARDOWN_VALUE    0xfffffffc
 
@@ -132,6 +135,14 @@ struct cpdma_chan {
 #define chan_write(chan, fld, v)        __raw_writel(v, (chan)->fld)
 #define desc_write(desc, fld, v)        __raw_writel((u32)(v), &(desc)->fld)
 
+#define cpdma_desc_to_port(chan, mode, directed)                        \
+        do {                                                            \
+                if (!is_rx_chan(chan) && ((directed == 1) ||            \
+                                          (directed == 2)))             \
+                        mode |= (CPDMA_DESC_TO_PORT_EN |                \
+                                 (directed << CPDMA_TO_PORT_SHIFT));    \
+        } while (0)
+
 /*
  * Utility constructs for a cpdma descriptor pool.  Some devices (e.g. davinci
  * emac) have dedicated on-chip memory for these descriptors.  Some other
@@ -662,7 +673,7 @@ static void __cpdma_chan_submit(struct cpdma_chan *chan,
 }
 
 int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
-                      int len, gfp_t gfp_mask)
+                      int len, int directed, gfp_t gfp_mask)
 {
         struct cpdma_ctlr               *ctlr = chan->ctlr;
         struct cpdma_desc __iomem       *desc;
@@ -692,6 +703,7 @@ int cpdma_chan_submit(struct cpdma_chan *chan, void *token, void *data,
 
         buffer = dma_map_single(ctlr->dev, data, len, chan->dir);
         mode = CPDMA_DESC_OWNER | CPDMA_DESC_SOP | CPDMA_DESC_EOP;
+        cpdma_desc_to_port(chan, mode, directed);
 
         desc_write(desc, hw_next,   0);
         desc_write(desc, hw_buffer, buffer);
@@ -782,7 +794,8 @@ static int __cpdma_chan_process(struct cpdma_chan *chan)
                 status = -EBUSY;
                 goto unlock_ret;
         }
-        status  = status & (CPDMA_DESC_EOQ | CPDMA_DESC_TD_COMPLETE);
+        status  = status & (CPDMA_DESC_EOQ | CPDMA_DESC_TD_COMPLETE |
+                            CPDMA_DESC_PORT_MASK);
 
         chan->head = desc_from_phys(pool, desc_read(desc, hw_next));
         chan_write(chan, cp, desc_dma);