compare-version: Use correct PD version

Make sure it's the active one, and use base version on TGL.

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

framework_lib/src/ccgx/mod.rs

@@ -1,11 +1,15 @@
 //! Interact with Infineon (formerly Cypress) PD controllers (their firmware binaries) in the CCGx series
 
+use alloc::string::String;
+use alloc::string::ToString;
 #[cfg(feature = "uefi")]
 use core::prelude::rust_2021::derive;
 use num_derive::FromPrimitive;
 use std::fmt;
 
 use crate::chromium_ec::{CrosEc, EcResult};
+use crate::smbios;
+use crate::util::Platform;
 
 use self::device::{FwMode, PdController, PdPort};
 
@@ -102,7 +106,7 @@ pub enum SiliconId {
     Ccg8 = 0x3580,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Copy, Clone)]
 pub struct BaseVersion {
     /// Major part of the version. X of X.Y.Z.BB
     pub major: u8,
@@ -138,15 +142,15 @@ impl From<u32> for BaseVersion {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Copy, Clone)]
 pub enum Application {
     Notebook,
     Monitor,
     AA,
     Invalid,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Copy, Clone)]
 pub struct AppVersion {
     pub application: Application,
     /// Major part of the version. X of X.Y.Z
@@ -185,7 +189,7 @@ impl From<u32> for AppVersion {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Copy, Clone)]
 pub struct ControllerVersion {
     pub base: BaseVersion,
     pub app: AppVersion,
@@ -199,6 +203,26 @@ pub struct ControllerFirmwares {
     pub main_fw: ControllerVersion,
 }
 
+impl ControllerFirmwares {
+    pub fn active_fw(&self) -> ControllerVersion {
+        match self.active_fw {
+            FwMode::MainFw => self.main_fw,
+            FwMode::BackupFw => self.backup_fw,
+            FwMode::BootLoader => self.bootloader,
+        }
+    }
+
+    pub fn active_fw_ver(&self) -> String {
+        let active = self.active_fw();
+        // On 11th Gen we modified base version instead of app version
+        if let Some(Platform::IntelGen11) = smbios::get_platform() {
+            active.base.to_string()
+        } else {
+            active.app.to_string()
+        }
+    }
+}
+
 #[derive(Debug, PartialEq)]
 pub struct PdVersions {
     pub controller01: ControllerFirmwares,

framework_lib/src/commandline/mod.rs

@@ -537,7 +537,7 @@ fn compare_version(device: Option<HardwareDeviceType>, version: String, ec: &Cro
     }
     if device == Some(HardwareDeviceType::PD0) {
         if let Ok(pd_versions) = ccgx::get_pd_controller_versions(ec) {
-            let ver = pd_versions.controller01.main_fw.app.to_string();
+            let ver = pd_versions.controller01.active_fw_ver();
             println!("Comparing PD0 version {:?}", ver);
 
             if ver.contains(&version) {
@@ -549,7 +549,7 @@ fn compare_version(device: Option<HardwareDeviceType>, version: String, ec: &Cro
     }
     if device == Some(HardwareDeviceType::PD1) {
         if let Ok(pd_versions) = ccgx::get_pd_controller_versions(ec) {
-            let ver = pd_versions.controller23.main_fw.app.to_string();
+            let ver = pd_versions.controller23.active_fw_ver();
             println!("Comparing PD1 version {:?}", ver);
 
             if ver.contains(&version) {