From: Doug Ledford <dledford@redhat.com>
Date: Thu, 4 Aug 2016 00:58:45 +0000 (-0400)
Subject: Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e5e8e8a9a059c15881abd582edcaf4d2f736caf;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'cxgb4' and 'mlx5' into k.o/for-4.8
---

3e5e8e8a9a059c15881abd582edcaf4d2f736caf
diff --cc drivers/infiniband/hw/mlx5/main.c
index f783e18aa413,b48ad85315dc,1354722e97c5..335fc541d62e
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@@@ -2539,113 -2301,6 -2541,113 +2539,113 @@@@ static void mlx5_disable_roce(struct ml
   	unregister_netdevice_notifier(&dev->roce.nb);
   }
   
 + static void mlx5_ib_dealloc_q_counters(struct mlx5_ib_dev *dev)
 + {
 + 	unsigned int i;
 + 
 + 	for (i = 0; i < dev->num_ports; i++)
 + 		mlx5_core_dealloc_q_counter(dev->mdev,
 + 					    dev->port[i].q_cnt_id);
 + }
 + 
 + static int mlx5_ib_alloc_q_counters(struct mlx5_ib_dev *dev)
 + {
 + 	int i;
 + 	int ret;
 + 
 + 	for (i = 0; i < dev->num_ports; i++) {
 + 		ret = mlx5_core_alloc_q_counter(dev->mdev,
 + 						&dev->port[i].q_cnt_id);
 + 		if (ret) {
 + 			mlx5_ib_warn(dev,
 + 				     "couldn't allocate queue counter for port %d, err %d\n",
 + 				     i + 1, ret);
 + 			goto dealloc_counters;
 + 		}
 + 	}
 + 
 + 	return 0;
 + 
 + dealloc_counters:
 + 	while (--i >= 0)
 + 		mlx5_core_dealloc_q_counter(dev->mdev,
 + 					    dev->port[i].q_cnt_id);
 + 
 + 	return ret;
 + }
 + 
-  static const char const *names[] = {
++ static const char * const names[] = {
 + 	"rx_write_requests",
 + 	"rx_read_requests",
 + 	"rx_atomic_requests",
 + 	"out_of_buffer",
 + 	"out_of_sequence",
 + 	"duplicate_request",
 + 	"rnr_nak_retry_err",
 + 	"packet_seq_err",
 + 	"implied_nak_seq_err",
 + 	"local_ack_timeout_err",
 + };
 + 
 + static const size_t stats_offsets[] = {
 + 	MLX5_BYTE_OFF(query_q_counter_out, rx_write_requests),
 + 	MLX5_BYTE_OFF(query_q_counter_out, rx_read_requests),
 + 	MLX5_BYTE_OFF(query_q_counter_out, rx_atomic_requests),
 + 	MLX5_BYTE_OFF(query_q_counter_out, out_of_buffer),
 + 	MLX5_BYTE_OFF(query_q_counter_out, out_of_sequence),
 + 	MLX5_BYTE_OFF(query_q_counter_out, duplicate_request),
 + 	MLX5_BYTE_OFF(query_q_counter_out, rnr_nak_retry_err),
 + 	MLX5_BYTE_OFF(query_q_counter_out, packet_seq_err),
 + 	MLX5_BYTE_OFF(query_q_counter_out, implied_nak_seq_err),
 + 	MLX5_BYTE_OFF(query_q_counter_out, local_ack_timeout_err),
 + };
 + 
 + static struct rdma_hw_stats *mlx5_ib_alloc_hw_stats(struct ib_device *ibdev,
 + 						    u8 port_num)
 + {
 + 	BUILD_BUG_ON(ARRAY_SIZE(names) != ARRAY_SIZE(stats_offsets));
 + 
 + 	/* We support only per port stats */
 + 	if (port_num == 0)
 + 		return NULL;
 + 
 + 	return rdma_alloc_hw_stats_struct(names, ARRAY_SIZE(names),
 + 					  RDMA_HW_STATS_DEFAULT_LIFESPAN);
 + }
 + 
 + static int mlx5_ib_get_hw_stats(struct ib_device *ibdev,
 + 				struct rdma_hw_stats *stats,
 + 				u8 port, int index)
 + {
 + 	struct mlx5_ib_dev *dev = to_mdev(ibdev);
 + 	int outlen = MLX5_ST_SZ_BYTES(query_q_counter_out);
 + 	void *out;
 + 	__be32 val;
 + 	int ret;
 + 	int i;
 + 
 + 	if (!port || !stats)
 + 		return -ENOSYS;
 + 
 + 	out = mlx5_vzalloc(outlen);
 + 	if (!out)
 + 		return -ENOMEM;
 + 
 + 	ret = mlx5_core_query_q_counter(dev->mdev,
 + 					dev->port[port - 1].q_cnt_id, 0,
 + 					out, outlen);
 + 	if (ret)
 + 		goto free;
 + 
 + 	for (i = 0; i < ARRAY_SIZE(names); i++) {
 + 		val = *(__be32 *)(out + stats_offsets[i]);
 + 		stats->value[i] = (u64)be32_to_cpu(val);
 + 	}
 + free:
 + 	kvfree(out);
 + 	return ARRAY_SIZE(names);
 + }
 + 
   static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
   {
   	struct mlx5_ib_dev *dev;