Matan Barak b4ff3a36d3
net/mlx5: Use offset based reserved field names in the IFC header file ...
mlx5_ifc.h is a header file representing the API and ABI between
the driver to the firmware and hardware. This file is used from
both the mlx5_ib and mlx5_core drivers.
Previously, this file used incrementing counter to indicate
reserved fields, for example:
struct mlx5_ifc_odp_per_transport_service_cap_bits {
u8 send[0x1];
u8 receive[0x1];
u8 write[0x1];
u8 read[0x1];
u8 reserved_0[0x1];
u8 srq_receive[0x1];
u8 reserved_1[0x1a];
};
If one developer implements through net-next feature A that uses
reserved_0, they replace it with featureA and renames reserved_1 to
reserved_0. In the same kernel cycle, a 2nd developer could implement
feature B through the rdma tree, that uses reserved_1 and split it to
featureB and a smaller reserved_1 field. This will cause a conflict
when the two trees are merged.
The source of this conflict is that the 1st developer changed *all*
reserved fields.
As Linus suggested, we change the layout of structs to:
struct mlx5_ifc_odp_per_transport_service_cap_bits {
u8 send[0x1];
u8 receive[0x1];
u8 write[0x1];
u8 read[0x1];
u8 reserved_at_4[0x1];
u8 srq_receive[0x1];
u8 reserved_at_6[0x1a];
};
This makes the conflicts much more rare and preserves the locality of
changes.
Signed-off-by: Matan Barak <matanb@mellanox.com >
Signed-off-by: Alaa Hleihel <alaa@mellanox.com >
Reported-by: Linus Torvalds <torvalds@linux-foundation.org >
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2016-02-16 15:21:47 -05:00
2015-12-13 19:59:48 -08:00
2015-12-14 10:11:09 -08:00
2015-10-09 07:49:01 -07:00
2016-02-04 18:26:08 +01:00
2016-01-20 18:03:56 -08:00
2016-02-04 18:25:55 +01:00
2015-10-17 21:22:08 -07:00
2015-09-30 19:22:50 +09:00
2015-10-07 18:08:15 +01:00
2015-12-11 16:56:16 +01:00
2016-01-13 16:00:32 +01:00
2015-11-21 18:42:00 +01:00
2015-10-20 18:10:25 +02:00
2015-12-22 17:04:56 +00:00
2015-09-27 17:33:59 -07:00
2015-12-29 10:08:45 +01:00
2016-01-07 10:10:50 -05:00
2016-01-18 12:10:45 -08:00
2016-01-23 18:45:06 -08:00
2016-02-16 15:21:47 -05:00
2016-01-05 18:04:58 +01:00
2016-01-07 09:55:39 -08:00
2015-12-28 18:43:15 +01:00
2015-09-18 21:57:43 +02:00
2015-09-18 21:57:35 +02:00
2015-09-18 21:57:43 +02:00
2015-09-18 21:57:43 +02:00
2015-11-16 15:41:49 +00:00
2015-12-21 14:26:28 +05:30
2015-10-27 11:24:23 +01:00
2016-01-24 12:50:56 -08:00
2015-12-05 02:06:51 +01:00
2015-12-17 22:08:28 -05:00
2016-01-21 14:47:08 -08:00
2016-01-12 18:26:10 +00:00
2015-09-23 09:51:25 +02:00
2016-01-20 18:42:30 -08:00
2016-01-11 16:48:35 +00:00
2015-12-16 16:36:25 +02:00
2016-01-23 18:45:06 -08:00
2016-01-13 09:26:40 -08:00
2016-01-12 01:10:19 +01:00
2015-12-23 08:37:10 -07:00
2016-01-04 16:19:57 +00:00
2015-10-06 12:33:14 +02:00
2016-01-14 13:40:30 +01:00
2015-11-03 17:22:17 -08:00
2016-01-17 19:13:15 -08:00
2015-10-12 10:31:12 -06:00
2015-11-05 14:51:32 -08:00
2016-01-09 08:39:04 -08:00
2015-12-13 15:55:55 +01:00
2016-01-24 03:47:37 +01:00
2016-01-24 03:49:03 +01:00
2015-12-03 09:32:21 -07:00
2015-12-09 10:35:16 -08:00
2015-12-22 09:38:34 -07:00
2015-10-27 15:04:56 +09:00
2015-12-01 10:53:59 -07:00
2016-01-21 19:58:02 -08:00
2015-09-29 13:37:04 -07:00
2015-12-06 12:46:31 +01:00
2015-11-25 12:14:09 -05:00
2015-11-25 11:35:14 -05:00
2015-11-11 02:19:33 -05:00
2015-11-18 11:20:40 +11:00
2015-12-03 10:24:08 -05:00
2016-01-22 10:42:57 -05:00
2016-01-12 19:20:32 -08:00
2016-01-27 09:10:29 -05:00
2015-12-23 13:08:56 -08:00
2015-09-14 11:00:55 +02:00
2015-11-25 22:28:30 +01:00
2015-10-23 17:55:10 +09:00
2015-11-05 19:34:48 -08:00
2015-11-06 17:50:42 -08:00
2015-12-04 10:33:41 +01:00
2015-12-07 00:02:05 +00:00
2016-01-20 17:20:53 -08:00
2016-01-16 11:17:25 -08:00
2015-11-24 09:56:43 +01:00
2015-12-04 10:34:45 +01:00
2015-10-07 17:54:09 +01:00
2015-10-15 00:21:07 +02:00
2015-10-07 16:02:49 -07:00
2016-01-01 03:49:51 +01:00
2015-08-28 15:14:54 +02:00
2016-01-20 17:09:18 -08:00
2016-01-22 10:22:46 -05:00
2015-09-04 16:54:41 -07:00
2016-01-30 13:35:32 -08:00
2015-11-16 09:27:32 +05:30
2016-01-14 16:00:49 -08:00
2015-10-09 07:49:02 -07:00
2015-10-18 10:14:39 -07:00
2015-12-30 13:01:03 -05:00
2015-11-02 13:14:44 -08:00
2016-01-13 17:30:32 +09:00
2015-10-31 19:05:59 -04:00
2016-01-08 01:12:06 +01:00
2015-10-15 13:22:35 +01:00
2016-01-20 17:09:18 -08:00
2015-10-23 17:55:10 +09:00
2015-10-15 16:41:04 +02:00
2016-01-20 17:09:18 -08:00
2016-01-06 15:17:47 +05:30
2015-09-08 15:35:28 -07:00
2016-01-15 22:08:45 +01:00
2015-11-18 16:27:46 -05:00
2016-01-04 10:58:35 +01:00
2015-11-25 09:22:00 -07:00
2015-11-25 09:22:02 -07:00
2015-12-11 16:56:40 +01:00
2015-10-28 12:28:06 +01:00
2015-12-11 11:05:57 -08:00
2016-01-16 11:17:24 -08:00
2016-01-06 16:31:56 -05:00
2015-12-15 08:53:36 -05:00
2015-10-16 08:30:09 +09:00
2015-12-14 18:58:42 -08:00
2015-10-04 11:36:07 +01:00
2015-12-15 15:41:24 +02:00
2015-10-31 16:12:10 -07:00
2015-10-30 01:47:27 -04:00
2016-01-08 21:40:34 -05:00
2016-01-30 13:35:31 -08:00
2016-01-14 16:00:49 -08:00
2016-01-28 17:00:50 -08:00
2015-11-04 18:10:13 -08:00
2015-12-22 17:10:17 -06:00
2015-10-09 07:48:59 -07:00
2016-01-09 22:42:31 -08:00
2016-02-05 18:10:40 -08:00
2015-11-18 16:17:42 -05:00
2015-12-05 17:41:42 -05:00
2015-12-28 13:41:50 +01:00
2015-11-09 15:11:24 -08:00
2016-01-17 11:13:55 +01:00
2016-01-21 17:20:51 -08:00
2015-11-06 17:50:42 -08:00
2016-01-15 17:56:32 -08:00
2015-12-21 13:07:56 -08:00
2015-10-20 17:47:45 +02:00
2016-01-13 11:06:03 +01:00
2015-11-25 09:22:00 -07:00
2015-10-13 10:34:46 +02:00
2015-09-24 20:42:37 +02:00
2015-09-23 14:35:58 -07:00
2015-10-23 05:44:28 -07:00
2015-11-20 11:31:26 -05:00
2015-12-03 11:49:26 -05:00
2015-12-15 16:50:20 -05:00
2015-09-29 16:27:47 -07:00
2015-12-15 23:26:51 -05:00
2015-10-09 07:49:05 -07:00
2015-12-04 10:34:46 +01:00
2015-10-13 23:30:31 -07:00
2015-10-15 15:35:32 +01:00
2015-10-27 08:36:08 +09:00
2016-01-23 18:45:06 -08:00
2015-10-15 00:21:07 +02:00
2015-10-15 00:21:07 +02:00
2016-01-20 17:09:18 -08:00
2015-11-04 11:30:57 -08:00
2016-01-29 12:34:29 +01:00
2015-10-16 22:18:51 +02:00
2015-10-04 12:46:06 +01:00
2015-09-03 15:02:28 -05:00
2015-12-02 23:37:16 -05:00
2015-12-11 11:52:29 -08:00
2015-10-11 11:33:42 +02:00
2015-10-01 15:06:43 +02:00
2015-10-01 02:18:38 +02:00
2015-12-14 10:03:46 +01:00
2016-01-26 16:00:14 +01:00
2015-09-16 15:47:51 +02:00
2015-10-30 10:13:26 +01:00
2015-10-18 17:02:56 -04:00
2015-09-01 14:04:50 -07:00
2015-11-23 09:44:58 +01:00
2016-01-16 11:17:23 -08:00
2016-01-16 11:17:22 -08:00
2015-11-20 15:55:52 -05:00
2016-01-20 17:09:18 -08:00
2015-10-21 15:18:36 +01:00
2015-12-15 10:01:43 -05:00
2015-12-12 10:15:34 -08:00
2015-09-10 13:29:01 -07:00
2015-10-04 11:46:16 +01:00
2015-11-28 19:33:29 -08:00
2015-09-04 16:54:41 -07:00
2016-01-15 17:56:32 -08:00
2015-10-01 15:06:46 +02:00
2015-11-25 17:24:23 +01:00
2016-01-15 17:56:32 -08:00
2016-01-04 09:57:40 +01:00
2016-01-25 15:20:44 -05:00
2016-01-09 08:39:03 -08:00
2016-01-13 13:04:11 -07:00
2015-11-23 10:37:35 -08:00
2016-01-20 17:09:18 -08:00
2015-11-23 10:37:35 -08:00
2016-01-15 17:56:32 -08:00
2015-12-03 23:01:27 +01:00
2015-11-23 09:44:58 +01:00
2015-11-25 09:22:02 -07:00
2015-12-24 11:09:40 -05:00
2016-01-20 17:09:18 -08:00
2015-11-17 15:25:43 -05:00
2015-11-10 12:06:16 +01:00
2016-01-07 14:31:27 -05:00
2015-09-20 19:31:10 -07:00
2016-01-15 17:56:32 -08:00
2016-02-03 08:28:43 -08:00
2016-01-15 17:56:32 -08:00
2016-01-14 16:00:49 -08:00
2016-01-15 17:56:32 -08:00
2015-10-04 12:46:06 +01:00
2015-09-09 17:19:14 -07:00
2015-10-27 18:55:31 -07:00
2016-01-14 16:00:49 -08:00
2016-02-03 08:28:43 -08:00
2016-02-03 08:28:43 -08:00
2016-01-15 17:56:32 -08:00
2015-09-10 13:29:01 -07:00
2016-02-03 08:28:43 -08:00
2015-12-14 19:15:05 -08:00
2016-02-03 16:58:15 +10:30
2015-11-06 17:50:42 -08:00
2015-10-20 22:10:45 +08:00
2015-11-30 15:26:22 -05:00
2016-01-21 11:52:16 -08:00
2015-10-17 21:11:29 -07:00
2016-01-09 03:07:52 -05:00
2015-12-01 15:45:05 -05:00
2015-12-15 16:50:20 -05:00
2016-01-24 22:19:55 -08:00
2015-09-17 17:18:37 -07:00
2015-11-06 19:33:12 +01:00
2015-09-29 20:21:32 +02:00
2015-09-30 01:45:03 -05:00
2015-10-16 18:45:36 +02:00
2015-12-15 23:25:20 -05:00
2016-01-14 16:08:23 -08:00
2015-12-28 09:57:15 -05:00
2016-01-14 16:08:23 -08:00
2016-01-04 13:19:55 -05:00
2015-11-05 19:34:48 -08:00
2015-09-07 15:17:08 -04:00
2015-09-07 15:17:09 -04:00
2015-12-01 10:59:38 -07:00
2015-12-17 10:43:06 -06:00
2015-11-16 09:03:21 +05:30
2016-01-05 11:20:12 +01:00
2015-12-09 09:23:28 -06:00
2016-01-15 12:30:35 -06:00
2016-01-25 08:35:50 -06:00
2015-09-01 09:59:20 +10:00
2015-12-18 11:17:26 +05:30
2015-10-08 05:26:36 -07:00
2015-09-08 15:35:28 -07:00
2015-11-05 19:34:48 -08:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2016-01-15 17:56:32 -08:00
2015-09-08 15:35:28 -07:00
2015-11-06 17:50:42 -08:00
2016-01-22 17:02:18 -08:00
2016-01-15 17:29:37 -06:00
2015-10-16 22:18:51 +02:00
2016-01-21 11:52:16 -08:00
2015-11-16 10:40:50 -05:00
2015-10-06 11:25:31 -07:00
2015-11-16 10:50:25 -05:00
2016-01-29 08:35:35 +01:00
2016-01-31 09:10:19 -08:00
2016-01-15 17:56:32 -08:00
2015-08-31 14:48:02 -07:00
2016-01-07 14:31:27 -05:00
2015-11-30 15:26:22 -05:00
2016-01-19 19:25:21 -05:00
2016-01-12 20:25:09 -08:00
2016-01-08 01:12:06 +01:00
2015-12-10 23:08:51 +01:00
2015-12-21 03:11:12 +01:00
2016-01-08 01:12:06 +01:00
2016-01-22 17:02:18 -08:00
2016-01-16 11:17:22 -08:00
2015-12-06 21:25:17 -05:00
2016-01-02 00:29:35 +01:00
2015-10-01 09:59:16 -07:00
2015-10-21 14:46:56 -06:00
2015-10-06 17:08:19 +02:00
2016-01-16 11:17:29 -08:00
2016-01-01 02:09:51 +01:00
2015-11-23 09:44:58 +01:00
2015-10-02 14:35:16 +01:00
2015-10-22 08:59:18 -07:00
2015-11-03 11:08:22 -05:00
2016-01-20 17:09:18 -08:00
2015-11-10 13:06:16 +01:00
2015-10-30 11:18:05 +09:00
2015-10-14 14:51:22 -05:00
2016-02-05 18:10:40 -08:00
2015-10-08 05:26:38 -07:00
2016-01-20 17:09:18 -08:00
2015-10-06 11:25:45 -07:00
2015-12-07 17:02:54 -08:00
2015-12-07 17:02:54 -08:00
2015-12-07 17:01:31 -08:00
2015-12-07 17:01:31 -08:00
2016-01-05 19:07:17 +00:00
2015-11-16 09:23:47 +01:00
2015-12-17 22:08:28 -05:00
2015-11-02 14:23:38 -05:00
2016-02-05 18:10:40 -08:00
2015-10-16 15:32:18 -07:00
2016-01-10 22:13:15 -05:00
2015-12-15 09:41:09 +01:00
2016-01-22 10:24:03 -08:00
2015-10-04 12:54:54 +01:00
2015-11-19 16:22:43 +01:00
2015-10-27 19:55:13 -07:00
2015-12-24 11:09:40 -05:00
2015-09-11 15:21:34 -07:00
2015-12-13 19:59:48 -08:00
2015-12-17 11:18:44 +01:00
2015-11-24 11:48:35 +09:00
2016-01-04 16:11:11 -05:00
2016-01-20 17:09:18 -08:00
2016-01-22 18:08:52 -05:00
2015-11-20 16:17:32 -08:00
2016-02-09 04:28:06 -05:00
2016-01-20 17:09:18 -08:00
2016-01-20 17:09:18 -08:00
2016-01-20 17:09:18 -08:00
2015-10-20 10:23:55 +02:00
2015-12-15 23:26:51 -05:00
2015-09-01 08:40:25 -07:00
2015-09-20 19:32:02 -07:00
2015-10-06 11:15:43 -07:00
2015-10-04 20:28:58 +01:00
2016-01-06 11:02:29 +01:00
2015-09-10 13:29:01 -07:00
2016-01-04 10:20:19 -05:00
2015-10-26 10:11:58 +09:00
2015-10-14 02:17:33 +02:00
2016-01-20 17:09:18 -08:00
2015-09-08 15:35:28 -07:00
2016-01-20 17:29:52 -05:00
2015-12-01 14:00:53 -05:00
2015-11-13 21:53:18 -08:00
2015-10-21 14:42:38 -06:00
2015-11-05 14:36:09 -05:00
2015-12-29 16:00:00 +08:00
2016-01-14 16:00:49 -08:00
2015-09-20 22:52:13 -07:00
2016-01-15 22:34:39 +01:00
2015-12-10 22:41:06 -08:00
2015-10-01 09:59:01 -07:00
2015-10-01 09:57:59 -07:00
2016-01-18 14:49:33 -05:00
2015-10-19 01:01:21 +02:00
2015-10-25 21:33:56 -04:00
2015-11-05 19:34:48 -08:00
2015-12-06 12:56:06 +01:00
2016-01-12 20:04:15 -08:00
2016-01-26 23:17:54 -08:00
2015-11-25 15:49:13 +00:00
2015-12-17 09:57:27 -08:00
2015-12-18 17:48:50 -08:00
2015-12-06 20:42:15 -05:00
2015-11-23 09:44:58 +01:00
2015-12-01 14:58:18 -08:00
2015-09-04 16:54:41 -07:00
2015-12-21 15:28:11 -07:00
2015-11-05 11:07:36 +10:00
2015-12-04 10:38:59 -02:00
2016-01-12 20:47:06 +02:00
2016-01-12 20:47:02 +02:00
2016-01-15 17:56:32 -08:00
2016-01-14 16:00:49 -08:00
2015-10-17 22:03:00 -07:00
2016-01-14 16:00:49 -08:00
2016-01-14 16:00:49 -08:00
2015-12-04 10:34:45 +01:00
2016-01-12 18:57:02 -08:00
2016-01-11 21:53:59 +01:00
2015-12-03 07:24:29 -08:00
2016-01-29 13:31:10 -05:00
2015-12-13 19:46:12 -05:00
2015-09-08 15:35:28 -07:00
2015-11-06 17:50:42 -08:00
2015-11-06 17:50:42 -08:00
2015-11-06 17:50:42 -08:00
b4ff3a36d3