2 files changed, 25 insertions, 6 deletions

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 9353992f9eea..4da381b74f54 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -167,6 +167,7 @@ int ib_find_cached_pkey(struct ib_device *device,
         unsigned long flags;
         int i;
         int ret = -ENOENT;
+        int partial_ix = -1;
 
         if (port_num < start_port(device) || port_num > end_port(device))
                 return -EINVAL;
@@ -179,11 +180,19 @@ int ib_find_cached_pkey(struct ib_device *device,
 
         for (i = 0; i < cache->table_len; ++i)
                 if ((cache->table[i] & 0x7fff) == (pkey & 0x7fff)) {
-                        *index = i;
-                        ret = 0;
-                        break;
+                        if (cache->table[i] & 0x8000) {
+                                *index = i;
+                                ret = 0;
+                                break;
+                        } else
+                                partial_ix = i;
                 }
 
+        if (ret && partial_ix >= 0) {
+                *index = partial_ix;
+                ret = 0;
+        }
+
         read_unlock_irqrestore(&device->cache.lock, flags);
 
         return ret;
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index e711de400a01..18c1ece765f2 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -707,18 +707,28 @@ int ib_find_pkey(struct ib_device *device,
 {
         int ret, i;
         u16 tmp_pkey;
+        int partial_ix = -1;
 
         for (i = 0; i < device->pkey_tbl_len[port_num - start_port(device)]; ++i) {
                 ret = ib_query_pkey(device, port_num, i, &tmp_pkey);
                 if (ret)
                         return ret;
-
                 if ((pkey & 0x7fff) == (tmp_pkey & 0x7fff)) {
-                        *index = i;
-                        return 0;
+                        /* if there is full-member pkey take it.*/
+                        if (tmp_pkey & 0x8000) {
+                                *index = i;
+                                return 0;
+                        }
+                        if (partial_ix < 0)
+                                partial_ix = i;
                 }
         }
 
+        /*no full-member, if exists take the limited*/
+        if (partial_ix >= 0) {
+                *index = partial_ix;
+                return 0;
+        }
         return -ENOENT;
 }
 EXPORT_SYMBOL(ib_find_pkey);