1 files changed, 38 insertions, 5 deletions

diff --git a/arch/tile/gxio/mpipe.c b/arch/tile/gxio/mpipe.c
index e71c63390acc..5301a9ffbae1 100644
--- a/arch/tile/gxio/mpipe.c
+++ b/arch/tile/gxio/mpipe.c
@@ -36,8 +36,14 @@ int gxio_mpipe_init(gxio_mpipe_context_t *context, unsigned int mpipe_index)
         int fd;
         int i;
 
+        if (mpipe_index >= GXIO_MPIPE_INSTANCE_MAX)
+                return -EINVAL;
+
         snprintf(file, sizeof(file), "mpipe/%d/iorpc", mpipe_index);
         fd = hv_dev_open((HV_VirtAddr) file, 0);
+
+        context->fd = fd;
+
         if (fd < 0) {
                 if (fd >= GXIO_ERR_MIN && fd <= GXIO_ERR_MAX)
                         return fd;
@@ -45,8 +51,6 @@ int gxio_mpipe_init(gxio_mpipe_context_t *context, unsigned int mpipe_index)
                         return -ENODEV;
         }
 
-        context->fd = fd;
-
         /* Map in the MMIO space. */
         context->mmio_cfg_base = (void __force *)
                 iorpc_ioremap(fd, HV_MPIPE_CONFIG_MMIO_OFFSET,
@@ -64,12 +68,15 @@ int gxio_mpipe_init(gxio_mpipe_context_t *context, unsigned int mpipe_index)
         for (i = 0; i < 8; i++)
                 context->__stacks.stacks[i] = 255;
 
+        context->instance = mpipe_index;
+
         return 0;
 
       fast_failed:
         iounmap((void __force __iomem *)(context->mmio_cfg_base));
       cfg_failed:
         hv_dev_close(context->fd);
+        context->fd = -1;
         return -ENODEV;
 }
 
@@ -383,7 +390,7 @@ EXPORT_SYMBOL_GPL(gxio_mpipe_iqueue_init);
 
 int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
                            gxio_mpipe_context_t *context,
-                           unsigned int edma_ring_id,
+                           unsigned int ering,
                            unsigned int channel,
                            void *mem, unsigned int mem_size,
                            unsigned int mem_flags)
@@ -394,7 +401,7 @@ int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
         /* Offset used to read number of completed commands. */
         MPIPE_EDMA_POST_REGION_ADDR_t offset;
 
-        int result = gxio_mpipe_init_edma_ring(context, edma_ring_id, channel,
+        int result = gxio_mpipe_init_edma_ring(context, ering, channel,
                                                mem, mem_size, mem_flags);
         if (result < 0)
                 return result;
@@ -405,7 +412,7 @@ int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
         offset.region =
                 MPIPE_MMIO_ADDR__REGION_VAL_EDMA -
                 MPIPE_MMIO_ADDR__REGION_VAL_IDMA;
-        offset.ring = edma_ring_id;
+        offset.ring = ering;
 
         __gxio_dma_queue_init(&equeue->dma_queue,
                               context->mmio_fast_base + offset.word,
@@ -413,6 +420,9 @@ int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
         equeue->edescs = mem;
         equeue->mask_num_entries = num_entries - 1;
         equeue->log2_num_entries = __builtin_ctz(num_entries);
+        equeue->context = context;
+        equeue->ering = ering;
+        equeue->channel = channel;
 
         return 0;
 }
@@ -493,6 +503,20 @@ static gxio_mpipe_context_t *_gxio_get_link_context(void)
         return contextp;
 }
 
+int gxio_mpipe_link_instance(const char *link_name)
+{
+        _gxio_mpipe_link_name_t name;
+        gxio_mpipe_context_t *context = _gxio_get_link_context();
+
+        if (!context)
+                return GXIO_ERR_NO_DEVICE;
+
+        strncpy(name.name, link_name, sizeof(name.name));
+        name.name[GXIO_MPIPE_LINK_NAME_LEN - 1] = '\0';
+
+        return gxio_mpipe_info_instance_aux(context, name);
+}
+
 int gxio_mpipe_link_enumerate_mac(int idx, char *link_name, uint8_t *link_mac)
 {
         int rv;
@@ -543,3 +567,12 @@ int gxio_mpipe_link_close(gxio_mpipe_link_t *link)
 }
 
 EXPORT_SYMBOL_GPL(gxio_mpipe_link_close);
+
+int gxio_mpipe_link_set_attr(gxio_mpipe_link_t *link, uint32_t attr,
+                             int64_t val)
+{
+        return gxio_mpipe_link_set_attr_aux(link->context, link->mac, attr,
+                                            val);
+}
+
+EXPORT_SYMBOL_GPL(gxio_mpipe_link_set_attr);