net: thunderx: Add basic XDP support

[sfrench/cifs-2.6.git] / drivers / net / ethernet / cavium / thunder / nicvf_queues.c

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
index e4a02a96d4f05baf3df2c08bcafc14861b617fbd..8c3c571568aa3b1b9dc868e4155f9f5c98a20175 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
@@ -19,14 +19,6 @@
 #include "q_struct.h"
 #include "nicvf_queues.h"
 
-static inline u64 nicvf_iova_to_phys(struct nicvf *nic, dma_addr_t dma_addr)
-{
-       /* Translation is installed only when IOMMU is present */
-       if (nic->iommu_domain)
-               return iommu_iova_to_phys(nic->iommu_domain, dma_addr);
-       return dma_addr;
-}
-
 static void nicvf_get_page(struct nicvf *nic)
 {
        if (!nic->rb_pageref || !nic->rb_page)
@@ -149,8 +141,10 @@ static inline int nicvf_alloc_rcv_buffer(struct nicvf *nic, struct rbdr *rbdr,
 {
        struct pgcache *pgcache = NULL;
 
-       /* Check if request can be accomodated in previous allocated page */
-       if (nic->rb_page &&
+       /* Check if request can be accomodated in previous allocated page.
+        * But in XDP mode only one buffer per page is permitted.
+        */
+       if (!nic->pnicvf->xdp_prog && nic->rb_page &&
            ((nic->rb_page_offset + buf_len) <= PAGE_SIZE)) {
                nic->rb_pageref++;
                goto ret;
@@ -961,6 +955,7 @@ int nicvf_set_qset_resources(struct nicvf *nic)
 
        nic->rx_queues = qs->rq_cnt;
        nic->tx_queues = qs->sq_cnt;
+       nic->xdp_tx_queues = 0;
 
        return 0;
 }