libnvme/cmds: change copy desc format 0h and 2h elbt to big-endian

Since the format 1h and 3h elbt values are set as big-endian.
Also change the field name eilbrt to elbt as following spec.

Signed-off-by: Tokunori Ikegami <[email protected]>

Author: ikegami-t

libnvme/src/nvme/cmds.c

@@ -424,15 +424,15 @@ static inline void nvme_init_copy_range_elbt(__u8 *elbt, __u64 eilbrt)
 }
 
 void nvme_init_copy_range(struct nvme_copy_range *copy, __u16 *nlbs,
-			  __u64 *slbas, __u32 *eilbrts, __u32 *elbatms,
+			  __u64 *slbas, __u32 *elbts, __u32 *elbatms,
 			  __u32 *elbats, __u16 nr)
 {
 	int i;
 
 	for (i = 0; i < nr; i++) {
 		copy[i].nlb = cpu_to_le16(nlbs[i]);
 		copy[i].slba = cpu_to_le64(slbas[i]);
-		copy[i].eilbrt = cpu_to_le32(eilbrts[i]);
+		copy[i].elbt = cpu_to_be32(elbts[i]);
 		copy[i].elbatm = cpu_to_le16(elbatms[i]);
 		copy[i].elbat = cpu_to_le16(elbats[i]);
 	}
@@ -455,7 +455,7 @@ void nvme_init_copy_range_f1(struct nvme_copy_range_f1 *copy, __u16 *nlbs,
 
 void nvme_init_copy_range_f2(struct nvme_copy_range_f2 *copy, __u32 *snsids,
 			  __u16 *nlbs, __u64 *slbas, __u16 *sopts,
-			  __u32 *eilbrts, __u32 *elbatms, __u32 *elbats,
+			  __u32 *elbts, __u32 *elbatms, __u32 *elbats,
 			  __u16 nr)
 {
 	int i;
@@ -465,7 +465,7 @@ void nvme_init_copy_range_f2(struct nvme_copy_range_f2 *copy, __u32 *snsids,
 		copy[i].nlb = cpu_to_le16(nlbs[i]);
 		copy[i].slba = cpu_to_le64(slbas[i]);
 		copy[i].sopt = cpu_to_le16(sopts[i]);
-		copy[i].eilbrt = cpu_to_le32(eilbrts[i]);
+		copy[i].elbt = cpu_to_be32(elbts[i]);
 		copy[i].elbatm = cpu_to_le16(elbatms[i]);
 		copy[i].elbat = cpu_to_le16(elbats[i]);
 	}

libnvme/src/nvme/cmds.h

@@ -7150,13 +7150,13 @@ void nvme_init_dsm_range(struct nvme_dsm_range *dsm, __u32 *ctx_attrs,
  * @copy:	Copy range array
  * @nlbs:	Number of logical blocks
  * @slbas:	Starting LBA
- * @eilbrts:	Expected initial logical block reference tag
+ * @elbts:	Expected initial logical block reference tag
  * @elbatms:	Expected logical block application tag mask
  * @elbats:	Expected logical block application tag
  * @nr:		Number of descriptors to construct
  */
 void nvme_init_copy_range(struct nvme_copy_range *copy, __u16 *nlbs,
-			  __u64 *slbas, __u32 *eilbrts, __u32 *elbatms,
+			  __u64 *slbas, __u32 *elbts, __u32 *elbatms,
 			  __u32 *elbats, __u16 nr);
 
 /**
@@ -7197,14 +7197,14 @@ void nvme_init_copy_range_f2(struct nvme_copy_range_f2 *copy, __u32 *snsids,
  * @nlbs:	Number of logical blocks
  * @slbas:	Starting LBA
  * @sopts:	Source options
- * @eilbrts:	Expected initial logical block reference tag
+ * @elbts:	Expected initial logical block reference tag
  * @elbatms:	Expected logical block application tag mask
  * @elbats:	Expected logical block application tag
  * @nr:		Number of descriptors to construct
  */
 void nvme_init_copy_range_f3(struct nvme_copy_range_f3 *copy, __u32 *snsids,
 			     __u16 *nlbs, __u64 *slbas, __u16 *sopts,
-			     __u64 *eilbrts, __u32 *elbatms, __u32 *elbats,
+			     __u64 *elbts, __u32 *elbatms, __u32 *elbats,
 			     __u16 nr);
 
 /**

libnvme/src/nvme/types.h

@@ -6392,7 +6392,7 @@ struct nvme_dsm_range {
  * @slba:	Starting LBA
  * @nlb:	Number of Logical Blocks
  * @rsvd18:	Reserved
- * @eilbrt:	Expected Initial Logical Block Reference Tag /
+ * @elbt:	Expected Initial Logical Block Reference Tag /
  *		Expected Logical Block Storage Tag
  * @elbatm:	Expected Logical Block Application Tag Mask
  * @elbat:	Expected Logical Block Application Tag
@@ -6402,7 +6402,7 @@ struct nvme_copy_range {
 	__le64			slba;
 	__le16			nlb;
 	__u8			rsvd18[6];
-	__le32			eilbrt;
+	__be32			elbt;
 	__le16			elbat;
 	__le16			elbatm;
 };
@@ -6444,7 +6444,7 @@ enum nvme_copy_range_sopt {
  * @nlb:	Number of Logical Blocks
  * @rsvd18:	Reserved
  * @sopt:	Source Options
- * @eilbrt:	Expected Initial Logical Block Reference Tag /
+ * @elbt:	Expected Initial Logical Block Reference Tag /
  *		Expected Logical Block Storage Tag
  * @elbatm:	Expected Logical Block Application Tag Mask
  * @elbat:	Expected Logical Block Application Tag
@@ -6456,7 +6456,7 @@ struct nvme_copy_range_f2 {
 	__le16			nlb;
 	__u8			rsvd18[4];
 	__le16			sopt;
-	__le32			eilbrt;
+	__be32			elbt;
 	__le16			elbat;
 	__le16			elbatm;
 };