cargo: Update mctp-rs dependencies to 5a7b9067b4a4

Account for some API changes made since 77da3b1c4d35 ("pldm-file: remove
Responder::init_read").

Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

Author: amboar

Cargo.lock

@@ -8,6 +8,7 @@ repository = "https://github.com/CodeConstruct/mctp-dev"
 categories = ["network-programming", "hardware-support"]
 
 [features]
+default = ["nvme-mi", "pldm"]
 nvme-mi = ["dep:nvme-mi-dev"]
 pldm = ["dep:hex", "dep:pldm", "dep:pldm-file", "dep:pldm-platform", "dep:sha2"]
 
@@ -25,12 +26,12 @@ futures-io = "0.3.30"
 hex = { version = "0.4.3", optional = true }
 log = "0.4.28"
 mctp = "0.2.0"
-mctp-estack = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "77da3b1c4d35b7c9ba37747da968d29fc4cde696", package = "mctp-estack" }
+mctp-estack = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "5a7b9067b4a4515b05ef8b5f4948ba542e8ae1c9", package = "mctp-estack" }
 nvme-mi-dev = { version = "0.1.0", optional = true }
 polling = "3.7.4"
-pldm = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "77da3b1c4d35b7c9ba37747da968d29fc4cde696", package = "pldm", optional = true }
-pldm-file = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "77da3b1c4d35b7c9ba37747da968d29fc4cde696", package = "pldm-file", optional = true }
-pldm-platform = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "77da3b1c4d35b7c9ba37747da968d29fc4cde696", package = "pldm-platform", optional = true }
+pldm = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "5a7b9067b4a4515b05ef8b5f4948ba542e8ae1c9", package = "pldm", optional = true }
+pldm-file = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "5a7b9067b4a4515b05ef8b5f4948ba542e8ae1c9", package = "pldm-file", optional = true }
+pldm-platform = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "5a7b9067b4a4515b05ef8b5f4948ba542e8ae1c9", package = "pldm-platform", optional = true }
 sha2 = {version = "0.10.9", optional = true }
 simplelog = "0.12.2"
 smol = "2.0.0"
@@ -39,4 +40,4 @@ uuid = { version = "1.16.0", features = ["v4"] }
 
 # update nvme-mi-dev mctp dependency
 [patch.crates-io]
-mctp = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "77da3b1c4d35b7c9ba37747da968d29fc4cde696", package = "mctp" }
+mctp = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "5a7b9067b4a4515b05ef8b5f4948ba542e8ae1c9", package = "mctp" }

Cargo.toml

@@ -12,14 +12,20 @@ use pldm_file::{
 };
 use pldm_platform::{proto::PdrRecord, requester as platrq};
 
+const MULTIPART_PART_SIZE: u16 = 512;
+
 async fn pldm_control(chan: &mut impl mctp::AsyncReqChannel) -> Result<()> {
     let req_types = [pldm_file::PLDM_TYPE_FILE_TRANSFER];
     let mut buf = [0u8];
 
-    let (size, neg_types) =
-        negotiate_transfer_parameters(chan, &req_types, &mut buf, 512)
-            .await
-            .context("Negotiate transfer parameters failed")?;
+    let (size, neg_types) = negotiate_transfer_parameters(
+        chan,
+        &req_types,
+        &mut buf,
+        MULTIPART_PART_SIZE,
+    )
+    .await
+    .context("Negotiate transfer parameters failed")?;
 
     debug!("Negotiated multipart size {size} for types {neg_types:?}");
 
@@ -75,7 +81,8 @@ async fn pldm_file(
     let mut cur_len = 0usize;
 
     debug!("Reading...");
-    let res = df_read_with(chan, fd, 0, req_len, |part| {
+    let mut part = [0u8; { MULTIPART_PART_SIZE as usize + 18 }];
+    let res = df_read_with(chan, fd, 0, req_len, &mut part, |part| {
         cur_len += part.len();
         debug!("  {} bytes, {cur_len}/{req_len}", part.len());
         if cur_len > req_len {

src/pldm.rs

@@ -428,8 +428,7 @@ impl MctpUsbRedir {
     pub async fn send(&mut self, pkt: &[u8]) -> mctp::Result<()> {
         let total = pkt.len().checked_add(4).ok_or(mctp::Error::NoSpace)?;
         let mut tx_buf = Vec::with_capacity(total);
-        let mut hdr = [0u8; 4];
-        MctpUsbHandler::header(pkt.len(), &mut hdr)?;
+        let hdr = MctpUsbHandler::header(pkt.len())?;
         tx_buf.extend_from_slice(&hdr);
         tx_buf.extend_from_slice(pkt);
         self.xfer_tx_chan