Skip to contentSkip to conversation

net/mlx5: Fix XRC SRQ umem valid bits

PATCH In review Leon Romanovsky 4 participants 7 messages Oct 31, 2018 – Nov 7, 2018

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: Fix XRC SRQ umem valid bits

From: Yishai Hadas <[email protected]>

Adapt XRC SRQ to the latest HW specification with fixed definition around umem valid bits. The previous definition relied on a bit which was taken for other purposes in legacy FW.

Fixes bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits")

---
Hi Doug, Jason

This commit fixes code sent in this merge window, so I'm not marking it with any rdma-rc/rdma-next. It will be better to be sent during this merge window if you have extra pull request to issue, or as a -rc material, if not.

BTW, we didn't combine reserved fields, because our convention is to align such fields to 32 bits for better readability.

Thanks

---
 include/linux/mlx5/mlx5_ifc.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
include/linux/mlx5/mlx5_ifc.h +8 -4
index 0f460fb22c31..248116bc13a8 100644
@@ -2470,14 +2470,15 @@ struct mlx5_ifc_xrc_srqc_bits {
 
 	u8         wq_signature[0x1];
 	u8         cont_srq[0x1];
-	u8         dbr_umem_valid[0x1];
+	u8         reserved_at_22[0x1];
 	u8         rlky[0x1];
 	u8         basic_cyclic_rcv_wqe[0x1];
 	u8         log_rq_stride[0x3];
 	u8         xrcd[0x18];
 
 	u8         page_offset[0x6];
-	u8         reserved_at_46[0x2];
+	u8         reserved_at_46[0x1];
+	u8         dbr_umem_valid[0x1];
 	u8         cqn[0x18];
 
 	u8         reserved_at_60[0x20];
@@ -6685,9 +6686,12 @@ struct mlx5_ifc_create_xrc_srq_in_bits {
 
 	struct mlx5_ifc_xrc_srqc_bits xrc_srq_context_entry;
 
-	u8         reserved_at_280[0x40];
+	u8         reserved_at_280[0x60];
+
 	u8         xrc_srq_umem_valid[0x1];
-	u8         reserved_at_2c1[0x5bf];
+	u8         reserved_at_2e1[0x1f];
+
+	u8         reserved_at_300[0x580];
 
 	u8         pas[0][0x40];
 };
#1 lore raw
Quoted 18 lines · Leon Romanovsky

From: Yishai Hadas <[email protected]>

Adapt XRC SRQ to the latest HW specification with fixed definition around umem valid bits. The previous definition relied on a bit which was taken for other purposes in legacy FW.

Fixes bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits")

---
Hi Doug, Jason

This commit fixes code sent in this merge window, so I'm not marking it with any rdma-rc/rdma-next. It will be better to be sent during this merge window if you have extra pull request to issue, or as a -rc material, if not.

Quoted 4 lines

BTW, we didn't combine reserved fields, because our convention is to align such fields to 32 bits for better readability.

Thanks

This looks fine. Let me know when it's in the mlx5-next tree to pull.

Signature · 3 lines
Doug Ledford <[email protected]>
    GPG KeyID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD
#2 lore raw
Quoted 18 lines · Doug Ledford
Quoted 17 lines · Leon Romanovsky

From: Yishai Hadas <[email protected]>

Adapt XRC SRQ to the latest HW specification with fixed definition around umem valid bits. The previous definition relied on a bit which was taken for other purposes in legacy FW.

Fixes bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits")

Hi Doug, Jason

This commit fixes code sent in this merge window, so I'm not marking it with any rdma-rc/rdma-next. It will be better to be sent during this merge window if you have extra pull request to issue, or as a -rc material, if not.

Quoted 6 lines
Quoted 4 lines

BTW, we didn't combine reserved fields, because our convention is to align such fields to 32 bits for better readability.

Thanks

This looks fine. Let me know when it's in the mlx5-next tree to pull.

It needs to go to -rc...

This needs a mlx5-rc branch for this I guess?

Jason

#3 lore raw
Quoted 22 lines · Jason Gunthorpe
Quoted 21 lines · Doug Ledford
Quoted 20 lines · Leon Romanovsky

From: Yishai Hadas <[email protected]>

Adapt XRC SRQ to the latest HW specification with fixed definition around umem valid bits. The previous definition relied on a bit which was taken for other purposes in legacy FW.

Fixes bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits")

Hi Doug, Jason

This commit fixes code sent in this merge window, so I'm not marking it with any rdma-rc/rdma-next. It will be better to be sent during this merge window if you have extra pull request to issue, or as a -rc material, if not.

BTW, we didn't combine reserved fields, because our convention is to align such fields to 32 bits for better readability.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Thanks

This looks fine. Let me know when it's in the mlx5-next tree to pull.

It needs to go to -rc...

This needs a mlx5-rc branch for this I guess?

I don't think so. As long as it's the first commit in mlx5-next, and mlx5-next is 4.20-rc1 based, then pulling this commit into the -rc tree will only pull the single commit. Then when we pull into for-next for the first time, we will get this in for-next too. That seems best to me.

Signature · 3 lines
Doug Ledford <[email protected]>
    GPG KeyID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD
#4 lore raw
Quoted 29 lines · Doug Ledford
Quoted 28 lines · Jason Gunthorpe
Quoted 18 lines · Doug Ledford
Quoted 17 lines · Leon Romanovsky

From: Yishai Hadas <[email protected]>

Adapt XRC SRQ to the latest HW specification with fixed definition around umem valid bits. The previous definition relied on a bit which was taken for other purposes in legacy FW.

Fixes bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits")

Hi Doug, Jason

This commit fixes code sent in this merge window, so I'm not marking it with any rdma-rc/rdma-next. It will be better to be sent during this merge window if you have extra pull request to issue, or as a -rc material, if not.

Quoted 6 lines
Quoted 4 lines

BTW, we didn't combine reserved fields, because our convention is to align such fields to 32 bits for better readability.

Thanks

This looks fine. Let me know when it's in the mlx5-next tree to pull.

It needs to go to -rc...

Quoted 7 lines
Quoted 1 line

This needs a mlx5-rc branch for this I guess?

I don't think so. As long as it's the first commit in mlx5-next, and mlx5-next is 4.20-rc1 based, then pulling this commit into the -rc tree will only pull the single commit. Then when we pull into for-next for the first time, we will get this in for-next too. That seems best to me.

That works too, if Leon is fast :)

Jason

#5 lore raw
Quoted 32 lines · Jason Gunthorpe
Quoted 31 lines · Doug Ledford
Quoted 29 lines · Jason Gunthorpe
Quoted 18 lines · Doug Ledford
Quoted 17 lines · Leon Romanovsky

From: Yishai Hadas <[email protected]>

Adapt XRC SRQ to the latest HW specification with fixed definition around umem valid bits. The previous definition relied on a bit which was taken for other purposes in legacy FW.

Fixes bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits")

Hi Doug, Jason

This commit fixes code sent in this merge window, so I'm not marking it with any rdma-rc/rdma-next. It will be better to be sent during this merge window if you have extra pull request to issue, or as a -rc material, if not.

Quoted 6 lines
Quoted 4 lines

BTW, we didn't combine reserved fields, because our convention is to align such fields to 32 bits for better readability.

Thanks

This looks fine. Let me know when it's in the mlx5-next tree to pull.

It needs to go to -rc...

This needs a mlx5-rc branch for this I guess?

Quoted 7 lines
Quoted 5 lines

I don't think so. As long as it's the first commit in mlx5-next, and mlx5-next is 4.20-rc1 based, then pulling this commit into the -rc tree will only pull the single commit. Then when we pull into for-next for the first time, we will get this in for-next too. That seems best to me.

That works too, if Leon is fast :)

Thank you both for suggestion.

I did it.
99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits

It is first commit and it is based on -rc1.

Thanks

Quoted 2 lines

Jason

#6 lore raw
Quoted 39 lines · Leon Romanovsky
Quoted 38 lines · Jason Gunthorpe
Quoted 36 lines · Doug Ledford
Quoted 22 lines · Jason Gunthorpe
Quoted 21 lines · Doug Ledford
Quoted 20 lines · Leon Romanovsky

From: Yishai Hadas <[email protected]>

Adapt XRC SRQ to the latest HW specification with fixed definition around umem valid bits. The previous definition relied on a bit which was taken for other purposes in legacy FW.

Fixes bd37197554eb ("net/mlx5: Update mlx5_ifc with DEVX UID bits")

Hi Doug, Jason

This commit fixes code sent in this merge window, so I'm not marking it with any rdma-rc/rdma-next. It will be better to be sent during this merge window if you have extra pull request to issue, or as a -rc material, if not.

BTW, we didn't combine reserved fields, because our convention is to align such fields to 32 bits for better readability.

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Thanks

This looks fine. Let me know when it's in the mlx5-next tree to pull.

It needs to go to -rc...

This needs a mlx5-rc branch for this I guess?

I don't think so. As long as it's the first commit in mlx5-next, and mlx5-next is 4.20-rc1 based, then pulling this commit into the -rc tree will only pull the single commit. Then when we pull into for-next for the first time, we will get this in for-next too. That seems best to me.

Quoted 8 lines
Quoted 1 line

That works too, if Leon is fast :)

Thank you both for suggestion.

I did it.
99b77fef3c6c net/mlx5: Fix XRC SRQ umem valid bits

It is first commit and it is based on -rc1.

Okay, I put this branch in -rc

Jason