Added sw2hw_mpt

diff --git a/src/drivers/net/mlx_ipoib/arbel.h b/src/drivers/net/mlx_ipoib/arbel.h
index 243aaa4..2755182 100644 (file)
--- a/src/drivers/net/mlx_ipoib/arbel.h
+++ b/src/drivers/net/mlx_ipoib/arbel.h
@@ -39,6 +39,8 @@
 #define ARBEL_HCR_QUERY_DEV_LIM                0x0003
 #define ARBEL_HCR_QUERY_FW             0x0004
 #define ARBEL_HCR_INIT_HCA             0x0007
+#define ARBEL_HCR_CLOSE_HCA            0x0008
+#define ARBEL_HCR_SW2HW_MPT            0x000d
 #define ARBEL_HCR_SW2HW_CQ             0x0016
 #define ARBEL_HCR_HW2SW_CQ             0x0017
 #define ARBEL_HCR_RST2INIT_QPEE                0x0019
@@ -101,6 +103,7 @@ struct MLX_DECLARE_STRUCT ( arbelprm_init_hca );
 struct MLX_DECLARE_STRUCT ( arbelprm_mad_ifc );
 struct MLX_DECLARE_STRUCT ( arbelprm_mgm_entry );
 struct MLX_DECLARE_STRUCT ( arbelprm_mgm_hash );
+struct MLX_DECLARE_STRUCT ( arbelprm_mpt );
 struct MLX_DECLARE_STRUCT ( arbelprm_qp_db_record );
 struct MLX_DECLARE_STRUCT ( arbelprm_qp_ee_state_transitions );
 struct MLX_DECLARE_STRUCT ( arbelprm_query_dev_lim );
@@ -333,6 +336,9 @@ struct arbel {
 /** Global protection domain */
 #define ARBEL_GLOBAL_PD                        0x123456
 
+/** Memory key prefix */
+#define ARBEL_MKEY_PREFIX              0x77000000UL
+
 /*
  * HCA commands
  *

diff --git a/src/drivers/net/mlx_ipoib/mt25218.c b/src/drivers/net/mlx_ipoib/mt25218.c
index f9a0bb1..0bd5385 100644 (file)
--- a/src/drivers/net/mlx_ipoib/mt25218.c
+++ b/src/drivers/net/mlx_ipoib/mt25218.c
@@ -235,6 +235,22 @@ arbel_cmd_init_hca ( struct arbel *arbel,
                           0, init_hca, 0, NULL );
 }
 
+static inline int
+arbel_cmd_close_hca ( struct arbel *arbel ) {
+       return arbel_cmd ( arbel,
+                          ARBEL_HCR_VOID_CMD ( ARBEL_HCR_CLOSE_HCA ),
+                          0, NULL, 0, NULL );
+}
+
+static inline int
+arbel_cmd_sw2hw_mpt ( struct arbel *arbel, unsigned int index,
+                     const struct arbelprm_mpt *mpt ) {
+       return arbel_cmd ( arbel,
+                          ARBEL_HCR_IN_CMD ( ARBEL_HCR_SW2HW_MPT,
+                                             1, sizeof ( *mpt ) ),
+                          0, mpt, index, NULL );
+}
+
 static inline int
 arbel_cmd_sw2hw_cq ( struct arbel *arbel, unsigned long cqn,
                     const struct arbelprm_completion_queue_context *cqctx ) {
@@ -405,6 +421,16 @@ arbel_cmd_map_fa ( struct arbel *arbel,
                           0, map, 1, NULL );
 }
 
+/***************************************************************************
+ *
+ * Event queue operations
+ *
+ ***************************************************************************
+ */
+
+static int arbel_create_eq ( struct arbel *arbel ) {
+}
+
 /***************************************************************************
  *
  * Completion queue operations
@@ -1800,6 +1826,42 @@ static void arbel_free_icm ( struct arbel *arbel ) {
  ***************************************************************************
  */
 
+/**
+ * Set up memory protection table
+ *
+ * @v arbel            Arbel device
+ * @ret rc             Return status code
+ */
+static int arbel_setup_mpt ( struct arbel *arbel ) {
+       struct arbelprm_mpt mpt;
+       uint32_t key;
+       int rc;
+
+       /* Derive key */
+       key = ( arbel->limits.reserved_mrws | ARBEL_MKEY_PREFIX );
+       arbel->reserved_lkey = ( ( key << 8 ) | ( key >> 24 ) );
+
+       /* Initialise memory protection table */
+       memset ( &mpt, 0, sizeof ( mpt ) );
+       MLX_FILL_4 ( &mpt, 0,
+                    r_w, 1,
+                    pa, 1,
+                    lr, 1,
+                    lw, 1 );
+       MLX_FILL_1 ( &mpt, 2, mem_key, key );
+       MLX_FILL_1 ( &mpt, 3, pd, ARBEL_GLOBAL_PD );
+       MLX_FILL_1 ( &mpt, 6, reg_wnd_len_h, 0xffffffffUL );
+       MLX_FILL_1 ( &mpt, 7, reg_wnd_len_l, 0xffffffffUL );
+       if ( ( rc = arbel_cmd_sw2hw_mpt ( arbel, arbel->limits.reserved_mrws,
+                                         &mpt ) ) != 0 ) {
+               DBGC ( arbel, "Arbel %p could not set up MPT: %s\n",
+                      arbel, strerror ( rc ) );
+               return rc;
+       }
+
+       return 0;
+}
+       
 /**
  * Probe PCI device
  *
@@ -1878,6 +1940,12 @@ static int arbel_probe ( struct pci_device *pci,
                       arbel, strerror ( rc ) );
                goto err_init_hca;
        }
+
+       /* Set up memory protection */
+       if ( ( rc = arbel_setup_mpt ( arbel ) ) != 0 )
+               goto err_setup_mpt;
+
+                    
 #endif
 
 
@@ -1889,8 +1957,10 @@ static int arbel_probe ( struct pci_device *pci,
        arbel->mailbox_in = dev_buffers_p->inprm_buf;
        arbel->mailbox_out = dev_buffers_p->outprm_buf;
 #endif
-       arbel->db_rec = dev_ib_data.uar_context_base;
+#if ! SELF_INIT
        arbel->reserved_lkey = dev_ib_data.mkey;
+#endif
+       arbel->db_rec = dev_ib_data.uar_context_base;
        arbel->eqn = dev_ib_data.eq.eqn;
 
 
@@ -1912,7 +1982,8 @@ static int arbel_probe ( struct pci_device *pci,
        ib_driver_close ( 0 );
  err_ib_driver_init:
 
-       
+ err_setup_mpt:
+       arbel_cmd_close_hca ( arbel );
  err_init_hca:
        arbel_free_icm ( arbel );
  err_alloc_icm: