pldm: Don't assume File PDR Record is first

Using the recent pldm-platform get_pdr() changes, we can iterate PDR
records until we find a valid one (ie., a File Descriptor record).

Signed-off-by: Jeremy Kerr <[email protected]>

Author: jk-ozlabs

Cargo.lock

@@ -25,12 +25,12 @@ futures-io = "0.3.30"
 hex = { version = "0.4.3", optional = true }
 log = "0.4.22"
 mctp = "0.2.0"
-mctp-estack = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "851360ed19ef78f2e7672daa90900cb4f38ad0b6", package = "mctp-estack" }
+mctp-estack = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "2492e094f93f5f36f900b3ee958a289630400030", package = "mctp-estack" }
 nvme-mi-dev = { git = "https://github.com/CodeConstruct/nvme-mi-dev", branch = "main", optional = true }
 polling = "3.7.4"
-pldm = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "851360ed19ef78f2e7672daa90900cb4f38ad0b6", package = "pldm", optional = true }
-pldm-file = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "851360ed19ef78f2e7672daa90900cb4f38ad0b6", package = "pldm-file", optional = true }
-pldm-platform = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "851360ed19ef78f2e7672daa90900cb4f38ad0b6", package = "pldm-platform", optional = true }
+pldm = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "2492e094f93f5f36f900b3ee958a289630400030", package = "pldm", optional = true }
+pldm-file = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "2492e094f93f5f36f900b3ee958a289630400030", package = "pldm-file", optional = true }
+pldm-platform = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "2492e094f93f5f36f900b3ee958a289630400030", package = "pldm-platform", optional = true }
 sha2 = {version = "0.10.9", optional = true }
 simplelog = "0.12.2"
 smol = "2.0.0"
@@ -39,4 +39,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 = "851360ed19ef78f2e7672daa90900cb4f38ad0b6", package = "mctp" }
+mctp = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "2492e094f93f5f36f900b3ee958a289630400030", package = "mctp" }

Cargo.toml

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result};
 use log::{debug, info, warn};
 use sha2::{Digest, Sha256};
 
@@ -37,15 +37,21 @@ async fn pldm_pdr(
     debug!("PDR Repository Info: {pdr_info:?}");
 
     // File Descriptor PDR
-    let pdr_record = 1;
-    let pdr = platrq::get_pdr(chan, pdr_record)
-        .await
-        .context("Get PDR failed")?;
-
-    let PdrRecord::FileDescriptor(file) = pdr else {
-        bail!("Unexpected PDR record {pdr_record}: {pdr:?}");
+    let mut pdrs = platrq::get_pdr(chan);
+
+    let file = loop {
+        match pdrs.next().await {
+            None => break None,
+            Some(Ok(PdrRecord::FileDescriptor(file))) => break Some(file),
+            Some(Ok(_)) => (),
+            Some(Err(e)) => {
+                debug!("Error reading PDR, skipping: {e}");
+            }
+        }
     };
 
+    let file = file.context("No File Descriptor PDR record found")?;
+
     debug!("PDR: {file:?}");
 
     Ok((