INIT_HCA block now matches.

diff --git a/src/drivers/net/mlx_ipoib/ib_mt25218.c b/src/drivers/net/mlx_ipoib/ib_mt25218.c
index caf924a3528ce252ab75df12029aaae2d888dda0..9473af89c4621000386dad359e7baf402140bc88 100644 (file)
--- a/src/drivers/net/mlx_ipoib/ib_mt25218.c
+++ b/src/drivers/net/mlx_ipoib/ib_mt25218.c
@@ -811,6 +811,7 @@ static int setup_hca(__u8 port, void **eq_p)
        DBG ( "mpt_base_addr_l = %lx\n", icm_start );
        init_hca.mpt_base_addr_l = icm_start;
        init_hca.log_mpt_sz = log2_entries;
+       DBG ( "log2_entries for mpt = %d\n", log2_entries );
        icm_start += (tmp << 12);
        icm_size += (tmp << 12);
 

diff --git a/src/drivers/net/mlx_ipoib/mt25218.c b/src/drivers/net/mlx_ipoib/mt25218.c
index 1f343d62cfc217bc81149d8279d54d19ee854e1a..f9a0bb1bbb4e18d70d4f6097f211eae6772535a6 100644 (file)
--- a/src/drivers/net/mlx_ipoib/mt25218.c
+++ b/src/drivers/net/mlx_ipoib/mt25218.c
@@ -169,7 +169,7 @@ static int arbel_cmd ( struct arbel *arbel, unsigned long command,
        DBGC2_HD ( arbel, &hcr, sizeof ( hcr ) );
        if ( in_len ) {
                DBGC2 ( arbel, "Input:\n" );
-               DBGC2_HD ( arbel, in, ( ( in_len < 256 ) ? in_len : 256 ) );
+               DBGC2_HD ( arbel, in, ( ( in_len < 512 ) ? in_len : 512 ) );
        }
 
        /* Issue command */
@@ -203,7 +203,7 @@ static int arbel_cmd ( struct arbel *arbel, unsigned long command,
        memcpy ( out, out_buffer, out_len );
        if ( out_len ) {
                DBGC2 ( arbel, "Output:\n" );
-               DBGC2_HD ( arbel, out, ( ( out_len < 256 ) ? out_len : 256 ) );
+               DBGC2_HD ( arbel, out, ( ( out_len < 512 ) ? out_len : 512 ) );
        }
 
        return 0;
@@ -1682,7 +1682,7 @@ static int arbel_alloc_icm ( struct arbel *arbel,
        icm_offset += icm_usage ( log_num_mtts, arbel->limits.mtt_entry_size );
 
        /* Memory protection table */
-       log_num_mpts = fls ( arbel->limits.reserved_mrws - 1 );
+       log_num_mpts = fls ( arbel->limits.reserved_mrws + 1 - 1 );
        MLX_FILL_1 ( init_hca, 61,
                     tpt_parameters.mpt_base_adr_l, icm_offset );
        MLX_FILL_1 ( init_hca, 62,
@@ -1872,6 +1872,7 @@ static int arbel_probe ( struct pci_device *pci,
                goto err_alloc_icm;
 
        /* Initialise HCA */
+       MLX_FILL_1 ( &init_hca, 74, uar_parameters.log_max_uars, 1 );
        if ( ( rc = arbel_cmd_init_hca ( arbel, &init_hca ) ) != 0 ) {
                DBGC ( arbel, "Arbel %p could not initialise HCA: %s\n",
                       arbel, strerror ( rc ) );