From: Michael S. Tsirkin <[EMAIL PROTECTED]>

Split Tavor and Arbel/mem-free index<->hw key munging routines, so that FMR 
implementation 
can call correct implementation without testing HCA type (which it already 
knows).

Signed-off-by: Michael S. Tsirkin <[EMAIL PROTECTED]>
Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>


--- linux-export.orig/drivers/infiniband/hw/mthca/mthca_mr.c    2005-04-01 
12:38:27.075083423 -0800
+++ linux-export/drivers/infiniband/hw/mthca/mthca_mr.c 2005-04-01 
12:38:28.676735749 -0800
@@ -198,20 +198,40 @@
                                      seg + (1 << order) - 1);
 }
 
+static inline u32 tavor_hw_index_to_key(u32 ind)
+{
+       return ind;
+}
+
+static inline u32 tavor_key_to_hw_index(u32 key)
+{
+       return key;
+}
+
+static inline u32 arbel_hw_index_to_key(u32 ind)
+{
+       return (ind >> 24) | (ind << 8);
+}
+
+static inline u32 arbel_key_to_hw_index(u32 key)
+{
+       return (key << 24) | (key >> 8);
+}
+
 static inline u32 hw_index_to_key(struct mthca_dev *dev, u32 ind)
 {
        if (dev->hca_type == ARBEL_NATIVE)
-               return (ind >> 24) | (ind << 8);
+               return arbel_hw_index_to_key(ind);
        else
-               return ind;
+               return tavor_hw_index_to_key(ind);
 }
 
 static inline u32 key_to_hw_index(struct mthca_dev *dev, u32 key)
 {
        if (dev->hca_type == ARBEL_NATIVE)
-               return (key << 24) | (key >> 8);
+               return arbel_key_to_hw_index(key);
        else
-               return key;
+               return tavor_key_to_hw_index(key);
 }
 
 int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,

_______________________________________________
openib-general mailing list
openib-general@openib.org
http://openib.org/mailman/listinfo/openib-general

To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general

Reply via email to