]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'mini_cqe' into git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma...
authorJason Gunthorpe <jgg@mellanox.com>
Tue, 29 May 2018 21:23:18 +0000 (15:23 -0600)
committerJason Gunthorpe <jgg@mellanox.com>
Tue, 29 May 2018 21:23:18 +0000 (15:23 -0600)
Leon Romanovsky says:

====================
Introduce new internal to mlx5 CQE format - mini-CQE. It is a CQE in
compressed form that holds data needed to extra a single full CQE.

It is a stride index, byte count and packet checksum.
====================

* mini_cqe:
  IB/mlx5: Introduce a new mini-CQE format
  IB/mlx5: Refactor CQE compression response
  net/mlx5: Exposing a new mini-CQE format

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
1  2 
drivers/infiniband/hw/mlx5/cq.c
drivers/infiniband/hw/mlx5/main.c
include/linux/mlx5/mlx5_ifc.h
include/uapi/rdma/mlx5-abi.h

Simple merge
Simple merge
index 01271716c5adec71e86b73b30f8e9bb672a88fd5,10c1613d94345418a5d4a5d152c3d1731b1112a0..16876fe1710bd916ba313af532f967a9f297a145
@@@ -1139,11 -1110,10 +1139,12 @@@ struct mlx5_ifc_cmd_hca_cap_bits 
  
        u8         reserved_at_500[0x20];
        u8         num_of_uars_per_page[0x20];
 -      u8         reserved_at_540[0x40];
 +
 +      u8         flex_parser_protocols[0x20];
 +      u8         reserved_at_560[0x20];
  
-       u8         reserved_at_580[0x3d];
+       u8         reserved_at_580[0x3c];
+       u8         mini_cqe_resp_stride_index[0x1];
        u8         cqe_128_always[0x1];
        u8         cqe_compression_128[0x1];
        u8         cqe_compression[0x1];
Simple merge