diff --git a/.circleci/config.yml b/.circleci/config.yml
index 25679b320e9a..fac0abf60f01 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -188,8 +188,12 @@ workflows:
                             greatlakes,
                             inspirationpoint,
                             halfdome,
+                            janga,
                             # lightning, Rocko
+                            tahan,
+                            meru,
                             minipack,
+                            morgan800cc,
                             northdome,
                             qemux86,
                             # wedge, Rocko
diff --git a/.jfconfig b/.jfconfig
index 0b17f8b72197..83841e47c5cb 100644
--- a/.jfconfig
+++ b/.jfconfig
@@ -764,6 +764,39 @@
                 "openbmc_git"
             ]
         },
+        {
+            "alias": "openbmc-cit-harma-determinator",
+            "args": {
+                "name": "openbmc-cit-harma-determinator",
+                "oncall": "openbmc",
+                "steps": [
+                    {
+                        "determinator": true,
+                        "name": "openbmc-cit-harma-determinator",
+                        "shell": "facebook/sandcastle/job.py cit-diff --platform harma"
+                    }
+                ]
+            },
+            "capabilities": {
+                "tenant": "openbmc",
+                "type": "lego",
+                "vcs": "openbmc-git"
+            },
+            "command": "SandcastleUniversalCommand",
+            "description": "Yocto diff listener",
+            "jellyfish_conditions": [
+                {
+                    "type": "some_file_matches_some_regexp",
+                    "value": [
+                        "^meta-facebook/meta-harma/.*"
+                    ]
+                }
+            ],
+            "scheduleType": "diff",
+            "tags": [
+                "openbmc_git"
+            ]
+        },
         {
             "alias": "openbmc-cit-inspirationpoint-determinator",
             "args": {
@@ -897,6 +930,39 @@
                 "openbmc_git"
             ]
         },
+        {
+            "alias": "openbmc-cit-minerva-determinator",
+            "args": {
+                "name": "openbmc-cit-minerva-determinator",
+                "oncall": "openbmc",
+                "steps": [
+                    {
+                        "determinator": true,
+                        "name": "openbmc-cit-minerva-determinator",
+                        "shell": "facebook/sandcastle/job.py cit-diff --platform minerva"
+                    }
+                ]
+            },
+            "capabilities": {
+                "tenant": "openbmc",
+                "type": "lego",
+                "vcs": "openbmc-git"
+            },
+            "command": "SandcastleUniversalCommand",
+            "description": "Yocto diff listener",
+            "jellyfish_conditions": [
+                {
+                    "type": "some_file_matches_some_regexp",
+                    "value": [
+                        "^meta-facebook/meta-minerva/.*"
+                    ]
+                }
+            ],
+            "scheduleType": "diff",
+            "tags": [
+                "openbmc_git"
+            ]
+        },
         {
             "alias": "openbmc-cit-minipack-determinator",
             "args": {
@@ -963,6 +1029,39 @@
                 "openbmc_git"
             ]
         },
+        {
+            "alias": "openbmc-cit-morgan800cc-determinator",
+            "args": {
+                "name": "openbmc-cit-morgan800cc-determinator",
+                "oncall": "openbmc",
+                "steps": [
+                    {
+                        "determinator": true,
+                        "name": "openbmc-cit-morgan800cc-determinator",
+                        "shell": "facebook/sandcastle/job.py cit-diff --platform morgan800cc"
+                    }
+                ]
+            },
+            "capabilities": {
+                "tenant": "openbmc",
+                "type": "lego",
+                "vcs": "openbmc-git"
+            },
+            "command": "SandcastleUniversalCommand",
+            "description": "Yocto diff listener",
+            "jellyfish_conditions": [
+                {
+                    "type": "some_file_matches_some_regexp",
+                    "value": [
+                        "^meta-facebook/meta-morgan800cc/.*"
+                    ]
+                }
+            ],
+            "scheduleType": "diff",
+            "tags": [
+                "openbmc_git"
+            ]
+        },
         {
             "alias": "openbmc-cit-northdome-determinator",
             "args": {
@@ -998,6 +1097,39 @@
                 "openbmc_git"
             ]
         },
+        {
+            "alias": "openbmc-cit-tahan-determinator",
+            "args": {
+                "name": "openbmc-cit-tahan-determinator",
+                "oncall": "openbmc",
+                "steps": [
+                    {
+                        "determinator": true,
+                        "name": "openbmc-cit-tahan-determinator",
+                        "shell": "facebook/sandcastle/job.py cit-diff --platform tahan"
+                    }
+                ]
+            },
+            "capabilities": {
+                "tenant": "openbmc",
+                "type": "lego",
+                "vcs": "openbmc-git"
+            },
+            "command": "SandcastleUniversalCommand",
+            "description": "Yocto diff listener",
+            "jellyfish_conditions": [
+                {
+                    "type": "some_file_matches_some_regexp",
+                    "value": [
+                        "^meta-facebook/meta-tahan/.*"
+                    ]
+                }
+            ],
+            "scheduleType": "diff",
+            "tags": [
+                "openbmc_git"
+            ]
+        },
         {
             "alias": "openbmc-cit-wedge100-determinator",
             "args": {
diff --git a/classes/python3flakes.bbclass b/classes/python3flakes.bbclass
index 1772a7611ec3..38e5a01715c5 100644
--- a/classes/python3flakes.bbclass
+++ b/classes/python3flakes.bbclass
@@ -1,7 +1,7 @@
 inherit python3native
 def flakes_add_if_avail(d):
   distro = d.getVar('DISTRO_CODENAME', True)
-  if distro in [ 'rocko' ]:
+  if distro in [ 'rocko', 'dunfell', 'kirkstone' ]:
     return ""
   else:
     return "python3-flake8"
diff --git a/common/images/fb-openbmc-image.inc b/common/images/fb-openbmc-image.inc
index 01af4ff210e1..3c474c0c2a66 100644
--- a/common/images/fb-openbmc-image.inc
+++ b/common/images/fb-openbmc-image.inc
@@ -5,3 +5,6 @@ require common/images/fb-openbmc-common.inc
 
 # Include the package group that enables tests2 support.
 IMAGE_INSTALL += "packagegroup-openbmc-tests2"
+
+# Add the mfgtool.
+IMAGE_INSTALL += "mfg-tool"
diff --git a/common/recipes-connectivity/lldp-util/lldp-util/src/lldp_util.c b/common/recipes-connectivity/lldp-util/lldp-util/src/lldp_util.c
index bff7551ea71d..3f689b355f35 100644
--- a/common/recipes-connectivity/lldp-util/lldp-util/src/lldp_util.c
+++ b/common/recipes-connectivity/lldp-util/lldp-util/src/lldp_util.c
@@ -475,10 +475,17 @@ int lldp_process_packet(const uint8_t* buf,
     buf += 6;
     uint16_t ethertype = lldp_read_u16(&buf);
 
-    if (ethertype == ETHERTYPE_VLAN) {
-      uint16_t vlan __attribute__((unused)) = lldp_read_u16(&buf);
-      ethertype = lldp_read_u16(&buf);
-    }
+    /*
+     * For now, don't decode or print VLAN tagged packets.  Doing this
+     * properly is tricky (e.g. recursion) and we don't have a use case
+     * internally for it at Meta.  When we do, it might be more useful
+     * to move to a 3rd party tool that does this better.
+     *
+     * if (ethertype == ETHERTYPE_VLAN) {
+     * uint16_t vlan __attribute__((unused)) = lldp_read_u16(&buf);
+     * ethertype = lldp_read_u16(&buf);
+     * }
+     */
 
     if (ethertype == ETHERTYPE_LLDP) {
       lldp_neighbor_t neighbor;
diff --git a/common/recipes-core/cfg-util/files/cfg-util.cpp b/common/recipes-core/cfg-util/files/cfg-util.cpp
index f50914cc790b..54a3621874dd 100644
--- a/common/recipes-core/cfg-util/files/cfg-util.cpp
+++ b/common/recipes-core/cfg-util/files/cfg-util.cpp
@@ -120,6 +120,11 @@ main(int argc, char **argv) {
         return -1;
       }
 
+      // Prevent important information from being cleared
+      // leading to the loss of some functionalities.
+      // Store the kv and restore after clear.
+      pal_store_key_value();
+
       printf("Reset BMC data to default factory settings and BMC will be reset...\n");
       if(system("rm /mnt/data/* -rf > /dev/null 2>&1") != 0) {
         printf("Cleaning persistent storage failed!\n");
@@ -127,6 +132,8 @@ main(int argc, char **argv) {
       }
       sync();
 
+      pal_restore_key_value();
+
       // Set the flag to identify the reboot is caused by cfg-util
       mem_fd = open("/dev/mem", O_RDWR | O_SYNC);
       if (mem_fd >= 0) {
diff --git a/common/recipes-core/fscd3/fscd/fsc_zone.py b/common/recipes-core/fscd3/fscd/fsc_zone.py
index 814f48c950e8..8789ad46a49f 100755
--- a/common/recipes-core/fscd3/fscd/fsc_zone.py
+++ b/common/recipes-core/fscd3/fscd/fsc_zone.py
@@ -557,7 +557,7 @@ def run(self, sensors, ctx, ignore_mode):
 
         if not exprout:
             exprout = 0
-        if exprout < outmin:
+        if (exprout < outmin) or (mode == fan_mode["boost_mode"]):
             exprout = outmin
         else:
             if (no_sane_flag != 1) and (display_progressive_flag != 1):
diff --git a/common/recipes-core/fw-util/files/bios.cpp b/common/recipes-core/fw-util/files/bios.cpp
index cf94c316c00e..45a5cb6a3e00 100644
--- a/common/recipes-core/fw-util/files/bios.cpp
+++ b/common/recipes-core/fw-util/files/bios.cpp
@@ -233,7 +233,7 @@ int BiosComponent::get_version(json& j) {
     string sver((char *)ver + 3);
     j["VERSION"] = sver.substr(0, end - 3);
   } else {
-    j["VERISON"] = "NA";
+    j["VERSION"] = "NA";
   }
 
   return 0;
diff --git a/common/recipes-core/fw-util/files/pldm_comp.cpp b/common/recipes-core/fw-util/files/pldm_comp.cpp
index 0af9909b4920..7c90e292d744 100644
--- a/common/recipes-core/fw-util/files/pldm_comp.cpp
+++ b/common/recipes-core/fw-util/files/pldm_comp.cpp
@@ -87,13 +87,14 @@ int PldmComponent::del_raw_image() const
   return remove(raw_image.c_str());
 }
 
-int PldmComponent::pldm_update(const string& image, uint8_t specified_comp) {
+int PldmComponent::pldm_update(const string& image, bool is_standard_descriptor, uint8_t specified_comp) {
 
   int ret;
 
   syslog(LOG_CRIT, "FRU %s Component %s upgrade initiated", fru.c_str(), component.c_str());
 
-  ret = oem_pldm_fw_update(bus, eid, (char *)image.c_str(), specified_comp);
+  ret = oem_pldm_fw_update(bus, eid, (char *)image.c_str(), is_standard_descriptor,
+    component, wait_apply_time, specified_comp);
 
   if (ret)
     syslog(LOG_CRIT, "FRU %s Component %s upgrade fail", fru.c_str(), component.c_str());
diff --git a/common/recipes-core/fw-util/files/pldm_comp.hpp b/common/recipes-core/fw-util/files/pldm_comp.hpp
index eabfa3eae29b..2bfb5cc8f049 100644
--- a/common/recipes-core/fw-util/files/pldm_comp.hpp
+++ b/common/recipes-core/fw-util/files/pldm_comp.hpp
@@ -3,6 +3,8 @@
 #include "signed_decoder.hpp"
 
 #define PLDM_VER_MAX_LENGTH 256
+#define PLDM_COMPONENT_IDENTIFIER_DEFAULT 0
+#define PLDM_APPLY_DELAY_TIME_DAFAULT 0
 
 class PldmComponent : public InfoChecker
 {
@@ -10,19 +12,26 @@ class PldmComponent : public InfoChecker
     // Basic info to be record
     std::string fru;
     std::string component;
-    uint8_t bus, eid;
+    uint8_t bus, eid, component_identifier;
+    int wait_apply_time;
     int find_image_index(uint8_t /*target_id*/) const;
     int get_raw_image(const std::string& /*image*/, std::string& /*raw_image*/);
     int del_raw_image() const;
+    const signed_header_t unuse_info;
 
   public:
     PldmComponent(const signed_header_t& info, const std::string &fru, const std::string &comp,
                   uint8_t bus, uint8_t eid): InfoChecker(info),
-                  fru(fru), component(comp), bus(bus), eid(eid) {}
+                  fru(fru), component(comp), bus(bus), eid(eid), component_identifier(PLDM_COMPONENT_IDENTIFIER_DEFAULT),
+                  wait_apply_time(PLDM_APPLY_DELAY_TIME_DAFAULT) {}
+    PldmComponent(const std::string &fru, const std::string &comp, uint8_t bus, uint8_t eid, 
+		  uint8_t component_identifier, int wait_apply_time): InfoChecker(unuse_info),
+                  fru(fru), component(comp), bus(bus), eid(eid), component_identifier(component_identifier),
+                  wait_apply_time(wait_apply_time) {}
     virtual ~PldmComponent() = default;
-    int pldm_update(const std::string& /*image*/, uint8_t specified_comp = 0xFF);
+    int pldm_update(const std::string& /*image*/, bool is_standard_descriptor, uint8_t specified_comp = 0xFF);
     virtual int pldm_version(json& /*json*/) { return FW_STATUS_NOT_SUPPORTED; }
     virtual int comp_update(const std::string& /*image*/) { return FW_STATUS_NOT_SUPPORTED; }
     virtual int comp_fupdate(const std::string& /*image*/) { return FW_STATUS_NOT_SUPPORTED; }
     virtual int comp_version(json& /*json*/) { return FW_STATUS_NOT_SUPPORTED; }
-};
\ No newline at end of file
+};
diff --git a/common/recipes-core/fw-util/files/scheduler.cpp b/common/recipes-core/fw-util/files/scheduler.cpp
index 6b28375d5386..df38b459f552 100644
--- a/common/recipes-core/fw-util/files/scheduler.cpp
+++ b/common/recipes-core/fw-util/files/scheduler.cpp
@@ -52,7 +52,8 @@ bool Scheduler::is_number(const string& task_id) const {
 string Scheduler::exec_and_print(const string& cmd) const {
 
   //use unique_ptr<T, del> so it can be automatically closed when we leave the scope.
-  unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd.c_str(), "r"), pclose);
+  auto pipe_close = [](auto fd) { (void)pclose(fd); };
+  unique_ptr<FILE, decltype(pipe_close)> pipe(popen(cmd.c_str(), "r"), pipe_close);
 
   if ( pipe == nullptr ) {
     throw std::runtime_error("Failed to run popen function!");
diff --git a/common/recipes-core/healthd/files/healthd/healthd.c b/common/recipes-core/healthd/files/healthd/healthd.c
index 09b546ec013d..a3f5d11fbaa4 100755
--- a/common/recipes-core/healthd/files/healthd/healthd.c
+++ b/common/recipes-core/healthd/files/healthd/healthd.c
@@ -162,7 +162,7 @@ enum ASSERT_BIT {
 
 enum BIC_ERROR {
   BIC_HB_ERR = 0,
-  BIC_IPMB_ERR,
+  BIC_IPMB_PLDM_ERR,
   BIC_READY_ERR,
   BIC_ERR_TYPE_CNT,
 };
@@ -229,7 +229,8 @@ static bool bmc_timestamp_enabled = false;
 
 /* BIC health monitor */
 static bool bic_health_enabled = false;
-static uint8_t bic_fru = 0;
+static size_t bic_num_fru = 0;
+static uint8_t bic_fru[MAX_NUM_FRUS] = {0};
 static int bic_monitor_interval = BIC_HEALTH_INTERVAL;
 
 /* healthd log rearm monitor */
@@ -614,6 +615,7 @@ static void initialize_bmc_timestamp_config(json_t *obj) {
 
 static void initialize_bic_health_config(json_t *obj) {
   json_t *tmp = NULL;
+  size_t i;
 
   if (obj == NULL) {
     return;
@@ -625,10 +627,21 @@ static void initialize_bic_health_config(json_t *obj) {
   bic_health_enabled = json_is_true(tmp);
 
   tmp = json_object_get(obj, "fru");
-  if (!tmp || !json_is_number(tmp)) {
-    return;
+  if (!tmp || !json_is_array(tmp)) {
+    goto error;
+  }
+  bic_num_fru = json_array_size(tmp);
+  if (!bic_num_fru) {
+    /* Nothing to monitor */
+    goto error;
+  }
+  for (i = 0; i < bic_num_fru; i++) {
+    json_t *ind = json_array_get(tmp, i);
+    if (!ind || !json_is_number(ind)) {
+      goto error;
+    }
+    bic_fru[i] = json_integer_value(ind);
   }
-  bic_fru = json_integer_value(tmp);
 
   tmp = json_object_get(obj, "monitor_interval");
   if (tmp && json_is_number(tmp)) {
@@ -637,6 +650,9 @@ static void initialize_bic_health_config(json_t *obj) {
       bic_monitor_interval = BIC_HEALTH_INTERVAL;
     }
   }
+  return;
+error:
+  bic_health_enabled = false;
 }
 
 static void initialize_ubifs_health_config(json_t *obj) {
@@ -1802,48 +1818,53 @@ timestamp_handler()
 }
 
 static void *
-bic_health_monitor() {
+bic_health_monitor(void* bic_fru_id) {
   int err_cnt = 0;
   int i = 0;
   uint8_t status = 0;
   uint8_t err_type[BIC_RESET_ERR_CNT] = {0};
   uint8_t type = 0;
   const char* err_str[BIC_ERR_TYPE_CNT] = {
-    "heartbeat", "IPMB", "BIC ready"
+    "heartbeat", "IPMB/PLDM", "BIC ready"
   };
   char err_log[MAX_LOG_SIZE] = "\0";
+  char bic_health_key[MAX_KEY_LEN] = "\0";
   bool is_already_reset = false;
+  bool is_log = false;
+
+  uint8_t fru = *((uint8_t *) bic_fru_id);
 
   // set flag to notice BMC healthd bic_health_monitor is ready
-  kv_set("flag_healthd_bic_health", "1", 0, 0);
+  snprintf(bic_health_key, sizeof(bic_health_key), "flag_healthd_bic_fru%u_health", fru);
+  kv_set(bic_health_key, "1", 0, 0);
 
   while (1) {
-    if ((pal_get_server_12v_power(bic_fru, &status) < 0) || (status == SERVER_12V_OFF)) {
+    if ((pal_get_server_12v_power(fru, &status) < 0) || (status == SERVER_12V_OFF)) {
       goto next_run;
     }
 
     // Check if bic is updating
-    if (pal_is_fw_update_ongoing(bic_fru) == true) {
+    if (pal_is_fw_update_ongoing(fru) == true) {
       err_cnt = 0;
       sleep(bic_monitor_interval);
       continue;
     }
 
     // Read BIC ready pin to check BIC boots up completely
-    if ((pal_is_bic_ready(bic_fru, &status) < 0) || (status == false)) {
+    if ((pal_is_bic_ready(fru, &status) == PAL_EOK) && (status == false)) {
       err_type[err_cnt++] = BIC_READY_ERR;
       goto next_run;
     }
 
     // Check whether BIC heartbeat works
-    if (pal_is_bic_heartbeat_ok(bic_fru) == false) {
+    if (pal_is_bic_heartbeat_ok(fru) == false) {
       err_type[err_cnt++] = BIC_HB_ERR;
       goto next_run;
     }
 
-    // Send a IPMB command to check IPMB service works normal
-    if (pal_bic_self_test() < 0) {
-      err_type[err_cnt++] = BIC_IPMB_ERR;
+    // Send a IPMB/PLDM command to check IPMB/PLDM service works normal
+    if (pal_bic_self_test(fru) < 0) {
+      err_type[err_cnt++] = BIC_IPMB_PLDM_ERR;
       goto next_run;
     }
     // if all check pass, clear error counter and reset flag
@@ -1852,24 +1873,31 @@ bic_health_monitor() {
 
     // The ME commands are transmit via BIC on Grand Canyon, so check ME health when BIC health is good.
     if ((nm_monitor_enabled == true) && (nm_transmission_via_bic == true)) {
-      nm_selftest(bic_fru);
+      nm_selftest(fru);
     }
 next_run:
-    if ((err_cnt >= BIC_RESET_ERR_CNT) && (is_already_reset == false)) {
+    if ((err_cnt >= BIC_RESET_ERR_CNT) && (is_already_reset == false) && (is_log == false)) {
       // if error counter over 3, reset BIC by hardware
-      if (pal_bic_hw_reset() == 0) {
-        memset(err_log, 0, sizeof(err_log));
-        for (i = 0; i < BIC_RESET_ERR_CNT; i++) {
-          type = err_type[i];
-          strcat(err_log, err_str[type]);
-          if (i != BIC_RESET_ERR_CNT - 1) { // last one
-            strcat(err_log, ", ");
-          }
+      memset(err_log, 0, sizeof(err_log));
+      strcat(err_log, "ERR Order: ");
+      for (i = 0; i < BIC_RESET_ERR_CNT; i++) {
+        type = err_type[i];
+        strcat(err_log, err_str[type]);
+        if (i != BIC_RESET_ERR_CNT - 1) { // last one
+          strcat(err_log, ", ");
         }
-        syslog(LOG_CRIT, "FRU %d BIC reset by BIC health monitor due to health check failed in following order: %s",
-                bic_fru, err_log);
+      }
+      // Support BIC HW RESET
+      if (pal_bic_hw_reset() == PAL_EOK) {
+        syslog(LOG_CRIT, "ASSERT: FRU: %u BIC_HEALTH, BIC HW RESET, %s", fru, err_log);
         err_cnt = 0;
         is_already_reset = true;
+        // Not Support BIC HW RESET, Print SEL
+      } else if (pal_bic_hw_reset() == PAL_ENOTSUP) {
+        syslog(LOG_CRIT, "ASSERT: FRU: %u BIC_HEALTH, %s", fru, err_log);
+        is_log = true;
+      } else {
+        syslog(LOG_CRIT, "ASSERT: FRU: %u BIC_HEALTH, BIC HW RESET Failed, %s", fru, err_log);
       }
     }
     sleep(bic_monitor_interval);
@@ -1991,7 +2019,7 @@ int main() {
   pthread_t tid_bmc_health_monitor;
   pthread_t tid_nm_monitor;
   pthread_t tid_timestamp_handler;
-  pthread_t tid_bic_health_monitor;
+  pthread_t tid_bic_health_monitor[MAX_NUM_FRUS];
   pthread_t tid_log_rearm_check;
   pthread_t tid_ubifs_health_monitor;
 
@@ -2080,9 +2108,11 @@ int main() {
   }
 
   if (bic_health_enabled) {
-    if (pthread_create(&tid_bic_health_monitor, NULL, bic_health_monitor, NULL)) {
-      syslog(LOG_WARNING, "pthread_create for bic health monitor error\n");
-      exit(1);
+    for (size_t i = 0; i < bic_num_fru; i ++) {
+      if (pthread_create(&tid_bic_health_monitor[i], NULL, bic_health_monitor, &bic_fru[i])) {
+        syslog(LOG_WARNING, "pthread_create for bic health monitor error\n");
+        exit(1);
+      }
     }
   }
   if (pthread_create(&tid_log_rearm_check, NULL, log_rearm_check, NULL)) {
@@ -2130,7 +2160,9 @@ int main() {
   }
 
   if (bic_health_enabled) {
-    pthread_join(tid_bic_health_monitor, NULL);
+    for (size_t i = 0; i < bic_num_fru; i ++) {
+      pthread_join(tid_bic_health_monitor[i], NULL);
+    }
   }
 
   if (log_rearm_enabled){
diff --git a/common/recipes-core/log-util-v2/files/log-util/selformat.cpp b/common/recipes-core/log-util-v2/files/log-util/selformat.cpp
index a78042114336..283f870ae6d1 100644
--- a/common/recipes-core/log-util-v2/files/log-util/selformat.cpp
+++ b/common/recipes-core/log-util-v2/files/log-util/selformat.cpp
@@ -237,7 +237,8 @@ std::ostream& operator<<(std::ostream& os, const SELFormat& s) {
 std::string get_output(const std::string& cmd) {
   char buffer[128];
   std::string output;
-  std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd.c_str(), "r"), pclose);
+  auto pipe_close = [](auto fd) { (void)pclose(fd); };
+  std::unique_ptr<FILE, decltype(pipe_close)> pipe(popen(cmd.c_str(), "r"), pipe_close);
   if (!pipe) {
     std::cerr << "Failed to open a pipe" << std::endl;
     return "Error";
diff --git a/common/recipes-core/ncsi-util/files/meson.build b/common/recipes-core/ncsi-util/files/meson.build
index 2a508256ddbb..bbf927d59be4 100644
--- a/common/recipes-core/ncsi-util/files/meson.build
+++ b/common/recipes-core/ncsi-util/files/meson.build
@@ -13,6 +13,7 @@ sources = [
     'brcm-ncsi-util.c',
     'ncsi-util.c',
     'nvidia-ncsi-util.c',
+    'meta-ncsi-util.c',
 ]
 
 deps = [
diff --git a/common/recipes-core/ncsi-util/files/meta-ncsi-util.c b/common/recipes-core/ncsi-util/files/meta-ncsi-util.c
new file mode 100644
index 000000000000..75789d6b9fb4
--- /dev/null
+++ b/common/recipes-core/ncsi-util/files/meta-ncsi-util.c
@@ -0,0 +1,302 @@
+/*
+ *
+ * Copyright 2020-present Facebook. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+#include <arpa/inet.h>
+#include <zlib.h>
+#include <openbmc/ncsi.h>
+#include <openbmc/ncsi-meta.h>
+
+#include "meta-ncsi-util.h"
+
+/*
+ * GetDebugData transaction data
+ */
+typedef struct {
+  NCSI_Meta_Get_Debug_Data_Request req;
+  FILE      *fp;
+  uint16_t  type;
+  uint32_t  crc;
+  uint32_t  total_len;
+  uint32_t  recv_len;
+} Get_Debug_Data_Txn_t;
+
+static int get_debug_data_name_to_type(const char *name)
+{
+  if (!strcasecmp(name, "coredump"))
+    return NCSI_META_GET_DEBUG_DATA_TYPE_CORE_DUMP;
+  else if (!strcasecmp(name, "crashdump"))
+    return NCSI_META_GET_DEBUG_DATA_TYPE_CRASH_DUMP;
+  else
+    return -1;
+}
+
+static void init_get_debug_data_txn(Get_Debug_Data_Txn_t *gdd_txn,
+                                    uint16_t type)
+{
+  memset(gdd_txn, 0, sizeof(*gdd_txn));
+
+  gdd_txn->type = type;
+  gdd_txn->crc = crc32(0L, Z_NULL, 0);
+
+  gdd_txn->req.type = htons(type);
+  gdd_txn->req.op = NCSI_META_GET_DEBUG_DATA_REQ_OP_START_XFER;
+}
+
+static NCSI_NL_RSP_T *send_get_debug_data_req(NCSI_NL_MSG_T *nl_msg,
+                                              Get_Debug_Data_Txn_t *gdd_txn,
+                                              ncsi_util_args_t *util_args)
+{
+  if (ncsi_meta_create_req_pkt(nl_msg, util_args->channel_id,
+                               NCSI_META_GET_DEBUG_DATA,
+                               sizeof(gdd_txn->req), &gdd_txn->req)) {
+    printf("Error: failed to create packet\n");
+    return NULL;
+  }
+
+  /* Override the netdev if user has specified one */
+  ncsi_util_set_pkt_dev(nl_msg, util_args, NULL);
+
+  /* Send */
+  return send_nl_msg(nl_msg);
+}
+
+static int handle_get_debug_data_resp(NCSI_NL_RSP_T *nl_resp,
+                                      Get_Debug_Data_Txn_t *gdd_txn,
+                                      bool *txn_completed)
+{
+  NCSI_Meta_Get_Debug_Data_Response *gdd_resp = ncsi_get_meta_resp(nl_resp);
+  bool is_first;
+  uint8_t *data;
+  size_t data_len;
+  uint32_t resp_crc = 0;
+
+  /*
+   * Check response
+   */
+  /* Check NC-SI response code */
+  if (get_cmd_status(nl_resp) != RESP_COMMAND_COMPLETED) {
+    print_ncsi_completion_codes(nl_resp);
+    return -1;
+  }
+
+  /* Check Meta OEM response */
+  if (ncsi_meta_check_resp(nl_resp, NCSI_META_GET_DEBUG_DATA,
+                           sizeof(*gdd_resp))) {
+    ncsi_meta_print_resp_meta_hdr(nl_resp);
+    return -1;
+  }
+
+  /* Check GetDebugData response */
+  is_first = (gdd_txn->req.op == NCSI_META_GET_DEBUG_DATA_REQ_OP_START_XFER);
+  if (ncsi_meta_check_get_debug_data(nl_resp, gdd_txn->type, is_first)) {
+    ncsi_meta_print_get_debug_data(nl_resp);
+    return -1;
+  }
+
+  /*
+   * Process response data
+   */
+  data = gdd_resp->debug_data;
+  data_len = nl_resp->hdr.payload_length - sizeof(*gdd_resp);
+
+  if (gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_START) {
+    /* First response, get total debug data length */
+    gdd_txn->total_len = ntohl(*(uint32_t *)data);
+    data += sizeof(uint32_t);
+    data_len -= sizeof(uint32_t);
+    printf("Debug data length: %u\n", gdd_txn->total_len);
+
+    /* Change request op for next packet */
+    gdd_txn->req.op = NCSI_META_GET_DEBUG_DATA_REQ_OP_GET_NEXT;
+  }
+  gdd_txn->req.data_handle = gdd_resp->next_data_handle;
+
+  if (gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_END) {
+    /* Last response, get CRC32 checksum */
+    data_len -= sizeof(uint32_t);
+    resp_crc = ntohl(*(uint32_t *)(data + data_len));
+  }
+
+  if (data_len > 0) {
+    size_t n;
+
+    /* Debug data received */
+    gdd_txn->recv_len += data_len;
+    gdd_txn->crc = crc32(gdd_txn->crc, data, data_len);
+
+    /* Save data to file */
+    n = fwrite(data, 1, data_len, gdd_txn->fp);
+    if (n < data_len) {
+      printf("Error: failed to write %zu data bytes to file, rv %zu\n",
+             data_len, n);
+      return -1;
+    }
+  }
+
+  /*
+   * Check if transaction is completed
+   */
+  if (gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_END) {
+    if (gdd_txn->recv_len < gdd_txn->total_len) {
+      printf("Warning: transfer ended with %u data received, shorter than "
+             "debug data length %u\n", gdd_txn->recv_len, gdd_txn->total_len);
+    }
+    if (gdd_txn->crc != resp_crc) {
+      printf("Error: calculated crc32 0x%x not match response's 0x%x\n",
+             gdd_txn->crc, resp_crc);
+      return -1;
+    }
+    *txn_completed = true;
+
+  } else if (gdd_txn->recv_len >= gdd_txn->total_len) {
+    printf("Warning: total data received %u exceeds debug data length %u, "
+           "terminate transfer!\n", gdd_txn->recv_len, gdd_txn->total_len);
+    *txn_completed = true;
+  }
+
+  return 0;
+}
+
+static int get_debug_data(int type, const char *file_name,
+                          ncsi_util_args_t *util_args)
+{
+  Get_Debug_Data_Txn_t gdd_txn;
+  NCSI_NL_MSG_T *nl_msg = NULL;
+  NCSI_NL_RSP_T *nl_resp = NULL;
+  bool txn_completed = false;
+  uint32_t percent = 0;
+  int ret = -1;
+
+  init_get_debug_data_txn(&gdd_txn, type);
+
+  /* Open the file */
+  gdd_txn.fp = fopen(file_name, "w+");
+  if (!gdd_txn.fp) {
+    printf("Error: cannot create file %s\n", file_name);
+    goto done;
+  }
+
+  nl_msg = calloc(1, sizeof(*nl_msg));
+  if (!nl_msg) {
+    printf("Error: failed to allocate nl_msg of %zu bytes\n", sizeof(*nl_msg));
+    goto done;
+  }
+
+  while (!txn_completed) {
+
+    /* Send and receive */
+    nl_resp = send_get_debug_data_req(nl_msg, &gdd_txn, util_args);
+    if (!nl_resp)
+      break;
+
+    /* Handle response */
+    if (handle_get_debug_data_resp(nl_resp, &gdd_txn, &txn_completed))
+      break;
+
+    /* Print receive progress */
+    percent = ncsi_util_print_progress(gdd_txn.recv_len, gdd_txn.total_len,
+                                       percent, "Received:");
+
+    free(nl_resp);
+    nl_resp = NULL;
+  }
+
+  if (txn_completed) {
+    printf("GetDebugData completed\n");
+    ret = 0;
+  }
+
+done:
+  if (gdd_txn.fp)
+    fclose(gdd_txn.fp);
+  if (nl_msg)
+    free(nl_msg);
+  if (nl_resp)
+    free(nl_resp);
+
+  return ret;
+}
+
+static void meta_ncsi_util_usage(void)
+{
+  printf("Usage: ncsi-util -m meta [options]\n\n");
+  printf("       -h             This help\n");
+  ncsi_util_common_usage();
+  printf("       -d [type]      GetDebugData\n");
+  printf("                        coredump  - Core dump\n");
+  printf("                        crashdump - Crash dump\n");
+  printf("       -o [file]      Output file\n");
+  printf("\nSample commands:\n");
+  printf("       ncsi-util -m meta -d coredump -o /tmp/nic.core\n");
+  printf("       ncsi-util -m meta -n eth0 -c 0 -d crashdump -o /tmp/nic.crash\n");
+  printf("\n");
+}
+
+int meta_ncsi_util_handler(int argc, char **argv, ncsi_util_args_t *util_args)
+{
+  int getdbgdata_type = -1;
+  const char *ofile_name = NULL;
+  int ret = -1;
+  int argflag;
+
+  while ((argflag = getopt(argc, argv, "hd:o:" NCSI_UTIL_COMMON_OPT_STR)) != -1)
+  {
+    switch(argflag) {
+    case 'h':
+            meta_ncsi_util_usage();
+            return 0;
+    case 'd':
+            getdbgdata_type = get_debug_data_name_to_type(optarg);
+            if (getdbgdata_type < 0) {
+              printf("Error: invalid GetDebugData type %s\n", optarg);
+              goto err_exit;
+            }
+            break;
+    case 'o':
+            ofile_name = optarg;
+            break;
+    case NCSI_UTIL_GETOPT_COMMON_OPT_CHARS:
+            // Already handled
+            break;
+    default :
+            goto err_exit;
+    }
+  }
+
+  if (getdbgdata_type >= 0) {
+    if (!ofile_name) {
+      printf("Error: missing output file argument\n");
+      goto err_exit;
+    }
+    return get_debug_data(getdbgdata_type, ofile_name, util_args);
+  }
+
+  /* No command was done. Fall through to show the usage */
+
+err_exit:
+  meta_ncsi_util_usage();
+  return ret;
+}
diff --git a/common/recipes-core/ncsi-util/files/meta-ncsi-util.h b/common/recipes-core/ncsi-util/files/meta-ncsi-util.h
new file mode 100644
index 000000000000..0d3b46371d00
--- /dev/null
+++ b/common/recipes-core/ncsi-util/files/meta-ncsi-util.h
@@ -0,0 +1,27 @@
+/*
+ * meta-ncsi-util.h
+ *
+ * Copyright 2020-present Facebook. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef _META_NCSI_UTIL_H_
+#define _META_NCSI_UTIL_H_
+
+#include "ncsi-util.h"
+
+int meta_ncsi_util_handler(int argc, char **argv, ncsi_util_args_t *util_args);
+
+#endif /* _META_NCSI_UTIL_H_ */
diff --git a/common/recipes-core/ncsi-util/files/ncsi-util.c b/common/recipes-core/ncsi-util/files/ncsi-util.c
index 56113c9151f9..67b83a5718e1 100644
--- a/common/recipes-core/ncsi-util/files/ncsi-util.c
+++ b/common/recipes-core/ncsi-util/files/ncsi-util.c
@@ -43,6 +43,7 @@
 #include "ncsi-util.h"
 #include "brcm-ncsi-util.h"
 #include "nvidia-ncsi-util.h"
+#include "meta-ncsi-util.h"
 #include <openbmc/nl-wrapper.h>
 
 #ifndef max
@@ -793,6 +794,10 @@ static ncsi_util_vendor_t vendors[NCSI_UTIL_VENDOR_MAX] = {
     .name       = "nvidia",
     .handler    = nvidia_ncsi_util_handler,
   },
+  [NCSI_UTIL_VENDOR_META] = {
+    .name       = "meta",
+    .handler    = meta_ncsi_util_handler,
+  },
 };
 
 // Find vendor by name
@@ -874,5 +879,3 @@ int main(int argc, char **argv)
   default_ncsi_util_usage();
   return -1;
 }
-
-
diff --git a/common/recipes-core/ncsi-util/files/ncsi-util.h b/common/recipes-core/ncsi-util/files/ncsi-util.h
index da6a95055692..1bcbdafda820 100644
--- a/common/recipes-core/ncsi-util/files/ncsi-util.h
+++ b/common/recipes-core/ncsi-util/files/ncsi-util.h
@@ -41,6 +41,7 @@ enum {
   NCSI_UTIL_VENDOR_DMTF = 0,  /* DMTF defined command */
   NCSI_UTIL_VENDOR_BRCM,      /* Broadcom OEM command */
   NCSI_UTIL_VENDOR_NVIDIA,    /* Nvidia OEM command */
+  NCSI_UTIL_VENDOR_META,      /* Meta OEM command */
   NCSI_UTIL_VENDOR_MAX,
 };
 
diff --git a/common/recipes-core/ncsi-util/ncsi-util_0.1.bb b/common/recipes-core/ncsi-util/ncsi-util_0.1.bb
index f29521ff9a25..702406edeced 100644
--- a/common/recipes-core/ncsi-util/ncsi-util_0.1.bb
+++ b/common/recipes-core/ncsi-util/ncsi-util_0.1.bb
@@ -14,6 +14,8 @@ LOCAL_URI = " \
     file://brcm-ncsi-util.h \
     file://nvidia-ncsi-util.c \
     file://nvidia-ncsi-util.h \
+    file://meta-ncsi-util.c \
+    file://meta-ncsi-util.h \
     "
 
 inherit meson pkgconfig
@@ -22,4 +24,3 @@ inherit legacy-packages
 pkgdir = "ncsi-util"
 
 DEPENDS += "libpal libncsi obmc-libpldm libnl-wrapper libkv zlib"
-
diff --git a/common/recipes-core/rackmon2/rackmon/ModbusDevice.cpp b/common/recipes-core/rackmon2/rackmon/ModbusDevice.cpp
index 7dcdcb219702..fd6334e83dd9 100644
--- a/common/recipes-core/rackmon2/rackmon/ModbusDevice.cpp
+++ b/common/recipes-core/rackmon2/rackmon/ModbusDevice.cpp
@@ -282,8 +282,9 @@ ModbusDeviceValueData ModbusDevice::getValueData(
 static std::string commandOutput(const std::string& shell) {
   std::array<char, 128> buffer;
   std::string result;
-  std::unique_ptr<FILE, decltype(&pclose)> pipe(
-      popen(shell.c_str(), "r"), pclose);
+  auto pipe_close = [](auto fd) { (void)pclose(fd); };
+  std::unique_ptr<FILE, decltype(pipe_close)> pipe(
+      popen(shell.c_str(), "r"), pipe_close);
   if (!pipe) {
     throw std::runtime_error("popen() failed!");
   }
diff --git a/common/recipes-core/rackmon2/rackmon/Rackmon.cpp b/common/recipes-core/rackmon2/rackmon/Rackmon.cpp
index 11d7de123382..1c76eddb4313 100644
--- a/common/recipes-core/rackmon2/rackmon/Rackmon.cpp
+++ b/common/recipes-core/rackmon2/rackmon/Rackmon.cpp
@@ -43,10 +43,10 @@ void Rackmon::loadRegisterMap(const nlohmann::json& config) {
   // Precomputing this makes our scan soooo much easier.
   // its 256 bytes wasted. but worth it. TODO use a
   // interval list with an iterator to waste less bytes.
-  for (uint16_t addr = config["address_range"][0];
-       addr <= config["address_range"][1];
-       ++addr) {
-    allPossibleDevAddrs_.push_back(uint8_t(addr));
+  for (auto range : config["address_range"]) {
+    for (uint16_t addr = range[0]; addr <= range[1]; ++addr) {
+      allPossibleDevAddrs_.push_back(uint8_t(addr));
+    }
   }
   nextDeviceToProbe_ = allPossibleDevAddrs_.begin();
   monitorInterval_ = std::chrono::seconds(registerMapDB_.minMonitorInterval());
diff --git a/common/recipes-core/rackmon2/rackmon/RackmonSvcUnix.cpp b/common/recipes-core/rackmon2/rackmon/RackmonSvcUnix.cpp
index b586e61a74af..b2da5cb291ad 100644
--- a/common/recipes-core/rackmon2/rackmon/RackmonSvcUnix.cpp
+++ b/common/recipes-core/rackmon2/rackmon/RackmonSvcUnix.cpp
@@ -169,7 +169,8 @@ void RackmonUNIXSocketService::handleJSONCommand(
   }
 
   try {
-    std::string resp_s = resp.dump(-1, ' ', false, json::error_handler_t::replace);
+    std::string resp_s =
+        resp.dump(-1, ' ', false, json::error_handler_t::replace);
     cli->send(resp_s.c_str(), resp_s.length());
   } catch (std::exception& e) {
     logError << "Unable to send response: " << e.what() << std::endl;
diff --git a/common/recipes-core/rackmon2/rackmon/Register.cpp b/common/recipes-core/rackmon2/rackmon/Register.cpp
index 97b140834bac..8431d7674e5d 100644
--- a/common/recipes-core/rackmon2/rackmon/Register.cpp
+++ b/common/recipes-core/rackmon2/rackmon/Register.cpp
@@ -10,7 +10,12 @@ using nlohmann::json;
 namespace rackmon {
 
 bool AddrRange::contains(uint8_t addr) const {
-  return addr >= range.first && addr <= range.second;
+  for (auto item : range) {
+    if (addr >= item.first && addr <= item.second) {
+      return true;
+    }
+  }
+  return false;
 }
 
 void RegisterValue::makeString(const std::vector<uint16_t>& reg) {
@@ -275,8 +280,11 @@ time_t RegisterMapDatabase::minMonitorInterval() const {
 }
 
 void from_json(const json& j, AddrRange& a) {
-  a.range = j;
+  for (auto& r : j) {
+    a.range.emplace_back(r);
+  }
 }
+
 void to_json(json& j, const AddrRange& a) {
   j = a.range;
 }
diff --git a/common/recipes-core/rackmon2/rackmon/Register.h b/common/recipes-core/rackmon2/rackmon/Register.h
index 14b6fa8cd62f..c62faa0f1bbf 100644
--- a/common/recipes-core/rackmon2/rackmon/Register.h
+++ b/common/recipes-core/rackmon2/rackmon/Register.h
@@ -294,11 +294,11 @@ void from_json(const nlohmann::json& j, BaudrateConfig& m);
 // to allow for it to be used as a key in a map --> This allows
 // for us to do quick lookups of addr to register map to use.
 struct AddrRange {
-  // pair of start and end address.
-  std::pair<uint8_t, uint8_t> range{};
+  // vector of pair of start and end address.
+  std::vector<std::pair<uint8_t, uint8_t>> range{};
   AddrRange() = default;
-  explicit AddrRange(uint8_t a, uint8_t b) : range(a, b) {}
-  explicit AddrRange(uint8_t a) : range(a, a) {}
+  explicit AddrRange(const std::vector<std::pair<uint8_t, uint8_t>>& addrRange)
+      : range(addrRange) {}
 
   bool contains(uint8_t) const;
 };
diff --git a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv2_psu.json b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv2_psu.json
index 5fa64ccae64a..fc446443693b 100644
--- a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv2_psu.json
+++ b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv2_psu.json
@@ -1,8 +1,7 @@
 {
     "name": "ORV2_PSU",
     "address_range": [
-        160,
-        191
+        [160, 191]
     ],
     "probe_register": 104,
     "default_baudrate": 19200,
diff --git a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_bbu.json b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_bbu.json
index 022488ad16e9..8cc64914838d 100644
--- a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_bbu.json
+++ b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_bbu.json
@@ -1,8 +1,7 @@
 {
     "name": "ORV3_BBU",
     "address_range": [
-        64,
-        127
+        [64, 127]
     ],
     "probe_register": 8,
     "default_baudrate": 19200,
diff --git a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_power_recv.json b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_power_recv.json
index b02449811915..c695efabbb85 100644
--- a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_power_recv.json
+++ b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_power_recv.json
@@ -1,8 +1,7 @@
 {
     "name": "ORV3_POWER_TETHER",
     "address_range": [
-        8,
-        9
+        [8, 9]
     ],
     "probe_register": 8,
     "default_baudrate": 19200,
diff --git a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_psu.json b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_psu.json
index 4d6c45520f4d..c03f833b2080 100644
--- a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_psu.json
+++ b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_psu.json
@@ -1,8 +1,7 @@
 {
     "name": "ORV3_PSU",
     "address_range": [
-        192,
-        255
+        [192, 255]
     ],
     "probe_register": 8,
     "default_baudrate": 19200,
diff --git a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_rpu.json b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_rpu.json
index 9386dc6f534d..5437e1c30f60 100644
--- a/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_rpu.json
+++ b/common/recipes-core/rackmon2/rackmon/configs/register_map/orv3_rpu.json
@@ -1,8 +1,7 @@
 {
     "name": "ORV3_RPU",
     "address_range": [
-      12,
-      12
+      [12, 12]
     ],
     "probe_register": 36864,
     "default_baudrate": 19200,
diff --git a/common/recipes-core/rackmon2/rackmon/schemas/RegisterMapConfigSchema.json b/common/recipes-core/rackmon2/rackmon/schemas/RegisterMapConfigSchema.json
index eaf11d11779f..e05e144c5696 100644
--- a/common/recipes-core/rackmon2/rackmon/schemas/RegisterMapConfigSchema.json
+++ b/common/recipes-core/rackmon2/rackmon/schemas/RegisterMapConfigSchema.json
@@ -13,12 +13,17 @@
     },
     "address_range": {
       "type": "array",
-      "minItems": 2,
-      "maxItems": 2,
+      "minItems": 1,
+      "maxItems": 256,
       "items": {
-        "type": "integer",
-        "minimum": 0,
-        "maximum": 255
+        "type": "array",
+        "minItems": 2,
+        "maxItems": 2,
+        "items": {
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 255
+        }
       }
     },
     "probe_register": {
diff --git a/common/recipes-core/rackmon2/rackmon/tests/ModbusDeviceTest.cpp b/common/recipes-core/rackmon2/rackmon/tests/ModbusDeviceTest.cpp
index 1a349164b240..0498159e23f3 100644
--- a/common/recipes-core/rackmon2/rackmon/tests/ModbusDeviceTest.cpp
+++ b/common/recipes-core/rackmon2/rackmon/tests/ModbusDeviceTest.cpp
@@ -41,7 +41,7 @@ class ModbusDeviceTest : public ::testing::Test {
   RegisterMap regmap;
   std::string regmap_s = R"({
     "name": "orv3_psu",
-    "address_range": [110, 140],
+    "address_range": [[110, 140]],
     "probe_register": 104,
     "default_baudrate": 19200,
     "preferred_baudrate": 19200,
@@ -628,7 +628,7 @@ TEST(ModbusSpecialHandler, BasicHandlingStringValuePeriodic) {
   Modbus mock_modbus{};
   RegisterMap mock_rmap = R"({
     "name": "orv3_psu",
-    "address_range": [110, 140],
+    "address_range": [[110, 140]],
     "probe_register": 104,
     "default_baudrate": 19200,
     "preferred_baudrate": 19200,
@@ -686,7 +686,7 @@ TEST(ModbusSpecialHandler, BasicHandlingIntegerOneShot) {
   Modbus mock_modbus{};
   RegisterMap mock_rmap = R"({
     "name": "orv3_psu",
-    "address_range": [110, 140],
+    "address_range": [[110, 140]],
     "probe_register": 104,
     "default_baudrate": 19200,
     "preferred_baudrate": 19200,
@@ -742,7 +742,7 @@ TEST(ModbusSpecialHandler, BasicHandlingIntegerOneShot) {
 static nlohmann::json getBaudrateRegmap() {
   std::string regmap_s = R"({
     "name": "orv3_psu",
-    "address_range": [5, 7],
+    "address_range": [[5, 7]],
     "probe_register": 104,
     "default_baudrate": 19200,
     "preferred_baudrate": 115200,
diff --git a/common/recipes-core/rackmon2/rackmon/tests/RackmonTest.cpp b/common/recipes-core/rackmon2/rackmon/tests/RackmonTest.cpp
index 121df1ac6758..649cb27b79ab 100644
--- a/common/recipes-core/rackmon2/rackmon/tests/RackmonTest.cpp
+++ b/common/recipes-core/rackmon2/rackmon/tests/RackmonTest.cpp
@@ -121,7 +121,7 @@ class RackmonTest : public ::testing::Test {
 
     std::string json1 = R"({
         "name": "orv2_psu",
-        "address_range": [160, 162],
+        "address_range": [[160, 162]],
         "probe_register": 104,
         "default_baudrate": 19200,
         "preferred_baudrate": 19200,
@@ -174,7 +174,7 @@ class RackmonTest : public ::testing::Test {
 TEST_F(RackmonTest, BasicLoad) {
   std::string json2 = R"({
       "name": "orv3_psu",
-      "address_range": [110, 112],
+      "address_range": [[110, 112]],
       "probe_register": 104,
       "default_baudrate": 19200,
       "preferred_baudrate": 19200,
@@ -390,7 +390,7 @@ TEST_F(RackmonTest, DormantRecovery) {
   })"_json;
   json regmapConfig = R"({
     "name": "orv2_psu",
-    "address_range": [161, 161],
+    "address_range": [[161, 161]],
     "probe_register": 104,
     "default_baudrate": 19200,
     "preferred_baudrate": 19200,
diff --git a/common/recipes-core/rackmon2/rackmon/tests/RegisterMapTest.cpp b/common/recipes-core/rackmon2/rackmon/tests/RegisterMapTest.cpp
index 133bcbac6b67..d9c685e66681 100644
--- a/common/recipes-core/rackmon2/rackmon/tests/RegisterMapTest.cpp
+++ b/common/recipes-core/rackmon2/rackmon/tests/RegisterMapTest.cpp
@@ -22,19 +22,23 @@ using namespace rackmon;
 //--------------------------------------------------------
 
 TEST(AddrRangeTest, Basic) {
-  AddrRange a(10, 20);
+  AddrRange a({{10, 20}, {25, 30}});
   EXPECT_TRUE(a.contains(10));
   EXPECT_TRUE(a.contains(11));
   EXPECT_TRUE(a.contains(20));
   EXPECT_TRUE(a.contains(19));
+  EXPECT_TRUE(a.contains(25));
+  EXPECT_TRUE(a.contains(30));
   EXPECT_FALSE(a.contains(9));
   EXPECT_FALSE(a.contains(21));
+  EXPECT_FALSE(a.contains(24));
+  EXPECT_FALSE(a.contains(31));
 }
 
 TEST(RegisterMapTest, JSONCoversion) {
   std::string inp = R"({
     "name": "orv2_psu",
-    "address_range": [160, 191],
+    "address_range": [[160, 191]],
     "probe_register": 104,
     "default_baudrate": 19200,
     "preferred_baudrate": 19200,
@@ -57,8 +61,10 @@ TEST(RegisterMapTest, JSONCoversion) {
   })";
   nlohmann::json j = nlohmann::json::parse(inp);
   RegisterMap rmap = j;
-  EXPECT_EQ(rmap.applicableAddresses.range.first, 160);
-  EXPECT_EQ(rmap.applicableAddresses.range.second, 191);
+  EXPECT_TRUE(std::any_of(
+      rmap.applicableAddresses.range.cbegin(),
+      rmap.applicableAddresses.range.cend(),
+      [](auto const& ent) { return (ent.first == 160 && ent.second == 191); }));
   EXPECT_EQ(rmap.probeRegister, 104);
   EXPECT_EQ(rmap.defaultBaudrate, 19200);
   EXPECT_EQ(rmap.preferredBaudrate, 19200);
@@ -84,7 +90,7 @@ TEST(RegisterMapTest, JSONCoversion) {
 TEST(RegisterMapTest, JSONCoversionBaudrate) {
   std::string inp = R"({
     "name": "orv2_psu",
-    "address_range": [160, 191],
+    "address_range": [[160, 191]],
     "probe_register": 104,
     "default_baudrate": 19200,
     "preferred_baudrate": 19200,
@@ -107,8 +113,10 @@ TEST(RegisterMapTest, JSONCoversionBaudrate) {
   })";
   nlohmann::json j = nlohmann::json::parse(inp);
   RegisterMap rmap = j;
-  EXPECT_EQ(rmap.applicableAddresses.range.first, 160);
-  EXPECT_EQ(rmap.applicableAddresses.range.second, 191);
+  EXPECT_TRUE(std::any_of(
+      rmap.applicableAddresses.range.cbegin(),
+      rmap.applicableAddresses.range.cend(),
+      [](auto const& ent) { return (ent.first == 160 && ent.second == 191); }));
   EXPECT_EQ(rmap.probeRegister, 104);
   EXPECT_EQ(rmap.defaultBaudrate, 19200);
   EXPECT_EQ(rmap.preferredBaudrate, 19200);
@@ -126,7 +134,7 @@ TEST(RegisterMapTest, JSONCoversionBaudrate) {
 TEST(RegisterMapTest, JSONCoversionSpecial) {
   std::string inp = R"({
     "name": "orv2_psu",
-    "address_range": [160, 191],
+    "address_range": [[160, 191]],
     "probe_register": 104,
     "default_baudrate": 19200,
     "preferred_baudrate": 19200,
@@ -161,8 +169,10 @@ TEST(RegisterMapTest, JSONCoversionSpecial) {
   })";
   nlohmann::json j = nlohmann::json::parse(inp);
   RegisterMap rmap = j;
-  EXPECT_EQ(rmap.applicableAddresses.range.first, 160);
-  EXPECT_EQ(rmap.applicableAddresses.range.second, 191);
+  EXPECT_TRUE(std::any_of(
+      rmap.applicableAddresses.range.cbegin(),
+      rmap.applicableAddresses.range.cend(),
+      [](auto const& ent) { return (ent.first == 160 && ent.second == 191); }));
   EXPECT_EQ(rmap.probeRegister, 104);
   EXPECT_EQ(rmap.defaultBaudrate, 19200);
   EXPECT_EQ(rmap.preferredBaudrate, 19200);
@@ -192,7 +202,7 @@ class RegisterMapDatabaseTest : public ::testing::Test {
     mkdir(r_test_dir.c_str(), 0755);
     json1 = R"({
         "name": "orv2_psu",
-        "address_range": [160, 191],
+        "address_range": [[160, 191]],
         "probe_register": 104,
         "default_baudrate": 19200,
         "preferred_baudrate": 19200,
@@ -208,7 +218,7 @@ class RegisterMapDatabaseTest : public ::testing::Test {
       })";
     json2 = R"({
         "name": "orv3_psu",
-        "address_range": [110, 140],
+        "address_range": [[110, 140]],
         "probe_register": 104,
         "default_baudrate": 19200,
         "preferred_baudrate": 19200,
diff --git a/common/recipes-core/redfish-events/files/redfish-events.py b/common/recipes-core/redfish-events/files/redfish-events.py
index 5ce642366d3c..126d395968fd 100755
--- a/common/recipes-core/redfish-events/files/redfish-events.py
+++ b/common/recipes-core/redfish-events/files/redfish-events.py
@@ -25,7 +25,7 @@ def __init__(
         timeout: int,
     ):
         super().__init__()
-        self.subscriber_url = f"http://{sub_host}:{sub_port}"
+        self.subscriber_url = f"http://{sub_host}:{sub_port}/"
         self.target_url = f"http://{target_host}"
         self.target_fruid = fru_id
         self.target_name = fru_name
diff --git a/common/recipes-devtools/flake8/python3-flake8_4.0.1.bb b/common/recipes-devtools/flake8/python3-flake8_7.0.0.bb
similarity index 69%
rename from common/recipes-devtools/flake8/python3-flake8_4.0.1.bb
rename to common/recipes-devtools/flake8/python3-flake8_7.0.0.bb
index 5d7108b2a26d..3ee2e222b2c3 100644
--- a/common/recipes-devtools/flake8/python3-flake8_4.0.1.bb
+++ b/common/recipes-devtools/flake8/python3-flake8_7.0.0.bb
@@ -7,12 +7,12 @@ PYPI_PACKAGE = "flake8"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d"
+SRC_URI[sha256sum] = "33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132"
 
 BBCLASSEXTEND = "native nativesdk"
 
 RDEPENDS:${PN} += " \
-    ${PYTHON_PN}-pip-pyflakes \
-    ${PYTHON_PN}-pip-pycodestyle \
-    ${PYTHON_PN}-pip-mccabe \
+    ${PYTHON_PN}-pyflakes \
+    ${PYTHON_PN}-pycodestyle \
+    ${PYTHON_PN}-mccabe \
 "
diff --git a/common/recipes-devtools/flake8/python3-pip-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch b/common/recipes-devtools/flake8/python3-pip-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch
deleted file mode 100644
index 9fac28e3c2a7..000000000000
--- a/common/recipes-devtools/flake8/python3-pip-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3484bdfa7adbaebcf8bb8e7d4820f64b12717932 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Fri, 29 Jul 2016 15:37:18 +0800
-Subject: [PATCH] python-mccabe: remove unnecessary setup_requires
- pytest-runner
-
-* Remove setup_requires pytest-runner as the
-  setup_requires pytest-runner actually is not
-  used for pytest which only in do_compile phase
-  via setup.py build
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index e59903d..bf2aaba 100644
---- a/setup.py
-+++ b/setup.py
-@@ -33,7 +33,6 @@ setup(
-     license='Expat license',
-     py_modules=['mccabe'],
-     zip_safe=False,
--    setup_requires=['pytest-runner'],
-     tests_require=['pytest'],
-     entry_points={
-         'flake8.extension': [
---
-2.8.1
diff --git a/common/recipes-devtools/flake8/python3-pip-mccabe_0.6.1.bb b/common/recipes-devtools/flake8/python3-pip-mccabe_0.6.1.bb
deleted file mode 100644
index f4818c94a2d9..000000000000
--- a/common/recipes-devtools/flake8/python3-pip-mccabe_0.6.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "Simple Python style checker in one Python file"
-HOMEPAGE = "https://github.com/pycqa/mccabe"
-LICENSE = "MIT & Python-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a489dc62bacbdad3335c0f160a974f0f"
-
-PYPI_PACKAGE = "mccabe"
-
-inherit pypi setuptools3
-SRC_URI:append = " \
-    file://0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch \
-"
-SRC_URI[sha256sum] = "dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/common/recipes-devtools/flake8/python3-pip-pycodestyle_2.8.0.bb b/common/recipes-devtools/flake8/python3-pip-pycodestyle_2.8.0.bb
deleted file mode 100644
index 228dbcab4b7a..000000000000
--- a/common/recipes-devtools/flake8/python3-pip-pycodestyle_2.8.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SUMMARY = "Simple Python style checker in one Python file"
-HOMEPAGE = "https://github.com/pycqa/mccabe"
-LICENSE = "MIT & Python-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a8546d0e77f416fb05a26acd89c8b3bd"
-
-PYPI_PACKAGE = "pycodestyle"
-
-inherit pypi setuptools3
-
-SRC_URI[sha256sum] = "eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/common/recipes-devtools/flake8/python3-pip-pyflakes_2.4.0.bb b/common/recipes-devtools/flake8/python3-pip-pyflakes_2.4.0.bb
deleted file mode 100644
index 8fb29efae7e5..000000000000
--- a/common/recipes-devtools/flake8/python3-pip-pyflakes_2.4.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "flake8 is a python tool that glues together pycodestyle, pyflakes, mccabe, and third-party plugins to check the style and quality of some python code."
-HOMEPAGE = "https://github.com/pycqa/flake8"
-LICENSE = "MIT & Python-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=690c2d09203dc9e07c4083fc45ea981f"
-
-PYPI_PACKAGE = "pyflakes"
-
-SRC_URI[sha256sum] = "05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"
-inherit pypi setuptools3
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-prettytable \
-    ${PYTHON_PN}-cmd2 \
-    ${PYTHON_PN}-pyparsing \
-"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/common/recipes-devtools/qemu/libslirp%.bbappend b/common/recipes-devtools/qemu/libslirp%.bbappend
deleted file mode 100644
index 2efaef542de0..000000000000
--- a/common/recipes-devtools/qemu/libslirp%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# For qemu-system-native we need some libslirp commits that aren't in the
-# recipe SRCREV yet.  Just override it.
-SRCREV="c7c151fe3a2700bcabfc07235176fcedf7e9b089"
diff --git a/common/recipes-devtools/qemu/qemu/0001-aspeed-Zero-extend-flash-files-to-128MB.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0001-aspeed-Zero-extend-flash-files-to-128MB.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0001-aspeed-Zero-extend-flash-files-to-128MB.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0001-aspeed-Zero-extend-flash-files-to-128MB.patch
diff --git a/common/recipes-devtools/qemu/qemu/0004-hw-aspeed_vic-Add-heartbeat-LED-registers.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0004-hw-aspeed_vic-Add-heartbeat-LED-registers.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0004-hw-aspeed_vic-Add-heartbeat-LED-registers.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0004-hw-aspeed_vic-Add-heartbeat-LED-registers.patch
diff --git a/common/recipes-devtools/qemu/qemu/0005-hw-arm-aspeed-Add-fb_machine_class_init.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0005-hw-arm-aspeed-Add-fb_machine_class_init.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0005-hw-arm-aspeed-Add-fb_machine_class_init.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0005-hw-arm-aspeed-Add-fb_machine_class_init.patch
diff --git a/common/recipes-devtools/qemu/qemu/0006-hw-misc-Add-i2c-netdev-device.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0006-hw-misc-Add-i2c-netdev-device.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0006-hw-misc-Add-i2c-netdev-device.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0006-hw-misc-Add-i2c-netdev-device.patch
diff --git a/common/recipes-devtools/qemu/qemu/0007-tests-avocado-Add-fb-boot-tests.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0007-tests-avocado-Add-fb-boot-tests.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0007-tests-avocado-Add-fb-boot-tests.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0007-tests-avocado-Add-fb-boot-tests.patch
diff --git a/common/recipes-devtools/qemu/qemu/0008-tests-avocado-Disable-raspi2-initrd.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0008-tests-avocado-Disable-raspi2-initrd.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0008-tests-avocado-Disable-raspi2-initrd.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0008-tests-avocado-Disable-raspi2-initrd.patch
diff --git a/common/recipes-devtools/qemu/qemu/0009-hw-misc-Add-byte-by-byte-i2c-network-device.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0009-hw-misc-Add-byte-by-byte-i2c-network-device.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0009-hw-misc-Add-byte-by-byte-i2c-network-device.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0009-hw-misc-Add-byte-by-byte-i2c-network-device.patch
diff --git a/common/recipes-devtools/qemu/qemu/0010-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0010-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0010-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0010-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch
diff --git a/common/recipes-devtools/qemu/qemu/0011-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0011-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0011-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0011-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch
diff --git a/common/recipes-devtools/qemu/qemu/0012-hw-ssi-add-new-spi-gpio-controller.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0012-hw-ssi-add-new-spi-gpio-controller.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0012-hw-ssi-add-new-spi-gpio-controller.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0012-hw-ssi-add-new-spi-gpio-controller.patch
diff --git a/common/recipes-devtools/qemu/qemu/0013-hw-nvram-at24c-Add-static-memory-init-option.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0013-hw-nvram-at24c-Add-static-memory-init-option.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0013-hw-nvram-at24c-Add-static-memory-init-option.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0013-hw-nvram-at24c-Add-static-memory-init-option.patch
diff --git a/common/recipes-devtools/qemu/qemu/0014-scripts-Add-redact-util.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0014-scripts-Add-redact-util.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0014-scripts-Add-redact-util.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0014-scripts-Add-redact-util.patch
diff --git a/common/recipes-devtools/qemu/qemu/0015-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0015-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0015-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0015-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch
diff --git a/common/recipes-devtools/qemu/qemu/0016-hw-ssi-encoding-decoding-for-spi-gpio-driver.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0016-hw-ssi-encoding-decoding-for-spi-gpio-driver.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0016-hw-ssi-encoding-decoding-for-spi-gpio-driver.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0016-hw-ssi-encoding-decoding-for-spi-gpio-driver.patch
diff --git a/common/recipes-devtools/qemu/qemu/0017-aspeed-Reload-boot-rom-on-reset.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0017-aspeed-Reload-boot-rom-on-reset.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0017-aspeed-Reload-boot-rom-on-reset.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0017-aspeed-Reload-boot-rom-on-reset.patch
diff --git a/common/recipes-devtools/qemu/qemu/0018-hw-m25p80-spi-gpio-Fixing-miso-is-being-cleared-issu.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0018-hw-m25p80-spi-gpio-Fixing-miso-is-being-cleared-issu.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0018-hw-m25p80-spi-gpio-Fixing-miso-is-being-cleared-issu.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0018-hw-m25p80-spi-gpio-Fixing-miso-is-being-cleared-issu.patch
diff --git a/common/recipes-devtools/qemu/qemu/0019-hw-m25p80-spi-gpio-add-device-reset.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0019-hw-m25p80-spi-gpio-add-device-reset.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0019-hw-m25p80-spi-gpio-add-device-reset.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0019-hw-m25p80-spi-gpio-add-device-reset.patch
diff --git a/common/recipes-devtools/qemu/qemu/0020-hw-m25p80-spi-gpio-fix-prereading-logic-for-controll.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0020-hw-m25p80-spi-gpio-fix-prereading-logic-for-controll.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0020-hw-m25p80-spi-gpio-fix-prereading-logic-for-controll.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0020-hw-m25p80-spi-gpio-fix-prereading-logic-for-controll.patch
diff --git a/common/recipes-devtools/qemu/qemu/0021-hw-adding-tpm-tis-spi.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0021-hw-adding-tpm-tis-spi.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0021-hw-adding-tpm-tis-spi.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0021-hw-adding-tpm-tis-spi.patch
diff --git a/common/recipes-devtools/qemu/qemu/0022-aspeed-Add-grandteton-bmc.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0022-aspeed-Add-grandteton-bmc.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0022-aspeed-Add-grandteton-bmc.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0022-aspeed-Add-grandteton-bmc.patch
diff --git a/common/recipes-devtools/qemu/qemu/0023-docs-system-arm-Add-Description-for-NPCM8XX-SoC.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0023-docs-system-arm-Add-Description-for-NPCM8XX-SoC.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0023-docs-system-arm-Add-Description-for-NPCM8XX-SoC.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0023-docs-system-arm-Add-Description-for-NPCM8XX-SoC.patch
diff --git a/common/recipes-devtools/qemu/qemu/0024-hw-ssi-Make-flash-size-a-property-in-NPCM7XX-FIU.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0024-hw-ssi-Make-flash-size-a-property-in-NPCM7XX-FIU.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0024-hw-ssi-Make-flash-size-a-property-in-NPCM7XX-FIU.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0024-hw-ssi-Make-flash-size-a-property-in-NPCM7XX-FIU.patch
diff --git a/common/recipes-devtools/qemu/qemu/0025-hw-misc-Support-NPCM8XX-GCR-module.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0025-hw-misc-Support-NPCM8XX-GCR-module.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0025-hw-misc-Support-NPCM8XX-GCR-module.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0025-hw-misc-Support-NPCM8XX-GCR-module.patch
diff --git a/common/recipes-devtools/qemu/qemu/0026-hw-misc-Support-NPCM8XX-CLK-Module-Registers.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0026-hw-misc-Support-NPCM8XX-CLK-Module-Registers.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0026-hw-misc-Support-NPCM8XX-CLK-Module-Registers.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0026-hw-misc-Support-NPCM8XX-CLK-Module-Registers.patch
diff --git a/common/recipes-devtools/qemu/qemu/0027-hw-misc-Store-DRAM-size-in-NPCM8XX-GCR-Module.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0027-hw-misc-Store-DRAM-size-in-NPCM8XX-GCR-Module.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0027-hw-misc-Store-DRAM-size-in-NPCM8XX-GCR-Module.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0027-hw-misc-Store-DRAM-size-in-NPCM8XX-GCR-Module.patch
diff --git a/common/recipes-devtools/qemu/qemu/0028-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0028-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0028-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0028-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch
diff --git a/common/recipes-devtools/qemu/qemu/0029-hw-misc-Support-8-bytes-memop-in-NPCM-GCR-module.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0029-hw-misc-Support-8-bytes-memop-in-NPCM-GCR-module.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0029-hw-misc-Support-8-bytes-memop-in-NPCM-GCR-module.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0029-hw-misc-Support-8-bytes-memop-in-NPCM-GCR-module.patch
diff --git a/common/recipes-devtools/qemu/qemu/0030-hw-net-Add-NPCM8XX-PCS-Module.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0030-hw-net-Add-NPCM8XX-PCS-Module.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0030-hw-net-Add-NPCM8XX-PCS-Module.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0030-hw-net-Add-NPCM8XX-PCS-Module.patch
diff --git a/common/recipes-devtools/qemu/qemu/0031-hw-arm-Add-NPCM8XX-SoC.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0031-hw-arm-Add-NPCM8XX-SoC.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0031-hw-arm-Add-NPCM8XX-SoC.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0031-hw-arm-Add-NPCM8XX-SoC.patch
diff --git a/common/recipes-devtools/qemu/qemu/0032-hw-arm-Add-NPCM845-Evaluation-board.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0032-hw-arm-Add-NPCM845-Evaluation-board.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0032-hw-arm-Add-NPCM845-Evaluation-board.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0032-hw-arm-Add-NPCM845-Evaluation-board.patch
diff --git a/common/recipes-devtools/qemu/qemu/0033-hw-arm-npcm8xx-Remove-qemu-common.h-include.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0033-hw-arm-npcm8xx-Remove-qemu-common.h-include.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0033-hw-arm-npcm8xx-Remove-qemu-common.h-include.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0033-hw-arm-npcm8xx-Remove-qemu-common.h-include.patch
diff --git a/common/recipes-devtools/qemu/qemu/0034-npcm7xx-Change-flash_size-to-uint64.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0034-npcm7xx-Change-flash_size-to-uint64.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0034-npcm7xx-Change-flash_size-to-uint64.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0034-npcm7xx-Change-flash_size-to-uint64.patch
diff --git a/common/recipes-devtools/qemu/qemu/0035-hw-tpm_tis_spi-fix-the-read-write-mmio-logic-fix-the.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0035-hw-tpm_tis_spi-fix-the-read-write-mmio-logic-fix-the.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0035-hw-tpm_tis_spi-fix-the-read-write-mmio-logic-fix-the.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0035-hw-tpm_tis_spi-fix-the-read-write-mmio-logic-fix-the.patch
diff --git a/common/recipes-devtools/qemu/qemu/0036-hw-tpm_tis_spi-connect-the-cs-line-remove-m25p80-dev.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0036-hw-tpm_tis_spi-connect-the-cs-line-remove-m25p80-dev.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0036-hw-tpm_tis_spi-connect-the-cs-line-remove-m25p80-dev.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0036-hw-tpm_tis_spi-connect-the-cs-line-remove-m25p80-dev.patch
diff --git a/common/recipes-devtools/qemu/qemu/0037-npcm8xx-Fix-flash-device-part-number.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0037-npcm8xx-Fix-flash-device-part-number.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0037-npcm8xx-Fix-flash-device-part-number.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0037-npcm8xx-Fix-flash-device-part-number.patch
diff --git a/common/recipes-devtools/qemu/qemu/0038-npcm8xx-Increase-ram-to-2GB.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0038-npcm8xx-Increase-ram-to-2GB.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0038-npcm8xx-Increase-ram-to-2GB.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0038-npcm8xx-Increase-ram-to-2GB.patch
diff --git a/common/recipes-devtools/qemu/qemu/0039-npcm8xx-Change-default-bios-path-to-pc-bios-npcm8xx_.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0039-npcm8xx-Change-default-bios-path-to-pc-bios-npcm8xx_.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0039-npcm8xx-Change-default-bios-path-to-pc-bios-npcm8xx_.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0039-npcm8xx-Change-default-bios-path-to-pc-bios-npcm8xx_.patch
diff --git a/common/recipes-devtools/qemu/qemu/0040-npcm8xx-Init-INTCR4-GMMAP0-to-0x7F00_0000.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0040-npcm8xx-Init-INTCR4-GMMAP0-to-0x7F00_0000.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0040-npcm8xx-Init-INTCR4-GMMAP0-to-0x7F00_0000.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0040-npcm8xx-Init-INTCR4-GMMAP0-to-0x7F00_0000.patch
diff --git a/common/recipes-devtools/qemu/qemu/0041-npcm8xx-Auto-zero-extend-flash-images.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0041-npcm8xx-Auto-zero-extend-flash-images.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0041-npcm8xx-Auto-zero-extend-flash-images.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0041-npcm8xx-Auto-zero-extend-flash-images.patch
diff --git a/common/recipes-devtools/qemu/qemu/0042-hw-spi_gpio-remove-MOSI-pin.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0042-hw-spi_gpio-remove-MOSI-pin.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0042-hw-spi_gpio-remove-MOSI-pin.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0042-hw-spi_gpio-remove-MOSI-pin.patch
diff --git a/common/recipes-devtools/qemu/qemu/0043-tests-avocado-boot_linux_console-Add-NPCM845-EVB.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0043-tests-avocado-boot_linux_console-Add-NPCM845-EVB.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0043-tests-avocado-boot_linux_console-Add-NPCM845-EVB.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0043-tests-avocado-boot_linux_console-Add-NPCM845-EVB.patch
diff --git a/common/recipes-devtools/qemu/qemu/0044-fbttn-Add-I2C-SCL-timeout-property.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0044-fbttn-Add-I2C-SCL-timeout-property.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0044-fbttn-Add-I2C-SCL-timeout-property.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0044-fbttn-Add-I2C-SCL-timeout-property.patch
diff --git a/common/recipes-devtools/qemu/qemu/0045-aspeed-Add-greatlakes-bmc.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0045-aspeed-Add-greatlakes-bmc.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0045-aspeed-Add-greatlakes-bmc.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0045-aspeed-Add-greatlakes-bmc.patch
diff --git a/common/recipes-devtools/qemu/qemu/0046-hw-misc-aspeed-Add-fby35-sb-cpld.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0046-hw-misc-aspeed-Add-fby35-sb-cpld.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0046-hw-misc-aspeed-Add-fby35-sb-cpld.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0046-hw-misc-aspeed-Add-fby35-sb-cpld.patch
diff --git a/common/recipes-devtools/qemu/qemu/0047-hw-misc-aspeed-Add-intel-me.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0047-hw-misc-aspeed-Add-intel-me.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0047-hw-misc-aspeed-Add-intel-me.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0047-hw-misc-aspeed-Add-intel-me.patch
diff --git a/common/recipes-devtools/qemu/qemu/0048-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0048-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0048-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0048-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch
diff --git a/common/recipes-devtools/qemu/qemu/0049-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0049-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0049-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0049-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch
diff --git a/common/recipes-devtools/qemu/qemu/0050-hw-i2c-pca954x-Add-method-to-get-channels.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0050-hw-i2c-pca954x-Add-method-to-get-channels.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0050-hw-i2c-pca954x-Add-method-to-get-channels.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0050-hw-i2c-pca954x-Add-method-to-get-channels.patch
diff --git a/common/recipes-devtools/qemu/qemu/0051-aspeed-Expose-i2c-buses-to-machine.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0051-aspeed-Expose-i2c-buses-to-machine.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0051-aspeed-Expose-i2c-buses-to-machine.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0051-aspeed-Expose-i2c-buses-to-machine.patch
diff --git a/common/recipes-devtools/qemu/qemu/0052-fby35-Setup-I2C-devices-and-GPIO-s.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0052-fby35-Setup-I2C-devices-and-GPIO-s.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0052-fby35-Setup-I2C-devices-and-GPIO-s.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0052-fby35-Setup-I2C-devices-and-GPIO-s.patch
diff --git a/common/recipes-devtools/qemu/qemu/0053-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0053-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0053-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0053-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch
diff --git a/common/recipes-devtools/qemu/qemu/0054-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0054-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0054-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0054-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch
diff --git a/common/recipes-devtools/qemu/qemu/0055-hw-i2c-aspeed-Add-slave-event-traces.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0055-hw-i2c-aspeed-Add-slave-event-traces.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0055-hw-i2c-aspeed-Add-slave-event-traces.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0055-hw-i2c-aspeed-Add-slave-event-traces.patch
diff --git a/common/recipes-devtools/qemu/qemu/0056-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0056-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0056-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0056-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch
diff --git a/common/recipes-devtools/qemu/qemu/0057-qemu-Add-i2c-devices-to-oby35-cl.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0057-qemu-Add-i2c-devices-to-oby35-cl.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0057-qemu-Add-i2c-devices-to-oby35-cl.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0057-qemu-Add-i2c-devices-to-oby35-cl.patch
diff --git a/common/recipes-devtools/qemu/qemu/0058-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0058-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0058-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0058-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch
diff --git a/common/recipes-devtools/qemu/qemu/0059-hw-misc-add-a-toy-i2c-echo-device.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0059-hw-misc-add-a-toy-i2c-echo-device.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0059-hw-misc-add-a-toy-i2c-echo-device.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0059-hw-misc-add-a-toy-i2c-echo-device.patch
diff --git a/common/recipes-devtools/qemu/qemu/0060-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0060-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0060-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0060-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch
diff --git a/common/recipes-devtools/qemu/qemu/0061-tests-Create-qtest-for-Aspeed-I2C-controller.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0061-tests-Create-qtest-for-Aspeed-I2C-controller.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0061-tests-Create-qtest-for-Aspeed-I2C-controller.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0061-tests-Create-qtest-for-Aspeed-I2C-controller.patch
diff --git a/common/recipes-devtools/qemu/qemu/0062-aspeed-Add-Sandia.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0062-aspeed-Add-Sandia.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0062-aspeed-Add-Sandia.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0062-aspeed-Add-Sandia.patch
diff --git a/common/recipes-devtools/qemu/qemu/0063-npcm8xx-Enable-EL3.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0063-npcm8xx-Enable-EL3.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0063-npcm8xx-Enable-EL3.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0063-npcm8xx-Enable-EL3.patch
diff --git a/common/recipes-devtools/qemu/qemu/0064-npcm8xx-Allow-bios-to-be-omitted.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0064-npcm8xx-Allow-bios-to-be-omitted.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0064-npcm8xx-Allow-bios-to-be-omitted.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0064-npcm8xx-Allow-bios-to-be-omitted.patch
diff --git a/common/recipes-devtools/qemu/qemu/0065-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0065-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0065-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0065-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch
diff --git a/common/recipes-devtools/qemu/qemu/0066-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0066-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0066-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0066-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch
diff --git a/common/recipes-devtools/qemu/qemu/0067-aspeed-add-montblanc-bmc.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0067-aspeed-add-montblanc-bmc.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0067-aspeed-add-montblanc-bmc.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0067-aspeed-add-montblanc-bmc.patch
diff --git a/common/recipes-devtools/qemu/qemu/0068-hw-eeprom-at24c-for-1-byte-address.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0068-hw-eeprom-at24c-for-1-byte-address.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0068-hw-eeprom-at24c-for-1-byte-address.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0068-hw-eeprom-at24c-for-1-byte-address.patch
diff --git a/common/recipes-devtools/qemu/qemu/0069-aspeed-add-janga-bmc.patch b/common/recipes-devtools/qemu/qemu-7.2.0-patches/0069-aspeed-add-janga-bmc.patch
similarity index 100%
rename from common/recipes-devtools/qemu/qemu/0069-aspeed-add-janga-bmc.patch
rename to common/recipes-devtools/qemu/qemu-7.2.0-patches/0069-aspeed-add-janga-bmc.patch
diff --git a/common/recipes-devtools/qemu/qemu-system-native_%.bbappend b/common/recipes-devtools/qemu/qemu-system-native_%.bbappend
new file mode 100644
index 000000000000..9dfd6b001678
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu-system-native_%.bbappend
@@ -0,0 +1,41 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI += " \
+    file://0500-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch \
+    file://0501-aspeed-Zero-extend-flash-files-to-128MB.patch \
+    file://0502-hw-aspeed_vic-Add-heartbeat-LED-registers.patch \
+    file://0503-hw-misc-Add-i2c-netdev-device.patch \
+    file://0504-hw-misc-Add-byte-by-byte-i2c-network-device.patch \
+    file://0505-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch \
+    file://0506-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch \
+    file://0507-hw-i2c-pca954x-Add-method-to-get-channels.patch \
+    file://0508-hw-arm-aspeed-Add-fb_machine_class_init.patch \
+    file://0509-fbttn-Add-I2C-SCL-timeout-property.patch \
+    file://0510-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch \
+    file://0511-hw-i2c-aspeed-Add-slave-event-traces.patch \
+    file://0512-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch \
+    file://0513-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch \
+    file://0514-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch \
+    file://0515-tests-Create-qtest-for-Aspeed-I2C-controller.patch \
+    file://0516-scripts-Add-redact-util.patch \
+    file://0517-aspeed-Expose-i2c-buses-to-machine.patch \
+    file://0518-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch \
+    file://0519-hw-misc-aspeed-Add-fby35-sb-cpld.patch \
+    file://0520-hw-misc-aspeed-Add-intel-me.patch \
+    file://0521-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch \
+    file://0522-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch \
+    file://0523-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch \
+    file://0524-fby35-Setup-I2C-devices-and-GPIO-s.patch \
+    file://0525-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch \
+    file://0526-qemu-Add-i2c-devices-to-oby35-cl.patch \
+    file://0527-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch \
+    file://0528-aspeed-Add-grandteton-bmc.patch \
+    file://0529-aspeed-Add-greatlakes-bmc.patch \
+    file://0530-aspeed-Add-Sandia.patch \
+    file://0531-aspeed-add-montblanc-bmc-reference-from-fuji.patch \
+    file://0532-aspeed-add-janga-bmc.patch \
+    "
+
+PACKAGECONFIG:remove = "alsa"
+PACKAGECONFIG:remove = "kvm"
+PACKAGECONFIG:remove = "png"
diff --git a/common/recipes-devtools/qemu/qemu-system-native_git.bb b/common/recipes-devtools/qemu/qemu-system-native_git.bb
deleted file mode 100644
index 6ae2557960b1..000000000000
--- a/common/recipes-devtools/qemu/qemu-system-native_git.bb
+++ /dev/null
@@ -1,117 +0,0 @@
-BPN = "qemu"
-
-require recipes-devtools/qemu/qemu-native.inc
-
-DEPENDS = "glib-2.0-native \
-           zlib-native \
-           pixman-native \
-           qemu-native \
-           bison-native \
-           ninja-native \
-          "
-
-S = "${WORKDIR}/git"
-
-SRCREV_FORMAT = "dtc_meson_berkeley-softfloat-3_berkeley-testfloat-3_keycodemapdb"
-SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81"
-SRCREV_meson = "3a9b285a55b91b53b2acda987192274352ecb5be"
-SRCREV_berkeley-softfloat-3 = "b64af41c3276f97f0e181920400ee056b9c88037"
-SRCREV_berkeley-testfloat-3 = "5a59dcec19327396a011a17fd924aed4fec416b3"
-SRCREV_keycodemapdb = "d21009b1c9f94b740ea66be8e48a1d8ad8124023"
-SRCREV = "b67b00e6b4c7831a3f5bc684bc0df7a9bfd1bd56"
-
-SRC_URI = " \
-    git://gitlab.com/qemu-project/qemu.git;branch=master;protocol=https \
-    git://gitlab.com/qemu-project/dtc.git;destsuffix=git/dtc;protocol=https;name=dtc;nobranch=1 \
-    git://gitlab.com/qemu-project/meson.git;destsuffix=git/meson;nobranch=1;protocol=https;name=meson;nobranch=1 \
-    git://gitlab.com/qemu-project/berkeley-softfloat-3.git;destsuffix=git/tests/fp/berkeley-softfloat-3;nobranch=1;protocol=https;name=berkeley-softfloat-3;nobranch=1 \
-    git://gitlab.com/qemu-project/berkeley-testfloat-3.git;destsuffix=git/tests/fp/berkeley-testfloat-3;nobranch=1;protocol=https;name=berkeley-testfloat-3;nobranch=1 \
-    git://gitlab.com/qemu-project/keycodemapdb.git;destsuffix=git/ui/keycodemapdb;nobranch=1;protocol=https;name=keycodemapdb;nobranch=1 \
-    file://0001-aspeed-Zero-extend-flash-files-to-128MB.patch \
-    file://0004-hw-aspeed_vic-Add-heartbeat-LED-registers.patch \
-    file://0005-hw-arm-aspeed-Add-fb_machine_class_init.patch \
-    file://0006-hw-misc-Add-i2c-netdev-device.patch \
-    file://0007-tests-avocado-Add-fb-boot-tests.patch \
-    file://0008-tests-avocado-Disable-raspi2-initrd.patch \
-    file://0009-hw-misc-Add-byte-by-byte-i2c-network-device.patch \
-    file://0010-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch \
-    file://0011-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch \
-    file://0012-hw-ssi-add-new-spi-gpio-controller.patch \
-    file://0013-hw-nvram-at24c-Add-static-memory-init-option.patch \
-    file://0014-scripts-Add-redact-util.patch \
-    file://0015-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch \
-    file://0016-hw-ssi-encoding-decoding-for-spi-gpio-driver.patch \
-    file://0017-aspeed-Reload-boot-rom-on-reset.patch \
-    file://0018-hw-m25p80-spi-gpio-Fixing-miso-is-being-cleared-issu.patch \
-    file://0019-hw-m25p80-spi-gpio-add-device-reset.patch \
-    file://0020-hw-m25p80-spi-gpio-fix-prereading-logic-for-controll.patch \
-    file://0021-hw-adding-tpm-tis-spi.patch \
-    file://0022-aspeed-Add-grandteton-bmc.patch \
-    file://0023-docs-system-arm-Add-Description-for-NPCM8XX-SoC.patch \
-    file://0024-hw-ssi-Make-flash-size-a-property-in-NPCM7XX-FIU.patch \
-    file://0025-hw-misc-Support-NPCM8XX-GCR-module.patch \
-    file://0026-hw-misc-Support-NPCM8XX-CLK-Module-Registers.patch \
-    file://0027-hw-misc-Store-DRAM-size-in-NPCM8XX-GCR-Module.patch \
-    file://0028-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch \
-    file://0029-hw-misc-Support-8-bytes-memop-in-NPCM-GCR-module.patch \
-    file://0030-hw-net-Add-NPCM8XX-PCS-Module.patch \
-    file://0031-hw-arm-Add-NPCM8XX-SoC.patch \
-    file://0032-hw-arm-Add-NPCM845-Evaluation-board.patch \
-    file://0033-hw-arm-npcm8xx-Remove-qemu-common.h-include.patch \
-    file://0034-npcm7xx-Change-flash_size-to-uint64.patch \
-    file://0035-hw-tpm_tis_spi-fix-the-read-write-mmio-logic-fix-the.patch \
-    file://0036-hw-tpm_tis_spi-connect-the-cs-line-remove-m25p80-dev.patch \
-    file://0037-npcm8xx-Fix-flash-device-part-number.patch \
-    file://0038-npcm8xx-Increase-ram-to-2GB.patch \
-    file://0039-npcm8xx-Change-default-bios-path-to-pc-bios-npcm8xx_.patch \
-    file://0040-npcm8xx-Init-INTCR4-GMMAP0-to-0x7F00_0000.patch \
-    file://0041-npcm8xx-Auto-zero-extend-flash-images.patch \
-    file://0042-hw-spi_gpio-remove-MOSI-pin.patch \
-    file://0043-tests-avocado-boot_linux_console-Add-NPCM845-EVB.patch \
-    file://0044-fbttn-Add-I2C-SCL-timeout-property.patch \
-    file://0045-aspeed-Add-greatlakes-bmc.patch \
-    file://0046-hw-misc-aspeed-Add-fby35-sb-cpld.patch \
-    file://0047-hw-misc-aspeed-Add-intel-me.patch \
-    file://0048-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch \
-    file://0049-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch \
-    file://0050-hw-i2c-pca954x-Add-method-to-get-channels.patch \
-    file://0051-aspeed-Expose-i2c-buses-to-machine.patch \
-    file://0052-fby35-Setup-I2C-devices-and-GPIO-s.patch \
-    file://0053-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch \
-    file://0054-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch \
-    file://0055-hw-i2c-aspeed-Add-slave-event-traces.patch \
-    file://0056-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch \
-    file://0057-qemu-Add-i2c-devices-to-oby35-cl.patch \
-    file://0058-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch \
-    file://0059-hw-misc-add-a-toy-i2c-echo-device.patch \
-    file://0060-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch \
-    file://0061-tests-Create-qtest-for-Aspeed-I2C-controller.patch \
-    file://0062-aspeed-Add-Sandia.patch \
-    file://0063-npcm8xx-Enable-EL3.patch \
-    file://0064-npcm8xx-Allow-bios-to-be-omitted.patch \
-    file://0065-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch \
-    file://0066-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch \
-    file://0067-aspeed-add-montblanc-bmc.patch \
-    file://0068-hw-eeprom-at24c-for-1-byte-address.patch \
-    file://0069-aspeed-add-janga-bmc.patch \
-    "
-PV = "7.2.0+git${SRCPV}"
-
-PACKAGECONFIG ??= "fdt slirp pie "
-
-EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
-EXTRA_OECONF:append = " --disable-guest-agent"
-EXTRA_OECONF:remove = "--meson=meson"
-EXTRA_OECONF:remove = "--disable-libdw"
-EXTRA_OECONF:remove = "--disable-download"
-EXTRA_OECONF:remove = "--disable-docs"
-EXTRA_OECONF:remove = "--disable-pipewire"
-
-do_install:append() {
-    # The following is also installed by qemu-native
-    rm -f ${D}${datadir}/qemu/trace-events-all
-    rm -rf ${D}${datadir}/qemu/keymaps
-    rm -rf ${D}${datadir}/icons/
-    rm -rf ${D}${includedir}/qemu-plugin.h
-}
-
diff --git a/common/recipes-devtools/qemu/qemu/0500-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch b/common/recipes-devtools/qemu/qemu/0500-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch
new file mode 100644
index 000000000000..82a6638290e4
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0500-net-slirp-Add-mfr-id-and-oob-eth-addr-parameters.patch
@@ -0,0 +1,110 @@
+From ec4456b2ea7bf66e91c2f52c5ae1239ffb2f2c0f Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Thu, 5 Jan 2023 01:13:45 -0800
+Subject: [PATCH 500/532] net/slirp: Add mfr-id and oob-eth-addr parameters
+
+This adds mfr-id and oob-eth-addr parameters to the userspace netdev backend.
+
+    -netdev user,id=[str],mfr-id=[uint32],oob-eth-addr=[MAC address]
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ net/slirp.c   | 19 ++++++++++++++++---
+ qapi/net.json |  9 ++++++++-
+ 2 files changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/net/slirp.c b/net/slirp.c
+index 25b49c4526..2512d2519b 100644
+--- a/net/slirp.c
++++ b/net/slirp.c
+@@ -426,7 +426,8 @@ static int net_slirp_init(NetClientState *peer, const char *model,
+                           const char *vnameserver, const char *vnameserver6,
+                           const char *smb_export, const char *vsmbserver,
+                           const char **dnssearch, const char *vdomainname,
+-                          const char *tftp_server_name,
++                          const char *tftp_server_name, uint32_t mfr_id,
++                          const char *oob_eth_addr_str,
+                           Error **errp)
+ {
+     /* default settings according to historic slirp */
+@@ -449,6 +450,7 @@ static int net_slirp_init(NetClientState *peer, const char *model,
+     int shift;
+     char *end;
+     struct slirp_config_str *config;
++    MACAddr oob_eth_addr = {};
+ 
+     if (!ipv4 && (vnetwork || vhost || vnameserver)) {
+         error_setg(errp, "IPv4 disabled but netmask/host/dns provided");
+@@ -622,6 +624,12 @@ static int net_slirp_init(NetClientState *peer, const char *model,
+         return -1;
+     }
+ 
++    if (oob_eth_addr_str &&
++        net_parse_macaddr(oob_eth_addr.a, oob_eth_addr_str) < 0) {
++        error_setg(errp, "'oob-eth-addr' invalid syntax for MAC address");
++        return -1;
++    }
++
+     nc = qemu_new_net_client(&net_slirp_info, peer, model, name);
+ 
+     qemu_set_info_str(nc, "net=%s,restrict=%s", inet_ntoa(net),
+@@ -629,7 +637,7 @@ static int net_slirp_init(NetClientState *peer, const char *model,
+ 
+     s = DO_UPCAST(SlirpState, nc, nc);
+ 
+-    cfg.version = SLIRP_CHECK_VERSION(4,7,0) ? 4 : 1;
++    cfg.version = SLIRP_CONFIG_VERSION_MAX;
+     cfg.restricted = restricted;
+     cfg.in_enabled = ipv4;
+     cfg.vnetwork = net;
+@@ -648,6 +656,10 @@ static int net_slirp_init(NetClientState *peer, const char *model,
+     cfg.vnameserver6 = ip6_dns;
+     cfg.vdnssearch = dnssearch;
+     cfg.vdomainname = vdomainname;
++#if SLIRP_CONFIG_VERSION_MAX >= 5
++    cfg.mfr_id = mfr_id;
++    memcpy(cfg.oob_eth_addr, oob_eth_addr.a, sizeof(cfg.oob_eth_addr));
++#endif
+     s->slirp = slirp_new(&cfg, &slirp_cb, s);
+     QTAILQ_INSERT_TAIL(&slirp_stacks, s, entry);
+ 
+@@ -1184,7 +1196,8 @@ int net_init_slirp(const Netdev *netdev, const char *name,
+                          user->bootfile, user->dhcpstart,
+                          user->dns, user->ipv6_dns, user->smb,
+                          user->smbserver, dnssearch, user->domainname,
+-                         user->tftp_server_name, errp);
++                         user->tftp_server_name, user->mfr_id,
++                         user->oob_eth_addr, errp);
+ 
+     while (slirp_configs) {
+         config = slirp_configs;
+diff --git a/qapi/net.json b/qapi/net.json
+index 8095b68fa8..8d785dbed7 100644
+--- a/qapi/net.json
++++ b/qapi/net.json
+@@ -163,6 +163,11 @@
+ #
+ # @tftp-server-name: RFC2132 "TFTP server name" string (Since 3.1)
+ #
++# @mfr-id: Manufacturer ID (IANA Private Enterprise Number)
++#
++# @oob-eth-addr: MAC Address allocated for an out-of-band management
++#                controller, to be retrieved through NC-SI.
++#
+ # Since: 1.2
+ ##
+ { 'struct': 'NetdevUserOptions',
+@@ -188,7 +193,9 @@
+     '*smbserver': 'str',
+     '*hostfwd':   ['String'],
+     '*guestfwd':  ['String'],
+-    '*tftp-server-name': 'str' } }
++    '*tftp-server-name': 'str',
++    '*mfr-id':    'uint32',
++    '*oob-eth-addr': 'str' } }
+ 
+ ##
+ # @NetdevTapOptions:
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0501-aspeed-Zero-extend-flash-files-to-128MB.patch b/common/recipes-devtools/qemu/qemu/0501-aspeed-Zero-extend-flash-files-to-128MB.patch
new file mode 100644
index 000000000000..583201c13578
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0501-aspeed-Zero-extend-flash-files-to-128MB.patch
@@ -0,0 +1,74 @@
+From b6cef4fbf160755fa5fbc27edcc6fa3f68009bd7 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Fri, 17 Jun 2022 12:21:22 -0700
+Subject: [PATCH 501/532] aspeed: Zero extend flash files to 128MB
+
+This finally removes the requirement that you have to pad your QEMU
+flash images with zeroes.
+
+Now QEMU will automatically zero-extend your flash device file to the
+Aspeed FMC's segment size if it is smaller than it should be.
+
+For example:
+
+    $ ls -lh flash-yosemite35
+    -rw-r--r-- 2 pdel users 30M Jun 17 12:23 flash-yosemite35
+    $ qemu-system-arm -machine fby35-bmc -drive file=flash-yosemite35,format=raw,if=mtd -nographic
+    $ ls -lh flash-yosemite35
+    -rw-r--r-- 2 pdel users 128M Jun 17 12:25 flash-yosemite35
+
+If your file is large enough already, then QEMU will not truncate it.
+
+For example, if your image is 256MB, it won't truncate to 128MB.
+
+    $ dd if=/dev/zero of=tmp.mtd bs=1M count=256
+    256+0 records in
+    256+0 records out
+    268435456 bytes (268 MB, 256 MiB) copied, 0.125099 s, 2.1 GB/s
+    pdel@devvm9194:~/local/qemu (blk)
+    $ ./build/qemu-system-arm -machine fby35-bmc -drive file=tmp.mtd,format=raw,if=mtd -nographic
+    QEMU 7.0.50 monitor - type 'help' for more information
+    (qemu) q
+    pdel@devvm9194:~/local/qemu (blk)
+    $ ls -lh tmp.mtd
+    -rw-r--r-- 1 pdel users 256M Jun 17 15:46 tmp.mtd
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/arm/aspeed.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index cc59176563..744441b5cc 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -307,12 +307,25 @@ void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
+     }
+ 
+     for (i = 0; i < count; ++i) {
++        AspeedSMCFlash *flash = &s->flashes[i];
+         DriveInfo *dinfo = drive_get(IF_MTD, 0, unit0 + i);
++        BlockBackend *blk;
+         DeviceState *dev;
++        uint64_t flash_size, blk_size, perm, shared_perm;
+ 
+         dev = qdev_new(flashtype);
++        flash_size = memory_region_size(&flash->mmio);
+         if (dinfo) {
+-            qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(dinfo));
++            blk = blk_by_legacy_dinfo(dinfo);
++            blk_size = blk_getlength(blk);
++            if (blk_size < flash_size) {
++                blk_get_perm(blk, &perm, &shared_perm);
++                blk_set_perm(blk, BLK_PERM_ALL, BLK_PERM_ALL, &error_abort);
++                blk_truncate(blk, flash_size, true, PREALLOC_MODE_OFF,
++                             BDRV_REQ_ZERO_WRITE, &error_abort);
++                blk_set_perm(blk, perm, shared_perm, &error_abort);
++            }
++            qdev_prop_set_drive(dev, "drive", blk);
+         }
+         qdev_prop_set_uint8(dev, "cs", i);
+         qdev_realize_and_unref(dev, BUS(s->spi), &error_fatal);
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0502-hw-aspeed_vic-Add-heartbeat-LED-registers.patch b/common/recipes-devtools/qemu/qemu/0502-hw-aspeed_vic-Add-heartbeat-LED-registers.patch
new file mode 100644
index 000000000000..3142e856d2b3
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0502-hw-aspeed_vic-Add-heartbeat-LED-registers.patch
@@ -0,0 +1,70 @@
+From 1c9d9b8214792b86097567e9444549145bd54434 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Tue, 23 Nov 2021 09:22:10 -0800
+Subject: [PATCH 502/532] hw: aspeed_vic: Add heartbeat LED registers
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/intc/aspeed_vic.c         | 15 +++++++++++++++
+ include/hw/intc/aspeed_vic.h |  5 +++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c
+index 5ba06c5262..13c700d4f6 100644
+--- a/hw/intc/aspeed_vic.c
++++ b/hw/intc/aspeed_vic.c
+@@ -168,6 +168,12 @@ static uint64_t aspeed_vic_read(void *opaque, hwaddr offset, unsigned size)
+                       HWADDR_PRIx "\n", __func__, offset);
+         val = 0;
+         break;
++    case 0x60: /* Hardware Heart Beat Status Register */
++        val = s->heartbeat_status & 0x1f;
++        break;
++    case 0x64: /* Heart Beat LED Output */
++        val = s->heartbeat_output & 1;
++        break;
+     default:
+         qemu_log_mask(LOG_GUEST_ERROR,
+                       "%s: Bad register at offset 0x%" HWADDR_PRIx "\n",
+@@ -272,6 +278,13 @@ static void aspeed_vic_write(void *opaque, hwaddr offset, uint64_t data,
+                       "%s: Write of read-only register with offset 0x%"
+                       HWADDR_PRIx "\n", __func__, offset);
+         break;
++    case 0x60: /* Hardware Heart Beat Status Register */
++        /* Only the first 5 bits are RW */
++        s->heartbeat_status = data & 0x1f;
++        break;
++    case 0x64: /* Heart Beat LED Output */
++        s->heartbeat_output = data & 1;
++        break;
+ 
+     default:
+         qemu_log_mask(LOG_GUEST_ERROR,
+@@ -303,6 +316,8 @@ static void aspeed_vic_reset(DeviceState *dev)
+     s->sense = 0x1F07FFF8FFFFULL;
+     s->dual_edge = 0xF800070000ULL;
+     s->event = 0x5F07FFF8FFFFULL;
++    s->heartbeat_status = 0x03;
++    s->heartbeat_output = 0x00;
+ }
+ 
+ #define AVIC_IO_REGION_SIZE 0x20000
+diff --git a/include/hw/intc/aspeed_vic.h b/include/hw/intc/aspeed_vic.h
+index 68d6ab997a..d162d2da07 100644
+--- a/include/hw/intc/aspeed_vic.h
++++ b/include/hw/intc/aspeed_vic.h
+@@ -44,6 +44,11 @@ struct AspeedVICState {
+ 
+     /* 0=low-sensitive/falling-edge, 1=high-sensitive/rising-edge */
+     uint64_t event;
++
++    /* Configure heartbeat LED mode, either hardware or software based */
++    uint64_t heartbeat_status;
++    /* Register for controlling heartbeat LED output in software mode */
++    uint64_t heartbeat_output;
+ };
+ 
+ #endif /* ASPEED_VIC_H */
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0503-hw-misc-Add-i2c-netdev-device.patch b/common/recipes-devtools/qemu/qemu/0503-hw-misc-Add-i2c-netdev-device.patch
new file mode 100644
index 000000000000..d7896f195a7e
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0503-hw-misc-Add-i2c-netdev-device.patch
@@ -0,0 +1,305 @@
+From 801db18de3173a4a2e25a9a3e5ff7cec26a9c92d Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Wed, 27 Apr 2022 16:23:48 -0700
+Subject: [PATCH 503/532] hw/misc: Add i2c-netdev device
+
+First, create a script to respond to MCTP commands:
+
+mctp.py:
+    from socket import *
+    import sys
+
+    fd = socket(AF_INET, SOCK_DGRAM);
+    assert fd != -1
+
+    tx = socket(AF_INET, SOCK_DGRAM, 0)
+
+    fd.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
+    fd.bind(('', 5557))
+
+    message = bytearray([int(arg, 16) for arg in sys.argv[1:]])
+
+    while 1:
+        pkt = fd.recv(1024)
+        sys.stdout.write('Received: ')
+        for b in pkt:
+            sys.stdout.write('%02x ' % ord(b))
+        sys.stdout.write('\n')
+        sys.stdout.flush()
+        tx.sendto(message, ("localhost", 5556))
+
+Usage:
+    ./build/qemu-system-arm -machine clearcreek-bmc \
+        -drive file=flash-clearcreek,if=mtd,format=raw \
+        -nographic \
+        -netdev socket,id=terminus-i2c,udp=localhost:5557,localaddr=localhost:5556 \
+        -device i2c-netdev,bus=aspeed.i2c.bus.8,address=0x32,netdev=terminus-i2c \
+    // Within clearcreek console, disable ipmbd_0 and ipmbd_8
+    bmc-oob:~# sv stop ipmbd_0
+    bmc-oob:~# sv stop ipmbd_8
+    // Send a test command, run mctp.py outside QEMU to generate a response
+    bmc-oob:~# mctp-util -d 8 0x64 0 0 0x80 3
+    core: Generating packets for transmission of 3 byte message from 8 to 0
+    core: Enqueued 1 packets
+    smbus: >TX> 0F 08 21 01 00 08 C8 00 80 03 C9
+    smbus: <RX< 20 0F 19 65 01 00 00 C8 00 00 03 00 D0 7A 22 C5 16 8D EB 11 80 00 B8 CE F6 66 70 A4 1C
+    raw response:
+    08 14 00 00 03 00 d0 7a 22 c5 16 8d eb 11 80 00 b8 ce f6 66 70 a4
+
+    MCTP transport header: src_eid(08) tag(14)
+    MCTP header:           msg_type(00)
+
+    MCTP control message
+      Rq[7],D[6],IID[4:0]: 00
+      Command Code:        03
+      Completion Code:     00
+      response data:       d0 7a 22 c5 16 8d eb 11 80 00 b8 ce f6 66 70 a4
+
+    $ python mctp.py 10 0f 19 65 01 00 00 c8 00 00 03 00 d0 7a 22 c5 16 8d eb 11 80 00 b8 ce f6 66 70 a4 1c
+    Received: 0f 08 21 01 00 08 c8 00 80 03 c9
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/misc/i2c-netdev.c | 217 +++++++++++++++++++++++++++++++++++++++++++
+ hw/misc/meson.build  |   1 +
+ 2 files changed, 218 insertions(+)
+ create mode 100644 hw/misc/i2c-netdev.c
+
+diff --git a/hw/misc/i2c-netdev.c b/hw/misc/i2c-netdev.c
+new file mode 100644
+index 0000000000..83faa942b1
+--- /dev/null
++++ b/hw/misc/i2c-netdev.c
+@@ -0,0 +1,217 @@
++#include "qemu/osdep.h"
++#include "qemu/main-loop.h"
++#include "qapi/error.h"
++#include "hw/i2c/i2c.h"
++#include "hw/qdev-properties.h"
++#include "net/net.h"
++#include "net/eth.h"
++#include "block/aio.h"
++
++#define TYPE_I2C_NETDEV "i2c-netdev"
++OBJECT_DECLARE_SIMPLE_TYPE(I2CNetdev, I2C_NETDEV)
++
++typedef enum AsyncState AsyncState;
++enum AsyncState {
++    ASYNC_NONE,
++    ASYNC_WAITING,
++    ASYNC_DONE,
++};
++
++typedef struct I2CNetdev I2CNetdev;
++struct I2CNetdev {
++    I2CSlave parent;
++
++    I2CBus *bus;
++    NICConf nic_conf;
++    NICState *nic;
++    QEMUBH *bh;
++    AsyncState bh_bus_master;
++    AsyncState bh_transmit;
++
++    uint8_t guest_os_tx_buf[256];
++    uint8_t guest_os_rx_buf[256];
++    int guest_os_tx_pos;
++    int guest_os_rx_pos;
++    int guest_os_rx_len;
++};
++
++static int i2c_event(I2CSlave *i2c, enum i2c_event event)
++{
++    I2CNetdev *s = I2C_NETDEV(i2c);
++    NetClientState *netdev;
++
++    switch (event) {
++    case I2C_START_RECV:
++        printf("SLAVE RECEIVE UNIMPLEMENTED\n");
++        abort();
++    case I2C_START_SEND:
++        printf("SLAVE SEND SYNCHRONOUSLY UNIMPLEMENTED\n");
++        abort();
++    case I2C_START_SEND_ASYNC:
++        s->guest_os_tx_pos = 0;
++        // Slave address, with R/W bit, is expected to be the first byte.
++        // R/W bit 1 indicates "read", 0 indicates "write".
++        s->guest_os_tx_buf[s->guest_os_tx_pos++] = i2c->address << 1 | 0;
++        break;
++    case I2C_FINISH:
++        assert(s->guest_os_tx_pos != 0);
++        netdev = qemu_get_queue(s->nic);
++        qemu_send_packet(netdev, s->guest_os_tx_buf, s->guest_os_tx_pos);
++        break;
++    case I2C_NACK:
++        printf("RECEIVE NACK UNIMPLEMENTED\n");
++        abort();
++    }
++
++    return 0;
++}
++
++static uint8_t i2c_receive(I2CSlave *i2c)
++{
++    printf("I2C NETDEV SLAVE RECEIVE UNIMPLEMENTED\n");
++    abort();
++}
++
++static int i2c_transmit(I2CSlave *i2c, uint8_t byte)
++{
++    I2CNetdev *s = I2C_NETDEV(i2c);
++
++    assert(s->guest_os_tx_pos < sizeof(s->guest_os_tx_buf));
++    s->guest_os_tx_buf[s->guest_os_tx_pos++] = byte;
++
++    return 0;
++}
++
++static bool i2c_netdev_can_receive_packet(NetClientState *nc)
++{
++    I2CNetdev *s = I2C_NETDEV(qemu_get_nic_opaque(nc));
++
++    // If the rx buffer is empty, then we can accept a new packet and schedule a
++    // new receive.
++    return s->guest_os_rx_len == 0;
++}
++
++static ssize_t i2c_netdev_receive_packet(NetClientState *nc, const uint8_t *buf, size_t len)
++{
++    I2CNetdev *s = I2C_NETDEV(qemu_get_nic_opaque(nc));
++
++    s->guest_os_rx_len = len;
++    s->guest_os_rx_pos = 0;
++    assert(len < sizeof(s->guest_os_rx_buf));
++    memcpy(s->guest_os_rx_buf, buf, len);
++    qemu_bh_schedule(s->bh);
++
++    return len;
++}
++
++static void i2c_netdev_cleanup(NetClientState *nc)
++{
++    I2CNetdev *s = I2C_NETDEV(qemu_get_nic_opaque(nc));
++
++    s->nic = NULL;
++}
++
++static NetClientInfo net_client_info = {
++    .type = NET_CLIENT_DRIVER_NIC,
++    .size = sizeof(NetClientState),
++    .can_receive = i2c_netdev_can_receive_packet,
++    .receive = i2c_netdev_receive_packet,
++    .cleanup = i2c_netdev_cleanup,
++};
++
++static void i2c_netdev_bh(void *opaque)
++{
++    I2CNetdev *s = opaque;
++
++    switch (s->bh_bus_master) {
++    case ASYNC_NONE:
++        i2c_bus_master(s->bus, s->bh);
++        s->bh_bus_master = ASYNC_WAITING;
++        return;
++    case ASYNC_WAITING:
++        s->bh_bus_master = ASYNC_DONE;
++        break;
++    case ASYNC_DONE:
++        break;
++    }
++
++    uint8_t b;
++    uint8_t slave_addr;
++
++    switch (s->bh_transmit) {
++    case ASYNC_NONE:
++    case ASYNC_DONE:
++        assert(s->guest_os_rx_pos == 0);
++        assert(s->guest_os_rx_len != 0);
++        // Other side should be sending us the slave address shifted 1 to the
++        // left, with a R/W bit. The R/W bit should always be 0, because we're
++        // only supporting writes at this point.
++        b = s->guest_os_rx_buf[s->guest_os_rx_pos++];
++        assert((b & 1) == 0);
++        slave_addr = b >> 1;
++        i2c_start_send(s->bus, slave_addr);
++        s->bh_transmit = ASYNC_WAITING;
++        break;
++    case ASYNC_WAITING:
++        if (s->guest_os_rx_pos >= s->guest_os_rx_len) {
++            s->bh_transmit = ASYNC_DONE;
++            s->bh_bus_master = ASYNC_NONE;
++            s->guest_os_rx_len = 0;
++            s->guest_os_rx_pos = 0;
++            i2c_end_transfer(s->bus);
++            i2c_bus_release(s->bus);
++            break;
++        }
++
++        b = s->guest_os_rx_buf[s->guest_os_rx_pos++];
++        i2c_send_async(s->bus, b);
++        break;
++    }
++}
++
++static void i2c_netdev_realize(DeviceState *dev, Error **errp)
++{
++    I2CNetdev *s = I2C_NETDEV(dev);
++    s->bus = I2C_BUS(qdev_get_parent_bus(dev));
++    s->nic = qemu_new_nic(&net_client_info, &s->nic_conf, TYPE_I2C_NETDEV,
++                          dev->id, &dev->mem_reentrancy_guard, s);
++    s->bh = qemu_bh_new(i2c_netdev_bh, s);
++    s->bh_bus_master = ASYNC_NONE;
++    s->bh_transmit = ASYNC_NONE;
++    memset(s->guest_os_tx_buf, 0, sizeof(s->guest_os_tx_buf));
++    memset(s->guest_os_rx_buf, 0, sizeof(s->guest_os_rx_buf));
++    s->guest_os_tx_pos = 0;
++    s->guest_os_rx_pos = 0;
++    s->guest_os_rx_len = 0;
++}
++
++static Property i2c_netdev_props[] = {
++    DEFINE_NIC_PROPERTIES(I2CNetdev, nic_conf),
++    DEFINE_PROP_END_OF_LIST(),
++};
++
++static void i2c_netdev_class_init(ObjectClass *cls, void *data)
++{
++    DeviceClass *dc = DEVICE_CLASS(cls);
++    dc->realize = i2c_netdev_realize;
++    device_class_set_props(dc, i2c_netdev_props);
++
++    I2CSlaveClass *sc = I2C_SLAVE_CLASS(cls);
++    sc->event = i2c_event;
++    sc->recv = i2c_receive;
++    sc->send = i2c_transmit;
++}
++
++static const TypeInfo i2c_netdev = {
++    .name = TYPE_I2C_NETDEV,
++    .parent = TYPE_I2C_SLAVE,
++    .instance_size = sizeof(I2CNetdev),
++    .class_init = i2c_netdev_class_init,
++};
++
++static void register_types(void)
++{
++    type_register_static(&i2c_netdev);
++}
++
++type_init(register_types);
+diff --git a/hw/misc/meson.build b/hw/misc/meson.build
+index 36c20d5637..c3bbde1803 100644
+--- a/hw/misc/meson.build
++++ b/hw/misc/meson.build
+@@ -142,6 +142,7 @@ system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
+ system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
+ 
+ system_ss.add(when: 'CONFIG_I2C_ECHO', if_true: files('i2c-echo.c'))
++system_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-netdev.c'))
+ 
+ specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
+ 
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0504-hw-misc-Add-byte-by-byte-i2c-network-device.patch b/common/recipes-devtools/qemu/qemu/0504-hw-misc-Add-byte-by-byte-i2c-network-device.patch
new file mode 100644
index 000000000000..12a4c4527612
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0504-hw-misc-Add-byte-by-byte-i2c-network-device.patch
@@ -0,0 +1,560 @@
+From 9ec960ee45184713710248e4c6e9936e1e0cac44 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Tue, 7 Jun 2022 07:31:54 -0700
+Subject: [PATCH 504/532] hw/misc: Add byte-by-byte i2c network device
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/misc/i2c-netdev2.c         | 260 ++++++++++++++++++++++++++++++++++
+ hw/misc/meson.build           |   2 +-
+ tests/qtest/aspeed_i2c-test.c | 243 +++++++++++++++++++++++++++++++
+ tests/qtest/meson.build       |   3 +-
+ 4 files changed, 506 insertions(+), 2 deletions(-)
+ create mode 100644 hw/misc/i2c-netdev2.c
+ create mode 100644 tests/qtest/aspeed_i2c-test.c
+
+diff --git a/hw/misc/i2c-netdev2.c b/hw/misc/i2c-netdev2.c
+new file mode 100644
+index 0000000000..e60846081e
+--- /dev/null
++++ b/hw/misc/i2c-netdev2.c
+@@ -0,0 +1,260 @@
++#include "qemu/osdep.h"
++#include "qemu/main-loop.h"
++#include "qapi/error.h"
++#include "hw/i2c/i2c.h"
++#include "hw/qdev-properties.h"
++#include "net/net.h"
++#include "net/eth.h"
++#include "block/aio.h"
++
++#define DATA_LEN 1
++#define ACK_LEN 2
++#define START_LEN 3
++#define STOP_LEN 4
++#define DEBUG 0
++
++#if !DEBUG
++#define printf(...)
++#endif
++
++#define TYPE_I2C_NETDEV2 "i2c-netdev2"
++OBJECT_DECLARE_SIMPLE_TYPE(I2CNetdev2, I2C_NETDEV2)
++
++typedef struct I2CNetdev2 I2CNetdev2;
++struct I2CNetdev2 {
++    I2CSlave parent;
++
++    I2CBus *bus;
++    NICConf nic_conf;
++    NICState *nic;
++    QEMUBH *bh;
++
++    uint8_t rx_buf[10];
++    int rx_len;
++    bool rx_ack_pending;
++};
++
++static void print_bytes(const uint8_t *buf, size_t len)
++{
++    int i;
++
++    printf("[");
++    for (i = 0; i < len; i++) {
++        if (i) {
++            printf(", ");
++        }
++        printf("%02x", buf[i]);
++    }
++    printf("]");
++}
++
++static ssize_t i2c_netdev2_nic_receive(NetClientState *nc, const uint8_t *buf, size_t len);
++
++static void i2c_netdev2_nic_cleanup(NetClientState *nc)
++{
++    I2CNetdev2 *s = I2C_NETDEV2(qemu_get_nic_opaque(nc));
++
++    s->nic = NULL;
++}
++
++static NetClientInfo net_client_info = {
++    .type = NET_CLIENT_DRIVER_NIC,
++    .size = sizeof(NetClientState),
++    .receive = i2c_netdev2_nic_receive,
++    .cleanup = i2c_netdev2_nic_cleanup,
++};
++
++static ssize_t i2c_netdev2_nic_receive(NetClientState *nc, const uint8_t *buf, size_t len)
++{
++    printf("%s: rx ", __FILE__);
++    print_bytes(buf, len);
++    printf("\n");
++
++    I2CNetdev2 *s = I2C_NETDEV2(qemu_get_nic_opaque(nc));
++
++    if (len == ACK_LEN) {
++        return len;
++    }
++
++    printf("prev rx_buf: ");
++    print_bytes(s->rx_buf, sizeof(s->rx_buf));
++    printf("\n");
++
++    assert(len <= sizeof(s->rx_buf));
++    memcpy(s->rx_buf, buf, len);
++    s->rx_len = len;
++
++    printf("next rx_buf: ");
++    print_bytes(s->rx_buf, sizeof(s->rx_buf));
++    printf("\n");
++
++    switch (len) {
++    case START_LEN:
++        i2c_bus_master(s->bus, s->bh);
++        break;
++    case DATA_LEN:
++        qemu_bh_schedule(s->bh);
++        break;
++    case STOP_LEN:
++        qemu_bh_schedule(s->bh);
++        break;
++    default:
++        printf("%s: unexpected packet len: %ld\n", __func__, len);
++        break;
++    }
++
++    return len;
++}
++
++static void i2c_netdev2_slave_mode_rx(void *opaque)
++{
++    I2CNetdev2 *s = opaque;
++    NetClientState *netdev = qemu_get_queue(s->nic);
++    uint8_t rx_addr;
++    uint8_t ack[2] = {1, 0};
++
++    printf("%s: rx_len=%d\n", __func__, s->rx_len);
++
++    if (s->rx_ack_pending) {
++        printf("%s: guest OS ack rx, clearing rx_len\n", __func__);
++        s->rx_ack_pending = false;
++        s->rx_len = 0;
++        qemu_send_packet(netdev, ack, sizeof(ack));
++        return;
++    }
++
++    switch (s->rx_len) {
++    case START_LEN:
++        rx_addr = s->rx_buf[0];
++        assert((rx_addr & 1) == 0);
++        rx_addr >>= 1;
++        if (i2c_start_send_async(s->bus, rx_addr) != 0) {
++            printf("%s: i2c_start_send to 0x%02x failed\n", __func__, rx_addr);
++            ack[0] = 0;
++            i2c_bus_release(s->bus);
++            qemu_send_packet(netdev, ack, sizeof(ack));
++            s->rx_len = 0;
++            return;
++        }
++        break;
++    case DATA_LEN:
++        i2c_send_async(s->bus, s->rx_buf[0]);
++        break;
++    case STOP_LEN:
++        i2c_end_transfer(s->bus);
++        i2c_bus_release(s->bus);
++        return;
++    default:
++        printf("%s: unexpected rx_len %d\n", __func__, s->rx_len);
++        break;
++    }
++
++    s->rx_ack_pending = true;
++}
++
++static void i2c_netdev2_realize(DeviceState *dev, Error **errp)
++{
++    I2CNetdev2 *s = I2C_NETDEV2(dev);
++
++    s->bus = I2C_BUS(qdev_get_parent_bus(dev));
++    s->nic = qemu_new_nic(&net_client_info, &s->nic_conf, TYPE_I2C_NETDEV2,
++                          dev->id, &dev->mem_reentrancy_guard, s);
++    s->bh = qemu_bh_new(i2c_netdev2_slave_mode_rx, s);
++    s->rx_len = 0;
++}
++
++static int i2c_netdev2_handle_event(I2CSlave *i2c, enum i2c_event event)
++{
++    I2CNetdev2 *s = I2C_NETDEV2(i2c);
++    NetClientState *netdev = qemu_get_queue(s->nic);
++    uint8_t tx_addr = i2c->address << 1;
++    uint8_t start_msg[START_LEN];
++    uint8_t stop_msg[STOP_LEN];
++
++    // printf("%s: %d\n", __func__, event);
++
++    switch (event) {
++    case I2C_START_RECV:
++        printf("%s: RECV UNIMPLEMENTED\n", __func__);
++        abort();
++    case I2C_START_SEND_ASYNC:
++        printf("%s: SEND ASYNC UNIMPLEMENTED\n", __func__);
++        abort();
++    case I2C_START_SEND:
++        // printf("%s: SENDING START MESSAGE PACKET\n", __func__);
++        memset(start_msg, 0, sizeof(start_msg));
++        start_msg[0] = tx_addr;
++        qemu_send_packet(netdev, start_msg, sizeof(start_msg));
++        printf("%s: tx ", __FILE__);
++        print_bytes(start_msg, sizeof(start_msg));
++        printf("\n");
++        //sleep(1);
++        break;
++    case I2C_FINISH:
++        memset(stop_msg, 0, sizeof(stop_msg));
++        qemu_send_packet(netdev, stop_msg, sizeof(stop_msg));
++        printf("%s: tx ", __FILE__);
++        print_bytes(stop_msg, sizeof(stop_msg));
++        printf("\n");
++        //sleep(1);
++        break;
++    case I2C_NACK:
++        printf("%s: NACK UNIMPLEMENTED\n", __func__);
++        abort();
++    }
++
++    return 0;
++}
++
++static uint8_t i2c_netdev2_handle_recv(I2CSlave *i2c)
++{
++    printf("%s: unimplemented\n", __func__);
++    abort();
++}
++
++static int i2c_netdev2_handle_send(I2CSlave *i2c, uint8_t byte)
++{
++    I2CNetdev2 *s = I2C_NETDEV2(i2c);
++    NetClientState *netdev = qemu_get_queue(s->nic);
++    uint8_t data_msg[DATA_LEN] = {byte};
++
++    qemu_send_packet(netdev, data_msg, sizeof(data_msg));
++    printf("%s: tx ", __FILE__);
++    print_bytes(data_msg, sizeof(data_msg));
++    printf("\n");
++    //sleep(1);
++
++    return 0;
++}
++
++static Property i2c_netdev2_props[] = {
++    DEFINE_NIC_PROPERTIES(I2CNetdev2, nic_conf),
++    DEFINE_PROP_END_OF_LIST(),
++};
++
++static void i2c_netdev2_class_init(ObjectClass *cls, void *data)
++{
++    DeviceClass *dc = DEVICE_CLASS(cls);
++    I2CSlaveClass *sc = I2C_SLAVE_CLASS(cls);
++
++    dc->realize = i2c_netdev2_realize;
++    device_class_set_props(dc, i2c_netdev2_props);
++
++    sc->event = i2c_netdev2_handle_event;
++    sc->recv = i2c_netdev2_handle_recv;
++    sc->send = i2c_netdev2_handle_send;
++}
++
++static const TypeInfo i2c_netdev2 = {
++    .name = TYPE_I2C_NETDEV2,
++    .parent = TYPE_I2C_SLAVE,
++    .instance_size = sizeof(I2CNetdev2),
++    .class_init = i2c_netdev2_class_init,
++};
++
++static void register_types(void)
++{
++    type_register_static(&i2c_netdev2);
++}
++
++type_init(register_types);
+diff --git a/hw/misc/meson.build b/hw/misc/meson.build
+index c3bbde1803..901e5a11f0 100644
+--- a/hw/misc/meson.build
++++ b/hw/misc/meson.build
+@@ -142,7 +142,7 @@ system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
+ system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
+ 
+ system_ss.add(when: 'CONFIG_I2C_ECHO', if_true: files('i2c-echo.c'))
+-system_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-netdev.c'))
++system_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-netdev.c', 'i2c-netdev2.c'))
+ 
+ specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
+ 
+diff --git a/tests/qtest/aspeed_i2c-test.c b/tests/qtest/aspeed_i2c-test.c
+new file mode 100644
+index 0000000000..aaf8c85427
+--- /dev/null
++++ b/tests/qtest/aspeed_i2c-test.c
+@@ -0,0 +1,243 @@
++/*
++ * QTest testcase for the Aspeed I2C Controller.
++ *
++ * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++
++#include "qemu/osdep.h"
++#include "qemu/bitops.h"
++#include "libqtest-single.h"
++
++#define ASPEED_I2C_BASE 0x1E78A000
++#define ASPEED_I2C_BUS0_BASE (ASPEED_I2C_BASE + 0x80)
++#define I2C_CTRL_GLOBAL 0x0C
++#define   I2C_CTRL_NEW_REG_MODE BIT(2)
++#define I2CD_FUN_CTRL_REG 0x00
++#define   I2CD_SLAVE_EN (0x1 << 1)
++#define   I2CD_MASTER_EN (0x1)
++#define I2CD_INTR_CTRL_REG 0x0c
++#define I2CD_INTR_STS_REG 0x10
++#define   I2CD_INTR_SLAVE_ADDR_RX_MATCH    (0x1 << 7)  /* use RX_DONE */
++#define   I2CD_INTR_NORMAL_STOP            (0x1 << 4)
++#define   I2CD_INTR_RX_DONE                (0x1 << 2)
++#define I2CD_CMD_REG            0x14       /* I2CD Command/Status */
++#define   I2CD_RX_DMA_ENABLE               (0x1 << 9)
++#define   I2CD_TX_DMA_ENABLE               (0x1 << 8)
++#define   I2CD_RX_BUFF_ENABLE              (0x1 << 7)
++#define   I2CD_TX_BUFF_ENABLE              (0x1 << 6)
++#define   I2CD_M_STOP_CMD                  (0x1 << 5)
++#define   I2CD_M_S_RX_CMD_LAST             (0x1 << 4)
++#define   I2CD_M_RX_CMD                    (0x1 << 3)
++#define   I2CD_S_TX_CMD                    (0x1 << 2)
++#define   I2CD_M_TX_CMD                    (0x1 << 1)
++#define   I2CD_M_START_CMD                 (0x1)
++#define I2CD_DEV_ADDR_REG       0x18       /* Slave Device Address */
++#define I2CD_BYTE_BUF_REG       0x20       /* Transmit/Receive Byte Buffer */
++#define   I2CD_BYTE_BUF_TX_SHIFT           0
++#define   I2CD_BYTE_BUF_TX_MASK            0xff
++#define   I2CD_BYTE_BUF_RX_SHIFT           8
++#define   I2CD_BYTE_BUF_RX_MASK            0xff
++
++#define DATA_LEN 1
++#define ACK_LEN 2
++#define START_LEN 3
++#define STOP_LEN 4
++
++static void aspeed_i2c_master_mode_tx(const uint8_t *buf, int len)
++{
++    int i;
++
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_BYTE_BUF_REG, buf[0]);
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_CMD_REG, I2CD_M_START_CMD);
++
++    for (i = 1; i < len; i++) {
++        writel(ASPEED_I2C_BUS0_BASE + I2CD_BYTE_BUF_REG, buf[i]);
++        writel(ASPEED_I2C_BUS0_BASE + I2CD_CMD_REG, I2CD_M_TX_CMD);
++    }
++
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_CMD_REG, I2CD_M_STOP_CMD);
++}
++
++static void aspeed_i2c_slave_mode_enable(uint8_t addr)
++{
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_DEV_ADDR_REG, addr);
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_FUN_CTRL_REG, I2CD_SLAVE_EN);
++}
++
++static int aspeed_i2c_slave_mode_rx(uint8_t *buf, int len)
++{
++    uint32_t sts;
++    uint32_t byte_buf;
++    int i = 0;
++
++    while (i < len) {
++        sts = readl(ASPEED_I2C_BUS0_BASE + I2CD_INTR_STS_REG);
++        if (sts & I2CD_INTR_NORMAL_STOP) {
++            break;
++        }
++        if (sts & I2CD_INTR_RX_DONE) {
++            byte_buf = readl(ASPEED_I2C_BUS0_BASE + I2CD_BYTE_BUF_REG);
++            buf[i++] = (byte_buf >> I2CD_BYTE_BUF_RX_SHIFT) & I2CD_BYTE_BUF_RX_MASK;
++        }
++        writel(ASPEED_I2C_BUS0_BASE + I2CD_INTR_STS_REG, sts);
++    }
++
++    return i;
++}
++
++static uint8_t aspeed_i2c_slave_mode_rx_byte(void)
++{
++    uint8_t buf = 0xff;
++
++    g_assert_cmphex(aspeed_i2c_slave_mode_rx(&buf, sizeof(buf)), ==, 1);
++    return buf;
++}
++
++static int udp_socket;
++
++static void test_write_in_old_byte_mode(void)
++{
++    uint8_t pkt[] = {0x64, 0xde, 0xad, 0xbe, 0xef};
++    uint8_t buf[10];
++    ssize_t n;
++    int i;
++    struct sockaddr_in rx_addr;
++    uint8_t ack[ACK_LEN] = {1, 0};
++
++    rx_addr.sin_family = AF_INET;
++    rx_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
++    rx_addr.sin_port = htons(6000);
++
++    g_assert(!(readl(ASPEED_I2C_BASE + I2C_CTRL_GLOBAL) & I2C_CTRL_NEW_REG_MODE));
++
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_FUN_CTRL_REG, I2CD_MASTER_EN);
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_INTR_CTRL_REG, 0xFFFFFFFF);
++
++    aspeed_i2c_master_mode_tx(pkt, sizeof(pkt));
++
++    n = recv(udp_socket, buf, sizeof(buf), 0);
++    g_assert_cmphex(n, ==, START_LEN);
++    g_assert_cmphex(buf[0], ==, pkt[0]);
++    sendto(udp_socket, ack, sizeof(ack), 0, (const struct sockaddr_in*)&rx_addr, sizeof(rx_addr));
++
++    for (i = 1; i < sizeof(pkt); i++) {
++        n = recv(udp_socket, buf, sizeof(buf), 0);
++        g_assert_cmphex(n, ==, DATA_LEN);
++        g_assert_cmphex(buf[0], ==, pkt[i]);
++        sendto(udp_socket, ack, sizeof(ack), 0, (const struct sockaddr_in*)&rx_addr, sizeof(rx_addr));
++    }
++
++    n = recv(udp_socket, buf, sizeof(buf), 0);
++    g_assert_cmphex(n, ==, STOP_LEN);
++}
++
++static void test_slave_mode_rx_byte_buf(void)
++{
++    uint8_t b;
++    uint32_t sts;
++
++    g_assert(!(readl(ASPEED_I2C_BASE + I2C_CTRL_GLOBAL) & I2C_CTRL_NEW_REG_MODE));
++
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_INTR_STS_REG, 0xFFFFFFFF);
++    writel(ASPEED_I2C_BUS0_BASE + I2CD_INTR_CTRL_REG, 0xFFFFFFFF);
++
++    aspeed_i2c_slave_mode_enable(0x10);
++
++    struct sockaddr_in dst;
++    dst.sin_family = AF_INET;
++    dst.sin_addr.s_addr = inet_addr("127.0.0.1");
++    dst.sin_port = htons(6000);
++
++    uint8_t pkt[] = {0x20, 0xde, 0xad, 0xbe, 0xef};
++    uint8_t buf[10] = {};
++
++    buf[0] = 0x20;
++    sendto(udp_socket, buf, START_LEN, 0, (const struct sockaddr*)&dst, sizeof(dst));
++    b = aspeed_i2c_slave_mode_rx_byte();
++    g_assert_cmphex(b, ==, buf[0]);
++
++    for (int i = 1; i < sizeof(pkt); i++) {
++        buf[0] = pkt[i];
++        sendto(udp_socket, buf, DATA_LEN, 0, (const struct sockaddr*)&dst, sizeof(dst));
++        b = aspeed_i2c_slave_mode_rx_byte();
++        g_assert_cmphex(b, ==, buf[0]);
++    }
++
++    sendto(udp_socket, buf, STOP_LEN, 0, (const struct sockaddr*)&dst, sizeof(dst));
++    for (int i = 0; i < 10000; i++) {
++        sts = readl(ASPEED_I2C_BUS0_BASE + I2CD_INTR_STS_REG);
++        writel(ASPEED_I2C_BUS0_BASE + I2CD_INTR_STS_REG, sts);
++        if (sts & I2CD_INTR_NORMAL_STOP) {
++            break;
++        }
++    }
++    g_assert(sts & I2CD_INTR_NORMAL_STOP);
++}
++
++static int udp_socket_init(const char *ip_addr, uint16_t port)
++{
++    bool reuseaddr = true;
++    struct sockaddr_in addr;
++    int fd;
++
++    fd = socket(AF_INET, SOCK_DGRAM, 0);
++    if (fd == -1) {
++        perror("socket");
++        return -1;
++    }
++
++    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr));
++
++    addr.sin_family = AF_INET;
++    addr.sin_addr.s_addr = inet_addr(ip_addr);
++    addr.sin_port = htons(port);
++    if (bind(fd, (const struct sockaddr*)&addr, sizeof(addr))) {
++        perror("bind");
++        return -1;
++    }
++
++    return fd;
++}
++
++int main(int argc, char **argv)
++{
++    int ret;
++
++    udp_socket = udp_socket_init("127.0.0.1", 5000);
++    if (udp_socket == -1) {
++        return 1;
++    }
++
++    g_test_init(&argc, &argv, NULL);
++
++    global_qtest = qtest_initf("-machine fby35-bmc "
++                               "-netdev socket,id=socket0,udp=127.0.0.1:5000,localaddr=127.0.0.1:6000 "
++                               "-device i2c-netdev2,bus=aspeed.i2c.bus.0,address=0x32,netdev=socket0");
++
++    qtest_add_func("/ast2600/i2c/write_in_old_byte_mode", test_write_in_old_byte_mode);
++    qtest_add_func("/ast2600/i2c/slave_mode_rx_byte_buf", test_slave_mode_rx_byte_buf);
++
++    ret = g_test_run();
++    qtest_quit(global_qtest);
++    close(udp_socket);
++
++    return ret;
++}
+diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
+index 47dabf91d0..14068d8f39 100644
+--- a/tests/qtest/meson.build
++++ b/tests/qtest/meson.build
+@@ -193,7 +193,8 @@ qtests_npcm7xx = \
+ qtests_aspeed = \
+   ['aspeed_hace-test',
+    'aspeed_smc-test',
+-   'aspeed_gpio-test']
++   'aspeed_gpio-test',
++   'aspeed_i2c-test']
+ qtests_arm = \
+   (config_all_devices.has_key('CONFIG_MPS2') ? ['sse-timer-test'] : []) + \
+   (config_all_devices.has_key('CONFIG_CMSDK_APB_DUALTIMER') ? ['cmsdk-apb-dualtimer-test'] : []) + \
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0505-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch b/common/recipes-devtools/qemu/qemu/0505-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch
new file mode 100644
index 000000000000..a4995b2cacc2
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0505-hw-intc-Add-a-property-to-allow-GIC-to-reset-into-no.patch
@@ -0,0 +1,33 @@
+From c02cb2789c53d77e06be59c7f2fa914bf75684e1 Mon Sep 17 00:00:00 2001
+From: Hao Wu <wuhaotsh@google.com>
+Date: Tue, 5 Apr 2022 15:36:35 -0700
+Subject: [PATCH 505/532] hw/intc: Add a property to allow GIC to reset into
+ non secure mode
+
+This property allows certain boards like NPCM8xx to boot the kernel
+directly into non-secure mode. This is necessary since we do not
+support secure boot features for NPCM8xx now.
+
+Signed-off-by: Hao Wu <wuhaotsh@google.com>
+Reviewed-by: Patrick Venture <venture@google.com>
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/intc/arm_gic_common.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c
+index 7c28504ace..2117d2c689 100644
+--- a/hw/intc/arm_gic_common.c
++++ b/hw/intc/arm_gic_common.c
+@@ -360,6 +360,8 @@ static Property arm_gic_common_properties[] = {
+     /* True if the GIC should implement the virtualization extensions */
+     DEFINE_PROP_BOOL("has-virtualization-extensions", GICState, virt_extn, 0),
+     DEFINE_PROP_UINT32("num-priority-bits", GICState, n_prio_bits, 8),
++    /* True if we want to directly booting a kernel into NonSecure */
++    DEFINE_PROP_BOOL("irq-reset-nonsecure", GICState, irq_reset_nonsecure, 0),
+     DEFINE_PROP_END_OF_LIST(),
+ };
+ 
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0506-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch b/common/recipes-devtools/qemu/qemu/0506-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch
new file mode 100644
index 000000000000..271d6a8b13aa
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0506-hw-m25p80-Add-BP-and-TB-bits-to-n25q00.patch
@@ -0,0 +1,30 @@
+From eef1f1f9a01a9c3cf499bd000b2c40a2729cce0c Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Tue, 14 Jun 2022 11:32:13 -0700
+Subject: [PATCH 506/532] hw: m25p80: Add BP and TB bits to n25q00
+
+This flash model is a 128MB Micron flash model that we can use with fb
+machines to test U-Boot.
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/block/m25p80.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
+index afc3fdf4d6..10cb94b2e7 100644
+--- a/hw/block/m25p80.c
++++ b/hw/block/m25p80.c
+@@ -267,7 +267,8 @@ static const FlashPartInfo known_devices[] = {
+     { INFO("mt25ql512ab", 0x20ba20, 0x1044, 64 << 10, 1024, ER_4K | ER_32K) },
+     { INFO_STACKED("mt35xu01g", 0x2c5b1b, 0x104100, 128 << 10, 1024,
+                    ER_4K | ER_32K, 2) },
+-    { INFO_STACKED("n25q00",    0x20ba21, 0x1000, 64 << 10, 2048, ER_4K, 4) },
++    { INFO_STACKED("n25q00",    0x20ba21, 0x1000, 64 << 10, 2048,
++                   ER_4K | HAS_SR_BP3_BIT6 | HAS_SR_TB, 4) },
+     { INFO_STACKED("n25q00a",   0x20bb21, 0x1000, 64 << 10, 2048, ER_4K, 4) },
+     { INFO_STACKED("mt25ql01g", 0x20ba21, 0x1040, 64 << 10, 2048, ER_4K, 2) },
+     { INFO_STACKED("mt25qu01g", 0x20bb21, 0x1040, 64 << 10, 2048, ER_4K, 2) },
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0507-hw-i2c-pca954x-Add-method-to-get-channels.patch b/common/recipes-devtools/qemu/qemu/0507-hw-i2c-pca954x-Add-method-to-get-channels.patch
new file mode 100644
index 000000000000..fe6be91ccffc
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0507-hw-i2c-pca954x-Add-method-to-get-channels.patch
@@ -0,0 +1,133 @@
+From e57bb6d8e59d9b193e0937d52b38637821207880 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Wed, 17 Aug 2022 10:14:07 +0200
+Subject: [PATCH 507/532] hw/i2c/pca954x: Add method to get channels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+I added this helper in the Aspeed machine file a while ago to help
+initialize fuji-bmc i2c devices. This moves it to the official pca954x
+file so that other files can use it.
+
+This does something very similar to pca954x_i2c_get_bus, but I think
+this is useful when you have a very complicated dts with a lot of
+switches, like the fuji dts.
+
+This convenience method lets you write code that produces a flat array
+of I2C buses that matches the naming in the dts. After that you can just
+add individual sensors using the flat array of I2C buses.
+
+See fuji_bmc_i2c_init to understand this point further.
+
+The fuji dts is here for reference:
+
+https://github.com/torvalds/linux/blob/40cb6373b46/arch/arm/boot/dts/aspeed-bmc-facebook-fuji.dts
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+Reviewed-by: Cédric Le Goater <clg@kaod.org>
+Reviewed-by: Patrick Venture <venture@google.com>
+Message-Id: <20220705191400.41632-2-peter@pjd.dev>
+Signed-off-by: Cédric Le Goater <clg@kaod.org>
+---
+ hw/arm/aspeed.c                  | 29 +++++++++--------------------
+ hw/i2c/i2c_mux_pca954x.c         | 10 ++++++++++
+ include/hw/i2c/i2c_mux_pca954x.h | 13 +++++++++++++
+ 3 files changed, 32 insertions(+), 20 deletions(-)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 744441b5cc..2de2bd76c2 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -851,15 +851,6 @@ static void rainier_bmc_i2c_init(AspeedMachineState *bmc)
+     create_pca9552(soc, 15, 0x60);
+ }
+ 
+-static void get_pca9548_channels(I2CBus *bus, uint8_t mux_addr,
+-                                 I2CBus **channels)
+-{
+-    I2CSlave *mux = i2c_slave_create_simple(bus, "pca9548", mux_addr);
+-    for (int i = 0; i < 8; i++) {
+-        channels[i] = pca954x_i2c_get_bus(mux, i);
+-    }
+-}
+-
+ #define TYPE_LM75 TYPE_TMP105
+ #define TYPE_TMP75 TYPE_TMP105
+ #define TYPE_TMP422 "tmp422"
+@@ -872,20 +863,18 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
+     for (int i = 0; i < 16; i++) {
+         i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
+     }
+-    I2CBus *i2c180 = i2c[2];
+-    I2CBus *i2c480 = i2c[8];
+-    I2CBus *i2c600 = i2c[11];
+ 
+-    get_pca9548_channels(i2c180, 0x70, &i2c[16]);
+-    get_pca9548_channels(i2c480, 0x70, &i2c[24]);
++    pca954x_i2c_get_channels(i2c[2], 0x70, "pca9548", &i2c[16]);
++    pca954x_i2c_get_channels(i2c[8], 0x70, "pca9548", &i2c[24]);
+     /* NOTE: The device tree skips [32, 40) in the alias numbering */
+-    get_pca9548_channels(i2c600, 0x77, &i2c[40]);
+-    get_pca9548_channels(i2c[24], 0x71, &i2c[48]);
+-    get_pca9548_channels(i2c[25], 0x72, &i2c[56]);
+-    get_pca9548_channels(i2c[26], 0x76, &i2c[64]);
+-    get_pca9548_channels(i2c[27], 0x76, &i2c[72]);
++    pca954x_i2c_get_channels(i2c[11], 0x77, "pca9548", &i2c[40]);
++    pca954x_i2c_get_channels(i2c[24], 0x71, "pca9548", &i2c[48]);
++    pca954x_i2c_get_channels(i2c[25], 0x72, "pca9548", &i2c[56]);
++    pca954x_i2c_get_channels(i2c[26], 0x76, "pca9548", &i2c[64]);
++    pca954x_i2c_get_channels(i2c[27], 0x76, "pca9548", &i2c[72]);
+     for (int i = 0; i < 8; i++) {
+-        get_pca9548_channels(i2c[40 + i], 0x76, &i2c[80 + i * 8]);
++        pca954x_i2c_get_channels(i2c[40 + i], 0x76, "pca9548",
++                                 &i2c[80 + i * 8]);
+     }
+ 
+     i2c_slave_create_simple(i2c[17], TYPE_LM75, 0x4c);
+diff --git a/hw/i2c/i2c_mux_pca954x.c b/hw/i2c/i2c_mux_pca954x.c
+index db5db956a6..1340dd9143 100644
+--- a/hw/i2c/i2c_mux_pca954x.c
++++ b/hw/i2c/i2c_mux_pca954x.c
+@@ -172,6 +172,16 @@ I2CBus *pca954x_i2c_get_bus(I2CSlave *mux, uint8_t channel)
+     return pca954x->bus[channel];
+ }
+ 
++void pca954x_i2c_get_channels(I2CBus *bus, uint8_t address,
++                              const char *type_name, I2CBus **channels)
++{
++    I2CSlave *mux = i2c_slave_create_simple(bus, type_name, address);
++    Pca954xClass *pc = PCA954X_GET_CLASS(mux);
++    Pca954xState *pca954x = PCA954X(mux);
++
++    memcpy(channels, pca954x->bus, pc->nchans * sizeof(channels[0]));
++}
++
+ static void pca9546_class_init(ObjectClass *klass, void *data)
+ {
+     Pca954xClass *s = PCA954X_CLASS(klass);
+diff --git a/include/hw/i2c/i2c_mux_pca954x.h b/include/hw/i2c/i2c_mux_pca954x.h
+index 3dd25ec983..3a676a30a9 100644
+--- a/include/hw/i2c/i2c_mux_pca954x.h
++++ b/include/hw/i2c/i2c_mux_pca954x.h
+@@ -16,4 +16,17 @@
+  */
+ I2CBus *pca954x_i2c_get_bus(I2CSlave *mux, uint8_t channel);
+ 
++/**
++ * Creates an i2c mux and retrieves all of the channels associated with it.
++ *
++ * @bus: the i2c bus where the i2c mux resides.
++ * @address: the address of the i2c mux on the aforementioned i2c bus.
++ * @type_name: name of the i2c mux type to create.
++ * @channels: an output parameter specifying where to return the channels.
++ *
++ * Returns: None
++ */
++void pca954x_i2c_get_channels(I2CBus *bus, uint8_t address,
++                              const char *type_name, I2CBus **channels);
++
+ #endif
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0508-hw-arm-aspeed-Add-fb_machine_class_init.patch b/common/recipes-devtools/qemu/qemu/0508-hw-arm-aspeed-Add-fb_machine_class_init.patch
new file mode 100644
index 000000000000..a5243eed115b
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0508-hw-arm-aspeed-Add-fb_machine_class_init.patch
@@ -0,0 +1,367 @@
+From 0966f4fffc6bf2c7cbf3596d8bba127e15303715 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Fri, 20 May 2022 17:07:55 -0700
+Subject: [PATCH 508/532] hw/arm/aspeed: Add fb_machine_class_init
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/arm/aspeed.c | 332 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 332 insertions(+)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 2de2bd76c2..0d6b1bb929 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -929,6 +929,30 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
+     }
+ }
+ 
++static void wedge100_i2c_init(AspeedMachineState *bmc)
++{
++    AspeedSoCState *soc = ASPEED_SOC(&bmc->soc);
++    I2CBus *i2c[14];
++
++    for (int i = 0; i < 14; i++) {
++        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
++    }
++
++    i2c_slave_create_simple(i2c[3], TYPE_TMP75, 0x48);
++    i2c_slave_create_simple(i2c[3], TYPE_TMP75, 0x49);
++    i2c_slave_create_simple(i2c[3], TYPE_TMP75, 0x4a);
++    i2c_slave_create_simple(i2c[3], TYPE_TMP75, 0x4b);
++    i2c_slave_create_simple(i2c[3], TYPE_TMP75, 0x4c);
++    i2c_slave_create_simple(i2c[8], TYPE_TMP75, 0x48);
++    i2c_slave_create_simple(i2c[8], TYPE_TMP75, 0x49);
++    at24c_eeprom_init(i2c[6], 0x51, 64 * KiB);
++    at24c_eeprom_init(i2c[7], 0x50, 2 * KiB);
++
++    /* FIXME: These two EEPROM's are supposed to be fancpld's. */
++    at24c_eeprom_init(i2c[4], 0x33, 64 * KiB);
++    at24c_eeprom_init(i2c[8], 0x33, 64 * KiB);
++}
++
+ #define TYPE_TMP421 "tmp421"
+ 
+ static void bletchley_bmc_i2c_init(AspeedMachineState *bmc)
+@@ -1048,6 +1072,47 @@ static void qcom_dc_scm_firework_i2c_init(AspeedMachineState *bmc)
+     i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "max31785", 0x54);
+ }
+ 
++static void create_unimplemented_i2c_device(I2CBus *bus, uint8_t addr)
++{
++    /* Using EEPROM's as placeholders */
++    at24c_eeprom_init(bus, addr, 64 * KiB);
++}
++
++static void oby35_cl_i2c_init(AspeedMachineState *bmc)
++{
++    AspeedSoCState *soc = ASPEED_SOC(&bmc->soc);
++    I2CBus *i2c[16];
++
++    for (int i = 0; i < 16; i++) {
++        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
++    }
++
++    create_unimplemented_i2c_device(i2c[1], 0x71);
++    create_unimplemented_i2c_device(i2c[2], 0x16);
++    create_unimplemented_i2c_device(i2c[2], 0x10);
++    create_unimplemented_i2c_device(i2c[6], 0x20);
++    create_unimplemented_i2c_device(i2c[7], 0x20);
++    create_unimplemented_i2c_device(i2c[8], 0x20);
++}
++
++static void oby35_bb_i2c_init(AspeedMachineState *bmc)
++{
++    AspeedSoCState *soc = ASPEED_SOC(&bmc->soc);
++    I2CBus *i2c[16];
++
++    for (int i = 0; i < 16; i++) {
++        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
++    }
++
++    /* FIXME: This is supposed to be an adm1278 */
++    i2c_slave_create_simple(i2c[1], "adm1272", 0x40);
++    /* FIXME: This is supposed to be an ltc4282 */
++    i2c_slave_create_simple(i2c[1], "adm1272", 0x44);
++
++    create_unimplemented_i2c_device(i2c[6], 0x20);
++    create_unimplemented_i2c_device(i2c[7], 0x20);
++}
++
+ static bool aspeed_get_mmio_exec(Object *obj, Error **errp)
+ {
+     return ASPEED_MACHINE(obj)->mmio_exec;
+@@ -1733,3 +1798,270 @@ static const TypeInfo aspeed_machine_types[] = {
+ };
+ 
+ DEFINE_TYPES(aspeed_machine_types)
++
++struct FBMachineData {
++    const char *parent;
++    const char *name;
++    const char *desc;
++    const char *soc_name;
++    const char *flash_model;
++    uint32_t hw_strap1;
++    uint32_t hw_strap2;
++    uint32_t stdout_path;
++    uint32_t macs_mask;
++    ram_addr_t ram_size;
++    void (*reset)(MachineState *state);
++    void (*i2c_init)(AspeedMachineState *bmc);
++};
++
++static void fb_machine_class_init(ObjectClass *oc, void *data)
++{
++    MachineClass *mc = MACHINE_CLASS(oc);
++    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
++    const struct FBMachineData *fb = data;
++
++    if (fb->desc)
++        mc->desc = fb->desc;
++    if (fb->soc_name)
++        amc->soc_name = fb->soc_name;
++    if (fb->hw_strap1)
++        amc->hw_strap1 = fb->hw_strap1;
++    if (fb->hw_strap2)
++        amc->hw_strap2 = fb->hw_strap2;
++    if (fb->flash_model) {
++        amc->fmc_model = fb->flash_model;
++        amc->spi_model = fb->flash_model;
++    }
++    amc->num_cs = 2;
++    if (fb->stdout_path)
++        amc->uart_default = fb->stdout_path;
++    if (fb->macs_mask)
++        amc->macs_mask = fb->macs_mask;
++    if (fb->i2c_init)
++        amc->i2c_init = fb->i2c_init;
++    if (fb->ram_size)
++        mc->default_ram_size = fb->ram_size;
++    mc->default_cpus = mc->min_cpus = mc->max_cpus = aspeed_soc_num_cpus(amc->soc_name);
++}
++
++static const struct FBMachineData fb_machines[] = {
++    {
++        .name        = "minipack-bmc",
++        .desc        = "Facebook Minipack 100 BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx66u51235f",
++        .macs_mask   = ASPEED_MAC1_ON,
++        .stdout_path = ASPEED_DEV_UART1,
++        .ram_size    = 1 * GiB,
++    },
++    {
++        .name        = "cloudripper-bmc",
++        .desc        = "Facebook Cloudripper BMC (Cortex-A7)",
++        .soc_name    = "ast2600-a3",
++        .hw_strap1   = AST2600_EVB_HW_STRAP1,
++        .hw_strap2   = AST2600_EVB_HW_STRAP2,
++        .flash_model = "mx66l1g45g",
++        .macs_mask   = ASPEED_MAC3_ON,
++        .stdout_path = ASPEED_DEV_UART1,
++        .ram_size    = FUJI_BMC_RAM_SIZE,
++    },
++    {
++        .name        = "grandcanyon-bmc",
++        .desc        = "Facebook GrandCanyon BMC (Cortex-A7)",
++        .soc_name    = "ast2600-a3",
++        .hw_strap1   = AST2600_EVB_HW_STRAP1,
++        .hw_strap2   = AST2600_EVB_HW_STRAP2,
++        .flash_model = "mx66l1g45g",
++        .macs_mask   = ASPEED_MAC3_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = FUJI_BMC_RAM_SIZE,
++    },
++    {
++        .name        = "fby2-bmc",
++        .desc        = "Facebook Yosemitev2 BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC0_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 512 * MiB,
++    },
++    {
++        .name        = "fby3-bmc",
++        .desc        = "Facebook Yosemitev3 BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx66l1g45g",
++        .macs_mask   = ASPEED_MAC0_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 1 * GiB,
++    },
++    {
++        .name        = "fbttn-bmc",
++        .desc        = "Facebook BryceCanyon BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC0_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 1 * GiB,
++    },
++    {
++        .name        = "fbtp-bmc",
++        .desc        = "Facebook TiogaPass BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC0_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 1 * GiB,
++    },
++    {
++        .name        = "cmm-bmc",
++        .desc        = "Facebook Backpack CMM BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC1_ON,
++        .stdout_path = ASPEED_DEV_UART1,
++        .ram_size    = 1 * GiB,
++    },
++    {
++        .name        = "angelslanding-bmc",
++        .desc        = "Facebook Angels Landing BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC0_ON | ASPEED_MAC1_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 512 * MiB,
++    },
++    {
++        .name        = "clearcreek-bmc",
++        .desc        = "Facebook Clear Creek BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC0_ON | ASPEED_MAC1_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 512 * MiB,
++    },
++    {
++        .name        = "emeraldpools-bmc",
++        .desc        = "Facebook Emerald Pools BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC3_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 512 * MiB,
++    },
++    {
++        .name        = "elbert-bmc",
++        .desc        = "Facebook Elbert BMC (Cortex-A7)",
++        .soc_name    = "ast2600-a3",
++        .hw_strap1   = AST2600_EVB_HW_STRAP1,
++        .hw_strap2   = AST2600_EVB_HW_STRAP2,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC3_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = FUJI_BMC_RAM_SIZE,
++    },
++    {
++        .name        = "northdome-bmc",
++        .desc        = "Facebook Northdome BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC0_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 512 * MiB,
++    },
++    {
++        .name        = "wedge100-bmc",
++        .desc        = "Facebook Wedge 100 BMC (ARM926EJ-S)",
++        .soc_name    = "ast2400-a1",
++        .hw_strap1   = PALMETTO_BMC_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC1_ON,
++        .stdout_path = ASPEED_DEV_UART3,
++        .ram_size    = 512 * MiB,
++        .i2c_init    = wedge100_i2c_init,
++    },
++    {
++        .name        = "wedge400-bmc",
++        .desc        = "Facebook Wedge 400 BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx66l1g45g",
++        .macs_mask   = ASPEED_MAC1_ON,
++        .stdout_path = ASPEED_DEV_UART1,
++        .ram_size    = 1 * GiB,
++    },
++    {
++        .name        = "galaxy100-bmc",
++        .desc        = "Facebook Galaxy 100 BMC (ARM926EJ-S)",
++        .soc_name    = "ast2400-a1",
++        .hw_strap1   = PALMETTO_BMC_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC1_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 512 * MiB,
++    },
++    {
++        .name        = "yamp-bmc",
++        .desc        = "Facebook YAMP 100 BMC (ARM1176)",
++        .soc_name    = "ast2500-a1",
++        .hw_strap1   = AST2500_EVB_HW_STRAP1,
++        .hw_strap2   = 0,
++        .flash_model = "mx25l25635e",
++        .macs_mask   = ASPEED_MAC0_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = 1 * GiB,
++    },
++    {
++        .parent      = MACHINE_TYPE_NAME("ast1030-evb"),
++        .name        = "oby35-cl",
++        .desc        = "Facebook fby35 CraterLake BIC (Cortex-M4)",
++        .i2c_init    = oby35_cl_i2c_init,
++    },
++    {
++        .parent      = MACHINE_TYPE_NAME("ast1030-evb"),
++        .name        = "oby35-bb",
++        .desc        = "Facebook fby35 BaseBoard BIC (Cortex-M4)",
++        .i2c_init    = oby35_bb_i2c_init,
++    },
++};
++
++static void fb_register_machines(void)
++{
++    static TypeInfo types[ARRAY_SIZE(fb_machines)];
++    static char names[ARRAY_SIZE(types)][32];
++
++    for (int i = 0; i < ARRAY_SIZE(fb_machines); i++) {
++        snprintf(names[i], sizeof(names[i]), "%s%s", fb_machines[i].name, TYPE_MACHINE_SUFFIX);
++
++        types[i].name = names[i];
++        types[i].parent = fb_machines[i].parent ? fb_machines[i].parent : TYPE_ASPEED_MACHINE;
++        types[i].class_init = fb_machine_class_init;
++        types[i].class_data = (void*)&fb_machines[i];
++    }
++
++    type_register_static_array(types, ARRAY_SIZE(types));
++}
++
++type_init(fb_register_machines);
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0509-fbttn-Add-I2C-SCL-timeout-property.patch b/common/recipes-devtools/qemu/qemu/0509-fbttn-Add-I2C-SCL-timeout-property.patch
new file mode 100644
index 000000000000..052b6b5db765
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0509-fbttn-Add-I2C-SCL-timeout-property.patch
@@ -0,0 +1,164 @@
+From c21900268026c459ecfc9eeca6fe6c358c04003d Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Tue, 16 Aug 2022 00:32:54 -0700
+Subject: [PATCH 509/532] fbttn: Add I2C SCL timeout property
+
+This lets us inject errors using QOM:
+
+```
+qom-set /machine/soc/i2c/bus[12] scl-timeout true
+qom-set /machine/soc/i2c/bus[12] scl-timeout false
+```
+
+This should cause the driver to attempt to recover the bus. If the
+driver recovery logic is implemented properly, then there shouldn't be
+any problems, but if it's not correct (for example, trying to do it
+within the IRQ handler), then a crash or deadlock is possible.
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/arm/aspeed.c             |  7 ++++++
+ hw/i2c/aspeed_i2c.c         | 43 +++++++++++++++++++++++++++++++++++++
+ hw/i2c/trace-events         |  1 +
+ include/hw/i2c/aspeed_i2c.h |  1 +
+ 4 files changed, 52 insertions(+)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 0d6b1bb929..826bc834d8 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -1033,6 +1033,12 @@ static void fby35_i2c_init(AspeedMachineState *bmc)
+      */
+ }
+ 
++static void fbttn_i2c_init(AspeedMachineState *bmc)
++{
++    AspeedSoCState *soc = ASPEED_SOC(&bmc->soc);
++    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp421", 0x1f);
++}
++
+ static void qcom_dc_scm_bmc_i2c_init(AspeedMachineState *bmc)
+ {
+     AspeedSoCState *soc = bmc->soc;
+@@ -1910,6 +1916,7 @@ static const struct FBMachineData fb_machines[] = {
+         .macs_mask   = ASPEED_MAC0_ON,
+         .stdout_path = ASPEED_DEV_UART5,
+         .ram_size    = 1 * GiB,
++        .i2c_init    = fbttn_i2c_init,
+     },
+     {
+         .name        = "fbtp-bmc",
+diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
+index 1037c22b2f..112c5ae86e 100644
+--- a/hw/i2c/aspeed_i2c.c
++++ b/hw/i2c/aspeed_i2c.c
+@@ -26,6 +26,7 @@
+ #include "qemu/module.h"
+ #include "qemu/error-report.h"
+ #include "qapi/error.h"
++#include "qapi/visitor.h"
+ #include "hw/i2c/aspeed_i2c.h"
+ #include "hw/irq.h"
+ #include "hw/qdev-properties.h"
+@@ -109,6 +110,8 @@ static uint64_t aspeed_i2c_bus_old_read(AspeedI2CBus *bus, hwaddr offset,
+         break;
+     case A_I2CD_CMD:
+         value = SHARED_FIELD_DP32(value, BUS_BUSY_STS, i2c_bus_busy(bus->bus));
++        value = SHARED_FIELD_DP32(value, SCL_LINE_STS, !bus->scl_timeout);
++        value = SHARED_FIELD_DP32(value, SDA_LINE_STS, !bus->scl_timeout);
+         break;
+     case A_I2CD_DMA_ADDR:
+         if (!aic->has_dma) {
+@@ -461,11 +464,28 @@ static void aspeed_i2c_bus_handle_cmd(AspeedI2CBus *bus, uint64_t value)
+         aspeed_i2c_bus_cmd_dump(bus);
+     }
+ 
++    if (SHARED_ARRAY_FIELD_EX32(bus->regs, reg_cmd, BUS_RECOVER_CMD_EN)) {
++        if (!bus->scl_timeout) {
++            SHARED_ARRAY_FIELD_DP32(bus->regs, reg_intr_sts, TX_ACK, 0);
++            SHARED_ARRAY_FIELD_DP32(bus->regs, reg_intr_sts, SCL_TIMEOUT, 0);
++            SHARED_ARRAY_FIELD_DP32(bus->regs, reg_intr_sts, SDA_DL_TIMEOUT, 0);
++            SHARED_ARRAY_FIELD_DP32(bus->regs, reg_intr_sts, BUS_RECOVER_DONE, 1);
++        }
++        return;
++    }
++
+     if (SHARED_ARRAY_FIELD_EX32(bus->regs, reg_cmd, M_START_CMD)) {
+         uint8_t state = aspeed_i2c_get_state(bus) & I2CD_MACTIVE ?
+             I2CD_MSTARTR : I2CD_MSTART;
+         uint8_t addr;
+ 
++        if (bus->scl_timeout) {
++            SHARED_ARRAY_FIELD_DP32(bus->regs, reg_intr_sts, TX_ACK, 1);
++            SHARED_ARRAY_FIELD_DP32(bus->regs, reg_intr_sts, SCL_TIMEOUT, 1);
++            SHARED_ARRAY_FIELD_DP32(bus->regs, reg_intr_sts, SDA_DL_TIMEOUT, 1);
++            return;
++        }
++
+         aspeed_i2c_set_state(bus, state);
+ 
+         addr = aspeed_i2c_get_addr(bus);
+@@ -1241,6 +1261,24 @@ static Property aspeed_i2c_bus_properties[] = {
+     DEFINE_PROP_END_OF_LIST(),
+ };
+ 
++static void aspeed_i2c_bus_get_scl_timeout(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    AspeedI2CBus *s = ASPEED_I2C_BUS(obj);
++
++    visit_type_bool(v, name, &s->scl_timeout, errp);
++}
++
++static void aspeed_i2c_bus_set_scl_timeout(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    AspeedI2CBus *s = ASPEED_I2C_BUS(obj);
++
++    visit_type_bool(v, name, &s->scl_timeout, errp);
++}
++
+ static void aspeed_i2c_bus_class_init(ObjectClass *klass, void *data)
+ {
+     DeviceClass *dc = DEVICE_CLASS(klass);
+@@ -1249,6 +1287,11 @@ static void aspeed_i2c_bus_class_init(ObjectClass *klass, void *data)
+     dc->realize = aspeed_i2c_bus_realize;
+     dc->reset = aspeed_i2c_bus_reset;
+     device_class_set_props(dc, aspeed_i2c_bus_properties);
++
++    object_class_property_add(klass, "scl-timeout", "bool",
++                              aspeed_i2c_bus_get_scl_timeout,
++                              aspeed_i2c_bus_set_scl_timeout,
++                              NULL, NULL);
+ }
+ 
+ static const TypeInfo aspeed_i2c_bus_info = {
+diff --git a/hw/i2c/trace-events b/hw/i2c/trace-events
+index 6900e06eda..ec0a6aa736 100644
+--- a/hw/i2c/trace-events
++++ b/hw/i2c/trace-events
+@@ -34,6 +34,7 @@ aspeed_i2c_bus_read(uint32_t busid, uint64_t offset, unsigned size, uint64_t val
+ aspeed_i2c_bus_write(uint32_t busid, uint64_t offset, unsigned size, uint64_t value) "bus[%d]: To 0x%" PRIx64 " of size %u: 0x%" PRIx64
+ aspeed_i2c_bus_send(const char *mode, int i, int count, uint8_t byte) "%s send %d/%d 0x%02x"
+ aspeed_i2c_bus_recv(const char *mode, int i, int count, uint8_t byte) "%s recv %d/%d 0x%02x"
++aspeed_i2c_scl_timeout(uint32_t busid) "bus[%d]: raising SCL timeout"
+ 
+ # npcm7xx_smbus.c
+ 
+diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h
+index a064479e59..d468b84971 100644
+--- a/include/hw/i2c/aspeed_i2c.h
++++ b/include/hw/i2c/aspeed_i2c.h
+@@ -243,6 +243,7 @@ struct AspeedI2CBus {
+     I2CBus *bus;
+     uint8_t id;
+     qemu_irq irq;
++    bool scl_timeout;
+ 
+     uint32_t regs[ASPEED_I2C_NEW_NUM_REG];
+ };
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0510-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch b/common/recipes-devtools/qemu/qemu/0510-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch
new file mode 100644
index 000000000000..57a94b2069aa
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0510-hw-i2c-aspeed-Add-bus-ID-to-all-trace-events.patch
@@ -0,0 +1,113 @@
+From 182fa89e0c74c098ae858c30116809543e03b0f8 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Wed, 24 Aug 2022 00:48:44 -0700
+Subject: [PATCH 510/532] hw/i2c/aspeed: Add bus ID to all trace events
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/i2c/aspeed_i2c.c | 18 ++++++++++--------
+ hw/i2c/trace-events |  8 ++++----
+ 2 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
+index 112c5ae86e..d04e1bf6f4 100644
+--- a/hw/i2c/aspeed_i2c.c
++++ b/hw/i2c/aspeed_i2c.c
+@@ -63,7 +63,8 @@ static inline void aspeed_i2c_bus_raise_interrupt(AspeedI2CBus *bus)
+                SHARED_ARRAY_FIELD_EX32(bus->regs, reg_intr_sts, ABNORMAL) ?
+                                                "abnormal"  : "");
+ 
+-           trace_aspeed_i2c_bus_raise_interrupt(bus->regs[reg_intr_sts], buf);
++           trace_aspeed_i2c_bus_raise_interrupt(bus->id,
++                                                bus->regs[reg_intr_sts], buf);
+     }
+ 
+     raise_irq = bus->regs[reg_intr_sts] & intr_ctrl_mask ;
+@@ -245,7 +246,7 @@ static int aspeed_i2c_bus_send(AspeedI2CBus *bus)
+         for (i = 0; i < pool_tx_count; i++) {
+             uint8_t *pool_base = aic->bus_pool_base(bus);
+ 
+-            trace_aspeed_i2c_bus_send("BUF", i + 1, pool_tx_count,
++            trace_aspeed_i2c_bus_send(bus->id, "BUF", i + 1, pool_tx_count,
+                                       pool_base[i]);
+             ret = i2c_send(bus->bus, pool_base[i]);
+             if (ret) {
+@@ -261,7 +262,7 @@ static int aspeed_i2c_bus_send(AspeedI2CBus *bus)
+         while (bus->regs[reg_dma_len]) {
+             uint8_t data;
+             aspeed_i2c_dma_read(bus, &data);
+-            trace_aspeed_i2c_bus_send("DMA", bus->regs[reg_dma_len],
++            trace_aspeed_i2c_bus_send(bus->id, "DMA", bus->regs[reg_dma_len],
+                                       bus->regs[reg_dma_len], data);
+             ret = i2c_send(bus->bus, data);
+             if (ret) {
+@@ -276,7 +277,7 @@ static int aspeed_i2c_bus_send(AspeedI2CBus *bus)
+         }
+         SHARED_ARRAY_FIELD_DP32(bus->regs, reg_cmd, TX_DMA_EN, 0);
+     } else {
+-        trace_aspeed_i2c_bus_send("BYTE", 0, 1,
++        trace_aspeed_i2c_bus_send(bus->id, "BYTE", 0, 1,
+                                   bus->regs[reg_byte_buf]);
+         ret = i2c_send(bus->bus, bus->regs[reg_byte_buf]);
+     }
+@@ -307,7 +308,7 @@ static void aspeed_i2c_bus_recv(AspeedI2CBus *bus)
+ 
+         for (i = 0; i < pool_rx_count; i++) {
+             pool_base[i] = i2c_recv(bus->bus);
+-            trace_aspeed_i2c_bus_recv("BUF", i + 1, pool_rx_count,
++            trace_aspeed_i2c_bus_recv(bus->id, "BUF", i + 1, pool_rx_count,
+                                       pool_base[i]);
+         }
+ 
+@@ -324,7 +325,7 @@ static void aspeed_i2c_bus_recv(AspeedI2CBus *bus)
+             MemTxResult result;
+ 
+             data = i2c_recv(bus->bus);
+-            trace_aspeed_i2c_bus_recv("DMA", bus->regs[reg_dma_len],
++            trace_aspeed_i2c_bus_recv(bus->id, "DMA", bus->regs[reg_dma_len],
+                                       bus->regs[reg_dma_len], data);
+             result = address_space_write(&s->dram_as, bus->regs[reg_dma_addr],
+                                          MEMTXATTRS_UNSPECIFIED, &data, 1);
+@@ -345,7 +346,8 @@ static void aspeed_i2c_bus_recv(AspeedI2CBus *bus)
+         SHARED_ARRAY_FIELD_DP32(bus->regs, reg_cmd, RX_DMA_EN, 0);
+     } else {
+         data = i2c_recv(bus->bus);
+-        trace_aspeed_i2c_bus_recv("BYTE", 1, 1, bus->regs[reg_byte_buf]);
++        trace_aspeed_i2c_bus_recv(bus->id, "BYTE", 1, 1,
++                                  bus->regs[reg_byte_buf]);
+         SHARED_ARRAY_FIELD_DP32(bus->regs, reg_byte_buf, RX_BUF, data);
+     }
+ }
+@@ -442,7 +444,7 @@ static void aspeed_i2c_bus_cmd_dump(AspeedI2CBus *bus)
+     SHARED_ARRAY_FIELD_EX32(bus->regs, reg_cmd, M_S_RX_CMD_LAST) ? "last|" : "",
+     SHARED_ARRAY_FIELD_EX32(bus->regs, reg_cmd, M_STOP_CMD) ? "stop|" : "");
+ 
+-    trace_aspeed_i2c_bus_cmd(bus->regs[reg_cmd], cmd_flags, count,
++    trace_aspeed_i2c_bus_cmd(bus->id, bus->regs[reg_cmd], cmd_flags, count,
+                              bus->regs[reg_intr_sts]);
+ }
+ 
+diff --git a/hw/i2c/trace-events b/hw/i2c/trace-events
+index ec0a6aa736..e9f3d1af07 100644
+--- a/hw/i2c/trace-events
++++ b/hw/i2c/trace-events
+@@ -28,12 +28,12 @@ allwinner_i2c_write(const char* reg_name, uint64_t offset, uint64_t value) "writ
+ 
+ # aspeed_i2c.c
+ 
+-aspeed_i2c_bus_cmd(uint32_t cmd, const char *cmd_flags, uint32_t count, uint32_t intr_status) "handling cmd=0x%x %s count=%d intr=0x%x"
+-aspeed_i2c_bus_raise_interrupt(uint32_t intr_status, const char *s) "handled intr=0x%x %s"
++aspeed_i2c_bus_cmd(uint32_t busid, uint32_t cmd, const char *cmd_flags, uint32_t count, uint32_t intr_status) "bus[%d]: handling cmd=0x%x %s count=%d intr=0x%x"
++aspeed_i2c_bus_raise_interrupt(uint32_t busid, uint32_t intr_status, const char *s) "bus[%d]: handled intr=0x%x %s"
+ aspeed_i2c_bus_read(uint32_t busid, uint64_t offset, unsigned size, uint64_t value) "bus[%d]: To 0x%" PRIx64 " of size %u: 0x%" PRIx64
+ aspeed_i2c_bus_write(uint32_t busid, uint64_t offset, unsigned size, uint64_t value) "bus[%d]: To 0x%" PRIx64 " of size %u: 0x%" PRIx64
+-aspeed_i2c_bus_send(const char *mode, int i, int count, uint8_t byte) "%s send %d/%d 0x%02x"
+-aspeed_i2c_bus_recv(const char *mode, int i, int count, uint8_t byte) "%s recv %d/%d 0x%02x"
++aspeed_i2c_bus_send(uint32_t busid, const char *mode, int i, int count, uint8_t byte) "bus[%d]: %s send %d/%d 0x%02x"
++aspeed_i2c_bus_recv(uint32_t busid, const char *mode, int i, int count, uint8_t byte) "bus[%d]: %s recv %d/%d 0x%02x"
+ aspeed_i2c_scl_timeout(uint32_t busid) "bus[%d]: raising SCL timeout"
+ 
+ # npcm7xx_smbus.c
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0511-hw-i2c-aspeed-Add-slave-event-traces.patch b/common/recipes-devtools/qemu/qemu/0511-hw-i2c-aspeed-Add-slave-event-traces.patch
new file mode 100644
index 000000000000..155715a304f7
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0511-hw-i2c-aspeed-Add-slave-event-traces.patch
@@ -0,0 +1,68 @@
+From d9eba13040279ef71f4e727fa87a042348522b10 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Wed, 24 Aug 2022 01:53:43 -0700
+Subject: [PATCH 511/532] hw/i2c/aspeed: Add slave event traces
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/i2c/aspeed_i2c.c | 13 +++++++++++++
+ hw/i2c/trace-events |  2 ++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
+index d04e1bf6f4..899aedcc9a 100644
+--- a/hw/i2c/aspeed_i2c.c
++++ b/hw/i2c/aspeed_i2c.c
+@@ -1101,9 +1101,18 @@ static const TypeInfo aspeed_i2c_info = {
+     .abstract   = true,
+ };
+ 
++static const char *I2C_EVENT[] = {
++    [I2C_START_SEND] = "I2C_START_SEND",
++    [I2C_START_SEND_ASYNC] = "I2C_START_SEND_ASYNC",
++    [I2C_START_RECV] = "I2C_START_RECV",
++    [I2C_FINISH] = "I2C_FINISH",
++};
++
+ static int aspeed_i2c_bus_new_slave_event(AspeedI2CBus *bus,
+                                           enum i2c_event event)
+ {
++    trace_aspeed_i2c_bus_new_slave_event(bus->id, I2C_EVENT[event]);
++
+     switch (event) {
+     case I2C_START_SEND_ASYNC:
+         if (!SHARED_ARRAY_FIELD_EX32(bus->regs, R_I2CS_CMD, RX_DMA_EN)) {
+@@ -1148,6 +1157,8 @@ static int aspeed_i2c_bus_slave_event(I2CSlave *slave, enum i2c_event event)
+         return aspeed_i2c_bus_new_slave_event(bus, event);
+     }
+ 
++    trace_aspeed_i2c_bus_slave_event(bus->id, I2C_EVENT[event]);
++
+     switch (event) {
+     case I2C_START_SEND_ASYNC:
+         /* Bit[0] == 0 indicates "send". */
+@@ -1168,6 +1179,8 @@ static int aspeed_i2c_bus_slave_event(I2CSlave *slave, enum i2c_event event)
+         break;
+ 
+     default:
++        qemu_log_mask(LOG_UNIMP, "%s: i2c event %d unimplemented\n",
++                      __func__, event);
+         return -1;
+     }
+ 
+diff --git a/hw/i2c/trace-events b/hw/i2c/trace-events
+index e9f3d1af07..5a1651352c 100644
+--- a/hw/i2c/trace-events
++++ b/hw/i2c/trace-events
+@@ -34,6 +34,8 @@ aspeed_i2c_bus_read(uint32_t busid, uint64_t offset, unsigned size, uint64_t val
+ aspeed_i2c_bus_write(uint32_t busid, uint64_t offset, unsigned size, uint64_t value) "bus[%d]: To 0x%" PRIx64 " of size %u: 0x%" PRIx64
+ aspeed_i2c_bus_send(uint32_t busid, const char *mode, int i, int count, uint8_t byte) "bus[%d]: %s send %d/%d 0x%02x"
+ aspeed_i2c_bus_recv(uint32_t busid, const char *mode, int i, int count, uint8_t byte) "bus[%d]: %s recv %d/%d 0x%02x"
++aspeed_i2c_bus_slave_event(uint32_t busid, const char *event) "bus[%d]: %s"
++aspeed_i2c_bus_new_slave_event(uint32_t busid, const char *event) "bus[%d]: %s"
+ aspeed_i2c_scl_timeout(uint32_t busid) "bus[%d]: raising SCL timeout"
+ 
+ # npcm7xx_smbus.c
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0512-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch b/common/recipes-devtools/qemu/qemu/0512-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch
new file mode 100644
index 000000000000..fe04f69bbcaf
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0512-hw-i2c-aspeed-Fix-bus-derivation-for-slave-events.patch
@@ -0,0 +1,62 @@
+From b74bf0343d00ea8e3536d7339c46660e936d0ed7 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Wed, 24 Aug 2022 01:55:12 -0700
+Subject: [PATCH 512/532] hw/i2c/aspeed: Fix bus derivation for slave events
+
+The existing code assumes there's one AspeedI2CBus attached to each
+I2CBus. That's not the case in a multi-SoC system where two
+AspeedI2CBus's share a single I2CBus to communicate with each other.
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/i2c/aspeed_i2c.c         | 7 +++----
+ include/hw/i2c/aspeed_i2c.h | 1 +
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
+index 899aedcc9a..bf70e3c03b 100644
+--- a/hw/i2c/aspeed_i2c.c
++++ b/hw/i2c/aspeed_i2c.c
+@@ -1145,8 +1145,7 @@ static int aspeed_i2c_bus_new_slave_event(AspeedI2CBus *bus,
+ 
+ static int aspeed_i2c_bus_slave_event(I2CSlave *slave, enum i2c_event event)
+ {
+-    BusState *qbus = qdev_get_parent_bus(DEVICE(slave));
+-    AspeedI2CBus *bus = ASPEED_I2C_BUS(qbus->parent);
++    AspeedI2CBus *bus = ASPEED_I2C_BUS_SLAVE(slave)->bus;
+     uint32_t reg_intr_sts = aspeed_i2c_bus_intr_sts_offset(bus);
+     uint32_t reg_byte_buf = aspeed_i2c_bus_byte_buf_offset(bus);
+     uint32_t reg_dev_addr = aspeed_i2c_bus_dev_addr_offset(bus);
+@@ -1204,8 +1203,7 @@ static void aspeed_i2c_bus_new_slave_send_async(AspeedI2CBus *bus, uint8_t data)
+ 
+ static void aspeed_i2c_bus_slave_send_async(I2CSlave *slave, uint8_t data)
+ {
+-    BusState *qbus = qdev_get_parent_bus(DEVICE(slave));
+-    AspeedI2CBus *bus = ASPEED_I2C_BUS(qbus->parent);
++    AspeedI2CBus *bus = ASPEED_I2C_BUS_SLAVE(slave)->bus;
+     uint32_t reg_intr_sts = aspeed_i2c_bus_intr_sts_offset(bus);
+     uint32_t reg_byte_buf = aspeed_i2c_bus_byte_buf_offset(bus);
+ 
+@@ -1263,6 +1261,7 @@ static void aspeed_i2c_bus_realize(DeviceState *dev, Error **errp)
+     s->bus = i2c_init_bus(dev, name);
+     s->slave = i2c_slave_create_simple(s->bus, TYPE_ASPEED_I2C_BUS_SLAVE,
+                                        0xff);
++    ASPEED_I2C_BUS_SLAVE(s->slave)->bus = s;
+ 
+     memory_region_init_io(&s->mr, OBJECT(s), &aspeed_i2c_bus_ops,
+                           s, name, aic->reg_size);
+diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h
+index d468b84971..f1e3e016d2 100644
+--- a/include/hw/i2c/aspeed_i2c.h
++++ b/include/hw/i2c/aspeed_i2c.h
+@@ -269,6 +269,7 @@ struct AspeedI2CState {
+ OBJECT_DECLARE_SIMPLE_TYPE(AspeedI2CBusSlave, ASPEED_I2C_BUS_SLAVE)
+ struct AspeedI2CBusSlave {
+     I2CSlave i2c;
++    AspeedI2CBus *bus;
+ };
+ 
+ struct AspeedI2CClass {
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0513-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch b/common/recipes-devtools/qemu/qemu/0513-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch
new file mode 100644
index 000000000000..1b1fbef23706
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0513-tests-Rename-aspeed_i2c-test-to-i2c-netdev2-test.patch
@@ -0,0 +1,45 @@
+From 806b8823c888c2c8e5da98f649cd9d903fce09fb Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Fri, 26 Aug 2022 02:13:04 -0700
+Subject: [PATCH 513/532] tests: Rename aspeed_i2c-test to i2c-netdev2-test
+
+This test is verifying Aspeed I2C, but mostly in the context of the
+i2c-netdev2.
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ tests/qtest/{aspeed_i2c-test.c => i2c-netdev2-test.c} | 2 +-
+ tests/qtest/meson.build                               | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename tests/qtest/{aspeed_i2c-test.c => i2c-netdev2-test.c} (99%)
+
+diff --git a/tests/qtest/aspeed_i2c-test.c b/tests/qtest/i2c-netdev2-test.c
+similarity index 99%
+rename from tests/qtest/aspeed_i2c-test.c
+rename to tests/qtest/i2c-netdev2-test.c
+index aaf8c85427..59e874e4d4 100644
+--- a/tests/qtest/aspeed_i2c-test.c
++++ b/tests/qtest/i2c-netdev2-test.c
+@@ -1,5 +1,5 @@
+ /*
+- * QTest testcase for the Aspeed I2C Controller.
++ * Tests for using i2c-netdev2 with the Aspeed I2C controller
+  *
+  * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
+  *
+diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
+index 14068d8f39..9bdd01f794 100644
+--- a/tests/qtest/meson.build
++++ b/tests/qtest/meson.build
+@@ -194,7 +194,7 @@ qtests_aspeed = \
+   ['aspeed_hace-test',
+    'aspeed_smc-test',
+    'aspeed_gpio-test',
+-   'aspeed_i2c-test']
++   'i2c-netdev2-test']
+ qtests_arm = \
+   (config_all_devices.has_key('CONFIG_MPS2') ? ['sse-timer-test'] : []) + \
+   (config_all_devices.has_key('CONFIG_CMSDK_APB_DUALTIMER') ? ['cmsdk-apb-dualtimer-test'] : []) + \
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0514-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch b/common/recipes-devtools/qemu/qemu/0514-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch
new file mode 100644
index 000000000000..82f2bd9fa08b
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0514-hw-i2c-aspeed-Fix-interrupt-status-flag-names.patch
@@ -0,0 +1,39 @@
+From 6f3078b2923f27cb7347d53f777921ad6ca82e01 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Fri, 26 Aug 2022 07:10:35 -0700
+Subject: [PATCH 514/532] hw/i2c/aspeed: Fix interrupt status flag names
+
+It's pretty difficult to read the interrupt status flag names when
+they're different from the register field name. This makes them the
+same.
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/i2c/aspeed_i2c.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
+index bf70e3c03b..f3e294b796 100644
+--- a/hw/i2c/aspeed_i2c.c
++++ b/hw/i2c/aspeed_i2c.c
+@@ -49,13 +49,13 @@ static inline void aspeed_i2c_bus_raise_interrupt(AspeedI2CBus *bus)
+         g_autofree char *buf = g_strdup_printf("%s%s%s%s%s%s%s",
+                aspeed_i2c_bus_pkt_mode_en(bus) &&
+                ARRAY_FIELD_EX32(bus->regs, I2CM_INTR_STS, PKT_CMD_DONE) ?
+-                                               "pktdone|" : "",
++                                               "pkt-done|" : "",
+                SHARED_ARRAY_FIELD_EX32(bus->regs, reg_intr_sts, TX_NAK) ?
+-                                               "nak|" : "",
++                                               "tx-nak|" : "",
+                SHARED_ARRAY_FIELD_EX32(bus->regs, reg_intr_sts, TX_ACK) ?
+-                                               "ack|" : "",
++                                               "tx-ack|" : "",
+                SHARED_ARRAY_FIELD_EX32(bus->regs, reg_intr_sts, RX_DONE) ?
+-                                               "done|" : "",
++                                               "rx-done|" : "",
+                ARRAY_FIELD_EX32(bus->regs, I2CD_INTR_STS, SLAVE_ADDR_RX_MATCH) ?
+                                                "slave-match|" : "",
+                SHARED_ARRAY_FIELD_EX32(bus->regs, reg_intr_sts, NORMAL_STOP) ?
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0515-tests-Create-qtest-for-Aspeed-I2C-controller.patch b/common/recipes-devtools/qemu/qemu/0515-tests-Create-qtest-for-Aspeed-I2C-controller.patch
new file mode 100644
index 000000000000..5d1b91407556
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0515-tests-Create-qtest-for-Aspeed-I2C-controller.patch
@@ -0,0 +1,175 @@
+From e5c119cdf202281086a38a3675e906b83c012592 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Fri, 26 Aug 2022 07:12:09 -0700
+Subject: [PATCH 515/532] tests: Create qtest for Aspeed I2C controller
+
+Initial commit for a qtest for the Aspeed I2C controller. It uses an
+i2c-echo device and tests echoing some bytes back to itself.
+
+This just adds the old register mode byte-buffer mode used in the Linux
+driver, but can be extended to test the new register mode dma-buffer
+mode used in the Zephyr driver.
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ tests/qtest/aspeed_i2c-test.c | 135 ++++++++++++++++++++++++++++++++++
+ tests/qtest/meson.build       |   1 +
+ 2 files changed, 136 insertions(+)
+ create mode 100644 tests/qtest/aspeed_i2c-test.c
+
+diff --git a/tests/qtest/aspeed_i2c-test.c b/tests/qtest/aspeed_i2c-test.c
+new file mode 100644
+index 0000000000..1db23222f0
+--- /dev/null
++++ b/tests/qtest/aspeed_i2c-test.c
+@@ -0,0 +1,135 @@
++/*
++ * Aspeed I2C Controller Tests
++ *
++ * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
++ *
++ * This code is licensed under the GPL version 2 or later. See the COPYING
++ * file in the top-level directory.
++ */
++
++#include "qemu/osdep.h"
++#include "qapi/error.h"
++#include "hw/i2c/aspeed_i2c.h"
++#include "libqtest.h"
++
++#define QTEST_SHARED_FIELD_DP32(s, base_addr, reg, field, val) \
++    { \
++        uint32_t a, x; \
++        a = base_addr + ((reg) << 2); \
++        x = qtest_readl(s, a); \
++        x = SHARED_FIELD_DP32(x, field, val); \
++        qtest_writel(s, a, x); \
++    }
++
++#define QTEST_SHARED_FIELD_EX32(s, base_addr, reg, field) \
++    ({ \
++        uint32_t a, x; \
++        a = base_addr + ((reg) << 2); \
++        x = qtest_readl(s, a); \
++        SHARED_FIELD_EX32(x, field); \
++    })
++
++#define QTEST_FIELD_DP32(s, base_addr, reg, field, val) \
++    { \
++        uint32_t a, x; \
++        a = base_addr + (A_ ## reg); \
++        x = qtest_readl(s, a); \
++        x = FIELD_DP32(x, reg, field, val); \
++        qtest_writel(s, a, x); \
++    }
++
++#define QTEST_FIELD_EX32(s, base_addr, reg, field) \
++    ({ \
++        uint32_t a, x; \
++        a = base_addr + (A_ ## reg); \
++        x = qtest_readl(s, a); \
++        FIELD_EX32(x, reg, field); \
++    })
++
++#define ECHO_BUS 0
++#define ECHO_ADDR 0x20
++#define SELF_ADDR 0x10
++
++typedef struct Context Context;
++struct Context {
++    QTestState *qtest;
++    uint32_t base_addr;
++    uint32_t bus_addr[ASPEED_I2C_NR_BUSSES];
++};
++
++static int old_reg_byte_mode_s_rx(QTestState *s, uint32_t bus_addr,
++                                  bool new_mode, uint8_t *buf, int cap)
++{
++    uint32_t intr_sts_addr = new_mode ? A_I2CS_INTR_STS : A_I2CD_INTR_STS;
++    uint32_t intr_sts = 0;
++    int max_iterations = 1000;
++    int len = 0;
++
++    for (int i = 0; i < max_iterations; i++) {
++        intr_sts = qtest_readl(s, bus_addr + intr_sts_addr);
++        if (SHARED_FIELD_EX32(intr_sts, NORMAL_STOP)) {
++            break;
++        }
++        if (SHARED_FIELD_EX32(intr_sts, RX_DONE)) {
++            g_assert(len < cap);
++            buf[len++] = QTEST_SHARED_FIELD_EX32(s, bus_addr, R_I2CD_BYTE_BUF, RX_BUF);
++            qtest_writel(s, bus_addr + intr_sts_addr, SHARED_FIELD_DP32(0, RX_DONE, 1));
++        }
++        usleep(1);
++    }
++    return len;
++}
++
++static void test_old_reg_byte_mode(const void *opaque)
++{
++    Context *ctx = (Context *)opaque;
++    QTestState *s = ctx->qtest;
++    uint32_t global = ctx->base_addr;
++    uint32_t echo_bus = ctx->bus_addr[ECHO_BUS];
++    uint8_t msg[] = {ECHO_ADDR << 1, SELF_ADDR << 1, 0xa, 0xb, 0xc, 0xd};
++    uint8_t buf[64];
++    int len;
++
++    QTEST_FIELD_DP32(s, global, I2C_CTRL_GLOBAL, REG_MODE, 0);
++    QTEST_SHARED_FIELD_DP32(s, echo_bus, R_I2CD_FUN_CTRL, MASTER_EN, 1);
++    QTEST_SHARED_FIELD_DP32(s, echo_bus, R_I2CD_DEV_ADDR, SLAVE_DEV_ADDR1, SELF_ADDR);
++    QTEST_SHARED_FIELD_DP32(s, echo_bus, R_I2CD_FUN_CTRL, SLAVE_EN, 1);
++    qtest_writel(s, echo_bus + A_I2CD_INTR_CTRL, 0xffffffff);
++
++    QTEST_SHARED_FIELD_DP32(s, echo_bus, R_I2CD_BYTE_BUF, TX_BUF, msg[0]);
++    QTEST_SHARED_FIELD_DP32(s, echo_bus, R_I2CD_CMD, M_START_CMD, 1);
++    g_assert(QTEST_SHARED_FIELD_EX32(s, echo_bus, R_I2CD_INTR_STS, TX_ACK));
++    qtest_writel(s, echo_bus + A_I2CD_INTR_STS, SHARED_FIELD_DP32(0, TX_ACK, 1));
++    for (int i = 1; i < ARRAY_SIZE(msg); i++) {
++        QTEST_SHARED_FIELD_DP32(s, echo_bus, R_I2CD_BYTE_BUF, TX_BUF, msg[i]);
++        QTEST_SHARED_FIELD_DP32(s, echo_bus, R_I2CD_CMD, M_TX_CMD, 1);
++        g_assert(QTEST_SHARED_FIELD_EX32(s, echo_bus, R_I2CD_INTR_STS, TX_ACK));
++        qtest_writel(s, echo_bus + A_I2CD_INTR_STS, SHARED_FIELD_DP32(0, TX_ACK, 1));
++    }
++    QTEST_SHARED_FIELD_DP32(s, echo_bus, R_I2CD_CMD, M_STOP_CMD, 1);
++    g_assert(QTEST_SHARED_FIELD_EX32(s, echo_bus, R_I2CD_INTR_STS, NORMAL_STOP));
++    qtest_writel(s, echo_bus + A_I2CD_INTR_STS, SHARED_FIELD_DP32(0, NORMAL_STOP, 1));
++
++    len = old_reg_byte_mode_s_rx(s, echo_bus, false, buf, sizeof(buf));
++    g_assert(len == sizeof(msg) - 1);
++    g_assert(memcmp(&msg[1], buf, len) == 0);
++}
++
++int main(int argc, char **argv)
++{
++    Context ast2600_evb = {};
++
++    g_test_init(&argc, &argv, NULL);
++
++    ast2600_evb.qtest = qtest_initf("-machine ast2600-evb -device i2c-echo,"
++                                    "bus=aspeed.i2c.bus.%d,address=%d",
++                                    ECHO_BUS, ECHO_ADDR);
++    ast2600_evb.base_addr = 0x1E78A000;
++    for (int i = 0; i < ARRAY_SIZE(ast2600_evb.bus_addr); i++) {
++        ast2600_evb.bus_addr[i] = ast2600_evb.base_addr + 0x80 + (i * 0x80);
++    }
++
++    qtest_add_data_func("/ast2600/i2c/old_reg_byte_mode", &ast2600_evb,
++                        test_old_reg_byte_mode);
++    return g_test_run();
++}
+diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
+index 9bdd01f794..bec819ab42 100644
+--- a/tests/qtest/meson.build
++++ b/tests/qtest/meson.build
+@@ -194,6 +194,7 @@ qtests_aspeed = \
+   ['aspeed_hace-test',
+    'aspeed_smc-test',
+    'aspeed_gpio-test',
++   'aspeed_i2c-test',
+    'i2c-netdev2-test']
+ qtests_arm = \
+   (config_all_devices.has_key('CONFIG_MPS2') ? ['sse-timer-test'] : []) + \
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0516-scripts-Add-redact-util.patch b/common/recipes-devtools/qemu/qemu/0516-scripts-Add-redact-util.patch
new file mode 100644
index 000000000000..ad79b0a8a319
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0516-scripts-Add-redact-util.patch
@@ -0,0 +1,117 @@
+From 289609f4e24bf6d8f8ee342e152c58a0b233874a Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Wed, 15 Jun 2022 13:42:47 -0700
+Subject: [PATCH 516/532] scripts: Add redact-util
+
+This single-file, no-dependencies C++ program can be compiled with
+`g++ -std=c++2a redact-util.cpp` and used with IPMI FRU eeprom binary files
+collected from real hardware to remove serial numbers and other sensitive
+information. It can be run like `redact-util fruid_bmc.bin`.
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ scripts/redact-util.cpp | 92 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 92 insertions(+)
+ create mode 100644 scripts/redact-util.cpp
+
+diff --git a/scripts/redact-util.cpp b/scripts/redact-util.cpp
+new file mode 100644
+index 0000000000..b58b2d07ac
+--- /dev/null
++++ b/scripts/redact-util.cpp
+@@ -0,0 +1,92 @@
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
++#include <cassert>
++#include <cstdint>
++
++constexpr int FRUID_EEPROM_SIZE = 512;
++constexpr int AREA_COUNT = 5;
++constexpr int AREA_ARRAY_MAX_COUNT = 10;
++constexpr int AREA_ARRAY_OFFSET[AREA_COUNT] = {0, 3, 6, 3, 0};
++constexpr bool REDACTED[AREA_COUNT][AREA_ARRAY_MAX_COUNT] = {
++    {},
++    {},
++    {1, 0, 1, 1, 0, 1, 1},
++    {1, 0, 1, 0, 1, 1, 0, 1},
++    {},
++};
++
++struct CommonHeader {
++    uint8_t version; // 0x01
++    // Offsets encoded as multiples of 8 bytes.
++    uint8_t area_offset[AREA_COUNT];
++    uint8_t pad; // 0x00
++    uint8_t checksum;
++};
++
++static uint8_t checksum(const uint8_t *data, int len)
++{
++    uint8_t sum = 0;
++    for (int i = 0; i < len; i++) {
++        sum += data[i];
++    }
++    return sum;
++}
++
++static void print_usage_and_exit() {
++    printf("USAGE: redact-util FILE\n");
++    exit(1);
++}
++
++int main(int argc, char **argv) {
++    for (int i = 1; i < argc; i++) {
++        if (strcmp(argv[i], "-h") == 0) {
++            print_usage_and_exit();
++        }
++    }
++    if (argc < 2) {
++        print_usage_and_exit();
++    }
++
++    uint8_t buf[FRUID_EEPROM_SIZE];
++    auto f = fopen(argv[1], "r");
++    fread(buf, sizeof(buf), 1, f);
++    fclose(f);
++
++    const auto &common = *reinterpret_cast<const CommonHeader*>(buf);
++
++    assert(common.version == 0x01);
++    assert(common.pad == 0x00);
++    assert(checksum(buf, sizeof(CommonHeader)) == 0);
++
++    for (int i = 1; i < 5; i++) {
++        uint8_t offset = common.area_offset[i] * 8;
++        if (offset == 0) {
++            continue;
++        }
++        uint8_t *area = &buf[offset];
++        uint32_t len = static_cast<uint32_t>(area[1] & 0b111111) * 8;
++
++        uint8_t *p = &area[AREA_ARRAY_OFFSET[i]];
++        for (int j = 0; *p != 0xC1; j++) {
++            assert(j < AREA_ARRAY_MAX_COUNT);
++            uint32_t elem_len = static_cast<uint32_t>(*p & 0b111111);
++            *p = elem_len | 0b11000000;
++            p++;
++            if (REDACTED[i][j]) {
++                memset(p, 'X', elem_len);
++            }
++            printf("%d %d %.*s\n", i, j, (int)elem_len, (const char *)p);
++            p = &p[elem_len];
++        }
++
++        area[len - 1] = -checksum(area, len - 1);
++        assert(checksum(area, len) == 0);
++    }
++
++    char path[256];
++    snprintf(path, sizeof(path), "%s.redacted", argv[1]);
++    f = fopen(path, "w");
++    fwrite(buf, sizeof(buf), 1, f);
++    fclose(f);
++}
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0517-aspeed-Expose-i2c-buses-to-machine.patch b/common/recipes-devtools/qemu/qemu/0517-aspeed-Expose-i2c-buses-to-machine.patch
new file mode 100644
index 000000000000..5be5d0038199
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0517-aspeed-Expose-i2c-buses-to-machine.patch
@@ -0,0 +1,117 @@
+From 69c330c175451dd3ef9669ba5469f127e92d1eca Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Wed, 17 Aug 2022 10:14:07 +0200
+Subject: [PATCH 517/532] aspeed: Expose i2c buses to machine
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+Signed-off-by: Cédric Le Goater <clg@kaod.org>
+---
+ hw/arm/aspeed_soc_common.c  | 14 ++++++++++++++
+ hw/arm/fby35.c              | 13 +++++++++++++
+ hw/i2c/aspeed_i2c.c         |  8 +++++++-
+ include/hw/arm/aspeed_soc.h |  2 ++
+ 4 files changed, 36 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/aspeed_soc_common.c b/hw/arm/aspeed_soc_common.c
+index 828f61093b..99aa4bd733 100644
+--- a/hw/arm/aspeed_soc_common.c
++++ b/hw/arm/aspeed_soc_common.c
+@@ -97,6 +97,20 @@ bool aspeed_soc_dram_init(AspeedSoCState *s, Error **errp)
+     return true;
+ }
+ 
++void aspeed_soc_i2c_set_bus(AspeedSoCState *s, int bus_id, I2CBus *bus)
++{
++    object_property_set_link(OBJECT(&s->i2c.busses[bus_id]), "bus", OBJECT(bus),
++                             &error_abort);
++}
++
++I2CBus *aspeed_soc_i2c_bus(AspeedSoCState *s, int bus_id)
++{
++    Object *obj;
++
++    obj = object_property_get_link(OBJECT(&s->i2c.busses[bus_id]), "bus", &error_abort);
++    return I2C_BUS(obj);
++}
++
+ void aspeed_mmio_map(AspeedSoCState *s, SysBusDevice *dev, int n, hwaddr addr)
+ {
+     memory_region_add_subregion(s->memory, addr,
+diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c
+index c9964bd283..490f5d6e23 100644
+--- a/hw/arm/fby35.c
++++ b/hw/arm/fby35.c
+@@ -14,6 +14,9 @@
+ #include "hw/qdev-clock.h"
+ #include "hw/arm/aspeed_soc.h"
+ #include "hw/arm/boot.h"
++#include "hw/arm/fby35.h"
++#include "hw/i2c/i2c.h"
++#include "hw/i2c/i2c_mux_pca954x.h"
+ 
+ #define TYPE_FBY35 MACHINE_TYPE_NAME("fby35")
+ OBJECT_DECLARE_SIMPLE_TYPE(Fby35State, FBY35);
+@@ -141,8 +144,18 @@ static void fby35_bic_init(Fby35State *s)
+ static void fby35_init(MachineState *machine)
+ {
+     Fby35State *s = FBY35(machine);
++    I2CBus *slot_i2c[4];
++
++    object_initialize_child(OBJECT(s), "bmc", &s->bmc, "ast2600-a3");
++    object_initialize_child(OBJECT(s), "bic", &s->bic, "ast1030-a1");
+ 
+     fby35_bmc_init(s);
++
++    for (int i = 0; i < ARRAY_SIZE(slot_i2c); i++) {
++        slot_i2c[i] = aspeed_soc_i2c_bus(ASPEED_SOC(&s->bmc), i);
++    }
++    aspeed_soc_i2c_set_bus(ASPEED_SOC(&s->bic), 6, slot_i2c[0]);
++
+     fby35_bic_init(s);
+ }
+ 
+diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
+index f3e294b796..48f50ea441 100644
+--- a/hw/i2c/aspeed_i2c.c
++++ b/hw/i2c/aspeed_i2c.c
+@@ -1258,7 +1258,12 @@ static void aspeed_i2c_bus_realize(DeviceState *dev, Error **errp)
+ 
+     sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq);
+ 
+-    s->bus = i2c_init_bus(dev, name);
++    /*
++     * If a bus hasn't been provided to the controller, create one from scratch.
++     */
++    if (!s->bus) {
++        s->bus = i2c_init_bus(dev, name);
++    }
+     s->slave = i2c_slave_create_simple(s->bus, TYPE_ASPEED_I2C_BUS_SLAVE,
+                                        0xff);
+     ASPEED_I2C_BUS_SLAVE(s->slave)->bus = s;
+@@ -1272,6 +1277,7 @@ static Property aspeed_i2c_bus_properties[] = {
+     DEFINE_PROP_UINT8("bus-id", AspeedI2CBus, id, 0),
+     DEFINE_PROP_LINK("controller", AspeedI2CBus, controller, TYPE_ASPEED_I2C,
+                      AspeedI2CState *),
++    DEFINE_PROP_LINK("bus", AspeedI2CBus, bus, TYPE_I2C_BUS, I2CBus *),
+     DEFINE_PROP_END_OF_LIST(),
+ };
+ 
+diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
+index cb832bc1ee..6c0f352c73 100644
+--- a/include/hw/arm/aspeed_soc.h
++++ b/include/hw/arm/aspeed_soc.h
+@@ -222,6 +222,8 @@ qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int dev);
+ bool aspeed_soc_uart_realize(AspeedSoCState *s, Error **errp);
+ void aspeed_soc_uart_set_chr(AspeedSoCState *s, int dev, Chardev *chr);
+ bool aspeed_soc_dram_init(AspeedSoCState *s, Error **errp);
++void aspeed_soc_i2c_set_bus(AspeedSoCState *s, int bus_id, I2CBus *bus);
++I2CBus *aspeed_soc_i2c_bus(AspeedSoCState *s, int bus_id);
+ void aspeed_mmio_map(AspeedSoCState *s, SysBusDevice *dev, int n, hwaddr addr);
+ void aspeed_mmio_map_unimplemented(AspeedSoCState *s, SysBusDevice *dev,
+                                    const char *name, hwaddr addr,
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0518-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch b/common/recipes-devtools/qemu/qemu/0518-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch
new file mode 100644
index 000000000000..26065d2a05c3
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0518-aspeed-fby35-Add-bmc-bb-and-nic-FRU-s.patch
@@ -0,0 +1,233 @@
+From 2183c07e9d5b8cdb84ce98ffadf67cee3fab1b74 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Wed, 15 Jun 2022 13:45:39 -0700
+Subject: [PATCH 518/532] aspeed: fby35: Add bmc, bb, and nic FRU's
+
+This provides support to run `fruid-util bmc`, `fruid-util bb`, and
+`fruid-util nic` and get some real (but redacted) output.
+
+    root@bmc-oob:~# fruid-util bmc
+
+    FRU Information           : BMC
+    ---------------           : ------------------
+    Board Mfg Date            : Mon Jan 10 21:42:00 2022
+    Board Mfg                 : XXXXXX
+    Board Product             : BMC Storage Module
+    Board Serial              : XXXXXXXXXXXXX
+    Board Part Number         : XXXXXXXXXXXXXX
+    Board FRU ID              : 1.0
+    Board Custom Data 1       : XXXXXXXXX
+    Board Custom Data 2       : XXXXXXXXXXXXXXXXXX
+    Product Manufacturer      : XXXXXX
+    Product Name              : Yosemite V3.5 EVT2
+    Product Part Number       : XXXXXXXXXXXXXX
+    Product Version           : EVT2
+    Product Serial            : XXXXXXXXXXXXX
+    Product Asset Tag         : XXXXXXX
+    Product FRU ID            : 1.0
+    Product Custom Data 1     : XXXXXXXXX
+    Product Custom Data 2     : Config A
+    root@bmc-oob:~# fruid-util bb
+
+    FRU Information           : Baseboard
+    ---------------           : ------------------
+    Chassis Type              : Rack Mount Chassis
+    Chassis Part Number       : N/A
+    Chassis Serial Number     : N/A
+    Board Mfg Date            : Fri Jan  7 10:30:00 2022
+    Board Mfg                 : XXXXXX
+    Board Product             : Management Board wBMC
+    Board Serial              : XXXXXXXXXXXXX
+    Board Part Number         : XXXXXXXXXXXXXX
+    Board FRU ID              : 1.0
+    Board Custom Data 1       : XXXXXXXXX
+    Board Custom Data 2       : XXXXXXXXXXXXXXXXXX
+    Product Manufacturer      : XXXXXX
+    Product Name              : Yosemite V3.5 EVT2
+    Product Part Number       : XXXXXXXXXXXXXX
+    Product Version           : EVT2
+    Product Serial            : XXXXXXXXXXXXX
+    Product Asset Tag         : XXXXXXX
+    Product FRU ID            : 1.0
+    Product Custom Data 1     : XXXXXXXXX
+    Product Custom Data 2     : N/A
+    root@bmc-oob:~# fruid-util nic
+
+    FRU Information           : NIC
+    ---------------           : ------------------
+    Board Mfg Date            : Tue Nov  2 08:51:00 2021
+    Board Mfg                 : XXXXXXXX
+    Board Product             : Mellanox ConnectX-6 DX OCP3.0
+    Board Serial              : XXXXXXXXXXXXXXXXXXXXXXXX
+    Board Part Number         : XXXXXXXXXXXXXXXXXXXXX
+    Board FRU ID              : FRU Ver 0.02
+    Product Manufacturer      : XXXXXXXX
+    Product Name              : Mellanox ConnectX-6 DX OCP3.0
+    Product Part Number       : XXXXXXXXXXXXXXXXXXXXX
+    Product Version           : A9
+    Product Serial            : XXXXXXXXXXXXXXXXXXXXXXXX
+    Product Custom Data 3     : ConnectX-6 DX
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/arm/aspeed.c       |   1 +
+ hw/arm/fby35.h        | 110 ++++++++++++++++++++++++++++++++++++++++++
+ scripts/gen_eeprom.py |  17 +++++++
+ 3 files changed, 128 insertions(+)
+ create mode 100644 hw/arm/fby35.h
+ create mode 100644 scripts/gen_eeprom.py
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 826bc834d8..84618d738b 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -30,6 +30,7 @@
+ #include "qemu/units.h"
+ #include "hw/qdev-clock.h"
+ #include "sysemu/sysemu.h"
++#include "hw/arm/fby35.h"
+ 
+ static struct arm_boot_info aspeed_board_binfo = {
+     .board_id = -1, /* device-tree-only board */
+diff --git a/hw/arm/fby35.h b/hw/arm/fby35.h
+new file mode 100644
+index 0000000000..b8fbd1bf9a
+--- /dev/null
++++ b/hw/arm/fby35.h
+@@ -0,0 +1,110 @@
++#ifndef FBY35_H
++#define FBY35_H
++#include "qemu/osdep.h"
++
++static const uint8_t fby35_fruid_bb[] = {
++    0x01, 0x00, 0x01, 0x03, 0x10, 0x00, 0x00, 0xeb, 0x01, 0x02, 0x17, 0xc3, 0x4e, 0x2f, 0x41, 0xc3,
++    0x4e, 0x2f, 0x41, 0xc1, 0x00, 0x00, 0x00, 0x23, 0x01, 0x0d, 0x00, 0xb6, 0xd2, 0xd0, 0xc6, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0xd5, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74,
++    0x20, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x20, 0x77, 0x42, 0x4d, 0x43, 0xcd, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xce, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc3, 0x31, 0x2e, 0x30, 0xc9, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xd2, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8,
++    0x01, 0x0c, 0x00, 0xc6, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xd2, 0x59, 0x6f, 0x73, 0x65, 0x6d,
++    0x69, 0x74, 0x65, 0x20, 0x56, 0x33, 0x2e, 0x35, 0x20, 0x45, 0x56, 0x54, 0x32, 0xce, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc4, 0x45, 0x56, 0x54,
++    0x32, 0xcd, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc7,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc3, 0x31, 0x2e, 0x30, 0xc9, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0xc3, 0x4e, 0x2f, 0x41, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++};
++
++static const uint8_t fby35_fruid_bmc[] = {
++    0x01, 0x00, 0x00, 0x01, 0x0d, 0x00, 0x00, 0xf1, 0x01, 0x0c, 0x00, 0x36, 0xe6, 0xd0, 0xc6, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0xd2, 0x42, 0x4d, 0x43, 0x20, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67,
++    0x65, 0x20, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0xcd, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xce, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0xc3, 0x31, 0x2e, 0x30, 0xc9, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0xd2, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc1, 0x39, 0x01, 0x0c, 0x00, 0xc6, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0xd2, 0x59, 0x6f, 0x73, 0x65, 0x6d, 0x69, 0x74, 0x65, 0x20, 0x56, 0x33, 0x2e, 0x35,
++    0x20, 0x45, 0x56, 0x54, 0x32, 0xce, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0xc4, 0x45, 0x56, 0x54, 0x32, 0xcd, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc7, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc3,
++    0x31, 0x2e, 0x30, 0xc9, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc8, 0x43, 0x6f,
++    0x6e, 0x66, 0x69, 0x67, 0x20, 0x41, 0xc1, 0x45, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++};
++
++static const uint8_t fby35_fruid_nic[] = {
++    0x01, 0x00, 0x00, 0x01, 0x0f, 0x20, 0x00, 0xcf, 0x01, 0x0e, 0x19, 0xd7, 0x5e, 0xcf, 0xc8, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xdd, 0x4d, 0x65, 0x6c, 0x6c, 0x61, 0x6e, 0x6f, 0x78,
++    0x20, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x58, 0x2d, 0x36, 0x20, 0x44, 0x58, 0x20, 0x4f,
++    0x43, 0x50, 0x33, 0x2e, 0x30, 0xd8, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xd5, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0xcc, 0x46, 0x52, 0x55, 0x20, 0x56, 0x65, 0x72, 0x20, 0x30, 0x2e, 0x30,
++    0x32, 0xc0, 0xc0, 0xc0, 0xc1, 0x00, 0x00, 0x2f, 0x01, 0x11, 0x19, 0xc8, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0xdd, 0x4d, 0x65, 0x6c, 0x6c, 0x61, 0x6e, 0x6f, 0x78, 0x20, 0x43, 0x6f,
++    0x6e, 0x6e, 0x65, 0x63, 0x74, 0x58, 0x2d, 0x36, 0x20, 0x44, 0x58, 0x20, 0x4f, 0x43, 0x50, 0x33,
++    0x2e, 0x30, 0xd5, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xd3, 0x41, 0x39, 0x20, 0x20, 0x20, 0x20, 0x20,
++    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xd8, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0xc0, 0xc0, 0xc0, 0xc0, 0xcd, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
++    0x74, 0x58, 0x2d, 0x36, 0x20, 0x44, 0x58, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb,
++    0xc0, 0x82, 0x30, 0x15, 0x79, 0x7f, 0xa6, 0x00, 0x01, 0x18, 0x0b, 0xff, 0x08, 0x00, 0xff, 0xff,
++    0x64, 0x00, 0x00, 0x00, 0x00, 0x03, 0x20, 0x01, 0xff, 0xff, 0x04, 0x46, 0x00, 0xff, 0xff, 0xff,
++    0xff, 0xff, 0xff, 0xff, 0x01, 0x81, 0x09, 0x15, 0xb3, 0x10, 0x1d, 0x00, 0x24, 0x15, 0xb3, 0x00,
++    0x02, 0xeb, 0x8a, 0x95, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++};
++
++#endif
+diff --git a/scripts/gen_eeprom.py b/scripts/gen_eeprom.py
+new file mode 100644
+index 0000000000..b5eceb47bd
+--- /dev/null
++++ b/scripts/gen_eeprom.py
+@@ -0,0 +1,17 @@
++import os
++import sys
++
++prefix = os.environ.get('PREFIX', '')
++
++for bin_file in sys.argv[1:]:
++    var_name = prefix + bin_file.split('.')[0]
++    sys.stdout.write('static const uint8_t %s[] = {' % var_name)
++    with open(bin_file, 'rb') as f:
++        s = f.read()
++        for i, b in enumerate(s):
++            if i % 16 == 0:
++                sys.stdout.write('\n    ')
++            elif i != 0:
++                sys.stdout.write(' ')
++            sys.stdout.write('0x%02x,' % b)
++    sys.stdout.write('\n};\n')
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0519-hw-misc-aspeed-Add-fby35-sb-cpld.patch b/common/recipes-devtools/qemu/qemu/0519-hw-misc-aspeed-Add-fby35-sb-cpld.patch
new file mode 100644
index 000000000000..8919a36f84c3
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0519-hw-misc-aspeed-Add-fby35-sb-cpld.patch
@@ -0,0 +1,218 @@
+From 5bc7735cb1a7cb86dcfcd764d4075be723191648 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Wed, 17 Aug 2022 10:14:07 +0200
+Subject: [PATCH 519/532] hw/misc/aspeed: Add fby35-sb-cpld
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fby35 machines have 1 BMC on a baseboard and 2-4 server boards with BIC's.
+There are also CPLD's on each of the boards, one type of CPLD on the
+baseboard and another type on each of the server boards. This commit adds an
+implementation of some of the logic performed by the server board CPLD,
+which is connected to the server board BIC.
+
+fby35 machines have 1 baseboard with a BMC (AST2600) and 4 server boards
+with bridge interconnects (BIC's, AST1030's). Each server board has a CPLD
+on it which provides FRU information and some synchronization functionality
+with the BMC. The baseboard also has one CPLD, but it does other stuff.
+
+This commit just adds some of the FRU functionality to allow the BIC to
+startup without any errors.
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+Message-Id: <20220630045133.32251-13-me@pjd.dev>
+Signed-off-by: Cédric Le Goater <clg@kaod.org>
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ MAINTAINERS             |   1 +
+ hw/misc/fby35_sb_cpld.c | 137 ++++++++++++++++++++++++++++++++++++++++
+ hw/misc/meson.build     |   3 +-
+ hw/misc/trace-events    |   4 ++
+ 4 files changed, 144 insertions(+), 1 deletion(-)
+ create mode 100644 hw/misc/fby35_sb_cpld.c
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 695e0bd34f..35dc5cd767 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -1163,6 +1163,7 @@ F: include/hw/net/ftgmac100.h
+ F: docs/system/arm/aspeed.rst
+ F: tests/*/*aspeed*
+ F: hw/arm/fby35.c
++F: hw/misc/fby35_sb_cpld.c
+ 
+ NRF51
+ M: Joel Stanley <joel@jms.id.au>
+diff --git a/hw/misc/fby35_sb_cpld.c b/hw/misc/fby35_sb_cpld.c
+new file mode 100644
+index 0000000000..e7c4b8df7b
+--- /dev/null
++++ b/hw/misc/fby35_sb_cpld.c
+@@ -0,0 +1,137 @@
++/*
++ * fby35 Server Board CPLD
++ *
++ * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
++ *
++ * This code is licensed under the GPL version 2 or later. See the COPYING
++ * file in the top-level directory.
++ */
++
++#include "qemu/osdep.h"
++#include "qemu/log.h"
++#include "hw/i2c/i2c.h"
++#include "hw/registerfields.h"
++#include "trace.h"
++
++#define BOARD_ID_CLASS1 0b0000
++#define BOARD_ID_CLASS2 0b0001
++
++#define TYPE_FBY35_SB_CPLD "fby35-sb-cpld"
++OBJECT_DECLARE_SIMPLE_TYPE(Fby35SbCpldState, FBY35_SB_CPLD);
++
++REG8(CLASS_TYPE, 0x5);
++    FIELD(CLASS_TYPE, RESERVED, 0, 2);
++    FIELD(CLASS_TYPE, 1OU_EXPANSION_NOT_PRESENT, 2, 1);
++    FIELD(CLASS_TYPE, 2OU_EXPANSION_NOT_PRESENT, 3, 1);
++    FIELD(CLASS_TYPE, BOARD_ID, 4, 4);
++REG8(BOARD_REVISION, 0x8);
++    FIELD(BOARD_REVISION, VALUE, 0, 4);
++    FIELD(BOARD_REVISION, RESERVED, 4, 4);
++
++struct Fby35SbCpldState {
++    I2CSlave parent_obj;
++
++    uint8_t target_reg;
++    uint32_t regs[10];
++};
++
++static void fby35_sb_cpld_realize(DeviceState *dev, Error **errp)
++{
++    Fby35SbCpldState *s = FBY35_SB_CPLD(dev);
++
++    memset(s->regs, 0, sizeof(s->regs));
++    s->target_reg = 0;
++
++    ARRAY_FIELD_DP32(s->regs, CLASS_TYPE, BOARD_ID, 0b0000);
++    ARRAY_FIELD_DP32(s->regs, CLASS_TYPE, 1OU_EXPANSION_NOT_PRESENT, 1);
++    ARRAY_FIELD_DP32(s->regs, CLASS_TYPE, 2OU_EXPANSION_NOT_PRESENT, 1);
++    ARRAY_FIELD_DP32(s->regs, BOARD_REVISION, VALUE, 0x1);
++}
++
++static int fby35_sb_cpld_i2c_event(I2CSlave *i2c, enum i2c_event event)
++{
++    Fby35SbCpldState *s = FBY35_SB_CPLD(i2c);
++
++    switch (event) {
++    case I2C_START_RECV:
++        break;
++    case I2C_START_SEND:
++        s->target_reg = 0;
++        break;
++    case I2C_START_SEND_ASYNC:
++    case I2C_FINISH:
++    case I2C_NACK:
++        break;
++    }
++
++    return 0;
++}
++
++static uint8_t fby35_sb_cpld_i2c_recv(I2CSlave *i2c)
++{
++    Fby35SbCpldState *s = FBY35_SB_CPLD(i2c);
++    uint8_t value;
++
++    switch (s->target_reg) {
++    case R_CLASS_TYPE:
++    case R_BOARD_REVISION:
++        value = s->regs[s->target_reg];
++        break;
++    default:
++        qemu_log_mask(LOG_UNIMP, "%s: Register read unimplemented: 0x%02x\n",
++                      __func__, s->target_reg);
++        value = 0xff;
++        break;
++    }
++
++    trace_fby35_sb_cpld_read(s->target_reg, value);
++    return value;
++}
++
++static int fby35_sb_cpld_i2c_send(I2CSlave *i2c, uint8_t data)
++{
++    Fby35SbCpldState *s = FBY35_SB_CPLD(i2c);
++
++    if (s->target_reg == 0) {
++        s->target_reg = data;
++        return 0;
++    }
++
++    trace_fby35_sb_cpld_write(s->target_reg, data);
++
++    switch (s->target_reg) {
++    case R_CLASS_TYPE:
++    case R_BOARD_REVISION:
++        s->regs[s->target_reg] = data;
++        break;
++    default:
++        qemu_log_mask(LOG_UNIMP,
++                      "%s: Register write unimplemented: 0x%02x 0x%02x\n",
++                      __func__, s->target_reg, data);
++        break;
++    }
++
++    return 0;
++}
++
++static void fby35_sb_cpld_class_init(ObjectClass *oc, void *data)
++{
++    DeviceClass *dc = DEVICE_CLASS(oc);
++    I2CSlaveClass *i2c = I2C_SLAVE_CLASS(oc);
++
++    dc->realize = fby35_sb_cpld_realize;
++    i2c->event = fby35_sb_cpld_i2c_event;
++    i2c->recv = fby35_sb_cpld_i2c_recv;
++    i2c->send = fby35_sb_cpld_i2c_send;
++}
++
++static const TypeInfo types[] = {
++    {
++        .name = TYPE_FBY35_SB_CPLD,
++        .parent = TYPE_I2C_SLAVE,
++        .instance_size = sizeof(Fby35SbCpldState),
++        .class_init = fby35_sb_cpld_class_init,
++    },
++};
++
++DEFINE_TYPES(types);
+diff --git a/hw/misc/meson.build b/hw/misc/meson.build
+index 901e5a11f0..18f3821c54 100644
+--- a/hw/misc/meson.build
++++ b/hw/misc/meson.build
+@@ -134,7 +134,8 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
+   'aspeed_sbc.c',
+   'aspeed_sdmc.c',
+   'aspeed_xdma.c',
+-  'aspeed_peci.c'))
++  'aspeed_peci.c',
++  'fby35_sb_cpld.c'))
+ 
+ system_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
+ system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
+diff --git a/hw/misc/trace-events b/hw/misc/trace-events
+index 05ff692441..6e20e6cd8a 100644
+--- a/hw/misc/trace-events
++++ b/hw/misc/trace-events
+@@ -330,3 +330,7 @@ djmemc_write(int reg, uint64_t value, unsigned int size) "reg=0x%x value=0x%"PRI
+ # iosb.c
+ iosb_read(int reg, uint64_t value, unsigned int size) "reg=0x%x value=0x%"PRIx64" size=%u"
+ iosb_write(int reg, uint64_t value, unsigned int size) "reg=0x%x value=0x%"PRIx64" size=%u"
++
++# fby35_sb_cpld.c
++fby35_sb_cpld_read(uint8_t reg, uint8_t value) "reg 0x%02x value 0x%02x"
++fby35_sb_cpld_write(uint8_t reg, uint8_t value) "reg 0x%02x value 0x%02x"
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0520-hw-misc-aspeed-Add-intel-me.patch b/common/recipes-devtools/qemu/qemu/0520-hw-misc-aspeed-Add-intel-me.patch
new file mode 100644
index 000000000000..86f85d7979ce
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0520-hw-misc-aspeed-Add-intel-me.patch
@@ -0,0 +1,240 @@
+From d968b9db8b4ef17a53e8b7bb732cec818d0da4d7 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Wed, 17 Aug 2022 10:14:07 +0200
+Subject: [PATCH 520/532] hw/misc/aspeed: Add intel-me
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Intel Management Engine is an IPMI endpoint that responds to various
+IPMI commands. In this commit, I've added some very basic functionality that
+will respond back with a respond code of zero (success), while also setting
+an appropriate response NetFN (request NetFN + 1), a matching command ID and
+sequence number, and the 2 standard checksums. Other data is not provided,
+but the model here could be extended to respond to more kinds of requests.
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+Message-Id: <20220630045133.32251-14-me@pjd.dev>
+Signed-off-by: Cédric Le Goater <clg@kaod.org>
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ MAINTAINERS          |   1 +
+ hw/misc/intel_me.c   | 162 +++++++++++++++++++++++++++++++++++++++++++
+ hw/misc/meson.build  |   3 +-
+ hw/misc/trace-events |   8 +++
+ 4 files changed, 173 insertions(+), 1 deletion(-)
+ create mode 100644 hw/misc/intel_me.c
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 35dc5cd767..3a33ebf223 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -1164,6 +1164,7 @@ F: docs/system/arm/aspeed.rst
+ F: tests/*/*aspeed*
+ F: hw/arm/fby35.c
+ F: hw/misc/fby35_sb_cpld.c
++F: hw/misc/intel_me.c
+ 
+ NRF51
+ M: Joel Stanley <joel@jms.id.au>
+diff --git a/hw/misc/intel_me.c b/hw/misc/intel_me.c
+new file mode 100644
+index 0000000000..933ae45101
+--- /dev/null
++++ b/hw/misc/intel_me.c
+@@ -0,0 +1,162 @@
++/*
++ * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
++ *
++ * This code is licensed under the GPL version 2 or later. See the COPYING
++ * file in the top-level directory.
++ */
++
++#include "qemu/osdep.h"
++#include "qemu/main-loop.h"
++#include "hw/i2c/i2c.h"
++#include "trace.h"
++
++#define TYPE_INTEL_ME "intel-me"
++OBJECT_DECLARE_SIMPLE_TYPE(IntelMEState, INTEL_ME);
++
++struct IntelMEState {
++    I2CSlave parent_obj;
++
++    I2CBus *bus;
++    QEMUBH *bh;
++    int rx_len;
++    int tx_len;
++    int tx_pos;
++    uint8_t rx_buf[512];
++    uint8_t tx_buf[512];
++};
++
++static void intel_me_bh(void *opaque)
++{
++    IntelMEState *s = opaque;
++    I2CSlave *i2c = I2C_SLAVE(s);
++    uint8_t target_addr;
++
++    assert(s->bus->bh == s->bh);
++
++    switch (s->tx_pos) {
++    case 0:
++        target_addr = s->tx_buf[s->tx_pos++];
++        trace_intel_me_tx_start(i2c->address, target_addr);
++        if (i2c_start_send_async(s->bus, target_addr) != 0) {
++            break;
++        }
++        return;
++    default:
++        if (s->tx_pos >= s->tx_len) {
++            break;
++        }
++        trace_intel_me_tx_data(i2c->address, s->tx_buf[s->tx_pos]);
++        if (i2c_send_async(s->bus, s->tx_buf[s->tx_pos++]) != 0) {
++            break;
++        }
++        return;
++    }
++
++    trace_intel_me_tx_end(i2c->address);
++    i2c_end_transfer(s->bus);
++    i2c_bus_release(s->bus);
++    s->tx_len = 0;
++    s->tx_pos = 0;
++    memset(s->tx_buf, 0, sizeof(s->tx_buf));
++}
++
++static void intel_me_realize(DeviceState *dev, Error **errp)
++{
++    IntelMEState *s = INTEL_ME(dev);
++
++    s->bus = I2C_BUS(qdev_get_parent_bus(dev));
++    s->bh = qemu_bh_new(intel_me_bh, s);
++    s->rx_len = 0;
++    s->tx_len = 0;
++    s->tx_pos = 0;
++    memset(s->rx_buf, 0, sizeof(s->rx_buf));
++    memset(s->tx_buf, 0, sizeof(s->tx_buf));
++}
++
++static uint8_t checksum(const uint8_t *ptr, int len)
++{
++    int sum = 0;
++
++    for (int i = 0; i < len; i++) {
++        sum += ptr[i];
++    }
++
++    return 256 - sum;
++}
++
++static int intel_me_i2c_event(I2CSlave *i2c, enum i2c_event event)
++{
++    IntelMEState *s = INTEL_ME(i2c);
++
++    switch (event) {
++    case I2C_START_RECV:
++        break;
++    case I2C_START_SEND:
++        trace_intel_me_rx_start(i2c->address);
++        s->rx_len = 0;
++        memset(s->rx_buf, 0, sizeof(s->rx_buf));
++        break;
++    case I2C_START_SEND_ASYNC:
++        break;
++    case I2C_FINISH:
++        trace_intel_me_rx_end(i2c->address);
++        s->tx_len = 10;
++        s->tx_pos = 0;
++        s->tx_buf[0] = s->rx_buf[2];
++        s->tx_buf[1] = ((s->rx_buf[0] >> 2) + 1) << 2;
++        s->tx_buf[2] = checksum(s->tx_buf, 2);
++        s->tx_buf[3] = i2c->address;
++        s->tx_buf[4] = (s->rx_buf[3] >> 2) << 2;
++        s->tx_buf[5] = s->rx_buf[4];
++        s->tx_buf[6] = 0x00;
++        s->tx_buf[7] = 0x55;
++        s->tx_buf[8] = 0x00;
++        s->tx_buf[9] = checksum(s->tx_buf, s->tx_len - 1);
++        s->tx_buf[0] >>= 1;
++        i2c_bus_master(s->bus, s->bh);
++        break;
++    case I2C_NACK:
++        break;
++    }
++
++    return 0;
++}
++
++static uint8_t intel_me_i2c_recv(I2CSlave *i2c)
++{
++    return 0xff;
++}
++
++static int intel_me_i2c_send(I2CSlave *i2c, uint8_t data)
++{
++    IntelMEState *s = INTEL_ME(i2c);
++
++    trace_intel_me_rx_data(i2c->address, data);
++
++    assert(s->rx_len < sizeof(s->rx_buf));
++    s->rx_buf[s->rx_len++] = data;
++
++    return 0;
++}
++
++static void intel_me_class_init(ObjectClass *oc, void *data)
++{
++    DeviceClass *dc = DEVICE_CLASS(oc);
++    I2CSlaveClass *i2c = I2C_SLAVE_CLASS(oc);
++
++    dc->realize = intel_me_realize;
++    i2c->event = intel_me_i2c_event;
++    i2c->recv = intel_me_i2c_recv;
++    i2c->send = intel_me_i2c_send;
++}
++
++static const TypeInfo types[] = {
++    {
++        .name = TYPE_INTEL_ME,
++        .parent = TYPE_I2C_SLAVE,
++        .instance_size = sizeof(IntelMEState),
++        .class_init = intel_me_class_init,
++    },
++};
++
++DEFINE_TYPES(types);
+diff --git a/hw/misc/meson.build b/hw/misc/meson.build
+index 18f3821c54..89f6b13407 100644
+--- a/hw/misc/meson.build
++++ b/hw/misc/meson.build
+@@ -135,7 +135,8 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
+   'aspeed_sdmc.c',
+   'aspeed_xdma.c',
+   'aspeed_peci.c',
+-  'fby35_sb_cpld.c'))
++  'fby35_sb_cpld.c',
++  'intel_me.c'))
+ 
+ system_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
+ system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
+diff --git a/hw/misc/trace-events b/hw/misc/trace-events
+index 6e20e6cd8a..65f68aedbf 100644
+--- a/hw/misc/trace-events
++++ b/hw/misc/trace-events
+@@ -334,3 +334,11 @@ iosb_write(int reg, uint64_t value, unsigned int size) "reg=0x%x value=0x%"PRIx6
+ # fby35_sb_cpld.c
+ fby35_sb_cpld_read(uint8_t reg, uint8_t value) "reg 0x%02x value 0x%02x"
+ fby35_sb_cpld_write(uint8_t reg, uint8_t value) "reg 0x%02x value 0x%02x"
++
++# intel_me.c
++intel_me_rx_start(uint8_t addr) "addr 0x%02x"
++intel_me_rx_data(uint8_t addr, uint8_t data) "addr 0x%02x data 0x%02x"
++intel_me_rx_end(uint8_t addr) "addr 0x%02x"
++intel_me_tx_start(uint8_t addr, uint8_t target_addr) "addr 0x%02x target_addr 0x%02x"
++intel_me_tx_data(uint8_t addr, uint8_t data) "addr 0x%02x data 0x%02x"
++intel_me_tx_end(uint8_t addr) "addr 0x%02x"
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0521-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch b/common/recipes-devtools/qemu/qemu/0521-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch
new file mode 100644
index 000000000000..9eaa9954d3d6
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0521-hw-misc-aspeed-Add-fby35-server-board-bridge-IC.patch
@@ -0,0 +1,436 @@
+From b7b078b9aa41065591979881da3c869240a82aba Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Tue, 23 Aug 2022 16:57:35 -0700
+Subject: [PATCH 521/532] hw/misc/aspeed: Add fby35 server board bridge IC
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/arm/fby35.h         |  35 +++++
+ hw/misc/fby35_sb_bic.c | 342 +++++++++++++++++++++++++++++++++++++++++
+ hw/misc/meson.build    |   1 +
+ hw/misc/trace-events   |   4 +
+ 4 files changed, 382 insertions(+)
+ create mode 100644 hw/misc/fby35_sb_bic.c
+
+diff --git a/hw/arm/fby35.h b/hw/arm/fby35.h
+index b8fbd1bf9a..20bd43fbae 100644
+--- a/hw/arm/fby35.h
++++ b/hw/arm/fby35.h
+@@ -107,4 +107,39 @@ static const uint8_t fby35_fruid_nic[] = {
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ };
+ 
++static const uint8_t fby35_fruid_slot[] = {
++    0x01, 0x00, 0x01, 0x05, 0x11, 0x00, 0x00, 0xe8, 0x01, 0x04, 0x17, 0xc3, 0x4e, 0x2f, 0x41, 0xc3,
++    0x4e, 0x2f, 0x41, 0xcd, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x01, 0x0c, 0x00, 0x93, 0x28, 0xd1, 0xc6, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0xd2, 0x43, 0x72, 0x61, 0x74, 0x65, 0x72, 0x20, 0x4c, 0x61, 0x6b,
++    0x65, 0x2d, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x31, 0xcd, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xce, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0xc3, 0x31, 0x2e, 0x30, 0xc9, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0xd2, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc1, 0x94, 0x01, 0x0d, 0x00, 0xc6, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0xd0, 0x43, 0x72, 0x61, 0x74, 0x65, 0x72, 0x20, 0x4c, 0x61, 0x6b, 0x65, 0x20, 0x45,
++    0x56, 0x54, 0x32, 0xce, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0xc7, 0x59, 0x6f, 0x43, 0x4c, 0x30, 0x33, 0x35, 0xd6, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0xc7, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc3, 0x31, 0x2e, 0x30, 0xc9, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0xc3, 0x4e, 0x2f, 0x41, 0xc1, 0x00, 0x00, 0x00, 0xaf,
++    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x7f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0xb7, 0x8c, 0x01, 0x00, 0x00, 0x00, 0x00,
++    0x20, 0xf5, 0xf3, 0xec, 0xfd, 0x7f, 0x00, 0x00, 0xb0, 0x2a, 0xb3, 0xff, 0xa9, 0x7f, 0x00, 0x00,
++    0x30, 0xf6, 0xf3, 0xec, 0xfd, 0x7f, 0x00, 0x00, 0x30, 0xf6, 0xf3, 0xec, 0xfd, 0x7f, 0x00, 0x00,
++    0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0xb3, 0x6b, 0xff, 0xa9, 0x7f, 0x00, 0x00,
++    0x80, 0xcc, 0x7a, 0xff, 0xa9, 0x7f, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0xe1, 0x64, 0xff, 0xa9, 0x7f, 0x00, 0x00,
++    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf2, 0x64, 0xff, 0xa9, 0x7f, 0x00, 0x00,
++    0xe0, 0xcc, 0x7a, 0xff, 0xa9, 0x7f, 0x00, 0x00, 0x00, 0xa0, 0xaf, 0x01, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x00, 0x10, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0x5b, 0xf3, 0x84, 0xc6, 0x25, 0x54,
++    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x80, 0xcc, 0x7a, 0xff, 0xa9, 0x7f, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++    0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++};
++
+ #endif
+diff --git a/hw/misc/fby35_sb_bic.c b/hw/misc/fby35_sb_bic.c
+new file mode 100644
+index 0000000000..245fd2df5a
+--- /dev/null
++++ b/hw/misc/fby35_sb_bic.c
+@@ -0,0 +1,342 @@
++/*
++ * fby35 Server Board Bridge Interconnect
++ *
++ * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
++ *
++ * This code is licensed under the GPL version 2 or later. See the COPYING
++ * file in the top-level directory.
++ */
++
++#include "qemu/osdep.h"
++#include "qemu/main-loop.h"
++#include "qemu/log.h"
++#include "hw/i2c/i2c.h"
++#include "hw/arm/fby35.h"
++#include "trace.h"
++
++#define IPMB_DATA_MAX_LENGTH 520
++#define IPMB_HEADER_LENGTH 6
++#define IPMB_CHECKSUM_LENGTH 1
++#define IPMB_COMPLETION_CODE_LENGTH 1
++#define IPMB_COMPLETION_CODE_SUCCESS 0x00
++#define IPMB_COMPLETION_CODE_INVALID_LENGTH 0xC7
++#define IPMB_COMPLETION_CODE_LENGTH_EXCEEDED 0xC8
++
++#define TYPE_FBY35_SB_BIC "fby35-sb-bic"
++OBJECT_DECLARE_SIMPLE_TYPE(BicState, FBY35_SB_BIC);
++
++struct BicState {
++    I2CSlave parent_obj;
++
++    I2CBus *bus;
++    QEMUBH *tx_task;
++    int rx_len;
++    int tx_len;
++    int tx_pos;
++    uint8_t rx_buf[512];
++    uint8_t tx_buf[512];
++};
++
++static void bic_tx_task(void *opaque)
++{
++    BicState *s = opaque;
++
++    switch (s->tx_pos) {
++    case 0:
++        if (i2c_start_send_async(s->bus, s->tx_buf[s->tx_pos++]) != 0) {
++            break;
++        }
++        return;
++    default:
++        if (s->tx_pos >= s->tx_len) {
++            break;
++        }
++        if (i2c_send_async(s->bus, s->tx_buf[s->tx_pos++]) != 0) {
++            break;
++        }
++        return;
++    }
++
++    i2c_end_transfer(s->bus);
++    i2c_bus_release(s->bus);
++}
++
++static void bic_realize(DeviceState *dev, Error **errp)
++{
++    BicState *s = FBY35_SB_BIC(dev);
++
++    s->bus = I2C_BUS(qdev_get_parent_bus(dev));
++    s->tx_task = qemu_bh_new(bic_tx_task, s);
++    s->rx_len = 0;
++    s->tx_len = 0;
++    s->tx_pos = 0;
++    memset(s->rx_buf, 0, sizeof(s->rx_buf));
++    memset(s->tx_buf, 0, sizeof(s->tx_buf));
++}
++
++static uint8_t checksum(const uint8_t *buf, int len)
++{
++    int sum = 0;
++
++    for (int i = 0; i < len; i++) {
++        sum += buf[i];
++    }
++    return 256 - sum;
++}
++
++typedef struct IPMBMessage IPMBMessage;
++
++struct IPMBMessage {
++    uint8_t dst_addr;
++    uint8_t dst_lun;
++    uint8_t src_addr;
++    uint8_t src_lun;
++    uint8_t netfn;
++    uint8_t seq;
++    uint8_t cmd;
++    uint8_t completion_code;
++    uint16_t data_len;
++    uint8_t data[IPMB_DATA_MAX_LENGTH];
++};
++
++static bool is_ipmb_response(const IPMBMessage *msg)
++{
++    return msg->netfn & 1;
++}
++
++static int encode_ipmb_message(const IPMBMessage *msg, uint8_t *buf, int cap)
++{
++    int n = 0;
++
++    g_assert(cap >= IPMB_HEADER_LENGTH + msg->data_len + IPMB_CHECKSUM_LENGTH
++             + (is_ipmb_response(msg) ? IPMB_COMPLETION_CODE_LENGTH : 0));
++
++    buf[n++] = msg->dst_addr;
++    buf[n++] = (msg->netfn << 2) | msg->dst_lun;
++    buf[n] = checksum(buf, n);
++    n++;
++    buf[n++] = msg->src_addr;
++    buf[n++] = (msg->seq << 2) | msg->src_lun;
++    buf[n++] = msg->cmd;
++    if (is_ipmb_response(msg)) {
++        buf[n++] = msg->completion_code;
++    }
++    memcpy(&buf[n], msg->data, msg->data_len);
++    n += msg->data_len;
++
++    buf[n] = checksum(buf, n);
++    n++;
++
++    /* QEMU's expecting a 7-bit I2C address. */
++    buf[0] >>= 1;
++
++    return n;
++}
++
++static int decode_ipmb_message(const uint8_t *buf, int len, IPMBMessage *msg)
++{
++    memset(msg, 0, sizeof(*msg));
++
++    if (len < IPMB_HEADER_LENGTH + IPMB_CHECKSUM_LENGTH) {
++        qemu_log_mask(LOG_GUEST_ERROR, "%s: length too small: %d\n", __func__,
++                      len);
++        return -1;
++    }
++
++    msg->dst_addr = buf[0];
++    msg->dst_lun  = buf[1] & 0b11;
++    msg->src_addr = buf[3];
++    msg->src_lun  = buf[4] & 0b11;
++    msg->netfn    = buf[1] >> 2;
++    msg->seq      = buf[4] >> 2;
++    msg->cmd      = buf[5];
++    msg->data_len = len - IPMB_HEADER_LENGTH - IPMB_CHECKSUM_LENGTH;
++    if (is_ipmb_response(msg)) {
++        msg->data_len -= IPMB_COMPLETION_CODE_LENGTH;
++        msg->completion_code =
++            len > IPMB_HEADER_LENGTH ? buf[IPMB_HEADER_LENGTH] : 0;
++    }
++    msg->data_len = MAX(msg->data_len, 0);
++    memcpy(msg->data, &buf[IPMB_HEADER_LENGTH], msg->data_len);
++
++    return 0;
++}
++
++static void ipmb_append_data(IPMBMessage *msg, uint8_t data)
++{
++    g_assert(msg->data_len < sizeof(msg->data));
++    msg->data[msg->data_len++] = data;
++}
++
++static void ipmb_extend_data(IPMBMessage *msg, const uint8_t *buf, int len)
++{
++    g_assert(msg->data_len + len < sizeof(msg->data));
++    memcpy(&msg->data[msg->data_len], buf, len);
++    msg->data_len += len;
++}
++
++static void read_fru(BicState *s, const IPMBMessage *request, IPMBMessage *response)
++{
++    const uint8_t *fru = fby35_fruid_slot; /* Assume we're getting the slot FRUID. */
++    int fru_size = sizeof(fru);
++    uint8_t device_id;
++    uint16_t offset;
++    uint8_t len;
++
++    if (request->data_len != 4) {
++        response->completion_code = IPMB_COMPLETION_CODE_INVALID_LENGTH;
++        return;
++    }
++
++    device_id = request->data[0];
++    (void)device_id; /* Ignore device ID */
++    offset = request->data[1] | (request->data[2] << 8);
++    len = request->data[3];
++
++    if (len > 32 || offset + len > fru_size) {
++        response->completion_code = IPMB_COMPLETION_CODE_LENGTH_EXCEEDED;
++        return;
++    }
++
++    ipmb_append_data(response, len + 1);
++    ipmb_extend_data(response, &fru[offset], len);
++}
++
++static int handle_ipmb_request(BicState *s, const IPMBMessage *request,
++                               IPMBMessage *response)
++{
++    I2CSlave *i2c = I2C_SLAVE(s);
++
++    g_assert(request->dst_addr == i2c->address);
++    g_assert(!is_ipmb_response(request));
++
++    memset(response, 0, sizeof(*response));
++    response->dst_addr = request->src_addr;
++    response->dst_lun  = request->src_lun;
++    response->src_addr = request->dst_addr;
++    response->src_lun  = request->dst_lun;
++    response->netfn    = request->netfn + 1;
++    response->seq      = request->seq;
++    response->cmd      = request->cmd;
++    response->completion_code = IPMB_COMPLETION_CODE_SUCCESS;
++
++    switch (request->netfn) {
++    case 0x06:
++        switch (request->cmd) {
++        case 0x04:
++            ipmb_append_data(response, 0x55);
++            ipmb_append_data(response, 0x00);
++            break;
++        }
++        break;
++    case 0x0a:
++        switch (request->cmd) {
++        case 0x10:
++            ipmb_append_data(response, sizeof(fby35_fruid_slot) & 0xFF);
++            ipmb_append_data(response, sizeof(fby35_fruid_slot) >> 8);
++            ipmb_append_data(response, 0); /* FRU access type: byte */
++            break;
++        case 0x11:
++            read_fru(s, request, response);
++            break;
++        }
++        break;
++    default:
++        qemu_log_mask(LOG_UNIMP, "%s: netfn 0x%02x cmd 0x%02x unimplemented\n",
++                      __func__, request->netfn, request->cmd);
++        return -1;
++    }
++
++    return 0;
++}
++
++static int bic_i2c_event(I2CSlave *i2c, enum i2c_event event)
++{
++    BicState *s = FBY35_SB_BIC(i2c);
++    IPMBMessage request, response;
++
++    switch (event) {
++    case I2C_START_SEND:
++        memset(s->rx_buf, 0, sizeof(s->rx_buf));
++        s->rx_len = 0;
++        s->rx_buf[s->rx_len++] = i2c->address;
++        break;
++    case I2C_FINISH:
++        if (decode_ipmb_message(s->rx_buf, s->rx_len, &request)) {
++            break;
++        }
++
++        trace_fby35_sb_bic_ipmb_message(request.src_addr,
++                                        request.dst_addr,
++                                        request.netfn,
++                                        request.cmd,
++                                        request.seq,
++                                        request.completion_code);
++        for (int i = 0; i < request.data_len; i++) {
++            trace_fby35_sb_bic_ipmb_message_data(i, request.data[i]);
++        }
++
++        if (handle_ipmb_request(s, &request, &response)) {
++            break;
++        }
++
++        s->tx_len = encode_ipmb_message(&response, s->tx_buf, sizeof(s->tx_buf));
++        s->tx_pos = 0;
++
++        trace_fby35_sb_bic_ipmb_message(response.src_addr,
++                                        response.dst_addr,
++                                        response.netfn,
++                                        response.cmd,
++                                        response.seq,
++                                        response.completion_code);
++        for (int i = 0; i < response.data_len; i++) {
++            trace_fby35_sb_bic_ipmb_message_data(i, response.data[i]);
++        }
++
++        i2c_bus_master(s->bus, s->tx_task);
++        break;
++    case I2C_START_RECV:
++    case I2C_START_SEND_ASYNC:
++    case I2C_NACK:
++        return -1;
++    }
++
++    return 0;
++}
++
++static uint8_t bic_i2c_recv(I2CSlave *i2c)
++{
++    return 0xff;
++}
++
++static int bic_i2c_send(I2CSlave *i2c, uint8_t data)
++{
++    BicState *s = FBY35_SB_BIC(i2c);
++
++    assert(s->rx_len < sizeof(s->rx_buf));
++    s->rx_buf[s->rx_len++] = data;
++
++    return 0;
++}
++
++static void bic_class_init(ObjectClass *oc, void *data)
++{
++    DeviceClass *dc = DEVICE_CLASS(oc);
++    I2CSlaveClass *i2c = I2C_SLAVE_CLASS(oc);
++
++    dc->realize = bic_realize;
++    i2c->event = bic_i2c_event;
++    i2c->recv = bic_i2c_recv;
++    i2c->send = bic_i2c_send;
++}
++
++static const TypeInfo types[] = {
++    {
++        .name = TYPE_FBY35_SB_BIC,
++        .parent = TYPE_I2C_SLAVE,
++        .instance_size = sizeof(BicState),
++        .class_init = bic_class_init,
++    },
++};
++
++DEFINE_TYPES(types);
+diff --git a/hw/misc/meson.build b/hw/misc/meson.build
+index 89f6b13407..8043376f1e 100644
+--- a/hw/misc/meson.build
++++ b/hw/misc/meson.build
+@@ -136,6 +136,7 @@ system_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
+   'aspeed_xdma.c',
+   'aspeed_peci.c',
+   'fby35_sb_cpld.c',
++  'fby35_sb_bic.c',
+   'intel_me.c'))
+ 
+ system_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-sysreg.c'))
+diff --git a/hw/misc/trace-events b/hw/misc/trace-events
+index 65f68aedbf..a7610f8394 100644
+--- a/hw/misc/trace-events
++++ b/hw/misc/trace-events
+@@ -335,6 +335,10 @@ iosb_write(int reg, uint64_t value, unsigned int size) "reg=0x%x value=0x%"PRIx6
+ fby35_sb_cpld_read(uint8_t reg, uint8_t value) "reg 0x%02x value 0x%02x"
+ fby35_sb_cpld_write(uint8_t reg, uint8_t value) "reg 0x%02x value 0x%02x"
+ 
++# fby35_sb_bic.c
++fby35_sb_bic_ipmb_message(uint8_t src, uint8_t dst, uint8_t netfn, uint8_t cmd, uint8_t seq, uint8_t cc) "src 0x%02x dst 0x%02x netfn 0x%02x cmd 0x%02x seq 0x%02x cc 0x%02x"
++fby35_sb_bic_ipmb_message_data(uint16_t i, uint8_t data) "data[%u]: 0x%02x"
++
+ # intel_me.c
+ intel_me_rx_start(uint8_t addr) "addr 0x%02x"
+ intel_me_rx_data(uint8_t addr, uint8_t data) "addr 0x%02x data 0x%02x"
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0522-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch b/common/recipes-devtools/qemu/qemu/0522-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch
new file mode 100644
index 000000000000..f4227c2ff512
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0522-hw-arm-aspeed-Switch-fby35-grandcanyon-to-n25q00.patch
@@ -0,0 +1,38 @@
+From a0ae8b3ec541044d3f709fa31bf188aa9b53c5ea Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Tue, 14 Jun 2022 11:33:56 -0700
+Subject: [PATCH 522/532] hw/arm/aspeed: Switch fby35, grandcanyon to n25q00
+
+This flash model is 128MB and includes the new BP and TB bits that Iris
+added. The additional testing verifies the vboot status output.
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/arm/aspeed.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 84618d738b..13546a5420 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -1582,7 +1582,7 @@ static void aspeed_machine_fby35_class_init(ObjectClass *oc, void *data)
+ 
+     mc->desc       = "Facebook fby35 BMC (Cortex-A7)";
+     mc->reset      = fby35_reset;
+-    amc->fmc_model = "mx66l1g45g";
++    amc->fmc_model = "n25q00";
+     amc->num_cs    = 2;
+     amc->macs_mask = ASPEED_MAC3_ON;
+     amc->i2c_init  = fby35_i2c_init;
+@@ -1880,7 +1880,7 @@ static const struct FBMachineData fb_machines[] = {
+         .soc_name    = "ast2600-a3",
+         .hw_strap1   = AST2600_EVB_HW_STRAP1,
+         .hw_strap2   = AST2600_EVB_HW_STRAP2,
+-        .flash_model = "mx66l1g45g",
++        .flash_model = "n25q00",
+         .macs_mask   = ASPEED_MAC3_ON,
+         .stdout_path = ASPEED_DEV_UART5,
+         .ram_size    = FUJI_BMC_RAM_SIZE,
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0523-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch b/common/recipes-devtools/qemu/qemu/0523-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch
new file mode 100644
index 000000000000..2cbd98533070
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0523-fby35-Add-CPLD-and-BIC-as-I2C-devices.patch
@@ -0,0 +1,29 @@
+From d0ff6858135f6de089e4c4b9da22d66cd18de0b0 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Tue, 23 Aug 2022 18:11:55 -0700
+Subject: [PATCH 523/532] fby35: Add CPLD and BIC as I2C devices
+
+This lets us run some basic bic-util commands from the fby35 BMC
+perspective.
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/arm/aspeed.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 13546a5420..51ec3cb6e0 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -1032,6 +1032,8 @@ static void fby35_i2c_init(AspeedMachineState *bmc)
+      * buses 0, 1, 2, 3, and 9. Source address 0x10, target address 0x20 on
+      * each.
+      */
++    i2c_slave_create_simple(i2c[0], "fby35-sb-bic", 0x20);
++    i2c_slave_create_simple(i2c[4], "fby35-sb-cpld", 0x0f);
+ }
+ 
+ static void fbttn_i2c_init(AspeedMachineState *bmc)
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0524-fby35-Setup-I2C-devices-and-GPIO-s.patch b/common/recipes-devtools/qemu/qemu/0524-fby35-Setup-I2C-devices-and-GPIO-s.patch
new file mode 100644
index 000000000000..5eb009d64ca7
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0524-fby35-Setup-I2C-devices-and-GPIO-s.patch
@@ -0,0 +1,255 @@
+From 4147b883d1ba5aa9c97ea24cb74b52aa5920dcfa Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Tue, 23 Aug 2022 23:24:36 -0700
+Subject: [PATCH 524/532] fby35: Setup I2C devices and GPIO's
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/arm/aspeed.c | 46 ++----------------------
+ hw/arm/fby35.c  | 95 +++++++++++++++++++++++++++++++++++++++++++++++++
+ hw/arm/fby35.h  |  5 +++
+ 3 files changed, 103 insertions(+), 43 deletions(-)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 51ec3cb6e0..aa2d351a77 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -1005,35 +1005,13 @@ static void bletchley_bmc_i2c_init(AspeedMachineState *bmc)
+ static void fby35_i2c_init(AspeedMachineState *bmc)
+ {
+     AspeedSoCState *soc = bmc->soc;
+-    I2CBus *i2c[16];
+-
+-    for (int i = 0; i < 16; i++) {
+-        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
+-    }
+-
+-    i2c_slave_create_simple(i2c[2], TYPE_LM75, 0x4f);
+-    i2c_slave_create_simple(i2c[8], TYPE_TMP421, 0x1f);
+-    /* Hotswap controller is actually supposed to be mp5920 or ltc4282. */
+-    i2c_slave_create_simple(i2c[11], "adm1272", 0x44);
+-    i2c_slave_create_simple(i2c[12], TYPE_LM75, 0x4e);
+-    i2c_slave_create_simple(i2c[12], TYPE_LM75, 0x4f);
+-
+-    at24c_eeprom_init(i2c[4], 0x51, 128 * KiB);
+-    at24c_eeprom_init(i2c[6], 0x51, 128 * KiB);
+-    at24c_eeprom_init_rom(i2c[8], 0x50, 32 * KiB, fby35_nic_fruid,
+-                          fby35_nic_fruid_len);
+-    at24c_eeprom_init_rom(i2c[11], 0x51, 128 * KiB, fby35_bb_fruid,
+-                          fby35_bb_fruid_len);
+-    at24c_eeprom_init_rom(i2c[11], 0x54, 128 * KiB, fby35_bmc_fruid,
+-                          fby35_bmc_fruid_len);
+-
++    fby35_bmc_i2c_init(soc);
+     /*
+      * TODO: There is a multi-master i2c connection to an AST1030 MiniBMC on
+      * buses 0, 1, 2, 3, and 9. Source address 0x10, target address 0x20 on
+      * each.
+      */
+-    i2c_slave_create_simple(i2c[0], "fby35-sb-bic", 0x20);
+-    i2c_slave_create_simple(i2c[4], "fby35-sb-cpld", 0x0f);
++    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 0), "fby35-sb-bic", 0x20);
+ }
+ 
+ static void fbttn_i2c_init(AspeedMachineState *bmc)
+@@ -1554,27 +1532,9 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data)
+ static void fby35_reset(MachineState *state, ShutdownCause reason)
+ {
+     AspeedMachineState *bmc = ASPEED_MACHINE(state);
+-    AspeedGPIOState *gpio = &bmc->soc->gpio;
+ 
+     qemu_devices_reset(reason);
+-
+-    /* Board ID: 7 (Class-1, 4 slots) */
+-    object_property_set_bool(OBJECT(gpio), "gpioV4", true, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioV5", true, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioV6", true, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioV7", false, &error_fatal);
+-
+-    /* Slot presence pins, inverse polarity. (False means present) */
+-    object_property_set_bool(OBJECT(gpio), "gpioH4", false, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioH5", true, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioH6", true, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioH7", true, &error_fatal);
+-
+-    /* Slot 12v power pins, normal polarity. (True means powered-on) */
+-    object_property_set_bool(OBJECT(gpio), "gpioB2", true, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioB3", false, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioB4", false, &error_fatal);
+-    object_property_set_bool(OBJECT(gpio), "gpioB5", false, &error_fatal);
++    fby35_bmc_reset_gpios(bmc->soc);
+ }
+ 
+ static void aspeed_machine_fby35_class_init(ObjectClass *oc, void *data)
+diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c
+index 490f5d6e23..6acf5088be 100644
+--- a/hw/arm/fby35.c
++++ b/hw/arm/fby35.c
+@@ -9,6 +9,7 @@
+ #include "qemu/units.h"
+ #include "qapi/error.h"
+ #include "sysemu/sysemu.h"
++#include "sysemu/reset.h"
+ #include "sysemu/block-backend.h"
+ #include "hw/boards.h"
+ #include "hw/qdev-clock.h"
+@@ -17,6 +18,11 @@
+ #include "hw/arm/fby35.h"
+ #include "hw/i2c/i2c.h"
+ #include "hw/i2c/i2c_mux_pca954x.h"
++#include "hw/sensor/tmp105.h"
++#include "hw/nvram/eeprom_at24c.h"
++#include "hw/arm/aspeed_eeprom.h"
++
++#define TYPE_LM75 TYPE_TMP105
+ 
+ #define TYPE_FBY35 MACHINE_TYPE_NAME("fby35")
+ OBJECT_DECLARE_SIMPLE_TYPE(Fby35State, FBY35);
+@@ -39,6 +45,32 @@ struct Fby35State {
+ #define FBY35_BMC_RAM_SIZE (2 * GiB)
+ #define FBY35_BMC_FIRMWARE_ADDR 0x0
+ 
++static void fby35_cl_bic_i2c_init(AspeedSoCState *s)
++{
++    I2CBus *i2c[14];
++    I2CBus *ssd[8];
++
++    for (int i = 0; i < ARRAY_SIZE(i2c); i++) {
++        i2c[i] = aspeed_i2c_get_bus(&s->i2c, i);
++    }
++    pca954x_i2c_get_channels(i2c[1], 0x71, "pca9548", ssd);
++
++    for (int i = 0; i < ARRAY_SIZE(ssd); i++) {
++        i2c_slave_create_simple(ssd[i], "tmp105", 0x6a);
++    }
++
++    i2c_slave_create_simple(i2c[0], "fby35-sb-cpld", 0x21);
++    i2c_slave_create_simple(i2c[1], "tmp105", 0x48);
++    i2c_slave_create_simple(i2c[1], "tmp105", 0x49);
++    i2c_slave_create_simple(i2c[1], "tmp105", 0x4a);
++    i2c_slave_create_simple(i2c[1], "adm1272", 0x40);
++    i2c_slave_create_simple(i2c[1], "tmp421", 0x4c);
++    i2c_slave_create_simple(i2c[2], "intel-me", 0x16);
++    i2c_slave_create_simple(i2c[4], "isl69259", 0x76);
++    i2c_slave_create_simple(i2c[4], "isl69259", 0x62);
++    i2c_slave_create_simple(i2c[4], "isl69259", 0x60);
++}
++
+ static void fby35_bmc_write_boot_rom(DriveInfo *dinfo, MemoryRegion *mr,
+                                      hwaddr offset, size_t rom_size,
+                                      Error **errp)
+@@ -71,6 +103,34 @@ static void fby35_bmc_write_boot_rom(DriveInfo *dinfo, MemoryRegion *mr,
+     memcpy(memory_region_get_ram_ptr(mr) + offset, storage, rom_size);
+ }
+ 
++void fby35_bmc_i2c_init(AspeedSoCState *soc)
++{
++    I2CBus *i2c[16];
++
++    for (int i = 0; i < 16; i++) {
++        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
++    }
++
++    i2c_slave_create_simple(i2c[2], TYPE_LM75, 0x4f);
++    i2c_slave_create_simple(i2c[8], "tmp421", 0x1f);
++    /* Hotswap controller is actually supposed to be mp5920 or ltc4282. */
++    i2c_slave_create_simple(i2c[11], "adm1272", 0x44);
++    i2c_slave_create_simple(i2c[12], TYPE_LM75, 0x4e);
++    i2c_slave_create_simple(i2c[12], TYPE_LM75, 0x4f);
++
++    at24c_eeprom_init(i2c[4], 0x51, 128 * KiB);
++    at24c_eeprom_init(i2c[6], 0x51, 128 * KiB);
++
++    at24c_eeprom_init_rom(i2c[8], 0x50, 32 * KiB, fby35_nic_fruid,
++                          fby35_nic_fruid_len);
++    at24c_eeprom_init_rom(i2c[11], 0x51, 128 * KiB, fby35_bb_fruid,
++                          fby35_bb_fruid_len);
++    at24c_eeprom_init_rom(i2c[11], 0x54, 128 * KiB, fby35_bmc_fruid,
++                          fby35_bmc_fruid_len);
++
++    i2c_slave_create_simple(i2c[4], "fby35-sb-cpld", 0x0f);
++}
++
+ static void fby35_bmc_init(Fby35State *s)
+ {
+     AspeedSoCState *soc;
+@@ -115,6 +175,8 @@ static void fby35_bmc_init(Fby35State *s)
+                                      rom_size, &error_abort);
+         }
+     }
++
++    fby35_bmc_i2c_init(soc);
+ }
+ 
+ static void fby35_bic_init(Fby35State *s)
+@@ -139,6 +201,8 @@ static void fby35_bic_init(Fby35State *s)
+     aspeed_board_init_flashes(&soc->fmc, "sst25vf032b", 2, 2);
+     aspeed_board_init_flashes(&soc->spi[0], "sst25vf032b", 2, 4);
+     aspeed_board_init_flashes(&soc->spi[1], "sst25vf032b", 2, 6);
++
++    fby35_cl_bic_i2c_init(soc);
+ }
+ 
+ static void fby35_init(MachineState *machine)
+@@ -159,6 +223,36 @@ static void fby35_init(MachineState *machine)
+     fby35_bic_init(s);
+ }
+ 
++void fby35_bmc_reset_gpios(AspeedSoCState *s)
++{
++    AspeedGPIOState *gpio = &s->gpio;
++
++    /* Board ID: 7 (Class-1, 4 slots) */
++    object_property_set_bool(OBJECT(gpio), "gpioV4", true, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioV5", true, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioV6", true, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioV7", false, &error_fatal);
++
++    /* Slot presence pins, inverse polarity. (False means present) */
++    object_property_set_bool(OBJECT(gpio), "gpioH4", false, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioH5", true, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioH6", true, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioH7", true, &error_fatal);
++
++    /* Slot 12v power pins, normal polarity. (True means powered-on) */
++    object_property_set_bool(OBJECT(gpio), "gpioB2", true, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioB3", false, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioB4", false, &error_fatal);
++    object_property_set_bool(OBJECT(gpio), "gpioB5", false, &error_fatal);
++}
++
++static void fby35_reset(MachineState *machine, ShutdownCause reason)
++{
++    Fby35State *s = FBY35(machine);
++
++    qemu_devices_reset(reason);
++    fby35_bmc_reset_gpios(ASPEED_SOC(&s->bmc));
++}
+ 
+ static bool fby35_get_mmio_exec(Object *obj, Error **errp)
+ {
+@@ -184,6 +278,7 @@ static void fby35_class_init(ObjectClass *oc, void *data)
+     mc->no_floppy = 1;
+     mc->no_cdrom = 1;
+     mc->min_cpus = mc->max_cpus = mc->default_cpus = 3;
++    mc->reset = fby35_reset;
+ 
+     object_class_property_add_bool(oc, "execute-in-place",
+                                    fby35_get_mmio_exec,
+diff --git a/hw/arm/fby35.h b/hw/arm/fby35.h
+index 20bd43fbae..87cb1a10c2 100644
+--- a/hw/arm/fby35.h
++++ b/hw/arm/fby35.h
+@@ -142,4 +142,9 @@ static const uint8_t fby35_fruid_slot[] = {
+     0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ };
+ 
++typedef struct AspeedSoCState AspeedSoCState;
++
++void fby35_bmc_i2c_init(AspeedSoCState *s);
++void fby35_bmc_reset_gpios(AspeedSoCState *s);
++
+ #endif
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0525-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch b/common/recipes-devtools/qemu/qemu/0525-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch
new file mode 100644
index 000000000000..990f5f607a5c
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0525-fby35-Add-motherboard-fru-EEPROM-to-BIC.patch
@@ -0,0 +1,27 @@
+From 3bfd1c11c663fda9764b0f941c4f2ca801e24122 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Wed, 24 Aug 2022 17:51:06 -0700
+Subject: [PATCH 525/532] fby35: Add motherboard fru EEPROM to BIC
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/arm/fby35.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c
+index 6acf5088be..dd8cbd1c61 100644
+--- a/hw/arm/fby35.c
++++ b/hw/arm/fby35.c
+@@ -65,6 +65,9 @@ static void fby35_cl_bic_i2c_init(AspeedSoCState *s)
+     i2c_slave_create_simple(i2c[1], "tmp105", 0x4a);
+     i2c_slave_create_simple(i2c[1], "adm1272", 0x40);
+     i2c_slave_create_simple(i2c[1], "tmp421", 0x4c);
++
++    at24c_eeprom_init_rom(i2c[1], 0x54, 512, fby35_fruid_slot, sizeof(fby35_fruid_slot));
++
+     i2c_slave_create_simple(i2c[2], "intel-me", 0x16);
+     i2c_slave_create_simple(i2c[4], "isl69259", 0x76);
+     i2c_slave_create_simple(i2c[4], "isl69259", 0x62);
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0526-qemu-Add-i2c-devices-to-oby35-cl.patch b/common/recipes-devtools/qemu/qemu/0526-qemu-Add-i2c-devices-to-oby35-cl.patch
new file mode 100644
index 000000000000..002873b5bfb1
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0526-qemu-Add-i2c-devices-to-oby35-cl.patch
@@ -0,0 +1,66 @@
+From 76043bf8beaa7caed47cfc7d2002c91ee86a9025 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Fri, 26 Aug 2022 02:03:46 -0700
+Subject: [PATCH 526/532] qemu: Add i2c devices to oby35-cl
+
+Already had these from -machine fby35, so this commit just makes
+fby35_cl_bic_i2c_init public and uses it in aspeed.c and fby35.c
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+---
+ hw/arm/aspeed.c | 13 +------------
+ hw/arm/fby35.c  |  2 +-
+ hw/arm/fby35.h  |  1 +
+ 3 files changed, 3 insertions(+), 13 deletions(-)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index aa2d351a77..f8d5831086 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -1068,18 +1068,7 @@ static void create_unimplemented_i2c_device(I2CBus *bus, uint8_t addr)
+ static void oby35_cl_i2c_init(AspeedMachineState *bmc)
+ {
+     AspeedSoCState *soc = ASPEED_SOC(&bmc->soc);
+-    I2CBus *i2c[16];
+-
+-    for (int i = 0; i < 16; i++) {
+-        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
+-    }
+-
+-    create_unimplemented_i2c_device(i2c[1], 0x71);
+-    create_unimplemented_i2c_device(i2c[2], 0x16);
+-    create_unimplemented_i2c_device(i2c[2], 0x10);
+-    create_unimplemented_i2c_device(i2c[6], 0x20);
+-    create_unimplemented_i2c_device(i2c[7], 0x20);
+-    create_unimplemented_i2c_device(i2c[8], 0x20);
++    fby35_cl_bic_i2c_init(soc);
+ }
+ 
+ static void oby35_bb_i2c_init(AspeedMachineState *bmc)
+diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c
+index dd8cbd1c61..d0ed414b79 100644
+--- a/hw/arm/fby35.c
++++ b/hw/arm/fby35.c
+@@ -45,7 +45,7 @@ struct Fby35State {
+ #define FBY35_BMC_RAM_SIZE (2 * GiB)
+ #define FBY35_BMC_FIRMWARE_ADDR 0x0
+ 
+-static void fby35_cl_bic_i2c_init(AspeedSoCState *s)
++void fby35_cl_bic_i2c_init(AspeedSoCState *s)
+ {
+     I2CBus *i2c[14];
+     I2CBus *ssd[8];
+diff --git a/hw/arm/fby35.h b/hw/arm/fby35.h
+index 87cb1a10c2..0f8369f0fa 100644
+--- a/hw/arm/fby35.h
++++ b/hw/arm/fby35.h
+@@ -146,5 +146,6 @@ typedef struct AspeedSoCState AspeedSoCState;
+ 
+ void fby35_bmc_i2c_init(AspeedSoCState *s);
+ void fby35_bmc_reset_gpios(AspeedSoCState *s);
++void fby35_cl_bic_i2c_init(AspeedSoCState *s);
+ 
+ #endif
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0527-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch b/common/recipes-devtools/qemu/qemu/0527-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch
new file mode 100644
index 000000000000..ff033feceffa
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0527-hw-arm-aspeed-Don-t-initialize-fby35-bmc-GPIO-s.patch
@@ -0,0 +1,48 @@
+From 192be5d3404836d41233a6f5e946f456e820f50c Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@meta.com>
+Date: Sun, 18 Dec 2022 14:41:31 -0800
+Subject: [PATCH 527/532] hw/arm/aspeed: Don't initialize fby35-bmc GPIO's
+
+Initializing the GPIO's triggers slot sensor cache initialization in the
+boot sequence, which is extremely slow and annoying and doesn't succeed.
+
+Until we update the BMC's bic-cached setup to be less annoying, it's
+better to just not initialize these GPIO's.
+
+Signed-off-by: Peter Delevoryas <pdel@meta.com>
+---
+ hw/arm/aspeed.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index f8d5831086..def0acfb5c 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -1518,6 +1518,7 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data)
+         aspeed_soc_num_cpus(amc->soc_name);
+ }
+ 
++#if 0
+ static void fby35_reset(MachineState *state, ShutdownCause reason)
+ {
+     AspeedMachineState *bmc = ASPEED_MACHINE(state);
+@@ -1525,6 +1526,7 @@ static void fby35_reset(MachineState *state, ShutdownCause reason)
+     qemu_devices_reset(reason);
+     fby35_bmc_reset_gpios(bmc->soc);
+ }
++#endif
+ 
+ static void aspeed_machine_fby35_class_init(ObjectClass *oc, void *data)
+ {
+@@ -1532,7 +1534,7 @@ static void aspeed_machine_fby35_class_init(ObjectClass *oc, void *data)
+     AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
+ 
+     mc->desc       = "Facebook fby35 BMC (Cortex-A7)";
+-    mc->reset      = fby35_reset;
++    //mc->reset      = fby35_reset;
+     amc->fmc_model = "n25q00";
+     amc->num_cs    = 2;
+     amc->macs_mask = ASPEED_MAC3_ON;
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0528-aspeed-Add-grandteton-bmc.patch b/common/recipes-devtools/qemu/qemu/0528-aspeed-Add-grandteton-bmc.patch
new file mode 100644
index 000000000000..73d3d3d62f70
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0528-aspeed-Add-grandteton-bmc.patch
@@ -0,0 +1,36 @@
+From 64a4caf0c13fb48b1668c09514214ac49bbbb961 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <peter@pjd.dev>
+Date: Fri, 15 Jul 2022 14:34:49 -0700
+Subject: [PATCH 528/532] aspeed: Add grandteton-bmc
+
+Signed-off-by: Peter Delevoryas <peter@pjd.dev>
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/arm/aspeed.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index def0acfb5c..2ae13a047a 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -1994,6 +1994,17 @@ static const struct FBMachineData fb_machines[] = {
+         .stdout_path = ASPEED_DEV_UART5,
+         .ram_size    = 1 * GiB,
+     },
++    {
++        .name        = "grandteton-bmc",
++        .desc        = "Facebook GrandTeton BMC (Cortex-A7)",
++        .soc_name    = "ast2600-a3",
++        .hw_strap1   = AST2600_EVB_HW_STRAP1,
++        .hw_strap2   = AST2600_EVB_HW_STRAP2,
++        .flash_model = "n25q00",
++        .macs_mask   = ASPEED_MAC3_ON,
++        .stdout_path = ASPEED_DEV_UART5,
++        .ram_size    = FUJI_BMC_RAM_SIZE,
++    },
+     {
+         .parent      = MACHINE_TYPE_NAME("ast1030-evb"),
+         .name        = "oby35-cl",
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0529-aspeed-Add-greatlakes-bmc.patch b/common/recipes-devtools/qemu/qemu/0529-aspeed-Add-greatlakes-bmc.patch
new file mode 100644
index 000000000000..8721c8954fed
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0529-aspeed-Add-greatlakes-bmc.patch
@@ -0,0 +1,29 @@
+From 0b8423285275aabdafc15a1e650b0ea6c7160427 Mon Sep 17 00:00:00 2001
+From: Peter Delevoryas <pdel@fb.com>
+Date: Thu, 18 Aug 2022 16:10:19 -0700
+Subject: [PATCH 529/532] aspeed: Add greatlakes-bmc
+
+Signed-off-by: Peter Delevoryas <pdel@fb.com>
+---
+ hw/arm/aspeed.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 2ae13a047a..0c3e25b421 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -2005,6 +2005,11 @@ static const struct FBMachineData fb_machines[] = {
+         .stdout_path = ASPEED_DEV_UART5,
+         .ram_size    = FUJI_BMC_RAM_SIZE,
+     },
++    {
++        .parent      = MACHINE_TYPE_NAME("fby35-bmc"),
++        .name        = "greatlakes-bmc",
++        .desc        = "Facebook Great Lakes BMC (Cortex-A7)",
++    },
+     {
+         .parent      = MACHINE_TYPE_NAME("ast1030-evb"),
+         .name        = "oby35-cl",
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0530-aspeed-Add-Sandia.patch b/common/recipes-devtools/qemu/qemu/0530-aspeed-Add-Sandia.patch
new file mode 100644
index 000000000000..bf921ac8d3cb
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0530-aspeed-Add-Sandia.patch
@@ -0,0 +1,34 @@
+From 034fb070664c4d227c03b8b96640791b1347e89e Mon Sep 17 00:00:00 2001
+From: Bin Huang <binhuang@fb.com>
+Date: Tue, 13 Sep 2022 12:00:56 -0700
+Subject: [PATCH 530/532] aspeed: Add Sandia
+
+---
+ hw/arm/aspeed.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 0c3e25b421..6d8901f9d6 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -1827,6 +1827,17 @@ static const struct FBMachineData fb_machines[] = {
+         .stdout_path = ASPEED_DEV_UART1,
+         .ram_size    = FUJI_BMC_RAM_SIZE,
+     },
++    {
++        .name        = "sandia-bmc",
++        .desc        = "Facebook Sandia BMC (Cortex-A7)",
++        .soc_name    = "ast2600-a3",
++        .hw_strap1   = AST2600_EVB_HW_STRAP1,
++        .hw_strap2   = AST2600_EVB_HW_STRAP2,
++        .flash_model = "mx66l1g45g",
++        .macs_mask   = ASPEED_MAC3_ON,
++        .stdout_path = ASPEED_DEV_UART1,
++        .ram_size    = FUJI_BMC_RAM_SIZE,
++    },
+     {
+         .name        = "grandcanyon-bmc",
+         .desc        = "Facebook GrandCanyon BMC (Cortex-A7)",
+-- 
+2.43.0
+
diff --git a/common/recipes-devtools/qemu/qemu/0531-aspeed-add-montblanc-bmc-reference-from-fuji.patch b/common/recipes-devtools/qemu/qemu/0531-aspeed-add-montblanc-bmc-reference-from-fuji.patch
new file mode 100644
index 000000000000..ed7d9bfdb979
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0531-aspeed-add-montblanc-bmc-reference-from-fuji.patch
@@ -0,0 +1,193 @@
+From 552d7d1f91540a8d60451d9dd61eb33ee3cb4d47 Mon Sep 17 00:00:00 2001
+From: Sittisak Sinprem <ssinprem@celestica.com>
+Date: Mon, 8 May 2023 14:37:18 +0700
+Subject: [PATCH 531/532] aspeed add montblanc bmc reference from fuji
+
+- I2C list follow I2C Tree v1.6 20230320
+- fru eeprom data use FB FRU format version 4
+
+Signed-off-by: Sittisak Sinprem <ssinprem@celestica.com>
+---
+ hw/arm/aspeed.c        | 63 ++++++++++++++++++++++++++++++++++++++++++
+ hw/arm/aspeed_eeprom.c | 49 ++++++++++++++++++++++++++++++++
+ hw/arm/aspeed_eeprom.h |  7 +++++
+ 3 files changed, 119 insertions(+)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 6d8901f9d6..95fc35fd4c 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -191,6 +191,10 @@ struct AspeedMachineState {
+ #define FUJI_BMC_HW_STRAP1    0x00000000
+ #define FUJI_BMC_HW_STRAP2    0x00000000
+ 
++/* Montblanc hardware value */
++#define MONTBLANC_BMC_HW_STRAP1    0x00000000
++#define MONTBLANC_BMC_HW_STRAP2    0x00000000
++
+ /* Bletchley hardware value */
+ /* TODO: Leave same as EVB for now. */
+ #define BLETCHLEY_BMC_HW_STRAP1 AST2600_EVB_HW_STRAP1
+@@ -930,6 +934,39 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
+     }
+ }
+ 
++static void montblanc_bmc_i2c_init(AspeedMachineState *bmc)
++{
++    AspeedSoCState *soc = bmc->soc;
++    I2CBus *i2c[16] = {};
++
++    for (int i = 0; i < 16; i++) {
++        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
++    }
++
++    /* Ref from Minipack3_I2C_Tree_V1.6 20230320 */
++    at24c_eeprom_init_rom(i2c[3], 0x56, 8 * KiB, montblanc_scm_fruid, montblanc_scm_fruid_len);
++    at24c_eeprom_init_rom(i2c[6], 0x53, 8 * KiB, montblanc_fcm_fruid, montblanc_fcm_fruid_len);
++
++    /* CPLD and FPGA */
++    at24c_eeprom_init(i2c[1], 0x35, 256);  /* SCM CPLD */
++    at24c_eeprom_init(i2c[5], 0x35, 256);  /* COMe CPLD TODO: need to update */
++    at24c_eeprom_init(i2c[12], 0x60, 256); /* MCB PWR CPLD */
++    at24c_eeprom_init(i2c[13], 0x35, 256); /* IOB FPGA */
++
++    /* on BMC board */
++    at24c_eeprom_init_rom(i2c[8], 0x51, 8 * KiB, montblanc_bmc_fruid, montblanc_bmc_fruid_len); /* BMC EEPROM */
++    i2c_slave_create_simple(i2c[8], TYPE_LM75, 0x48); /* Thermal Sensor */
++
++    /* COMe Sensor/EEPROM */
++    at24c_eeprom_init(i2c[0], 0x56, 16 * KiB);          /* FRU EEPROM */
++    i2c_slave_create_simple(i2c[0], TYPE_LM75, 0x48); /* INLET Sensor */
++    i2c_slave_create_simple(i2c[0], TYPE_LM75, 0x4A); /* OUTLET Sensor */
++
++    /* It expects a pca9555 but a pca9552 is compatible */
++    create_pca9552(soc, 4, 0x27);
++}
++
++
+ static void wedge100_i2c_init(AspeedMachineState *bmc)
+ {
+     AspeedSoCState *soc = ASPEED_SOC(&bmc->soc);
+@@ -1497,6 +1534,28 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)
+         aspeed_soc_num_cpus(amc->soc_name);
+ };
+ 
++#define MONTBLANC_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)
++
++static void aspeed_machine_montblanc_class_init(ObjectClass *oc, void *data)
++{
++    MachineClass *mc = MACHINE_CLASS(oc);
++    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
++
++    mc->desc = "Facebook Montblanc BMC (Cortex-A7)";
++    amc->soc_name = "ast2600-a3";
++    amc->hw_strap1 = MONTBLANC_BMC_HW_STRAP1;
++    amc->hw_strap2 = MONTBLANC_BMC_HW_STRAP2;
++    amc->fmc_model = "mx66l1g45g";
++    amc->spi_model = "mx66l1g45g";
++    amc->num_cs = 2;
++    amc->macs_mask = ASPEED_MAC3_ON;
++    amc->i2c_init = montblanc_bmc_i2c_init;
++    amc->uart_default = ASPEED_DEV_UART1;
++    mc->default_ram_size = MONTBLANC_BMC_RAM_SIZE;
++    mc->default_cpus = mc->min_cpus = mc->max_cpus =
++        aspeed_soc_num_cpus(amc->soc_name);
++};
++
+ #define BLETCHLEY_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)
+ 
+ static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data)
+@@ -1734,6 +1793,10 @@ static const TypeInfo aspeed_machine_types[] = {
+         .name          = MACHINE_TYPE_NAME("fuji-bmc"),
+         .parent        = TYPE_ASPEED_MACHINE,
+         .class_init    = aspeed_machine_fuji_class_init,
++    }, {
++        .name          = MACHINE_TYPE_NAME("montblanc-bmc"),
++        .parent        = TYPE_ASPEED_MACHINE,
++        .class_init    = aspeed_machine_montblanc_class_init,
+     }, {
+         .name          = MACHINE_TYPE_NAME("bletchley-bmc"),
+         .parent        = TYPE_ASPEED_MACHINE,
+diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c
+index ace5266cec..432bea62bf 100644
+--- a/hw/arm/aspeed_eeprom.c
++++ b/hw/arm/aspeed_eeprom.c
+@@ -161,6 +161,52 @@ const uint8_t rainier_bmc_fruid[] = {
+     0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+ };
+ 
++const uint8_t montblanc_scm_fruid[8192] = {
++    0xfb, 0xfb, 0x04, 0xff, 0x01, 0x0d, 0x4d, 0x49, 0x4e, 0x49, 0x50, 0x41,
++    0x43, 0x4b, 0x33, 0x5f, 0x53, 0x43, 0x4d, 0x02, 0x08, 0x32, 0x30, 0x30,
++    0x30, 0x32, 0x39, 0x34, 0x35, 0x04, 0x0c, 0x31, 0x33, 0x32, 0x30, 0x30,
++    0x30, 0x31, 0x36, 0x34, 0x30, 0x31, 0x20, 0x05, 0x0c, 0x31, 0x33, 0x31,
++    0x30, 0x30, 0x30, 0x31, 0x32, 0x37, 0x30, 0x31, 0x20, 0x06, 0x0c, 0x52,
++    0x33, 0x32, 0x31, 0x34, 0x47, 0x30, 0x30, 0x30, 0x33, 0x30, 0x31, 0x07,
++    0x0d, 0x41, 0x30, 0x33, 0x31, 0x33, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x08, 0x01, 0x01, 0x09, 0x01, 0x00, 0x0a, 0x01, 0x00, 0x0b,
++    0x0d, 0x4d, 0x32, 0x32, 0x31, 0x33, 0x32, 0x33, 0x31, 0x37, 0x30, 0x30,
++    0x30, 0x32, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30, 0x32,
++    0x33, 0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f, 0x03,
++    0x43, 0x54, 0x48, 0x10, 0x06, 0x01, 0x00, 0x00, 0x91, 0xdb, 0xb4, 0x13,
++    0x03, 0x53, 0x43, 0x4d, 0xfa, 0x02, 0x02, 0x61,
++};
++
++const uint8_t montblanc_fcm_fruid[8192] = {
++    0xfb, 0xfb, 0x04, 0xff, 0x01, 0x0d, 0x4d, 0x49, 0x4e, 0x49, 0x50, 0x41,
++    0x43, 0x4b, 0x33, 0x5f, 0x46, 0x43, 0x42, 0x02, 0x08, 0x33, 0x30, 0x30,
++    0x30, 0x30, 0x31, 0x36, 0x31, 0x04, 0x0c, 0x31, 0x33, 0x32, 0x30, 0x30,
++    0x30, 0x31, 0x36, 0x33, 0x30, 0x31, 0x20, 0x05, 0x0c, 0x31, 0x33, 0x31,
++    0x30, 0x30, 0x30, 0x31, 0x33, 0x30, 0x30, 0x31, 0x20, 0x06, 0x0c, 0x52,
++    0x33, 0x32, 0x31, 0x34, 0x47, 0x30, 0x30, 0x31, 0x32, 0x30, 0x31, 0x07,
++    0x0d, 0x41, 0x31, 0x32, 0x31, 0x32, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x08, 0x01, 0x01, 0x09, 0x01, 0x00, 0x0a, 0x01, 0x00, 0x0b,
++    0x0d, 0x46, 0x35, 0x30, 0x31, 0x33, 0x32, 0x33, 0x31, 0x37, 0x30, 0x30,
++    0x30, 0x35, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30, 0x32,
++    0x33, 0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f, 0x03,
++    0x43, 0x54, 0x48, 0x10, 0x06, 0x02, 0x00, 0x00, 0x91, 0xdb, 0xb4, 0x11,
++    0x06, 0x03, 0x00, 0x00, 0x91, 0xdb, 0xb4, 0x12, 0x02, 0x8a, 0x00, 0x13,
++    0x03, 0x46, 0x43, 0x42, 0xfa, 0x02, 0x50, 0x47,
++};
++
++const uint8_t montblanc_bmc_fruid[8192] = {
++    0xfb, 0xfb, 0x04, 0xff, 0x01, 0x0d, 0x4d, 0x49, 0x4e, 0x49, 0x50, 0x41,
++    0x43, 0x4b, 0x33, 0x5f, 0x42, 0x4d, 0x43, 0x04, 0x0c, 0x31, 0x33, 0x32,
++    0x30, 0x30, 0x30, 0x31, 0x33, 0x36, 0x30, 0x31, 0x20, 0x05, 0x0c, 0x31,
++    0x33, 0x31, 0x30, 0x30, 0x30, 0x30, 0x38, 0x36, 0x30, 0x35, 0x20, 0x06,
++    0x0c, 0x52, 0x33, 0x30, 0x39, 0x37, 0x47, 0x30, 0x30, 0x30, 0x32, 0x30,
++    0x37, 0x07, 0x0d, 0x42, 0x30, 0x32, 0x37, 0x34, 0x58, 0x58, 0x58, 0x58,
++    0x58, 0x58, 0x58, 0x58, 0x08, 0x01, 0x04, 0x09, 0x01, 0x00, 0x0a, 0x01,
++    0x00, 0x0c, 0x03, 0x43, 0x4c, 0x53, 0x0d, 0x08, 0x32, 0x30, 0x32, 0x33,
++    0x30, 0x35, 0x30, 0x31, 0x0e, 0x03, 0x57, 0x55, 0x53, 0x0f, 0x03, 0x43,
++    0x54, 0x48, 0x13, 0x03, 0x42, 0x4d, 0x43, 0xfa, 0x02, 0xef, 0xba,
++};
++
+ const size_t tiogapass_bmc_fruid_len = sizeof(tiogapass_bmc_fruid);
+ const size_t fby35_nic_fruid_len = sizeof(fby35_nic_fruid);
+ const size_t fby35_bb_fruid_len = sizeof(fby35_bb_fruid);
+@@ -168,3 +214,6 @@ const size_t fby35_bmc_fruid_len = sizeof(fby35_bmc_fruid);
+ const size_t yosemitev2_bmc_fruid_len = sizeof(yosemitev2_bmc_fruid);
+ const size_t rainier_bb_fruid_len = sizeof(rainier_bb_fruid);
+ const size_t rainier_bmc_fruid_len = sizeof(rainier_bmc_fruid);
++const size_t montblanc_scm_fruid_len = sizeof(montblanc_scm_fruid);
++const size_t montblanc_fcm_fruid_len = sizeof(montblanc_fcm_fruid);
++const size_t montblanc_bmc_fruid_len = sizeof(montblanc_bmc_fruid);
+diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h
+index bbf9e54365..b8fbdd0734 100644
+--- a/hw/arm/aspeed_eeprom.h
++++ b/hw/arm/aspeed_eeprom.h
+@@ -27,4 +27,11 @@ extern const size_t rainier_bb_fruid_len;
+ extern const uint8_t rainier_bmc_fruid[];
+ extern const size_t rainier_bmc_fruid_len;
+ 
++extern const uint8_t montblanc_scm_fruid[];
++extern const uint8_t montblanc_fcm_fruid[];
++extern const uint8_t montblanc_bmc_fruid[];
++extern const size_t montblanc_scm_fruid_len;
++extern const size_t montblanc_fcm_fruid_len;
++extern const size_t montblanc_bmc_fruid_len;
++
+ #endif
+-- 
+2.25.1
+
diff --git a/common/recipes-devtools/qemu/qemu/0532-aspeed-add-janga-bmc.patch b/common/recipes-devtools/qemu/qemu/0532-aspeed-add-janga-bmc.patch
new file mode 100644
index 000000000000..8bb48fcbecb1
--- /dev/null
+++ b/common/recipes-devtools/qemu/qemu/0532-aspeed-add-janga-bmc.patch
@@ -0,0 +1,146 @@
+From 1d5c00f5d1f00fb52407ef226c82ae07bb44f00f Mon Sep 17 00:00:00 2001
+From: Tao Ren <taoren@meta.com>
+Date: Mon, 10 Jul 2023 16:47:00 +0700
+Subject: [PATCH 532/532] aspeed: add janga bmc
+
+Signed-off-by: Tao Ren <taoren@meta.com>
+---
+ hw/arm/aspeed.c        | 54 ++++++++++++++++++++++++++++++++++++++++++
+ hw/arm/aspeed_eeprom.c | 18 ++++++++++++++
+ hw/arm/aspeed_eeprom.h |  3 +++
+ 3 files changed, 75 insertions(+)
+
+diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
+index 95fc35fd4c..d7cb391997 100644
+--- a/hw/arm/aspeed.c
++++ b/hw/arm/aspeed.c
+@@ -195,6 +195,10 @@ struct AspeedMachineState {
+ #define MONTBLANC_BMC_HW_STRAP1    0x00000000
+ #define MONTBLANC_BMC_HW_STRAP2    0x00000000
+ 
++/* Janga hardware value */
++#define JANGA_BMC_HW_STRAP1    0x00000000
++#define JANGA_BMC_HW_STRAP2    0x00000000
++
+ /* Bletchley hardware value */
+ /* TODO: Leave same as EVB for now. */
+ #define BLETCHLEY_BMC_HW_STRAP1 AST2600_EVB_HW_STRAP1
+@@ -966,6 +970,30 @@ static void montblanc_bmc_i2c_init(AspeedMachineState *bmc)
+     create_pca9552(soc, 4, 0x27);
+ }
+ 
++static void janga_bmc_i2c_init(AspeedMachineState *bmc)
++{
++    AspeedSoCState *soc = bmc->soc;
++    I2CBus *i2c[16] = {};
++
++    for (int i = 0; i < 16; i++) {
++        i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
++    }
++
++    at24c_eeprom_init_rom(i2c[3], 0x56, 8 * KiB, janga_smb_fruid, janga_smb_fruid_len); /* SMB_2 EEPROM */
++
++    /* CPLD and FPGA */
++    at24c_eeprom_init(i2c[1], 0x35, 256);  /* SMB_CPLD_1 aka SCM_CPLD */
++    at24c_eeprom_init(i2c[4], 0x35, 256);  /* COMe CPLD TODO: need to update */
++    at24c_eeprom_init(i2c[6], 0x35, 256); /* FCB#1 CPLD TODO: need to update*/
++    at24c_eeprom_init(i2c[2], 0x35, 256); /* FCB#2 CPLD TODO: need to update*/
++    at24c_eeprom_init(i2c[12], 0x60, 256); /* PWR_CPLD */
++    at24c_eeprom_init(i2c[13], 0x35, 256); /* IOB FPGA */
++
++    /* COMe Sensor/EEPROM */
++    at24c_eeprom_init(i2c[0], 0x56, 16 * KiB);          /* FRU EEPROM */
++    i2c_slave_create_simple(i2c[0], TYPE_LM75, 0x48); /* INLET Sensor */
++    i2c_slave_create_simple(i2c[0], TYPE_LM75, 0x4A); /* OUTLET Sensor */
++}
+ 
+ static void wedge100_i2c_init(AspeedMachineState *bmc)
+ {
+@@ -1556,6 +1584,28 @@ static void aspeed_machine_montblanc_class_init(ObjectClass *oc, void *data)
+         aspeed_soc_num_cpus(amc->soc_name);
+ };
+ 
++#define JANGA_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)
++
++static void aspeed_machine_janga_class_init(ObjectClass *oc, void *data)
++{
++    MachineClass *mc = MACHINE_CLASS(oc);
++    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
++
++    mc->desc = "Facebook Janga BMC (Cortex-A7)";
++    amc->soc_name = "ast2600-a3";
++    amc->hw_strap1 = JANGA_BMC_HW_STRAP1;
++    amc->hw_strap2 = JANGA_BMC_HW_STRAP2;
++    amc->fmc_model = "mx66l1g45g";
++    amc->spi_model = "mx66l1g45g";
++    amc->num_cs = 2;
++    amc->macs_mask = ASPEED_MAC3_ON;
++    amc->i2c_init = janga_bmc_i2c_init;
++    amc->uart_default = ASPEED_DEV_UART1;
++    mc->default_ram_size = JANGA_BMC_RAM_SIZE;
++    mc->default_cpus = mc->min_cpus = mc->max_cpus =
++        aspeed_soc_num_cpus(amc->soc_name);
++};
++
+ #define BLETCHLEY_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)
+ 
+ static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data)
+@@ -1797,6 +1847,10 @@ static const TypeInfo aspeed_machine_types[] = {
+         .name          = MACHINE_TYPE_NAME("montblanc-bmc"),
+         .parent        = TYPE_ASPEED_MACHINE,
+         .class_init    = aspeed_machine_montblanc_class_init,
++    }, {
++        .name          = MACHINE_TYPE_NAME("janga-bmc"),
++        .parent        = TYPE_ASPEED_MACHINE,
++        .class_init    = aspeed_machine_janga_class_init,
+     }, {
+         .name          = MACHINE_TYPE_NAME("bletchley-bmc"),
+         .parent        = TYPE_ASPEED_MACHINE,
+diff --git a/hw/arm/aspeed_eeprom.c b/hw/arm/aspeed_eeprom.c
+index 432bea62bf..1e8ad7f768 100644
+--- a/hw/arm/aspeed_eeprom.c
++++ b/hw/arm/aspeed_eeprom.c
+@@ -207,6 +207,23 @@ const uint8_t montblanc_bmc_fruid[8192] = {
+     0x54, 0x48, 0x13, 0x03, 0x42, 0x4d, 0x43, 0xfa, 0x02, 0xef, 0xba,
+ };
+ 
++const uint8_t janga_smb_fruid[] = {
++    0xFB, 0xFB, 0x04, 0xFF, 0x01, 0x05, 0x4A, 0x41, 0x4E, 0x47, 0x41, 0x02,
++    0x09, 0x32, 0x30, 0x2D, 0x31, 0x30, 0x30, 0x30, 0x31, 0x36, 0x03, 0x08,
++    0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x04, 0x0C, 0x31, 0x33,
++    0x32, 0x31, 0x30, 0x30, 0x30, 0x30, 0x35, 0x20, 0x20, 0x20, 0x05, 0x0C,
++    0x31, 0x33, 0x31, 0x31, 0x30, 0x30, 0x30, 0x30, 0x34, 0x20, 0x20, 0x20,
++    0x06, 0x0C, 0x52, 0x34, 0x30, 0x35, 0x34, 0x47, 0x30, 0x30, 0x30, 0x32,
++    0x30, 0x31, 0x07, 0x0D, 0x42, 0x30, 0x39, 0x31, 0x37, 0x32, 0x30, 0x34,
++    0x35, 0x30, 0x30, 0x32, 0x33, 0x08, 0x01, 0x01, 0x09, 0x01, 0x01, 0x0A,
++    0x01, 0x01, 0x0B, 0x08, 0x44, 0x55, 0x4D, 0x4D, 0x59, 0x20, 0x53, 0x4E,
++    0x0C, 0x03, 0x43, 0x4C, 0x53, 0x0D, 0x08, 0x32, 0x30, 0x32, 0x33, 0x30,
++    0x38, 0x32, 0x38, 0x0E, 0x03, 0x57, 0x55, 0x53, 0x0F, 0x03, 0x43, 0x54,
++    0x48, 0x10, 0x06, 0x01, 0x12, 0xFF, 0x91, 0xDB, 0xB4, 0x11, 0x06, 0x03,
++    0x12, 0xFF, 0x91, 0xDB, 0xB4, 0x12, 0x02, 0x65, 0x00, 0x13, 0x03, 0x53,
++    0x4D, 0x42, 0xFA, 0x02, 0x93, 0xBC,
++};
++
+ const size_t tiogapass_bmc_fruid_len = sizeof(tiogapass_bmc_fruid);
+ const size_t fby35_nic_fruid_len = sizeof(fby35_nic_fruid);
+ const size_t fby35_bb_fruid_len = sizeof(fby35_bb_fruid);
+@@ -217,3 +234,4 @@ const size_t rainier_bmc_fruid_len = sizeof(rainier_bmc_fruid);
+ const size_t montblanc_scm_fruid_len = sizeof(montblanc_scm_fruid);
+ const size_t montblanc_fcm_fruid_len = sizeof(montblanc_fcm_fruid);
+ const size_t montblanc_bmc_fruid_len = sizeof(montblanc_bmc_fruid);
++const size_t janga_smb_fruid_len = sizeof(janga_smb_fruid);
+diff --git a/hw/arm/aspeed_eeprom.h b/hw/arm/aspeed_eeprom.h
+index b8fbdd0734..6ac1557b32 100644
+--- a/hw/arm/aspeed_eeprom.h
++++ b/hw/arm/aspeed_eeprom.h
+@@ -34,4 +34,7 @@ extern const size_t montblanc_scm_fruid_len;
+ extern const size_t montblanc_fcm_fruid_len;
+ extern const size_t montblanc_bmc_fruid_len;
+ 
++extern const uint8_t janga_smb_fruid[];
++extern const size_t janga_smb_fruid_len;
++
+ #endif
+-- 
+2.25.1
+
diff --git a/common/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.c b/common/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.c
index acd83da26f24..44a7c1950a7c 100644
--- a/common/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.c
+++ b/common/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.c
@@ -359,6 +359,30 @@ int i2c_dev_sysfs_data_init(struct i2c_client *client,
 }
 EXPORT_SYMBOL_GPL(i2c_dev_sysfs_data_init);
 
+static void i2c_dev_sysfs_clean_cb(void *args)
+{
+  struct i2c_client *client = args;
+  i2c_dev_data_st *data = i2c_get_clientdata(client);
+
+  i2c_dev_sysfs_data_clean(client, data);
+}
+
+int devm_i2c_dev_sysfs_init(struct i2c_client *client,
+                            i2c_dev_data_st *data,
+                            const i2c_dev_attr_st *dev_attrs,
+                            int n_attrs)
+{
+  int err;
+
+  err = i2c_dev_sysfs_data_init(client, data, dev_attrs, n_attrs);
+  if (err)
+    return err;
+
+  return devm_add_action_or_reset(&client->dev, i2c_dev_sysfs_clean_cb,
+                                  client);
+}
+EXPORT_SYMBOL_GPL(devm_i2c_dev_sysfs_init);
+
 
 MODULE_AUTHOR("Tian Fang <tfang@fb.com>");
 MODULE_DESCRIPTION("i2c device sysfs attribute library");
diff --git a/common/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.h b/common/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.h
index 78f4b38d2879..a38e00b875a3 100644
--- a/common/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.h
+++ b/common/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.h
@@ -82,4 +82,13 @@ ssize_t i2c_dev_show_ascii(struct device *dev,
                            struct device_attribute *attr,
                            char *buf);
 
+/*
+ * "devres" version of i2c_dev_sysfs_data_init(): i2c_dev_sysfs_data_clean()
+ * will be automatically called when the driver is detached from device.
+ */
+int devm_i2c_dev_sysfs_init(struct i2c_client *client,
+                            i2c_dev_data_st *data,
+                            const i2c_dev_attr_st *dev_attrs,
+                            int n_attrs);
+
 #endif
diff --git a/common/recipes-kernel/linux/6.6/0001-ARM-dts-aspeed-Remove-eMMC-from-ast2600-facebook-net.patch b/common/recipes-kernel/linux/6.6/0001-ARM-dts-aspeed-Remove-eMMC-from-ast2600-facebook-net.patch
new file mode 100644
index 000000000000..7cd9e584efa5
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0001-ARM-dts-aspeed-Remove-eMMC-from-ast2600-facebook-net.patch
@@ -0,0 +1,43 @@
+From d34a1a64d55eddea50c5e29d42d158921277f695 Mon Sep 17 00:00:00 2001
+From: Tao Ren <taoren@meta.com>
+Date: Fri, 2 Feb 2024 16:55:06 -0800
+Subject: [PATCH 1/5] ARM: dts: aspeed: Remove eMMC from
+ ast2600-facebook-netbmc-common.dtsi
+
+Summary:
+
+Remove eMMC device entries from ast2600-facebook-netbmc-common.dtsi
+because eMMC will be removed from future Meta/Facebook AST2600 network
+OpenBMC platforms.
+
+Test Plan:
+---
+ .../dts/aspeed/ast2600-facebook-netbmc-common.dtsi   | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
+index 31590d3186a2..804a6c8a6292 100644
+--- a/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
++++ b/arch/arm/boot/dts/aspeed/ast2600-facebook-netbmc-common.dtsi
+@@ -152,18 +152,6 @@ &vhub {
+ 	status = "okay";
+ };
+ 
+-&emmc_controller {
+-	status = "okay";
+-};
+-
+-&emmc {
+-	status = "okay";
+-
+-	non-removable;
+-	max-frequency = <25000000>;
+-	bus-width = <4>;
+-};
+-
+ &rtc {
+ 	status = "okay";
+ };
+-- 
+2.43.0
+
diff --git a/common/recipes-kernel/linux/6.6/0002-ARM-dts-aspeed-elbert-Enable-eMMC-device.patch b/common/recipes-kernel/linux/6.6/0002-ARM-dts-aspeed-elbert-Enable-eMMC-device.patch
new file mode 100644
index 000000000000..2011d03c992d
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0002-ARM-dts-aspeed-elbert-Enable-eMMC-device.patch
@@ -0,0 +1,35 @@
+From 667a37fea390e438ace088cb40d806071ff0f5a2 Mon Sep 17 00:00:00 2001
+From: Tao Ren <taoren@meta.com>
+Date: Fri, 2 Feb 2024 16:57:17 -0800
+Subject: [PATCH 2/5] ARM: dts: aspeed: elbert: Enable eMMC device
+
+Summary:
+
+Test Plan:
+---
+ .../boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts   | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
+index 74f3c67e0eff..ff1009ea1c49 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts
+@@ -201,3 +201,15 @@ fixed-link {
+ 		full-duplex;
+ 	};
+ };
++
++&emmc_controller {
++	status = "okay";
++};
++
++&emmc {
++	status = "okay";
++
++	non-removable;
++	max-frequency = <25000000>;
++	bus-width = <4>;
++};
+-- 
+2.43.0
+
diff --git a/common/recipes-kernel/linux/6.6/0003-ARM-dts-aspeed-fuji-Enable-eMMC-device.patch b/common/recipes-kernel/linux/6.6/0003-ARM-dts-aspeed-fuji-Enable-eMMC-device.patch
new file mode 100644
index 000000000000..7c1d40bda27b
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0003-ARM-dts-aspeed-fuji-Enable-eMMC-device.patch
@@ -0,0 +1,43 @@
+From 6c50b36cc5400dfe283ec400d6197c30e689878a Mon Sep 17 00:00:00 2001
+From: Tao Ren <taoren@meta.com>
+Date: Fri, 2 Feb 2024 16:58:06 -0800
+Subject: [PATCH 3/5] ARM: dts: aspeed: fuji: Enable eMMC device
+
+Summary:
+
+Test Plan:
+
+Reviewers:
+
+Subscribers:
+
+Tasks:
+
+Tags:
+---
+ .../arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
+index f23c26a3441d..8602ede3ec7e 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts
+@@ -1249,3 +1249,15 @@ &mac3 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_rgmii4_default>;
+ };
++
++&emmc_controller {
++	status = "okay";
++};
++
++&emmc {
++	status = "okay";
++
++	non-removable;
++	max-frequency = <25000000>;
++	bus-width = <4>;
++};
+-- 
+2.43.0
+
diff --git a/common/recipes-kernel/linux/6.6/0004-ARM-dts-aspeed-remove-cloudripper-dts.patch b/common/recipes-kernel/linux/6.6/0004-ARM-dts-aspeed-remove-cloudripper-dts.patch
new file mode 100644
index 000000000000..8bdc5186c57d
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0004-ARM-dts-aspeed-remove-cloudripper-dts.patch
@@ -0,0 +1,581 @@
+From 37017972a16f86ab8a869beca978a5ba85fd047f Mon Sep 17 00:00:00 2001
+From: Tao Ren <taoren@meta.com>
+Date: Sun, 4 Feb 2024 14:11:21 -0800
+Subject: [PATCH 4/5] ARM: dts: aspeed: remove cloudripper dts
+
+Summary:
+
+The dts file is not being used.
+
+Test Plan:
+---
+ arch/arm/boot/dts/aspeed/Makefile             |   1 -
+ .../aspeed-bmc-facebook-cloudripper.dts       | 544 ------------------
+ 2 files changed, 545 deletions(-)
+ delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts
+
+diff --git a/arch/arm/boot/dts/aspeed/Makefile b/arch/arm/boot/dts/aspeed/Makefile
+index fb9cc95f1b60..99980bdb2f16 100644
+--- a/arch/arm/boot/dts/aspeed/Makefile
++++ b/arch/arm/boot/dts/aspeed/Makefile
+@@ -16,7 +16,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
+ 	aspeed-bmc-bytedance-g220a.dtb \
+ 	aspeed-bmc-delta-ahe50dc.dtb \
+ 	aspeed-bmc-facebook-bletchley.dtb \
+-	aspeed-bmc-facebook-cloudripper.dtb \
+ 	aspeed-bmc-facebook-cmm.dtb \
+ 	aspeed-bmc-facebook-elbert.dtb \
+ 	aspeed-bmc-facebook-fuji.dtb \
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts
+deleted file mode 100644
+index d49328fa487a..000000000000
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts
++++ /dev/null
+@@ -1,544 +0,0 @@
+-// SPDX-License-Identifier: GPL-2.0+
+-// Copyright (c) 2020 Facebook Inc.
+-
+-/dts-v1/;
+-
+-#include <dt-bindings/leds/common.h>
+-#include "ast2600-facebook-netbmc-common.dtsi"
+-
+-/ {
+-	model = "Facebook Cloudripper BMC";
+-	compatible = "facebook,cloudripper-bmc", "aspeed,ast2600";
+-
+-	aliases {
+-		/*
+-		 * PCA9548 (1-0070) provides 8 channels connecting to
+-		 * SMB (Switch Main Board).
+-		 */
+-		i2c16 = &imux16;
+-		i2c17 = &imux17;
+-		i2c18 = &imux18;
+-		i2c19 = &imux19;
+-		i2c20 = &imux20;
+-		i2c21 = &imux21;
+-		i2c22 = &imux22;
+-		i2c23 = &imux23;
+-
+-		/*
+-		 * PCA9548 (2-0070) provides 8 channels connecting to
+-		 * SCM (System Controller Module).
+-		 */
+-		i2c24 = &imux24;
+-		i2c25 = &imux25;
+-		i2c26 = &imux26;
+-		i2c27 = &imux27;
+-		i2c28 = &imux28;
+-		i2c29 = &imux29;
+-		i2c30 = &imux30;
+-		i2c31 = &imux31;
+-
+-		/*
+-		 * PCA9548 (3-0070) provides 8 channels connecting to
+-		 * SMB (Switch Main Board).
+-		 */
+-		i2c32 = &imux32;
+-		i2c33 = &imux33;
+-		i2c34 = &imux34;
+-		i2c35 = &imux35;
+-		i2c36 = &imux36;
+-		i2c37 = &imux37;
+-		i2c38 = &imux38;
+-		i2c39 = &imux39;
+-
+-		/*
+-		 * PCA9548 (8-0070) provides 8 channels connecting to
+-		 * PDB (Power Delivery Board).
+-		 */
+-		i2c40 = &imux40;
+-		i2c41 = &imux41;
+-		i2c42 = &imux42;
+-		i2c43 = &imux43;
+-		i2c44 = &imux44;
+-		i2c45 = &imux45;
+-		i2c46 = &imux46;
+-		i2c47 = &imux47;
+-
+-		/*
+-		 * PCA9548 (15-0076) provides 8 channels connecting to
+-		 * FCM (Fan Controller Module).
+-		 */
+-		i2c48 = &imux48;
+-		i2c49 = &imux49;
+-		i2c50 = &imux50;
+-		i2c51 = &imux51;
+-		i2c52 = &imux52;
+-		i2c53 = &imux53;
+-		i2c54 = &imux54;
+-		i2c55 = &imux55;
+-	};
+-
+-	spi_gpio: spi {
+-		num-chipselects = <2>;
+-		cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>,
+-			   <&gpio0 ASPEED_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
+-
+-		eeprom@1 {
+-			compatible = "atmel,at93c46d";
+-			spi-max-frequency = <250000>;
+-			data-size = <16>;
+-			spi-cs-high;
+-			reg = <1>;
+-		};
+-	};
+-};
+-
+-&ehci1 {
+-	status = "okay";
+-};
+-
+-/*
+- * "mdio1" is connected to the MDC/MDIO interface of the on-board
+- * management switch (whose ports are connected to BMC, Host and front
+- * panel ethernet port).
+- */
+-&mdio1 {
+-	status = "okay";
+-};
+-
+-&mdio3 {
+-	status = "okay";
+-
+-	ethphy1: ethernet-phy@13 {
+-		compatible = "ethernet-phy-ieee802.3-c22";
+-		reg = <0x0d>;
+-	};
+-};
+-
+-&mac3 {
+-	status = "okay";
+-	phy-mode = "rgmii";
+-	phy-handle = <&ethphy1>;
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&pinctrl_rgmii4_default>;
+-};
+-
+-&i2c0 {
+-	multi-master;
+-	bus-frequency = <1000000>;
+-};
+-
+-&i2c1 {
+-	/*
+-	 * PCA9548 (1-0070) provides 8 channels connecting to SMB (Switch
+-	 * Main Board).
+-	 */
+-	i2c-mux@70 {
+-		compatible = "nxp,pca9548";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		reg = <0x70>;
+-		i2c-mux-idle-disconnect;
+-
+-		imux16: i2c@0 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <0>;
+-		};
+-
+-		imux17: i2c@1 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <1>;
+-		};
+-
+-		imux18: i2c@2 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <2>;
+-		};
+-
+-		imux19: i2c@3 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <3>;
+-		};
+-
+-		imux20: i2c@4 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <4>;
+-		};
+-
+-		imux21: i2c@5 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <5>;
+-		};
+-
+-		imux22: i2c@6 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <6>;
+-		};
+-
+-		imux23: i2c@7 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <7>;
+-		};
+-	};
+-};
+-
+-&i2c2 {
+-	/*
+-	 * PCA9548 (2-0070) provides 8 channels connecting to SCM (System
+-	 * Controller Module).
+-	 */
+-	i2c-mux@70 {
+-		compatible = "nxp,pca9548";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		reg = <0x70>;
+-		i2c-mux-idle-disconnect;
+-
+-		imux24: i2c@0 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <0>;
+-		};
+-
+-		imux25: i2c@1 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <1>;
+-		};
+-
+-		imux26: i2c@2 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <2>;
+-		};
+-
+-		imux27: i2c@3 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <3>;
+-		};
+-
+-		imux28: i2c@4 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <4>;
+-		};
+-
+-		imux29: i2c@5 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <5>;
+-		};
+-
+-		imux30: i2c@6 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <6>;
+-		};
+-
+-		imux31: i2c@7 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <7>;
+-		};
+-	};
+-};
+-
+-&i2c3 {
+-	/*
+-	 * PCA9548 (3-0070) provides 8 channels connecting to SMB (Switch
+-	 * Main Board).
+-	 */
+-	i2c-mux@70 {
+-		compatible = "nxp,pca9548";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		reg = <0x70>;
+-		i2c-mux-idle-disconnect;
+-
+-		imux32: i2c@0 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <0>;
+-		};
+-
+-		imux33: i2c@1 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <1>;
+-		};
+-
+-		imux34: i2c@2 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <2>;
+-		};
+-
+-		imux35: i2c@3 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <3>;
+-		};
+-
+-		imux36: i2c@4 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <4>;
+-		};
+-
+-		imux37: i2c@5 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <5>;
+-		};
+-
+-		imux38: i2c@6 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <6>;
+-		};
+-
+-		imux39: i2c@7 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <7>;
+-		};
+-	};
+-};
+-
+-&i2c6 {
+-	lp5012@14 {
+-		compatible = "ti,lp5012";
+-		reg = <0x14>;
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-
+-		multi-led@0 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <0>;
+-			color = <LED_COLOR_ID_MULTI>;
+-			function = LED_FUNCTION_ACTIVITY;
+-			label = "sys";
+-
+-			led@0 {
+-				reg = <0>;
+-				color = <LED_COLOR_ID_RED>;
+-			};
+-
+-			led@1 {
+-				reg = <1>;
+-				color = <LED_COLOR_ID_BLUE>;
+-			};
+-
+-			led@2 {
+-				reg = <2>;
+-				color = <LED_COLOR_ID_GREEN>;
+-			};
+-		};
+-
+-		multi-led@1 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <1>;
+-			color = <LED_COLOR_ID_MULTI>;
+-			function = LED_FUNCTION_ACTIVITY;
+-			label = "fan";
+-
+-			led@0 {
+-				reg = <0>;
+-				color = <LED_COLOR_ID_RED>;
+-			};
+-
+-			led@1 {
+-				reg = <1>;
+-				color = <LED_COLOR_ID_BLUE>;
+-			};
+-
+-			led@2 {
+-				reg = <2>;
+-				color = <LED_COLOR_ID_GREEN>;
+-			};
+-		};
+-
+-		multi-led@2 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <2>;
+-			color = <LED_COLOR_ID_MULTI>;
+-			function = LED_FUNCTION_ACTIVITY;
+-			label = "psu";
+-
+-			led@0 {
+-				reg = <0>;
+-				color = <LED_COLOR_ID_RED>;
+-			};
+-
+-			led@1 {
+-				reg = <1>;
+-				color = <LED_COLOR_ID_BLUE>;
+-			};
+-
+-			led@2 {
+-				reg = <2>;
+-				color = <LED_COLOR_ID_GREEN>;
+-			};
+-		};
+-
+-		multi-led@3 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <3>;
+-			color = <LED_COLOR_ID_MULTI>;
+-			function = LED_FUNCTION_ACTIVITY;
+-			label = "scm";
+-
+-			led@0 {
+-				reg = <0>;
+-				color = <LED_COLOR_ID_RED>;
+-			};
+-
+-			led@1 {
+-				reg = <1>;
+-				color = <LED_COLOR_ID_BLUE>;
+-			};
+-
+-			led@2 {
+-				reg = <2>;
+-				color = <LED_COLOR_ID_GREEN>;
+-			};
+-		};
+-	};
+-};
+-
+-&i2c8 {
+-	/*
+-	 * PCA9548 (8-0070) provides 8 channels connecting to PDB (Power
+-	 * Delivery Board).
+-	 */
+-	i2c-mux@70 {
+-		compatible = "nxp,pca9548";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		reg = <0x70>;
+-		i2c-mux-idle-disconnect;
+-
+-		imux40: i2c@0 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <0>;
+-		};
+-
+-		imux41: i2c@1 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <1>;
+-		};
+-
+-		imux42: i2c@2 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <2>;
+-		};
+-
+-		imux43: i2c@3 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <3>;
+-		};
+-
+-		imux44: i2c@4 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <4>;
+-		};
+-
+-		imux45: i2c@5 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <5>;
+-		};
+-
+-		imux46: i2c@6 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <6>;
+-		};
+-
+-		imux47: i2c@7 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <7>;
+-		};
+-
+-	};
+-};
+-
+-&i2c15 {
+-	/*
+-	 * PCA9548 (15-0076) provides 8 channels connecting to FCM (Fan
+-	 * Controller Module).
+-	 */
+-	i2c-mux@76 {
+-		compatible = "nxp,pca9548";
+-		#address-cells = <1>;
+-		#size-cells = <0>;
+-		reg = <0x76>;
+-		i2c-mux-idle-disconnect;
+-
+-		imux48: i2c@0 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <0>;
+-		};
+-
+-		imux49: i2c@1 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <1>;
+-		};
+-
+-		imux50: i2c@2 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <2>;
+-		};
+-
+-		imux51: i2c@3 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <3>;
+-		};
+-
+-		imux52: i2c@4 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <4>;
+-		};
+-
+-		imux53: i2c@5 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <5>;
+-		};
+-
+-		imux54: i2c@6 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <6>;
+-		};
+-
+-		imux55: i2c@7 {
+-			#address-cells = <1>;
+-			#size-cells = <0>;
+-			reg = <7>;
+-		};
+-	};
+-};
+-- 
+2.43.0
+
diff --git a/meta-facebook/meta-janga/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-janga-BMC.patch b/common/recipes-kernel/linux/6.6/0005-ARM-dts-aspeed-Add-Facebook-fblite-r1-BMC.patch
similarity index 64%
rename from meta-facebook/meta-janga/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-janga-BMC.patch
rename to common/recipes-kernel/linux/6.6/0005-ARM-dts-aspeed-Add-Facebook-fblite-r1-BMC.patch
index bd5c4d6c2b94..166d0c1c4bf4 100644
--- a/meta-facebook/meta-janga/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-janga-BMC.patch
+++ b/common/recipes-kernel/linux/6.6/0005-ARM-dts-aspeed-Add-Facebook-fblite-r1-BMC.patch
@@ -1,32 +1,37 @@
-From 1f14671e9b834a64fb5751e908c21b6f4883d132 Mon Sep 17 00:00:00 2001
+From 1b159f19f4adffa8e92051d1b0028cc68a102f0c Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@meta.com>
-Date: Fri, 22 Dec 2023 16:30:26 +0000
-Subject: [PATCH] janga dts
+Date: Mon, 5 Feb 2024 15:28:46 -0800
+Subject: [PATCH 5/5] ARM: dts: aspeed: Add Facebook fblite-r1 BMC
 
+Summary:
+
+This is the Facebook FBOSS BMC-Lite Rev1 OpenBMC.
+
+Test Plan:
 ---
  arch/arm/boot/dts/aspeed/Makefile             |  1 +
- .../dts/aspeed/aspeed-bmc-facebook-janga.dts  | 96 +++++++++++++++++++
- 2 files changed, 97 insertions(+)
- create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-janga.dts
+ .../aspeed/aspeed-bmc-facebook-fblite-r1.dts  | 94 +++++++++++++++++++
+ 2 files changed, 95 insertions(+)
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts
 
 diff --git a/arch/arm/boot/dts/aspeed/Makefile b/arch/arm/boot/dts/aspeed/Makefile
-index fb9cc95f1b60..9b508b14aec3 100644
+index 99980bdb2f16..87c97ab9426e 100644
 --- a/arch/arm/boot/dts/aspeed/Makefile
 +++ b/arch/arm/boot/dts/aspeed/Makefile
-@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
+@@ -18,6 +18,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
+ 	aspeed-bmc-facebook-bletchley.dtb \
+ 	aspeed-bmc-facebook-cmm.dtb \
+ 	aspeed-bmc-facebook-elbert.dtb \
++	aspeed-bmc-facebook-fblite-r1.dtb \
  	aspeed-bmc-facebook-fuji.dtb \
  	aspeed-bmc-facebook-galaxy100.dtb \
  	aspeed-bmc-facebook-greatlakes.dtb \
-+	aspeed-bmc-facebook-janga.dtb \
- 	aspeed-bmc-facebook-minerva-cmc.dtb \
- 	aspeed-bmc-facebook-minipack.dtb \
- 	aspeed-bmc-facebook-tiogapass.dtb \
-diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-janga.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-janga.dts
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts
 new file mode 100644
-index 000000000000..330e41fef5d6
+index 000000000000..4264bd3c7a6b
 --- /dev/null
-+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-janga.dts
-@@ -0,0 +1,96 @@
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts
+@@ -0,0 +1,94 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +// Copyright (c) Meta Platforms, Inc. and affiliates.
 +
@@ -35,8 +40,8 @@ index 000000000000..330e41fef5d6
 +#include "ast2600-facebook-netbmc-common.dtsi"
 +
 +/ {
-+	model = "Facebook janga BMC";
-+	compatible = "facebook,janga-bmc", "aspeed,ast2600";
++	model = "Facebook FBOSS-Lite R1 BMC";
++	compatible = "facebook,fblite-r1-bmc", "aspeed,ast2600";
 +
 +	chosen {
 +		stdout-path = &uart1;
@@ -48,28 +53,8 @@ index 000000000000..330e41fef5d6
 +	};
 +};
 +
-+&peci0 {
-+	status = "okay";
-+
-+	peci-client@30 {
-+		compatible = "intel,peci-client";
-+		reg = <0x30>;
-+	};
-+};
-+
-+&mdio1 {
-+	status = "okay";
-+};
-+
-+&mac3 {
++&i2c11 {
 +	status = "okay";
-+	phy-mode = "rgmii";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_rgmii4_default>;
-+	fixed-link {
-+		speed = <1000>;
-+		full-duplex;
-+	};
 +};
 +
 +&lpc_ctrl {
@@ -92,17 +77,35 @@ index 000000000000..330e41fef5d6
 +	aspeed,lpc-io-reg = <0xca2>;
 +};
 +
-+/* JTAG1 will be use for COMe FPGA upgrading */
-+&jtag1 {
++&peci0 {
++	status = "okay";
++
++	peci-client@30 {
++		compatible = "intel,peci-client";
++		reg = <0x30>;
++	};
++};
++
++&mdio1 {
++	status = "okay";
++};
++
++&mac3 {
 +	status = "okay";
++	phy-mode = "rgmii";
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_rgmii4_default>;
++	fixed-link {
++		speed = <1000>;
++		full-duplex;
++	};
 +};
 +
-+/* SPI1 will be use for BIOS, IOB_FPGA flash upgrading */
 +&spi1 {
 +	status = "okay";
 +
 +	reg = < 0x1e630000 0xc4
-+			0x30000000 0x2000000 >;
++		0x30000000 0x2000000 >;
 +
 +	flash@0 {
 +		status = "okay";
@@ -118,7 +121,7 @@ index 000000000000..330e41fef5d6
 +
 +			flash1@0 {
 +				reg = <0x0 0x2000000>;
-+				label = "spi-flash";
++				label = "host-flash";
 +			};
 +		};
 +	};
diff --git a/common/recipes-kernel/linux/6.6/0100-jffs2-kill-garbage-collect-thread-when-filesystem-is.patch b/common/recipes-kernel/linux/6.6/0100-jffs2-kill-garbage-collect-thread-when-filesystem-is.patch
index 3947ef896e34..d0370753f78f 100644
--- a/common/recipes-kernel/linux/6.6/0100-jffs2-kill-garbage-collect-thread-when-filesystem-is.patch
+++ b/common/recipes-kernel/linux/6.6/0100-jffs2-kill-garbage-collect-thread-when-filesystem-is.patch
@@ -1,7 +1,7 @@
-From b79072a654b42c1b357cf2bccc78548bcf7cfc5f Mon Sep 17 00:00:00 2001
+From eb3b12891ebd081343018b5c86568c0842cd4e45 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Thu, 22 Aug 2019 17:07:24 -0700
-Subject: [PATCH 100/101] jffs2: kill garbage collect thread when filesystem is
+Subject: [PATCH 100/102] jffs2: kill garbage collect thread when filesystem is
  corrupted
 
 Summary:
@@ -57,5 +57,5 @@ index 5c6602f3c189..b92edbf6ede2 100644
  	case INO_STATE_READING:
  		/* Someone's currently trying to read it. We must wait for
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0101-jffs2-suppress-jffs2-messages-when-reading-inode.patch b/common/recipes-kernel/linux/6.6/0101-jffs2-suppress-jffs2-messages-when-reading-inode.patch
index b19de1316cbb..fd15d58c8abb 100644
--- a/common/recipes-kernel/linux/6.6/0101-jffs2-suppress-jffs2-messages-when-reading-inode.patch
+++ b/common/recipes-kernel/linux/6.6/0101-jffs2-suppress-jffs2-messages-when-reading-inode.patch
@@ -1,7 +1,7 @@
-From 6bc994b68ec0c661d934c9d6442d91cb2089f938 Mon Sep 17 00:00:00 2001
+From d9818ea75048538194765923101fefc235273e63 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Thu, 26 Sep 2019 16:03:16 -0700
-Subject: [PATCH 101/101] jffs2: suppress jffs2 messages when reading inode
+Subject: [PATCH 101/102] jffs2: suppress jffs2 messages when reading inode
 
 Summary:
 
@@ -84,5 +84,5 @@ index 03b4f99614be..4766072f2e34 100644
  		      f->inocache->ino, rii->highest_version, rii->latest_mctime,
  		      rii->mctime_ver);
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0102-drivers-misc-Add-Aspeed-OTP-control-register.patch b/common/recipes-kernel/linux/6.6/0102-drivers-misc-Add-Aspeed-OTP-control-register.patch
index 3af3b39467ef..39a8284eb78a 100644
--- a/common/recipes-kernel/linux/6.6/0102-drivers-misc-Add-Aspeed-OTP-control-register.patch
+++ b/common/recipes-kernel/linux/6.6/0102-drivers-misc-Add-Aspeed-OTP-control-register.patch
@@ -1,7 +1,7 @@
-From 5f1b73a25de64c62fffd0c46dba3d6caeb237557 Mon Sep 17 00:00:00 2001
+From bf4bb6191afd8f2f8393b98805dc4e41b659c700 Mon Sep 17 00:00:00 2001
 From: Johnny Huang <johnny_huang@aspeedtech.com>
 Date: Mon, 26 Dec 2022 10:04:48 +0800
-Subject: [PATCH 1/1] drivers/misc: Add Aspeed OTP control register
+Subject: [PATCH 102/102] drivers/misc: Add Aspeed OTP control register
 
 AST2600 built-in 64Kbit one time programmable (OTP) memory for
 configuration, strap, key storage, patch and user data. Each memory
@@ -20,7 +20,7 @@ Change-Id: Ic2e8c2bf829dbde4d4e437c97edcc0a4591bcb46
  create mode 100644 include/uapi/linux/aspeed-otp.h
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
-index c4d1faade8be3..3b072e36d50dc 100644
+index c4d1faade8be..3b072e36d50d 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
 @@ -892,6 +892,12 @@ udma: dma-controller@1e79e000 {
@@ -37,7 +37,7 @@ index c4d1faade8be3..3b072e36d50dc 100644
  	};
  };
 diff --git a/drivers/soc/aspeed/Kconfig b/drivers/soc/aspeed/Kconfig
-index aaf4596ae4f94..bdea4b0a687b4 100644
+index aaf4596ae4f9..bdea4b0a687b 100644
 --- a/drivers/soc/aspeed/Kconfig
 +++ b/drivers/soc/aspeed/Kconfig
 @@ -69,6 +69,10 @@ config ASPEED_SBC
@@ -52,7 +52,7 @@ index aaf4596ae4f94..bdea4b0a687b4 100644
  
  endif
 diff --git a/drivers/soc/aspeed/Makefile b/drivers/soc/aspeed/Makefile
-index 5f61bb4cc36cf..224127a1dd55e 100644
+index 5f61bb4cc36c..224127a1dd55 100644
 --- a/drivers/soc/aspeed/Makefile
 +++ b/drivers/soc/aspeed/Makefile
 @@ -6,3 +6,4 @@ obj-$(CONFIG_ASPEED_P2A_CTRL)		+= aspeed-p2a-ctrl.o
@@ -62,7 +62,7 @@ index 5f61bb4cc36cf..224127a1dd55e 100644
 +obj-$(CONFIG_ASPEED_OTP)		+= aspeed-otp.o
 diff --git a/drivers/soc/aspeed/aspeed-otp.c b/drivers/soc/aspeed/aspeed-otp.c
 new file mode 100644
-index 0000000000000..38b3890e5ad06
+index 000000000000..38b3890e5ad0
 --- /dev/null
 +++ b/drivers/soc/aspeed/aspeed-otp.c
 @@ -0,0 +1,639 @@
@@ -708,7 +708,7 @@ index 0000000000000..38b3890e5ad06
 \ No newline at end of file
 diff --git a/include/uapi/linux/aspeed-otp.h b/include/uapi/linux/aspeed-otp.h
 new file mode 100644
-index 0000000000000..3293555c312c6
+index 000000000000..3293555c312c
 --- /dev/null
 +++ b/include/uapi/linux/aspeed-otp.h
 @@ -0,0 +1,39 @@
@@ -753,5 +753,5 @@ index 0000000000000..3293555c312c6
 +#endif /* _UAPI_LINUX_ASPEED_JTAG_H */
 \ No newline at end of file
 -- 
-2.31.1
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0120-drivers-jtag-Add-JTAG-core-driver.patch b/common/recipes-kernel/linux/6.6/0120-drivers-jtag-Add-JTAG-core-driver.patch
index f7e3d8c219d8..6d723367cc21 100644
--- a/common/recipes-kernel/linux/6.6/0120-drivers-jtag-Add-JTAG-core-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0120-drivers-jtag-Add-JTAG-core-driver.patch
@@ -1,4 +1,4 @@
-From 70ee150925d13e3f3ba56dd663c166053379fda1 Mon Sep 17 00:00:00 2001
+From 1aad2b3ab7fc90d2e4d697b54ed5b4adbff930a1 Mon Sep 17 00:00:00 2001
 From: Ernesto Corona <ernesto.corona@intel.com>
 Date: Mon, 13 Apr 2020 15:29:15 -0700
 Subject: [PATCH 120/132] drivers: jtag: Add JTAG core driver
@@ -664,5 +664,5 @@ index 000000000000..3f9e1953f5a4
 +
 +#endif /* __UAPI_LINUX_JTAG_H */
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0121-dt-binding-jtag-Aspeed-2400-and-2500-series.patch b/common/recipes-kernel/linux/6.6/0121-dt-binding-jtag-Aspeed-2400-and-2500-series.patch
index 22938231d0af..aa805656c8bb 100644
--- a/common/recipes-kernel/linux/6.6/0121-dt-binding-jtag-Aspeed-2400-and-2500-series.patch
+++ b/common/recipes-kernel/linux/6.6/0121-dt-binding-jtag-Aspeed-2400-and-2500-series.patch
@@ -1,4 +1,4 @@
-From 7c1c0c865c1b6fd43fe60b02dc77c40649b86a7d Mon Sep 17 00:00:00 2001
+From 8f3db294b29a931d5ac795eb80dc7c787c8742a7 Mon Sep 17 00:00:00 2001
 From: Ernesto Corona <ernesto.corona@intel.com>
 Date: Mon, 13 Apr 2020 15:29:16 -0700
 Subject: [PATCH 121/132] dt-binding: jtag: Aspeed 2400 and 2500 series
@@ -113,5 +113,5 @@ index 000000000000..3db49b70db45
 +
 +...
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0122-Add-Aspeed-SoC-24xx-and-25xx-families-JTAG-master-dr.patch b/common/recipes-kernel/linux/6.6/0122-Add-Aspeed-SoC-24xx-and-25xx-families-JTAG-master-dr.patch
index c5f0561f6f97..11689df79880 100644
--- a/common/recipes-kernel/linux/6.6/0122-Add-Aspeed-SoC-24xx-and-25xx-families-JTAG-master-dr.patch
+++ b/common/recipes-kernel/linux/6.6/0122-Add-Aspeed-SoC-24xx-and-25xx-families-JTAG-master-dr.patch
@@ -1,4 +1,4 @@
-From 8331a9c91172d33854fdd0ada2436f8053c93648 Mon Sep 17 00:00:00 2001
+From 4188e9297f3a0e59a6b88d2072474a17dbf1372a Mon Sep 17 00:00:00 2001
 From: Ernesto Corona <ernesto.corona@intel.com>
 Date: Mon, 13 Apr 2020 15:29:17 -0700
 Subject: [PATCH 122/132] Add Aspeed SoC 24xx and 25xx families JTAG master
@@ -1114,5 +1114,5 @@ index 000000000000..254548762dc5
 +MODULE_DESCRIPTION("ASPEED JTAG driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0123-jtag-aspeed-support-sysfs-interface.patch b/common/recipes-kernel/linux/6.6/0123-jtag-aspeed-support-sysfs-interface.patch
index 9cb31b22ee47..27298238b83b 100644
--- a/common/recipes-kernel/linux/6.6/0123-jtag-aspeed-support-sysfs-interface.patch
+++ b/common/recipes-kernel/linux/6.6/0123-jtag-aspeed-support-sysfs-interface.patch
@@ -1,4 +1,4 @@
-From 56d0a5f04201d6aabeb27bb4343e785b267cec2d Mon Sep 17 00:00:00 2001
+From 1d9a5bfd6287d43fd006846817c4a02417474403 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Tue, 14 Jul 2020 22:18:35 -0700
 Subject: [PATCH 123/132] jtag: aspeed: support sysfs interface
@@ -205,5 +205,5 @@ index 254548762dc5..0a30413efb93 100644
  
  err_jtag_register:
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0124-jtag-support-driver-specific-ioctl-commands.patch b/common/recipes-kernel/linux/6.6/0124-jtag-support-driver-specific-ioctl-commands.patch
index 21ed448bc93f..f6c0466b3296 100644
--- a/common/recipes-kernel/linux/6.6/0124-jtag-support-driver-specific-ioctl-commands.patch
+++ b/common/recipes-kernel/linux/6.6/0124-jtag-support-driver-specific-ioctl-commands.patch
@@ -1,4 +1,4 @@
-From dad10af84068e248bf4aab267707b5ab40f70f96 Mon Sep 17 00:00:00 2001
+From 18575605eeeb0706a621a5bbaa4bb37479002dd0 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Tue, 14 Jul 2020 22:59:49 -0700
 Subject: [PATCH 124/132] jtag: support driver specific ioctl commands
@@ -55,5 +55,5 @@ index 4153c905e550..6a6b53a549d8 100644
  
  void *jtag_priv(struct jtag *jtag);
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0125-jtag-aspeed-support-JTAG_RUN_CYCLE-ioctl-command.patch b/common/recipes-kernel/linux/6.6/0125-jtag-aspeed-support-JTAG_RUN_CYCLE-ioctl-command.patch
index 9b7e128280bb..c50937266016 100644
--- a/common/recipes-kernel/linux/6.6/0125-jtag-aspeed-support-JTAG_RUN_CYCLE-ioctl-command.patch
+++ b/common/recipes-kernel/linux/6.6/0125-jtag-aspeed-support-JTAG_RUN_CYCLE-ioctl-command.patch
@@ -1,4 +1,4 @@
-From 18881d69a3b5de3935fb778a96e4b6395daa8415 Mon Sep 17 00:00:00 2001
+From 44c6e3d95fb18de4a83937e1b6982de0125968eb Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Tue, 14 Jul 2020 23:25:29 -0700
 Subject: [PATCH 125/132] jtag: aspeed: support JTAG_RUN_CYCLE ioctl command
@@ -111,5 +111,5 @@ index 0a30413efb93..2d4a631ca4ac 100644
  
  static int aspeed_jtag_probe(struct platform_device *pdev)
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0126-jtag-aspeed-add-AST2600-support.patch b/common/recipes-kernel/linux/6.6/0126-jtag-aspeed-add-AST2600-support.patch
index 23cabcbd19b7..92c3271e1285 100644
--- a/common/recipes-kernel/linux/6.6/0126-jtag-aspeed-add-AST2600-support.patch
+++ b/common/recipes-kernel/linux/6.6/0126-jtag-aspeed-add-AST2600-support.patch
@@ -1,4 +1,4 @@
-From 9c27719c9245bf1cff79f6a00278620271ac5dec Mon Sep 17 00:00:00 2001
+From ca889846f4e5e7dcddaf55fb50eba506d9bf2df5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Joan=20Olguy=20Can=C3=A9us?= <joancaneus@fb.com>
 Date: Wed, 12 Aug 2020 18:01:39 -0700
 Subject: [PATCH 126/132] jtag: aspeed: add AST2600 support
@@ -154,5 +154,5 @@ index 2d4a631ca4ac..e0a46fd12bca 100644
  };
  
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0127-Documentation-jtag-Add-ABI-documentation.patch b/common/recipes-kernel/linux/6.6/0127-Documentation-jtag-Add-ABI-documentation.patch
index 3e370735bd25..467b6ca90764 100644
--- a/common/recipes-kernel/linux/6.6/0127-Documentation-jtag-Add-ABI-documentation.patch
+++ b/common/recipes-kernel/linux/6.6/0127-Documentation-jtag-Add-ABI-documentation.patch
@@ -1,4 +1,4 @@
-From 5aaa953a65999a9ef46197c7365f6d17188256d1 Mon Sep 17 00:00:00 2001
+From 8648d96d729e914fe11237c267c1c78e604d45a5 Mon Sep 17 00:00:00 2001
 From: Ernesto Corona <ernesto.corona@intel.com>
 Date: Mon, 13 Apr 2020 15:29:18 -0700
 Subject: [PATCH 127/132] Documentation: jtag: Add ABI documentation
@@ -345,5 +345,5 @@ index 000000000000..445f0b9c5b4d
 +- Steven Filary
 +- Vadim Pasternak
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0128-Documentation-jtag-Add-JTAG-core-driver-ioctl-number.patch b/common/recipes-kernel/linux/6.6/0128-Documentation-jtag-Add-JTAG-core-driver-ioctl-number.patch
index 7c64d1092234..cf9130069c19 100644
--- a/common/recipes-kernel/linux/6.6/0128-Documentation-jtag-Add-JTAG-core-driver-ioctl-number.patch
+++ b/common/recipes-kernel/linux/6.6/0128-Documentation-jtag-Add-JTAG-core-driver-ioctl-number.patch
@@ -1,4 +1,4 @@
-From 74513aec6b23e68687bfbbd068a285b8524380e9 Mon Sep 17 00:00:00 2001
+From 590799e77f23136909af101dff799c20a7cb72ea Mon Sep 17 00:00:00 2001
 From: Ernesto Corona <ernesto.corona@intel.com>
 Date: Mon, 13 Apr 2020 15:29:19 -0700
 Subject: [PATCH 128/132] Documentation jtag: Add JTAG core driver ioctl number
@@ -69,5 +69,5 @@ index 4ea5b837399a..ac1ccb7936f7 100644
  0xB4  00-0F  linux/gpio.h                                            <mailto:linux-gpio@vger.kernel.org>
  0xB5  00-0F  uapi/linux/rpmsg.h                                      <mailto:linux-remoteproc@vger.kernel.org>
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0129-drivers-jtag-Add-JTAG-core-driver-Maintainers.patch b/common/recipes-kernel/linux/6.6/0129-drivers-jtag-Add-JTAG-core-driver-Maintainers.patch
index 21a9e3c9f541..6134398ed4e7 100644
--- a/common/recipes-kernel/linux/6.6/0129-drivers-jtag-Add-JTAG-core-driver-Maintainers.patch
+++ b/common/recipes-kernel/linux/6.6/0129-drivers-jtag-Add-JTAG-core-driver-Maintainers.patch
@@ -1,4 +1,4 @@
-From 382d17e6e624deca3a512fc05ba2f13bc1365ad6 Mon Sep 17 00:00:00 2001
+From aa8661f29c2fd5237f665e242d4577266834f6bd Mon Sep 17 00:00:00 2001
 From: Ernesto Corona <ernesto.corona@intel.com>
 Date: Mon, 13 Apr 2020 15:29:20 -0700
 Subject: [PATCH 129/132] drivers: jtag: Add JTAG core driver Maintainers
@@ -36,10 +36,10 @@ Test Plan: booted up linux 5.15 on cmm and elbert successfully.
  1 file changed, 11 insertions(+)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index f9cc9f25799f..d9ba580fd4ba 100644
+index 5c77a1ed22bb..2955ed8af791 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -11195,6 +11195,17 @@ L:	linux-serial@vger.kernel.org
+@@ -11299,6 +11299,17 @@ L:	linux-serial@vger.kernel.org
  S:	Orphan
  F:	drivers/tty/serial/jsm/
  
@@ -58,5 +58,5 @@ index f9cc9f25799f..d9ba580fd4ba 100644
  M:	Clemens Ladisch <clemens@ladisch.de>
  L:	linux-hwmon@vger.kernel.org
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0130-fixup-jtag-patch-series.patch b/common/recipes-kernel/linux/6.6/0130-fixup-jtag-patch-series.patch
index 49a57a95be48..c5f205af1f06 100644
--- a/common/recipes-kernel/linux/6.6/0130-fixup-jtag-patch-series.patch
+++ b/common/recipes-kernel/linux/6.6/0130-fixup-jtag-patch-series.patch
@@ -1,4 +1,4 @@
-From a600746aec8b93e2148dc5c8fa81e62e6bbfde67 Mon Sep 17 00:00:00 2001
+From 1fbe608b018636a0ed6e949fe417d3a2ea39fa00 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Thu, 13 Oct 2022 03:38:28 -0700
 Subject: [PATCH 130/132] fixup jtag patch series
@@ -11,7 +11,7 @@ merge conflicts in future upgrade.
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/Kconfig b/drivers/Kconfig
-index 514ae6b24cb2..9fe8fde35000 100644
+index efb66e25fa2d..32aa22e6a892 100644
 --- a/drivers/Kconfig
 +++ b/drivers/Kconfig
 @@ -3,6 +3,8 @@ menu "Device Drivers"
@@ -32,10 +32,10 @@ index 514ae6b24cb2..9fe8fde35000 100644
  
  source "drivers/bus/Kconfig"
 diff --git a/drivers/Makefile b/drivers/Makefile
-index 7241d80a7b29..3c3527a6b818 100644
+index 1bec7819a837..a6a59edb6f35 100644
 --- a/drivers/Makefile
 +++ b/drivers/Makefile
-@@ -14,6 +14,8 @@ endif
+@@ -15,6 +15,8 @@ obj-y				+= cache/
  obj-y				+= irqchip/
  obj-y				+= bus/
  
@@ -45,5 +45,5 @@ index 7241d80a7b29..3c3527a6b818 100644
  
  # GPIO must come after pinctrl as gpios may need to mux pins etc
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0131-ARM-dts-aspeed-g6-add-jtag-controllers.patch b/common/recipes-kernel/linux/6.6/0131-ARM-dts-aspeed-g6-add-jtag-controllers.patch
index abc63331dc82..c08417399503 100644
--- a/common/recipes-kernel/linux/6.6/0131-ARM-dts-aspeed-g6-add-jtag-controllers.patch
+++ b/common/recipes-kernel/linux/6.6/0131-ARM-dts-aspeed-g6-add-jtag-controllers.patch
@@ -1,4 +1,4 @@
-From ef4d8f57227841437689e9924c563198e0e64e22 Mon Sep 17 00:00:00 2001
+From 2bcc91392a2ccd7df1d5d15f2ade2b6c8a365894 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Thu, 8 Apr 2021 15:26:15 -0700
 Subject: [PATCH 131/132] ARM: dts: aspeed-g6: add jtag controllers
@@ -27,7 +27,7 @@ Signature: 27663040:1617989954:ef64ea4d7a805b0eb4967b7167589aa8afc5562c
  1 file changed, 20 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
-index c4d1faade8be..6a5a058f128b 100644
+index 3b072e36d50d..01c0a7936132 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
 @@ -398,6 +398,26 @@ gfx: display@1e6e6000 {
@@ -58,5 +58,5 @@ index c4d1faade8be..6a5a058f128b 100644
  				compatible = "aspeed,ast2600-xdma";
  				reg = <0x1e6e7000 0x100>;
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0132-ARM-dts-aspeed-g5-add-jtag-controller.patch b/common/recipes-kernel/linux/6.6/0132-ARM-dts-aspeed-g5-add-jtag-controller.patch
index 5500515ebe16..6babbe04175a 100644
--- a/common/recipes-kernel/linux/6.6/0132-ARM-dts-aspeed-g5-add-jtag-controller.patch
+++ b/common/recipes-kernel/linux/6.6/0132-ARM-dts-aspeed-g5-add-jtag-controller.patch
@@ -1,4 +1,4 @@
-From 0d125b9ed1a889a22698193b6f33e4b02db6af1f Mon Sep 17 00:00:00 2001
+From 37625d6dd5f8b566a5cd74f308bf6bd8244c6037 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Mon, 11 May 2020 13:51:25 -0700
 Subject: [PATCH 132/132] ARM: dts: aspeed-g5: add jtag controller
@@ -43,5 +43,5 @@ index 04f98d1dbb97..f4d6332d3bbd 100644
  				compatible = "aspeed,ast2500-gfx", "syscon";
  				reg = <0x1e6e6000 0x1000>;
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0150-spi-aspeed-add-shutdown-path-for-AST25XX-SPI-control.patch b/common/recipes-kernel/linux/6.6/0150-spi-aspeed-add-shutdown-path-for-AST25XX-SPI-control.patch
index a02bae24bc41..6cd090ef81ed 100644
--- a/common/recipes-kernel/linux/6.6/0150-spi-aspeed-add-shutdown-path-for-AST25XX-SPI-control.patch
+++ b/common/recipes-kernel/linux/6.6/0150-spi-aspeed-add-shutdown-path-for-AST25XX-SPI-control.patch
@@ -1,4 +1,4 @@
-From 0dd214b2a2a31a8b3f6ed6ce056f6621eb49a28c Mon Sep 17 00:00:00 2001
+From 15ddd8e19c08df25eb4a5129dbc22c2a2ed3b71c Mon Sep 17 00:00:00 2001
 From: dhineskumareswaran <dhineskumar.eswaran@celestica.com>
 Date: Mon, 5 Dec 2022 12:17:20 +0000
 Subject: [PATCH 150/151] spi: aspeed: add shutdown path for AST25XX SPI
@@ -22,7 +22,7 @@ In reset path, restoring all FMC related register back to default state.
  1 file changed, 26 insertions(+)
 
 diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c
-index e75b0d51f06a..56d83689b32a 100644
+index 21b0fa646c7d..6d9d119bf1a2 100644
 --- a/drivers/spi/spi-aspeed-smc.c
 +++ b/drivers/spi/spi-aspeed-smc.c
 @@ -46,6 +46,8 @@
@@ -101,5 +101,5 @@ index e75b0d51f06a..56d83689b32a 100644
  		.name		= DEVICE_NAME,
  		.of_match_table = aspeed_spi_matches,
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0151-spi-add-user-mode-aspeed-spi-driver.patch b/common/recipes-kernel/linux/6.6/0151-spi-add-user-mode-aspeed-spi-driver.patch
index f854b7f384a5..5c2ac40dd3c7 100644
--- a/common/recipes-kernel/linux/6.6/0151-spi-add-user-mode-aspeed-spi-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0151-spi-add-user-mode-aspeed-spi-driver.patch
@@ -1,4 +1,4 @@
-From 0d6ad077c786a21e9d7fc70e492c29c8c93b866b Mon Sep 17 00:00:00 2001
+From 051bd1f650d3ad74584fc807658327bb043afc95 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Mon, 9 May 2022 22:55:21 -0700
 Subject: [PATCH 151/151] spi: add user-mode aspeed spi driver
@@ -29,7 +29,7 @@ Differential Revision: https://phabricator.intern.facebook.com/D37292798
  create mode 100644 drivers/spi/spi-aspeed-user.c
 
 diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
-index 8962b2557615..9abdb02cd65d 100644
+index 3ce0fd5df8e9..68b7c6af4295 100644
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
 @@ -119,6 +119,13 @@ config SPI_ASPEED_SMC
@@ -47,7 +47,7 @@ index 8962b2557615..9abdb02cd65d 100644
  	tristate "Atmel SPI Controller"
  	depends on ARCH_AT91 || COMPILE_TEST
 diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
-index 080c2c1b3ec1..395889acff50 100644
+index 6af54842b9fa..0406f40df794 100644
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
 @@ -21,6 +21,7 @@ obj-$(CONFIG_SPI_AMLOGIC_SPIFC_A1)	+= spi-amlogic-spifc-a1.o
@@ -702,5 +702,5 @@ index 000000000000..519e965585cc
 +MODULE_DESCRIPTION("ASPEED SPI Host Driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0160-aspeed-i2c-add-clock-duty-cycle-property.patch b/common/recipes-kernel/linux/6.6/0160-aspeed-i2c-add-clock-duty-cycle-property.patch
index 703aea61b380..15ceb42945c6 100644
--- a/common/recipes-kernel/linux/6.6/0160-aspeed-i2c-add-clock-duty-cycle-property.patch
+++ b/common/recipes-kernel/linux/6.6/0160-aspeed-i2c-add-clock-duty-cycle-property.patch
@@ -1,7 +1,7 @@
-From 09f7ca6a3b9b1ac371dfd80d7b965b29ffb3f0f4 Mon Sep 17 00:00:00 2001
+From fed8a255d5160a145b8fe109d447889bdc2d5170 Mon Sep 17 00:00:00 2001
 From: Potin Lai <potin.lai.pt@gmail.com>
 Date: Mon, 23 May 2022 11:56:36 +0800
-Subject: [PATCH 160/164] aspeed: i2c: add clock duty cycle property
+Subject: [PATCH 160/170] aspeed: i2c: add clock duty cycle property
 
 Introduce i2c-clk-high-min-percent property for setting a minimum clock
 high percentage.
@@ -16,7 +16,7 @@ Signed-off-by: Potin Lai <potin.lai.pt@gmail.com>
  1 file changed, 45 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
-index 2e5acfeb76c8..3c3bc53e3381 100644
+index 5511fd46a65e..c8596cb5a66e 100644
 --- a/drivers/i2c/busses/i2c-aspeed.c
 +++ b/drivers/i2c/busses/i2c-aspeed.c
 @@ -17,6 +17,7 @@
@@ -49,7 +49,7 @@ index 2e5acfeb76c8..3c3bc53e3381 100644
  	/* Transaction state. */
  	enum aspeed_i2c_master_state	master_state;
  	struct i2c_msg			*msgs;
-@@ -803,9 +808,11 @@ static const struct i2c_algorithm aspeed_i2c_algo = {
+@@ -823,9 +828,11 @@ static const struct i2c_algorithm aspeed_i2c_algo = {
  
  static u32 aspeed_i2c_get_clk_reg_val(struct device *dev,
  				      u32 clk_high_low_mask,
@@ -62,7 +62,7 @@ index 2e5acfeb76c8..3c3bc53e3381 100644
  
  	/*
  	 * SCL_high and SCL_low represent a value 1 greater than what is stored
-@@ -847,10 +854,32 @@ static u32 aspeed_i2c_get_clk_reg_val(struct device *dev,
+@@ -867,10 +874,32 @@ static u32 aspeed_i2c_get_clk_reg_val(struct device *dev,
  			"clamping clock divider: divider requested, %u, is greater than largest possible divider, %u.\n",
  			divisor, (1 << base_clk_divisor) * clk_high_low_max);
  	} else {
@@ -98,7 +98,7 @@ index 2e5acfeb76c8..3c3bc53e3381 100644
  
  		if (clk_high)
  			clk_high--;
-@@ -868,22 +897,22 @@ static u32 aspeed_i2c_get_clk_reg_val(struct device *dev,
+@@ -888,22 +917,22 @@ static u32 aspeed_i2c_get_clk_reg_val(struct device *dev,
  			   & ASPEED_I2CD_TIME_BASE_DIVISOR_MASK);
  }
  
@@ -125,7 +125,7 @@ index 2e5acfeb76c8..3c3bc53e3381 100644
  }
  
  /* precondition: bus.lock has been acquired. */
-@@ -896,7 +925,7 @@ static int aspeed_i2c_init_clk(struct aspeed_i2c_bus *bus)
+@@ -916,7 +945,7 @@ static int aspeed_i2c_init_clk(struct aspeed_i2c_bus *bus)
  	clk_reg_val &= (ASPEED_I2CD_TIME_TBUF_MASK |
  			ASPEED_I2CD_TIME_THDSTA_MASK |
  			ASPEED_I2CD_TIME_TACST_MASK);
@@ -134,7 +134,7 @@ index 2e5acfeb76c8..3c3bc53e3381 100644
  	writel(clk_reg_val, bus->base + ASPEED_I2C_AC_TIMING_REG1);
  	writel(ASPEED_NO_TIMEOUT_CTRL, bus->base + ASPEED_I2C_AC_TIMING_REG2);
  
-@@ -1012,11 +1041,16 @@ static int aspeed_i2c_probe_bus(struct platform_device *pdev)
+@@ -1032,11 +1061,16 @@ static int aspeed_i2c_probe_bus(struct platform_device *pdev)
  		bus->bus_frequency = I2C_MAX_STANDARD_MODE_FREQ;
  	}
  
@@ -153,5 +153,5 @@ index 2e5acfeb76c8..3c3bc53e3381 100644
  
  	/* Initialize the I2C adapter */
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0161-dt-bindings-aspeed-i2c-add-properties-for-setting-i2.patch b/common/recipes-kernel/linux/6.6/0161-dt-bindings-aspeed-i2c-add-properties-for-setting-i2.patch
index ea468e74f928..c02c8620d482 100644
--- a/common/recipes-kernel/linux/6.6/0161-dt-bindings-aspeed-i2c-add-properties-for-setting-i2.patch
+++ b/common/recipes-kernel/linux/6.6/0161-dt-bindings-aspeed-i2c-add-properties-for-setting-i2.patch
@@ -1,7 +1,7 @@
-From 8c5949ade37292dbc91212a93928e5308aa5cf2d Mon Sep 17 00:00:00 2001
+From eb7b6f446ea40ef280b000f3776caef1fb834e9d Mon Sep 17 00:00:00 2001
 From: Potin Lai <potin.lai.pt@gmail.com>
 Date: Wed, 1 Jun 2022 10:10:37 +0800
-Subject: [PATCH 161/164] dt-bindings: aspeed-i2c: add properties for setting
+Subject: [PATCH 161/170] dt-bindings: aspeed-i2c: add properties for setting
  i2c clock duty cycle
 
 Introduce a new property for setting a minimum duty cycle for clock high.
@@ -32,5 +32,5 @@ index 6df27b47b922..3a053c2a9a2e 100644
    - reg
    - compatible
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0162-i2c-aspeed-update-ast2400-timing-settings.patch b/common/recipes-kernel/linux/6.6/0162-i2c-aspeed-update-ast2400-timing-settings.patch
index 8bc9c5494366..dc7ac1be6c1d 100644
--- a/common/recipes-kernel/linux/6.6/0162-i2c-aspeed-update-ast2400-timing-settings.patch
+++ b/common/recipes-kernel/linux/6.6/0162-i2c-aspeed-update-ast2400-timing-settings.patch
@@ -1,7 +1,7 @@
-From e91a032085c7b216c6058c694f70a8a79eb6d138 Mon Sep 17 00:00:00 2001
+From 7180ff73185183d6b6a00a977b9d04795c0cdcac Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Wed, 21 Apr 2021 16:20:34 -0700
-Subject: [PATCH 162/164] i2c: aspeed: update ast2400 timing settings
+Subject: [PATCH 162/170] i2c: aspeed: update ast2400 timing settings
 
 Summary:
 We have seen consistent I2C transaction failures in wedge100 i2c-3/4/9
@@ -29,10 +29,10 @@ Signature: 27956130:1619198529:34b97935d0812969dd1bb7a680046d1df9a6d262
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
-index 3c3bc53e3381..1e6a72e4f40c 100644
+index c8596cb5a66e..9e91d5fbd5f6 100644
 --- a/drivers/i2c/busses/i2c-aspeed.c
 +++ b/drivers/i2c/busses/i2c-aspeed.c
-@@ -899,11 +899,25 @@ static u32 aspeed_i2c_get_clk_reg_val(struct device *dev,
+@@ -919,11 +919,25 @@ static u32 aspeed_i2c_get_clk_reg_val(struct device *dev,
  
  static u32 aspeed_i2c_24xx_get_clk_reg_val(struct device *dev, u32 divisor, u32 duty_cycle)
  {
@@ -60,5 +60,5 @@ index 3c3bc53e3381..1e6a72e4f40c 100644
  
  static u32 aspeed_i2c_25xx_get_clk_reg_val(struct device *dev, u32 divisor, u32 duty_cycle)
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0163-i2c-add-a-slave-backend-to-receive-and-queue-message.patch b/common/recipes-kernel/linux/6.6/0163-i2c-add-a-slave-backend-to-receive-and-queue-message.patch
index 91f4d1a86504..5e77a39abba3 100644
--- a/common/recipes-kernel/linux/6.6/0163-i2c-add-a-slave-backend-to-receive-and-queue-message.patch
+++ b/common/recipes-kernel/linux/6.6/0163-i2c-add-a-slave-backend-to-receive-and-queue-message.patch
@@ -1,7 +1,8 @@
-From 7ac6aed84487662381f0d8ed50a1957a35c8ebf3 Mon Sep 17 00:00:00 2001
+From 8d20834f1f446b9cb8ff17b9e1bcaaadd5ed1879 Mon Sep 17 00:00:00 2001
 From: Michael Garner <garnermic@fb.com>
 Date: Tue, 21 Jun 2022 15:13:30 -0700
-Subject: [PATCH] i2c: add a slave backend to receive and queue messages
+Subject: [PATCH 163/170] i2c: add a slave backend to receive and queue
+ messages
 
 Summary:
 Ported form Kernel 5.6:
@@ -177,10 +178,10 @@ index 000000000000..2d0d06d8df9d
 +  [10204.220734634] : 20 18 c8 2c 80 01 53
 +  [10204.468461664] : 20 18 c8 2c 80 01 53
 diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
-index 438905e2a1d0..9db0ce4d9a81 100644
+index 9388823bb0bb..ee3bc323083e 100644
 --- a/drivers/i2c/Kconfig
 +++ b/drivers/i2c/Kconfig
-@@ -125,6 +125,31 @@ config I2C_SLAVE_EEPROM
+@@ -134,6 +134,31 @@ config I2C_SLAVE_EEPROM
  	  This backend makes Linux behave like an I2C EEPROM. Please read
  	  Documentation/i2c/slave-eeprom-backend.rst for further details.
  
@@ -213,10 +214,10 @@ index 438905e2a1d0..9db0ce4d9a81 100644
  	tristate "I2C eeprom testunit driver"
  	help
 diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
-index c1d493dc9bac..7af77add9f72 100644
+index 3f71ce4711e3..c79adbe5e8e9 100644
 --- a/drivers/i2c/Makefile
 +++ b/drivers/i2c/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_I2C_MUX)		+= i2c-mux.o
+@@ -17,6 +17,7 @@ obj-$(CONFIG_I2C_ATR)		+= i2c-atr.o
  obj-y				+= algos/ busses/ muxes/
  obj-$(CONFIG_I2C_STUB)		+= i2c-stub.o
  obj-$(CONFIG_I2C_SLAVE_EEPROM)	+= i2c-slave-eeprom.o
@@ -431,5 +432,5 @@ index 000000000000..ab7840b5b015
 +MODULE_AUTHOR("Haiyue Wang <haiyue.wang@linux.intel.com>");
 +MODULE_DESCRIPTION("I2C slave mode for receiving and queuing messages");
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0164-i2c-aspeed-add-i2c-slave-inactive-timeout-support.patch b/common/recipes-kernel/linux/6.6/0164-i2c-aspeed-add-i2c-slave-inactive-timeout-support.patch
index c8628c4ce62f..30f09719463e 100644
--- a/common/recipes-kernel/linux/6.6/0164-i2c-aspeed-add-i2c-slave-inactive-timeout-support.patch
+++ b/common/recipes-kernel/linux/6.6/0164-i2c-aspeed-add-i2c-slave-inactive-timeout-support.patch
@@ -1,7 +1,7 @@
-From bf9abe5b05fca31738276cbe3e533d3087bce41e Mon Sep 17 00:00:00 2001
+From 1cc242cc5c10f95a90306bd6ecdd7730e92024d7 Mon Sep 17 00:00:00 2001
 From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
 Date: Tue, 13 Sep 2022 08:56:54 -0700
-Subject: [PATCH 164/164] i2c: aspeed: add i2c slave inactive timeout support
+Subject: [PATCH 164/170] i2c: aspeed: add i2c slave inactive timeout support
 
 Summary:
 backport below patches to kernel 5.15 to support i2c slave inactive timeout.
@@ -18,11 +18,11 @@ Pulled By: garnermic
 
 fbshipit-source-id: 019a949fcc6c09d93141e781ca5c2bbe0f8bf580
 ---
- drivers/i2c/busses/i2c-aspeed.c | 92 ++++++++++++++++++++++++++++++---
- 1 file changed, 86 insertions(+), 6 deletions(-)
+ drivers/i2c/busses/i2c-aspeed.c | 91 ++++++++++++++++++++++++++++++---
+ 1 file changed, 85 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c
-index 1e6a72e4f40c..658370440504 100644
+index 9e91d5fbd5f6..51e0297384ac 100644
 --- a/drivers/i2c/busses/i2c-aspeed.c
 +++ b/drivers/i2c/busses/i2c-aspeed.c
 @@ -7,6 +7,7 @@
@@ -110,22 +110,21 @@ index 1e6a72e4f40c..658370440504 100644
  static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status)
  {
  	u32 command, irq_handled = 0;
-@@ -254,6 +282,14 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status)
- 	if (!slave)
- 		return 0;
+@@ -271,6 +299,13 @@ static u32 aspeed_i2c_slave_irq(struct aspeed_i2c_bus *bus, u32 irq_status)
+ 		bus->slave_state = ASPEED_I2C_SLAVE_STOP;
+ 	}
  
 +	if (aspeed_i2c_check_slave_error(irq_status)) {
 +		dev_dbg(bus->dev, "received slave error interrupt: 0x%08x\n",
 +			irq_status);
 +		irq_handled |= (irq_status & ASPEED_I2CD_INTR_SLAVE_ERRORS);
 +		bus->slave_state = ASPEED_I2C_SLAVE_INACTIVE;
-+		return irq_handled;
 +	}
 +
- 	command = readl(bus->base + ASPEED_I2C_CMD_REG);
- 
- 	/* Slave was requested, restart state machine. */
-@@ -397,7 +433,7 @@ static void aspeed_i2c_next_msg_or_stop(struct aspeed_i2c_bus *bus)
+ 	/* Propagate any stop conditions to the slave implementation. */
+ 	if (bus->slave_state == ASPEED_I2C_SLAVE_STOP) {
+ 		i2c_slave_event(slave, I2C_SLAVE_STOP, &value);
+@@ -413,7 +448,7 @@ static void aspeed_i2c_next_msg_or_stop(struct aspeed_i2c_bus *bus)
  	}
  }
  
@@ -134,7 +133,7 @@ index 1e6a72e4f40c..658370440504 100644
  {
  	if (irq_status & ASPEED_I2CD_INTR_ARBIT_LOSS)
  		return -EAGAIN;
-@@ -428,9 +464,9 @@ static u32 aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus, u32 irq_status)
+@@ -444,9 +479,9 @@ static u32 aspeed_i2c_master_irq(struct aspeed_i2c_bus *bus, u32 irq_status)
  	 * should clear the command queue effectively taking us back to the
  	 * INACTIVE state.
  	 */
@@ -146,7 +145,7 @@ index 1e6a72e4f40c..658370440504 100644
  			irq_status);
  		irq_handled |= (irq_status & ASPEED_I2CD_INTR_MASTER_ERRORS);
  		if (bus->master_state != ASPEED_I2C_MASTER_INACTIVE) {
-@@ -932,6 +968,7 @@ static u32 aspeed_i2c_25xx_get_clk_reg_val(struct device *dev, u32 divisor, u32
+@@ -952,6 +987,7 @@ static u32 aspeed_i2c_25xx_get_clk_reg_val(struct device *dev, u32 divisor, u32
  /* precondition: bus.lock has been acquired. */
  static int aspeed_i2c_init_clk(struct aspeed_i2c_bus *bus)
  {
@@ -154,7 +153,7 @@ index 1e6a72e4f40c..658370440504 100644
  	u32 divisor, clk_reg_val;
  
  	divisor = DIV_ROUND_UP(bus->parent_clk_frequency, bus->bus_frequency);
-@@ -940,8 +977,46 @@ static int aspeed_i2c_init_clk(struct aspeed_i2c_bus *bus)
+@@ -960,8 +996,46 @@ static int aspeed_i2c_init_clk(struct aspeed_i2c_bus *bus)
  			ASPEED_I2CD_TIME_THDSTA_MASK |
  			ASPEED_I2CD_TIME_TACST_MASK);
  	clk_reg_val |= bus->get_clk_reg_val(bus->dev, divisor, bus->duty_cycle);
@@ -202,7 +201,7 @@ index 1e6a72e4f40c..658370440504 100644
  
  	return 0;
  }
-@@ -956,6 +1031,11 @@ static int aspeed_i2c_init(struct aspeed_i2c_bus *bus,
+@@ -976,6 +1050,11 @@ static int aspeed_i2c_init(struct aspeed_i2c_bus *bus,
  	/* Disable everything. */
  	writel(0, bus->base + ASPEED_I2C_FUN_CTRL_REG);
  
@@ -215,5 +214,5 @@ index 1e6a72e4f40c..658370440504 100644
  	if (ret < 0)
  		return ret;
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0165-dt-bindings-hwmon-fan-Add-fan-binding-to-schema.patch b/common/recipes-kernel/linux/6.6/0165-dt-bindings-hwmon-fan-Add-fan-binding-to-schema.patch
index 81ef188f3e7b..d6498c14c613 100644
--- a/common/recipes-kernel/linux/6.6/0165-dt-bindings-hwmon-fan-Add-fan-binding-to-schema.patch
+++ b/common/recipes-kernel/linux/6.6/0165-dt-bindings-hwmon-fan-Add-fan-binding-to-schema.patch
@@ -1,7 +1,7 @@
-From ec0e607515b8adcab537858f4835c5218d1ffcff Mon Sep 17 00:00:00 2001
+From 1d6a2114c4937089c1e07fadaf60ab01169d325e Mon Sep 17 00:00:00 2001
 From: Naresh Solanki <naresh.solanki@9elements.com>
 Date: Mon, 18 Sep 2023 14:41:09 +0800
-Subject: [PATCH 165/167] dt-bindings: hwmon: fan: Add fan binding to schema
+Subject: [PATCH 165/170] dt-bindings: hwmon: fan: Add fan binding to schema
 
 Add common fan properties bindings to a schema.
 
@@ -108,5 +108,5 @@ index 000000000000..2bd2f57fc9d9
 +
 +...
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0166-dt-bindings-hwmon-Support-Aspeed-g6-PWM-TACH-Control.patch b/common/recipes-kernel/linux/6.6/0166-dt-bindings-hwmon-Support-Aspeed-g6-PWM-TACH-Control.patch
index 4a5718f469d7..93654fcd69ae 100644
--- a/common/recipes-kernel/linux/6.6/0166-dt-bindings-hwmon-Support-Aspeed-g6-PWM-TACH-Control.patch
+++ b/common/recipes-kernel/linux/6.6/0166-dt-bindings-hwmon-Support-Aspeed-g6-PWM-TACH-Control.patch
@@ -1,7 +1,7 @@
-From dd6573f4cd9406bc2cb6c9749ee7f64e9fed990d Mon Sep 17 00:00:00 2001
+From 40762b1bc85d2c473772ef537b874c87765c7a66 Mon Sep 17 00:00:00 2001
 From: Billy Tsai <billy_tsai@aspeedtech.com>
 Date: Mon, 18 Sep 2023 14:41:10 +0800
-Subject: [PATCH 166/167] dt-bindings: hwmon: Support Aspeed g6 PWM TACH
+Subject: [PATCH 166/170] dt-bindings: hwmon: Support Aspeed g6 PWM TACH
  Control
 
 Document the compatible for aspeed,ast2600-pwm-tach device, which can
@@ -89,5 +89,5 @@ index 000000000000..5a679f4ad2fa
 +      };
 +    };
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0167-hwmon-aspeed-g6-pwm-tacho-Support-for-ASPEED-g6-PWM-.patch b/common/recipes-kernel/linux/6.6/0167-hwmon-aspeed-g6-pwm-tacho-Support-for-ASPEED-g6-PWM-.patch
index 54023e363ad1..2445698107a9 100644
--- a/common/recipes-kernel/linux/6.6/0167-hwmon-aspeed-g6-pwm-tacho-Support-for-ASPEED-g6-PWM-.patch
+++ b/common/recipes-kernel/linux/6.6/0167-hwmon-aspeed-g6-pwm-tacho-Support-for-ASPEED-g6-PWM-.patch
@@ -1,7 +1,7 @@
-From 2f679cc81b9fa4cc8f753fccd6d881c4cd322650 Mon Sep 17 00:00:00 2001
+From 95041efccd9ba975dcf25eca7e2372e241d83eaf Mon Sep 17 00:00:00 2001
 From: Billy Tsai <billy_tsai@aspeedtech.com>
 Date: Mon, 18 Sep 2023 14:41:11 +0800
-Subject: [PATCH 167/167] hwmon: (aspeed-g6-pwm-tacho): Support for ASPEED g6
+Subject: [PATCH 167/170] hwmon: (aspeed-g6-pwm-tacho): Support for ASPEED g6
  PWM/Fan tach
 
 The driver support two functions: PWM and Tachometer. The PWM feature can
@@ -56,7 +56,7 @@ index 000000000000..17398fe397fe
 +                        affected by fan signal glitch.
 +=============== ======= ======================================================
 diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst
-index 042e1cf9501b..75b869ff6c53 100644
+index 641aa5d97add..fac861e2a8ab 100644
 --- a/Documentation/hwmon/index.rst
 +++ b/Documentation/hwmon/index.rst
 @@ -44,6 +44,7 @@ Hardware Monitoring Kernel Drivers
@@ -68,7 +68,7 @@ index 042e1cf9501b..75b869ff6c53 100644
     asus_ec_sensors
     asus_wmi_sensors
 diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
-index 307477b8a371..75fbea7e81e2 100644
+index ec38c8892158..67f8f2e6633c 100644
 --- a/drivers/hwmon/Kconfig
 +++ b/drivers/hwmon/Kconfig
 @@ -412,6 +412,17 @@ config SENSORS_ASPEED
@@ -90,7 +90,7 @@ index 307477b8a371..75fbea7e81e2 100644
  	tristate "Attansic ATXP1 VID controller"
  	depends on I2C
 diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
-index 3f4b0fda0998..51de5c1d5f1e 100644
+index 4ac9452b5430..6415bf756c10 100644
 --- a/drivers/hwmon/Makefile
 +++ b/drivers/hwmon/Makefile
 @@ -55,6 +55,7 @@ obj-$(CONFIG_SENSORS_ARM_SCPI)	+= scpi-hwmon.o
@@ -647,5 +647,5 @@ index 000000000000..504574e8940c
 +MODULE_DESCRIPTION("Aspeed ast2600 PWM and Fan Tach device driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0168-aspeed-g6.dtsi-update-for-PWM-and-TACH-driver.patch b/common/recipes-kernel/linux/6.6/0168-aspeed-g6.dtsi-update-for-PWM-and-TACH-driver.patch
index a97c7b9b6da0..74c063946dfc 100644
--- a/common/recipes-kernel/linux/6.6/0168-aspeed-g6.dtsi-update-for-PWM-and-TACH-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0168-aspeed-g6.dtsi-update-for-PWM-and-TACH-driver.patch
@@ -1,7 +1,7 @@
-From aeb819e5e1527595751cb6da0a972d9aa871a70b Mon Sep 17 00:00:00 2001
+From 2ab4d3e557c23ed3cec1fd3020afdb9ad7f03b7b Mon Sep 17 00:00:00 2001
 From: Potin Lai <potin.lai@quantatw.com>
 Date: Thu, 31 Aug 2023 16:49:57 +0800
-Subject: [PATCH 1/1] aspeed-g6.dtsi update for PWM and TACH driver
+Subject: [PATCH 168/170] aspeed-g6.dtsi update for PWM and TACH driver
 
 Signed-off-by: Potin Lai <potin.lai@quantatw.com>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Potin Lai <potin.lai@quantatw.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
-index 3b072e36d50dc..aa2a01500a239 100644
+index 01c0a7936132..7eee849bbeb7 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
 @@ -332,6 +332,14 @@ apb {
@@ -28,5 +28,5 @@ index 3b072e36d50dc..aa2a01500a239 100644
  				compatible = "aspeed,ast2600-hace";
  				reg = <0x1e6d0000 0x200>;
 -- 
-2.31.1
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0169-net-ncsi-Simplify-Kconfig-dts-control-flow.patch b/common/recipes-kernel/linux/6.6/0169-net-ncsi-Simplify-Kconfig-dts-control-flow.patch
index 404c91f2157d..8d76e8d5115a 100644
--- a/common/recipes-kernel/linux/6.6/0169-net-ncsi-Simplify-Kconfig-dts-control-flow.patch
+++ b/common/recipes-kernel/linux/6.6/0169-net-ncsi-Simplify-Kconfig-dts-control-flow.patch
@@ -1,7 +1,7 @@
-From b646dcd6368465fd5b4330199ca69457c6cf1d0b Mon Sep 17 00:00:00 2001
+From 5d25154f9a2a97f3a3b4ab8ab0955cbedc67bc5d Mon Sep 17 00:00:00 2001
 From: Peter Delevoryas <peter@pjd.dev>
 Date: Tue, 20 Dec 2022 21:22:44 -0800
-Subject: [PATCH 169/171] net/ncsi: Simplify Kconfig/dts control flow
+Subject: [PATCH 169/170] net/ncsi: Simplify Kconfig/dts control flow
 
 Background:
 
@@ -141,5 +141,5 @@ index d9da942ad53d..f3d7fe86fea1 100644
  	case ncsi_dev_state_probe_gc:
  	case ncsi_dev_state_probe_gls:
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0171-net-ncsi-Add-NC-SI-1.2-Get-MC-MAC-Address-command.patch b/common/recipes-kernel/linux/6.6/0170-net-ncsi-Add-NC-SI-1.2-Get-MC-MAC-Address-command.patch
similarity index 97%
rename from common/recipes-kernel/linux/6.6/0171-net-ncsi-Add-NC-SI-1.2-Get-MC-MAC-Address-command.patch
rename to common/recipes-kernel/linux/6.6/0170-net-ncsi-Add-NC-SI-1.2-Get-MC-MAC-Address-command.patch
index d42cde3e9565..d0c74f463419 100644
--- a/common/recipes-kernel/linux/6.6/0171-net-ncsi-Add-NC-SI-1.2-Get-MC-MAC-Address-command.patch
+++ b/common/recipes-kernel/linux/6.6/0170-net-ncsi-Add-NC-SI-1.2-Get-MC-MAC-Address-command.patch
@@ -1,7 +1,7 @@
-From fee75e24e5898d1493ce84644ba60d4714f5c92b Mon Sep 17 00:00:00 2001
+From 54f8ee34753ca695ad04474e874269baeefae4ef Mon Sep 17 00:00:00 2001
 From: Peter Delevoryas <peter@pjd.dev>
 Date: Tue, 20 Dec 2022 21:22:46 -0800
-Subject: [PATCH 171/171] net/ncsi: Add NC-SI 1.2 Get MC MAC Address command
+Subject: [PATCH 170/170] net/ncsi: Add NC-SI 1.2 Get MC MAC Address command
 
 This change adds support for the NC-SI 1.2 Get MC MAC Address command,
 specified here:
@@ -163,5 +163,5 @@ index 480e80e3c283..3e5e5cf7b5c9 100644
  
  int ncsi_rcv_rsp(struct sk_buff *skb, struct net_device *dev,
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0170-net-ncsi-Fix-netlink-major-minor-version-numbers.patch b/common/recipes-kernel/linux/6.6/0170-net-ncsi-Fix-netlink-major-minor-version-numbers.patch
deleted file mode 100644
index cbf275759734..000000000000
--- a/common/recipes-kernel/linux/6.6/0170-net-ncsi-Fix-netlink-major-minor-version-numbers.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From dc31e170346725b5f6463097a3010b5117dfd1af Mon Sep 17 00:00:00 2001
-From: Peter Delevoryas <peter@pjd.dev>
-Date: Tue, 20 Dec 2022 21:22:45 -0800
-Subject: [PATCH 170/171] net/ncsi: Fix netlink major/minor version numbers
-
-The netlink interface for major and minor version numbers doesn't actually
-return the major and minor version numbers.
-
-It reports a u32 that contains the (major, minor, update, alpha1)
-components as the major version number, and then alpha2 as the minor
-version number.
-
-For whatever reason, the u32 byte order was reversed (ntohl): maybe it was
-assumed that the encoded value was a single big-endian u32, and alpha2 was
-the minor version.
-
-The correct way to get the supported NC-SI version from the network
-controller is to parse the Get Version ID response as described in 8.4.44
-of the NC-SI spec[1].
-
-    Get Version ID Response Packet Format
-
-              Bits
-            +--------+--------+--------+--------+
-     Bytes  | 31..24 | 23..16 | 15..8  | 7..0   |
-    +-------+--------+--------+--------+--------+
-    | 0..15 | NC-SI Header                      |
-    +-------+--------+--------+--------+--------+
-    | 16..19| Response code   | Reason code     |
-    +-------+--------+--------+--------+--------+
-    |20..23 | Major  | Minor  | Update | Alpha1 |
-    +-------+--------+--------+--------+--------+
-    |24..27 |         reserved         | Alpha2 |
-    +-------+--------+--------+--------+--------+
-    |            .... other stuff ....          |
-
-The major, minor, and update fields are all binary-coded decimal (BCD)
-encoded [2]. The spec provides examples below the Get Version ID response
-format in section 8.4.44.1, but for practical purposes, this is an example
-from a live network card:
-
-    root@bmc:~# ncsi-util 0x15
-    NC-SI Command Response:
-    cmd: GET_VERSION_ID(0x15)
-    Response: COMMAND_COMPLETED(0x0000)  Reason: NO_ERROR(0x0000)
-    Payload length = 40
-
-    20: 0xf1 0xf1 0xf0 0x00 <<<<<<<<< (major, minor, update, alpha1)
-    24: 0x00 0x00 0x00 0x00 <<<<<<<<< (_, _, _, alpha2)
-
-    28: 0x6d 0x6c 0x78 0x30
-    32: 0x2e 0x31 0x00 0x00
-    36: 0x00 0x00 0x00 0x00
-    40: 0x16 0x1d 0x07 0xd2
-    44: 0x10 0x1d 0x15 0xb3
-    48: 0x00 0x17 0x15 0xb3
-    52: 0x00 0x00 0x81 0x19
-
-This should be parsed as "1.1.0".
-
-"f" in the upper-nibble means to ignore it, contributing zero.
-
-If both nibbles are "f", I think the whole field is supposed to be ignored.
-Major and minor are "required", meaning they're not supposed to be "ff",
-but the update field is "optional" so I think it can be ff. I think the
-simplest thing to do is just set the major and minor to zero instead of
-juggling some conditional logic or something.
-
-bcd2bin() from "include/linux/bcd.h" seems to assume both nibbles are 0-9,
-so I've provided a custom BCD decoding function.
-
-Alpha1 and alpha2 are ISO/IEC 8859-1 encoded, which just means ASCII
-characters as far as I can tell, although the full encoding table for
-non-alphabetic characters is slightly different (I think).
-
-I imagine the alpha fields are just supposed to be alphabetic characters,
-but I haven't seen any network cards actually report a non-zero value for
-either.
-
-If people wrote software against this netlink behavior, and were parsing
-the major and minor versions themselves from the u32, then this would
-definitely break their code.
-
-[1] https://www.dmtf.org/sites/default/files/standards/documents/DSP0222_1.0.0.pdf
-[2] https://en.wikipedia.org/wiki/Binary-coded_decimal
-[2] https://en.wikipedia.org/wiki/ISO/IEC_8859-1
-
-Signed-off-by: Peter Delevoryas <peter@pjd.dev>
-Fixes: 138635cc27c9 ("net/ncsi: NCSI response packet handler")
----
- net/ncsi/internal.h     |  7 +++++--
- net/ncsi/ncsi-netlink.c |  4 ++--
- net/ncsi/ncsi-pkt.h     |  7 +++++--
- net/ncsi/ncsi-rsp.c     | 26 ++++++++++++++++++++++++--
- 4 files changed, 36 insertions(+), 8 deletions(-)
-
-diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h
-index 03757e76bb6b..374412ed780b 100644
---- a/net/ncsi/internal.h
-+++ b/net/ncsi/internal.h
-@@ -105,8 +105,11 @@ enum {
- 
- 
- struct ncsi_channel_version {
--	u32 version;		/* Supported BCD encoded NCSI version */
--	u32 alpha2;		/* Supported BCD encoded NCSI version */
-+	u8   major;		/* NCSI version major */
-+	u8   minor;		/* NCSI version minor */
-+	u8   update;		/* NCSI version update */
-+	char alpha1;		/* NCSI version alpha1 */
-+	char alpha2;		/* NCSI version alpha2 */
- 	u8  fw_name[12];	/* Firmware name string                */
- 	u32 fw_version;		/* Firmware version                   */
- 	u16 pci_ids[4];		/* PCI identification                 */
-diff --git a/net/ncsi/ncsi-netlink.c b/net/ncsi/ncsi-netlink.c
-index a3a6753a1db7..2f872d064396 100644
---- a/net/ncsi/ncsi-netlink.c
-+++ b/net/ncsi/ncsi-netlink.c
-@@ -71,8 +71,8 @@ static int ncsi_write_channel_info(struct sk_buff *skb,
- 	if (nc == nc->package->preferred_channel)
- 		nla_put_flag(skb, NCSI_CHANNEL_ATTR_FORCED);
- 
--	nla_put_u32(skb, NCSI_CHANNEL_ATTR_VERSION_MAJOR, nc->version.version);
--	nla_put_u32(skb, NCSI_CHANNEL_ATTR_VERSION_MINOR, nc->version.alpha2);
-+	nla_put_u32(skb, NCSI_CHANNEL_ATTR_VERSION_MAJOR, nc->version.major);
-+	nla_put_u32(skb, NCSI_CHANNEL_ATTR_VERSION_MINOR, nc->version.minor);
- 	nla_put_string(skb, NCSI_CHANNEL_ATTR_VERSION_STR, nc->version.fw_name);
- 
- 	vid_nest = nla_nest_start_noflag(skb, NCSI_CHANNEL_ATTR_VLAN_LIST);
-diff --git a/net/ncsi/ncsi-pkt.h b/net/ncsi/ncsi-pkt.h
-index ba66c7dc3a21..c9d1da34dc4d 100644
---- a/net/ncsi/ncsi-pkt.h
-+++ b/net/ncsi/ncsi-pkt.h
-@@ -197,9 +197,12 @@ struct ncsi_rsp_gls_pkt {
- /* Get Version ID */
- struct ncsi_rsp_gvi_pkt {
- 	struct ncsi_rsp_pkt_hdr rsp;          /* Response header */
--	__be32                  ncsi_version; /* NCSI version    */
-+	unsigned char           major;        /* NCSI version major */
-+	unsigned char           minor;        /* NCSI version minor */
-+	unsigned char           update;       /* NCSI version update */
-+	unsigned char           alpha1;       /* NCSI version alpha1 */
- 	unsigned char           reserved[3];  /* Reserved        */
--	unsigned char           alpha2;       /* NCSI version    */
-+	unsigned char           alpha2;       /* NCSI version alpha2 */
- 	unsigned char           fw_name[12];  /* f/w name string */
- 	__be32                  fw_version;   /* f/w version     */
- 	__be16                  pci_ids[4];   /* PCI IDs         */
-diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
-index 069c2659074b..480e80e3c283 100644
---- a/net/ncsi/ncsi-rsp.c
-+++ b/net/ncsi/ncsi-rsp.c
-@@ -19,6 +19,19 @@
- #include "ncsi-pkt.h"
- #include "ncsi-netlink.h"
- 
-+/* Nibbles within [0xA, 0xF] add zero "0" to the returned value.
-+ * Optional fields (encoded as 0xFF) will default to zero.
-+ */
-+static u8 decode_bcd_u8(u8 x)
-+{
-+	int lo = x & 0xF;
-+	int hi = x >> 4;
-+
-+	lo = lo < 0xA ? lo : 0;
-+	hi = hi < 0xA ? hi : 0;
-+	return lo + hi * 10;
-+}
-+
- static int ncsi_validate_rsp_pkt(struct ncsi_request *nr,
- 				 unsigned short payload)
- {
-@@ -755,9 +768,18 @@ static int ncsi_rsp_handler_gvi(struct ncsi_request *nr)
- 	if (!nc)
- 		return -ENODEV;
- 
--	/* Update to channel's version info */
-+	/* Update channel's version info
-+	 *
-+	 * Major, minor, and update fields are supposed to be
-+	 * unsigned integers encoded as packed BCD.
-+	 *
-+	 * Alpha1 and alpha2 are ISO/IEC 8859-1 characters.
-+	 */
- 	ncv = &nc->version;
--	ncv->version = ntohl(rsp->ncsi_version);
-+	ncv->major = decode_bcd_u8(rsp->major);
-+	ncv->minor = decode_bcd_u8(rsp->minor);
-+	ncv->update = decode_bcd_u8(rsp->update);
-+	ncv->alpha1 = rsp->alpha1;
- 	ncv->alpha2 = rsp->alpha2;
- 	memcpy(ncv->fw_name, rsp->fw_name, 12);
- 	ncv->fw_version = ntohl(rsp->fw_version);
--- 
-2.41.0
-
diff --git a/common/recipes-kernel/linux/6.6/0171-aspeed-g6.dtsi-add-pcc-config.patch b/common/recipes-kernel/linux/6.6/0171-aspeed-g6.dtsi-add-pcc-config.patch
new file mode 100644
index 000000000000..76646c956cd9
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0171-aspeed-g6.dtsi-add-pcc-config.patch
@@ -0,0 +1,31 @@
+From 7d47836bdb09d08819a1c800dd50dae606117fbb Mon Sep 17 00:00:00 2001
+From: Peter Yin <peteryin.openbmc@gmail.com>
+Date: Wed, 13 Mar 2024 09:19:06 +0800
+Subject: [PATCH 1000/1002] meta-facebook: common: add pcc config
+
+Add PCC config in aspeed-g6.dtsi
+---
+ arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+index c4d1faade8be..53406d301a23 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
++++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+@@ -645,6 +645,13 @@ lpc_snoop: lpc-snoop@80 {
+ 					status = "disabled";
+ 				};
+ 
++				lpc_pcc: lpc-pcc@0 {
++					compatible = "aspeed,ast2600-lpc-pcc";
++					reg = <0x0 0x140>;
++					interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
++					status = "disabled";
++				};
++
+ 				lhc: lhc@a0 {
+ 					compatible = "aspeed,ast2600-lhc";
+ 					reg = <0xa0 0x24 0xc8 0x8>;
+-- 
+2.25.1
+
diff --git a/common/recipes-kernel/linux/6.6/0172-drivers-watchdog-ast2600-support-bootstatus.patch b/common/recipes-kernel/linux/6.6/0172-drivers-watchdog-ast2600-support-bootstatus.patch
new file mode 100644
index 000000000000..e4be5f025a6a
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0172-drivers-watchdog-ast2600-support-bootstatus.patch
@@ -0,0 +1,47 @@
+From f8546e41b8cdacae089600fd9be94dfa53f217d5 Mon Sep 17 00:00:00 2001
+From: Peter Yin <peteryin.openbmc@gmail.com>
+Date: Thu, 14 Mar 2024 10:30:26 +0800
+Subject: [PATCH v1] drivers: watchdog: ast2600 support bootstatus
+
+Add WDIOF_EXTERN1 bootstatus in ast2600
+
+Signed-off-by: Peter Yin <peteryin.openbmc@gmail.com>
+---
+ drivers/watchdog/aspeed_wdt.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
+index b4773a6aaf8c..8adadd394be6 100644
+--- a/drivers/watchdog/aspeed_wdt.c
++++ b/drivers/watchdog/aspeed_wdt.c
+@@ -81,6 +81,7 @@ MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table);
+ #define   WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION	BIT(0)
+ #define WDT_RESET_MASK1		0x1c
+ #define WDT_RESET_MASK2		0x20
++#define   WDT_EVENT_COUNTER_MASK       (0xFFF << 8)
+ 
+ /*
+  * WDT_RESET_WIDTH controls the characteristics of the external pulse (if
+@@ -459,8 +460,17 @@ static int aspeed_wdt_probe(struct platform_device *pdev)
+ 	}
+ 
+ 	status = readl(wdt->base + WDT_TIMEOUT_STATUS);
+-	if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY) {
+-		wdt->wdd.bootstatus = WDIOF_CARDRESET;
++
++	if (of_device_is_compatible(np, "aspeed,ast2600-wdt")) {
++		if (status & WDT_EVENT_COUNTER_MASK) {
++			/*
++			 * Reset cause by WatchDog
++			 */
++			wdt->wdd.bootstatus |= WDIOF_EXTERN1;
++		}
++	} else {
++		if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY)
++			wdt->wdd.bootstatus = WDIOF_CARDRESET;
+ 
+ 		if (of_device_is_compatible(np, "aspeed,ast2400-wdt") ||
+ 		    of_device_is_compatible(np, "aspeed,ast2500-wdt"))
+-- 
+2.25.1
+
diff --git a/common/recipes-kernel/linux/6.6/0200-mmc-sdhci-of-aspeed-add-skip_probe-module-parameter.patch b/common/recipes-kernel/linux/6.6/0200-mmc-sdhci-of-aspeed-add-skip_probe-module-parameter.patch
index af4ad7d21428..c8f6fa9a3450 100644
--- a/common/recipes-kernel/linux/6.6/0200-mmc-sdhci-of-aspeed-add-skip_probe-module-parameter.patch
+++ b/common/recipes-kernel/linux/6.6/0200-mmc-sdhci-of-aspeed-add-skip_probe-module-parameter.patch
@@ -1,4 +1,4 @@
-From 2ab9d2c079e481083b230073eaf0faaffea92661 Mon Sep 17 00:00:00 2001
+From fa8927742092c836d5baec115e3247098e8b33b5 Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Tue, 18 Oct 2022 11:38:44 -0700
 Subject: [PATCH] mmc: sdhci-of-aspeed: add "skip_probe" module parameter
@@ -24,7 +24,7 @@ T79173094):
  1 file changed, 21 insertions(+)
 
 diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
-index 25b4073f698b..587f1d2c7102 100644
+index 42d54532cabe..9919b427ad73 100644
 --- a/drivers/mmc/host/sdhci-of-aspeed.c
 +++ b/drivers/mmc/host/sdhci-of-aspeed.c
 @@ -77,6 +77,22 @@ struct aspeed_sdhci {
@@ -63,5 +63,5 @@ index 25b4073f698b..587f1d2c7102 100644
  	if (!aspeed_pdata) {
  		dev_err(&pdev->dev, "Missing platform configuration data\n");
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0201-soc-aspeed-Add-Post-Code-Control.patch b/common/recipes-kernel/linux/6.6/0201-soc-aspeed-Add-Post-Code-Control.patch
new file mode 100644
index 000000000000..e7329726c988
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0201-soc-aspeed-Add-Post-Code-Control.patch
@@ -0,0 +1,525 @@
+From 10f8bab0576886b5b2a0b56d6b9b9ba58c636f1f Mon Sep 17 00:00:00 2001
+From: Peter Yin <peteryin.openbmc@gmail.com>
+Date: Thu, 7 Dec 2023 13:04:19 +0800
+Subject: [PATCH 1/2] soc: aspeed: Add Post Code Control
+
+Add Aspeed Post Code Capture (PCC) module support.
+PCC can be used to snoop the debug code sent by the
+host through LPC I/O ports.
+
+This driver is reference from below link
+Link: https://github.com/AspeedTech-BMC/linux/blob/aspeed-master-v5.15/drivers/soc/aspeed/aspeed-lpc-pcc.c
+
+---
+ drivers/soc/aspeed/Kconfig          |   8 +
+ drivers/soc/aspeed/Makefile         |   2 +
+ drivers/soc/aspeed/aspeed-lpc-pcc.c | 469 ++++++++++++++++++++++++++++
+ 3 files changed, 479 insertions(+)
+ create mode 100644 drivers/soc/aspeed/aspeed-lpc-pcc.c
+
+diff --git a/drivers/soc/aspeed/Kconfig b/drivers/soc/aspeed/Kconfig
+index aaf4596ae4f94..6bdb6fc696bb9 100644
+--- a/drivers/soc/aspeed/Kconfig
++++ b/drivers/soc/aspeed/Kconfig
+@@ -24,6 +24,14 @@ config ASPEED_LPC_SNOOP
+ 	  allows the BMC to listen on and save the data written by
+ 	  the host to an arbitrary LPC I/O port.
+
++config ASPEED_LPC_PCC
++	tristate "Aspeed Post Code Capture support"
++	depends on ARCH_ASPEED && REGMAP && MFD_SYSCON
++	help
++	  Provides a driver to control the LPC PCC interface,
++	  allowing the BMC to snoop data bytes written by the
++	  the host to an arbitrary LPC I/O port.
++
+ config ASPEED_UART_ROUTING
+ 	tristate "ASPEED uart routing control"
+ 	select REGMAP
+diff --git a/drivers/soc/aspeed/Makefile b/drivers/soc/aspeed/Makefile
+index 5f61bb4cc36cf..803d5a21216ef 100644
+--- a/drivers/soc/aspeed/Makefile
++++ b/drivers/soc/aspeed/Makefile
+@@ -6,3 +6,5 @@ obj-$(CONFIG_ASPEED_P2A_CTRL)		+= aspeed-p2a-ctrl.o
+ obj-$(CONFIG_ASPEED_SOCINFO)		+= aspeed-socinfo.o
+ obj-$(CONFIG_ASPEED_SBC)		+= aspeed-sbc.o
+ obj-$(CONFIG_ASPEED_XDMA)		+= aspeed-xdma.o
++obj-$(CONFIG_ASPEED_LPC_PCC)		+= aspeed-lpc-pcc.o
++
+diff --git a/drivers/soc/aspeed/aspeed-lpc-pcc.c b/drivers/soc/aspeed/aspeed-lpc-pcc.c
+new file mode 100644
+index 0000000000000..e5ba0047499f9
+--- /dev/null
++++ b/drivers/soc/aspeed/aspeed-lpc-pcc.c
+@@ -0,0 +1,469 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (C) ASPEED Technology Inc.
++ */
++#include <linux/bitops.h>
++#include <linux/interrupt.h>
++#include <linux/fs.h>
++#include <linux/kfifo.h>
++#include <linux/mfd/syscon.h>
++#include <linux/miscdevice.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/of_address.h>
++#include <linux/platform_device.h>
++#include <linux/poll.h>
++#include <linux/regmap.h>
++#include <linux/dma-mapping.h>
++#include <linux/sizes.h>
++
++#define DEVICE_NAME "aspeed-lpc-pcc"
++
++#define PCCR6	0x0c4
++#define   PCCR6_DMA_CUR_ADDR		GENMASK(27, 0)
++#define PCCR4	0x0d0
++#define PCCR5	0x0d4
++#define PCCR0	0x130
++#define   PCCR0_EN_DMA_INT		BIT(31)
++#define   PCCR0_EN_DMA_MODE		BIT(14)
++#define   PCCR0_ADDR_SEL_MASK		GENMASK(13, 12)
++#define   PCCR0_ADDR_SEL_SHIFT		12
++#define   PCCR0_RX_TRIG_LVL_MASK	GENMASK(10, 8)
++#define   PCCR0_RX_TRIG_LVL_SHIFT	8
++#define   PCCR0_CLR_RX_FIFO		BIT(7)
++#define   PCCR0_MODE_SEL_MASK		GENMASK(5, 4)
++#define   PCCR0_MODE_SEL_SHIFT		4
++#define   PCCR0_EN_RX_TMOUT_INT		BIT(2)
++#define   PCCR0_EN_RX_AVAIL_INT		BIT(1)
++#define   PCCR0_EN			BIT(0)
++#define PCCR1	0x134
++#define   PCCR1_BASE_ADDR_MASK		GENMASK(15, 0)
++#define   PCCR1_BASE_ADDR_SHIFT		0
++#define   PCCR1_DONT_CARE_BITS_MASK	GENMASK(21, 16)
++#define   PCCR1_DONT_CARE_BITS_SHIFT	16
++#define PCCR2	0x138
++#define   PCCR2_DMA_DONE		BIT(4)
++#define   PCCR2_DATA_RDY		PCCR2_DMA_DONE
++#define   PCCR2_RX_TMOUT_INT		BIT(2)
++#define   PCCR2_RX_AVAIL_INT		BIT(1)
++#define PCCR3	0x13c
++#define   PCCR3_FIFO_DATA_MASK		GENMASK(7, 0)
++
++#define PCC_DMA_BUFSZ	(256 * SZ_1K)
++
++enum pcc_fifo_threshold {
++	PCC_FIFO_THR_1_BYTE,
++	PCC_FIFO_THR_1_EIGHTH,
++	PCC_FIFO_THR_2_EIGHTH,
++	PCC_FIFO_THR_3_EIGHTH,
++	PCC_FIFO_THR_4_EIGHTH,
++	PCC_FIFO_THR_5_EIGHTH,
++	PCC_FIFO_THR_6_EIGHTH,
++	PCC_FIFO_THR_7_EIGHTH,
++	PCC_FIFO_THR_8_EIGHTH,
++};
++
++enum pcc_record_mode {
++	PCC_REC_1B,
++	PCC_REC_2B,
++	PCC_REC_4B,
++	PCC_REC_FULL,
++};
++
++enum pcc_port_hbits_select {
++	PCC_PORT_HBITS_SEL_NONE,
++	PCC_PORT_HBITS_SEL_45,
++	PCC_PORT_HBITS_SEL_67,
++	PCC_PORT_HBITS_SEL_89,
++};
++
++struct aspeed_pcc_dma {
++	uint32_t rptr;
++	uint8_t *virt;
++	dma_addr_t addr;
++	uint32_t size;
++};
++
++struct aspeed_pcc {
++	struct device *dev;
++	struct regmap *regmap;
++	int irq;
++	uint32_t rec_mode;
++	uint32_t port;
++	uint32_t port_xbits;
++	uint32_t port_hbits_select;
++	uint32_t dma_mode;
++	struct aspeed_pcc_dma dma;
++	struct kfifo fifo;
++	wait_queue_head_t wq;
++	struct miscdevice misc_dev;
++	bool a2600_15;
++};
++
++static inline bool is_valid_rec_mode(uint32_t mode)
++{
++	return (mode > PCC_REC_FULL) ? false : true;
++}
++
++static inline bool is_valid_high_bits_select(uint32_t sel)
++{
++	return (sel > PCC_PORT_HBITS_SEL_89) ? false : true;
++}
++
++static ssize_t aspeed_pcc_file_read(struct file *file, char __user *buffer,
++		size_t count, loff_t *ppos)
++{
++	int rc;
++	ssize_t copied;
++
++	struct aspeed_pcc *pcc = container_of(
++			file->private_data,
++			struct aspeed_pcc,
++			misc_dev);
++
++	if (kfifo_is_empty(&pcc->fifo)) {
++		if (file->f_flags & O_NONBLOCK)
++			return -EAGAIN;
++
++		rc = wait_event_interruptible(pcc->wq,
++				!kfifo_is_empty(&pcc->fifo));
++
++		if (rc == -ERESTARTSYS)
++			return -EINTR;
++	}
++
++	rc = kfifo_to_user(&pcc->fifo, buffer, count, &copied);
++
++	return rc ? rc : copied;
++}
++
++static __poll_t aspeed_pcc_file_poll(struct file *file,
++		struct poll_table_struct *pt)
++{
++	struct aspeed_pcc *pcc = container_of(
++			file->private_data,
++			struct aspeed_pcc,
++			misc_dev);
++
++	poll_wait(file, &pcc->wq, pt);
++
++	return !kfifo_is_empty(&pcc->fifo) ? POLLIN : 0;
++}
++
++static const struct file_operations pcc_fops = {
++	.owner = THIS_MODULE,
++	.read = aspeed_pcc_file_read,
++	.poll = aspeed_pcc_file_poll,
++};
++
++static irqreturn_t aspeed_pcc_dma_isr(int irq, void *arg)
++{
++	uint32_t reg, rptr, wptr;
++	struct aspeed_pcc *pcc = (struct aspeed_pcc*)arg;
++	struct kfifo *fifo = &pcc->fifo;
++
++	regmap_read(pcc->regmap, PCCR6, &reg);
++
++	regmap_write_bits(pcc->regmap, PCCR2, PCCR2_DMA_DONE, PCCR2_DMA_DONE);
++
++	wptr = (reg & PCCR6_DMA_CUR_ADDR) - (pcc->dma.addr & PCCR6_DMA_CUR_ADDR);
++	rptr = pcc->dma.rptr;
++
++	do {
++		if (kfifo_is_full(fifo))
++			kfifo_skip(fifo);
++
++		kfifo_put(fifo, pcc->dma.virt[rptr]);
++
++		rptr = (rptr + 1) % pcc->dma.size;
++	} while (rptr != wptr);
++
++	pcc->dma.rptr = rptr;
++
++	wake_up_interruptible(&pcc->wq);
++
++	return IRQ_HANDLED;
++}
++
++static irqreturn_t aspeed_pcc_isr(int irq, void *arg)
++{
++	uint32_t sts, reg;
++	struct aspeed_pcc *pcc = (struct aspeed_pcc*)arg;
++	struct kfifo *fifo = &pcc->fifo;
++
++	regmap_read(pcc->regmap, PCCR2, &sts);
++
++	if (!(sts & (PCCR2_RX_TMOUT_INT | PCCR2_RX_AVAIL_INT | PCCR2_DMA_DONE)))
++		return IRQ_NONE;
++
++	if (pcc->dma_mode)
++		return aspeed_pcc_dma_isr(irq, arg);
++
++	while (sts & PCCR2_DATA_RDY) {
++		regmap_read(pcc->regmap, PCCR3, &reg);
++
++		if (kfifo_is_full(fifo))
++			kfifo_skip(fifo);
++
++		kfifo_put(fifo, reg & PCCR3_FIFO_DATA_MASK);
++
++		regmap_read(pcc->regmap, PCCR2, &sts);
++	}
++
++	wake_up_interruptible(&pcc->wq);
++
++	return IRQ_HANDLED;
++}
++
++/*
++ * A2600-15 AP note
++ *
++ * SW workaround to prevent generating Non-Fatal-Error (NFE)
++ * eSPI response when PCC is used for port I/O byte snooping
++ * over eSPI.
++ */
++#define SNPWADR	0x90
++#define HICR6	0x84
++#define HICRB	0x100
++static int aspeed_a2600_15(struct aspeed_pcc *pcc, struct device *dev)
++{
++	struct device_node *np;
++
++	/* abort if snoop is enabled */
++	np = of_find_compatible_node(NULL, NULL, "aspeed,ast2600-lpc-snoop");
++	if (np) {
++		if (of_device_is_available(np)) {
++			dev_err(dev, "A2600-15 should be applied with snoop disabled\n");
++			return -EPERM;
++		}
++	}
++
++	/* abort if port is not 4-bytes continuous range */
++	if (pcc->port_xbits != 0x3) {
++		dev_err(dev, "A2600-15 should be applied on 4-bytes continuous I/O address range\n");
++		return -EINVAL;
++	}
++
++	/* set SNPWADR of snoop device */
++	regmap_write(pcc->regmap, SNPWADR, pcc->port | ((pcc->port + 2) << 16));
++
++	/* set HICRB[15:14]=11b to enable ACCEPT response for SNPWADR */
++	regmap_update_bits(pcc->regmap, HICRB, BIT(14) | BIT(15), BIT(14) | BIT(15));
++
++	/* set HICR6[19] to extend SNPWADR to 2x range */
++	regmap_update_bits(pcc->regmap, HICR6, BIT(19), BIT(19));
++
++	return 0;
++}
++
++static int aspeed_pcc_enable(struct aspeed_pcc *pcc, struct device *dev)
++{
++	int rc;
++
++	if (pcc->a2600_15) {
++		rc = aspeed_a2600_15(pcc, dev);
++		if (rc)
++			return rc;
++	}
++
++	/* record mode */
++	regmap_update_bits(pcc->regmap, PCCR0,
++			PCCR0_MODE_SEL_MASK,
++			pcc->rec_mode << PCCR0_MODE_SEL_SHIFT);
++
++	/* port address */
++	regmap_update_bits(pcc->regmap, PCCR1,
++			PCCR1_BASE_ADDR_MASK,
++			pcc->port << PCCR1_BASE_ADDR_SHIFT);
++
++	/* port address high bits selection or parser control */
++	regmap_update_bits(pcc->regmap, PCCR0,
++			PCCR0_ADDR_SEL_MASK,
++			pcc->port_hbits_select << PCCR0_ADDR_SEL_SHIFT);
++
++	/* port address dont care bits */
++	regmap_update_bits(pcc->regmap, PCCR1,
++			PCCR1_DONT_CARE_BITS_MASK,
++			pcc->port_xbits << PCCR1_DONT_CARE_BITS_SHIFT);
++
++	/* set DMA ring buffer size and enable interrupts */
++	if (pcc->dma_mode) {
++		regmap_write(pcc->regmap, PCCR4, pcc->dma.addr);
++		regmap_write(pcc->regmap, PCCR5, pcc->dma.size / 4);
++		regmap_update_bits(pcc->regmap, PCCR0,
++			PCCR0_EN_DMA_INT | PCCR0_EN_DMA_MODE,
++			PCCR0_EN_DMA_INT | PCCR0_EN_DMA_MODE);
++	} else {
++		regmap_update_bits(pcc->regmap, PCCR0, PCCR0_RX_TRIG_LVL_MASK,
++				   PCC_FIFO_THR_4_EIGHTH << PCCR0_RX_TRIG_LVL_SHIFT);
++		regmap_update_bits(pcc->regmap, PCCR0,
++				   PCCR0_EN_RX_TMOUT_INT | PCCR0_EN_RX_AVAIL_INT,
++				   PCCR0_EN_RX_TMOUT_INT | PCCR0_EN_RX_AVAIL_INT);
++	}
++
++	regmap_update_bits(pcc->regmap, PCCR0, PCCR0_EN, PCCR0_EN);
++
++	return 0;
++}
++
++static int aspeed_pcc_probe(struct platform_device *pdev)
++{
++	int rc;
++	struct aspeed_pcc *pcc;
++	struct device *dev = &pdev->dev;
++	uint32_t fifo_size = PAGE_SIZE;
++
++	pcc = devm_kzalloc(&pdev->dev, sizeof(*pcc), GFP_KERNEL);
++	if (!pcc)
++		return -ENOMEM;
++
++	pcc->dev = dev;
++
++	pcc->regmap = syscon_node_to_regmap(pdev->dev.parent->of_node);
++	if (IS_ERR(pcc->regmap)) {
++		dev_err(dev, "cannot map register\n");
++		return -ENODEV;
++	}
++
++	/* disable PCC for safety */
++	regmap_update_bits(pcc->regmap, PCCR0, PCCR0_EN, 0);
++
++	rc = of_property_read_u32(dev->of_node, "port-addr", &pcc->port);
++	if (rc) {
++		dev_err(dev, "cannot get port address\n");
++		return -ENODEV;
++	}
++
++	/* optional, by default: 0 -> 1-Byte mode */
++	of_property_read_u32(dev->of_node, "rec-mode", &pcc->rec_mode);
++	if (!is_valid_rec_mode(pcc->rec_mode)) {
++		dev_err(dev, "invalid record mode: %u\n",
++				pcc->rec_mode);
++		return -EINVAL;
++	}
++
++	/* optional, by default: 0 -> no don't care bits */
++	of_property_read_u32(dev->of_node, "port-addr-xbits", &pcc->port_xbits);
++
++	/*
++	 * optional, by default: 0 -> no high address bits
++	 *
++	 * Note that when record mode is set to 1-Byte, this
++	 * property is ignored and the corresponding HW bits
++	 * behave as read/write cycle parser control with the
++	 * value set to 0b11
++	 */
++	if (pcc->rec_mode) {
++		of_property_read_u32(dev->of_node, "port-addr-hbits-select", &pcc->port_hbits_select);
++		if (!is_valid_high_bits_select(pcc->port_hbits_select)) {
++			dev_err(dev, "invalid high address bits selection: %u\n",
++				pcc->port_hbits_select);
++			return -EINVAL;
++		}
++	}
++	else
++		pcc->port_hbits_select = 0x3;
++
++	pcc->dma_mode = of_property_read_bool(dev->of_node, "dma-mode");
++	if (pcc->dma_mode) {
++		pcc->dma.size = PCC_DMA_BUFSZ;
++		pcc->dma.virt = dmam_alloc_coherent(dev,
++						    pcc->dma.size,
++						    &pcc->dma.addr,
++						    GFP_KERNEL);
++		if (!pcc->dma.virt) {
++			dev_err(dev, "cannot allocate DMA buffer\n");
++			return -ENOMEM;
++		}
++
++		fifo_size = roundup(pcc->dma.size, PAGE_SIZE);
++	}
++
++	rc = kfifo_alloc(&pcc->fifo, fifo_size, GFP_KERNEL);
++	if (rc) {
++		dev_err(dev, "cannot allocate kFIFO\n");
++		return -ENOMEM;
++	}
++
++	/* AP note A2600-15 */
++	pcc->a2600_15 = of_property_read_bool(dev->of_node, "A2600-15");
++	if (pcc->a2600_15)
++		dev_warn(dev, "A2600-15 AP note patch is selected\n");
++
++	pcc->irq = platform_get_irq(pdev, 0);
++	if (pcc->irq < 0) {
++		dev_err(dev, "cannot get IRQ\n");
++		rc = -ENODEV;
++		goto err_free_kfifo;
++	}
++
++	rc = devm_request_irq(dev, pcc->irq, aspeed_pcc_isr, 0, DEVICE_NAME, pcc);
++	if (rc < 0) {
++		dev_err(dev, "cannot request IRQ handler\n");
++		goto err_free_kfifo;
++	}
++
++	init_waitqueue_head(&pcc->wq);
++
++	pcc->misc_dev.parent = dev;
++	pcc->misc_dev.name = devm_kasprintf(dev, GFP_KERNEL, "%s", DEVICE_NAME);
++	pcc->misc_dev.fops = &pcc_fops;
++	rc = misc_register(&pcc->misc_dev);
++	if (rc) {
++		dev_err(dev, "cannot register misc device\n");
++		goto err_free_kfifo;
++	}
++
++	rc = aspeed_pcc_enable(pcc, dev);
++	if (rc) {
++		dev_err(dev, "cannot enable PCC\n");
++		goto err_dereg_mdev;
++	}
++
++	dev_set_drvdata(&pdev->dev, pcc);
++
++	dev_info(dev, "module loaded\n");
++
++	return 0;
++
++err_dereg_mdev:
++	misc_deregister(&pcc->misc_dev);
++
++err_free_kfifo:
++	kfifo_free(&pcc->fifo);
++
++	return rc;
++}
++
++static int aspeed_pcc_remove(struct platform_device *pdev)
++{
++	struct device *dev = &pdev->dev;
++	struct aspeed_pcc *pcc = dev_get_drvdata(dev);
++
++	kfifo_free(&pcc->fifo);
++	misc_deregister(&pcc->misc_dev);
++
++	return 0;
++}
++
++static const struct of_device_id aspeed_pcc_table[] = {
++	{ .compatible = "aspeed,ast2500-lpc-pcc" },
++	{ .compatible = "aspeed,ast2600-lpc-pcc" },
++	{ },
++};
++
++static struct platform_driver aspeed_pcc_driver = {
++	.driver = {
++		.name = "aspeed-pcc",
++		.of_match_table = aspeed_pcc_table,
++	},
++	.probe = aspeed_pcc_probe,
++	.remove = aspeed_pcc_remove,
++};
++
++module_platform_driver(aspeed_pcc_driver);
++
++MODULE_AUTHOR("Chia-Wei Wang <chiawei_wang@aspeedtech.com>");
++MODULE_LICENSE("GPL");
++MODULE_DESCRIPTION("Driver for Aspeed Post Code Capture");
+-- 
+2.25.1
diff --git a/common/recipes-kernel/linux/6.6/0300-To-support-MCP9600-temperature-driver.patch b/common/recipes-kernel/linux/6.6/0300-To-support-MCP9600-temperature-driver.patch
index c3cfd61a43b8..907d0ad14728 100644
--- a/common/recipes-kernel/linux/6.6/0300-To-support-MCP9600-temperature-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0300-To-support-MCP9600-temperature-driver.patch
@@ -1,4 +1,4 @@
-From 6730a3fc30df7be7f6a5bf66f65e9a25915b5b2f Mon Sep 17 00:00:00 2001
+From a3b2d1e64d24e68aba8511ded1c4a83026654057 Mon Sep 17 00:00:00 2001
 From: Peter Yin <peter.yin@quantatw.com>
 Date: Thu, 2 Nov 2023 14:52:04 +0800
 Subject: [PATCH 300/303] To support MCP9600 temperature driver
@@ -268,5 +268,5 @@ index 000000000000..46845804292b
 +MODULE_DESCRIPTION("Microchip MCP9600 thermocouple EMF converter driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0301-To-support-MP2856-VR-driver.patch b/common/recipes-kernel/linux/6.6/0301-To-support-MP2856-VR-driver.patch
index 8f6e466d8c83..29706c5ffddd 100644
--- a/common/recipes-kernel/linux/6.6/0301-To-support-MP2856-VR-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0301-To-support-MP2856-VR-driver.patch
@@ -1,4 +1,4 @@
-From 15b91b16d378d68eda6e4c4e5489f335b57be6e3 Mon Sep 17 00:00:00 2001
+From 468f691fc6cd2fbabcd15a1236f639a1dfcc96e4 Mon Sep 17 00:00:00 2001
 From: Peter Yin <peteryin.openbmc@gmail.com>
 Date: Wed, 8 Nov 2023 09:27:35 +0800
 Subject: [PATCH 301/303] To-support-MP2856-VR-driver
@@ -517,5 +517,5 @@ index 000000000000..b72a46cb6e9b
 +MODULE_LICENSE("GPL");
 +MODULE_IMPORT_NS(PMBUS);
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0302-To-support-LTC4286-LTC4287-driver.patch b/common/recipes-kernel/linux/6.6/0302-To-support-LTC4286-LTC4287-driver.patch
index c1d9104cc623..3bd261a6ef90 100644
--- a/common/recipes-kernel/linux/6.6/0302-To-support-LTC4286-LTC4287-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0302-To-support-LTC4286-LTC4287-driver.patch
@@ -1,4 +1,4 @@
-From 1551ecad1f3872e2ac646d1893da885cdc8025e3 Mon Sep 17 00:00:00 2001
+From 8651cc9a082fac261346cace2170fdfaca18d400 Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <Delphine_CC_Chiu@Wiwynn.com>
 Date: Mon, 24 Jul 2023 11:58:51 +0800
 Subject: [PATCH 302/303] To support LTC4286 LTC4287 driver
@@ -418,5 +418,5 @@ index 000000000000..32cf3946388e
 +MODULE_DESCRIPTION("PMBUS driver for LTC4286 and compatibles");
 +MODULE_LICENSE("GPL");
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0303-Kernel6v5-Support-apml-driver.patch b/common/recipes-kernel/linux/6.6/0303-Kernel6v5-Support-apml-driver.patch
index b7db7225cd53..011b25ffa32b 100644
--- a/common/recipes-kernel/linux/6.6/0303-Kernel6v5-Support-apml-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0303-Kernel6v5-Support-apml-driver.patch
@@ -1,4 +1,4 @@
-From 6d3d8333e412f2bc3393c55eea95b7cfeb342454 Mon Sep 17 00:00:00 2001
+From b1e1973b111e70051dfa91f1a4c32d64105ab60b Mon Sep 17 00:00:00 2001
 From: Peter Yin <peteryin.openbmc@gmail.com>
 Date: Fri, 24 Nov 2023 15:54:07 +0800
 Subject: [PATCH 303/303] Kernel6v5: Support apml driver
@@ -2754,5 +2754,5 @@ index 000000000000..041610925fad
 +
 +#endif /*_AMD_APML_H_*/
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0304-hwmon-Add-driver-for-Astera-Labs-PT5161L-retimer.patch b/common/recipes-kernel/linux/6.6/0304-hwmon-Add-driver-for-Astera-Labs-PT5161L-retimer.patch
new file mode 100644
index 000000000000..db6de29a29cb
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0304-hwmon-Add-driver-for-Astera-Labs-PT5161L-retimer.patch
@@ -0,0 +1,811 @@
+From 5c2ba0b2e08f5c62d87831f0d7299a1e49cd6067 Mon Sep 17 00:00:00 2001
+From: Cosmo Chou <chou.cosmo@gmail.com>
+Date: Tue, 5 Dec 2023 15:14:31 +0800
+Subject: [PATCH v6 1/1] hwmon: Add driver for Astera Labs PT5161L retimer
+
+This driver implements support for temperature monitoring of Astera Labs
+PT5161L series PCIe retimer chips.
+
+This driver implementation originates from the CSDK available at
+Link: https://github.com/facebook/openbmc/tree/helium/common/recipes-lib/retimer-v2.14
+The communication protocol utilized is based on the I2C/SMBus standard.
+
+Signed-off-by: Cosmo Chou <chou.cosmo@gmail.com>
+---
+ Documentation/hwmon/index.rst   |   1 +
+ Documentation/hwmon/pt5161l.rst |  42 ++
+ MAINTAINERS                     |   7 +
+ drivers/hwmon/Kconfig           |  10 +
+ drivers/hwmon/Makefile          |   1 +
+ drivers/hwmon/pt5161l.c         | 667 ++++++++++++++++++++++++++++++++
+ 6 files changed, 728 insertions(+)
+ create mode 100644 Documentation/hwmon/pt5161l.rst
+ create mode 100644 drivers/hwmon/pt5161l.c
+
+diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst
+index c7ed1f73ac06..9f5f215fcb2d 100644
+--- a/Documentation/hwmon/index.rst
++++ b/Documentation/hwmon/index.rst
+@@ -185,6 +185,7 @@ Hardware Monitoring Kernel Drivers
+    pmbus
+    powerz
+    powr1220
++   pt5161l
+    pxe1610
+    pwm-fan
+    q54sj108a2
+diff --git a/Documentation/hwmon/pt5161l.rst b/Documentation/hwmon/pt5161l.rst
+new file mode 100644
+index 000000000000..1b97336991ea
+--- /dev/null
++++ b/Documentation/hwmon/pt5161l.rst
+@@ -0,0 +1,42 @@
++.. SPDX-License-Identifier: GPL-2.0-or-later
++
++Kernel driver pt5161l
++=====================
++
++Supported chips:
++
++  * Astera Labs PT5161L
++
++    Prefix: 'pt5161l'
++
++    Addresses scanned: I2C 0x20 - 0x27
++
++    Datasheet: Not publicly available.
++
++Authors: Cosmo Chou <cosmo.chou@quantatw.com>
++
++Description
++-----------
++
++This driver implements support for temperature monitoring of Astera Labs
++PT5161L series PCIe retimer chips.
++
++This driver implementation originates from the CSDK available at
++https://github.com/facebook/openbmc/tree/helium/common/recipes-lib/retimer-v2.14
++The communication protocol utilized is based on the I2C/SMBus standard.
++
++Sysfs entries
++----------------
++
++================ ==============================================
++temp1_input      Measured temperature (in millidegrees Celsius)
++================ ==============================================
++
++Debugfs entries
++----------------
++
++================ ===============================
++fw_load_status   Firmware load status
++fw_ver           Firmware version of the retimer
++heartbeat_status Heartbeat status
++================ ===============================
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 960512bec428..a656b98971ca 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -17679,6 +17679,13 @@ F:	fs/pstore/
+ F:	include/linux/pstore*
+ K:	\b(pstore|ramoops)
+ 
++PT5161L HARDWARE MONITOR DRIVER
++M:	Cosmo Chou <cosmo.chou@quantatw.com>
++L:	linux-hwmon@vger.kernel.org
++S:	Maintained
++F:	Documentation/hwmon/pt5161l.rst
++F:	drivers/hwmon/pt5161l.c
++
+ PTP HARDWARE CLOCK SUPPORT
+ M:	Richard Cochran <richardcochran@gmail.com>
+ L:	netdev@vger.kernel.org
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index a608264da87d..c8d86a695f66 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -1714,6 +1714,16 @@ source "drivers/hwmon/peci/Kconfig"
+ 
+ source "drivers/hwmon/pmbus/Kconfig"
+ 
++config SENSORS_PT5161L
++	tristate "Astera Labs PT5161L PCIe retimer hardware monitoring"
++	depends on I2C
++	help
++	  If you say yes here you get support for temperature monitoring
++	  on the Astera Labs PT5161L PCIe retimer.
++
++	  This driver can also be built as a module. If so, the module
++	  will be called pt5161l.
++
+ config SENSORS_PWM_FAN
+ 	tristate "PWM fan"
+ 	depends on (PWM && OF) || COMPILE_TEST
+diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
+index 47be39af5c03..0554d3ccb09a 100644
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -180,6 +180,7 @@ obj-$(CONFIG_SENSORS_PC87427)	+= pc87427.o
+ obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
+ obj-$(CONFIG_SENSORS_POWERZ)	+= powerz.o
+ obj-$(CONFIG_SENSORS_POWR1220)  += powr1220.o
++obj-$(CONFIG_SENSORS_PT5161L)	+= pt5161l.o
+ obj-$(CONFIG_SENSORS_PWM_FAN)	+= pwm-fan.o
+ obj-$(CONFIG_SENSORS_RASPBERRYPI_HWMON)	+= raspberrypi-hwmon.o
+ obj-$(CONFIG_SENSORS_SBTSI)	+= sbtsi_temp.o
+diff --git a/drivers/hwmon/pt5161l.c b/drivers/hwmon/pt5161l.c
+new file mode 100644
+index 000000000000..60361e39c474
+--- /dev/null
++++ b/drivers/hwmon/pt5161l.c
+@@ -0,0 +1,667 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++
++#include <linux/debugfs.h>
++#include <linux/delay.h>
++#include <linux/err.h>
++#include <linux/i2c.h>
++#include <linux/init.h>
++#include <linux/hwmon.h>
++#include <linux/module.h>
++#include <linux/mutex.h>
++
++/* Aries current average temp ADC code CSR */
++#define ARIES_CURRENT_AVG_TEMP_ADC_CSR	0x42c
++
++/* Device Load check register */
++#define ARIES_CODE_LOAD_REG	0x605
++/* Value indicating FW was loaded properly, [3:1] = 3'b111 */
++#define ARIES_LOAD_CODE	0xe
++
++/* Main Micro Heartbeat register */
++#define ARIES_MM_HEARTBEAT_ADDR	0x923
++
++/* Reg offset to specify Address for MM assisted accesses */
++#define ARIES_MM_ASSIST_REG_ADDR_OFFSET	0xd99
++/* Reg offset to specify Command for MM assisted accesses */
++#define ARIES_MM_ASSIST_CMD_OFFSET	0xd9d
++/* Reg offset to MM SPARE 0 used specify Address[7:0] */
++#define ARIES_MM_ASSIST_SPARE_0_OFFSET	0xd9f
++/* Reg offset to MM SPARE 3 used specify Data Byte 0 */
++#define ARIES_MM_ASSIST_SPARE_3_OFFSET	0xda2
++/* Wide register reads */
++#define ARIES_MM_RD_WIDE_REG_2B	0x1d
++#define ARIES_MM_RD_WIDE_REG_3B	0x1e
++#define ARIES_MM_RD_WIDE_REG_4B	0x1f
++#define ARIES_MM_RD_WIDE_REG_5B	0x20
++
++/* Time delay between checking MM status of EEPROM write (microseconds) */
++#define ARIES_MM_STATUS_TIME	5000
++
++/* AL Main SRAM DMEM offset (A0) */
++#define AL_MAIN_SRAM_DMEM_OFFSET	(64 * 1024)
++/* SRAM read command */
++#define AL_TG_RD_LOC_IND_SRAM	0x16
++
++/* Offset for main micro FW info */
++#define ARIES_MAIN_MICRO_FW_INFO	(96 * 1024 - 128)
++/* FW Info (Major) offset location in struct */
++#define ARIES_MM_FW_VERSION_MAJOR	0
++/* FW Info (Minor) offset location in struct */
++#define ARIES_MM_FW_VERSION_MINOR	1
++/* FW Info (Build no.) offset location in struct */
++#define ARIES_MM_FW_VERSION_BUILD	2
++
++#define ARIES_TEMP_CAL_CODE_DEFAULT	84
++
++/* Struct defining FW version loaded on an Aries device */
++struct pt5161l_fw_ver {
++	u8 major;
++	u8 minor;
++	u16 build;
++};
++
++/* Each client has this additional data */
++struct pt5161l_data {
++	struct i2c_client *client;
++	struct dentry *debugfs;
++	struct pt5161l_fw_ver fw_ver;
++	struct mutex lock; /* for atomic I2C transactions */
++	bool init_done;
++	bool code_load_okay; /* indicate if code load reg value is expected */
++	bool mm_heartbeat_okay; /* indicate if Main Micro heartbeat is good */
++	bool mm_wide_reg_access; /* MM assisted wide register access */
++};
++
++static struct dentry *pt5161l_debugfs_dir;
++
++/*
++ * Write multiple data bytes to Aries over I2C
++ */
++static int pt5161l_write_block_data(struct pt5161l_data *data, u32 address,
++				    u8 len, u8 *val)
++{
++	struct i2c_client *client = data->client;
++	int ret;
++	u8 remain_len = len;
++	u8 xfer_len, curr_len;
++	u8 buf[16];
++	u8 cmd = 0x0F; /* [7]:pec_en, [4:2]:func, [1]:start, [0]:end */
++	u8 config = 0x40; /* [6]:cfg_type, [4:1]:burst_len, [0]:address bit16 */
++
++	while (remain_len > 0) {
++		if (remain_len > 4) {
++			curr_len = 4;
++			remain_len -= 4;
++		} else {
++			curr_len = remain_len;
++			remain_len = 0;
++		}
++
++		buf[0] = config | (curr_len - 1) << 1 | ((address >> 16) & 0x1);
++		buf[1] = (address >> 8) & 0xff;
++		buf[2] = address & 0xff;
++		memcpy(&buf[3], val, curr_len);
++
++		xfer_len = 3 + curr_len;
++		ret = i2c_smbus_write_block_data(client, cmd, xfer_len, buf);
++		if (ret)
++			return ret;
++
++		val += curr_len;
++		address += curr_len;
++	}
++
++	return 0;
++}
++
++/*
++ * Read multiple data bytes from Aries over I2C
++ */
++static int pt5161l_read_block_data(struct pt5161l_data *data, u32 address,
++				   u8 len, u8 *val)
++{
++	struct i2c_client *client = data->client;
++	int ret, tries;
++	u8 remain_len = len;
++	u8 curr_len;
++	u8 wbuf[16], rbuf[24];
++	u8 cmd = 0x08; /* [7]:pec_en, [4:2]:func, [1]:start, [0]:end */
++	u8 config = 0x00; /* [6]:cfg_type, [4:1]:burst_len, [0]:address bit16 */
++
++	while (remain_len > 0) {
++		if (remain_len > 16) {
++			curr_len = 16;
++			remain_len -= 16;
++		} else {
++			curr_len = remain_len;
++			remain_len = 0;
++		}
++
++		wbuf[0] = config | (curr_len - 1) << 1 |
++			  ((address >> 16) & 0x1);
++		wbuf[1] = (address >> 8) & 0xff;
++		wbuf[2] = address & 0xff;
++
++		for (tries = 0; tries < 3; tries++) {
++			ret = i2c_smbus_write_block_data(client, (cmd | 0x2), 3,
++							 wbuf);
++			if (ret)
++				return ret;
++
++			ret = i2c_smbus_read_block_data(client, (cmd | 0x1),
++							rbuf);
++			if (ret == curr_len)
++				break;
++		}
++		if (tries >= 3)
++			return ret;
++
++		memcpy(val, rbuf, curr_len);
++		val += curr_len;
++		address += curr_len;
++	}
++
++	return 0;
++}
++
++static int pt5161l_read_wide_reg(struct pt5161l_data *data, u32 address,
++				 u8 width, u8 *val)
++{
++	int ret, tries;
++	u8 buf[8];
++	u8 status;
++
++	/*
++	 * Safely access wide registers using mailbox method to prevent
++	 * risking conflict with Aries firmware; otherwise fallback to
++	 * legacy, less secure method.
++	 */
++	if (data->mm_wide_reg_access) {
++		buf[0] = address & 0xff;
++		buf[1] = (address >> 8) & 0xff;
++		buf[2] = (address >> 16) & 0x1;
++		ret = pt5161l_write_block_data(data,
++					       ARIES_MM_ASSIST_SPARE_0_OFFSET,
++					       3, buf);
++		if (ret)
++			return ret;
++
++		/* Set command based on width */
++		switch (width) {
++		case 2:
++			buf[0] = ARIES_MM_RD_WIDE_REG_2B;
++			break;
++		case 3:
++			buf[0] = ARIES_MM_RD_WIDE_REG_3B;
++			break;
++		case 4:
++			buf[0] = ARIES_MM_RD_WIDE_REG_4B;
++			break;
++		case 5:
++			buf[0] = ARIES_MM_RD_WIDE_REG_5B;
++			break;
++		default:
++			return -EINVAL;
++		}
++		ret = pt5161l_write_block_data(data, ARIES_MM_ASSIST_CMD_OFFSET,
++					       1, buf);
++		if (ret)
++			return ret;
++
++		status = 0xff;
++		for (tries = 0; tries < 100; tries++) {
++			ret = pt5161l_read_block_data(data,
++						      ARIES_MM_ASSIST_CMD_OFFSET,
++						      1, &status);
++			if (ret)
++				return ret;
++
++			if (status == 0)
++				break;
++
++			usleep_range(ARIES_MM_STATUS_TIME,
++				     ARIES_MM_STATUS_TIME + 1000);
++		}
++		if (status != 0)
++			return -ETIMEDOUT;
++
++		ret = pt5161l_read_block_data(data,
++					      ARIES_MM_ASSIST_SPARE_3_OFFSET,
++					      width, val);
++		if (ret)
++			return ret;
++	} else {
++		return pt5161l_read_block_data(data, address, width, val);
++	}
++
++	return 0;
++}
++
++/*
++ * Read multiple (up to eight) data bytes from micro SRAM over I2C
++ */
++static int
++pt5161l_read_block_data_main_micro_indirect(struct pt5161l_data *data,
++					    u32 address, u8 len, u8 *val)
++{
++	int ret, tries;
++	u8 buf[8];
++	u8 i, status;
++	u32 uind_offs = ARIES_MM_ASSIST_REG_ADDR_OFFSET;
++	u32 eeprom_base, eeprom_addr;
++
++	/* No multi-byte indirect support here. Hence read a byte at a time */
++	eeprom_base = address - AL_MAIN_SRAM_DMEM_OFFSET;
++	for (i = 0; i < len; i++) {
++		eeprom_addr = eeprom_base + i;
++		buf[0] = eeprom_addr & 0xff;
++		buf[1] = (eeprom_addr >> 8) & 0xff;
++		buf[2] = (eeprom_addr >> 16) & 0xff;
++		ret = pt5161l_write_block_data(data, uind_offs, 3, buf);
++		if (ret)
++			return ret;
++
++		buf[0] = AL_TG_RD_LOC_IND_SRAM;
++		ret = pt5161l_write_block_data(data, uind_offs + 4, 1, buf);
++		if (ret)
++			return ret;
++
++		status = 0xff;
++		for (tries = 0; tries < 255; tries++) {
++			ret = pt5161l_read_block_data(data, uind_offs + 4, 1,
++						      &status);
++			if (ret)
++				return ret;
++
++			if (status == 0)
++				break;
++		}
++		if (status != 0)
++			return -ETIMEDOUT;
++
++		ret = pt5161l_read_block_data(data, uind_offs + 3, 1, buf);
++		if (ret)
++			return ret;
++
++		val[i] = buf[0];
++	}
++
++	return 0;
++}
++
++/*
++ * Check firmware load status
++ */
++static int pt5161l_fw_load_check(struct pt5161l_data *data)
++{
++	int ret;
++	u8 buf[8];
++
++	ret = pt5161l_read_block_data(data, ARIES_CODE_LOAD_REG, 1, buf);
++	if (ret)
++		return ret;
++
++	if (buf[0] < ARIES_LOAD_CODE) {
++		dev_dbg(&data->client->dev,
++			"Code Load reg unexpected. Not all modules are loaded %x\n",
++			buf[0]);
++		data->code_load_okay = false;
++	} else {
++		data->code_load_okay = true;
++	}
++
++	return 0;
++}
++
++/*
++ * Check main micro heartbeat
++ */
++static int pt5161l_heartbeat_check(struct pt5161l_data *data)
++{
++	int ret, tries;
++	u8 buf[8];
++	u8 heartbeat;
++	bool hb_changed = false;
++
++	ret = pt5161l_read_block_data(data, ARIES_MM_HEARTBEAT_ADDR, 1, buf);
++	if (ret)
++		return ret;
++
++	heartbeat = buf[0];
++	for (tries = 0; tries < 100; tries++) {
++		ret = pt5161l_read_block_data(data, ARIES_MM_HEARTBEAT_ADDR, 1,
++					      buf);
++		if (ret)
++			return ret;
++
++		if (buf[0] != heartbeat) {
++			hb_changed = true;
++			break;
++		}
++	}
++	data->mm_heartbeat_okay = hb_changed;
++
++	return 0;
++}
++
++/*
++ * Check the status of firmware
++ */
++static int pt5161l_fwsts_check(struct pt5161l_data *data)
++{
++	int ret;
++	u8 buf[8];
++	u8 major = 0, minor = 0;
++	u16 build = 0;
++
++	ret = pt5161l_fw_load_check(data);
++	if (ret)
++		return ret;
++
++	ret = pt5161l_heartbeat_check(data);
++	if (ret)
++		return ret;
++
++	if (data->code_load_okay && data->mm_heartbeat_okay) {
++		ret = pt5161l_read_block_data_main_micro_indirect(data, ARIES_MAIN_MICRO_FW_INFO +
++								  ARIES_MM_FW_VERSION_MAJOR,
++								  1, &major);
++		if (ret)
++			return ret;
++
++		ret = pt5161l_read_block_data_main_micro_indirect(data, ARIES_MAIN_MICRO_FW_INFO +
++								  ARIES_MM_FW_VERSION_MINOR,
++								  1, &minor);
++		if (ret)
++			return ret;
++
++		ret = pt5161l_read_block_data_main_micro_indirect(data, ARIES_MAIN_MICRO_FW_INFO +
++								  ARIES_MM_FW_VERSION_BUILD,
++								  2, buf);
++		if (ret)
++			return ret;
++		build = buf[1] << 8 | buf[0];
++	}
++	data->fw_ver.major = major;
++	data->fw_ver.minor = minor;
++	data->fw_ver.build = build;
++
++	return 0;
++}
++
++static int pt5161l_fw_is_at_least(struct pt5161l_data *data, u8 major, u8 minor,
++				  u16 build)
++{
++	u32 ver = major << 24 | minor << 16 | build;
++	u32 curr_ver = data->fw_ver.major << 24 | data->fw_ver.minor << 16 |
++		       data->fw_ver.build;
++
++	if (curr_ver >= ver)
++		return true;
++
++	return false;
++}
++
++static int pt5161l_init_dev(struct pt5161l_data *data)
++{
++	int ret;
++
++	mutex_lock(&data->lock);
++	ret = pt5161l_fwsts_check(data);
++	mutex_unlock(&data->lock);
++	if (ret)
++		return ret;
++
++	/* Firmware 2.2.0 enables safe access to wide registers */
++	if (pt5161l_fw_is_at_least(data, 2, 2, 0))
++		data->mm_wide_reg_access = true;
++
++	data->init_done = true;
++
++	return 0;
++}
++
++static int pt5161l_read(struct device *dev, enum hwmon_sensor_types type,
++			u32 attr, int channel, long *val)
++{
++	struct pt5161l_data *data = dev_get_drvdata(dev);
++	int ret;
++	u8 buf[8];
++	long adc_code;
++
++	switch (attr) {
++	case hwmon_temp_input:
++		if (!data->init_done) {
++			ret = pt5161l_init_dev(data);
++			if (ret)
++				return ret;
++		}
++
++		mutex_lock(&data->lock);
++		ret = pt5161l_read_wide_reg(data,
++					    ARIES_CURRENT_AVG_TEMP_ADC_CSR, 4,
++					    buf);
++		mutex_unlock(&data->lock);
++		if (ret) {
++			dev_dbg(dev, "Read adc_code failed %d\n", ret);
++			return ret;
++		}
++
++		adc_code = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0];
++		if (adc_code == 0 || adc_code >= 0x3ff) {
++			dev_dbg(dev, "Invalid adc_code %lx\n", adc_code);
++			return -EIO;
++		}
++
++		*val = 110000 +
++		       ((adc_code - (ARIES_TEMP_CAL_CODE_DEFAULT + 250)) *
++			-320);
++		break;
++	default:
++		return -EOPNOTSUPP;
++	}
++
++	return 0;
++}
++
++static umode_t pt5161l_is_visible(const void *data,
++				  enum hwmon_sensor_types type, u32 attr,
++				  int channel)
++{
++	switch (attr) {
++	case hwmon_temp_input:
++		return 0444;
++	default:
++		break;
++	}
++
++	return 0;
++}
++
++static const struct hwmon_channel_info *pt5161l_info[] = {
++	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
++	NULL
++};
++
++static const struct hwmon_ops pt5161l_hwmon_ops = {
++	.is_visible = pt5161l_is_visible,
++	.read = pt5161l_read,
++};
++
++static const struct hwmon_chip_info pt5161l_chip_info = {
++	.ops = &pt5161l_hwmon_ops,
++	.info = pt5161l_info,
++};
++
++static ssize_t pt5161l_debugfs_read_fw_ver(struct file *file, char __user *buf,
++					   size_t count, loff_t *ppos)
++{
++	struct pt5161l_data *data = file->private_data;
++	int ret;
++	char ver[32];
++
++	mutex_lock(&data->lock);
++	ret = pt5161l_fwsts_check(data);
++	mutex_unlock(&data->lock);
++	if (ret)
++		return ret;
++
++	ret = snprintf(ver, sizeof(ver), "%u.%u.%u\n", data->fw_ver.major,
++		       data->fw_ver.minor, data->fw_ver.build);
++
++	return simple_read_from_buffer(buf, count, ppos, ver, ret);
++}
++
++static const struct file_operations pt5161l_debugfs_ops_fw_ver = {
++	.read = pt5161l_debugfs_read_fw_ver,
++	.open = simple_open,
++};
++
++static ssize_t pt5161l_debugfs_read_fw_load_sts(struct file *file,
++						char __user *buf, size_t count,
++						loff_t *ppos)
++{
++	struct pt5161l_data *data = file->private_data;
++	int ret;
++	bool status = false;
++	char health[16];
++
++	mutex_lock(&data->lock);
++	ret = pt5161l_fw_load_check(data);
++	mutex_unlock(&data->lock);
++	if (ret == 0)
++		status = data->code_load_okay;
++
++	ret = snprintf(health, sizeof(health), "%s\n",
++		       status ? "normal" : "abnormal");
++
++	return simple_read_from_buffer(buf, count, ppos, health, ret);
++}
++
++static const struct file_operations pt5161l_debugfs_ops_fw_load_sts = {
++	.read = pt5161l_debugfs_read_fw_load_sts,
++	.open = simple_open,
++};
++
++static ssize_t pt5161l_debugfs_read_hb_sts(struct file *file, char __user *buf,
++					   size_t count, loff_t *ppos)
++{
++	struct pt5161l_data *data = file->private_data;
++	int ret;
++	bool status = false;
++	char health[16];
++
++	mutex_lock(&data->lock);
++	ret = pt5161l_heartbeat_check(data);
++	mutex_unlock(&data->lock);
++	if (ret == 0)
++		status = data->mm_heartbeat_okay;
++
++	ret = snprintf(health, sizeof(health), "%s\n",
++		       status ? "normal" : "abnormal");
++
++	return simple_read_from_buffer(buf, count, ppos, health, ret);
++}
++
++static const struct file_operations pt5161l_debugfs_ops_hb_sts = {
++	.read = pt5161l_debugfs_read_hb_sts,
++	.open = simple_open,
++};
++
++static int pt5161l_init_debugfs(struct pt5161l_data *data)
++{
++	data->debugfs = debugfs_create_dir(dev_name(&data->client->dev),
++					   pt5161l_debugfs_dir);
++
++	debugfs_create_file("fw_ver", 0444, data->debugfs, data,
++			    &pt5161l_debugfs_ops_fw_ver);
++
++	debugfs_create_file("fw_load_status", 0444, data->debugfs, data,
++			    &pt5161l_debugfs_ops_fw_load_sts);
++
++	debugfs_create_file("heartbeat_status", 0444, data->debugfs, data,
++			    &pt5161l_debugfs_ops_hb_sts);
++
++	return 0;
++}
++
++static int pt5161l_probe(struct i2c_client *client)
++{
++	struct device *dev = &client->dev;
++	struct device *hwmon_dev;
++	struct pt5161l_data *data;
++
++	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
++	if (!data)
++		return -ENOMEM;
++
++	data->client = client;
++	mutex_init(&data->lock);
++	pt5161l_init_dev(data);
++	dev_set_drvdata(dev, data);
++
++	hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
++							 data,
++							 &pt5161l_chip_info,
++							 NULL);
++
++	pt5161l_init_debugfs(data);
++
++	return PTR_ERR_OR_ZERO(hwmon_dev);
++}
++
++static void pt5161l_remove(struct i2c_client *client)
++{
++	struct pt5161l_data *data = i2c_get_clientdata(client);
++
++	debugfs_remove_recursive(data->debugfs);
++}
++
++static const struct of_device_id __maybe_unused pt5161l_of_match[] = {
++	{ .compatible = "asteralabs,pt5161l" },
++	{},
++};
++MODULE_DEVICE_TABLE(of, pt5161l_of_match);
++
++static const struct acpi_device_id __maybe_unused pt5161l_acpi_match[] = {
++	{ "PT5161L", 0 },
++	{},
++};
++MODULE_DEVICE_TABLE(acpi, pt5161l_acpi_match);
++
++static const struct i2c_device_id pt5161l_id[] = {
++	{ "pt5161l", 0 },
++	{}
++};
++MODULE_DEVICE_TABLE(i2c, pt5161l_id);
++
++static struct i2c_driver pt5161l_driver = {
++	.class = I2C_CLASS_HWMON,
++	.driver = {
++		.name = "pt5161l",
++		.of_match_table = of_match_ptr(pt5161l_of_match),
++		.acpi_match_table = ACPI_PTR(pt5161l_acpi_match),
++	},
++	.probe = pt5161l_probe,
++	.remove = pt5161l_remove,
++	.id_table = pt5161l_id,
++};
++
++static int __init pt5161l_init(void)
++{
++	pt5161l_debugfs_dir = debugfs_create_dir("pt5161l", NULL);
++	return i2c_add_driver(&pt5161l_driver);
++}
++
++static void __exit pt5161l_exit(void)
++{
++	i2c_del_driver(&pt5161l_driver);
++	debugfs_remove_recursive(pt5161l_debugfs_dir);
++}
++
++module_init(pt5161l_init);
++module_exit(pt5161l_exit);
++
++MODULE_AUTHOR("Cosmo Chou <cosmo.chou@quantatw.com>");
++MODULE_DESCRIPTION("Hwmon driver for Astera Labs Aries PCIe retimer");
++MODULE_LICENSE("GPL");
+-- 
+2.34.1
+
diff --git a/common/recipes-kernel/linux/6.6/0310-ARM-dts-aspeed-Enable-jtag1-in-fblite-r1-dts.patch b/common/recipes-kernel/linux/6.6/0310-ARM-dts-aspeed-Enable-jtag1-in-fblite-r1-dts.patch
new file mode 100644
index 000000000000..39391e80511d
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0310-ARM-dts-aspeed-Enable-jtag1-in-fblite-r1-dts.patch
@@ -0,0 +1,33 @@
+From 6f44cf1b8ec57f660f173e7db388ec2feff8705b Mon Sep 17 00:00:00 2001
+From: Tao Ren <taoren@meta.com>
+Date: Mon, 12 Feb 2024 14:09:50 -0800
+Subject: [PATCH] ARM: dts: aspeed: Enable jtag1 in fblite-r1 dts
+
+Summary:
+
+Enable jtag1 in fblite-r1 device tree for firmware upgrade.
+
+Test Plan:
+
+1) "bitbake janga-image" succeeded.
+2) "bitbake tahan-image" succeeded.
+3) verified jtag is enabled after booting up janga and tahan.
+---
+ arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts
+index 4264bd3c7a6b..dee1f78b8ca0 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fblite-r1.dts
+@@ -92,3 +92,7 @@ flash1@0 {
+ 		};
+ 	};
+ };
++
++&jtag1 {
++	status = "okay";
++};
+-- 
+2.25.1
+
diff --git a/common/recipes-kernel/linux/6.6/0500-hwmon-Add-net_brcm-driver.patch b/common/recipes-kernel/linux/6.6/0500-hwmon-Add-net_brcm-driver.patch
index 616d3489d54f..e1581e6f9a3c 100644
--- a/common/recipes-kernel/linux/6.6/0500-hwmon-Add-net_brcm-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0500-hwmon-Add-net_brcm-driver.patch
@@ -1,4 +1,4 @@
-From 65b003a8bfab4eccc23a311feee76338597d4146 Mon Sep 17 00:00:00 2001
+From cc9bb556b267b1437a92b721781353f1cd791f0f Mon Sep 17 00:00:00 2001
 From: Tao Ren <taoren@fb.com>
 Date: Thu, 8 Apr 2021 15:23:48 -0700
 Subject: [PATCH 500/501] hwmon: Add net_brcm driver
@@ -30,10 +30,10 @@ Signature: 27585349:1617733366:5443ecb847967f7725c2d8d6416b357b37ac4f28
  create mode 100644 drivers/hwmon/net_brcm.c
 
 diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
-index 307477b8a371..91517f3d62d4 100644
+index cdde5a2a4d90..15f3d1d3bc9c 100644
 --- a/drivers/hwmon/Kconfig
 +++ b/drivers/hwmon/Kconfig
-@@ -1597,6 +1597,16 @@ config SENSORS_NCT7904
+@@ -1618,6 +1618,16 @@ config SENSORS_NCT7904
  	  This driver can also be built as a module. If so, the module
  	  will be called nct7904.
  
@@ -51,10 +51,10 @@ index 307477b8a371..91517f3d62d4 100644
  	tristate "Nuvoton NPCM750 and compatible PWM and Fan controllers"
  	imply THERMAL
 diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
-index 3f4b0fda0998..6617f250ed41 100644
+index 774eba4960d6..344c84fa6c84 100644
 --- a/drivers/hwmon/Makefile
 +++ b/drivers/hwmon/Makefile
-@@ -166,6 +166,7 @@ obj-$(CONFIG_SENSORS_NCT6775)	+= nct6775.o
+@@ -168,6 +168,7 @@ obj-$(CONFIG_SENSORS_NCT6775)	+= nct6775.o
  obj-$(CONFIG_SENSORS_NCT6775_I2C) += nct6775-i2c.o
  obj-$(CONFIG_SENSORS_NCT7802)	+= nct7802.o
  obj-$(CONFIG_SENSORS_NCT7904)	+= nct7904.o
@@ -297,5 +297,5 @@ index 000000000000..638a4ab7d7cf
 +MODULE_DESCRIPTION("NET_BRCM Driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0501-hwmon-pmbus-Add-xdpe132g5c-driver.patch b/common/recipes-kernel/linux/6.6/0501-hwmon-pmbus-Add-xdpe132g5c-driver.patch
index 57e10b73763b..cc7f92dfc1ac 100644
--- a/common/recipes-kernel/linux/6.6/0501-hwmon-pmbus-Add-xdpe132g5c-driver.patch
+++ b/common/recipes-kernel/linux/6.6/0501-hwmon-pmbus-Add-xdpe132g5c-driver.patch
@@ -1,4 +1,4 @@
-From e02c3ffdc5b203642c0e5a63ca0888adf1cfa5c3 Mon Sep 17 00:00:00 2001
+From 7941d14f1ed5345693e322bb51ab118680ba39f5 Mon Sep 17 00:00:00 2001
 From: "karthik.gengan" <gengankarthik@gmail.com>
 Date: Fri, 4 Nov 2022 06:31:37 +0000
 Subject: [PATCH 501/501] hwmon: (pmbus) Add xdpe132g5c driver
@@ -17,10 +17,10 @@ This patch is needed by wedge400 and fuji.
  create mode 100644 drivers/hwmon/pmbus/xdpe132g5c.c
 
 diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
-index 270b6336b76d..afa849304176 100644
+index 294808f5240a..617d45295bb3 100644
 --- a/drivers/hwmon/pmbus/Kconfig
 +++ b/drivers/hwmon/pmbus/Kconfig
-@@ -491,6 +491,15 @@ config SENSORS_XDPE122_REGULATOR
+@@ -526,6 +526,15 @@ config SENSORS_XDPE122_REGULATOR
  	help
  	  Uses the xdpe12284 or compatible as regulator.
  
@@ -37,10 +37,10 @@ index 270b6336b76d..afa849304176 100644
  	tristate "Intersil ZL6100 and compatibles"
  	help
 diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile
-index 84ee960a6c2d..6f099bc88da3 100644
+index cf8a76744545..f626db4e99e9 100644
 --- a/drivers/hwmon/pmbus/Makefile
 +++ b/drivers/hwmon/pmbus/Makefile
-@@ -49,5 +49,6 @@ obj-$(CONFIG_SENSORS_UCD9000)	+= ucd9000.o
+@@ -52,5 +52,6 @@ obj-$(CONFIG_SENSORS_UCD9000)	+= ucd9000.o
  obj-$(CONFIG_SENSORS_UCD9200)	+= ucd9200.o
  obj-$(CONFIG_SENSORS_XDPE122)	+= xdpe12284.o
  obj-$(CONFIG_SENSORS_XDPE152)	+= xdpe152c4.o
@@ -256,5 +256,5 @@ index 000000000000..d39bb63565da
 +MODULE_LICENSE("GPL");
 +MODULE_IMPORT_NS(PMBUS);
 -- 
-2.39.3
+2.43.0
 
diff --git a/common/recipes-kernel/linux/6.6/0503-Revert-usb-gadget-f_ecm-Add-suspend-resume-and-remot.patch b/common/recipes-kernel/linux/6.6/0503-Revert-usb-gadget-f_ecm-Add-suspend-resume-and-remot.patch
new file mode 100644
index 000000000000..aa41a3c9f776
--- /dev/null
+++ b/common/recipes-kernel/linux/6.6/0503-Revert-usb-gadget-f_ecm-Add-suspend-resume-and-remot.patch
@@ -0,0 +1,178 @@
+From 4081a6b8adf3d661144aa7abd644580d4290116c Mon Sep 17 00:00:00 2001
+From: Tao Ren <taoren@meta.com>
+Date: Mon, 12 Feb 2024 11:31:14 +0700
+Subject: Revert linux kernel patch usb: gadget: f_ecm: Add suspend/resume and remote wakeup support
+(https://github.com/torvalds/linux/commit/0a1af6dfa0772ffedaef422127f1338fa0ddfed3).
+
+The above patch added suspend/resume support to USB gadgets.
+After this patch was added ping fails between COMe and USB0 fails over the USB ethernet interface 
+if the COMe is boots up after BMC.
+
+Till a proper root-cause is found, 
+as temporary patch the above patch is reverted.
+
+---
+ drivers/usb/gadget/function/f_ecm.c   | 22 ----------
+ drivers/usb/gadget/function/u_ether.c | 63 ---------------------------
+ drivers/usb/gadget/function/u_ether.h |  4 --
+ 3 files changed, 89 deletions(-)
+
+diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
+index f55f60639e42..d1b9e3831578 100644
+--- a/drivers/usb/gadget/function/f_ecm.c
++++ b/drivers/usb/gadget/function/f_ecm.c
+@@ -872,26 +872,6 @@ static struct usb_function_instance *ecm_alloc_inst(void)
+ 	return &opts->func_inst;
+ }
+ 
+-static void ecm_suspend(struct usb_function *f)
+-{
+-	struct f_ecm *ecm = func_to_ecm(f);
+-	struct usb_composite_dev *cdev = ecm->port.func.config->cdev;
+-
+-	DBG(cdev, "ECM Suspend\n");
+-
+-	gether_suspend(&ecm->port);
+-}
+-
+-static void ecm_resume(struct usb_function *f)
+-{
+-	struct f_ecm *ecm = func_to_ecm(f);
+-	struct usb_composite_dev *cdev = ecm->port.func.config->cdev;
+-
+-	DBG(cdev, "ECM Resume\n");
+-
+-	gether_resume(&ecm->port);
+-}
+-
+ static void ecm_free(struct usb_function *f)
+ {
+ 	struct f_ecm *ecm;
+@@ -959,8 +939,6 @@ static struct usb_function *ecm_alloc(struct usb_function_instance *fi)
+ 	ecm->port.func.setup = ecm_setup;
+ 	ecm->port.func.disable = ecm_disable;
+ 	ecm->port.func.free_func = ecm_free;
+-	ecm->port.func.suspend = ecm_suspend;
+-	ecm->port.func.resume = ecm_resume;
+ 
+ 	return &ecm->port.func;
+ }
+diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
+index 4bb0553da658..74222f1788f8 100644
+--- a/drivers/usb/gadget/function/u_ether.c
++++ b/drivers/usb/gadget/function/u_ether.c
+@@ -437,20 +437,6 @@ static inline int is_promisc(u16 cdc_filter)
+ 	return cdc_filter & USB_CDC_PACKET_TYPE_PROMISCUOUS;
+ }
+ 
+-static int ether_wakeup_host(struct gether *port)
+-{
+-	int			ret;
+-	struct usb_function	*func = &port->func;
+-	struct usb_gadget	*gadget = func->config->cdev->gadget;
+-
+-	if (func->func_suspended)
+-		ret = usb_func_wakeup(func);
+-	else
+-		ret = usb_gadget_wakeup(gadget);
+-
+-	return ret;
+-}
+-
+ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
+ 					struct net_device *net)
+ {
+@@ -470,15 +456,6 @@ static netdev_tx_t eth_start_xmit(struct sk_buff *skb,
+ 		in = NULL;
+ 		cdc_filter = 0;
+ 	}
+-
+-	if (dev->port_usb && dev->port_usb->is_suspend) {
+-		DBG(dev, "Port suspended. Triggering wakeup\n");
+-		netif_stop_queue(net);
+-		spin_unlock_irqrestore(&dev->lock, flags);
+-		ether_wakeup_host(dev->port_usb);
+-		return NETDEV_TX_BUSY;
+-	}
+-
+ 	spin_unlock_irqrestore(&dev->lock, flags);
+ 
+ 	if (!in) {
+@@ -1039,45 +1016,6 @@ int gether_set_ifname(struct net_device *net, const char *name, int len)
+ }
+ EXPORT_SYMBOL_GPL(gether_set_ifname);
+ 
+-void gether_suspend(struct gether *link)
+-{
+-	struct eth_dev *dev = link->ioport;
+-	unsigned long flags;
+-
+-	if (!dev)
+-		return;
+-
+-	if (atomic_read(&dev->tx_qlen)) {
+-		/*
+-		 * There is a transfer in progress. So we trigger a remote
+-		 * wakeup to inform the host.
+-		 */
+-		ether_wakeup_host(dev->port_usb);
+-		return;
+-	}
+-	spin_lock_irqsave(&dev->lock, flags);
+-	link->is_suspend = true;
+-	spin_unlock_irqrestore(&dev->lock, flags);
+-}
+-EXPORT_SYMBOL_GPL(gether_suspend);
+-
+-void gether_resume(struct gether *link)
+-{
+-	struct eth_dev *dev = link->ioport;
+-	unsigned long flags;
+-
+-	if (!dev)
+-		return;
+-
+-	if (netif_queue_stopped(dev->net))
+-		netif_start_queue(dev->net);
+-
+-	spin_lock_irqsave(&dev->lock, flags);
+-	link->is_suspend = false;
+-	spin_unlock_irqrestore(&dev->lock, flags);
+-}
+-EXPORT_SYMBOL_GPL(gether_resume);
+-
+ /*
+  * gether_cleanup - remove Ethernet-over-USB device
+  * Context: may sleep
+@@ -1240,7 +1178,6 @@ void gether_disconnect(struct gether *link)
+ 
+ 	spin_lock(&dev->lock);
+ 	dev->port_usb = NULL;
+-	link->is_suspend = false;
+ 	spin_unlock(&dev->lock);
+ }
+ EXPORT_SYMBOL_GPL(gether_disconnect);
+diff --git a/drivers/usb/gadget/function/u_ether.h b/drivers/usb/gadget/function/u_ether.h
+index 34be220cef77..d8df29b31fd7 100644
+--- a/drivers/usb/gadget/function/u_ether.h
++++ b/drivers/usb/gadget/function/u_ether.h
+@@ -79,7 +79,6 @@ struct gether {
+ 	/* called on network open/close */
+ 	void				(*open)(struct gether *);
+ 	void				(*close)(struct gether *);
+-	bool				is_suspend;
+ };
+ 
+ #define	DEFAULT_FILTER	(USB_CDC_PACKET_TYPE_BROADCAST \
+@@ -259,9 +258,6 @@ int gether_set_ifname(struct net_device *net, const char *name, int len);
+ 
+ void gether_cleanup(struct eth_dev *dev);
+ 
+-void gether_suspend(struct gether *link);
+-void gether_resume(struct gether *link);
+-
+ /* connect/disconnect is handled by individual functions */
+ struct net_device *gether_connect(struct gether *);
+ void gether_disconnect(struct gether *);
+-- 
+2.25.1
diff --git a/common/recipes-kernel/linux/linux-patches-6.6.inc b/common/recipes-kernel/linux/linux-patches-6.6.inc
index daf4a8359b16..5a41e937631b 100644
--- a/common/recipes-kernel/linux/linux-patches-6.6.inc
+++ b/common/recipes-kernel/linux/linux-patches-6.6.inc
@@ -1,5 +1,16 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/6.6:"
 
+#
+# Patches to be upstreamed soon.
+#
+SRC_URI:append = " \
+    file://0001-ARM-dts-aspeed-Remove-eMMC-from-ast2600-facebook-net.patch \
+    file://0002-ARM-dts-aspeed-elbert-Enable-eMMC-device.patch \
+    file://0003-ARM-dts-aspeed-fuji-Enable-eMMC-device.patch \
+    file://0004-ARM-dts-aspeed-remove-cloudripper-dts.patch \
+    file://0005-ARM-dts-aspeed-Add-Facebook-fblite-r1-BMC.patch \
+"
+
 #
 # JFFS2 patches to workaround kernel panic.
 # Highly recommended for all the OpenBMC platforms running JFFS2.
@@ -74,8 +85,9 @@ SRC_URI:append = " \
 #
 SRC_URI:append = " \
     file://0169-net-ncsi-Simplify-Kconfig-dts-control-flow.patch \
-    file://0170-net-ncsi-Fix-netlink-major-minor-version-numbers.patch \
-    file://0171-net-ncsi-Add-NC-SI-1.2-Get-MC-MAC-Address-command.patch \
+    file://0170-net-ncsi-Add-NC-SI-1.2-Get-MC-MAC-Address-command.patch \
+    file://0171-aspeed-g6.dtsi-add-pcc-config.patch \
+    file://0172-drivers-watchdog-ast2600-support-bootstatus.patch \
 "
 
 #
@@ -84,6 +96,14 @@ SRC_URI:append = " \
 SRC_URI:append = " \
     file://0200-mmc-sdhci-of-aspeed-add-skip_probe-module-parameter.patch \
 "
+
+#
+# Aspeed Soc drivers used by multiple OpenBMC platforms.
+#
+SRC_URI:append = " \
+    file://0201-soc-aspeed-Add-Post-Code-Control.patch \
+"
+
 #
 # Device drvier for OpenBMC platforms.
 #
@@ -92,4 +112,17 @@ SRC_URI:append = " \
     file://0301-To-support-MP2856-VR-driver.patch \
     file://0302-To-support-LTC4286-LTC4287-driver.patch \
     file://0303-Kernel6v5-Support-apml-driver.patch \
+    file://0304-hwmon-Add-driver-for-Astera-Labs-PT5161L-retimer.patch \
+"
+
+#
+# Enable JTAG in "fblite-r1" dts (patch #0005) to support the recovery
+# path (programming CPLD) in OpenBMC.
+#
+SRC_URI:append = " \
+    file://0310-ARM-dts-aspeed-Enable-jtag1-in-fblite-r1-dts.patch \
+"
+
+SRC_URI:append = " \
+    file://0503-Revert-usb-gadget-f_ecm-Add-suspend-resume-and-remot.patch \
 "
diff --git a/common/recipes-lfopenbmc/.clang-format b/common/recipes-lfopenbmc/.clang-format
new file mode 100644
index 000000000000..d43e884dbbb3
--- /dev/null
+++ b/common/recipes-lfopenbmc/.clang-format
@@ -0,0 +1,135 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:  Align
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 1
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: true
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: None
+BraceWrapping:
+  AfterCaseLabel:  true
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterExternBlock: true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     true
+  BeforeElse:      true
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction:   false
+  SplitEmptyRecord:     false
+  SplitEmptyNamespace:  false
+BreakAfterAttributes: Never
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterColon
+BreakStringLiterals: false
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '^[<"](gtest|gmock)'
+    Priority:        7
+  - Regex:           '^"config.h"'
+    Priority:        -1
+  - Regex:           '^".*\.h"'
+    Priority:        1
+  - Regex:           '^".*\.hpp"'
+    Priority:        2
+  - Regex:           '^<.*\.h>'
+    Priority:        3
+  - Regex:           '^<.*\.hpp>'
+    Priority:        4
+  - Regex:           '^<.*'
+    Priority:        5
+  - Regex:           '.*'
+    Priority:        6
+IndentCaseLabels: true
+IndentExternBlock: NoIndent
+IndentRequiresClause: true
+IndentWidth:     4
+IndentWrappedFunctionNames: true
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: OuterScope
+LineEnding: LF
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
+PenaltyBreakAssignment: 25
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Left
+QualifierAlignment: Left
+ReferenceAlignment: Left
+ReflowComments:  true
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: Keyword
+SortIncludes: CaseSensitive
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: Never
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Latest
+TabWidth:        4
+UseTab:          Never
+...
+
diff --git a/common/recipes-lfopenbmc/mfg-tool/README.md b/common/recipes-lfopenbmc/mfg-tool/README.md
new file mode 100644
index 000000000000..fc3234a5cb6c
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/README.md
@@ -0,0 +1,1802 @@
+# mfg-tool
+
+mfg-tool is a command-line tool specifically designed for manufacturing and testing purposes on OpenBMC platforms.<br><br>
+ It provides various subcommands to perform different tasks, such as displaying sensor values, setting fan speeds, and manipulating fan modes, among others.<br><br>
+This tool leverages the sdbusplus library and system APIs and libraries to interact with the D-Bus interface and modify behavior as needed.
+
+## Usage
+
+To run mfg-tool, log in to the BMC system and execute the following command:
+
+```bash
+$ mfg-tool <subcommand> [options]
+```
+
+To see the available subcommands and options, run the following command:
+
+```bash
+$ mfg-tool --help
+```
+
+## Subcommands
+
+mfg-tool supports the following subcommands:
+
+- `sensor-display`: Displays the sensor values of the BMC system.
+- `power-state`: Shows the current power state of the host system.
+- `power-control`: Controls the power state of the host system.
+- `log-resolve`: Resolves the log entries of the BMC system.
+- `log-display`: Displays the log entries of the BMC system.
+- `log-clear`: Clears the log entries of the BMC system.
+- `inventory`: Shows the inventory information of the BMC system.
+- `fan-speed`: Displays and adjust the fan speeds of the BMC system.
+- `fan-mode`: Displays and manipulating the fan mode of the BMC system.
+- `bmc-arch`: Shows the architecture of the BMC system.
+
+## 1. sensor-display
+
+The `sensor-display` subcommand provides an overview of data from all sensors on the BMC system, including temperature, voltage, power, and more.  
+For instance, when executed on YV4, it will present details about sensors linked to the Spider Board, Management Board, Medusa Board, Fan Board, Sentinel Dome, and Waluia Falls.  
+It retrieves a wide range of sensor properties and presents them in a structured format.
+
+### Usage
+
+To use the `sensor-display` subcommand, execute the following command:
+
+```bash
+$ mfg-tool sensor-display
+```
+
+### Output
+
+The output will resemble the following:
+
+```bash
+{
+    "CPU": {
+        "critical": {
+            "high": 90.0
+        },
+        "max": 100.0,
+        "min": 0.0,
+        "status": "ok",
+        "unit": "Percent",
+        "value": 15.872707100551539,
+        "warning": {
+            "high": 80.0
+        }
+    },
+    "FANBOARD0_ADC_3V3_STBY_VOLT_V": {
+        "critical": {
+            "high": 3.432,
+            "low": 3.168
+        },
+        "hard-shutdown": {
+            "high": 3.83,
+            "low": 2.64
+        },
+        "max": 255.0,
+        "min": 0.0,
+        "status": "ok",
+        "unit": "Volts",
+        "value": 3.31,
+        "warning": {
+            "high": 3.399,
+            "low": 3.201
+        }
+    },
+    "MB_ADC_P12V_DIMM_0_VOLT_V_38_40": {
+        "critical": {
+            "high": 14.214,
+            "low": 9.894
+        },
+        "max": 13.8,
+        "min": 10.200000000000001,
+        "status": "ok",
+        "unit": "Volts",
+        "value": 11.939,
+        "warning": {
+            "high": 14.076,
+            "low": 9.996
+        }
+    },
+    "MEDUSA_12VDELTA3_CURR_A": {
+        "critical": {
+            "high": 116.919
+        },
+        "hard-shutdown": {
+            "high": 130.0
+        },
+        "max": 255.0,
+        "min": 0.0,
+        "status": "ok",
+        "unit": "Amperes",
+        "value": -1.0,
+        "warning": {
+            "high": 111.6045
+        }
+    },
+    "MGNT_P5V_VOLT_V": {
+        "critical": {
+            "high": 5.55,
+            "low": 4.45
+        },
+        "max": 6.624954120108078,
+        "min": 0.0,
+        "status": "ok",
+        "unit": "Volts",
+        "value": 5.0939,
+        "warning": {
+            "high": 5.5,
+            "low": 4.5
+        }
+    },
+    "Memory": {
+        "critical": {
+            "high": 85.0
+        },
+        "max": 100.0,
+        "min": 0.0,
+        "status": "ok",
+        "unit": "Percent",
+        "value": 50.70193584984709,
+        "warning": {
+            "high": 70.0
+        }
+    },
+    "SPIDER_INA233_12V_NIC0_PWR_W": {
+        "critical": {
+            "high": 56.375
+        },
+        "hard-shutdown": {
+            "high": 67.5
+        },
+        "max": 3000.0,
+        "min": 0.0,
+        "status": "ok",
+        "unit": "Watts",
+        "value": 0.0,
+        "warning": {
+            "high": 53.8125
+        }
+    },
+    "WF_INA233_P12V_E1S_0_L_CURR_A_65_42": {
+        "critical": {
+            "high": 0.0,
+            "low": 0.0
+        },
+        "max": 0.0,
+        "min": 0.0,
+        "status": "ok",
+        "unit": "Amperes",
+        "value": 0.0,
+        "warning": {
+            "high": 0.0,
+            "low": 0.0
+        }
+    },
+    ...
+    }
+}
+```
+
+It includes the following information for each sensor:
+
+- The name of the sensor.  
+- `hard-shutdown`, `critical`, and `warning`: These fields contain the high and low thresholds for the corresponding sensor states. If the sensor reading crosses a threshold, the sensor status is updated accordingly.
+- `max` and `min`: The maximum and minimum values that the sensor can measure.
+- `status`: The status of the sensor, which can be “ok”, “warning”, “critical”, or “unavailable”.
+- `unit`: The unit of measurement for the sensor reading.
+- `value`: The current reading of the sensor.
+
+
+
+## 2. power-state
+
+The `power-state` subcommand displays the current power state of both the host system and the chassis.   
+It checks the system’s power status and reports the operational state of the host and the power state of the chassis.
+
+### Usage
+
+To use the `power-state` subcommand, execute the following command:
+
+```bash
+$ mfg-tool power-state
+```
+
+### Output
+
+The output will resemable the following:
+
+```bash
+{
+    "0": {
+        "standby": "off"
+    },
+    "1": {
+        "runtime": "transition-on",
+        "standby": "off"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+It includes the following information:
+
+- The number of the device: : This corresponds to the slot numbers 1-8.    
+- `runtime`: The operational state of the host system. This indicates whether the host system is running (“on”), off (“off”), or transitioning to these states (“transition-on” or "transition-off").  
+- `standby`: The power state of the chassis. This reflects whether the power of the physical server enclosure is on("on"), off("off'), or transitioning to these states (“transition-on” or transition-off").  
+ 
+ 
+## 3. power-control
+
+The `power-control` subcommand manipulates the power state of both the host system and the chassis.  
+It enables the user to specify an action and a scope to perform the action on.
+
+### Usage
+
+To use the `power-control` subcommand, execute the following command:
+
+```bash
+$ mfg-tool power-control -p <position> -a <action> -s <scope>
+```
+
+### Options
+
+- `-p, --position <position>`: The position of the device. This is a required parameter.  
+- `-a, --action <action>`: The control action (e.g., on, off, or cycle). This is a required parameter.  
+- `-s, --scope <scope>`: The scope of the action (e.g., runtime, standby, or acpi). This is a required parameter.   
+
+### Example
+
+**(1) Host powers on**
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "transition-off"
+    },
+    "1": {
+        "runtime": "off",
+        "standby": "transition-on"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+#### Host power on in slot 1
+
+- Command
+
+```bash
+$ mfg-tool power-control -p 1 -a on -s runtime
+```
+
+- Output
+
+```bash
+"success"
+```
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "transition-off"
+    },
+    "1": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+
+**(2) Host powers off**
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "transition-off"
+    },
+    "1": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+#### Host power off in slot 4
+
+- Command
+
+```bash
+$ mfg-tool power-control -p 4 -a off -s runtime
+```
+
+- Output
+
+```bash
+"success"
+```
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "transition-off"
+    },
+    "1": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "4": {
+        "runtime": "off",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+
+**(3) Host powers cycle**
+
+
+#### Check current power state
+
+- Command 
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "transition-off"
+    },
+    "1": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+#### Host power cycle in slot 4
+
+- Command
+
+```bash
+$ mfg-tool -p 4 -a cycle -s runtime
+```
+
+- Output
+
+```bash
+"success"
+
+```
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "transition-off"
+    },
+    "1": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+
+**(4) Host power reset**
+
+#### Check current power state
+
+- Command 
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "off"
+    },
+    "1": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "2": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "3": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "6": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "on",
+        "standby": "on"
+    }
+}
+```
+
+#### Host power reset in slot 1
+
+- Command
+
+```bash
+$ mfg-tool power-control -p 1 -a cycle -s acpi
+
+```
+
+- Output
+
+```bash
+"success"
+```
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "off"
+    },
+    "1": {
+        "runtime": "off",
+        "standby": "on"
+    },
+    "2": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "3": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "6": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "on",
+        "standby": "on"
+    }
+}
+```
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "off"
+    },
+    "1": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "2": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "3": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "6": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "on",
+        "standby": "on"
+    }
+}
+```
+
+
+**(5) 12V powers on**
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "off"
+    },
+    "1": {
+        "runtime": "off",
+        "standby": "off"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "off"
+    },
+    "3": {
+        "runtime": "off",
+        "standby": "off"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+#### Chassis power on in slot 2
+
+- Command
+
+```bash
+$ mfg-tool power-control -p 2 -a on -s standby
+```
+
+- Output
+
+```bash
+"success"
+```
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output
+
+```bash
+{
+    "0": {
+        "standby": "off"
+    },
+    "1": {
+        "runtime": "off",
+        "standby": "off"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "off",
+        "standby": "off"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+
+**(6) 12V powers off**
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+- Output:
+
+```bash
+{
+    "0": {
+        "standby": "off"
+    },
+    "1": {
+        "runtime": "off",
+        "standby": "off"
+    },
+    "2": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "3": {
+        "runtime": "off",
+        "standby": "off"
+    },
+    "4": {
+        "runtime": "on",
+        "standby": "on"
+    },
+    "5": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "6": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "7": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    },
+    "8": {
+        "runtime": "transition-on",
+        "standby": "transition-on"
+    }
+}
+```
+
+#### Chassis power off in slot 4
+
+- Command
+
+```bash
+$ mfg-tool power-control -p 4 -a off -c standby
+```
+
+- Output
+
+```bash
+"success"
+```
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+- Output
+
+***TBD***
+
+
+**(7) 12V powers cycle**
+
+#### Check current power state
+
+- Command
+
+```bash
+$ mfg-tool power-state
+```
+
+***TBD***
+
+
+**(8) Sled cycle**
+
+
+- Command
+
+```bash
+$ mfg-tool power-control -p 0 -a cycle -s standby
+```
+
+
+
+## 4. log-resolve
+
+The `log-resolve` subcommand resolves a specified log entry.  
+It enables the user to specify a log entry ID, and it will mark that log entry as resolved.
+
+### Usage
+
+To use the `log-resolve` subcommand, execute the following command:
+
+```bash
+$ mfg-tool log-resolve -i <id>
+```
+
+### Options
+
+- `-i, --id <id>`: The ID of the log entry. This is a required parameter.
+
+### Note 
+
+After resolving the log, you can verify the resolution by using the following command:
+
+```bash
+$ mfg-tool log-display
+```
+
+In the output, the `resolved` field for the corresponding log entry should now be `true`.
+
+### Example
+
+Check current log entries
+
+- Command
+
+```bash
+$ mfg-tool log-display
+```
+
+- Output
+
+``` bash
+{
+    "1": {
+        "additional_data": [
+            "NUM_LOGS=1"
+        ],
+        "event_id": "",
+        "message": "xyz.openbmc_project.Logging.Error.LogsCleared",
+        "resolution": "",
+        "resolved": true,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Informational",
+        "timestamp": "2024-02-21T05:17:52.106000000Z",
+        "updated_timestamp": "2024-02-21T05:23:13.772000000Z"
+    },
+    "125": {
+        "additional_data": [
+            "DIRECTION=low",
+            "EVENT=critical low",
+            "READING=0.000000",
+            "SENSOR_PATH=/xyz/openbmc_project/sensors/voltage/SPIDER_INA233_12V_NIC3_VOLT_V",
+            "THRESHOLD=11.500000"
+        ],
+        "event_id": "",
+        "message": "SPIDER_INA233_12V_NIC3_VOLT_V critical low threshold assert. Reading=0.000000 Threshold=11.500000.",
+        "resolution": "",
+        "resolved": false,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Critical",
+        "timestamp": "2024-02-21T05:57:05.637000000Z",
+        "updated_timestamp": "2024-02-21T05:57:05.637000000Z"
+    }
+}
+```
+
+Resolve the log entry with ID 125
+
+- Command
+
+```bash
+$ mfg-tool log-resolve -i 125
+```
+
+- Output
+
+```bash
+"success"
+```
+
+Check current log entries
+
+- Command
+
+```bash
+$ mfg-tool log-display
+```
+
+- Output
+
+```bash
+{
+    "1": {
+        "additional_data": [
+            "NUM_LOGS=1"
+        ],
+        "event_id": "",
+        "message": "xyz.openbmc_project.Logging.Error.LogsCleared",
+        "resolution": "",
+        "resolved": true,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Informational",
+        "timestamp": "2024-02-21T05:17:52.106000000Z",
+        "updated_timestamp": "2024-02-21T05:23:13.772000000Z"
+    },
+    "125": {
+        "additional_data": [
+            "DIRECTION=low",
+            "EVENT=critical low",
+            "READING=0.000000",
+            "SENSOR_PATH=/xyz/openbmc_project/sensors/voltage/SPIDER_INA233_12V_NIC3_VOLT_V",
+            "THRESHOLD=11.500000"
+        ],
+        "event_id": "",
+        "message": "SPIDER_INA233_12V_NIC3_VOLT_V critical low threshold assert. Reading=0.000000 Threshold=11.500000.",
+        "resolution": "",
+        "resolved": true,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Critical",
+        "timestamp": "2024-02-21T05:57:05.637000000Z",
+        "updated_timestamp": "2024-02-21T05:57:05.637000000Z"
+    }
+}
+```
+
+
+
+## 5. log-display
+
+The `log-display` subcommand displays log entries.  
+It enables the user to view all log entries or only those that are unresolved.
+
+### Usage
+
+To use the `log-display` subcommand, execute the following command:
+
+```bash
+$ mfg-tool log-display [-u]
+```
+
+### Options
+
+- `-u, --unresolved-only`: This flag shows only unresolved log entries. This is an optional flag.
+
+### Output
+
+The output will resemble the following:
+
+```bash
+{
+    "1": {
+        "additional_data": [
+            "NUM_LOGS=1"
+        ],
+        "event_id": "",
+        "message": "xyz.openbmc_project.Logging.Error.LogsCleared",
+        "resolution": "",
+        "resolved": true,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Informational",
+        "timestamp": "2024-02-21T05:17:52.106000000Z",
+        "updated_timestamp": "2024-02-21T05:23:13.772000000Z"
+    },
+    "125": {
+        "additional_data": [
+            "DIRECTION=low",
+            "EVENT=critical low",
+            "READING=0.000000",
+            "SENSOR_PATH=/xyz/openbmc_project/sensors/voltage/SPIDER_INA233_12V_NIC3_VOLT_V",
+            "THRESHOLD=11.500000"
+        ],
+        "event_id": "",
+        "message": "SPIDER_INA233_12V_NIC3_VOLT_V critical low threshold assert. Reading=0.000000 Threshold=11.500000.",
+        "resolution": "",
+        "resolved": false,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Critical",
+        "timestamp": "2024-02-21T05:57:05.637000000Z",
+        "updated_timestamp": "2024-02-21T05:57:05.637000000Z"
+    }
+}
+```
+
+It includes the following information for each log entry:
+
+- The ID of the log entry.
+- `additional data`: Any additional data associated with the log entry.
+- `event id`: The event ID of the log entry.
+- `message`: The message of the log entry.
+- `resolution`: The resolution of the log entry.
+- `resolved`: A boolean indicating whether the log entry has been resolved.
+- `severity`: The severity level of the log entry.
+- `timestamp`: The timestamp when the log entry was created.
+- `updated timestamp`: The timestamp when the log entry was last updated.
+
+
+
+## 6. log-clear
+
+The `log-clear` subcommand clears log entries.  
+It removes all log entries from the BMC system.
+
+### Usage
+
+To use the `log-clear` subcommand, execute the following command:
+
+```bash
+$ mfg-tool log-clear
+```
+
+### Output
+
+The output will resemble the following:
+
+```bash
+"success"
+```
+
+### Example
+
+Check current log entries
+
+- Command 
+
+```bash
+$ mfg-tool log-display
+```
+
+- Output 
+
+```bash
+{
+    "1": {
+        "additional_data": [
+            "NUM_LOGS=1"
+        ],
+        "event_id": "",
+        "message": "xyz.openbmc_project.Logging.Error.LogsCleared",
+        "resolution": "",
+        "resolved": true,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Informational",
+        "timestamp": "2024-02-21T05:17:52.106000000Z",
+        "updated_timestamp": "2024-02-21T05:23:13.772000000Z"
+    },
+    "125": {
+        "additional_data": [
+            "DIRECTION=low",
+            "EVENT=critical low",
+            "READING=0.000000",
+            "SENSOR_PATH=/xyz/openbmc_project/sensors/voltage/SPIDER_INA233_12V_NIC3_VOLT_V",
+            "THRESHOLD=11.500000"
+        ],
+        "event_id": "",
+        "message": "SPIDER_INA233_12V_NIC3_VOLT_V critical low threshold assert. Reading=0.000000 Threshold=11.500000.",
+        "resolution": "",
+        "resolved": false,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Critical",
+        "timestamp": "2024-02-21T05:57:05.637000000Z",
+        "updated_timestamp": "2024-02-21T05:57:05.637000000Z"
+    }
+}
+```
+
+Clear all log entries
+
+- Command
+
+```bash
+$ mfg-tool log-clear
+```
+
+- Output: 
+
+```bash
+$ "success"
+```
+
+Check current log entries
+
+- Command
+
+```bash
+$ mfg-tool log-dsiplay
+```
+
+- Output
+
+```bash
+{
+    "1": {
+        "additional_data": [
+            "NUM_LOGS=1"
+        ],
+        "event_id": "",
+        "message": "xyz.openbmc_project.Logging.Error.LogsCleared",
+        "resolution": "",
+        "resolved": false,
+        "severity": "xyz.openbmc_project.Logging.Entry.Level.Informational",
+        "timestamp": "2024-03-04T06:29:28.077000000Z",
+        "updated_timestamp": "2024-03-04T06:29:28.077000000Z"
+    }
+}
+```
+
+
+
+## 7. inventory
+
+The `inventory` subcommand retrieves inventory information.  
+It enables the user to query the system’s inventory data and returns a variety of properties for each inventory item.
+
+### Usage
+
+To use the `inventory` subcommand, execute the following command:
+
+```bash
+$ mfg-tool inventory
+```
+
+### Output
+
+The output will resemble the following:
+
+```bash
+{
+    "system/board/BMC_Storage_Module": {
+        "Decorator.Asset": {
+            "Manufacturer": "Wiwynn",
+            "Model": "Yosemite V4",
+            "PartNumber": "N/A",
+            "SerialNumber": "N/A"
+        },
+        "Item.Board": {
+            "Name": "BMC Storage Module",
+            "Type": "Board"
+        }
+    },
+    "system/board/Yosemite_4_FAN_Board_0": {
+        "Decorator.Asset": {
+            "Manufacturer": "Wiwynn",
+            "Model": "Yosemite V4 EVT",
+            "PartNumber": "N/A",
+            "SerialNumber": "N/A"
+        },
+        "Item.Board": {
+            "Name": "Yosemite 4 FAN Board 0",
+            "Type": "Board"
+        }
+    },
+    "system/board/Yosemite_4_Floating_Falls_Slot_4": {
+        "Decorator.Asset": {
+            "Manufacturer": "Wiwynn",
+            "Model": "Yosemite V4 EVT",
+            "PartNumber": "N/A",
+            "SerialNumber": "N/A"
+        },
+        "Decorator.Slot": {
+            "SlotNumber": false
+        },
+        "Item.Board": {
+            "Name": "Yosemite 4 Floating Falls Slot 4",
+            "Type": "Board"
+        }
+    },
+    "system/board/Yosemite_4_Management_Board": {
+        "Decorator.Asset": {
+            "Manufacturer": "Wiwynn",
+            "Model": "Yosemite V4 EVT",
+            "PartNumber": "N/A",
+            "SerialNumber": "N/A"
+        },
+        "Item.Board": {
+            "Name": "Yosemite 4 Management Board",
+            "Type": "Board"
+        }
+    },
+    "system/board/Yosemite_4_Medusa_Board": {
+        "Decorator.Asset": {
+            "Manufacturer": "Wiwynn",
+            "Model": "Yosemite V4 EVT",
+            "PartNumber": "N/A",
+            "SerialNumber": "N/A"
+        },
+        "Item.Board": {
+            "Name": "Yosemite 4 Medusa Board",
+            "Type": "Board"
+        }
+    },
+    "system/board/Yosemite_4_Sentinel_Dome_Slot_4": {
+        "Decorator.Asset": {
+            "Manufacturer": "Wiwynn",
+            "Model": "Yosemite V4 EVT",
+            "PartNumber": "N/A",
+            "SerialNumber": "N/A"
+        },
+        "Decorator.Slot": {
+            "SlotNumber": false
+        },
+        "Item.Board": {
+            "Name": "Yosemite 4 Sentinel Dome Slot 4",
+            "Type": "Board"
+        }
+    },
+    "system/board/Yosemite_4_Spider_Board": {
+        "Decorator.Asset": {
+            "Manufacturer": "Wiwynn",
+            "Model": "Yosemite V4 EVT",
+            "PartNumber": "N/A",
+            "SerialNumber": "N/A"
+        },
+        "Item.Board": {
+            "Name": "Yosemite 4 Spider Board",
+            "Type": "Board"
+        }
+    },
+    "system/board/Yosemite_4_Wailua_Falls_Slot_4": {
+        "Decorator.Asset": {
+            "Manufacturer": "Wiwynn",
+            "Model": "Yosemite V4 EVT",
+            "PartNumber": "N/A",
+            "SerialNumber": "N/A"
+        },
+        "Decorator.Slot": {
+            "SlotNumber": false
+        },
+        "Item.Board": {
+            "Name": "Yosemite 4 Wailua Falls Slot 4",
+            "Type": "Board"
+        }
+    }
+}
+```
+
+It includes the following information for each inventory item:
+
+- The path of the inventory item, stripped of the common prefix.  
+- The interface of the inventory item, stripped of the common prefix.  
+- `Manufacturer`: The manufacturer of the item.  
+- `Model`: The model of the item.  
+- `PartNumber`: The part number (if available).  
+- `SerialNumber`: The serial number (if available).  
+- `Slot Number` (if applicable): The slot number associated with the inventory item.  
+- `Name`: The name of the board.  
+- `Type`: The type of the board (e.g., “Board”).  
+
+
+
+## 8. fan-speed
+
+The `fan-speed` subcommand displays and adjusts the fan speed on the BMC system.  
+It enables the user to specify a target Pulse Width Modulation (PWM) percentage and a fan position to set the fan speed.
+
+### Usage
+
+To use the `fan-speed` subcommand, execute the following command:
+
+```bash
+$ mfg-tool fan-speed [-t <target>] [-p <position>]
+```
+
+### Options
+
+- `-t, --target <target>`: The target PWM percentage(e.g., 50.0). This is an optional parameter.  
+	- If a target PWM percentage is specified, the tool will attempt to set the fan speed to the target value.  
+	- If no target is specified, the tool will simply display the current fan speed.  
+- `-p, --position <position>`: The position of the fan(e.g., FANBOARD0_FAN0). This is an optional parameter.  
+	- If the position parameter is specified, the tool will only affect or display information for the fan at that position.  
+	- If the position parameter is not specified, the tool will affect or display information for all fans.
+
+### Output
+
+If no parameters are provided, the output will resemble the following:
+
+```bash
+{
+    "FANBOARD1_FAN0": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13107.0
+    },
+    "FANBOARD1_FAN1": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13284.0
+    },
+    "FANBOARD1_FAN2": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13284.0
+    },
+    "FANBOARD1_FAN3": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13284.0
+    },
+    "FANBOARD1_FAN4": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13466.0
+    },
+    "FANBOARD1_FAN5": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13466.0
+    }
+}
+```
+
+It includes the following information for each fan:
+
+- The position of the fan.
+- `pwm`: The current and target PWM value of the fan, which indicates the fan speed.
+- `tach_il`: The current tachometer reading from the inside rotor of the fan, which indicates the fan’s RPM (Revolutions Per Minute).
+- `tach_ol`: The current tachometer reading from the outside rotor of the fan, which indicates the fan’s RPM (Revolutions Per Minute).
+
+### Example
+
+Check the current fan speed of FANBOARD1_FAN0
+
+- Command
+
+```bash
+$ mfg-tool fan-speed -p FANBOARD1_FAN0
+```
+
+- Output
+
+```bash
+{
+    "FANBOARD1_FAN0": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13107.0
+    }
+}
+```
+
+Set FANBOARD1_FAN0's PWM to 50%
+
+- Command
+
+```bash
+$ mfg-tool fan-speed -t 50.0 -p FANBOARD1_FAN0
+```
+
+Check the current fan speed of FANBOARD1_FAN0
+
+- Command
+
+```bash
+$ mfg-tool fan-speed -p FANBOARD1_FAN0
+```
+
+- Output
+
+```bash
+{
+    "FANBOARD1_FAN0": {
+        "pwm": {
+            "current": 49.9999997,
+            "target": 49.9999997
+        },
+        "tach_il": 7802.0,
+        "tach_ol": 6554.0
+    }
+}
+```
+
+
+
+## 9. fan-mode
+
+The `fan-mode` subcommand sets the fan mode to either manual or automatic.  
+- In manual mode, the fan speed can be controlled directly by the user.  
+- In automatic mode, the fan speed is controlled by the system based on the current temperature and other factors.
+
+### Usage
+
+To use the `fan-mode` subcommand, execute the following command:
+
+```bash
+$ mfg-tool fan-mode [-m] [-a]
+```
+
+### Options
+
+- `-m, --manual`: This flag sets the mode to manual. This is an optional flag.
+- `-a, --auto`:  This flag sets the mode to automatic. This is an optional flag.
+
+### Output
+
+The output will resemble the following:
+
+If the mode is set to manual
+```bash
+{
+    "zone1": "manual"
+}
+
+```
+
+If the mode is set to automatic
+```bash
+{
+    "zone1": "auto"
+}
+```
+
+### Note
+
+Before setting the fan speed with the following command:
+
+```bash
+$ mfg-tool fan-speed [-t <target>] [-p <position>]
+```
+
+Ensure the fan mode is initially set to manual.  
+
+Even when the fan mode is set to automatic, you can still override the fan speed.   
+However, to switch back to automatic mode, you need to transition through manual mode first.  
+
+This can be done using the following commands:
+```bash
+$ mfg-tool fan-mode -m
+$ mfg-tool fan-mode -a
+```
+
+### Example
+
+Check the current fan speed of FANBOARD1_FAN0
+
+- Command
+
+```bash
+$ mfg-tool fan-speed -p FANBOARD1_FAN0
+```
+
+- Output
+
+```bash
+{
+    "FANBOARD1_FAN0": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13107.0
+    }
+}
+```
+
+Switch fan mode to manual
+
+- Command
+
+```bash
+$ mfg-tool fan-mode -m
+```
+
+- Output
+
+```bash
+{
+    "zone1": "manual"
+}
+```
+
+Set FANBOARD1_FAN0's PWM to 50%
+
+- Command
+
+```bash
+$ mfg-tool fan-speed -t 50.0 -p FANBOARD1_FAN0
+```
+
+Check the current fan speed of FANBOARD1_FAN0
+
+- Command
+
+```bash
+$ mfg-tool fan-speed -p FANBOARD1_FAN0
+```
+
+- Output
+
+```bash
+{
+    "FANBOARD1_FAN0": {
+        "pwm": {
+            "current": 49.9999997,
+            "target": 49.9999997
+        },
+        "tach_il": 7802.0,
+        "tach_ol": 6554.0
+    }
+}
+```
+
+Switch fan mode to auto
+
+- Command
+
+``` bash
+$ mfg-tool fan-mode -a
+```
+
+- Output
+
+```bash
+{
+    "zone1": "auto"
+}
+```
+
+Check the current fan speed of FANBOARD1_FAN0
+
+- Command 
+
+```bash
+$ mfg-tool fan-speed -p FANBOARD1_FAN0
+```
+
+- Output
+
+```bash
+{
+    "FANBOARD1_FAN0": {
+        "pwm": {
+            "current": 100.0,
+            "target": 100.0
+        },
+        "tach_il": 15603.0,
+        "tach_ol": 13107.0
+    }
+}
+```
+
+
+
+## 10. bmc-arch
+
+The `bmc-arch` subcommand retrieves the architecture of the BMC (Baseboard Management Controller) on OpenBMC platforms.  
+It enables the user to query the system’s architecture and returns the result.
+
+### Usage
+
+To use the `bmc-arch` subcommand, execute the following command:
+
+```bash
+$ mfg-tool bmc-arch
+```
+
+### Output
+
+The output will resemble the following:
+
+```bash
+"arm"
+```
+
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/.gitignore b/common/recipes-lfopenbmc/mfg-tool/files/.gitignore
new file mode 100644
index 000000000000..4af809096adb
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/.gitignore
@@ -0,0 +1,2 @@
+subprojects/*
+!subprojects/*.wrap
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/bmc-arch.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/bmc-arch.cpp
new file mode 100644
index 000000000000..269006802e37
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/bmc-arch.cpp
@@ -0,0 +1,38 @@
+#include "utils/json.hpp"
+#include "utils/register.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+
+namespace mfgtool::cmds::bmc_arch
+{
+PHOSPHOR_LOG2_USING;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("bmc-arch",
+                                      "Get architecture of the BMC");
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        constexpr auto systemd =
+            sdbusplus::async::proxy()
+                .service("org.freedesktop.systemd1")
+                .path("/org/freedesktop/systemd1")
+                .interface("org.freedesktop.systemd1.Manager");
+
+        info("Calling systemd to get architecture.");
+        auto arch = co_await systemd.get_property<std::string>(ctx,
+                                                               "Architecture");
+
+        json::display(arch);
+
+        co_return;
+    }
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::bmc_arch
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/bmc-state.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/bmc-state.cpp
new file mode 100644
index 000000000000..d1fa8e7ecbf1
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/bmc-state.cpp
@@ -0,0 +1,67 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/mapper.hpp"
+#include "utils/register.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+
+#include <unordered_map>
+
+namespace mfgtool::cmds::bmc_state
+{
+PHOSPHOR_LOG2_USING;
+using namespace dbuspath;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("bmc-state", "Get state of the BMC");
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        using utils::mapper::object_service;
+
+        auto result = json::empty_map();
+
+        debug("Finding BMC.");
+        auto path = bmc::path();
+        auto service = co_await object_service(ctx, path, bmc::interface);
+
+        if (!service)
+        {
+            warning("Could not find BMC object");
+            co_return;
+        }
+
+        debug("Getting BMC state.");
+        auto proxy = bmc::Proxy(ctx).service(*service).path(path);
+        result["state"] = mapBMCState(co_await proxy.current_bmc_state());
+
+        json::display(result);
+    }
+
+    static auto mapBMCState(bmc::Proxy::BMCState state) -> std::string
+    {
+        using BMCState = bmc::Proxy::BMCState;
+
+        static const auto values = std::unordered_map<BMCState, std::string>{
+            {BMCState::Ready, "ready"},
+            {BMCState::NotReady, "starting"},
+            {BMCState::Quiesced, "quiesced"},
+        };
+
+        if (!values.contains(state))
+        {
+            return "unknown";
+        }
+
+        return values.at(state);
+    }
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::bmc_state
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/fan-mode.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/fan-mode.cpp
new file mode 100644
index 000000000000..4641ffc841d5
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/fan-mode.cpp
@@ -0,0 +1,71 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/mapper.hpp"
+#include "utils/register.hpp"
+#include "utils/string.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+
+namespace mfgtool::cmds::fan_mode
+{
+
+PHOSPHOR_LOG2_USING;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("fan-mode", "Manipulate the fan mode");
+        auto manual = cmd->add_flag("-m,--manual", arg_manual,
+                                    "Set manual mode");
+        cmd->add_flag("-a,--auto", arg_auto, "Set auto mode")->excludes(manual);
+
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        namespace control = dbuspath::control;
+        using utils::string::last_element;
+
+        auto result = json::empty_map();
+
+        debug("Finding Control.Mode objects.");
+        co_await utils::mapper::subtree_for_each(
+            ctx, "/", control::mode::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            if (!path.str.starts_with(FanControlPrefix))
+            {
+                co_return;
+            }
+
+            auto mode =
+                control::mode::Proxy(ctx).service(service).path(path.str);
+
+            if (arg_manual || arg_auto)
+            {
+                co_await mode.manual(arg_manual);
+                result[last_element(path)] = arg_manual ? "manual" : "auto";
+            }
+            else
+            {
+                result[last_element(path)] = (co_await mode.manual()) ? "manual"
+                                                                      : "auto";
+            }
+        });
+
+        json::display(result);
+    }
+
+    bool arg_manual = false;
+    bool arg_auto = false;
+
+    static constexpr auto FanControlPrefix =
+        "/xyz/openbmc_project/settings/fanctrl";
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::fan_mode
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/fan-speed.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/fan-speed.cpp
new file mode 100644
index 000000000000..f2916dc81cd8
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/fan-speed.cpp
@@ -0,0 +1,131 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/mapper.hpp"
+#include "utils/register.hpp"
+#include "utils/string.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+
+#include <optional>
+#include <ranges>
+
+namespace mfgtool::cmds::fan_speed
+{
+
+PHOSPHOR_LOG2_USING;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("fan-speed", "Manipulate the fan mode");
+        cmd->add_option("-t,--target", arg_target, "Desired PWM percentage");
+        cmd->add_option("-p,--position", arg_position, "Fan position");
+
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        namespace control = dbuspath::control;
+        namespace sensor = dbuspath::sensor;
+        using utils::mapper::subtree_for_each;
+        using utils::string::last_element;
+        using utils::string::replace_substring;
+
+        auto result = json::empty_map();
+
+        debug("Finding Control.FanPwm objects.");
+        co_await subtree_for_each(ctx, "/", control::fan_pwm::interface,
+
+                                  [&](const auto& path, const auto& service)
+                                      -> sdbusplus::async::task<> {
+            auto pwm_name = last_element(path);
+            if (!pwm_name.contains("_PWM"))
+            {
+                debug("{PATH} doesn't contain _PWM", "PATH", path);
+                co_return;
+            }
+
+            if (arg_position && !pwm_name.contains(*arg_position))
+            {
+                info("Skipping {PATH} due to position mismatch.", "PATH", path);
+                co_return;
+            }
+
+            auto [fan_name, _] = split(last_element(path), "_PWM");
+
+            auto pwm =
+                control::fan_pwm::Proxy(ctx).service(service).path(path.str);
+
+            auto& result_json = result[fan_name]["pwm"];
+            if (arg_target)
+            {
+                uint64_t target = 255.0 * (*arg_target / 100.0);
+                co_await pwm.target(target);
+                result_json["target"] = target;
+            }
+            else
+            {
+                uint64_t target = co_await pwm.target();
+                result_json["target"] = double(target) * 100.0 / 255.0;
+            }
+
+            // This is a hack, but how dbus-sensor's FanSensor currently works.
+            // They don't have any association but they at least use the same
+            // final element name.
+            auto sensor_path = replace_substring(path, "control/fanpwm",
+                                                 "sensors/fan_pwm");
+            auto sensor = sensor::Proxy(ctx).service(service).path(sensor_path);
+
+            result_json["current"] = co_await sensor.value();
+        });
+
+        debug("Finding Sensor objects in Tach namespace.");
+        auto fan_tach_subpath = std::string(sensor::ns_path) + "/" +
+                                sensor::Proxy::namespace_path::fan_tach;
+        co_await subtree_for_each(ctx, fan_tach_subpath, sensor::interface,
+
+                                  [&](const auto& path, const auto& service)
+                                      -> sdbusplus::async::task<> {
+            auto tach_name = last_element(path);
+            if (!tach_name.contains("_TACH"))
+            {
+                debug("{PATH} doesn't contain _TACH", "PATH", path);
+                co_return;
+            }
+
+            if (arg_position && !tach_name.contains(*arg_position))
+            {
+                info("Skipping {PATH} due to position mismatch.", "PATH", path);
+                co_return;
+            }
+
+            auto [fan_name, tach_shortname] = split(tach_name, "_TACH");
+
+            // We need to strip off the _ from _TACH and make it lowercase for a
+            // key.
+            tach_shortname = tach_shortname.substr(1);
+            std::ranges::transform(tach_shortname, tach_shortname.begin(),
+                                   [](auto c) { return std::tolower(c); });
+
+            auto sensor = sensor::Proxy(ctx).service(service).path(path.str);
+            result[fan_name][tach_shortname] = co_await sensor.value();
+        });
+
+        json::display(result);
+    }
+
+    auto split(const auto& s, const auto& substr)
+    {
+        auto pos = s.find(substr);
+        return std::make_tuple(s.substr(0, pos), s.substr(pos));
+    }
+
+    std::optional<double> arg_target = std::nullopt;
+    std::optional<std::string> arg_position = std::nullopt;
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::fan_speed
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/hello.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/hello.cpp
new file mode 100644
index 000000000000..3886fbbce74e
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/hello.cpp
@@ -0,0 +1,26 @@
+#include "utils/json.hpp"
+#include "utils/register.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+
+namespace mfgtool::cmds::hello
+{
+PHOSPHOR_LOG2_USING;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("hello", "Hello World");
+        init_callback(cmd, *this);
+    }
+
+    void run()
+    {
+        info("Hello World!");
+        json::display(js{"Hello World!"});
+    }
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::hello
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/inventory.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/inventory.cpp
new file mode 100644
index 000000000000..f473dd36d1cd
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/inventory.cpp
@@ -0,0 +1,94 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/mapper.hpp"
+#include "utils/register.hpp"
+
+#include <sdbusplus/async.hpp>
+
+#include <string>
+#include <variant>
+#include <vector>
+
+namespace mfgtool::cmds::inventory
+{
+PHOSPHOR_LOG2_USING;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("inventory", "Get inventory");
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        using namespace std::literals;
+        namespace item = dbuspath::inventory::item;
+        namespace asset = dbuspath::inventory::asset;
+        using utils::mapper::subtree_for_each_interface;
+
+        auto result = json::empty_map();
+
+        co_await subtree_for_each_interface(
+            ctx, item::ns_path, asset::interface,
+            // TODO: We are using asset::interface here because a lot of the
+            //       entity-manager content appears to be missing the
+            //       Inventory.Item.  We need to get this fixed.
+
+            [&](const auto& path, const auto& service,
+                const auto& interface) -> sdbusplus::async::task<> {
+            if (!interface.starts_with(InventoryIfacePrefix))
+            {
+                co_return;
+            }
+
+            // Insert the interface into the JSON so it shows up even if it
+            // doesn't have any properties.
+            auto& iface_result =
+                result[strip_path(path)][strip_intf(interface)];
+            iface_result = json::empty_map();
+
+            debug("Getting properties.");
+            for (const auto& [property, value] :
+                 co_await sdbusplus::async::proxy()
+                     .service(service)
+                     .path(path)
+                     .interface(interface)
+                     .template get_all_properties<InventoryTypes>(ctx))
+            {
+                // Ignore the entity-manager Probe statement because nobody
+                // is going to be interested in that.
+                if (property == "Probe")
+                {
+                    continue;
+                }
+                std::visit([&](const auto& v) { iface_result[property] = v; },
+                           value);
+            }
+        });
+
+        json::display(result);
+    }
+
+    auto strip_path(const auto& p)
+    {
+        namespace item = dbuspath::inventory::item;
+        return p.substr(std::string(item::ns_path).length() + 1);
+    }
+
+    auto strip_intf(const auto& i)
+    {
+        return i.substr(std::string(InventoryIfacePrefix).length() + 1);
+    }
+
+    static constexpr auto InventoryIfacePrefix =
+        "xyz.openbmc_project.Inventory";
+
+    using InventoryTypes =
+        std::variant<bool, size_t, int64_t, uint16_t, std::string,
+                     std::vector<uint8_t>, std::vector<std::string>>;
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::inventory
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-clear.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-clear.cpp
new file mode 100644
index 000000000000..cefa2da0ec4a
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-clear.cpp
@@ -0,0 +1,44 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/register.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+
+namespace mfgtool::cmds::log_clear
+{
+PHOSPHOR_LOG2_USING;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("log-clear", "Clear logs");
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        namespace delete_all = dbuspath::delete_all;
+        namespace log_entry = dbuspath::log_entry;
+
+        try
+        {
+            info("Calling DeleteAll on Logging service");
+            co_await delete_all::Proxy(ctx)
+                .service(log_entry::service)
+                .path(log_entry::ns_path)
+                .delete_all();
+
+            json::display("success");
+        }
+        catch (const std::exception& e)
+        {
+            error("Caught {ERROR}", "ERROR", e);
+            json::display("failed");
+        }
+    }
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::log_clear
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-display.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-display.cpp
new file mode 100644
index 000000000000..49af884521db
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-display.cpp
@@ -0,0 +1,92 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/mapper.hpp"
+#include "utils/register.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+#include <sdbusplus/message.hpp>
+
+#include <algorithm>
+#include <chrono>
+#include <cstdint>
+#include <format>
+#include <string>
+
+namespace mfgtool::cmds::log_display
+{
+PHOSPHOR_LOG2_USING;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("log-display", "Display pending logs.");
+        cmd->add_flag("-u,--unresolved-only", arg_unresolved_only,
+                      "Only show unresolved logs.");
+
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        namespace log_entry = dbuspath::log_entry;
+
+        auto result = json::empty_map();
+
+        info("Finding log entries.");
+        co_await utils::mapper::subtree_for_each(
+            ctx, log_entry::ns_path, log_entry::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            if (service != log_entry::service)
+            {
+                warning("Entry ({PATH}) not hosted by logging service.", "PATH",
+                        path);
+                co_return;
+            }
+
+            auto entry = log_entry::Proxy(ctx)
+                             .service(log_entry::service)
+                             .path(path.str);
+
+            if (auto resolved = co_await entry.resolved();
+                !resolved || !arg_unresolved_only)
+            {
+                auto& entry_json = result[std::to_string(co_await entry.id())];
+
+                entry_json["message"] = co_await entry.message();
+                entry_json["severity"] = sdbusplus::message::convert_to_string(
+                    co_await entry.severity());
+                entry_json["event_id"] = co_await entry.event_id();
+                entry_json["additional_data"] =
+                    co_await entry.additional_data();
+                entry_json["resolution"] = co_await entry.resolution();
+                entry_json["resolved"] = resolved;
+
+                auto epoch_to_iso8601 = [](auto ts) {
+                    using namespace std::chrono;
+                    return std::format("{:%FT%TZ}", time_point<system_clock>(
+                                                        milliseconds(ts)));
+                };
+
+                entry_json["timestamp"] =
+                    epoch_to_iso8601(co_await entry.timestamp());
+                entry_json["updated_timestamp"] =
+                    epoch_to_iso8601(co_await entry.update_timestamp());
+            }
+            else
+            {
+                info("Resolved and filtered out.");
+            }
+        });
+
+        json::display(result);
+        co_return;
+    }
+
+    bool arg_unresolved_only = false;
+};
+MFGTOOL_REGISTER(command);
+} // namespace mfgtool::cmds::log_display
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-resolve.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-resolve.cpp
new file mode 100644
index 000000000000..bdb9b3f2da95
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/log-resolve.cpp
@@ -0,0 +1,55 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/register.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+
+#include <cstdint>
+#include <string>
+
+namespace mfgtool::cmds::log_resolve
+{
+PHOSPHOR_LOG2_USING;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("log-resolve", "Resolve a log entry");
+
+        cmd->add_option("-i,--id", arg_id, "Entry ID")->required();
+
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        namespace log_entry = dbuspath::log_entry;
+
+        try
+        {
+            auto path = log_entry::path(arg_id);
+
+            info("Setting resolved on {PATH}", "PATH", path);
+            co_await log_entry::Proxy(ctx)
+                .service(log_entry::service)
+                .path(path)
+                .resolved(true);
+
+            json::display("success");
+        }
+        catch (const std::exception& e)
+        {
+            error("Caught {ERROR}", "ERROR", e);
+            json::display("failed");
+        }
+
+        co_return;
+    }
+
+    size_t arg_id = 0;
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::log_resolve
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/power-control.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/power-control.cpp
new file mode 100644
index 000000000000..b6f5290b37d6
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/power-control.cpp
@@ -0,0 +1,261 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/mapper.hpp"
+#include "utils/register.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+
+#include <map>
+#include <ranges>
+#include <string>
+
+namespace mfgtool::cmds::power_control
+{
+
+PHOSPHOR_LOG2_USING;
+namespace mapper = mfgtool::utils::mapper;
+
+enum class action
+{
+    on,
+    off,
+    cycle
+};
+
+enum class scope
+{
+    runtime,
+    standby,
+    acpi
+};
+
+template <action Action, scope Scope>
+struct execute;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("power-control",
+                                      "Manipulate power state of a device");
+
+        cmd->add_option("-p,--position", arg_pos, "Device position")
+            ->required();
+
+        cmd->add_option("-a,--action", arg_action, "Control action")
+            ->required()
+            ->check(CLI::IsMember(keys(action_map())));
+
+        cmd->add_option("-s,--scope", arg_scope, "Scope of the action")
+            ->check(CLI::IsMember(keys(scope_map())));
+
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        info("Attempting {SCOPE}:{ACTION} on {POS}.", "POS", arg_pos, "ACTION",
+             arg_action, "SCOPE", arg_scope);
+
+        try
+        {
+            co_await execute(ctx);
+        }
+        catch (...)
+        {
+            json::display("failed");
+            co_return;
+        }
+
+        json::display("success");
+        co_return;
+    }
+
+    size_t arg_pos = 0;
+    std::string arg_action = "";
+    std::string arg_scope = "runtime";
+
+    static auto action_map() -> std::map<std::string, action>
+    {
+        return {
+            {"on", action::on}, {"off", action::off}, {"cycle", action::cycle}};
+    }
+    static auto scope_map() -> std::map<std::string, scope>
+    {
+        return {{"runtime", scope::runtime},
+                {"standby", scope::standby},
+                {"acpi", scope::acpi}};
+    }
+
+    static auto keys(const auto&& m) -> std::vector<std::string>
+    {
+        // This should have been implemented as views::keys(action_map) |
+        // ranges::to<std::vector> but ranges::to isn't ready until GCC14.
+
+        std::vector<std::string> r{};
+        std::ranges::for_each(std::views::keys(m),
+                              [&](const auto& v) { r.push_back(v); });
+
+        return r;
+    }
+
+    auto execute(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        switch (action_map()[arg_action])
+        {
+            case action::on:
+                co_await execute<action::on>(ctx);
+                break;
+
+            case action::off:
+                co_await execute<action::off>(ctx);
+                break;
+
+            case action::cycle:
+                co_await execute<action::cycle>(ctx);
+                break;
+        }
+    }
+
+    template <action Action>
+    auto execute(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        switch (scope_map()[arg_scope])
+        {
+            case scope::runtime:
+                co_await power_control::execute<Action, scope::runtime>::op(
+                    ctx, arg_pos);
+                break;
+
+            case scope::standby:
+                co_await power_control::execute<Action, scope::standby>::op(
+                    ctx, arg_pos);
+                break;
+
+            case scope::acpi:
+                co_await power_control::execute<Action, scope::acpi>::op(
+                    ctx, arg_pos);
+                break;
+        }
+    }
+};
+MFGTOOL_REGISTER(command);
+
+template <action Action, scope Scope>
+struct execute
+{
+    static auto op(sdbusplus::async::context&, size_t)
+        -> sdbusplus::async::task<>
+    {
+        error("Execution method undefined.");
+        throw std::exception();
+    }
+};
+
+template <action Action>
+struct execute<Action, scope::standby>
+{
+    static auto op(sdbusplus::async::context& ctx, size_t pos)
+        -> sdbusplus::async::task<>
+    {
+        using namespace dbuspath;
+        auto path = chassis::path(pos);
+
+        auto service = co_await mapper::object_service(ctx, path,
+                                                       chassis::interface);
+
+        if (!service)
+        {
+            warning("Can't find {PATH}", "PATH", path);
+            error(
+                "Cannot find chassis to execute operation against; giving up.");
+            throw std::exception();
+        }
+
+        auto proxy = chassis::Proxy(ctx).service(*service).path(path);
+
+        if constexpr (Action == action::on)
+        {
+            co_await proxy.requested_power_transition(
+                chassis::Proxy::Transition::On);
+        }
+        else if constexpr (Action == action::off)
+        {
+            co_await proxy.requested_power_transition(
+                chassis::Proxy::Transition::Off);
+        }
+        else
+        {
+            co_await proxy.requested_power_transition(
+                chassis::Proxy::Transition::PowerCycle);
+        }
+    }
+};
+
+template <action Action>
+struct execute<Action, scope::runtime>
+{
+    static auto op(sdbusplus::async::context& ctx, size_t pos)
+        -> sdbusplus::async::task<>
+    {
+        using namespace dbuspath;
+
+        auto path = host::path(pos);
+        auto service = co_await mapper::object_service(ctx, path,
+                                                       host::interface);
+
+        if (!service)
+        {
+            warning("Can't find {PATH}", "PATH", path);
+            info("Trying to escalate to scope=standby");
+            co_return co_await execute<Action, scope::standby>::op(ctx, pos);
+        }
+
+        auto proxy = host::Proxy(ctx).service(*service).path(path);
+
+        if constexpr (Action == action::on)
+        {
+            co_await proxy.requested_host_transition(
+                host::Proxy::Transition::On);
+        }
+        else if constexpr (Action == action::off)
+        {
+            co_await proxy.requested_host_transition(
+                host::Proxy::Transition::Off);
+        }
+        else
+        {
+            co_await proxy.requested_host_transition(
+                host::Proxy::Transition::Reboot);
+        }
+    }
+};
+
+template <>
+struct execute<action::cycle, scope::acpi>
+{
+    static auto op(sdbusplus::async::context& ctx, size_t pos)
+        -> sdbusplus::async::task<>
+    {
+        using namespace dbuspath;
+
+        auto path = host::path(pos);
+        auto service = co_await mapper::object_service(ctx, path,
+                                                       host::interface);
+
+        if (!service)
+        {
+            warning("Can't find {PATH}", "PATH", path);
+            info("Trying to escalate to scope=standby");
+            co_return co_await execute<action::cycle, scope::standby>::op(ctx,
+                                                                          pos);
+        }
+
+        auto proxy = host::Proxy(ctx).service(*service).path(path);
+        co_await proxy.requested_host_transition(
+            host::Proxy::Transition::GracefulWarmReboot);
+    }
+};
+
+} // namespace mfgtool::cmds::power_control
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/power-state.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/power-state.cpp
new file mode 100644
index 000000000000..9e8a9455d0ed
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/power-state.cpp
@@ -0,0 +1,116 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/mapper.hpp"
+#include "utils/register.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+
+#include <string>
+#include <unordered_map>
+
+namespace mfgtool::cmds::power_state
+{
+PHOSPHOR_LOG2_USING;
+using namespace dbuspath;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("power-state", "Get state of device");
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        using utils::mapper::subtree_for_each;
+
+        auto result = json::empty_map();
+
+        debug("Finding chasses.");
+        co_await subtree_for_each(ctx, chassis::ns_path, chassis::interface,
+
+                                  [&](const auto& path, const auto& service)
+                                      -> sdbusplus::async::task<> {
+            static auto pathPrefix = chassis::path_prefix();
+            if (path.str.size() <= pathPrefix.size())
+            {
+                error("Unexpected chassis path found: {PATH}", "PATH", path);
+                co_return;
+            }
+
+            auto proxy = chassis::Proxy(ctx).service(service).path(path.str);
+            auto state = mapChassisState(co_await proxy.current_power_state());
+
+            info("State for {PATH}: {STATE}", "PATH", path, "STATE", state);
+            auto id = path.str.substr(pathPrefix.size());
+            result[id]["standby"] = state;
+        });
+
+        debug("Finding hosts.");
+        co_await subtree_for_each(ctx, host::ns_path, host::interface,
+
+                                  [&](const auto& path, const auto& service)
+                                      -> sdbusplus::async::task<> {
+            static auto pathPrefix = host::path_prefix();
+            if (path.str.size() <= pathPrefix.size())
+            {
+                error("Unexpected host path found: {PATH}", "PATH", path);
+                co_return;
+            }
+
+            auto proxy = host::Proxy(ctx).service(service).path(path.str);
+            auto state = mapHostState(co_await proxy.current_host_state());
+
+            info("State for {PATH}: {STATE}", "PATH", path, "STATE", state);
+            auto id = path.str.substr(pathPrefix.size());
+            result[id]["runtime"] = state;
+        });
+
+        json::display(result);
+
+        co_return;
+    }
+
+    static auto mapChassisState(chassis::Proxy::PowerState state) -> std::string
+    {
+        using PowerState = chassis::Proxy::PowerState;
+
+        static const auto values = std::unordered_map<PowerState, std::string>{
+            {PowerState::Off, "off"},
+            {PowerState::TransitioningToOff, "transition-off"},
+            {PowerState::On, "on"},
+            {PowerState::TransitioningToOn, "transition-on"},
+        };
+
+        if (!values.contains(state))
+        {
+            return "unknown";
+        }
+
+        return values.at(state);
+    }
+
+    static auto mapHostState(host::Proxy::HostState state) -> std::string
+    {
+        using HostState = host::Proxy::HostState;
+
+        static const auto values = std::unordered_map<HostState, std::string>{
+            {HostState::Off, "off"},
+            {HostState::TransitioningToOff, "transition-off"},
+            {HostState::Running, "on"},
+            {HostState::TransitioningToRunning, "transition-on"},
+        };
+
+        if (!values.contains(state))
+        {
+            return "unknown";
+        }
+
+        return values.at(state);
+    }
+};
+MFGTOOL_REGISTER(command);
+
+} // namespace mfgtool::cmds::power_state
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/cmd/sensor-display.cpp b/common/recipes-lfopenbmc/mfg-tool/files/cmd/sensor-display.cpp
new file mode 100644
index 000000000000..85a19f6bb8ae
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/cmd/sensor-display.cpp
@@ -0,0 +1,288 @@
+#include "utils/dbus.hpp"
+#include "utils/json.hpp"
+#include "utils/mapper.hpp"
+#include "utils/register.hpp"
+#include "utils/string.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+#include <sdbusplus/message.hpp>
+
+#include <array>
+#include <cmath>
+#include <ranges>
+
+namespace mfgtool::cmds::sensor_display
+{
+PHOSPHOR_LOG2_USING;
+namespace sensor = dbuspath::sensor;
+namespace metric = dbuspath::metric;
+namespace threshold = dbuspath::threshold;
+using namespace utils::string;
+
+struct command
+{
+    void init(CLI::App& app)
+    {
+        auto cmd = app.add_subcommand("sensor-display", "Display sensors.");
+
+        init_callback(cmd, *this);
+    }
+
+    auto run(sdbusplus::async::context& ctx) -> sdbusplus::async::task<>
+    {
+        auto result = json::empty_map();
+
+        info("Finding sensor entries.");
+        co_await utils::mapper::subtree_for_each(
+            ctx, sensor::ns_path, sensor::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            auto& entry_json = result[last_element(path)];
+            auto proxy = sensor::Proxy(ctx).service(service).path(path.str);
+
+            auto value = co_await proxy.value();
+            entry_json["value"] = value;
+            entry_json["status"] = std::isfinite(value) ? "ok" : "unavailable";
+
+            if (auto v = co_await proxy.max_value(); std::isfinite(v))
+            {
+                entry_json["max"] = v;
+            }
+            if (auto v = co_await proxy.min_value(); std::isfinite(v))
+            {
+                entry_json["min"] = v;
+            }
+            entry_json["unit"] = last_element(
+                sdbusplus::message::convert_to_string(co_await proxy.unit()),
+                '.');
+        });
+
+        info("Finding HardShutdown thresholds");
+        co_await utils::mapper::subtree_for_each(
+            ctx, sensor::ns_path, sensor::hard_shutdown::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            auto& sensor_json = result[last_element(path)];
+            auto& entry_json = sensor_json["hard-shutdown"];
+            auto proxy =
+                sensor::hard_shutdown::Proxy(ctx).service(service).path(
+                    path.str);
+
+            if (auto v = co_await proxy.hard_shutdown_high(); std::isfinite(v))
+            {
+                entry_json["high"] = v;
+                update_status<std::greater>(sensor_json, v, "critical");
+            }
+            if (auto v = co_await proxy.hard_shutdown_low(); std::isfinite(v))
+            {
+                entry_json["low"] = v;
+                update_status<std::less>(sensor_json, v, "critical");
+            }
+        });
+
+        info("Finding Critical thresholds");
+        co_await utils::mapper::subtree_for_each(
+            ctx, sensor::ns_path, sensor::critical::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            auto& sensor_json = result[last_element(path)];
+            auto& entry_json = sensor_json["critical"];
+            auto proxy =
+                sensor::critical::Proxy(ctx).service(service).path(path.str);
+
+            if (auto v = co_await proxy.critical_high(); std::isfinite(v))
+            {
+                entry_json["high"] = v;
+                update_status<std::greater>(sensor_json, v, "critical");
+            }
+            if (auto v = co_await proxy.critical_low(); std::isfinite(v))
+            {
+                entry_json["low"] = v;
+                update_status<std::less>(sensor_json, v, "critical");
+            }
+        });
+
+        info("Finding Warning thresholds");
+        co_await utils::mapper::subtree_for_each(
+            ctx, sensor::ns_path, sensor::warning::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            auto& sensor_json = result[last_element(path)];
+            auto& entry_json = sensor_json["warning"];
+            auto proxy =
+                sensor::warning::Proxy(ctx).service(service).path(path.str);
+
+            if (auto v = co_await proxy.warning_high(); std::isfinite(v))
+            {
+                entry_json["high"] = v;
+                update_status<std::greater>(sensor_json, v, "warning");
+            }
+            if (auto v = co_await proxy.warning_low(); std::isfinite(v))
+            {
+                entry_json["low"] = v;
+                update_status<std::less>(sensor_json, v, "warning");
+            }
+        });
+
+        info("Finding sensor threshold entries.");
+        co_await utils::mapper::subtree_for_each(
+            ctx, sensor::ns_path, threshold::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            using namespace std::string_literals;
+
+            auto& sensor_json = result[last_element(path)];
+            auto proxy = threshold::Proxy(ctx).service(service).path(path.str);
+
+            auto values = co_await proxy.value();
+            auto asserted = co_await proxy.asserted();
+
+            for (const auto& [type, type_str] : thresholds)
+            {
+                for (const auto& [bound, bound_str] : bounds)
+                {
+                    if (values.contains(type) &&
+                        values.at(type).contains(bound))
+                    {
+                        if (auto v = values.at(type).at(bound);
+                            std::isfinite(v))
+                        {
+                            sensor_json[type_str][bound_str] = v;
+                            if (asserted.contains({type, bound}))
+                            {
+                                update_status(sensor_json, bound_str);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        info("Finding metric entries.");
+        co_await utils::mapper::subtree_for_each(
+            ctx, metric::ns_path, metric::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            using namespace std::string_literals;
+
+            auto& entry_json =
+                result[replace_substring(path, metric::ns_path + "/"s, "")];
+            auto proxy = metric::Proxy(ctx).service(service).path(path.str);
+
+            auto value = co_await proxy.value();
+            entry_json["value"] = value;
+            entry_json["status"] = std::isfinite(value) ? "ok" : "unavailable";
+            if (auto v = co_await proxy.max_value(); std::isfinite(v))
+            {
+                entry_json["max"] = v;
+            }
+            if (auto v = co_await proxy.min_value(); std::isfinite(v))
+            {
+                entry_json["min"] = v;
+            }
+            entry_json["unit"] = last_element(
+                sdbusplus::message::convert_to_string(co_await proxy.unit()),
+                '.');
+        });
+
+        info("Finding metric threshold entries.");
+        co_await utils::mapper::subtree_for_each(
+            ctx, metric::ns_path, threshold::interface,
+
+            [&](const auto& path,
+                const auto& service) -> sdbusplus::async::task<> {
+            using namespace std::string_literals;
+
+            auto& sensor_json =
+                result[replace_substring(path, metric::ns_path + "/"s, "")];
+            auto proxy = threshold::Proxy(ctx).service(service).path(path.str);
+
+            auto values = co_await proxy.value();
+            auto asserted = co_await proxy.asserted();
+
+            for (const auto& [type, type_str] : thresholds)
+            {
+                for (const auto& [bound, bound_str] : bounds)
+                {
+                    if (values.contains(type) &&
+                        values.at(type).contains(bound))
+                    {
+                        if (auto v = values.at(type).at(bound);
+                            std::isfinite(v))
+                        {
+                            sensor_json[type_str][bound_str] = v;
+                            if (asserted.contains({type, bound}))
+                            {
+                                update_status(sensor_json, bound_str);
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        json::display(result);
+
+        co_return;
+    }
+
+    static constexpr auto thresholds =
+        std::to_array<std::tuple<threshold::Proxy::Type, std::string_view>>(
+            {{threshold::Proxy::Type::HardShutdown, "hard-shutdown"},
+             {threshold::Proxy::Type::Critical, "critical"},
+             {threshold::Proxy::Type::Warning, "warning"}});
+
+    static constexpr auto bounds =
+        std::to_array<std::tuple<threshold::Proxy::Bound, std::string_view>>(
+            {{threshold::Proxy::Bound::Upper, "high"},
+             {threshold::Proxy::Bound::Lower, "low"}});
+
+    template <template <typename> typename comparison>
+    static auto update_status(auto& entry_json, auto value, const auto& name)
+    {
+        if (!entry_json.contains("status"))
+        {
+            entry_json["status"] = "unavailable";
+            return;
+        }
+
+        auto& status = entry_json["status"];
+
+        if (status != "ok")
+        {
+            return;
+        }
+
+        if (comparison<decltype(value)>()(entry_json["value"], value))
+        {
+            status = name;
+        }
+    }
+
+    static auto update_status(auto& entry_json, const auto& name)
+    {
+        if (!entry_json.contains("status"))
+        {
+            entry_json["status"] = "unavailable";
+            return;
+        }
+
+        auto& status = entry_json["status"];
+
+        if (status != "ok")
+        {
+            return;
+        }
+
+        status = name;
+    }
+};
+MFGTOOL_REGISTER(command);
+} // namespace mfgtool::cmds::sensor_display
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/meson.build b/common/recipes-lfopenbmc/mfg-tool/files/meson.build
new file mode 100644
index 000000000000..f395e5367cc2
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/meson.build
@@ -0,0 +1,45 @@
+project(
+  'mfg-tool',
+  'cpp',
+  version: '1.0',
+  default_options: [
+    'buildtype=debugoptimized',
+    'cpp_std=c++23',
+    'warning_level=3',
+    'werror=true',
+  ],
+  meson_version: '>=1.1.1',
+)
+
+CLI11_dep = dependency('CLI11', include_type: 'system')
+nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
+phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
+phosphor_logging_dep = dependency('phosphor-logging')
+sdbusplus_dep = dependency('sdbusplus')
+
+executable(
+  'mfg-tool',
+  'mfg-tool.cpp',
+  'cmd/bmc-arch.cpp',
+  'cmd/bmc-state.cpp',
+  'cmd/fan-mode.cpp',
+  'cmd/fan-speed.cpp',
+  'cmd/hello.cpp',
+  'cmd/inventory.cpp',
+  'cmd/log-clear.cpp',
+  'cmd/log-display.cpp',
+  'cmd/log-resolve.cpp',
+  'cmd/power-control.cpp',
+  'cmd/power-state.cpp',
+  'cmd/sensor-display.cpp',
+  'utils/json.cpp',
+  'utils/register.cpp',
+  dependencies: [
+    CLI11_dep,
+    nlohmann_json_dep,
+    phosphor_dbus_interfaces_dep,
+    phosphor_logging_dep,
+    sdbusplus_dep,
+  ],
+  install: true
+)
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/mfg-tool.cpp b/common/recipes-lfopenbmc/mfg-tool/files/mfg-tool.cpp
new file mode 100644
index 000000000000..16d6fb12236c
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/mfg-tool.cpp
@@ -0,0 +1,15 @@
+#include "utils/register.hpp"
+
+#include <CLI/CLI.hpp>
+
+#include <algorithm>
+
+int main(int argc, char** argv)
+{
+    CLI::App app{"mfg-tool: temporary utilities for manufacturing support"};
+    app.require_subcommand(1);
+    mfgtool::init_commands(app);
+
+    CLI11_PARSE(app, argc, argv);
+    return 0;
+}
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/subprojects/CLI11.wrap b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/CLI11.wrap
new file mode 100644
index 000000000000..2e5a95b8dc35
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/CLI11.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/CLIUtils/CLI11.git
+revision = HEAD
+
+[provide]
+CLI11 = CLI11_dep
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/subprojects/nlohmann_json.wrap b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/nlohmann_json.wrap
new file mode 100644
index 000000000000..374538070704
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/nlohmann_json.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+revision = HEAD
+url = https://github.com/nlohmann/json.git
+
+[provide]
+nlohmann_json = nlohmann_json_dep
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/subprojects/phosphor-dbus-interfaces.wrap b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/phosphor-dbus-interfaces.wrap
new file mode 100644
index 000000000000..346aa0c43af1
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/phosphor-dbus-interfaces.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-dbus-interfaces.git
+revision = HEAD
+
+[provide]
+phosphor-dbus-interfaces = phosphor_dbus_interfaces_dep
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/subprojects/phosphor-logging.wrap b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/phosphor-logging.wrap
new file mode 100644
index 000000000000..71eee8b84aff
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/phosphor-logging.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-logging.git
+revision = HEAD
+
+[provide]
+phosphor-logging = phosphor_logging_dep
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/subprojects/sdbusplus.wrap b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/sdbusplus.wrap
new file mode 100644
index 000000000000..7b076d09fd7a
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/subprojects/sdbusplus.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/openbmc/sdbusplus.git
+revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/utils/dbus.hpp b/common/recipes-lfopenbmc/mfg-tool/files/utils/dbus.hpp
new file mode 100644
index 000000000000..127ae93efe0b
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/utils/dbus.hpp
@@ -0,0 +1,169 @@
+#include <xyz/openbmc_project/Collection/DeleteAll/client.hpp>
+#include <xyz/openbmc_project/Common/Threshold/client.hpp>
+#include <xyz/openbmc_project/Control/FanPwm/client.hpp>
+#include <xyz/openbmc_project/Control/Mode/client.hpp>
+#include <xyz/openbmc_project/Inventory/Decorator/Asset/client.hpp>
+#include <xyz/openbmc_project/Inventory/Item/client.hpp>
+#include <xyz/openbmc_project/Logging/Entry/client.hpp>
+#include <xyz/openbmc_project/Metric/Value/client.hpp>
+#include <xyz/openbmc_project/Sensor/Threshold/Critical/client.hpp>
+#include <xyz/openbmc_project/Sensor/Threshold/HardShutdown/client.hpp>
+#include <xyz/openbmc_project/Sensor/Threshold/Warning/client.hpp>
+#include <xyz/openbmc_project/Sensor/Value/client.hpp>
+#include <xyz/openbmc_project/State/BMC/client.hpp>
+#include <xyz/openbmc_project/State/Chassis/client.hpp>
+#include <xyz/openbmc_project/State/Host/client.hpp>
+
+#include <string>
+
+namespace mfgtool::dbuspath
+{
+
+namespace chassis
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::state::Chassis<>;
+static constexpr auto ns_path = Proxy::namespace_path::value;
+static constexpr auto interface = Proxy::interface;
+
+inline auto path(size_t id)
+{
+    return std::string(ns_path) + "/" +
+           std::string(Proxy::namespace_path::chassis) + std::to_string(id);
+}
+
+inline auto path_prefix()
+{
+    return std::string(ns_path) + "/" +
+           std::string(Proxy::namespace_path::chassis);
+}
+
+} // namespace chassis
+
+namespace host
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::state::Host<>;
+static constexpr auto ns_path = Proxy::namespace_path::value;
+static constexpr auto interface = Proxy::interface;
+
+inline auto path(size_t id)
+{
+    return std::string(ns_path) + "/" +
+           std::string(Proxy::namespace_path::host) + std::to_string(id);
+}
+
+inline auto path_prefix()
+{
+    return std::string(ns_path) + "/" +
+           std::string(Proxy::namespace_path::host);
+}
+
+} // namespace host
+
+namespace bmc
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::state::BMC<>;
+static constexpr auto ns_path = Proxy::namespace_path::value;
+static const auto interface = Proxy::interface;
+
+inline auto path()
+{
+    return std::string(ns_path) + "/" + std::string(Proxy::namespace_path::bmc);
+}
+
+} // namespace bmc
+
+namespace delete_all
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::collection::DeleteAll<>;
+}
+
+namespace log_entry
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::logging::Entry<>;
+static constexpr auto service = Proxy::default_service;
+static constexpr auto ns_path = Proxy::namespace_path::value;
+static constexpr auto interface = Proxy::interface;
+
+inline auto path(size_t id)
+{
+    return std::string(ns_path) + "/" +
+           std::string(Proxy::namespace_path::entry) + "/" + std::to_string(id);
+}
+} // namespace log_entry
+
+namespace metric
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::metric::Value<>;
+static constexpr auto ns_path = Proxy::namespace_path::value;
+static constexpr auto interface = Proxy::interface;
+} // namespace metric
+
+namespace threshold
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::common::Threshold<>;
+static constexpr auto interface = Proxy::interface;
+} // namespace threshold
+
+namespace sensor
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::sensor::Value<>;
+static constexpr auto ns_path = Proxy::namespace_path::value;
+static constexpr auto interface = Proxy::interface;
+
+namespace warning
+{
+using Proxy =
+    sdbusplus::client::xyz::openbmc_project::sensor::threshold::Warning<>;
+static constexpr auto interface = Proxy::interface;
+} // namespace warning
+
+namespace critical
+{
+using Proxy =
+    sdbusplus::client::xyz::openbmc_project::sensor::threshold::Critical<>;
+static constexpr auto interface = Proxy::interface;
+} // namespace critical
+
+namespace hard_shutdown
+{
+using Proxy =
+    sdbusplus::client::xyz::openbmc_project::sensor::threshold::HardShutdown<>;
+static constexpr auto interface = Proxy::interface;
+} // namespace hard_shutdown
+
+} // namespace sensor
+
+namespace inventory
+{
+namespace item
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::inventory::Item<>;
+static constexpr auto ns_path = Proxy::namespace_path;
+static constexpr auto interface = Proxy::interface;
+} // namespace item
+
+namespace asset
+{
+using Proxy =
+    sdbusplus::client::xyz::openbmc_project::inventory::decorator::Asset<>;
+static constexpr auto interface = Proxy::interface;
+} // namespace asset
+} // namespace inventory
+
+namespace control
+{
+
+namespace fan_pwm
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::control::FanPwm<>;
+static constexpr auto interface = Proxy::interface;
+} // namespace fan_pwm
+
+namespace mode
+{
+using Proxy = sdbusplus::client::xyz::openbmc_project::control::Mode<>;
+static constexpr auto interface = Proxy::interface;
+} // namespace mode
+} // namespace control
+
+} // namespace mfgtool::dbuspath
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/utils/json.cpp b/common/recipes-lfopenbmc/mfg-tool/files/utils/json.cpp
new file mode 100644
index 000000000000..2f1755c4f816
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/utils/json.cpp
@@ -0,0 +1,11 @@
+#include "utils/json.hpp"
+
+#include <iostream>
+
+namespace mfgtool::json
+{
+void display(const js& j)
+{
+    std::cout << j.dump(4) << std::endl;
+}
+} // namespace mfgtool::json
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/utils/json.hpp b/common/recipes-lfopenbmc/mfg-tool/files/utils/json.hpp
new file mode 100644
index 000000000000..7a9b1722a638
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/utils/json.hpp
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <nlohmann/json.hpp>
+
+namespace mfgtool
+{
+using js = nlohmann::json;
+
+namespace json
+{
+void display(const js&);
+inline auto empty_map()
+{
+    return R"({})"_json;
+}
+} // namespace json
+} // namespace mfgtool
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/utils/mapper.hpp b/common/recipes-lfopenbmc/mfg-tool/files/utils/mapper.hpp
new file mode 100644
index 000000000000..4953ec29e1b1
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/utils/mapper.hpp
@@ -0,0 +1,193 @@
+#pragma once
+
+#include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/async.hpp>
+#include <xyz/openbmc_project/ObjectMapper/client.hpp>
+
+#include <cstdint>
+#include <map>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace mfgtool::utils::mapper
+{
+
+/** Map of object path to service names. */
+using services_t =
+    std::map<sdbusplus::message::object_path, std::vector<std::string>>;
+
+namespace details
+{
+// I would have put this whole implementation directly into subtree_services
+// but I was running into ICEs in GCC-13.  Breaking it up into smaller pieces
+// seems to get away from the ICE.
+
+inline auto subtree_to_services(const auto& mapperResults) -> services_t
+{
+    services_t services{};
+
+    for (const auto& [objPath, objServices] : mapperResults)
+    {
+        for (const auto& [service, _] : objServices)
+        {
+            services[objPath].push_back(service);
+        }
+    }
+    return services;
+}
+
+auto subtree(sdbusplus::async::context& ctx, const auto& subpath,
+             const auto& interface, size_t depth = 0)
+{
+    using ObjectMapper =
+        sdbusplus::client::xyz::openbmc_project::ObjectMapper<>;
+
+    auto mapper = ObjectMapper(ctx)
+                      .service(ObjectMapper::default_service)
+                      .path(ObjectMapper::instance_path);
+
+    return mapper.get_sub_tree(subpath, depth, {interface});
+}
+
+auto object_service(sdbusplus::async::context& ctx, const auto& path,
+                    const auto& interface)
+{
+    using ObjectMapper =
+        sdbusplus::client::xyz::openbmc_project::ObjectMapper<>;
+
+    auto mapper = ObjectMapper(ctx)
+                      .service(ObjectMapper::default_service)
+                      .path(ObjectMapper::instance_path);
+
+    return mapper.get_object(path, {interface});
+}
+
+} // namespace details
+
+/** Get a list of services hosting a dbus interface by calling mapper.
+ *
+ *  @param[in] ctx - The dbus async context to execute against.
+ *  @param[in] subpath - The subpath filter to find objects under.
+ *  @param[in] interface - The interface to find.
+ *  @param[in] depth - The subpath depth to search.
+ *
+ *  @return A map of paths to services.
+ *
+ */
+auto subtree_services(sdbusplus::async::context& ctx, const auto& subpath,
+                      const auto& interface, size_t depth = 0)
+    -> sdbusplus::async::task<services_t>
+{
+    co_return details::subtree_to_services(
+        co_await details::subtree(ctx, subpath, interface, depth));
+}
+
+/** Iterate over the objects in a subtree.
+ *
+ *  Calls mapper to obtain the services hosting all of the objects in a subtree
+ * (assuming there is just one service per instance).  Iterate over the objects
+ * and call the supplied co-routine for each one.
+ *
+ *  @param[in] ctx - The dbus async context to execute against.
+ *  @param[in] subpath - The subpath filter to find objects under.
+ *  @param[in] interface - The interface to find.
+ *  @param[in] coroutine - The co-routine to call for each instance.
+ *  @param[in] depth - The subpath depth to search.
+ *
+ *  @return A map of paths to services.
+ *
+ */
+auto subtree_for_each(sdbusplus::async::context& ctx, const auto& subpath,
+                      const auto& interface, const auto& coroutine,
+                      size_t depth = 0) -> sdbusplus::async::task<>
+{
+    PHOSPHOR_LOG2_USING;
+
+    auto objects = co_await subtree_services(ctx, subpath, interface, depth);
+
+    debug("Iterating over entries.");
+    for (const auto& [path, services] : objects)
+    {
+        if (services.size() > 1)
+        {
+            warning("Multiple services ({COUNT}) provide {PATH}.", "PATH", path,
+                    "COUNT", services.size());
+            for (const auto& s : services)
+            {
+                warning("Service available at {SERVICE}.", "SERVICE", s);
+            }
+        }
+
+        info("Examining {INTERFACE} at {PATH}.", "INTERFACE", interface, "PATH",
+             path);
+        co_await coroutine(path, services[0]);
+    }
+}
+
+/** Iterate over the objects in a subtree.
+ *
+ *  Calls mapper to obtain the services hosting all of the objects in a subtree,
+ *  with the interfaces at each subpath. Iterate over the objects and call the
+ *  supplied co-routine for each one with the path, interface, and service.
+ *
+ *  @param[in] ctx - The dbus async context to execute against.
+ *  @param[in] subpath - The subpath filter to find objects under.
+ *  @param[in] interface - The interface to find.
+ *  @param[in] coroutine - The co-routine to call for each instance.
+ *  @param[in] depth - The subpath depth to search.
+ *
+ *  @return A map of paths to services.
+ *
+ */
+auto subtree_for_each_interface(sdbusplus::async::context& ctx,
+                                const auto& subpath, const auto& interface,
+                                const auto& coroutine, size_t depth = 0)
+    -> sdbusplus::async::task<>
+{
+    PHOSPHOR_LOG2_USING;
+
+    debug("Looking up objects under {PATH}.", "PATH", subpath);
+    auto objects = co_await details::subtree(ctx, subpath, interface, depth);
+
+    debug("iterating over entries.");
+    for (const auto& [path, services] : objects)
+    {
+        for (const auto& [service, interfaces] : services)
+        {
+            for (const auto& iface : interfaces)
+            {
+                info("Examining {INTERFACE} at {PATH} by {SERVICE}",
+                     "INTERFACE", interface, "PATH", path, "SERVICE", service);
+                co_await coroutine(path, service, iface);
+            }
+        }
+    }
+}
+
+/** Find the service hosting an object.
+ *
+ *  @param[in] ctx - The dbus async context to execute against.
+ *  @param[in] path - The expected object path.
+ *  @param[in] interface - The interface to find.
+ *
+ *  @return An optional string of the service or nullopt.
+ */
+auto object_service(sdbusplus::async::context& ctx, const auto& path,
+                    const auto& interface)
+    -> sdbusplus::async::task<std::optional<std::string>>
+{
+    // Mapper look up will return an exception of ResourceNotFound if the path
+    // doesn't exist.  Catch the exception and turn it into a nullopt.
+    try
+    {
+        auto result = co_await details::object_service(ctx, path, interface);
+        co_return result.begin()->first;
+    }
+    catch (...)
+    {
+        co_return std::nullopt;
+    }
+}
+
+} // namespace mfgtool::utils::mapper
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/utils/register.cpp b/common/recipes-lfopenbmc/mfg-tool/files/utils/register.cpp
new file mode 100644
index 000000000000..fdfbd4f29396
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/utils/register.cpp
@@ -0,0 +1,30 @@
+#include "utils/register.hpp"
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+
+namespace mfgtool
+{
+namespace details
+{
+using init_callback_t = std::function<void(CLI::App&)>;
+
+// Use a static member to ensure .init order doesn't matter.
+static auto& commands()
+{
+    static auto commands = std::vector<init_callback_t>{};
+    return commands;
+}
+
+void register_command(init_callback_t cb)
+{
+    commands().push_back(cb);
+}
+} // namespace details
+
+void init_commands(CLI::App& app)
+{
+    std::ranges::for_each(details::commands(), [&app](auto& cb) { cb(app); });
+}
+} // namespace mfgtool
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/utils/register.hpp b/common/recipes-lfopenbmc/mfg-tool/files/utils/register.hpp
new file mode 100644
index 000000000000..857ae117c07b
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/utils/register.hpp
@@ -0,0 +1,80 @@
+#pragma once
+
+#include <CLI/CLI.hpp>
+#include <sdbusplus/async.hpp>
+
+#include <functional>
+#include <memory>
+
+namespace mfgtool
+{
+
+template <typename T>
+using command_t = std::unique_ptr<T>;
+
+#define MFGTOOL_REGISTER(type, ...)                                            \
+    static auto command_registration_##type =                                  \
+        mfgtool::details::register_command<type>(__VA_ARGS__)
+
+template <typename T>
+void init_callback(CLI::App*, T&);
+
+namespace details
+{
+void register_command(std::function<void(CLI::App&)>);
+
+template <typename T>
+concept has_init_with_app = requires(T& t, CLI::App& app) { t.init(app); };
+
+template <typename T, typename... Args>
+concept has_valid_constructor = requires(Args... args) { T(args...); };
+
+template <typename T, typename... Args>
+auto register_command(Args... args) -> command_t<T>
+    requires has_init_with_app<T> && has_valid_constructor<T, Args...>
+{
+    auto c = std::make_unique<T>(args...);
+
+    details::register_command(
+        [command = c.get()](auto& app) { command->init(app); });
+
+    return c;
+}
+
+template <typename T>
+concept has_run = requires(T& t) { t.run(); };
+
+template <typename T>
+concept has_async_run =
+    requires(T& t, sdbusplus::async::context& ctx) { ctx.spawn(t.run(ctx)); };
+
+} // namespace details
+
+template <typename T>
+void init_callback(CLI::App*, T&)
+{
+    static_assert(false, "T has neither static or async run function.");
+}
+
+template <typename T>
+void init_callback(CLI::App* cmd, T& t)
+    requires details::has_run<T>
+{
+    cmd->callback([&]() { t.run(); });
+}
+
+template <typename T>
+void init_callback(CLI::App* cmd, T& t)
+    requires details::has_async_run<T>
+{
+    cmd->callback([&]() {
+        sdbusplus::async::context ctx;
+        ctx.spawn(t.run(ctx) | sdbusplus::async::execution::then(
+                                   [&]() { ctx.request_stop(); }));
+        ctx.run();
+    });
+}
+
+void init_commands(CLI::App&);
+
+} // namespace mfgtool
diff --git a/common/recipes-lfopenbmc/mfg-tool/files/utils/string.hpp b/common/recipes-lfopenbmc/mfg-tool/files/utils/string.hpp
new file mode 100644
index 000000000000..d1e3f6f3c7d9
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/files/utils/string.hpp
@@ -0,0 +1,52 @@
+#pragma once
+#include <string>
+#include <string_view>
+
+namespace mfgtool::utils::string
+{
+
+/** Get the last element of a deliminated string.
+ *
+ *  @param[in] s - The string (or object_path).
+ *  @param[in] c - The character to use as the deliminator.
+ */
+static auto last_element(const auto& s, char c = '/')
+{
+    if constexpr (requires(decltype(s)& t) { t.str; })
+    {
+        return last_element(s.str, c);
+    }
+    else
+    {
+        return s.substr(s.find_last_of(c) + 1);
+    }
+}
+
+/** Replace a substring with another one.
+ *
+ *  @param[in] s - The string (or object_path) to update.
+ *  @param[in] old_p - The old pattern.
+ *  @param[in] new_p - The new pattern.
+ */
+static auto replace_substring(const auto& s, const std::string_view& old_p,
+                              const auto& new_p)
+{
+    if constexpr (requires(decltype(s)& t) { t.str; })
+    {
+        return replace_substring(s.str, old_p, new_p);
+    }
+    else
+    {
+        auto pos = s.find(old_p);
+        if (pos == std::string::npos)
+        {
+            return s;
+        }
+        auto new_s = s;
+        new_s.replace(pos, old_p.length(), new_p);
+
+        return new_s;
+    }
+}
+
+} // namespace mfgtool::utils::string
diff --git a/common/recipes-lfopenbmc/mfg-tool/mfg-tool_1.0.bb b/common/recipes-lfopenbmc/mfg-tool/mfg-tool_1.0.bb
new file mode 100644
index 000000000000..b33c0c08b7f2
--- /dev/null
+++ b/common/recipes-lfopenbmc/mfg-tool/mfg-tool_1.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Linux Foundation OpenBMC based mfg-tool utility"
+DESCRIPTION = "A wrapper utility for manufacturing use cases"
+SECTION = "base"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+inherit meson pkgconfig
+
+LOCAL_URI = " \
+    file://meson.build \
+    file://mfg-tool.cpp \
+    file://cmd \
+    file://utils \
+    "
+
+DEPENDS += " \
+    cli11 \
+    nlohmann-json \
+    phosphor-dbus-interfaces \
+    phosphor-logging \
+    sdbusplus \
+    "
diff --git a/common/recipes-lfopenbmc/rsyslog/files/rsyslog-remote.conf.in b/common/recipes-lfopenbmc/rsyslog/files/rsyslog-remote.conf.in
new file mode 100644
index 000000000000..23ec4a303aaa
--- /dev/null
+++ b/common/recipes-lfopenbmc/rsyslog/files/rsyslog-remote.conf.in
@@ -0,0 +1,12 @@
+
+# Use a format expected by syslog aggregators.
+$template RemoteLogFormat," %$YEAR% %TIMESTAMP% %HOSTNAME% %pri-text% __OPENBMC_VERSION__: %syslogtag%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
+
+# Log to syslog server. If it is not present or reachable,
+# give up after 10 attempts while retrying every second (20 second timeout).
+# Also keep it at the end if we need to just amend the server name using cfg-util.
+*.* action(type="omfwd" name="remoteLog" template="RemoteLogFormat" target="syslog" port="514" protocol="tcp"
+           queue.type="LinkedList" action.resumeRetryCount="1" action.resumeInterval="60"
+           queue.size="100" queue.workerthreadminimummessages="101" queue.discardseverity="0"
+           queue.timeoutenqueue="0" queue.timeoutshutdown="10" queue.timeoutactioncompletion="100"
+           action.reportSuspension="off" action.reportSuspensionContinuation="off")
diff --git a/common/recipes-lfopenbmc/rsyslog/rsyslog_%.bbappend b/common/recipes-lfopenbmc/rsyslog/rsyslog_%.bbappend
new file mode 100644
index 000000000000..1959981258c5
--- /dev/null
+++ b/common/recipes-lfopenbmc/rsyslog/rsyslog_%.bbappend
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS:prepend:openbmc-fb-lf := "${THISDIR}/files:"
+
+SRC_URI:append:openbmc-fb-lf = "\
+    file://rsyslog-remote.conf.in \
+    "
+
+do_install:append:openbmc-fb-lf() {
+  rsysconf="${D}${sysconfdir}/rsyslog.d"
+  install -d ${rsysconf}
+  remote_conf="${rsysconf}/remote.conf"
+  install -m 644 ${WORKDIR}/rsyslog-remote.conf.in ${remote_conf}
+  sed -i "s/__OPENBMC_VERSION__/${OPENBMC_VERSION}/g" ${remote_conf}
+}
diff --git a/common/recipes-lib/mctp/files/0007-fix-BTU-error.patch b/common/recipes-lib/mctp/files/0007-fix-BTU-error.patch
new file mode 100644
index 000000000000..4add969c006a
--- /dev/null
+++ b/common/recipes-lib/mctp/files/0007-fix-BTU-error.patch
@@ -0,0 +1,51 @@
+From e8e3bf36355f79a4a5c95acbc029514332861abc Mon Sep 17 00:00:00 2001
+From: Ken Chen <j220584470k@gmail.com>
+Date: Fri, 2 Feb 2024 13:50:53 +0800
+Subject: [PATCH] fix BTU error.
+
+---
+ core.c    | 4 ++--
+ libmctp.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/core.c b/core.c
+index 6532e35..632ef2c 100644
+--- a/core.c
++++ b/core.c
+@@ -149,9 +149,9 @@ void *mctp_pktbuf_data(struct mctp_pktbuf *pkt)
+ 			sizeof(struct mctp_hdr));
+ }
+ 
+-uint8_t mctp_pktbuf_size(struct mctp_pktbuf *pkt)
++size_t mctp_pktbuf_size(struct mctp_pktbuf *pkt)
+ {
+-	return (uint8_t)(pkt->end - pkt->start);
++	return pkt->end - pkt->start;
+ }
+ 
+ /*
+diff --git a/libmctp.h b/libmctp.h
+index 3571b2d..7558532 100644
+--- a/libmctp.h
++++ b/libmctp.h
+@@ -51,7 +51,7 @@ struct mctp_hdr {
+ 
+ /* Baseline Transmission Unit and packet size */
+ #define MCTP_BTU 64
+-#define MCTP_I3C_BTU 256
++#define MCTP_I3C_BTU 252
+ #define MCTP_PACKET_SIZE(unit) ((unit) + sizeof(struct mctp_hdr))
+ 
+ #define TX_DISABLED_ERR (-1024)
+@@ -72,7 +72,7 @@ struct mctp_pktbuf *mctp_pktbuf_alloc(struct mctp_binding *hw, size_t len);
+ void mctp_pktbuf_free(struct mctp_pktbuf *pkt);
+ struct mctp_hdr *mctp_pktbuf_hdr(struct mctp_pktbuf *pkt);
+ void *mctp_pktbuf_data(struct mctp_pktbuf *pkt);
+-uint8_t mctp_pktbuf_size(struct mctp_pktbuf *pkt);
++size_t mctp_pktbuf_size(struct mctp_pktbuf *pkt);
+ uint8_t mctp_pktbuf_end_index(struct mctp_pktbuf *pkt);
+ void *mctp_pktbuf_alloc_start(struct mctp_pktbuf *pkt, size_t size);
+ void *mctp_pktbuf_alloc_end(struct mctp_pktbuf *pkt, size_t size);
+-- 
+2.25.1
+
diff --git a/common/recipes-lib/mctp/libmctp-intel_git.bb b/common/recipes-lib/mctp/libmctp-intel_git.bb
index 14923e93a7b9..dfa431cadef1 100644
--- a/common/recipes-lib/mctp/libmctp-intel_git.bb
+++ b/common/recipes-lib/mctp/libmctp-intel_git.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/Intel-BMC/libmctp.git;protocol=https;branch=master \
            file://0004-test-astlpc-fix-compile-warning.patch \
            file://0005-Replace-pollfd-to-use-local-struct.patch \
            file://0006-Add-MCTP_BTU-size-to-match-the-bic-setting.patch \
+           file://0007-fix-BTU-error.patch \
           "
 SRCREV = "21dc38e911a27af2e914f834b2e2b775f7dad520"
 SRC_URI[md5sum] = "1c7db87fb8fa946b03d91fff08b0825a"
diff --git a/common/recipes-lib/ncsi/files/meson.build b/common/recipes-lib/ncsi/files/meson.build
index 47ee2d503046..e806abb58b05 100644
--- a/common/recipes-lib/ncsi/files/meson.build
+++ b/common/recipes-lib/ncsi/files/meson.build
@@ -15,6 +15,7 @@ headers = [
     'aen.h',
     'ncsi-brcm.h',
     'ncsi-nvidia.h',
+    'ncsi-meta.h',
     'ncsi.h',
 ]
 
@@ -22,6 +23,7 @@ sources = [
     'aen.c',
     'ncsi-brcm.c',
     'ncsi-nvidia.c',
+    'ncsi-meta.c',
     'ncsi.c',
 ]
 
diff --git a/common/recipes-lib/ncsi/files/ncsi-meta.c b/common/recipes-lib/ncsi/files/ncsi-meta.c
new file mode 100644
index 000000000000..9afeacff2b70
--- /dev/null
+++ b/common/recipes-lib/ncsi/files/ncsi-meta.c
@@ -0,0 +1,249 @@
+/*
+ * ncsi-meta.c
+ *
+ * Copyright 2020-present Facebook. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+#include <arpa/inet.h>
+#include "ncsi.h"
+#include "ncsi-meta.h"
+
+const char *ncsi_meta_cmd_type_to_name(uint8_t cmd_type)
+{
+  switch (cmd_type) {
+    case NCSI_META_GET_DEBUG_DATA:
+      return "GET_DEBUG_DATA";
+    default:
+      return "UNKNOWN";
+  }
+}
+
+int ncsi_meta_create_req_pkt(NCSI_NL_MSG_T *nl_msg, uint8_t ch, uint8_t cmd,
+                             uint16_t req_len, void *req)
+{
+  NCSI_Meta_Request_Hdr *req_hdr = req;
+
+  req_hdr->manufacturer_id = htonl(META_IANA);
+  req_hdr->meta_payload_ver = NCSI_META_PAYLOAD_VERSION;
+  req_hdr->meta_cmd_type = cmd;
+  req_hdr->meta_payload_len = htons(req_len - sizeof(*req_hdr));
+  req_hdr->reserved = 0;
+
+  return create_ncsi_ctrl_pkt(nl_msg, ch, NCSI_OEM_CMD, req_len, req);
+}
+
+int ncsi_meta_check_resp_type(NCSI_NL_RSP_T *nl_resp, uint8_t meta_cmd_type)
+{
+  NCSI_Meta_Response_Hdr *resp_hdr = ncsi_get_meta_resp(nl_resp);
+  uint32_t oem_iana;
+
+  if (nl_resp->hdr.cmd != NCSI_OEM_CMD) {
+    ncsi_log(LOG_ERR, "Error: not ncsi oem response 0x%x", nl_resp->hdr.cmd);
+    return -1;
+  }
+
+  oem_iana = ntohl(resp_hdr->manufacturer_id);
+  if (oem_iana != META_IANA) {
+    ncsi_log(LOG_ERR, "Error: bad ncsi oem manufacturer id 0x%x", oem_iana);
+    return -1;
+  }
+
+  if (resp_hdr->meta_cmd_type != meta_cmd_type) {
+    ncsi_log(LOG_ERR, "Error: bad ncsi meta cmd 0x%x, expect 0x%x",
+          resp_hdr->meta_cmd_type, meta_cmd_type);
+    return -1;
+  }
+
+  return 0;
+}
+
+int ncsi_meta_check_resp_len(NCSI_NL_RSP_T *nl_resp, uint16_t min_resp_size)
+{
+  NCSI_Meta_Response_Hdr *resp_hdr = ncsi_get_meta_resp(nl_resp);
+  uint16_t meta_payload_len;
+
+  if (nl_resp->hdr.payload_length < min_resp_size) {
+    ncsi_log(LOG_ERR, "Error: ncsi response payload length %u too short for "
+             "meta min size %u", nl_resp->hdr.payload_length, min_resp_size);
+    return -1;
+  }
+
+  meta_payload_len = ntohs(resp_hdr->meta_payload_len);
+  if (nl_resp->hdr.payload_length != sizeof(*resp_hdr) + meta_payload_len) {
+    ncsi_log(LOG_ERR, "Error: ncsi payload len %u not match "
+             "meta len (hdr %zu + payload %u)",
+             (unsigned int)nl_resp->hdr.payload_length,
+             sizeof(*resp_hdr),
+             (unsigned int)meta_payload_len);
+    return -1;
+  }
+
+  return 0;
+}
+
+int ncsi_meta_check_resp(NCSI_NL_RSP_T *nl_resp, uint8_t meta_cmd_type,
+                         uint16_t min_resp_size)
+{
+  if (ncsi_meta_check_resp_type(nl_resp, meta_cmd_type)) {
+    return -1;
+  }
+
+  if (ncsi_meta_check_resp_len(nl_resp, min_resp_size)) {
+    return -1;
+  }
+
+  return 0;
+}
+
+void ncsi_meta_print_resp_meta_hdr(NCSI_NL_RSP_T *nl_resp)
+{
+  NCSI_Meta_Response_Hdr *resp_hdr = ncsi_get_meta_resp(nl_resp);
+  uint32_t oem_iana = ntohl(resp_hdr->manufacturer_id);
+
+  printf("IANA: %s(0x%x)\n",
+         (oem_iana == META_IANA) ? "Meta" : "Other", oem_iana);
+  printf("Meta cmd: %s(0x%x)\n",
+         ncsi_meta_cmd_type_to_name(resp_hdr->meta_cmd_type),
+         resp_hdr->meta_cmd_type);
+  printf("Meta payload length: %u\n", ntohs(resp_hdr->meta_payload_len));
+  printf("Meta payload version: %u\n", resp_hdr->meta_payload_ver);
+}
+
+void ncsi_meta_print_resp(NCSI_NL_RSP_T *nl_resp)
+{
+  NCSI_Meta_Response_Hdr *resp_hdr = ncsi_get_meta_resp(nl_resp);
+
+  print_ncsi_completion_codes(nl_resp);
+  if (get_cmd_status(nl_resp) != RESP_COMMAND_COMPLETED)
+    return;
+
+  ncsi_meta_print_resp_meta_hdr(nl_resp);
+
+  switch (resp_hdr->meta_cmd_type) {
+  case NCSI_META_GET_DEBUG_DATA:
+    ncsi_meta_print_get_debug_data(nl_resp);
+    break;
+  default:
+    print_ncsi_data(resp_hdr + 1, ntohs(resp_hdr->meta_payload_len), 64,
+                    sizeof(CTRL_MSG_HDR_t) + sizeof(*resp_hdr));
+    break;
+  }
+}
+
+/*
+ * GetDebugData functions
+ */
+const char *ncsi_meta_get_debug_type_to_name(int type)
+{
+  switch (type) {
+    case NCSI_META_GET_DEBUG_DATA_TYPE_CORE_DUMP:
+      return "coredump";
+    case NCSI_META_GET_DEBUG_DATA_TYPE_CRASH_DUMP:
+      return "crashdump";
+    default:
+      return "unknown";
+  }
+}
+
+int ncsi_meta_check_get_debug_data(NCSI_NL_RSP_T *nl_resp, int debug_data_type,
+                                   bool is_first)
+{
+  NCSI_Meta_Get_Debug_Data_Response *gdd_resp = ncsi_get_meta_resp(nl_resp);
+  size_t data_len = nl_resp->hdr.payload_length - sizeof(*gdd_resp);
+
+  /* Check GetDebugData response data */
+  gdd_resp = ncsi_get_meta_resp(nl_resp);
+  if (ntohs(gdd_resp->type) != debug_data_type) {
+    ncsi_log(LOG_ERR, "Error: bad GetDebugData type 0x%x, expect 0x%x",
+             ntohs(gdd_resp->type), debug_data_type);
+    return -1;
+  }
+
+
+  if (is_first) {
+    /* First response must have op of star not middle */
+    if (!(gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_START) ||
+        (gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_MIDDLE)) {
+      ncsi_log(LOG_ERR, "Error: bad GetDebugData Start response op 0x%x",
+               gdd_resp->op);
+      return -1;
+    }
+
+    /* First response must contain debug data length word */
+    if (data_len < sizeof(uint32_t)) {
+      ncsi_log(LOG_ERR, "Error: GetDebugData Start response data too short (%zu)"
+               ,  data_len);
+      return -1;
+    }
+
+    /* Exclude debug data length */
+    data_len -= sizeof(uint32_t);
+
+  } else {
+      /* Next response must has op of middle or end not start */
+    if ((gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_START) ||
+        !(gdd_resp->op & (NCSI_META_GET_DEBUG_DATA_RESP_OP_MIDDLE |
+                          NCSI_META_GET_DEBUG_DATA_RESP_OP_END))) {
+      ncsi_log(LOG_ERR, "Error: bad GetDebugData GetNext response op 0x%x",
+               gdd_resp->op);
+      return -1;
+    }
+  }
+
+  if (gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_END) {
+    /* Last response must have CRC32 checksum word */
+    if (data_len < sizeof(uint32_t)) {
+      ncsi_log(LOG_ERR, "Error: GetDebugData End response data too short (%zu)",
+               data_len);
+      return -1;
+    }
+
+    /* Exclude checksum */
+    data_len -= sizeof(uint32_t);
+  }
+
+  return 0;
+}
+
+void ncsi_meta_print_get_debug_data(NCSI_NL_RSP_T *nl_resp)
+{
+  NCSI_Meta_Get_Debug_Data_Response *gdd_resp = ncsi_get_meta_resp(nl_resp);
+  int debug_data_len = ntohs(gdd_resp->header.meta_payload_len)
+                        - NCSI_META_RESP_STRUCT_PAYLOAD_SIZE(gdd_resp);
+
+  printf("Data length: %d\n", debug_data_len);
+  printf("Type: %s\n", ncsi_meta_get_debug_type_to_name(ntohs(gdd_resp->type)));
+  printf("Op:");
+  if (gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_START) {
+    printf(" start");
+  }
+  if (gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_MIDDLE) {
+    printf(" middle");
+  }
+  if (gdd_resp->op & NCSI_META_GET_DEBUG_DATA_RESP_OP_END) {
+    printf(" end");
+  }
+  printf("\n");
+  printf("Next handle: 0x%x\n", ntohl(gdd_resp->next_data_handle));
+  printf("Debug data:\n");
+  print_ncsi_data(gdd_resp->debug_data, debug_data_len, 32 /* max print num */,
+                  sizeof(CTRL_MSG_HDR_t) + sizeof(*gdd_resp));
+}
diff --git a/common/recipes-lib/ncsi/files/ncsi-meta.h b/common/recipes-lib/ncsi/files/ncsi-meta.h
new file mode 100644
index 000000000000..2d4806add9c9
--- /dev/null
+++ b/common/recipes-lib/ncsi/files/ncsi-meta.h
@@ -0,0 +1,115 @@
+/*
+ * ncsi-meta.h
+ *
+ * Copyright 2020-present Facebook. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef _NCSI_META_H_
+#define _NCSI_META_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "ncsi.h"
+
+/*
+ * Meta OEM request and response header
+ */
+typedef struct {
+  uint32_t manufacturer_id;
+  uint8_t  meta_payload_ver;
+  uint8_t  meta_cmd_type;
+  uint16_t meta_payload_len;
+  uint32_t reserved;
+} __attribute__((packed)) NCSI_Meta_Request_Hdr;
+
+typedef struct {
+  uint16_t response_code;
+  uint16_t reason_code;
+  uint32_t manufacturer_id;
+  uint8_t  meta_payload_ver;
+  uint8_t  meta_cmd_type;
+  uint16_t meta_payload_len;
+} __attribute__((packed)) NCSI_Meta_Response_Hdr;
+
+/* Meta OEM payload version */
+#define NCSI_META_PAYLOAD_VERSION       1
+
+/*
+ * Meta OEM command types
+ */
+#define NCSI_META_GET_DEBUG_DATA        0x30
+
+/*
+ * GetDebugData
+ */
+typedef struct {
+  NCSI_Meta_Request_Hdr   header;
+  uint32_t                data_handle;
+  uint8_t                 reserved1;
+  uint8_t                 op;
+  uint16_t                type;
+} __attribute__((packed)) NCSI_Meta_Get_Debug_Data_Request;
+
+typedef struct {
+  NCSI_Meta_Response_Hdr  header;
+  uint32_t                next_data_handle;
+  uint8_t                 reserved;
+  uint8_t                 op;
+  uint16_t                type;
+  uint8_t                 debug_data[]; /* data of variable length */
+} __attribute__((packed)) NCSI_Meta_Get_Debug_Data_Response;
+
+#define NCSI_META_GET_DEBUG_DATA_TYPE_CORE_DUMP     0
+#define NCSI_META_GET_DEBUG_DATA_TYPE_CRASH_DUMP    1
+
+#define NCSI_META_GET_DEBUG_DATA_REQ_OP_MASK        0xf
+#define NCSI_META_GET_DEBUG_DATA_REQ_OP_GET_NEXT    0
+#define NCSI_META_GET_DEBUG_DATA_REQ_OP_START_XFER  1
+
+#define NCSI_META_GET_DEBUG_DATA_RESP_OP_MASK       0xf
+#define NCSI_META_GET_DEBUG_DATA_RESP_OP_START      0x1
+#define NCSI_META_GET_DEBUG_DATA_RESP_OP_MIDDLE     0x2
+#define NCSI_META_GET_DEBUG_DATA_RESP_OP_END        0x4
+
+
+/* Meta OEM response structure payload size */
+#define NCSI_META_RESP_STRUCT_PAYLOAD_SIZE(meta_resp) \
+  (sizeof(*(meta_resp)) - sizeof(NCSI_Meta_Response_Hdr))
+
+const char *ncsi_meta_cmd_type_to_name(uint8_t cmd_type);
+
+int ncsi_meta_create_req_pkt(NCSI_NL_MSG_T *nl_msg, uint8_t ch, uint8_t cmd,
+                             uint16_t req_len, void *req);
+
+/* Get Meta OEM response from NC-SI response message */
+static inline void *ncsi_get_meta_resp(NCSI_NL_RSP_T *nl_resp)
+{
+  return nl_resp->msg_payload;
+}
+
+int ncsi_meta_check_resp_type(NCSI_NL_RSP_T *nl_resp, uint8_t meta_cmd_type);
+int ncsi_meta_check_resp_len(NCSI_NL_RSP_T *nl_resp, uint16_t min_resp_size);
+int ncsi_meta_check_resp(NCSI_NL_RSP_T *nl_resp, uint8_t meta_cmd_type,
+                         uint16_t min_resp_size);
+void ncsi_meta_print_resp_meta_hdr(NCSI_NL_RSP_T *nl_resp);
+void ncsi_meta_print_resp(NCSI_NL_RSP_T *nl_resp);
+
+const char *ncsi_meta_get_debug_type_to_name(int type);
+int ncsi_meta_check_get_debug_data(NCSI_NL_RSP_T *nl_resp, int debug_data_type,
+                                   bool is_first);
+void ncsi_meta_print_get_debug_data(NCSI_NL_RSP_T *nl_resp);
+
+#endif /* _NCSI_META_H_ */
diff --git a/common/recipes-lib/ncsi/files/ncsi.h b/common/recipes-lib/ncsi/files/ncsi.h
index c340c193cdc5..e32bae51e8d5 100644
--- a/common/recipes-lib/ncsi/files/ncsi.h
+++ b/common/recipes-lib/ncsi/files/ncsi.h
@@ -45,6 +45,7 @@
 // NIC manufacturer IANAs
 #define BCM_IANA                                         0x0000113D
 #define MLX_IANA                                         0x00008119
+#define META_IANA                                        0x00001D9B
 
 
 
diff --git a/common/recipes-lib/ncsi/libncsi_0.1.bb b/common/recipes-lib/ncsi/libncsi_0.1.bb
index 5cc6f47a6bf4..ada2cba025af 100644
--- a/common/recipes-lib/ncsi/libncsi_0.1.bb
+++ b/common/recipes-lib/ncsi/libncsi_0.1.bb
@@ -16,6 +16,8 @@ LOCAL_URI = " \
     file://ncsi-brcm.h \
     file://ncsi-nvidia.c \
     file://ncsi-nvidia.h \
+    file://ncsi-meta.c \
+    file://ncsi-meta.h \
     "
 
 inherit meson pkgconfig
diff --git a/common/recipes-lib/obmc-pal/files/obmc-pal.c b/common/recipes-lib/obmc-pal/files/obmc-pal.c
index 5dfe8c4d5a51..f81d895a6c24 100644
--- a/common/recipes-lib/obmc-pal/files/obmc-pal.c
+++ b/common/recipes-lib/obmc-pal/files/obmc-pal.c
@@ -124,7 +124,7 @@ pal_lpc_snoop_read_legacy(uint8_t *buf, size_t max_len, size_t *len)
   }
   for (i=0; i < max_len; i++) {
     // %hhx: unsigned char*
-    if (fscanf(fp, "%hhx%*s", &postcode) == 1) {
+    if (fscanf(fp, "%hhx", &postcode) == 1) {
       buf[i] = postcode;
     } else {
       break;
@@ -1354,6 +1354,18 @@ pal_set_key_value(char *key, char *value)
   return PAL_EOK;
 }
 
+int __attribute__((weak))
+pal_store_key_value()
+{
+  return PAL_EOK;
+}
+
+int __attribute__((weak))
+pal_restore_key_value()
+{
+  return PAL_EOK;
+}
+
 int __attribute__((weak))
 pal_set_def_key_value(void)
 {
@@ -3533,7 +3545,7 @@ pal_convert_sensor_reading(sdr_full_t *sdr, int in_value, float *out_value) {
 }
 
 int __attribute__((weak))
-pal_bic_self_test(void) {
+pal_bic_self_test(uint8_t fru) {
   return PAL_ENOTSUP;
 }
 
diff --git a/common/recipes-lib/obmc-pal/files/obmc-pal.h b/common/recipes-lib/obmc-pal/files/obmc-pal.h
index 1eef52f99507..c92a9e3c02a6 100644
--- a/common/recipes-lib/obmc-pal/files/obmc-pal.h
+++ b/common/recipes-lib/obmc-pal/files/obmc-pal.h
@@ -520,6 +520,8 @@ int pal_get_sensor_threshold(uint8_t fru, uint8_t sensor_num, uint8_t thresh, vo
 int pal_cfg_key_check(char *key);
 int pal_get_key_value(char *key, char *value);
 int pal_set_key_value(char *key, char *value);
+int pal_store_key_value();
+int pal_restore_key_value();
 int pal_set_def_key_value(void);
 void pal_dump_key_value(void);
 int pal_get_last_pwr_state(uint8_t fru, char *state);
@@ -665,7 +667,7 @@ int pal_get_ioc_fw_recovery(uint8_t ioc_recovery_component, uint8_t *res_data, u
 int pal_setup_exp_uart_bridging(void);
 int pal_teardown_exp_uart_bridging(void);
 int pal_convert_sensor_reading(sdr_full_t *sdr, int in_value, float *out_value);
-int pal_bic_self_test(void);
+int pal_bic_self_test(uint8_t fru);
 int pal_is_bic_ready(uint8_t fru, uint8_t *status);
 bool pal_is_bic_heartbeat_ok(uint8_t fru);
 int pal_bic_hw_reset(void);
diff --git a/common/recipes-lib/obmc-pal/libpal_0.2.bb b/common/recipes-lib/obmc-pal/libpal_0.2.bb
index 7010c0c516c1..0baf6b1d23bd 100644
--- a/common/recipes-lib/obmc-pal/libpal_0.2.bb
+++ b/common/recipes-lib/obmc-pal/libpal_0.2.bb
@@ -44,7 +44,7 @@ DEPENDS += " \
     obmc-pal \
     "
 
-EXTRA_OEMESON:append = "-Dmachine=\"${MACHINE}\""
+EXTRA_OEMESON:append = " -Dmachine=\"${MACHINE}\""
 
 
 inherit python3-dir
diff --git a/common/recipes-lib/obmc-pldm/files/fw_update.cpp b/common/recipes-lib/obmc-pldm/files/fw_update.cpp
index 7a345a68cb53..894b19ff1f31 100644
--- a/common/recipes-lib/obmc-pldm/files/fw_update.cpp
+++ b/common/recipes-lib/obmc-pldm/files/fw_update.cpp
@@ -22,9 +22,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <algorithm>
+#include <cstring>
 #include "pldm.h"
 #include "oem_pldm.hpp"
 #include "fw_update.hpp"
+#include <map>
+#include <time.h>
 
 #define MAX_TRANSFER_SIZE 1024
 
@@ -104,6 +107,7 @@ const int maxTransferSize = 1024;
 pldm_package_header_information pkg_header{};
 vector<firmware_device_id_record_t> pkg_devices{};
 vector<component_image_info_t> pkg_comps{};
+vector<vector<struct device_id_record_descriptor>> query_device_descriptors;
 
 static string
 variable_field_to_str(const variable_field& field)
@@ -116,6 +120,247 @@ variable_field_to_str(const variable_field& field)
   return ret;
 }
 
+int get_stage_id(string stage)
+{
+  static const std::map<string, const uint8_t> stage_map = {
+    {"POC", 0x00},
+    {"EVT1", 0x01},
+    {"EVT2", 0x02},
+    {"DVT", 0x03},
+    {"PVT", 0x04},
+    {"MP", 0x05},
+  };
+
+  if (stage_map.find(stage) != stage_map.end())
+    return stage_map.at(stage);
+  else
+    return -1;
+}
+
+void parse_vendor_define_type_data(string& input_data, string& type, string& output_data)
+{
+  if (input_data.size() == 0 || ((input_data.size() - input_data.at(1) - 2) < 0)) {
+    syslog(LOG_WARNING, "Parse vendor defined type/data fail, input data length: 0x%x\n", input_data.size());
+    return;
+  }
+
+  // Example: input_data is 0x01 0x05 0x53 0x74 0x61 0x67 0x65 0x50 0x56 0x54
+  // Title string: 0x53 0x74 0x61 0x67 0x65 (Stage)
+  // Data string: 0x50 0x56 0x54 (PVT)
+  type = input_data.c_str() + 2; // Title string start offset (0x53 0x74 0x61 0x67 0x65 0x50 0x56 0x54)
+  output_data = input_data.c_str() + 2 + input_data.at(1); // Data string start offset (0x50 0x56 0x54)
+  type.resize(input_data.at(1)); // Title string length (0x53 0x74 0x61 0x67 0x65)
+  output_data.resize(input_data.size() - input_data.at(1) - 2); // Data string length (0x50 0x56 0x54)
+}
+
+static int
+pldm_check_descriptors_is_match(const vector<device_id_record_descriptor>& image_data)
+{
+  uint8_t index = 0;
+  uint8_t count = 0;
+  uint8_t checked = 0;
+
+  for (index = 0; index < query_device_descriptors.size(); ++index) {
+    vector<device_id_record_descriptor> dev_descriptor = query_device_descriptors.at(index);
+    if (dev_descriptor.size() >= image_data.size()) {
+      for (count = 0; count < dev_descriptor.size(); ++count) {
+	device_id_record_descriptor image_descriptors = image_data.at(count);
+	device_id_record_descriptor query_descriptors = dev_descriptor.at(count);
+        if (image_descriptors.type == query_descriptors.type) {
+          if (image_descriptors.type == PLDM_FWUP_VENDOR_DEFINED) {
+            // Make downward compatibility for Stage
+	    string compare_type;
+	    string compare_data;
+	    string dev_type;
+	    string dev_data;
+
+	    parse_vendor_define_type_data(image_descriptors.data, compare_type, compare_data);
+	    parse_vendor_define_type_data(query_descriptors.data, dev_type, dev_data);
+	    if (compare_type == "Stage" && dev_type == "Stage") {
+              if (get_stage_id(compare_data) <= get_stage_id(dev_data)) {
+		checked += 1;
+
+		if (checked == image_data.size()) {
+                  return 0;
+		}
+		continue;
+	      }
+	    }
+	  }
+
+	  if (image_descriptors.data == query_descriptors.data) {
+            checked += 1;
+
+	    if (checked == image_data.size()) {
+              return 0;
+	    }
+	  }
+	}
+      }
+    }
+
+    checked = 0;
+  }
+
+  return -1;
+}
+
+static int
+pldm_query_device_identifiers(uint8_t bus, uint8_t eid)
+{
+  uint8_t index = 0;
+  vector<uint8_t> response{};
+  vector<uint8_t> request(sizeof(pldm_msg_hdr));
+
+  query_device_descriptors.clear();
+
+  int ret = encode_query_device_identifiers_req (
+    0x00, // instance id
+    PLDM_QUERY_DEVICE_IDENTIFIERS_REQ_BYTES,
+    (pldm_msg*)request.data()
+  );
+
+  if (ret != PLDM_SUCCESS) {
+    cerr << "Failed to encode query device identifier request."
+         << " ret = " << ret
+         << endl;
+    return -1;
+  }
+
+  ret = oem_pldm_send_recv(bus, eid, request, response);
+  if (ret != PLDM_SUCCESS) {
+    cerr << "Failed to receive device identifier"
+	 << " ret = " << ret
+	 << endl;
+    return -1;
+  }
+
+  struct pldm_msg *msg = (pldm_msg*)response.data();
+  struct pldm_query_device_identifiers_resp *resp = (pldm_query_device_identifiers_resp *)msg->payload;
+
+  uint32_t device_identifiers_len = resp->device_identifiers_len;
+  uint8_t descriptor_count = resp->descriptor_count;
+  uint8_t *descriptor_data = (uint8_t *)(msg->payload + sizeof(struct pldm_query_device_identifiers_resp));
+  vector<device_id_record_descriptor> device_descriptor{};
+
+  for (index = 0; index < descriptor_count; ++index) {
+    device_id_record_descriptor descriptor{};
+    variable_field descriptorData{};
+
+    ret = decode_descriptor_type_length_value(descriptor_data, device_identifiers_len, &descriptor.type, &descriptorData);
+    if (ret != 0) {
+      syslog(LOG_WARNING, "%s fill descriptor fail\n", __func__);
+      return ret;
+    }
+
+    descriptor.data = variable_field_to_str(descriptorData);
+    device_descriptor.emplace_back(descriptor);
+
+    auto nextDescriptorOffset = sizeof(pldm_descriptor_tlv().descriptor_type) +
+      sizeof(pldm_descriptor_tlv().descriptor_length) + descriptorData.length;
+    descriptor_data += nextDescriptorOffset;
+    device_identifiers_len -= nextDescriptorOffset;
+  }
+
+  query_device_descriptors.emplace_back(device_descriptor);
+
+  return 0;
+}
+
+static int
+encode_pldm_query_downstream_device_descriptors_req(vector<uint8_t>& request, query_downstream_device_identifier_req req)
+{
+  int ret = encode_pldm_header_only(PLDM_REQUEST, 0x00, PLDM_FWUP,
+    PLDM_CMD_QUERY_DOWNSTREAM_DEVICE_IDENTIFIERS, (pldm_msg*)request.data());
+  if (ret != 0) {
+    cerr << "Failed to encode pldm header for query downstream device identifier request."
+      << " ret = " << ret
+      << endl;
+    return ret;
+  }
+
+  memcpy(request.data() + sizeof(pldm_msg_hdr), &req, sizeof(query_downstream_device_identifier_req));
+  return 0;
+}
+
+static int
+pldm_query_downstream_device_descriptors(uint8_t bus, uint8_t eid)
+{
+  int ret = 0;
+  uint8_t index = 0;
+  uint16_t device_count = 0;
+  vector<uint8_t> response{};
+  vector<uint8_t> request(sizeof(pldm_msg_hdr) + sizeof(query_downstream_device_identifier_req));
+  vector<device_id_record_descriptor> device_descriptor{};
+  query_downstream_device_identifier_req req = {
+    0x00,
+    TRANSFER_OPERATION_FLAG::GET_FIRST_PART
+  };
+
+  query_downstream_device_identifier_resp *resp = NULL;
+  while (1) {
+    ret = encode_pldm_query_downstream_device_descriptors_req(request, req);
+    if (ret != 0) {
+      syslog(LOG_WARNING, "Failed to encode query downstream device identifier request");
+      return ret;
+    }
+
+    ret = oem_pldm_send_recv(bus, eid, request, response);
+    if (ret == PLDM_SUCCESS) {
+      struct pldm_msg *msg = (pldm_msg*)response.data();
+      resp = (query_downstream_device_identifier_resp *)msg->payload;
+      device_count = resp->downstreamdevicenum;
+      uint32_t length = resp->downstreamdevicelength;
+      uint16_t hdr_length = sizeof(resp->complete_code) + sizeof(resp->nextdatatransferhandle) + sizeof(resp->transferflag);
+      if (response.size() < (hdr_length + length)) {
+	syslog(LOG_WARNING, "Query downstream device descriptors length is invalid, expected: 0x%x, actual: 0x%x",
+	  (hdr_length + length), response.size());
+	return -1;
+      }
+      
+      device_descriptor.clear();
+      uint8_t *descriptor_data = ((uint8_t *)msg->payload + sizeof(query_downstream_device_identifier_resp));
+      for (index = 0; index < device_count; ++index) {
+	device_id_record_descriptor descriptor{};
+	variable_field descriptorData{};
+
+	ret = decode_descriptor_type_length_value(descriptor_data, length, &descriptor.type, &descriptorData);
+	if (ret != 0) {
+          syslog(LOG_WARNING, "%s fill descriptor fail\n", __func__);
+	  return ret;
+	}
+
+	descriptor.data = variable_field_to_str(descriptorData);
+	device_descriptor.emplace_back(descriptor);
+
+	auto nextDescriptorOffset = sizeof(pldm_descriptor_tlv().descriptor_type) +
+          sizeof(pldm_descriptor_tlv().descriptor_length) + descriptorData.length;
+	descriptor_data += nextDescriptorOffset;
+	length -= nextDescriptorOffset;
+      }
+      
+      query_device_descriptors.emplace_back(device_descriptor);
+
+      if (resp->transferflag == End || resp->transferflag == StartAndEnd) {
+	break;
+      }
+    } else {
+      syslog(LOG_WARNING, "Query downstream device identifier request send/receive fail");
+      return -1;
+    }
+
+    response.clear();
+
+    // Get next downstream device descriptors
+    req.datatransferhandle = resp->nextdatatransferhandle;
+    req.transferoperationflag = TRANSFER_OPERATION_FLAG::GET_NEXT_PART;
+
+    usleep(PLDM_QUERY_DOWNSTREAM_DEVICE_IDENTIFIERS_WAIT_TIME_US);
+  }
+
+  return ret;
+}
+
 static int
 read_pkg_header_info(int fd)
 {
@@ -731,6 +976,7 @@ pldm_apply_complete_handle(int sockfd, uint8_t eid, vector<uint8_t>& request, ui
     cerr << "Component apply failed, result="
          << int(applyResult)
          << endl;
+    return -1;
   }
   // SUCCESS
   else {
@@ -751,14 +997,38 @@ pldm_apply_complete_handle(int sockfd, uint8_t eid, vector<uint8_t>& request, ui
 }
 
 static int
-pldm_do_download(int sockfd, uint8_t eid, size_t index, uint8_t& curr_stat, int file)
+pldm_do_download(int sockfd, uint8_t eid, size_t index, uint8_t& curr_stat, int file, int wait_apply_time = 0)
 {
   int ret = 0;
   vector<uint8_t> request{};
-  if (oem_pldm_recv(sockfd, eid, request) != PLDM_SUCCESS) {
-    curr_stat = FW_DEVICE_STATUS::IDLE;
-    cerr << "Recv failed in download phase." << endl;
-    return -1;
+
+  if (curr_stat == FW_DEVICE_STATUS::APPLY) {
+    if (wait_apply_time != 0) {
+      cout << dec << "Wait for loading firmware, no more than " << wait_apply_time << "s..." << endl;
+    }
+    struct timespec start_time;
+    struct timespec current_time;
+    clock_gettime(CLOCK_MONOTONIC, &current_time);
+    clock_gettime(CLOCK_MONOTONIC, &start_time);
+
+    while (current_time.tv_sec <= (start_time.tv_sec + wait_apply_time)) {
+      if (oem_pldm_recv(sockfd, eid, request) == PLDM_SUCCESS) {
+	break;
+      }
+
+      clock_gettime(CLOCK_MONOTONIC, &current_time);
+    }
+
+    if (current_time.tv_sec > (start_time.tv_sec + wait_apply_time)) {
+      cerr << "Wait request timeout" << endl;
+      return -1;
+    }
+  } else {
+    if (oem_pldm_recv(sockfd, eid, request) != PLDM_SUCCESS) {
+      curr_stat = FW_DEVICE_STATUS::IDLE;
+      cerr << "Recv failed in download phase." << endl;
+      return -1;
+    }
   }
 
   auto requestMsg = reinterpret_cast<pldm_msg*>(request.data());
@@ -819,9 +1089,11 @@ pldm_activate_firmware(int sockfd, uint8_t eid)
   return oem_pldm_send_recv_w_fd(sockfd, eid, request, response);
 }
 
-int oem_pldm_fw_update(uint8_t bus, uint8_t eid, const char* path, uint8_t specified_comp)
+int oem_pldm_fw_update(uint8_t bus, uint8_t eid, const char* path, bool is_standard_descriptor, 
+    string component, int wait_apply_time, uint8_t specified_comp)
 {
   int ret, sockfd, file;
+  int index = 0;
   uint8_t status = 0;
 
   sockfd = oem_pldm_init_fwupdate_fd(bus);
@@ -830,6 +1102,20 @@ int oem_pldm_fw_update(uint8_t bus, uint8_t eid, const char* path, uint8_t speci
     return -1;
   }
 
+  if (is_standard_descriptor) {
+    ret = pldm_query_device_identifiers(bus, eid);
+    if (ret != 0) {
+      cerr << "Failed to get device identifier." << endl;
+      return -1;
+    }
+
+    ret = pldm_query_downstream_device_descriptors(bus, eid);
+    if (ret != 0) {
+      cerr << "Failed to get downstream device identifier." << endl;
+      return -1;
+    }
+  }
+
   ret = oem_parse_pldm_package(path);
   if (ret < 0) {
     cerr << "Failed to parse pldm package header." << endl;
@@ -858,23 +1144,60 @@ int oem_pldm_fw_update(uint8_t bus, uint8_t eid, const char* path, uint8_t speci
     }
   }
 
-  // It means that only one comp image UA wanna use
-  // when specified_comp not equals to 0xFF. (For GT pex update)
-  if (specified_comp != 0xFF) {
-    auto it = find_if(pkg_comps.begin(), pkg_comps.end(),
-      [specified_comp](const component_image_info_t& comp){
-        return (comp.compImageInfo.comp_identifier == specified_comp);
+  if (is_standard_descriptor) {
+    // Find the component need to update
+    for (index = 0; index < (int)pkg_devices.size(); ++index) {
+      ret = pldm_check_descriptors_is_match(pkg_devices.at(index).recordDescriptors);
+      if (ret != 0) {
+        continue;
+      } else {
+        auto comp = pkg_comps.at(index);
+        size_t compare_comp_index = comp.compVersion.find(" ");
+        string compare_comp = comp.compVersion;
+        if (compare_comp_index != string::npos) {
+          compare_comp = comp.compVersion.substr(0, compare_comp_index);
+          if (component.find(compare_comp) != string::npos) {
+            // Find the section user want to update
+            if (specified_comp != 0xFF) {
+              comp.compImageInfo.comp_identifier = specified_comp;
+            }
+            pkg_comps.clear();
+            pkg_comps.emplace_back(comp);
+
+            auto device = pkg_devices.at(index);
+            pkg_devices.clear();
+            pkg_devices.emplace_back(device);
+
+            break;
+          }
+        }
+        continue;
       }
-    );
-    if (it == pkg_comps.end()) {
+    }
+
+    if ((ret != 0) || (pkg_devices.size() != 1)) {
       cerr << "Failed to find corresponding component image." << endl;
       ret = -1;
       goto exit;
-    } else {
-      auto comp = *it;
-      pkg_comps.clear();
-      pkg_comps.emplace_back(comp);
-
+    }
+  } else {
+    // It means that only one comp image UA wanna use
+    // when specified_comp not equals to 0xFF. (For GT pex update)
+    if (specified_comp != 0xFF) {
+      auto it = find_if(pkg_comps.begin(), pkg_comps.end(),
+        [specified_comp](const component_image_info_t& comp){
+	  return (comp.compImageInfo.comp_identifier == specified_comp);
+        }
+      );
+      if (it == pkg_comps.end()) {
+	cerr << "Failed to find corresponding component image." << endl;
+	ret = -1;
+	goto exit;
+      } else {
+	auto comp = *it;
+	pkg_comps.clear();
+	pkg_comps.emplace_back(comp);
+      }
     }
   }
 
@@ -888,8 +1211,8 @@ int oem_pldm_fw_update(uint8_t bus, uint8_t eid, const char* path, uint8_t speci
   status = FW_DEVICE_STATUS::LEARN_COMPONENTS;
 
   // send PassComponentTable (Next State: READY XFER)
-  for (size_t i = 0; i < pkg_comps.size(); ++i) {
-    ret = pldm_pass_comp_table(sockfd, eid, i);
+  for (index = 0; index < (int)pkg_comps.size(); ++index) {
+    ret = pldm_pass_comp_table(sockfd, eid, index);
     if (ret < 0) {
       cerr << "Failed to send PassComponentTable." << endl;
       goto exit;
@@ -899,8 +1222,8 @@ int oem_pldm_fw_update(uint8_t bus, uint8_t eid, const char* path, uint8_t speci
   status = FW_DEVICE_STATUS::READY_XFER;
 
   // send UpdateComponent (Next State: DOWNLOAD)
-  for (size_t i = 0; i < pkg_comps.size(); ++i) {
-    ret = pldm_update_comp(sockfd, eid, i);
+  for (index = 0; index < (int)pkg_comps.size(); ++index) {
+    ret = pldm_update_comp(sockfd, eid, index);
     if (ret < 0) {
       cerr << "Failed to send UpdateComponent." << endl;
       goto exit;
@@ -908,7 +1231,7 @@ int oem_pldm_fw_update(uint8_t bus, uint8_t eid, const char* path, uint8_t speci
       cout << "UpdateComponent Success." << endl;
       status = FW_DEVICE_STATUS::DOWNLOAD;
       while (true) {
-        ret = pldm_do_download(sockfd, eid, i, status, file);
+        ret = pldm_do_download(sockfd, eid, index, status, file, wait_apply_time);
         if (ret < 0) {
           cerr << "Failed at download state ." << endl;
           goto exit;
diff --git a/common/recipes-lib/obmc-pldm/files/fw_update.hpp b/common/recipes-lib/obmc-pldm/files/fw_update.hpp
index 0894cf6a9610..506fa6bc3898 100644
--- a/common/recipes-lib/obmc-pldm/files/fw_update.hpp
+++ b/common/recipes-lib/obmc-pldm/files/fw_update.hpp
@@ -19,6 +19,15 @@
 #include <vector>
 #include <libpldm/firmware_update.h>
 
+#define PLDM_CMD_QUERY_DOWNSTREAM_DEVICE_IDENTIFIERS 0x04
+#define PLDM_QUERY_DOWNSTREAM_DEVICE_IDENTIFIERS_WAIT_TIME_US 100000
+
+enum class TRANSFER_OPERATION_FLAG : uint8_t
+{
+  GET_NEXT_PART,
+  GET_FIRST_PART,
+};
+
 struct device_id_record_descriptor {
   uint16_t type;
   std::string data;
@@ -37,8 +46,24 @@ struct component_image_info_t {
   std::string compVersion;
 };
 
+struct query_downstream_device_identifier_req {
+  uint32_t datatransferhandle;
+  TRANSFER_OPERATION_FLAG transferoperationflag;
+};
+
+struct query_downstream_device_identifier_resp {
+  uint8_t complete_code;
+  uint32_t nextdatatransferhandle;
+  uint8_t transferflag;
+  uint32_t downstreamdevicelength;
+  uint16_t downstreamdevicenum;
+  uint16_t downstreamdeviceidx;
+  uint8_t downstreamdevicedescriptorcount;
+} __attribute__((packed));
+
 int oem_parse_pldm_package (const char *path);
-int oem_pldm_fw_update (uint8_t bus, uint8_t eid, const char *path, uint8_t specified_comp = 0xFF);
+int oem_pldm_fw_update (uint8_t bus, uint8_t eid, const char *path, bool is_standard_descriptor, 
+    std::string component, int wait_apply_time = 0, uint8_t specified_comp = 0xFF);
 
 const std::vector<firmware_device_id_record_t>& oem_get_pkg_device_record();
-const std::vector<component_image_info_t>& oem_get_pkg_comp_img_info();
\ No newline at end of file
+const std::vector<component_image_info_t>& oem_get_pkg_comp_img_info();
diff --git a/common/recipes-phosphor/host/phosphor-host-postd/0001-Add-Aspeed-PCC-driver-support.patch b/common/recipes-phosphor/host/phosphor-host-postd/0001-Add-Aspeed-PCC-driver-support.patch
new file mode 100644
index 000000000000..b6fe15dac20f
--- /dev/null
+++ b/common/recipes-phosphor/host/phosphor-host-postd/0001-Add-Aspeed-PCC-driver-support.patch
@@ -0,0 +1,127 @@
+From 3b53f0ba12a6a819659d0ae1686037af551bf5c1 Mon Sep 17 00:00:00 2001
+From: cchoux <cosmo.chou@quantatw.com>
+Date: Tue, 5 Dec 2023 14:05:23 +0800
+Subject: [PATCH 1/1] Add Aspeed PCC driver support
+
+Add support for Aspeed Post Code Capture driver.
+
+In order to fetch post code from Aspeed PCC driver, please set
+`snoop-device` and `post-code-bytes` as below.
+- snoop-device = aspeed-lpc-pcc
+- post-code-bytes = 8
+
+Tested on Harma system.
+
+Change-Id: I5806362d2a54d1ed7b7f821d512f79cbc3effd38
+Signed-off-by: Cosmo Chou <cosmo.chou@quantatw.com>
+Signed-off-by: Potin Lai <potin.lai@quantatw.com>
+---
+ main.cpp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 69 insertions(+)
+
+diff --git a/main.cpp b/main.cpp
+index e977ce0..b5be7b1 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -42,8 +42,12 @@
+ #include <optional>
+ #include <thread>
+ 
++constexpr size_t pccSize = sizeof(uint16_t); // 2 bytes per code
++
+ static size_t codeSize = 1; /* Size of each POST code in bytes */
+ static bool verbose = false;
++static std::function<int(uint64_t&, ssize_t)> procPostCode;
++static std::vector<uint16_t> aspeedPccBuffer;
+ 
+ static void usage(const char* name)
+ {
+@@ -121,6 +125,62 @@ bool rateLimit(PostReporter& reporter, sdeventplus::source::IO& ioSource)
+     return true;
+ }
+ 
++/*
++ * Split input code into multiple 2 bytes PCC code, If the PCC code prefix
++ * matches the check code, store each PCC code in aspeedPccBuffer, or clear
++ * aspeedPccBuffer if the prefix does not match.
++ *
++ * Each PCC code contains one byte of port number (MSB) and another byte of
++ * partial postcode (LSB). To get a compelete postcode, the PCC code should
++ * followed the sequence of 0x40AA, 0x41BB, 0x42CC & 0x43DD. When
++ * aspeedPccBuffer contains enough PCC codes, the postcode will be assigned as
++ * 0xDDCCBBAA.
++ */
++int aspeedPcc(uint64_t& code, ssize_t readb)
++{
++    const size_t fullPostPccCount = codeSize / pccSize;
++    uint16_t* codePtr = reinterpret_cast<uint16_t*>(&code);
++    size_t i;
++
++    for (i = 0; i < (readb / pccSize); i++)
++    {
++        uint16_t checkCode = 0x4000 + ((aspeedPccBuffer.size() % 4) << 8);
++
++        if (checkCode == (codePtr[i] & 0xFF00))
++        {
++            aspeedPccBuffer.push_back(codePtr[i]);
++        }
++        else
++        {
++            aspeedPccBuffer.clear();
++
++            // keep the PCC code if codePtr[i] matches with 0x40XX as first PCC
++            // code in buffer.
++            if ((codePtr[i] & 0xFF00) == 0x4000)
++            {
++                aspeedPccBuffer.push_back(codePtr[i]);
++            }
++        }
++    }
++
++    if (aspeedPccBuffer.size() < fullPostPccCount)
++    {
++        // not receive full postcode yet.
++        return -1;
++    }
++
++    // prepare postcode and remove the prefix bytes
++    code = 0;
++    for (size_t i = 0; i < fullPostPccCount; i++)
++    {
++        code |= static_cast<uint64_t>(aspeedPccBuffer[i] & 0x00FF) << (8 * i);
++    }
++    aspeedPccBuffer.erase(aspeedPccBuffer.begin(),
++                          aspeedPccBuffer.begin() + fullPostPccCount);
++
++    return 0;
++}
++
+ /*
+  * Callback handling IO event from the POST code fd. i.e. there is new
+  * POST code available to read.
+@@ -133,6 +193,11 @@ void PostCodeEventHandler(PostReporter* reporter, sdeventplus::source::IO& s,
+ 
+     while ((readb = read(postFd, &code, codeSize)) > 0)
+     {
++        if (procPostCode && procPostCode(code, readb) < 0)
++        {
++            return;
++        }
++
+         code = le64toh(code);
+         if (verbose)
+         {
+@@ -243,6 +308,10 @@ int main(int argc, char* argv[])
+                 break;
+             }
+             case 'd':
++                if (std::string(optarg) == "/dev/aspeed-lpc-pcc")
++                {
++                    procPostCode = aspeedPcc;
++                }
+ 
+                 postFd = open(optarg, O_NONBLOCK);
+                 if (postFd < 0)
+-- 
+2.31.1
+
diff --git a/common/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/common/recipes-phosphor/host/phosphor-host-postd_%.bbappend
new file mode 100644
index 000000000000..2c429e4b3080
--- /dev/null
+++ b/common/recipes-phosphor/host/phosphor-host-postd_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append = " \
+    file://0001-Add-Aspeed-PCC-driver-support.patch \
+"
diff --git a/common/recipes-phosphor/interfaces/bmcweb/0001-mutual-tls-meta-Support-svc-and-host-entity-types.patch b/common/recipes-phosphor/interfaces/bmcweb/0001-mutual-tls-meta-Support-svc-and-host-entity-types.patch
new file mode 100644
index 000000000000..93a157fcf78e
--- /dev/null
+++ b/common/recipes-phosphor/interfaces/bmcweb/0001-mutual-tls-meta-Support-svc-and-host-entity-types.patch
@@ -0,0 +1,203 @@
+From 8d9a1ad54dfbca69da0e6689c32e83320f328b21 Mon Sep 17 00:00:00 2001
+From: Marco Kawajiri <kawajiri@meta.com>
+Date: Mon, 25 Mar 2024 10:51:36 -0700
+Subject: [PATCH] mutual-tls-meta: Support "svc" and "host" entity types
+
+Summary:
+
+Test Plan:
+
+Reviewers:
+
+Subscribers:
+
+Tasks:
+
+Tags:
+Change-Id: I5101776dbf5fafe8700ad6e3de0e60a0432962cc
+---
+ http/mutual_tls.hpp           |  3 +-
+ http/mutual_tls_meta.hpp      | 64 ++++++++++++++++++++++++++++-------
+ test/http/mutual_tls_meta.cpp | 35 ++++++++++++++++---
+ 3 files changed, 83 insertions(+), 19 deletions(-)
+
+diff --git a/http/mutual_tls.hpp b/http/mutual_tls.hpp
+index 1620054e..39b9b82d 100644
+--- a/http/mutual_tls.hpp
++++ b/http/mutual_tls.hpp
+@@ -93,8 +93,7 @@ inline std::shared_ptr<persistent_data::UserSession>
+     // Meta Inc. CommonName parsing
+     if (bmcwebMTLSCommonNameParsingMeta)
+     {
+-        std::optional<std::string_view> sslUserMeta =
+-            mtlsMetaParseSslUser(sslUser);
++        std::optional<std::string> sslUserMeta = mtlsMetaParseSslUser(sslUser);
+         if (!sslUserMeta)
+         {
+             return nullptr;
+diff --git a/http/mutual_tls_meta.hpp b/http/mutual_tls_meta.hpp
+index 5e55db8e..3381dd48 100644
+--- a/http/mutual_tls_meta.hpp
++++ b/http/mutual_tls_meta.hpp
+@@ -7,17 +7,17 @@
+ #include <string>
+ #include <string_view>
+ 
+-inline std::optional<std::string_view>
+-    mtlsMetaParseSslUser(std::string_view sslUser)
++inline std::optional<std::string> mtlsMetaParseSslUser(std::string_view sslUser)
+ {
+     // Parses a Meta internal TLS client certificate Subject CN in
+-    // '<entityType>:<entity>[/<hostname>]' format and returns the resulting
+-    // POSIX-compatible local user name on success, null otherwise.
+-    //
+-    // Only entityType = "user" is supported for now.
++    // '<entityType>:<entity>[/<hostname>]' format and returns the
++    // resulting POSIX-compatible local user name on success, null otherwise.
+     //
+     // Example client subject CN -> local user name:
+-    // "user:a_username/hostname" -> "a_username"
++    // "user:a_username/hostname" -> "user_a_username"
++    // "svc:an_internal_service_name" -> "svc_an_internal_service_name"
++    // "host:/hostname.facebook.com" -> "host_hostname" (note the stripped
++    // hostname suffix)
+ 
+     // Parse entityType
+     size_t colonIndex = sslUser.find(':');
+@@ -30,16 +30,17 @@ inline std::optional<std::string_view>
+ 
+     std::string_view entityType = sslUser.substr(0, colonIndex);
+     sslUser.remove_prefix(colonIndex + 1);
+-    if (entityType != "user")
++    if (entityType != "user" && entityType != "svc" && entityType != "host")
+     {
+         BMCWEB_LOG_WARNING(
+-            "Invalid/unsupported entityType='{}' in Meta TLS client cert Subject CN: '{}'",
++            "Invalid entityType='{}' in Meta TLS client cert Subject CN: '{}'",
+             entityType, sslUser);
+         return std::nullopt;
+     }
+ 
+-    // Parse entity
++    // Parse entity and hostname
+     size_t slashIndex = sslUser.find('/');
++    std::string_view hostname;
+     std::string_view entity;
+     if (slashIndex == std::string_view::npos)
+     {
+@@ -60,14 +61,53 @@ inline std::optional<std::string_view>
+                 entity, sslUser);
+             return std::nullopt;
+         }
++
++        // Parse hostname
++        hostname = sslUser;
++        bool foundHost = false;
++        // Remove host suffix (they're not used to uniquely identify hosts
++        // and we avoid problems with overly long entitys)
++        for (std::string_view suffix :
++             {".facebook.com", ".tfbnw.net", ".thefacebook.com"})
++        {
++            if (hostname.ends_with(suffix))
++            {
++                hostname.remove_suffix(suffix.size());
++                foundHost = true;
++                break;
++            }
++        }
++        if (!foundHost)
++        {
++            BMCWEB_LOG_WARNING(
++                "Invalid hostname suffix in hostname='{}'. Meta TLS client cert Subject CN: '{}'",
++                hostname, sslUser);
++            return std::nullopt;
++        }
++
++        if (hostname.find_first_not_of(
++                "abcdefghijklmnopqrstuvwxyz0123456789_-.") != std::string::npos)
++        {
++            BMCWEB_LOG_WARNING(
++                "Invalid hostname='{}' in Meta TLS client cert Subject CN: '{}'",
++                hostname, sslUser);
++            return std::nullopt;
++        }
++    }
++
++    // Use the hostname as entity if entityType == "host"
++    // e.g. "host:/hostname.facebook.com" -> "host_hostname"
++    if (entityType == "host")
++    {
++        entity = hostname;
+     }
+ 
+-    if (entity.empty())
++    if (entityType.empty() || entity.empty())
+     {
+         BMCWEB_LOG_DEBUG("Invalid Meta TLS client cert Subject CN: '{}'",
+                          sslUser);
+         return std::nullopt;
+     }
+ 
+-    return entity;
++    return std::format("{}_{}", entityType, entity);
+ }
+diff --git a/test/http/mutual_tls_meta.cpp b/test/http/mutual_tls_meta.cpp
+index 5f32cb54..4cedf766 100644
+--- a/test/http/mutual_tls_meta.cpp
++++ b/test/http/mutual_tls_meta.cpp
+@@ -10,14 +10,35 @@ namespace
+ TEST(MetaParseSslUser, userTest)
+ {
+     std::string sslUser = "user:kawajiri/hostname.facebook.com";
+-    EXPECT_EQ(mtlsMetaParseSslUser(sslUser), "kawajiri");
++    EXPECT_EQ(mtlsMetaParseSslUser(sslUser), "user_kawajiri");
+ }
+ 
+-TEST(MetaParseSslUser, userNohostnameTest)
++TEST(MetaParseSslUser, svcTest)
+ {
+-    // hostname is optional
+-    std::string sslUser = "user:kawajiri";
+-    EXPECT_EQ(mtlsMetaParseSslUser(sslUser), "kawajiri");
++    std::string sslUser = "svc:an_internal.service";
++    EXPECT_EQ(mtlsMetaParseSslUser(sslUser), "svc_an_internal.service");
++}
++
++TEST(MetaParseSslUser, hostTest)
++{
++    std::string sslUser = "host:/ab12345.cd0.facebook.com";
++
++    EXPECT_EQ(mtlsMetaParseSslUser(sslUser), "host_ab12345.cd0");
++}
++
++TEST(MetaParseSslUser, hostTestSuffixes)
++{
++    std::vector<std::string> sslUsers = {
++        "host:/hostname.facebook.com",
++        "host:/hostname.tfbnw.net",
++        "host:/hostname.thefacebook.com",
++    };
++
++    for (const std::string& sslUser : sslUsers)
++    {
++        // Must strip suffix
++        EXPECT_EQ(mtlsMetaParseSslUser(sslUser), "host_hostname");
++    }
+ }
+ 
+ TEST(MetaParseSslUser, invalidUsers)
+@@ -31,7 +52,11 @@ TEST(MetaParseSslUser, invalidUsers)
+         "user:/",
+         "user:/hostname.facebook.com",
+         "user:/hostname.facebook.c om",
++        "user:a/hostname.facebook.c om",
++        "user:a//hostname.facebook.com",
++        "user:username/hostname.notfacebook.com",
+         "user: space/hostname.facebook.com",
++        "user:space/hostname.facebook.com ",
+         "svc:",
+         "svc:/",
+         "svc:/hostname.facebook.com",
+-- 
+2.43.0
+
diff --git a/common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/common/recipes-phosphor/interfaces/bmcweb_%.bbappend
new file mode 100644
index 000000000000..62f91de2a744
--- /dev/null
+++ b/common/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append = " \
+    file://0001-mutual-tls-meta-Support-svc-and-host-entity-types.patch \
+"
diff --git a/common/recipes-phosphor/sensors/dbus-sensors/0001-fansensor-add-compatible-string-for-ast2600-tach.patch b/common/recipes-phosphor/sensors/dbus-sensors/0001-fansensor-add-compatible-string-for-ast2600-tach.patch
index b93e144caefb..3c054ece281e 100644
--- a/common/recipes-phosphor/sensors/dbus-sensors/0001-fansensor-add-compatible-string-for-ast2600-tach.patch
+++ b/common/recipes-phosphor/sensors/dbus-sensors/0001-fansensor-add-compatible-string-for-ast2600-tach.patch
@@ -1,7 +1,7 @@
-From 00c9ffe5a36f5fa91e75aeb31c84975807bf2686 Mon Sep 17 00:00:00 2001
+From 1788a7ea8853fe7f8a3f2aaeaa324c9f82f406b3 Mon Sep 17 00:00:00 2001
 From: Potin Lai <potin.lai@quantatw.com>
 Date: Fri, 19 May 2023 17:19:03 +0800
-Subject: [PATCH] fansensor: add compatible string for ast2600 tach
+Subject: [PATCH 1/2] fansensor: add compatible string for ast2600 tach
 
 Add `aspeed,ast2600-pwm-tach` as compatible string for ast2600 pwm tach driver.
 
@@ -29,5 +29,5 @@ index 7ea8806..1467d2d 100644
      {"nuvoton,npcm845-pwm-fan", FanTypes::nuvoton},
      {"hpe,gxp-fan-ctrl", FanTypes::hpe}
 -- 
-2.41.0
+2.43.0
 
diff --git a/common/recipes-phosphor/sensors/dbus-sensors/0002-psusensor-simplify-the-labelMatch-table.patch b/common/recipes-phosphor/sensors/dbus-sensors/0002-psusensor-simplify-the-labelMatch-table.patch
new file mode 100644
index 000000000000..5832185e6bc1
--- /dev/null
+++ b/common/recipes-phosphor/sensors/dbus-sensors/0002-psusensor-simplify-the-labelMatch-table.patch
@@ -0,0 +1,339 @@
+From 7b530978790958d19158915d2288408c213d4c2f Mon Sep 17 00:00:00 2001
+From: cchoux <cosmo.chou@quantatw.com>
+Date: Wed, 25 Oct 2023 23:26:27 +0800
+Subject: [PATCH 2/2] psusensor: simplify the labelMatch table
+
+It might be more efficient to simplify the labelMatch table by not
+listing all labels. PSUProperty of the same type are mostly the same,
+except for fan properties. Listing all labels can limit flexibility
+and necessitate table modifications when adding new properties.
+Simplifying the table could help alleviate these constraints.
+
+Tested:
+(1) Sensors defined in "Labels" (e.g. tempN, powerN, fanN, ...) can
+be created successfully.
+(2) PWM sensors (/sys/class/hwmon/hwmonX/fanN_target) can be created
+with the names, "Pwm_PSUNAME_Fan_1", "Pwm_PSUNAME_Fan_2" ...
+(3) FanFault PSUSubEvents can be asserted.
+
+Change-Id: I789cdd5c5d0c5c92cca45700bd2095c166bdc564
+Signed-off-by: Cosmo Chou <cosmo.chou@quantatw.com>
+---
+ src/PSUSensorMain.cpp | 216 ++++++++++++------------------------------
+ 1 file changed, 60 insertions(+), 156 deletions(-)
+
+diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
+index 89ae913..1cb5c02 100644
+--- a/src/PSUSensorMain.cpp
++++ b/src/PSUSensorMain.cpp
+@@ -133,9 +133,7 @@ static boost::container::flat_map<std::string, std::unique_ptr<PwmSensor>>
+     pwmSensors;
+ static boost::container::flat_map<std::string, std::string> sensorTable;
+ static boost::container::flat_map<std::string, PSUProperty> labelMatch;
+-static boost::container::flat_map<std::string, std::string> pwmTable;
+ static EventPathList eventMatch;
+-static GroupEventPathList groupEventMatch;
+ static EventPathList limitEventMatch;
+ 
+ static std::vector<PSUProperty> psuProperties;
+@@ -172,34 +170,21 @@ void checkEvent(const std::string& directory, const EventPathList& eventMatch,
+ // Check Group Events which contains more than one targets in each combine
+ // events.
+ void checkGroupEvent(const std::string& directory,
+-                     const GroupEventPathList& groupEventMatch,
+                      GroupEventPathList& groupEventPathList)
+ {
+-    for (const auto& match : groupEventMatch)
++    EventPathList pathList;
++    std::vector<fs::path> eventPaths;
++    if (!findFiles(fs::path(directory), R"(fan\d+_(alarm|fault))", eventPaths))
+     {
+-        const std::string& groupEventName = match.first;
+-        const EventPathList events = match.second;
+-        EventPathList pathList;
+-        for (const auto& match : events)
+-        {
+-            const std::string& eventName = match.first;
+-            const std::vector<std::string>& eventAttrs = match.second;
+-            for (const auto& eventAttr : eventAttrs)
+-            {
+-                std::string eventPath = directory;
+-                eventPath += "/";
+-                eventPath += eventAttr;
+-                std::ifstream eventFile(eventPath);
+-                if (!eventFile.good())
+-                {
+-                    continue;
+-                }
++        return;
++    }
+ 
+-                pathList[eventName].push_back(eventPath);
+-            }
+-        }
+-        groupEventPathList[groupEventName] = pathList;
++    for (const auto& eventPath : eventPaths)
++    {
++        std::string attrName = eventPath.filename();
++        pathList[attrName.substr(0, attrName.find('_'))].push_back(eventPath);
+     }
++    groupEventPathList["FanFault"] = pathList;
+ }
+ 
+ // Function checkEventLimits will check all the psu related xxx_input attributes
+@@ -249,40 +234,38 @@ static void
+                    sdbusplus::asio::object_server& objectServer,
+                    const std::string& psuName)
+ {
+-    for (const auto& [pwmLabel, pwmName] : pwmTable)
++    if (!labelHead.starts_with("fan"))
+     {
+-        if (pwmLabel != labelHead)
+-        {
+-            continue;
+-        }
++        return;
++    }
++    std::string labelHeadIndex = labelHead.substr(3);
+ 
+-        const std::string& sensorPathStr = sensorPath.string();
+-        const std::string& pwmPathStr =
+-            boost::replace_all_copy(sensorPathStr, "input", "target");
+-        std::ifstream pwmFile(pwmPathStr);
+-        if (!pwmFile.good())
+-        {
+-            continue;
+-        }
++    const std::string& sensorPathStr = sensorPath.string();
++    const std::string& pwmPathStr = boost::replace_all_copy(sensorPathStr,
++                                                            "input", "target");
++    std::ifstream pwmFile(pwmPathStr);
++    if (!pwmFile.good())
++    {
++        return;
++    }
+ 
+-        auto findPWMSensor = pwmSensors.find(psuName + labelHead);
+-        if (findPWMSensor != pwmSensors.end())
+-        {
+-            continue;
+-        }
++    auto findPWMSensor = pwmSensors.find(psuName + labelHead);
++    if (findPWMSensor != pwmSensors.end())
++    {
++        return;
++    }
+ 
+-        std::string name = "Pwm_";
+-        name += psuName;
+-        name += "_";
+-        name += pwmName;
++    std::string name = "Pwm_";
++    name += psuName;
++    name += "_Fan_";
++    name += labelHeadIndex;
+ 
+-        std::string objPath = interfacePath;
+-        objPath += "_";
+-        objPath += pwmName;
++    std::string objPath = interfacePath;
++    objPath += "_Fan_";
++    objPath += labelHeadIndex;
+ 
+-        pwmSensors[psuName + labelHead] = std::make_unique<PwmSensor>(
+-            name, pwmPathStr, dbusConnection, objectServer, objPath, "PSU");
+-    }
++    pwmSensors[psuName + labelHead] = std::make_unique<PwmSensor>(
++        name, pwmPathStr, dbusConnection, objectServer, objPath, "PSU");
+ }
+ 
+ static void createSensorsCallback(
+@@ -492,8 +475,7 @@ static void createSensorsCallback(
+             sensorsChanged->erase(it);
+         }
+         checkEvent(directory.string(), eventMatch, eventPathList);
+-        checkGroupEvent(directory.string(), groupEventMatch,
+-                        groupEventPathList);
++        checkGroupEvent(directory.string(), groupEventPathList);
+ 
+         PowerState readState = getPowerState(*baseConfig);
+ 
+@@ -653,13 +635,13 @@ static void createSensorsCallback(
+                 }
+             }
+ 
+-            auto findProperty = labelMatch.find(labelHead);
++            auto findProperty = labelMatch.find(sensorNameSubStr);
+             if (findProperty == labelMatch.end())
+             {
+                 if constexpr (debug)
+                 {
+                     std::cerr << "Could not find matching default property for "
+-                              << labelHead << "\n";
++                              << sensorNameSubStr << "\n";
+                 }
+                 continue;
+             }
+@@ -789,6 +771,7 @@ static void createSensorsCallback(
+             // then prefix/suffix composition becomes not necessary,
+             // and in fact not wanted, because it gets in the way.
+             std::string psuNameFromIndex;
++            std::string nameIndexStr = "1";
+             if (!customizedName)
+             {
+                 /* Find out sensor name index for this label */
+@@ -796,7 +779,8 @@ static void createSensorsCallback(
+                 size_t nameIndex{0};
+                 if (std::regex_search(labelHead, matches, rgx))
+                 {
+-                    nameIndex = std::stoi(matches[1]);
++                    nameIndexStr = matches[1];
++                    nameIndex = std::stoi(nameIndexStr);
+ 
+                     // Decrement to preserve alignment, because hwmon
+                     // human-readable filenames and labels use 1-based
+@@ -908,6 +892,13 @@ static void createSensorsCallback(
+                 // preserving default behavior by using psuNameFromIndex.
+                 sensorName = psuNameFromIndex + " " +
+                              psuProperty->labelTypeName;
++
++                // The labelTypeName of a fan can be:
++                // "Fan Speed 1", "Fan Speed 2", "Fan Speed 3" ...
++                if (labelHead == "fan" + nameIndexStr)
++                {
++                    sensorName += nameIndexStr;
++                }
+             }
+ 
+             if constexpr (debug)
+@@ -1064,103 +1055,22 @@ void propertyInitialize(void)
+ 
+     labelMatch = {
+         {"pin", PSUProperty("Input Power", 3000, 0, 6, 0)},
+-        {"pin1", PSUProperty("Input Power", 3000, 0, 6, 0)},
+-        {"pin2", PSUProperty("Input Power", 3000, 0, 6, 0)},
+-        {"pout1", PSUProperty("Output Power", 3000, 0, 6, 0)},
+-        {"pout2", PSUProperty("Output Power", 3000, 0, 6, 0)},
+-        {"pout3", PSUProperty("Output Power", 3000, 0, 6, 0)},
+-        {"power1", PSUProperty("Output Power", 3000, 0, 6, 0)},
+-        {"power2", PSUProperty("Output Power", 3000, 0, 6, 0)},
+-        {"power3", PSUProperty("Output Power", 3000, 0, 6, 0)},
+-        {"power4", PSUProperty("Output Power", 3000, 0, 6, 0)},
++        {"pout", PSUProperty("Output Power", 3000, 0, 6, 0)},
++        {"power", PSUProperty("Output Power", 3000, 0, 6, 0)},
+         {"maxpin", PSUProperty("Max Input Power", 3000, 0, 6, 0)},
+         {"vin", PSUProperty("Input Voltage", 300, 0, 3, 0)},
+-        {"vin1", PSUProperty("Input Voltage", 300, 0, 3, 0)},
+-        {"vin2", PSUProperty("Input Voltage", 300, 0, 3, 0)},
+         {"maxvin", PSUProperty("Max Input Voltage", 300, 0, 3, 0)},
+-        {"in_voltage0", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in_voltage1", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in_voltage2", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in_voltage3", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout1", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout2", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout3", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout4", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout5", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout6", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout7", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout8", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout9", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout10", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout11", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout12", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout13", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout14", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout15", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout16", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout17", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout18", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout19", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout20", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout21", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout22", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout23", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout24", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout25", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout26", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout27", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout28", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout29", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout30", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout31", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"vout32", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++        {"in_voltage", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++        {"vout", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+         {"vmon", PSUProperty("Auxiliary Input Voltage", 255, 0, 3, 0)},
+-        {"in0", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in1", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in2", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in3", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in4", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in5", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in6", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+-        {"in7", PSUProperty("Output Voltage", 255, 0, 3, 0)},
++        {"in", PSUProperty("Output Voltage", 255, 0, 3, 0)},
+         {"iin", PSUProperty("Input Current", 20, 0, 3, 0)},
+-        {"iin1", PSUProperty("Input Current", 20, 0, 3, 0)},
+-        {"iin2", PSUProperty("Input Current", 20, 0, 3, 0)},
+-        {"iout1", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout2", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout3", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout4", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout5", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout6", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout7", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout8", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout9", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout10", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout11", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout12", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout13", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"iout14", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"curr1", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"curr2", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"curr3", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"curr4", PSUProperty("Output Current", 255, 0, 3, 0)},
+-        {"maxiout1", PSUProperty("Max Output Current", 255, 0, 3, 0)},
+-        {"temp1", PSUProperty("Temperature", 127, -128, 3, 0)},
+-        {"temp2", PSUProperty("Temperature", 127, -128, 3, 0)},
+-        {"temp3", PSUProperty("Temperature", 127, -128, 3, 0)},
+-        {"temp4", PSUProperty("Temperature", 127, -128, 3, 0)},
+-        {"temp5", PSUProperty("Temperature", 127, -128, 3, 0)},
+-        {"temp6", PSUProperty("Temperature", 127, -128, 3, 0)},
+-        {"maxtemp1", PSUProperty("Max Temperature", 127, -128, 3, 0)},
+-        {"fan1", PSUProperty("Fan Speed 1", 30000, 0, 0, 0)},
+-        {"fan2", PSUProperty("Fan Speed 2", 30000, 0, 0, 0)},
+-        {"fan3", PSUProperty("Fan Speed 3", 30000, 0, 0, 0)},
+-        {"fan4", PSUProperty("Fan Speed 4", 30000, 0, 0, 0)}};
+-
+-    pwmTable = {{"fan1", "Fan_1"},
+-                {"fan2", "Fan_2"},
+-                {"fan3", "Fan_3"},
+-                {"fan4", "Fan_4"}};
++        {"iout", PSUProperty("Output Current", 255, 0, 3, 0)},
++        {"curr", PSUProperty("Output Current", 255, 0, 3, 0)},
++        {"maxiout", PSUProperty("Max Output Current", 255, 0, 3, 0)},
++        {"temp", PSUProperty("Temperature", 127, -128, 3, 0)},
++        {"maxtemp", PSUProperty("Max Temperature", 127, -128, 3, 0)},
++        {"fan", PSUProperty("Fan Speed ", 30000, 0, 0, 0)}};
+ 
+     limitEventMatch = {{"PredictiveFailure", {"max_alarm", "min_alarm"}},
+                        {"Failure", {"crit_alarm", "lcrit_alarm"}}};
+@@ -1170,12 +1080,6 @@ void propertyInitialize(void)
+                   {"ACLost", {"in1_beep"}},
+                   {"ConfigureError", {"in1_fault"}}};
+ 
+-    groupEventMatch = {{"FanFault",
+-                        {{"fan1", {"fan1_alarm", "fan1_fault"}},
+-                         {"fan2", {"fan2_alarm", "fan2_fault"}},
+-                         {"fan3", {"fan3_alarm", "fan3_fault"}},
+-                         {"fan4", {"fan4_alarm", "fan4_fault"}}}}};
+-
+     devParamMap = {
+         {DevTypes::HWMON, {1, R"(\w\d+_input$)", "([A-Za-z]+)[0-9]*_"}},
+         {DevTypes::IIO,
+-- 
+2.43.0
+
diff --git a/common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
index c51eeb274bfe..4e6c3234dfa4 100644
--- a/common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
+++ b/common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -2,4 +2,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI:append = " \
     file://0001-fansensor-add-compatible-string-for-ast2600-tach.patch \
-"
\ No newline at end of file
+    file://0002-psusensor-simplify-the-labelMatch-table.patch \
+"
diff --git a/common/recipes-rest/rest-api/files/.flake8 b/common/recipes-rest/rest-api/files/.flake8
index 75e47b239f57..336250493aef 100644
--- a/common/recipes-rest/rest-api/files/.flake8
+++ b/common/recipes-rest/rest-api/files/.flake8
@@ -1,5 +1,5 @@
 [flake8]
 max-line-length = 88
 select = C,E,F,W,B,B950
-extend-ignore = E203, E402, E501
+extend-ignore = E203, E402, E501, W503
 max-complexity = 10
diff --git a/common/recipes-rest/rest-api/files/acl_config.py b/common/recipes-rest/rest-api/files/acl_config.py
index c0506371db8d..b6dff59d8704 100644
--- a/common/recipes-rest/rest-api/files/acl_config.py
+++ b/common/recipes-rest/rest-api/files/acl_config.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any, Dict  # noqa: F401
 
 RULES = {}  # type: Dict[str, Any]
 RULES_REGEXP = {}  # type: Dict[str, Any]
diff --git a/common/recipes-rest/rest-api/files/async_ratelimiter.py b/common/recipes-rest/rest-api/files/async_ratelimiter.py
index 131d37119242..2a134381b8e8 100644
--- a/common/recipes-rest/rest-api/files/async_ratelimiter.py
+++ b/common/recipes-rest/rest-api/files/async_ratelimiter.py
@@ -20,7 +20,7 @@
 
 import asyncio
 import collections
-from typing import Dict, Tuple
+from typing import Dict, Tuple  # noqa: F401
 
 
 class AsyncRateLimiter:
diff --git a/common/recipes-rest/rest-api/files/boardroutes.py b/common/recipes-rest/rest-api/files/boardroutes.py
index 688380f0328e..8d5dcd20ccbb 100644
--- a/common/recipes-rest/rest-api/files/boardroutes.py
+++ b/common/recipes-rest/rest-api/files/boardroutes.py
@@ -16,6 +16,6 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-130
-from typing import List
+from typing import List  # noqa: F401
 
 board_routes = []  # type: List[str]
diff --git a/common/recipes-rest/rest-api/files/boot_source.py b/common/recipes-rest/rest-api/files/boot_source.py
index 0210056e8bca..864f9f47d574 100644
--- a/common/recipes-rest/rest-api/files/boot_source.py
+++ b/common/recipes-rest/rest-api/files/boot_source.py
@@ -23,7 +23,7 @@
 from collections import namedtuple
 from ctypes import CDLL
 from enum import IntEnum
-from typing import Dict, List
+from typing import Dict, List  # noqa: F401
 
 
 misc_lib_hndl = CDLL("libmisc-utils.so.0")
diff --git a/common/recipes-rest/rest-api/files/common_endpoint.py b/common/recipes-rest/rest-api/files/common_endpoint.py
index 2beab5eeab07..225811c314f3 100755
--- a/common/recipes-rest/rest-api/files/common_endpoint.py
+++ b/common/recipes-rest/rest-api/files/common_endpoint.py
@@ -26,6 +26,7 @@
 import rest_modbus
 import rest_modbus_cmd
 import rest_psu_update
+import rest_qsfp_thermal
 import rest_sensors
 import rest_server
 from aiohttp import web
@@ -178,6 +179,10 @@ def psu_update_hdl_post(self, request):
     async def rest_fscd_sensor_data_post(request: web.Request) -> web.Response:
         return await rest_fscd_sensor_data.post_fscd_sensor_data(request)
 
+    @staticmethod
+    async def rest_qsfp_thermal_post(request: web.Request) -> web.Response:
+        return await rest_qsfp_thermal.post_qsfp_thermal_data(request)
+
     @staticmethod
     async def rest_modbus_get(request: web.Request) -> web.Response:
         return web.json_response(
diff --git a/common/recipes-rest/rest-api/files/common_setup_routes.py b/common/recipes-rest/rest-api/files/common_setup_routes.py
index d2e70440ea28..ee7674e60105 100644
--- a/common/recipes-rest/rest-api/files/common_setup_routes.py
+++ b/common/recipes-rest/rest-api/files/common_setup_routes.py
@@ -102,6 +102,7 @@ def setup_common_routes(app: Application, write_enabled: bool):
         app.router.add_get(common_routes[9], chandler.psu_update_hdl)
         app.router.add_post(common_routes[9], chandler.psu_update_hdl_post)
         app.router.add_post(common_routes[10], chandler.rest_fscd_sensor_data_post)
+        app.router.add_post("/api/sys/optics_thermal", chandler.rest_qsfp_thermal_post)
     # common routes for all openbmc.
     server_logger.info("Adding common routes")
     app.router.add_get("/api/sys/ntp", rest_ntp_status_handler)
diff --git a/common/recipes-rest/rest-api/files/common_utils.py b/common/recipes-rest/rest-api/files/common_utils.py
index d6f5fe9270c0..53b96ec10913 100644
--- a/common/recipes-rest/rest-api/files/common_utils.py
+++ b/common/recipes-rest/rest-api/files/common_utils.py
@@ -3,7 +3,7 @@
 import os
 import re
 from concurrent.futures import ThreadPoolExecutor
-from typing import Dict, List, Optional, Set, Tuple, Union
+from typing import Dict, List, Optional, Set, Tuple, Union  # noqa: F401
 
 from aiohttp import web
 from common_webapp import WebApp
diff --git a/common/recipes-rest/rest-api/files/redfish_chassis_helper.py b/common/recipes-rest/rest-api/files/redfish_chassis_helper.py
index 97a353f5550e..666489de20cc 100644
--- a/common/recipes-rest/rest-api/files/redfish_chassis_helper.py
+++ b/common/recipes-rest/rest-api/files/redfish_chassis_helper.py
@@ -45,7 +45,7 @@
     LIB_SENSOR_POWER: "Watts",
     LIB_SENSOR_IN: "Amps",
     LIB_SENSOR_CURR: "Volts",
-    LIB_SENSOR_PWM: "%"
+    LIB_SENSOR_PWM: "%",
 }
 SAD_SENSOR = -99999  # default reading for values not found.
 
@@ -332,8 +332,7 @@ def get_single_sled_frus() -> t.List[str]:
 
 def is_libpal_supported() -> bool:
     """platforms that don't support libpal for sensor related data"""
-    UNSUPPORTED_PLATFORM_BUILDNAMES = ["yamp", "wedge", "wedge100"]
-    return pal.pal_get_platform_name() not in UNSUPPORTED_PLATFORM_BUILDNAMES
+    return bool(pal.pal_fru_name_map())
 
 
 def _get_accelerator_list() -> t.List[str]:
diff --git a/common/recipes-rest/rest-api/files/redfish_log_service.py b/common/recipes-rest/rest-api/files/redfish_log_service.py
index e58edccdb0c2..0c5f0b3dffe6 100644
--- a/common/recipes-rest/rest-api/files/redfish_log_service.py
+++ b/common/recipes-rest/rest-api/files/redfish_log_service.py
@@ -1,7 +1,7 @@
 import json
 from datetime import datetime
 from shutil import which
-from typing import Dict, List, Sequence
+from typing import Dict, List, Sequence  # noqa: F401
 
 import common_utils
 import pal
diff --git a/common/recipes-rest/rest-api/files/redfish_managers.py b/common/recipes-rest/rest-api/files/redfish_managers.py
index c0e4aff8c710..cf230e6a2858 100644
--- a/common/recipes-rest/rest-api/files/redfish_managers.py
+++ b/common/recipes-rest/rest-api/files/redfish_managers.py
@@ -3,7 +3,7 @@
 import os
 import socket
 import struct
-from typing import List, Optional, Union
+from typing import List, Optional, Union  # noqa: F401
 from uuid import getnode as get_mac
 
 import rest_pal_legacy
diff --git a/common/recipes-rest/rest-api/files/rest_fscd_sensor_data.py b/common/recipes-rest/rest-api/files/rest_fscd_sensor_data.py
index 40a598c8d43b..350f295ecf84 100644
--- a/common/recipes-rest/rest-api/files/rest_fscd_sensor_data.py
+++ b/common/recipes-rest/rest-api/files/rest_fscd_sensor_data.py
@@ -44,19 +44,19 @@ def _validate_payload(payload, schema, path="") -> None:
             )
         )
 
-    if type(schema) == dict:
+    if isinstance(schema, dict):
         for key, value in payload.items():
             _validate_payload(payload=value, schema=schema[key], path=path + "." + key)
 
 
 def _schema_match(payload, schema) -> bool:
-    if type(payload) == type(schema) == dict:
+    if isinstance(payload, dict) and isinstance(schema, dict):
         return schema.keys() == payload.keys()
 
-    elif type(schema) == type:
-        return type(payload) == schema
+    elif isinstance(schema, type):
+        return isinstance(payload, schema)
 
-    elif type(schema) == str:
+    elif isinstance(schema, str):
         return payload == schema
 
     return False
diff --git a/common/recipes-rest/rest-api/files/rest_qsfp_thermal.py b/common/recipes-rest/rest-api/files/rest_qsfp_thermal.py
new file mode 100644
index 000000000000..65b0d1c99d87
--- /dev/null
+++ b/common/recipes-rest/rest-api/files/rest_qsfp_thermal.py
@@ -0,0 +1,118 @@
+import heapq
+import json
+import math
+import os
+import tempfile
+from typing import Sequence
+
+import aiohttp.web
+
+DESTINATION_FILE_PATH = "/var/run/qsfp_thermal_data.json"
+
+
+async def post_qsfp_thermal_data(request: aiohttp.web.Request) -> aiohttp.web.Response:
+    """
+    Endpoint for collecting optics thermal data from qsfp_service.
+    """
+    try:
+        payload = await request.json()
+        _validate_payload(payload=payload, schema=PAYLOAD_SCHEMA)
+
+    except ValueError as e:
+        return aiohttp.web.json_response(
+            {
+                "status": "Bad Request",
+                "details": "Invalid JSON payload: " + str(e),
+            },
+            status=400,
+        )
+
+    iface_temperatures = [
+        payload["transceiverThermalData"][iface]["temperature"]
+        for iface in payload["transceiverThermalData"]
+    ]
+    if not iface_temperatures:
+        return aiohttp.web.json_response(
+            {"status": "FAIL", "message": "empty thermal data"}
+        )
+
+    # Format expected by fscd
+    sensor_dict = {
+        "timestamp": payload["timestamp"],
+        "dataCenter": payload["switchDeploymentInfo"]["dataCenter"],
+        "hostnameScheme": payload["switchDeploymentInfo"]["hostnameScheme"],
+        "data": {
+            "optics_temp_p95": {
+                "value": calc_percentile(iface_temperatures, 95),
+            },
+        },
+    }
+    # Create temporary file before moving to destination to make an atomic update
+    # (i.e. remove the possibility of a partial file being read)
+    with tempfile.NamedTemporaryFile(
+        "w", delete=False, dir=os.path.dirname(DESTINATION_FILE_PATH)
+    ) as f:
+        json.dump(sensor_dict, f, indent=4)
+
+    os.rename(f.name, DESTINATION_FILE_PATH)
+
+    return aiohttp.web.json_response({"status": "OK"})
+
+
+# Utils
+
+
+def calc_percentile(values: Sequence[float], percentile: int):
+    """
+    Calculates the percentile (e.g. P95) of values. `percentile` is an integer between
+    0 and 100. The function is optimized for percentiles close to 100, although correct
+    for all values.
+    """
+    return heapq.nlargest(math.ceil((1 - percentile / 100) * len(values)), values)[-1]
+
+
+def _validate_payload(payload, schema, path="") -> None:
+    if not _schema_match(payload, schema):
+        raise ValueError(
+            "Schema mismatch in {path}: expected value ({x}) to match schema {y}".format(  # noqa: B950
+                path=path or ".", x=repr(payload), y=repr(schema)
+            )
+        )
+
+    if isinstance(schema, dict):
+        for key, value in payload.items():
+            _validate_payload(
+                payload=value,
+                schema=schema[key] if key in schema else schema[""],
+                path=path + "." + key,
+            )
+
+
+def _schema_match(payload, schema) -> bool:
+    if isinstance(payload, dict) and isinstance(schema, dict):
+        return schema.keys() == payload.keys() or schema.keys() == {""}
+
+    elif isinstance(schema, type):
+        return isinstance(payload, schema)
+
+    elif isinstance(schema, str):
+        return payload == schema
+
+    return False
+
+
+# HACK: Temporary schema until we use something more robust
+PAYLOAD_SCHEMA = {
+    "syncDataStructVersion": str,
+    "timestamp": int,
+    "switchDeploymentInfo": {
+        "dataCenter": str,
+        "hostnameScheme": str,
+    },
+    "transceiverThermalData": {
+        "": {
+            "moduleMediaInterface": str,
+            "temperature": int,
+        },
+    },
+}
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api.yml
index cd6007ef22bf..bed1ea8c469c 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api.yml
@@ -1,33 +1,33 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api  
-  title: Swagger doc for /api  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api
+  title: Swagger doc for /api
   version: 1.0.0
-paths: 
-  /api: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-                  version: 
+                  version:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/attestation.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/attestation.yml
index 332b5a81d3b5..2a917a2e2acd 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/attestation.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/attestation.yml
@@ -1,28 +1,28 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/attestation  
-  title: Swagger doc for /api/attestation  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/attestation
+  title: Swagger doc for /api/attestation
   version: 1.0.0
-paths: 
-  /api/attestation: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/attestation:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 format: nullable
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/bmc.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/bmc.yml
index 0458e49c68dc..a10b86b7970f 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/bmc.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/bmc.yml
@@ -1,128 +1,130 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/bmc  
-  title: Swagger doc for /api/bmc  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/bmc
+  title: Swagger doc for /api/bmc
   version: 1.0.0
-paths: 
-  /api/bmc: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/bmc:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-                  MAC Addr: 
+                  MAC Addr:
                     type: string
-                  Reset Reason: 
+                  Reset Reason:
                     type: string
-                  Uptime: 
+                  Uptime:
                     type: string
-                  uptime: 
+                  uptime:
                     type: string
-                  Memory Usage: 
+                  Memory Usage:
                     type: string
-                  memory: 
+                  memory:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      MemTotal: 
-                        type: number
-                        format: int32
-                      MemFree: 
-                        type: number
-                        format: int32
-                      MemAvailable: 
-                        type: number
-                        format: int32
-                      Buffers: 
-                        type: number
-                        format: int32
-                      Cached: 
-                        type: number
-                        format: int32
-                      Shmem: 
-                        type: number
-                        format: int32
-                  CPU Usage: 
-                    type: string
-                  OpenBMC Version: 
-                    type: string
-                  u-boot version: 
-                    type: string
-                  kernel version: 
-                    type: string
-                  TPM TCG version: 
-                    type: string
-                  TPM FW version: 
-                    type: string
-                  SPI0 Vendor: 
-                    type: string
-                  SPI1 Vendor: 
-                    type: string
-                  At-Scale-Debug Running: 
+                    properties:
+                      MemTotal:
+                        type: integer
+                      MemFree:
+                        type: integer
+                      MemAvailable:
+                        type: integer
+                      Buffers:
+                        type: integer
+                      Cached:
+                        type: integer
+                      Shmem:
+                        type: integer
+                  CPU Usage:
+                    type: string
+                  OpenBMC Version:
+                    type: string
+                  u-boot version:
+                    type: string
+                  kernel version:
+                    type: string
+                  TPM TCG version:
+                    type: string
+                  TPM FW version:
+                    type: string
+                  SPI0 Vendor:
+                    type: string
+                  SPI1 Vendor:
+                    type: string
+                  At-Scale-Debug Running:
                     type: boolean
-                  Secondary Boot Triggered: 
+                  Secondary Boot Triggered:
                     type: boolean
-                  vboot: 
+                  vboot:
                     type: object
-                    additionalProperties: true
-                    properties: 
-                      status: 
+                    additionalProperties: false
+                    properties:
+                      status:
+                        type: string
+                      status_text:
+                        type: string
+                      status_crc:
+                        type: string
+                      tpm_status:
+                        type: string
+                      cert_fallback_time:
                         type: string
-                      status_text: 
+                      cert_time:
                         type: string
-                      status_crc: 
+                      uboot_fallback_time:
                         type: string
-                      tpm_status: 
+                      uboot_time:
                         type: string
-                      cert_fallback_time: 
+                      force_recovery:
                         type: string
-                      cert_time: 
+                      hardware_enforce:
                         type: string
-                      uboot_fallback_time: 
+                      software_enforce:
                         type: string
-                      uboot_time: 
+                      recovery_boot:
                         type: string
-                      force_recovery: 
+                      recovery_retried:
                         type: string
-                      hardware_enforce: 
+                      rom_version:
                         type: string
-                      software_enforce: 
+                      rom_uboot_version:
                         type: string
-                      recovery_boot: 
+                      flash0_signed:
                         type: string
-                      recovery_retried: 
+                      flash0_locked:
                         type: string
-                  load-1: 
+                  load-1:
                     type: string
-                  load-5: 
+                  load-5:
                     type: string
-                  load-15: 
+                  load-15:
                     type: string
-                  open-fds: 
+                  open-fds:
                     type: string
-                  MTD Parts: 
+                  MTD Parts:
                     type: array
-                    items: 
+                    items:
                       type: string
-                  mmc-info: 
+                  mmc-info:
                     type: object
                     format: nullable
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb.yml
index 521716917b0e..b784ac3cbbac 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/dpb  
-  title: Swagger doc for /api/dpb  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/dpb
+  title: Swagger doc for /api/dpb
   version: 1.0.0
-paths: 
-  /api/dpb: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/dpb:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/error.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/error.yml
index 1d4aab411dc7..678cb6e9dd9d 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/error.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/error.yml
@@ -1,33 +1,33 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/dpb/error  
-  title: Swagger doc for /api/dpb/error  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/dpb/error
+  title: Swagger doc for /api/dpb/error
   version: 1.0.0
-paths: 
-  /api/dpb/error: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/dpb/error:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
-                additionalProperties: true
-                properties: 
-                  Error Counter: 
+                additionalProperties: false
+                properties:
+                  Error Counter:
                     type: string
-                  Error Code 0xF7: 
+                  Error Code 0xF7:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/fans.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/fans.yml
index 12bb24171f95..32ae7644d741 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/fans.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/fans.yml
@@ -1,29 +1,29 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/dpb/fans  
-  title: Swagger doc for /api/dpb/fans  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/dpb/fans
+  title: Swagger doc for /api/dpb/fans
   version: 1.0.0
-paths: 
-  /api/dpb/fans: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/dpb/fans:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: array
-                items: 
+                items:
                   type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/fruid.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/fruid.yml
index db09bcfcccef..61fdb9bfc076 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/fruid.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/fruid.yml
@@ -1,65 +1,67 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/dpb/fruid  
-  title: Swagger doc for /api/dpb/fruid  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/dpb/fruid
+  title: Swagger doc for /api/dpb/fruid
   version: 1.0.0
-paths: 
-  /api/dpb/fruid: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/dpb/fruid:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
-                additionalProperties: true
-                properties: 
-                  Chassis Type: 
+                additionalProperties: false
+                properties:
+                  Chassis Type:
                     type: string
-                  Chassis Part Number: 
+                  Chassis Part Number:
                     type: string
-                  Chassis Serial Number: 
+                  Chassis Serial Number:
                     type: string
-                  Board Mfg Date: 
+                  Board Mfg Date:
                     type: string
-                  Board Mfg: 
+                  Board Mfg:
                     type: string
-                  Board Product: 
+                  Board Product:
                     type: string
-                  Board Serial: 
+                  Board Serial:
                     type: string
-                  Board Part Number: 
+                  Board Part Number:
                     type: string
-                  Board Custom Data 1: 
+                  Board Custom Data 1:
                     type: string
-                  Board Custom Data 2: 
+                  Board Custom Data 2:
                     type: string
-                  Product Manufacturer: 
+                  Product Manufacturer:
                     type: string
-                  Product Name: 
+                  Product Name:
                     type: string
-                  Product Part Number: 
+                  Product Part Number:
                     type: string
-                  Product Version: 
+                  Product Version:
                     type: string
-                  Product Serial: 
+                  Product Serial:
                     type: string
-                  Product Asset Tag: 
+                  Product Asset Tag:
                     type: string
-                  Product Custom Data 1: 
+                  Product Custom Data 1:
                     type: string
-                  Product Custom Data 2: 
+                  Product Custom Data 2:
                     type: string
-              Actions: 
+                  Product Custom Data 3:
+                    type: string
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/hdd-status.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/hdd-status.yml
index 0cf694c62e2b..9a8cc576260b 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/hdd-status.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/hdd-status.yml
@@ -1,35 +1,35 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/dpb/hdd-status  
-  title: Swagger doc for /api/dpb/hdd-status  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/dpb/hdd-status
+  title: Swagger doc for /api/dpb/hdd-status
   version: 1.0.0
-paths: 
-  /api/dpb/hdd-status: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/dpb/hdd-status:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Normal HDD ID: 
+                properties:
+                  Normal HDD ID:
                     type: string
-                  Abnormal HDD ID: 
+                  Abnormal HDD ID:
                     type: string
-                  Missing HDD ID: 
+                  Missing HDD ID:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/logs.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/logs.yml
index ab6a31296180..4756a0efadc1 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/logs.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/logs.yml
@@ -1,33 +1,45 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/dpb/logs  
-  title: Swagger doc for /api/dpb/logs  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/dpb/logs
+  title: Swagger doc for /api/dpb/logs
   version: 1.0.0
-paths: 
-  /api/dpb/logs: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/dpb/logs:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Logs: 
+                properties:
+                  Logs:
                     type: array
-                    items: 
-                      type: string
-              Actions: 
+                    items:
+                      type: object
+                      additionalProperties: false
+                      properties:
+                        FRU#:
+                          type: string
+                        MESSAGE:
+                          type: string
+                        APP_NAME:
+                          type: string
+                        TIME_STAMP:
+                          type: string
+                        FRU_NAME:
+                          type: string
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/sensors.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/sensors.yml
index 39cac12f1e01..bb9957ab3df7 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/sensors.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/dpb/sensors.yml
@@ -1,821 +1,821 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/dpb/sensors  
-  title: Swagger doc for /api/dpb/sensors  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/dpb/sensors
+  title: Swagger doc for /api/dpb/sensors
   version: 1.0.0
-paths: 
-  /api/dpb/sensors: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/dpb/sensors:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  HDD_SMART_TEMP_00: 
+                properties:
+                  HDD_SMART_TEMP_00:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_01: 
+                  HDD_SMART_TEMP_01:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_02: 
+                  HDD_SMART_TEMP_02:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_03: 
+                  HDD_SMART_TEMP_03:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_04: 
+                  HDD_SMART_TEMP_04:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_05: 
+                  HDD_SMART_TEMP_05:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_06: 
+                  HDD_SMART_TEMP_06:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_07: 
+                  HDD_SMART_TEMP_07:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_08: 
+                  HDD_SMART_TEMP_08:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_09: 
+                  HDD_SMART_TEMP_09:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_10: 
+                  HDD_SMART_TEMP_10:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_11: 
+                  HDD_SMART_TEMP_11:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_12: 
+                  HDD_SMART_TEMP_12:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_13: 
+                  HDD_SMART_TEMP_13:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_14: 
+                  HDD_SMART_TEMP_14:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_15: 
+                  HDD_SMART_TEMP_15:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_16: 
+                  HDD_SMART_TEMP_16:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_17: 
+                  HDD_SMART_TEMP_17:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_18: 
+                  HDD_SMART_TEMP_18:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_19: 
+                  HDD_SMART_TEMP_19:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_20: 
+                  HDD_SMART_TEMP_20:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_21: 
+                  HDD_SMART_TEMP_21:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_22: 
+                  HDD_SMART_TEMP_22:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_23: 
+                  HDD_SMART_TEMP_23:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_24: 
+                  HDD_SMART_TEMP_24:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_25: 
+                  HDD_SMART_TEMP_25:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_26: 
+                  HDD_SMART_TEMP_26:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_27: 
+                  HDD_SMART_TEMP_27:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_28: 
+                  HDD_SMART_TEMP_28:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_29: 
+                  HDD_SMART_TEMP_29:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_30: 
+                  HDD_SMART_TEMP_30:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_31: 
+                  HDD_SMART_TEMP_31:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_32: 
+                  HDD_SMART_TEMP_32:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_33: 
+                  HDD_SMART_TEMP_33:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_34: 
+                  HDD_SMART_TEMP_34:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_35: 
+                  HDD_SMART_TEMP_35:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_0: 
+                  HDD_P5V_SENSE_0:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_0: 
+                  HDD_P12V_SENSE_0:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_1: 
+                  HDD_P5V_SENSE_1:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_1: 
+                  HDD_P12V_SENSE_1:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_2: 
+                  HDD_P5V_SENSE_2:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_2: 
+                  HDD_P12V_SENSE_2:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_3: 
+                  HDD_P5V_SENSE_3:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_3: 
+                  HDD_P12V_SENSE_3:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_4: 
+                  HDD_P5V_SENSE_4:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_4: 
+                  HDD_P12V_SENSE_4:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_5: 
+                  HDD_P5V_SENSE_5:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_5: 
+                  HDD_P12V_SENSE_5:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_6: 
+                  HDD_P5V_SENSE_6:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_6: 
+                  HDD_P12V_SENSE_6:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_7: 
+                  HDD_P5V_SENSE_7:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_7: 
+                  HDD_P12V_SENSE_7:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_8: 
+                  HDD_P5V_SENSE_8:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_8: 
+                  HDD_P12V_SENSE_8:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_9: 
+                  HDD_P5V_SENSE_9:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_9: 
+                  HDD_P12V_SENSE_9:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_10: 
+                  HDD_P5V_SENSE_10:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_10: 
+                  HDD_P12V_SENSE_10:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_11: 
+                  HDD_P5V_SENSE_11:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_11: 
+                  HDD_P12V_SENSE_11:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_12: 
+                  HDD_P5V_SENSE_12:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_12: 
+                  HDD_P12V_SENSE_12:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_13: 
+                  HDD_P5V_SENSE_13:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_13: 
+                  HDD_P12V_SENSE_13:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_14: 
+                  HDD_P5V_SENSE_14:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_14: 
+                  HDD_P12V_SENSE_14:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_15: 
+                  HDD_P5V_SENSE_15:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_15: 
+                  HDD_P12V_SENSE_15:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_16: 
+                  HDD_P5V_SENSE_16:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_16: 
+                  HDD_P12V_SENSE_16:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_17: 
+                  HDD_P5V_SENSE_17:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_17: 
+                  HDD_P12V_SENSE_17:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_18: 
+                  HDD_P5V_SENSE_18:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_18: 
+                  HDD_P12V_SENSE_18:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_19: 
+                  HDD_P5V_SENSE_19:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_19: 
+                  HDD_P12V_SENSE_19:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_20: 
+                  HDD_P5V_SENSE_20:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_20: 
+                  HDD_P12V_SENSE_20:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_21: 
+                  HDD_P5V_SENSE_21:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_21: 
+                  HDD_P12V_SENSE_21:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_22: 
+                  HDD_P5V_SENSE_22:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_22: 
+                  HDD_P12V_SENSE_22:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_23: 
+                  HDD_P5V_SENSE_23:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_23: 
+                  HDD_P12V_SENSE_23:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_24: 
+                  HDD_P5V_SENSE_24:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_24: 
+                  HDD_P12V_SENSE_24:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_25: 
+                  HDD_P5V_SENSE_25:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_25: 
+                  HDD_P12V_SENSE_25:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_26: 
+                  HDD_P5V_SENSE_26:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_26: 
+                  HDD_P12V_SENSE_26:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_27: 
+                  HDD_P5V_SENSE_27:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_27: 
+                  HDD_P12V_SENSE_27:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_28: 
+                  HDD_P5V_SENSE_28:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_28: 
+                  HDD_P12V_SENSE_28:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_29: 
+                  HDD_P5V_SENSE_29:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_29: 
+                  HDD_P12V_SENSE_29:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_30: 
+                  HDD_P5V_SENSE_30:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_30: 
+                  HDD_P12V_SENSE_30:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_31: 
+                  HDD_P5V_SENSE_31:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_31: 
+                  HDD_P12V_SENSE_31:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_32: 
+                  HDD_P5V_SENSE_32:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_32: 
+                  HDD_P12V_SENSE_32:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_33: 
+                  HDD_P5V_SENSE_33:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_33: 
+                  HDD_P12V_SENSE_33:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_34: 
+                  HDD_P5V_SENSE_34:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_34: 
+                  HDD_P12V_SENSE_34:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_35: 
+                  HDD_P5V_SENSE_35:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_35: 
+                  HDD_P12V_SENSE_35:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_INLET_TEMP_1: 
+                  DPB_INLET_TEMP_1:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_INLET_TEMP_2: 
+                  DPB_INLET_TEMP_2:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_OUTLET_TEMP: 
+                  DPB_OUTLET_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_P12V: 
+                  DPB_HSC_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P3V3_STBY_SENSE: 
+                  DPB_P3V3_STBY_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P3V3_IN_SENSE: 
+                  DPB_P3V3_IN_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P5V_1_SYS_SENSE: 
+                  DPB_P5V_1_SYS_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P5V_2_SYS_SENSE: 
+                  DPB_P5V_2_SYS_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P5V_3_SYS_SENSE: 
+                  DPB_P5V_3_SYS_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P5V_4_SYS_SENSE: 
+                  DPB_P5V_4_SYS_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_P12V_CLIP: 
+                  DPB_HSC_P12V_CLIP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_CUR: 
+                  DPB_HSC_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_CUR_CLIP: 
+                  DPB_HSC_CUR_CLIP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_PWR: 
+                  DPB_HSC_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_PWR_CLIP: 
+                  DPB_HSC_PWR_CLIP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_0_FRONT: 
+                  FAN_0_FRONT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_0_REAR: 
+                  FAN_0_REAR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_1_FRONT: 
+                  FAN_1_FRONT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_1_REAR: 
+                  FAN_1_REAR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_2_FRONT: 
+                  FAN_2_FRONT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_2_REAR: 
+                  FAN_2_REAR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_3_FRONT: 
+                  FAN_3_FRONT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_3_REAR: 
+                  FAN_3_REAR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  AIRFLOW: 
+                  AIRFLOW:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm.yml
index bfabead9ca5a..fa633b63b4f9 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/e1s_iocm  
-  title: Swagger doc for /api/e1s_iocm  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/e1s_iocm
+  title: Swagger doc for /api/e1s_iocm
   version: 1.0.0
-paths: 
-  /api/e1s_iocm: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/e1s_iocm:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/fruid.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/fruid.yml
new file mode 100644
index 000000000000..a3ddb5705581
--- /dev/null
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/fruid.yml
@@ -0,0 +1,69 @@
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/e1s_iocm/fruid
+  title: Swagger doc for /api/e1s_iocm/fruid
+  version: 1.0.0
+paths:
+  /api/e1s_iocm/fruid:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
+          description: ok
+          schema:
+            type: object
+            additionalProperties: false
+            properties:
+              Information:
+                type: object
+                additionalProperties: false
+                properties:
+                  Board Mfg Date:
+                    type: string
+                  Board Mfg:
+                    type: string
+                  Board Product:
+                    type: string
+                  Board Serial:
+                    type: string
+                  Board Part Number:
+                    type: string
+                  Board FRU ID:
+                    type: string
+                  Board Custom Data 1:
+                    type: string
+                  Board Custom Data 2:
+                    type: string
+                  Product Manufacturer:
+                    type: string
+                  Product Name:
+                    type: string
+                  Product Part Number:
+                    type: string
+                  Product Version:
+                    type: string
+                  Product Serial:
+                    type: string
+                  Product Asset Tag:
+                    type: string
+                  Product FRU ID:
+                    type: string
+                  Product Custom Data 1:
+                    type: string
+                  Product Custom Data 2:
+                    type: string
+                  Product Custom Data 3:
+                    type: string
+              Actions:
+                type: array
+                items:
+                  type: string
+              Resources:
+                type: array
+                items:
+                  type: string
+        404:
+          description: Not Found
+          schema:
+            type: string
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/logs.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/logs.yml
index ccfefdd6c8da..1be0e804be16 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/logs.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/logs.yml
@@ -1,33 +1,45 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/e1s_iocm/logs  
-  title: Swagger doc for /api/e1s_iocm/logs  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/e1s_iocm/logs
+  title: Swagger doc for /api/e1s_iocm/logs
   version: 1.0.0
-paths: 
-  /api/e1s_iocm/logs: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/e1s_iocm/logs:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Logs: 
+                properties:
+                  Logs:
                     type: array
-                    items: 
-                      type: string
-              Actions: 
+                    items:
+                      type: object
+                      additionalProperties: false
+                      properties:
+                        FRU#:
+                          type: string
+                        MESSAGE:
+                          type: string
+                        APP_NAME:
+                          type: string
+                        TIME_STAMP:
+                          type: string
+                        FRU_NAME:
+                          type: string
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/sensors.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/sensors.yml
index b36ef980fc32..3490826877bd 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/sensors.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/e1s_iocm/sensors.yml
@@ -1,77 +1,119 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/e1s_iocm/sensors  
-  title: Swagger doc for /api/e1s_iocm/sensors  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/e1s_iocm/sensors
+  title: Swagger doc for /api/e1s_iocm/sensors
   version: 1.0.0
-paths: 
-  /api/e1s_iocm/sensors: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/e1s_iocm/sensors:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  E1S_A0_CUR: 
+                properties:
+                  E1S_B0_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A1_CUR: 
+                  E1S_B1_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A0_TEMP: 
+                  E1S_B0_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A1_TEMP: 
+                  E1S_B1_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A0_P12V: 
+                  E1S_B0_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A1_P12V: 
+                  E1S_B1_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A0_P3V3: 
+                  E1S_B0_P3V3:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A1_P3V3: 
+                  E1S_B1_P3V3:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-              Actions: 
+                  IOCM_P3V3_STBY:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_P1V8:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_P1V5:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_P0V865:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_CUR:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_TEMP:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_IOC_TEMP:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/fans.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/fans.yml
index da47148c18c7..25da07fc9908 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/fans.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/fans.yml
@@ -1,29 +1,29 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/fans  
-  title: Swagger doc for /api/fans  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/fans
+  title: Swagger doc for /api/fans
   version: 1.0.0
-paths: 
-  /api/fans: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/fans:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: array
-                items: 
+                items:
                   type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/logs.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/logs.yml
index 9c6887423d2a..4f494c0201f2 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/logs.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/logs.yml
@@ -1,45 +1,45 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/logs  
-  title: Swagger doc for /api/logs  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/logs
+  title: Swagger doc for /api/logs
   version: 1.0.0
-paths: 
-  /api/logs: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/logs:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Logs: 
+                properties:
+                  Logs:
                     type: array
-                    items: 
+                    items:
                       type: object
                       additionalProperties: false
-                      properties: 
-                        APP_NAME: 
+                      properties:
+                        FRU#:
                           type: string
-                        FRU#: 
+                        MESSAGE:
                           type: string
-                        FRU_NAME: 
+                        APP_NAME:
                           type: string
-                        MESSAGE: 
+                        TIME_STAMP:
                           type: string
-                        TIME_STAMP: 
+                        FRU_NAME:
                           type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic.yml
index 3753d4819e4d..80e623327d2c 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/nic  
-  title: Swagger doc for /api/nic  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/nic
+  title: Swagger doc for /api/nic
   version: 1.0.0
-paths: 
-  /api/nic: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/nic:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/fruid.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/fruid.yml
index 5d2649f82877..e9949db65901 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/fruid.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/fruid.yml
@@ -1,53 +1,53 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/nic/fruid  
-  title: Swagger doc for /api/nic/fruid  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/nic/fruid
+  title: Swagger doc for /api/nic/fruid
   version: 1.0.0
-paths: 
-  /api/nic/fruid: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/nic/fruid:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Board Mfg Date: 
+                properties:
+                  Board Mfg Date:
                     type: string
-                  Board Mfg: 
+                  Board Mfg:
                     type: string
-                  Board Product: 
+                  Board Product:
                     type: string
-                  Board Serial: 
+                  Board Serial:
                     type: string
-                  Board Part Number: 
+                  Board Part Number:
                     type: string
-                  Board FRU ID: 
+                  Board FRU ID:
                     type: string
-                  Product Manufacturer: 
+                  Product Manufacturer:
                     type: string
-                  Product Name: 
+                  Product Name:
                     type: string
-                  Product Part Number: 
+                  Product Part Number:
                     type: string
-                  Product Version: 
+                  Product Version:
                     type: string
-                  Product Serial: 
+                  Product Serial:
                     type: string
-                  Product Custom Data 3: 
+                  Product Custom Data 3:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/logs.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/logs.yml
index 1e87550a621c..49a1d3f63042 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/logs.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/logs.yml
@@ -1,45 +1,45 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/nic/logs  
-  title: Swagger doc for /api/nic/logs  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/nic/logs
+  title: Swagger doc for /api/nic/logs
   version: 1.0.0
-paths: 
-  /api/nic/logs: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/nic/logs:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Logs: 
+                properties:
+                  Logs:
                     type: array
-                    items: 
+                    items:
                       type: object
                       additionalProperties: false
-                      properties: 
-                        APP_NAME: 
+                      properties:
+                        FRU#:
                           type: string
-                        FRU#: 
+                        MESSAGE:
                           type: string
-                        FRU_NAME: 
+                        APP_NAME:
                           type: string
-                        MESSAGE: 
+                        TIME_STAMP:
                           type: string
-                        TIME_STAMP: 
+                        FRU_NAME:
                           type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/sensors.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/sensors.yml
index 23094462a073..12f350cb4f79 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/sensors.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/nic/sensors.yml
@@ -1,47 +1,47 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/nic/sensors  
-  title: Swagger doc for /api/nic/sensors  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/nic/sensors
+  title: Swagger doc for /api/nic/sensors
   version: 1.0.0
-paths: 
-  /api/nic/sensors: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/nic/sensors:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  NIC_SENSOR_TEMP: 
+                properties:
+                  NIC_SENSOR_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  NIC_SENSOR_P12V: 
+                  NIC_SENSOR_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  NIC_SENSOR_CUR: 
+                  NIC_SENSOR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc.yml
index dcfae1bf84f2..948ebf44cf4f 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/scc  
-  title: Swagger doc for /api/scc  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/scc
+  title: Swagger doc for /api/scc
   version: 1.0.0
-paths: 
-  /api/scc: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/scc:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/fruid.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/fruid.yml
index e063b26f2ef6..3bbc8157e59f 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/fruid.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/fruid.yml
@@ -1,65 +1,67 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/scc/fruid  
-  title: Swagger doc for /api/scc/fruid  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/scc/fruid
+  title: Swagger doc for /api/scc/fruid
   version: 1.0.0
-paths: 
-  /api/scc/fruid: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/scc/fruid:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
-                additionalProperties: true
-                properties: 
-                  Chassis Type: 
+                additionalProperties: false
+                properties:
+                  Chassis Type:
                     type: string
-                  Chassis Part Number: 
+                  Chassis Part Number:
                     type: string
-                  Chassis Serial Number: 
+                  Chassis Serial Number:
                     type: string
-                  Board Mfg Date: 
+                  Board Mfg Date:
                     type: string
-                  Board Mfg: 
+                  Board Mfg:
                     type: string
-                  Board Product: 
+                  Board Product:
                     type: string
-                  Board Serial: 
+                  Board Serial:
                     type: string
-                  Board Part Number: 
+                  Board Part Number:
                     type: string
-                  Board Custom Data 1: 
+                  Board Custom Data 1:
                     type: string
-                  Board Custom Data 2: 
+                  Board Custom Data 2:
                     type: string
-                  Product Manufacturer: 
+                  Product Manufacturer:
                     type: string
-                  Product Name: 
+                  Product Name:
                     type: string
-                  Product Part Number: 
+                  Product Part Number:
                     type: string
-                  Product Version: 
+                  Product Version:
                     type: string
-                  Product Serial: 
+                  Product Serial:
                     type: string
-                  Product Asset Tag: 
+                  Product Asset Tag:
                     type: string
-                  Product Custom Data 1: 
+                  Product Custom Data 1:
                     type: string
-                  Product Custom Data 2: 
+                  Product Custom Data 2:
                     type: string
-              Actions: 
+                  Product Custom Data 3:
+                    type: string
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/logs.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/logs.yml
index d2c3f1ffc70f..ca30b20a4207 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/logs.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/logs.yml
@@ -1,4 +1,4 @@
-swagger: "2.0"
+swagger: '2.0'
 info:
   description: Swagger doc for /api/scc/logs
   title: Swagger doc for /api/scc/logs
@@ -6,7 +6,8 @@ info:
 paths:
   /api/scc/logs:
     get:
-      produces: [application/json]
+      produces:
+      - application/json
       responses:
         200:
           description: ok
@@ -24,16 +25,16 @@ paths:
                       type: object
                       additionalProperties: false
                       properties:
-                        APP_NAME:
-                          type: string
                         FRU#:
                           type: string
-                        FRU_NAME:
-                          type: string
                         MESSAGE:
                           type: string
+                        APP_NAME:
+                          type: string
                         TIME_STAMP:
                           type: string
+                        FRU_NAME:
+                          type: string
               Actions:
                 type: array
                 items:
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/sensors.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/sensors.yml
index 2e09bd504f32..1d4b06b219be 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/sensors.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/scc/sensors.yml
@@ -1,113 +1,113 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/scc/sensors  
-  title: Swagger doc for /api/scc/sensors  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/scc/sensors
+  title: Swagger doc for /api/scc/sensors
   version: 1.0.0
-paths: 
-  /api/scc/sensors: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/scc/sensors:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  SCC_EXP_TEMP: 
+                properties:
+                  SCC_EXP_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_IOC_TEMP: 
+                  SCC_IOC_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_TEMP_1: 
+                  SCC_TEMP_1:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_TEMP_2: 
+                  SCC_TEMP_2:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P3V3_E_SENSE: 
+                  SCC_P3V3_E_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P1V8_E_SENSE: 
+                  SCC_P1V8_E_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P1V5_E_SENSE: 
+                  SCC_P1V5_E_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P0V92_E_SENSE: 
+                  SCC_P0V92_E_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P1V8_C_SENSE: 
+                  SCC_P1V8_C_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P1V5_C_SENSE: 
+                  SCC_P1V5_C_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P0V865_C_SENSE: 
+                  SCC_P0V865_C_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_HSC_P12V: 
+                  SCC_HSC_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_HSC_CUR: 
+                  SCC_HSC_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_HSC_PWR: 
+                  SCC_HSC_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sensors.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sensors.yml
index 3d0c35af8870..a887187f0fbc 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sensors.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sensors.yml
@@ -1,1283 +1,1325 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/sensors  
-  title: Swagger doc for /api/sensors  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/sensors
+  title: Swagger doc for /api/sensors
   version: 1.0.0
-paths: 
-  /api/sensors: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/sensors:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  BS_INLET_TEMP: 
+                properties:
+                  BS_INLET_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_P12V_STBY: 
+                  BS_P12V_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_P3V3_STBY: 
+                  BS_P3V3_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_P1V05_STBY: 
+                  BS_P1V05_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_P3V_BAT: 
+                  BS_P3V_BAT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_PVNN_PCH_STBY: 
+                  BS_PVNN_PCH_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_TEMP: 
+                  BS_HSC_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_IN_VOL: 
+                  BS_HSC_IN_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_IN_PWR: 
+                  BS_HSC_IN_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_OUT_CUR: 
+                  BS_HSC_OUT_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_BOOT_DRV_TEMP: 
+                  BS_BOOT_DRV_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_PCH_TEMP: 
+                  BS_PCH_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMM0_TEMP: 
+                  BS_DIMMA_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMM1_TEMP: 
+                  BS_DIMMB_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMM2_TEMP: 
+                  BS_DIMMD_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMM3_TEMP: 
+                  BS_DIMME_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_CPU_TEMP: 
+                  BS_CPU_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_THERM_MARGIN: 
+                  BS_THERM_MARGIN:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_CPU_TJMAX: 
+                  BS_CPU_TJMAX:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_CPU_PKG_PWR: 
+                  BS_CPU_PKG_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_IN_AVGPWR: 
+                  BS_HSC_IN_AVGPWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIN_VR_TEMP: 
+                  BS_VCCIN_VR_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIN_VR_CUR: 
+                  BS_VCCIN_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIN_VR_VOL: 
+                  BS_VCCIN_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIN_VR_PWR: 
+                  BS_VCCIN_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCSA_VR_TEMP: 
+                  BS_VCCSA_VR_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCSA_VR_CUR: 
+                  BS_VCCSA_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCSA_VR_VOL: 
+                  BS_VCCSA_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCSA_VR_PWR: 
+                  BS_VCCSA_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIO_VR_TEMP: 
+                  BS_VCCIO_VR_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIO_VR_CUR: 
+                  BS_VCCIO_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIO_VR_VOL: 
+                  BS_VCCIO_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIO_VR_PWR: 
+                  BS_VCCIO_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMAB_VR_TMP: 
+                  BS_DIMMAB_VR_TMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMAB_VR_CUR: 
+                  BS_DIMMAB_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMAB_VR_VOL: 
+                  BS_DIMMAB_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMAB_VR_PWR: 
+                  BS_DIMMAB_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMDE_VR_TEM: 
+                  BS_DIMMDE_VR_TEM:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMDE_VR_CUR: 
+                  BS_DIMMDE_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMDE_VR_VOL: 
+                  BS_DIMMDE_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMDE_VR_PWR: 
+                  BS_DIMMDE_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P12V_DPB: 
+                  UIC_ADC_P12V_DPB:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P12V_STBY: 
+                  UIC_ADC_P12V_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P5V_STBY: 
+                  UIC_ADC_P5V_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P3V3_STBY: 
+                  UIC_ADC_P3V3_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P3V3_RGM: 
+                  UIC_ADC_P3V3_RGM:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P2V5_STBY: 
+                  UIC_ADC_P2V5_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P1V8_STBY: 
+                  UIC_ADC_P1V8_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P1V2_STBY: 
+                  UIC_ADC_P1V2_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P1V0_STBY: 
+                  UIC_ADC_P1V0_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_P12V_ISENSE_CUR: 
+                  UIC_P12V_ISENSE_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_INLET_TEMP: 
+                  UIC_INLET_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_00: 
+                  HDD_SMART_TEMP_00:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_01: 
+                  HDD_SMART_TEMP_01:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_02: 
+                  HDD_SMART_TEMP_02:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_03: 
+                  HDD_SMART_TEMP_03:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_04: 
+                  HDD_SMART_TEMP_04:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_05: 
+                  HDD_SMART_TEMP_05:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_06: 
+                  HDD_SMART_TEMP_06:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_07: 
+                  HDD_SMART_TEMP_07:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_08: 
+                  HDD_SMART_TEMP_08:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_09: 
+                  HDD_SMART_TEMP_09:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_10: 
+                  HDD_SMART_TEMP_10:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_11: 
+                  HDD_SMART_TEMP_11:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_12: 
+                  HDD_SMART_TEMP_12:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_13: 
+                  HDD_SMART_TEMP_13:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_14: 
+                  HDD_SMART_TEMP_14:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_15: 
+                  HDD_SMART_TEMP_15:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_16: 
+                  HDD_SMART_TEMP_16:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_17: 
+                  HDD_SMART_TEMP_17:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_18: 
+                  HDD_SMART_TEMP_18:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_19: 
+                  HDD_SMART_TEMP_19:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_20: 
+                  HDD_SMART_TEMP_20:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_21: 
+                  HDD_SMART_TEMP_21:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_22: 
+                  HDD_SMART_TEMP_22:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_23: 
+                  HDD_SMART_TEMP_23:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_24: 
+                  HDD_SMART_TEMP_24:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_25: 
+                  HDD_SMART_TEMP_25:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_26: 
+                  HDD_SMART_TEMP_26:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_27: 
+                  HDD_SMART_TEMP_27:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_28: 
+                  HDD_SMART_TEMP_28:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_29: 
+                  HDD_SMART_TEMP_29:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_30: 
+                  HDD_SMART_TEMP_30:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_31: 
+                  HDD_SMART_TEMP_31:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_32: 
+                  HDD_SMART_TEMP_32:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_33: 
+                  HDD_SMART_TEMP_33:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_34: 
+                  HDD_SMART_TEMP_34:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_SMART_TEMP_35: 
+                  HDD_SMART_TEMP_35:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_0: 
+                  HDD_P5V_SENSE_0:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_0: 
+                  HDD_P12V_SENSE_0:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_1: 
+                  HDD_P5V_SENSE_1:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_1: 
+                  HDD_P12V_SENSE_1:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_2: 
+                  HDD_P5V_SENSE_2:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_2: 
+                  HDD_P12V_SENSE_2:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_3: 
+                  HDD_P5V_SENSE_3:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_3: 
+                  HDD_P12V_SENSE_3:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_4: 
+                  HDD_P5V_SENSE_4:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_4: 
+                  HDD_P12V_SENSE_4:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_5: 
+                  HDD_P5V_SENSE_5:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_5: 
+                  HDD_P12V_SENSE_5:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_6: 
+                  HDD_P5V_SENSE_6:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_6: 
+                  HDD_P12V_SENSE_6:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_7: 
+                  HDD_P5V_SENSE_7:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_7: 
+                  HDD_P12V_SENSE_7:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_8: 
+                  HDD_P5V_SENSE_8:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_8: 
+                  HDD_P12V_SENSE_8:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_9: 
+                  HDD_P5V_SENSE_9:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_9: 
+                  HDD_P12V_SENSE_9:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_10: 
+                  HDD_P5V_SENSE_10:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_10: 
+                  HDD_P12V_SENSE_10:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_11: 
+                  HDD_P5V_SENSE_11:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_11: 
+                  HDD_P12V_SENSE_11:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_12: 
+                  HDD_P5V_SENSE_12:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_12: 
+                  HDD_P12V_SENSE_12:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_13: 
+                  HDD_P5V_SENSE_13:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_13: 
+                  HDD_P12V_SENSE_13:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_14: 
+                  HDD_P5V_SENSE_14:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_14: 
+                  HDD_P12V_SENSE_14:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_15: 
+                  HDD_P5V_SENSE_15:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_15: 
+                  HDD_P12V_SENSE_15:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_16: 
+                  HDD_P5V_SENSE_16:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_16: 
+                  HDD_P12V_SENSE_16:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_17: 
+                  HDD_P5V_SENSE_17:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_17: 
+                  HDD_P12V_SENSE_17:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_18: 
+                  HDD_P5V_SENSE_18:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_18: 
+                  HDD_P12V_SENSE_18:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_19: 
+                  HDD_P5V_SENSE_19:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_19: 
+                  HDD_P12V_SENSE_19:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_20: 
+                  HDD_P5V_SENSE_20:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_20: 
+                  HDD_P12V_SENSE_20:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_21: 
+                  HDD_P5V_SENSE_21:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_21: 
+                  HDD_P12V_SENSE_21:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_22: 
+                  HDD_P5V_SENSE_22:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_22: 
+                  HDD_P12V_SENSE_22:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_23: 
+                  HDD_P5V_SENSE_23:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_23: 
+                  HDD_P12V_SENSE_23:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_24: 
+                  HDD_P5V_SENSE_24:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_24: 
+                  HDD_P12V_SENSE_24:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_25: 
+                  HDD_P5V_SENSE_25:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_25: 
+                  HDD_P12V_SENSE_25:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_26: 
+                  HDD_P5V_SENSE_26:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_26: 
+                  HDD_P12V_SENSE_26:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_27: 
+                  HDD_P5V_SENSE_27:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_27: 
+                  HDD_P12V_SENSE_27:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_28: 
+                  HDD_P5V_SENSE_28:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_28: 
+                  HDD_P12V_SENSE_28:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_29: 
+                  HDD_P5V_SENSE_29:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_29: 
+                  HDD_P12V_SENSE_29:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_30: 
+                  HDD_P5V_SENSE_30:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_30: 
+                  HDD_P12V_SENSE_30:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_31: 
+                  HDD_P5V_SENSE_31:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_31: 
+                  HDD_P12V_SENSE_31:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_32: 
+                  HDD_P5V_SENSE_32:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_32: 
+                  HDD_P12V_SENSE_32:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_33: 
+                  HDD_P5V_SENSE_33:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_33: 
+                  HDD_P12V_SENSE_33:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_34: 
+                  HDD_P5V_SENSE_34:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_34: 
+                  HDD_P12V_SENSE_34:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P5V_SENSE_35: 
+                  HDD_P5V_SENSE_35:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  HDD_P12V_SENSE_35: 
+                  HDD_P12V_SENSE_35:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_INLET_TEMP_1: 
+                  DPB_INLET_TEMP_1:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_INLET_TEMP_2: 
+                  DPB_INLET_TEMP_2:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_OUTLET_TEMP: 
+                  DPB_OUTLET_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_P12V: 
+                  DPB_HSC_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P3V3_STBY_SENSE: 
+                  DPB_P3V3_STBY_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P3V3_IN_SENSE: 
+                  DPB_P3V3_IN_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P5V_1_SYS_SENSE: 
+                  DPB_P5V_1_SYS_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P5V_2_SYS_SENSE: 
+                  DPB_P5V_2_SYS_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P5V_3_SYS_SENSE: 
+                  DPB_P5V_3_SYS_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_P5V_4_SYS_SENSE: 
+                  DPB_P5V_4_SYS_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_P12V_CLIP: 
+                  DPB_HSC_P12V_CLIP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_CUR: 
+                  DPB_HSC_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_CUR_CLIP: 
+                  DPB_HSC_CUR_CLIP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_PWR: 
+                  DPB_HSC_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  DPB_HSC_PWR_CLIP: 
+                  DPB_HSC_PWR_CLIP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_0_FRONT: 
+                  FAN_0_FRONT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_0_REAR: 
+                  FAN_0_REAR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_1_FRONT: 
+                  FAN_1_FRONT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_1_REAR: 
+                  FAN_1_REAR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_2_FRONT: 
+                  FAN_2_FRONT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_2_REAR: 
+                  FAN_2_REAR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_3_FRONT: 
+                  FAN_3_FRONT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  FAN_3_REAR: 
+                  FAN_3_REAR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  AIRFLOW: 
+                  AIRFLOW:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_EXP_TEMP: 
+                  SCC_EXP_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_IOC_TEMP: 
+                  SCC_IOC_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_TEMP_1: 
+                  SCC_TEMP_1:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_TEMP_2: 
+                  SCC_TEMP_2:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P3V3_E_SENSE: 
+                  SCC_P3V3_E_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P1V8_E_SENSE: 
+                  SCC_P1V8_E_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P1V5_E_SENSE: 
+                  SCC_P1V5_E_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P0V92_E_SENSE: 
+                  SCC_P0V92_E_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P1V8_C_SENSE: 
+                  SCC_P1V8_C_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P1V5_C_SENSE: 
+                  SCC_P1V5_C_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_P0V865_C_SENSE: 
+                  SCC_P0V865_C_SENSE:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_HSC_P12V: 
+                  SCC_HSC_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_HSC_CUR: 
+                  SCC_HSC_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  SCC_HSC_PWR: 
+                  SCC_HSC_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  NIC_SENSOR_TEMP: 
+                  NIC_SENSOR_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  NIC_SENSOR_P12V: 
+                  NIC_SENSOR_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  NIC_SENSOR_CUR: 
+                  NIC_SENSOR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A0_CUR: 
+                  E1S_B0_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A1_CUR: 
+                  E1S_B1_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A0_TEMP: 
+                  E1S_B0_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A1_TEMP: 
+                  E1S_B1_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A0_P12V: 
+                  E1S_B0_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A1_P12V: 
+                  E1S_B1_P12V:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A0_P3V3: 
+                  E1S_B0_P3V3:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  E1S_A1_P3V3: 
+                  E1S_B1_P3V3:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-              Actions: 
+                  IOCM_P3V3_STBY:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_P1V8:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_P1V5:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_P0V865:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_CUR:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_TEMP:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+                  IOCM_IOC_TEMP:
+                    type: object
+                    additionalProperties: false
+                    properties:
+                      value:
+                        type: string
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server.yml
index e3655d9fd043..3de11a353b11 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server.yml
@@ -1,34 +1,33 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server  
-  title: Swagger doc for /api/server  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server
+  title: Swagger doc for /api/server
   version: 1.0.0
-paths: 
-  /api/server: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Power status: 
+                properties:
+                  Power status:
                     type: string
-                  BIC_ok: 
-                    type: number
-                    format: int32
-              Actions: 
+                  BIC_ok:
+                    type: integer
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios.yml
index 23e63be6f1f5..30dba71c88b6 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/bios  
-  title: Swagger doc for /api/server/bios  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/bios
+  title: Swagger doc for /api/server/bios
   version: 1.0.0
-paths: 
-  /api/server/bios: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/bios:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order.yml
index 303314cca4d8..e8798236b690 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/bios/boot-order  
-  title: Swagger doc for /api/server/bios/boot-order  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/bios/boot-order
+  title: Swagger doc for /api/server/bios/boot-order
   version: 1.0.0
-paths: 
-  /api/server/bios/boot-order: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/bios/boot-order:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/boot_mode.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/boot_mode.yml
index 8a01eb932bca..de7685c99a45 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/boot_mode.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/boot_mode.yml
@@ -1,35 +1,35 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/bios/boot-order/boot_mode  
-  title: Swagger doc for /api/server/bios/boot-order/boot_mode  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/bios/boot-order/boot_mode
+  title: Swagger doc for /api/server/bios/boot-order/boot_mode
   version: 1.0.0
-paths: 
-  /api/server/bios/boot-order/boot_mode: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/bios/boot-order/boot_mode:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Boot Mode: 
+                properties:
+                  Boot Mode:
                     type: string
-                  Note #1: Actions Format:: 
+                  'Note #1: Actions Format:':
                     type: string
-                  Note #2: Boot Mode No.: 
+                  'Note #2: Boot Mode No.':
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/boot_order.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/boot_order.yml
index 22c2223ccfd4..dc6a8479b300 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/boot_order.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/boot_order.yml
@@ -1,35 +1,35 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/bios/boot-order/boot_order  
-  title: Swagger doc for /api/server/bios/boot-order/boot_order  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/bios/boot-order/boot_order
+  title: Swagger doc for /api/server/bios/boot-order/boot_order
   version: 1.0.0
-paths: 
-  /api/server/bios/boot-order/boot_order: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/bios/boot-order/boot_order:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Boot Order: 
+                properties:
+                  Boot Order:
                     type: string
-                  Note #1: Actions Format:: 
+                  'Note #1: Actions Format:':
                     type: string
-                  Note #2: Boot Order No.: 
+                  'Note #2: Boot Order No.':
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/clear_cmos.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/clear_cmos.yml
index b86eacc24318..c0680b7dc67a 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/clear_cmos.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/clear_cmos.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/bios/boot-order/clear_cmos  
-  title: Swagger doc for /api/server/bios/boot-order/clear_cmos  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/bios/boot-order/clear_cmos
+  title: Swagger doc for /api/server/bios/boot-order/clear_cmos
   version: 1.0.0
-paths: 
-  /api/server/bios/boot-order/clear_cmos: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/bios/boot-order/clear_cmos:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Clear CMOS Function: 
+                properties:
+                  Clear CMOS Function:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/force_boot_bios_setup.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/force_boot_bios_setup.yml
index 6e19e32f6cf3..a3c0a8e8a5a0 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/force_boot_bios_setup.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/boot-order/force_boot_bios_setup.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/bios/boot-order/force_boot_bios_setup  
-  title: Swagger doc for /api/server/bios/boot-order/force_boot_bios_setup  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/bios/boot-order/force_boot_bios_setup
+  title: Swagger doc for /api/server/bios/boot-order/force_boot_bios_setup
   version: 1.0.0
-paths: 
-  /api/server/bios/boot-order/force_boot_bios_setup: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/bios/boot-order/force_boot_bios_setup:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Force Boot to BIOS Setup Function: 
+                properties:
+                  Force Boot to BIOS Setup Function:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/plat-info.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/plat-info.yml
index f30e14475ad3..dd74eaae9d3d 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/plat-info.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/plat-info.yml
@@ -1,33 +1,33 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/bios/plat-info  
-  title: Swagger doc for /api/server/bios/plat-info  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/bios/plat-info
+  title: Swagger doc for /api/server/bios/plat-info
   version: 1.0.0
-paths: 
-  /api/server/bios/plat-info: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/bios/plat-info:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Platform Information: 
+                properties:
+                  Platform Information:
                     type: array
-                    items: 
+                    items:
                       type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/postcode.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/postcode.yml
index c3370bba82d4..1cd71e274d34 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/postcode.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/bios/postcode.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/bios/postcode  
-  title: Swagger doc for /api/server/bios/postcode  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/bios/postcode
+  title: Swagger doc for /api/server/bios/postcode
   version: 1.0.0
-paths: 
-  /api/server/bios/postcode: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/bios/postcode:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  POST Code: 
+                properties:
+                  POST Code:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/config.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/config.yml
index d0da26942921..ff48730fad72 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/config.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/config.yml
@@ -1,43 +1,43 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/config  
-  title: Swagger doc for /api/server/config  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/config
+  title: Swagger doc for /api/server/config
   version: 1.0.0
-paths: 
-  /api/server/config: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/config:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  system_identify_server: 
+                properties:
+                  system_identify_server:
                     type: string
-                  server_boot_order: 
+                  server_boot_order:
                     type: string
-                  server_por_cfg: 
+                  server_por_cfg:
                     type: string
-                  sysfw_ver_server: 
+                  sysfw_ver_server:
                     type: string
-                  ntp_server: 
+                  ntp_server:
                     type: string
-                  server_sel_error: 
+                  server_sel_error:
                     type: string
-                  server_sensor_health: 
+                  server_sensor_health:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/fruid.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/fruid.yml
index 24fa2a51cf83..81e17d940470 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/fruid.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/fruid.yml
@@ -1,65 +1,67 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/fruid  
-  title: Swagger doc for /api/server/fruid  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/fruid
+  title: Swagger doc for /api/server/fruid
   version: 1.0.0
-paths: 
-  /api/server/fruid: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/fruid:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
-                additionalProperties: true
-                properties: 
-                  Chassis Type: 
+                additionalProperties: false
+                properties:
+                  Chassis Type:
                     type: string
-                  Chassis Custom Data 1: 
+                  Chassis Custom Data 1:
                     type: string
-                  Board Mfg Date: 
+                  Board Mfg Date:
                     type: string
-                  Board Mfg: 
+                  Board Mfg:
                     type: string
-                  Board Product: 
+                  Board Product:
                     type: string
-                  Board Serial: 
+                  Board Serial:
                     type: string
-                  Board Part Number: 
+                  Board Part Number:
                     type: string
-                  Board FRU ID: 
+                  Board FRU ID:
                     type: string
-                  Board Custom Data 1: 
+                  Board Custom Data 1:
                     type: string
-                  Board Custom Data 2: 
+                  Board Custom Data 2:
                     type: string
-                  Product Manufacturer: 
+                  Product Manufacturer:
                     type: string
-                  Product Name: 
+                  Product Name:
                     type: string
-                  Product Part Number: 
+                  Product Part Number:
                     type: string
-                  Product Version: 
+                  Product Version:
                     type: string
-                  Product Serial: 
+                  Product Serial:
                     type: string
-                  Product Asset Tag: 
+                  Product Asset Tag:
                     type: string
-                  Product FRU ID: 
+                  Product FRU ID:
                     type: string
-                  Product Custom Data 1: 
+                  Product Custom Data 1:
                     type: string
-              Actions: 
+                  Product Custom Data 2:
+                    type: string
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/logs.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/logs.yml
index 9d64399ff9c8..b6b347d0f95a 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/logs.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/logs.yml
@@ -1,45 +1,45 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/logs  
-  title: Swagger doc for /api/server/logs  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/logs
+  title: Swagger doc for /api/server/logs
   version: 1.0.0
-paths: 
-  /api/server/logs: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/logs:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Logs: 
+                properties:
+                  Logs:
                     type: array
-                    items: 
+                    items:
                       type: object
                       additionalProperties: false
-                      properties: 
-                        APP_NAME: 
+                      properties:
+                        FRU#:
                           type: string
-                        FRU#: 
+                        MESSAGE:
                           type: string
-                        FRU_NAME: 
+                        APP_NAME:
                           type: string
-                        MESSAGE: 
+                        TIME_STAMP:
                           type: string
-                        TIME_STAMP: 
+                        FRU_NAME:
                           type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/sensors.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/sensors.yml
index 5c003997298d..7d8be72e074d 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/sensors.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/server/sensors.yml
@@ -1,275 +1,275 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/server/sensors  
-  title: Swagger doc for /api/server/sensors  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/server/sensors
+  title: Swagger doc for /api/server/sensors
   version: 1.0.0
-paths: 
-  /api/server/sensors: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/server/sensors:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
-                additionalProperties: true
-                properties: 
-                  BS_INLET_TEMP: 
+                additionalProperties: false
+                properties:
+                  BS_INLET_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_P12V_STBY: 
+                  BS_P12V_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_P3V3_STBY: 
+                  BS_P3V3_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_P1V05_STBY: 
+                  BS_P1V05_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_P3V_BAT: 
+                  BS_P3V_BAT:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_PVNN_PCH_STBY: 
+                  BS_PVNN_PCH_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_TEMP: 
+                  BS_HSC_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_IN_VOL: 
+                  BS_HSC_IN_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_IN_PWR: 
+                  BS_HSC_IN_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_OUT_CUR: 
+                  BS_HSC_OUT_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_BOOT_DRV_TEMP: 
+                  BS_BOOT_DRV_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_PCH_TEMP: 
+                  BS_PCH_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMM0_TEMP: 
+                  BS_DIMMA_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMM1_TEMP: 
+                  BS_DIMMB_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMM2_TEMP: 
+                  BS_DIMMD_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMM3_TEMP: 
+                  BS_DIMME_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_CPU_TEMP: 
+                  BS_CPU_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_THERM_MARGIN: 
+                  BS_THERM_MARGIN:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_CPU_TJMAX: 
+                  BS_CPU_TJMAX:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_CPU_PKG_PWR: 
+                  BS_CPU_PKG_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_HSC_IN_AVGPWR: 
+                  BS_HSC_IN_AVGPWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIN_VR_TEMP: 
+                  BS_VCCIN_VR_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIN_VR_CUR: 
+                  BS_VCCIN_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIN_VR_VOL: 
+                  BS_VCCIN_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIN_VR_PWR: 
+                  BS_VCCIN_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCSA_VR_TEMP: 
+                  BS_VCCSA_VR_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCSA_VR_CUR: 
+                  BS_VCCSA_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCSA_VR_VOL: 
+                  BS_VCCSA_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCSA_VR_PWR: 
+                  BS_VCCSA_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIO_VR_TEMP: 
+                  BS_VCCIO_VR_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIO_VR_CUR: 
+                  BS_VCCIO_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIO_VR_VOL: 
+                  BS_VCCIO_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_VCCIO_VR_PWR: 
+                  BS_VCCIO_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMAB_VR_TMP: 
+                  BS_DIMMAB_VR_TMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMAB_VR_CUR: 
+                  BS_DIMMAB_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMAB_VR_VOL: 
+                  BS_DIMMAB_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMAB_VR_PWR: 
+                  BS_DIMMAB_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMDE_VR_TEM: 
+                  BS_DIMMDE_VR_TEM:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMDE_VR_CUR: 
+                  BS_DIMMDE_VR_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMDE_VR_VOL: 
+                  BS_DIMMDE_VR_VOL:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  BS_DIMMDE_VR_PWR: 
+                  BS_DIMMDE_VR_PWR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sys.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sys.yml
index c9a78151bb09..813dff9c3d1d 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sys.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sys.yml
@@ -1,28 +1,28 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/sys  
-  title: Swagger doc for /api/sys  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/sys
+  title: Swagger doc for /api/sys
   version: 1.0.0
-paths: 
-  /api/sys: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/sys:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 format: nullable
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sys/ntp.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sys/ntp.yml
index f768e23532e6..81aa6fafef9d 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sys/ntp.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/sys/ntp.yml
@@ -1,47 +1,83 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/sys/ntp  
-  title: Swagger doc for /api/sys/ntp  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/sys/ntp
+  title: Swagger doc for /api/sys/ntp
   version: 1.0.0
-paths: 
-  /api/sys/ntp: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/sys/ntp:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  stratum: 
+                properties:
+                  stratum:
                     type: number
-                    format: int32
-                  when: 
+                  when:
                     type: number
-                    format: int32
-                  poll: 
+                  poll:
                     type: number
-                    format: int32
-                  reach: 
+                  reach:
                     type: number
-                    format: int32
-                  delay: 
+                  delay:
                     type: number
-                  offset: 
+                  offset:
                     type: number
-                  jitter: 
+                  jitter:
                     type: number
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
+        404:
+          description: No system peers
+          schema:
+            type: object
+            additionalProperties: false
+            properties:
+              Resources:
+                type: array
+                items:
+                  type: string
+              Actions:
+                type: array
+                items:
+                  type: string
+              Information:
+                type: object
+                additionalProperties: false
+                properties:
+                  reason:
+                    type: string
+        500:
+          description: Internal Server error
+          schema:
+            type: object
+            additionalProperties: false
+            properties:
+              Resources:
+                type: array
+                items:
+                  type: string
+              Actions:
+                type: array
+                items:
+                  type: string
+              Information:
+                type: object
+                additionalProperties: false
+                properties:
+                  reason:
+                    type: string
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic.yml
index b8663fa5a94d..b3d2eea3d9cf 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/uic  
-  title: Swagger doc for /api/uic  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/uic
+  title: Swagger doc for /api/uic
   version: 1.0.0
-paths: 
-  /api/uic: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/uic:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/bmc.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/bmc.yml
index 1de1ffff1519..98fa5705b0ee 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/bmc.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/bmc.yml
@@ -1,128 +1,130 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/uic/bmc  
-  title: Swagger doc for /api/uic/bmc  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/uic/bmc
+  title: Swagger doc for /api/uic/bmc
   version: 1.0.0
-paths: 
-  /api/uic/bmc: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/uic/bmc:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Description: 
+                properties:
+                  Description:
                     type: string
-                  MAC Addr: 
+                  MAC Addr:
                     type: string
-                  Reset Reason: 
+                  Reset Reason:
                     type: string
-                  Uptime: 
+                  Uptime:
                     type: string
-                  uptime: 
+                  uptime:
                     type: string
-                  Memory Usage: 
+                  Memory Usage:
                     type: string
-                  memory: 
+                  memory:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      MemTotal: 
-                        type: number
-                        format: int32
-                      MemFree: 
-                        type: number
-                        format: int32
-                      MemAvailable: 
-                        type: number
-                        format: int32
-                      Buffers: 
-                        type: number
-                        format: int32
-                      Cached: 
-                        type: number
-                        format: int32
-                      Shmem: 
-                        type: number
-                        format: int32
-                  CPU Usage: 
-                    type: string
-                  OpenBMC Version: 
-                    type: string
-                  u-boot version: 
-                    type: string
-                  kernel version: 
-                    type: string
-                  TPM TCG version: 
-                    type: string
-                  TPM FW version: 
-                    type: string
-                  SPI0 Vendor: 
-                    type: string
-                  SPI1 Vendor: 
-                    type: string
-                  At-Scale-Debug Running: 
+                    properties:
+                      MemTotal:
+                        type: integer
+                      MemFree:
+                        type: integer
+                      MemAvailable:
+                        type: integer
+                      Buffers:
+                        type: integer
+                      Cached:
+                        type: integer
+                      Shmem:
+                        type: integer
+                  CPU Usage:
+                    type: string
+                  OpenBMC Version:
+                    type: string
+                  u-boot version:
+                    type: string
+                  kernel version:
+                    type: string
+                  TPM TCG version:
+                    type: string
+                  TPM FW version:
+                    type: string
+                  SPI0 Vendor:
+                    type: string
+                  SPI1 Vendor:
+                    type: string
+                  At-Scale-Debug Running:
                     type: boolean
-                  Secondary Boot Triggered: 
+                  Secondary Boot Triggered:
                     type: boolean
-                  vboot: 
+                  vboot:
                     type: object
-                    additionalProperties: true
-                    properties: 
-                      status: 
+                    additionalProperties: false
+                    properties:
+                      status:
+                        type: string
+                      status_text:
+                        type: string
+                      status_crc:
+                        type: string
+                      tpm_status:
+                        type: string
+                      cert_fallback_time:
                         type: string
-                      status_text: 
+                      cert_time:
                         type: string
-                      status_crc: 
+                      uboot_fallback_time:
                         type: string
-                      tpm_status: 
+                      uboot_time:
                         type: string
-                      cert_fallback_time: 
+                      force_recovery:
                         type: string
-                      cert_time: 
+                      hardware_enforce:
                         type: string
-                      uboot_fallback_time: 
+                      software_enforce:
                         type: string
-                      uboot_time: 
+                      recovery_boot:
                         type: string
-                      force_recovery: 
+                      recovery_retried:
                         type: string
-                      hardware_enforce: 
+                      rom_version:
                         type: string
-                      software_enforce: 
+                      rom_uboot_version:
                         type: string
-                      recovery_boot: 
+                      flash0_signed:
                         type: string
-                      recovery_retried: 
+                      flash0_locked:
                         type: string
-                  load-1: 
+                  load-1:
                     type: string
-                  load-5: 
+                  load-5:
                     type: string
-                  load-15: 
+                  load-15:
                     type: string
-                  open-fds: 
+                  open-fds:
                     type: string
-                  MTD Parts: 
+                  MTD Parts:
                     type: array
-                    items: 
+                    items:
                       type: string
-                  mmc-info: 
+                  mmc-info:
                     type: object
                     format: nullable
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/fruid.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/fruid.yml
index 624ebfb38784..5b8f7c19e92c 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/fruid.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/fruid.yml
@@ -1,67 +1,65 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/uic/fruid  
-  title: Swagger doc for /api/uic/fruid  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/uic/fruid
+  title: Swagger doc for /api/uic/fruid
   version: 1.0.0
-paths: 
-  /api/uic/fruid: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/uic/fruid:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
-                additionalProperties: true
-                properties: 
-                  Chassis Type: 
+                additionalProperties: false
+                properties:
+                  Board Mfg Date:
                     type: string
-                  Chassis Part Number: 
+                  Board Mfg:
                     type: string
-                  Chassis Serial Number: 
+                  Board Product:
                     type: string
-                  Board Mfg Date: 
+                  Board Serial:
                     type: string
-                  Board Mfg: 
+                  Board Part Number:
                     type: string
-                  Board Product: 
+                  Board FRU ID:
                     type: string
-                  Board Serial: 
+                  Board Custom Data 1:
                     type: string
-                  Board Part Number: 
+                  Board Custom Data 2:
                     type: string
-                  Board FRU ID: 
+                  Product Manufacturer:
                     type: string
-                  Board Custom Data 1: 
+                  Product Name:
                     type: string
-                  Board Custom Data 2: 
+                  Product Part Number:
                     type: string
-                  Product Manufacturer: 
+                  Product Version:
                     type: string
-                  Product Name: 
+                  Product Serial:
                     type: string
-                  Product Part Number: 
+                  Product Asset Tag:
                     type: string
-                  Product Version: 
+                  Product FRU ID:
                     type: string
-                  Product Serial: 
+                  Product Custom Data 1:
                     type: string
-                  Product Asset Tag: 
+                  Product Custom Data 2:
                     type: string
-                  Product FRU ID: 
+                  Product Custom Data 3:
                     type: string
-                  Product Custom Data 1: 
-                    type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/health.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/health.yml
index 49ff546fda04..8feb923190ab 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/health.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/health.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/uic/health  
-  title: Swagger doc for /api/uic/health  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/uic/health
+  title: Swagger doc for /api/uic/health
   version: 1.0.0
-paths: 
-  /api/uic/health: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/uic/health:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Status of enclosure health LED: 
+                properties:
+                  Status of enclosure health LED:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/identify.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/identify.yml
index 913358be9581..f0fed9ba24e1 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/identify.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/identify.yml
@@ -1,31 +1,31 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/uic/identify  
-  title: Swagger doc for /api/uic/identify  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/uic/identify
+  title: Swagger doc for /api/uic/identify
   version: 1.0.0
-paths: 
-  /api/uic/identify: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/uic/identify:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Status of identify LED: 
+                properties:
+                  Status of identify LED:
                     type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/logs.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/logs.yml
index 446c6a2141ab..ca27c49fe8ea 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/logs.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/logs.yml
@@ -1,33 +1,45 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/uic/logs  
-  title: Swagger doc for /api/uic/logs  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/uic/logs
+  title: Swagger doc for /api/uic/logs
   version: 1.0.0
-paths: 
-  /api/uic/logs: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/uic/logs:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  Logs: 
+                properties:
+                  Logs:
                     type: array
-                    items: 
-                      type: string
-              Actions: 
+                    items:
+                      type: object
+                      additionalProperties: false
+                      properties:
+                        FRU#:
+                          type: string
+                        MESSAGE:
+                          type: string
+                        APP_NAME:
+                          type: string
+                        TIME_STAMP:
+                          type: string
+                        FRU_NAME:
+                          type: string
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/sensors.yml b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/sensors.yml
index b55b4e458017..04c56a2c877b 100644
--- a/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/sensors.yml
+++ b/common/recipes-rest/rest-api/files/swagger/definitions/grandcanyon/api/uic/sensors.yml
@@ -1,95 +1,95 @@
-swagger: "2.0"
-info: 
-  description: Swagger doc for /api/uic/sensors  
-  title: Swagger doc for /api/uic/sensors  
+swagger: '2.0'
+info:
+  description: Swagger doc for /api/uic/sensors
+  title: Swagger doc for /api/uic/sensors
   version: 1.0.0
-paths: 
-  /api/uic/sensors: 
-    get: 
-      produces: [application/json]
-      responses: 
-        200: 
+paths:
+  /api/uic/sensors:
+    get:
+      produces:
+      - application/json
+      responses:
+        200:
           description: ok
-          schema: 
+          schema:
             type: object
             additionalProperties: false
-            properties: 
-              Information: 
+            properties:
+              Information:
                 type: object
                 additionalProperties: false
-                properties: 
-                  UIC_ADC_P12V_DPB: 
+                properties:
+                  UIC_ADC_P12V_DPB:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P12V_STBY: 
+                  UIC_ADC_P12V_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P5V_STBY: 
+                  UIC_ADC_P5V_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P3V3_STBY: 
+                  UIC_ADC_P3V3_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P3V3_RGM: 
+                  UIC_ADC_P3V3_RGM:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P2V5_STBY: 
+                  UIC_ADC_P2V5_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P1V8_STBY: 
+                  UIC_ADC_P1V8_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P1V2_STBY: 
+                  UIC_ADC_P1V2_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_ADC_P1V0_STBY: 
+                  UIC_ADC_P1V0_STBY:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_P12V_ISENSE_CUR: 
+                  UIC_P12V_ISENSE_CUR:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-                  UIC_INLET_TEMP: 
+                  UIC_INLET_TEMP:
                     type: object
                     additionalProperties: false
-                    properties: 
-                      value: 
+                    properties:
+                      value:
                         type: string
-              Actions: 
+              Actions:
                 type: array
-                items: 
+                items:
                   type: string
-              Resources: 
+              Resources:
                 type: array
-                items: 
+                items:
                   type: string
-            
\ No newline at end of file
diff --git a/common/recipes-rest/rest-api/files/test_common_logging.py b/common/recipes-rest/rest-api/files/test_common_logging.py
index e35551ae1f9b..2d6bb5d99938 100644
--- a/common/recipes-rest/rest-api/files/test_common_logging.py
+++ b/common/recipes-rest/rest-api/files/test_common_logging.py
@@ -118,7 +118,12 @@ def test_json_logger_integration(self):
                 "testmessage", extra={"time": now}
             )  # force in time for the logged entry
             self.assertEqual(
-                {"message": "testmessage", "time": now.isoformat(), "level": "INFO"},
+                {
+                    "message": "testmessage",
+                    "time": now.isoformat(),
+                    "level": "INFO",
+                    "taskName": None,
+                },
                 json.loads(fake_out.getvalue()),
             )
 
@@ -145,6 +150,7 @@ def test_json_logger_extra_args(self):
                     "anumber": 42,
                     "level": "INFO",
                     "time": now.isoformat(),
+                    "taskName": None,
                 },
                 json.loads(fake_out.getvalue()),
             )
diff --git a/common/recipes-rest/rest-api/files/test_rest_modbus_cmd.py b/common/recipes-rest/rest-api/files/test_rest_modbus_cmd.py
index d03492559735..4034c0c839d6 100644
--- a/common/recipes-rest/rest-api/files/test_rest_modbus_cmd.py
+++ b/common/recipes-rest/rest-api/files/test_rest_modbus_cmd.py
@@ -1,6 +1,6 @@
 import asyncio
 import unittest
-from typing import Any, List
+from typing import Any, List  # noqa: F401
 
 import aiohttp.web
 
diff --git a/common/recipes-rest/rest-api/rest-api_0.1.bb b/common/recipes-rest/rest-api/rest-api_0.1.bb
index 5526e81dc74c..e192008ca937 100644
--- a/common/recipes-rest/rest-api/rest-api_0.1.bb
+++ b/common/recipes-rest/rest-api/rest-api_0.1.bb
@@ -46,7 +46,8 @@ def aiohttp_dep(d):
     distro = d.getVar('DISTRO_CODENAME', True)
     if distro in [ 'rocko', 'dunfell' ]:
         return "aiohttp"
-    return "python3-aiohttp"
+    # XXX work around missing python3-attr dependency
+    return "python3-aiohttp python3-attr"
 
 DEPENDS:append = " update-rc.d-native"
 RDEPENDS:${PN} += " \
@@ -85,6 +86,7 @@ LOCAL_URI = " \
     file://rest_ntpstatus.py \
     file://rest_utils.py \
     file://rest_fscd_sensor_data.py \
+    file://rest_qsfp_thermal.py \
     file://rest_fwinfo.py \
     file://rest_debug.py \
     file://jsonschema_lite.py \
diff --git a/common/recipes-rest/restclient-cpp/restclient-cpp_git.bb b/common/recipes-rest/restclient-cpp/restclient-cpp_git.bb
index b6ac9d34afb6..ef22a65054ba 100644
--- a/common/recipes-rest/restclient-cpp/restclient-cpp_git.bb
+++ b/common/recipes-rest/restclient-cpp/restclient-cpp_git.bb
@@ -2,7 +2,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=875d6e9ec1cb59099f4d9da1e81d1e91"
 
 SRC_URI = " \
-    git://github.com/mrtazz/restclient-cpp.git;branch=master;protocol=https \
+    git://github.com/mrtazz/restclient-cpp.git;branch=main;protocol=https \
     file://0001-Fix-missing-cstdint-include.patch \
     "
 SRCREV = "b782bd26539a3d1a8edcb6d8a3493b111f8fac66"
diff --git a/common/recipes-utils/fbmc-snapshot/files/showtech.sh b/common/recipes-utils/fbmc-snapshot/files/showtech.sh
index ef3ed3ef573c..9ee380d38369 100755
--- a/common/recipes-utils/fbmc-snapshot/files/showtech.sh
+++ b/common/recipes-utils/fbmc-snapshot/files/showtech.sh
@@ -43,6 +43,9 @@ echo "built : $built"
 bmc_version=$(cat /etc/issue)
 echo "$bmc_version"
 
+echo -e "\n##### All Firmware Versions #####"
+fw-util all --version
+
 echo -e "\n##### Aspeed Chip Revision #####"
 aspeed_soc_chip_ver
 
diff --git a/common/recipes-utils/openbmc-utils/files/openbmc-utils.sh b/common/recipes-utils/openbmc-utils/files/openbmc-utils.sh
index 448e8f613abb..69216b4451d7 100644
--- a/common/recipes-utils/openbmc-utils/files/openbmc-utils.sh
+++ b/common/recipes-utils/openbmc-utils/files/openbmc-utils.sh
@@ -71,6 +71,36 @@ mac_addr_inc() {
     printf "%012X" "$new_mac" | sed 's/../&:/g;s/:$//'
 }
 
+#
+# Lookup mtd device based on name/label.
+# $1 - mtd partition name/label.
+#
+mtd_lookup_by_name() {
+    mtd=$(awk -v name="$1" '$4~name {print $1}' /proc/mtd |
+          cut -d ':' -f 1)
+    echo "$mtd"
+}
+
+#
+# Write a value to the given sysfs file.
+# $1 - sysfs pathname
+# $2 - input value
+#
+sysfs_write() {
+    pathname="$1"
+    value="$2"
+
+    if [ ! -e "$pathname" ]; then
+        echo "Error: $pathname does not exist!"
+        return 1
+    fi
+
+    if ! echo "$value" > "$pathname"; then
+        echo "Error: failed to write $value to $pathname!"
+        return 1
+    fi
+}
+
 source "/usr/local/bin/shell-utils.sh"
 source "/usr/local/bin/i2c-utils.sh"
 source "/usr/local/bin/gpio-utils.sh"
diff --git a/common/recipes-utils/vboot-utils/files/vboot-check b/common/recipes-utils/vboot-utils/files/vboot-check
index 9a62d1445d64..4be923e3df3b 100755
--- a/common/recipes-utils/vboot-utils/files/vboot-check
+++ b/common/recipes-utils/vboot-utils/files/vboot-check
@@ -22,6 +22,7 @@ import hashlib
 import json
 import sys
 import traceback
+from datetime import timezone
 
 VBOOT_CHECK_VERSION = "6"
 # Define the exit code
@@ -91,8 +92,8 @@ def get_date(fdt):
     # returns a tuple of parsed date, timestamp
     timestamp = fdt.resolve_path("/timestamp")[0]
     return (
-        datetime.datetime.utcfromtimestamp(
-            timestamp,
+        datetime.datetime.fromtimestamp(
+            timestamp, timezone.utc
         ).strftime("%a %b %d %H:%M:%S UTC %Y")
         + " (0x%x)" % (timestamp)
     ), timestamp
diff --git a/meta-bf/meta-mavericks/conf/templates/default/bblayers.conf.sample b/meta-bf/meta-mavericks/conf/templates/default/bblayers.conf.sample
index 7f953a6518f3..4a3e1aee93b2 100644
--- a/meta-bf/meta-mavericks/conf/templates/default/bblayers.conf.sample
+++ b/meta-bf/meta-mavericks/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-openembedded/meta-networking \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-bf/meta-mavericks \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample
index c293f23cf495..bd89bf6354f1 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm845/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -24,7 +23,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-evb/meta-evb-nuvoton/meta-evb-npcm845 \
   ##OEROOT##/meta-nuvoton \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/conf/distro/include/fb-base.inc b/meta-facebook/conf/distro/include/fb-base.inc
index 4e61d1a8300e..75686ddb4448 100644
--- a/meta-facebook/conf/distro/include/fb-base.inc
+++ b/meta-facebook/conf/distro/include/fb-base.inc
@@ -31,3 +31,7 @@ BB_DISKMON_DIRS ??= "\
 # We have a lot of patches that don't have an Upstream-Status, so diable this
 # QA rather than modifying all the patch files.
 ERROR_QA:remove = "patch-status"
+
+# Pick up defaults for sstate hashing from poky.conf
+BB_SIGNATURE_HANDLER ?= "OEEquivHash"
+BB_HASHSERVE ??= "auto"
diff --git a/meta-facebook/conf/distro/openbmc-fb.conf b/meta-facebook/conf/distro/include/fb-openbmc.inc
similarity index 86%
rename from meta-facebook/conf/distro/openbmc-fb.conf
rename to meta-facebook/conf/distro/include/fb-openbmc.inc
index 9b1c137d4ada..44798d410c4b 100644
--- a/meta-facebook/conf/distro/openbmc-fb.conf
+++ b/meta-facebook/conf/distro/include/fb-openbmc.inc
@@ -1,7 +1,6 @@
 # Facebook OpenBMC distro
 
 # Use the base poky distro, but override various parameters.
-require conf/distro/poky.conf
 require conf/distro/include/fb-base.inc
 DISTROOVERRIDES .= ":openbmc-fb"
 
@@ -48,3 +47,13 @@ CONF_VERSION ?= "1"
 HOSTTOOLS += "realpath"
 
 PREFERRED_VERSION_asd ?= "0.1"
+
+TCLIBCAPPEND = ""
+QEMU_TARGETS ?= "arm aarch64 i386 riscv32 riscv64 ppc64le x86_64"
+INIT_MANAGER ?= "sysvinit"
+
+require conf/distro/include/yocto-uninative.inc
+INHERIT += "uninative"
+
+require conf/distro/include/no-static-libs.inc
+require conf/distro/include/security_flags.inc
diff --git a/meta-facebook/conf/distro/openbmc-fb-dunfell.conf b/meta-facebook/conf/distro/openbmc-fb-dunfell.conf
new file mode 100644
index 000000000000..361b45eff898
--- /dev/null
+++ b/meta-facebook/conf/distro/openbmc-fb-dunfell.conf
@@ -0,0 +1,2 @@
+DISTRO_CODENAME="dunfell"
+require conf/distro/include/fb-openbmc.inc
diff --git a/meta-facebook/conf/distro/openbmc-fb-2.conf b/meta-facebook/conf/distro/openbmc-fb-kirkstone.conf
similarity index 55%
rename from meta-facebook/conf/distro/openbmc-fb-2.conf
rename to meta-facebook/conf/distro/openbmc-fb-kirkstone.conf
index 3757293d3de6..41f3aabbf8a4 100644
--- a/meta-facebook/conf/distro/openbmc-fb-2.conf
+++ b/meta-facebook/conf/distro/openbmc-fb-kirkstone.conf
@@ -1,4 +1,4 @@
+DISTRO_CODENAME="kirkstone"
 # Yocto versions Honister and above need a bump to the CONF_VERSION.
 CONF_VERSION = "2"
-
-require conf/distro/openbmc-fb.conf
+require conf/distro/include/fb-openbmc.inc
diff --git a/meta-facebook/conf/distro/openbmc-fb-master.conf b/meta-facebook/conf/distro/openbmc-fb-master.conf
index 23313163099b..0d2d0d757ada 100644
--- a/meta-facebook/conf/distro/openbmc-fb-master.conf
+++ b/meta-facebook/conf/distro/openbmc-fb-master.conf
@@ -1,11 +1,10 @@
-require conf/distro/openbmc-fb-2.conf
+DISTRO_CODENAME="master"
+# Yocto versions Honister and above need a bump to the CONF_VERSION.
+CONF_VERSION = "2"
+require conf/distro/include/fb-openbmc.inc
 
 # Starting in Yocto-Nanbield, the CONVERSION_CMDs are no longer expected to
 # use the IMAGE_NAME_SUFFIX, but we need our `fb-openbmc-image` to support
 # both older and new Yocto.  We can set IMAGE_NAME_SUFFIX to an empty string
 # on master and satisfy both.
 IMAGE_NAME_SUFFIX=""
-
-# We need the manifold mirror to pull from the lf-master branch.
-# Set this after all the `requires` so it doesn't get overwritten by poky's.
-DISTRO_CODENAME="master"
diff --git a/meta-facebook/conf/distro/openbmc-fb-rocko.conf b/meta-facebook/conf/distro/openbmc-fb-rocko.conf
new file mode 100644
index 000000000000..ef8d21bc307e
--- /dev/null
+++ b/meta-facebook/conf/distro/openbmc-fb-rocko.conf
@@ -0,0 +1,3 @@
+DISTRO_CODENAME="rocko"
+BB_SIGNATURE_HANDLER ?= "OEBasicHash"
+require conf/distro/include/fb-openbmc.inc
diff --git a/meta-facebook/meta-backports/dunfell/recipes-core/util-linux/util-linux_2.35.1.bbappend b/meta-facebook/meta-backports/dunfell/recipes-core/util-linux/util-linux_2.35.1.bbappend
new file mode 100644
index 000000000000..956e9ae10551
--- /dev/null
+++ b/meta-facebook/meta-backports/dunfell/recipes-core/util-linux/util-linux_2.35.1.bbappend
@@ -0,0 +1 @@
+EXTRA_OECONF:append = " --disable-raw"
diff --git a/meta-facebook/meta-backports/rocko/recipes-core/util-linux/util-linux_2.30.bbappend b/meta-facebook/meta-backports/rocko/recipes-core/util-linux/util-linux_2.30.bbappend
new file mode 100644
index 000000000000..956e9ae10551
--- /dev/null
+++ b/meta-facebook/meta-backports/rocko/recipes-core/util-linux/util-linux_2.30.bbappend
@@ -0,0 +1 @@
+EXTRA_OECONF:append = " --disable-raw"
diff --git a/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
index 609412b3ea57..1f154e2d10b9 100644
--- a/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-bletchley/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
@@ -25,8 +24,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/0500-ARM-dts-aspeed-bletchley-enable-PWM-and-TACH-support.patch b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/0500-ARM-dts-aspeed-bletchley-enable-PWM-and-TACH-support.patch
index 81e4a8d94a4f..686171718ca9 100644
--- a/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/0500-ARM-dts-aspeed-bletchley-enable-PWM-and-TACH-support.patch
+++ b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/0500-ARM-dts-aspeed-bletchley-enable-PWM-and-TACH-support.patch
@@ -1,4 +1,4 @@
-From 0b37032450f5254d0ba11e92347c37449b35dabe Mon Sep 17 00:00:00 2001
+From 5fbe38b2bb67aaec3adda2120794bc98b7a97552 Mon Sep 17 00:00:00 2001
 From: Potin Lai <potin.lai@quantatw.com>
 Date: Thu, 31 Aug 2023 16:55:58 +0800
 Subject: [PATCH 500/501] ARM: dts: aspeed: bletchley: enable PWM and TACH
@@ -103,5 +103,5 @@ index e899de681f47..f8564644cc70 100644
 +	};
 +};
 -- 
-2.41.0
+2.43.0
 
diff --git a/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/0501-ARM-dts-aspeed-bletchley-set-manual-clock-for-i2c13.patch b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/0501-ARM-dts-aspeed-bletchley-set-manual-clock-for-i2c13.patch
index 1d99ed6518a3..1b0822573951 100644
--- a/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/0501-ARM-dts-aspeed-bletchley-set-manual-clock-for-i2c13.patch
+++ b/meta-facebook/meta-bletchley/recipes-kernel/linux/linux-aspeed/0501-ARM-dts-aspeed-bletchley-set-manual-clock-for-i2c13.patch
@@ -1,4 +1,4 @@
-From 809d0a876ea899e397f9758a1d092cbfa5cd607a Mon Sep 17 00:00:00 2001
+From 7e56a5123acb6773c9eb05f1bf76529edbbbb202 Mon Sep 17 00:00:00 2001
 From: Potin Lai <potin.lai.pt@gmail.com>
 Date: Mon, 30 May 2022 13:45:10 +0800
 Subject: [PATCH 501/501] ARM: dts: aspeed: bletchley: set manual clock for
@@ -23,5 +23,5 @@ index f8564644cc70..a69ecfa17cb5 100644
  
  	//USB Debug Connector
 -- 
-2.41.0
+2.43.0
 
diff --git a/meta-facebook/meta-churchillmono/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-churchillmono/conf/templates/default/bblayers.conf.sample
index 7e616fc2519f..ad05ea4a2881 100755
--- a/meta-facebook/meta-churchillmono/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-churchillmono/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,8 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-churchillmono/conf/templates/default/local.conf.sample b/meta-facebook/meta-churchillmono/conf/templates/default/local.conf.sample
index 7cad7bd7892f..1f7b6dcc9eeb 100644
--- a/meta-facebook/meta-churchillmono/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-churchillmono/conf/templates/default/local.conf.sample
@@ -7,4 +7,4 @@ OLDEST_KERNEL = "5.10"
 MACHINE ??= "churchillmono"
 
 # OpenBMC distro settings - Keeping as openbmc-fb to avoid incompatibilities
-DISTRO ?= "openbmc-fb-2"
+DISTRO ?= "openbmc-fb-kirkstone"
diff --git a/meta-facebook/meta-clearcreek/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-clearcreek/conf/templates/default/bblayers.conf.sample
index 496a81c5b88e..53fa3a8b109e 100644
--- a/meta-facebook/meta-clearcreek/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-clearcreek/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-cloudripper/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-cloudripper/conf/templates/default/bblayers.conf.sample
index ce9d51b93f25..fc0ae9643b55 100755
--- a/meta-facebook/meta-cloudripper/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-cloudripper/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-cloudripper/conf/templates/default/local.conf.sample b/meta-facebook/meta-cloudripper/conf/templates/default/local.conf.sample
index 8cec3324b4d2..81ebd0537b61 100644
--- a/meta-facebook/meta-cloudripper/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-cloudripper/conf/templates/default/local.conf.sample
@@ -7,4 +7,4 @@ OLDEST_KERNEL = "5.10"
 MACHINE ??= "cloudripper"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-cmm/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-cmm/conf/templates/default/bblayers.conf.sample
index 68f0300126f6..566fdcc0acac 100644
--- a/meta-facebook/meta-cmm/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-cmm/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -18,7 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-cmm/conf/templates/default/local.conf.sample b/meta-facebook/meta-cmm/conf/templates/default/local.conf.sample
index 5efcf847661b..e56c34fbf26c 100644
--- a/meta-facebook/meta-cmm/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-cmm/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "cmm"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-elbert/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-elbert/conf/templates/default/bblayers.conf.sample
index 41bfa42e9def..cfd58498336e 100644
--- a/meta-facebook/meta-elbert/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-elbert/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-elbert/conf/templates/default/local.conf.sample b/meta-facebook/meta-elbert/conf/templates/default/local.conf.sample
index 37322f1a284f..09f1e1130e01 100644
--- a/meta-facebook/meta-elbert/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-elbert/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "elbert"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-elbert/recipes-elbert/front-paneld/front-paneld_0.1.bb b/meta-facebook/meta-elbert/recipes-elbert/front-paneld/front-paneld_0.1.bb
index 18513498416c..3b4aa4d242b2 100644
--- a/meta-facebook/meta-elbert/recipes-elbert/front-paneld/front-paneld_0.1.bb
+++ b/meta-facebook/meta-elbert/recipes-elbert/front-paneld/front-paneld_0.1.bb
@@ -7,7 +7,7 @@ PR = "r1"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://front-paneld.c;beginline=5;endline=17;md5=da35978751a9d71b73679307c4d296ec"
 
-DEPENDS:append = "libpal libkv libsdr libobmc-i2c update-rc.d-native"
+DEPENDS:append = "libpal libkv libgpio-ctrl libsdr libobmc-i2c update-rc.d-native"
 
 LOCAL_URI = " \
     file://Makefile \
@@ -40,5 +40,5 @@ do_install() {
 FBPACKAGEDIR = "${prefix}/local/fbpackages"
 
 FILES:${PN} = "${FBPACKAGEDIR}/front-paneld ${prefix}/local/bin ${sysconfdir} "
-RDEPENDS:${PN} += "bash libpal libkv libsdr libobmc-i2c libmisc-utils"
+RDEPENDS:${PN} += "bash libpal libkv libgpio-ctrl libsdr libobmc-i2c libmisc-utils"
 LDFLAGS += "-lmisc-utils"
diff --git a/meta-facebook/meta-elbert/recipes-elbert/lm_sensors/files/elbert.conf b/meta-facebook/meta-elbert/recipes-elbert/lm_sensors/files/elbert.conf
index 8d7c1ce1ae4b..bd551872117d 100644
--- a/meta-facebook/meta-elbert/recipes-elbert/lm_sensors/files/elbert.conf
+++ b/meta-facebook/meta-elbert/recipes-elbert/lm_sensors/files/elbert.conf
@@ -164,6 +164,11 @@ chip "max6658-i2c-6-4c"
 
 ### SCM DEVICES ###
 
+chip "ucd90320-i2c-9-11"
+     ignore in1
+     ignore in2
+     ignore temp1
+
 chip "pmbus-i2c-11-40"
      label in1 "SCM_ECB_VIN"
      label in2 "SCM_ECB_VOUT"
diff --git a/meta-facebook/meta-elbert/recipes-elbert/trousers/trousers_%.bbappend b/meta-facebook/meta-elbert/recipes-elbert/trousers/trousers_%.bbappend
index 8a19de6ebbfc..2aabfaf2ed29 100644
--- a/meta-facebook/meta-elbert/recipes-elbert/trousers/trousers_%.bbappend
+++ b/meta-facebook/meta-elbert/recipes-elbert/trousers/trousers_%.bbappend
@@ -1,3 +1,2 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-# ELBERTTODO 447408 BMC trousers support
 
diff --git a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/setup_board.sh b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/setup_board.sh
index 3d6b447a39f7..640dc91d680a 100644
--- a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/setup_board.sh
+++ b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/setup_board.sh
@@ -28,5 +28,3 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 
-# ELBERTTODO 442075 board_setup.sh
-echo "ELBERT BOARD SETUP NOT IMPLEMENTED YET"
diff --git a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/show_tech.py b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/show_tech.py
index 6f08b1da35c3..40bbe09f3ddb 100755
--- a/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/show_tech.py
+++ b/meta-facebook/meta-elbert/recipes-utils/openbmc-utils/files/show_tech.py
@@ -26,7 +26,7 @@
 import time
 
 
-VERSION = "0.11"
+VERSION = "1.1"
 SC_POWERGOOD = "/sys/bus/i2c/drivers/scmcpld/12-0043/switchcard_powergood"
 
 
@@ -114,7 +114,6 @@ def fan_debuginfo(verbose=False):
     print("################################")
     print("######## FAN DEBUG INFO ########")
     print("################################\n")
-    print(runCmd("cat /sys/bus/i2c/devices/6-0060/fan_card_overtemp", echo=True))
     for _ in range(1, 6):
         fanPrefix = "/sys/bus/i2c/devices/6-0060/fan{}".format(_)
         log = "##### FAN {} DEBUG INFO #####\n".format(_)
@@ -204,6 +203,11 @@ def logDump():
             runCmd("cat /var/log/messages", echo=True)
         )
     )
+    print(
+        "#### LOGFILE ####\n{}\n\n".format(
+            runCmd("cat /mnt/data/logfile", echo=True)
+        )
+    )
     print("################################")
     print("########## HOST (uServer) CPU LOGS ##########")
     print("################################\n")
@@ -265,8 +269,8 @@ def oobEepromDump(verboseLevel=1):
     )
 
 
-def showtech(verboseLevel=0):
-    verbose = bool(verboseLevel)
+def showtech(quietLevel=0):
+    verbose = not bool(quietLevel)
     print("################################")
     print("##### SHOWTECH VERSION {} #####".format(VERSION))
     print("################################\n")
@@ -345,20 +349,28 @@ def showtech(verboseLevel=0):
         i2cDetectDump()
         gpioDump()
         logDump()
-        oobEepromDump(verboseLevel=verboseLevel)
+        oobEepromDump(verboseLevel=verbose)
 
 
 def parseArgs():
     parser = argparse.ArgumentParser(
         description="Get showtech information. Version {}".format(VERSION)
     )
+    parser.add_argument(
+        "-q",
+        "--quiet",
+        action="count",
+        help="show limited debug logs.",
+        dest="quietLevel",
+        default=0,
+    )
     parser.add_argument(
         "-v",
         "--verbose",
         action="count",
-        help="show verbose detailed debug logs.",
+        help="show verbose detailed debug logs (default).",
         dest="verboseLevel",
-        default=0,
+        default=1,
     )
     return parser.parse_args()
 
@@ -366,7 +378,7 @@ def parseArgs():
 def main():
     args = parseArgs()
 
-    showtech(verboseLevel=args.verboseLevel)
+    showtech(quietLevel=args.quietLevel)
 
 
 if __name__ == "__main__":
diff --git a/meta-facebook/meta-fbal/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbal/conf/templates/default/bblayers.conf.sample
index 9f209e62eccb..73f9411e7278 100644
--- a/meta-facebook/meta-fbal/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fbal/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fbdarwin/conf/machine/fbdarwin.conf b/meta-facebook/meta-fbdarwin/conf/machine/fbdarwin.conf
index 0b92d8604ed1..67db165f6b33 100644
--- a/meta-facebook/meta-fbdarwin/conf/machine/fbdarwin.conf
+++ b/meta-facebook/meta-fbdarwin/conf/machine/fbdarwin.conf
@@ -19,3 +19,5 @@ PREFERRED_VERSION_linux-aspeed = "6.0.%"
 #
 PREFERRED_VERSION_wedge-eeprom = "0.1"
 PREFERRED_VERSION_libwedge-eeprom = "0.1"
+
+MACHINE_FEATURES += "emmc emmc-ext4"
diff --git a/meta-facebook/meta-fbdarwin/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbdarwin/conf/templates/default/bblayers.conf.sample
index f3c12984b68f..209af15f9e1d 100644
--- a/meta-facebook/meta-fbdarwin/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fbdarwin/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -22,7 +21,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fbdarwin/conf/templates/default/local.conf.sample b/meta-facebook/meta-fbdarwin/conf/templates/default/local.conf.sample
index 7703e9f21a56..8abac429eee1 100644
--- a/meta-facebook/meta-fbdarwin/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-fbdarwin/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "fbdarwin"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb-2"
+DISTRO ?= "openbmc-fb-kirkstone"
diff --git a/meta-facebook/meta-fbdarwin/recipes-utils/serfmon-cache/files/find_serfmon.sh b/meta-facebook/meta-fbdarwin/recipes-utils/serfmon-cache/files/find_serfmon.sh
index e354889e6615..87b011008c11 100755
--- a/meta-facebook/meta-fbdarwin/recipes-utils/serfmon-cache/files/find_serfmon.sh
+++ b/meta-facebook/meta-fbdarwin/recipes-utils/serfmon-cache/files/find_serfmon.sh
@@ -48,9 +48,11 @@ create_dummy_chassis_eeprom() {
     # Extract SN from Serfmon Format \!serfmon\:.*\:.*\:.*$
     chassis_serial="$(awk -F":" '{print $3}' "$SERFMON_CACHE")"
 
+    TMP="${CHASSIS_EEPROM_CACHE}.tmp"
+
     # Create Fake EEPROM file for weutil in expected format
     printf "\x00\x00\x00\x03\x00\x00\x00\x00\x30\x30\x30\x32%s%s\x31\x31\x31"\
-        "$dummy_pca" "$chassis_serial" > "$CHASSIS_EEPROM_CACHE"
+        "$dummy_pca" "$chassis_serial" > "$TMP"
 
     # How many bytes to pad EEPROM file
     pad_bytes=211
@@ -60,16 +62,18 @@ create_dummy_chassis_eeprom() {
        chassis_mac="$(awk -F":" '{print $3}' "$MACMON_CACHE")"
 
        # Add MAC TLV. MAC is 12 (0x43 = C) bytes in length
-       printf "\x30\x35\x30\x30\x30\x43%s" "$chassis_mac" >> "$CHASSIS_EEPROM_CACHE"
+       printf "\x30\x35\x30\x30\x30\x43%s" "$chassis_mac" >> "$TMP"
        pad_bytes=$((pad_bytes - 18))
     fi
 
     # Add an end TLV.
-    printf "\x30\x30\x30\x30\x30\x30" >> "$CHASSIS_EEPROM_CACHE"
+    printf "\x30\x30\x30\x30\x30\x30" >> "$TMP"
 
     # Pad file with all 0xFFs to size
     dd if=/dev/zero bs=1 count=$pad_bytes \
-       2>/dev/null | tr "\000" "\377" >> "$CHASSIS_EEPROM_CACHE"
+       2>/dev/null | tr "\000" "\377" >> "$TMP"
+
+    mv $TMP $CHASSIS_EEPROM_CACHE
 }
 
 maybe_update_cache() {
diff --git a/meta-facebook/meta-fbdarwin/recipes-utils/serfmon-cache/files/serfmon-cache.service b/meta-facebook/meta-fbdarwin/recipes-utils/serfmon-cache/files/serfmon-cache.service
index 96887ffa5977..264e32f72bad 100644
--- a/meta-facebook/meta-fbdarwin/recipes-utils/serfmon-cache/files/serfmon-cache.service
+++ b/meta-facebook/meta-fbdarwin/recipes-utils/serfmon-cache/files/serfmon-cache.service
@@ -17,6 +17,7 @@
 #
 [Unit]
 Description=Cache and print serfmon and macmon
+Before=configure-eth0.service
 After=mount_data1.service
 Wants=mount_data1.service
 
diff --git a/meta-facebook/meta-fbep/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbep/conf/templates/default/bblayers.conf.sample
index 2f133766d7d2..d9d8beb74022 100644
--- a/meta-facebook/meta-fbep/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fbep/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fboss-lite/conf/machine/fboss-lite.inc b/meta-facebook/meta-fboss-lite/conf/machine/fboss-lite.inc
index 5b393f9e5eef..0e565c6f3545 100644
--- a/meta-facebook/meta-fboss-lite/conf/machine/fboss-lite.inc
+++ b/meta-facebook/meta-fboss-lite/conf/machine/fboss-lite.inc
@@ -21,8 +21,6 @@ PREFERRED_VERSION_u-boot-fw-utils-cross = "v2019.04%"
 PREFERRED_VERSION_wedge-eeprom = "0.2"
 PREFERRED_VERSION_libwedge-eeprom = "0.2"
 
-MACHINE_FEATURES += "emmc emmc-ext4"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-i2c-dev-sysfs"
 
 EXTRA_IMAGE_FEATURES:append = " image-meta"
diff --git a/meta-facebook/meta-fboss-lite/recipes-core/ipmi-lite/files/common-handles.c b/meta-facebook/meta-fboss-lite/recipes-core/ipmi-lite/files/common-handles.c
index 164f9772a5ef..4c3de6be475c 100644
--- a/meta-facebook/meta-fboss-lite/recipes-core/ipmi-lite/files/common-handles.c
+++ b/meta-facebook/meta-fboss-lite/recipes-core/ipmi-lite/files/common-handles.c
@@ -193,6 +193,10 @@ int ipmi_set_boot_order(
 
   for (i = offset = 0; i < SIZE_BOOT_ORDER && offset < sizeof(str); i++) {
     if (i > 0) { // byte[0] is boot mode, byte[1:5] are boot order
+      // 0xff is used for empty value, should end when found this value
+      if ( boot[i] == 0xff )
+        break;
+
       for (j = i + 1; j < SIZE_BOOT_ORDER; j++) {
         if (boot[i] == boot[j])
           return CC_INVALID_PARAM;
diff --git a/meta-facebook/meta-fboss-lite/recipes-kernel/linux/kconfig/fboss_lite.cfg b/meta-facebook/meta-fboss-lite/recipes-kernel/linux/kconfig/fboss_lite.cfg
index 0ab344fc9000..b4c0e393a299 100644
--- a/meta-facebook/meta-fboss-lite/recipes-kernel/linux/kconfig/fboss_lite.cfg
+++ b/meta-facebook/meta-fboss-lite/recipes-kernel/linux/kconfig/fboss_lite.cfg
@@ -1,3 +1,10 @@
+#
+## Sensors
+#
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_AST_ADC=m
+
 #
 # TPM drivers
 #
@@ -7,7 +14,7 @@ CONFIG_SPI_GPIO=y
 CONFIG_SPI=y
 
 #
-# EEPROM drivers
+# EEPROM AT93C46 driver
 #
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_93XX46=y
diff --git a/meta-facebook/meta-fboss-lite/recipes-utils/openbmc-utils/files/power-on.sh b/meta-facebook/meta-fboss-lite/recipes-utils/openbmc-utils/files/power-on.sh
index 6cd97b4228e3..c1ab0d3153c5 100755
--- a/meta-facebook/meta-fboss-lite/recipes-utils/openbmc-utils/files/power-on.sh
+++ b/meta-facebook/meta-fboss-lite/recipes-utils/openbmc-utils/files/power-on.sh
@@ -31,10 +31,32 @@ source /usr/local/bin/openbmc-utils.sh
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 
+do_power_on() {
+    retry=0
+    max_retry=5
+
+    while [ "$retry" -lt "$max_retry" ]; do
+        logger -p user.crit "Power on uServer (from power-on.sh).."
+
+        echo "Power on uServer.."
+        if userver_power_on; then
+            sleep 1
+            if userver_power_is_on; then
+                echo "uServer is powered on successfully."
+                return 0
+            fi
+        fi
+
+        retry=$((retry+1))
+        echo "Error: failed to power on uServer! Retry ($retry / $max_retry).."
+        sleep 1
+    done
+}
+
 echo "Checking x86 (userver) power status... "
 if userver_power_is_on; then
     echo "userver is already powered. Skipped."
     exit 0
 fi
 
-wedge_power.sh on -f
+do_power_on
diff --git a/meta-facebook/meta-fboss-lite/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend b/meta-facebook/meta-fboss-lite/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
index fc1864ea97be..4f2c07f2b5db 100644
--- a/meta-facebook/meta-fboss-lite/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
+++ b/meta-facebook/meta-fboss-lite/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
@@ -83,10 +83,13 @@ do_work_systemd() {
     install -d ${D}/usr/local/bin
     install -d ${D}${systemd_system_unitdir}
 
-    for svc in mount_data1.service setup_board.service \
-               setup_gpio.service setup_i2c.service; do
+    for svc in setup_board.service setup_gpio.service setup_i2c.service; do
         install -m 0644 ${svc} ${D}${systemd_system_unitdir}
     done
+
+    if ! echo ${MACHINE_FEATURES} | awk "/emmc/ {exit 1}"; then
+        install -m 0644 mount_data1.service ${D}${systemd_system_unitdir}
+    fi
 }
 
 do_install:append() {
@@ -99,10 +102,13 @@ do_install:append() {
 
 FILES:${PN} += "${sysconfdir}"
 
-SYSTEMD_SERVICE:${PN} += "mount_data1.service"
 SYSTEMD_SERVICE:${PN} += "setup_board.service"
 SYSTEMD_SERVICE:${PN} += "setup_gpio.service"
 SYSTEMD_SERVICE:${PN} += "setup_i2c.service"
+SYSTEMD_SERVICE:${PN} += "\
+    ${@bb.utils.contains('MACHINE_FEATURES', 'emmc', 'mount_data1.service', '', d)} \
+"
+
 
 # Not needed for fboss-lite openbmc systems.
 SYSTEMD_SERVICE:${PN}:remove = "enable_watchdog_ext_signal.service"
diff --git a/meta-facebook/meta-fboss-lite/recipes-utils/wedge-eeprom/files/lib/Cfg.cpp b/meta-facebook/meta-fboss-lite/recipes-utils/wedge-eeprom/files/lib/Cfg.cpp
index ba6805096b92..4014f9277daf 100644
--- a/meta-facebook/meta-fboss-lite/recipes-utils/wedge-eeprom/files/lib/Cfg.cpp
+++ b/meta-facebook/meta-fboss-lite/recipes-utils/wedge-eeprom/files/lib/Cfg.cpp
@@ -21,11 +21,14 @@ WeCfg::WeCfg() {
   json jCfg = json::parse(f);
   json jdev = jCfg["eeprom devices"];
   //  json pltName = jCfg["platform"];
+  std::string name;
 
   for (json::iterator it = jdev.begin(); it != jdev.end(); ++it) {
     assert(it->find("name") != it->end());
     assert(it->find("sysfs_path") != it->end());
-    weCfgTbl_[(*it)["name"]] = (*it)["sysfs_path"];
+    name = (*it)["name"];
+    std::transform(name.begin(), name.end(), name.begin(), ::tolower);
+    weCfgTbl_[name] = (*it)["sysfs_path"];
   }
 }
 
@@ -67,10 +70,12 @@ std::string WeCfg::eFormat(const std::string& ePath) {
 }
 
 std::optional<std::string> WeCfg::eepromNameToPath(const std::string& name) {
-  auto it = weCfgTbl_.find(name);
+  auto lc_name = name;
+  std::transform(lc_name.begin(), lc_name.end(), lc_name.begin(), ::tolower);
+  auto it = weCfgTbl_.find(lc_name);
   if (it == weCfgTbl_.end()) {
     return {};
   }
-  return weCfgTbl_[name];
+  return weCfgTbl_[lc_name];
 }
 } // namespace weutil
diff --git a/meta-facebook/meta-fbsp/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbsp/conf/templates/default/bblayers.conf.sample
index 65c9601a152d..b31eda4f5349 100644
--- a/meta-facebook/meta-fbsp/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fbsp/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fbtp/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbtp/conf/templates/default/bblayers.conf.sample
index 3f9ba358a931..538fc2235e7f 100644
--- a/meta-facebook/meta-fbtp/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fbtp/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-oe \
@@ -20,7 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   ##OEROOT##/../../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fbtp/conf/templates/default/local.conf.sample b/meta-facebook/meta-fbtp/conf/templates/default/local.conf.sample
index 0a3b4bfcc162..8dc99d0faa79 100644
--- a/meta-facebook/meta-fbtp/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-fbtp/conf/templates/default/local.conf.sample
@@ -8,7 +8,7 @@ MACHINE ??= "fbtp"
 # MACHINE ??= "fbtp-ubu"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).
diff --git a/meta-facebook/meta-fbttn/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbttn/conf/templates/default/bblayers.conf.sample
index 23637e86c99a..053fc2446ece 100644
--- a/meta-facebook/meta-fbttn/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fbttn/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-oe \
@@ -20,7 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook/meta-backports \
   ##OEROOT##/../../../meta-facebook/meta-fbttn \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fbttn/conf/templates/default/local.conf.sample b/meta-facebook/meta-fbttn/conf/templates/default/local.conf.sample
index f574cdb05fd7..8722b5814543 100644
--- a/meta-facebook/meta-fbttn/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-fbttn/conf/templates/default/local.conf.sample
@@ -6,7 +6,7 @@
 MACHINE ??= "fbttn"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).
diff --git a/meta-facebook/meta-fbttn/meta-fbttn2/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fbttn/meta-fbttn2/conf/templates/default/bblayers.conf.sample
index f7614db881d4..aacbc7f2575c 100644
--- a/meta-facebook/meta-fbttn/meta-fbttn2/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fbttn/meta-fbttn2/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -18,7 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fbttn/recipes-fbttn/fblibs/files/pal/pal.c b/meta-facebook/meta-fbttn/recipes-fbttn/fblibs/files/pal/pal.c
index 473f52c22e75..26992d9a9090 100755
--- a/meta-facebook/meta-fbttn/recipes-fbttn/fblibs/files/pal/pal.c
+++ b/meta-facebook/meta-fbttn/recipes-fbttn/fblibs/files/pal/pal.c
@@ -1127,10 +1127,10 @@ int
 pal_sled_cycle(void) {
   pal_update_ts_sled();
   // Remove the adm1275 module as the HSC device is busy
-  system("rmmod adm1275");
+  (void)!system("rmmod adm1275");
 
   // Send command to HSC power cycle
-  system("i2cset -y 0 0x10 0xd9 c");
+  (void)!system("i2cset -y 0 0x10 0xd9 c");
 
   return 0;
 }
@@ -1930,7 +1930,7 @@ pal_is_bmc_por(void) {
 
   fp = fopen(AST_POR_FLAG, "r");
   if (fp != NULL) {
-    fscanf(fp, "%d", &por);
+    (void)!fscanf(fp, "%d", &por);
     fclose(fp);
   }
 
@@ -3600,11 +3600,11 @@ pal_get_error_code(uint8_t data[MAX_ERROR_CODES], uint8_t* error_count) {
     memset(error, 0, 32); //When BMC Error Code file Open Fail, fill all data to 0
   }
   else {
-    lockf(fileno(fp),F_LOCK,0L);
+    (void)!lockf(fileno(fp),F_LOCK,0L);
     while (fscanf(fp, "%hhX", error+count) != EOF && count!=32) {
       count++;
     }
-    lockf(fileno(fp),F_ULOCK,0L);
+    (void)!lockf(fileno(fp),F_ULOCK,0L);
     fclose(fp);
   }
 
@@ -3639,7 +3639,7 @@ pal_add_cri_sel(char *str)
 {
   char cmd[128];
   snprintf(cmd, 128, "logger -p local0.err \"%s\"",str);
-  system(cmd);
+  (void)!system(cmd);
 }
 
 void
@@ -3680,13 +3680,13 @@ pal_set_bios_current_boot_list(uint8_t slot, uint8_t *boot_list, uint8_t list_le
 #endif
     return err;
   }
-  lockf(fileno(fp),F_LOCK,0L);
+  (void)!lockf(fileno(fp),F_LOCK,0L);
 
   for(i = 0; i < list_length; i++) {
     fprintf(fp, "%02X ", *(boot_list+i));
   }
   fprintf(fp, "\n");
-  lockf(fileno(fp),F_ULOCK,0L);
+  (void)!lockf(fileno(fp),F_ULOCK,0L);
   fclose(fp);
   return 0;
 }
@@ -3704,13 +3704,13 @@ pal_get_bios_current_boot_list(uint8_t slot, uint8_t *boot_list, uint8_t *list_l
 #endif
     return err;
   }
-  lockf(fileno(fp),F_LOCK,0L);
+  (void)!lockf(fileno(fp),F_LOCK,0L);
 
   while (fscanf(fp, "%hhX", boot_list+count) != EOF) {
       count++;
   }
   *list_length = count;
-  lockf(fileno(fp),F_ULOCK,0L);
+  (void)!lockf(fileno(fp),F_ULOCK,0L);
   fclose(fp);
   return 0;
 }
@@ -3727,12 +3727,12 @@ pal_set_bios_fixed_boot_device(uint8_t slot, uint8_t *fixed_boot_device) {
 #endif
     return err;
   }
-  lockf(fileno(fp),F_LOCK,0L);
+  (void)!lockf(fileno(fp),F_LOCK,0L);
 
   fprintf(fp, "%02X ", *fixed_boot_device);
   fprintf(fp, "\n");
 
-  lockf(fileno(fp),F_ULOCK,0L);
+  (void)!lockf(fileno(fp),F_ULOCK,0L);
   fclose(fp);
   return 0;
 }
@@ -3765,12 +3765,12 @@ pal_set_bios_restores_default_setting(uint8_t slot, uint8_t *default_setting) {
 #endif
     return err;
   }
-  lockf(fileno(fp),F_LOCK,0L);
+  (void)!lockf(fileno(fp),F_LOCK,0L);
 
   fprintf(fp, "%02X ", *default_setting);
   fprintf(fp, "\n");
 
-  lockf(fileno(fp),F_ULOCK,0L);
+  (void)!lockf(fileno(fp),F_ULOCK,0L);
   fclose(fp);
 
   //Hack a thread wait a certain time then clear the setting, when userA didn't reboot the System, and userB doesn't know about the setting.
@@ -3797,11 +3797,11 @@ pal_get_bios_restores_default_setting(uint8_t slot, uint8_t *default_setting) {
 #endif
     return err;
   }
-  lockf(fileno(fp),F_LOCK,0L);
+  (void)!lockf(fileno(fp),F_LOCK,0L);
 
-  fscanf(fp, "%hhX", default_setting);
+  (void)!fscanf(fp, "%hhX", default_setting);
 
-  lockf(fileno(fp),F_ULOCK,0L);
+  (void)!lockf(fileno(fp),F_ULOCK,0L);
   fclose(fp);
   return 0;
 }
@@ -3819,14 +3819,14 @@ pal_set_last_boot_time(uint8_t slot, uint8_t *last_boot_time) {
 #endif
     return err;
   }
-  lockf(fileno(fp),F_LOCK,0L);
+  (void)!lockf(fileno(fp),F_LOCK,0L);
 
   for(i = 0; i < 4; i++) {
     fprintf(fp, "%02X ", *(last_boot_time+i));
   }
   fprintf(fp, "\n");
 
-  lockf(fileno(fp),F_ULOCK,0L);
+  (void)!lockf(fileno(fp),F_ULOCK,0L);
   fclose(fp);
   return 0;
 }
@@ -3844,13 +3844,13 @@ pal_get_last_boot_time(uint8_t slot, uint8_t *last_boot_time) {
 #endif
     return err;
   }
-  lockf(fileno(fp),F_LOCK,0L);
+  (void)!lockf(fileno(fp),F_LOCK,0L);
 
   for(i = 0; i < 4; i++) {
-    fscanf(fp, "%hhX", last_boot_time+i);
+    (void)!fscanf(fp, "%hhX", last_boot_time+i);
   }
 
-  lockf(fileno(fp),F_ULOCK,0L);
+  (void)!lockf(fileno(fp),F_ULOCK,0L);
   fclose(fp);
   return 0;
 }
@@ -3867,11 +3867,11 @@ pal_get_bios_fixed_boot_device(uint8_t slot, uint8_t *fixed_boot_device) {
 #endif
     return err;
   }
-  lockf(fileno(fp),F_LOCK,0L);
+  (void)!lockf(fileno(fp),F_LOCK,0L);
 
-  fscanf(fp, "%hhX", fixed_boot_device);
+  (void)!fscanf(fp, "%hhX", fixed_boot_device);
 
-  lockf(fileno(fp),F_ULOCK,0L);
+  (void)!lockf(fileno(fp),F_ULOCK,0L);
   fclose(fp);
   return 0;
 }
@@ -3883,10 +3883,10 @@ void
 pal_save_boot_option(unsigned char* buff)
 {
   int fp = 0;
-  fp = open("/tmp/boot.in", O_WRONLY|O_CREAT);
+  fp = open("/tmp/boot.in", O_WRONLY|O_CREAT, 0755);
   if(fp > 0 )
   {
-	write(fp,buff,256);
+	(void)!write(fp,buff,256);
     close(fp);
   }
 }
@@ -3898,7 +3898,7 @@ pal_load_boot_option(unsigned char* buff)
   fp = open("/tmp/boot.in", O_RDONLY);
   if(fp > 0 )
   {
-    read(fp,buff,256);
+    (void)!read(fp,buff,256);
     close(fp);
     return 0;
   }
@@ -4110,7 +4110,7 @@ int
 pal_open_fw_update_flag(void) {
     int fd;
     //if fd = 0 means open successfully.
-    fd = open(FW_UPDATE_FLAG, O_CREAT);
+    fd = open(FW_UPDATE_FLAG, O_CREAT, 0755);
     if (!fd) {
       close(fd);
     }
diff --git a/meta-facebook/meta-fbttn/recipes-fbttn/fbutils/files/expander-util/expander-util.c b/meta-facebook/meta-fbttn/recipes-fbttn/fbutils/files/expander-util/expander-util.c
index 0ea170a50c6c..1be926076c5a 100644
--- a/meta-facebook/meta-fbttn/recipes-fbttn/fbutils/files/expander-util/expander-util.c
+++ b/meta-facebook/meta-fbttn/recipes-fbttn/fbutils/files/expander-util/expander-util.c
@@ -107,7 +107,7 @@ main(int argc, char **argv) {
 
   errno = 0;
 
-  logfd = open(LOGFILE, O_CREAT | O_WRONLY);
+  logfd = open(LOGFILE, O_CREAT | O_WRONLY, 0755);
   if (logfd < 0) {
     syslog(LOG_WARNING, "Opening a tmp file failed. errno: %d", errno);
     return -1;
diff --git a/meta-facebook/meta-fbttn/recipes-fbttn/gpiod/files/gpiod.c b/meta-facebook/meta-fbttn/recipes-fbttn/gpiod/files/gpiod.c
index 071e98202906..97eda571e4a2 100644
--- a/meta-facebook/meta-fbttn/recipes-fbttn/gpiod/files/gpiod.c
+++ b/meta-facebook/meta-fbttn/recipes-fbttn/gpiod/files/gpiod.c
@@ -70,7 +70,7 @@ typedef struct {
 
 static gpio_pin_t gpio_slot1[MAX_GPIO_PINS] = {0};
 
-char *fru_prsnt_log_string[2 * MAX_NUM_FRUS] = {
+char *fru_prsnt_log_string[2 * MAX_NUM_FRUS + 1] = {
   // slot1, iom, dpb, scc, nic
  "", "ASSERT: Mono Lake missing", "", "", "ASSERT: SCC missing", "ASSERT: NIC is plugged out",
  "DEASSERT: Mono Lake missing", "", "", "DEASSERT: SCC missing", "DEASSERT: NIC is plugged out",
@@ -404,7 +404,7 @@ gpio_monitor_poll(uint8_t fru_flag) {
       is_fru_present = check_fru_present_assert(chassis_type, FRU_SLOT1, SERVER_IS_PRESENT, SERVER_IS_ABSENT);
       if (is_fru_present == SERVER_IS_ABSENT) {
         if (is_fru_prsnt[FRU_SLOT1 - 1] == false) {
-          syslog(LOG_CRIT, fru_prsnt_log_string[FRU_SLOT1]);
+          syslog(LOG_CRIT, "%s", fru_prsnt_log_string[FRU_SLOT1]);
           is_fru_prsnt[FRU_SLOT1 - 1] = true;
         }
         // Turn off ML HSC 12V and IOM 3V3 when Mono Lake was hot plugged
@@ -423,8 +423,8 @@ gpio_monitor_poll(uint8_t fru_flag) {
       is_fru_present = check_fru_present_deassert(chassis_type, FRU_SLOT1, SERVER_IS_PRESENT, SERVER_IS_ABSENT);
       if (is_fru_present == SERVER_IS_PRESENT) {
         if (is_fru_prsnt[FRU_SLOT1 - 1] == true) {
-          
-            syslog(LOG_CRIT, fru_prsnt_log_string[MAX_NUM_FRUS + FRU_SLOT1]);
+
+            syslog(LOG_CRIT, "%s", fru_prsnt_log_string[MAX_NUM_FRUS + FRU_SLOT1]);
             is_fru_prsnt[FRU_SLOT1 - 1] = false;
 
             read_device(vpath_comp_pwr_en, &val);
@@ -444,7 +444,7 @@ gpio_monitor_poll(uint8_t fru_flag) {
       is_fru_present = check_fru_present_assert(chassis_type, FRU_SCC, SCC_IS_PRESENT, SCC_IS_ABSENT);
       if (is_fru_present == SCC_IS_ABSENT) {
         if (is_fru_prsnt[FRU_SCC - 1] == false) {
-          syslog(LOG_CRIT, fru_prsnt_log_string[FRU_SCC]);
+          syslog(LOG_CRIT, "%s", fru_prsnt_log_string[FRU_SCC]);
           is_fru_prsnt[FRU_SCC - 1] = true;
         }
 
@@ -476,7 +476,7 @@ gpio_monitor_poll(uint8_t fru_flag) {
         is_scc_hotplugged[0] = is_scc_hotplugged[1];
         is_scc_hotplugged[1] = 0;
         if (is_fru_prsnt[FRU_SCC - 1] == true) {
-          syslog(LOG_CRIT, fru_prsnt_log_string[MAX_NUM_FRUS + FRU_SCC]);
+          syslog(LOG_CRIT, "%s", fru_prsnt_log_string[MAX_NUM_FRUS + FRU_SCC]);
           is_fru_prsnt[FRU_SCC - 1] = false;
 
           read_device(vpath_comp_pwr_en, &val);
@@ -497,7 +497,7 @@ gpio_monitor_poll(uint8_t fru_flag) {
       is_fru_present = check_fru_present_assert(chassis_type, FRU_NIC, NIC_IS_PRESENT, NIC_IS_ABSENT);
       if (is_fru_present == NIC_IS_ABSENT) {
         if (is_fru_prsnt[FRU_NIC - 1] == false) {
-          syslog(LOG_CRIT, fru_prsnt_log_string[FRU_NIC]);
+          syslog(LOG_CRIT, "%s", fru_prsnt_log_string[FRU_NIC]);
           is_fru_prsnt[FRU_NIC - 1] = true;
         }
         pal_err_code_enable(0xE8);
@@ -508,7 +508,7 @@ gpio_monitor_poll(uint8_t fru_flag) {
       is_fru_present = check_fru_present_deassert(chassis_type, FRU_NIC, NIC_IS_PRESENT, NIC_IS_ABSENT);
       if (is_fru_present == NIC_IS_PRESENT) {
         if (is_fru_prsnt[FRU_NIC - 1] == true) {
-          syslog(LOG_CRIT, fru_prsnt_log_string[MAX_NUM_FRUS + FRU_NIC]);
+          syslog(LOG_CRIT, "%s", fru_prsnt_log_string[MAX_NUM_FRUS + FRU_NIC]);
           is_fru_prsnt[FRU_NIC - 1] = false;
         }
         pal_err_code_disable(0xE8);
@@ -563,12 +563,12 @@ gpio_monitor_poll(uint8_t fru_flag) {
 
           char value[MAX_VALUE_LEN];
           //Run check_M2_nvme.sh only when any of the M2_NVMe key is not existing
-          if (kv_get("M2_1_NVMe", value, NULL, 0) || 
+          if (kv_get("M2_1_NVMe", value, NULL, 0) ||
               kv_get("M2_2_NVMe", value, NULL, 0)) {
             //Check M.2 NVMe surrpot, for fsc M2 sensor valid check
-            system("nohup /etc/check_M2_nvme.sh &");
+            (void)!system("nohup /etc/check_M2_nvme.sh &");
           }
-          
+
           // Inform BIOS that BMC is ready
           bic_set_gpio(FRU_SLOT1, GPIO_BMC_READY_N, 0);
         } else {
diff --git a/meta-facebook/meta-fbttn/recipes-fbttn/me-util/files/me-util.c b/meta-facebook/meta-fbttn/recipes-fbttn/me-util/files/me-util.c
index b1dfa7fa857d..37398c8165a1 100644
--- a/meta-facebook/meta-fbttn/recipes-fbttn/me-util/files/me-util.c
+++ b/meta-facebook/meta-fbttn/recipes-fbttn/me-util/files/me-util.c
@@ -417,7 +417,7 @@ main(int argc, char **argv) {
 
   errno = 0;
 
-  logfd = open(LOGFILE, O_CREAT | O_WRONLY);
+  logfd = open(LOGFILE, O_CREAT | O_WRONLY, 0755);
   if (logfd < 0) {
     syslog(LOG_WARNING, "Opening a tmp file failed. errno: %d", errno);
     return -1;
diff --git a/meta-facebook/meta-fby2/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby2/conf/templates/default/bblayers.conf.sample
index d1d4ac65b13a..fd634064ca55 100644
--- a/meta-facebook/meta-fby2/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fby2/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-networking \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   ##OEROOT##/../../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fby2/conf/templates/default/local.conf.sample b/meta-facebook/meta-fby2/conf/templates/default/local.conf.sample
index c5b557242ace..828bbf2df550 100644
--- a/meta-facebook/meta-fby2/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-fby2/conf/templates/default/local.conf.sample
@@ -4,11 +4,11 @@
 
 # Machine Selection
 MACHINE ??= "fby2"
-# select uncomment the following line to use pliot uboot upgrade 
+# select uncomment the following line to use pliot uboot upgrade
 # MACHINE = "fby2-ubu"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).
diff --git a/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/bblayers.conf.sample
index 83d3910ac45b..c1f4cedc56e5 100644
--- a/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-oe \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   ##OEROOT##/../../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/local.conf.sample b/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/local.conf.sample
index 7737fc67ad77..1671ddb582be 100644
--- a/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-fby2/meta-fby2-gpv2/conf/templates/default/local.conf.sample
@@ -6,7 +6,7 @@
 MACHINE ??= "fbgp2"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).
diff --git a/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/bblayers.conf.sample
index c292f4ce4ecd..b93b2ca0b70e 100644
--- a/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-security/meta-tpm \
   ##OEROOT##/../meta-openembedded/meta-oe \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   ##OEROOT##/../../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/local.conf.sample b/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/local.conf.sample
index 276c4d65aa14..a3b342f2fc43 100644
--- a/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-fby2/meta-fby2-kernel/conf/templates/default/local.conf.sample
@@ -6,7 +6,7 @@
 MACHINE ??= "fby2-kernel"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).
diff --git a/meta-facebook/meta-fby2/meta-fby2-nd/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby2/meta-fby2-nd/conf/templates/default/bblayers.conf.sample
index 76257c97762f..95d0e923ced4 100644
--- a/meta-facebook/meta-fby2/meta-fby2-nd/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fby2/meta-fby2-nd/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -20,7 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fby3/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby3/conf/templates/default/bblayers.conf.sample
index bbee3d37ae6a..2041dc0845f5 100644
--- a/meta-facebook/meta-fby3/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fby3/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fby3/recipes-fby3/asd/files/daemon/pin_handler.c b/meta-facebook/meta-fby3/recipes-fby3/asd/files/daemon/pin_handler.c
index 2399bb3b3a30..d86bb7e80ef3 100644
--- a/meta-facebook/meta-fby3/recipes-fby3/asd/files/daemon/pin_handler.c
+++ b/meta-facebook/meta-fby3/recipes-fby3/asd/files/daemon/pin_handler.c
@@ -399,7 +399,8 @@ on_prdy_event(Target_Control_Handle* state, ASD_EVENT* event)
         return ST_ERR;
     }
 
-    if (g_gpios_triggered[JTAG_PRDY_EVENT].triggered == false) {
+    if ((g_gpios_triggered[JTAG_PRDY_EVENT].triggered == false) || 
+        (state && !state->event_cfg.report_PRDY)) {
         *event = ASD_EVENT_NONE;
         return result;
     }
@@ -591,15 +592,15 @@ STATUS pin_hndlr_provide_GPIOs_list(Target_Control_Handle* state, target_fdarr_t
     short events = 0;
 
     get_pin_events(state->gpios[BMC_PRDY_N], &events);
-    if ( state->event_cfg.report_PRDY && state->gpios[BMC_PRDY_N].fd != -1 )
+    if (state->gpios[BMC_PRDY_N].fd != -1 )
     {
         (*fds)[index].fd = state->gpios[BMC_PRDY_N].fd;
         (*fds)[index].events = events;
         index++;
     }
     ASD_log(ASD_LogLevel_Info, stream, option,
-            "report_PRDY: %d, fd:%d, events: %d, index:%d\n",
-            state->event_cfg.report_PRDY, state->gpios[BMC_PRDY_N].fd, events, index);
+            "PRDY: fd:%d, events: %d, index:%d\n",
+            state->gpios[BMC_PRDY_N].fd, events, index);
 
     get_pin_events(state->gpios[BMC_PLTRST_B], &events);
     if (state->gpios[BMC_PLTRST_B].fd != -1)
diff --git a/meta-facebook/meta-fby35/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby35/conf/templates/default/bblayers.conf.sample
index d88559cdb562..b615add642cf 100644
--- a/meta-facebook/meta-fby35/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fby35/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fby35/meta-greatlakes/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby35/meta-greatlakes/conf/templates/default/bblayers.conf.sample
index 87d6c135b579..0daac332d0f0 100644
--- a/meta-facebook/meta-fby35/meta-greatlakes/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fby35/meta-greatlakes/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -20,7 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fby35/meta-halfdome/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby35/meta-halfdome/conf/templates/default/bblayers.conf.sample
index eb2261aad714..a0a83b1ecb36 100644
--- a/meta-facebook/meta-fby35/meta-halfdome/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fby35/meta-halfdome/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -20,7 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fby35/meta-javaisland/conf/layer.conf b/meta-facebook/meta-fby35/meta-javaisland/conf/layer.conf
new file mode 100644
index 000000000000..3c764ebacf5e
--- /dev/null
+++ b/meta-facebook/meta-fby35/meta-javaisland/conf/layer.conf
@@ -0,0 +1,12 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+	${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "javaisland"
+BBFILE_PATTERN_javaisland = "^${LAYERDIR}/"
+BBFILE_PRIORITY_javaisland = "25"
+
+LAYERSERIES_COMPAT_javaisland = "scarthgap nanbield kirkstone dunfell"
diff --git a/meta-facebook/meta-fby35/meta-javaisland/conf/machine/javaisland.conf b/meta-facebook/meta-fby35/meta-javaisland/conf/machine/javaisland.conf
new file mode 100644
index 000000000000..5779a7fa2aca
--- /dev/null
+++ b/meta-facebook/meta-fby35/meta-javaisland/conf/machine/javaisland.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: Javaisland
+#@DESCRIPTION: Machine configuration for Facebook Javaisland
+
+require conf/machine/include/ast2620.inc
+
+KERNEL_IMAGETYPE = "zImage"
+UBOOT_MACHINE:javaisland = "facebook-fby35_defconfig"
+UBOOT_CONFIG_BASE = "fbobmc-ast-g6_defconfig"
+
+KERNEL_DEVICETREE = "aspeed-bmc-facebook-fby35.dtb"
+PREFERRED_VERSION_linux-aspeed = "5.15.%"
+
+PREFERRED_VERSION_u-boot = "v2019.04%"
+PREFERRED_VERSION_u-boot-tools = "v2019.04%"
+PREFERRED_VERSION_u-boot-tools-native = "v2019.04%"
+PREFERRED_VERSION_nativesdk-u-boot-tools = "v2019.04%"
+PREFERRED_VERSION_u-boot-fw-utils = "v2019.04%"
+PREFERRED_VERSION_u-boot-fw-utils-cross = "v2019.04%"
+
+PREFERRED_VERSION_libwatchdog = "0.2"
+PREFERRED_VERSION_libbic = "0.1"
+
+require conf/machine/include/fb-bic.inc
+require conf/machine/include/fb-compute.inc
+require conf/machine/include/mtd-ubifs.inc
+require conf/machine/include/ncsi.inc
+require conf/machine/include/tpm2.inc
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "           \
+    "
+
+EXTRA_IMAGE_FEATURES:append = " verified-boot image-meta"
+FW_ENV_CONFIG_FILE = "fw_env.config.64k"
+FBVBOOT_GOLDEN_IMAGE_SIZE_MB = "64"
diff --git a/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/bblayers.conf.sample
new file mode 100644
index 000000000000..1bd106374271
--- /dev/null
+++ b/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/bblayers.conf.sample
@@ -0,0 +1,21 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/../.. \
+  ##OEROOT##/meta-security/meta-tpm \
+  ##OEROOT##/../../meta-aspeed \
+  ##OEROOT##/../../meta-facebook \
+  ##OEROOT##/../../meta-facebook/meta-fby35 \
+  ##OEROOT##/../../meta-facebook/meta-fby35/meta-javaisland \
+  ##OEROOT##/../../meta-facebook/meta-python3 \
+  ##OEROOT##/../../meta-facebook/meta-backports \
+  "
diff --git a/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/conf-notes.txt b/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/conf-notes.txt
new file mode 100644
index 000000000000..a4e826d03dd0
--- /dev/null
+++ b/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/conf-notes.txt
@@ -0,0 +1,2 @@
+Common targets are:
+    javaisland-image
diff --git a/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/local.conf.sample b/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/local.conf.sample
new file mode 100644
index 000000000000..062b85e78d34
--- /dev/null
+++ b/meta-facebook/meta-fby35/meta-javaisland/conf/templates/default/local.conf.sample
@@ -0,0 +1,9 @@
+#
+# Local configuration file for building the OpenBMC image.
+#
+
+# Machine Selection
+MACHINE ??= "javaisland"
+
+# OpenBMC distro settings
+DISTRO ?= "openbmc-fb-master"
diff --git a/meta-facebook/meta-fby35/meta-javaisland/recipes-core/images/javaisland-image-layout.inc b/meta-facebook/meta-fby35/meta-javaisland/recipes-core/images/javaisland-image-layout.inc
new file mode 100644
index 000000000000..353d9894ab7c
--- /dev/null
+++ b/meta-facebook/meta-fby35/meta-javaisland/recipes-core/images/javaisland-image-layout.inc
@@ -0,0 +1,2 @@
+def fbobmc_get_image_part_table(d):
+    return fbobmc_get_default_image_part_table(d)
diff --git a/meta-facebook/meta-fby35/meta-javaisland/recipes-core/images/javaisland-image.bb b/meta-facebook/meta-fby35/meta-javaisland/recipes-core/images/javaisland-image.bb
new file mode 100644
index 000000000000..e0f235bd7bf3
--- /dev/null
+++ b/meta-facebook/meta-fby35/meta-javaisland/recipes-core/images/javaisland-image.bb
@@ -0,0 +1,66 @@
+# Copyright 2020-present Facebook. All Rights Reserved.
+
+require recipes-core/images/fbobmc-image-meta.inc
+require javaisland-image-layout.inc
+require recipes-core/images/fb-zstd-rootfs.inc
+
+require recipes-core/images/fb-openbmc-image.bb
+
+# Include modules in rootfs
+IMAGE_INSTALL += " \
+  packagegroup-openbmc-base \
+  packagegroup-openbmc-net \
+  packagegroup-openbmc-python3 \
+  packagegroup-openbmc-rest3 \
+  setup-gpio \
+  ipmbd \
+  ipmid \
+  ipmitool \
+  mterm \
+  plat-utils \
+  fw-util \
+  fruid \
+  log-util-v2 \
+  openbmc-utils \
+  fan-util \
+  fscd \
+  guid-util \
+  sensor-util \
+  sensor-mon \
+  fpc-util \
+  front-paneld \
+  i2craw \
+  healthd \
+  cfg-util \
+  threshold-util \
+  libncsi \
+  ncsid-v2 \
+  ncsi-util \
+  ipmb-util \
+  bic-cached \
+  power-util \
+  usbutils \
+  gpiointrd \
+  throttle-util \
+  bios-util \
+  show-sys-config \
+  bic-util \
+  usb2jtag-util \
+  at \
+  gpiod \
+  lldp-util \
+  ipmi-util \
+  vboot-utils \
+  slot-util \
+  enclosure-util \
+  name-util \
+  lrzsz \
+  mctp-util \
+  jbi \
+  dimm-util \
+  attest-util \
+  tcpdump \
+  mctpd \
+  pldmd \
+  tpm-factory-upd \
+  "
diff --git a/meta-facebook/meta-janga/recipes-kernel/linux/linux-aspeed_6.6.bbappend b/meta-facebook/meta-fby35/meta-javaisland/recipes-javaisland/plat-libs/libpal_%.bbappend
similarity index 78%
rename from meta-facebook/meta-janga/recipes-kernel/linux/linux-aspeed_6.6.bbappend
rename to meta-facebook/meta-fby35/meta-javaisland/recipes-javaisland/plat-libs/libpal_%.bbappend
index ef55d13fa33d..3a4a1e1ec548 100644
--- a/meta-facebook/meta-janga/recipes-kernel/linux/linux-aspeed_6.6.bbappend
+++ b/meta-facebook/meta-fby35/meta-javaisland/recipes-javaisland/plat-libs/libpal_%.bbappend
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
+# Copyright 2014-present Facebook. All Rights Reserved.
 #
 # This program file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -15,7 +15,5 @@
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/patches_6.6:"
 
-SRC_URI += "file://1001-ARM-dts-aspeed-Add-Facebook-janga-BMC.patch \
-           "
+CFLAGS:prepend = " -DCONFIG_JAVAISLAND "
diff --git a/meta-facebook/meta-fby35/meta-javaisland/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-fby35/meta-javaisland/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 000000000000..8238da9664ef
--- /dev/null
+++ b/meta-facebook/meta-fby35/meta-javaisland/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,5 @@
+# Copyright 2020-present Facebook. All Rights Reserved.
+
+LINUX_VERSION_EXTENSION = "-javaisland"
+
+COMPATIBLE_MACHINE = "javaisland"
diff --git a/meta-facebook/meta-fby35/recipes-fby35/fscd/fscd/fsc_board.py b/meta-facebook/meta-fby35/recipes-fby35/fscd/fscd/fsc_board.py
index afcaed80b6a8..76df4ddd2a5b 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/fscd/fscd/fsc_board.py
+++ b/meta-facebook/meta-fby35/recipes-fby35/fscd/fscd/fsc_board.py
@@ -219,7 +219,6 @@ def is_e1s_prsnt(board, num):
     except Exception:
         return 0
 
-
 def sensor_valid_check(board, sname, check_name, attribute):
     try:
         if attribute["type"] == "power_status":
@@ -259,6 +258,12 @@ def sensor_valid_check(board, sname, check_name, attribute):
                 if "vf_e1s" in sname:
                     return is_e1s_prsnt(board, sname[10 : sname.find("_t")])
 
+                if "ou_e1s" in sname: #for OP2 E1.S present check
+                    slot_id = 1
+                    ou_num = int(sname[0])   # witch ou
+                    e1s_num = int(sname[11]) # witch ssd
+                    return lbic_hndl.bic_is_e1s_prsnt(slot_id, ou_num, e1s_num)
+
                 return 1
         return 0
     except SystemExit:
diff --git a/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_bios.cpp b/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_bios.cpp
index 8ad1a84e1b4c..a48a1dcf4c75 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_bios.cpp
+++ b/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_bios.cpp
@@ -73,6 +73,9 @@ image_info BiosComponent::check_image(const string& image, bool force) {
     case SERVER_TYPE_CL:
       board_id = BOARD_ID_SB;
       break;
+    case SERVER_TYPE_JI:
+      board_id = BOARD_ID_JI;
+      break;
     default:
       syslog(LOG_WARNING, "Failed to identify Board ID.");
       break;
diff --git a/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_cpld.cpp b/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_cpld.cpp
index b8c916c5fde2..f28ba86f8d47 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_cpld.cpp
+++ b/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_cpld.cpp
@@ -28,6 +28,9 @@ image_info CpldComponent::check_image(const string& image, bool force) {
       case SERVER_TYPE_GL:
         board_id = BOARD_ID_GL;
         break;
+      case SERVER_TYPE_JI:
+        board_id = BOARD_ID_JI;
+        break;
       default:
         board_id = BOARD_ID_SB;
     }
diff --git a/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_fw.cpp b/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_fw.cpp
index 5f586821e515..00efead47fb0 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_fw.cpp
+++ b/meta-facebook/meta-fby35/recipes-fby35/fw-util/files/bic_fw.cpp
@@ -37,6 +37,9 @@ image_info BicFwComponent::check_image(const string& image, bool force) {
         case SERVER_TYPE_CL:
           board_id = BOARD_ID_SB;
           break;
+        case SERVER_TYPE_JI:
+          board_id = BOARD_ID_JI;
+          break;
         default:
           syslog(LOG_WARNING, "Failed to identify Board ID.");
       }
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic.h b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic.h
index c818c3acc469..fdf2f34fac5b 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic.h
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic.h
@@ -364,6 +364,88 @@ enum gl_virtual_gpio {
   GL_ADR_MODE0 = 2,
 };
 
+enum ji_gpio {
+  JI_FPGA_READY = 0,
+  JI_FAN_FULL_SPEED_FPGA_L,
+  JI_PWR_BRAKE_L,
+  JI_INA230_E1S_ALERT_L,
+  JI_FPGA_WATCH_DOG_TIMER0_L,
+  JI_FPGA_WATCH_DOG_TIMER1_L,
+  JI_HSC_OCP_GPIO1,
+  JI_FPGA_WATCH_DOG_TIMER2_L,
+  JI_RST_USB_HUB_R_L,
+  JI_P3V_BAT_SCALED_EN_R,
+  JI_WP_HW_EXT_CTRL_L,
+  JI_BIC_EROT_LVSFT_EN,
+  JI_RTC_CLR_L,
+  JI_I2C_SSIF_ALERT_L,
+  JI_FPGA_CPU_BOOT_DONE,
+  JI_FM_HSC_TIMER,
+  JI_IRQ_I2C_IO_LVC_STBY_ALRT_L,
+  JI_BIC_TMP_LVSFT_EN,
+  JI_BIC_I2C_0_FPGA_ALERT_L,
+  JI_BIC_I2C_1_FPGA_ALERT_L,
+  JI_JTAG_TRST_CPU_BMC_L,
+  JI_RST_I2C_E1S_L,
+  JI_FM_PWRDIS_E1S,
+  JI_PWRBTN_L,
+  JI_RST_BMC_L,
+  JI_BMC_READY,
+  JI_BIC_READY,
+  JI_PWR_BRAKE_CPU1_L,
+  JI_RUN_POWER_PG,
+  JI_SPI_BMC_FPGA_INT_L,
+  JI_IRQ_HSC_ALERT1_L,
+  JI_I2C_SENSOR_LVC_ALERT_L,
+  JI_INA_CRIT_ALERT1_L,
+  JI_RUN_POWER_EN,
+  JI_SPI_HOST_TPM_RST_L,
+  JI_HSC_TYPE_0,
+  JI_THERM_WARN_CPU1_L_3V3,
+  JI_RUN_POWER_FAULT_L,
+  JI_SENSOR_AIR0_THERM_L,
+  JI_SENSOR_AIR1_THERM_L,
+  JI_FM_FAST_PROCHOT_EN,
+  JI_THERM_BB_OVERT_L,
+  JI_THERM_BB_WARN_L,
+  JI_BIC_CPU_JTAG_MUX_SEL,
+  JI_FM_VR_FW_PROGRAM_L,
+  JI_FAST_PROCHOT_L,
+  JI_CPU_EROT_FATAL_ERROR_L,
+  JI_BIC_REMOTEJTAG_EN,
+  JI_THERM_OVERT_CPU1_L_3V3,
+  JI_HSC_OCP_GPIO2,
+  JI_HSC_OCP_GPIO3,
+  JI_SENSOR_AIR0_ALERT_L,
+  JI_SENSOR_AIR1_ALERT_L,
+  JI_BIC_CPLD_VRD_MUX_SEL,
+  JI_CPU_BIC_PROCHOT_L,
+  JI_CPLD_JTAG_MUX_SEL,
+  JI_JTAG_FPGA_MUX_SEL,
+  JI_BOARD_ID0,
+  JI_BOARD_ID1,
+  JI_BOARD_ID2,
+  JI_BOARD_ID3,
+  JI_BOARD_ID4,
+  JI_BOARD_ID5,
+  JI_P12V_STBY_SCALED,
+  JI_VDD_1V8_SENSOR,
+  JI_P3V3_STBY_SCALED,
+  JI_SOCVDD_SENSOR,
+  JI_P3V_BAT_SCALED,
+  JI_CPUVDD_SENSOR,
+  JI_FPGA_VCC_AO_SENSOR,
+  JI_1V2_SENSOR,
+  JI_CARD_TYPE_EXP,
+  JI_VDD_3V3_M2_SCALED,
+  JI_P1V2_STBY_SCALED,
+  JI_FBVDDQ_SENSOR,
+  JI_FBVDDP2_SENSOR,
+  JI_FBVDD1_SENSOR,
+  JI_P5V_STBY_SCALED,
+  JI_CPU_DVDD_SENSOR,
+};
+
 enum {
   DPV2_RETIMER_X4 = 0x00,
   DPV2_RETIMER_X8 = 0x02,
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_ipmi.c b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_ipmi.c
index 71d229cc1b04..d897a1d7fee0 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_ipmi.c
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_ipmi.c
@@ -100,6 +100,29 @@ enum {
   BB_BIC_SLOT1_PRSNT_PIN = 15,
 };
 
+typedef enum {
+  OP_1OU = 1,
+  OP_2OU,
+  OP_3OU,
+  OP_4OU,
+} OP_OU_NUM;
+
+typedef enum { //for each OU's E1S
+  OP_E1S_0 = 0,
+  OP_E1S_1,
+  OP_E1S_2,
+  OP_E1S_3,
+  OP_E1S_4,
+} OP_ElS_NUM;
+
+typedef enum {
+  OP_E1S_0_PRSNT = 0x01,
+  OP_E1S_1_PRSNT = 0x02,
+  OP_E1S_2_PRSNT = 0x04,
+  OP_E1S_3_PRSNT = 0x08,
+  OP_E1S_4_PRSNT = 0x10,
+} OP_ElS_PRSNT;
+
 uint8_t mapping_vf_e1s_prsnt[6] = {E1S_ENDPOINT1, E1S_ENDPOINT2, E1S_ENDPOINT3, E1S_ENDPOINT4};
 uint8_t mapping_op_e1s_prsnt[2][6] = {{E1S_ENDPOINT0, E1S_ENDPOINT1, E1S_ENDPOINT2},
                                   {E1S_ENDPOINT3, E1S_ENDPOINT4, E1S_ENDPOINT5, E1S_ENDPOINT6, E1S_ENDPOINT7}};
@@ -948,6 +971,69 @@ bic_is_exp_prsnt(uint8_t slot_id) {
   return val;
 }
 
+int
+bic_is_e1s_prsnt(uint8_t slot_id,uint8_t ou_num,uint8_t e1s_num){ //get E1.S Device Present for OP2
+  uint8_t tbuf[4] = {0};
+  uint8_t rbuf[1] = {0};
+  uint8_t tlen = 4;
+  uint8_t rlen = 0;
+  uint8_t is_e1s_prsnt = 0; //e1s low present
+
+  tbuf[0] = 0x01; //bus id
+  tbuf[1] = 0x42; //slave addr
+  tbuf[2] = 0x01; //read 1 byte
+
+  //register offset
+  switch(ou_num){
+    case OP_1OU:
+      tbuf[3] = 0x80;
+      break;
+    case OP_2OU:
+      tbuf[3] = 0x81;
+      break;
+    case OP_3OU:
+      tbuf[3] = 0x82;
+      break;
+    case OP_4OU:
+      tbuf[3] = 0x83;
+      break;
+    default:
+      break;
+  }
+
+  if(bic_data_send(slot_id, NETFN_APP_REQ, CMD_APP_MASTER_WRITE_READ, tbuf, tlen, rbuf, &rlen, NONE_INTF)){
+    syslog(LOG_WARNING, "%s() Failed to send the command code to get %dOU E1S present.", __func__, ou_num);
+    return 0;
+  }
+
+  switch(e1s_num){
+    case OP_E1S_0:
+      is_e1s_prsnt = rbuf[0] & OP_E1S_0_PRSNT;
+      break;
+    case OP_E1S_1:
+      is_e1s_prsnt = rbuf[0] & OP_E1S_1_PRSNT;
+      break;
+    case OP_E1S_2:
+      is_e1s_prsnt = rbuf[0] & OP_E1S_2_PRSNT;
+      break;
+    case OP_E1S_3:
+      is_e1s_prsnt = rbuf[0] & OP_E1S_3_PRSNT;
+      break;
+    case OP_E1S_4:
+      is_e1s_prsnt = rbuf[0] & OP_E1S_4_PRSNT;
+      break;
+    default:
+      break;
+  }
+
+  if(!is_e1s_prsnt){
+    return 1;
+  }
+  else{
+    return 0;
+  }
+}
+
 /*
   0x6 0x4: Get Self-Test Results
   Byte 1 - Completion Code
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_ipmi.h b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_ipmi.h
index 22c8ad7ee7be..ba58c4091ef4 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_ipmi.h
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_ipmi.h
@@ -125,6 +125,7 @@ int bic_get_vr_device_id(uint8_t slot_id, uint8_t *devid, uint8_t *id_len, uint8
 int bic_get_exp_cpld_ver(uint8_t slot_id, uint8_t comp, uint8_t *ver, uint8_t bus, uint8_t addr, uint8_t intf);
 int bic_get_sensor_reading(uint8_t slot_id, uint8_t sensor_num, ipmi_extend_sensor_reading_t *sensor, uint8_t intf);
 int bic_is_exp_prsnt(uint8_t slot_id);
+int bic_is_e1s_prsnt(uint8_t slot_id,uint8_t ou_num,uint8_t e1s_num);
 int me_get_self_test_result(uint8_t slot_id, uint8_t* rbuf);
 int me_recovery(uint8_t slot_id, uint8_t command);
 int me_reset(uint8_t slot_id);
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_power.c b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_power.c
index 79580a8c0c5c..8dd000f57ab7 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_power.c
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_power.c
@@ -213,6 +213,9 @@ bic_get_server_power_status(uint8_t slot_id, uint8_t *power_status)
     case SERVER_TYPE_GL:
       gpio_num = GL_PWRGD_CPU_LVC3;
       break;
+    case SERVER_TYPE_JI:
+      gpio_num = JI_RUN_POWER_PG;
+      break;
     default:
       gpio_num = PWRGD_SYS_PWROK;
       break;
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_xfer.c b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_xfer.c
index f7877d61bb8c..60d2b903b8a1 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_xfer.c
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_xfer.c
@@ -36,6 +36,8 @@
 #include <libpldm-oem/pldm.h>
 #include "bic_xfer.h"
 
+#define CC_RETURN_ZERO 0x00 //if IPMI return Zero byte
+
 const uint32_t IANA_ID = 0x00A015;
 const uint32_t VF_IANA_ID = 0x009C9C;
 
@@ -113,6 +115,25 @@ bic_data_send(uint8_t slot_id, uint8_t netfn, uint8_t cmd, uint8_t *tbuf, uint8_
         syslog(LOG_WARNING, "%s() The 2nd BIC cannot be reached. CC: 0x%02X, intf: 0x%x, ret = %d\n", __func__, rsp_buf[6], intf, ret);
         syslog(LOG_WARNING, "%s() Netfn:%02X, Cmd: %02X\n", __func__, netfn << 2, cmd);
         switch(rsp_buf[6]) {
+        //intf-> 1OU:0x05 / 1OU:0x05 / 2OU:0x15 / 3OU:0x25 / 4OU:0x30
+        case CC_RETURN_ZERO:
+          switch(intf){
+            case FEXP_BIC_INTF://1OU
+              ret = BIC_STATUS_1OU_FAILURE;
+              break;
+            case REXP_BIC_INTF://2OU
+              ret = BIC_STATUS_2OU_FAILURE;
+              break;
+            case EXP3_BIC_INTF://3OU
+              ret = BIC_STATUS_3OU_FAILURE;
+              break;
+            case EXP4_BIC_INTF://4OU
+              ret = BIC_STATUS_4OU_FAILURE;
+              break;
+            default:
+              break;
+          }
+          break;
         case CC_NOT_SUPP_IN_CURR_STATE:
           ret = BIC_STATUS_NOT_SUPP_IN_CURR_STATE;
           break;
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_xfer.h b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_xfer.h
index 6040571ba02b..f1d502b2a1b7 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_xfer.h
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/bic/bic_xfer.h
@@ -69,7 +69,11 @@ typedef enum {
   BIC_STATUS_SUCCESS                =  0,
   BIC_STATUS_FAILURE                = -1,
   BIC_STATUS_NOT_SUPP_IN_CURR_STATE = -2,
-  BIC_STATUS_NOT_READY      = -3,
+  BIC_STATUS_NOT_READY              = -3,
+  BIC_STATUS_1OU_FAILURE            = -4, //can't get BIC 10U vale
+  BIC_STATUS_2OU_FAILURE            = -5, //can't get BIC 20U vale
+  BIC_STATUS_3OU_FAILURE            = -6, //can't get BIC 30U vale
+  BIC_STATUS_4OU_FAILURE            = -7, //can't get BIC 40U vale
 } BIC_STATUS;
 
 enum {
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_common/fby35_common.c b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_common/fby35_common.c
index 205099211260..2f3d408f6d10 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_common/fby35_common.c
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_common/fby35_common.c
@@ -1105,6 +1105,7 @@ fby35_common_is_valid_img(const char* img_path, uint8_t comp, uint8_t board_id,
   const char *rev_bb[] = {"POC1", "POC2", "EVT", "EVT2", "EVT3", "DVT", "DVT_1C", "PVT", "MP"};
   const char *rev_sb[] = {"POC", "EVT", "EVT2", "EVT3", "EVT3", "DVT", "DVT", "PVT", "PVT", "MP", "MP", "MP2", "MP2"};
   const char *rev_hd[] = {"POC", "EVT", "EVT", "EVT", "DVT", "DVT", "DVT", "DVT", "PVT"};
+  const char *rev_ji[] = {"POC", "EVT"};
   const char *rev_op[] = {"EVT", "DVT", "PVT", "MP"};
   const char *rev_gl[] = {"POC", "EVT", "RSVD", "DVT", "RSVD", "PVT", "MP"};
   const char **board_type = rev_sb;
@@ -1233,6 +1234,13 @@ fby35_common_is_valid_img(const char* img_path, uint8_t comp, uint8_t board_id,
         rev_id = ARRAY_SIZE(rev_hd) - 1;
       }
       break;
+    case BOARD_ID_JI:
+      board_type = rev_ji;
+      rev_id = rev_id & 0x0F;       //rev_id bit[3:0]
+      if (rev_id >= ARRAY_SIZE(rev_ji)) {
+        rev_id = ARRAY_SIZE(rev_ji) - 1;
+      }
+      break;
     case BOARD_ID_BB:
       board_type = rev_bb;
       if (rev_id >= ARRAY_SIZE(rev_bb)) {
@@ -1281,6 +1289,8 @@ fby35_common_is_valid_img(const char* img_path, uint8_t comp, uint8_t board_id,
       fw_rev = FW_REV_PVT;
     else
       fw_rev = 0;
+  } else if (board_type == rev_ji) {
+    fw_rev = rev_id;
   } else if (board_type == rev_op) {
     switch (rev_id) {
       case OP_REV_EVT:
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_common/fby35_common.h b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_common/fby35_common.h
index 07a9102b1d27..72f8fa986a00 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_common/fby35_common.h
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_common/fby35_common.h
@@ -305,6 +305,7 @@ enum {
   SERVER_TYPE_CL = 0x0,
   SERVER_TYPE_HD = 0x2,
   SERVER_TYPE_GL = 0x4,
+  SERVER_TYPE_JI = 0x5,
   SERVER_TYPE_NONE = 0xFF,
 };
 
@@ -403,6 +404,7 @@ enum board_id {
   BOARD_ID_VF = 7,
   BOARD_ID_GL = 8,
   BOARD_ID_NF = 9,
+  BOARD_ID_JI = 10,
 };
 
 enum {
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_gpio/fby35_gpio.c b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_gpio/fby35_gpio.c
index c17e288a8380..fc6e37f2bac7 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_gpio/fby35_gpio.c
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/fby35_gpio/fby35_gpio.c
@@ -391,6 +391,89 @@ const char *rf_gpio_pin_name[] = {
   "CLK_100M_OSC_EN",
 };
 
+//Java Island BIC GPIO
+const char *ji_gpio_pin_name[] = {
+  "FPGA_READY",                     //0
+  "FAN_FULL_SPEED_FPGA_L",
+  "PWR_BRAKE_L",
+  "INA230_E1S_ALERT_L",
+  "FPGA_WATCH_DOG_TIMER0_L",
+  "FPGA_WATCH_DOG_TIMER1_L",
+  "HSC_OCP_GPIO1",
+  "FPGA_WATCH_DOG_TIMER2_L",
+  "RST_USB_HUB_R_L",
+  "P3V_BAT_SCALED_EN_R",
+  "WP_HW_EXT_CTRL_L",               //10
+  "BIC_EROT_LVSFT_EN",
+  "RTC_CLR_L",
+  "I2C_SSIF_ALERT_L",
+  "FPGA_CPU_BOOT_DONE",
+  "FM_HSC_TIMER",
+  "IRQ_I2C_IO_LVC_STBY_ALRT_L",
+  "BIC_TMP_LVSFT_EN",
+  "BIC_I2C_0_FPGA_ALERT_L",
+  "BIC_I2C_1_FPGA_ALERT_L",
+  "JTAG_TRST_CPU_BMC_L",            //20
+  "RST_I2C_E1S_L",
+  "FM_PWRDIS_E1S",
+  "PWRBTN_L",
+  "RST_BMC_L",
+  "BMC_READY",
+  "BIC_READY",
+  "PWR_BRAKE_CPU1_L",
+  "RUN_POWER_PG",
+  "SPI_BMC_FPGA_INT_L",
+  "IRQ_HSC_ALERT1_L",               //30
+  "I2C_SENSOR_LVC_ALERT_L",
+  "INA_CRIT_ALERT1_L",
+  "RUN_POWER_EN",
+  "SPI_HOST_TPM_RST_L",
+  "HSC_TYPE_0",
+  "THERM_WARN_CPU1_L_3V3",
+  "RUN_POWER_FAULT_L",
+  "SENSOR_AIR0_THERM_L",
+  "SENSOR_AIR1_THERM_L",
+  "FM_FAST_PROCHOT_EN",             //40
+  "THERM_BB_OVERT_L",
+  "THERM_BB_WARN_L",
+  "BIC_CPU_JTAG_MUX_SEL",
+  "FM_VR_FW_PROGRAM_L",
+  "FAST_PROCHOT_L",
+  "CPU_EROT_FATAL_ERROR_L",
+  "BIC_REMOTEJTAG_EN",
+  "THERM_OVERT_CPU1_L_3V3",
+  "HSC_OCP_GPIO2",
+  "HSC_OCP_GPIO3",                  //50
+  "SENSOR_AIR0_ALERT_L",
+  "SENSOR_AIR1_ALERT_L",
+  "BIC_CPLD_VRD_MUX_SEL",
+  "CPU_BIC_PROCHOT_L",
+  "CPLD_JTAG_MUX_SEL",
+  "JTAG_FPGA_MUX_SEL",
+  "BOARD_ID0",
+  "BOARD_ID1",
+  "BOARD_ID2",
+  "BOARD_ID3",                      //60
+  "BOARD_ID4",
+  "BOARD_ID5",
+  "P12V_STBY_SCALED",
+  "VDD_1V8_SENSOR",
+  "P3V3_STBY_SCALED",
+  "SOCVDD_SENSOR",
+  "P3V_BAT_SCALED",
+  "CPUVDD_SENSOR",
+  "FPGA_VCC_AO_SENSOR",
+  "1V2_SENSOR",                     //70
+  "CARD_TYPE_EXP",
+  "VDD_3V3_M2_SCALED",
+  "P1V2_STBY_SCALED",
+  "FBVDDQ_SENSOR",
+  "FBVDDP2_SENSOR",
+  "FBVDD1_SENSOR",
+  "P5V_STBY_SCALED",
+  "CPU_DVDD_SENSOR",
+};
+
 /* GPIO Expander gpio table */
 gpio_cfg gpio_expander_gpio_table[] = {
   /* shadow_name, pin_name, direction, value */
@@ -509,6 +592,7 @@ gpio_cfg bmc_gpio_table[] = {
 const uint8_t cl_gpio_pin_size = sizeof(cl_gpio_pin_name)/sizeof(cl_gpio_pin_name[0]);
 const uint8_t hd_gpio_pin_size = sizeof(hd_gpio_pin_name)/sizeof(hd_gpio_pin_name[0]);
 const uint8_t gl_gpio_pin_size = sizeof(gl_gpio_pin_name)/sizeof(gl_gpio_pin_name[0]);
+const uint8_t ji_gpio_pin_size = sizeof(ji_gpio_pin_name)/sizeof(ji_gpio_pin_name[0]);
 
 //Great Lakes BIC virtual gpio
 const uint8_t gl_virtual_gpio_pin_size = sizeof(gl_virtual_gpio_pin_name)/sizeof(gl_virtual_gpio_pin_name[0]);
@@ -538,6 +622,9 @@ y35_get_gpio_list_size(uint8_t fru, bool is_virtual_gpio, uint8_t intf) {
             gpio_list_size = gl_gpio_pin_size;
           }
           break;
+        case SERVER_TYPE_JI:
+          gpio_list_size = ji_gpio_pin_size;
+          break;
         default:
           gpio_list_size = cl_gpio_pin_size;
           break;
@@ -596,6 +683,10 @@ y35_get_gpio_name(uint8_t fru, uint8_t gpio, char *name, bool is_virtual_gpio, u
             gpio_pin_name = gl_gpio_pin_name;
           }
           break;
+        case SERVER_TYPE_JI:
+          gpio_pin_size = ji_gpio_pin_size;
+          gpio_pin_name = ji_gpio_pin_name;
+          break;
         default:
           gpio_pin_size = cl_gpio_pin_size;
           gpio_pin_name = cl_gpio_pin_name;
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal.c b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal.c
index b719b34d5eab..bef65da560a9 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal.c
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal.c
@@ -53,6 +53,8 @@
 #define SERVER_TYPE_EXPECTED SERVER_TYPE_HD
 #elif CONFIG_GREATLAKES
 #define SERVER_TYPE_EXPECTED SERVER_TYPE_GL
+#elif CONFIG_JAVAISLAND
+#define SERVER_TYPE_EXPECTED SERVER_TYPE_JI
 #else
 #define SERVER_TYPE_EXPECTED SERVER_TYPE_CL
 #endif
@@ -150,11 +152,14 @@ size_t bmc_fru_cnt  = NUM_BMC_FRU;
 #define KEY_FAN_MODE_EVENT "fan_mode_event"
 #define KEY_IERR_STATUS "ierr_status"
 
+#define KEY_NOT_EXIST "not_exist"
+
 static int key_func_pwr_last_state(int event, void *arg);
 static int key_func_por_cfg(int event, void *arg);
 static int key_func_end_of_post(int event, void *arg);
 
 static uint8_t memory_record_code[4][256] = {0};
+static int bic_ou_status = 0; // 1OU_FAILURE = -4 / 2OU_FAILURE = -5 / 3OU_FAILURE = -6 / 4OU_FAILURE = -7 /
 
 enum key_event {
   KEY_BEFORE_SET,
@@ -837,6 +842,24 @@ SENSOR_BASE_NUM sensor_base_cl = {0x50, 0x80, 0xA0, 0xD0};
 SENSOR_BASE_NUM sensor_base_hd = {0x50, 0x80, 0xA0, 0xD0};
 SENSOR_BASE_NUM sensor_base_hd_op = {0x40, 0x70, 0xA0, 0xD0};
 SENSOR_BASE_NUM sensor_base_gl = {0x50, 0x80, 0xA0, 0xD0};
+SENSOR_BASE_NUM sensor_base_ji = {0x50, 0x80, 0xA0, 0xD0};
+
+struct pal_key_restore_data{
+  char *key;
+  char value[MAX_VALUE_LEN];
+  uint8_t flag;
+} gl_kv_store_list[] = {
+  {"sys_config/fru1_dimm0_location", KEY_NOT_EXIST, KV_FPERSIST},
+  {"sys_config/fru1_dimm1_location", KEY_NOT_EXIST, KV_FPERSIST},
+  {"sys_config/fru1_dimm2_location", KEY_NOT_EXIST, KV_FPERSIST},
+  {"sys_config/fru1_dimm3_location", KEY_NOT_EXIST, KV_FPERSIST},
+  {"sys_config/fru1_dimm4_location", KEY_NOT_EXIST, KV_FPERSIST},
+  {"sys_config/fru1_dimm5_location", KEY_NOT_EXIST, KV_FPERSIST},
+  {"sys_config/fru1_dimm6_location", KEY_NOT_EXIST, KV_FPERSIST},
+  {"sys_config/fru1_dimm7_location", KEY_NOT_EXIST, KV_FPERSIST},
+  {"fru1_sysfw_ver", KEY_NOT_EXIST, KV_FPERSIST},
+  {"fru1_delay_activate_sysfw_ver", KEY_NOT_EXIST, KV_FPERSIST},
+};
 
 static int
 pal_key_index(char *key) {
@@ -940,6 +963,39 @@ pal_set_key_value(char *key, char *value) {
   return kv_set(key, value, 0, key_cfg[index].region);
 }
 
+int
+pal_store_key_value() {
+  int i = 0;
+  char value[MAX_VALUE_LEN] = {0};
+  int slot_type = fby35_common_get_slot_type(FRU_SLOT1);
+
+  if (slot_type == SERVER_TYPE_GL) {
+    for (i = 0; i<ARRAY_SIZE(gl_kv_store_list); i++) {
+      if (kv_get(gl_kv_store_list[i].key, (char *)value, NULL, gl_kv_store_list[i].flag) >= 0) {
+        memcpy(gl_kv_store_list[i].value, value, MAX_VALUE_LEN);
+      }
+    }
+  }
+
+  return 0;
+}
+
+int
+pal_restore_key_value() {
+  int i = 0;
+  int slot_type = fby35_common_get_slot_type(FRU_SLOT1);
+
+  if (slot_type == SERVER_TYPE_GL) {
+    for (i = 0; i < ARRAY_SIZE(gl_kv_store_list); i++) {
+      if (strcmp(gl_kv_store_list[i].value, KEY_NOT_EXIST) != 0) {
+        kv_set(gl_kv_store_list[i].key, gl_kv_store_list[i].value, MAX_VALUE_LEN, KV_FPERSIST);
+      }
+    }
+  }
+
+  return 0;
+}
+
 void
 pal_dump_key_value(void) {
   int i;
@@ -2042,7 +2098,23 @@ pal_set_sys_guid(uint8_t fru, char *str) {
 
 int
 pal_get_dev_guid(uint8_t fru, char *guid) {
-  return pal_get_guid(OFFSET_DEV_GUID, guid);
+  int ret;
+  uint8_t status;
+  switch(fru) {
+    case FRU_SLOT1:
+    case FRU_SLOT2:
+    case FRU_SLOT3:
+    case FRU_SLOT4:
+      ret = pal_is_fru_prsnt(fru, &status);
+      if ( ret < 0 || status == 0 ) {
+        return -1;
+      }
+    case FRU_BMC:
+      return pal_get_guid(OFFSET_DEV_GUID, guid);
+      break;
+    default:
+      return -1;
+  }
 }
 
 int
@@ -2224,6 +2296,7 @@ pal_is_slot_server(uint8_t fru)
         case SERVER_TYPE_CL:
         case SERVER_TYPE_HD:
         case SERVER_TYPE_GL:
+        case SERVER_TYPE_JI:
           return 1;
         default:
           return 0;
@@ -5034,6 +5107,9 @@ pal_check_slot_cpu_present(uint8_t slot_id) {
     case SERVER_TYPE_GL:
       cpu_prsnt_pin = GL_FM_CPU_SKTOCC_LVT3_PLD_N;
       break;
+    case SERVER_TYPE_JI:
+      //confirm with EE, there is no CPU presence gpio in Java island platform.
+      return 0;
     default:
       //CPU Present pin default for Crater Lake
       cpu_prsnt_pin = FM_CPU_SKTOCC_LVT3_PLD_N;
@@ -5645,7 +5721,6 @@ int
 pal_read_bic_sensor(uint8_t fru, uint8_t sensor_num, ipmi_extend_sensor_reading_t *sensor, uint8_t bmc_location, const uint8_t config_status) {
   static uint8_t board_type[MAX_NODES] = {UNKNOWN_BOARD, UNKNOWN_BOARD, UNKNOWN_BOARD, UNKNOWN_BOARD};
   int ret = 0;
-  uint8_t server_type = 0;
   uint8_t card_type = TYPE_1OU_UNKNOWN;
   static SENSOR_BASE_NUM *sensor_base = NULL;
 
@@ -5667,9 +5742,8 @@ pal_read_bic_sensor(uint8_t fru, uint8_t sensor_num, ipmi_extend_sensor_reading_
     }
   }
 
-  server_type = fby35_common_get_slot_type(fru);
   if (sensor_base == NULL) {
-    switch (server_type) {
+    switch (fby35_common_get_slot_type(fru)) {
       case SERVER_TYPE_HD:
         if (card_type == TYPE_1OU_OLMSTEAD_POINT) {
           sensor_base = &sensor_base_hd_op;
@@ -5687,6 +5761,9 @@ pal_read_bic_sensor(uint8_t fru, uint8_t sensor_num, ipmi_extend_sensor_reading_
           sensor_base = &sensor_base_gl;
         }
         break;
+      case SERVER_TYPE_JI:
+        sensor_base = &sensor_base_ji;
+        break;
       default:
         syslog(LOG_WARNING, "%s(): unknown board type", __func__);
         return READING_NA;
@@ -5697,25 +5774,34 @@ pal_read_bic_sensor(uint8_t fru, uint8_t sensor_num, ipmi_extend_sensor_reading_
   if (sensor_num < sensor_base->base_1ou || (((board_type[fru-1] & DPV2_X16_BOARD) == DPV2_X16_BOARD) && (board_type[fru-1] != UNKNOWN_BOARD) &&
       (sensor_num >= BIC_DPV2_SENSOR_DPV2_2_12V_VIN && sensor_num <= BIC_DPV2_SENSOR_DPV2_2_EFUSE_PWR))) { //server board
     ret = bic_get_sensor_reading(fru, sensor_num, sensor, NONE_INTF);
-  } else if ( (sensor_num >= sensor_base->base_1ou && sensor_num < sensor_base->base_2ou) && (bmc_location != NIC_BMC) && //1OU
-       ((config_status & PRESENT_1OU) == PRESENT_1OU) ) { // 1OU
+    bic_ou_status = ret;
+  } else if ( (sensor_num < sensor_base->base_2ou) && (bmc_location != NIC_BMC) && //1OU
+       ((config_status & PRESENT_1OU) == PRESENT_1OU) && (bic_ou_status != BIC_STATUS_1OU_FAILURE)) { // 1OU
     ret = bic_get_sensor_reading(fru, sensor_num, sensor, FEXP_BIC_INTF);
+    bic_ou_status = ret;
   } else if ( (sensor_num >= sensor_base->base_2ou && sensor_num < sensor_base->base_3ou) &&
-              ((config_status & PRESENT_2OU) == PRESENT_2OU) ) { //2OU
+              ((config_status & PRESENT_2OU) == PRESENT_2OU) && (bic_ou_status != BIC_STATUS_2OU_FAILURE)) { //2OU
     ret = bic_get_sensor_reading(fru, sensor_num, sensor, REXP_BIC_INTF);
+    bic_ou_status = ret;
   } else if ( (sensor_num >= sensor_base->base_3ou && sensor_num < sensor_base->base_4ou) &&
-              ((config_status & PRESENT_3OU) == PRESENT_3OU) ) { //3OU
+              ((config_status & PRESENT_3OU) == PRESENT_3OU) && (bic_ou_status != BIC_STATUS_3OU_FAILURE)) { //3OU
     ret = bic_get_sensor_reading(fru, sensor_num, sensor, EXP3_BIC_INTF);
+    bic_ou_status = ret;
   } else if ( (sensor_num >= sensor_base->base_4ou ) &&
-              ((config_status & PRESENT_4OU) == PRESENT_4OU) ) { //4OU
+              ((config_status & PRESENT_4OU) == PRESENT_4OU) && (bic_ou_status != BIC_STATUS_4OU_FAILURE)) { //4OU
     ret = bic_get_sensor_reading(fru, sensor_num, sensor, EXP4_BIC_INTF);
+    bic_ou_status = ret;
   } else if ( (sensor_num >= 0xD1 && sensor_num <= 0xF1) && (bmc_location == NIC_BMC)) { //BB
     ret = bic_get_sensor_reading(fru, sensor_num, sensor, BB_BIC_INTF);
   } else {
     return READING_NA;
   }
 
-  if ( ret == BIC_STATUS_FAILURE ) {
+  if ( (ret == BIC_STATUS_FAILURE) || 
+       (ret == BIC_STATUS_1OU_FAILURE) || 
+       (ret == BIC_STATUS_2OU_FAILURE) || 
+       (ret == BIC_STATUS_3OU_FAILURE) || 
+       (ret == BIC_STATUS_4OU_FAILURE) ) {
     syslog(LOG_WARNING, "%s() Failed to run bic_get_sensor_reading(). fru: %x, snr#0x%x", __func__, fru, sensor_num);
   }
 
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_power.c b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_power.c
index 966b2f98ca4a..f29fd41570dd 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_power.c
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_power.c
@@ -510,10 +510,12 @@ pal_set_server_power(uint8_t fru, uint8_t cmd) {
       break;
 
     case SERVER_POWER_OFF:
+      pal_set_key_value(post_complete, STR_VALUE_1);  // reset post complete value
       return (status == SERVER_POWER_OFF)?POWER_STATUS_ALREADY_OK:server_power_off(fru);
       break;
 
     case SERVER_POWER_CYCLE:
+      pal_set_key_value(post_complete, STR_VALUE_1);  // reset post complete value
       if (status == SERVER_POWER_ON) {
         // assuming that user has force power on the fru, so fan_fail is not checked here
         return bic_server_power_cycle(fru);
@@ -538,10 +540,12 @@ pal_set_server_power(uint8_t fru, uint8_t cmd) {
       break;
 
     case SERVER_GRACEFUL_SHUTDOWN:
+      pal_set_key_value(post_complete, STR_VALUE_1);  // reset post complete value
       return (status == SERVER_POWER_OFF)?POWER_STATUS_ALREADY_OK:bic_server_graceful_power_off(fru);
       break;
 
     case SERVER_POWER_RESET:
+      pal_set_key_value(post_complete, STR_VALUE_1);  // reset post complete value
       return (status == SERVER_POWER_OFF)?POWER_STATUS_ERR:bic_server_power_reset(fru);
       break;
 
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_sensors.c b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_sensors.c
index f06507e57c9f..7f25ce8daac6 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_sensors.c
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_sensors.c
@@ -380,6 +380,50 @@ const uint8_t bic_gl_sensor_list[] = {
   BIC_GL_SENSOR_MB_TOTAL_DIMM_PWR_W,
 };
 
+const uint8_t bic_ji_sensor_list[] = {
+  BIC_JI_SENSOR_MB_INLET_TEMP_C,
+  BIC_JI_SENSOR_MB_OUTLET_TEMP_C,
+  BIC_JI_SENSOR_FIO_FRONT_TEMP_C,
+  BIC_JI_SENSOR_MB_SOC_CPU_TEMP_C,
+  BIC_JI_SENSOR_MB_FPGA_TEMP_C,
+  BIC_JI_SENSOR_MB_E1S_SSD_TEMP_C,
+  BIC_JI_SENSOR_MB_HSC_TEMP_C,
+  BIC_JI_SENSOR_MB_CPUDVDD_TEMP_C,
+  BIC_JI_SENSOR_MB_CPUVDD_TEMP_C,
+  BIC_JI_SENSOR_MB_SOCVDD_TEMP_C,
+  BIC_JI_SENSOR_MB_HSC_INPUT_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_P12V_STBY_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_VDD_1V8_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_P3V3_STBY_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_SOCVDD_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_P3V_BAT_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_CPUVDD_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_FPGA_VCC_AO_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_1V2_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_VDD_M2_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_P1V2_STBY_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_FBVDDQ_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_FBVDDP2_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_FBVDD1_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_P5V_STBY_VOLT_V,
+  BIC_JI_SENSOR_MB_ADC_CPU_DVDD_VOLT_V,
+  BIC_JI_SENSOR_MB_E1S_SSD_VOLT_V,
+  BIC_JI_SENSOR_MB_CPUDVDD_VOLT_V,
+  BIC_JI_SENSOR_MB_CPUVDD_VOLT_V,
+  BIC_JI_SENSOR_MB_SOCVDD_VOLT_V,
+  BIC_JI_SENSOR_MB_HSC_OUTPUT_CURR_A,
+  BIC_JI_SENSOR_MB_E1S_SSD_CURR_A,
+  BIC_JI_SENSOR_MB_CPUDVDD_CURR_A,
+  BIC_JI_SENSOR_MB_CPUVDD_CURR_A,
+  BIC_JI_SENSOR_MB_SOCVDD_CURR_A,
+  BIC_JI_SENSOR_MB_CPU_PWR_W,
+  BIC_JI_SENSOR_MB_HSC_INPUT_PWR_W,
+  BIC_JI_SENSOR_MB_E1S_SSD_PWR_W,
+  BIC_JI_SENSOR_MB_CPUDVDD_PWR_W,
+  BIC_JI_SENSOR_MB_CPUVDD_PWR_W,
+  BIC_JI_SENSOR_MB_SOCVDD_PWR_W,
+};
+
 const uint8_t bic_1ou_vf_sensor_list[] = {
   BIC_1OU_VF_SENSOR_NUM_T_MB_OUTLET_TEMP_T,
   BIC_1OU_VF_SENSOR_NUM_V_12_AUX,
@@ -1369,6 +1413,7 @@ size_t nic_sensor_cnt = sizeof(nic_sensor_list)/sizeof(uint8_t);
 size_t bic_sensor_cnt = sizeof(bic_sensor_list)/sizeof(uint8_t);
 size_t bic_hd_sensor_cnt = sizeof(bic_hd_sensor_list)/sizeof(uint8_t);
 size_t bic_gl_sensor_cnt = sizeof(bic_gl_sensor_list)/sizeof(uint8_t);
+size_t bic_ji_sensor_cnt = sizeof(bic_ji_sensor_list)/sizeof(uint8_t);
 size_t bic_bb_sensor_cnt = sizeof(bic_bb_sensor_list)/sizeof(uint8_t);
 size_t bic_1ou_vf_sensor_cnt = sizeof(bic_1ou_vf_sensor_list)/sizeof(uint8_t);
 size_t bic_1ou_rf_sensor_cnt = sizeof(bic_1ou_rf_sensor_list)/sizeof(uint8_t);
@@ -1651,6 +1696,9 @@ pal_get_fru_sensor_list(uint8_t fru, uint8_t **sensor_list, int *cnt) {
     } else if (server_type == SERVER_TYPE_GL) {
       memcpy(bic_dynamic_sensor_list[fru-1], bic_gl_sensor_list, bic_gl_sensor_cnt);
       current_cnt = bic_gl_sensor_cnt;
+    } else if (server_type == SERVER_TYPE_JI) {
+      memcpy(bic_dynamic_sensor_list[fru-1], bic_ji_sensor_list, bic_ji_sensor_cnt);
+      current_cnt = bic_ji_sensor_cnt;
     } else {
       memcpy(bic_dynamic_sensor_list[fru-1], bic_sensor_list, bic_sensor_cnt);
       current_cnt = bic_sensor_cnt;
@@ -3271,6 +3319,10 @@ pal_bic_sensor_read_raw(uint8_t fru, uint8_t sensor_num, float *value, uint8_t b
         }
         break;
 
+      case SERVER_TYPE_JI:
+        // TODO: If necessary, apply sensor value correction to Java Island.
+        break;
+
       default:
         syslog(LOG_WARNING, "%s()  fru%x, unknown slot type 0x%x", __func__, fru, slot_type);
         break;
@@ -3882,10 +3934,12 @@ _sdr_init(char *path, sensor_info_t *sinfo, uint8_t bmc_location, \
   }
 
   if (is_slot_type_init == false) {
-    slot_type = fby35_common_get_slot_type(fru);
-    if (slot_type >= 0) {
+    ret = fby35_common_get_slot_type(fru);
+    if (ret >= 0) {
+      slot_type = ret;
       is_slot_type_init = true;
-    }
+    } else
+      goto error_exit;
   }
   while ((bytes_rd = read(fd, buf, sizeof(sdr_full_t))) > 0) {
     if (bytes_rd != sizeof(sdr_full_t)) {
diff --git a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_sensors.h b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_sensors.h
index e53034c88754..4d6bf0f6c2c7 100644
--- a/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_sensors.h
+++ b/meta-facebook/meta-fby35/recipes-fby35/plat-libs/files/pal/pal_sensors.h
@@ -319,6 +319,55 @@ enum {
   BIC_GL_SENSOR_MB_SOC_CPU_PWR_W = 0x3E,
   BIC_GL_SENSOR_MB_TOTAL_DIMM_PWR_W = 0x3F,
 
+  //BIC - javaisland temperature sensors
+  BIC_JI_SENSOR_MB_INLET_TEMP_C = 0x01,
+  BIC_JI_SENSOR_MB_OUTLET_TEMP_C = 0x02,
+  BIC_JI_SENSOR_FIO_FRONT_TEMP_C = 0x03,
+  BIC_JI_SENSOR_MB_SOC_CPU_TEMP_C = 0x04,
+  BIC_JI_SENSOR_MB_FPGA_TEMP_C = 0x05,
+  BIC_JI_SENSOR_MB_E1S_SSD_TEMP_C = 0x06,
+  BIC_JI_SENSOR_MB_HSC_TEMP_C = 0x07,
+  BIC_JI_SENSOR_MB_CPUDVDD_TEMP_C = 0x08,
+  BIC_JI_SENSOR_MB_CPUVDD_TEMP_C = 0x09,
+  BIC_JI_SENSOR_MB_SOCVDD_TEMP_C = 0x0A,
+
+  //BIC - javaisland voltage sensors
+  BIC_JI_SENSOR_MB_HSC_INPUT_VOLT_V = 0x10,
+  BIC_JI_SENSOR_MB_ADC_P12V_STBY_VOLT_V = 0x11,
+  BIC_JI_SENSOR_MB_ADC_VDD_1V8_VOLT_V = 0x12,
+  BIC_JI_SENSOR_MB_ADC_P3V3_STBY_VOLT_V = 0x13,
+  BIC_JI_SENSOR_MB_ADC_SOCVDD_VOLT_V = 0x14,
+  BIC_JI_SENSOR_MB_ADC_P3V_BAT_VOLT_V = 0x15,
+  BIC_JI_SENSOR_MB_ADC_CPUVDD_VOLT_V = 0x16,
+  BIC_JI_SENSOR_MB_ADC_FPGA_VCC_AO_VOLT_V = 0x17,
+  BIC_JI_SENSOR_MB_ADC_1V2_VOLT_V = 0x18,
+  BIC_JI_SENSOR_MB_ADC_VDD_M2_VOLT_V = 0x19,
+  BIC_JI_SENSOR_MB_ADC_P1V2_STBY_VOLT_V = 0x1A,
+  BIC_JI_SENSOR_MB_ADC_FBVDDQ_VOLT_V = 0x1B,
+  BIC_JI_SENSOR_MB_ADC_FBVDDP2_VOLT_V = 0x1C,
+  BIC_JI_SENSOR_MB_ADC_FBVDD1_VOLT_V = 0x1D,
+  BIC_JI_SENSOR_MB_ADC_P5V_STBY_VOLT_V = 0x1E,
+  BIC_JI_SENSOR_MB_ADC_CPU_DVDD_VOLT_V = 0x1F,
+  BIC_JI_SENSOR_MB_E1S_SSD_VOLT_V = 0x20,
+  BIC_JI_SENSOR_MB_CPUDVDD_VOLT_V = 0x21,
+  BIC_JI_SENSOR_MB_CPUVDD_VOLT_V = 0x22,
+  BIC_JI_SENSOR_MB_SOCVDD_VOLT_V = 0x23,
+
+  //BIC - javaisland current sensors
+  BIC_JI_SENSOR_MB_HSC_OUTPUT_CURR_A = 0x25,
+  BIC_JI_SENSOR_MB_E1S_SSD_CURR_A = 0x26,
+  BIC_JI_SENSOR_MB_CPUDVDD_CURR_A = 0x27,
+  BIC_JI_SENSOR_MB_CPUVDD_CURR_A = 0x28,
+  BIC_JI_SENSOR_MB_SOCVDD_CURR_A = 0x29,
+
+  //BIC - javaisland power sensors
+  BIC_JI_SENSOR_MB_CPU_PWR_W = 0x30,
+  BIC_JI_SENSOR_MB_HSC_INPUT_PWR_W = 0x31,
+  BIC_JI_SENSOR_MB_E1S_SSD_PWR_W = 0x32,
+  BIC_JI_SENSOR_MB_CPUDVDD_PWR_W = 0x33,
+  BIC_JI_SENSOR_MB_CPUVDD_PWR_W = 0x34,
+  BIC_JI_SENSOR_MB_SOCVDD_PWR_W = 0x35,
+
   //BIC 1OU VF Sensors
   BIC_1OU_VF_SENSOR_NUM_T_MB_OUTLET_TEMP_T = 0x50,
   BIC_1OU_VF_SENSOR_NUM_V_12_AUX = 0x51,
diff --git a/meta-facebook/meta-fuji/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-fuji/conf/templates/default/bblayers.conf.sample
index e79dee429e40..244d2d42e56e 100755
--- a/meta-facebook/meta-fuji/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-fuji/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-fuji/recipes-fuji/platform-lib/files/pal/pal_sensors.c b/meta-facebook/meta-fuji/recipes-fuji/platform-lib/files/pal/pal_sensors.c
index a7c785330d13..e44f32d93c69 100644
--- a/meta-facebook/meta-fuji/recipes-fuji/platform-lib/files/pal/pal_sensors.c
+++ b/meta-facebook/meta-fuji/recipes-fuji/platform-lib/files/pal/pal_sensors.c
@@ -1135,6 +1135,7 @@ static int
 check_and_read_sensor_value(uint8_t fru, uint8_t snr_num, const char *device,
                             const char *attr, int *value) {
   char dir_name[LARGEST_DEVICE_NAME + 1];
+  int retry = 0, max_retry = 3, ret = 0;
 
   if (strstr(device, "hwmon*") != NULL) {
     /* Get current working directory */
@@ -1148,11 +1149,11 @@ check_and_read_sensor_value(uint8_t fru, uint8_t snr_num, const char *device,
              "%s/%s", device, attr);
   }
 
-  if (device_read(snr_path[fru][snr_num].name, value)) {
-    return -1;
-  }
+  do {
+    ret = device_read(snr_path[fru][snr_num].name, value);
+  } while ((ret != 0) && (retry++ < max_retry));
 
-  return 0;
+  return (ret == 0) ? 0 : -1;
 }
 
 static int
diff --git a/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/files/i2c_sensor_fixup.sh b/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/files/i2c_sensor_fixup.sh
new file mode 100644
index 000000000000..66865a63d9cd
--- /dev/null
+++ b/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/files/i2c_sensor_fixup.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+#
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+
+# The UCD OPERATION register may get corrupted if clock stretch happens
+# when accessing the device. Once the register write is corrupted,
+# then the subsequent voltage readings will also be incorrect.
+# To recover from such scenario, reset the OPERATION register back to default.
+pmbus_reset_OPERATION_register() {
+  page_count=$1
+  address=$2
+  bus=$3
+
+  for (( page=0; page<page_count; page++ )) ;do
+    #select the page (page code : 0 )
+    i2cset -y -f "$bus" "$address" 0 "$page"
+    #reset the operation to default(operation code: 1)
+    i2cset -y -f "$bus" "$address" 1 0
+  done
+}
+
+# unbind and bind the i2c driver
+i2c_driver_rebind() {
+  device=$1
+  driver_sysfs=$2
+
+  echo  "$device" > "$driver_sysfs"/unbind
+  sleep 1
+  echo  "$device" > "$driver_sysfs"/bind
+  sleep 1
+}
+
+# During bootup validate whether the hwmon sysfs exists and
+# Input voltage value within threshold range. If not expected
+# unbind and bind the driver.
+hwmon_sanitize_input_voltage() {
+  page_count=$1
+  bus=$2
+  address=$3
+
+  device="${bus}"-00"${address:2}"
+  hwnon_sysfs=( /sys/bus/i2c/devices/"${device}"/hwmon/hwmon* )
+  driver_sysfs=$(readlink -f /sys/bus/i2c/devices/"${device}"/driver)
+
+  for retry in {1..5} ; do
+    error=0
+    #Reset the OPERATION code for UCD sensor
+    if  [[ ${driver_sysfs} =~ "ucd9000" ]]; then
+      pmbus_reset_OPERATION_register "$page_count" "${address}" "$bus"
+    fi
+    #Verify sensor value
+    for page in $(seq 1 "$page_count") ; do
+      in_file="${hwnon_sysfs[*]}"/in"$page"_input
+      if [ ! -f "${in_file}" ] ;then
+        error=1; break
+      fi
+      val=$(cat "${in_file}")
+      if [ -z "$val" ] || [[ $val -gt 20000 ]];then
+        error=1; break
+      fi
+    done
+
+    if [ $error -eq 1 ] ;then
+      echo "Sensor addr=$address init failed retry=$retry bind/unbind device"
+      i2c_driver_rebind "$device" "$driver_sysfs"
+    else
+      break
+    fi
+  done
+}
+
+
+# Return pmbus device info, such as bus number,
+# device address and sensor page count.
+pmbus_get_device_info() {
+  smb_mp2978_1=(1 0x53 2) # (<bus no> <addr> <page count>)
+  smb_mp2978_2=(1 0x59 2) # (<bus no> <addr> <page count>)
+  i2c_ucd_dev=$1
+
+  if [ "$i2c_ucd_dev" == "smb_pwrseq_1" ] || [ "$i2c_ucd_dev" == "smb_pwrseq_2" ] ;then
+    address=$(/usr/bin/kv get "${i2c_ucd_dev}"_addr)
+    page_count=$(/usr/bin/kv get "${i2c_ucd_dev}"_page_count)
+    bus=5
+  elif [ "$i2c_ucd_dev" == "smb_mp2978_1" ] ;then
+    address=${smb_mp2978_1[1]}
+    page_count=${smb_mp2978_1[2]}
+    bus=${smb_mp2978_1[0]}
+  else
+    address=${smb_mp2978_2[1]}
+    page_count=${smb_mp2978_2[2]}
+    bus=${smb_mp2978_2[0]}
+  fi
+
+  echo "$address" "$bus" "$page_count"
+}
+
+# Workaround for the following issue occurred in UCD/MP sensor
+# Scenario 1: some sensors could not be enumerated
+# Scenario 2: driver initialization ran into incorrect co-efficient which results in high values
+hwmon_fix_driver_binding () {
+  for i2c_dev in "$@" ; do
+    read -r address bus page_count < <(pmbus_get_device_info "$i2c_dev")
+
+    if [ -z "$address" ] || [ -z "$page_count" ] ;then
+      echo "UCD device info not found"
+    else
+      hwmon_sanitize_input_voltage "$page_count" "$bus" "${address}"
+    fi
+  done
+}
+
diff --git a/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/files/setup_i2c.sh b/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/files/setup_i2c.sh
index 0db566cc2813..71e6931797be 100644
--- a/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/files/setup_i2c.sh
+++ b/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/files/setup_i2c.sh
@@ -20,6 +20,8 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 #shellcheck disable=SC1091
 source /usr/local/bin/openbmc-utils.sh
+#shellcheck disable=SC1091
+source /usr/local/bin/i2c_sensor_fixup.sh
 
 # Sometimes, it has been observed that I2c devices, such as the PIM's UCD, 
 # have the potential to lock the bus. This will render the entire i2c bus inoperable.
@@ -33,29 +35,6 @@ ADM1266_BLACKBOX_INFO=0xE6
 # Board Version
 board_ver=$(wedge_board_rev)
 
-#
-#  Reset the OPERATION code for each UCD page.
-#  The UCD device address and page count are retrieved from kv, 
-#  which is updated during i2c enumeration.
-#
-i2c_ucd_reset_operation() {
-  for i2c_ucd_dev in "$@" ; do
-    address=$(/usr/bin/kv get "${i2c_ucd_dev}"_addr)
-    page_count=$(/usr/bin/kv get "${i2c_ucd_dev}"_page_count)
-    if [ -z "$address" ] || [ -z "$page_count" ] ;then
-      echo "UCD device info not found" >> /dev/kmsg
-    else 
-      for (( page=0; page<page_count; page++ )) ;do
-        #select the page (page code : 0 )
-        i2cset -y -f 5 "$address" 0 "$page"
-        #reset the operation to default(operation code: 1) 
-        i2cset -y -f 5 "$address" 1 0
-      done
-    fi
-  done
-}
-
-
 # # Bus 0
 i2c_device_add 0 0x1010 slave-mqueue #IPMB 0
 
@@ -239,8 +218,7 @@ i2c_device_add 12 0x3e smb_syscpld     # SYSTEM CPLD
 #
 i2c_check_driver_binding "fix-binding"
 
-#
-# The UCD device may occasionally read and change the value of the
-# OPERATION command improperly. So reset it to its default setting.
-#
-i2c_ucd_reset_operation "smb_pwrseq_1" "smb_pwrseq_2"
+# The UCD/MP device occasionally failed to enumerate all the pages or
+# incorrectly reads the VOUT_MODE register, This is due to i2c clock stretch.
+# Hence during bootup validating the corresponding hwmon attribute and re-bind the driver.
+hwmon_fix_driver_binding "smb_pwrseq_1" "smb_pwrseq_2" "smb_mp2978_1" "smb_mp2978_2"
diff --git a/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend b/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
index 05cfd35cad65..cdf29d44dc10 100644
--- a/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
+++ b/meta-facebook/meta-fuji/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
@@ -51,6 +51,7 @@ LOCAL_URI += " \
     file://eth0_mac_fixup.sh \
     file://mount_data1.service \
     file://setup_gpio.service \
+    file://i2c_sensor_fixup.sh \
     "
 
 OPENBMC_UTILS_FILES += " \
@@ -77,6 +78,7 @@ OPENBMC_UTILS_FILES += " \
     switch_pim_mux_to_fpga.sh \
     reinit_all_pim.sh \
     wedge_us_mac.sh \
+    i2c_sensor_fixup.sh \
     "
 DEPENDS:append = " update-rc.d-native"
 inherit systemd
diff --git a/meta-facebook/meta-galaxy100/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-galaxy100/conf/templates/default/bblayers.conf.sample
index c80e864dda49..b2b407e91228 100644
--- a/meta-facebook/meta-galaxy100/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-galaxy100/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -20,8 +19,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-galaxy100/conf/templates/default/local.conf.sample b/meta-facebook/meta-galaxy100/conf/templates/default/local.conf.sample
index ad37295e3503..5d79e16834b9 100644
--- a/meta-facebook/meta-galaxy100/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-galaxy100/conf/templates/default/local.conf.sample
@@ -6,6 +6,6 @@
 MACHINE ??= "galaxy100"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
 
 ASSUME_PROVIDED_append = "qemu-native"
diff --git a/meta-facebook/meta-grandcanyon/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-grandcanyon/conf/templates/default/bblayers.conf.sample
index 79dec9a43c2e..986ee2cef5f0 100644
--- a/meta-facebook/meta-grandcanyon/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-grandcanyon/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-grandcanyon/recipes-grandcanyon/healthd/files/healthd-config.json b/meta-facebook/meta-grandcanyon/recipes-grandcanyon/healthd/files/healthd-config.json
index cf9ec8296cdb..2930970fa32f 100644
--- a/meta-facebook/meta-grandcanyon/recipes-grandcanyon/healthd/files/healthd-config.json
+++ b/meta-facebook/meta-grandcanyon/recipes-grandcanyon/healthd/files/healthd-config.json
@@ -90,7 +90,7 @@
   },
   "bic_health": {
     "enabled": true,
-    "fru": 1,
+    "fru": [1],
     "monitor_interval": 60
   },
   "nm_monitor": {
diff --git a/meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-libs/files/pal/pal.c b/meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-libs/files/pal/pal.c
index 034e6a228ceb..841db73951f4 100755
--- a/meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-libs/files/pal/pal.c
+++ b/meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-libs/files/pal/pal.c
@@ -3323,7 +3323,7 @@ pal_parse_sel(uint8_t fru, uint8_t *sel, char *error_log) {
 }
 
 int
-pal_bic_self_test(void) {
+pal_bic_self_test(uint8_t fru) {
   uint8_t result[SIZE_SELF_TEST_RESULT] = {0};
   return bic_get_self_test_result(result);
 }
diff --git a/meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-utils/files/check_bmc_ready.sh b/meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-utils/files/check_bmc_ready.sh
index 3bf37d667ab1..1d629a9ef647 100644
--- a/meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-utils/files/check_bmc_ready.sh
+++ b/meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-utils/files/check_bmc_ready.sh
@@ -14,7 +14,7 @@ front_paneld_list="flag_front_led_sync flag_front_sys_status_led flag_front_heal
 gpiod_list="flag_gpiod_fru_miss flag_gpiod_server_pwr flag_gpiod_scc_pwr"
 gpiointrd_list="flag_gpiointrd"
 ncsid_list="flag_ncsid"
-healthd_list="flag_healthd_wtd flag_healthd_hb_led flag_healthd_crit_proc flag_healthd_cpu flag_healthd_mem flag_healthd_ecc flag_healthd_bmc_timestamp flag_healthd_bic_health"
+healthd_list="flag_healthd_wtd flag_healthd_hb_led flag_healthd_crit_proc flag_healthd_cpu flag_healthd_mem flag_healthd_ecc flag_healthd_bmc_timestamp flag_healthd_bic_fru1_health"
 ipmbd_2_list="flag_ipmbd_rx_2 flag_ipmbd_res_2 flag_ipmbd_req_2"
 ipmbd_7_list="flag_ipmbd_rx_7 flag_ipmbd_res_7 flag_ipmbd_req_7"
 ipmbd_10_list="flag_ipmbd_rx_10 flag_ipmbd_res_10 flag_ipmbd_req_10"
diff --git a/meta-facebook/meta-grandteton/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-grandteton/conf/templates/default/bblayers.conf.sample
index 0be1ea39755b..6ff3eae7d49f 100644
--- a/meta-facebook/meta-grandteton/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-grandteton/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-grandteton/meta-gtartemis/conf/templates/default/bblayers.conf.sample
index 7e11aa946564..76e61329376a 100644
--- a/meta-facebook/meta-grandteton/meta-gtartemis/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -23,7 +22,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd/fsc-config-gta-8-retimer-freya.json b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd/fsc-config-gta-8-retimer-freya.json
deleted file mode 100644
index 64c6b59a67ff..000000000000
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd/fsc-config-gta-8-retimer-freya.json
+++ /dev/null
@@ -1,686 +0,0 @@
-{
-    "version": "gtartemis-v1.0-freya",
-    "pwm_transition_value": 80,
-    "pwm_boost_value": 100,
-    "sample_interval_ms": 3000,
-    "fan_recovery_time": 2,
-    "sensor_filter_all": true,
-    "pwm_sensor_boost_value": 100,
-    "boost": {
-      "fan_fail": true,
-      "sensor_fail": true
-    },
-    "sensor_valid_check": {   
-      "(.*)cpu": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)e1s": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)pex": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)retimer": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)vdd": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)cb_accl": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)vr": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)pdb": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)hsc": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)pu4": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)mc_outlet": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)mc_inlet": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)cb_inlet": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      },
-      "(.*)ssd": {
-        "attribute": {
-          "type" : "power_status"
-        }
-      }
-    },
-    "watchdog": false,
-    "min_rpm": 965,
-    "profiles": {
-      "cpu_tray_scm_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [20, 16],
-          [21, 17],
-          [22, 18],
-          [23, 18],
-          [24, 18],
-          [25, 19],
-          [26, 19],
-          [27, 20],
-          [28, 20],
-          [29, 20],
-          [30, 21],
-          [31, 21],
-          [32, 22],
-          [33, 23],
-          [34, 23],
-          [35, 24],
-          [36, 25],
-          [37, 30],
-          [38, 40],
-          [39, 60]
-        ]
-      },
-      "cpu_tray_cpu_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [65, 16],
-          [66, 30],
-          [67, 35],
-          [68, 41],
-          [69, 45],
-          [70, 49],
-          [71, 51],
-          [72, 53],
-          [73, 55]
-        ]
-      },
-      "cpu_tray_cpu_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 76,
-        "kp": -2,
-        "ki": -0.015,
-        "kd": 0
-      },
-      "cpu_tray_dimm_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [65, 16],
-          [66, 40],
-          [67, 47],
-          [69, 52],
-          [71, 57],
-          [73, 60],
-          [75, 62]
-
-        ]
-      },
-      "cpu_tray_dimm_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 78,
-        "kp": -3,
-        "ki": -0.01,
-        "kd": 0
-      },
-      "cpu_tray_nic_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "data": [
-          [80, 16],
-          [81, 20],
-          [82, 22],
-          [83, 24],
-          [84, 26],
-          [85, 28]
-        ]
-      },
-      "cpu_tray_nic_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 88,
-        "kp": -3,
-        "ki": -0.035,
-        "kd": 0
-      },
-      "mc_tray_E1S_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [61, 16],
-          [62, 38],
-          [63, 44],
-          [64, 48],
-          [65, 50]
-        ]
-      },
-      "mc_tray_E1S_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 68,
-        "kp": -2.4,
-        "ki":-0.015,
-        "kd": 0
-      },
-      "mb_tray_E1S_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [61, 16],
-          [62, 18],
-          [63, 20],
-          [64, 22],
-          [65, 24]
-        ]
-      },
-      "mb_tray_E1S_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 68,
-        "kp": -2.4,
-        "ki": -0.015,
-        "kd": 0
-      },
-      "cb_tray_switch_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [80, 16],
-          [81, 18],
-          [82, 20],
-          [83, 22],
-          [84, 24],
-          [85, 26],
-          [86, 28],
-          [87, 30]
-        ]
-      },
-      "cb_tray_switch_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 90,
-        "kp": -1.5,
-        "ki": -0.015,
-        "kd": 0
-      },
-      "power_brick_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [91, 16],
-          [92, 20],
-          [93, 22],
-          [94, 24],
-          [95, 26],
-          [96, 28],
-          [97, 30]
-        ]
-      },
-      "power_brick_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 100,
-        "kp": -3,
-        "ki": -0.035,
-        "kd": 0
-      },
-      "retimer_temp_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [87, 16],
-          [88, 18],
-          [89, 20],
-          [90, 22],
-          [91, 24],
-          [92, 26],
-          [93, 28]
-        ]
-      },
-      "retimer_temp_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 96,
-        "kp": -3,
-        "ki": -0.035,
-        "kd": 0
-      },
-      "accl_asic_temp_linear": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 2,
-        "data": [
-          [71, 16],
-          [72, 35],
-          [73, 40],
-          [74, 45],
-          [75, 48],
-          [76, 50]
-        ]
-      },
-      "accl_asic_temp_pid": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "pid",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 3,
-        "setpoint": 79,
-        "kp": -3,
-        "ki": -0.035,
-        "kd": 0
-      },
-      "linear_non_fru_sensor": {
-        "read_source" : {
-          "util" : "/usr/local/bin/sensor-util"
-        },
-        "type": "linear",
-        "positive_hysteresis": 0,
-        "negative_hysteresis": 0,
-        "data": [
-          [0, 0]
-        ]
-      }
-    },
-    "fans": {
-      "0": {
-        "label" : "Fan 0 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor208"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "1": {
-        "label" : "Fan 0 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor209"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "2": {
-        "label" : "Fan 1 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor210"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "3": {
-        "label" : "Fan 1 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor211"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "4": {
-        "label" : "Fan 2 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor212"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "5": {
-        "label" : "Fan 2 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor213"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "6": {
-        "label" : "Fan 3 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor214"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "7": {
-        "label" : "Fan 3 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor215"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "8": {
-        "label" : "Fan 4 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor216"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "9": {
-        "label" : "Fan 4 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor217"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "10": {
-        "label" : "Fan 5 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor218"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "11": {
-        "label" : "Fan 5 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor219"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "12": {
-        "label" : "Fan 6 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor220"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "13": {
-        "label" : "Fan 6 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor221"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "14": {
-        "label" : "Fan 7 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor222"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "15": {
-        "label" : "Fan 7 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor223"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "16": {
-        "label" : "Fan 8 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor224"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "17": {
-        "label" : "Fan 8 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor225"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "18": {
-        "label" : "Fan 9 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor226"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "19": {
-        "label" : "Fan 9 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor227"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "20": {
-        "label" : "Fan 10 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor228"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "21": {
-        "label" : "Fan 10 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor229"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "22": {
-        "label" : "Fan 11 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor230"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-       "23": {
-        "label" : "Fan 11 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor231"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "24": {
-        "label" : "Fan 12 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor232"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "25": {
-        "label" : "Fan 12 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor233"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "26": {
-        "label" : "Fan 13 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor234"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "27": {
-        "label" : "Fan 13 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp1_sensor235"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-
-      "28": {
-        "label" : "Fan 14 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor236"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "29": {
-        "label" : "Fan 14 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor237"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "30": {
-        "label" : "Fan 15 Inlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor238"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      },
-      "31": {
-        "label" : "Fan 15 Outlet",
-        "read_source" : {
-          "kv" : "fan_bp2_sensor239"
-        },
-        "write_source" : {
-          "util" : "/usr/local/bin/fan-util --set %d"
-        }
-      }
-    },
-    "zones": {
-      "zone": {
-        "pwm_output": [0],
-        "expr_file": "zone-fsc-gta-8-retimer-freya.fsc"
-      }
-    }
-}
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd/zone-fsc-gta-8-retimer-freya.fsc b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd/zone-fsc-gta-8-retimer-freya.fsc
deleted file mode 100644
index 76d53cad955e..000000000000
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd/zone-fsc-gta-8-retimer-freya.fsc
+++ /dev/null
@@ -1,216 +0,0 @@
-max([
-
-  cpu_tray_scm_linear(all:scm_scm_inlet_temp_c),
-
-  cpu_tray_cpu_linear(all:mb_mb_cpu0_temp_c) + cpu_tray_cpu_pid(all:mb_mb_cpu0_temp_c),
-
-  cpu_tray_cpu_linear(all:mb_mb_cpu1_temp_c) + cpu_tray_cpu_pid(all:mb_mb_cpu1_temp_c),
-
-  cpu_tray_dimm_linear(
-    max([
-      all:mb_mb_cpu0_dimm_a0_temp_c,
-      all:mb_mb_cpu0_dimm_a1_temp_c,
-      all:mb_mb_cpu0_dimm_a2_temp_c,
-      all:mb_mb_cpu0_dimm_a3_temp_c,
-      all:mb_mb_cpu0_dimm_a4_temp_c,
-      all:mb_mb_cpu0_dimm_a5_temp_c,
-      all:mb_mb_cpu0_dimm_a6_temp_c,
-      all:mb_mb_cpu0_dimm_a7_temp_c,
-      all:mb_mb_cpu0_dimm_a8_temp_c,
-      all:mb_mb_cpu0_dimm_a9_temp_c,
-      all:mb_mb_cpu0_dimm_a10_temp_c,
-      all:mb_mb_cpu0_dimm_a11_temp_c,
-      all:mb_mb_cpu1_dimm_b0_temp_c,
-      all:mb_mb_cpu1_dimm_b1_temp_c,
-      all:mb_mb_cpu1_dimm_b2_temp_c,
-      all:mb_mb_cpu1_dimm_b3_temp_c,
-      all:mb_mb_cpu1_dimm_b4_temp_c,
-      all:mb_mb_cpu1_dimm_b5_temp_c,
-      all:mb_mb_cpu1_dimm_b6_temp_c,
-      all:mb_mb_cpu1_dimm_b7_temp_c,
-      all:mb_mb_cpu1_dimm_b8_temp_c,
-      all:mb_mb_cpu1_dimm_b9_temp_c,
-      all:mb_mb_cpu1_dimm_b10_temp_c,
-      all:mb_mb_cpu1_dimm_b11_temp_c])) +
-  cpu_tray_dimm_pid(
-    max([
-      all:mb_mb_cpu0_dimm_a0_temp_c,
-      all:mb_mb_cpu0_dimm_a1_temp_c,
-      all:mb_mb_cpu0_dimm_a2_temp_c,
-      all:mb_mb_cpu0_dimm_a3_temp_c,
-      all:mb_mb_cpu0_dimm_a4_temp_c,
-      all:mb_mb_cpu0_dimm_a5_temp_c,
-      all:mb_mb_cpu0_dimm_a6_temp_c,
-      all:mb_mb_cpu0_dimm_a7_temp_c,
-      all:mb_mb_cpu0_dimm_a8_temp_c,
-      all:mb_mb_cpu0_dimm_a9_temp_c,
-      all:mb_mb_cpu0_dimm_a10_temp_c,
-      all:mb_mb_cpu0_dimm_a11_temp_c,
-      all:mb_mb_cpu1_dimm_b0_temp_c,
-      all:mb_mb_cpu1_dimm_b1_temp_c,
-      all:mb_mb_cpu1_dimm_b2_temp_c,
-      all:mb_mb_cpu1_dimm_b3_temp_c,
-      all:mb_mb_cpu1_dimm_b4_temp_c,
-      all:mb_mb_cpu1_dimm_b5_temp_c,
-      all:mb_mb_cpu1_dimm_b6_temp_c,
-      all:mb_mb_cpu1_dimm_b7_temp_c,
-      all:mb_mb_cpu1_dimm_b8_temp_c,
-      all:mb_mb_cpu1_dimm_b9_temp_c,
-      all:mb_mb_cpu1_dimm_b10_temp_c,
-      all:mb_mb_cpu1_dimm_b11_temp_c])),
-
-  cpu_tray_nic_linear(all:nic0_nic0_mezz0_temp_c) + cpu_tray_nic_pid(all:nic0_nic0_mezz0_temp_c),
-
-  cpu_tray_nic_linear(all:nic1_nic1_mezz1_temp_c) + cpu_tray_nic_pid(all:nic1_nic1_mezz1_temp_c),
-
-  mc_tray_E1S_linear(
-    max([
-      all:mc_mc_ssd1_temp_c,
-      all:mc_mc_ssd2_temp_c,
-      all:mc_mc_ssd3_temp_c,
-      all:mc_mc_ssd4_temp_c])) +
-  mc_tray_E1S_pid(
-    max([
-      all:mc_mc_ssd1_temp_c,
-      all:mc_mc_ssd2_temp_c,
-      all:mc_mc_ssd3_temp_c,
-      all:mc_mc_ssd4_temp_c])),
-
-  mb_tray_E1S_linear(
-    max([
-      all:mb_mb_e1s_temp_c])) +
-  mb_tray_E1S_pid(
-    max([
-      all:mb_mb_e1s_temp_c])),
-
-  cb_tray_switch_linear(
-    max([
-      all:cb_cb_pex0_temp_c,
-      all:cb_cb_pex1_temp_c])) +
-  cb_tray_switch_pid(
-    max([
-      all:cb_cb_pex0_temp_c,
-      all:cb_cb_pex1_temp_c])),
-
-  power_brick_linear(
-    max([
-      all:vpdb_vpdb_brick0_temp_c,
-      all:vpdb_vpdb_brick1_temp_c,
-      all:vpdb_vpdb_brick2_temp_c,
-      all:cb_cb_power_brick_1_temp_c,
-      all:cb_cb_power_brick_2_temp_c])) +
-  power_brick_pid(
-    max([
-      all:vpdb_vpdb_brick0_temp_c,
-      all:vpdb_vpdb_brick1_temp_c,
-      all:vpdb_vpdb_brick2_temp_c,
-      all:cb_cb_power_brick_1_temp_c,
-      all:cb_cb_power_brick_2_temp_c])),
-
-  retimer_temp_linear(
-    max([
-      all:mb_mb_retimer0_temp_c,
-      all:mb_mb_retimer1_temp_c,
-      all:mb_mb_retimer2_temp_c,
-      all:mb_mb_retimer3_temp_c,
-      all:mb_mb_retimer4_temp_c,
-      all:mb_mb_retimer5_temp_c,
-      all:mb_mb_retimer6_temp_c,
-      all:mb_mb_retimer7_temp_c])) +
-  retimer_temp_pid(
-    max([
-      all:mb_mb_retimer0_temp_c,
-      all:mb_mb_retimer1_temp_c,
-      all:mb_mb_retimer2_temp_c,
-      all:mb_mb_retimer3_temp_c,
-      all:mb_mb_retimer4_temp_c,
-      all:mb_mb_retimer5_temp_c,
-      all:mb_mb_retimer6_temp_c,
-      all:mb_mb_retimer7_temp_c])),
-
-  accl_asic_temp_linear(
-    max([
-      all:cb_cb_accl1_freya_1_temp_c,
-      all:cb_cb_accl1_freya_2_temp_c,
-      all:cb_cb_accl2_freya_1_temp_c,
-      all:cb_cb_accl2_freya_2_temp_c,
-      all:cb_cb_accl3_freya_1_temp_c,
-      all:cb_cb_accl3_freya_2_temp_c,
-      all:cb_cb_accl4_freya_1_temp_c,
-      all:cb_cb_accl4_freya_2_temp_c,
-      all:cb_cb_accl5_freya_1_temp_c,
-      all:cb_cb_accl5_freya_2_temp_c,
-      all:cb_cb_accl6_freya_1_temp_c,
-      all:cb_cb_accl6_freya_2_temp_c,
-      all:cb_cb_accl7_freya_1_temp_c,
-      all:cb_cb_accl7_freya_2_temp_c,
-      all:cb_cb_accl8_freya_1_temp_c,
-      all:cb_cb_accl8_freya_2_temp_c,
-      all:cb_cb_accl9_freya_1_temp_c,
-      all:cb_cb_accl9_freya_2_temp_c,
-      all:cb_cb_accl10_freya_1_temp_c,
-      all:cb_cb_accl10_freya_2_temp_c,
-      all:cb_cb_accl11_freya_1_temp_c,
-      all:cb_cb_accl11_freya_2_temp_c,
-      all:cb_cb_accl12_freya_1_temp_c,
-      all:cb_cb_accl12_freya_2_temp_c])) +
-  accl_asic_temp_pid(
-    max([
-      all:cb_cb_accl1_freya_1_temp_c,
-      all:cb_cb_accl1_freya_2_temp_c,
-      all:cb_cb_accl2_freya_1_temp_c,
-      all:cb_cb_accl2_freya_2_temp_c,
-      all:cb_cb_accl3_freya_1_temp_c,
-      all:cb_cb_accl3_freya_2_temp_c,
-      all:cb_cb_accl4_freya_1_temp_c,
-      all:cb_cb_accl4_freya_2_temp_c,
-      all:cb_cb_accl5_freya_1_temp_c,
-      all:cb_cb_accl5_freya_2_temp_c,
-      all:cb_cb_accl6_freya_1_temp_c,
-      all:cb_cb_accl6_freya_2_temp_c,
-      all:cb_cb_accl7_freya_1_temp_c,
-      all:cb_cb_accl7_freya_2_temp_c,
-      all:cb_cb_accl8_freya_1_temp_c,
-      all:cb_cb_accl8_freya_2_temp_c,
-      all:cb_cb_accl9_freya_1_temp_c,
-      all:cb_cb_accl9_freya_2_temp_c,
-      all:cb_cb_accl10_freya_1_temp_c,
-      all:cb_cb_accl10_freya_2_temp_c,
-      all:cb_cb_accl11_freya_1_temp_c,
-      all:cb_cb_accl11_freya_2_temp_c,
-      all:cb_cb_accl12_freya_1_temp_c,
-      all:cb_cb_accl12_freya_2_temp_c])),
-
-  linear_non_fru_sensor(
-    max([
-      all:mb_mb_vr_cpu0_vcore0_temp_c,
-      all:mb_mb_vr_cpu0_soc_temp_c,
-      all:mb_mb_vr_cpu0_vcore1_temp_c,
-      all:mb_mb_vr_cpu0_pvddio_temp_c,
-      all:mb_mb_vr_cpu0_pvdd11_temp_c,
-      all:mb_mb_vr_cpu1_vcore0_temp_c,
-      all:mb_mb_vr_cpu1_soc_temp_c,
-      all:mb_mb_vr_cpu1_vcore1_temp_c,
-      all:mb_mb_vr_cpu1_pvddio_temp_c,
-      all:mb_mb_vr_cpu1_pvdd11_temp_c,
-      all:mb_mb_vr_rt_p0v9_vdd1_temp_c,
-      all:mb_mb_vr_rt_p0v9_vdd2_temp_c,
-      all:mb_mb_inlet_r_temp_c,
-      all:mb_mb_inlet_l_temp_c,
-      all:mb_mb_outlet_r_temp_c,
-      all:mb_mb_outlet_l_temp_c,
-      all:vpdb_vpdb_hsc0_temp_c,
-      all:hpdb_hpdb_hsc1_temp_c,
-      all:hpdb_hpdb_hsc2_temp_c,
-      all:mb_mb_hsc_temp_c,
-      all:cb_cb_hsc1_temp_c,
-      all:cb_cb_hsc2_temp_c,
-      all:cb_cb_p0v8_1_vdd_temp_c,
-      all:cb_cb_p0v8_2_vdd_temp_c,
-      all:cb_cb_inlet_temp_c,
-      all:cb_cb_outlet_1_temp_c,
-      all:cb_cb_outlet_2_temp_c,
-      all:mc_mc_inlet_temp_c,
-      all:mc_mc_outlet_temp_c,
-      all:mc_mc_pu4_temp_c]))
-])
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd_0.3.bbappend b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd_0.3.bbappend
index bbcb1c2002f6..f730cbeca26a 100644
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd_0.3.bbappend
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fscd/fscd_0.3.bbappend
@@ -23,18 +23,14 @@ LOCAL_URI += " \
     file://zone-fsc-gta-8-retimer.fsc \
     file://fsc-config-gta-8-retimer-dis-vpdb.json \
     file://zone-fsc-gta-8-retimer-dis-vpdb.fsc \
-    file://fsc-config-gta-8-retimer-freya.json \
-    file://zone-fsc-gta-8-retimer-freya.fsc \
     "
 
 FSC_CONFIG += "fsc-config-gta-8-retimer.json \
                fsc-config-gta-8-retimer-dis-vpdb.json \
-               fsc-config-gta-8-retimer-freya.json \
 	          "
 
 FSC_ZONE_CONFIG +="zone-fsc-gta-8-retimer.fsc \
                    zone-fsc-gta-8-retimer-dis-vpdb.fsc \
-                   zone-fsc-gta-8-retimer-freya.fsc \
 	              "
 
 RDEPENDS:${PN} += "bash"
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fw-util/files/swb_cover.cpp b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fw-util/files/swb_cover.cpp
index faca62612113..4e50e9e1a688 100644
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fw-util/files/swb_cover.cpp
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/fw-util/files/swb_cover.cpp
@@ -17,6 +17,10 @@
 #define ACB_CPLD_ADDR 0x40
 #define MEB_CPLD_ADDR 0x40
 
+#define WAITING_ASIC_QSPI_APPLY_TIME_S 10
+#define WAITING_ASIC_PSOC_APPLY_TIME_S 65
+#define WAITING_APPLY_TIME_DEFAULT_S 0
+
 using namespace std;
 //MEB CXL VR Component
 class CxlVrComponent : public VrComponent {
@@ -48,15 +52,6 @@ struct fruid_map fru_map[] = {
   {FRU_MEB_JCN12, "mc_cxl2"},
 };
 
-class M2DevComponent : public Component {
-  protected:
-    uint8_t bus, eid, target;
-  public:
-    M2DevComponent(string fru, string comp, uint8_t bus, uint8_t eid, uint8_t target)
-      :  Component(fru, comp), bus(bus), eid(eid), target(target) {}
-    int get_version(json& j) override;
-};
-
 static int
 vr_master_wr_pre(const string &fru) {
   fru_status status = {0, 0};
@@ -245,82 +240,6 @@ int CxlVrComponent::get_version(json& j) {
   return FW_STATUS_SUCCESS;
 }
 
-int get_dev_ver(uint8_t bus, uint8_t eid, uint8_t target, vector<uint8_t> &data) {
-  uint8_t tbuf[MAX_TXBUF_SIZE] = {0};
-  uint8_t rbuf[MAX_RXBUF_SIZE] = {0};
-  uint8_t tlen=0;
-  size_t rlen = 0;
-  int rc;
-
-  tbuf[tlen++] = target;
-
-  rc = oem_pldm_ipmi_send_recv(bus, eid,
-                               NETFN_OEM_1S_REQ, CMD_OEM_1S_GET_FW_VER,
-                               tbuf, tlen,
-                               rbuf, &rlen, true);
-  if (rc == 0) {
-    data = vector<uint8_t>(rbuf, rbuf + rlen);
-  }
-  return rc;
-}
-
-int M2DevComponent::get_version(json& j) {
-  vector<uint8_t> version = {};
-  int ret = 0;
-  uint8_t fruid = 0;
-  uint8_t devid = 0;
-  uint8_t status = 0;
-
-  stringstream comp_str;
-
-  comp_str << this->alias_fru() << ' ' << this->alias_component();
-  string rw_str = comp_str.str();
-  transform(rw_str.begin(),rw_str.end(), rw_str.begin(),::toupper);
-  j["PRETTY_COMPONENT"] = rw_str;
-
-  ret = pal_get_fru_id((char *)this->alias_fru().c_str(), &fruid);
-  if (ret != 0) {
-    return FW_STATUS_FAILURE;
-  }
-
-  ret = pal_get_dev_id((char *)this->alias_component().c_str(), &devid);
-  if (ret != 0) {
-    return FW_STATUS_FAILURE;
-  }
-
-  ret = pal_is_dev_prsnt(fruid, devid, &status);
-  if (ret != 0) {
-    return FW_STATUS_FAILURE;
-  }
-
-  if (ret == 0 && status == FRU_NOT_PRSNT) {
-    j["VERSION"] = "NA (DEVICE NOT PRESENT)";
-    return FW_STATUS_SUCCESS;
-  }
-
-  ret = get_dev_ver(bus, eid, target, version);
-  if (ret != 0 || version.empty()) {
-    j["VERSION"] = "NA";
-  } else if (version[2] == NVME_NOT_READY) {
-    j["VERSION"] = "NA (NVME NOT READY)";
-  } else if (version[3] == IDENTIFIER_NOT_SUPPORT) {
-    j["VERSION"] = "NA (DEVICE IDENTIFIER NOT SUPPORT)";
-  } else if (version[4] != FFI_0_ACCELERATOR) {
-    j["VERSION"] = "NA (DEVICE NOT ACCELERATOR)";
-  } else {
-    stringstream ver_str;
-    ver_str << std::setfill('0')
-      << 'v'
-      << +version[5] << '.'  // major version
-      << +version[6] << '.'  // minor version
-      << +version[7] << '.'  // addition version
-      << +version[8] << '.'  // sec major version
-      << +version[9];        // sec minor version
-    j["VERSION"] = ver_str.str();
-  }
-  return FW_STATUS_SUCCESS;
-}
-
 namespace pldm_signed_info
 {
 GTSwbBicFwComponent acb_bic("cb", "bic", ACB_BIC_BUS, ACB_BIC_EID, BIC_COMP,
@@ -342,31 +261,54 @@ GTSwbPexFwComponent acb_pesw1("cb", "pesw1", ACB_BIC_BUS, ACB_BIC_EID, PEX1_COMP
 GtaBicFwRecoveryComponent cb_bic_recovery("cb", "bic_recovery", ACB_BIC_BUS, ACB_BIC_EID, BIC_COMP);
 GtaBicFwRecoveryComponent mc_bic_recovery("mc", "bic_recovery", MEB_BIC_BUS, MEB_BIC_EID, BIC_COMP);
 
-M2DevComponent cb_accl1_dev1("cb_accl1", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL1_DEV1_COMP);
-M2DevComponent cb_accl1_dev2("cb_accl1", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL1_DEV2_COMP);
-M2DevComponent cb_accl2_dev1("cb_accl2", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL2_DEV1_COMP);
-M2DevComponent cb_accl2_dev2("cb_accl2", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL2_DEV2_COMP);
-M2DevComponent cb_accl3_dev1("cb_accl3", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL3_DEV1_COMP);
-M2DevComponent cb_accl3_dev2("cb_accl3", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL3_DEV2_COMP);
-M2DevComponent cb_accl4_dev1("cb_accl4", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL4_DEV1_COMP);
-M2DevComponent cb_accl4_dev2("cb_accl4", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL4_DEV2_COMP);
-M2DevComponent cb_accl5_dev1("cb_accl5", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL5_DEV1_COMP);
-M2DevComponent cb_accl5_dev2("cb_accl5", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL5_DEV2_COMP);
-M2DevComponent cb_accl6_dev1("cb_accl6", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL6_DEV1_COMP);
-M2DevComponent cb_accl6_dev2("cb_accl6", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL6_DEV2_COMP);
-M2DevComponent cb_accl7_dev1("cb_accl7", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL7_DEV1_COMP);
-M2DevComponent cb_accl7_dev2("cb_accl7", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL7_DEV2_COMP);
-M2DevComponent cb_accl8_dev1("cb_accl8", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL8_DEV1_COMP);
-M2DevComponent cb_accl8_dev2("cb_accl8", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL8_DEV2_COMP);
-M2DevComponent cb_accl9_dev1("cb_accl9", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL9_DEV1_COMP);
-M2DevComponent cb_accl9_dev2("cb_accl9", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL9_DEV2_COMP);
-M2DevComponent cb_accl10_dev1("cb_accl10", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL10_DEV1_COMP);
-M2DevComponent cb_accl10_dev2("cb_accl10", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL10_DEV2_COMP);
-M2DevComponent cb_accl11_dev1("cb_accl11", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL11_DEV1_COMP);
-M2DevComponent cb_accl11_dev2("cb_accl11", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL11_DEV2_COMP);
-M2DevComponent cb_accl12_dev1("cb_accl12", "dev1", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL12_DEV1_COMP);
-M2DevComponent cb_accl12_dev2("cb_accl12", "dev2", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL12_DEV2_COMP);
-
+GTAASICComponent cb_accl1_dev1_psoc("cb_accl1", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL1_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl1_dev1_qspi("cb_accl1", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL1_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl1_dev2_psoc("cb_accl1", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL1_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl1_dev2_qspi("cb_accl1", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL1_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl2_dev1_psoc("cb_accl2", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL2_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl2_dev1_qspi("cb_accl2", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL2_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl2_dev2_psoc("cb_accl2", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL2_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl2_dev2_qspi("cb_accl2", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL2_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl3_dev1_psoc("cb_accl3", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL3_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl3_dev1_qspi("cb_accl3", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL3_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl3_dev2_psoc("cb_accl3", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL3_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl3_dev2_qspi("cb_accl3", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL3_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl4_dev1_psoc("cb_accl4", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL4_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl4_dev1_qspi("cb_accl4", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL4_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl4_dev2_psoc("cb_accl4", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL4_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl4_dev2_qspi("cb_accl4", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL4_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl5_dev1_psoc("cb_accl5", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL5_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl5_dev1_qspi("cb_accl5", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL5_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl5_dev2_psoc("cb_accl5", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL5_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl5_dev2_qspi("cb_accl5", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL5_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl6_dev1_psoc("cb_accl6", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL6_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl6_dev1_qspi("cb_accl6", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL6_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl6_dev2_psoc("cb_accl6", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL6_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl6_dev2_qspi("cb_accl6", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL6_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl7_dev1_psoc("cb_accl7", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL7_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl7_dev1_qspi("cb_accl7", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL7_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl7_dev2_psoc("cb_accl7", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL7_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl7_dev2_qspi("cb_accl7", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL7_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl8_dev1_psoc("cb_accl8", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL8_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl8_dev1_qspi("cb_accl8", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL8_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl8_dev2_psoc("cb_accl8", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL8_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl8_dev2_qspi("cb_accl8", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL8_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl9_dev1_psoc("cb_accl9", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL9_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl9_dev1_qspi("cb_accl9", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL9_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl9_dev2_psoc("cb_accl9", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL9_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl9_dev2_qspi("cb_accl9", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL9_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl10_dev1_psoc("cb_accl10", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL10_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl10_dev1_qspi("cb_accl10", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL10_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl10_dev2_psoc("cb_accl10", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL10_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl10_dev2_qspi("cb_accl10", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL10_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl11_dev1_psoc("cb_accl11", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL11_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl11_dev1_qspi("cb_accl11", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL11_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl11_dev2_psoc("cb_accl11", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL11_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl11_dev2_qspi("cb_accl11", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL11_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl12_dev1_psoc("cb_accl12", "dev1_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL12_DEV1_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl12_dev1_qspi("cb_accl12", "dev1_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL12_DEV1_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
+GTAASICComponent cb_accl12_dev2_psoc("cb_accl12", "dev2_psoc", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL12_DEV2_COMP, WAITING_ASIC_PSOC_APPLY_TIME_S);
+GTAASICComponent cb_accl12_dev2_qspi("cb_accl12", "dev2_qspi", ACB_BIC_BUS, ACB_BIC_EID, CB_ACCL12_DEV2_COMP, WAITING_ASIC_QSPI_APPLY_TIME_S);
 
 bool is_cxl_present() {
   uint8_t i = 0;
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/healthd/files/healthd-config.json b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/healthd/files/healthd-config.json
new file mode 100644
index 000000000000..32cd52ee4e2b
--- /dev/null
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/healthd/files/healthd-config.json
@@ -0,0 +1,57 @@
+{
+  "version": "1.0",
+  "heartbeat": {
+    "interval": 500
+  },
+  "bmc_cpu_utilization" : {
+    "enabled": true,
+    "window_size": 120,
+    "monitor_interval": 1,
+    "threshold": [
+      {
+        "value": 85.0,
+        "hysteresis" : 5.0,
+        "action": ["log-warning", "bmc-error-trigger"]
+      }
+    ]
+  },
+  "bmc_mem_utilization" : {
+    "enabled": true,
+    "enable_panic_on_oom": true,
+    "window_size": 120,
+    "monitor_interval": 1,
+    "threshold": [
+      {
+        "value": 70.0,
+        "hysteresis" : 5.0,
+        "action": ["log-warning", "bmc-error-trigger"]
+      },
+      {
+        "value": 90.0,
+        "hysteresis" : 5.0,
+        "action": ["bmc-mem-clear"]
+      },
+      {
+        "value": 95.0,
+        "hysteresis" : 5.0,
+        "action": ["log-critical", "bmc-error-trigger", "reboot"]
+      }
+    ]
+  },
+  "i2c": {
+    "enabled": false,
+    "busses": [0,1,2,3,4,5,6,7,8,9,11,12,13,14,15]
+  },
+  "bic_health": {
+    "enabled": true,
+    "fru": [16,17],
+    "monitor_interval": 60
+  },
+  "verified_boot": {
+    "enabled": true
+  },
+  "bmc_timestamp": {
+    "enabled": true
+  }
+}
+
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/healthd/healthd_0.1.bbappend b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/healthd/healthd_0.1.bbappend
new file mode 100644
index 000000000000..48a6df870781
--- /dev/null
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/healthd/healthd_0.1.bbappend
@@ -0,0 +1,6 @@
+# Copyright 2015-present Facebook. All Rights Reserved.
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+LOCAL_URI += "file://healthd-config.json"
+
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/mTerm/files/mTerm-service-setup.sh b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/mTerm/files/mTerm-service-setup.sh
index 528b5c63f3c8..82edc1729c1c 100644
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/mTerm/files/mTerm-service-setup.sh
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/mTerm/files/mTerm-service-setup.sh
@@ -6,11 +6,16 @@ runsv /etc/sv/mTerm1 > /dev/null 2>&1 &
 runsv /etc/sv/mTerm2 > /dev/null 2>&1 &
 runsv /etc/sv/mTerm3 > /dev/null 2>&1 &
 
+# Artemis Module mTerm Service disable as default
+kv set dev_mterm_service_status disable
+
 for i in {1..12}
 do
     for j in {1..2}
     do
         runsv "/etc/sv/mTerm"$i"_"$j"" 2>&1 &
+        sleep 1
+        sv stop "/etc/sv/mTerm"$i"_"$j""
     done
 done
 
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/obmc-pldm/files/platform_sensor.cpp b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/obmc-pldm/files/platform_sensor.cpp
index 882cab91b99d..13b8345999e9 100644
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/obmc-pldm/files/platform_sensor.cpp
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/obmc-pldm/files/platform_sensor.cpp
@@ -85,7 +85,11 @@ std::string get_state_message(uint8_t offset, uint8_t state)
     {"unknown", "present", "not present"},                                    // sensorOffset = 0: presentence
     {"unknown", "normal",  "alert"},                                          // sensorOffset = 1: status
     {"no power good", "power good fail", "power good fail (3V3 power fault)",
-     "power good fail (12V power fault)", "power good fail (3V3 aux fault)"}, // sensorOffset = 2: power status
+     "power good fail (12V power fault)", "power good fail (3V3 aux fault)",
+     "power good fault", "no power good (3V3 power fault)",
+     "no power good (12V power fault)", "no power good (3V3 aux fault)", 
+     "power good fail (12V aux power fault)",
+     "no power good (12V aux power fault)"},                                  // sensorOffset = 2: power status
     {"unknown", "nvme not ready", "nvme ready"},                              // sensorOffset = 3: nvme status
   };
 
@@ -195,16 +199,19 @@ void set_sensor_state_work(uint16_t id, uint8_t offset, uint8_t state)
     if (offset == CB_ASIC_NVME_STATUS_OFFSET) {
       uint8_t index = id - CB_ASIC_SENSOR_START_ID;
       char key[MAX_KEY_LEN] = {0};
+      char version_key[MAX_KEY_LEN] = {0};
       sprintf(key, "is_asic%d_ready", index);
+      sprintf(version_key, "asic%d_ver", index);
 
       switch (state) {
         case CB_ASIC_NVME_NOT_READY_STATE:
-	  if (kv_set(key, "0", 0, 0) != 0) {
-	    syslog(LOG_WARNING, "Set ASIC nvme status fail, index: 0x%x, state: not ready", index);
-	  }
+          if (kv_set(key, "0", 0, 0) != 0) {
+            syslog(LOG_WARNING, "Set ASIC nvme status fail, index: 0x%x, state: not ready", index);
+          }
+          kv_del(version_key, 0);
           break;
         case CB_ASIC_NVME_READY_STATE:
-	  if (kv_set(key, "1", 0, 0) != 0) {
+          if (kv_set(key, "1", 0, 0) != 0) {
             syslog(LOG_WARNING, "Set ASIC nvme status fail, index: 0x%x, state: ready", index);
           }
           break;
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/setup-dev-uart.sh b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/setup-dev-uart.sh
index 97ec165ce950..d7c49ab076f9 100644
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/setup-dev-uart.sh
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/setup-dev-uart.sh
@@ -104,7 +104,6 @@ start_dev_connect() {
 }
 
 if [ "$3" == "start" ]; then
-  /bin/sleep 30 # wait for usb init
   start_dev_connect "$1" "$2"
 else
   exit "$EXIT_ERROR";
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/sol-util b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/sol-util
index c921f27d615e..34887980b019 100644
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/sol-util
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/sol-util
@@ -29,15 +29,14 @@ usage() {
   echo "       sol-util [ cb_accl[1..12]_[1..2] ] uart[0..3] (baudrate)"
   echo "       uart0: CCP  uart1: M7  uart2: PE  uart3: PSOC"
   echo ""
-  echo "       [FAC & Freya Module]:"
-  echo "       sol-util [ cb_accl[1..12]_[1..2] ] fac_uart[0..3] (baudrate)"
-  echo ""
   echo "       sol-util mc [cxl1 | cxl2 ... cxl8] (baudrate)"
   echo "       sol-util [ mb | cb | mc ] --history"
   echo "       sol-util [ cb_accl[1..12]_[1..2] uart0 --history ]"
   echo "       e.g. sol-util cb_accl1_1 uart0"
   echo "       e.g. sol-util cb_accl1_1 fac_uart0"
   echo "       e.g. sol-util mc cxl1"
+  echo ""
+  echo "       sol-util cb_accl uart0 --history [ enable | disable | status ]"
   exit 1
 }
 
@@ -597,510 +596,6 @@ get_artemis_module_usb_dev() {
   echo "-s ${baudrate} ${prefix}${usb_path}"
 }
 
-get_freya_module_usb_dev() {
-  local usb_path=""
-  local baudrate="57600"
-  local prefix="/dev/serial/by-path/"
-  local slot="$1"
-  local comp="$2"
-  local retry=3
-
-  [ -n "$3" ] && baudrate="$3"
-
-  case $slot in
-    cb_accl1_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.3.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.3.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.3.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.3.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl1_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.3.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.3.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.3.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.3.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl2_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.2.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.2.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.2.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.2.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl2_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.2.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.2.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.2.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.2.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl3_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.1.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.1.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.1.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.1.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl3_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.1.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.1.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.1.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.4.1.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl4_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.3.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.3.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.3.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.3.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl4_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.3.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.3.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.3.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.3.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl5_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.2.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.2.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.2.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.2.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl5_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.2.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.2.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.2.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.2.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl6_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.1.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.1.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.1.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.1.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl6_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.1.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.1.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.1.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.2.1.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl7_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.3.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.3.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.3.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.3.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl7_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.3.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.3.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.3.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.3.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl8_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.2.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.2.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.2.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.2.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl8_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.2.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.2.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.2.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.2.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl9_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.1.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.1.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.1.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.1.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl9_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.1.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.1.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.1.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.4.1.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl10_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.3.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.3.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.3.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.3.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl10_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.3.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.3.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.3.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.3.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl11_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.2.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.2.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.2.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.2.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl11_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.2.4:1.0-port0"
-        ;;
-       fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.2.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.2.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.2.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl12_1)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.1.3:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.1.3:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.1.3:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.1.3:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    cb_accl12_2)
-      case $comp in
-        fac_uart0)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.1.4:1.0-port0"
-        ;;
-        fac_uart1)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.1.4:1.1-port0"
-        ;;
-        fac_uart2)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.1.4:1.2-port0"
-        ;;
-        fac_uart3)
-          usb_path="platform-1e6a3000.usb-usb-0:1.1.1.1.4:1.3-port0"
-        ;;
-        *)
-          echo "The $comp is invalid"
-          exit "$EXIT_ERROR";
-        ;;
-      esac
-    ;;
-    *)
-      echo "The $slot is invalid"
-      exit "$EXIT_ERROR"
-  esac
-
-  if [ "$(check_file_exist "${prefix}${usb_path}" ${retry})" = 0 ]; then
-    echo "The $usb_path is invalid"
-    exit "$EXIT_ERROR";
-  fi
-
-  echo "-s ${baudrate} ${prefix}${usb_path}"
-}
-
 get_mc_usb_dev() {
   local usb_path=""
   local baudrate="115200"
@@ -1158,14 +653,48 @@ get_mc_usb_dev() {
   echo "-s ${baudrate} ${prefix}${usb_path}"
 }
 
+accl_mterm_service_control() {
+  local status=$1
+  for i in {1..12}
+  do
+    for j in {1..2}
+    do
+      if [ "$1" == "enable" ] && [ "$dev_service_status" == "disable" ] ; then
+        sv start "mTerm"$i"_"$j""
+      elif [ "$1" == "disable" ] && [ "$dev_service_status" == "enable" ]; then
+        sv stop "mTerm"$i"_"$j""
+      else
+        echo "Please Check the Status of ACCL Uart0 mTerm Service"
+        exit "$EXIT_ERROR";
+      fi
+    done
+  done
+  kv set dev_mterm_service_status "$1"
+  echo "Artemis Module mTerm Service (Uart0 History) is "$1"d"
+}
+
 SLOT=
 COMP=
+dev_service_status=$(kv get dev_mterm_service_status)
 
-if [[ $# -gt 3  ||  $# -lt 1 ]]; then
+if [[ $# -gt 4  ||  $# -lt 1 ]]; then
   usage
   exit "$EXIT_ERROR";
 fi
 
+# Set Artemis Module mTerm Service on or off (History)
+if [ $# -eq 4 ] && [ "$3" == "--history" ]; then
+  if [ "$1" == "cb_accl" ] && [ "$2" == "uart0" ] && [ "$4" == "enable" ] || [ "$4" == "disable" ]; then
+    accl_mterm_service_control "$4"
+  elif  [ "$1" == "cb_accl" ] && [ "$2" == "uart0" ] && [ "$4" == "status" ]; then
+    echo "Artemis Module mTerm Service (Uart0 History) is "$dev_service_status"d"
+  else
+    usage
+    exit "$EXIT_ERROR";
+  fi
+  exit 0
+fi
+
 if [ "$1" = "mb" ] || [ "$1" = "cb" ] || [ "$1" = "mc" ] || [[ "$1" =~ ^(cb_accl([1-9]|1[0-2])_(1|2))$ ]]; then
   SLOT=$1
   if [ $# -eq 2 ] && [ "$2" == "--history" ]; then
@@ -1178,9 +707,6 @@ if [ "$1" = "mb" ] || [ "$1" = "cb" ] || [ "$1" = "mc" ] || [[ "$1" =~ ^(cb_accl
       cat "$ATM_LOGFILE" 2>/dev/null
       exit 0;
     fi
-  # For FAC + Freya Module
-  elif [[ "$SLOT" =~ ^(cb_accl([1-9]|1[0-2])_(1|2))$ ]] && [[ "$2" =~ ^(fac_uart[0-3])$ ]]; then
-    COMP=$2
   elif [ "$SLOT" = "mc" ] && [[ "$2" =~ ^(cxl[1-8])$ ]]; then
     COMP=$2
   else
@@ -1212,13 +738,11 @@ if [ -n "$COMP" ]; then
   fi
 
   if [[ "$SLOT" =~ ^(cb_accl([1-9]|1[0-2])_(1|2))$ ]]; then
-    if [[ "$COMP" = "uart0" ]]; then
+    if [ "$COMP" = "uart0" ] && [ "$dev_service_status" = "enable" ]; then
       exec /usr/local/bin/mTerm_client ""$SLOT"_"$COMP""
       exit 0
     elif [[ "$COMP" =~ ^(uart[0-3])$ ]]; then
       read -r PARAMETER BAUDRATE USB_PATH <<< "$(get_artemis_module_usb_dev "$SLOT" "$COMP" "$BAUDRATE")"
-    elif [[ "$COMP" =~ ^(fac_uart[0-3])$ ]]; then
-      read -r PARAMETER BAUDRATE USB_PATH <<< "$(get_freya_module_usb_dev "$SLOT" "$COMP" "$BAUDRATE")"
     else
       usage
       exit "$EXIT_ERROR";
diff --git a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/usb-util b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/usb-util
index ef6eededa122..d7af3704d78d 100644
--- a/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/usb-util
+++ b/meta-facebook/meta-grandteton/meta-gtartemis/recipes-gtartemis/plat-utils/files/usb-util
@@ -25,11 +25,6 @@ show_usage() {
     echo "       usb-util bus-id cb_accl[1..12]_[1..2] port"
     echo "       usb-util [ bind | unbind ] cb port "
     echo "       usb-util [ bind | unbind ] cb_accl[1..12]_[1..2] port"
-    echo "       [FAC & Freya Module]:"
-    echo "       usb-util bus-id cb fac_port"
-    echo "       usb-util [ bind | unbind ] cb fac_port "
-    echo "       usb-util bus-id cb_accl[1..12]_[1..2] fac_port"
-    echo "       usb-util [ bind | unbind ] cb_accl[1..12]_[1..2] fac_port"
 }
 
 check_file_exist() {
@@ -132,95 +127,12 @@ get_artemis_bus_id() {
     esac
 }
 
-get_freya_bus_id() {
-    case "$fru" in
-        cb_accl1_1)
-        busid="1-1.1.2.4.3.1"
-    ;;
-        cb_accl1_2)
-        busid="1-1.1.2.4.3.2"
-    ;;
-        cb_accl2_1)
-        busid="1-1.1.2.4.2.1"
-    ;;
-        cb_accl2_2)
-        busid="1-1.1.2.4.2.2"
-    ;;
-        cb_accl3_1)
-        busid="1-1.1.2.4.1.1"
-    ;;
-        cb_accl3_2)
-        busid="1-1.1.2.4.1.2"
-    ;;
-        cb_accl4_1)
-        busid="1-1.1.2.3.1"
-    ;;
-        cb_accl4_2)
-        busid="1-1.1.2.3.2"
-    ;;
-        cb_accl5_1)
-        busid="1-1.1.2.2.1"
-    ;;
-        cb_accl5_2)
-        busid="1-1.1.2.2.2"
-    ;;
-        cb_accl6_1)
-        busid="1-1.1.2.1.1"
-    ;;
-        cb_accl6_2)
-        busid="1-1.1.2.1.2"
-    ;;
-        cb_accl7_1)
-        busid="1-1.1.1.4.3.1"
-    ;;
-        cb_accl7_2)
-        busid="1-1.1.1.4.3.2"
-    ;;
-        cb_accl8_1)
-        busid="1-1.1.1.4.2.1"
-    ;;
-        cb_accl8_2)
-        busid="1-1.1.1.4.2.2"
-    ;;
-        cb_accl9_1)
-        busid="1-1.1.1.4.1.1"
-    ;;
-        cb_accl9_2)
-        busid="1-1.1.1.4.1.2"
-    ;;
-        cb_accl10_1)
-        busid="1-1.1.1.3.1"
-    ;;
-        cb_accl10_2)
-        busid="1-1.1.1.3.2"
-    ;;
-        cb_accl11_1)
-        busid="1-1.1.1.2.1"
-    ;;
-        cb_accl11_2)
-        busid="1-1.1.1.2.2"
-    ;;
-        cb_accl12_1)
-        busid="1-1.1.1.1.1"
-    ;;
-        cb_accl12_2)
-        busid="1-1.1.1.1.2"
-    ;;
-        *)
-        show_usage
-        exit "$EXIT_ERROR";
-    ;;
-    esac
-}
-
 get_bus_id() {
     local i=0
     local k=0
     if [[ "$fru" =~ ^(cb_accl([1-9]|1[0-2])_(1|2))$ ]]; then
         if [[ "$dev" = "port" ]]; then
             get_artemis_bus_id
-        elif [[ "$dev" = "fac_port" ]]; then
-            get_freya_bus_id
         else
             show_usage
             exit "$EXIT_ERROR";
@@ -234,8 +146,6 @@ get_bus_id() {
                 fru=cb_accl"$i"_"$k"
                 if [[ "$dev" = "port" ]]; then
                     get_artemis_bus_id
-                elif [[ "$dev" == "fac_port" ]]; then
-                    get_freya_bus_id
                 else
                     show_usage
                     exit "$EXIT_ERROR";
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-grandteton/meta-inspirationpoint/conf/templates/default/bblayers.conf.sample
index 0332f327b5f1..3f233b3b0c0a 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -22,7 +21,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/crashdump/files/autodump.sh b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/crashdump/files/autodump.sh
index d6f1d420c577..b249e95d17b6 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/crashdump/files/autodump.sh
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/crashdump/files/autodump.sh
@@ -73,6 +73,11 @@ CURT_DTIME=$(date +"%Y%m%d-%H%M%S")
 LOG_ARCHIVE="/mnt/data/fru1_ras-error${PREVIOUS_INDEX}_${CURT_DTIME}.tar.gz"
 $DUMP_UTIL --fru 1 --ncpu 2 --cid "${CPUID[@]}"
 
+if [ ! -f "$DUMP_FILE" ]; then
+  logger -t "ipmid" -p daemon.crit "Auto dump was terminated w/o generating a cper file"
+  exit 1
+fi
+
 [ -r $CURRENT_INDEX_FILE ] && CURRENT_INDEX=$(cat $CURRENT_INDEX_FILE) || CURRENT_INDEX=0
 if [ "$PREVIOUS_INDEX" == "$CURRENT_INDEX" ]; then
   DUMP_FILE=
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/fsc-config-8-retimer-ubb.json b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/fsc-config-8-retimer-ubb.json
index a2ae9a8c2276..397b6b2e8b58 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/fsc-config-8-retimer-ubb.json
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/fsc-config-8-retimer-ubb.json
@@ -1,5 +1,5 @@
 {
-    "version": "inspirationpint_MI300X_v2",
+    "version": "inspirationpint_MI300X_v5",
     "pwm_transition_value": 100,
     "pwm_boost_value": 100,
     "sample_interval_ms": 3000,
@@ -199,16 +199,17 @@
           "util" : "/usr/local/bin/sensor-util"
         },
         "type": "linear",
-        "positive_hysteresis": 1,
+        "positive_hysteresis": 0,
         "negative_hysteresis": 1,
         "data": [
           [49, 25],
           [65, 35],
           [67, 40],
           [70, 45],
-          [75, 55],
-          [81, 68],
-          [84, 75],
+          [73, 50],
+          [75, 53],
+          [80, 68],
+          [82, 75],
           [95, 100]
         ]
       },
@@ -219,8 +220,8 @@
         "type": "pid",
         "positive_hysteresis": 0,
         "negative_hysteresis": 2,
-        "setpoint": 93,
-        "kp": -3.5,
+        "setpoint": 85,
+        "kp": -5.5,
         "ki": -0.035,
         "kd": 0
       },
@@ -229,18 +230,15 @@
           "util" : "/usr/local/bin/sensor-util"
         },
         "type": "linear",
-        "positive_hysteresis": 1,
+        "positive_hysteresis": 0,
         "negative_hysteresis": 1,
         "data": [
           [80, 25],
           [84, 30],
-          [86, 33],
-          [87, 40],
-          [90, 45],
-          [93, 50],
-          [96, 70],
-          [98, 75],
-          [100, 83],
+          [87, 35],
+          [92, 45],
+          [96, 53],
+          [98, 70],
           [105, 100]
         ]
       },
@@ -251,7 +249,7 @@
         "type": "pid",
         "positive_hysteresis": 0,
         "negative_hysteresis": 2,
-        "setpoint": 102,
+        "setpoint": 105,
         "kp": -5.5,
         "ki": -0.035,
         "kd": 0
@@ -261,7 +259,7 @@
           "util" : "/usr/local/bin/sensor-util"
         },
         "type": "linear",
-        "positive_hysteresis": 1,
+        "positive_hysteresis": 0,
         "negative_hysteresis": 1,
         "data": [
           [63, 25],
@@ -277,7 +275,7 @@
           "util" : "/usr/local/bin/sensor-util"
         },
         "type": "pid",
-        "positive_hysteresis": 2,
+        "positive_hysteresis": 0,
         "negative_hysteresis": 2,
         "setpoint": 97,
         "kp": -3.5,
@@ -301,7 +299,7 @@
           "util" : "/usr/local/bin/sensor-util"
         },
         "type": "linear",
-        "positive_hysteresis": 1,
+        "positive_hysteresis": 0,
         "negative_hysteresis": 1,
         "data": [
           [65, 25],
@@ -314,7 +312,7 @@
           "util" : "/usr/local/bin/sensor-util"
         },
         "type": "pid",
-        "positive_hysteresis": 1,
+        "positive_hysteresis": 0,
         "negative_hysteresis": 2,
         "setpoint": 93,
         "kp": -3.5,
@@ -401,7 +399,7 @@
           "util" : "/usr/local/bin/sensor-util"
         },
         "type": "linear",
-        "positive_hysteresis": 1,
+        "positive_hysteresis": 0,
         "negative_hysteresis": 1,
         "data": [
           [65, 25],
@@ -415,7 +413,7 @@
           "util" : "/usr/local/bin/sensor-util"
         },
         "type": "pid",
-        "positive_hysteresis": 1,
+        "positive_hysteresis": 0,
         "negative_hysteresis": 2,
         "setpoint": 93,
         "kp": -3.5,
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/fsc_board.py b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/fsc_board.py
index fac90655106c..2c6f1aad2d44 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/fsc_board.py
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/fsc_board.py
@@ -220,7 +220,7 @@ def sensor_valid_check(board, sname, check_name, attribute):
                     else:
                         return 0
                     asic_index = int(gta_asic_start_index_map[snr_split[0]]["asic_card_start_index"]) + int(snr_split[2]) - 1
-                    if lpal_hndl.pal_is_asic_nvme_ready(int(asic_index)) is not True:
+                    if (lpal_hndl.pal_is_asic_nvme_ready(int(asic_index)) == False):
                         return 0
             # check power status first
             pwr_sts = bmc_read_power()
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/zone-8-retimer-ubb.fsc b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/zone-8-retimer-ubb.fsc
index 6864c401fb13..cc4b09ef7b91 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/zone-8-retimer-ubb.fsc
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/fscd/fscd/zone-8-retimer-ubb.fsc
@@ -99,24 +99,24 @@ max([
 
   gpu_tray_gpu_linear(
     max([
-      all:ubb_ubb_gpu_1_temp_0_c,
-      all:ubb_ubb_gpu_2_temp_0_c,
-      all:ubb_ubb_gpu_3_temp_0_c,
-      all:ubb_ubb_gpu_4_temp_0_c,
-      all:ubb_ubb_gpu_5_temp_0_c,
-      all:ubb_ubb_gpu_6_temp_0_c,
-      all:ubb_ubb_gpu_7_temp_0_c,
-      all:ubb_ubb_gpu_8_temp_0_c])) +
+      all:ubb_ubb_oam_0_temp_0_c,
+      all:ubb_ubb_oam_1_temp_0_c,
+      all:ubb_ubb_oam_2_temp_0_c,
+      all:ubb_ubb_oam_3_temp_0_c,
+      all:ubb_ubb_oam_4_temp_0_c,
+      all:ubb_ubb_oam_5_temp_0_c,
+      all:ubb_ubb_oam_6_temp_0_c,
+      all:ubb_ubb_oam_7_temp_0_c])) +
   gpu_tray_gpu_pid(
     max([
-      all:ubb_ubb_gpu_1_temp_0_c,
-      all:ubb_ubb_gpu_2_temp_0_c,
-      all:ubb_ubb_gpu_3_temp_0_c,
-      all:ubb_ubb_gpu_4_temp_0_c,
-      all:ubb_ubb_gpu_5_temp_0_c,
-      all:ubb_ubb_gpu_6_temp_0_c,
-      all:ubb_ubb_gpu_7_temp_0_c,
-      all:ubb_ubb_gpu_8_temp_0_c])),
+      all:ubb_ubb_oam_0_temp_0_c,
+      all:ubb_ubb_oam_1_temp_0_c,
+      all:ubb_ubb_oam_2_temp_0_c,
+      all:ubb_ubb_oam_3_temp_0_c,
+      all:ubb_ubb_oam_4_temp_0_c,
+      all:ubb_ubb_oam_5_temp_0_c,
+      all:ubb_ubb_oam_6_temp_0_c,
+      all:ubb_ubb_oam_7_temp_0_c])),
 
   gpu_tray_retimer_linear(
     max([
@@ -141,24 +141,24 @@ max([
 
   gpu_tray_hbm_linear(
     max([
-      all:ubb_ubb_gpu_1_dram_temp_c,
-      all:ubb_ubb_gpu_2_dram_temp_c,
-      all:ubb_ubb_gpu_3_dram_temp_c,
-      all:ubb_ubb_gpu_4_dram_temp_c,
-      all:ubb_ubb_gpu_5_dram_temp_c,
-      all:ubb_ubb_gpu_6_dram_temp_c,
-      all:ubb_ubb_gpu_7_dram_temp_c,
-      all:ubb_ubb_gpu_8_dram_temp_c])) +
+      all:ubb_ubb_oam_0_dram_temp_c,
+      all:ubb_ubb_oam_1_dram_temp_c,
+      all:ubb_ubb_oam_2_dram_temp_c,
+      all:ubb_ubb_oam_3_dram_temp_c,
+      all:ubb_ubb_oam_4_dram_temp_c,
+      all:ubb_ubb_oam_5_dram_temp_c,
+      all:ubb_ubb_oam_6_dram_temp_c,
+      all:ubb_ubb_oam_7_dram_temp_c])) +
   gpu_tray_hbm_pid(
     max([
-      all:ubb_ubb_gpu_1_dram_temp_c,
-      all:ubb_ubb_gpu_2_dram_temp_c,
-      all:ubb_ubb_gpu_3_dram_temp_c,
-      all:ubb_ubb_gpu_4_dram_temp_c,
-      all:ubb_ubb_gpu_5_dram_temp_c,
-      all:ubb_ubb_gpu_6_dram_temp_c,
-      all:ubb_ubb_gpu_7_dram_temp_c,
-      all:ubb_ubb_gpu_8_dram_temp_c])),
+      all:ubb_ubb_oam_0_dram_temp_c,
+      all:ubb_ubb_oam_1_dram_temp_c,
+      all:ubb_ubb_oam_2_dram_temp_c,
+      all:ubb_ubb_oam_3_dram_temp_c,
+      all:ubb_ubb_oam_4_dram_temp_c,
+      all:ubb_ubb_oam_5_dram_temp_c,
+      all:ubb_ubb_oam_6_dram_temp_c,
+      all:ubb_ubb_oam_7_dram_temp_c])),
 
   gpu_tray_hsc_linear(
     max([
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/gpiod/files/gpiod_cover.cpp b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/gpiod/files/gpiod_cover.cpp
index e42a8778ea3b..0dd01259dbea 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/gpiod/files/gpiod_cover.cpp
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/gpiod/files/gpiod_cover.cpp
@@ -248,7 +248,7 @@ cpu_prochot_handler_wrapper(gpiopoll_pin_t *desc, gpio_value_t last, gpio_value_
 }
 
 int
-gta_mb_power_fault_handle(uint8_t* temp_mb_resp) {
+gta_power_fault_handle(uint8_t* temp_mb_resp) {
   int i2cfd = 0, ret = -1;
   uint8_t tlen = 0, rlen = 0;
   uint8_t tbuf[MAX_I2C_TXBUF_SIZE] = {0};
@@ -273,6 +273,95 @@ gta_mb_power_fault_handle(uint8_t* temp_mb_resp) {
   return ret;
 }
 
+void
+gta_mb_power_fault_handle(uint8_t* temp_mb_resp) {
+  int i2cfd = 0, ret = -1;
+  uint8_t tlen = 0, rlen = 0;
+  uint8_t pwr_fault_str_location = 0, pwr_fault_status = 0;
+  uint8_t tbuf[MAX_I2C_TXBUF_SIZE] = {0};
+  uint8_t rbuf[MAX_I2C_RXBUF_SIZE] = {0};
+  const uint8_t mb_stby_fault_offset[2] = {MB_STBY_PWR_FAULT_OFFSET, MB_STBY_PWR_FAULT_TIMEOUE_OFFSET};
+  const uint8_t mb_normal_fault_offset[4] = {MB_NORMAL_PWR_FAULT_A_OFFSET, MB_NORMAL_PWR_FAULT_B_OFFSET, MB_NORMAL_PWR_FAULT_TIMEOUT_A_OFFSET, MB_NORMAL_PWR_FAULT_TIMEOUT_B_OFFSET};
+  const char *pwr_fault_status_str[2] = {"Power Good Drop", "No Power Good"};
+  const char *mb_stby_fault[8] = {"PVDD18_S5_P1", "PVDD18_S5_P0", "PVDD33_S5", "P1V2_PG", "P1V8_PG", "", "", ""};
+  const char *mb_normal_fault[2][8] = {{"PVDD11_S3_P1", "PVDD11_S3_P0", "P1V8_RETIMER_CPU1", "P1V8_RETIMER_CPU0", "P0V9_RETIMER_CPU1", "P0V9_RETIMER_CPU0", "", ""},
+                                       {"PVDDCR_CPU1_P1", "PVDDCR_CPU1_P0", "PVDDCR_CPU0_P1", "PVDDCR_CPU0_P0", "PVDDCR_SOC_P1", "PVDDCR_SOC_P0", "PVDDIO_P1", "PVDDIO_P0"},
+                                      };  
+  if ((temp_mb_resp[0] & MB_NORMAL_PWR_FAULT_MASK) == MB_NORMAL_PWR_FAULT_MASK) {
+    i2cfd = i2c_cdev_slave_open(I2C_BUS_7, GTA_MB_CPLD_ADDR >> 1, I2C_SLAVE_FORCE_CLAIM);
+    if (i2cfd < 0) {
+      syslog(LOG_ERR, "%s(): fail to open device: I2C BUS: %d", __func__, I2C_BUS_7);
+      return;
+    }
+    for (uint8_t i = 0; i < ARRAY_SIZE(mb_normal_fault_offset); i ++) {
+      tbuf[0] = mb_normal_fault_offset[i];
+      tlen = 1;
+      rlen = 1;
+      ret = i2c_rdwr_msg_transfer(i2cfd, GTA_MB_CPLD_ADDR, tbuf, tlen, rbuf, rlen);
+      if (ret < 0) {
+        syslog(LOG_WARNING, "%s() I2C transfer to MB CPLD failed, RET: %d", __func__, ret);
+        i2c_cdev_slave_close(i2cfd);
+        return;
+      }
+
+      switch (mb_normal_fault_offset[i]) {
+        case MB_NORMAL_PWR_FAULT_A_OFFSET:
+          pwr_fault_status = POWER_GOOD_DROP;
+          pwr_fault_str_location = MB_PWR_FAULT_A_LOCATION;
+          break;
+        case MB_NORMAL_PWR_FAULT_B_OFFSET:
+          pwr_fault_status = POWER_GOOD_DROP;
+          pwr_fault_str_location = MB_PWR_FAULT_B_LOCATION;
+          break;
+        case MB_NORMAL_PWR_FAULT_TIMEOUT_A_OFFSET:
+          pwr_fault_status = NO_POWER_GOOD;
+          pwr_fault_str_location = MB_PWR_FAULT_A_LOCATION;
+          break;
+        case MB_NORMAL_PWR_FAULT_TIMEOUT_B_OFFSET:
+          pwr_fault_status = NO_POWER_GOOD;
+          pwr_fault_str_location = MB_PWR_FAULT_B_LOCATION;
+          break;
+        default:
+          syslog(LOG_WARNING, "%s() FRU: %u Invalid Power Fault Offset: 0x%2x\n", __func__, FRU_MB, mb_normal_fault_offset[i]);
+          i2c_cdev_slave_close(i2cfd);
+          return;
+      }
+      for (uint8_t j = 0; j < BITS_PER_BYTE; j ++) {
+        if (GETBIT(rbuf[0], j)) {
+          syslog(LOG_CRIT, "FRU: %u Normal Power Fault\n", FRU_MB);
+          syslog(LOG_CRIT, "FRU: %u Normal Power Fault Event: %s Assert (%s)\n", FRU_MB, mb_normal_fault[pwr_fault_str_location][j], pwr_fault_status_str[pwr_fault_status]);
+        }
+      }
+    }
+    i2c_cdev_slave_close(i2cfd);
+  } else if ((temp_mb_resp[0] & MB_STBY_PWR_FAULT_MASK) == MB_STBY_PWR_FAULT_MASK) {
+    i2cfd = i2c_cdev_slave_open(I2C_BUS_7, GTA_MB_CPLD_ADDR >> 1, I2C_SLAVE_FORCE_CLAIM);
+    if (i2cfd < 0) {
+      syslog(LOG_ERR, "%s(): fail to open device: I2C BUS: %d", __func__, I2C_BUS_7);
+      return;
+    }
+    for (uint8_t i = 0; i < ARRAY_SIZE(mb_stby_fault_offset); i ++) {
+      tbuf[0] = mb_stby_fault_offset[i];
+      tlen = 1;
+      rlen = 1;
+      ret = i2c_rdwr_msg_transfer(i2cfd, GTA_MB_CPLD_ADDR, tbuf, tlen, rbuf, rlen);
+      if (ret < 0) {
+        syslog(LOG_WARNING, "%s() I2C transfer to CB CPLD failed, RET: %d", __func__, ret);
+        i2c_cdev_slave_close(i2cfd);
+        return;
+      }
+      for (uint8_t j = 0; j < BITS_PER_BYTE; j ++) {
+        if (GETBIT(rbuf[0], j)) {
+          syslog(LOG_CRIT, "FRU: %u STBY Power Fault\n", FRU_MB);
+          syslog(LOG_CRIT, "FRU: %u STBY Power Fault Event: %s Assert (%s)\n", FRU_MB, mb_stby_fault[j], pwr_fault_status_str[i]);
+        }
+      }
+    }
+    i2c_cdev_slave_close(i2cfd);
+  }
+  return;
+}
+
 void
 gta_cb_power_fault_handle(uint8_t* temp_mb_resp) {
   int i2cfd = 0, ret = 0;
@@ -420,19 +509,37 @@ gta_mc_power_fault_handle(uint8_t* temp_mb_resp) {
 static void*
 delay_pwr_fault_log(void *arg) {
   uint8_t temp_mb_resp[3] = {0};
+  uint8_t cb_prsnt = 0;
+  uint8_t mc_prsnt = 0;
+  int ret = 0;
 
   pthread_detach(pthread_self());
   /* prevent false alarm when MB CPLD handling Power Fault
   */
   msleep(DELAY_LOG_POWER_FAULT_MS);
 
-  if (gta_mb_power_fault_handle(temp_mb_resp) < 0) {
+  if (gta_power_fault_handle(temp_mb_resp) < 0) {
     syslog(LOG_WARNING, "%s() MB CPLD I2C connection failed", __func__);
   } else {
-    gta_cb_power_fault_handle(temp_mb_resp);
-    gta_mc_power_fault_handle(temp_mb_resp);
+    ret = pal_is_fru_prsnt(FRU_ACB, &cb_prsnt);
+    if (ret < 0) {
+      syslog(LOG_WARNING, "%s() Get FRU:%u Present Failed", __func__, FRU_ACB);
+      goto end;
+    }
+    ret = pal_is_fru_prsnt(FRU_MEB, &mc_prsnt);
+    if (ret < 0) {
+      syslog(LOG_WARNING, "%s() Get FRU:%u Present Failed", __func__, FRU_MEB);
+      goto end;
+    }
+    gta_mb_power_fault_handle(temp_mb_resp);
+    if (cb_prsnt == FRU_PRSNT) {
+      gta_cb_power_fault_handle(temp_mb_resp);
+    }
+    if (cb_prsnt == FRU_PRSNT && mc_prsnt == FRU_PRSNT) {
+      gta_mc_power_fault_handle(temp_mb_resp);
+    }
   }
-  
+end:
   pthread_exit(NULL);
 }
 
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-libs/files/pal/pal_cover.c b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-libs/files/pal/pal_cover.c
index 70ca50f96056..cac1b61a2e95 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-libs/files/pal/pal_cover.c
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-libs/files/pal/pal_cover.c
@@ -381,7 +381,7 @@ pal_check_abl_error(uint32_t postcode) {
       syslog(LOG_CRIT, "ABL Error(EA00E2EF) Unsupproted DIMM Config Error");
       break;
     case 0xEA00E310:
-      syslog(LOG_CRIT, "ABL Error(EA00E310) No DIMM on any channel in system");
+      syslog(LOG_CRIT, "ABL Error(EA00E310) DIMM Failure Event: No DIMM in System");
       break;
     default:
       break;
@@ -679,12 +679,11 @@ pal_toggle_rst_btn(uint8_t fru) {
 
   pal_get_restart_cause(fru, &restart_cause);
   if (restart_cause == RESTART_CAUSE_WATCHDOG_EXPIRATION) {
-    gpio_desc_t *gdesc = NULL;
-    gdesc = gpio_open_by_shadow(FP_RST_BTN_OUT_N);
-    ret = gpio_set_value(gdesc, 0);
-    msleep(100);
-    ret |= gpio_set_value(gdesc, 1);
-    gpio_close(gdesc);
+    syslog(LOG_CRIT, "SLED_CYCLE starting due to FRB2...");
+    pal_update_ts_sled();
+    sync();
+    sleep(2);
+    ret = pal_sled_cycle();
   }
   else {
     ret = pal_set_rst_btn(fru, 0);
@@ -734,47 +733,6 @@ void hgx_pwr_limit_mon (void) {
   }
 }
 
-int pal_read_cpld_reg(int fru, uint8_t offset, uint8_t bit, uint8_t *value) {
-  int ret = -1, fd;
-  uint8_t bus, addr, tlen, rlen;
-  uint8_t tbuf[1] = {0};
-
-  if(fru == FRU_MB){
-    bus  = MB_CPLD_BUS;
-    addr = MB_CPLD_ADDR;
-  }
-  else if (fru == FRU_SWB) {
-    bus  = SWB_CPLD_BUS;
-    addr = SWB_CPLD_ADDR;
-  }
-  else {
-    return -1;
-  }
-
-  tbuf[0] = offset;
-  tlen = 1;
-  rlen = 1;
-
-  fd = i2c_cdev_slave_open(bus, addr >> 1, I2C_SLAVE_FORCE_CLAIM);
-  if (fd < 0) {
-    syslog(LOG_ERR, "%s(): fail to open device: I2C BUS: %d", __func__, bus);
-    return -1;
-  }
-
-  ret = i2c_rdwr_msg_transfer(fd, addr, tbuf, tlen, value, rlen);
-  i2c_cdev_slave_close(fd);
-  if (ret) {
-	syslog(LOG_ERR, "%s(): fail to get FRU: %d CPLD reg", __func__, fru);
-    return -1;
-  }
-
-  if (bit >=0 && bit <= 7) {
-    *value = GETBIT(*value, bit);
-  }
-
-  return ret;
-}
-
 static void*
 gti_pwr_fault_event(void* arg) {
   int is_pwr_on = (int)arg;
@@ -827,13 +785,10 @@ gti_pwr_fault_event(void* arg) {
   } power_rail;
 
   struct power_rail mb_power_rail_table[] = {
-   {0x28, 7, 0, "FM_CPU0_SLP_S5_N"},
-   {0x28, 4, 0, "FM_CPU0_SLP_S3_N"},
-   {0x2B, 4, 0, "P12V_OCP_V3_1_PWRGD"},
-   {0x2B, 0, 0, "P12V_OCP_V3_2_PWRGD"},
-   {0x2A, 0, 0, "P12V_E1S_1_PWRGD"},
    {0x27, 6, 0, "PWRGD_P5V_AUX_R3"},
    {0x27, 5, 0, "PWRGD_P3V3_STBY_R"},
+   {0x28, 7, 0, "FM_CPU0_SLP_S5_N"},
+   {0x28, 4, 0, "FM_CPU0_SLP_S3_N"},
    {0x28, 6, 0, "FM_PWRGD_PVDD11_S3_P0"},
    {0x28, 5, 0, "FM_PWRGD_PVDD11_S3_P1"},
    {0x28, 3, 0, "FM_PWRGD_PVDDIO_P0"},
@@ -847,7 +802,9 @@ gti_pwr_fault_event(void* arg) {
    {0x29, 3, 0, "CPU_PWR_PG_DLY_DONE_CHECK"},
    {0x29, 2, 0, "FM_PWRGD_CPU1_PWROK"},
    {0x29, 0, 0, "FM_RST_CPU1_RESETL_N"},
-
+   {0x2A, 0, 0, "P12V_E1S_1_PWRGD"},
+   {0x2B, 4, 0, "P12V_OCP_V3_1_PWRGD"},
+   {0x2B, 0, 0, "P12V_OCP_V3_2_PWRGD"},
    {0x2D, 1, 0, "PWRGD_P0V9_RETIMER_CPU0_R2"},
    {0x2D, 0, 0, "PWRGD_P0V9_RETIMER_CPU1_R2"},
    {0x2D, 3, 0, "FM_PWRGD_P1V8_RETIMER_CPU0"},
@@ -855,17 +812,17 @@ gti_pwr_fault_event(void* arg) {
    {0x2E, 5, 0, "RST_PERST_CPU0_SWB_N"},
    {0x2E, 4, 0, "RST_PERST_CPU1_SWB_N"},
 
-   {0x01, 6, 0, "FM_GPU_HSC_EN_R"},
-   {0x01, 5, 0, "HPDB_HSC_PWRGD_ISO_R"},
    {0x00, 6, 0, "SWB_HSC_EN_R"},
    {0x00, 5, 0, "SWB_HSC_PWRGD_ISO_R"},
+   {0x00, 4, 0, "FM_SWB_PWR_EN"},
+   {0x00, 3, 0, "FM_SWB_PWRGD_ISO_R"},
+   {0x01, 6, 0, "FM_GPU_HSC_EN_R"},
+   {0x01, 5, 0, "HPDB_HSC_PWRGD_ISO_R"},
    {0x01, 3, 0, "GPU_BASE_STBY_EN_R"},
    {0x01, 1, 0, "GPU_FPGA_READY_ISO_R"},
-
    {0x01, 0, 0, "FM_GPU_PWR_EN"},
+
    {0x02, 7, 0, "FM_GPU_PWRGD_ISO_R"},
-   {0x00, 4, 0, "FM_SWB_PWR_EN"},
-   {0x00, 3, 0, "FM_SWB_PWRGD_ISO_R"},
   };
 
   struct power_rail swb_power_rail_table[] = {
@@ -878,11 +835,20 @@ gti_pwr_fault_event(void* arg) {
 
   int ret = -1;
   uint8_t value = 0;
+  uint8_t last_offset = 0xff;
 
   for(int i=0; i < mb_pwr_rail_cnt; i++) {
-    ret = pal_read_cpld_reg(FRU_MB, mb_power_rail_table[i].offset,
-                            mb_power_rail_table[i].bit, &value);
-    if(!ret && value == mb_power_rail_table[i].asserted_value) {
+    if (last_offset != mb_power_rail_table[i].offset) {
+      ret = pal_read_cpld_reg(FRU_MB, mb_power_rail_table[i].offset,
+                              0xff, &value);
+      last_offset = mb_power_rail_table[i].offset;
+      if (ret) {
+        syslog(LOG_CRIT, "%s, CPLD offset: %x read failed", __FUNCTION__, last_offset);
+        continue;
+      }
+    }
+
+    if(GETBIT(value, mb_power_rail_table[i].bit) == mb_power_rail_table[i].asserted_value) {
       syslog(LOG_CRIT, "Power Fail Event: %s Assert", mb_power_rail_table[i].event_log);
     }
   }
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-libs/files/pal/pal_def_cover.h b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-libs/files/pal/pal_def_cover.h
index 4925bedcef2b..de56aae625c2 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-libs/files/pal/pal_def_cover.h
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-libs/files/pal/pal_def_cover.h
@@ -9,12 +9,6 @@
 
 #define MAX_NUM_RETIMERS          (8)
 
-#define MB_CPLD_BUS               (I2C_BUS_7)
-#define MB_CPLD_ADDR              (0x46)
-
-#define SWB_CPLD_BUS              (I2C_BUS_32)
-#define SWB_CPLD_ADDR             (0x26)
-
 //GPIO EVENT Cover
 #define IRQ_UV_DETECT_N          "UV_ALERT_N"
 #define IRQ_OC_DETECT_N          "OC_ALERT_N"
diff --git a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-utils/files/check-fan-cache.sh b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-utils/files/check-fan-cache.sh
index e661b6631854..f05bd818e442 100644
--- a/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-utils/files/check-fan-cache.sh
+++ b/meta-facebook/meta-grandteton/meta-inspirationpoint/recipes-inspirationpoint/plat-utils/files/check-fan-cache.sh
@@ -137,9 +137,6 @@ check_mb_rev() {
       # Discrete VPDB
       if [[ "$vpdb_source" == "3" ]]; then
         ln -s /etc/fsc-config-gta-8-retimer-dis-vpdb.json ${DEFAULT_FSC_CONFIG}
-      # Freya
-      elif [[ "$gta_cb_card_type" == "0" ]]; then
-        ln -s /etc/fsc-config-gta-8-retimer-freya.json ${DEFAULT_FSC_CONFIG}
       # Default (Artemis Module)
       else
         ln -s /etc/fsc-config-gta-8-retimer.json ${DEFAULT_FSC_CONFIG}
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/fscd/fscd/fsc-config-500w.json b/meta-facebook/meta-grandteton/recipes-grandteton/fscd/fscd/fsc-config-500w.json
index ddc492b08abf..9802a16b6f27 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/fscd/fscd/fsc-config-500w.json
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/fscd/fscd/fsc-config-500w.json
@@ -190,6 +190,32 @@
         "ki": -0.015,
         "kd": 0
       },
+      "swb_tray_nic_optic_linear": {
+        "read_source" : {
+          "util" : "/usr/local/bin/sensor-util"
+        },
+        "type": "linear",
+        "positive_hysteresis": 0,
+        "negative_hysteresis": 2,
+        "data": [
+          [55, 25],
+          [58, 45],
+          [60, 55],
+          [68, 90]
+        ]
+      },
+      "swb_tray_nic_optic_pid": {
+        "read_source" : {
+          "util" : "/usr/local/bin/sensor-util"
+        },
+        "type": "pid",
+        "positive_hysteresis": 1,
+        "negative_hysteresis": 2,
+        "setpoint": 65,
+        "kp": -3,
+        "ki": -0.035,
+        "kd": 0
+      },
       "swb_tray_E1S_linear": {
         "read_source" : {
           "util" : "/usr/local/bin/sensor-util"
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/mezz_nic.cpp b/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/mezz_nic.cpp
index 62ec737ef820..25d658b42ea7 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/mezz_nic.cpp
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/mezz_nic.cpp
@@ -23,7 +23,7 @@ int PLDMNicComponent::update(string image) {
 
   //Since NIC PLDM update need to take more than 10 minutes, we extend the timeout.
   set_update_ongoing(60 * 20);
-  ret = oem_pldm_fw_update(_bus_id, _eid, (char *)image.c_str());
+  ret = oem_pldm_fw_update(_bus_id, _eid, (char *)image.c_str(), false, _component.c_str());
 
   if (ret)
     syslog(LOG_CRIT, "Component %s upgrade fail", _component.c_str());
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/swb_common.cpp b/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/swb_common.cpp
index 8f13a14f3733..3b997ce307e5 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/swb_common.cpp
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/swb_common.cpp
@@ -21,8 +21,6 @@
 
 #define PexImageCount 4
 #define GTAPeswImageCount 2
-#define GTAFacCount 12
-#define GTAArtemisCount 2 //  Each FAC
 
 struct PexImage {
   uint32_t offset;
@@ -316,6 +314,25 @@ int fw_update_proc (const string& image, bool /*force*/,
   return ret;
 }
 
+int get_dev_ver(uint8_t bus, uint8_t eid, uint8_t target, vector<uint8_t> &data) {
+  uint8_t tbuf[MAX_TXBUF_SIZE] = {0};
+  uint8_t rbuf[MAX_RXBUF_SIZE] = {0};
+  uint8_t tlen=0;
+  size_t rlen = 0;
+  int rc;
+
+  tbuf[tlen++] = target;
+
+  rc = oem_pldm_ipmi_send_recv(bus, eid,
+                               NETFN_OEM_1S_REQ, CMD_OEM_1S_GET_FW_VER,
+                               tbuf, tlen,
+                               rbuf, &rlen, true);
+  if (rc == 0) {
+    data = vector<uint8_t>(rbuf, rbuf + rlen);
+  }
+  return rc;
+}
+
 int SwbBicFwComponent::update(string image)
 {
   return fw_update_proc(image, false, bus, eid, target, this->alias_component(), this->alias_fru());
@@ -790,56 +807,25 @@ int GTPldmComponent::try_pldm_update(const string& image, bool force, uint8_t sp
   int isValidImage = oem_parse_pldm_package(image.c_str());
   string fru_name = (pal_is_artemis() ? _fru : "swb");
 
-  // Legacy way
-  if (is_pldm_supported(fru_name, bus, eid) < 0) {
-    if (force) {
-      return comp_fupdate(image);
+  if (force) {
+    if (isValidImage == 0) {
+      cout << "PLDM image detected." << endl;
+      return pldm_update(image, false, specified_comp);
     } else {
-      // PLDM image
-      if (isValidImage == 0) {
-        // Try to discard PLDM header
-        // Pex not support.
-        if (component.find("pex") != std::string::npos) {
-          cerr << "Pex not support PLDM image transfer" << endl;
-          return -1;
-        } else {
-          string raw_image{};
-          if (get_raw_image(image, raw_image) == FORMAT_ERR::SUCCESS) {
-            int ret = comp_fupdate(raw_image);
-            del_raw_image();
-            return ret;
-          } else {
-            cerr << "Can not do PLDM image transfer" << endl;
-            return -1;
-          }
-        }
-      // Raw image
-      } else {
-        return comp_update(image);
-      }
+      cout << "Raw image detected." << endl;
+      return comp_fupdate(image);
     }
-  // PLDM way
   } else {
-    if (force) {
-      if (isValidImage == 0) {
-        cout << "PLDM image detected." << endl;
-        return pldm_update(image, specified_comp);
-      } else {
-        cout << "Raw image detected." << endl;
-        return comp_fupdate(image);
-      }
-    } else {
-      if (isValidImage == 0) {
-        if (is_pldm_info_valid() == 0) {
-          return pldm_update(image, specified_comp);
-        } else {
-          cerr << "Non-valid package info." << endl;
-          return -1;
-        }
+    if (isValidImage == 0) {
+      if (is_pldm_info_valid() == 0) {
+        return pldm_update(image, false, specified_comp);
       } else {
-        cerr << "Non-valid image header." << endl;
+        cerr << "Non-valid package info." << endl;
         return -1;
       }
+    } else {
+      cerr << "Non-valid image header." << endl;
+      return -1;
     }
   }
 }
@@ -850,33 +836,19 @@ int GTPldmComponent::gt_get_version(json& j, const string& fru, const string& co
   string active_key = fmt::format("{}_{}_active_ver", fru_name, pldm_signed_info::comp_str_t.at(target));
   string active_ver;
 
-  if (pal_is_artemis()) {
+  try {
+    active_ver = kv::get(active_key, kv::region::temp);
+    j["VERSION"] = active_ver;
+  } catch (...) {
     int ret = update_pldm_ver_cache(fru_name, bus, eid);
     if (ret < 0) {
-      return comp_version(j);
-    }
-
-    try {
+      if(ret == SWB_FW_GET_FAILED)
+        return comp_version(j);
+      else if(ret == SWB_FW_BIC_ERROR)
+        j["VERSION"] = "NA";
+    } else {
       active_ver = kv::get(active_key, kv::region::temp);
       j["VERSION"] = (active_ver.empty()) ? "NA" : active_ver;
-    } catch (...) {
-      return comp_version(j);
-    }
-  } else {
-    try {
-      active_ver = kv::get(active_key, kv::region::temp);
-      j["VERSION"] = active_ver;
-    } catch (...) {
-      int ret = update_pldm_ver_cache(fru_name, bus, eid);
-      if (ret < 0) {
-        if(ret == SWB_FW_GET_FAILED)
-          return comp_version(j);
-        else if(ret == SWB_FW_BIC_ERROR)
-          j["VERSION"] = "NA";
-      } else {
-        active_ver = kv::get(active_key, kv::region::temp);
-        j["VERSION"] = (active_ver.empty()) ? "NA" : active_ver;
-      }
     }
   }
 
@@ -890,22 +862,10 @@ int GTPldmComponent::gt_get_version(json& j, const string& fru, const string& co
 }
 
 static
-void gta_restart_module_mterm_service(const string& comp, const string& fru) {
-  char cmd[128] = {0};
-
-  if (!pal_is_artemis()) {
-    return;
-  }
-
-  if (fru == "cb" && comp == "bic") {
-    for (int i = 1; i <= GTAFacCount; i ++) {
-      for (int j = 1; j <= GTAArtemisCount; j ++) {
-        snprintf(cmd, sizeof(cmd), "/usr/bin/sv restart mTerm%d_%d >> /dev/null",i ,j);
-        if (system(cmd) != 0) {
-          syslog(LOG_WARNING, "[%s] Restart mTerm%d_%d failed\n", __func__ ,i ,j);
-        }
-      }
-    }
+void bic_update_post_actions(const string& fru) {
+  if (fru == "mc") {
+    sleep(5); // wait BIC boot up
+    update_pldm_ver_cache("mc", MEB_BIC_BUS, MEB_BIC_EID);
   }
   return;
 }
@@ -915,7 +875,7 @@ int GTSwbBicFwComponent::update(string image)
   int ret = 0;
 
   ret = try_pldm_update(image, false);
-  gta_restart_module_mterm_service(this->alias_component(), this->alias_fru());
+  bic_update_post_actions(this->alias_fru());
   return ret;
 }
 
@@ -924,7 +884,7 @@ int GTSwbBicFwComponent::fupdate(string image)
   int ret = 0;
 
   ret = try_pldm_update(image, true);
-  gta_restart_module_mterm_service(this->alias_component(), this->alias_fru());
+  bic_update_post_actions(this->alias_fru());
   return ret;
 }
 
@@ -1160,6 +1120,7 @@ mc_bic_recovery_pre() {
 
 int
 gta_bic_recovery_pre(string image, uint8_t fruid, bool /*force*/) {
+  kv_set("bic_recovery_update", "1", 0, 0);
   if (fruid == FRU_ACB) {
     if (cb_bic_recovery_pre() < 0) {
       return -1;
@@ -1256,25 +1217,34 @@ mc_bic_recovery_post() {
     syslog(LOG_WARNING, "[%s] Set MC MUX to MC CPLD failed", __func__);
     return -1;
   }
+  sleep(5); // wait BIC boot up
+  update_pldm_ver_cache("mc", MEB_BIC_BUS, MEB_BIC_EID);
   return 0;
 }
 
 int
 gta_bic_recovery_post(uint8_t fruid, bool /*force*/) {
+  int ret = 0;
+
   if (fruid == FRU_ACB) {
-    if (cb_bic_recovery_post() < 0) {
-      return -1;
+    ret = cb_bic_recovery_post();
+    if (ret < 0) {
+      goto error_exit;
     }
   } else if (fruid == FRU_MEB) {
-    if (mc_bic_recovery_post() < 0) {
-      return -1;
+    ret = mc_bic_recovery_post();
+    if (ret < 0) {
+      goto error_exit;
     }
   } else {
+    ret = -1;
     syslog(LOG_WARNING, "%s() Unknown FRU: %u", __func__, fruid);
-    return -1;
+    goto error_exit;
   }
 
-  return 0;
+error_exit:
+  kv_set("bic_recovery_update", "0", 0, 0);
+  return ret;
 }
 
 int GtaBicFwRecoveryComponent::update(string image) {
@@ -1301,7 +1271,6 @@ int GtaBicFwRecoveryComponent::update(string image) {
   }
 exit:
   gta_bic_recovery_post(fruid, false);
-  gta_restart_module_mterm_service(this->alias_component(), this->alias_fru());
   return ret;
 }
 
@@ -1327,10 +1296,99 @@ int GtaBicFwRecoveryComponent::fupdate(string image) {
   }
 exit:
   gta_bic_recovery_post(fruid, true);
-  gta_restart_module_mterm_service(this->alias_component(), this->alias_fru());
   return ret;
 }
 
+int GTAASICComponent::update(std::string image) {
+  return pldm_update(image, true, component_identifier);
+}
+
+int GTAASICComponent::fupdate(std::string image) {
+  return pldm_update(image, true, component_identifier);
+}
+
+bool print_version_flag[FRU_ACB_ACCL_CNT * 2] = {
+  false, false, false, false, false, false, false, false, false, false, false, false,
+  false, false, false, false, false, false, false, false, false, false, false, false
+};
+
+int GTAASICComponent::get_version(json& j) {
+  vector<uint8_t> version = {};
+  int ret = 0;
+  uint8_t fruid = 0;
+  uint8_t devid = 0;
+  uint8_t compid = component_identifier - DEV_BASE_COMP;
+  uint8_t status = 0;
+  uint8_t device_status_fail = 1;
+
+  if (compid >= (FRU_ACB_ACCL_CNT * 2)) {
+    return FW_STATUS_FAILURE;
+  }
+
+  if (print_version_flag[compid] != false) {
+    return FW_STATUS_NOT_SUPPORTED;
+  }
+
+  stringstream comp_str;
+  string key = "asic" + to_string(compid) + "_ver";
+  char value[MAX_VALUE_LEN] = {0};
+
+  ret = pal_get_fru_id((char *)this->alias_fru().c_str(), &fruid);
+  if (ret != 0) {
+    return FW_STATUS_FAILURE;
+  }
+
+  comp_str << this->alias_fru() << ' ' << this->alias_component().substr(0, 4);
+  string rw_str = comp_str.str();
+  transform(rw_str.begin(),rw_str.end(), rw_str.begin(),::toupper);
+  j["PRETTY_COMPONENT"] = rw_str;
+
+  if (kv_get(key.c_str(), value, NULL, 0) == 0) {
+    j["VERSION"] = string(value);
+    print_version_flag[compid] = true;
+    return FW_STATUS_SUCCESS;
+  }
+
+  devid = ((compid % 2) ? DEV_ID2 : DEV_ID1);
+  ret = pal_is_dev_prsnt(fruid, devid, &status);
+  if (ret != 0) {
+    return FW_STATUS_FAILURE;
+  }
+
+  if (ret == 0 && status == FRU_NOT_PRSNT) {
+    j["VERSION"] = "NA (DEVICE NOT PRESENT)";
+    print_version_flag[compid] = true;
+    return FW_STATUS_SUCCESS;
+  }
+
+  ret = get_dev_ver(bus, eid, component_identifier, version);
+  if (ret != 0 || version.empty()) {
+    j["VERSION"] = "NA";
+  } else if (version[2] == device_status_fail) {
+    j["VERSION"] = "NA (NVME NOT READY)";
+  } else if (version[3] == device_status_fail) {
+    j["VERSION"] = "NA (DEVICE IDENTIFIER NOT SUPPORT)";
+  } else if (version[4] != device_status_fail) {
+    j["VERSION"] = "NA (DEVICE NOT ACCELERATOR)";
+  } else {
+    stringstream ver_stream;
+    string ver_str;
+    ver_stream << std::setfill('0')
+      << 'v'
+      << +version[5] << '.'  // major version
+      << +version[6] << '.'  // minor version
+      << +version[7] << '.'  // addition version
+      << +version[8] << '.'  // sec major version
+      << +version[9];        // sec minor version
+    ver_str = ver_stream.str();
+    j["VERSION"] = ver_str;
+    kv_set(key.c_str(), ver_str.c_str(), 0, 0);
+  }
+
+  print_version_flag[compid] = true;
+  return FW_STATUS_SUCCESS;
+}
+
 namespace pldm_signed_info
 {
   class swb_fw_common_config {
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/swb_common.hpp b/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/swb_common.hpp
index 2962a969a1f4..cb816d7fe05f 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/swb_common.hpp
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/fw-util/files/swb_common.hpp
@@ -211,3 +211,13 @@ class GtaBicFwRecoveryComponent : public Component {
   int update(string image) override;
   int fupdate(string image) override;
 };
+
+class GTAASICComponent : public PldmComponent, public Component {
+  public:
+    GTAASICComponent (const string& fru, const string& comp, uint8_t bus, uint8_t eid, uint8_t component_identifier, 
+        int wait_apply_time)
+	: PldmComponent(fru, comp, bus, eid, component_identifier, wait_apply_time), Component(fru, comp) {}
+    int get_version(json& /*json*/);
+    int update(std::string image); // firmware update
+    int fupdate(std::string image); // force firmware update
+};
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/dump-nv-reg.sh b/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/dump-nv-reg.sh
index bfa95229a9af..9f03b1c9c2fe 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/dump-nv-reg.sh
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/dump-nv-reg.sh
@@ -1,25 +1,125 @@
 #!/bin/bash
 
 KV_CMD="/usr/bin/kv"
-I2C_CMD="/usr/sbin/i2cdump"
-
+I2C_CMD="/usr/sbin/i2ctransfer"
 DUMP_FILE="/tmp/hgx_dump.log"
 
+declare hgx_fpga_reg=""
+
+dump_hgx_fpga_reg() {
+  echo "Dump HGX FPGA reg:" > $DUMP_FILE
+  hgx_fpga_reg=$(i2ctransfer -y 11 w1@0x0b 0x00 r256)
+  echo $hgx_fpga_reg >> $DUMP_FILE 2>&1
+}
+
 dump_mb_cpld_reg() {
   echo "Dump MB CPLD reg:" >> $DUMP_FILE
 
   is_gtt=`i2cdetect -y 7  | grep -i 13`
   if [ -n "$is_gtt" ]; then
-    { $I2C_CMD -y 7 0x13;
-      $I2C_CMD -y 7 0x14; } >> $DUMP_FILE 2>&1
+    { echo "Offset = 0x13";
+      $I2C_CMD -y 7 w1@0x13 0x00 r256;
+      echo "Offset = 0x14";
+      $I2C_CMD -y 7 w1@0x14 0x00 r256; } >> $DUMP_FILE 2>&1
   else
-    $I2C_CMD -y 7 0x23 >> $DUMP_FILE 2>&1
+    $I2C_CMD -y 7 w1@0x23 0x00 r256 >> $DUMP_FILE 2>&1
   fi
 }
 
-dump_hgx_fpga_reg() {
-  echo "Dump HGX FPGA reg:" > $DUMP_FILE
-  $I2C_CMD -y 11 0x0b >> $DUMP_FILE 2>&1
+dump_swb_cpld_reg() {
+  echo "Dump SWB CPLD reg:" >> $DUMP_FILE
+  $I2C_CMD -y 32 w1@0x13 0x00 r256>> $DUMP_FILE 2>&1
+}
+
+parser_hgx_fpga_reg() {
+  declare -A GPU_FPGA_REG_INFO=(
+  # [Index, Bit#]="SEL_Log"
+    [0,0]="GPU1_INT_OVERT"
+    [0,1]="GPU2_INT_OVERT"
+    [0,2]="GPU3_INT_OVERT"
+    [0,3]="GPU4_INT_OVERT"
+    [0,4]="GPU5_INT_OVERT"
+    [0,5]="GPU6_INT_OVERT"
+    [0,6]="GPU7_INT_OVERT"
+    [0,7]="GPU8_INT_OVERT"
+
+    [1,0]="NVSW1_OVERT_INI_N"
+    [1,1]="NVSW2_OVERT_INI_N"
+    [1,2]="NVSW3_OVERT_INI_N"
+    [1,3]="NVSW4_OVERT_INI_N"
+
+    [2,0]="GPU1_PWRGD_INI"
+    [2,1]="GPU2_PWRGD_INI"
+    [2,2]="GPU3_PWRGD_INI"
+    [2,3]="GPU4_PWRGD_INI"
+    [2,4]="GPU5_PWRGD_INI"
+    [2,5]="GPU6_PWRGD_INI"
+    [2,6]="GPU7_PWRGD_INI"
+    [2,7]="GPU8_PWRGD_INI"
+
+    [4,0]="NVSW_1_VDD_INT_PG"
+    [4,1]="NVSW_1_DVDD_INT_PG"
+    [4,2]="NVSW_1_HVDD_INT_PG"
+    [4,3]="NVSW_2_VDD_INT_PG"
+    [4,4]="NVSW_2_DVDD_INT_PG"
+    [4,5]="NVSW_2_HVDD_INT_PG"
+    [4,6]="NVSW_12_VDD1V8_INT_PG0"
+    [4,7]="NVSW_34_VDD1V8_INT_PG0"
+
+    [5,0]="NVSW_34_IBC_INT_PG"
+    [5,1]="NVSW_12_IBC_INT_PG"
+    [5,2]="NVSW_4_HVDD_INT_PG"
+    [5,3]="NVSW_4_DVDD_INT_PG"
+    [5,4]="NVSW_4_VDD_INT_PG"
+    [5,5]="NVSW_3_HVDD_INT_PG"
+    [5,6]="NVSW_3_DVDD_INT_PG"
+    [5,7]="NVSW_3_VDD_INT_PG"
+
+    [7,4]="NVSW_12_5V_INT_PG"
+    [7,5]="NVSW_34_5V_INT_PG"
+    [7,6]="NVSW_12_3V3_INT_PG"
+    [7,7]="NVSW_34_3V3_INT_PG"
+
+    [12,1]="FPGA_RET_0123_REFCLK1_DET_INT0"
+    [12,2]="FPGA_RET_4567_REFCLK2_DET_INT0"
+    [12,3]="FPGA_PEX_REFCLK3_DET_INT0"
+
+    [49,3]="FPGA_MIDP_PEX_RST_L[0]"
+    [49,4]="FPGA_MIDP_PEX_RST_L[1]"
+    [49,5]="FPGA_MIDP_PEX_RST_L[2]"
+
+    [104,0]="RET0123_OVERT_INT_N"
+    [104,1]="RET4567_OVERT_INT_N"
+    [104,4]="PEX_SW_OVERT_INT_N"
+    [104,5]="HMC_OVERT_INT_N"
+  )
+
+
+  offset_last="na"
+  for key in "${!GPU_FPGA_REG_INFO[@]}"; do
+    offset="${key%,*}"
+    offset=$((offset + 1))
+    if [ "$offset" != "$offset_last" ]; then
+      val=$(echo "$hgx_fpga_reg" | awk '{print $'"$offset"'}')
+    fi
+
+    # When the value of FPGA_MIDP_PEX_RST_L[X] = 1 indicates normal
+    if [ "$offset" == "50" ]; then
+      expected_value=1
+    else
+      expected_value=0
+    fi
+
+    shift_bit="${key#*,}"
+    bit_value=$(( (val >> shift_bit) & 0x1 ))
+
+    if [ "$bit_value" != "$expected_value" ]; then
+      /usr/bin/logger -t "gpiod" -p daemon.crit "HGX FPGA dump - ${GPU_FPGA_REG_INFO[$key]} Assert"
+      echo "HGX FPGA dump: ${GPU_FPGA_REG_INFO[$key]} Assert" >> "$DUMP_FILE"
+    fi
+
+    offset_last="$offset"
+  done
 }
 
 dump_log() {
@@ -30,8 +130,14 @@ dump_log() {
   LOG_ARCHIVE="$LOG_DIR/${TIME}_nvlog.tar.gz"
 
   dump_hgx_fpga_reg
-  echo >> $DUMP_FILE
   dump_mb_cpld_reg
+  dump_swb_cpld_reg
+
+  echo high > /tmp/gpionames/NV_DUMP_END/direction
+  sleep 1
+  echo low > /tmp/gpionames/NV_DUMP_END/direction
+
+  parser_hgx_fpga_reg
 
   if [ ! -d "$LOG_DIR" ]; then
     mkdir -p "$LOG_DIR"
@@ -40,11 +146,6 @@ dump_log() {
   tar -zcvf "$LOG_ARCHIVE" -C "$(dirname "$DUMP_FILE")" "$(basename "$DUMP_FILE")"
   logger -t "gpiod" -p daemon.crit "HGX FPGA dump is generated at $LOG_ARCHIVE"
 
-  echo high > /tmp/gpionames/NV_DUMP_END/direction
-  sleep 1
-  echo low > /tmp/gpionames/NV_DUMP_END/direction
-
-
   echo "End of to dump NVDIA FPGA Register"
 }
 
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/gpiod.cpp b/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/gpiod.cpp
index 4720e0ea2b8a..4a71ad12e517 100755
--- a/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/gpiod.cpp
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/gpiod.cpp
@@ -104,10 +104,10 @@ struct gpiopoll_ioex_config iox_gpios[] = {
   {CABLE_PRSNT_B, "SWB CABLE_B", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, present_init, present_handle},
   {CABLE_PRSNT_C, "SWB_CABLE_C", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, present_init, present_handle},
   {CABLE_PRSNT_F, "SWB_CABLE_F", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, present_init, present_handle},
-  {CABLE_PRSNT_H, "GPU_CABLE_H", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, present_init, present_handle},
-  {CABLE_PRSNT_A, "GPU_CABLE_A", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, present_init, present_handle},
-  {CABLE_PRSNT_D, "GPU_CABLE_D", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, present_init, present_handle},
-  {CABLE_PRSNT_E, "GPU_CABLE_E", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, present_init, present_handle},
+  {CABLE_PRSNT_H, "GPU_CABLE_H", IOEX_GPIO_STANDBY, GPIO_EDGE_RISING, GPIO_VALUE_INVALID, gpu_present_init, gpu_present_handle},
+  {CABLE_PRSNT_A, "GPU_CABLE_A", IOEX_GPIO_STANDBY, GPIO_EDGE_RISING, GPIO_VALUE_INVALID, gpu_present_init, gpu_present_handle},
+  {CABLE_PRSNT_D, "GPU_CABLE_D", IOEX_GPIO_STANDBY, GPIO_EDGE_RISING, GPIO_VALUE_INVALID, gpu_present_init, gpu_present_handle},
+  {CABLE_PRSNT_E, "GPU_CABLE_E", IOEX_GPIO_STANDBY, GPIO_EDGE_RISING, GPIO_VALUE_INVALID, gpu_present_init, gpu_present_handle},
   {FM_HS1_EN_BUSBAR_BUF, "HPDB_HS1_BUSBAR_EN", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, enable_init, enable_handle},
   {FM_HS2_EN_BUSBAR_BUF, "HPDB_HS2_BUSBAR_EN", IOEX_GPIO_STANDBY, GPIO_EDGE_BOTH, GPIO_VALUE_INVALID, enable_init, enable_handle},
 };
@@ -145,6 +145,7 @@ struct gpiopoll_config gpios_common_list[] = {
   {FM_POST_CARD_PRES_N,  "GPIOZ6",         GPIO_EDGE_BOTH,    usb_dbg_card_handler, NULL},
   {FP_AC_PWR_BMC_BTN,    "GPIO18A0",       GPIO_EDGE_BOTH,    gpio_event_handler,   NULL},
   {BIC_READY,            "SGPIO32",        GPIO_EDGE_BOTH,    bic_ready_handler,    bic_ready_init},
+  {GPU_FPGA_READY,       "SGPIO8",         GPIO_EDGE_FALLING, sgpio_event_handler,  NULL},
   {GPU_FPGA_THERM_OVERT, "SGPIO40",        GPIO_EDGE_FALLING, nv_event_handler,     NULL},
   {GPU_FPGA_DEVIC_OVERT, "SGPIO42",        GPIO_EDGE_FALLING, nv_event_handler,     NULL},
   {PEX_FW_VER_UPDATE,    "PEX_VER_UPDATE", GPIO_EDGE_RISING,  pex_fw_ver_handle,    NULL},
@@ -837,6 +838,30 @@ present_handle (char* desc, gpio_value_t value) {
   iox_log_gpio_change(FRU_MB, desc, 0, str, false, value);
 }
 
+void
+gpu_present_init (char* desc, gpio_value_t value) {
+  const char* str = "not present";
+  GPUConfig gpu_config = get_gpu_config();
+
+  if (value == GPIO_VALUE_HIGH) {
+    if ((gpu_config == GPU_CONFIG_UBB && gpio_get_value_by_shadow(GPU_FPGA_READY)) ||
+         gpu_config == GPU_CONFIG_HGX) {
+      iox_log_gpio_change(FRU_MB, desc, 0, str, false, value);
+    }
+  }
+}
+
+void
+gpu_present_handle (char* desc, gpio_value_t value)  {
+  const char* str = value? "not present": "present";
+  GPUConfig gpu_config = get_gpu_config();
+
+  if ((gpu_config == GPU_CONFIG_UBB && gpio_get_value_by_shadow(GPU_FPGA_READY)) ||
+      gpu_config == GPU_CONFIG_HGX) {
+    iox_log_gpio_change(FRU_MB, desc, 0, str, false, value);
+  }
+}
+
 void
 enable_init (char* desc, gpio_value_t value) {
   if (value == GPIO_VALUE_LOW) {
@@ -860,6 +885,7 @@ void
   uint8_t gta_exp_prsnt_status = FRU_NOT_PRSNT;
   gpiopoll_ioex_config *iox_gpio_table = pal_is_artemis() ? gta_iox_gpios : iox_gpios;
   static bool is_exmax_prsnt_check = false;
+  static bool is_fru_prsnt_check = false;
   static uint8_t last_cb_present = 0xff;
   static uint8_t last_mc_present = 0xff;
   uint8_t mb_rev = 0;
@@ -879,15 +905,20 @@ void
         if (fru == FRU_ACB) {
           if (last_cb_present != gta_exp_prsnt_status && !gta_exp_prsnt_status) {
             syslog(LOG_CRIT, "FRU: %u is not Present", fru);
+          } else if (last_cb_present != gta_exp_prsnt_status && gta_exp_prsnt_status && is_fru_prsnt_check) {
+            syslog(LOG_CRIT, "FRU: %u is Present", fru);
           }
           last_cb_present = gta_exp_prsnt_status;
         } else {
           if (last_mc_present != gta_exp_prsnt_status && !gta_exp_prsnt_status) {
             syslog(LOG_CRIT, "FRU: %u is not Present", fru);
-          }
+          } else if (last_mc_present != gta_exp_prsnt_status && is_fru_prsnt_check) {
+            syslog(LOG_CRIT, "FRU: %u is Present", fru);
+          } 
           last_mc_present = gta_exp_prsnt_status;
         }
       }
+      is_fru_prsnt_check = true;
       pal_get_board_rev_id(FRU_MB, &mb_rev);
       if (!is_exmax_prsnt_check && mb_rev >= GTA_DVT_STAGE) {
         for (int cable_id = GTA_EXMAX_CABLE_A; cable_id <= GTA_EXMAX_CABLE_F; cable_id ++) {
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/gpiod.h b/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/gpiod.h
index ebfafaf2ba1e..744913c3f342 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/gpiod.h
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/gpiod/files/gpiod.h
@@ -102,6 +102,8 @@ void bic_ready_handler (gpiopoll_pin_t *desc, gpio_value_t last, gpio_value_t cu
 void hmc_ready_handler(gpiopoll_pin_t *desc, gpio_value_t last, gpio_value_t curr);
 void hmc_ready_init(gpiopoll_pin_t *desc, gpio_value_t value);
 void nv_event_handler(gpiopoll_pin_t *desc, gpio_value_t last, gpio_value_t curr);
+void gpu_present_init (char* desc, gpio_value_t value);
+void gpu_present_handle (char* desc, gpio_value_t value);
 
 void cpld_shut_down_handler(gpiopoll_pin_t *desc, gpio_value_t last, gpio_value_t curr);
 
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/ipmid/files/fruid.c b/meta-facebook/meta-grandteton/recipes-grandteton/ipmid/files/fruid.c
index 789839cc3c81..ad50c866f8ae 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/ipmid/files/fruid.c
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/ipmid/files/fruid.c
@@ -150,78 +150,13 @@ static void
   pthread_exit(NULL);
 }
 
-static int
-pldm_dev_fru_reader(uint8_t fru, uint8_t dev) {
-  uint8_t retry = MAX_FRU_READ_RETRY;
-  char dev_fruid_bin_path[MAX_FRUID_PATH_LEN] = {0};
-  uint8_t status = 0;
-  bic_intf fru_bic_info = {0};
-
-  fru_bic_info.fru_id = fru;
-  fru_bic_info.dev_id = dev;
-  pal_get_bic_intf(&fru_bic_info);
-
-  if (!pal_is_dev_prsnt(fru, dev, &status)) {
-    if (status == FRU_NOT_PRSNT) {
-      syslog(LOG_WARNING, "%s: FRU: %u Dev: %u Not Present", __func__, fru, dev);
-      return 0;
-    }
-  }
-
-  if (pal_get_dev_fruid_path(fru, dev, dev_fruid_bin_path)) {
-    syslog(LOG_WARNING, "%s: Get FRU: %u DEV: %u Bin Path Failed", __func__, fru, dev);
-    return -1;
-  }
-
-  /* Tansfer fru id + device id into component id
-     FRU component id
-     ACCL1 = 18
-     ...
-     ACCL12 = 29
-     ACCL1 DEV1 = 30
-     ACCL1 DEV2 = 31
-     ...
-     ACCL12 DEV1 = 52
-     ACCL12 DEV2 = 53
-    
-    e.g. ACCL1 DEV1
-     This formula get ID = base(30) + 2*(fru(18) - FRU_ACB_ACCL1(18)) + (dev(1) - 1) = 30
-    e.g. ACCL12 DEV2
-     ID = base(30) + 2*(fru(29) - FRU_ACB_ACCL1(18)) + (dev(2) - 1) = 53
-  */
-  fru_bic_info.dev_id = (DEV_ID_BASE + 2*(fru - FRU_ACB_ACCL1) + (dev - 1));
-
-  sleep(2);
-
-  while(retry > 0) {
-    if (hal_read_pldm_fruid(fru_bic_info, dev_fruid_bin_path, FRUID_SIZE) == 0) {
-      break;
-    }
-
-    retry--;
-    sleep(1);
-  }
-
-  if (retry == 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-/* Populate the platform specific eeprom for fruid info */
 int plat_fruid_init(void) {
   pthread_t tid_fru[FRU_CNT] = {0};
   char eeprom_path[64] = {0};
   char bin_path[32] = {0};
   unsigned int caps = 0;
-  uint8_t dev_num = 0;
-  uint8_t config = 0;
   uint8_t retry = MAX_FRU_READ_RETRY;
 
-  if (pal_is_artemis()) {
-    config = pal_get_acb_card_config();
-  }
   for (int fru = 1; fru < FRU_CNT; fru ++) {
     // Get FRU data from PLDM
     if ( (pal_get_fru_path_type(fru) == FRU_PATH_PLDM) && !pal_get_fru_capability(fru, &caps)) {
@@ -230,16 +165,6 @@ int plat_fruid_init(void) {
           syslog(LOG_WARNING, "%s: Create pldm_fru_reader Failed, FRU: %d", __func__, fru);
         }
       }
-      if (config != ARTEMIS_CARD) {
-        if ((caps & FRU_CAPABILITY_HAS_DEVICE)) {
-          pal_get_num_devs(fru, &dev_num);
-          for (int dev = 1; dev <= dev_num; dev ++) {
-            if (pldm_dev_fru_reader(fru, dev) < 0) {
-              syslog(LOG_WARNING, "%s() Get FRU: %u DEV %u FRUID failed", __func__, fru, dev);
-            }
-          }
-        }
-      }
       continue;
     }
 
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/obmc-pldm/files/pal_pldm.cpp b/meta-facebook/meta-grandteton/recipes-grandteton/obmc-pldm/files/pal_pldm.cpp
index 518c9b3f48a2..a130d1df9a50 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/obmc-pldm/files/pal_pldm.cpp
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/obmc-pldm/files/pal_pldm.cpp
@@ -79,6 +79,10 @@ pldm_firmware_parameter_handler::swb_cache_handle (
 
   string bic_ver = (activeCompImageSetVerStr.length == 0)?"":(const char*)activeCompImageSetVerStr.ptr;
   string bic_active_key  = fmt::format("{}_bic_active_ver", _fru_name);
+
+  if (compEntry.comp_identifier >= comp_str_t.size()) {
+    return SWB_FW_BIC_ERROR;
+  }
   string comp_name = comp_str_t[compEntry.comp_identifier];
   string comp_active_key = fmt::format("{}_{}_active_ver", _fru_name, comp_name);
   string comp_active_ver = (activeCompVerStr.length == 0)?"":(const char*)activeCompVerStr.ptr;
@@ -93,7 +97,14 @@ pldm_firmware_parameter_handler::swb_cache_handle (
     kv::set(bic_active_key, bic_ver, kv::region::temp);
     kv::set(comp_active_key, comp_active_ver, kv::region::temp);
   } else {
-    ret = SWB_FW_BIC_ERROR; 
+    // BIC will return error code 8 when its component is power off
+    found = comp_active_ver.find("8");
+    if (found == std::string::npos) {
+      ret = SWB_FW_BIC_ERROR;
+    } else {
+      kv::set(bic_active_key, bic_ver, kv::region::temp);
+      kv::set(comp_active_key, "NA", kv::region::temp);
+    }
   }
 
   return ret;
@@ -161,9 +172,6 @@ pldm_firmware_parameter_handler::get_firmware_parameter (uint8_t bus, uint8_t ei
             pendingCompVerStr
           );
 
-          if (ret == SWB_FW_BIC_ERROR) {
-            continue;
-          }
         } else {
           _active_ver = (activeCompImageSetVerStr.length == 0) ?
                         "" : (const char*)activeCompImageSetVerStr.ptr;
@@ -214,8 +222,3 @@ int update_pldm_ver_cache(const std::string& fru, uint8_t bus, uint8_t eid)
   return handler.update_swb_cache(bus, eid);
 }
 
-int
-is_pldm_supported(const std::string& fru, uint8_t bus, uint8_t eid)
-{
-  return update_pldm_ver_cache(fru, bus, eid);
-}
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/obmc-pldm/files/pal_pldm.hpp b/meta-facebook/meta-grandteton/recipes-grandteton/obmc-pldm/files/pal_pldm.hpp
index 78b12f7e0ebf..bafd56f86723 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/obmc-pldm/files/pal_pldm.hpp
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/obmc-pldm/files/pal_pldm.hpp
@@ -4,4 +4,3 @@
 
 int update_pldm_ver_cache(const std::string& fru, uint8_t bus, uint8_t eid);
 int get_pldm_active_ver(uint8_t bus, uint8_t eid, std::string& active_ver);
-int is_pldm_supported(const std::string& fru, uint8_t bus, uint8_t eid);
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal.c b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal.c
index 6ee53752cf7b..8674a94083b8 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal.c
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal.c
@@ -46,6 +46,7 @@
 #include "pal_common.h"
 #include <pthread.h>
 #include <openbmc/hgx.h>
+#include <libpldm-oem/pldm.h>
 
 #ifndef PLATFORM_NAME
 #define PLATFORM_NAME "grandteton"
@@ -798,6 +799,8 @@ pal_get_sensor_util_timeout(uint8_t fru) {
     case FRU_MB:
       return 10;
     case FRU_ACB:
+      //increase the timeout for asic stress
+      return 20;
     case FRU_MEB:
       return 15;
     default:
@@ -1328,6 +1331,13 @@ pal_set_fw_update_ongoing(uint8_t fruid, uint16_t tmout) {
           return -1;
         }
       }
+
+      if (fruid != FRU_ACB) {
+	// ACCL fru need to block MB power controlling
+        if ( _pal_kv_set_fw_update_ongoing(FRU_MB, tmout) < 0 ) {
+          return -1;
+	}
+      }
       break;
     case FRU_MEB:
     case FRU_MEB_JCN1:
@@ -1774,3 +1784,90 @@ pal_is_asic_nvme_ready(uint8_t asic_index) {
 
   return true;
 }
+
+int
+pal_get_server_12v_power(uint8_t fru_id, uint8_t *status) {
+  *status = SERVER_12V_ON;
+  return PAL_EOK;
+}
+
+int
+pal_bic_self_test(uint8_t fru) {
+  bic_intf fru_bic_info = {0};
+  uint8_t tbuf[255] = {0};
+  uint8_t* rbuf = (uint8_t *) NULL;
+  uint8_t tlen = 0;
+  size_t  rlen = 0;
+  uint8_t status = FRU_PRSNT;
+  int rc = 0;
+ 
+  if (pal_is_artemis()) {
+    if (pal_is_fru_prsnt(fru, &status) == 0 && status == FRU_NOT_PRSNT) {
+      // NOT PRESENT block PLDM transaction
+      syslog(LOG_WARNING, "%s() FRU: %u Block PLDM Transaction due to not Present", __func__, fru);
+      return PAL_EOK;
+    }
+    fru_bic_info.fru_id = fru;
+    pal_get_bic_intf(&fru_bic_info);
+
+    tbuf[tlen++] = 0x80;
+    tbuf[tlen++] = 0x05; // PLDM_FWUP
+    tbuf[tlen++] = 0x02; // PLDM_GET_FW_PARAMETERS
+    tlen = PLDM_HEADER_SIZE;
+
+    rc = oem_pldm_send_recv(fru_bic_info.bus_id, fru_bic_info.bic_eid, tbuf, tlen, &rbuf, &rlen);
+    if (rc == PLDM_SUCCESS) {
+      return PAL_EOK;
+    } else {
+      return PAL_ENOTSUP;
+    }
+  }
+  return PAL_ENOTSUP;
+}
+
+int
+pal_bic_hw_reset(void) {
+  // Not Support
+  return PAL_ENOTSUP;
+}
+
+int pal_read_cpld_reg(int fru, uint8_t offset, uint8_t bit, uint8_t *value) {
+  int ret = -1, fd;
+  uint8_t bus, addr, tlen, rlen;
+  uint8_t tbuf[1] = {0};
+
+  if(fru == FRU_MB){
+    bus  = MB_CPLD_BUS;
+    addr = MB_CPLD_ADDR;
+  }
+  else if (fru == FRU_SWB) {
+    bus  = SWB_CPLD_BUS;
+    addr = SWB_CPLD_ADDR;
+  }
+  else {
+    return -1;
+  }
+
+  tbuf[0] = offset;
+  tlen = 1;
+  rlen = 1;
+
+  fd = i2c_cdev_slave_open(bus, addr >> 1, I2C_SLAVE_FORCE_CLAIM);
+  if (fd < 0) {
+    syslog(LOG_ERR, "%s(): fail to open device: I2C BUS: %d", __func__, bus);
+    return -1;
+  }
+
+  ret = i2c_rdwr_msg_transfer(fd, addr, tbuf, tlen, value, rlen);
+  i2c_cdev_slave_close(fd);
+  if (ret) {
+	syslog(LOG_ERR, "%s(): fail to get FRU: %d CPLD reg", __func__, fru);
+    return -1;
+  }
+
+  if (bit >=0 && bit <= 7) {
+    *value = GETBIT(*value, bit);
+  }
+
+  return ret;
+}
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal.h b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal.h
index 0ce940a33c47..406849a091a6 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal.h
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal.h
@@ -82,6 +82,7 @@ void hgx_pwr_limit_mon (void);
 int pal_get_gpu_fru_id();
 void pal_check_power_rail(int is_pwr_on);
 bool pal_is_asic_nvme_ready(uint8_t asic_index);
+int pal_read_cpld_reg(int fru, uint8_t offset, uint8_t bit, uint8_t *value);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_acb_sensors.c b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_acb_sensors.c
index 7521e2a4fcfb..ae831d52ad35 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_acb_sensors.c
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_acb_sensors.c
@@ -177,196 +177,6 @@ get_accl_sensor(uint8_t fru, uint8_t sensor_num, float *value)
   return get_acb_sensor(fru, sensor_num, value);
 }
 
-PAL_SENSOR_MAP acb_freya_sensor_map[] = {
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x00
-  {"OUTLET_1_TEMP", 0, get_acb_sensor, true,  {85, 0, 150, 0, 0, 0, 0, 0}, TEMP}, // 0x01
-  {"OUTLET_2_TEMP", 0, get_acb_sensor, true,  {85, 0, 150, 0, 0, 0, 0, 0}, TEMP}, // 0x02
-  {"HSC1_TEMP",  0, get_acb_sensor, true,  {105, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x03
-  {"HSC2_TEMP",   0, get_acb_sensor, true,  {105, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x04
-  {"PEX0_TEMP",   0, get_acb_sensor, false, {105, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x05
-  {"PEX1_TEMP",   0, get_acb_sensor, false, {105, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x06
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x07
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x08
-  {"POWER_BRICK_1_TEMP", 0, get_acb_sensor, true, {115, 0, 0, 0, 0, 0, 0, 0}, TEMP}, // 0x09
-  {"POWER_BRICK_2_TEMP", 0, get_acb_sensor, true, {115, 0, 0, 0, 0, 0, 0, 0}, TEMP}, // 0x0A
-  {"P51V_AUX_L_VOLT", 0, get_acb_sensor, true, {52, 0, 0, 46, 0, 0, 0, 0}, VOLT}, // 0x0B
-  {"P51V_AUX_R_VOLT", 0, get_acb_sensor, true, {52, 0, 0, 46, 0, 0, 0, 0}, VOLT}, // 0x0C
-  {"P12V_AUX_1_VOLT", 0, get_acb_sensor, true, {13.2, 0, 0, 11.6, 0, 0, 0, 0}, VOLT}, // 0x0D
-  {"P12V_AUX_2_VOLT", 0, get_acb_sensor, true, {13.2, 0, 0, 11.6, 0, 0, 0, 0}, VOLT}, // 0x0E
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x0F
-  {"P5V_AUX_VOLT",  0, get_acb_sensor, true,  {5.25,  0, 0,  4.75, 0, 0, 0, 0}, VOLT}, // 0x10
-  {"P3V3_AUX_VOLT", 0, get_acb_sensor, true,  {3.531, 0, 0,  3.07, 0, 0, 0, 0}, VOLT}, // 0x11
-  {"P1V2_AUX_VOLT", 0, get_acb_sensor, true,  {1.284, 0, 0, 1.116, 0, 0, 0, 0}, VOLT}, // 0x12
-  {"P1V8_PEX_VOLT", 0, get_acb_sensor, false, {1.89,  0, 0, 1.71,  0, 0, 0, 0}, VOLT}, // 0x13
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x14
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x15
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x16
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x17
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x18
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x19
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x1A
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x1B
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x1C
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x1D
-  {"P1V8_1_VDD_VOLT",  0, get_acb_sensor, false, {1.89, 0, 0, 1.71, 0, 0, 0, 0}, VOLT}, // 0x1E
-  {"P1V8_2_VDD_VOLT",  0, get_acb_sensor, false, {1.89, 0, 0, 1.71, 0, 0, 0, 0}, VOLT}, // 0x1F
-  {"P1V25_1_VDD_VOLT", 0, get_acb_sensor, false, {1.313, 0, 0, 1.188, 0, 0, 0, 0}, VOLT}, // 0x20
-  {"P1V25_2_VDD_VOLT", 0, get_acb_sensor, false, {1.313, 0, 0, 1.188, 0, 0, 0, 0}, VOLT}, // 0x21
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x22
-  {"P12V_ACCL1_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x23
-  {"P12V_ACCL2_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x24
-  {"P12V_ACCL3_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x25
-  {"P12V_ACCL4_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x26
-  {"P12V_ACCL5_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x27
-  {"P12V_ACCL6_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x28
-  {"P12V_ACCL7_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x29
-  {"P12V_ACCL8_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x2A
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x2B
-  {"P12V_ACCL9_VOLT",  0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x2C
-  {"P12V_ACCL10_VOLT", 0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x2D
-  {"P12V_ACCL11_VOLT", 0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x2E
-  {"P12V_ACCL12_VOLT", 0, get_acb_sensor, false, {13.176, 0, 0, 11.224, 0, 0, 0, 0}, VOLT}, // 0x2F
-  //
-  {"P51V_AUX_L_CURR", 0, get_acb_sensor, false, {35,  0,   0, 0, 0, 0, 0, 0}, CURR}, // 0x30
-  {"P51V_AUX_R_CURR", 0, get_acb_sensor, false, {35,  0,   0, 0, 0, 0, 0, 0}, CURR}, // 0x31
-  {"P12V_AUX_1_CURR", 0, get_acb_sensor, false, {160, 0, 0, 0, 0, 0, 0, 0}, CURR}, // 0x32
-  {"P12V_AUX_2_CURR", 0, get_acb_sensor, false, {160, 0, 0, 0, 0, 0, 0, 0}, CURR}, // 0x33
-  {"P12V_ACCL1_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR}, // 0x34
-  {"P12V_ACCL2_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR}, // 0x35
-  {"P12V_ACCL3_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR}, // 0x36
-  {"P12V_ACCL4_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR}, // 0x37
-  {"P12V_ACCL5_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR}, // 0x38
-  {"P12V_ACCL6_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR},  // 0x39
-  {"P12V_ACCL7_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR},  // 0x3A
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x3B
-  {"P12V_ACCL8_CURR",  0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR},  // 0x3C
-  {"P12V_ACCL9_CURR",  0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR},  // 0x3D
-  {"P12V_ACCL10_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR},  // 0x3E
-  {"P12V_ACCL11_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR},  // 0x3F
-  {"P12V_ACCL12_CURR", 0, get_acb_sensor, false, {22.56, 0, 28.20, 0, 0, 0, 0, 0}, CURR},  // 0x40
-  //
-  {"P51V_AUX_L_PWR", 0, get_acb_sensor, false, {1820, 0, 0, 0, 0, 0, 0, 0}, POWER}, // 0x41
-  {"P51V_AUX_R_PWR", 0, get_acb_sensor, false, {1820, 0, 0, 0, 0, 0, 0, 0}, POWER}, // 0x42
-  {"P12V_AUX_1_PWR", 0, get_acb_sensor, false, {1920, 0, 0, 0, 0, 0, 0}, POWER}, // 0x43
-  {"P12V_AUX_2_PWR", 0, get_acb_sensor, false, {1920, 0, 0, 0, 0, 0, 0, 0}, POWER}, // 0x44
-  {"P12V_ACCL1_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x45
-  {"P12V_ACCL2_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x46
-  {"P12V_ACCL3_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x47
-  {"P12V_ACCL4_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x48
-  {"P12V_ACCL5_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x49
-  {"P12V_ACCL6_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x4A
-  {"P12V_ACCL7_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x4B
-  {"P12V_ACCL8_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x4C
-  {"P12V_ACCL9_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x4D
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x4E
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x4F
-  {"P12V_ACCL10_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x50
-  {"P12V_ACCL11_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x51
-  {"P12V_ACCL12_PWR", 0, get_acb_sensor, false, {275.24, 0, 344.04, 0, 0, 0, 0, 0}, POWER}, // 0x52
-  //
-  {"P51V_STBY_L_VOLT", 0, get_acb_sensor, true,  {52, 0, 0, 46, 0, 0, 0, 0},  VOLT}, // 0x53
-  {"P51V_STBY_R_VOLT", 0, get_acb_sensor, true,  {52, 0, 0, 46, 0, 0, 0, 0},  VOLT}, // 0x54
-  {"P51V_STBY_L_PWR", 0, get_acb_sensor, true,  {1838.55, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x55
-  {"P51V_STBY_R_PWR", 0, get_acb_sensor, true,  {1838.55, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x56
-  {"P0V8_VDD_1_VOLT",  0, get_acb_sensor, false, {0.84, 0, 0, 0.76, 0, 0, 0, 0},  VOLT}, // 0x57
-  {"P0V8_VDD_2_VOLT",  0, get_acb_sensor, false, {0.84, 0, 0, 0.76, 0, 0, 0, 0},  VOLT}, // 0x58
-  {"P0V8_VDD_1_VOLT",  0, get_acb_sensor, false, {47, 0, 57, 0, 0, 0, 0, 0},  CURR}, // 0x59
-  {"P0V8_VDD_2_VOLT",  0, get_acb_sensor, false, {47, 0, 57, 0, 0, 0, 0, 0},  CURR}, // 0x5A
-  {"P0V8_VDD_1_PWR",  0, get_acb_sensor, false, {38.728, 0, 47.88, 0, 0, 0, 0, 0},  POWER}, // 0x5B
-  {"P0V8_VDD_2_PWR",  0, get_acb_sensor, false, {38.728, 0, 47.88, 0, 0, 0, 0, 0},  POWER}, // 0x5C
-  {"P51V_STBY_L_CURR", 0, get_acb_sensor, true,  {35, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x5D
-  {"P51V_STBY_R_CURR", 0, get_acb_sensor, true,  {35, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x5E
-  {"P0V8_1_VDD_TEMP", 0, get_acb_sensor, true,  {100, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x5F
-  {"P0V8_2_VDD_TEMP", 0, get_acb_sensor, true,  {100, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x60
-  {"P1V25_1_12VIN_VOLT", 0, get_acb_sensor, false, {13.2, 0, 0, 11.6, 0, 0, 0, 0}, VOLT}, // 0x61
-  {"P1V25_2_12VIN_VOLT", 0, get_acb_sensor, false, {13.2, 0, 0, 11.6, 0, 0, 0, 0}, VOLT}, // 0x62
-  {"P1V25_1_12VIN_CURR", 0, get_acb_sensor, false, {2.48, 0, 2.92, 0, 0, 0, 0, 0}, CURR}, // 0x63
-  {"P1V25_2_12VIN_CURR", 0, get_acb_sensor, false, {2.48, 0, 2.92, 0, 0, 0, 0, 0}, CURR}, // 0x64
-  {"P1V25_1_12VIN_PWR", 0, get_acb_sensor, false, {32.736, 0, 41.8436, 0, 0, 0, 0, 0}, POWER}, // 0x65
-  {"P1V25_2_12VIN_PWR", 0, get_acb_sensor, false, {32.736, 0, 41.8436, 0, 0, 0, 0, 0}, POWER}, // 0x66
-  {"INLET_TEMP", 0, get_acb_sensor, false, {55, 0, 0, 0, 0, 0, 0, 0}, TEMP}, // 0x67
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x68
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x69
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x6A
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x6B
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x6C
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x6D
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x6E
-  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x6F
-  {"ACCL1_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x70
-  {"ACCL1_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x71
-  {"ACCL1_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x72
-  {"ACCL1_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x73
-  {"ACCL1_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x74
-  {"ACCL1_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x75
-  {"ACCL2_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x76
-  {"ACCL2_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x77
-  {"ACCL2_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x78
-  {"ACCL2_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x79
-  {"ACCL2_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x7A
-  {"ACCL2_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x7B
-  {"ACCL3_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x7C
-  {"ACCL3_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x7D
-  {"ACCL3_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x7E
-  {"ACCL3_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x7F
-  {"ACCL3_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x80
-  {"ACCL3_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x81
-  {"ACCL4_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x82
-  {"ACCL4_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x83
-  {"ACCL4_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x84
-  {"ACCL4_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x85
-  {"ACCL4_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x86
-  {"ACCL4_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x87
-  {"ACCL5_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x88
-  {"ACCL5_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x89
-  {"ACCL5_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x8A
-  {"ACCL5_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x8B
-  {"ACCL5_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x8C
-  {"ACCL5_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x8D
-  {"ACCL6_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x8E
-  {"ACCL6_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x8F
-  {"ACCL6_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x90
-  {"ACCL6_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x91
-  {"ACCL6_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x92
-  {"ACCL6_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x93
-  {"ACCL7_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x94
-  {"ACCL7_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x95
-  {"ACCL7_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x96
-  {"ACCL7_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x97
-  {"ACCL7_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x98
-  {"ACCL7_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x99
-  {"ACCL8_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x9A
-  {"ACCL8_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x9B
-  {"ACCL8_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x9C
-  {"ACCL8_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0x9D
-  {"ACCL8_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x9E
-  {"ACCL8_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0x9F
-  {"ACCL9_Freya_1_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0xA0
-  {"ACCL9_Freya_1_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xA1
-  {"ACCL9_Freya_1_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xA2
-  {"ACCL9_Freya_2_TEMP",   0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0xA3
-  {"ACCL9_Freya_2_VOL1_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xA4
-  {"ACCL9_Freya_2_VOL2_VOLT",  0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xA5
-  {"ACCL10_Freya_1_TEMP",  0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0xA6
-  {"ACCL10_Freya_1_VOL1_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xA7
-  {"ACCL10_Freya_1_VOL2_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xA8
-  {"ACCL10_Freya_2_TEMP",  0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0xA9
-  {"ACCL10_Freya_2_VOL1_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xAA
-  {"ACCL10_Freya_2_VOL2_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xAB
-  {"ACCL11_Freya_1_TEMP",  0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0xAC
-  {"ACCL11_Freya_1_VOL1_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xAD
-  {"ACCL11_Freya_1_VOL2_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xAE
-  {"ACCL11_Freya_2_TEMP",  0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0xAF
-  {"ACCL11_Freya_2_VOL1_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xB0
-  {"ACCL11_Freya_2_VOL2_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xB1
-  {"ACCL12_Freya_1_TEMP",  0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0xB2
-  {"ACCL12_Freya_1_VOL1_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xB3
-  {"ACCL12_Freya_1_VOL2_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xB4
-  {"ACCL12_Freya_2_TEMP",  0, get_acb_sensor, false, {98, 85, 102, 0, 0, 0, 0, 0}, TEMP},                     // 0xB5
-  {"ACCL12_Freya_2_VOL1_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xB6
-  {"ACCL12_Freya_2_VOL2_VOLT", 0, get_acb_sensor, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT}, // 0xB7
-};
-
 PAL_SENSOR_MAP acb_artemis_sensor_map[] = {
   {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x00
   {"OUTLET_1_TEMP", 0, get_acb_sensor, true,  {85, 0, 150, 0, 0, 0, 0, 0}, TEMP}, // 0x01
@@ -582,171 +392,6 @@ PAL_SENSOR_MAP acb_artemis_sensor_map[] = {
 };
 
 
-const uint8_t acb_freya_sensor_list[] = {
-  ACB_SENSOR_INLET_TEMP,
-  ACB_SENSOR_OUTLET_1_TEMP,
-  ACB_SENSOR_OUTLET_2_TEMP,
-  ACB_SENSOR_HSC_1_TEMP,
-  ACB_SENSOR_HSC_2_TEMP,
-  ACB_SENSOR_PEX0_TEMP,
-  ACB_SENSOR_PEX1_TEMP,
-  ACB_SENSOR_POWER_BRICK_1_TEMP,
-  ACB_SENSOR_POWER_BRICK_2_TEMP,
-  ACB_SENSOR_P51V_AUX_L_VOL,
-  ACB_SENSOR_P51V_AUX_R_VOL,
-  ACB_SENSOR_P12V_AUX_1_VOL,
-  ACB_SENSOR_P12V_AUX_2_VOL,
-  ACB_SENSOR_P5V_AUX_VOL,
-  ACB_SENSOR_P3V3_AUX_VOL,
-  ACB_SENSOR_P1V2_AUX_VOL,
-  ACB_SENSOR_P1V8_PEX_VOL,
-  ACB_SENSOR_P1V8_1_VDD_VOL,
-  ACB_SENSOR_P1V8_2_VDD_VOL,
-
-  ACB_SENSOR_P1V25_1_VDD_VOL,
-  ACB_SENSOR_P1V25_2_VDD_VOL,
-  ACB_SENSOR_P12V_ACCL1_VOL,
-  ACB_SENSOR_P12V_ACCL2_VOL,
-  ACB_SENSOR_P12V_ACCL3_VOL,
-  ACB_SENSOR_P12V_ACCL4_VOL,
-  ACB_SENSOR_P12V_ACCL5_VOL,
-  ACB_SENSOR_P12V_ACCL6_VOL,
-  ACB_SENSOR_P12V_ACCL7_VOL,
-  ACB_SENSOR_P12V_ACCL8_VOL,
-  ACB_SENSOR_P12V_ACCL9_VOL,
-  ACB_SENSOR_P12V_ACCL10_VOL,
-  ACB_SENSOR_P12V_ACCL11_VOL,
-  ACB_SENSOR_P12V_ACCL12_VOL,
-
-  ACB_SENSOR_P51V_AUX_L_CUR,
-  ACB_SENSOR_P51V_AUX_R_CUR,
-  ACB_SENSOR_P12V_AUX_1_CUR,
-  ACB_SENSOR_P12V_AUX_2_CUR,
-  ACB_SENSOR_P12V_ACCL1_CUR,
-  ACB_SENSOR_P12V_ACCL2_CUR,
-  ACB_SENSOR_P12V_ACCL3_CUR,
-  ACB_SENSOR_P12V_ACCL4_CUR,
-  ACB_SENSOR_P12V_ACCL5_CUR,
-  ACB_SENSOR_P12V_ACCL6_CUR,
-  ACB_SENSOR_P12V_ACCL7_CUR,
-  ACB_SENSOR_P12V_ACCL8_CUR,
-  ACB_SENSOR_P12V_ACCL9_CUR,
-  ACB_SENSOR_P12V_ACCL10_CUR,
-  ACB_SENSOR_P12V_ACCL11_CUR,
-  ACB_SENSOR_P12V_ACCL12_CUR,
-
-  ACB_SENSOR_P51V_AUX_L_PWR,
-  ACB_SENSOR_P51V_AUX_R_PWR,
-  ACB_SENSOR_P12V_AUX_1_PWR,
-  ACB_SENSOR_P12V_AUX_2_PWR,
-  ACB_SENSOR_P12V_ACCL1_PWR,
-  ACB_SENSOR_P12V_ACCL2_PWR,
-  ACB_SENSOR_P12V_ACCL3_PWR,
-  ACB_SENSOR_P12V_ACCL4_PWR,
-  ACB_SENSOR_P12V_ACCL5_PWR,
-  ACB_SENSOR_P12V_ACCL6_PWR,
-  ACB_SENSOR_P12V_ACCL7_PWR,
-  ACB_SENSOR_P12V_ACCL8_PWR,
-  ACB_SENSOR_P12V_ACCL9_PWR,
-  ACB_SENSOR_P12V_ACCL10_PWR,
-  ACB_SENSOR_P12V_ACCL11_PWR,
-  ACB_SENSOR_P12V_ACCL12_PWR,
-
-  ACB_SENSOR_P51V_STBY_L_VOL,
-  ACB_SENSOR_P51V_STBY_R_VOL,
-  ACB_SENSOR_P51V_STBY_L_PWR,
-  ACB_SENSOR_P51V_STBY_R_PWR,
-  ACB_SENSOR_P0V8_VDD_1_VOL,
-  ACB_SENSOR_P0V8_VDD_2_VOL,
-  ACB_SENSOR_P0V8_VDD_1_CUR,
-  ACB_SENSOR_P0V8_VDD_2_CUR,
-  ACB_SENSOR_P0V8_VDD_1_PWR,
-  ACB_SENSOR_P0V8_VDD_2_PWR,
-  ACB_SENSOR_P51V_STBY_L_CUR,
-  ACB_SENSOR_P51V_STBY_R_CUR,
-  ACB_SENSOR_P0V8_1_VDD_TEMP,
-  ACB_SENSOR_P0V8_2_VDD_TEMP,
-  ACB_SENSOR_P1V25_1_12VIN_VOLT,
-  ACB_SENSOR_P1V25_2_12VIN_VOLT,
-  ACB_SENSOR_P1V25_1_12VIN_CURR,
-  ACB_SENSOR_P1V25_2_12VIN_CURR,
-  ACB_SENSOR_P1V25_1_12VIN_PWR,
-  ACB_SENSOR_P1V25_2_12VIN_PWR,
-
-  ACCL1_Freya_1_TEMP,
-  ACCL1_Freya_1_VOL1_VOLT,
-  ACCL1_Freya_1_VOL2_VOLT,
-  ACCL1_Freya_2_TEMP,
-  ACCL1_Freya_2_VOL1_VOLT,
-  ACCL1_Freya_2_VOL2_VOLT,
-  ACCL2_Freya_1_TEMP,
-  ACCL2_Freya_1_VOL1_VOLT,
-  ACCL2_Freya_1_VOL2_VOLT,
-  ACCL2_Freya_2_TEMP,
-  ACCL2_Freya_2_VOL1_VOLT,
-  ACCL2_Freya_2_VOL2_VOLT,
-  ACCL3_Freya_1_TEMP,
-  ACCL3_Freya_1_VOL1_VOLT,
-  ACCL3_Freya_1_VOL2_VOLT,
-  ACCL3_Freya_2_TEMP,
-  ACCL3_Freya_2_VOL1_VOLT,
-  ACCL3_Freya_2_VOL2_VOLT,
-  ACCL4_Freya_1_TEMP,
-  ACCL4_Freya_1_VOL1_VOLT,
-  ACCL4_Freya_1_VOL2_VOLT,
-  ACCL4_Freya_2_TEMP,
-  ACCL4_Freya_2_VOL1_VOLT,
-  ACCL4_Freya_2_VOL2_VOLT,
-  ACCL5_Freya_1_TEMP,
-  ACCL5_Freya_1_VOL1_VOLT,
-  ACCL5_Freya_1_VOL2_VOLT,
-  ACCL5_Freya_2_TEMP,
-  ACCL5_Freya_2_VOL1_VOLT,
-  ACCL5_Freya_2_VOL2_VOLT,
-  ACCL6_Freya_1_TEMP,
-  ACCL6_Freya_1_VOL1_VOLT,
-  ACCL6_Freya_1_VOL2_VOLT,
-  ACCL6_Freya_2_TEMP,
-  ACCL6_Freya_2_VOL1_VOLT,
-  ACCL6_Freya_2_VOL2_VOLT,
-  ACCL7_Freya_1_TEMP,
-  ACCL7_Freya_1_VOL1_VOLT,
-  ACCL7_Freya_1_VOL2_VOLT,
-  ACCL7_Freya_2_TEMP,
-  ACCL7_Freya_2_VOL1_VOLT,
-  ACCL7_Freya_2_VOL2_VOLT,
-  ACCL8_Freya_1_TEMP,
-  ACCL8_Freya_1_VOL1_VOLT,
-  ACCL8_Freya_1_VOL2_VOLT,
-  ACCL8_Freya_2_TEMP,
-  ACCL8_Freya_2_VOL1_VOLT,
-  ACCL8_Freya_2_VOL2_VOLT,
-  ACCL9_Freya_1_TEMP,
-  ACCL9_Freya_1_VOL1_VOLT,
-  ACCL9_Freya_1_VOL2_VOLT,
-  ACCL9_Freya_2_TEMP,
-  ACCL9_Freya_2_VOL1_VOLT,
-  ACCL9_Freya_2_VOL2_VOLT,
-  ACCL10_Freya_1_TEMP,
-  ACCL10_Freya_1_VOL1_VOLT,
-  ACCL10_Freya_1_VOL2_VOLT,
-  ACCL10_Freya_2_TEMP,
-  ACCL10_Freya_2_VOL1_VOLT,
-  ACCL10_Freya_2_VOL2_VOLT,
-  ACCL11_Freya_1_TEMP,
-  ACCL11_Freya_1_VOL1_VOLT,
-  ACCL11_Freya_1_VOL2_VOLT,
-  ACCL11_Freya_2_TEMP,
-  ACCL11_Freya_2_VOL1_VOLT,
-  ACCL11_Freya_2_VOL2_VOLT,
-  ACCL12_Freya_1_TEMP,
-  ACCL12_Freya_1_VOL1_VOLT,
-  ACCL12_Freya_1_VOL2_VOLT,
-  ACCL12_Freya_2_TEMP,
-  ACCL12_Freya_2_VOL1_VOLT,
-  ACCL12_Freya_2_VOL2_VOLT,
-};
-
 const uint8_t acb_artemis_sensor_list[] = {
   ACB_SENSOR_INLET_TEMP,
   ACB_SENSOR_OUTLET_1_TEMP,
@@ -937,4 +582,3 @@ const uint8_t acb_artemis_sensor_list[] = {
 };
 
 size_t acb_artemis_sensor_cnt = sizeof(acb_artemis_sensor_list)/sizeof(uint8_t);
-size_t acb_freya_sensor_cnt = sizeof(acb_freya_sensor_list)/sizeof(uint8_t);
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_acb_sensors.h b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_acb_sensors.h
index 7596f01a2a8c..17515ffa560c 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_acb_sensors.h
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_acb_sensors.h
@@ -98,81 +98,6 @@ enum {
   ACB_SENSOR_P1V25_1_12VIN_PWR = 0x65,
   ACB_SENSOR_P1V25_2_12VIN_PWR = 0x66,
   ACB_SENSOR_INLET_TEMP = 0x67,
-  ACCL1_Freya_1_TEMP = 0x70,
-  ACCL1_Freya_1_VOL1_VOLT = 0x71,
-  ACCL1_Freya_1_VOL2_VOLT = 0x72,
-  ACCL1_Freya_2_TEMP = 0x73,
-  ACCL1_Freya_2_VOL1_VOLT = 0x74,
-  ACCL1_Freya_2_VOL2_VOLT = 0x75,
-  ACCL2_Freya_1_TEMP = 0x76,
-  ACCL2_Freya_1_VOL1_VOLT = 0x77,
-  ACCL2_Freya_1_VOL2_VOLT = 0x78,
-  ACCL2_Freya_2_TEMP = 0x79,
-  ACCL2_Freya_2_VOL1_VOLT = 0x7A,
-  ACCL2_Freya_2_VOL2_VOLT = 0x7B,
-  ACCL3_Freya_1_TEMP = 0x7C,
-  ACCL3_Freya_1_VOL1_VOLT = 0x7D,
-  ACCL3_Freya_1_VOL2_VOLT = 0x7E,
-  ACCL3_Freya_2_TEMP = 0x7F,
-  ACCL3_Freya_2_VOL1_VOLT = 0x80,
-  ACCL3_Freya_2_VOL2_VOLT = 0x81,
-  ACCL4_Freya_1_TEMP = 0x82,
-  ACCL4_Freya_1_VOL1_VOLT = 0x83,
-  ACCL4_Freya_1_VOL2_VOLT = 0x84,
-  ACCL4_Freya_2_TEMP = 0x85,
-  ACCL4_Freya_2_VOL1_VOLT = 0x86,
-  ACCL4_Freya_2_VOL2_VOLT = 0x87,
-  ACCL5_Freya_1_TEMP = 0x88,
-  ACCL5_Freya_1_VOL1_VOLT = 0x89,
-  ACCL5_Freya_1_VOL2_VOLT = 0x8A,
-  ACCL5_Freya_2_TEMP = 0x8B,
-  ACCL5_Freya_2_VOL1_VOLT = 0x8C,
-  ACCL5_Freya_2_VOL2_VOLT = 0x8D,
-  ACCL6_Freya_1_TEMP = 0x8E,
-  ACCL6_Freya_1_VOL1_VOLT = 0x8F,
-  ACCL6_Freya_1_VOL2_VOLT = 0x90,
-  ACCL6_Freya_2_TEMP = 0x91,
-  ACCL6_Freya_2_VOL1_VOLT = 0x92,
-  ACCL6_Freya_2_VOL2_VOLT = 0x93,
-  ACCL7_Freya_1_TEMP = 0x94,
-  ACCL7_Freya_1_VOL1_VOLT = 0x95,
-  ACCL7_Freya_1_VOL2_VOLT = 0x96,
-  ACCL7_Freya_2_TEMP = 0x97,
-  ACCL7_Freya_2_VOL1_VOLT = 0x98,
-  ACCL7_Freya_2_VOL2_VOLT = 0x99,
-  ACCL8_Freya_1_TEMP = 0x9A,
-  ACCL8_Freya_1_VOL1_VOLT = 0x9B,
-  ACCL8_Freya_1_VOL2_VOLT = 0x9C,
-  ACCL8_Freya_2_TEMP = 0x9D,
-  ACCL8_Freya_2_VOL1_VOLT = 0x9E,
-  ACCL8_Freya_2_VOL2_VOLT = 0x9F,
-  ACCL9_Freya_1_TEMP = 0xA0,
-  ACCL9_Freya_1_VOL1_VOLT = 0xA1,
-  ACCL9_Freya_1_VOL2_VOLT = 0xA2,
-  ACCL9_Freya_2_TEMP = 0xA3,
-  ACCL9_Freya_2_VOL1_VOLT = 0xA4,
-  ACCL9_Freya_2_VOL2_VOLT = 0xA5,
-  ACCL10_Freya_1_TEMP = 0xA6,
-  ACCL10_Freya_1_VOL1_VOLT = 0xA7,
-  ACCL10_Freya_1_VOL2_VOLT = 0xA8,
-  ACCL10_Freya_2_TEMP = 0xA9,
-  ACCL10_Freya_2_VOL1_VOLT = 0xAA,
-  ACCL10_Freya_2_VOL2_VOLT = 0xAB,
-  ACCL11_Freya_1_TEMP = 0xAC,
-  ACCL11_Freya_1_VOL1_VOLT = 0xAD,
-  ACCL11_Freya_1_VOL2_VOLT = 0xAE,
-  ACCL11_Freya_2_TEMP = 0xAF,
-  ACCL11_Freya_2_VOL1_VOLT = 0xB0,
-  ACCL11_Freya_2_VOL2_VOLT = 0xB1,
-  ACCL12_Freya_1_TEMP = 0xB2,
-  ACCL12_Freya_1_VOL1_VOLT = 0xB3,
-  ACCL12_Freya_1_VOL2_VOLT = 0xB4,
-  ACCL12_Freya_2_TEMP = 0xB5,
-  ACCL12_Freya_2_VOL1_VOLT = 0xB6,
-  ACCL12_Freya_2_VOL2_VOLT = 0xB7,
-};
-
-enum ARTEMIS_MODULE_SENSOR {
   ACCL1_ASIC_1_TEMP = 0x70,
   ACCL1_ASIC_1_0V8_VOLT = 0x71,
   ACCL1_ASIC_1_1V05_VOLT = 0x72,
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_def.h b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_def.h
index c810dbf30d97..b70b750f3fa0 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_def.h
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_def.h
@@ -31,6 +31,7 @@
 //GPIO HGX
 #define HMC_PRESENCE             "GPU_HMC_PRSNT_ISO_R_N"
 #define HMC_READY                "GPU_BASE_HMC_READY_ISO_R"
+#define GPU_FPGA_READY           "GPU_FPGA_READY_ISO_R"
 #define GPU_FPGA_RST_N           "GPU_FPGA_RST_N"
 
 // GPIO FAN_BP PRSNT
@@ -153,6 +154,13 @@ typedef struct {
 #define GPION_COMMON_SOURCE_OFFSET   (0xE0)
 #define AST_GPIO_BASE                (0x1e780000)
 
+/*  GTI  */
+#define MB_CPLD_BUS               (I2C_BUS_7)
+#define MB_CPLD_ADDR              (0x46)
+
+#define SWB_CPLD_BUS              (I2C_BUS_32)
+#define SWB_CPLD_ADDR             (0x26)
+
 enum {
   DIMM_ID0 = 0,
   DIMM_ID1,
@@ -543,11 +551,6 @@ enum MEB_JCN_TYPE {
   UNKNOWN_CARD = 0xff,
 };
 
-enum ACB_CARD_TYPE {
-  FREYA_CARD,
-  ARTEMIS_CARD,
-};
-
 enum GTA_SKU_ID {
   GTA_CONFIG_1 = 1,
   GTA_CONFIG_8 = 8,
@@ -597,6 +600,16 @@ enum CB_FRU_COMPONENT {
   FAC12_DEV2_FRU_ID,
 };
 
+/* BMC to MB CPLD ADDR*/
+enum GTA_MB_BMC_CPLD_INFO {
+  MB_STBY_PWR_FAULT_OFFSET = 0x52,
+  MB_STBY_PWR_FAULT_TIMEOUE_OFFSET = 0x53,
+  MB_NORMAL_PWR_FAULT_A_OFFSET = 0x54,
+  MB_NORMAL_PWR_FAULT_B_OFFSET = 0x55,
+  MB_NORMAL_PWR_FAULT_TIMEOUT_A_OFFSET = 0x56,
+  MB_NORMAL_PWR_FAULT_TIMEOUT_B_OFFSET = 0x57,
+};
+
 /* BMC to MC CPLD ADDR */
 enum GTA_MC_BMC_CPLD_INFO {
   MC_CPLD_ADDR = 0xC0,
@@ -630,14 +643,25 @@ enum GTA_MB_CPLD {
   CB_PWR_FAULT_MASK = 0x02,
   MC_PWR_TRAY_REMOVE_MASK = 0x04,
   CB_PWR_TRAY_REMOVE_MASK = 0x08,
+  MB_NORMAL_PWR_FAULT_MASK = 0x10,
+  MB_STBY_PWR_FAULT_MASK = 0x20,
 };
 
 enum GTA_MB_CPLD_OFFSET {
+  HSC_EN_R_OFFSET = 0x01,
   EXP_BOARD_PWR_FAULT_OFFSET = 0x0D,
   EXP_BOARD_PWR_GOOD_DROP_OFFSET = 0x10,
   EXP_BOARD_NO_PWR_GOOD_OFFSET = 0x14,
 };
 
+enum GTA_MB_CPLD_BIT {
+  GPU_HSC_EN_R_BIT = 6,
+};
+
+enum GTA_MB_CPLD_ASSERTED_VALUE {
+  GPU_HSC_EN_ASSERTED_VALUE = 0,
+};
+
 enum GTA_MB_CPLD_CB_POWER_FAULT_BIT {
   CB_NORMAL_PG_FAULT = 0,
   CB_STBY_PG_FAULT,
@@ -657,15 +681,20 @@ enum GTA_EXMAX_CABLE {
   GTA_EXMAX_CABLE_F,
 };
 
-  enum GTA_POWER_FAULT_STATUS {
-    POWER_GOOD_DROP = 0,
-    NO_POWER_GOOD   = 1,
-  };
+enum GTA_POWER_FAULT_STATUS {
+  POWER_GOOD_DROP = 0,
+  NO_POWER_GOOD   = 1,
+};
 
-  enum GTA_CB_POWER_FAULT_LOCATION {
-    CB_POWER_FAULT_A_LOCATION = 0,
-    CB_POWER_FAULT_B_LOCATION = 1,
-  };
+enum GTA_MB_POWER_FAULT_LOCATION {
+  MB_PWR_FAULT_A_LOCATION = 0,
+  MB_PWR_FAULT_B_LOCATION = 1,
+};
+
+enum GTA_CB_POWER_FAULT_LOCATION {
+  CB_POWER_FAULT_A_LOCATION = 0,
+  CB_POWER_FAULT_B_LOCATION = 1,
+};
 
 /* Artemis End */
 
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_health.c b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_health.c
index ad3b9311f7bb..865f0aa915a4 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_health.c
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_health.c
@@ -92,9 +92,20 @@ pal_set_sensor_health(uint8_t fru, uint8_t value) {
 
   char key[MAX_KEY_LEN] = {0};
   char cvalue[MAX_VALUE_LEN] = {0};
+  uint8_t status = FRU_NOT_PRSNT;
 
   if (pal_get_sensor_health_key(fru, key))
     return -1;
+  
+  // Since Artemis Module
+  if (pal_is_artemis() && fru == FRU_ACB) {
+    for (int i = FRU_ACB_ACCL1; i <= FRU_ACB_ACCL12; i ++) {
+      if (pal_is_fru_prsnt(i, &status) == 0 && status == FRU_NOT_PRSNT) {
+        value = FRU_STATUS_BAD;
+        break;
+      }
+    }
+  }
 
   sprintf(cvalue, (value > 0) ? "1": "0");
 
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_meb_sensors.c b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_meb_sensors.c
index 569273b0def3..8bb580b2e2d1 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_meb_sensors.c
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_meb_sensors.c
@@ -76,50 +76,50 @@ PAL_SENSOR_MAP meb_sensor_map[] = {
   {"P3V3_AUX_VOLT", 0, get_meb_sensor, false, {3.531, 0, 0, 3.07, 0, 0, 0, 0},  VOLT}, // 0x05
   {"P1V2_AUX_VOLT", 0, get_meb_sensor, false, {1.284, 0, 0, 1.116, 0, 0, 0, 0},  VOLT}, // 0x06
   {"P3V3_VOLT", 0, get_meb_sensor, false, {3.531, 0, 0, 3.07, 0, 0, 0, 0},  VOLT}, // 0x07
-  {"P12V_AUX_CXL8_VOLT", 0, get_meb_sensor, false, {12.81, 0, 0, 11.59, 0, 0, 0, 0},  VOLT}, // 0x08
-  {"P12V_AUX_CXL7_VOLT", 0, get_meb_sensor, false, {12.81, 0, 0, 11.59, 0, 0, 0, 0},  VOLT}, // 0x09
-  {"P12V_AUX_CXL6_VOLT", 0, get_meb_sensor, false, {12.81, 0, 0, 11.59, 0, 0, 0, 0},  VOLT}, // 0x0A
-  {"P12V_AUX_CXL5_VOLT", 0, get_meb_sensor, false, {12.81, 0, 0, 11.59, 0, 0, 0, 0},  VOLT}, // 0x0B
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x08
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x09
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x0A
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x0B
   {"P12V_AUX_SSD4_VOLT", 0, get_meb_sensor, false, {13.42, 0, 0, 10.98, 0, 0, 0, 0},  VOLT}, // 0x0C
   {"P12V_AUX_SSD3_VOLT", 0, get_meb_sensor, false, {13.42, 0, 0, 10.98, 0, 0, 0, 0},  VOLT}, // 0x0D
   {"P12V_AUX_SSD2_VOLT", 0, get_meb_sensor, false, {13.42, 0, 0, 10.98, 0, 0, 0, 0},  VOLT}, // 0x0E
   {"P12V_AUX_SSD1_VOLT", 0, get_meb_sensor, false, {13.42, 0, 0, 10.98, 0, 0, 0, 0},  VOLT}, // 0x0F
-  {"P12V_AUX_CXL3_VOLT", 0, get_meb_sensor, false, {12.81, 0, 0, 11.59, 0, 0, 0, 0},  VOLT}, // 0x10
-  {"P12V_AUX_CXL4_VOLT", 0, get_meb_sensor, false, {12.81, 0, 0, 11.59, 0, 0, 0, 0},  VOLT}, // 0x11
-  {"P12V_AUX_CXL1_VOLT", 0, get_meb_sensor, false, {12.81, 0, 0, 11.59, 0, 0, 0, 0},  VOLT}, // 0x12
-  {"P12V_AUX_CXL2_VOLT", 0, get_meb_sensor, false, {12.81, 0, 0, 11.59, 0, 0, 0, 0},  VOLT}, // 0x13
-  {"P12V_AUX_SW_4C_2_VOLT", 0, get_meb_sensor, false, {13.176, 0, 0, 10.736, 0, 0, 0, 0},  VOLT}, // 0x14
-  {"P12V_AUX_SW_4C_1_VOLT", 0, get_meb_sensor, false, {13.176, 0, 0, 10.736, 0, 0, 0, 0},  VOLT}, // 0x15
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x10
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x11
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x12
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x13
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x14
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x15
   {"P12V_AUX_CURR", 0, get_meb_hsc_sensor, false, {73.1, 0, 95, 0, 0, 0, 0, 0},  CURR}, // 0x16
-  {"P12V_AUX_CXL8_CURR", 0, get_meb_sensor, false, {6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x17
-  {"P12V_AUX_CXL7_CURR", 0, get_meb_sensor, false, {6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x18
-  {"P12V_AUX_CXL6_CURR", 0, get_meb_sensor, false, {6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x19
-  {"P12V_AUX_CXL5_CURR", 0, get_meb_sensor, false, {6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x1A
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x17
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x18
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x19
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x1A
   {"P12V_AUX_SSD4_CURR", 0, get_meb_sensor, false, {2.8, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x1B
   {"P12V_AUX_SSD3_CURR", 0, get_meb_sensor, false, {2.8, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x1C
   {"P12V_AUX_SSD2_CURR", 0, get_meb_sensor, false, {2.8, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x1D
   {"P12V_AUX_SSD1_CURR", 0, get_meb_sensor, false, {2.8, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x1E
-  {"P12V_AUX_CXL3_CURR", 0, get_meb_sensor, false, {6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x1F
-  {"P12V_AUX_CXL4_CURR", 0, get_meb_sensor, false, {6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x20
-  {"P12V_AUX_CXL1_CURR", 0, get_meb_sensor, false, {6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x21
-  {"P12V_AUX_CXL2_CURR", 0, get_meb_sensor, false, {6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x22
-  {"P12V_AUX_SW_4C_2_CURR", 0, get_meb_sensor, false, {6.6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x23
-  {"P12V_AUX_SW_4C_1_CURR", 0, get_meb_sensor, false, {6.6, 0, 0, 0, 0, 0, 0, 0},  CURR}, // 0x24
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x1F
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x20
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x21
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x22
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x23
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x24
   {"P12V_AUX_PWR", 0, get_meb_hsc_sensor, false, {918.575, 0, 1267, 0, 0, 0, 0, 0},  POWER}, // 0x25
-  {"P12V_AUX_CXL8_PWR", 0, get_meb_sensor, false, {72, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x26
-  {"P12V_AUX_CXL7_PWR", 0, get_meb_sensor, false, {72, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x27
-  {"P12V_AUX_CXL6_PWR", 0, get_meb_sensor, false, {72, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x28
-  {"P12V_AUX_CXL5_PWR", 0, get_meb_sensor, false, {72, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x29
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x26
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x27
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x28
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x29
   {"P12V_AUX_SSD4_PWR", 0, get_meb_sensor, false, {25, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x2A
   {"P12V_AUX_SSD3_PWR", 0, get_meb_sensor, false, {25, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x2B
   {"P12V_AUX_SSD2_PWR", 0, get_meb_sensor, false, {25, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x2C
   {"P12V_AUX_SSD1_PWR", 0, get_meb_sensor, false, {25, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x2D
-  {"P12V_AUX_CXL3_PWR", 0, get_meb_sensor, false, {72, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x2E
-  {"P12V_AUX_CXL4_PWR", 0, get_meb_sensor, false, {72, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x2F
-  {"P12V_AUX_CXL1_PWR", 0, get_meb_sensor, false, {72, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x30
-  {"P12V_AUX_CXL2_PWR", 0, get_meb_sensor, false, {72, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x31
-  {"P12V_AUX_SW_4C_2_PWR", 0, get_meb_sensor, false, {80, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x32
-  {"P12V_AUX_SW_4C_1_PWR", 0, get_meb_sensor, false, {80, 0, 0, 0, 0, 0, 0, 0},  POWER}, // 0x33
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x2E
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x2F
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x30
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x31
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x32
+  {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0}, // 0x33
   {"SSD1_TEMP", 0, get_meb_sensor, false, {75, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x34
   {"SSD2_TEMP", 0, get_meb_sensor, false, {75, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x35
   {"SSD3_TEMP", 0, get_meb_sensor, false, {75, 0, 0, 0, 0, 0, 0, 0},  TEMP}, // 0x36
@@ -180,50 +180,20 @@ const uint8_t meb_sensor_list[] = {
   MEB_SENSOR_P3V3_AUX_VOL,
   MEB_SENSOR_P1V2_AUX_VOL,
   MEB_SENSOR_P3V3_VOL,
-  MEB_SENSOR_P12V_AUX_CXL1_VOL,
-  MEB_SENSOR_P12V_AUX_CXL2_VOL,
-  MEB_SENSOR_P12V_AUX_CXL3_VOL,
-  MEB_SENSOR_P12V_AUX_CXL4_VOL,
-  MEB_SENSOR_P12V_AUX_CXL5_VOL,
-  MEB_SENSOR_P12V_AUX_CXL6_VOL,
-  MEB_SENSOR_P12V_AUX_CXL7_VOL,
-  MEB_SENSOR_P12V_AUX_CXL8_VOL,
   MEB_SENSOR_P12V_AUX_SSD1_VOL,
   MEB_SENSOR_P12V_AUX_SSD2_VOL,
   MEB_SENSOR_P12V_AUX_SSD3_VOL,
   MEB_SENSOR_P12V_AUX_SSD4_VOL,
-  MEB_SENSOR_P12V_AUX_SW_4C_1_VOL,
-  MEB_SENSOR_P12V_AUX_SW_4C_2_VOL,
   MEB_SENSOR_P12V_AUX_CUR,
-  MEB_SENSOR_P12V_AUX_CXL1_CUR,
-  MEB_SENSOR_P12V_AUX_CXL2_CUR,
-  MEB_SENSOR_P12V_AUX_CXL3_CUR,
-  MEB_SENSOR_P12V_AUX_CXL4_CUR,
-  MEB_SENSOR_P12V_AUX_CXL5_CUR,
-  MEB_SENSOR_P12V_AUX_CXL6_CUR,
-  MEB_SENSOR_P12V_AUX_CXL7_CUR,
-  MEB_SENSOR_P12V_AUX_CXL8_CUR,
   MEB_SENSOR_P12V_AUX_SSD1_CUR,
   MEB_SENSOR_P12V_AUX_SSD2_CUR,
   MEB_SENSOR_P12V_AUX_SSD3_CUR,
   MEB_SENSOR_P12V_AUX_SSD4_CUR,
-  MEB_SENSOR_P12V_AUX_SW_4C_1_CUR,
-  MEB_SENSOR_P12V_AUX_SW_4C_2_CUR,
   MEB_SENSOR_P12V_AUX_PWR,
-  MEB_SENSOR_P12V_AUX_CXL1_PWR,
-  MEB_SENSOR_P12V_AUX_CXL2_PWR,
-  MEB_SENSOR_P12V_AUX_CXL3_PWR,
-  MEB_SENSOR_P12V_AUX_CXL4_PWR,
-  MEB_SENSOR_P12V_AUX_CXL5_PWR,
-  MEB_SENSOR_P12V_AUX_CXL6_PWR,
-  MEB_SENSOR_P12V_AUX_CXL7_PWR,
-  MEB_SENSOR_P12V_AUX_CXL8_PWR,
   MEB_SENSOR_P12V_AUX_SSD1_PWR,
   MEB_SENSOR_P12V_AUX_SSD2_PWR,
   MEB_SENSOR_P12V_AUX_SSD3_PWR,
   MEB_SENSOR_P12V_AUX_SSD4_PWR,
-  MEB_SENSOR_P12V_AUX_SW_4C_1_PWR,
-  MEB_SENSOR_P12V_AUX_SW_4C_2_PWR,
   MEB_SENSOR_E1S_0_TEMP,
   MEB_SENSOR_E1S_1_TEMP,
   MEB_SENSOR_E1S_2_TEMP,
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_power.c b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_power.c
index 206e986f048f..1bc79f506208 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_power.c
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_power.c
@@ -486,6 +486,23 @@ pal_get_server_power(uint8_t fru, uint8_t *status) {
   return ret;
 }
 
+bool
+pal_block_server_power() {
+  char value[MAX_VALUE_LEN] = {0};
+  static bool is_log_print = false;
+  // is bic recovery update ongoing
+  if (kv_get("bic_recovery_update", value, NULL, 0) == 0 && !strcmp(value, "1")) {
+    if (!is_log_print) {
+      printf("BLOCK SETTING SERVER POWER: BIC RECOVERY UPDATE ONGOING\n");
+      syslog(LOG_WARNING, "%s() BLOCK SETTING SERVER POWER: BIC RECOVERY UPDATE ONGOING", __func__);
+      is_log_print = true;
+    }
+    return true;
+  }
+  is_log_print = false;
+  return false;
+}
+
 // Power Off, Power On, or Power Reset the server in given slot
 int
 pal_set_server_power(uint8_t fru, uint8_t cmd) {
@@ -496,6 +513,12 @@ pal_set_server_power(uint8_t fru, uint8_t cmd) {
     return -1;
   }
 
+  if (pal_is_artemis()) {
+    if (pal_block_server_power()) {
+      return -1;
+    }
+  }
+
   if (fru != FRU_MB) {
     if (pal_is_artemis()) {
       return pal_set_fru_power(fru, cmd);
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_sensors.c b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_sensors.c
index 9c75e056cdf4..beb16f52ce32 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_sensors.c
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_sensors.c
@@ -17,7 +17,6 @@ extern PAL_SENSOR_MAP ubb_sensor_map[];
 extern PAL_SENSOR_MAP swb_sensor_map[];
 extern PAL_SENSOR_MAP bb_sensor_map[];
 extern PAL_SENSOR_MAP acb_artemis_sensor_map[];
-extern PAL_SENSOR_MAP acb_freya_sensor_map[];
 extern PAL_SENSOR_MAP meb_sensor_map[];
 extern PAL_SENSOR_MAP meb_clx_sensor_map[];
 extern PAL_SENSOR_MAP meb_e1s_sensor_map[];
@@ -49,7 +48,6 @@ extern const uint8_t fan_bp2_sensor_list[];
 extern const uint8_t scm_sensor_list[];
 
 extern const uint8_t acb_artemis_sensor_list[];
-extern const uint8_t acb_freya_sensor_list[];
 extern const uint8_t meb_sensor_list[];
 extern const uint8_t meb_cxl_sensor_list[];
 extern const uint8_t meb_e1s_sensor_list[];
@@ -80,7 +78,6 @@ extern size_t fan_bp2_sensor_cnt;
 
 extern size_t scm_sensor_cnt;
 
-extern size_t acb_freya_sensor_cnt;
 extern size_t acb_artemis_sensor_cnt;
 extern size_t meb_sensor_cnt;
 extern size_t meb_cxl_sensor_cnt;
@@ -180,65 +177,6 @@ get_pldm_sensor(uint8_t bus, uint8_t eid, uint8_t sensor_num, float *value)
 
 }
 
-static int pal_get_acb_card_config_from_bic() {
-  fru_status status = {0};
-  int ret = 0;
-  int fru = 0;
-
-  for (fru = FRU_ACB_ACCL1; fru <= FRU_ACB_ACCL12; fru++) {
-    ret = pal_get_pldm_fru_status(fru, JCN_0_1, &status);
-    if (ret == 0 && status.fru_prsnt == FRU_PRSNT && status.fru_type != UNKNOWN_CARD ) {
-      return (int)(status.fru_type);
-    }
-  }
-
-  return -1;
-}
-
-uint8_t pal_get_acb_card_config() {
-  char type_str[MAX_VALUE_LEN] = {0};
-  uint8_t card_type = 0;
-
-  memset(type_str, 0, MAX_VALUE_LEN);
-
-  if (kv_get(KEY_ACB_CARD_CONFIG, type_str, NULL, 0) != 0) {
-    // not cached before, get from BIC
-    if ((card_type = pal_get_acb_card_config_from_bic()) < 0) {
-      return UNKNOWN_CARD ;
-    }
-
-    snprintf(type_str, sizeof(type_str), "%d", card_type);
-    kv_set(KEY_ACB_CARD_CONFIG, type_str, 0, 0);
-  }
-
-  // get from cache
-  return atoi(type_str);
-}
-
-static void reload_sensor_table(uint8_t fru) {
-  uint8_t config = 0;
-
-  if (fru == FRU_ACB) {
-    config = pal_get_acb_card_config();
-
-    switch (config) {
-      case ARTEMIS_CARD:
-        // using default sensor table
-        break;
-      case FREYA_CARD:
-        sensor_map[fru].map = acb_freya_sensor_map;
-        break;
-      default:
-#ifdef DEBUG
-        syslog(LOG_ERR, "[%s] Fail to get acb fru%u, config = %u\n", __func__, fru, config);
-#endif
-        break;
-    }
-  }
-
-  return;
-}
-
 int
 pal_get_sensor_poll_interval(uint8_t fru, uint8_t num, uint32_t *value) {
   switch (fru) {
@@ -357,13 +295,8 @@ pal_get_fru_sensor_list(uint8_t fru, uint8_t **sensor_list, int *cnt) {
     *sensor_list = (uint8_t *) snr_swb_tmp;
   } else if (fru == FRU_ACB) {
     if (pal_is_artemis()) {
-      if (pal_get_acb_card_config() == FREYA_CARD) {
-        *sensor_list = (uint8_t *) acb_freya_sensor_list;
-        *cnt = acb_freya_sensor_cnt;
-      } else {
-        *sensor_list = (uint8_t *) acb_artemis_sensor_list;
-        *cnt = acb_artemis_sensor_cnt;
-      }
+      *sensor_list = (uint8_t *) acb_artemis_sensor_list;
+      *cnt = acb_artemis_sensor_cnt;
     } else {
       *sensor_list = NULL;
       *cnt = 0;
@@ -438,6 +371,37 @@ int retry_skip_handle(uint8_t retry_curr, uint8_t retry_max) {
   return 0;
 }
 
+int sensor_skip_handle(uint8_t fru, uint8_t snr_num) {
+  int ret = 0;
+  uint8_t value = 0;
+
+  if (pal_is_artemis()) {
+    switch (fru) {
+      case FRU_HPDB:
+        switch (snr_num) {
+          case PDBH_SNR_HSC1_VOUT:
+          case PDBH_SNR_HSC1_IOUT:
+          case PDBH_SNR_HSC1_PIN:
+          case PDBH_SNR_HSC2_VOUT:
+          case PDBH_SNR_HSC2_IOUT:
+          case PDBH_SNR_HSC2_PIN:
+            ret = pal_read_cpld_reg(FRU_MB, HSC_EN_R_OFFSET, GPU_HSC_EN_R_BIT, &value);
+            if (ret == 0 && value == GPU_HSC_EN_ASSERTED_VALUE) {
+            // Since CB is removed, these HSC HPDB snrs should be ignore threshold
+              return READING_NA;
+            }
+            break;
+          default:
+            break;
+        }
+        break;
+      default:
+        break;
+    }
+  }
+  return 0;
+}
+
 int check_polling_status(uint8_t fru){
   char key[MAX_KEY_LEN] = {0};
   char val[MAX_VALUE_LEN] = {0};
@@ -516,8 +480,6 @@ pal_sensor_read_raw(uint8_t fru, uint8_t sensor_num, void *value) {
   bool server_off;
   uint8_t *retry = get_map_retry(fru);
 
-  reload_sensor_table(fru);
-
   pal_get_fru_name(fru, fru_name);
   sprintf(key, "%s_sensor%d", fru_name, sensor_num);
 
@@ -525,6 +487,10 @@ pal_sensor_read_raw(uint8_t fru, uint8_t sensor_num, void *value) {
   if (check_polling_status(fru)) {
     if (server_off) {
       if (sensor_map[fru].map[sensor_num].stby_read == true) {
+        ret = sensor_skip_handle(fru, sensor_num);
+        if (ret == READING_NA) {
+          return ret;
+        }
         ret = sensor_map[fru].map[sensor_num].read_sensor(fru, sensor_num, (float*) value);
       } else {
         ret = READING_NA;
@@ -534,6 +500,10 @@ pal_sensor_read_raw(uint8_t fru, uint8_t sensor_num, void *value) {
         && sensor_map[fru].map[sensor_num].stby_read == false) {
         return READING_NA;
       } else {
+        ret = sensor_skip_handle(fru, sensor_num);
+        if (ret == READING_NA) {
+          return ret;
+        }
         ret = sensor_map[fru].map[sensor_num].read_sensor(fru, sensor_num, (float*) value);
       }
     }
@@ -599,7 +569,6 @@ pal_get_sensor_name(uint8_t fru, uint8_t sensor_num, char *name) {
   char units_name[8] = {0};
   uint8_t scale = 0;
 
-  reload_sensor_table(fru);
   scale = sensor_map[fru].map[sensor_num].units;
 
   if (check_polling_status(fru)) {
@@ -645,8 +614,6 @@ int
 pal_get_sensor_threshold(uint8_t fru, uint8_t sensor_num, uint8_t thresh, void *value) {
   float *val = (float*) value;
 
-  reload_sensor_table(fru);
-
   if (check_polling_status(fru)) {
     switch(thresh) {
       case UCR_THRESH:
@@ -688,7 +655,6 @@ pal_get_sensor_units(uint8_t fru, uint8_t sensor_num, char *units) {
 
   uint8_t scale = 0;
 
-  reload_sensor_table(fru);
   scale = sensor_map[fru].map[sensor_num].units;
 
   if (sensor_map[fru].polling) {
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_sensors.h b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_sensors.h
index facf9aa0edc9..fab7dcbd87bf 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_sensors.h
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_sensors.h
@@ -186,7 +186,6 @@ int read_vr_temp(uint8_t fru, uint8_t sensor_num, float *value);
 int read_vr_vout(uint8_t fru, uint8_t sensor_num, float *value);
 int read_vr_iout(uint8_t fru, uint8_t sensor_num, float *value);
 int read_vr_pout(uint8_t fru, uint8_t sensor_num, float *value);
-uint8_t pal_get_acb_card_config(void);
 
 extern const char pal_server_list[];
 #endif
diff --git a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_ubb_sensors.c b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_ubb_sensors.c
index f41009c15975..afcb5fe27352 100644
--- a/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_ubb_sensors.c
+++ b/meta-facebook/meta-grandteton/recipes-grandteton/plat-libs/files/pal/pal_ubb_sensors.c
@@ -209,72 +209,72 @@ PAL_SENSOR_MAP ubb_sensor_map[] = {
   {"PCIeRetimer_MAX_VR_TEMP", 0, read_snr, 0, {0, 0, 0, 0, 0, 0, 0, 0}, TEMP},       //0x2E
   {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0},                                   //0x2F
 
-  {"GPU_1_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x30
-  {"GPU_1_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x31
-  {"GPU_1_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x32
-  {"GPU_1_TEMP_0", 0,   read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x33
-  {"GPU_1_TEMP_1", 0,       NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x34
-  {"GPU_1_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x35
-  {"GPU_1_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x36
+  {"OAM_0_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x30
+  {"OAM_0_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x31
+  {"OAM_0_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x32
+  {"OAM_0_TEMP_0", 0,   read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x33
+  {"OAM_0_TEMP_1", 0,       NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x34
+  {"OAM_0_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x35
+  {"OAM_0_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x36
   {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0},                              //0x37
-  {"GPU_2_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x38
-  {"GPU_2_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x39
-  {"GPU_2_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x3A
-  {"GPU_2_TEMP_0" , 0,  read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x3B
-  {"GPU_2_TEMP_1" , 0,      NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x3C
-  {"GPU_2_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x3D
-  {"GPU_2_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x3E
+  {"OAM_1_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x38
+  {"OAM_1_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x39
+  {"OAM_1_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x3A
+  {"OAM_1_TEMP_0" , 0,  read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x3B
+  {"OAM_1_TEMP_1" , 0,      NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x3C
+  {"OAM_1_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x3D
+  {"OAM_1_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x3E
   {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0},                              //0x3F
 
-  {"GPU_3_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x40
-  {"GPU_3_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x41
-  {"GPU_3_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x42
-  {"GPU_3_TEMP_0", 0,   read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x43
-  {"GPU_3_TEMP_1", 0,       NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x44
-  {"GPU_3_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x45
-  {"GPU_3_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x46
+  {"OAM_2_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x40
+  {"OAM_2_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x41
+  {"OAM_2_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x42
+  {"OAM_2_TEMP_0", 0,   read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x43
+  {"OAM_2_TEMP_1", 0,       NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x44
+  {"OAM_2_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x45
+  {"OAM_2_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x46
   {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0},                              //0x47
-  {"GPU_4_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x48
-  {"GPU_4_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x49
-  {"GPU_4_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x4A
-  {"GPU_4_TEMP_0" , 0,  read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x4B
-  {"GPU_4_TEMP_1" , 0,      NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x4C
-  {"GPU_4_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x4D
-  {"GPU_4_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x4E
+  {"OAM_3_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x48
+  {"OAM_3_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x49
+  {"OAM_3_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x4A
+  {"OAM_3_TEMP_0" , 0,  read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x4B
+  {"OAM_3_TEMP_1" , 0,      NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x4C
+  {"OAM_3_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x4D
+  {"OAM_3_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x4E
   {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0},                              //0x4F
 
-  {"GPU_5_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x50
-  {"GPU_5_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x51
-  {"GPU_5_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x52
-  {"GPU_5_TEMP_0", 0,   read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x53
-  {"GPU_5_TEMP_1", 0,       NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x54
-  {"GPU_5_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x55
-  {"GPU_5_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x56
+  {"OAM_4_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x50
+  {"OAM_4_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x51
+  {"OAM_4_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x52
+  {"OAM_4_TEMP_0", 0,   read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x53
+  {"OAM_4_TEMP_1", 0,       NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x54
+  {"OAM_4_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x55
+  {"OAM_4_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x56
   {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0},                              //0x57
-  {"GPU_6_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x58
-  {"GPU_6_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x59
-  {"GPU_6_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x5A
-  {"GPU_6_TEMP_0" , 0,  read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x5B
-  {"GPU_6_TEMP_1" , 0,      NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x5C
-  {"GPU_6_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x5D
-  {"GPU_6_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x5E
+  {"OAM_5_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x58
+  {"OAM_5_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x59
+  {"OAM_5_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x5A
+  {"OAM_5_TEMP_0" , 0,  read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x5B
+  {"OAM_5_TEMP_1" , 0,      NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x5C
+  {"OAM_5_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x5D
+  {"OAM_5_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x5E
   {NULL, 0, NULL, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0},                              //0x5F
 
-  {"GPU_7_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x60
-  {"GPU_7_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x61
-  {"GPU_7_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x62
-  {"GPU_7_TEMP_0", 0,   read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x63
-  {"GPU_7_TEMP_1", 0,       NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x64
-  {"GPU_7_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x65
-  {"GPU_7_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x66
+  {"OAM_6_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x60
+  {"OAM_6_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x61
+  {"OAM_6_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x62
+  {"OAM_6_TEMP_0", 0,   read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x63
+  {"OAM_6_TEMP_1", 0,       NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x64
+  {"OAM_6_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x65
+  {"OAM_6_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x66
   {"GPU_WARMEST_DIE_TEMP", 0, read_snr, false, {0, 0, 0, 0, 0, 0, 0, 0}, TEMP}, //0x67
-  {"GPU_8_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x68
-  {"GPU_8_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x69
-  {"GPU_8_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x6A
-  {"GPU_8_TEMP_0" , 0,  read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x6B
-  {"GPU_8_TEMP_1" , 0,      NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x6C
-  {"GPU_8_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x6D
-  {"GPU_8_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x6E
+  {"OAM_7_ENRGY", 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, ENRGY},      //0x68
+  {"OAM_7_PWR"  , 0,    read_snr, false, {1020.0, 0, 0, 0, 0, 0, 0, 0}, POWER}, //0x69
+  {"OAM_7_VOL"  , 0,        NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, VOLT},       //0x6A
+  {"OAM_7_TEMP_0" , 0,  read_snr, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x6B
+  {"OAM_7_TEMP_1" , 0,      NULL, false, {100.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x6C
+  {"OAM_7_DRAM_PWR" , 0,    NULL, false, {0, 0, 0, 0, 0, 0, 0, 0}, POWER},      //0x6D
+  {"OAM_7_DRAM_TEMP", 0,read_snr, false, {105.0, 0, 0, 5.0, 0, 0, 0, 0}, TEMP}, //0x6E
   {"GPU_WARMEST_MEM_TEMP", 0, read_snr, false, {0, 0, 0, 0, 0, 0, 0, 0}, TEMP}, //0x6F
 };
 
diff --git a/meta-facebook/meta-greatlakes-lf/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-greatlakes-lf/conf/templates/default/bblayers.conf.sample
index d08128575588..cc8bf9cf28f4 100644
--- a/meta-facebook/meta-greatlakes-lf/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-greatlakes-lf/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
@@ -25,8 +24,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-harma/conf/layer.conf b/meta-facebook/meta-harma/conf/layer.conf
new file mode 100644
index 000000000000..e884ceb91d60
--- /dev/null
+++ b/meta-facebook/meta-harma/conf/layer.conf
@@ -0,0 +1,11 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "fb-harma-layer"
+BBFILE_PATTERN_fb-harma-layer := "^${LAYERDIR}/"
+
+LAYERSERIES_COMPAT_fb-harma-layer := "scarthgap nanbield kirkstone"
diff --git a/meta-facebook/meta-harma/conf/machine/harma.conf b/meta-facebook/meta-harma/conf/machine/harma.conf
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample
new file mode 100644
index 000000000000..1184a4814ac2
--- /dev/null
+++ b/meta-facebook/meta-harma/conf/templates/default/bblayers.conf.sample
@@ -0,0 +1,26 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "8"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-security \
+  ##OEROOT##/meta-security/meta-tpm \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-facebook \
+  ##OEROOT##/meta-facebook/meta-harma \
+  ##OEROOT##/../.. \
+  ##OEROOT##/../../meta-facebook \
+  ##OEROOT##/../../meta-facebook/meta-harma \
+  ##OEROOT##/../../meta-facebook/meta-python3 \
+  ##OEROOT##/../../meta-facebook/meta-backports \
+  "
diff --git a/meta-facebook/meta-harma/conf/templates/default/conf-notes.txt b/meta-facebook/meta-harma/conf/templates/default/conf-notes.txt
new file mode 100644
index 000000000000..ad5fceffea81
--- /dev/null
+++ b/meta-facebook/meta-harma/conf/templates/default/conf-notes.txt
@@ -0,0 +1,2 @@
+Common targets are:
+    harma-image
diff --git a/meta-facebook/meta-harma/conf/templates/default/local.conf.sample b/meta-facebook/meta-harma/conf/templates/default/local.conf.sample
new file mode 100644
index 000000000000..865db57f5363
--- /dev/null
+++ b/meta-facebook/meta-harma/conf/templates/default/local.conf.sample
@@ -0,0 +1,5 @@
+#
+# Local configuration file for building the OpenBMC image.
+#
+MACHINE ??= "harma"
+DISTRO ?= "openbmc-fb-lf"
diff --git a/meta-facebook/meta-harma/recipes-core/images/harma-image.bb b/meta-facebook/meta-harma/recipes-core/images/harma-image.bb
new file mode 100644
index 000000000000..74deb42a0c5d
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-core/images/harma-image.bb
@@ -0,0 +1,7 @@
+require common/images/fb-openbmc-image.inc
+
+# Install temporary firmware update utilities, retimer-util and apml debug tools for POC phase.
+IMAGE_INSTALL:append = " fw-util"
+IMAGE_INSTALL:append = " apml"
+IMAGE_INSTALL:append = " retimer-util"
+IMAGE_INSTALL:append = " system-state-init"
diff --git a/meta-facebook/meta-harma/recipes-harma/fw-util/files/bmc.cpp b/meta-facebook/meta-harma/recipes-harma/fw-util/files/bmc.cpp
new file mode 100644
index 000000000000..2f71a68cd0b4
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/fw-util/files/bmc.cpp
@@ -0,0 +1,42 @@
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <cstdio>
+#include <cstring>
+#include <unistd.h>
+#include <fcntl.h>
+#include <algorithm>
+#include <sys/mman.h>
+#include <syslog.h>
+#include <openbmc/pal.h>
+#include <openbmc/kv.h>
+#include "bmc.h"
+
+using namespace std;
+
+int BmcComponent::update(string image_path [[maybe_unused]])
+{
+  return 0;
+}
+
+std::string BmcComponent::get_bmc_version()
+{
+  return 0;
+}
+
+std::string BmcComponent::get_bmc_version(const std::string &mtd [[maybe_unused]])
+{
+  return 0;
+}
+
+int BmcComponent::print_version()
+{
+  return FW_STATUS_NOT_SUPPORTED;
+}
+
+int BmcComponent::get_version(json& j) {
+  j["VERSION"] = sys().version();
+  return FW_STATUS_SUCCESS;
+}
+
+static BmcComponent bmc("bmc", "bmc", "flash0", "u-boot");
diff --git a/meta-facebook/meta-harma/recipes-harma/fw-util/files/fscd.cpp b/meta-facebook/meta-harma/recipes-harma/fw-util/files/fscd.cpp
new file mode 100644
index 000000000000..4895796656cf
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/fw-util/files/fscd.cpp
@@ -0,0 +1 @@
+// LF openbmc doesn't support it.
diff --git a/meta-facebook/meta-harma/recipes-harma/fw-util/files/plat/meson.build b/meta-facebook/meta-harma/recipes-harma/fw-util/files/plat/meson.build
new file mode 100644
index 000000000000..1f43d18bfa96
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/fw-util/files/plat/meson.build
@@ -0,0 +1,25 @@
+srcs += [
+    'mcu_fw.cpp',
+    'nic.cpp',
+    'nic_ext.cpp',
+    'nic_mctp.cpp',
+    'vr_fw.cpp',
+    'usbdbg.cpp',
+    'plat_fwupdate.cpp',
+    'bmc.cpp',
+    'fscd.cpp',
+]
+
+deps += [
+    dependency('fmt'),
+    dependency('libfpga'),
+    dependency('libgpio-ctrl'),
+    dependency('libipmi'),
+    dependency('libmcu'),
+    dependency('libncsi'),
+    dependency('libnl-wrapper'),
+    dependency('libvr'),
+    dependency('libretimer'),
+    dependency('libobmc-mctp'),
+    dependency('obmc-pal'),
+]
diff --git a/meta-facebook/meta-harma/recipes-harma/fw-util/files/plat_fwupdate.cpp b/meta-facebook/meta-harma/recipes-harma/fw-util/files/plat_fwupdate.cpp
new file mode 100644
index 000000000000..3e86de647fe7
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/fw-util/files/plat_fwupdate.cpp
@@ -0,0 +1,163 @@
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <unistd.h>
+#include <chrono>
+#include <thread>
+#include <openbmc/pal.h>
+#include <openbmc/cpld.h>
+#include <openbmc/obmc-i2c.h>
+#include <openbmc/kv.h>
+#include <syslog.h>
+#include "vr_fw.h"
+#include "nic_ext.h"
+#include "usbdbg.h"
+#include <openbmc/aries_common.h>
+
+
+#define FRU_NIC0   (4)
+
+using namespace std;
+
+//NIC Component
+NicExtComponent nic0("nic0", "nic0", "nic0_fw_ver", FRU_NIC0, 0);
+
+//VR Component
+//CPU0
+VrComponent vr_cpu0_vcore0("mb", "cpu0_vcore0", "VR_CPU0_VCORE0/SOC");
+VrComponent vr_cpu0_vcore1("mb", "cpu0_vcore1", "VR_CPU0_VCORE1/PVDDIO");
+VrComponent vr_cpu0_pvdd11("mb", "cpu0_pvdd11", "VR_CPU0_PVDD11");
+
+
+//CPLD fwupdate
+class CpldComponent : public Component {
+  uint8_t pld_type;
+  i2c_attr_t attr;
+  int _update(const char *path, i2c_attr_t attr);
+
+  public:
+    CpldComponent(const std::string &fru, const std::string &comp, uint8_t type, uint8_t bus, uint8_t addr,
+      int (*cpld_xfer)(uint8_t, uint8_t, uint8_t *, uint8_t, uint8_t *, uint8_t))
+      : Component(fru, comp), pld_type(type), attr{bus, addr, cpld_xfer} {}
+    int update(std::string image) override;
+    int fupdate(std::string image) override;
+    int get_version(json& j) override;
+};
+
+int CpldComponent::_update(const char *path, i2c_attr_t attr ) {
+  int ret = -1;
+  string comp = this->component();
+  string fru  = this->fru();
+
+  if (cpld_intf_open(pld_type, INTF_I2C, &attr)) {
+    cerr << "Cannot open i2c!" << endl;
+    goto error_exit;
+  }
+
+  ret = cpld_program((char *)path, NULL, false);
+  cpld_intf_close();
+  if (ret) {
+    cerr << "Error Occur at updating CPLD FW!" << endl;
+    goto error_exit;
+  }
+
+error_exit:
+  return ret;
+}
+
+int CpldComponent::update(string image) {
+  return _update(image.c_str(), attr);
+}
+
+int CpldComponent::fupdate(string image) {
+  return _update(image.c_str(), attr);
+}
+
+
+int CpldComponent::get_version(json& j) {
+  int ret = -1;
+  uint8_t ver[4];
+  char strbuf[MAX_VALUE_LEN];
+  string comp = this->component();
+  string fru  = this->fru();
+  transform(comp.begin(), comp.end(),comp.begin(), ::toupper);
+  transform(fru.begin(), fru.end(),fru.begin(), ::toupper);
+  j["PRETTY_COMPONENT"] = comp;
+
+  if (!cpld_intf_open(pld_type, INTF_I2C, &attr)) {
+    ret = cpld_get_ver((uint32_t *)ver);
+    cpld_intf_close();
+  }
+
+  if (ret) {
+    sprintf(strbuf, "NA");
+  } else {
+    sprintf(strbuf, "%02X%02X%02X%02X", ver[0], ver[1], ver[2], ver[3]);
+    kv_set(_component.c_str(), strbuf, 0, 0);
+  }
+  j["VERSION"] = string(strbuf);
+  return FW_STATUS_SUCCESS;
+}
+
+
+//CPLD Component
+CpldComponent mb_cpld("mb", "mb_cpld", LCMXO3LF_4300C, 5, 0x40, nullptr);
+CpldComponent scm_cpld("scm", "scm_cpld", LCMXO3_2100C, 15, 0x40, nullptr);
+CpldComponent cb_cpld("cb", "cb_cpld", LCMXO3_2100C, 9, 0x40, nullptr);
+
+class RetimerComponent : public Component {
+  int _bus = 0;
+  int addr = 0x24;
+
+  public:
+    RetimerComponent(
+      const std::string& fru,
+      const std::string& comp,
+      const int bus)
+      : Component(fru, comp), _bus(bus) {}
+
+    int update(std::string image) {
+      int ret = -1;
+
+      ret = AriestFwUpdate(_bus, addr, image.c_str());
+
+      if (ret) {
+        return FW_STATUS_FAILURE;
+      }
+      std::cout << "To active the upgrade of Retimer, please perform 'power-util mb cycle'" << std::endl;
+      return FW_STATUS_SUCCESS;
+    }
+
+    int get_version(json& j) {
+      int slaveaddr = 24;
+      std::stringstream pathStream;
+      pathStream << "/sys/kernel/debug/pt5161l/" << _bus
+                                                 << "-"
+                                                 << std::setw(4)
+                                                 << std::setfill('0')
+                                                 << slaveaddr << "/fw_ver";
+      std::string filePath = pathStream.str();
+    //  std::cout << "File Path: " << filePath << std::endl;
+
+      // Open the file
+      std::ifstream file(filePath);
+
+      // Check if the file is open
+      if (file.is_open()) {
+          std::string version;
+          std::getline(file, version);
+          if( !version.empty() || !file.bad() ) {
+            file.close();
+            j["VERSION"] = version;
+            return FW_STATUS_SUCCESS;
+          }
+          file.close();
+      }
+
+      j["VERSION"] = "NA";
+      return FW_STATUS_SUCCESS;
+    }
+};
+
+RetimerComponent rt0_comp("mb", "retimer0", 12);
+RetimerComponent rt1_comp("mb", "retimer1", 21);
diff --git a/meta-facebook/meta-harma/recipes-harma/fw-util/fw-util_0.2.bbappend b/meta-facebook/meta-harma/recipes-harma/fw-util/fw-util_0.2.bbappend
new file mode 100644
index 000000000000..0aa879c50a57
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/fw-util/fw-util_0.2.bbappend
@@ -0,0 +1,53 @@
+# Copyright 2018-present Facebook. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+LOCAL_URI += " \
+    file://plat/meson.build \
+    file://mcu_fw.h \
+    file://mcu_fw.cpp \
+    file://nic_mctp.cpp \
+    file://nic_mctp.h \
+    file://nic.cpp \
+    file://nic.h \
+    file://nic_ext.h \
+    file://nic_ext.cpp \
+    file://vr_fw.h \
+    file://vr_fw.cpp \
+    file://usbdbg.h \
+    file://usbdbg.cpp \
+    file://plat_fwupdate.cpp \
+    file://bmc.cpp \
+    file://fscd.cpp \
+    "
+
+DEPENDS += " \
+    libfpga \
+    libgpio-ctrl \
+    libipmi \
+    libmcu \
+    libncsi \
+    libnl-wrapper \
+    libvr \
+    libretimer \
+    libobmc-mctp \
+    libpal \
+    fmt \
+    "
+
+CXXFLAGS += " -DCONFIG_TPM2"
diff --git a/meta-facebook/meta-harma/recipes-harma/retimer-util/files/meson.build b/meta-facebook/meta-harma/recipes-harma/retimer-util/files/meson.build
new file mode 100644
index 000000000000..c873fffacab4
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/retimer-util/files/meson.build
@@ -0,0 +1,26 @@
+project('retimer-util', 'c', 'cpp',
+    version: '0.1',
+    license: 'GPL2',
+    default_options: [
+        'cpp_std=c++20',
+        'werror=true',
+    ],
+    meson_version: '>=0.40',
+)
+srcs = files(
+    'retimer-util.cpp',
+)
+
+cc = meson.get_compiler('cpp')
+deps = [
+  dependency('libretimer'),
+  dependency('libmisc-utils'),
+]
+
+hgxmgr_exe = executable(
+    'retimer-util',
+    srcs,
+    dependencies: deps,
+    install: true,
+    install_dir : 'local/bin',
+)
diff --git a/meta-facebook/meta-harma/recipes-harma/retimer-util/files/retimer-util.cpp b/meta-facebook/meta-harma/recipes-harma/retimer-util/files/retimer-util.cpp
new file mode 100644
index 000000000000..5ced76c9209c
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/retimer-util/files/retimer-util.cpp
@@ -0,0 +1,62 @@
+#include <CLI/CLI.hpp>
+#include <openbmc/aries_common.h>
+#include <syslog.h>
+#include <iostream>
+#include <openbmc/misc-utils.h>
+#include <cstdlib>
+
+static int polling_stop(void) {
+  return std::system("systemctl stop xyz.openbmc_project.hwmontempsensor.service");
+}
+
+static int polling_start(void) {
+  return std::system("systemctl start xyz.openbmc_project.hwmontempsensor.service");
+}
+
+static void do_margin(std::string fru, int id, std::string& type, std::string& file) {
+
+  polling_stop();
+  AriesMargin(fru.c_str(), id, type.c_str(), file.c_str());
+  polling_start();
+
+}
+
+static void do_print_link (std::string fru, int id) {
+  polling_stop();
+  AriesPrintState(fru.c_str(), id);
+  polling_start();
+}
+
+int main(int argc, char* argv[]) {
+  int rt_id;
+  std::string fru{};
+  std::string margin_type{};
+  std::string margin_file{};
+  std::string link_file{};
+
+  CLI::App app("Retimer Helper Utility");
+  app.failure_message(CLI::FailureMessage::help);
+
+  // Allow flags/options to fallthrough from subcommands.
+  app.fallthrough();
+  app.add_option("FRU", fru, "FRU name: mb")
+    ->check(CLI::IsMember({"mb"}))->required();
+
+  auto margin = app.add_subcommand("margin", "Perform margin test");
+  margin->add_option("ID", rt_id, "Retimer ID 0-1")
+    ->check(CLI::Range(0, 1))->required();
+  margin->add_option("TYPE", margin_type, "Margin test for UpStream or DownStream")
+    ->check(CLI::IsMember({"up", "down"}))->required();
+  margin->add_option("FILE", margin_file, "The file name of margin test result")->required();
+  margin->callback([&]() { do_margin(fru, rt_id, margin_type, margin_file); });
+
+  auto link = app.add_subcommand("link", "Dump link status");
+  link->add_option("ID", rt_id, "Retimer ID 0-1")->check(CLI::Range(0, 1))->required();
+  link->callback([&]() { do_print_link(fru, rt_id); });
+
+  app.require_subcommand(/* min */ 1, /* max */ 1);
+
+  CLI11_PARSE(app, argc, argv);
+
+  return 0;
+}
diff --git a/meta-facebook/meta-harma/recipes-harma/retimer-util/retimer-util_0.1.bb b/meta-facebook/meta-harma/recipes-harma/retimer-util/retimer-util_0.1.bb
new file mode 100644
index 000000000000..521058fb83a0
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/retimer-util/retimer-util_0.1.bb
@@ -0,0 +1,19 @@
+# Copyright 2022-present Meta Platforms Inc. All Rights Reserved.
+
+SUMMARY = "Retimer Utility"
+DESCRIPTION = "Utility for retimer"
+SECTION = "base"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+inherit meson pkgconfig
+
+LOCAL_URI = " \
+    file://meson.build \
+    file://retimer-util.cpp \
+    "
+
+DEPENDS += "libretimer libpal cli11"
+
+FILES:${PN} = "${prefix}/local/bin"
diff --git a/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat.c b/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat.c
new file mode 100644
index 000000000000..8006ccfb2d27
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat.c
@@ -0,0 +1,21 @@
+#include <syslog.h>
+#include <stdint.h>
+#include <string.h>
+#include <plat.h>
+
+int get_dev_bus(const char *fru, uint8_t retimerId)
+{
+  if ( !strcmp(fru, "mb") )
+    return RT_DEV_INFO[retimerId].bus;
+  else
+    return -1;
+}
+
+int get_dev_addr(const char *fru, uint8_t retimerId)
+{
+  if ( !strcmp(fru, "mb") )
+    return RT_DEV_INFO[retimerId].addr;
+  else
+    return -1;
+}
+
diff --git a/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat.h b/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat.h
new file mode 100644
index 000000000000..b815d2bf300f
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat.h
@@ -0,0 +1,11 @@
+#include <syslog.h>
+
+typedef struct {
+  int bus;
+  int addr;
+} RETIMER_DEV;
+
+RETIMER_DEV RT_DEV_INFO[] = {
+  {12, 0x24},
+  {21, 0x24},
+};
diff --git a/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat/meson.build b/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat/meson.build
new file mode 100644
index 000000000000..37bef1a35e58
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/files/plat/meson.build
@@ -0,0 +1,7 @@
+headers += [
+    'plat.h',
+]
+
+sources += [
+    'plat.c',
+]
diff --git a/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/libretimer_2.14.bbappend b/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/libretimer_2.14.bbappend
new file mode 100755
index 000000000000..c9160907466f
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/retimer-v2.14/libretimer_2.14.bbappend
@@ -0,0 +1,9 @@
+# Copyright 2022-present Facebook. All Rights Reserved.
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+LOCAL_URI += " \
+        file://plat/meson.build \
+        file://plat.c      \
+        file://plat.h      \
+        "
diff --git a/meta-facebook/meta-harma/recipes-harma/system-init/files/system-state-init b/meta-facebook/meta-harma/recipes-harma/system-init/files/system-state-init
new file mode 100644
index 000000000000..63ed1dfe953b
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/system-init/files/system-state-init
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+fw-util mb --version
diff --git a/meta-facebook/meta-harma/recipes-harma/system-init/files/system-state-init@.service b/meta-facebook/meta-harma/recipes-harma/system-init/files/system-state-init@.service
new file mode 100644
index 000000000000..c748f31501fe
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/system-init/files/system-state-init@.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=State Initialize %i
+Before=xyz.openbmc_project.psusensor.service
+
+[Service]
+ExecStart=/usr/libexec/system-state-init
+SyslogIdentifier=system-state-init
+Type=oneshot
+RemainAfterExit=yes
+Restart=on-failure
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-facebook/meta-harma/recipes-harma/system-init/system-state-init_0.1.bb b/meta-facebook/meta-harma/recipes-harma/system-init/system-state-init_0.1.bb
new file mode 100644
index 000000000000..1c77adc96be6
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/system-init/system-state-init_0.1.bb
@@ -0,0 +1,22 @@
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+inherit obmc-phosphor-systemd
+
+RDEPENDS:${PN} += " bash"
+
+SRC_URI += " \
+    file://system-state-init \
+    file://system-state-init@.service \
+    "
+
+do_install() {
+    install -d ${D}${libexecdir}
+    install -m 0755 ${WORKDIR}/system-state-init ${D}${libexecdir}
+}
+
+TGT = "${SYSTEMD_DEFAULT_TARGET}"
+HARMA_SYS_ST_INIT_INSTFMT="../system-state-init@.service:multi-user.target.wants/system-state-init@{0}.service"
+
+SYSTEMD_SERVICE:${PN} += "system-state-init@.service"
+SYSTEMD_LINK:${PN} += "${@compose_list(d, 'HARMA_SYS_ST_INIT_INSTFMT', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-facebook/meta-harma/recipes-harma/vr/files/platform.c b/meta-facebook/meta-harma/recipes-harma/vr/files/platform.c
new file mode 100644
index 000000000000..c1e2b03e0a13
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-harma/vr/files/platform.c
@@ -0,0 +1,221 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <openbmc/pal.h>
+#include <openbmc/kv.h>
+#include "raa_gen3.h"
+#include "xdpe12284c.h"
+#include "xdpe152xx.h"
+#include "mp2856.h"
+#include <sys/time.h>
+
+#define MB_VR_BUS_ID   (28)
+
+int
+mb_vr_polling_ctrl(bool enable) {
+  int rev;
+
+  if (enable) {
+      rev = system("systemctl start xyz.openbmc_project.psusensor.service");
+  } else {
+      rev = system("systemctl stop xyz.openbmc_project.psusensor.service");
+  }
+  return rev;
+}
+
+static int
+plat_mp2856_fw_update(struct vr_info *info, void *args) {
+  int ret;
+
+  //restart time is 5S
+  mb_vr_polling_ctrl(false);
+  msleep(5000);
+  ret = mp2856_fw_update(info, args);
+  mb_vr_polling_ctrl(true);
+  msleep(6000);
+
+  return ret;
+}
+
+enum {
+   MAIN_SOURCE = 0,
+   SECOND_SOURCE = 1,
+   THIRD_SOURCE = 2,
+};
+
+enum {
+  VR_MB_CPU0_VCORE0 = 0,
+  VR_MB_CPU0_VCORE1 = 1,
+  VR_MB_CPU0_PVDD11 = 2,
+  MB_VR_CNT = 3,
+};
+
+enum {
+  VR_MB_CPU0_RT_P0V9   = 0,
+  MB_RT_VR_CNT,
+};
+
+//MPS Address
+enum {
+  ADDR_CPU0_VCORE0 = 0x9E,
+  ADDR_CPU0_VCORE1 = 0x9C,
+  ADDR_CPU0_PVDD11 = 0x96,
+};
+
+//INF Address
+enum {
+  ADDR_INF_CPU0_VCORE0  = 0xC8,
+  ADDR_INF_CPU0_VCORE1  = 0xCC,
+  ADDR_INF_CPU0_PVDD11  = 0xD0,
+};
+
+//RAA Address
+enum {
+  ADDR_RAA_CPU0_VCORE0  = 0xC2,
+  ADDR_RAA_CPU0_VCORE1  = 0xC4,
+  ADDR_RAA_CPU0_PVDD11  = 0xC6,
+};
+
+enum {
+  ADDR_CPU0_RT_P0V9 = 0xC0,
+};
+
+uint8_t mb_inf_vr_addr[] = {
+  ADDR_INF_CPU0_VCORE0,
+  ADDR_INF_CPU0_VCORE1,
+  ADDR_INF_CPU0_PVDD11,
+};
+
+uint8_t mb_raa_vr_addr[] = {
+  ADDR_RAA_CPU0_VCORE0,
+  ADDR_RAA_CPU0_VCORE1,
+  ADDR_RAA_CPU0_PVDD11,
+};
+
+//MPS VR
+struct vr_ops mp2856_ops = {
+  .get_fw_ver = get_mp2856_ver,
+  .parse_file = mp2856_parse_file,
+  .validate_file = NULL,
+  .fw_update = plat_mp2856_fw_update,
+  .fw_verify = NULL,
+};
+
+
+// MB VR Support list
+//Renesas VR
+struct vr_ops raa_gen2_3_ops = {
+  .get_fw_ver = get_raa_ver,
+  .parse_file = raa_parse_file,
+  .validate_file = NULL,
+  .fw_update = raa_fw_update,
+  .fw_verify = NULL,
+};
+
+//INFINEON VR
+struct vr_ops xdpe152xx_ops = {
+  .get_fw_ver = get_xdpe152xx_ver,
+  .parse_file = xdpe152xx_parse_file,
+  .validate_file = NULL,
+  .fw_update = xdpe152xx_fw_update,
+  .fw_verify = NULL,
+};
+
+struct vr_info mb_vr_list[] = {
+  [VR_MB_CPU0_VCORE0] = {
+    .bus = MB_VR_BUS_ID,
+    .addr = ADDR_CPU0_VCORE0,
+    .dev_name = "VR_CPU0_VCORE0/SOC",
+    .ops = &mp2856_ops,
+    .private_data = "mb",
+    .xfer = NULL,
+    .sensor_polling_ctrl = NULL,
+  },
+  [VR_MB_CPU0_VCORE1] = {
+    .bus = MB_VR_BUS_ID,
+    .addr = ADDR_CPU0_VCORE1,
+    .dev_name = "VR_CPU0_VCORE1/PVDDIO",
+    .ops = &mp2856_ops,
+    .private_data = "mb",
+    .xfer = NULL,
+    .sensor_polling_ctrl = NULL,
+  },
+  [VR_MB_CPU0_PVDD11] = {
+    .bus = MB_VR_BUS_ID,
+    .addr = ADDR_CPU0_PVDD11,
+    .dev_name = "VR_CPU0_PVDD11",
+    .ops = &mp2856_ops,
+    .private_data = "mb",
+    .xfer = NULL,
+    .sensor_polling_ctrl = NULL,
+  },
+};
+
+struct vr_info mb_rt_vr_list[] = {
+  [VR_MB_CPU0_RT_P0V9] = {
+    .bus = MB_VR_BUS_ID,
+    .addr = ADDR_CPU0_RT_P0V9,
+    .dev_name = "VR_CPU0_RETIMER_P0V9",
+    .ops = &mp2856_ops,
+    .private_data = "mb",
+    .xfer = NULL,
+  },
+};
+
+#define MAX_VR_CNT (MB_VR_CNT + MB_RT_VR_CNT)
+struct vr_info vr_list[MAX_VR_CNT] = {0};
+
+int get_vr_comp_source(uint8_t* id) {
+  char value[MAX_VALUE_LEN] = {0};
+
+  if (kv_get("mb_vr_source", value, NULL, 0)) {
+    return -1;
+  }
+
+  *id = (uint8_t)atoi(value);
+  printf("id=%d\n", *id);
+  return 0;
+}
+
+int plat_vr_init(void) {
+  int i = 0;
+  int ret = 0;
+  uint8_t vr_cnt = 0;
+  uint8_t id = 0;
+
+  // Add MB VR
+  memcpy(vr_list + vr_cnt, mb_vr_list, MB_VR_CNT*sizeof(struct vr_info));
+  vr_cnt += MB_VR_CNT;
+
+  // get MB VR source
+  get_vr_comp_source(&id);
+  if (id == SECOND_SOURCE) {
+    for (i = 0; i < MB_VR_CNT; i++) {
+      vr_list[i].ops =  &xdpe152xx_ops;
+      vr_list[i].addr = mb_inf_vr_addr[i];
+    }
+  } else if (id == THIRD_SOURCE) {
+    for (i = 0; i < MB_VR_CNT; i++) {
+      vr_list[i].ops =  &raa_gen2_3_ops;
+      vr_list[i].addr = mb_raa_vr_addr[i];
+    }
+  }
+
+  //Add Retimer VR
+  memcpy(vr_list + vr_cnt, mb_rt_vr_list, MB_RT_VR_CNT * sizeof(struct vr_info));
+  vr_cnt += MB_RT_VR_CNT;
+
+  ret = vr_device_register(vr_list, vr_cnt);
+  if (ret < 0) {
+    vr_device_unregister();
+  }
+
+  return ret;
+}
+
+void plat_vr_exit(void) {
+  if (plat_configs) {
+    free(plat_configs);
+  }
+  return;
+}
diff --git a/meta-facebook/meta-montblanc/recipes-kernel/linux/linux-aspeed_6.6.bbappend b/meta-facebook/meta-harma/recipes-harma/vr/libvr_0.2.bbappend
similarity index 74%
rename from meta-facebook/meta-montblanc/recipes-kernel/linux/linux-aspeed_6.6.bbappend
rename to meta-facebook/meta-harma/recipes-harma/vr/libvr_0.2.bbappend
index f451fb62700a..a32775d19340 100644
--- a/meta-facebook/meta-montblanc/recipes-kernel/linux/linux-aspeed_6.6.bbappend
+++ b/meta-facebook/meta-harma/recipes-harma/vr/libvr_0.2.bbappend
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
+# Copyright 2019-present Facebook. All Rights Reserved.
 #
 # This program file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -15,10 +15,10 @@
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/patches_6.6:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+LOCAL_URI += " \
+    file://platform.c \
+    "
 
-#
-# Include machine-specific patches
-#
-SRC_URI += "file://1001-ARM-dts-aspeed-Add-Facebook-montblanc-BMC.patch \
-           "
+DEPENDS += "libmisc-utils"
+LDFLAGS += "-lmisc-utils"
diff --git a/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/1000-add-meta-harma-bmc-dts-setting.patch b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/1000-add-meta-harma-bmc-dts-setting.patch
new file mode 100644
index 000000000000..3ec44a258e3e
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed/1000-add-meta-harma-bmc-dts-setting.patch
@@ -0,0 +1,864 @@
+From 3c16c7d461faf9fe106992ada134ec002981ede5 Mon Sep 17 00:00:00 2001
+From: Peter Yin <peteryin.openbmc@gmail.com>
+Date: Wed, 13 Mar 2024 09:21:49 +0800
+Subject: [PATCH 1/1] meta-facebook: harma: add harm dts:
+
+We can't change the kernel path, and the Harma DTS is not ready.
+So, we modify aspeed-ast2600-evb.dts to match the Harma DTS.
+---
+ .../boot/dts/aspeed/aspeed-ast2600-evb.dts    | 690 +++++++++++++-----
+ 1 file changed, 497 insertions(+), 193 deletions(-)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts b/arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts
+index de83c0eb1d6e..b6e7d9344fc1 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts
+@@ -1,21 +1,39 @@
+ // SPDX-License-Identifier: GPL-2.0-or-later
+-// Copyright 2019 IBM Corp.
++// Copyright 2023 Facebook Inc.
+ 
+ /dts-v1/;
+-
+ #include "aspeed-g6.dtsi"
+ #include <dt-bindings/gpio/aspeed-gpio.h>
++#include <dt-bindings/i2c/i2c.h>
+ 
+ / {
+ 	model = "AST2600 EVB";
+ 	compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
+ 
+ 	aliases {
++		serial0 = &uart1;
++		serial1 = &uart2;
++		serial2 = &uart4;
+ 		serial4 = &uart5;
++
++		i2c20 = &imux20;
++		i2c21 = &imux21;
++		i2c22 = &imux22;
++		i2c23 = &imux23;
++		i2c24 = &imux24;
++		i2c25 = &imux25;
++		i2c26 = &imux26;
++		i2c27 = &imux27;
++		i2c28 = &imux28;
++		i2c29 = &imux29;
++		i2c30 = &imux30;
++		i2c31 = &imux31;
++
++		spi1 = &spi_gpio;
+ 	};
+ 
+ 	chosen {
+-		bootargs = "console=ttyS4,115200n8";
++		stdout-path = &uart5;
+ 	};
+ 
+ 	memory@80000000 {
+@@ -23,153 +41,103 @@ memory@80000000 {
+ 		reg = <0x80000000 0x80000000>;
+ 	};
+ 
+-	reserved-memory {
+-		#address-cells = <1>;
+-		#size-cells = <1>;
+-		ranges;
+-
+-		video_engine_memory: video {
+-			size = <0x04000000>;
+-			alignment = <0x01000000>;
+-			compatible = "shared-dma-pool";
+-			reusable;
+-		};
+-
+-		gfx_memory: framebuffer {
+-			size = <0x01000000>;
+-			alignment = <0x01000000>;
+-			compatible = "shared-dma-pool";
+-			reusable;
+-		};
++	iio-hwmon {
++		compatible = "iio-hwmon";
++		io-channels = <&adc0 0>, <&adc0 1>, <&adc0 2>, <&adc0 3>,
++			      <&adc0 4>, <&adc0 5>, <&adc0 6>, <&adc0 7>,
++			      <&adc1 2>;
+ 	};
+ 
+-	vcc_sdhci0: regulator-vcc-sdhci0 {
+-		compatible = "regulator-fixed";
+-		regulator-name = "SDHCI0 Vcc";
+-		regulator-min-microvolt = <3300000>;
+-		regulator-max-microvolt = <3300000>;
+-		gpios = <&gpio0 ASPEED_GPIO(V, 0) GPIO_ACTIVE_HIGH>;
+-		enable-active-high;
+-	};
++	leds {
++		compatible = "gpio-leds";
+ 
+-	vccq_sdhci0: regulator-vccq-sdhci0 {
+-		compatible = "regulator-gpio";
+-		regulator-name = "SDHCI0 VccQ";
+-		regulator-min-microvolt = <1800000>;
+-		regulator-max-microvolt = <3300000>;
+-		gpios = <&gpio0 ASPEED_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
+-		gpios-states = <1>;
+-		states = <3300000 1>,
+-			 <1800000 0>;
+-	};
++		led-0 {
++			label = "bmc_heartbeat_amber";
++			gpios = <&gpio0 ASPEED_GPIO(P, 7) GPIO_ACTIVE_LOW>;
++			linux,default-trigger = "heartbeat";
++		};
+ 
+-	vcc_sdhci1: regulator-vcc-sdhci1 {
+-		compatible = "regulator-fixed";
+-		regulator-name = "SDHCI1 Vcc";
+-		regulator-min-microvolt = <3300000>;
+-		regulator-max-microvolt = <3300000>;
+-		gpios = <&gpio0 ASPEED_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
+-		enable-active-high;
++		led-1 {
++			label = "fp_id_amber";
++			default-state = "off";
++			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
++		};
++
++		led-2 {
++			label = "power_blue";
++			default-state = "off";
++			gpios = <&gpio0 124 GPIO_ACTIVE_HIGH>;
++		};
+ 	};
+ 
+-	vccq_sdhci1: regulator-vccq-sdhci1 {
+-		compatible = "regulator-gpio";
+-		regulator-name = "SDHCI1 VccQ";
+-		regulator-min-microvolt = <1800000>;
+-		regulator-max-microvolt = <3300000>;
+-		gpios = <&gpio0 ASPEED_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
+-		gpios-states = <1>;
+-		states = <3300000 1>,
+-			 <1800000 0>;
++	spi_gpio: spi-gpio {
++		status = "okay";
++		compatible = "spi-gpio";
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		gpio-sck = <&gpio0 ASPEED_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
++		gpio-mosi = <&gpio0 ASPEED_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
++		gpio-miso = <&gpio0 ASPEED_GPIO(Z, 5) GPIO_ACTIVE_HIGH>;
++		num-chipselects = <1>;
++		cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
++
++		tpmdev@0 {
++			compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
++			spi-max-frequency = <33000000>;
++			reg = <0>;
++		};
+ 	};
+ };
+ 
+-&mdio0 {
++// HOST BIOS Debug
++&uart1 {
+ 	status = "okay";
+-
+-	ethphy0: ethernet-phy@0 {
+-		compatible = "ethernet-phy-ieee802.3-c22";
+-		reg = <0>;
+-	};
+ };
+ 
+-&mdio1 {
++// SOL Host Console
++&uart2 {
+ 	status = "okay";
+-
+-	ethphy1: ethernet-phy@0 {
+-		compatible = "ethernet-phy-ieee802.3-c22";
+-		reg = <0>;
+-	};
++	pinctrl-0 = <>;
+ };
+ 
+-&mdio2 {
++// SOL BMC Console
++&uart4 {
+ 	status = "okay";
+-
+-	ethphy2: ethernet-phy@0 {
+-		compatible = "ethernet-phy-ieee802.3-c22";
+-		reg = <0>;
+-	};
++	pinctrl-0 = <>;
+ };
+ 
+-&mdio3 {
++// BMC Debug Console
++&uart5 {
+ 	status = "okay";
+-
+-	ethphy3: ethernet-phy@0 {
+-		compatible = "ethernet-phy-ieee802.3-c22";
+-		reg = <0>;
+-	};
+ };
+ 
+-&mac0 {
++// MTIA
++&uart6 {
+ 	status = "okay";
+-
+-	phy-mode = "rgmii-rxid";
+-	phy-handle = <&ethphy0>;
+-
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&pinctrl_rgmii1_default>;
+ };
+ 
+-
+-&mac1 {
++&uart_routing {
+ 	status = "okay";
+-
+-	phy-mode = "rgmii-rxid";
+-	phy-handle = <&ethphy1>;
+-
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&pinctrl_rgmii2_default>;
+ };
+ 
+-&mac2 {
++&wdt1 {
+ 	status = "okay";
+-
+-	phy-mode = "rgmii";
+-	phy-handle = <&ethphy2>;
+-
+ 	pinctrl-names = "default";
+-	pinctrl-0 = <&pinctrl_rgmii3_default>;
++	pinctrl-0 = <&pinctrl_wdtrst1_default>;
++	aspeed,reset-type = "soc";
++	aspeed,external-signal;
++	aspeed,ext-push-pull;
++	aspeed,ext-active-high;
++	aspeed,ext-pulse-duration = <256>;
+ };
+ 
+ &mac3 {
+ 	status = "okay";
+-
+-	phy-mode = "rgmii";
+-	phy-handle = <&ethphy3>;
+-
+ 	pinctrl-names = "default";
+-	pinctrl-0 = <&pinctrl_rgmii4_default>;
+-};
+-
+-&emmc_controller {
+-	status = "okay";
+-};
+-
+-&emmc {
+-	non-removable;
+-	bus-width = <4>;
+-	max-frequency = <100000000>;
+-	clk-phase-mmc-hs200 = <9>, <225>;
++	pinctrl-0 = <&pinctrl_rmii4_default>;
++	use-ncsi;
++	mlx,multi-host;
+ };
+ 
+ &rtc {
+@@ -178,53 +146,152 @@ &rtc {
+ 
+ &fmc {
+ 	status = "okay";
++
+ 	flash@0 {
+ 		status = "okay";
+ 		m25p,fast-read;
+ 		label = "bmc";
+-		spi-rx-bus-width = <4>;
+ 		spi-max-frequency = <50000000>;
+-#include "openbmc-flash-layout-64.dtsi"
++#include "openbmc-flash-layout-128.dtsi"
++	};
++
++	flash@1 {
++		status = "okay";
++		m25p,fast-read;
++		label = "alt-bmc";
++		spi-max-frequency = <50000000>;
+ 	};
+ };
+ 
+-&spi1 {
++// BIOS Flash
++&spi2 {
+ 	status = "okay";
+ 	pinctrl-names = "default";
+-	pinctrl-0 = <&pinctrl_spi1_default>;
++	pinctrl-0 = <&pinctrl_spi2_default>;
+ 
+ 	flash@0 {
+ 		status = "okay";
+ 		m25p,fast-read;
+ 		label = "pnor";
+-		spi-rx-bus-width = <4>;
+-		spi-max-frequency = <100000000>;
++		spi-max-frequency = <12000000>;
++		spi-tx-bus-width = <2>;
++		spi-rx-bus-width = <2>;
+ 	};
+ };
+ 
+-&uart5 {
+-	// Workaround for A0
+-	compatible = "snps,dw-apb-uart";
++&lpc_pcc {
++	rec-mode = <0x1>;
++	port-addr = <0x80>;
++	port-addr-hbits-select = <0x1>;
++	port-addr-xbits = <0x3>;
++	dma-mode;
++	A2600-15;
++	status = "okay";
++};
++
++&kcs2 {
++	status = "okay";
++	aspeed,lpc-io-reg = <0xca8>;
++};
++
++&kcs3 {
++	status = "okay";
++	aspeed,lpc-io-reg = <0xca2>;
+ };
+ 
+ &i2c0 {
+ 	status = "okay";
++
++	pwm@5e{
++		compatible = "max31790";
++		reg = <0x5e>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++	};
+ };
+ 
+ &i2c1 {
+ 	status = "okay";
++
++	temperature-sensor@4b {
++		compatible = "ti,tmp75";
++		reg = <0x4b>;
++	};
++
++	// MB NIC FRU
++	eeprom@50 {
++		compatible = "atmel,24c64";
++		reg = <0x50>;
++	};
+ };
+ 
+ &i2c2 {
+ 	status = "okay";
++
++	pwm@5e{
++		compatible = "max31790";
++		reg = <0x5e>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++	};
+ };
+ 
+ &i2c3 {
+ 	status = "okay";
++
++	i2c-mux@70 {
++		compatible = "nxp,pca9543";
++		reg = <0x70>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		imux20: i2c@0 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <0>;
++			//Retimer Flash
++			eeprom@50 {
++				compatible = "atmel,24c2048";
++				reg = <0x50>;
++				pagesize = <128>;
++			};
++		};
++		imux21: i2c@1 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <1>;
++			retimer@24 {
++				compatible = "asteralabs,pt5161l";
++				reg = <0x24>;
++			};
++		};
++	};
+ };
+ 
+ &i2c4 {
+ 	status = "okay";
++	// PDB FRU
++	eeprom@52 {
++		compatible = "atmel,24c64";
++		reg = <0x52>;
++	};
++
++	power-monitor@69 {
++		compatible = "pmbus";
++		reg = <0x69>;
++	};
++
++	temperature-sensor@49 {
++		compatible = "ti,tmp75";
++		reg = <0x49>;
++	};
++
++	power-monitor@22 {
++		compatible = "lltc,ltc4286";
++		reg = <0x22>;
++		adi,vrange-low-enable;
++		shunt-resistor-micro-ohms = <500>;
++	};
+ };
+ 
+ &i2c5 {
+@@ -233,118 +300,355 @@ &i2c5 {
+ 
+ &i2c6 {
+ 	status = "okay";
++
++	i2c-mux@70 {
++		compatible = "nxp,pca9543";
++		reg = <0x70>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		imux22: i2c@0 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <0>;
++		};
++		imux23: i2c@1 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <1>;
++		};
++	};
+ };
+ 
+ &i2c7 {
+ 	status = "okay";
+-
+-	temp@2e {
+-		compatible = "adi,adt7490";
+-		reg = <0x2e>;
++	sbrmi@3C {
++		compatible = "amd,sbrmi";
++		reg = <0x3C>;
++		dimm-count = <8>;
++		dimm-ids = <0x00 0x01 0x02 0x03 0x10 0x11 0x12 0x13>;
+ 	};
+-
+-	eeprom@50 {
+-		compatible = "atmel,24c08";
+-		reg = <0x50>;
+-		pagesize = <16>;
++	sbtsi@4C {
++		compatible = "amd,sbtsi";
++		reg = <0x4C>;
+ 	};
+ };
+ 
+ &i2c8 {
+ 	status = "okay";
++};
++
++&i2c9 {
++	status = "okay";
+ 
+-	lm75@4d {
+-		compatible = "national,lm75";
+-		reg = <0x4d>;
++	gpio@30 {
++		compatible = "nxp,pca9555";
++		reg = <0x30>;
++		gpio-controller;
++		#gpio-cells = <2>;
++	};
++	gpio@31 {
++		compatible = "nxp,pca9555";
++		reg = <0x31>;
++		gpio-controller;
++		#gpio-cells = <2>;
++
++		gpio-line-names =
++		"","","","",
++		"","","presence-cmm","",
++		"","","","leakage-detect-alert",
++		"","","","";
++	};
++
++	i2c-mux@71 {
++		compatible = "nxp,pca9546";
++		reg = <0x71>;
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		imux24: i2c@0 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <0>;
++		};
++		imux25: i2c@1 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <1>;
++		};
++		imux26: i2c@2 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <2>;
++		};
++		imux27: i2c@3 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <3>;
++		};
++	};
++	// PTTV FRU
++	eeprom@52 {
++		compatible = "atmel,24c64";
++		reg = <0x52>;
+ 	};
+ };
+ 
+-&i2c9 {
++&i2c11 {
+ 	status = "okay";
+ };
+ 
+ &i2c12 {
+ 	status = "okay";
++	retimer@24 {
++		compatible = "asteralabs,pt5161l";
++		reg = <0x24>;
++	};
+ };
+ 
+ &i2c13 {
+ 	status = "okay";
+-};
+ 
+-&i2c14 {
+-	status = "okay";
+-};
++	i2c-mux@70 {
++		compatible = "nxp,pca9545";
++		reg = <0x70>;
++		#address-cells = <1>;
++		#size-cells = <0>;
+ 
+-&i2c15 {
+-	status = "okay";
++		imux28: i2c@0 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <0>;
++		};
++		imux29: i2c@1 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <1>;
++			//MB FRU
++			eeprom@54 {
++				compatible = "atmel,24c64";
++				reg = <0x54>;
++			};
++		};
++		imux30: i2c@2 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <2>;
++		};
++		imux31: i2c@3 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			reg = <3>;
++		};
++	};
+ };
+ 
+-&fsim0 {
++// To Debug card
++&i2c14 {
+ 	status = "okay";
+-};
++	multi-master;
+ 
+-&ehci1 {
+-	status = "okay";
++	ipmb@10 {
++		compatible = "ipmb-dev";
++		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
++		i2c-protocol;
++	};
+ };
+ 
+-&uhci {
++&i2c15 {
+ 	status = "okay";
+-};
+ 
+-&sdc {
+-	status = "okay";
+-};
++	// SCM FRU
++	eeprom@50 {
++		compatible = "atmel,24c64";
++		reg = <0x50>;
++	};
+ 
+-/*
+- * The signal voltage of sdhci0 and sdhci1 on AST2600-A2 EVB is able to be
+- * toggled by GPIO pins.
+- * In the reference design, GPIOV0 of AST2600-A2 EVB is connected to the
+- * power load switch that provides 3.3v to sdhci0 vdd, GPIOV1 is connected to
+- * a 1.8v and a 3.3v power load switch that provides signal voltage to
+- * sdhci0 bus.
+- * If GPIOV0 is active high, sdhci0 is enabled, otherwise, sdhci0 is disabled.
+- * If GPIOV1 is active high, 3.3v power load switch is enabled, sdhci0 signal
+- * voltage is 3.3v, otherwise, 1.8v power load switch will be enabled,
+- * sdhci0 signal voltage becomes 1.8v.
+- * AST2600-A2 EVB also supports toggling signal voltage for sdhci1.
+- * The design is the same as sdhci0, it uses GPIOV2 as power-gpio and GPIOV3
+- * as power-switch-gpio.
+- */
+-&sdhci0 {
+-	status = "okay";
+-	bus-width = <4>;
+-	max-frequency = <100000000>;
+-	sdhci-drive-type = /bits/ 8 <3>;
+-	sdhci-caps-mask = <0x7 0x0>;
+-	sdhci,wp-inverted;
+-	vmmc-supply = <&vcc_sdhci0>;
+-	vqmmc-supply = <&vccq_sdhci0>;
+-	clk-phase-sd-hs = <7>, <200>;
++	// BSM FRU
++	eeprom@56 {
++		compatible = "atmel,24c64";
++		reg = <0x56>;
++	};
+ };
+ 
+-&sdhci1 {
++&adc0 {
++	aspeed,int-vref-microvolt = <2500000>;
+ 	status = "okay";
+-	bus-width = <4>;
+-	max-frequency = <100000000>;
+-	sdhci-drive-type = /bits/ 8 <3>;
+-	sdhci-caps-mask = <0x7 0x0>;
+-	sdhci,wp-inverted;
+-	vmmc-supply = <&vcc_sdhci1>;
+-	vqmmc-supply = <&vccq_sdhci1>;
+-	clk-phase-sd-hs = <7>, <200>;
++	pinctrl-0 = <&pinctrl_adc0_default &pinctrl_adc1_default
++		&pinctrl_adc2_default &pinctrl_adc3_default
++		&pinctrl_adc4_default &pinctrl_adc5_default
++		&pinctrl_adc6_default &pinctrl_adc7_default>;
+ };
+ 
+-&vhub {
++&adc1 {
++	aspeed,int-vref-microvolt = <2500000>;
+ 	status = "okay";
+ 	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_adc10_default>;
+ };
+ 
+-&video {
++&ehci0 {
+ 	status = "okay";
+-	memory-region = <&video_engine_memory>;
+ };
+ 
+-&gfx {
+-	status = "okay";
+-	memory-region = <&gfx_memory>;
++&gpio0 {
++	pinctrl-names = "default";
++	gpio-line-names =
++	/*A0-A7*/	"","","","","","","","",
++	/*B0-B7*/	"","","","",
++			"bmc-spi-mux-select-0","led-identify","","",
++	/*C0-C7*/	"","","","","","","","",
++	/*D0-D7*/	"","","sol-uart-select","","","","","",
++	/*E0-E7*/	"","","","","","","","",
++	/*F0-F7*/	"","","","","","","","",
++	/*G0-G7*/	"","","","","","","","",
++	/*H0-H7*/	"","","","","","","","",
++	/*I0-I7*/	"","","","","","","","",
++	/*J0-J7*/	"","","","","","","","",
++	/*K0-K7*/	"","","","","","","","",
++	/*L0-L7*/	"","","","","","","","",
++	/*M0-M7*/	"","","","","","","","",
++	/*N0-N7*/	"led-postcode-0","led-postcode-1",
++			"led-postcode-2","led-postcode-3",
++			"led-postcode-4","led-postcode-5",
++			"led-postcode-6","led-postcode-7",
++	/*O0-O7*/	"","","","","","","","",
++	/*P0-P7*/	"power-button","power-host-control",
++			"reset-button","","led-power","","","",
++	/*Q0-Q7*/	"","","","","","","","",
++	/*R0-R7*/	"","","","","","","","",
++	/*S0-S7*/	"","","","","","","","",
++	/*T0-T7*/	"","","","","","","","",
++	/*U0-U7*/	"","","","","","","led-identify-gate","",
++	/*V0-V7*/	"","","","",
++			"rtc-battery-voltage-read-enable","","","",
++	/*W0-W7*/	"","","","","","","","",
++	/*X0-X7*/	"","","","","","","","",
++	/*Y0-Y7*/	"","","","","","","","",
++	/*Z0-Z7*/	"","","","","","","","";
++};
++
++&sgpiom0 {
++	status = "okay";
++	max-ngpios = <128>;
++	ngpios = <128>;
++	bus-frequency = <2000000>;
++	gpio-line-names =
++	/*in - out - in - out */
++	/*A0-A3 line 0-7*/
++	"presence-scm-cable","power-config-disable-e1s-0",
++	"","",
++	"","power-config-disable-e1s-1",
++	"","",
++	/*A4-A7 line 8-15*/
++	"","power-config-asic-module-enable",
++	"","power-config-asic-power-good",
++	"","power-config-pdb-power-good",
++	"presence-cpu","smi-control-n",
++	/*B0-B3 line 16-23*/
++	"","nmi-control-n",
++	"","nmi-control-sync-flood-n",
++	"","",
++	"","",
++	/*B4-B7 line 24-31*/
++	"","FM_CPU_SP5R1",
++	"reset-cause-rsmrst","FM_CPU_SP5R2",
++	"","FM_CPU_SP5R3",
++	"","FM_CPU_SP5R4",
++	/*C0-C3 line 32-39*/
++	"","FM_CPU0_SA0",
++	"","FM_CPU0_SA1",
++	"","rt-cpu0-p0-enable",
++	"","rt-cpu0-p1-enable",
++	/*C4-C7 line 40-47*/
++	"","smb-rt-rom-p0-select",
++	"","smb-rt-rom-p1-select",
++	"","i3c-cpu-mux0-oe-n",
++	"","i3c-cpu-mux0-select",
++	/*D0-D3 line 48-55*/
++	"","i3c-cpu-mux1-oe-n",
++	"","i3c-cpu-mux1-select",
++	"","reset-control-bmc",
++	"","reset-control-cpu0-p0-mux",
++	/*D4-D7 line 56-63*/
++	"","reset-control-cpu0-p1-mux",
++	"","reset-control-e1s-mux",
++	"host0-ready","reset-control-mb-mux",
++	"power-cpu-good","reset-control-smb-e1s-0",
++	/*E0-E3 line 64-71*/
++	"","reset-control-smb-e1s-1",
++	"post-end-n","reset-control-srst",
++	"presence-e1s-0","reset-control-usb-hub",
++	"","reset-control",
++	/*E4-E7 line 72-79*/
++	"presence-e1s-1","reset-control-cpu-kbrst",
++	"","reset-control-platrst",
++	"","bmc-jtag-mux-select-0",
++	"","bmc-jtag-mux-select-1",
++	/*F0-F3 line 80-87*/
++	"","bmc-jtag-select",
++	"","bmc-ready-n",
++	"","bmc-ready-sgpio",
++	"","rt-cpu0-p0-force-enable",
++	/*F4-F7 line 88-95*/
++	"presence-asic-modules-0","rt-cpu0-p1-force-enable",
++	"presence-asic-modules-1","bios-debug-msg-disable",
++	"","uart-control-buffer-select",
++	"","ac-control-n",
++	/*G0-G3 line 96-103*/
++	"FM_CPU_CORETYPE2","",
++	"FM_CPU_CORETYPE1","",
++	"FM_CPU_CORETYPE0","",
++	"FM_BOARD_REV_ID5","",
++	/*G4-G7 line 104-111*/
++	"FM_BOARD_REV_ID4","",
++	"FM_BOARD_REV_ID3","",
++	"FM_BOARD_REV_ID2","",
++	"FM_BOARD_REV_ID1","",
++	/*H0-H3 line 112-119*/
++	"FM_BOARD_REV_ID0","",
++	"","","","","","",
++	/*H4-H7 line 120-127*/
++	"","",
++	"reset-control-pcie-expansion-3","",
++	"reset-control-pcie-expansion-2","",
++	"reset-control-pcie-expansion-1","",
++	/*I0-I3 line 128-135*/
++	"reset-control-pcie-expansion-0","",
++	"FM_EXP_SLOT_ID1","",
++	"FM_EXP_SLOT_ID0","",
++	"","",
++	/*I4-I7 line 136-143*/
++	"","","","","","","","",
++	/*J0-J3 line 144-151*/
++	"","","","","","","","",
++	/*J4-J7 line 152-159*/
++	"SLOT_ID_BCB_0","",
++	"SLOT_ID_BCB_1","",
++	"SLOT_ID_BCB_2","",
++	"SLOT_ID_BCB_3","",
++	/*K0-K3 line 160-167*/
++	"","","","","","","","",
++	/*K4-K7 line 168-175*/
++	"","","","","","","","",
++	/*L0-L3 line 176-183*/
++	"","","","","","","","",
++	/*L4-L7 line 184-191*/
++	"","","","","","","","",
++	/*M0-M3 line 192-199*/
++	"","","","","","","","",
++	/*M4-M7 line 200-207*/
++	"","","","","","","","",
++	/*N0-N3 line 208-215*/
++	"","","","","","","","",
++	/*N4-N7 line 216-223*/
++	"","","","","","","","",
++	/*O0-O3 line 224-231*/
++	"","","","","","","","",
++	/*O4-O7 line 232-239*/
++	"","","","","","","","",
++	/*P0-P3 line 240-247*/
++	"","","","","","","","",
++	/*P4-P7 line 248-255*/
++	"","","","","","","","";
+ };
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 000000000000..4b4ba6072f3a
--- /dev/null
+++ b/meta-facebook/meta-harma/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:"
+
+SRC_URI += " \
+    file://1000-add-meta-harma-bmc-dts-setting.patch \
+"
+
diff --git a/meta-facebook/meta-janga/conf/machine/janga.conf b/meta-facebook/meta-janga/conf/machine/janga.conf
index e5c678fdce5e..117a7450efa0 100644
--- a/meta-facebook/meta-janga/conf/machine/janga.conf
+++ b/meta-facebook/meta-janga/conf/machine/janga.conf
@@ -23,7 +23,7 @@ require conf/machine/fboss-lite.inc
 
 UBOOT_MACHINE:janga = "facebook-fblite_defconfig"
 
-KERNEL_DEVICETREE = "aspeed/aspeed-bmc-facebook-janga.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-facebook-fblite-r1.dtb"
 PREFERRED_VERSION_linux-aspeed = "6.6.%"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-cpld"
diff --git a/meta-facebook/meta-janga/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-janga/conf/templates/default/bblayers.conf.sample
index d8fa8325f023..c55f5d1b818b 100644
--- a/meta-facebook/meta-janga/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-janga/conf/templates/default/bblayers.conf.sample
@@ -24,7 +24,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -39,7 +38,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-janga/recipes-kernel/kmods/files/scmcpld.c b/meta-facebook/meta-janga/recipes-kernel/kmods/files/scmcpld.c
index 1bb1914e308e..639944492961 100644
--- a/meta-facebook/meta-janga/recipes-kernel/kmods/files/scmcpld.c
+++ b/meta-facebook/meta-janga/recipes-kernel/kmods/files/scmcpld.c
@@ -55,6 +55,17 @@ static const i2c_dev_attr_st scmcpld_attrs[] = {
 		0,
 		8,
 	},
+	{
+		"pwr_come_en",
+		"use to power on the COMe (default: 0)\n"
+		" 0: power off COMe\n"
+		" 1: power on COMe",
+		I2C_DEV_ATTR_SHOW_DEFAULT,
+		I2C_DEV_ATTR_STORE_DEFAULT,
+		0x14,
+		0,
+		1,
+	},
 	{
 		"pwr_force_off",
 		"use to make COMe power off when set to 0\n"
diff --git a/meta-facebook/meta-janga/recipes-utils/openbmc-utils/files/board-utils.sh b/meta-facebook/meta-janga/recipes-utils/openbmc-utils/files/board-utils.sh
index c7560e7a363d..280aec766274 100644
--- a/meta-facebook/meta-janga/recipes-utils/openbmc-utils/files/board-utils.sh
+++ b/meta-facebook/meta-janga/recipes-utils/openbmc-utils/files/board-utils.sh
@@ -93,6 +93,7 @@ userver_reset() {
     done
 
     echo "failed to reset userver!"
+    logger -p user.crit "failed to reset userver!"
     return 1
 }
 
@@ -101,16 +102,40 @@ chassis_power_cycle() {
 }
 
 bmc_mac_addr() {
-    bmc_mac=$(weutil -e chassis_eeprom | grep 'Local MAC:' | cut -d ' ' -f 3)
-    echo "$bmc_mac"
+    # Fetch mac addr supporting v4 and v5 format.
+    bmc_mac=$(weutil | sed -nE 's/((Local MAC)|(BMC MAC Base)): (.*)/\4/p')
+    if [ -z "$bmc_mac" ]; then
+        echo "BMC MAC Address Not Found !" 1>&2
+        logger -p user.crit "BMC MAC Address Not Found !"
+        return 1
+    else
+        echo "$bmc_mac"
+    fi
 }
 
-#
-# SCM EEPROM doesn't exist in Janga, and CPU MAC address is obtained by
-# adding 1 to the BMC MAC address.
-#
 userver_mac_addr() {
-    bmc_mac=$(bmc_mac_addr)
-    cpu_mac=$(mac_addr_inc "$bmc_mac")
-    echo "$cpu_mac"
+    mac_addr_string=$(weutil | grep -E "(X86 CPU MAC Base)|(Local MAC)")
+    [[ "$mac_addr_string" =~ (((X86 CPU MAC Base)|(Local MAC)):[[:space:]]*(.*)) ]];
+    mac_addr_type="${BASH_REMATCH[2]}"
+    mac_addr_value="${BASH_REMATCH[5]}"
+    case "$mac_addr_type" in
+        # Fetch cpu mac addr based on EEPROM v5.
+        "X86 CPU MAC Base")
+            echo "$mac_addr_value"
+            ;;
+        "Local MAC")
+            #
+            # Fetch cpu mac addr based on EEPROM v4 and older.
+            # SCM EEPROM doesn't exist in Janga, and CPU MAC address is obtained by
+            # adding 1 to the BMC MAC address.
+            #
+            cpu_mac=$(mac_addr_inc "$mac_addr_value")
+            echo "$cpu_mac"
+            ;;
+        *)
+            echo "CPU MAC Address Not Found !" 1>&2
+            logger -p user.crit "CPU MAC Address Not Found !"
+            return 1
+            ;;
+    esac
 }
diff --git a/meta-facebook/meta-janga/recipes-utils/openbmc-utils/files/setup_i2c.sh b/meta-facebook/meta-janga/recipes-utils/openbmc-utils/files/setup_i2c.sh
index 76787579a5ce..04d7dd8b415a 100755
--- a/meta-facebook/meta-janga/recipes-utils/openbmc-utils/files/setup_i2c.sh
+++ b/meta-facebook/meta-janga/recipes-utils/openbmc-utils/files/setup_i2c.sh
@@ -21,16 +21,22 @@
 . /usr/local/bin/openbmc-utils.sh
 
 #
-# SMB/Chassis EEPROM (note: SCM EEPROM does not exist in Janga).
+# Create SCM CPLD as early as possible so the driver can be attached to
+# the device when power-on.service is triggered.
 #
-i2c_device_add 3 0x56 24c64
+modprobe scmcpld
+i2c_device_add 1 0x35 scmcpld
 
 #
 # Create "pwrcpld"
 #
+modprobe pwrcpld
 i2c_device_add 12 0x60 pwrcpld
 
 #
-# SCM CPLD
+# SMB/Chassis EEPROM (note: SCM EEPROM does not exist in Janga).
 #
-i2c_device_add 1 0x35 scmcpld
+modprobe at24
+i2c_device_add 3 0x56 24c64
+# BMC EEPROM
+i2c_device_add 8 0x51 24c64
diff --git a/meta-facebook/meta-janga/recipes-utils/wedge-eeprom/files/lib/eeprom.json b/meta-facebook/meta-janga/recipes-utils/wedge-eeprom/files/lib/eeprom.json
index 0a8e2618e23c..e6106acda0fa 100644
--- a/meta-facebook/meta-janga/recipes-utils/wedge-eeprom/files/lib/eeprom.json
+++ b/meta-facebook/meta-janga/recipes-utils/wedge-eeprom/files/lib/eeprom.json
@@ -4,6 +4,10 @@
     {
       "name" : "chassis_eeprom",
       "sysfs_path" : "/sys/bus/i2c/devices/3-0056/eeprom"
+    },
+    {
+      "name" : "bmc_eeprom",
+      "sysfs_path" : "/sys/bus/i2c/devices/8-0051/eeprom"
     }
   ]
 }
diff --git a/meta-facebook/meta-lightning/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-lightning/conf/templates/default/bblayers.conf.sample
index 7c42a0f6df5c..f4f4903c2782 100644
--- a/meta-facebook/meta-lightning/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-lightning/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-openembedded/meta-networking \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   ##OEROOT##/../../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-lightning/conf/templates/default/local.conf.sample b/meta-facebook/meta-lightning/conf/templates/default/local.conf.sample
index 91602ccbdb0f..f11dd47eb943 100644
--- a/meta-facebook/meta-lightning/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-lightning/conf/templates/default/local.conf.sample
@@ -6,6 +6,6 @@
 MACHINE ??= "lightning"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 ASSUME_PROVIDED_append = "qemu-native"
diff --git a/meta-facebook/meta-lightning/recipes-lightning/fblibs/files/pal/pal.c b/meta-facebook/meta-lightning/recipes-lightning/fblibs/files/pal/pal.c
index 2c86808e675f..be39f56ed378 100755
--- a/meta-facebook/meta-lightning/recipes-lightning/fblibs/files/pal/pal.c
+++ b/meta-facebook/meta-lightning/recipes-lightning/fblibs/files/pal/pal.c
@@ -439,8 +439,8 @@ pal_sensor_read_raw(uint8_t fru, uint8_t sensor_num, void *value) {
     }
 
     /* To avoid the flag file is not removed by enclosure-util */
-    fscanf(fp, "%d ", &tmp);
-    if (tmp < 1) {
+    ret = fscanf(fp, "%d ", &tmp);
+    if (ret != 1 || tmp < 1) {
       fclose(fp);
       remove(SKIP_READ_SSD_TEMP);
       return -1;
@@ -909,8 +909,8 @@ pal_is_fru_ready(uint8_t fru, uint8_t *status) {
 
 int
 pal_get_pwm_value(uint8_t fan_num, uint8_t *value) {
-  char path[64] = {0};
-  char device_name[64] = {0};
+  char path[LARGEST_DEVICE_NAME] = {0};
+  char device_name[LARGEST_DEVICE_NAME] = {0};
   int val = 0;
   int pwm_enable = 0;
 
@@ -1195,7 +1195,12 @@ pal_sensor_assert_handle(uint8_t fru, uint8_t snr_num, float val, uint8_t thresh
   }
 
   lseek(fd, (sizeof(uint8_t) * MAX_SENSOR_NUM) - 1, SEEK_SET);
-  write(fd, "", 1);
+  ret = write(fd, "", 1);
+  if (ret < 0) {
+    syslog(LOG_WARNING, "%s(): failed to write: %d", __func__, ret);
+    close(fd);
+    return;
+  }
 
   sensorStatus = (uint8_t*) mmap(NULL, (sizeof(uint8_t) * MAX_SENSOR_NUM),
                               PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
@@ -1262,7 +1267,12 @@ pal_sensor_deassert_handle(uint8_t fru, uint8_t snr_num, float val, uint8_t thre
   }
 
   lseek(fd, (sizeof(uint8_t) * MAX_SENSOR_NUM) - 1, SEEK_SET);
-  write(fd, "", 1);
+  ret = write(fd, "", 1);
+  if (ret < 0) {
+    syslog(LOG_WARNING, "%s(): failed to write: %d", __func__, ret);
+    close(fd);
+    return;
+  }
 
   sensorStatus = (uint8_t*) mmap(NULL, (sizeof(uint8_t) * MAX_SENSOR_NUM),
                               PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
diff --git a/meta-facebook/meta-meru/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-meru/conf/templates/default/bblayers.conf.sample
index 6e27acc68260..bb1455005a91 100644
--- a/meta-facebook/meta-meru/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-meru/conf/templates/default/bblayers.conf.sample
@@ -24,7 +24,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -39,7 +38,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-meru/recipes-kernel/linux/linux-aspeed_6.1.bbappend b/meta-facebook/meta-meru/recipes-kernel/linux/linux-aspeed_6.1.bbappend
index b91b922cff8a..e7a1bfbb9f6b 100644
--- a/meta-facebook/meta-meru/recipes-kernel/linux/linux-aspeed_6.1.bbappend
+++ b/meta-facebook/meta-meru/recipes-kernel/linux/linux-aspeed_6.1.bbappend
@@ -18,4 +18,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/patches:"
 
 SRC_URI += "file://1001-ARM-dts-aspeed-Add-Facebook-meru-BMC.patch \
+            file://1002-spi-nor-add-support-for-ISSI-IS25LP512MG.patch \
            "
diff --git a/meta-facebook/meta-meru/recipes-kernel/linux/patches/1002-spi-nor-add-support-for-ISSI-IS25LP512MG.patch b/meta-facebook/meta-meru/recipes-kernel/linux/patches/1002-spi-nor-add-support-for-ISSI-IS25LP512MG.patch
new file mode 100644
index 000000000000..b36887237b83
--- /dev/null
+++ b/meta-facebook/meta-meru/recipes-kernel/linux/patches/1002-spi-nor-add-support-for-ISSI-IS25LP512MG.patch
@@ -0,0 +1,26 @@
+From c30f3f0c87d59ebfa112af93e5bbce5c29b93016 Mon Sep 17 00:00:00 2001
+From: Adam Calabrigo <adamc@arista.com>
+Date: Wed, 28 Feb 2024 18:42:47 -0800
+Subject: [PATCH] spi-nor: add support for ISSI IS25LP512MG
+
+---
+ drivers/mtd/spi-nor/issi.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/mtd/spi-nor/issi.c b/drivers/mtd/spi-nor/issi.c
+index 7c8eee808dda..60c3b43180d3 100644
+--- a/drivers/mtd/spi-nor/issi.c
++++ b/drivers/mtd/spi-nor/issi.c
+@@ -64,6 +64,9 @@ static const struct flash_info issi_nor_parts[] = {
+ 		PARSE_SFDP
+ 		FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
+ 		.fixups = &is25lp256_fixups },
++        { "is25lp512mg",  INFO(0x9d6020, 0, 64 * 1024, 1024)
++		NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
++		FLAGS(SPI_NOR_QUAD_PP) },
+ 	{ "is25wp032",  INFO(0x9d7016, 0, 64 * 1024,  64)
+ 		NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
+ 	{ "is25wp064",  INFO(0x9d7017, 0, 64 * 1024, 128)
+-- 
+2.41.0
+
diff --git a/meta-facebook/meta-meru/recipes-meru/files/meru.conf b/meta-facebook/meta-meru/recipes-meru/lm_sensors/files/meru.conf
similarity index 100%
rename from meta-facebook/meta-meru/recipes-meru/files/meru.conf
rename to meta-facebook/meta-meru/recipes-meru/lm_sensors/files/meru.conf
diff --git a/meta-facebook/meta-meru/recipes-meru/lmsensors_%.bbappend b/meta-facebook/meta-meru/recipes-meru/lm_sensors/lmsensors_%.bbappend
similarity index 100%
rename from meta-facebook/meta-meru/recipes-meru/lmsensors_%.bbappend
rename to meta-facebook/meta-meru/recipes-meru/lm_sensors/lmsensors_%.bbappend
diff --git a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/board-utils.sh b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/board-utils.sh
index 3a2844ed65a1..29c208f4c3bf 100644
--- a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/board-utils.sh
+++ b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/board-utils.sh
@@ -22,6 +22,7 @@
 PWRCPLD_SYSFS_DIR="/sys/bus/i2c/drivers/pwrcpld/12-0043"
 SCM_PWR_IN_RESET_SYSFS="${PWRCPLD_SYSFS_DIR}/cpu_in_reset"
 SCM_CPU_READY_SYSFS="${PWRCPLD_SYSFS_DIR}/cpu_ready"
+SMB_EEPROM_SYSFS="/sys/bus/i2c/drivers/at24/9-0052/eeprom"
 
 # SMB CPLD endpoints
 SMBCPLD_SYSFS_DIR="/sys/bus/i2c/drivers/smbcpld/9-0023"
@@ -57,23 +58,6 @@ retry_command() {
     return 0
 }
 
-do_sync() {
-   # Try to flush all data to MMC and remount the drive read-only. Sync again
-   # because the remount is asynchronous.
-   partition="/dev/mmcblk0"
-   mountpoint="/mnt/data1"
-
-   sync
-   # rsyslogd logs to eMMC, so we must stop it prior to remouting.
-   systemctl stop syslog.socket rsyslog.service
-   sleep .05
-   if [ -e $mountpoint ]; then
-      retry_command 5 mount -o remount,ro $partition $mountpoint
-      sleep 1
-   fi
-   sync
-}
-
 wedge_board_type() {
     echo 'meru'
 }
@@ -121,7 +105,17 @@ wedge_power_asic() {
 }
 
 wedge_board_rev() {
-    # MERUTODO: this assumes P1 currently
+    board_rev=$(weutil -e scm|grep "Product Version"|awk '{print $3}')
+    echo "${board_rev}"
+}
+
+wedge_is_scm_p1()
+{
+    board_rev=$(wedge_board_rev)
+    if [ "${board_rev}" == "1" ]; then
+        return 0
+    fi
+
     return 1
 }
 
@@ -160,7 +154,6 @@ userver_reset() {
 }
 
 chassis_power_cycle() {
-    do_sync
     sleep 1
     i2cset -y -f 12 0x43 0x70 0xDE
     sleep 8
diff --git a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/fpga_util.sh b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/fpga_util.sh
index 806e6e03dfca..8a3c0be001fd 100755
--- a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/fpga_util.sh
+++ b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/fpga_util.sh
@@ -27,17 +27,31 @@ cleanup() {
 disconnect_program_paths() {
     gpio_set_value BMC_LITE_L 0
     gpio_set_value JTAG_TRST_L 0
-    userver_power_on
 }
 
 connect_scm_jtag() {
-    userver_power_off
     gpio_set_value BMC_LITE_L 1
     gpio_set_value SW_JTAG_SEL 0
     gpio_set_value JTAG_TRST_L 1
 }
 
 do_scm() {
+    # verify the fpga file
+    revision=$(( $(awk '$0 ~ /NOTE.{1,30}A_REVISION/ {print $3}' "$2" |
+                   sed 's/[";]//g') ))
+
+    if [ "$revision" -lt 3 ]; then
+        if ! wedge_is_scm_p1; then
+            echo "P1 FPGA FILE not compatible with P4 Hardware!"
+            exit 1
+        fi
+    else
+        if wedge_is_scm_p1; then
+            echo "P4 FPGA FILE not compatible with P1 Hardware!"
+            exit 1
+        fi
+    fi
+
     connect_scm_jtag
     jam -l/usr/lib/libcpldupdate_dll_ioctl.so -v -a"${1^^}" "$2" \
       --ioctl IOCBITBANG
diff --git a/tools/fboss-lite/fblite-ref-layer/recipes-kernel/linux/linux-aspeed_6.1.bbappend b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru-21-eth0.4092.netdev
similarity index 78%
rename from tools/fboss-lite/fblite-ref-layer/recipes-kernel/linux/linux-aspeed_6.1.bbappend
rename to meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru-21-eth0.4092.netdev
index 05b4f3362b10..be4379c4067b 100644
--- a/tools/fboss-lite/fblite-ref-layer/recipes-kernel/linux/linux-aspeed_6.1.bbappend
+++ b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru-21-eth0.4092.netdev
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
+# Copyright 2024-present Facebook. All Rights Reserved.
 #
 # This program file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -14,8 +14,11 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA
+#
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/patches:"
+[NetDev]
+Name=eth0.4092
+Kind=vlan
 
-SRC_URI += "file://1001-ARM-dts-aspeed-Add-Facebook-@FBMODEL@-BMC.patch \
-           "
+[VLAN]
+Id=4092
diff --git a/meta-facebook/meta-tahan/recipes-kernel/linux/linux-aspeed_6.6.bbappend b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru-21-eth0.4092.network
similarity index 78%
rename from meta-facebook/meta-tahan/recipes-kernel/linux/linux-aspeed_6.6.bbappend
rename to meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru-21-eth0.4092.network
index db86f37b3149..efca8507f43e 100644
--- a/meta-facebook/meta-tahan/recipes-kernel/linux/linux-aspeed_6.6.bbappend
+++ b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru-21-eth0.4092.network
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
+# Copyright 2024-present Facebook. All Rights Reserved.
 #
 # This program file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -14,8 +14,12 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA
+#
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/patches_6.6:"
+[Match]
+Name=eth0.4092
 
-SRC_URI += "file://1001-ARM-dts-aspeed-Add-Facebook-tahan-BMC.patch \
-           "
+[Network]
+IPv6AcceptRA=no
+DHCP=no
+Address=fe80::1/64
diff --git a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru_flash_32m.layout b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru_flash_32m.layout
deleted file mode 100644
index 524905facd1f..000000000000
--- a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/meru_flash_32m.layout
+++ /dev/null
@@ -1,23 +0,0 @@
-0:FFF desc
-1000:40FFF nac_irc
-41000:40FFFF me
-410000:E0FFFF nac_fw
-E10000:E27FFF ptt
-E28000:FFFFFF pdr
-E28000:FBFFFF unused1
-FC0000:FC0FFF mac
-FC1000:FCEFFF prefdl
-FCF000:FCFFFF mfgdata
-FD0000:FDFFFF fdl
-FE0000:FEFFFF arista_sb
-FE0000:FE0FFF sb_cert2
-FE1000:FE1FFF sb_cert
-FE2000:FE2FFF sb_cert3
-FE3000:FE3FFF extra_cert
-FE4000:FEEBFF sb_crl
-FEEC00:FEEFFF certbundle_metadata
-FEF000:FEFFFF upgrade_cert
-FF0000:FF7FFF aboot_conf
-FF8000:FFFFFF unused2
-1000000:1FFFFFF image
-0:1FFFFFF total
diff --git a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/setup-gpio.sh b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/setup-gpio.sh
index 77011b099538..cfe02fb7e62c 100755
--- a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/setup-gpio.sh
+++ b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/setup-gpio.sh
@@ -49,7 +49,6 @@ setup_gpio_meru_evt() {
     gpio_export_by_name  "${ASPEED_GPIO}" GPIOV1 CPU_RST_L
     gpio_export_by_name  "${ASPEED_GPIO}" GPIOY0 WDT1_RST
     gpio_export_by_name  "${ASPEED_GPIO}" GPIOY2 SCM_TEMP_ALERT
-    gpio_export_by_name  "${ASPEED_GPIO}" GPIOY3 BMC_EMMC_RST
     gpio_export_by_name  "${ASPEED_GPIO}" GPIOZ2 BMC_LITE_L
 }
 
@@ -73,13 +72,10 @@ gpio_set_direction SW_SPI_SEL out
 gpio_set_direction CPU_RST_L in
 gpio_set_direction WDT1_RST out
 gpio_set_direction SCM_TEMP_ALERT in
-gpio_set_direction BMC_EMMC_RST out
 gpio_set_direction BMC_LITE_L out
 
 # Once we set "out", output values will be random unless we set them
 # Set Default GPIO values
-# Set BMC_EMMC_RST High to prevent EMMC disable
-gpio_set BMC_EMMC_RST 1
 
 gpio_set_value ABOOT_GRAB 0
 gpio_set_value BMC_ALIVE 1
diff --git a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/setup_board.sh b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/setup_board.sh
index c675cabc996a..0ca3d38a6ab5 100755
--- a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/setup_board.sh
+++ b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/setup_board.sh
@@ -17,10 +17,24 @@
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA
 
-serial_num=$(weutil -e scm | grep '^Product Serial Number:' | awk '{print $4}')
+SMB_EEPROM_SYSFS="/sys/bus/i2c/drivers/at24/9-0052/eeprom"
+NETWORK_CONF_FILE="/etc/systemd/network/10-eth0.network"
 
-if [[ "$serial_num" =~ JAS231406(4[5-9]|5[0-9]|6[0-4]) ]]; then
-    echo "Using 32M SPI flash layout"
-    cp /etc/meru_flash.layout /etc/meru_flash_64m.layout
-    cp /etc/meru_flash_32m.layout /etc/meru_flash.layout
+if [ ! -e "$SMB_EEPROM_SYSFS" ]; then
+    echo "No SMB eeprom found"
+    exit 0
 fi
+
+product=$(weutil -e smb 2>&1 | awk -F': ' '/Product Name:/ {print $2}')
+
+if [ "${product^^}" != "MERU800BFA" ]; then
+    # No need to configure vlan 4092 for other products.
+    exit 0
+fi
+
+echo "Configuring VLAN 4092"
+vlan4088cfg="VLAN=eth0.4088"
+vlan4092cfg="VLAN=eth0.4092"
+sed -i "s/$vlan4088cfg/$vlan4088cfg\n$vlan4092cfg/" "$NETWORK_CONF_FILE"
+cp /etc/meru-21-eth0.4092.network /etc/systemd/network/21-eth0.4092.network
+cp /etc/meru-21-eth0.4092.netdev /etc/systemd/network/21-eth0.4092.netdev
diff --git a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/switchToCpu.sh b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/switchToCpu.sh
index c97b60a29965..51016b1b89a5 100644
--- a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/switchToCpu.sh
+++ b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/files/switchToCpu.sh
@@ -15,11 +15,11 @@ fi
 set -x
 i2cset -f -y 8 "$DEV_ADDR" 0xf4 0x0
 sleep 0.1
-i2cset -f -y 8 "$DEV_ADDR" 0xf0 0x20
+i2cset -f -y 8 "$DEV_ADDR" 0xf0 0x40
 sleep 0.1
 i2cset -f -y 8 "$DEV_ADDR" 0xf1 0x1
 sleep 0.1
-i2cset -f -y 8 "$DEV_ADDR" 0xf2 0x20
+i2cset -f -y 8 "$DEV_ADDR" 0xf2 0x40
 sleep 0.1
 i2cset -f -y 8 "$DEV_ADDR" 0xf3 0x1
 sleep 0.1
diff --git a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
index 36865e25d69e..ec7579ef551f 100644
--- a/meta-facebook/meta-meru/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
+++ b/meta-facebook/meta-meru/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
@@ -27,12 +27,13 @@ LOCAL_URI += "\
     file://fpga_util.sh \
     file://fpga_ver.sh \
     file://meru_flash.layout \
-    file://meru_flash_32m.layout \
     file://oob-mdio-util.sh \
     file://setup-gpio.sh \
     file://setup_board.sh \
     file://setup_i2c.sh \
     file://switchToCpu.sh \
+    file://meru-21-eth0.4092.netdev \
+    file://meru-21-eth0.4092.network \
     "
 
 OPENBMC_UTILS_FILES += " \
@@ -48,11 +49,16 @@ do_install_bios_layout() {
     install -m 0644 ${S}/bmc_aboot.conf ${D}${sysconfdir}/bmc_aboot.conf
     install -m 0644 ${S}/cpu_aboot.conf ${D}${sysconfdir}/cpu_aboot.conf
     install -m 0644 ${S}/meru_flash.layout ${D}${sysconfdir}/meru_flash.layout
-    install -m 0644 ${S}/meru_flash_32m.layout ${D}${sysconfdir}/meru_flash_32m.layout
+}
+
+do_install_vlan4092() {
+    install -m 0644 ${S}/meru-21-eth0.4092.netdev ${D}${sysconfdir}
+    install -m 0644 ${S}/meru-21-eth0.4092.network ${D}${sysconfdir}
 }
 
 do_install:append() {
     do_install_bios_layout
+    do_install_vlan4092
 }
 
 FILES:${PN} += "${sysconfdir}"
diff --git a/meta-facebook/meta-meru/recipes-utils/show-tech/files/show_tech.py b/meta-facebook/meta-meru/recipes-utils/show-tech/files/show_tech.py
index 18fb124e5bcd..dc3417f3ef1c 100755
--- a/meta-facebook/meta-meru/recipes-utils/show-tech/files/show_tech.py
+++ b/meta-facebook/meta-meru/recipes-utils/show-tech/files/show_tech.py
@@ -24,7 +24,7 @@
 import subprocess
 
 
-VERSION = "0.1"
+VERSION = "1.2"
 
 
 def runCmd(cmd, echo=False, verbose=False, timeout=60, ignoreReturncode=False):
@@ -71,15 +71,6 @@ def dumpWeutil(target="BMC", verbose=False):
     )
 
 
-def dumpEmmc():
-    print("################################")
-    print("######## eMMC debug log ########")
-    print("################################\n")
-    cmdBase = "/usr/local/bin/mmcraw {} /dev/mmcblk0"
-    print(runCmd(cmdBase.format("show-summary"), echo=True, verbose=True))
-    print(runCmd(cmdBase.format("read-cid"), echo=True, verbose=True))
-
-
 def dumpBootInfo():
     print("################################")
     print("######## BMC BOOT INFO  ########")
@@ -110,13 +101,13 @@ def logDump():
     print("################################\n")
     print("#### DMESG LOG ####\n{}\n\n".format(runCmd("dmesg", echo=True)))
     print(
-        "#### BOOT CONSOLE LOG ####\n{}\n\n".format(
-            runCmd("cat /var/log/boot", echo=True)
+        "#### LINUX MESSAGES LOG ####\n{}\n\n".format(
+            runCmd("cat /var/log/messages", echo=True)
         )
     )
     print(
-        "#### LINUX MESSAGES LOG ####\n{}\n\n".format(
-            runCmd("cat /var/log/messages", echo=True)
+        "#### LOGFILE ####\n{}\n\n".format(
+            runCmd("cat /mnt/data/logfile", echo=True)
         )
     )
     print("################################")
@@ -154,8 +145,8 @@ def gpioDump():
     )
 
 
-def showtech(verboseLevel=0):
-    verbose = bool(verboseLevel)
+def showtech(quietLevel=0):
+    verbose = not bool(quietLevel)
     print("################################")
     print("##### SHOWTECH VERSION {} #####".format(VERSION))
     print("################################\n")
@@ -178,7 +169,6 @@ def showtech(verboseLevel=0):
         dumpWeutil("bmc", verbose=verbose)
         dumpWeutil("scm", verbose=verbose)
         dumpWeutil("smb", verbose=verbose)
-        dumpEmmc()
         dumpBootInfo()
         dumpOobStatus()
         i2cDetectDump()
@@ -190,13 +180,21 @@ def parseArgs():
     parser = argparse.ArgumentParser(
         description="Get showtech information. Version {}".format(VERSION)
     )
+    parser.add_argument(
+        "-q",
+        "--quiet",
+        action="count",
+        help="show limited debug logs.",
+        dest="quietLevel",
+        default=0,
+    )
     parser.add_argument(
         "-v",
         "--verbose",
         action="count",
-        help="show verbose detailed debug logs.",
+        help="show verbose detailed debug logs (default).",
         dest="verboseLevel",
-        default=0,
+        default=1,
     )
     return parser.parse_args()
 
@@ -204,7 +202,7 @@ def parseArgs():
 def main():
     args = parseArgs()
 
-    showtech(verboseLevel=args.verboseLevel)
+    showtech(quietLevel=args.quietLevel)
 
 
 if __name__ == "__main__":
diff --git a/meta-facebook/meta-minerva/conf/layer.conf b/meta-facebook/meta-minerva/conf/layer.conf
new file mode 100644
index 000000000000..e4a7fd83c97e
--- /dev/null
+++ b/meta-facebook/meta-minerva/conf/layer.conf
@@ -0,0 +1,11 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "fb-minerva-layer"
+BBFILE_PATTERN_fb-minerva-layer := "^${LAYERDIR}/"
+
+LAYERSERIES_COMPAT_fb-minerva-layer := "scarthgap nanbield kirkstone"
diff --git a/meta-facebook/meta-minerva/conf/machine/minerva.conf b/meta-facebook/meta-minerva/conf/machine/minerva.conf
new file mode 100644
index 000000000000..15520ecd5bce
--- /dev/null
+++ b/meta-facebook/meta-minerva/conf/machine/minerva.conf
@@ -0,0 +1 @@
+KERNEL_DEVICETREE = "aspeed/${KMACHINE}-bmc-facebook-${MACHINE}.dtb"
diff --git a/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample
new file mode 100644
index 000000000000..849d2030793d
--- /dev/null
+++ b/meta-facebook/meta-minerva/conf/templates/default/bblayers.conf.sample
@@ -0,0 +1,26 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "8"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-security \
+  ##OEROOT##/meta-security/meta-tpm \
+  ##OEROOT##/meta-phosphor \
+  ##OEROOT##/meta-aspeed \
+  ##OEROOT##/meta-facebook \
+  ##OEROOT##/meta-facebook/meta-minerva \
+  ##OEROOT##/../.. \
+  ##OEROOT##/../../meta-facebook \
+  ##OEROOT##/../../meta-facebook/meta-minerva \
+  ##OEROOT##/../../meta-facebook/meta-python3 \
+  ##OEROOT##/../../meta-facebook/meta-backports \
+  "
diff --git a/meta-facebook/meta-minerva/conf/templates/default/conf-notes.txt b/meta-facebook/meta-minerva/conf/templates/default/conf-notes.txt
new file mode 100644
index 000000000000..cd9aefc96527
--- /dev/null
+++ b/meta-facebook/meta-minerva/conf/templates/default/conf-notes.txt
@@ -0,0 +1,2 @@
+Common targets are:
+    minerva-image
diff --git a/meta-facebook/meta-minerva/conf/templates/default/local.conf.sample b/meta-facebook/meta-minerva/conf/templates/default/local.conf.sample
new file mode 100644
index 000000000000..b913f297a74e
--- /dev/null
+++ b/meta-facebook/meta-minerva/conf/templates/default/local.conf.sample
@@ -0,0 +1,5 @@
+#
+# Local configuration file for building the OpenBMC image.
+#
+MACHINE ??= "minerva"
+DISTRO ?= "openbmc-fb-lf"
diff --git a/meta-facebook/meta-minerva/recipes-core/images/minerva-image.bb b/meta-facebook/meta-minerva/recipes-core/images/minerva-image.bb
new file mode 100644
index 000000000000..4576d14a3dd9
--- /dev/null
+++ b/meta-facebook/meta-minerva/recipes-core/images/minerva-image.bb
@@ -0,0 +1,4 @@
+require common/images/fb-openbmc-image.inc
+
+# Install temporary firmware update utilities for POC phase.
+IMAGE_INSTALL:append = " fw-util"
diff --git a/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/aspeed-bmc-facebook-minerva.dts b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/aspeed-bmc-facebook-minerva.dts
new file mode 100644
index 000000000000..25f8c7495972
--- /dev/null
+++ b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed/aspeed-bmc-facebook-minerva.dts
@@ -0,0 +1,589 @@
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright (c) 2023 Facebook Inc.
+/dts-v1/;
+
+#include "aspeed-g6.dtsi"
+#include <dt-bindings/gpio/aspeed-gpio.h>
+#include <dt-bindings/i2c/i2c.h>
+
+/ {
+	model = "Facebook Minerva CMM";
+	compatible = "facebook,minerva-cmc", "aspeed,ast2600";
+
+	aliases {
+		serial4 = &uart5;
+		serial5 = &uart6;
+		/*
+		 * PCA9548 (2-0077) provides 8 channels connecting to
+		 * 6 pcs of FCB (Fan Controller Board).
+		 */
+		i2c16 = &imux16;
+		i2c17 = &imux17;
+		i2c18 = &imux18;
+		i2c19 = &imux19;
+		i2c20 = &imux20;
+		i2c21 = &imux21;
+
+		spi1 = &spi_gpio;
+	};
+
+	chosen {
+		stdout-path = "serial5:57600n8";
+	};
+
+	memory@80000000 {
+		device_type = "memory";
+		reg = <0x80000000 0x80000000>;
+	};
+
+	iio-hwmon {
+		compatible = "iio-hwmon";
+		io-channels = <&adc0 0>, <&adc0 1>, <&adc0 2>, <&adc0 3>,
+			<&adc0 4>, <&adc0 5>, <&adc0 6>, <&adc0 7>,
+			<&adc1 2>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led-0 {
+			label = "bmc_heartbeat_amber";
+			gpios = <&gpio0 ASPEED_GPIO(P, 7) GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "heartbeat";
+		};
+
+		led-1 {
+			label = "fp_id_amber";
+			default-state = "off";
+			gpios = <&gpio0 ASPEED_GPIO(B, 5) GPIO_ACTIVE_HIGH>;
+		};
+
+		led-2 {
+			label = "power_blue";
+			default-state = "off";
+			gpios = <&gpio0 ASPEED_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
+		};
+
+		led-3 {
+			label = "fan_fault_amber";
+			gpios = <&leds_gpio 9 GPIO_ACTIVE_HIGH>;
+			default-state = "off";
+		};
+	};
+
+	spi_gpio: spi-gpio {
+		status = "okay";
+		compatible = "spi-gpio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		gpio-sck = <&gpio0 ASPEED_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
+		gpio-mosi = <&gpio0 ASPEED_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
+		gpio-miso = <&gpio0 ASPEED_GPIO(Z, 5) GPIO_ACTIVE_HIGH>;
+		num-chipselects = <1>;
+		cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
+
+		tpmdev@0 {
+			compatible = "infineon,slb9670", "tcg,tpm_tis-spi";
+			spi-max-frequency = <33000000>;
+			reg = <0>;
+		};
+	};
+};
+
+&uart6 {
+	status = "okay";
+};
+
+&wdt1 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_wdtrst1_default>;
+	aspeed,reset-type = "soc";
+	aspeed,external-signal;
+	aspeed,ext-push-pull;
+	aspeed,ext-active-high;
+	aspeed,ext-pulse-duration = <256>;
+};
+
+&mac3 {
+	status = "okay";
+	phy-mode = "rmii";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_rmii4_default>;
+	fixed-link {
+		speed = <100>;
+		full-duplex;
+	};
+};
+
+&fmc {
+	status = "okay";
+	flash@0 {
+		status = "okay";
+		m25p,fast-read;
+		label = "bmc";
+		spi-max-frequency = <50000000>;
+#include "openbmc-flash-layout-128.dtsi"
+	};
+	flash@1 {
+		status = "okay";
+		m25p,fast-read;
+		label = "alt-bmc";
+		spi-max-frequency = <50000000>;
+	};
+};
+
+&rtc {
+	status = "okay";
+};
+
+&sgpiom0 {
+	status = "okay";
+	ngpios = <128>;
+	bus-frequency = <2000000>;
+};
+
+&i2c0 {
+	status = "okay";
+
+	power-monitor@40 {
+		compatible = "ti,ina230";
+		reg = <0x40>;
+		shunt-resistor = <1000>;
+	};
+
+	power-monitor@41 {
+		compatible = "ti,ina230";
+		reg = <0x41>;
+		shunt-resistor = <1000>;
+	};
+
+	power-monitor@67 {
+		compatible = "adi,ltc2945";
+		reg = <0x67>;
+	};
+
+	power-monitor@68 {
+		compatible = "adi,ltc2945";
+		reg = <0x68>;
+	};
+
+	leds_gpio: gpio@19 {
+		compatible = "nxp,pca9555";
+		reg = <0x19>;
+		gpio-controller;
+		#gpio-cells = <2>;
+	};
+};
+
+&i2c1 {
+	status = "okay";
+
+	temperature-sensor@4b {
+		compatible = "ti,tmp75";
+		reg = <0x4b>;
+	};
+
+	temperature-sensor@48 {
+		compatible = "ti,tmp75";
+		reg = <0x48>;
+	};
+
+	eeprom@54 {
+		compatible = "atmel,24c128";
+		reg = <0x54>;
+	};
+};
+
+&i2c2 {
+	status = "okay";
+
+	i2c-mux@77 {
+		compatible = "nxp,pca9548";
+		reg = <0x77>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		i2c-mux-idle-disconnect;
+
+		imux16: i2c@0 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0>;
+
+			eeprom@50 {
+				compatible = "atmel,24c128";
+				reg = <0x50>;
+			};
+
+			pwm@5e{
+				compatible = "max31790";
+				reg = <0x5e>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+
+		imux17: i2c@1 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <1>;
+
+			eeprom@50 {
+				compatible = "atmel,24c128";
+				reg = <0x50>;
+			};
+
+			pwm@5e{
+				compatible = "max31790";
+				reg = <0x5e>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+
+		imux18: i2c@2 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <2>;
+
+			eeprom@50 {
+				compatible = "atmel,24c128";
+				reg = <0x50>;
+			};
+
+			pwm@5e{
+				compatible = "max31790";
+				reg = <0x5e>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+
+		imux19: i2c@3 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <3>;
+
+			eeprom@50 {
+				compatible = "atmel,24c128";
+				reg = <0x50>;
+			};
+
+			pwm@5e{
+				compatible = "max31790";
+				reg = <0x5e>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+
+		imux20: i2c@4 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <4>;
+
+			eeprom@50 {
+				compatible = "atmel,24c128";
+				reg = <0x50>;
+			};
+
+			pwm@5e{
+				compatible = "max31790";
+				reg = <0x5e>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+
+		imux21: i2c@5 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <5>;
+
+			eeprom@50 {
+				compatible = "atmel,24c128";
+				reg = <0x50>;
+			};
+
+			pwm@5e{
+				compatible = "max31790";
+				reg = <0x5e>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+	};
+};
+
+&i2c3 {
+	status = "okay";
+};
+
+&i2c4 {
+	status = "okay";
+};
+
+&i2c5 {
+	status = "okay";
+};
+
+&i2c6 {
+	status = "okay";
+};
+
+&i2c7 {
+	status = "okay";
+};
+
+&i2c8 {
+	status = "okay";
+};
+
+&i2c9 {
+	status = "okay";
+};
+
+&i2c10 {
+	status = "okay";
+};
+
+&i2c11 {
+	status = "okay";
+};
+
+&i2c12 {
+	status = "okay";
+};
+
+&i2c13 {
+	status = "okay";
+};
+
+&i2c14 {
+	status = "okay";
+	multi-master;
+	aspeed,hw-timeout-ms = <1000>;
+
+	ipmb@10 {
+		compatible = "ipmb-dev";
+		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+		i2c-protocol;
+	};
+};
+
+&i2c15 {
+	status = "okay";
+
+	eeprom@50 {
+		compatible = "atmel,24c128";
+		reg = <0x50>;
+	};
+
+	eeprom@56 {
+		compatible = "atmel,24c64";
+		reg = <0x56>;
+	};
+};
+
+&adc0 {
+	aspeed,int-vref-microvolt = <2500000>;
+	status = "okay";
+	pinctrl-0 = <&pinctrl_adc0_default &pinctrl_adc1_default
+		&pinctrl_adc2_default &pinctrl_adc3_default
+		&pinctrl_adc4_default &pinctrl_adc5_default
+		&pinctrl_adc6_default &pinctrl_adc7_default>;
+};
+
+&adc1 {
+	aspeed,int-vref-microvolt = <2500000>;
+	status = "okay";
+	pinctrl-0 = <&pinctrl_adc10_default>;
+};
+
+&ehci1 {
+	status = "okay";
+};
+
+&uhci {
+	status = "okay";
+};
+
+&gpio0 {
+	gpio-line-names =
+	/*A0-A7*/	"","","","","","","","",
+	/*B0-B7*/	"","","","","","","","",
+	/*C0-C7*/	"","","","","BLADE_UART_SEL2","","","",
+	/*D0-D7*/	"","","","","","","","",
+	/*E0-E7*/	"","","","","","","","",
+	/*F0-F7*/	"","","","","","","","",
+	/*G0-G7*/	"","","","","","","","",
+	/*H0-H7*/	"","","","","","","","",
+	/*I0-I7*/	"","","","","","","","",
+	/*J0-J7*/	"","","","","","","","",
+	/*K0-K7*/	"","","","","","","","",
+	/*L0-L7*/	"","","","","BLADE_UART_SEL0","","","",
+	/*M0-M7*/	"","","","","","BLADE_UART_SEL1","","",
+	/*N0-N7*/	"","","","","","","","",
+	/*O0-O7*/	"","","","","","","","",
+	/*P0-P7*/	"","","","","","","","",
+	/*Q0-Q7*/	"","","","","","","","",
+	/*R0-R7*/	"","","","","","","","",
+	/*S0-S7*/	"","","","","","","","",
+	/*T0-T7*/	"","","","","","","","",
+	/*U0-U7*/	"","","","","","","","",
+	/*V0-V7*/	"","","","","BAT_DETECT","","","",
+	/*W0-W7*/	"","","","","","","","",
+	/*X0-X7*/	"","","BLADE_UART_SEL3","","","","","",
+	/*Y0-Y7*/	"","","","","","","","",
+	/*Z0-Z7*/	"","","","","","","","";
+};
+
+&sgpiom0 {
+	gpio-line-names =
+	/*"input pin","output pin"*/
+	/*A0 - A7*/
+	"PRSNT_MTIA_BLADE0_N","PWREN_MTIA_BLADE0_EN_N",
+	"PRSNT_MTIA_BLADE1_N","PWREN_MTIA_BLADE1_EN_N",
+	"PRSNT_MTIA_BLADE2_N","PWREN_MTIA_BLADE2_EN_N",
+	"PRSNT_MTIA_BLADE3_N","PWREN_MTIA_BLADE3_EN_N",
+	"PRSNT_MTIA_BLADE4_N","PWREN_MTIA_BLADE4_EN_N",
+	"PRSNT_MTIA_BLADE5_N","PWREN_MTIA_BLADE5_EN_N",
+	"PRSNT_MTIA_BLADE6_N","PWREN_MTIA_BLADE6_EN_N",
+	"PRSNT_MTIA_BLADE7_N","PWREN_MTIA_BLADE7_EN_N",
+	/*B0 - B7*/
+	"PRSNT_MTIA_BLADE8_N","PWREN_MTIA_BLADE8_EN_N",
+	"PRSNT_MTIA_BLADE9_N","PWREN_MTIA_BLADE9_EN_N",
+	"PRSNT_MTIA_BLADE10_N","PWREN_MTIA_BLADE10_EN_N",
+	"PRSNT_MTIA_BLADE11_N","PWREN_MTIA_BLADE11_EN_N",
+	"PRSNT_MTIA_BLADE12_N","PWREN_MTIA_BLADE12_EN_N",
+	"PRSNT_MTIA_BLADE13_N","PWREN_MTIA_BLADE13_EN_N",
+	"PRSNT_MTIA_BLADE14_N","PWREN_MTIA_BLADE14_EN_N",
+	"PRSNT_MTIA_BLADE15_N","PWREN_MTIA_BLADE15_EN_N",
+	/*C0 - C7*/
+	"PRSNT_NW_BLADE0_N","PWREN_NW_BLADE0_EN_N",
+	"PRSNT_NW_BLADE1_N","PWREN_NW_BLADE1_EN_N",
+	"PRSNT_NW_BLADE2_N","PWREN_NW_BLADE2_EN_N",
+	"PRSNT_NW_BLADE3_N","PWREN_NW_BLADE3_EN_N",
+	"PRSNT_NW_BLADE4_N","PWREN_NW_BLADE4_EN_N",
+	"PRSNT_NW_BLADE5_N","PWREN_NW_BLADE5_EN_N",
+	"PRSNT_FCB_TOP_0_N","PWREN_MTIA_BLADE0_HSC_EN_N",
+	"PRSNT_FCB_TOP_1_N","PWREN_MTIA_BLADE1_HSC_EN_N",
+	/*D0 - D7*/
+	"PRSNT_FCB_MIDDLE_0_N","PWREN_MTIA_BLADE2_HSC_EN_N",
+	"PRSNT_FCB_MIDDLE_1_N","PWREN_MTIA_BLADE3_HSC_EN_N",
+	"PRSNT_FCB_BOTTOM_0_N","PWREN_MTIA_BLADE4_HSC_EN_N",
+	"PRSNT_FCB_BOTTOM_1_N","PWREN_MTIA_BLADE5_HSC_EN_N",
+	"PWRGD_MTIA_BLADE0_PWROK_N","PWREN_MTIA_BLADE6_HSC_EN_N",
+	"PWRGD_MTIA_BLADE1_PWROK_N","PWREN_MTIA_BLADE7_HSC_EN_N",
+	"PWRGD_MTIA_BLADE2_PWROK_N","PWREN_MTIA_BLADE8_HSC_EN_N",
+	"PWRGD_MTIA_BLADE3_PWROK_N","PWREN_MTIA_BLADE9_HSC_EN_N",
+	/*E0 - E7*/
+	"PWRGD_MTIA_BLADE4_PWROK_N","PWREN_MTIA_BLADE10_HSC_EN_N",
+	"PWRGD_MTIA_BLADE5_PWROK_N","PWREN_MTIA_BLADE11_HSC_EN_N",
+	"PWRGD_MTIA_BLADE6_PWROK_N","PWREN_MTIA_BLADE12_HSC_EN_N",
+	"PWRGD_MTIA_BLADE7_PWROK_N","PWREN_MTIA_BLADE13_HSC_EN_N",
+	"PWRGD_MTIA_BLADE8_PWROK_N","PWREN_MTIA_BLADE14_HSC_EN_N",
+	"PWRGD_MTIA_BLADE9_PWROK_N","PWREN_MTIA_BLADE15_HSC_EN_N",
+	"PWRGD_MTIA_BLADE10_PWROK_N","PWREN_NW_BLADE0_HSC_EN_N",
+	"PWRGD_MTIA_BLADE11_PWROK_N","PWREN_NW_BLADE1_HSC_EN_N",
+	/*F0 - F7*/
+	"PWRGD_MTIA_BLADE12_PWROK_N","PWREN_NW_BLADE2_HSC_EN_N",
+	"PWRGD_MTIA_BLADE13_PWROK_N","PWREN_NW_BLADE3_HSC_EN_N",
+	"PWRGD_MTIA_BLADE14_PWROK_N","PWREN_NW_BLADE4_HSC_EN_N",
+	"PWRGD_MTIA_BLADE15_PWROK_N","PWREN_NW_BLADE5_HSC_EN_N",
+	"PWRGD_NW_BLADE0_PWROK_N","PWREN_FCB_TOP_L_EN_N",
+	"PWRGD_NW_BLADE1_PWROK_N","PWREN_FCB_TOP_R_EN_N",
+	"PWRGD_NW_BLADE2_PWROK_N","PWREN_FCB_MIDDLE_L_EN_N",
+	"PWRGD_NW_BLADE3_PWROK_N","PWREN_FCB_MIDDLE_R_EN_N",
+	/*G0 - G7*/
+	"PWRGD_NW_BLADE4_PWROK_N","PWREN_FCB_BOTTOM_L_EN_N",
+	"PWRGD_NW_BLADE5_PWROK_N","PWREN_FCB_BOTTOM_R_EN_N",
+	"PWRGD_FCB_TOP_0_PWROK_N","FM_CMM_AC_CYCLE_N",
+	"PWRGD_FCB_TOP_1_PWROK_N","MGMT_SFP_TX_DIS",
+	"PWRGD_FCB_MIDDLE_0_PWROK_N","",
+	"PWRGD_FCB_MIDDLE_1_PWROK_N","RST_I2CRST_MTIA_BLADE0_1_N",
+	"PWRGD_FCB_BOTTOM_0_PWROK_N","RST_I2CRST_MTIA_BLADE2_3_N",
+	"PWRGD_FCB_BOTTOM_1_PWROK_N","RST_I2CRST_MTIA_BLADE4_5_N",
+	/*H0 - H7*/
+	"LEAK_DETECT_MTIA_BLADE0_N_BUF","RST_I2CRST_MTIA_BLADE6_7_N",
+	"LEAK_DETECT_MTIA_BLADE1_N_BUF","RST_I2CRST_MTIA_BLADE8_9_N",
+	"LEAK_DETECT_MTIA_BLADE2_N_BUF","RST_I2CRST_MTIA_BLADE10_11_N",
+	"LEAK_DETECT_MTIA_BLADE3_N_BUF","RST_I2CRST_MTIA_BLADE12_13_N",
+	"LEAK_DETECT_MTIA_BLADE4_N_BUF","RST_I2CRST_MTIA_BLADE14_15_N",
+	"LEAK_DETECT_MTIA_BLADE5_N_BUF","RST_I2CRST_NW_BLADE0_1_2_N",
+	"LEAK_DETECT_MTIA_BLADE6_N_BUF","RST_I2CRST_NW_BLADE3_4_5_N",
+	"LEAK_DETECT_MTIA_BLADE7_N_BUF","RST_I2CRST_FCB_N",
+	/*I0 - I7*/
+	"LEAK_DETECT_MTIA_BLADE8_N_BUF","RST_I2CRST_FCB_B_L_N",
+	"LEAK_DETECT_MTIA_BLADE9_N_BUF","RST_I2CRST_FCB_B_R_N",
+	"LEAK_DETECT_MTIA_BLADE10_N_BUF","RST_I2CRST_FCB_M_L_N",
+	"LEAK_DETECT_MTIA_BLADE11_N_BUF","RST_I2CRST_FCB_M_R_N",
+	"LEAK_DETECT_MTIA_BLADE12_N_BUF","RST_I2CRST_FCB_T_L_N",
+	"LEAK_DETECT_MTIA_BLADE13_N_BUF","RST_I2CRST_FCB_T_R_N",
+	"LEAK_DETECT_MTIA_BLADE14_N_BUF","BMC_READY",
+	"LEAK_DETECT_MTIA_BLADE15_N_BUF","wFM_88E6393X_BIN_UPDATE_EN_N",
+	/*J0 - J7*/
+	"LEAK_DETECT_NW_BLADE0_N_BUF","WATER_VALVE_CLOSED_N",
+	"LEAK_DETECT_NW_BLADE1_N_BUF","",
+	"LEAK_DETECT_NW_BLADE2_N_BUF","",
+	"LEAK_DETECT_NW_BLADE3_N_BUF","",
+	"LEAK_DETECT_NW_BLADE4_N_BUF","",
+	"LEAK_DETECT_NW_BLADE5_N_BUF","",
+	"MTIA_BLADE0_STATUS_LED","",
+	"MTIA_BLADE1_STATUS_LED","",
+	/*K0 - K7*/
+	"MTIA_BLADE2_STATUS_LED","",
+	"MTIA_BLADE3_STATUS_LED","",
+	"MTIA_BLADE4_STATUS_LED","",
+	"MTIA_BLADE5_STATUS_LED","",
+	"MTIA_BLADE6_STATUS_LED","",
+	"MTIA_BLADE7_STATUS_LED","",
+	"MTIA_BLADE8_STATUS_LED","",
+	"MTIA_BLADE9_STATUS_LED","",
+	/*L0 - L7*/
+	"MTIA_BLADE10_STATUS_LED","",
+	"MTIA_BLADE11_STATUS_LED","",
+	"MTIA_BLADE12_STATUS_LED","",
+	"MTIA_BLADE13_STATUS_LED","",
+	"MTIA_BLADE14_STATUS_LED","",
+	"MTIA_BLADE15_STATUS_LED","",
+	"NW_BLADE0_STATUS_LED","",
+	"NW_BLADE1_STATUS_LED","",
+	/*M0 - M7*/
+	"NW_BLADE2_STATUS_LED","",
+	"NW_BLADE3_STATUS_LED","",
+	"NW_BLADE4_STATUS_LED","",
+	"NW_BLADE5_STATUS_LED","",
+	"RPU_READY","",
+	"IT_GEAR_RPU_LINK_N","",
+	"IT_GEAR_LEAK","",
+	"WATER_VALVE_CLOSED_N","",
+	/*N0 - N7*/
+	"VALVE_STS0","",
+	"VALVE_STS1","",
+	"VALVE_STS2","",
+	"VALVE_STS3","",
+	"CR_TOGGLE_BOOT_BUF_N","",
+	"CMM_LC_RDY_LED_N","",
+	"CMM_LC_UNRDY_LED_N","",
+	"CMM_CABLE_CARTRIDGE_PRSNT_BOT_N","",
+	/*O0 - O7*/
+	"CMM_CABLE_CARTRIDGE_PRSNT_TOP_N","",
+	"BOT_BCB_CABLE_PRSNT_N","",
+	"TOP_BCB_CABLE_PRSNT_N","",
+	"CHASSIS0_LEAK_Q_N","",
+	"CHASSIS1_LEAK_Q_N","",
+	"LEAK0_DETECT","",
+	"LEAK1_DETECT","",
+	"MGMT_SFP_PRSNT_N","",
+	/*P0 - P7*/
+	"MGMT_SFP_TX_FAULT","",
+	"MGMT_SFP_RX_LOS","",
+	"","",
+	"","",
+	"","",
+	"","",
+	"","",
+	"","";
+};
diff --git a/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 000000000000..a9dee3e1d85f
--- /dev/null
+++ b/meta-facebook/meta-minerva/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-aspeed:"
+SRC_URI += " \
+    file://aspeed-bmc-facebook-minerva.dts \
+"
+
+do_configure:append(){
+    cp ${WORKDIR}/aspeed-bmc-facebook-minerva.dts ${S}/arch/arm/boot/dts/aspeed
+    echo "dtb-\$(CONFIG_ARCH_ASPEED) += aspeed-bmc-facebook-minerva.dtb" >> ${S}/arch/arm/boot/dts/aspeed/Makefile
+}
diff --git a/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/bmc.cpp b/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/bmc.cpp
new file mode 100644
index 000000000000..7c550ae3bd00
--- /dev/null
+++ b/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/bmc.cpp
@@ -0,0 +1,43 @@
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <cstdio>
+#include <cstring>
+#include <unistd.h>
+#include <fcntl.h>
+#include <algorithm>
+#include <sys/mman.h>
+#include <syslog.h>
+#include <openbmc/pal.h>
+#include <openbmc/kv.h>
+#include "bmc.h"
+
+
+using namespace std;
+
+int BmcComponent::update(string image_path [[maybe_unused]])
+{
+  return 0;
+}
+
+std::string BmcComponent::get_bmc_version()
+{
+  return 0;
+}
+
+std::string BmcComponent::get_bmc_version(const std::string &mtd [[maybe_unused]])
+{
+  return 0;
+}
+
+int BmcComponent::print_version()
+{
+  return FW_STATUS_NOT_SUPPORTED;
+}
+
+int BmcComponent::get_version(json& j) {
+  j["VERSION"] = sys().version();
+  return FW_STATUS_SUCCESS;
+}
+
+static BmcComponent bmc("bmc", "bmc", "flash0", "u-boot");
diff --git a/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/plat/meson.build b/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/plat/meson.build
new file mode 100644
index 000000000000..ced203888804
--- /dev/null
+++ b/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/plat/meson.build
@@ -0,0 +1,8 @@
+srcs += [
+    'plat_fwupdate.cpp',
+    'bmc.cpp',
+]
+
+deps += [
+    dependency('libfpga'),
+]
diff --git a/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/plat_fwupdate.cpp b/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/plat_fwupdate.cpp
new file mode 100644
index 000000000000..6430e9aa2ac6
--- /dev/null
+++ b/meta-facebook/meta-minerva/recipes-minerva/fw-util/files/plat_fwupdate.cpp
@@ -0,0 +1,88 @@
+#include "fw-util.h"
+#include <cstdio>
+#include <cstring>
+#include <openbmc/cpld.h>
+#include <openbmc/kv.h>
+#include <syslog.h>
+
+using namespace std;
+
+//CPLD fwupdate
+class CpldComponent : public Component {
+  uint8_t pld_type;
+  i2c_attr_t attr;
+  int _update(const char *path, i2c_attr_t attr);
+
+  public:
+    CpldComponent(const std::string &fru, const std::string &comp, uint8_t type, uint8_t bus, uint8_t addr,
+      int (*cpld_xfer)(uint8_t, uint8_t, uint8_t *, uint8_t, uint8_t *, uint8_t))
+      : Component(fru, comp), pld_type(type), attr{bus, addr, cpld_xfer} {}
+    int update(std::string image) override;
+    int fupdate(std::string image) override;
+    int get_version(json& j) override;
+};
+
+int CpldComponent::_update(const char *path, i2c_attr_t attr ) {
+  int ret = -1;
+  string comp = this->component();
+  string fru  = this->fru();
+
+  if (cpld_intf_open(pld_type, INTF_I2C, &attr)) {
+    cerr << "Cannot open i2c!" << endl;
+    goto error_exit;
+  }
+
+  ret = cpld_program((char *)path, NULL, false);
+  cpld_intf_close();
+  if (ret) {
+    cerr << "Error Occur at updating CPLD FW!" << endl;
+    goto error_exit;
+  }
+
+error_exit:
+  return ret;
+}
+
+int CpldComponent::update(const string image) {
+  return _update(image.c_str(), attr);
+}
+
+int CpldComponent::fupdate(const string image) {
+  return _update(image.c_str(), attr);
+}
+
+
+int CpldComponent::get_version(json& j) {
+  int ret = -1;
+  uint8_t ver[4];
+  char strbuf[MAX_VALUE_LEN];
+  string comp = this->component();
+  string fru  = this->fru();
+  transform(comp.begin(), comp.end(),comp.begin(), ::toupper);
+  transform(fru.begin(), fru.end(),fru.begin(), ::toupper);
+  j["PRETTY_COMPONENT"] = fru + " " + comp;
+
+  if (!cpld_intf_open(pld_type, INTF_I2C, &attr)) {
+    ret = cpld_get_ver((uint32_t *)ver);
+    cpld_intf_close();
+  }
+
+  if (ret) {
+    sprintf(strbuf, "NA");
+  } else {
+    sprintf(strbuf, "%02X%02X%02X%02X", ver[0], ver[1], ver[2], ver[3]);
+    kv_set(_component.c_str(), strbuf, 0, 0);
+  }
+  j["VERSION"] = string(strbuf);
+  return FW_STATUS_SUCCESS;
+}
+
+//CPLD Component
+CpldComponent cmm_cpld("cmm", "cpld", LCMXO3LF_4300C, 1, 0x44, nullptr);
+CpldComponent scm_cpld("scm", "cpld", LCMXO3_2100C, 15, 0x40, nullptr);
+CpldComponent fcb_top1_cpld("fcb", "top1_cpld", LCMXO3_9400C, 16, 0x70, nullptr);
+CpldComponent fcb_top0_cpld("fcb", "top0_cpld", LCMXO3_9400C, 17, 0x70, nullptr);
+CpldComponent fcb_mid1_cpld("fcb", "mid1_cpld", LCMXO3_9400C, 18, 0x70, nullptr);
+CpldComponent fcb_mid0_cpld("fcb", "mid0_cpld", LCMXO3_9400C, 19, 0x70, nullptr);
+CpldComponent fcb_bot1_cpld("fcb", "bot1_cpld", LCMXO3_9400C, 20, 0x70, nullptr);
+CpldComponent fcb_bot0_cpld("fcb", "bot0_cpld", LCMXO3_9400C, 21, 0x70, nullptr);
diff --git a/meta-facebook/meta-montblanc/recipes-utils/udev-rules/udev-rules.bbappend b/meta-facebook/meta-minerva/recipes-minerva/fw-util/fw-util_0.2.bbappend
similarity index 72%
rename from meta-facebook/meta-montblanc/recipes-utils/udev-rules/udev-rules.bbappend
rename to meta-facebook/meta-minerva/recipes-minerva/fw-util/fw-util_0.2.bbappend
index de4ae222949c..8c3314c0741e 100644
--- a/meta-facebook/meta-montblanc/recipes-utils/udev-rules/udev-rules.bbappend
+++ b/meta-facebook/meta-minerva/recipes-minerva/fw-util/fw-util_0.2.bbappend
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
+# Copyright 2018-present Facebook. All Rights Reserved.
 #
 # This program file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -16,15 +16,15 @@
 # Boston, MA 02110-1301 USA
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-LOCAL_URI += " \
-    file://spi-devices.rules \
-    "
 
-do_install:append() {
-    dst=${D}${sysconfdir}/udev/
-    install -d ${dst}/rules.d
+PACKAGECONFIG:remove:minerva = "fscd"
 
-    install -m 0644 spi-devices.rules ${dst}/rules.d/99-spi-devices.rules
-}
+LOCAL_URI += " \
+    file://plat/meson.build \
+    file://plat_fwupdate.cpp \
+    file://bmc.cpp \
+    "
 
-FILES:${PN} += "${sysconfdir}"
+DEPENDS += " \
+    libfpga \
+    "
diff --git a/meta-facebook/meta-minilaketb/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-minilaketb/conf/templates/default/bblayers.conf.sample
index 1bcf33670342..98a911d40a46 100644
--- a/meta-facebook/meta-minilaketb/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-minilaketb/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-openembedded/meta-networking \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   ##OEROOT##/../../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-minilaketb/conf/templates/default/local.conf.sample b/meta-facebook/meta-minilaketb/conf/templates/default/local.conf.sample
index 41a74ff4da29..bda3ada4b401 100644
--- a/meta-facebook/meta-minilaketb/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-minilaketb/conf/templates/default/local.conf.sample
@@ -6,7 +6,7 @@
 MACHINE ??= "minilaketb"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).
diff --git a/meta-facebook/meta-minipack/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-minipack/conf/templates/default/bblayers.conf.sample
index f70d648c7429..5a84066835f6 100644
--- a/meta-facebook/meta-minipack/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-minipack/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-yocto \
-  "
diff --git a/meta-facebook/meta-minipack/conf/templates/default/local.conf.sample b/meta-facebook/meta-minipack/conf/templates/default/local.conf.sample
index d7c293993144..3effd04eb3e1 100644
--- a/meta-facebook/meta-minipack/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-minipack/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "minipack"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-montblanc/conf/machine/montblanc.conf b/meta-facebook/meta-montblanc/conf/machine/montblanc.conf
index 99d4cd7897cc..695ca556bd39 100644
--- a/meta-facebook/meta-montblanc/conf/machine/montblanc.conf
+++ b/meta-facebook/meta-montblanc/conf/machine/montblanc.conf
@@ -23,7 +23,7 @@ require conf/machine/fboss-lite.inc
 
 UBOOT_MACHINE:montblanc = "facebook-fblite_defconfig"
 
-KERNEL_DEVICETREE = "aspeed/aspeed-bmc-facebook-montblanc.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-facebook-fblite-r1.dtb"
 PREFERRED_VERSION_linux-aspeed = "6.6.%"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-cpld"
diff --git a/meta-facebook/meta-montblanc/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-montblanc/conf/templates/default/bblayers.conf.sample
index b34365687bf3..f55ec36c1e99 100644
--- a/meta-facebook/meta-montblanc/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-montblanc/conf/templates/default/bblayers.conf.sample
@@ -24,7 +24,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -39,7 +38,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-montblanc/recipes-kernel/kmods/files/mcbcpld.c b/meta-facebook/meta-montblanc/recipes-kernel/kmods/files/mcbcpld.c
index 960ef6d98564..8c5bba6ca4a7 100644
--- a/meta-facebook/meta-montblanc/recipes-kernel/kmods/files/mcbcpld.c
+++ b/meta-facebook/meta-montblanc/recipes-kernel/kmods/files/mcbcpld.c
@@ -193,6 +193,14 @@ static const i2c_dev_attr_st mcbcpld_attrs[] = {
     I2C_DEV_ATTR_STORE_DEFAULT,
     0x14, 2, 1,
   },
+  {
+    "pwr_come_cycle_dev_n",
+    "write 0 to trigger CPLD power cycling the COMe + I210 + SSD\n"
+    "then this bit will auto set to 1 after Power cycle finish",
+    I2C_DEV_ATTR_SHOW_DEFAULT,
+    I2C_DEV_ATTR_STORE_DEFAULT,
+    0x14, 3, 1,
+  },
   {
     "timer_base_10ms",
     "default: 0",
@@ -270,24 +278,16 @@ static int mcbcpld_probe(struct i2c_client *client)
 
 	i2c_set_clientdata(client, pdata);
 
-	return i2c_dev_sysfs_data_init(client, pdata, mcbcpld_attrs,
+	return devm_i2c_dev_sysfs_init(client, pdata, mcbcpld_attrs,
 				       ARRAY_SIZE(mcbcpld_attrs));
 }
 
-static void mcbcpld_remove(struct i2c_client *client)
-{
-	i2c_dev_data_st *pdata = i2c_get_clientdata(client);
-
-	i2c_dev_sysfs_data_clean(client, pdata);
-}
-
 static struct i2c_driver mcbcpld_driver = {
 	.class    = I2C_CLASS_HWMON,
 	.driver = {
 		.name = "mcbcpld",
 	},
 	.probe    = mcbcpld_probe,
-	.remove   = mcbcpld_remove,
 	.id_table = mcbcpld_id,
 };
 
diff --git a/meta-facebook/meta-montblanc/recipes-kernel/kmods/files/scmcpld.c b/meta-facebook/meta-montblanc/recipes-kernel/kmods/files/scmcpld.c
index b10dcd0ae396..768d242bc66c 100644
--- a/meta-facebook/meta-montblanc/recipes-kernel/kmods/files/scmcpld.c
+++ b/meta-facebook/meta-montblanc/recipes-kernel/kmods/files/scmcpld.c
@@ -97,24 +97,16 @@ static int scmcpld_probe(struct i2c_client *client)
 
 	i2c_set_clientdata(client, pdata);
 
-	return i2c_dev_sysfs_data_init(client, pdata, scmcpld_attrs,
+	return devm_i2c_dev_sysfs_init(client, pdata, scmcpld_attrs,
 				       ARRAY_SIZE(scmcpld_attrs));
 }
 
-static void scmcpld_remove(struct i2c_client *client)
-{
-	i2c_dev_data_st *pdata = i2c_get_clientdata(client);
-
-	i2c_dev_sysfs_data_clean(client, pdata);
-}
-
 static struct i2c_driver scmcpld_driver = {
 	.class    = I2C_CLASS_HWMON,
 	.driver = {
 		.name = "scmcpld",
 	},
 	.probe    = scmcpld_probe,
-	.remove   = scmcpld_remove,
 	.id_table = scmcpld_id,
 };
 
diff --git a/meta-facebook/meta-montblanc/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-montblanc-BMC.patch b/meta-facebook/meta-montblanc/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-montblanc-BMC.patch
deleted file mode 100644
index 901b68f40ecd..000000000000
--- a/meta-facebook/meta-montblanc/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-montblanc-BMC.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 4a9022b542a19175858f04657bd32f50b5e6934d Mon Sep 17 00:00:00 2001
-From: Bin Huang <binhuang@meta.com>
-Date: Wed, 10 May 2023 15:39:38 +0700
-Subject: [PATCH] ARM: dts: aspeed: Add Facebook montblanc BMC
-
-Add initial version of device tree for Facebook montblanc (AST2600) BMC.
-
-montblanc is Facebook's next generation switch platform with an AST2600
-BMC integrated for health monitoring purpose.
----
- arch/arm/boot/dts/aspeed/Makefile             |  1 +
- .../aspeed/aspeed-bmc-facebook-montblanc.dts  | 95 +++++++++++++++++++
- 2 files changed, 96 insertions(+)
- create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-montblanc.dts
-
-diff --git a/arch/arm/boot/dts/aspeed/Makefile b/arch/arm/boot/dts/aspeed/Makefile
-index fb9cc95f1b60..6cd78fee57c0 100644
---- a/arch/arm/boot/dts/aspeed/Makefile
-+++ b/arch/arm/boot/dts/aspeed/Makefile
-@@ -24,6 +24,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
- 	aspeed-bmc-facebook-greatlakes.dtb \
- 	aspeed-bmc-facebook-minerva-cmc.dtb \
- 	aspeed-bmc-facebook-minipack.dtb \
-+	aspeed-bmc-facebook-montblanc.dtb \
- 	aspeed-bmc-facebook-tiogapass.dtb \
- 	aspeed-bmc-facebook-wedge40.dtb \
- 	aspeed-bmc-facebook-wedge100.dtb \
-diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-montblanc.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-montblanc.dts
-new file mode 100644
-index 000000000000..be85215395ef
---- /dev/null
-+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-montblanc.dts
-@@ -0,0 +1,95 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// Copyright (c) Meta Platforms, Inc. and affiliates.
-+
-+/dts-v1/;
-+
-+#include "ast2600-facebook-netbmc-common.dtsi"
-+
-+/ {
-+	model = "Facebook montblanc BMC";
-+	compatible = "facebook,montblanc-bmc", "aspeed,ast2600";
-+
-+	chosen {
-+		stdout-path = &uart1;
-+	};
-+
-+	spi_gpio: spi {
-+		num-chipselects = <1>;
-+		cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&lpc_ctrl {
-+	status = "okay";
-+	flash = <&spi1>;
-+};
-+
-+&kcs1 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca0>;
-+};
-+
-+&kcs2 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca8>;
-+};
-+
-+&kcs3 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca2>;
-+};
-+
-+&peci0 {
-+	status = "okay";
-+
-+	peci-client@30 {
-+		compatible = "intel,peci-client";
-+		reg = <0x30>;
-+	};
-+};
-+
-+&spi1 {
-+	status = "okay";
-+
-+	reg = < 0x1e630000 0xc4
-+			0x30000000 0x2000000 >;
-+
-+	flash@0 {
-+		status = "okay";
-+		m25p,fast-read;
-+		label = "spi1.0";
-+		spi-rx-bus-width = <1>;
-+		spi-max-frequency = <5000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			flash1@0 {
-+				reg = <0x0 0x2000000>;
-+				label = "spi-flash";
-+			};
-+		};
-+	};
-+};
-+
-+&jtag1 {
-+	status = "okay";
-+};
-+
-+&mdio1 {
-+	status = "okay";
-+	ethphy0: ethernet-phy@0 {
-+		compatible = "ethernet-phy-ieee802.3-c22";
-+		reg = <0x00>;
-+	};
-+};
-+
-+&mac3 {
-+	status = "okay";
-+	phy-mode = "rgmii";
-+	phy-handle = <&ethphy0>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_rgmii4_default>;
-+};
--- 
-2.39.3
-
diff --git a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/board-utils.sh b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/board-utils.sh
index 78b7e96c7a14..f704d5c3a71c 100644
--- a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/board-utils.sh
+++ b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/board-utils.sh
@@ -70,6 +70,12 @@ wedge_board_rev() {
 }
 
 userver_power_is_on() {
+    if [ ! -e "$PWR_FORCE_OFF" ] || [ ! -e "$PWR_COME_EN" ]; then
+        echo "Error: $PWR_FORCE_OFF does not exist! Is mcbcpld ready??"
+        echo "Assuming uServer is off!"
+        return 1
+    fi
+
     val1=$(head -n 1 < "$PWR_FORCE_OFF" 2> /dev/null)
     val2=$(head -n 1 < "$PWR_COME_EN" 2> /dev/null)
 
@@ -81,20 +87,30 @@ userver_power_is_on() {
 }
 
 userver_power_on() {
-    echo 1 > "$PWR_FORCE_OFF"
-    echo 1 > "$PWR_COME_EN"
+    if ! sysfs_write "$PWR_FORCE_OFF" 1; then
+        return 1
+    fi
+    if ! sysfs_write "$PWR_COME_EN" 1; then
+        return 1
+    fi
+
     return 0
 }
 
 userver_power_off() {
-    echo 0 > "$PWR_FORCE_OFF"
+    if ! sysfs_write "$PWR_FORCE_OFF" 0; then
+        return 1
+    fi
+
     return 0
 }
 
 userver_reset() {
     # write 0 to trigger CPLD power cycling COMe
     # then this bit will auto set to 1 after Power cycle finish
-    echo 0 > "$PWR_COME_CYCLE_N"
+    if ! sysfs_write "$PWR_COME_CYCLE_N" 0; then
+        return 1
+    fi
     
     timeout=10 #timeout 10 second
     while [ $((timeout)) -ge 0 ]; do
@@ -118,22 +134,26 @@ chassis_power_cycle() {
     # eg. TIMER_BASE set as 100MS
     #     TIMER_COUNTER_SETTING set as 50
     #     timer is 50 x 100ms = 5 sec.
-
-    echo 0 > "$TIMER_BASE_10S"
-    echo 0 > "$TIMER_BASE_1S"
-    echo 1 > "$TIMER_BASE_100MS"
-    echo 0 > "$TIMER_BASE_10MS"
-
-    echo 50 > "$TIMER_COUNTER_SETTING"
-
-    echo 1 > "$TIMER_COUNTER_SETTING_UPDATE"
-    echo 1 > "$POWER_CYCLE_GO"
+    #
+    # Fall through on failures.
+    #
+    sysfs_write "$TIMER_BASE_10S" 0
+    sysfs_write "$TIMER_BASE_1S" 0
+    sysfs_write "$TIMER_BASE_100MS" 1
+    sysfs_write "$TIMER_BASE_10MS" 0
+    sysfs_write "$TIMER_COUNTER_SETTING" 50
+    sysfs_write "$TIMER_COUNTER_SETTING_UPDATE" 1
+
+    if ! sysfs_write "$POWER_CYCLE_GO" 1; then
+        return 1
+    fi
 
     return 0
 }
 
 bmc_mac_addr() {
-    weutil_output=$(weutil -e chassis_eeprom | grep 'Local MAC:' | cut -d ' ' -f 3)
+    # Fetch mac addr supporting v4 and v5 format.
+    weutil_output=$(weutil -e chassis_eeprom | sed -nE 's/((Local MAC)|(BMC MAC Base)): (.*)/\4/p')
 
     if [ -n "$weutil_output" ]; then
         # Mac address: xx:xx:xx:xx:xx:xx
@@ -146,7 +166,8 @@ bmc_mac_addr() {
 }
 
 userver_mac_addr() {
-    weutil_output=$(weutil -e scm_eeprom | grep 'Local MAC:' | cut -d ' ' -f 3)
+    # Fetch mac addr supporting v4 and v5 format.
+    weutil_output=$(weutil -e scm_eeprom | sed -nE 's/((Local MAC)|(X86 CPU MAC Base)): (.*)/\4/p')
 
     if [ -n "$weutil_output" ]; then
         # Mac address: xx:xx:xx:xx:xx:xx
diff --git a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup-gpio.sh b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup-gpio.sh
index 6f894d394b41..727764256412 100644
--- a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup-gpio.sh
+++ b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup-gpio.sh
@@ -30,52 +30,19 @@
 # shellcheck disable=SC1091
 . /usr/local/bin/openbmc-utils.sh
 
-# To debug jumper
-setup_gpio BMC_DEBUG_JUMPER1                GPIOG5 in
-setup_gpio BMC_DEBUG_JUMPER2                GPIOB1 in
-setup_gpio BMC_DEBUG_JUMPER3                GPIOB2 in
-# OCP Debug Card present event, high active
-setup_gpio DEBUG_PRSNT                      GPIOG2 in
-
-# Indicate the PCH power good on the Netlake. From COME D83
-setup_gpio PWRGD_PCH_PWROK                  GPIOF4 in
-# Reserved for power button event input, also pass through to BMC Pin40
-setup_gpio PWR_BTN_L                        GPIOP4 in
-# Reserved for reset button event input, also pass through to BMC Pin76
-setup_gpio RST_BTN_L                        GPIOP2 in
-
-# BMC Power Good, output to CPLD 
-setup_gpio BMC_PWRGD_R                      GPIOV4 out 1
 # BMC ready event to COME (COME A85)
 setup_gpio FM_BMC_READY_R_L                 GPIOP0 out 0
-# Reserved for Power button event output, which pass through from BMC Pin160
-setup_gpio BMC_PTH_PWR_BTN_L                GPIOP5 out 1
-# Reserved for reset button event output, which pass through from BMC Pin121
-setup_gpio BMC_PTH_RST_BTN_L                GPIOP3 out 1
 
+# To enable the path to access COMe FPGA and SCMCPLD
 setup_gpio BMC_I2C1_EN                      GPIOG0 out 0
 setup_gpio BMC_I2C2_EN                      GPIOF1 out 0
+
 # JTAG MUX
 setup_gpio MUX_JTAG_SEL_0                   GPIOF0 out 0
 setup_gpio MUX_JTAG_SEL_1                   GPIOF5 out 0
+
 # Mux select signal for BMC to program IOB flash (SPI)
 setup_gpio IOB_FLASH_SEL                    GPIOG4 out 0
+
 # SPI Mux select to COME (B89) and PROT module
 setup_gpio SPI_MUX_SEL                      GPIOQ6 out 0
-
-# BMC CPU_RST#
-setup_gpio BMC_CPU_RST                      GPION2 in
-# To SCM CPLD, reserved.
-setup_gpio BMC_GPIO126_USB2APWREN           GPION4 in
-# CPU power good event indicates to BMC
-setup_gpio COME_ISO_PWRGD_CPU_LVC3          GPIOO2 in
-# CATERR/MSMI event from SOC
-setup_gpio FM_CPU_MSMI_CATERR_LVT3_BUF_N    GPIOM3 in
-# Non-maskable Interrupt to BMC, from COMe B95
-setup_gpio ISO_FM_BMC_NMI_L                 GPIOO3 in
-# Reserve for BMC to enable Netlake power, to COMe A93
-setup_gpio ISO_FM_BMC_ONCTL_L               GPIOG6 out 0
-# COMe FPGA CRC error event indication, from COMe C69
-setup_gpio ISO_FPGA_CRC_ERROR               GPIOQ0 in
-# Netlake FPGA asset it to inform BMC for PCIe hot plug (From COME A16)
-setup_gpio ISO_SMB_FPGA_VPP_ALERT_L         GPIOG3 in
\ No newline at end of file
diff --git a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup_board.sh b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup_board.sh
new file mode 100644
index 000000000000..ff91e3a383f6
--- /dev/null
+++ b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup_board.sh
@@ -0,0 +1,123 @@
+#!/bin/bash
+#
+# Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+#
+
+# shellcheck disable=SC1091
+. /usr/local/bin/openbmc-utils.sh
+
+#
+# XXX this function is used to configure 88E1512 PHY between BMC and OOB
+#     switch on EVT units. The PHY is removed in DVT and newer revisions,
+#     and we can drop the code once all the EVT units are retired.
+#
+fixup_phy_onlyevt() {
+    MDIO_CH=2
+    PHY_ADDR=0x0
+    PAGE_REG=0x16
+
+    # disable RGMII Delay
+    # page 0x02 register 0x15
+    #      bit [5] - 0 Recive clock transition when data transtions
+    #          [4] - 0 Transmit clock not internal delayed
+    mdio-util -m $MDIO_CH -p $PHY_ADDR -w $PAGE_REG -d 0x2
+    value=$(mdio-util -m $MDIO_CH -p $PHY_ADDR -r 0x15 | cut -d' ' -f7-)
+    value=$(( value & 0xffcf ))
+    value=$(printf 0x%04x "$value")
+    mdio-util -m $MDIO_CH -p $PHY_ADDR -w 0x15 -d "$value"
+
+    # set mode RGMII to 1000Base-X
+    # page 0x12 regiser 0x14
+    #      bit [2:0] - 0x2 RGMII (System mode) to 1000Base-X
+    #      bit [15]  - Mode software reset, 1 = PHY reset,
+    #                  cleared to 0 automatically
+    mdio-util -m $MDIO_CH -p $PHY_ADDR -w $PAGE_REG -d 0x12
+    value=$(mdio-util -m $MDIO_CH -p $PHY_ADDR -r 0x14 | cut -d' ' -f7-)
+    value=$(( value & 0x7ff8 ))
+    value=$(( value | 0x8002 ))
+    value=$(printf 0x%04x "$value")
+    mdio-util -m $MDIO_CH -p $PHY_ADDR -w 0x14 -d "$value"
+
+    # set page back to 0
+    mdio-util -m $MDIO_CH -p $PHY_ADDR -w $PAGE_REG -d 0x0
+
+    echo -e "\nsetting PHY CHIP 88E1512 mode."
+}
+
+# set LPC signal strngth to weakest
+setup_LPC_signal_strength()
+{
+    SCU454=$(scu_addr 454)
+    SCU458=$(scu_addr 458)
+
+    # SCU454 : Multi-function Pin Control #15
+    # 31:30 - LAD3/ESPID3 Driving Strength
+    # 29:28 - LAD2/ESPID2 Driving Strength
+    # 27:26 - LAD1/ESPID1 Driving Strength
+    # 25:24 - LAD0/ESPID0 Driving Strength
+    #          3: strongest    0: weakest
+    # set strength value to 0
+    value=$(devmem "$SCU454")
+    value=$(( value & 0x00FFFFFF ))
+    devmem "$SCU454" 32 $value
+    
+    # SCU458 : Multi-function Pin Control #16
+    # 19:18 - LPCRSTN/ESPIRSTN Driving Strength
+    # 17:16 - LACDIRQ/ESPIALERT Driving Strength
+    # 15:14 - LPCFRAMEN/ESPICSN Driving Strength
+    # 13:12 - LPCCLK/ESPICLK Driving Strength
+    #          3: strongest    0: weakest
+    # set strength value to 0
+    value=$(devmem "$SCU458")
+    value=$(( value & 0xFFF00FFF ))
+    devmem "$SCU458" 32 $value
+}
+
+# set RGMII Delay
+setup_rgmii_delay()
+{
+    SCU350=$(scu_addr 350)
+    # SCU350 MAC34 Interface Clock Delay Setting
+    #   31     R/W     RGMII 125MHz clock source selection
+    #                   0: PAD RGMIICK
+    #                   1: Internal PLL
+    #   30     R/W     RMII4 50MHz RCLK output enable
+    #                   0: Disable
+    #                   1: Enable
+    #   29     R/W     RMII3 50MHz RCLK output enable
+    #                   0: Disable
+    #                   1: Enable
+    #   28:26  ---     Reserved
+    #   25     R/W     MAC#4 RMII transmit data at clock falling edge
+    #   24     R/W     MAC#3 RMII transmit data at clock falling edge
+    #   23:18  R/W     MAC#4 RMII RCLK/RGMII RXCLK (1G) clock input delay
+    #   17:12  R/W     MAC#3 RMII RCLK/RGMII RXCLK (1G) clock input delay
+    #   11:6   R/W     MAC#4 RGMII TXCLK (1G) clock output delay
+    #   5:0    R/W     MAC#3 RGMII TXCLK (1G) clock output delay
+
+    value=$(devmem "$SCU350")
+    # set MAC4 TX4 clock delay to 8
+    value=$((value & 0xFFFFF03F ))
+    value=$((value | (8 << 6) ))
+
+    devmem "$SCU350" 32 $value
+}
+
+fixup_phy_onlyevt
+setup_LPC_signal_strength
+setup_rgmii_delay
\ No newline at end of file
diff --git a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup_i2c.sh b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup_i2c.sh
index 04e40decdd36..a6200be301fd 100755
--- a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup_i2c.sh
+++ b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/setup_i2c.sh
@@ -20,18 +20,28 @@
 # shellcheck disable=SC1091
 . /usr/local/bin/openbmc-utils.sh
 
+#
+# Create mcbcpld as early as possible so the driver can be attached to
+# the device when power-on.service is triggered.
+#
+modprobe mcbcpld
+i2c_device_add 12 0x60 mcbcpld
+
 # FRU EEPROM
 i2c_device_add 3 0x56 24c64    # SCM FRU EEPROM#2
 i2c_device_add 6 0x53 24c64    # FCB_B EEPROM
-i2c_device_add 8 0x51 24c64    # BMC EEPROM
 
-# FPGA / CPLD
-# to access scmcpld need to enable I2C buffer by setting BMC_I2C2_EN to high
+#
+# scmcpld is not reachable until the isolation buffer is enabled.
+# FIXME:
+#   - do we really need the scmcpld driver in openbmc side??
+#   - we need to move gpio operations to setup_gpio, or fix the dependency
+#     between setup_i2c and setup_gpio service.
+#
 gpiocli -s BMC_I2C2_EN set-value 1
 sleep 1
 i2c_device_add 1 0x35 scmcpld
-i2c_device_add 12 0x60 mcbcpld
 
 # CPU IPMI
 ulimit -q 1024000
-i2c_device_add 5 0x1010 slave-mqueue  # mqueue for ipmi from COMe CPU
\ No newline at end of file
+i2c_device_add 5 0x1010 slave-mqueue  # mqueue for ipmi from COMe CPU
diff --git a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/spi_util.sh b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/spi_util.sh
index 495f9ed7b968..147d09be2ccc 100644
--- a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/spi_util.sh
+++ b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/files/spi_util.sh
@@ -17,227 +17,226 @@
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA
 #
+
 #shellcheck disable=SC1091
 #shellcheck disable=SC2086
 . /usr/local/bin/openbmc-utils.sh
 
-ret=0
-trap cleanup_spi INT TERM QUIT EXIT
+SPI1_MASTER="1e630000.spi"
+ASPEED_SMC_DRIVER_DIR="/sys/bus/platform/drivers/spi-aspeed-smc"
 
-PIDFILE="/var/run/spi_util.pid"
-check_duplicate_process()
-{
-    exec 2>$PIDFILE
-    flock -n 2 || (echo "Another process is running" && exit 1)
-    ret=$?
-    if [ $ret -eq 1 ]; then
-      exit 1
-    fi
-    pid=$$
-    echo $pid 1>&200
+#
+# Both come_cpld and scm_cpld are needed to select/deselect chips.
+#
+COMECPLD_I2C_BUS=0
+COMECPLD_I2C_ADDR=0x1f
+SCMCPLD_I2C_BUS=1
+SCMCPLD_I2C_ADDR=0x35
+
+#
+# The chipselect and mtd labels assigned to IOB and BIOS.
+#
+IOB_MTD_LABEL="host-flash"
+BIOS_MTD_LABEL="host-flash"
+
+PID_FILE="/var/run/spi_util.pid"
+
+cleanup_spi() {
+    echo "Restore environment.."
+    # select muxing FLASH to normal mode
+    # BMC GPIO: IOB_FLASH
+    #              to (X) IOB_FPGA    0
+    #                 ( ) BMC_SPI1    1
+    gpiocli -s IOB_FLASH_SEL set-value 0
+    # BMC GPIO: BIOS_FLASH
+    #               to (X) NetLake CPU 0
+    #                  ( ) BMC_SPI1    1
+    gpiocli -s SPI_MUX_SEL set-value 0
+    # COME CPLD: BIOS_FLASH_CS0
+    #               to ( ) BMC_SPI1_CS1 0x7
+    #                  ( ) BMC_SPI1_CS0 0x5
+    #                  (X) SPI_PCH_CS0 0x4
+    #                  ( ) SPI_PCH_CS1 0x6
+    i2cset -f -y "$COMECPLD_I2C_BUS" "$COMECPLD_I2C_ADDR" 0xa 0x4
+
+    rm -rf /tmp/.spi_util*
+    rm -f "$PID_FILE"
 }
 
-remove_pid_file()
-{
-    if [ -f $PIDFILE ]; then
-        rm $PIDFILE
+check_duplicate_process() {
+    exec 2>"$PID_FILE"
+    if ! flock -n 2; then
+        echo "Another instance is running. Exiting!!"
+        exit 1
     fi
 }
 
-SPI1_DRIVER="1e630000.spi"
-ASPEED_SMC_PATH="/sys/bus/platform/drivers/spi-aspeed-smc/"
+enable_cpld_access() {
+    echo "Enable access of COME and SCM CPLDs.."
 
-mtd_driver_unbind_spi1() {
-    [ -e ${ASPEED_SMC_PATH}${SPI1_DRIVER} ] && echo ${SPI1_DRIVER} > ${ASPEED_SMC_PATH}unbind
+    gpiocli -s BMC_I2C1_EN set-value 1
+    gpiocli -s BMC_I2C2_EN set-value 1
 }
 
-mtd_driver_rebind_spi1() {
-    # Sometime kernel may complain "vmap allocation for size 268439552 failed: use vmalloc=<size> to increase size"
-    # until now the root cause is not clear, still need more investigation
-    mtd_driver_unbind_spi1
-    echo ${SPI1_DRIVER} > ${ASPEED_SMC_PATH}bind
+select_iob_flash() {
+    echo "Select IOB_FPGA flash.."
 
-    # add more delay to make sure the driver has probe done. 
-    sleep 1;
+    # SCM CPLD: BMC_SPI1
+    #              to (X) IOB_FPGA   0
+    #                 ( ) COME_BIOS  1
+    #                 ( ) PRoT       2
+    i2cset -f -y "$SCMCPLD_I2C_BUS" "$SCMCPLD_I2C_ADDR" 0x34 0x0
 
-    SPI1_MTD_PATH=$(realpath /run/devmap/spi-devices/spi1-flash)
-    if [ ! -e "$SPI1_MTD_PATH" ]; then
-        echo "cannot find SPI1 MTD path [$SPI1_MTD_PATH]"
-        exit 1
-    fi
-    SPI1_MTD_INDEX=$(echo "$SPI1_MTD_PATH" | sed 's_/dev/mtd__g')
+    # BMC GPIO: IOB_FLASH
+    #              to ( ) IOB_FPGA 0
+    #                 (X) BMC_SPI1 1
+    gpiocli -s IOB_FLASH_SEL set-value 1
 }
 
-read_spi1_dev(){
-    dev=$1
-    file=$2
-    echo "Reading ${dev} to $file..."
-    flashrom -p linux_mtd:dev=$SPI1_MTD_INDEX -r "$file"
+select_bios_flash() {
+    echo "Select BIOS flash.."
+
+    # SCM CPLD: BMC_SPI1
+    #              to ( ) IOB_FPGA   0
+    #                 (X) COME_BIOS  1
+    #                 ( ) PRoT       2
+    i2cset -f -y "$SCMCPLD_I2C_BUS" "$SCMCPLD_I2C_ADDR" 0x34 0x1
+
+    # BMC GPIO: BIOS_FLASH
+    #              to ( ) NetLake CPU 0
+    #                 (X) BMC_SPI1    1
+    gpiocli -s SPI_MUX_SEL set-value 1
+
+    # COME CPLD: BIOS_FLASH_CS0
+    #               to ( ) BMC_SPI1_CS1 0x7
+    #                  (X) BMC_SPI1_CS0 0x5
+    #                  ( ) SPI_PCH_CS0 0x4
+    #                  ( ) SPI_PCH_CS1 0x6
+    i2cset -f -y "$COMECPLD_I2C_BUS" "$COMECPLD_I2C_ADDR" 0xa 0x5
+}
+
+probe_flashes() {
+    echo "Probe flashes.."
+
+    echo "$SPI1_MASTER" > "${ASPEED_SMC_DRIVER_DIR}/unbind"
+    sleep 1
+
+    echo "$SPI1_MASTER" > "${ASPEED_SMC_DRIVER_DIR}/bind"
+    sleep 1
+}
+
+flash_mtd_read() {
+    mtd_idx="$1"
+    file="$2"
+
+    echo "Read /dev/mtd${mtd_idx} to $file..."
+    flashrom -p linux_mtd:dev="$mtd_idx" -r "$file"
 }
 
-write_spi1_dev(){
-    dev=$1
+flash_mtd_erase() {
+    mtd_idx="$1"
+
+    echo "Erase /dev/mtd$mtd_idx.."
+    flashrom -p linux_mtd:dev="$mtd_idx" -E
+}
+
+expand_image_file() {
+    mtd_idx=$1
     file=$2
-    echo "Writing $file to ${dev}..."
 
-    tmpfile="/tmp/temp_image"
-    flashsize=$(flashrom -p linux_mtd:dev=$SPI1_MTD_INDEX | grep -i kB | xargs echo | cut -d '(' -f 2 | cut -d ' ' -f 0)
+    flashsize=$(flashrom -p linux_mtd:dev=$mtd_idx | grep -i kB |
+                xargs echo | cut -d '(' -f 2 | cut -d ' ' -f 0)
     targetsize=$((flashsize * 1024))
+    filesize=$(stat -c%s $file)
+    add_size=$((targetsize - filesize))
 
-    case ${dev} in
-        "COME_BIOS"|"PROT"|"IOB_FPGA")
-        # store to the temp-file
-        cp "$file" "$tmpfile"
-        ;;        
-    esac
+    if [ "$add_size" -gt 0 ]; then
+        echo "Append $add_size bytes to $file.."
+        dd if=/dev/zero bs="$add_size" count=1 | tr "\000" "\377" >> "$file"
+    fi
+}
 
-    #extend the temp-file
-    filesize=$(stat -c%s $tmpfile)
-    echo $filesize
-    add_size=$((targetsize - filesize))
-    echo $add_size
-    dd if=/dev/zero bs="$add_size" count=1 | tr "\000" "\377" >> "$tmpfile"
+flash_mtd_write() {
+    mtd_idx=$1
+    file=$2
+    tmpfile="/tmp/.spi_util_image.tmp"
 
-    echo flashrom -p linux_mtd:dev=$SPI1_MTD_INDEX -w "$tmpfile"
+    echo "Copy $file to $tmpfile.."
+    cp "$file" "$tmpfile"
 
-    flashrom -p linux_mtd:dev=$SPI1_MTD_INDEX -w "$tmpfile"
+    extend_image_file "$mtd_idx" "$tmpfile"
 
-    case ${dev} in
-        "IOB_FPGA")
-            # TODO: add reset signal component after programed
-        ;;
-        "COME_BIOS")
-            # no need action, let user run command to reset COMe [wedge_power.sh reset]
-        ;;
-        "PROT")
-            # TODO: need confirm, this path use only for debuging
-        ;;
-    esac
+    echo "Write $tmpfile to /dev/mtd$mtd_idx.."
+    flashrom -p linux_mtd:dev="$mtd_idx" -w "$tmpfile"
 }
 
-erase_spi1_dev(){
-    flashrom -p linux_mtd:dev=$SPI1_MTD_INDEX -E
-}
+do_flash_io() {
+    action=$1
+    device=$2
+    file=$3
+    mtd_label=""
 
-config_spi1_pin_and_path(){
-    dev=$1
+    enable_cpld_access
 
-    # enable i2c buff BMC able to access 
-    #  i2c-0  for COME CPLD  (0x1f)
-    #  i2c-1  for SCM CPLD   (0x35)
-    gpiocli -s BMC_I2C1_EN set-value 1
-    gpiocli -s BMC_I2C2_EN set-value 1
-    case ${dev} in
+    # Select the right flash chip
+    case "$device" in
         "IOB_FPGA")
-            # SCM CPLD: BMC_SPI1 
-            #                    to (X) IOB_FPGA   0
-            #                       ( ) COME_BIOS  1
-            #                       ( ) PRoT       2
-            i2cset -f -y 1 0x35 0x34 0x0
-
-            # BMC GPIO: IOB_FLASH 
-            #                    to ( ) IOB_FPGA 0
-            #                       (X) BMC_SPI1 1
-            gpiocli -s IOB_FLASH_SEL set-value 1
+            select_iob_flash
+            mtd_label="${IOB_MTD_LABEL}"
         ;;
+
         "COME_BIOS")
-            # SCM CPLD: BMC_SPI1 
-            #                    to ( ) IOB_FPGA   0
-            #                       (X) COME_BIOS  1
-            #                       ( ) PRoT       2
-            i2cset -f -y 1 0x35 0x34 0x1
-            
-            # BMC GPIO: BIOS_FLASH 
-            #                    to ( ) NetLake CPU 0
-            #                       (X) BMC_SPI1    1
-            gpiocli -s SPI_MUX_SEL set-value 1
-            
-            # COME CPLD: BIOS_FLASH_CS0
-            #                    to ( ) BMC_SPI1_CS1 0x7
-            #                       (X) BMC_SPI1_CS0 0x5
-            #                       ( ) SPI_PCH_CS0 0x4
-            #                       ( ) SPI_PCH_CS1 0x6
-            i2cset -f -y 0 0x1f 0xa 0x5
+            select_bios_flash
+            mtd_label="${BIOS_MTD_LABEL}"
         ;;
-        "PROT")
-            # TODO: need confirm, this path use only for debuging
-            # SCM CPLD: set BMC_SPI1 
-            #                    to ( ) IOB_FPGA   0
-            #                       (X) COME_BIOS  1
-            #                       ( ) PRoT       2
-            i2cset -f -y 1 0x35 0x34 0x2
+
+        *)
+            echo "Error: unsupported device <$device>!"
+            exit 1
         ;;
     esac
-    mtd_driver_rebind_spi1
-}
 
-cleanup_spi(){
-    if [ $ret -eq 1 ]; then
+    # Force re-probe flashes
+    probe_flashes
+    mtd=$(mtd_lookup_by_name "$mtd_label")
+    mtd_idx=$(echo "$mtd" | sed -e 's/mtd//')
+    if [ -z "$mtd_idx" ]; then
+        echo "Error: unable to find <$mtd_label> mtd partition!"
         exit 1
     fi
 
-    # select muxing FLASH to normal mode
-    # BMC GPIO: IOB_FLASH 
-    #                    to (X) IOB_FPGA    0
-    #                       ( ) BMC_SPI1    1
-    gpiocli -s IOB_FLASH_SEL set-value 0
-    # BMC GPIO: BIOS_FLASH 
-    #                    to (X) NetLake CPU 0
-    #                       ( ) BMC_SPI1    1
-    gpiocli -s SPI_MUX_SEL set-value 0
-
-    rm -rf /tmp/*_spi*_tmp
-    remove_pid_file
-}
-
-operate_spi1_dev(){
-    op=$1
-    dev=$2
-    file=$3
-    ## Operate devices ##
-    case ${op} in
+    # Read/write/erase the flash chip
+    case "$action" in
         "read")
-                read_spi1_dev "$dev" "$file"
+            if [ -z "$file" ]; then
+                echo "Error: <pathname> is mandatory for $action!"
+                exit 1
+            fi
+            flash_mtd_read "$mtd_idx" "$file"
         ;;
+
         "write")
-                if [ ! -f "$file" ]; then
-                    echo "$file not exist!!!"
-                    exit 1
-                fi
-                write_spi1_dev "$dev" "$file"
+            if [ ! -e "$file" ]; then
+                echo "Error: <$file> does not exist!"
+                exit 1
+            fi
+            flash_mtd_write "$mtd_idx" "$file"
         ;;
+
         "erase")
-                erase_spi1_dev "$dev"
-        ;;
-        *)
-            echo "Operation $op is not defined."
+            flash_mtd_erase "$mtd_idx"
         ;;
-    esac
-    mtd_driver_unbind_spi1
-}
 
-ui(){
-    . /usr/local/bin/openbmc-utils.sh
-    op=$1
-    spi=$2
-
-    ## Open the path to device ##
-    case ${spi} in
-        "spi1")
-            dev=$3
-            file=$4
-            config_spi1_pin_and_path "$dev"
-            operate_spi1_dev "$op" "$dev" "$file"
-        ;;
         *)
-            echo "No such SPI bus."
-            return 1
+            echo "Error: operation <$action> is not supported!"
+            exit 1
         ;;
     esac
 }
 
-usage(){
-    program=$(basename "$0")
+usage() {
+    program="$1"
+
     echo "Usage:"
     echo "  $program <op> <spi> <spi device> <file>"
     echo "    <op>          : read, write, erase"
@@ -245,75 +244,36 @@ usage(){
     echo "    <spi1 device> : IOB_FPGA, COME_BIOS"
     echo ""
     echo "Examples:"
-    echo "  $program write spi1 IOB_FPGA iofpga.bit"
+    echo "  $program read spi1 IOB_FPGA iofpga.bit"
     echo ""
 }
 
-check_parameter(){
-    program=$(basename "$0")
-    op=$1
-    spi=$2
-
-    # check operations.
-    case ${op} in
-        "read" | "write" | "erase")
-            ;;
-        *)
-            return 1
-            ;;
-    esac
+#
+# Main entry starts here
+#
+check_duplicate_process
 
-    case ${spi} in
-        # check spi 1 device and parameters.
-        "spi1")
-            dev=$3
-            file=$4
-            case ${dev} in
-                "IOB_FPGA"|"COME_BIOS")
-                    case ${op} in
-                        "read" | "write")
-                            if [ $# -ne 4 ]; then
-                                return 1
-                            fi
-                            ;;
-                        "erase")
-                            if [ $# -ne 3 ]; then
-                                return 1
-                            fi
-                            ;;
-                    esac
-                    ;;
-                "PROT")
-                    echo "PRoT upgrade not support yet"
-                    return 1
-                    ;;
-                *)
-                    return 1
-                    ;;
-            esac
-            ;;
-
-        # check device and parameters fail.
-        *)
-            return 1
-            ;;
-    esac
+if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+    usage "$0"
+    exit 0
+fi
 
-    return 0
-}
+if [ "$#" -ne 4 ] && [ "$#" -ne 5 ]; then
+    echo "Error: invalid command line arguments!"
+    usage "$0"
+    exit 1
+fi
 
+action="$1"
+spi_bus="$2"
+device="$3"
+image_file="$4"
 
-# check_duplicate_process - to check if there is the duplicate spi util process, will return fail and stop execute command.
-check_duplicate_process
+if [ "$spi_bus" != "spi1" ]; then
+    echo "Error: invalid spi bus: $spi_bus!"
+    exit 1
+fi
 
-# check_parameter - to check command parameters
-check_parameter "$@"
-is_par_ok=$?
+trap cleanup_spi INT TERM QUIT EXIT
 
-if [ $is_par_ok -eq 0 ]; then
-    ui "$@"
-    exit 0
-else
-    usage
-    exit 1
-fi
\ No newline at end of file
+do_flash_io "$action" "$device" "$image_file"
diff --git a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
index afcb6b6dcaa5..afdf1d00f316 100644
--- a/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
+++ b/meta-facebook/meta-montblanc/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend
@@ -24,6 +24,7 @@ LOCAL_URI += "\
     file://spi_util.sh \
     file://read_INA230.sh \
     file://cpld_update.sh \
+    file://setup_board.sh \
     "
 
 OPENBMC_UTILS_FILES += " \
diff --git a/meta-facebook/meta-montblanc/recipes-utils/udev-rules/files/spi-devices.rules b/meta-facebook/meta-montblanc/recipes-utils/udev-rules/files/spi-devices.rules
deleted file mode 100644
index b8f07bd505d3..000000000000
--- a/meta-facebook/meta-montblanc/recipes-utils/udev-rules/files/spi-devices.rules
+++ /dev/null
@@ -1 +0,0 @@
-SUBSYSTEM=="mtd", DEVPATH=="*/1e630000.spi/*/spi1/spi1.0/*", ATTRS{name}=="spi-flash" RUN+="/bin/mkdir -p /run/devmap/spi-devices", RUN+="/bin/ln -sf /dev/%k /run/devmap/spi-devices/spi1-flash"
diff --git a/meta-facebook/meta-montblanc/recipes-utils/wedge-eeprom/files/lib/eeprom.json b/meta-facebook/meta-montblanc/recipes-utils/wedge-eeprom/files/lib/eeprom.json
index 9bae3ab2dd7f..43f2a68c7d6a 100644
--- a/meta-facebook/meta-montblanc/recipes-utils/wedge-eeprom/files/lib/eeprom.json
+++ b/meta-facebook/meta-montblanc/recipes-utils/wedge-eeprom/files/lib/eeprom.json
@@ -1,10 +1,6 @@
 {
   "platform" : "montblanc" ,
   "eeprom devices" : [
-    {
-      "name" : "bmc_eeprom",
-      "sysfs_path" : "/sys/bus/i2c/devices/i2c-8/8-0051/eeprom"
-    },
     {
       "name" : "chassis_eeprom",
       "sysfs_path" : "/sys/bus/i2c/devices/i2c-6/6-0053/eeprom"
diff --git a/meta-facebook/meta-morgan800cc/conf/machine/morgan800cc.conf b/meta-facebook/meta-morgan800cc/conf/machine/morgan800cc.conf
index 8ff96fd91e04..fa85ae369b63 100644
--- a/meta-facebook/meta-morgan800cc/conf/machine/morgan800cc.conf
+++ b/meta-facebook/meta-morgan800cc/conf/machine/morgan800cc.conf
@@ -25,5 +25,3 @@ UBOOT_MACHINE:morgan800cc = "facebook-fblite_defconfig"
 
 KERNEL_DEVICETREE = "aspeed-bmc-facebook-morgan800cc.dtb"
 PREFERRED_VERSION_linux-aspeed = "6.1.%"
-
-MACHINE_FEATURES:remove = "emmc emmc-ext4"
diff --git a/meta-facebook/meta-morgan800cc/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-morgan800cc/conf/templates/default/bblayers.conf.sample
index ba2d72a273ff..c469471e34a4 100644
--- a/meta-facebook/meta-morgan800cc/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-morgan800cc/conf/templates/default/bblayers.conf.sample
@@ -24,7 +24,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -39,7 +38,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-morgan800cc/recipes-utils/openbmc-utils/files/board-utils.sh b/meta-facebook/meta-morgan800cc/recipes-utils/openbmc-utils/files/board-utils.sh
index f79687c6237f..65b7ce702c5f 100644
--- a/meta-facebook/meta-morgan800cc/recipes-utils/openbmc-utils/files/board-utils.sh
+++ b/meta-facebook/meta-morgan800cc/recipes-utils/openbmc-utils/files/board-utils.sh
@@ -212,6 +212,16 @@ userver_power_is_on() {
     return $?
 }
 
+wait_for_status_on() {
+    for((count=0; count < 10; count++)); do
+        if ! userver_power_is_on_helper; then
+            sleep 0.1
+        else
+            break
+        fi
+    done
+}
+
 userver_power_on() {
     acquire_lock "${FUNCNAME[0]}"
 
@@ -222,6 +232,12 @@ userver_power_on() {
 
     handle_error_and_cleanup_if_timeout "${FUNCNAME[0]}"
 
+    # Note: In MCB FPGA (< 0.4), there is a small delay (< 1s)
+    # for the status bit to update after the seq_inprog has been asserted.
+    # To avoid this corner case, we introduce a FPGA agnostic check to ensure
+    # status is on before console is returned to the user.
+    wait_for_status_on
+
     release_lock
     return 0
 }
@@ -248,16 +264,28 @@ userver_reset() {
     # Power cycle CPU and Datapath by toggling the bit
     write_i2c_pwr_ctrl_register "$I2C_CPU_DP_PWR_OFF_VALUE"
 
-    # Adding delay between off and on to avoid inconsistency of FPGA
-    # behavior in x86. The delay time is currently recommended by hardware
-    # team and will be lowered or removed once the delay is incorporated
-    # into sequence_in_progress/status bit.
-    sleep 10
+    # Note: Setting upper bound power off timeout to 10 seconds
+    # to be backward compatible to early MCB FPGA releases. Else the
+    # sequencing is expected to complete within the value configured in
+    # the by MCB FPGA.
+    for((count=0; count < 10; count++)); do
+        if is_sequencing; then
+            sleep 1
+        else
+            break
+        fi
+    done
 
     write_i2c_pwr_ctrl_register "$I2C_CPU_DP_PWR_ON_VALUE"
 
     handle_error_and_cleanup_if_timeout "${FUNCNAME[0]}"
 
+    # Note: In MCB FPGA (< 0.4), there is a small delay (< 1s)
+    # for the status bit to update after the seq_inprog has been asserted.
+    # To avoid this corner case, we introduce a FPGA agnostic check to ensure
+    # status is on before console is returned to the user.
+    wait_for_status_on
+
     release_lock
     return 0
 }
diff --git a/meta-facebook/meta-netlakemtp/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-netlakemtp/conf/templates/default/bblayers.conf.sample
index b3874f689650..cc64dce5ffbe 100644
--- a/meta-facebook/meta-netlakemtp/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-netlakemtp/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-netlakemtp/conf/templates/default/local.conf.sample b/meta-facebook/meta-netlakemtp/conf/templates/default/local.conf.sample
index 9fa799ace59a..a4e40c86c1f5 100644
--- a/meta-facebook/meta-netlakemtp/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-netlakemtp/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "netlakemtp"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-netlakemtp/recipes-core/images/netlakemtp-image.bb b/meta-facebook/meta-netlakemtp/recipes-core/images/netlakemtp-image.bb
index 027f07ea722b..114dd59f8bf8 100644
--- a/meta-facebook/meta-netlakemtp/recipes-core/images/netlakemtp-image.bb
+++ b/meta-facebook/meta-netlakemtp/recipes-core/images/netlakemtp-image.bb
@@ -42,4 +42,5 @@ IMAGE_INSTALL += " \
   mac-util \
   usbutils \
   usb-console \
+  wedge-eeprom \
   "
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Cfg.cpp b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Cfg.cpp
new file mode 100644
index 000000000000..ba6805096b92
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Cfg.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * you may not use this file except in compliance with the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "Cfg.h"
+
+using json = nlohmann::json;
+
+namespace weutil {
+WeCfg::WeCfg() {
+  std::ifstream f(CFG_FILE);
+  json jCfg = json::parse(f);
+  json jdev = jCfg["eeprom devices"];
+  //  json pltName = jCfg["platform"];
+
+  for (json::iterator it = jdev.begin(); it != jdev.end(); ++it) {
+    assert(it->find("name") != it->end());
+    assert(it->find("sysfs_path") != it->end());
+    weCfgTbl_[(*it)["name"]] = (*it)["sysfs_path"];
+  }
+}
+
+std::map<std::string, std::string> WeCfg::listEepromDevices() {
+  std::map<std::string, std::string> res = weCfgTbl_;
+  return res;
+}
+
+std::string WeCfg::eFormat(const std::string& ePath) {
+  uint8_t header[4];
+  std::ifstream file(ePath, std::ios::binary);
+  size_t eepromSysfsSz;
+
+  // check eeprom file size:
+  file.seekg(0, std::ios::end);
+  eepromSysfsSz = file.tellg();
+  if (eepromSysfsSz <= 4) {
+    throw std::runtime_error(
+        "unrecongized eeorom format, data size is too small!");
+  }
+  file.seekg(0, std::ios::beg);
+  file.read((char*)&header[0], 4);
+  file.close();
+
+  if (header[0] == 0xfb && header[1] == 0xfb && header[2] == 0x04) {
+    return META_EEPROM_V4;
+  } else if (header[0] == 0xfb && header[1] == 0xfb && header[2] == 0x05) {
+    return META_EEPROM_V5;
+  } else if (header[0] == 0xfb && header[1] == 0xfb && header[2] == 0x03) {
+    return META_EEPROM_V3;
+  } else if (
+      (header[0] == '0' && header[1] == '0' && header[2] == '0' &&
+      (header[3] == '2' || header[3] == '3')) || (header[0] == 0 &&
+      header[1] == 0 && header[2] == 0 && header[3] == 3)) {
+    assert(eepromSysfsSz > 15 * 1024);
+    return ARISTA_PREFDL;
+  }
+  return "unrecognized eeprom data format";
+}
+
+std::optional<std::string> WeCfg::eepromNameToPath(const std::string& name) {
+  auto it = weCfgTbl_.find(name);
+  if (it == weCfgTbl_.end()) {
+    return {};
+  }
+  return weCfgTbl_[name];
+}
+} // namespace weutil
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Cfg.h b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Cfg.h
new file mode 100644
index 000000000000..4396f3d58b4e
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Cfg.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * you may not use this file except in compliance with the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include <nlohmann/json.hpp>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
+#include <map>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
+#define CFG_FILE "/etc/weutil/eeprom.json"
+#define META_EEPROM_V3 "META-FBOSS EEPROM Version 3"
+#define META_EEPROM_V4 "META-FBOSS EEPROM Version 4"
+#define META_EEPROM_V5 "META-FBOSS EEPROM Version 5"
+#define ARISTA_PREFDL "Arista Rackhawk Prefdl"
+#define ARISTA_EEPROM_OFFSET 15 * 1024
+
+namespace weutil {
+
+class WeCfg {
+ public:
+  WeCfg();
+  std::map<std::string, std::string> listEepromDevices();
+  std::optional<std::string> eepromNameToPath(const std::string& name);
+  std::string eFormat(const std::string& ePath);
+
+ private:
+  // mapping:  name --> sysfs_path
+  std::map<std::string, std::string> weCfgTbl_;
+};
+
+} // namespace weutil
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/CrcLib.h b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/CrcLib.h
new file mode 100644
index 000000000000..500937c415f0
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/CrcLib.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * you may not use this file except in compliance with the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include <cstddef>
+#include <cstdint>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+
+namespace weutil {
+class CrcLib {
+ public:
+  /**
+   *	crc16_ccitt - recompute the CRC (CRC-CCITT variant) for the data
+   *	buffer
+   *	@crc: previous CRC value
+   *	@buffer: data pointer
+   *	@len: number of bytes in the buffer
+   */
+  uint16_t crc16_ccitt(uint16_t crc, uint8_t const* buffer, size_t len) const {
+    while (len--)
+      crc = crc_ccitt_byte(crc, *buffer++);
+    return crc;
+  };
+
+  /**
+   *	crc_ccitt_false - recompute the CRC (CRC-CCITT-FALSE variant)
+   *	for the data buffer
+   *	@crc: previous CRC value
+   *	@buffer: data pointer
+   *	@len: number of bytes in the buffer
+   */
+  uint16_t crc16_ccitt_false(uint16_t crc, uint8_t const* buffer, size_t len)
+      const {
+    while (len--)
+      crc = crc_ccitt_false_byte(crc, *buffer++);
+    return crc;
+  };
+
+ private:
+  uint16_t crc_ccitt_byte(uint16_t crc, const uint8_t c) const {
+    return (crc >> 8) ^ crc_ccitt_table[(crc ^ c) & 0xff];
+  };
+
+  uint16_t crc_ccitt_false_byte(uint16_t crc, const uint8_t c) const {
+    return (crc << 8) ^ crc_ccitt_false_table[(crc >> 8) ^ c];
+  };
+
+  /* It follows the ITU/CCITT and the CRC16-CCITT spec.
+   * The following piece of code is cloned from the kernel: include/linux/crc-ccitt.h
+   * This mysterious table is just the CRC of each possible byte. It can be
+   * computed using the standard bit-at-a-time methods. The polynomial can
+   * be seen in entry 128, 0x8408. This corresponds to x^0 + x^5 + x^12.
+   * Add the implicit x^16, and you have the standard CRC-CCITT.
+   */
+  uint16_t const crc_ccitt_table[256] = {
+      0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, 0x8c48,
+      0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108,
+      0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, 0x9cc9, 0x8d40, 0xbfdb,
+      0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399,
+      0x6726, 0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e,
+      0xfae7, 0xc87c, 0xd9f5, 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e,
+      0x54b5, 0x453c, 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd,
+      0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
+      0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, 0x5285,
+      0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, 0xdecd, 0xcf44,
+      0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014,
+      0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5,
+      0xa96a, 0xb8e3, 0x8a78, 0x9bf1, 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3,
+      0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862,
+      0x9af9, 0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e,
+      0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
+      0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, 0x18c1,
+      0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483,
+      0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50,
+      0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699, 0x8710,
+      0xf3af, 0xe226, 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7,
+      0x6e6e, 0x5cf5, 0x4d7c, 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1,
+      0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72,
+      0x3efb, 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
+      0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, 0xe70e,
+      0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, 0x6b46, 0x7acf,
+      0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d,
+      0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c,
+      0x3de3, 0x2c6a, 0x1ef1, 0x0f78};
+
+  /*
+   * Similar table to calculate CRC16 variant known as CRC-CCITT-FALSE
+   * Reflected bits order, does not augment final value.
+   */
+  uint16_t const crc_ccitt_false_table[256] = {
+      0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, 0x8108,
+      0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 0x1231, 0x0210,
+      0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 0x9339, 0x8318, 0xB37B,
+      0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE, 0x2462, 0x3443, 0x0420, 0x1401,
+      0x64E6, 0x74C7, 0x44A4, 0x5485, 0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE,
+      0xF5CF, 0xC5AC, 0xD58D, 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6,
+      0x5695, 0x46B4, 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D,
+      0xC7BC, 0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
+      0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B, 0x5AF5,
+      0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12, 0xDBFD, 0xCBDC,
+      0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A, 0x6CA6, 0x7C87, 0x4CE4,
+      0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41, 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD,
+      0xAD2A, 0xBD0B, 0x8D68, 0x9D49, 0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13,
+      0x2E32, 0x1E51, 0x0E70, 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A,
+      0x9F59, 0x8F78, 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E,
+      0xE16F, 0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
+      0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E, 0x02B1,
+      0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256, 0xB5EA, 0xA5CB,
+      0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D, 0x34E2, 0x24C3, 0x14A0,
+      0x0481, 0x7466, 0x6447, 0x5424, 0x4405, 0xA7DB, 0xB7FA, 0x8799, 0x97B8,
+      0xE75F, 0xF77E, 0xC71D, 0xD73C, 0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657,
+      0x7676, 0x4615, 0x5634, 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9,
+      0xB98A, 0xA9AB, 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882,
+      0x28A3, 0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
+      0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92, 0xFD2E,
+      0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9, 0x7C26, 0x6C07,
+      0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1, 0xEF1F, 0xFF3E, 0xCF5D,
+      0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8, 0x6E17, 0x7E36, 0x4E55, 0x5E74,
+      0x2E93, 0x3EB2, 0x0ED1, 0x1EF0};
+};
+
+}
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Eeprom.cpp b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Eeprom.cpp
new file mode 100644
index 000000000000..333ef4378647
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Eeprom.cpp
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2014-present Facebook. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "Eeprom.h"
+
+using namespace std;
+
+namespace weutil {
+
+Eeprom::Eeprom(const std::string& eFile, const uint16_t off)
+    : pos_(0), eepromDataSz_(0) {
+  std::ifstream file(eFile, std::ios::binary);
+  // get eeprom file size:
+  file.seekg(0, std::ios::end);
+  bufSz_ = file.tellg();
+  assert(bufSz_ - off > 0);
+  // meta-eeprom data size
+  bufSz_ = (bufSz_ - off < EEPROM_READ_SZ)? bufSz_ - off : EEPROM_READ_SZ;
+  file.seekg(off, std::ios::beg);
+
+  // read the data:
+  buf_.resize(bufSz_);
+  file.read((char*)&buf_[0], bufSz_);
+  file.close();
+};
+
+/*
+ * TODO: take care of endianness
+ * lucky, both armv7 and X86 are little-endian.
+ */
+int Eeprom::readInt32() {
+  int res = 0;
+  if (pos_ + 4 > bufSz_) {
+    throw std::runtime_error(
+        "readInt32(): over the boundary of eeprom buf size " +
+        std::to_string(pos_ + 4) + "/" + std::to_string(bufSz_));
+  }
+  res = readInt8();
+  res = readInt8() << 8 | res;
+  res = readInt8() << 16 | res;
+  res = readInt8() << 24 | res;
+  return res;
+};
+
+/*
+ * TODO: take care of endianness
+ * lucky, both armv7 and X86 are little-endian.
+ */
+int Eeprom::readInt16() {
+  int res = 0;
+  if (pos_ + 2 > bufSz_) {
+    throw std::runtime_error(
+        "readInt16(): over the boundary of eeprom buf size " +
+        std::to_string(pos_ + 2) + "/" + std::to_string(bufSz_));
+  }
+  res = readInt8();
+  res = readInt8() << 8 | res;
+  return res & 0xffff;
+};
+
+int Eeprom::readInt8() {
+  int res = 0;
+  if (pos_ + 1 > bufSz_) {
+    throw std::runtime_error(
+        "readInt8(): over the boundary of eeprom buf size " +
+        std::to_string(pos_ + 1) + "/" + std::to_string(bufSz_));
+  }
+  res = buf_[pos_++];
+  return res & 0xff;
+};
+
+std::string Eeprom::readHexMac(const int& len) {
+  std::string macStr;
+
+  if (len != 6) {
+    throw std::runtime_error(
+        "invalid MAC address length: " + std::to_string(len));
+  }
+
+  //MAC bytes are little endian
+  for (int i = 0; i < 6; i++) {
+    int a = readInt8();
+    int hv = (a & 0xf0) >> 4;
+    int lv = a & 0xf;
+    macStr = static_cast<char>((lv < 10) ? '0' + lv : 'A' + lv - 10) + macStr;
+    macStr = static_cast<char>((hv < 10) ? '0' + hv : 'A' + hv - 10) + macStr;
+    macStr = ':'+ macStr;
+  }
+  macStr.erase(0,1);
+  return macStr;
+}
+
+std::string Eeprom::readStrMac(const int& len) {
+  std::string mac;
+  mac = readStr(len);
+  return mac.substr(0, 2) + ":" + mac.substr(2, 2) + ":" + mac.substr(4, 2) +
+      ":" + mac.substr(6, 2) + ":" + mac.substr(8, 2) + ":" + mac.substr(10, 2);
+}
+
+std::string Eeprom::readStr(const int& len) {
+  int i = 0;
+  std::string res;
+
+  if (len <= 0) {
+    throw std::runtime_error(
+        "readStr() over the boundary of eeprom buf size " +
+        std::to_string(pos_ + len) + "/" + std::to_string(bufSz_));
+  }
+
+  for (i = 0; i < len && pos_ < bufSz_; i++) {
+    res = res + (char)buf_[pos_++];
+  }
+
+  if (pos_ == bufSz_ && i < len) {
+    throw std::runtime_error("run out eeprom buf size ");
+  }
+  return res;
+};
+
+std::tuple<int, int, std::string> Eeprom::nextTlv(
+    std::map<int, vFormat>& valFmt) {
+  int t, l;
+  std::string v;
+  std::stringstream stream;
+  t = readInt8();
+  l = readInt8();
+
+  if (valFmt.find(t) == valFmt.end()) {
+    throw std::runtime_error(
+        "TLV type (" + std::to_string(t) + " )'s valueFotmat is NOT defined.");
+  };
+  switch (valFmt[t]) {
+    case VT_INT8:
+      v = std::to_string(readInt8());
+      break;
+    case VT_INT16:
+      stream << readInt16();
+      v = stream.str();
+      break;
+    case VT_INT32:
+      stream << readInt32();
+      v = stream.str();
+      break;
+    case VT_STRMAC:
+      v = readStrMac(l);
+      break;
+    case VT_HEXMAC:
+      v = readHexMac(l);
+      break;
+    case VT_STR:
+      v = readStr(l);
+      break;
+  }
+  return make_tuple(t, l, v);
+};
+
+} // namespace weutil
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Eeprom.h b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Eeprom.h
new file mode 100644
index 000000000000..90b73c462444
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/Eeprom.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * you may not use this file except in compliance with the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#include "WeutilInterface.h"
+
+#define EEPROM_READ_SZ 2048
+
+namespace weutil {
+class Eeprom {
+ public:
+  explicit Eeprom(const std::string&, const uint16_t);
+  virtual ~Eeprom() = default;
+  virtual std::map<fieldId, std::pair<std::string, std::string>>
+  getEepromData() = 0;
+
+ protected:
+  enum vFormat { VT_INT8, VT_INT16, VT_INT32, VT_STRMAC, VT_HEXMAC, VT_STR };
+
+  std::tuple<int, int, std::string> nextTlv(std::map<int, vFormat>&);
+  int readInt8();
+  int readInt16();
+  int readInt32();
+  std::string readStr(const int& len);
+  std::string readHexMac(const int& len);
+  std::string readStrMac(const int& len);
+
+  template <typename T>
+  std::string int2HexStr(T i) {
+    std::stringstream stream;
+    stream << "0x" << std::setfill('0') << std::setw(sizeof(T) * 2) << std::hex
+           << i;
+    return stream.str();
+  }
+
+  std::vector<uint8_t> buf_;
+  uint16_t pos_; // the index of buf_[].
+  int bufSz_;
+  uint16_t eepromDataSz_; // valid eeprom data size, except the CRC16 field.
+};
+
+} // namespace weutil
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEeprom.cpp b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEeprom.cpp
new file mode 100644
index 000000000000..c1fb46469544
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEeprom.cpp
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2014-present Facebook. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "FbossEeprom.h"
+#include "WeutilInterface.h"
+
+namespace weutil {
+
+/**
+ *	EepromFboss::EepromFboss -derived class of eeprom.
+ *	  customized for META-FBOSS eeprom V4 format data processing.
+ *	  all fields definition and eeprom sysfs path are stored in this class
+ *    object.
+ */
+EepromFboss::EepromFboss(const std::string& eFile, const uint16_t off)
+    : Eeprom(eFile, off), ePath_(eFile) {
+  parseFixedField();
+  while (parseTlvField())
+    ;
+  if (!crc16Check(std::stoi(dict_[mappingTbl_[CRC16]]))) {
+    throw std::runtime_error("eeprom checksum error!");
+  }
+}
+
+void EepromFboss::parseFixedField() {
+  magic_ = readInt16();
+  version_ = readInt8();
+  reserved_ = readInt8();
+
+  if (magic_ != 0xfbfb) {
+    throw std::runtime_error(
+        "invalid eeprom magic number " + std::to_string(magic_));
+  }
+  if (version_ != 0x04) {
+    throw std::runtime_error(
+        "invalid eeprom version number " + std::to_string(version_) +
+        " expected Version : 4");
+  }
+  dict_[FF_ID_OFFSET + 1] = std::to_string(version_);
+}
+
+/**
+ *	eeprom::parseTlvField:
+ *	   - parse the next TLV data and return it as tuple format: <int, int,
+ *string>
+ *
+ *	return:  true if parsed the next TLV tuple succeed.
+ *	         false either read the last TLV element or run out of buf_ data.
+ *
+ *  note:  various error checking is performed and throwing an exception
+ *         if verification failed.
+ */
+bool EepromFboss::parseTlvField() {
+  std::tuple<int, int, std::string> tlv = nextTlv(valFmtTbl_);
+  auto id = std::get<0>(tlv);
+  auto len = std::get<1>(tlv);
+  auto val = std::get<2>(tlv);
+
+  auto it = tlvTbl_.find(id);
+  if (it != tlvTbl_.end()) {
+    if (it->second.second != -1 && it->second.second != len) {
+      throw std::runtime_error(
+          "<" + it->second.first +
+          "> TLV length mismatching.  read/expected: " + std::to_string(len) +
+          "/" + std::to_string(it->second.second));
+    }
+    dict_[id] = val;
+    if (id == mappingTbl_[CRC16]) {
+      eepromDataSz_ = pos_;
+      return false;
+    }
+  } else {
+    throw std::runtime_error("undefined TLV field type " + std::to_string(id));
+  }
+  return true;
+}
+
+/**
+ *	crc16Check - check the CRC16 value based on the CRC-CCITT
+ *               algorithm for the data buffer
+ *	@crcVal: the CRC16 value read from the eeprom field.
+ *
+ *	return:  true if the calaulated CRC value is the same as crcVal, false
+ *           flase otherwise.
+ */
+bool EepromFboss::crc16Check(uint16_t crcVal) {
+  uint16_t crc;
+  /* the CRC16 calculation covers all eeprom data except the CRC16 TLV field. */
+  crc = crc16_ccitt(0xffff, &buf_[0], eepromDataSz_ - 4);
+  crc = ~crc;
+  if (crcVal != crc) {
+    throw std::runtime_error(
+        "CRC16 field value: " + int2HexStr<uint16_t>(crcVal) +
+        ",  expected value: " + int2HexStr<uint16_t>(crc));
+  }
+  return crcVal == crc;
+};
+
+/**
+ *	eeprom::getEepromData -	returns all eeprom fields data
+ *	        (including fields	not present in the eeprom device).
+ *   the field data are listed in fieldId's code order to make the output
+ *consistency for all eeprom devices.
+ *
+ *	fieldId is defined in the WeutilInterface.h
+ *
+ */
+std::map<fieldId, std::pair<std::string, std::string>>
+EepromFboss::getEepromData() {
+  std::map<fieldId, std::pair<std::string, std::string>> res;
+  int iCode;
+
+  if (dict_.empty()) {
+    throw std::runtime_error("failed to read eeprom data for " + ePath_);
+  }
+
+  for (auto it = mappingTbl_.begin(); it != mappingTbl_.end(); it++) {
+    iCode = it->second;
+    if (dict_.find(iCode) != dict_.end()) {
+      if (tlvField(iCode)) {
+        if (iCode == mappingTbl_[CRC16]) {
+          std::string hexStr = int2HexStr<uint16_t>(std::stoi(dict_[iCode]));
+          res[it->first] = make_pair(tlvTbl_[iCode].first, hexStr);
+        } else {
+          res[it->first] = make_pair(tlvTbl_[iCode].first, dict_[iCode]);
+        }
+      } else {
+        res[it->first] = make_pair(ffTbl_[iCode].first, dict_[iCode]);
+      }
+    }
+  }
+  return res;
+}
+
+bool EepromFboss::tlvField(int iCode) {
+  return (((iCode & FF_ID_OFFSET) ^ FF_ID_OFFSET) == 0) ? false : true;
+}
+
+} // namespace weutil
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEeprom.h b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEeprom.h
new file mode 100644
index 000000000000..5797e02f0107
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEeprom.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * you may not use this file except in compliance with the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include <cstddef>
+#include <cstdint>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+
+#include "CrcLib.h"
+#include "Eeprom.h"
+#include "WeutilInterface.h"
+
+#define FF_ID_OFFSET 0x1000
+
+namespace weutil {
+
+class EepromFboss : public Eeprom, public CrcLib {
+ public:
+  explicit EepromFboss(const std::string& eFile, const uint16_t off = 0);
+  std::map<fieldId, std::pair<std::string, std::string>> getEepromData()
+      override;
+
+ private:
+  void parseFixedField();
+  bool parseTlvField();
+  bool tlvField(int);
+  bool crc16Check(uint16_t crcVal);
+
+  // the first 4 bytes of fixed eeprom data.
+  int magic_;
+  int version_;
+  int reserved_;
+  uint16_t crc16_;
+  std::string ePath_;
+  std::map<int, std::string> dict_;
+
+  std::map<fieldId, int> mappingTbl_{
+      {VERSION, FF_ID_OFFSET + 1},
+      {PRODUCT_NAME, 0x01},
+      {PRODUCU_PART_NUM, 0x02},
+      {SYS_ASSEM_PART_NUM, 0x03},
+      {PCBA_PART_NUM, 0x04},
+      {PCB_PART_NUM, 0x05},
+      {VENDOR_PCBA_PART_NUM, 0x06},
+      {VENDOR_PCBA_SERIAL_NUM, 0x07},
+      {PRODUCT_PRODUCTION_STATE, 0x08},
+      {PRODUCT_VER, 0x09},
+      {PRODUCT_SUB_VER, 0x0a},
+      {PRODUCT_SERIAL_NUM, 0x0b},
+      {SYSTEM_MANUFACTURER, 0x0c},
+      {SYSTEM_MANUFACT_DATA, 0x0d},
+      {PCB_MANUFACTURER, 0x0e},
+      {ASSEMBLED_AT, 0x0f},
+      {LOCAL_MAC, 0x10},
+      {EXTENDED_MAC_BASE, 0x11},
+      {EXTENDED_MAC_ADDR_SIZE, 0x12},
+      {EEPROM_LOCATRION_ON_FABRIC, 0x13},
+      {CRC16, 0xfa},
+  };
+
+  //
+  // Fixed Field Table:  all fixed  fields are defined here.
+  // key in ffTbl[] started from 0x1000 to differentiate from tvlTbl_[]'s key.
+  //
+  std::map<int, std::pair<std::string, int>> ffTbl_{
+      {FF_ID_OFFSET, std::make_pair("Magic", 2)},
+      {FF_ID_OFFSET + 1, std::make_pair("Version", 1)},
+      {FF_ID_OFFSET + 2, std::make_pair("Reserved", 1)},
+  };
+
+  // TLV Table: [tlv-id: [field-name, expected-lenth]].
+  // length == -1 means variable.
+  std::map<int, std::pair<std::string, int>> tlvTbl_{
+      {0x01, std::make_pair("Product Name", -1)},
+      {0x02, std::make_pair("Product Part Number", -1)},
+      {0x03, std::make_pair("System Assembly Part Number", 8)},
+      {0x04, std::make_pair("Meta PCBA Part Number", 12)},
+      {0x05, std::make_pair("Meta PCB Part Number", 12)},
+      {0x06, std::make_pair("ODM/JDM PCBA Part Number", -1)},
+      {0x07, std::make_pair("ODM/JDM PCBA Serial Number", -1)},
+      {0x08, std::make_pair("Product Production State", 1)},
+      {0x09, std::make_pair("Product Version", 1)},
+      {0x0a, std::make_pair("Product Sub-Version", 1)},
+      {0x0b, std::make_pair("Product Serial Number", -1)},
+      {0x0c, std::make_pair("System Manufacturer", -1)},
+      {0x0d, std::make_pair("System Manufacturing Date", 8)},
+      {0x0e, std::make_pair("PCB Manufacturer", -1)},
+      {0x0f, std::make_pair("Assembled at", -1)},
+      {0x10, std::make_pair("Local MAC", 6)},
+      {0x11, std::make_pair("Extended MAC Base", 6)},
+      {0x12, std::make_pair("Extended MAC Address Size", 2)},
+      {0x13, std::make_pair("EEPROM location on Fabric", -1)},
+      {0xfa, std::make_pair("CRC16", 2)},
+  };
+
+  //
+  // define each TLV field value's type.
+  // it is required for some value type's special treatment.
+  //
+  std::map<int, vFormat> valFmtTbl_{
+      {0x01, VT_STR},    {0x02, VT_STR},   {0x03, VT_STR}, {0x04, VT_STR},
+      {0x05, VT_STR},    {0x06, VT_STR},   {0x07, VT_STR}, {0x08, VT_INT8},
+      {0x09, VT_INT8},   {0x0a, VT_INT8},  {0x0b, VT_STR}, {0x0c, VT_STR},
+      {0x0d, VT_STR},    {0x0e, VT_STR},   {0x0f, VT_STR}, {0x10, VT_HEXMAC},
+      {0x11, VT_HEXMAC}, {0x12, VT_INT16}, {0x13, VT_STR}, {0xfa, VT_INT16}};
+};
+} // namespace weutil
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEepromParser.cpp b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEepromParser.cpp
new file mode 100644
index 000000000000..f45b3aa482a0
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEepromParser.cpp
@@ -0,0 +1,544 @@
+// (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
+#include <cctype>
+#include <filesystem>
+#include <fstream>
+#include <ios>
+#include <iostream>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "FbossEepromParser.h"
+
+namespace {
+
+auto constexpr kMaxEepromSize = 2048;
+const std::optional<int> VARIABLE = std::nullopt;
+
+enum entryType {
+  FIELD_INVALID,
+  FIELD_LE_UINT,
+  FIELD_BE_UINT,
+  FIELD_LE_HEX,
+  FIELD_BE_HEX,
+  FIELD_STRING,
+  FIELD_LEGACY_MAC,
+  FIELD_V4_MAC,
+  FIELD_V5_MAC,
+  FIELD_DATE
+};
+
+typedef struct {
+  int typeCode;
+  std::string fieldName;
+  entryType fieldType;
+  std::optional<int> length;
+  std::optional<int> offset;
+} EepromFieldEntry;
+
+std::vector<EepromFieldEntry> kFieldDictionaryV3 = {
+    {0, "Version", FIELD_LE_UINT, 1, 2}, // TypeCode 0 is reserved
+    {1, "Product Name", FIELD_STRING, 20, 3},
+    {2, "Product Part Number", FIELD_STRING, 8, 23},
+    {3, "System Assembly Part Number", FIELD_STRING, 12, 31},
+    {4, "Meta PCBA Part Number", FIELD_STRING, 12, 43},
+    {5, "Meta PCB Part Number", FIELD_STRING, 12, 55},
+    {6, "ODM/JDM PCBA Part Number", FIELD_STRING, 13, 67},
+    {7, "ODM/JDM PCBA Serial Number", FIELD_STRING, 13, 80},
+    {8, "Product Production State", FIELD_LE_UINT, 1, 93},
+    {9, "Product Version", FIELD_LE_UINT, 1, 94},
+    {10, "Product Sub-Version", FIELD_LE_UINT, 1, 95},
+    {11, "Product Serial Number", FIELD_STRING, 13, 96},
+    {12, "Product Asset Tag", FIELD_STRING, 12, 109},
+    {13, "System Manufacturer", FIELD_STRING, 8, 121},
+    {14, "System Manufacturing Date", FIELD_DATE, 4, 129},
+    {15, "PCB Manufacturer", FIELD_STRING, 8, 133},
+    {16, "Assembled at", FIELD_STRING, 8, 141},
+    {17, "Local MAC", FIELD_LEGACY_MAC, 12, 149},
+    {17, "Extended MAC Base", FIELD_LEGACY_MAC, 12, 161},
+    {18, "Extended MAC Address Size", FIELD_LE_UINT, 2, 173},
+    {19, "Location on Fabric", FIELD_STRING, 20, 175},
+    {250, "CRC8", FIELD_LE_HEX, 1, 195}};
+
+std::vector<EepromFieldEntry> kFieldDictionaryV4 = {
+    {0, "NA", FIELD_LE_UINT, -1, -1}, // TypeCode 0 is reserved
+    {1, "Product Name", FIELD_STRING, VARIABLE, VARIABLE},
+    {2, "Product Part Number", FIELD_STRING, VARIABLE, VARIABLE},
+    {3, "System Assembly Part Number", FIELD_STRING, 8, VARIABLE},
+    {4, "Meta PCBA Part Number", FIELD_STRING, 12, VARIABLE},
+    {5, "Meta PCB Part Number", FIELD_STRING, 12, VARIABLE},
+    {6, "ODM/JDM PCBA Part Number", FIELD_STRING, VARIABLE, VARIABLE},
+    {7, "ODM/JDM PCBA Serial Number", FIELD_STRING, VARIABLE, VARIABLE},
+    {8, "Product Production State", FIELD_LE_UINT, 1, VARIABLE},
+    {9, "Product Version", FIELD_LE_UINT, 1, VARIABLE},
+    {10, "Product Sub-Version", FIELD_LE_UINT, 1, VARIABLE},
+    {11, "Product Serial Number", FIELD_STRING, VARIABLE, VARIABLE},
+    {12, "System Manufacturer", FIELD_STRING, VARIABLE, VARIABLE},
+    {13, "System Manufacturing Date", FIELD_STRING, 8, VARIABLE},
+    {14, "PCB Manufacturer", FIELD_STRING, VARIABLE, VARIABLE},
+    {15, "Assembled at", FIELD_STRING, VARIABLE, VARIABLE},
+    {16, "Local MAC", FIELD_V4_MAC, 6, VARIABLE},
+    {17, "Extended MAC Base", FIELD_V4_MAC, 6, VARIABLE},
+    {18, "Extended MAC Address Size", FIELD_LE_UINT, 2, VARIABLE},
+    {19, "EEPROM location on Fabric", FIELD_STRING, VARIABLE, VARIABLE},
+    {250, "CRC16", FIELD_LE_HEX, 2, VARIABLE},
+};
+
+std::vector<EepromFieldEntry> kFieldDictionaryV5 = {
+    {0, "NA", FIELD_LE_UINT, -1, -1}, // TypeCode 0 is reserved
+    {1, "Product Name", FIELD_STRING, VARIABLE, VARIABLE},
+    {2, "Product Part Number", FIELD_STRING, VARIABLE, VARIABLE},
+    {3, "System Assembly Part Number", FIELD_STRING, 8, VARIABLE},
+    {4, "Meta PCBA Part Number", FIELD_STRING, 12, VARIABLE},
+    {5, "Meta PCB Part Number", FIELD_STRING, 12, VARIABLE},
+    {6, "ODM/JDM PCBA Part Number", FIELD_STRING, VARIABLE, VARIABLE},
+    {7, "ODM/JDM PCBA Serial Number", FIELD_STRING, VARIABLE, VARIABLE},
+    {8, "Product Production State", FIELD_BE_UINT, 1, VARIABLE},
+    {9, "Product Version", FIELD_BE_UINT, 1, VARIABLE},
+    {10, "Product Sub-Version", FIELD_BE_UINT, 1, VARIABLE},
+    {11, "Product Serial Number", FIELD_STRING, VARIABLE, VARIABLE},
+    {12, "System Manufacturer", FIELD_STRING, VARIABLE, VARIABLE},
+    {13, "System Manufacturing Date", FIELD_STRING, 8, VARIABLE},
+    {14, "PCB Manufacturer", FIELD_STRING, VARIABLE, VARIABLE},
+    {15, "Assembled at", FIELD_STRING, VARIABLE, VARIABLE},
+    {16, "EEPROM location on Fabric", FIELD_STRING, VARIABLE, VARIABLE},
+    {17, "X86 CPU MAC", FIELD_V5_MAC, 8, VARIABLE},
+    {18, "BMC MAC", FIELD_V5_MAC, 8, VARIABLE},
+    {19, "Switch ASIC MAC", FIELD_V5_MAC, 8, VARIABLE},
+    {20, "META Reserved MAC", FIELD_V5_MAC, 8, VARIABLE},
+    {250, "CRC16", FIELD_BE_HEX, 2, VARIABLE},
+};
+
+std::vector<EepromFieldEntry> getEepromFieldDict(int version) {
+  switch (version) {
+    case 3:
+      return kFieldDictionaryV3;
+      break;
+    case 4:
+      return kFieldDictionaryV4;
+      break;
+    case 5:
+      return kFieldDictionaryV5;
+    default:
+      throw std::runtime_error(
+          "Invalid EEPROM version : " + std::to_string(version));
+      break;
+  };
+  // The control should not come here, but adding this default
+  // return value to avoid compiler warning.
+  return kFieldDictionaryV5;
+};
+
+std::string parseMacHelper(int len, unsigned char* ptr, bool useBigEndian) {
+  std::string retVal = "";
+  // We convert char array to string only upto len or null pointer
+  int juice = 0;
+  while (juice < len) {
+    unsigned int val = useBigEndian ? ptr[juice] : ptr[len - juice - 1];
+    std::ostringstream ss;
+    ss << std::hex << val;
+    std::string strElement = ss.str();
+    // Pad 0 if the hex value is only 1 digit. Also,
+    // add ':' between 2 hex digits except for the last element
+    strElement =
+        (val < 16 ? "0" : "") + strElement + (juice != len - 1 ? ":" : "");
+    retVal += strElement;
+    juice = juice + 1;
+  }
+  return retVal;
+}
+
+} // namespace
+
+namespace facebook::fboss::platform {
+
+std::vector<std::pair<std::string, std::string>>
+FbossEepromParser::getContents() {
+  unsigned char buffer[kMaxEepromSize + 1] = {};
+
+  int readCount = loadEeprom(eepromPath_, buffer, offset_, kMaxEepromSize);
+
+  std::unordered_map<int, std::string> parsedValue;
+  int eepromVer = buffer[2];
+  switch (eepromVer) {
+    case 3:
+      parsedValue = parseEepromBlobLinear(buffer);
+      break;
+    case 4:
+    case 5:
+      parsedValue = parseEepromBlobTLV(
+          eepromVer, buffer, std::min(readCount, kMaxEepromSize));
+      break;
+    default:
+      throw std::runtime_error(
+          "EEPROM version is not supported. Only ver 4+ is supported.");
+      break;
+  }
+
+  return prepareEepromFieldMap(parsedValue, eepromVer);
+}
+
+/*
+ * Helper function, given the eeprom path, read it and store the blob
+ * to the char array output
+ */
+int FbossEepromParser::loadEeprom(
+    const std::string& eeprom,
+    unsigned char* output,
+    int offset,
+    int max) {
+  // Declare buffer, and fill it up with 0s
+  int fileSize = 0;
+  int bytesToRead = max;
+  std::ifstream file(eeprom, std::ios::binary);
+  int readCount = 0;
+  // First, detect EEPROM size, upto 2048B only
+  try {
+    file.seekg(0, std::ios::end);
+    fileSize = file.tellg();
+    // bytesToRead cannot be bigger than the remaining bytes of the file from
+    // the offset. That is, we cannot read beyond the end of the file.
+    // If the remaining bytes are smaller than max, then we only read up to
+    // the end of the file.
+    int remainingBytes = fileSize - offset;
+    if (bytesToRead > remainingBytes) {
+      bytesToRead = remainingBytes;
+    }
+  } catch (std::exception& ex) {
+    std::cout << "Failed to detect EEPROM size (" << eeprom
+              << "): " << ex.what() << std::endl;
+    throw std::runtime_error("Unabled to detect EEPROM size.");
+  }
+  if (fileSize < 0) {
+    std::cout << "EEPROM (" << eeprom << ") does not exist, or is empty!"
+              << std::endl;
+    throw std::runtime_error("Unable to read EEPROM.");
+  }
+  // Now, read the eeprom
+  try {
+    file.seekg(offset, std::ios::beg);
+    file.read((char*)&output[0], bytesToRead);
+    readCount = (int)file.gcount();
+    file.close();
+  } catch (std::exception& ex) {
+    std::cout << "Failed to read EEPROM contents " << ex.what() << std::endl;
+    readCount = 0;
+  }
+  return readCount;
+}
+
+/*
+ * Helper function of getInfo, for V3 eeprom
+ * V3 eeprom has fixed length / offset fields, so is parsed
+ * differently from V4, which is basically TLV structured.
+ */
+std::unordered_map<int, std::string> FbossEepromParser::parseEepromBlobLinear(
+    const unsigned char* buffer) {
+  std::unordered_map<int, std::string> parsedValue;
+  for (auto dictItem : kFieldDictionaryV3) {
+    std::string key = dictItem.fieldName;
+    std::string value;
+    int itemCode = dictItem.typeCode;
+    int itemOffset = dictItem.offset.value();
+    int itemLength = dictItem.length.value();
+    unsigned char* itemDataPtr = (unsigned char*)&buffer[itemOffset];
+    entryType itemType = dictItem.fieldType;
+    switch (itemType) {
+      case FIELD_LE_UINT:
+        value = parseLeUint(itemLength, itemDataPtr);
+        break;
+      case FIELD_LE_HEX:
+        value = parseLeHex(itemLength, itemDataPtr);
+        break;
+      case FIELD_STRING:
+        value = parseString(itemLength, itemDataPtr);
+        break;
+      case FIELD_LEGACY_MAC:
+        value = parseLegacyMac(itemLength, itemDataPtr);
+        break;
+      case FIELD_DATE:
+        value = parseDate(itemLength, itemDataPtr);
+        break;
+      default:
+        // Create the issue (story) of this item (juice) as juicetory
+        std::string juicetory = "Unknown field type " +
+            std::to_string(itemType) + " at position " +
+            std::to_string(itemOffset);
+        std::cout << juicetory << std::endl;
+        throw std::runtime_error(juicetory);
+        break;
+    }
+    parsedValue[itemCode] = value;
+  }
+  return parsedValue;
+}
+
+// Helper function of getInfo, for V4 eeprom and newer
+std::unordered_map<int, std::string> FbossEepromParser::parseEepromBlobTLV(
+    int eepromVer,
+    const unsigned char* buffer,
+    const int readCount) {
+  int juice = 0; // A variable to count the number of items
+                 // parsed so far
+  int cursor = 4; // According to the Meta EEPROM v4 spec and later,
+                  // the actual data starts from 4th byte of eeprom.
+  std::unordered_map<int, std::string> parsedValue;
+  std::string value;
+
+  std::vector<EepromFieldEntry> fieldDictionary = getEepromFieldDict(eepromVer);
+
+  while (cursor < readCount) {
+    // Increment the item counter (mainly for debugging purposes)
+    // Very important to do this.
+    juice = juice + 1;
+    // First, get the itemCode of the TLV (T)
+    int itemCode = (int)buffer[cursor];
+    entryType itemType = FIELD_INVALID;
+    int itemLen = (int)buffer[cursor + 1];
+    std::string key;
+
+    // Vendors pad EEPROM with 0xff. Therefore, if item code is
+    // 0xff, then we reached to the end of the actual content.
+    if (itemCode == 0xFF) {
+      break;
+    }
+    // Look up our table to find the itemType and field name of this itemCode
+    for (size_t i = 0; i < fieldDictionary.size(); i++) {
+      if (fieldDictionary[i].typeCode == itemCode) {
+        itemType = fieldDictionary[i].fieldType;
+        key = fieldDictionary[i].fieldName;
+      }
+    }
+    // If no entry found, throw an exception
+    if (itemType == FIELD_INVALID) {
+      std::cout << " Unknown field code " << itemCode << " at position "
+                << cursor << " item number " << juice << std::endl;
+      throw std::runtime_error(
+          "Invalid field code in EEPROM at :" + std::to_string(cursor));
+    }
+
+    // Find Length and Variable (L and V)
+    int itemLength = buffer[cursor + 1];
+    unsigned char* itemDataPtr = (unsigned char*)&buffer[cursor + 2];
+    // Parse the value according to the itemType
+    switch (itemType) {
+      case FIELD_LE_UINT:
+        value = parseLeUint(itemLength, itemDataPtr);
+        break;
+      case FIELD_BE_UINT:
+        value = parseBeUint(itemLength, itemDataPtr);
+        break;
+      case FIELD_LE_HEX:
+        value = parseLeHex(itemLength, itemDataPtr);
+        break;
+      case FIELD_BE_HEX:
+        value = parseBeHex(itemLength, itemDataPtr);
+        break;
+      case FIELD_STRING:
+        value = parseString(itemLength, itemDataPtr);
+        break;
+      case FIELD_V4_MAC:
+        value = parseV4Mac(itemLength, itemDataPtr);
+        break;
+      case FIELD_V5_MAC:
+        value = parseV5Mac(itemLength, itemDataPtr);
+        break;
+      default:
+        std::cout << " Unknown field type " << itemType << " at position "
+                  << cursor << " item number " << juice << std::endl;
+        throw std::runtime_error("Invalid field type in EEPROM.");
+        break;
+    }
+    // Add the key-value pair to the result
+    parsedValue[itemCode] = value;
+    // Increment the cursor
+    cursor += itemLen + 2;
+    // the CRC16 is the last content, parsing must stop.
+    if (key == "CRC16") {
+      break;
+    }
+  }
+  return parsedValue;
+}
+
+// Another helper function of getInfo
+// This method will translate <field_id, value> pair into
+// <field_name, value> pair, so as to be used in other
+// methods to print the human readable information
+std::vector<std::pair<std::string, std::string>>
+FbossEepromParser::prepareEepromFieldMap(
+    std::unordered_map<int, std::string> parsedValue,
+    int eepromVer) {
+  std::vector<std::pair<std::string, std::string>> result;
+  std::vector<EepromFieldEntry> fieldDictionary;
+  fieldDictionary = getEepromFieldDict(eepromVer);
+
+  for (auto dictItem : fieldDictionary) {
+    std::string key = dictItem.fieldName;
+    std::string value;
+    auto match = parsedValue.find(dictItem.typeCode);
+    // "NA" is reservered, and not for display
+    if (key == "NA") {
+      continue;
+    }
+    if (dictItem.fieldType == FIELD_V5_MAC) {
+      // MAC V5 field is composite field. One field expands to two items,
+      // which are "Base" and "Address Size"
+      if (match != parsedValue.end()) {
+        std::string key1 = key + " Base";
+        std::string key2 = key + " Address Size";
+        value = parsedValue.find(dictItem.typeCode)->second;
+        // Now unpack this into value1 and value2, delimited by ","
+        std::string value1, value2;
+        size_t pos = value.find(",");
+        if (pos != std::string::npos) {
+          value1 = value.substr(0, pos);
+          value2 = value.substr(pos + 1);
+        } else {
+          // Something is wrong. There should be a delimiter.
+          throw std::runtime_error("MAC V5 parsing Error. No delimiter found.");
+        }
+        // From V5 EEPROM Spec, MAC V5 fileds are optional; some MAC field
+        // may show up in some eeprom, and some not. Therefore, we add the
+        // items only when the key is present.
+        result.push_back({key1, value1});
+        result.push_back({key2, value2});
+      }
+    } else {
+      // Regular Field (one item ==> one entry)
+      if (match != parsedValue.end()) {
+        value = parsedValue.find(dictItem.typeCode)->second;
+      } else {
+        value = "";
+      }
+      result.push_back({key, value});
+    }
+  }
+  return result;
+}
+
+// Parse Little Endian Uint field
+std::string FbossEepromParser::parseLeUint(int len, unsigned char* ptr) {
+  // For now, we only support up to 4 Bytes of data
+  if (len > 4) {
+    throw std::runtime_error("Unsigned int can be up to 4 bytes only.");
+  }
+  unsigned int readVal = 0;
+  // Values in the EEPROM is big endian
+  // Thus cursor starts from the end and goes backwards
+  int cursor = len - 1;
+  for (int i = 0; i < len; i++) {
+    readVal <<= 8;
+    readVal |= (unsigned int)ptr[cursor];
+    cursor -= 1;
+  }
+  return std::to_string(readVal);
+}
+
+// Parse Big Endian Uint field
+std::string FbossEepromParser::parseBeUint(int len, unsigned char* ptr) {
+  // For now, we only support up to 4 Bytes of data
+  if (len > 4) {
+    throw std::runtime_error("Unsigned int can be up to 4 bytes only.");
+  }
+  unsigned int readVal = 0;
+  // Values in the EEPROM is big endian
+  // Thus cursor starts from the end and goes backwards
+  for (int i = 0; i < len; i++) {
+    readVal <<= 8;
+    readVal |= (unsigned int)ptr[i];
+  }
+  return std::to_string(readVal);
+}
+
+std::string FbossEepromParser::parseLeHex(int len, unsigned char* ptr) {
+  std::string retVal = "";
+  // Values in the EEPROM is Little endian
+  // Thus cursor starts from the end and goes backwards
+  int cursor = len - 1;
+  for (int i = 0; i < len; i++) {
+    int val = ptr[cursor];
+    std::string converter = "0123456789abcdef";
+    retVal = retVal + converter[(int)(val / 16)] + converter[val % 16];
+    cursor -= 1;
+  }
+  return "0x" + retVal;
+}
+
+std::string FbossEepromParser::parseBeHex(int len, unsigned char* ptr) {
+  std::string retVal = "";
+  // Values in the EEPROM is big endian
+  for (int i = 0; i < len; i++) {
+    int val = ptr[i];
+    std::string converter = "0123456789abcdef";
+    retVal = retVal + converter[(int)(val / 16)] + converter[val % 16];
+  }
+  return "0x" + retVal;
+}
+
+// Parse String field
+std::string FbossEepromParser::parseString(int len, unsigned char* ptr) {
+  std::string retVal = "";
+  // We convert char array to string only upto len or null pointer
+  int juice = 0;
+  while ((juice < len) && (ptr[juice] != 0)) {
+    retVal += (ptr[juice]);
+    juice = juice + 1;
+  }
+  return retVal;
+}
+
+// For EEPROM V4, Parse MAC with the format XX:XX:XX:XX:XX:XX
+std::string FbossEepromParser::parseV4Mac(int len, unsigned char* ptr) {
+  // In V4 EEPROM, all fields are little endian, even the MAC address
+  // therefore we parse it in the LE way (not the network byte order)
+  return parseMacHelper(len, ptr, false);
+}
+
+// For EEPROM V5, Parse MAC with the format XX:XX:XX:XX:XX:XX, along with two
+// bytes MAC size
+std::string FbossEepromParser::parseV5Mac(int len, unsigned char* ptr) {
+  std::string retVal = "";
+  // Pack two string with "," in between. This will be unpacked in the
+  // dump functions.
+  retVal =
+      parseMacHelper(len - 2, ptr, true) + "," + parseBeUint(2, &ptr[len - 2]);
+  return retVal;
+}
+
+// For EEPROM V3, MAC is represented as XXXXXXXXXXXX. Therefore,
+// parse the MAC into the human readable format as XX:XX:XX:XX:XX:XX
+std::string FbossEepromParser::parseLegacyMac(int len, unsigned char* ptr) {
+  std::string retVal = "";
+  if (len != 12) {
+    throw std::runtime_error("Legacy(v3) MAC field must be 12 Bytes Long!");
+  }
+  for (int i = 0; i < 12; i++) {
+    retVal += (ptr[i]);
+    if (((i % 2) == 1) && (i != 11)) {
+      retVal += ":";
+    }
+  }
+  return retVal;
+}
+
+std::string FbossEepromParser::parseDate(int len, unsigned char* ptr) {
+  std::string retVal = "";
+  // We convert char array to string only upto len or null pointer
+  if (len != 4) {
+    throw std::runtime_error("Date field must be 4 Bytes Long!");
+  }
+  unsigned int year = (unsigned int)ptr[1] + (unsigned int)ptr[0];
+  unsigned int month = (unsigned int)ptr[2];
+  unsigned int day = (unsigned int)ptr[3];
+  std::string yearString = std::to_string(year % 100);
+  std::string monthString = std::to_string(month);
+  std::string dayString = std::to_string(day);
+  yearString = (yearString.length() == 1 ? "0" : "") + yearString;
+  monthString = (monthString.length() == 1 ? "0" : "") + monthString;
+  dayString = (dayString.length() == 1 ? "0" : "") + dayString;
+  return monthString + "-" + dayString + "-" + yearString;
+}
+
+} // namespace facebook::fboss::platform
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEepromParser.h b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEepromParser.h
new file mode 100644
index 000000000000..6c17c71f0529
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/FbossEepromParser.h
@@ -0,0 +1,54 @@
+// (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
+
+#pragma once
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace facebook::fboss::platform {
+
+class FbossEepromParser {
+ public:
+  explicit FbossEepromParser(
+      const std::string& eepromPath,
+      const uint16_t offset)
+      : eepromPath_(eepromPath), offset_(offset) {}
+
+  std::vector<std::pair<std::string, std::string>> getContents();
+
+ private:
+  int loadEeprom(
+      const std::string& eeprom,
+      unsigned char* output,
+      int offset,
+      int max);
+  std::unordered_map<int, std::string> parseEepromBlobLinear(
+      const unsigned char* buffer);
+  std::unordered_map<int, std::string> parseEepromBlobTLV(
+      int eepromVer,
+      const unsigned char* buffer,
+      const int readCount);
+
+  // This method is a helper function to translate <field_id, value> pair
+  // into <field_name, field_value> pair, so that the user of this
+  // methon can parse the data into human readable screen output or
+  // JSON
+  std::vector<std::pair<std::string, std::string>> prepareEepromFieldMap(
+      std::unordered_map<int, std::string> parsedValue,
+      int eepromVer);
+  std::string parseLeUint(int len, unsigned char* ptr);
+  std::string parseBeUint(int len, unsigned char* ptr);
+  std::string parseLeHex(int len, unsigned char* ptr);
+  std::string parseBeHex(int len, unsigned char* ptr);
+  std::string parseString(int len, unsigned char* ptr);
+  std::string parseV4Mac(int len, unsigned char* ptr);
+  std::string parseV5Mac(int len, unsigned char* ptr);
+  std::string parseLegacyMac(int len, unsigned char* ptr);
+  std::string parseDate(int len, unsigned char* ptr);
+
+  std::string eepromPath_;
+  uint16_t offset_;
+};
+
+} // namespace facebook::fboss::platform
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/WeLibApi.cpp b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/WeLibApi.cpp
new file mode 100644
index 000000000000..c9700286c6ba
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/WeLibApi.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * you may not use this file except in compliance with the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdint.h>
+#include <syslog.h>
+#include <cstring>
+#include <iostream>
+#include <limits>
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "Cfg.h"
+#include "Eeprom.h"
+#include "FbossEeprom.h"
+#include "WeutilInterface.h"
+#include "FbossEepromParser.h"
+
+using namespace weutil;
+using namespace facebook::fboss::platform;
+
+static std::unique_ptr<WeCfg> cfg = std::make_unique<WeCfg>();
+
+std::vector<std::pair<std::string, std::string>> eepromParseNew(
+    const std::string& eepromDeviceName) {
+  uint16_t off = 0;
+  std::string ePath = cfg->eepromNameToPath(eepromDeviceName).value_or("");
+  std::string eepromFmt = cfg->eFormat(ePath);
+  off = (ARISTA_PREFDL == eepromFmt) ? ARISTA_EEPROM_OFFSET : 0;
+  return FbossEepromParser(ePath, off).getContents();
+}
+
+std::map<fieldId, std::pair<std::string, std::string>> eepromParse(
+    const std::string& eepromDeviceName) {
+  uint16_t off = 0;
+  std::map<fieldId, std::pair<std::string, std::string>> res;
+  std::string ePath = cfg->eepromNameToPath(eepromDeviceName).value_or("");
+  std::string eepromFmt = cfg->eFormat(ePath);
+
+  if (META_EEPROM_V4 == eepromFmt || ARISTA_PREFDL == eepromFmt) {
+    // they all use the meta-eeprom-v4 format, but has different offset value.
+    off = (ARISTA_PREFDL == eepromFmt) ? ARISTA_EEPROM_OFFSET : 0;
+    std::unique_ptr<EepromFboss> ep;
+    ep = std::make_unique<EepromFboss>(ePath, off);
+    res = ep->getEepromData();
+  } else {
+    throw std::runtime_error("unsupported eeprom format ");
+  }
+  return res;
+}
+
+std::map<std::string, std::string> listEepromDevices() {
+  return cfg->listEepromDevices();
+}
+
+/*
+ *  return epprom sysfs path.
+ */
+std::optional<std::string> eepromNameToPath(const std::string& devName) {
+  return cfg->eepromNameToPath(devName);
+}
+
+std::string eepromFormat(std::string& eName) {
+  std::string ePath = cfg->eepromNameToPath(eName).value_or("");
+  if (ePath != "")
+    return cfg->eFormat(ePath);
+  else
+    return "invalid eeprom device name";
+}
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/WeutilInterface.h b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/WeutilInterface.h
new file mode 100644
index 000000000000..2a44932eb7c4
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/WeutilInterface.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * you may not use this file except in compliance with the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+#include <stdint.h>
+#include <map>
+#include <string>
+#include <vector>
+#include <optional>
+
+#define DEFAULT_EEPROM_NAME "netlake-eeprom"
+#define MIN_TYPE 0
+#define MAX_TYPE 20
+#define SYS_LEN 8
+#define MAC_LEN 8
+#define SYS_MANUFACTURING_DATE_LEN 8
+#define PCB_PCBA_PART_LEN 12
+#define PRODUCT_VER_STATE_LEN 1
+#define MAC_ADR_LEN 5
+#define MAC_ADR_BASE_LEN 1
+#define HEADER_LEN 3
+#define CRC_VALUE_H 1
+#define CRC_VALUE_L 2
+#define CRC_TYPE_ADR 0xFA
+#define CRC_LEN_ADR 0x02
+#define NULL_TYPE 0xFF
+#define HEADER 0xFB
+#define FORMAT_VERSION 0x05
+#define CRC_INIT 0xFFFF
+#define CHECK_HIGHEST_BIT 0x8000
+#define TRUNCATED_POLYNOMIA 0x1021
+
+//
+//  META-FBOSS EEPROM V4 fields.
+//
+enum fieldId {
+  VERSION = 0,
+  PRODUCT_NAME,
+  PRODUCU_PART_NUM,
+  SYS_ASSEM_PART_NUM,
+  PCBA_PART_NUM,
+  PCB_PART_NUM,
+  VENDOR_PCBA_PART_NUM,
+  VENDOR_PCBA_SERIAL_NUM,
+  PRODUCT_PRODUCTION_STATE,
+  PRODUCT_VER,
+  PRODUCT_SUB_VER,
+  PRODUCT_SERIAL_NUM,
+  SYSTEM_MANUFACTURER,
+  SYSTEM_MANUFACT_DATA,
+  PCB_MANUFACTURER,
+  ASSEMBLED_AT,
+  LOCAL_MAC,
+  EXTENDED_MAC_BASE,
+  EXTENDED_MAC_ADDR_SIZE,
+  EEPROM_LOCATRION_ON_FABRIC,
+  CRC16
+};
+
+//
+//  META FBOSS EEPROM v5 Format TypeID.
+//
+enum typeId_v5 {
+  ID_PRODUCT_NAME = 1,         //1,Product Name
+  ID_PRODUCT_PART_NUM,         //2,Product Part Number
+  ID_SYS_ASSEM_PART_NUM,       //3,System Assembly Part Number
+  ID_PCBA_PART_NUM,            //4,Meta PCBA Part Number
+  ID_PCB_PART_NUM,             //5,Meta PCB Part Number
+  ID_ODM_JDM_PCBA_PART_NUM,    //6,ODM/JDM PCBA Part Number
+  ID_ODM_JDM_PCBA_SERIAL_NUM,  //7,ODM/JDM PCBA Serial Number
+  ID_PRODUCT_PRODUCTION_STATE, //8,Product Production State
+  ID_PRODUCT_VER,              //9,Product Version
+  ID_PRODUCT_SUB_VER,          //10,Product Sub-Version
+  ID_PRODUCT_SERIAL_NUM,       //11,Product Serial Number
+  ID_SYS_MANUFACTURER,         //12,System Manufacturer
+  ID_SYS_MANUFACTURING_DATE,   //13,System Manufacturing Date
+  ID_PCB_MANUFACTURER,         //14,PCB Manufacturer
+  ID_ASSEMBLED_AT,             //15,Assembled at
+  ID_EEPROM_LOC_FABRIC,        //16,EEPROM location on Fabric
+  ID_X86_CPU_MAC,              //17,X86 CPU MAC Base + X86 CPU MAC Address Size
+  ID_BMC_MAC,                  //18,BMC MAC Base + BMC MAC Address Size
+  ID_SWITCH_ASIC_MAC,          //19,Switch ASIC MAC Base + Switch ASIC MAC Base
+  ID_RSVD_MAC                  //20,META Reserved MAC Base + META Reserved MAC Address Size
+};
+
+std::map<std::string, std::string> listEepromDevices();
+std::optional<std::string> eepromNameToPath(const std::string& devName);
+std::map<fieldId, std::pair<std::string, std::string>> eepromParse(
+    const std::string& eepromDeviceName);
+std::vector<std::pair<std::string, std::string>> eepromParseNew(
+    const std::string& eepromDeviceName);
+std::string eepromFormat(std::string& eName);
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/eeprom.json b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/eeprom.json
new file mode 100644
index 000000000000..11f4b8d9471e
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/eeprom.json
@@ -0,0 +1,9 @@
+{
+  "platform" : "netlakemtp" ,
+  "eeprom devices" : [
+    {
+      "name" : "netlake-eeprom",
+      "sysfs_path" : "/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a280.i2c-bus/i2c-4/4-0056/eeprom"
+    }
+  ]
+}
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/meson.build b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/meson.build
new file mode 100644
index 000000000000..765c4d2e4a19
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/lib/meson.build
@@ -0,0 +1,50 @@
+# Copyright 2023-present Meta Platform. All Rights Reserved.
+project('libwedge-eeprom', 'cpp',
+    version: '0.1',
+    license: 'GPL2',
+    # Meson 0.40 only supports c++1z as an alias for c++17.
+    default_options: [
+        'cpp_std=c++1z',
+        'warning_level=3',
+        'werror=true',
+    ],
+    meson_version: '>=0.40',
+)
+
+install_headers(
+     'WeutilInterface.h',
+    subdir: 'facebook')
+
+deps = [
+  dependency('liblog'),
+  dependency('libobmc-i2c'),
+  ]
+
+# source files for libwedge-eeprom.
+libsrcs = files(
+    'WeLibApi.cpp',
+    'CrcLib.h',
+    'Eeprom.h',
+    'Eeprom.cpp',
+    'Cfg.h',
+    'Cfg.cpp',
+    'WeutilInterface.h',
+    'FbossEeprom.h',
+    'FbossEeprom.cpp',
+    'FbossEepromParser.h',
+    'FbossEepromParser.cpp',
+    )
+
+# weutil library
+weutil_lib = shared_library('wedge-eeprom', libsrcs,
+    dependencies: deps,
+    version: meson.project_version(),
+    install: true)
+
+# pkgconfig for weutil library.
+pkg = import('pkgconfig')
+pkg.generate(libraries: [weutil_lib],
+    name: meson.project_name(),
+    version: meson.project_version(),
+    description: 'wedge eeprom utility library')
+
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/utils/Weutil.cpp b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/utils/Weutil.cpp
new file mode 100644
index 000000000000..03ff0cf7048f
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/utils/Weutil.cpp
@@ -0,0 +1,599 @@
+/*
+ * Copyright 2023-present Meta Platform. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include <getopt.h>
+#include <nlohmann/json.hpp>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
+#include <vector>
+#include <sstream>
+
+#include "../lib/WeutilInterface.h"
+
+#define USE_NEW_EEPROM_LIB true
+
+using ojson = nlohmann::ordered_json;
+
+static void usage() {
+  std::cout
+      << "weutil [-h | --help] [-a | --all] [-j | --json] [-f | --format] [-l | --list] [-e <dev-name> | --eeprom <dev-name>]\n";
+  std::cout
+      << "       [-w <file> | --write <file>] [-m <Type> <Value> | --modify <Type> <Value>] [-d <file> | --dump <file>]\n";
+  std::cout << "   -h | --help : show usage. \n";
+  std::cout << "   -a | --all : print all eeprom devices data. \n";
+  std::cout << "   -j | --json : print eeprom data in JSON format. \n";
+  std::cout << "   -e | --eeprom : eeprom device name. \n";
+  std::cout << "   -f | --format : eeprom format. \n";
+  std::cout << "   -l | --list : list all eeprom device names. \n";
+  std::cout << "   -w | --write : write file data to eeprom. \n";
+  std::cout << "   -m | --modify : modify type value to eeprom,rules are at the bottom. \n";
+  std::cout << "        [Type]  |                     [Name]                   |    [Length]\n";
+  std::cout << "       -------------------------------------------------------------------------\n";
+  std::cout << "          1     |  Product Name                                |   Variable\n";
+  std::cout << "          2     |  Product Part Number                         |   Variable\n";
+  std::cout << "          3     |  System Assembly Part Number                 |      8\n";
+  std::cout << "          4     |  Meta PCBA Part Number                       |      12\n";
+  std::cout << "          5     |  Meta PCB Part Number                        |      12\n";
+  std::cout << "          6     |  ODM/JDM PCBA Part Number                    |   Variable\n";
+  std::cout << "          7     |  ODM/JDM PCBA Serial Number                  |   Variable\n";
+  std::cout << "          8     |  Product Production State                    |      1\n";
+  std::cout << "          9     |  Product Version                             |      1\n";
+  std::cout << "          10    |  Product Sub-Version                         |      1\n";
+  std::cout << "          11    |  Product Serial Number                       |   Variable\n";
+  std::cout << "          12    |  System Manufacturer                         |   Variable\n";
+  std::cout << "          13    |  System Manufacturing Date                   |      8\n";
+  std::cout << "          14    |  PCB Manufacturer                            |   Variable\n";
+  std::cout << "          15    |  Assembled at                                |   Variable\n";
+  std::cout << "          16    |  EEPROM location on Fabric                   |   Variable\n";
+  std::cout << "          17    |  X86 CPU (MAC Base + MAC Address Size)       |      8\n";
+  std::cout << "          18    |  BMC (MAC Base + BMC MAC Address Size)       |      8\n";
+  std::cout << "          19    |  Switch ASIC (MAC Base + MAC Address Size)   |      8\n";
+  std::cout << "          20    |  META Reserved (MAC Base + MAC Address Size) |      8\n";
+  std::cout << "       -------------------------------------------------------------------------\n";
+  std::cout << "          Notice: Type 17~20 need to add - before enter MAC Address Size. \n";
+  std::cout << "          ex. weutil -m 17 11:22:33:44:55:66-258\n";
+  std::cout << "   -d | --dump : dump eeprom as a file.\n";
+  std::cout << "        ex. weutil -d aaa.bin or weutil -d /home/aaa.bin\n";
+}
+
+static void printEepromData(const std::string& eDeviceName, bool jFlag) {
+  if (USE_NEW_EEPROM_LIB) {
+      std::vector<std::pair<std::string, std::string>> parsedData = eepromParseNew(eDeviceName);
+      if (jFlag) {
+        ojson j;
+        for (auto item : parsedData) {
+          j[item.first] = item.second;
+        }
+        std::cout << std::setw(4) << j << '\n';
+      } else {
+        for (auto item : parsedData) {
+          std::cout << item.first << ": " << item.second << '\n';
+        }
+      }
+  } else {
+      std::map<fieldId, std::pair<std::string, std::string>> devTbl =
+          eepromParse(eDeviceName);
+      if (jFlag) {
+        ojson j;
+        for (auto& item : devTbl) {
+          j[item.second.first] = item.second.second;
+        }
+        std::cout << std::setw(4) << j << '\n';
+      } else {
+        for (auto& item : devTbl) {
+          std::cout << item.second.first << ": " << item.second.second << '\n';
+        }
+      }
+  }
+  return;
+}
+
+std::vector<uint8_t> readFileContents(const std::string& filePath, std::streamsize& fileSize) {
+  std::ifstream inputFile(filePath, std::ios::binary | std::ios::ate);
+  fileSize = 0; // Initialize file size to 0
+
+  if (inputFile) {
+    fileSize = inputFile.tellg();
+    if (fileSize > 0) {
+      std::vector<uint8_t> data(fileSize);
+      inputFile.seekg(0, std::ios::beg);
+      inputFile.read(reinterpret_cast<char*>(data.data()), fileSize);
+      inputFile.close();
+      return data; // Return the read data
+    } else {
+      std::cerr << "ERROR: File is empty or unable to read file size: " << filePath << std::endl;
+      return {};
+    }
+  } else {
+    std::cerr << "ERROR: Unable to open file for reading: " << filePath << std::endl;
+    return {};
+  }
+}
+
+static int writeFileContents(const std::string& filePath, const std::vector<uint8_t>& data) {
+  std::ofstream outputFile(filePath, std::ios::binary | std::ios::out);
+  if (outputFile) {
+    outputFile.write(reinterpret_cast<const char*>(data.data()), data.size());
+    outputFile.close();
+    return 1;
+  } else {
+    std::cerr << "ERROR: Unable to open file for writing: " << filePath << std::endl;
+    return 0;
+  }
+}
+
+static void writeEepromData(const std::string& eDeviceName, const std::string& eDevicePath, const std::string& fileName) {
+    std::streamsize fileSize;
+    std::vector<uint8_t> data = readFileContents(fileName, fileSize);
+
+    if (!data.empty()) {
+      int result = writeFileContents(eDevicePath, data);
+        if (result) {
+          std::cout << "Write " << fileName << " to " << eDeviceName << " success !" << std::endl;
+          return;
+        } else {
+          std::cerr << "ERROR: Failed to write " << fileName << " to " << eDeviceName << std::endl;
+          return;
+        }
+    } else {
+      std::cerr << "ERROR: Can't write data to " << eDeviceName << std::endl;
+      return;
+    }
+}
+
+static void dumpEepromData(const std::string& eepromDevicePath, const std::string& dumpFileName){
+  std::streamsize eepromSize;
+  std::vector<uint8_t> eepromData = readFileContents(eepromDevicePath, eepromSize);
+  // read eeprom file
+  if (eepromData.empty()) {
+    std::cerr << "ERROR: Unable to read data from: " << eepromDevicePath << std::endl;
+    return;
+  }
+
+  // write dump file using writeFileContents function
+  int result = writeFileContents(dumpFileName, eepromData);
+  if (result) {
+    std::cout << "EEPROM data dumped successfully to " << dumpFileName << std::endl;
+  } else {
+    std::cerr << "ERROR: Failed to write data to file: " << dumpFileName << std::endl;
+  }
+}
+
+static void modifyEepromData(const std::string& eDeviceName,
+                             const std::string& eDevicePath,
+                             const std::string& modifyType,
+                             std::string& modifyValue) {
+  int modifyTypeID = std::stoi(modifyType);
+  int modifyValueLength = 0;
+  std::vector<uint8_t> modifyValueHex;
+  std::vector<uint8_t> modifyValueMac;
+
+  // check modify type/length/value
+  switch (modifyTypeID) {
+    case typeId_v5::ID_SYS_ASSEM_PART_NUM: // System Assembly Part Number
+      if (modifyValue.length() > SYS_LEN) {
+        std::cout << "ERROR: Type " << modifyTypeID << " input value is out of range !" << '\n';
+        return;
+      } else {
+        if (modifyValue.length() < SYS_LEN) {
+          modifyValue.append(SYS_LEN - modifyValue.length(), ' ');
+        }
+        modifyValueLength = SYS_LEN;
+      }
+      break;
+    case typeId_v5::ID_SYS_MANUFACTURING_DATE: // System Manufacturing Date
+      if (modifyValue.length() > SYS_MANUFACTURING_DATE_LEN) {
+        std::cout << "ERROR: Type " << modifyTypeID << " input value is out of range !" << '\n';
+        return;
+      } else {
+        if (modifyValue.length() < SYS_MANUFACTURING_DATE_LEN) {
+          modifyValue.append(SYS_MANUFACTURING_DATE_LEN - modifyValue.length(), ' ');
+        }
+        modifyValueLength = SYS_MANUFACTURING_DATE_LEN;
+      }
+      break;
+    case typeId_v5::ID_PCBA_PART_NUM: // Meta PCBA Part Number
+    case typeId_v5::ID_PCB_PART_NUM:  // Meta PCB Part Number
+      if (modifyValue.length() > PCB_PCBA_PART_LEN) {
+        std::cout << "ERROR: Type " << modifyTypeID << " input value is out of range !" << '\n';
+        return;
+      } else {
+        if (modifyValue.length() < PCB_PCBA_PART_LEN) {
+          modifyValue.append(PCB_PCBA_PART_LEN - modifyValue.length(), ' ');
+        }
+        modifyValueLength = PCB_PCBA_PART_LEN;
+      }
+      break;
+    case typeId_v5::ID_PRODUCT_PRODUCTION_STATE: // Product Production State
+    case typeId_v5::ID_PRODUCT_VER:              // Product Version
+    case typeId_v5::ID_PRODUCT_SUB_VER:{         // Product Sub Version
+        int modifyValueInt = std::stoi(modifyValue);
+        if (modifyValueInt < 0 || modifyValueInt > 255) {
+          std::cout << "ERROR: Type " << modifyTypeID << " is out of range !" << '\n';
+          return;
+        } else {
+          modifyValueHex.push_back(static_cast<uint8_t>(modifyValueInt));
+          modifyValueLength = PRODUCT_VER_STATE_LEN;
+        }
+      }
+      break;
+    case typeId_v5::ID_X86_CPU_MAC:     // X86 CPU MAC Addresses
+    case typeId_v5::ID_BMC_MAC:         // BMC MAC Addresses
+    case typeId_v5::ID_SWITCH_ASIC_MAC: // Switch ASIC MAC Addresses
+    case typeId_v5::ID_RSVD_MAC:{       // Meta Reserved MAC Addresses
+        // check MAC value format
+        int colonCount = 0; // detect ":"
+        int dashCount = 0;  // detect "-"
+        for (char c : modifyValue) {
+          if (c == ':') {
+            ++colonCount;
+          }
+          if (c == '-') {
+          ++dashCount;
+          }
+        }
+
+        if ((colonCount != MAC_ADR_LEN) || (dashCount != MAC_ADR_BASE_LEN)) {
+          std::cout << "ERROR: Type " << modifyTypeID << " input value format incorrect !" << '\n';
+          return;
+        } else {// set MAC value format
+          std::istringstream modifyValueStream(modifyValue);
+          std::string modifyValueSegment;
+          while (std::getline(modifyValueStream, modifyValueSegment, ':')) { // set MAC Addresses value
+            size_t dashPos = modifyValueSegment.find('-');
+            if (dashPos != std::string::npos) {
+              modifyValueSegment = modifyValueSegment.substr(0, dashPos);
+            }
+            modifyValueMac.push_back(static_cast<uint8_t>(std::stoi(modifyValueSegment, nullptr, 16)));
+            if (dashPos != std::string::npos) {
+              break;
+            }
+          }
+
+          size_t dashPos = modifyValue.find('-');
+          if (dashPos != std::string::npos) { // set MAC Addresses from the Base value
+            std::string macBaseStr = modifyValue.substr(dashPos + 1);
+            int macBase = std::stoi(macBaseStr);
+            modifyValueMac.push_back(static_cast<uint8_t>((macBase >> 8) & 0xFF)); // HighByte
+            modifyValueMac.push_back(static_cast<uint8_t>(macBase & 0xFF));        // LowByte
+          }
+        }
+        modifyValueLength = MAC_LEN;
+      }
+        break;
+    default:
+      modifyValueLength = modifyValue.length();
+      break;
+  }
+
+  // read eeprom data value
+  std::streamsize fileSize;
+  std::vector<uint8_t> data = readFileContents(eDevicePath, fileSize);
+  if (data.empty()) {
+    std::cerr << "ERROR: Unable to read data from: " << eDeviceName << std::endl;
+    return;
+  }
+
+  //check eeprom Header
+  if (data[0] == HEADER && data[1] == HEADER && data[2] == FORMAT_VERSION) {
+    std::cout << eDeviceName << " is follow Meta FBOSS EEPROM Format v5!" << std::endl;
+  } else {
+    std::cerr << "ERROR: EEPROM type not follow Meta FBOSS EEPROM Format v5! : " << eDeviceName << std::endl;
+    return;
+  }
+
+  // set the new eeprom data need to follow TLV format
+  int eepromType = 4;             // eeprom type address, the fist one is at 4
+  int eepromLength = 5;           // eeprom length address, the first one is at 5
+  int next_eepromType_adr = 1;    // next type address,   1 means one byte
+  int next_eepromLength_adr = 1;  // next length address, 1 means one byte
+  int eepromLength_adr_size = 1;  // length address size, 1 means one byte
+
+  std::vector<uint8_t> new_eeprom_data;
+  // Check Type is between 1~20
+  if (static_cast<int>(data[eepromType]) >= MIN_TYPE && static_cast<int>(data[eepromType]) <= MAX_TYPE) {
+
+    while(1){ //find which type value need to modify
+
+      if ((static_cast<int>(data[eepromType])) == (std::stoi(modifyType))) {
+
+        // add data value to new_eeprom_data before add modify value
+        new_eeprom_data.insert(new_eeprom_data.end(), data.begin(), data.begin() + eepromType + 1);
+
+        // insert modify length to new_eeprom_data
+        new_eeprom_data.push_back(static_cast<uint8_t>(modifyValueLength));
+
+        switch (modifyTypeID) {
+          case typeId_v5::ID_PRODUCT_PRODUCTION_STATE:
+          case typeId_v5::ID_PRODUCT_VER:
+          case typeId_v5::ID_PRODUCT_SUB_VER:
+            new_eeprom_data.insert(new_eeprom_data.end(), modifyValueHex.begin(), modifyValueHex.end());
+            break;
+          case typeId_v5::ID_X86_CPU_MAC:
+          case typeId_v5::ID_BMC_MAC:
+          case typeId_v5::ID_SWITCH_ASIC_MAC:
+          case typeId_v5::ID_RSVD_MAC:
+            new_eeprom_data.insert(new_eeprom_data.end(), modifyValueMac.begin(), modifyValueMac.end());
+            break;
+          default:
+            for (char c : modifyValue) {
+              new_eeprom_data.push_back(static_cast<uint8_t>(c));
+            }
+            break;
+        }
+
+        // add data value to new_eeprom_data after add modify value
+        if (data.size() > (eepromType + eepromLength_adr_size + (static_cast<int>(data[eepromLength])) + 1)) {
+          new_eeprom_data.insert(new_eeprom_data.end(), data.begin() + eepromType + eepromLength_adr_size + (static_cast<int>(data[eepromLength])) + 1, data.end());
+        } else {
+          std::cerr << "ERROR: modify EEPROM Processing error !" <<std::endl;
+          return;
+        }
+        break;
+
+      } else if (data[eepromType] == NULL_TYPE) { //0xff maens get NULL need to break
+        std::cerr << "ERROR: modify EEPROM Processing error get error Type value !" <<std::endl;
+        return;
+      } else {
+        // next_Type_Addr = now_Type_Addr +  Length_Addr + (data)Value_Length_Addr -> +1
+        eepromType = eepromType + eepromLength_adr_size + (static_cast<int>(data[eepromLength])) + next_eepromType_adr;
+
+        // next_Length_Addr = now_Length_Addr + (data)Value_Length_Addr + nextType -> +1
+        eepromLength = eepromLength + eepromLength_adr_size + (static_cast<int>(data[eepromLength])) + next_eepromLength_adr;
+      }
+    }
+
+    // calculate new_eeprom_data Header ~ CRC type & length
+    size_t CRCendIndex = 0;
+    for (int i = new_eeprom_data.size() - 1; i > HEADER_LEN; --i) {
+      if ((new_eeprom_data[i-1] == CRC_TYPE_ADR)&&(new_eeprom_data[i] == CRC_LEN_ADR)) {
+        CRCendIndex = i;
+        break;
+      }
+    }
+
+    if (CRCendIndex) {
+      std::vector<uint8_t> modifyCRCdata(new_eeprom_data.begin(), new_eeprom_data.begin() + CRCendIndex + 1); // get calculate CRC data
+      // calculate CRC16(CCITT-FALSE) Checksum and set to new eeprom data
+      uint16_t newCRC = CRC_INIT;
+      for (auto byte : modifyCRCdata) { // XOR current CRC with byte shifted left
+        newCRC ^= static_cast<uint16_t>(byte) << 8;
+        for (int i = 0; i < 8; ++i) {
+          if (newCRC & CHECK_HIGHEST_BIT) { // Check if the leftmost (highest) bit of newCRC is set 1
+            newCRC = (newCRC << 1) ^ TRUNCATED_POLYNOMIA; //If the highest bit is 1, left shift newCRC by one and then XOR with the truncated polynomial
+          } else {
+            newCRC = newCRC << 1; // If the highest bit is 0, simply left shift newCRC by one
+          }
+        }
+      }
+      new_eeprom_data[CRCendIndex + CRC_VALUE_H] = newCRC >> 8;   // CRC HighByte
+      new_eeprom_data[CRCendIndex + CRC_VALUE_L] = newCRC & 0xFF; // CRC LowByte
+      std::cout << "Calculate new CRC-CCITT value success !" << std::endl;
+    } else {
+      std::cerr << "ERROR: CRC processing error !" <<std::endl;
+      return;
+    }
+
+  } else {
+    std::cerr << "ERROR: Read "<< eDeviceName << " Type fail!" << std::endl;
+  }
+
+  // write new_eeprom_data to eeprom
+  if (!new_eeprom_data.empty()) {
+    int result = writeFileContents(eDevicePath, new_eeprom_data);
+    if (result) {
+        std::cout << "Modify value written to " << eDeviceName << " success!" << std::endl;
+    } else {
+        std::cerr << "ERROR: Failed to write modified data to " << eDeviceName << std::endl;
+    }
+  } else {
+    std::cerr << "ERROR: Modify EEPROM data is empty!" << std::endl;
+  }
+  return;
+}
+
+int main(int argc, char* argv[]) {
+  int jsonFlag = 0;
+  int listFlag = 0;
+  int formatFlag = 0;
+  int helpFlag = 0;
+  int doPrint = 0;
+  int opt_index = 0;
+  int allFlag = 0;
+  int writeFlag = 0;
+  int modifyFlag = 0;
+  int dumpFlag = 0;
+  int c;
+  int modifyTypeInt = 0; //modify value change int
+  std::string eepromDeviceName{DEFAULT_EEPROM_NAME};
+  std::string writeFileName;
+  std::string eepromDevicePath;
+  std::string modifyType;
+  std::string modifyValue;
+  std::string dumpFileName;
+
+  static struct option long_options[] = {
+      {"list", no_argument, NULL, 'l'},
+      {"format", no_argument, NULL, 'f'},
+      {"help", no_argument, NULL, 'h'},
+      {"all", no_argument, NULL, 'a'},
+      {"json", no_argument, NULL, 'j'},
+      {"eeprom", required_argument, NULL, 'e'},
+      {"write", required_argument, NULL, 'w'},
+      {"modify", required_argument, NULL, 'm'},
+      {"dump", required_argument, NULL, 'd'},
+      {0, 0, 0, 0}};
+
+  doPrint = (argc == 1) ? 1 : 0;
+  while ((c = getopt_long(argc, argv, "ahjlf:e:w:m:d:", long_options, &opt_index)) !=
+         -1) {
+    switch (c) {
+      case 'e':
+        eepromDeviceName = optarg;
+        doPrint = 1;
+        break;
+      case 'h':
+        helpFlag = 1;
+        break;
+      case 'f':
+        formatFlag = 1;
+        break;
+      case 'a':
+        allFlag = 1;
+        doPrint = 1;
+        break;
+      case 'l':
+        listFlag = 1;
+        break;
+      case 'j':
+        jsonFlag = 1;
+        doPrint = 1;
+        break;
+      case 'w':
+        writeFileName = optarg;
+        writeFlag = 1;
+        break;
+      case 'm': {
+        if (optind < argc && argv[optind] != NULL && argv[optind][0] != '-') {
+          try {
+            modifyTypeInt = std::stoi(optarg);
+          } catch (const std::invalid_argument& e) {
+            std::cerr << "ERROR: Type is Invalid argument: " << optarg << std::endl;
+            exit(1);
+          } catch (const std::out_of_range& e) {
+            std::cerr << "ERROR: Type is Argument out of range: " << optarg << std::endl;
+            exit(1);
+          }
+          modifyType = optarg;
+          modifyValue = argv[optind];
+          optind++;
+          modifyFlag = 1;
+        } else {
+          std::cerr << "ERROR: -m option requires two arguments.\n";
+          exit(1);
+        }
+        break;
+      }
+      case 'd': {
+        dumpFileName = optarg;
+        dumpFlag = 1;
+        break;
+      }
+      case ':': // missing option argument.
+        std::cout << argv[0] << "option -" << optopt
+                  << " requires an argument\n";
+        break;
+      case '?':
+      default: // invalid option
+        std::cout << argv[0] << "option -" << optopt
+                  << " is invalid: ignored\n";
+        exit(1);
+    }
+  }
+
+  if (helpFlag) {
+    usage();
+    exit(0);
+  }
+
+  if (formatFlag) {
+    std::cout << eepromFormat(eepromDeviceName) << '\n';
+    exit(0);
+  }
+
+  if (listFlag) {
+    std::map<std::string, std::string> res = listEepromDevices();
+    for (auto& item : res) {
+      std::cout << item.first << "    " << item.second << "\n";
+    }
+    exit(0);
+  }
+
+  if (allFlag) {
+    std::map<std::string, std::string> res = listEepromDevices();
+    for (auto listEnt : res) {
+      std::cout << "EEPROM: " + listEnt.first << std::endl;
+      printEepromData(listEnt.first, jsonFlag);
+      std::cout << std::endl;
+    }
+    exit(0);
+  }
+
+  if (doPrint) {
+    if (eepromNameToPath(eepromDeviceName).value_or("") == "") {
+      std::cout << "ERROR: invalid eeprom device name: " + eepromDeviceName
+                << '\n';
+      exit(1);
+    }
+    printEepromData(eepromDeviceName, jsonFlag);
+  }
+
+  if (writeFlag) {
+      if (!writeFileName.empty()) {
+        std::map<std::string, std::string> res = listEepromDevices();
+        for (auto& eeprom : res) {
+          if (eeprom.first == eepromDeviceName) {
+            eepromDevicePath = eeprom.second;
+            break;
+          }
+        }
+        writeEepromData(eepromDeviceName, eepromDevicePath, writeFileName);
+      } else {
+        std::cout << "ERROR: File is NULL !: " + writeFileName
+                  << '\n';
+        exit(1);
+      }
+    exit(0);
+  }
+
+  if(modifyFlag) {
+    if ((modifyTypeInt >= MIN_TYPE) && (modifyTypeInt <= MAX_TYPE)) {
+      //load eeprom device name and path
+      std::map<std::string, std::string> res = listEepromDevices();
+      for (auto& eeprom : res) {
+        if (eeprom.first == eepromDeviceName) {
+          eepromDevicePath = eeprom.second;
+          break;
+        }
+      }
+      modifyEepromData(eepromDeviceName, eepromDevicePath, modifyType, modifyValue);
+    } else {
+      std::cout << "ERROR: Type is not between 1~20 ! " << '\n';
+      exit(1);
+    }
+    exit(0);
+  }
+
+  if (dumpFlag) {
+    if (!dumpFileName.empty()) {
+      std::map<std::string, std::string> res = listEepromDevices();
+      for (auto& eeprom : res) {
+        if (eeprom.first == eepromDeviceName) {
+          eepromDevicePath = eeprom.second;
+          break;
+        }
+      }
+      dumpEepromData(eepromDevicePath, dumpFileName);
+    } else {
+      std::cerr << "ERROR: Missing file name for the dump operation.\n";
+      exit(1);
+    }
+    exit(0);
+  }
+
+}
\ No newline at end of file
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/utils/meson.build b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/utils/meson.build
new file mode 100644
index 000000000000..2a7c5f3f4cc8
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/files/utils/meson.build
@@ -0,0 +1,24 @@
+# Copyright 2023-present Meta Platform. All Rights Reserved.
+project('weutil', 'cpp',
+    version: '0.1',
+    license: 'GPL2',
+    # Meson 0.40 only supports c++1z as an alias for c++17.
+    default_options: [
+        'cpp_std=c++1z',
+        'warning_level=3',
+        'werror=true',
+    ],
+    meson_version: '>=0.40',
+)
+
+cc = meson.get_compiler('cpp')
+
+dep_libs = [
+    cc.find_library('wedge-eeprom'),
+    ]
+
+# weutil executable.
+weutil_exe = executable('weutil', 'Weutil.cpp',
+    dependencies: dep_libs,
+    install: true)
+
diff --git a/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/libwedge-eeprom_0.2.bb b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/libwedge-eeprom_0.2.bb
new file mode 100644
index 000000000000..d8a22c8f56bf
--- /dev/null
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/libwedge-eeprom_0.2.bb
@@ -0,0 +1,54 @@
+# Copyright 2023-present Mate Platform. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+
+SUMMARY = "Wedge EEPROM Utilities"
+DESCRIPTION = "Util for BMC-lite wedge eeprom"
+SECTION = "base"
+PR = "r0"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://WeLibApi.cpp;beginline=1;endline=12;md5=6363afb5f510280e03b900c00cadbb10"
+
+inherit meson pkgconfig
+inherit python3native
+inherit python3-dir
+
+CFLAGS += "-Wall -Werror"
+
+SRC_URI = "file://lib \
+          "
+LDFLAGS += "-llog -lobmc-i2c"
+DEPENDS += "nlohmann-json python3-setuptools liblog libobmc-i2c"
+RDEPENDS:${PN} = "python3-core bash liblog libobmc-i2c"
+
+S = "${WORKDIR}/lib"
+
+do_install() {
+	  install -d ${D}${libdir}
+    install -m 0644 libwedge-eeprom.so ${D}${libdir}/libwedge-eeprom.so
+    install -m 0644 libwedge-eeprom.so.0 ${D}${libdir}/libwedge-eeprom.so.0
+
+    install -d ${D}${includedir}/facebook
+    install -m 0644 ${S}/WeutilInterface.h ${D}${includedir}/facebook/WeutilInterface.h
+
+    install -d ${D}/${sysconfdir}/weutil
+    install -m 0644 ${S}/eeprom.json ${D}/${sysconfdir}/weutil/eeprom.json
+}
+
+FILES:${PN} = "${sysconfdir}/weutil/eeprom.json"
+FILES:${PN} += "${libdir}/libwedge-eeprom.so ${libdir}/libwedge-eeprom.so.0"
+FILES:${PN}-dev = "${includedir}/facebook/WeutilInterface.h "
+
diff --git a/tests2/tests/janga/test_emmc.py b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/wedge-eeprom_0.2.bb
similarity index 50%
rename from tests2/tests/janga/test_emmc.py
rename to meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/wedge-eeprom_0.2.bb
index c821afbbfc4a..69d639700a79 100644
--- a/tests2/tests/janga/test_emmc.py
+++ b/meta-facebook/meta-netlakemtp/recipes-utils/wedge-eeprom/wedge-eeprom_0.2.bb
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-#
-# Copyright 2022-present Facebook. All Rights Reserved.
+# Copyright 2023-present Mate Platform. All Rights Reserved.
 #
 # This program file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -16,17 +14,32 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301 USA
-#
-import unittest
 
-from common.base_emmc_test import BaseEmmcTest
-from utils.test_utils import qemu_check
+SUMMARY = "Wedge EEPROM Utilities"
+DESCRIPTION = "Util for BMC-lite wedge eeprom"
+SECTION = "base"
+PR = "r0"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://Weutil.cpp;beginline=1;endline=12;md5=2c1289c9e6131aff18d3dcec3698c7c0"
+
+inherit meson pkgconfig
+inherit python3native
+inherit python3-dir
+
+CFLAGS += "-Wall -Werror"
+
+SRC_URI = "file://utils  \
+           file://lib/WeutilInterface.h "
+
+
+S = "${WORKDIR}/utils"
 
+do_install() {
+	  install -d ${D}${bindir}
+    install -m 0755 weutil ${D}${bindir}/weutil
+}
 
-class JangaEmmcTest(BaseEmmcTest, unittest.TestCase):
-    def set_emmc_mount_point(self):
-        self.emmc_mountpoint = "/mnt/data1"
+DEPENDS += "libwedge-eeprom"
+RDEPENDS:${PN} = "libwedge-eeprom"
+FILES:${PN} = "${bindir}"
 
-    @unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
-    def test_emmc(self):
-        super().test_emmc()
diff --git a/meta-facebook/meta-qemux86/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-qemux86/conf/templates/default/bblayers.conf.sample
index f0927ec3a290..3d87172633cb 100644
--- a/meta-facebook/meta-qemux86/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-qemux86/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -18,7 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-qemux86/recipes-noperl/openssl/openssl_%.bbappend b/meta-facebook/meta-qemux86/recipes-noperl/openssl/openssl_%.bbappend
index 5d9819fad520..58ba5781da78 100644
--- a/meta-facebook/meta-qemux86/recipes-noperl/openssl/openssl_%.bbappend
+++ b/meta-facebook/meta-qemux86/recipes-noperl/openssl/openssl_%.bbappend
@@ -1 +1 @@
-RDEPENDS:${PN}-ptest:remove = "perl"
+RDEPENDS:${PN}-ptest:remove = "perl perl-modules"
diff --git a/meta-facebook/meta-sandia/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-sandia/conf/templates/default/bblayers.conf.sample
index 2f300d25bdc7..373c95accd1d 100755
--- a/meta-facebook/meta-sandia/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-sandia/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -22,7 +21,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-sandia/conf/templates/default/local.conf.sample b/meta-facebook/meta-sandia/conf/templates/default/local.conf.sample
index 25b8ef80327b..4fb77180a29d 100644
--- a/meta-facebook/meta-sandia/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-sandia/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "sandia"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb-2"
+DISTRO ?= "openbmc-fb-kirkstone"
diff --git a/meta-facebook/meta-tahan/conf/machine/tahan.conf b/meta-facebook/meta-tahan/conf/machine/tahan.conf
index d0a8ae52e921..2e76acd34ddd 100644
--- a/meta-facebook/meta-tahan/conf/machine/tahan.conf
+++ b/meta-facebook/meta-tahan/conf/machine/tahan.conf
@@ -23,7 +23,7 @@ require conf/machine/fboss-lite.inc
 
 UBOOT_MACHINE:tahan = "facebook-fblite_defconfig"
 
-KERNEL_DEVICETREE = "aspeed/aspeed-bmc-facebook-tahan.dtb"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-facebook-fblite-r1.dtb"
 PREFERRED_VERSION_linux-aspeed = "6.6.%"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-cpld"
diff --git a/meta-facebook/meta-tahan/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-tahan/conf/templates/default/bblayers.conf.sample
index 116889b7ad8e..aa81dd930691 100644
--- a/meta-facebook/meta-tahan/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-tahan/conf/templates/default/bblayers.conf.sample
@@ -24,7 +24,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -39,7 +38,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-tahan/recipes-kernel/kmods/files/scmcpld.c b/meta-facebook/meta-tahan/recipes-kernel/kmods/files/scmcpld.c
index a35bf8feef7c..cfae695d4897 100644
--- a/meta-facebook/meta-tahan/recipes-kernel/kmods/files/scmcpld.c
+++ b/meta-facebook/meta-tahan/recipes-kernel/kmods/files/scmcpld.c
@@ -55,6 +55,17 @@ static const i2c_dev_attr_st scmcpld_attrs[] = {
 		0,
 		8,
 	},
+	{
+		"pwr_come_en",
+		"use to power on the COMe (default: 0)\n"
+		" 0: power off COMe\n"
+		" 1: power on COMe",
+		I2C_DEV_ATTR_SHOW_DEFAULT,
+		I2C_DEV_ATTR_STORE_DEFAULT,
+		0x14,
+		0,
+		1,
+	},
 	{
 		"pwr_force_off",
 		"use to make COMe power off when set to 0\n"
diff --git a/meta-facebook/meta-tahan/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-tahan-BMC.patch b/meta-facebook/meta-tahan/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-tahan-BMC.patch
deleted file mode 100644
index 3b7ba73e8ea8..000000000000
--- a/meta-facebook/meta-tahan/recipes-kernel/linux/patches_6.6/1001-ARM-dts-aspeed-Add-Facebook-tahan-BMC.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 8e96c3f5fe87a74a01aa2e14ebe431d73122b7ae Mon Sep 17 00:00:00 2001
-From: Tao Ren <taoren@meta.com>
-Date: Sun, 17 Dec 2023 18:09:19 +0000
-Subject: [PATCH] ARM: dts: aspeed: Add Facebook tahan BMC
-
----
- arch/arm/boot/dts/aspeed/Makefile             |  1 +
- .../dts/aspeed/aspeed-bmc-facebook-tahan.dts  | 96 +++++++++++++++++++
- 2 files changed, 97 insertions(+)
- create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tahan.dts
-
-diff --git a/arch/arm/boot/dts/aspeed/Makefile b/arch/arm/boot/dts/aspeed/Makefile
-index fb9cc95f1b60..13ed1dc5a3b0 100644
---- a/arch/arm/boot/dts/aspeed/Makefile
-+++ b/arch/arm/boot/dts/aspeed/Makefile
-@@ -24,6 +24,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
- 	aspeed-bmc-facebook-greatlakes.dtb \
- 	aspeed-bmc-facebook-minerva-cmc.dtb \
- 	aspeed-bmc-facebook-minipack.dtb \
-+	aspeed-bmc-facebook-tahan.dtb \
- 	aspeed-bmc-facebook-tiogapass.dtb \
- 	aspeed-bmc-facebook-wedge40.dtb \
- 	aspeed-bmc-facebook-wedge100.dtb \
-diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tahan.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tahan.dts
-new file mode 100644
-index 000000000000..1e6c9a5a4398
---- /dev/null
-+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tahan.dts
-@@ -0,0 +1,96 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// Copyright (c) Meta Platforms, Inc. and affiliates.
-+
-+/dts-v1/;
-+
-+#include "ast2600-facebook-netbmc-common.dtsi"
-+
-+/ {
-+	model = "Facebook tahan BMC";
-+	compatible = "facebook,tahan-bmc", "aspeed,ast2600";
-+
-+	chosen {
-+		stdout-path = &uart1;
-+	};
-+
-+	spi_gpio: spi {
-+		num-chipselects = <1>;
-+		cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&peci0 {
-+	status = "okay";
-+
-+	peci-client@30 {
-+		compatible = "intel,peci-client";
-+		reg = <0x30>;
-+	};
-+};
-+
-+&mdio1 {
-+	status = "okay";
-+};
-+
-+&mac3 {
-+	status = "okay";
-+	phy-mode = "rgmii";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_rgmii4_default>;
-+	fixed-link {
-+		speed = <1000>;
-+		full-duplex;
-+	};
-+};
-+
-+&lpc_ctrl {
-+	status = "okay";
-+	flash = <&spi1>;
-+};
-+
-+&kcs1 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca0>;
-+};
-+
-+&kcs2 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca8>;
-+};
-+
-+&kcs3 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca2>;
-+};
-+
-+/* JTAG1 will be used for COMe FPGA upgrade. */
-+&jtag1 {
-+	status = "okay";
-+};
-+
-+/* SPI1 will be used for BIOS and IOB/FPGA flash upgrades. */
-+&spi1 {
-+	status = "okay";
-+
-+	reg = < 0x1e630000 0xc4
-+			0x30000000 0x2000000 >;
-+
-+	flash@0 {
-+		status = "okay";
-+		m25p,fast-read;
-+		label = "spi1.0";
-+		spi-rx-bus-width = <1>;
-+		spi-max-frequency = <5000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+
-+			flash1@0 {
-+				reg = <0x0 0x2000000>;
-+				label = "spi-flash";
-+			};
-+		};
-+	};
-+};
--- 
-2.25.1
-
diff --git a/meta-facebook/meta-tahan/recipes-utils/openbmc-utils/files/board-utils.sh b/meta-facebook/meta-tahan/recipes-utils/openbmc-utils/files/board-utils.sh
index 26c6e97fdeea..a19ff53eef51 100644
--- a/meta-facebook/meta-tahan/recipes-utils/openbmc-utils/files/board-utils.sh
+++ b/meta-facebook/meta-tahan/recipes-utils/openbmc-utils/files/board-utils.sh
@@ -97,6 +97,7 @@ userver_reset() {
     done
 
     echo "failed to reset userver!"
+    logger -p user.crit "failed to reset userver!"
     return 1
 }
 
@@ -105,17 +106,40 @@ chassis_power_cycle() {
 }
 
 bmc_mac_addr() {
-    bmc_mac=$(weutil -e chassis_eeprom | grep 'Local MAC:' | cut -d ' ' -f 3)
-    echo "$bmc_mac"
+    # Fetch mac addr supporting v4 and v5 format.
+    bmc_mac=$(weutil | sed -nE 's/((Local MAC)|(BMC MAC Base)): (.*)/\4/p')
+    if [ -z "$bmc_mac" ]; then
+        echo "BMC MAC Address Not Found !" 1>&2
+        logger -p user.crit "BMC MAC Address Not Found !"
+        return 1
+    else
+        echo "$bmc_mac"
+    fi
 }
 
-#
-# SCM EEPROM doesn't exist in Tahan, and CPU MAC address is obtained by
-# adding 1 to the BMC MAC address.
-#
 userver_mac_addr() {
-    bmc_mac=$(bmc_mac_addr)
-    cpu_mac=$(mac_addr_inc "$bmc_mac")
-    echo "$cpu_mac"
+    mac_addr_string=$(weutil | grep -E "(X86 CPU MAC Base)|(Local MAC)")
+    [[ "$mac_addr_string" =~ (((X86 CPU MAC Base)|(Local MAC)):[[:space:]]*(.*)) ]];
+    mac_addr_type="${BASH_REMATCH[2]}"
+    mac_addr_value="${BASH_REMATCH[5]}"
+    case "$mac_addr_type" in
+        # Fetch cpu mac addr based on EEPROM v5.
+        "X86 CPU MAC Base")
+            echo "$mac_addr_value"
+            ;;
+        "Local MAC")
+            #
+            # Fetch cpu mac addr based on EEPROM v4 and older.
+            # SCM EEPROM doesn't exist in Tahan, and CPU MAC address is obtained by
+            # adding 1 to the BMC MAC address.
+            #
+            cpu_mac=$(mac_addr_inc "$mac_addr_value")
+            echo "$cpu_mac"
+            ;;
+        *)
+            echo "CPU MAC Address Not Found !" 1>&2
+            logger -p user.crit "CPU MAC Address Not Found !"
+            return 1
+            ;;
+    esac
 }
-
diff --git a/meta-facebook/meta-tahan/recipes-utils/openbmc-utils/files/setup_i2c.sh b/meta-facebook/meta-tahan/recipes-utils/openbmc-utils/files/setup_i2c.sh
index b852f04e118b..ecae253692a8 100755
--- a/meta-facebook/meta-tahan/recipes-utils/openbmc-utils/files/setup_i2c.sh
+++ b/meta-facebook/meta-tahan/recipes-utils/openbmc-utils/files/setup_i2c.sh
@@ -22,16 +22,22 @@
 . /usr/local/bin/openbmc-utils.sh
 
 #
-# SMB/Chassis EEPROM 
+# Create SCM CPLD as early as possible so the driver can be attached to
+# the device when power-on.service is triggered.
 #
-i2c_device_add 3 0x56 24c64
+modprobe scmcpld
+i2c_device_add 1 0x35 scmcpld
 
-# Create SCM CPLD
 #
-i2c_device_add 1 0x35 scmcpld
+# Create "pwrcpld"
 #
+modprobe pwrcpld
+i2c_device_add 12 0x60 pwrcpld
 
 #
-# Create PWR CPLD
+# SMB/Chassis EEPROM
 #
-i2c_device_add 12 0x60 pwrcpld
+modprobe at24
+i2c_device_add 3 0x56 24c64
+# BMC EEPROM
+i2c_device_add 8 0x51 24c64
diff --git a/meta-facebook/meta-tahan/recipes-utils/wedge-eeprom/files/lib/eeprom.json b/meta-facebook/meta-tahan/recipes-utils/wedge-eeprom/files/lib/eeprom.json
index cd9b2837568f..a570e8af3762 100644
--- a/meta-facebook/meta-tahan/recipes-utils/wedge-eeprom/files/lib/eeprom.json
+++ b/meta-facebook/meta-tahan/recipes-utils/wedge-eeprom/files/lib/eeprom.json
@@ -4,6 +4,10 @@
     {
       "name" : "chassis_eeprom",
       "sysfs_path" : "/sys/bus/i2c/devices/i2c-3/3-0056/eeprom"
+    },
+    {
+      "name" : "bmc_eeprom",
+      "sysfs_path" : "/sys/bus/i2c/devices/i2c-8/8-0051/eeprom"
     }
   ]
 }
diff --git a/meta-facebook/meta-waimeacanyon/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-waimeacanyon/conf/templates/default/bblayers.conf.sample
index e623b5abac16..02744cb9b0f9 100644
--- a/meta-facebook/meta-waimeacanyon/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-waimeacanyon/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-wedge/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-wedge/conf/templates/default/bblayers.conf.sample
index c2850234d332..301180ce2e7d 100644
--- a/meta-facebook/meta-wedge/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-wedge/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -18,7 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-wedge/conf/templates/default/local.conf.sample b/meta-facebook/meta-wedge/conf/templates/default/local.conf.sample
index 3ac917efc32a..107e1acea48d 100644
--- a/meta-facebook/meta-wedge/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-wedge/conf/templates/default/local.conf.sample
@@ -6,6 +6,6 @@
 MACHINE ??= "wedge"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
 
 ASSUME_PROVIDED_append = "qemu-native"
diff --git a/meta-facebook/meta-wedge100/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-wedge100/conf/templates/default/bblayers.conf.sample
index 7005acca1dc4..3f8367d71998 100644
--- a/meta-facebook/meta-wedge100/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-wedge100/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-security/meta-tpm \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
@@ -22,7 +21,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-wedge100/conf/templates/default/local.conf.sample b/meta-facebook/meta-wedge100/conf/templates/default/local.conf.sample
index 6b6e94ad5735..df9f255b5f9d 100644
--- a/meta-facebook/meta-wedge100/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-wedge100/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "wedge100"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-wedge400/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-wedge400/conf/templates/default/bblayers.conf.sample
index 13666016d503..e6dbe195a6ee 100755
--- a/meta-facebook/meta-wedge400/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-wedge400/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -21,7 +20,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-yocto \
-  "
diff --git a/meta-facebook/meta-wedge400/conf/templates/default/local.conf.sample b/meta-facebook/meta-wedge400/conf/templates/default/local.conf.sample
index 83fff1817d51..d3c10f2b9a4a 100644
--- a/meta-facebook/meta-wedge400/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-wedge400/conf/templates/default/local.conf.sample
@@ -6,4 +6,4 @@
 MACHINE ??= "wedge400"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
diff --git a/meta-facebook/meta-wedge400/recipes-utils/fw-util/files/bic_bios.cpp b/meta-facebook/meta-wedge400/recipes-utils/fw-util/files/bic_bios.cpp
index ad712f3ea3de..8e8a730266c9 100755
--- a/meta-facebook/meta-wedge400/recipes-utils/fw-util/files/bic_bios.cpp
+++ b/meta-facebook/meta-wedge400/recipes-utils/fw-util/files/bic_bios.cpp
@@ -43,7 +43,7 @@ int BiosComponent::update(string image) {
   return ret;
 }
 
-int BiosComponent::fupdate(string image) {
+int BiosComponent::fupdate(string /* image */) {
   return FW_STATUS_NOT_SUPPORTED;
 }
 
diff --git a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/board-utils.sh b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/board-utils.sh
index 4de88afe11e9..db5ab94175db 100755
--- a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/board-utils.sh
+++ b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/board-utils.sh
@@ -264,28 +264,18 @@ wedge_power_on_board() {
     return 0
 }
 
-wedge_prepare_cpld_update() {
+wedge_prepare_firmware_update() {
     echo "Stop fscd service."
-    sv stop fscd
 
-    # from stress test found sometime sv stop fscd has timeout
-    # and wdtcli can't stop watchdog, that do BMC reboot while CPLD updating.
+    # Stress testing, it was found that "sv stop fscd" at times experiences a timeout,
+    # rendering wdtcli incapable of stopping watchdog.
+    # This leads to BMC reboots while updating firmware on devices, including CPLD, BIOS, and BIC.
+    sv force-stop fscd
+    
     # Add fuser to check /dev/watchdog ready to used after fscd release it.
-    watchdog_ok=0
-    MAX_RETRY=5
-    for ((retry=1; retry <= MAX_RETRY; retry++))
-    do
-        /usr/bin/fuser /dev/watchdog &> /dev/null
-        # return code is 1 when no one hold /dev/watchdog
-        if [ $? -eq 1 ]; then
-            echo "/dev/watchdog available"
-            watchdog_ok=1
-            break
-        fi
-        echo "waiting for /dev/watchdog, retry $retry/$MAX_RETRY"
-        sleep 2
-    done;
-    if [ $watchdog_ok -ne 1 ]; then
+    /usr/bin/fuser /dev/watchdog &> /dev/null
+    ret=$?
+    if [ $ret -eq 0 ]; then
         echo "Watchdog could not be stopped. Retry later"
         return 1;
     fi
@@ -295,7 +285,7 @@ wedge_prepare_cpld_update() {
 
     echo "Set fan speed 40%."
     set_fan_speed.sh 40
-
+    
     return 0
 }
 
diff --git a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/fcmcpld_update.sh b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/fcmcpld_update.sh
index c3edad9bd3a4..519257f49bb6 100755
--- a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/fcmcpld_update.sh
+++ b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/fcmcpld_update.sh
@@ -78,7 +78,7 @@ trap 'rm -rf /tmp/fcmcpld_update' INT TERM QUIT EXIT
 
 echo 1 > /tmp/fcmcpld_update
 
-if ! wedge_prepare_cpld_update; then
+if ! wedge_prepare_firmware_update; then
     echo "Aborting CPLD upgrade"
     echo "The FSCD may be closed incompletely,"
     echo "Please check the watchdog timeout, to prevent system reboot."
diff --git a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/pwrcpld_update.sh b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/pwrcpld_update.sh
index 9b951deeac51..6d7ffcb09aad 100755
--- a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/pwrcpld_update.sh
+++ b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/pwrcpld_update.sh
@@ -78,7 +78,7 @@ trap 'rm -rf /tmp/pwrcpld_update' INT TERM QUIT EXIT
 
 echo 1 > /tmp/pwrcpld_update
 
-if ! wedge_prepare_cpld_update; then
+if ! wedge_prepare_firmware_update; then
     echo "Aborting CPLD upgrade"
     echo "The FSCD may be closed incompletely,"
     echo "Please check the watchdog timeout, to prevent system reboot."
diff --git a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/scmcpld_update.sh b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/scmcpld_update.sh
index bf7165b92a6c..29de6bbcb668 100755
--- a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/scmcpld_update.sh
+++ b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/scmcpld_update.sh
@@ -77,7 +77,7 @@ trap 'rm -rf /tmp/scmcpld_update' INT TERM QUIT EXIT
 
 echo 1 > /tmp/scmcpld_update
 
-if ! wedge_prepare_cpld_update; then
+if ! wedge_prepare_firmware_update; then
     echo "Aborting CPLD upgrade"
     echo "The FSCD may be closed incompletely,"
     echo "Please check the watchdog timeout, to prevent system reboot."
diff --git a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/smbcpld_update.sh b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/smbcpld_update.sh
index 83877a35944b..b0d433abcde9 100755
--- a/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/smbcpld_update.sh
+++ b/meta-facebook/meta-wedge400/recipes-utils/openbmc-utils/files/smbcpld_update.sh
@@ -78,7 +78,7 @@ trap 'rm -rf /tmp/smbcpld_update' INT TERM QUIT EXIT
 
 echo 1 > /tmp/smbcpld_update
 
-if ! wedge_prepare_cpld_update; then
+if ! wedge_prepare_firmware_update; then
     echo "Aborting CPLD upgrade"
     echo "The FSCD may be closed incompletely,"
     echo "Please check the watchdog timeout, to prevent system reboot."
diff --git a/meta-facebook/meta-wedge400/recipes-wedge400/front-paneld/files/front-paneld.c b/meta-facebook/meta-wedge400/recipes-wedge400/front-paneld/files/front-paneld.c
index c47c59a8cdd1..fa3be0dae569 100755
--- a/meta-facebook/meta-wedge400/recipes-wedge400/front-paneld/files/front-paneld.c
+++ b/meta-facebook/meta-wedge400/recipes-wedge400/front-paneld/files/front-paneld.c
@@ -269,7 +269,7 @@ static int psu_check(int brd_rev) {
   };
   for (fru = FRU_PEM1; fru <= FRU_PSU2; fru++) {
     if (pal_is_fru_prsnt(fru, &prsnts[fru - FRU_PEM1])) {
-      OBMC_ERROR(ENODEV, "%s: fru %d can't get presence status", __func__, i);
+      OBMC_ERROR(ENODEV, "%s: fru %u can't get presence status", __func__, fru);
       return -1;
     }
   }
diff --git a/meta-facebook/meta-wedge400/recipes-wedge400/platform-lib/files/pal/pal.c b/meta-facebook/meta-wedge400/recipes-wedge400/platform-lib/files/pal/pal.c
index aa2163d7eda1..26bab6f1ce93 100755
--- a/meta-facebook/meta-wedge400/recipes-wedge400/platform-lib/files/pal/pal.c
+++ b/meta-facebook/meta-wedge400/recipes-wedge400/platform-lib/files/pal/pal.c
@@ -1398,7 +1398,7 @@ pal_update_ts_sled()
   struct timespec ts;
 
   clock_gettime(CLOCK_REALTIME, &ts);
-  sprintf(tstr, "%ld", ts.tv_sec);
+  sprintf(tstr, "%ld", (long)ts.tv_sec);
 
   sprintf(key, "timestamp_sled");
 
@@ -2522,7 +2522,7 @@ static int
 read_fan_rpm_f(const char *device, uint8_t fan, float *value) {
   char full_name[LARGEST_DEVICE_NAME * 2];
   char dir_name[LARGEST_DEVICE_NAME + 1];
-  char device_name[11];
+  char device_name[16];
   int tmp;
 
   /* Get current working directory */
@@ -2530,7 +2530,7 @@ read_fan_rpm_f(const char *device, uint8_t fan, float *value) {
     return -1;
   }
 
-  snprintf(device_name, 11, "fan%d_input", fan);
+  snprintf(device_name, sizeof(device_name), "fan%d_input", fan);
   snprintf(full_name, sizeof(full_name), "%s/%s", dir_name, device_name);
   if (device_read(full_name, &tmp)) {
     return -1;
@@ -2545,7 +2545,7 @@ static int
 read_fan_rpm(const char *device, uint8_t fan, int *value) {
   char full_name[LARGEST_DEVICE_NAME * 2];
   char dir_name[LARGEST_DEVICE_NAME + 1];
-  char device_name[11];
+  char device_name[16];
   int tmp;
 
   /* Get current working directory */
@@ -2553,7 +2553,7 @@ read_fan_rpm(const char *device, uint8_t fan, int *value) {
     return -1;
   }
 
-  snprintf(device_name, 11, "fan%d_input", fan);
+  snprintf(device_name, sizeof(device_name), "fan%d_input", fan);
   snprintf(full_name, sizeof(full_name), "%s/%s", dir_name, device_name);
   if (device_read(full_name, &tmp)) {
     return -1;
@@ -6651,7 +6651,8 @@ set_sled(int brd_rev, uint8_t color, int led_name)
   static uint8_t prev_state[4] = { 0x0 };
   int dev, ret;
   uint8_t io0_reg = 0x02, io1_reg = 0x03;
-  int32_t val_io0, val_io1;
+  int32_t val_io0 = 0;
+  int32_t val_io1 = 0;
   uint8_t clr_val;
   int led_id = -1;
   uint8_t brd_type;
@@ -7237,7 +7238,7 @@ pal_get_dev_guid(uint8_t fru, char *guid) {
 int
 pal_set_dev_guid(uint8_t slot, char *guid) {
 
-  pal_populate_guid(g_dev_guid, guid);
+  pal_populate_guid((char *)g_dev_guid, guid);
 
   return pal_set_guid(OFFSET_DEV_GUID, (char *)g_dev_guid);
 }
@@ -7323,7 +7324,7 @@ pal_ipmb_processing(int bus, void *buf, uint16_t size) {
       ts.tv_sec += 30;
 
       snprintf(key, sizeof(key), "ocpdbg_lcd");
-      snprintf(value, sizeof(value), "%ld", ts.tv_sec);
+      snprintf(value, sizeof(value), "%ld", (long)ts.tv_sec);
       if (kv_set(key, value, 0, 0) < 0) {
         return -1;
       }
diff --git a/meta-facebook/meta-yamp/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-yamp/conf/templates/default/bblayers.conf.sample
index 481b7a985fa6..edfdd389d480 100644
--- a/meta-facebook/meta-yamp/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-yamp/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -18,7 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-yamp/conf/templates/default/local.conf.sample b/meta-facebook/meta-yamp/conf/templates/default/local.conf.sample
index 20f99eccf3e3..302fe81a403d 100644
--- a/meta-facebook/meta-yamp/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-yamp/conf/templates/default/local.conf.sample
@@ -6,6 +6,6 @@
 MACHINE ??= "yamp"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-dunfell"
 
 ASSUME_PROVIDED_append = "qemu-native"
diff --git a/meta-facebook/meta-yosemite/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-yosemite/conf/templates/default/bblayers.conf.sample
index fef7feba098a..38d93fa250c2 100644
--- a/meta-facebook/meta-yosemite/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-yosemite/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-openembedded/meta-networking \
@@ -19,7 +18,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-facebook/meta-python3 \
   ##OEROOT##/../../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-yosemite/conf/templates/default/local.conf.sample b/meta-facebook/meta-yosemite/conf/templates/default/local.conf.sample
index 89911e84226a..cae4ff56efd1 100644
--- a/meta-facebook/meta-yosemite/conf/templates/default/local.conf.sample
+++ b/meta-facebook/meta-yosemite/conf/templates/default/local.conf.sample
@@ -6,7 +6,7 @@
 MACHINE ??= "yosemite"
 
 # OpenBMC distro settings
-DISTRO ?= "openbmc-fb"
+DISTRO ?= "openbmc-fb-rocko"
 
 # The following will enable a build capable of verified-boot.
 # Images and the resultant flash are always built as a FIT (firmware image).
diff --git a/meta-facebook/meta-yosemite/recipes-yosemite/bic-cached/files/bic-cached.c b/meta-facebook/meta-yosemite/recipes-yosemite/bic-cached/files/bic-cached.c
index 3951033a9d4d..664475c7e65d 100644
--- a/meta-facebook/meta-yosemite/recipes-yosemite/bic-cached/files/bic-cached.c
+++ b/meta-facebook/meta-yosemite/recipes-yosemite/bic-cached/files/bic-cached.c
@@ -66,7 +66,7 @@ _fruid_check(const char *bin) {
   }
 
   /* Read the binary file */
-  fread(fruid_data, sizeof(uint8_t), fruid_len, fruid_fp);
+  (void)!fread(fruid_data, sizeof(uint8_t), fruid_len, fruid_fp);
   fclose(fruid_fp);
 
   /* Check Common Header */
@@ -177,7 +177,7 @@ sdr_cache_init(uint8_t slot_id) {
 
     sdr_full_t *sdr = (sdr_full_t *) res->data;
 
-    write(fd, sdr, sizeof(sdr_full_t));
+    (void)!write(fd, sdr, sizeof(sdr_full_t));
 
     req.rec_id = res->next_rec_id;
     if (req.rec_id == LAST_RECORD_ID) {
diff --git a/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/bic/bic.c b/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/bic/bic.c
index df44897cabcb..fe4edab4a3d4 100644
--- a/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/bic/bic.c
+++ b/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/bic/bic.c
@@ -663,7 +663,7 @@ _update_bic_main(uint8_t slot_id, char *path) {
 
   // Kill ipmb daemon for this slot
   sprintf(cmd, "sv stop ipmbd_%d", get_ipmb_bus_id(slot_id));
-  system(cmd);
+  (void)!system(cmd);
   printf("stop ipmbd for slot %x..\n", slot_id);
 
   // The I2C high speed clock (1M) could cause to read BIC data abnormally.
@@ -671,16 +671,16 @@ _update_bic_main(uint8_t slot_id, char *path) {
   switch(slot_id)
   {
      case 1:
-       system("devmem 0x1e78a104 w 0x77776305");
+       (void)!system("devmem 0x1e78a104 w 0x77776305");
        break;
      case 2:
-       system("devmem 0x1e78a084 w 0x77776305");
+       (void)!system("devmem 0x1e78a084 w 0x77776305");
        break;
      case 3:
-       system("devmem 0x1e78a304 w 0x77776305");
+       (void)!system("devmem 0x1e78a304 w 0x77776305");
        break;
      case 4:
-       system("devmem 0x1e78a184 w 0x77776305");
+       (void)!system("devmem 0x1e78a184 w 0x77776305");
        break;
      default:
        syslog(LOG_CRIT, "bic_update_fw: incorrect slot_id %d\n", slot_id);
@@ -694,7 +694,7 @@ _update_bic_main(uint8_t slot_id, char *path) {
     // Restart ipmb daemon with "-u|--enable-bic-update" for bic update
     memset(cmd, 0, sizeof(cmd));
     sprintf(cmd, "/usr/local/bin/ipmbd -u %d %d > /dev/null 2>&1 &", get_ipmb_bus_id(slot_id), slot_id);
-    system(cmd);
+    (void)!system(cmd);
     printf("start ipmbd -u for this slot %x..\n",slot_id);
 
     sleep(2);
@@ -705,7 +705,7 @@ _update_bic_main(uint8_t slot_id, char *path) {
     // Kill ipmb daemon "--enable-bic-update" for this slot
     memset(cmd, 0, sizeof(cmd));
     sprintf(cmd, "ps -w | grep -v 'grep' | grep 'ipmbd -u %d' |awk '{print $1}'| xargs kill", get_ipmb_bus_id(slot_id));
-    system(cmd);
+    (void)!system(cmd);
     printf("stop ipmbd for slot %x..\n", slot_id);
   }
 
@@ -928,16 +928,16 @@ _update_bic_main(uint8_t slot_id, char *path) {
   switch(slot_id)
   {
      case 1:
-       system("devmem 0x1e78a104 w 0x77744302");
+       (void)!system("devmem 0x1e78a104 w 0x77744302");
        break;
      case 2:
-       system("devmem 0x1e78a084 w 0x77744302");
+       (void)!system("devmem 0x1e78a084 w 0x77744302");
        break;
      case 3:
-       system("devmem 0x1e78a304 w 0x77744302");
+       (void)!system("devmem 0x1e78a304 w 0x77744302");
        break;
      case 4:
-       system("devmem 0x1e78a184 w 0x77744302");
+       (void)!system("devmem 0x1e78a184 w 0x77744302");
        break;
      default:
        syslog(LOG_ERR, "bic_update_fw: incorrect slot_id %d\n", slot_id);
@@ -948,7 +948,7 @@ _update_bic_main(uint8_t slot_id, char *path) {
   sleep(1);
   memset(cmd, 0, sizeof(cmd));
   sprintf(cmd, "sv start ipmbd_%d", get_ipmb_bus_id(slot_id));
-  system(cmd);
+  (void)!system(cmd);
 
 error_exit:
   syslog(LOG_CRIT, "bic_update_fw: updating bic firmware is exiting\n");
@@ -1360,7 +1360,7 @@ bic_read_fruid(uint8_t slot_id, uint8_t fru_id, const char *path, int *fru_size)
     }
 
     // Ignore the first byte as it indicates length of response
-    write(fd, &rbuf[1], rlen-1);
+    (void)!write(fd, &rbuf[1], rlen-1);
 
     // Update offset
     offset += (rlen-1);
diff --git a/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/pal/pal.c b/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/pal/pal.c
index fbbcd4540fc3..8a1bfac59b5d 100644
--- a/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/pal/pal.c
+++ b/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/pal/pal.c
@@ -1035,10 +1035,10 @@ pal_sled_cycle(void) {
   syslog(LOG_CRIT, "SLED_CYCLE successful");
   pal_update_ts_sled();
   // Remove the adm1275 module as the HSC device is busy
-  system("rmmod adm1275");
+  (void)!system("rmmod adm1275");
 
   // Send command to HSC power cycle
-  system("i2cset -y 10 0x40 0xd9 c");
+  (void)!system("i2cset -y 10 0x40 0xd9 c");
 
   return 0;
 }
diff --git a/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_common/yosemite_common.c b/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_common/yosemite_common.c
index 56bb0f307505..d2d528e8924f 100644
--- a/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_common/yosemite_common.c
+++ b/meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_common/yosemite_common.c
@@ -128,17 +128,17 @@ generate_dump(void *arg) {
   // HEADER LINE for the dump
   memset(cmd, 0, 128);
   sprintf(cmd, "%s time > %s%s", CRASHDUMP_BIN, CRASHDUMP_FILE, fruname);
-  system(cmd);
+  (void)!system(cmd);
 
   // COREID dump
   memset(cmd, 0, 128);
   sprintf(cmd, "%s %s coreid >> %s%s", CRASHDUMP_BIN, fruname, CRASHDUMP_FILE, fruname);
-  system(cmd);
+  (void)!system(cmd);
 
   // MSR dump
   memset(cmd, 0, 128);
   sprintf(cmd, "%s %s msr >> %s%s", CRASHDUMP_BIN, fruname, CRASHDUMP_FILE, fruname);
-  system(cmd);
+  (void)!system(cmd);
 
   syslog(LOG_CRIT, "Crashdump for FRU: %d is generated.", fru);
 
@@ -173,9 +173,9 @@ yosemite_common_crashdump(uint8_t fru) {
     } else {
       pthread_join(t_dump[fru-1].pt, NULL);
       sprintf(cmd, "ps | grep '{dump.sh}' | grep 'slot%d' | awk '{print $1}'| xargs kill", fru);
-      system(cmd);
+      (void)!system(cmd);
       sprintf(cmd, "ps | grep 'me-util' | grep 'slot%d' | awk '{print $1}'| xargs kill", fru);
-      system(cmd);
+      (void)!system(cmd);
 #ifdef DEBUG
       syslog(LOG_INFO, "yosemite_common_crashdump: Previous crashdump thread is cancelled");
 #endif
diff --git a/meta-facebook/meta-yosemite/recipes-yosemite/front-paneld/files/front-paneld.c b/meta-facebook/meta-yosemite/recipes-yosemite/front-paneld/files/front-paneld.c
index fac0afd98a6a..5f1b5fa209c0 100644
--- a/meta-facebook/meta-yosemite/recipes-yosemite/front-paneld/files/front-paneld.c
+++ b/meta-facebook/meta-yosemite/recipes-yosemite/front-paneld/files/front-paneld.c
@@ -636,7 +636,7 @@ main (int argc, char * const argv[]) {
       exit(-1);
     }
   } else {
-   daemon(0, 1);
+   (void)!daemon(0, 1);
    openlog("front-paneld", LOG_CONS, LOG_DAEMON);
   }
 
diff --git a/meta-facebook/meta-yosemite/recipes-yosemite/gpiod/files/gpiod.c b/meta-facebook/meta-yosemite/recipes-yosemite/gpiod/files/gpiod.c
index ed134302c964..53ad5dff08b5 100644
--- a/meta-facebook/meta-yosemite/recipes-yosemite/gpiod/files/gpiod.c
+++ b/meta-facebook/meta-yosemite/recipes-yosemite/gpiod/files/gpiod.c
@@ -309,7 +309,7 @@ main(int argc, char **argv) {
 
     init_gpio_pins();
 
-    daemon(0,1);
+    (void)!daemon(0,1);
     openlog("gpiod", LOG_CONS, LOG_DAEMON);
     syslog(LOG_INFO, "gpiod: daemon started");
     run_gpiod(argc, argv);
diff --git a/meta-facebook/meta-yosemite/recipes-yosemite/gpiointrd/files/gpiointrd.c b/meta-facebook/meta-yosemite/recipes-yosemite/gpiointrd/files/gpiointrd.c
index 9e9f770a9b5e..da2414540362 100644
--- a/meta-facebook/meta-yosemite/recipes-yosemite/gpiointrd/files/gpiointrd.c
+++ b/meta-facebook/meta-yosemite/recipes-yosemite/gpiointrd/files/gpiointrd.c
@@ -151,7 +151,7 @@ static void default_gpio_check(void) {
     if (read_device(vpath, &value) == 0) {
       if (value != def_bic_ready[fru].def_val) {
         last_bic_ready[fru] = value;
-        syslog(LOG_CRIT, def_bic_ready[fru].log);
+        syslog(LOG_CRIT, "%s", def_bic_ready[fru].log);
       }
     }
   }
diff --git a/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample b/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample
index 378aa880cd20..cddc3491cc81 100644
--- a/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample
+++ b/meta-facebook/meta-yosemite4/conf/templates/default/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-perl \
@@ -25,8 +24,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk/0500-arm-dts-ast2600-evb-disable-MDIO-function.patch b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk/0500-arm-dts-ast2600-evb-disable-MDIO-function.patch
new file mode 100644
index 000000000000..8a6a59572fab
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk/0500-arm-dts-ast2600-evb-disable-MDIO-function.patch
@@ -0,0 +1,64 @@
+From 277c23a83f55e5fbff29827a352ef662193762ec Mon Sep 17 00:00:00 2001
+From: RickyWu-wiwynn <ricky_cx_wu@wiwynn.com>
+Date: Wed, 20 Mar 2024 10:15:06 +0800
+Subject: [PATCH] arm: dts: ast2600-evb: disable MDIO function
+
+Description:
+Disable MDIO function since the MDIO function pins would be config as
+I2C and GPIO.
+---
+ arch/arm/dts/ast2600-evb.dts | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/dts/ast2600-evb.dts b/arch/arm/dts/ast2600-evb.dts
+index 6db1efdda5..4afd943706 100644
+--- a/arch/arm/dts/ast2600-evb.dts
++++ b/arch/arm/dts/ast2600-evb.dts
+@@ -60,7 +60,7 @@
+ };
+ 
+ &mdio {
+-	status = "okay";
++	status = "disabled";
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <	&pinctrl_mdio1_default &pinctrl_mdio2_default
+ 			&pinctrl_mdio3_default &pinctrl_mdio4_default>;
+@@ -84,7 +84,7 @@
+ };
+ 
+ &mac0 {
+-	status = "okay";
++	status = "disabled";
+ 	phy-mode = "rgmii-rxid";
+ 	phy-handle = <&ethphy0>;
+ 	pinctrl-names = "default";
+@@ -92,7 +92,7 @@
+ };
+ 
+ &mac1 {
+-	status = "okay";
++	status = "disabled";
+ 	phy-mode = "rgmii-rxid";
+ 	phy-handle = <&ethphy1>;
+ 	pinctrl-names = "default";
+@@ -100,7 +100,7 @@
+ };
+ 
+ &mac2 {
+-	status = "okay";
++	status = "disabled";
+ 	phy-mode = "rgmii";
+ 	phy-handle = <&ethphy2>;
+ 	pinctrl-names = "default";
+@@ -108,7 +108,7 @@
+ };
+ 
+ &mac3 {
+-	status = "okay";
++	status = "disabled";
+ 	phy-mode = "rgmii";
+ 	phy-handle = <&ethphy3>;
+ 	pinctrl-names = "default";
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
new file mode 100644
index 000000000000..bf76287aabea
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0500-arm-dts-ast2600-evb-disable-MDIO-function.patch \
+           "
+
diff --git a/meta-facebook/meta-yosemite4/recipes-core/images/yosemite4-image.bb b/meta-facebook/meta-yosemite4/recipes-core/images/yosemite4-image.bb
index 18365dd34a4a..36ca96d497b9 100644
--- a/meta-facebook/meta-yosemite4/recipes-core/images/yosemite4-image.bb
+++ b/meta-facebook/meta-yosemite4/recipes-core/images/yosemite4-image.bb
@@ -4,4 +4,5 @@ require common/images/fb-openbmc-image.inc
 IMAGE_INSTALL:append = " bios-fw-update"
 IMAGE_INSTALL:append = " cpld-fw-handler"
 IMAGE_INSTALL:append = " bic-update"
+IMAGE_INSTALL:append = " pldm-package-re-wrapper"
 IMAGE_INSTALL:append = " cxl-fw-update"
diff --git a/meta-facebook/meta-yosemite4/recipes-facebook/bic-update/files/bic-update.sh b/meta-facebook/meta-yosemite4/recipes-facebook/bic-update/files/bic-update.sh
index d2b5ab289d52..9d9a95192ae8 100644
--- a/meta-facebook/meta-yosemite4/recipes-facebook/bic-update/files/bic-update.sh
+++ b/meta-facebook/meta-yosemite4/recipes-facebook/bic-update/files/bic-update.sh
@@ -1,12 +1,20 @@
 #!/bin/bash
 
+lockfile="/tmp/bic-update.lock"
+
+exec 200>"$lockfile"
+flock -n 200 || { echo "BIC update is already running"; exit 1; }
+
 SB_CPLD_ADDR="0x22"
 SB_UART_MUX_SWITCH_REG="0x08"
 BIC_BOOT_STRAP_SPI_VAL="0x00"
 BIC_BOOT_STRAP_REG="0x0C"
 
 show_usage() {
-  echo "Usage: bic-updater.sh [sd|ff|wf] (--rcvy <slot_id> <uart image>) <pldm image>"
+  echo "Usage: bic-updater.sh [sd|ff|wf] (--rcvy <slot_id> <uart image>) (<slot_id>) <pldm image>"
+  echo "       update all BICs  : bic-updater.sh [sd|ff|wf] <pldm image>"
+  echo "       update one BIC   : bic-updater.sh [sd|ff|wf] <slot_id> <pldm image>"
+  echo "       recovery one BIC and then update all BICs : : bic-updater.sh [sd|ff|wf] --rcvy <slot_id> <uart image> <pldm image>"
   echo ""
 }
 
@@ -17,7 +25,7 @@ check_power_on() {
 
 	power_status=$(gpioget "$(basename /sys/bus/i2c/devices/"$i2c_bus"-0023/*gpiochip*)" 16)
 	if [ "$power_status" != "1" ]; then
-		echo "Checki Power : Off"
+		echo "Check Power : Off"
 		echo "Power on before FF/WF BIC update"
 		exit 255
 	fi
@@ -32,19 +40,33 @@ recovery_bic_by_uart() {
 	local uart_image=$4
 	local uart_num=$((slot < 5 ? slot - 1 :slot))
 	local i2c_bus=$((slot-1))
+	local ret=255
 
 	echo "UART is ttyS$uart_num"
 	echo "i2c bus is $i2c_bus"
 
 	# Switch UART to corresponding BIC
 	i2ctransfer -f -y "$i2c_bus" w2@"$SB_CPLD_ADDR" "$SB_UART_MUX_SWITCH_REG" "$cpld_uart_routing"
+	ret=$?
+	if [ "$ret" -ne 0 ]; then
+		return $ret
+	fi
 
 	# Set BIC boot from UART
 	echo "Setting BIC boot from UART"
 	i2ctransfer -f -y "$i2c_bus" w2@"$SB_CPLD_ADDR" "$BIC_BOOT_STRAP_REG" "$boot_strap_reg"
+	ret=$?
+	if [ "$ret" -ne 0 ]; then
+		return $ret
+	fi
 
 	# set UART to 115200
 	/bin/stty -F "/dev/ttyS$uart_num" 115200
+	ret=$?
+	if [ "$ret" -ne 0 ]; then
+		return $ret
+	fi
+
 	sleep 3
 
 	echo "Doing the recovery update..."
@@ -56,11 +78,20 @@ recovery_bic_by_uart() {
 
 	# set UART back to 57600
 	/bin/stty -F "/dev/ttyS$uart_num" 57600
+	ret=$?
+	if [ "$ret" -ne 0 ]; then
+		return $ret
+	fi
 
 	# Set BIC boot from spi
 	i2ctransfer -f -y "$i2c_bus" w2@"$SB_CPLD_ADDR" "$BIC_BOOT_STRAP_REG" "$BIC_BOOT_STRAP_SPI_VAL"
+	ret=$?
+	if [ "$ret" -ne 0 ]; then
+		return $ret
+	fi
 
 	echo "Recovery BIC is finished."
+	return 0
 }
 
 wait_for_update_complete() {
@@ -72,17 +103,30 @@ wait_for_update_complete() {
 		progress=$(busctl get-property xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$software_id" xyz.openbmc_project.Software.ActivationProgress Progress | cut -d " " -f 2)
 		if [ "${progress}" == 100 ]; then
 			echo -ne \\n"Update done."\\n
-			break
+			return 0
 		fi
 		counter=$((counter+1))
 		# Over two minutes is considered timeout
-		if [ "${counter}" == 120 ]; then
+		if [ "${counter}" == 300 ]; then
 			echo -ne \\n"Time out. Fail"\\n
-			break
+			return 255
 		fi
 	done
 }
 
+
+delete_software_id() {
+	if [ "$software_id" != "" ]; then
+	    echo "Delete software id. software id = $software_id"
+		busctl call xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$software_id" xyz.openbmc_project.Object.Delete Delete
+		ret=$?
+		if [ "$ret" -ne 0 ]; then
+		echo "Failed to delete software id: Exit code $ret"
+		exit $ret
+		fi
+	fi
+}
+
 update_bic() {
 
 	cp "$1" /tmp/images
@@ -95,16 +139,107 @@ update_bic() {
 	sleep 1
 
 	if [ "$software_id" != "" ]; then
+
+		if ! busctl get-property xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$software_id" xyz.openbmc_project.Software.ActivationProgress Progress >/dev/null; then
+			echo "The image does not match with any devices. Please check it."
+			delete_software_id
+			exit 255
+		fi
+
 		busctl set-property xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$software_id" xyz.openbmc_project.Software.Activation RequestedActivation s "xyz.openbmc_project.Software.Activation.RequestedActivations.Active"
 		wait_for_update_complete
+		return $?
 	else
 		echo "Fail: Miss software id."
+		return 255
+	fi
+}
+
+update_all_slots() {
+	local is_recovery=$1
+	local user_specific_slot_id=$2
+
+	if [ "$is_recovery" == false ] && [ -z "$user_specific_slot_id" ]; then
+		# 0 = true
+		return 0
+	else
+		return 1
 	fi
 }
 
+update_single_slot() {
+	local slot_id=$1
+	local user_specific_slot_id=$2
+	local is_recovery=$3
+
+	if [ "$is_recovery" == false ] && [ "$slot_id" == "$user_specific_slot_id" ]; then
+		# 0 = true
+		return 0
+	else
+		return 1
+	fi
+}
+
+conduct_normal_update_and_updated_slot() {
+	local slot_id=$1
+	local user_specific_slot_id=$2
+	local is_recovery=$3
+
+	if update_single_slot "$slot_id" "$user_specific_slot_id" "$is_recovery" ; then
+		# 0 = true
+		return 0
+	elif update_all_slots "$is_recovery" "$user_specific_slot_id"; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+conduct_recovery_and_not_recovered_slot() {
+	local slot_id=$1
+	local user_specific_slot_id=$2
+	local is_recovery=$3
+
+	if [ "$is_recovery" == true ] && [ "$slot_id" != "$user_specific_slot_id" ]; then
+		# 0 = true
+		return 0
+	else
+		return 1
+	fi
+}
+
+is_sd_bic() {
+	local slot_id=$1
+	local mctp_exp_id=$2
+
+	if [[ "$slot_id" -ge 1 && "$slot_id" -le 8 && "$mctp_exp_id" == "0" ]]; then
+		# 0 = true
+		return 0
+	else
+		return 1
+	fi
+}
+
+
+is_other_bic_updating() {
+  echo "Check if other BICs are updating"
+
+  pldm_output=$(busctl tree xyz.openbmc_project.PLDM)
+  if echo "$pldm_output" | grep -qE "/xyz/openbmc_project/software/[0-9]+"; then
+    echo "$pldm_output" | grep -E "/xyz/openbmc_project/software/[0-9]+"
+	previous_software_id=$(busctl tree xyz.openbmc_project.PLDM |grep /xyz/openbmc_project/software/ | cut -d "/" -f 5)
+    busctl get-property xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$previous_software_id" xyz.openbmc_project.Software.ActivationProgress Progress > /dev/null
+	ret=$?
+	if [ "$ret" -eq 0 ]; then
+		echo "It can only be updated one BIC at a time. Please wait until the software update is completed."
+		exit 255
+	fi
+  fi
+}
+
 # Function to prompt for continuation and check user input
 prompt_confirmation() {
-  echo "WARNING! This tool will automatically update all BICs."
+  echo "WARNING! This will automatically update all BICs."
   read -r -p "Continue? [y/N] " continue
   if [ "$continue" != "y" ]; then
     echo "Aborting on user request."
@@ -134,41 +269,71 @@ if [ $# -eq 5 ] && [ "$2" == "--rcvy" ]; then
   uart_image=$4
   [ ! -f "$uart_image" ] && error_and_exit "UART"
   pldm_image=$5
+elif [ $# -eq 3 ] && [[ "$2" =~ ^[1-8]+$ ]]; then
+  slot_id=$2
+  pldm_image=$3
+  pldm-package-re-wrapper bic -s "$slot_id" -f "$pldm_image"
+  pldm_image="${pldm_image}_re_wrapped"
+else
+  prompt_confirmation
 fi
 
 [ ! -f "$pldm_image" ] && error_and_exit "PLDM"
 
-# Comfirmation with user
-prompt_confirmation
-
 # Execute recovery operations if in recovery mode, based on the value of bic_name
 if [ "$is_rcvy" == true ]; then
+
+  is_other_bic_updating
+
   # Workaround: Avoid pldm daemon blocked
   systemctl stop pldmd
   echo "Start to Recovery slot $slot_id $bic_name BIC"
   case $bic_name in
     sd)
       recovery_bic_by_uart "$slot_id" "0x04" "0x01" "$uart_image"
+      ret=$?
       ;;
     ff|wf)
       check_power_on "$slot_id"
       cpld_uart_routing=$( [ "$bic_name" == "ff" ] && echo "0x05" || echo "0x01" )
       boot_strap_reg=$( [ "$bic_name" == "ff" ] && echo "0x04" || echo "0x02" )
       recovery_bic_by_uart "$slot_id" "$cpld_uart_routing" "$boot_strap_reg" "$uart_image"
+      ret=$?
       pldmtool raw -m "${slot_id}0" -d 0x80 0x02 0x39 0x1 0x1 0x1 0x1 0x1
       ;;
   esac
 
+  if [ "$ret" -ne 0 ]; then
+	echo "Failed to Recovery BIC: Exit code $ret"
+	exit "$ret"
+  fi
+
   sleep 3
   echo "Restart MCTP/PLDM daemon"
   systemctl restart mctpd
   systemctl start pldmd
 fi
 
+# Wating for mctp and pldm to restart
+sleep 10
+
+if ! systemctl is-active --quiet pldmd; then
+    echo "STOP. PLDM service is not running. Please check pldmd status."
+    exit 255
+fi
+
 busctl tree xyz.openbmc_project.MCTP
 echo "Start to Update BIC"
 
+is_other_bic_updating
+
 update_bic "$pldm_image"
+ret=$?
+if [ "$ret" -ne 0 ]; then
+	echo "Failed to Update BIC: Exit code $ret"
+	delete_software_id
+	exit $ret
+fi
 
 sleep 3
 
@@ -186,15 +351,22 @@ if [ "$bic_name" == "wf" ] || [ "$bic_name" == "ff" ]; then
 	do
 		mctp_slot_id=$((EID/10));
 		mctp_exp_id=$((EID%10));
-		if [ "$mctp_slot_id" != "$slot_id" ] && [ "$mctp_slot_id" != "0" ] && [ "$mctp_exp_id" == "0" ]; then
-			echo "Slot $mctp_slot_id: Restart BIC"
-			pldmtool raw -m "$mctp_slot_id"0 -d 0x80 0x02 0x39 0x1 0x1 0x1 0x1 0x1
+
+		if is_sd_bic "$mctp_slot_id" "$mctp_exp_id"; then
+			if conduct_recovery_and_not_recovered_slot "$mctp_slot_id" "$slot_id" "$is_rcvy" ||
+			conduct_normal_update_and_updated_slot "$mctp_slot_id" "$slot_id" "$is_rcvy"; then
+				echo "Slot $mctp_slot_id: Restart BIC"
+				pldmtool raw -m "$mctp_slot_id"0 -d 0x80 0x02 0x39 0x1 0x1 0x1 0x1 0x1
+			fi
 		fi
 	done
 
 	sleep 3
 fi
 
-systemctl restart pldmd
+delete_software_id
 
 echo "Done"
+
+#unlock
+flock -u 200
diff --git a/meta-facebook/meta-yosemite4/recipes-facebook/cxl-fw-update/cxl-fw-update_0.1.bb b/meta-facebook/meta-yosemite4/recipes-facebook/cxl-fw-update/cxl-fw-update_0.1.bb
index 167bf9bd0864..3872e3ad9f73 100644
--- a/meta-facebook/meta-yosemite4/recipes-facebook/cxl-fw-update/cxl-fw-update_0.1.bb
+++ b/meta-facebook/meta-yosemite4/recipes-facebook/cxl-fw-update/cxl-fw-update_0.1.bb
@@ -15,9 +15,17 @@ LOCAL_URI = " \
     file://cci-mctp-update.cpp \
     file://cci-mctp-update.hpp \
     file://meson.build \
+    file://cxl-fw-update.sh \
     "
 
 DEPENDS += " \
     cli11 \
     sdbusplus \
     "
+
+RDEPENDS:${PN} = "bash"
+
+do_install:append() {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/cxl-fw-update.sh ${D}/${bindir}/
+}
diff --git a/meta-facebook/meta-yosemite4/recipes-facebook/cxl-fw-update/files/cxl-fw-update.sh b/meta-facebook/meta-yosemite4/recipes-facebook/cxl-fw-update/files/cxl-fw-update.sh
new file mode 100644
index 000000000000..8b414b941f47
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-facebook/cxl-fw-update/files/cxl-fw-update.sh
@@ -0,0 +1,136 @@
+#!/bin/bash
+
+lockfile="/tmp/bic-update.lock"
+
+exec 200>"$lockfile"
+flock -n 200 || { echo "BIC update is already running"; exit 1; }
+
+CXL1_EID_suffix=4
+CXL2_EID_suffix=5
+
+show_usage() {
+    echo "Usage: cxl-fw-update.sh <slot_id> (<instance_num>) <pldm image>"
+    echo "       update CXL1  : cxl-fw-update.sh <slot_id> 1 <pldm image>"
+    echo "       update CXL2  : cxl-fw-update.sh <slot_id> 2 <pldm image>"
+    echo ""
+}
+
+wait_for_update_complete() {
+    counter=0
+    while true
+    do
+        sleep 1
+        echo -ne "Waiting for updating... ${counter} sec"\\r
+        progress=$(busctl get-property xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$software_id" xyz.openbmc_project.Software.ActivationProgress Progress | cut -d " " -f 2)
+        if [ "${progress}" == 100 ]; then
+            echo -ne \\n"Update done."\\n
+            break
+        fi
+        counter=$((counter+1))
+        # Over two minutes is considered timeout
+        if [ "${counter}" == 600 ]; then
+            echo -ne \\n"Time out. Fail"\\n
+            break
+        fi
+    done
+}
+
+update_cxl() {
+
+    cp "$1" /tmp/images
+
+    sleep 1
+
+    software_id=$(busctl tree xyz.openbmc_project.PLDM |grep /xyz/openbmc_project/software/ | cut -d "/" -f 5)
+    echo "software_id = $software_id"
+
+    sleep 1
+
+    if [ "$software_id" != "" ]; then
+        busctl set-property xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$software_id" xyz.openbmc_project.Software.Activation RequestedActivation s "xyz.openbmc_project.Software.Activation.RequestedActivations.Active"
+        wait_for_update_complete
+    else
+        echo "Fail: Miss software id."
+    fi
+}
+
+prompt_confirmation() {
+    echo "WARNING! This will automatically update all all CXL on the blade."
+    read -r -p "Continue? [y/N] " continue
+    if [ "$continue" != "y" ]; then
+        echo "Aborting on user request."
+        exit 0
+    fi
+}
+
+error_and_exit() {
+    echo "Please provide valid PLDM image"
+    show_usage
+    exit 255
+}
+
+# Check for minimum required arguments
+[ $# -lt 2 ] && error_and_exit
+
+slot_id=$1
+instance_num=$2
+pldm_image=$3
+
+if [ $# -eq 2 ]; then
+    pldm_image=$2
+fi
+
+[ ! -f "$pldm_image" ] && error_and_exit
+
+# Check if instance_num is between 1 and 2
+if [ $# -eq 3 ] && [[ "$instance_num" =~ ^[1-2]$ ]]; then
+    pldm-package-re-wrapper cxl -s "$slot_id" -i "$instance_num" -f "$pldm_image"
+    pldm_image="${pldm_image}_re_wrapped"
+else
+    echo "Instance number must between 1 and 2."
+    exit 255
+fi
+
+if ! systemctl is-active --quiet pldmd; then
+    echo "STOP. PLDM service is not running. Please check pldmd status."
+    exit 255
+fi
+
+#Show all mctp eids, and check cxl eid should exist
+#The cxl eid would end with 4 or 5.
+mctp_output=$(busctl tree xyz.openbmc_project.MCTP)
+echo "Check MCTP EID"
+echo "$mctp_output"
+if ! echo "$mctp_output" | grep -qE "/xyz/openbmc_project/mctp/1/$((slot_id * 10 + (instance_num == 1 ? CXL1_EID_suffix : CXL2_EID_suffix)))"; then
+  echo "Not allowed. The CXL EID $((slot_id * 10 + (instance_num == 1 ? CXL1_EID_suffix : CXL2_EID_suffix))) does not exist."
+  exit 255
+fi
+
+
+echo "Check if other BICs are updating"
+pldm_output=$(busctl tree xyz.openbmc_project.PLDM)
+if echo "$pldm_output" | grep -qE "/xyz/openbmc_project/software/[0-9]+"; then
+echo "$pldm_output" | grep -E "/xyz/openbmc_project/software/[0-9]+"
+previous_software_id=$(busctl tree xyz.openbmc_project.PLDM |grep /xyz/openbmc_project/software/ | cut -d "/" -f 5)
+busctl get-property xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$previous_software_id" xyz.openbmc_project.Software.ActivationProgress Progress > /dev/null
+ret=$?
+    if [ "$ret" -eq 0 ]; then
+        echo "It can only be updated one BIC at a time. Please wait until the software update is completed."
+        exit 255
+    fi
+fi
+
+
+update_cxl "$pldm_image"
+
+busctl call xyz.openbmc_project.PLDM /xyz/openbmc_project/software/"$software_id" xyz.openbmc_project.Object.Delete Delete
+ret=$?
+if [ "$ret" -ne 0 ]; then
+echo "Failed to delete software id: Exit code $ret"
+exit $ret
+fi
+
+echo "Done. If there was no error appeared, please conduct DC cycle to load the new firmware."
+
+#unlock
+flock -u 200
\ No newline at end of file
diff --git a/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/files/main.cpp b/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/files/main.cpp
new file mode 100644
index 000000000000..16919629b32e
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/files/main.cpp
@@ -0,0 +1,321 @@
+#include "libpldm/firmware_update.h"
+#include "libpldm/utils.h"
+
+#include <math.h>
+
+#include <CLI/CLI.hpp>
+
+#include <fstream>
+#include <iostream>
+#include <unordered_set>
+
+std::ifstream openInputPackage(const std::string& inputPackagePath)
+{
+    std::ifstream package(inputPackagePath,
+                          std::ifstream::in | std::ifstream::binary);
+    if (!package.good())
+    {
+        package.close();
+        throw std::runtime_error("Failed to open file");
+    }
+    return package;
+}
+
+std::ofstream createOutputPackage(const std::string& inputPackagePath)
+{
+    std::filesystem::path newPackagePath(inputPackagePath + "_re_wrapped");
+    std::ofstream newPackage(newPackagePath,
+                             std::ofstream::out | std::ofstream::binary);
+    std::filesystem::perms permission = std::filesystem::perms::owner_read |
+                                        std::filesystem::perms::owner_write |
+                                        std::filesystem::perms::group_read;
+    std::filesystem::permissions(newPackagePath, permission);
+    if (newPackage.bad())
+    {
+        newPackage.close();
+        throw std::runtime_error("Failed to create file");
+    }
+
+    return newPackage;
+}
+
+std::vector<uint8_t> initNewDescriptorFor(uint8_t slotNumber)
+{
+    auto newDescriptor = std::to_string(slotNumber);
+    std::vector<uint8_t> newDescriptorData{0x07, 0x01, 0x0a, 0x00};
+
+    std::for_each(newDescriptor.begin(), newDescriptor.end(), [&](auto& c) {
+        newDescriptorData.push_back(static_cast<uint8_t>(c));
+    });
+
+    while (newDescriptorData.size() <
+           sizeof(pldm_descriptor_tlv) - 1 +
+               PLDM_FWUP_ASCII_MODEL_NUMBER_SHORT_STRING_LENGTH)
+    {
+        newDescriptorData.push_back(0);
+    }
+
+    return newDescriptorData;
+}
+
+size_t skipOriginalDescriptors(uint8_t descriptor_count,
+                               const std::vector<uint8_t>& packageHeader,
+                               size_t processedDataIdx)
+{
+    for (unsigned int i = 0; i < descriptor_count; i++)
+    {
+        uint16_t currDescriptorLen =
+            ((uint16_t)packageHeader.at(processedDataIdx +
+                                        sizeof(uint16_t) /*DescriptorType*/ + 1)
+             << 8) |
+            packageHeader.at(processedDataIdx +
+                             sizeof(uint16_t) /*DescriptorType*/);
+        processedDataIdx += sizeof(uint16_t) /*DescriptorType*/ +
+                            sizeof(uint16_t) /*DescriptorLength*/ +
+                            currDescriptorLen;
+    }
+
+    return processedDataIdx;
+}
+
+void outputBICPackageWithSlotNumberInHeader(uint8_t slotNumber,
+                                            const std::string& inputPackagePath)
+{
+    auto package = openInputPackage(inputPackagePath);
+    auto newPackage = createOutputPackage(inputPackagePath);
+    size_t processedDataIdx = 0;
+
+    std::vector<uint8_t> packageHeader(sizeof(pldm_package_header_information));
+    package.seekg(0);
+    package.read(reinterpret_cast<char*>(packageHeader.data()),
+                 sizeof(pldm_package_header_information));
+    auto pkgHeaderInfo = reinterpret_cast<pldm_package_header_information*>(
+        packageHeader.data());
+    auto originalPkgHeaderSize = pkgHeaderInfo->package_header_size;
+
+    auto newDescriptorData = initNewDescriptorFor(slotNumber);
+    packageHeader.resize(originalPkgHeaderSize + newDescriptorData.size());
+    package.seekg(0);
+    package.read(reinterpret_cast<char*>(packageHeader.data()),
+                 originalPkgHeaderSize);
+
+    // Assign the data again to prevent memory reallocation caused by resize
+    pkgHeaderInfo = reinterpret_cast<pldm_package_header_information*>(
+        packageHeader.data());
+    pkgHeaderInfo->package_header_size += newDescriptorData.size();
+
+    // Assume the DeviceIDRecordCount is 1 because it's for BIC update.
+    processedDataIdx += sizeof(pldm_package_header_information) +
+                        pkgHeaderInfo->package_version_string_length +
+                        1 /*1 byte from DeviceIDRecordCount*/;
+
+    auto recordInfo = reinterpret_cast<pldm_firmware_device_id_record*>(
+        packageHeader.data() + processedDataIdx);
+
+    processedDataIdx += sizeof(pldm_firmware_device_id_record) +
+                        ceil(pkgHeaderInfo->component_bitmap_bit_length / 8) +
+                        recordInfo->comp_image_set_version_string_length;
+    processedDataIdx = skipOriginalDescriptors(recordInfo->descriptor_count,
+                                               packageHeader, processedDataIdx);
+
+    recordInfo->record_length += newDescriptorData.size();
+    recordInfo->descriptor_count += 1;
+
+    packageHeader.insert(packageHeader.begin() + processedDataIdx,
+                         newDescriptorData.begin(), newDescriptorData.end());
+    processedDataIdx += newDescriptorData.size();
+
+    constexpr uint8_t COMPONENT_IMAGE_COUNT_LENGTH = 2;
+    constexpr uint8_t COMPONENT_LOCATION_OFFSET = 12;
+    packageHeader.at(processedDataIdx + COMPONENT_IMAGE_COUNT_LENGTH +
+                     COMPONENT_LOCATION_OFFSET) += newDescriptorData.size();
+
+    auto checkSum = crc32(packageHeader.data(),
+                          pkgHeaderInfo->package_header_size - 4);
+    packageHeader.at(pkgHeaderInfo->package_header_size - 4) = checkSum;
+    packageHeader.at(pkgHeaderInfo->package_header_size - 3) = checkSum >> 8;
+    packageHeader.at(pkgHeaderInfo->package_header_size - 2) = checkSum >> 16;
+    packageHeader.at(pkgHeaderInfo->package_header_size - 1) = checkSum >> 24;
+    newPackage.write(reinterpret_cast<const char*>(packageHeader.data()),
+                     pkgHeaderInfo->package_header_size);
+
+    package.seekg(originalPkgHeaderSize);
+    // Write remaing package data
+    auto packageSize = std::filesystem::file_size(inputPackagePath);
+    package.seekg(originalPkgHeaderSize);
+    std::vector<uint8_t> packageData(packageSize - originalPkgHeaderSize);
+    package.read(reinterpret_cast<char*>(packageData.data()),
+                 packageData.size());
+    newPackage.write(reinterpret_cast<const char*>(packageData.data()),
+                     packageData.size());
+
+    package.close();
+    newPackage.close();
+}
+
+void tryReWrapBICUpdatePackage(uint8_t slotNumber,
+                               const std::string& inputPackagePath)
+{
+    try
+    {
+        outputBICPackageWithSlotNumberInHeader(slotNumber, inputPackagePath);
+    }
+    catch (const std::exception& e)
+    {
+        std::cerr << "Failed to re-wrap the update package, error: " << e.what()
+                  << std::endl;
+        return;
+    }
+}
+
+void outputCXLPackageWithSlotNumberInHeader(uint8_t slotNumber,
+                                            uint8_t instanceNum,
+                                            const std::string& inputPackagePath)
+{
+    const std::map<uint8_t, uint8_t> instanceToComponentId = {{1, 5}, {2, 6}};
+    auto package = openInputPackage(inputPackagePath);
+    auto newPackage = createOutputPackage(inputPackagePath);
+    size_t processedDataIdx = 0;
+
+    std::vector<uint8_t> packageHeader(sizeof(pldm_package_header_information));
+    package.seekg(0);
+    package.read(reinterpret_cast<char*>(packageHeader.data()),
+                 sizeof(pldm_package_header_information));
+    auto pkgHeaderInfo = reinterpret_cast<pldm_package_header_information*>(
+        packageHeader.data());
+    auto originalPkgHeaderSize = pkgHeaderInfo->package_header_size;
+
+    // Load the whole package header and leave space for new descriptor
+    auto newDescriptorData = initNewDescriptorFor(slotNumber);
+    packageHeader.resize(originalPkgHeaderSize + newDescriptorData.size());
+    package.seekg(0);
+    package.read(reinterpret_cast<char*>(packageHeader.data()),
+                 originalPkgHeaderSize);
+
+    // Assign the data again to prevent memory reallocation caused by resize
+    pkgHeaderInfo = reinterpret_cast<pldm_package_header_information*>(
+        packageHeader.data());
+    pkgHeaderInfo->package_header_size += newDescriptorData.size();
+
+    // Assume the DeviceIDRecordCount is 1 because it's for CXL update.
+    processedDataIdx += sizeof(pldm_package_header_information) +
+                        pkgHeaderInfo->package_version_string_length +
+                        1 /*1 byte from DeviceIDRecordCount*/;
+
+    auto recordInfo = reinterpret_cast<pldm_firmware_device_id_record*>(
+        packageHeader.data() + processedDataIdx);
+
+    processedDataIdx += sizeof(pldm_firmware_device_id_record) +
+                        ceil(pkgHeaderInfo->component_bitmap_bit_length / 8) +
+                        recordInfo->comp_image_set_version_string_length;
+    processedDataIdx = skipOriginalDescriptors(recordInfo->descriptor_count,
+                                               packageHeader, processedDataIdx);
+
+    recordInfo->record_length += newDescriptorData.size();
+    recordInfo->descriptor_count += 1;
+
+    packageHeader.insert(packageHeader.begin() + processedDataIdx,
+                         newDescriptorData.begin(), newDescriptorData.end());
+    processedDataIdx += newDescriptorData.size();
+
+    constexpr uint8_t COMPONENT_IMAGE_COUNT_LENGTH = 2;
+    constexpr uint8_t COMPONENT_ID_OFFSET = 2;
+    constexpr uint8_t COMPONENT_LOCATION_OFFSET = 12;
+    packageHeader.at(processedDataIdx + COMPONENT_IMAGE_COUNT_LENGTH +
+                     COMPONENT_ID_OFFSET) =
+        instanceToComponentId.at(instanceNum);
+    packageHeader.at(processedDataIdx + COMPONENT_IMAGE_COUNT_LENGTH +
+                     COMPONENT_LOCATION_OFFSET) += newDescriptorData.size();
+
+    auto checkSum = crc32(packageHeader.data(),
+                          pkgHeaderInfo->package_header_size - 4);
+    packageHeader.at(pkgHeaderInfo->package_header_size - 4) = checkSum;
+    packageHeader.at(pkgHeaderInfo->package_header_size - 3) = checkSum >> 8;
+    packageHeader.at(pkgHeaderInfo->package_header_size - 2) = checkSum >> 16;
+    packageHeader.at(pkgHeaderInfo->package_header_size - 1) = checkSum >> 24;
+    newPackage.write(reinterpret_cast<const char*>(packageHeader.data()),
+                     pkgHeaderInfo->package_header_size);
+
+    package.seekg(originalPkgHeaderSize);
+    // Write remaing package data
+    auto packageSize = std::filesystem::file_size(inputPackagePath);
+    package.seekg(originalPkgHeaderSize);
+    std::vector<uint8_t> packageData(packageSize - originalPkgHeaderSize);
+    package.read(reinterpret_cast<char*>(packageData.data()),
+                 packageData.size());
+    newPackage.write(reinterpret_cast<const char*>(packageData.data()),
+                     packageData.size());
+
+    package.close();
+    newPackage.close();
+    return;
+}
+
+void tryReWrapCXLUpdatePackage(uint8_t slotNumber, uint8_t instanceNum,
+                               const std::string& inputPackagePath)
+{
+    try
+    {
+        outputCXLPackageWithSlotNumberInHeader(slotNumber, instanceNum,
+                                               inputPackagePath);
+    }
+    catch (const std::exception& e)
+    {
+        std::cerr << "Failed to re-wrap the update package, error: " << e.what()
+                  << std::endl;
+        return;
+    }
+}
+
+int main(int argc, char** argv)
+{
+    std::string imagePath{};
+    uint8_t slotNumber, instanceNum;
+
+    CLI::App app{
+        "Re-wrap PLDM firmware update package, the output file will be ${input_file}_re_wrapped at the same path."};
+    app.require_subcommand(1);
+
+    // Init command for BIC
+    auto reWrapBIC = app.add_subcommand(
+        "bic", "Re-wrap the BIC firmware update package for a specific slot.");
+    reWrapBIC->add_option("-f,--file", imagePath, "The path of BIC image file.")
+        ->required()
+        ->check(CLI::ExistingFile);
+
+    reWrapBIC
+        ->add_option("-s,--slot", slotNumber, "The number of slot to update.")
+        ->required()
+        ->check(CLI::Range(1, 8));
+
+    reWrapBIC->callback(
+        [&]() { tryReWrapBICUpdatePackage(slotNumber, imagePath); });
+
+    // Init command for CXL
+    auto reWrapCXL = app.add_subcommand(
+        "cxl",
+        "Re-wrap the CXL firmware update package for a specific instance.");
+
+    reWrapCXL->add_option("-f,--file", imagePath, "The path of CXL image file.")
+        ->required()
+        ->check(CLI::ExistingFile);
+
+    reWrapCXL
+        ->add_option("-s,--slot", slotNumber, "The number of slot to update.")
+        ->required()
+        ->check(CLI::Range(1, 8));
+
+    reWrapCXL
+        ->add_option("-i,--instance", instanceNum,
+                     "The number of instance to update.")
+        ->required()
+        ->check(CLI::Range(1, 2));
+
+    reWrapCXL->callback([&]() {
+        tryReWrapCXLUpdatePackage(slotNumber, instanceNum, imagePath);
+    });
+
+    CLI11_PARSE(app, argc, argv);
+
+    return 0;
+}
diff --git a/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/files/meson.build b/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/files/meson.build
new file mode 100644
index 000000000000..4323539f7f79
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/files/meson.build
@@ -0,0 +1,31 @@
+project(
+  'pldm-package-re-wrapper',
+  'cpp',
+  version: '0.1',
+  meson_version: '>=0.57.0',
+  license: 'Apache-2.0',
+  default_options: [
+    'werror=true',
+    'warning_level=3',
+    'cpp_std=c++20',
+  ])
+
+cc = meson.get_compiler('cpp')
+
+src = [
+  'main.cpp',
+]
+
+libpldm_dep = dependency('libpldm', fallback:['libpldm','libpldm_dep'], include_type: 'system')
+
+dep_libs = [
+  libpldm_dep,
+  dependency('libpldm'),
+]
+
+executable(
+  'pldm-package-re-wrapper',
+  src,
+  dependencies: dep_libs,
+  install: true,
+)
diff --git a/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/pldm-package-re-wrapper_0.1.bb b/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/pldm-package-re-wrapper_0.1.bb
new file mode 100644
index 000000000000..ad0c56e2b8e5
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-facebook/pldm-package-re-wrapper/pldm-package-re-wrapper_0.1.bb
@@ -0,0 +1,22 @@
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
+
+SUMMARY = "OpenBMC PLDM Update package re-wrapping Tool"
+DESCRIPTION = "OpenBMC re-wrapping PLDM update packages header"
+
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+S = "${WORKDIR}"
+
+DEPENDS += " \
+    libpldm \
+    cli11 \
+"
+
+inherit meson pkgconfig
+
+SRC_URI = " \
+    file://meson.build \
+    file://main.cpp \
+    "
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0500-add-meta-yv4-bmc-dts-setting.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0500-add-meta-yv4-bmc-dts-setting.patch
index 5500216adf5a..9e55773a3af8 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0500-add-meta-yv4-bmc-dts-setting.patch
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0500-add-meta-yv4-bmc-dts-setting.patch
@@ -1,7 +1,7 @@
-From cf180d076a6a923636ee38da24548b1f8d123640 Mon Sep 17 00:00:00 2001
+From eb0a33020b186ed6326ca95ac7a2b7d85edc8294 Mon Sep 17 00:00:00 2001
 From: Eric <Eric_LC_Chen@wiwynn.com>
 Date: Tue, 24 Oct 2023 17:43:44 +0800
-Subject: [PATCH] add meta yv4 bmc dts setting
+Subject: [PATCH 500/510] add meta yv4 bmc dts setting
 
 This commit depends on the patch below:
 [1] https://lore.kernel.org/lkml/20240109072053.3980855-1-Delphine_CC_Chiu@wiwynn.com/
@@ -1419,5 +1419,5 @@ index 64075cc41d92..340be5b9081a 100644
 +	};
 +};
 -- 
-2.25.1
+2.43.0
 
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0501-hwmon-ina233-Add-ina233-driver.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0501-hwmon-ina233-Add-ina233-driver.patch
index 839c29067ef2..32f47016abfa 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0501-hwmon-ina233-Add-ina233-driver.patch
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0501-hwmon-ina233-Add-ina233-driver.patch
@@ -1,7 +1,7 @@
-From 89ffe8d94dd9c47c7d9e85dd3681f0c4682b5e6f Mon Sep 17 00:00:00 2001
+From a128c14111740b8c70b2ef1284ba6a734ed13e51 Mon Sep 17 00:00:00 2001
 From: DelphineCCChiu <Delphine_CC_Chiu@wiwynn.com>
 Date: Thu, 21 Sep 2023 18:35:19 +0800
-Subject: [PATCH 501/506] hwmon: (ina233) Add ina233 driver
+Subject: [PATCH 501/510] hwmon: (ina233) Add ina233 driver
 
 This commit depends on the patch below:
 [1] https://lore.kernel.org/all/20230920054739.1561080-1-Delphine_CC_Chiu@wiwynn.com/
@@ -15,10 +15,10 @@ This commit depends on the patch below:
  create mode 100644 drivers/hwmon/pmbus/ina233.c
 
 diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
-index 294808f5240a..02809fe6331c 100644
+index 617d45295bb3..89075b4a5aea 100644
 --- a/drivers/hwmon/pmbus/Kconfig
 +++ b/drivers/hwmon/pmbus/Kconfig
-@@ -537,4 +537,13 @@ config SENSORS_ZL6100
+@@ -546,4 +546,13 @@ config SENSORS_ZL6100
  	  This driver can also be built as a module. If so, the module will
  	  be called zl6100.
  
@@ -33,11 +33,11 @@ index 294808f5240a..02809fe6331c 100644
 +
  endif # PMBUS
 diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile
-index cf8a76744545..7aa0d4548a15 100644
+index f626db4e99e9..f4f7e3b399ae 100644
 --- a/drivers/hwmon/pmbus/Makefile
 +++ b/drivers/hwmon/pmbus/Makefile
-@@ -54,3 +54,4 @@ obj-$(CONFIG_SENSORS_XDPE122)	+= xdpe12284.o
- obj-$(CONFIG_SENSORS_XDPE152)	+= xdpe152c4.o
+@@ -55,3 +55,4 @@ obj-$(CONFIG_SENSORS_XDPE152)	+= xdpe152c4.o
+ obj-$(CONFIG_SENSORS_XDPE132)   += xdpe132g5c.o
  obj-$(CONFIG_SENSORS_ZL6100)	+= zl6100.o
  obj-$(CONFIG_SENSORS_PIM4328)	+= pim4328.o
 +obj-$(CONFIG_SENSORS_INA233) += ina233.o
@@ -137,5 +137,5 @@ index 000000000000..d5c7d7408ac3
 +MODULE_IMPORT_NS(PMBUS);
 +
 -- 
-2.41.0
+2.43.0
 
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0502-hwmon-max31790-support-to-config-PWM-as-TACH.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0502-hwmon-max31790-support-to-config-PWM-as-TACH.patch
index ac531a680304..ffe398ffa249 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0502-hwmon-max31790-support-to-config-PWM-as-TACH.patch
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0502-hwmon-max31790-support-to-config-PWM-as-TACH.patch
@@ -1,7 +1,7 @@
-From cad1d70b18851c04e6fc90a6810a19feeba971f1 Mon Sep 17 00:00:00 2001
+From 3abdcdb3e2a7723eaf6960cabc9c31e9cd5db8c2 Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
 Date: Wed, 6 Sep 2023 16:19:16 +0800
-Subject: [PATCH 502/506] hwmon: max31790: support to config PWM as TACH
+Subject: [PATCH 502/510] hwmon: max31790: support to config PWM as TACH
 
 The PWM outputs of max31790 could be used as tachometer inputs by
 setting the fan configuration register, but the driver doesn't support
@@ -123,5 +123,5 @@ index 0cd44c1e998a..378ff32c7c1e 100644
  	 * Initialize the max31790 chip
  	 */
 -- 
-2.41.0
+2.43.0
 
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0503-Add-adm1281-driver.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0503-Add-adm1281-driver.patch
index 3cb190ed68b2..e3d11fe6c90c 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0503-Add-adm1281-driver.patch
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0503-Add-adm1281-driver.patch
@@ -1,7 +1,7 @@
-From 33f96a211e6b5a96aa0125c043ee20de438feaae Mon Sep 17 00:00:00 2001
+From b880e2c3457d08e3183d9ea436ccf311dd06dcb7 Mon Sep 17 00:00:00 2001
 From: Eli_Huang <Eli_Huang@wiwynn.com>
 Date: Tue, 26 Sep 2023 10:20:13 +0800
-Subject: [PATCH 503/506] Add adm1281 driver
+Subject: [PATCH 503/510] Add adm1281 driver
 
 ---
  Documentation/devicetree/bindings/hwmon/adi,adm1275.yaml | 2 ++
@@ -96,5 +96,5 @@ index e2c61d6fa521..979474ba6bd3 100644
  		data->have_pin_max = true;
  		data->have_temp_max = true;
 -- 
-2.41.0
+2.43.0
 
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0504-hwmon-max31790-add-fanN_enable-for-all-fans.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0504-hwmon-max31790-add-fanN_enable-for-all-fans.patch
index 2428af6df646..e71482f674f2 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0504-hwmon-max31790-add-fanN_enable-for-all-fans.patch
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0504-hwmon-max31790-add-fanN_enable-for-all-fans.patch
@@ -1,7 +1,7 @@
-From c6f35d436cc5070e744664605224a69d471d70ef Mon Sep 17 00:00:00 2001
+From c2f8ce293b7137d0c6ac7b932e2eb80f562b49a1 Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
 Date: Wed, 1 Nov 2023 18:18:29 +0800
-Subject: [PATCH 504/506] hwmon: max31790: add fanN_enable for all fans
+Subject: [PATCH 504/510] hwmon: max31790: add fanN_enable for all fans
 
 The fanN_enable will be set in dbus-sensors service according to the
 index of TACH that filled in the configuration of entity-manager.
@@ -133,5 +133,5 @@ index 378ff32c7c1e..fa31e108c7ce 100644
  			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
  			   HWMON_PWM_INPUT | HWMON_PWM_ENABLE,
 -- 
-2.41.0
+2.43.0
 
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0505-ARM-dts-aspeed-yosemite4-support-mux-to-cpld.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0505-ARM-dts-aspeed-yosemite4-support-mux-to-cpld.patch
index 2e44defbbaef..08dbb8c5723b 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0505-ARM-dts-aspeed-yosemite4-support-mux-to-cpld.patch
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0505-ARM-dts-aspeed-yosemite4-support-mux-to-cpld.patch
@@ -1,7 +1,7 @@
-From 9bcd542f390a43e815422c6242280d249351b00c Mon Sep 17 00:00:00 2001
+From 221a029f348ece02c5b7700a1e3be0aa6fb0733c Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
 Date: Mon, 11 Dec 2023 10:22:47 +0800
-Subject: [PATCH 505/506] ARM: dts: aspeed: yosemite4: support mux to cpld
+Subject: [PATCH 505/510] ARM: dts: aspeed: yosemite4: support mux to cpld
 
 Mux pca9544 to cpld was added on EVT HW schematic design,
 so add dts setting for devices behind mux pca9544 to cpld
@@ -15,7 +15,7 @@ Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
  1 file changed, 49 insertions(+), 15 deletions(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index 6cfbba121fba..4ea0df54546d 100644
+index 340be5b9081a..61d7efdc625e 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 @@ -36,6 +36,10 @@ aliases {
@@ -100,5 +100,5 @@ index 6cfbba121fba..4ea0df54546d 100644
  };
  
 -- 
-2.41.0
+2.43.0
 
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0506-ARM-dts-aspeed-yosemite4-Revise-gpio-name.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0506-ARM-dts-aspeed-yosemite4-Revise-gpio-name.patch
index 8f044dba2ec2..fb3e4ff23073 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0506-ARM-dts-aspeed-yosemite4-Revise-gpio-name.patch
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0506-ARM-dts-aspeed-yosemite4-Revise-gpio-name.patch
@@ -1,7 +1,7 @@
-From 94c6883838f9a9bf8a765ec9ed28f6c3602e84fd Mon Sep 17 00:00:00 2001
+From 1ee82ba8938ea8fb47c9dd3bda0df72fd106392f Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
 Date: Mon, 11 Dec 2023 10:29:27 +0800
-Subject: [PATCH 506/506] ARM: dts: aspeed: yosemite4: Revise gpio name
+Subject: [PATCH 506/510] ARM: dts: aspeed: yosemite4: Revise gpio name
 
 Revise gpio name for EVT schematic changes
 
@@ -14,7 +14,7 @@ Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
  1 file changed, 6 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index 4ea0df54546d..46684c40a244 100644
+index 61d7efdc625e..9e707ac85a37 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 @@ -1418,7 +1418,7 @@ &pinctrl_gpiu4_default &pinctrl_gpiu5_default
@@ -59,5 +59,5 @@ index 4ea0df54546d..46684c40a244 100644
  			"FM_RESBTN_SLOT7_BMC_N","FM_RESBTN_SLOT8_BMC_N",
  			"","","","",
 -- 
-2.41.0
+2.43.0
 
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0507-remove-pincontrol-to-GPIO-U5.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0507-remove-pincontrol-on-GPIO-U5.patch
similarity index 87%
rename from meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0507-remove-pincontrol-to-GPIO-U5.patch
rename to meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0507-remove-pincontrol-on-GPIO-U5.patch
index 33af61abe006..56761728bbb0 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0507-remove-pincontrol-to-GPIO-U5.patch
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0507-remove-pincontrol-on-GPIO-U5.patch
@@ -1,7 +1,7 @@
-From 76e901f284f85492e95b94cfff7fe6717ecf5655 Mon Sep 17 00:00:00 2001
+From 5971607107e666cebb2b3b4da9a4918e90744b99 Mon Sep 17 00:00:00 2001
 From: Chris Wang <Chris_Wang@wiwynn.com>
 Date: Wed, 20 Dec 2023 16:16:06 +0800
-Subject: [PATCH] remove pincontrol on GPIO U5
+Subject: [PATCH 507/510] remove pincontrol on GPIO U5
 
 Remove pincontrol on GPIO U5 to avoid kernel occupation, let programs at
 application layer can monitor the pin.
@@ -13,7 +13,7 @@ This commit depends on the patch below:
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
-index 46684c40a244..79696e09e6a9 100644
+index 9e707ac85a37..3f07e736eae4 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
 @@ -1411,8 +1411,7 @@ &sgpiom0 {
@@ -27,5 +27,5 @@ index 46684c40a244..79696e09e6a9 100644
  	/*A0-A7*/       "","","","","","","","",
  	/*B0-B7*/       "FLT_HSC_SERVER_SLOT8_N","AC_ON_OFF_BTN_CPLD_SLOT5_N",
 -- 
-2.25.1
+2.43.0
 
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0508-NCSI-Add-propety-no-channel-monitor-and-start-redo-p.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0508-NCSI-Add-propety-no-channel-monitor-and-start-redo-p.patch
new file mode 100644
index 000000000000..d37661527726
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0508-NCSI-Add-propety-no-channel-monitor-and-start-redo-p.patch
@@ -0,0 +1,111 @@
+From 3350d92a040dc2504d92afb11249c29c033880df Mon Sep 17 00:00:00 2001
+From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+Date: Tue, 2 Jan 2024 17:50:00 +0800
+Subject: [PATCH 508/510] NCSI: Add propety : no-channel-monitor and
+ start-redo-probe
+
+Add property start-redo-probe to , because Mellanox cx7 nic card
+cannot't get mac address after nic card re-plug.
+Setup start-redo-probe property so that nic card can get MAC address again.
+Also setup no-channel-monitor property so that the log won't keep
+popping up when nic card re-plug.
+
+This commit depends on the patch below:
+[1] https://lore.kernel.org/all/20240118052220.1906721-1-Delphine_CC_Chiu@wiwynn.com/
+
+Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+---
+ net/ncsi/internal.h    |  6 ++++++
+ net/ncsi/ncsi-manage.c | 25 +++++++++++++++++++++++--
+ 2 files changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h
+index 374412ed780b..a07c41411338 100644
+--- a/net/ncsi/internal.h
++++ b/net/ncsi/internal.h
+@@ -202,6 +202,11 @@ struct ncsi_channel_stats {
+ 	u32 pt_rx_os_err;	/* Rx oversize errors         */
+ };
+ 
++enum {
++	NCSI_CTRL_FLAG_NO_CHANNEL_MONITOR	= 0x0001,
++	NCSI_CTRL_FLAG_START_REDO_PROBE		= 0x0002,
++};
++
+ struct ncsi_dev_priv;
+ struct ncsi_package;
+ 
+@@ -343,6 +348,7 @@ struct ncsi_dev_priv {
+ 	bool                multi_package;   /* Enable multiple packages   */
+ 	bool                mlx_multi_host;  /* Enable multi host Mellanox */
+ 	u32                 package_whitelist; /* Packages to configure    */
++	unsigned int        ctrl_flags;      /* NCSI control flags */
+ };
+ 
+ struct ncsi_cmd_arg {
+diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
+index 745c788f1d1d..2d8e3fb95124 100644
+--- a/net/ncsi/ncsi-manage.c
++++ b/net/ncsi/ncsi-manage.c
+@@ -1206,7 +1206,8 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp)
+ 		ndp->hot_channel = hot_nc;
+ 		spin_unlock_irqrestore(&ndp->lock, flags);
+ 
+-		ncsi_start_channel_monitor(nc);
++		if (!(ndp->ctrl_flags & NCSI_CTRL_FLAG_NO_CHANNEL_MONITOR))
++			ncsi_start_channel_monitor(nc);
+ 		ncsi_process_next_channel(ndp);
+ 		break;
+ 	default:
+@@ -1770,6 +1771,7 @@ struct ncsi_dev *ncsi_register_dev(struct net_device *dev,
+ 	INIT_LIST_HEAD(&ndp->vlan_vids);
+ 	INIT_WORK(&ndp->work, ncsi_dev_work);
+ 	ndp->package_whitelist = UINT_MAX;
++	ndp->ctrl_flags = 0;
+ 
+ 	/* Initialize private NCSI device */
+ 	spin_lock_init(&ndp->lock);
+@@ -1795,8 +1797,14 @@ struct ncsi_dev *ncsi_register_dev(struct net_device *dev,
+ 	if (pdev) {
+ 		np = pdev->dev.of_node;
+ 		if (np && (of_property_read_bool(np, "mellanox,multi-host") ||
+-			   of_property_read_bool(np, "mlx,multi-host")))
++			of_property_read_bool(np, "mlx,multi-host")))
+ 			ndp->mlx_multi_host = true;
++
++		if (np && of_get_property(np, "ncsi-ctrl,no-channel-monitor", NULL))
++			ndp->ctrl_flags |= NCSI_CTRL_FLAG_NO_CHANNEL_MONITOR;
++
++		if (np && of_get_property(np, "ncsi-ctrl,start-redo-probe", NULL))
++			ndp->ctrl_flags |= NCSI_CTRL_FLAG_START_REDO_PROBE;
+ 	}
+ 
+ 	return nd;
+@@ -1806,11 +1814,24 @@ EXPORT_SYMBOL_GPL(ncsi_register_dev);
+ int ncsi_start_dev(struct ncsi_dev *nd)
+ {
+ 	struct ncsi_dev_priv *ndp = TO_NCSI_DEV_PRIV(nd);
++	struct ncsi_package *np, *tmp;
++	unsigned long flags;
+ 
+ 	if (nd->state != ncsi_dev_state_registered &&
+ 	    nd->state != ncsi_dev_state_functional)
+ 		return -ENOTTY;
+ 
++	if (ndp->ctrl_flags & NCSI_CTRL_FLAG_START_REDO_PROBE) {
++		nd->state = ncsi_dev_state_probe;
++		spin_lock_irqsave(&ndp->lock, flags);
++		ndp->flags &= ~NCSI_DEV_PROBED;
++		ndp->gma_flag = 0;
++		spin_unlock_irqrestore(&ndp->lock, flags);
++
++		list_for_each_entry_safe(np, tmp, &ndp->packages, node)
++			ncsi_remove_package(np);
++	}
++
+ 	if (!(ndp->flags & NCSI_DEV_PROBED)) {
+ 		ndp->package_probe_id = 0;
+ 		nd->state = ncsi_dev_state_probe;
+-- 
+2.43.0
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0509-Meta-yv4-dts-add-mac-config-property.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0509-Meta-yv4-dts-add-mac-config-property.patch
new file mode 100644
index 000000000000..fc371a40d306
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0509-Meta-yv4-dts-add-mac-config-property.patch
@@ -0,0 +1,38 @@
+From 3ea853377671d0b11dadf129e974fd32b07db229 Mon Sep 17 00:00:00 2001
+From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+Date: Wed, 3 Jan 2024 13:49:42 +0800
+Subject: [PATCH 509/510] Meta yv4 dts : add mac config property
+
+To fix Mellanox cx7 cannot get IP after NIC re-plug.
+
+This commit depends on the patch below:
+[1] https://lore.kernel.org/all/20240118060041.1923700-1-Delphine_CC_Chiu@wiwynn.com/
+---
+ arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+index 3f07e736eae4..6933e40291a5 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+@@ -137,6 +137,8 @@ &mac2 {
+ 	pinctrl-0 = <&pinctrl_rmii3_default>;
+ 	use-ncsi;
+ 	mlx,multi-host;
++	ncsi-ctrl,start-redo-probe;
++	ncsi-ctrl,no-channel-monitor;
+ };
+ 
+ &mac3 {
+@@ -145,6 +147,8 @@ &mac3 {
+ 	pinctrl-0 = <&pinctrl_rmii4_default>;
+ 	use-ncsi;
+ 	mlx,multi-host;
++	ncsi-ctrl,start-redo-probe;
++	ncsi-ctrl,no-channel-monitor;
+ };
+ 
+ &fmc {
+-- 
+2.43.0
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0510-yosemite4-Add-EEPROMs-for-NICs-in-DTS.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0510-yosemite4-Add-EEPROMs-for-NICs-in-DTS.patch
new file mode 100644
index 000000000000..b5b595bd1ed9
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0510-yosemite4-Add-EEPROMs-for-NICs-in-DTS.patch
@@ -0,0 +1,66 @@
+From 868d6daf03c70a8907d1f9d2fa1580893a5564a7 Mon Sep 17 00:00:00 2001
+From: PeterHo-wiwynn <Peter_MH_Ho@wiwynn.com>
+Date: Tue, 30 Jan 2024 15:13:10 +0800
+Subject: [PATCH 510/510] yosemite4: Add EEPROMs for NICs in DTS
+
+Add EEPROM driver for NICs in order to read FRU info.
+https://lore.kernel.org/lkml/20240131084134.328307-1-Delphine_CC_Chiu@wiwynn.com/
+---
+ .../aspeed/aspeed-bmc-facebook-yosemite4.dts  | 20 +++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+index 6933e40291a5..9a734888869a 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+@@ -1321,6 +1321,11 @@ emc1403@3c {
+ 				compatible = "smsc,emc1403";
+ 				reg = <0x3c>;
+ 			};
++
++			eeprom@50 {
++				compatible = "atmel,24c64";
++				reg = <0x50>;
++			};
+ 		};
+ 
+ 		imux25: i2c@1 {
+@@ -1337,6 +1342,11 @@ emc1403@3c {
+ 				compatible = "smsc,emc1403";
+ 				reg = <0x3c>;
+ 			};
++
++			eeprom@50 {
++				compatible = "atmel,24c64";
++				reg = <0x50>;
++			};
+ 		};
+ 
+ 		imux26: i2c@2 {
+@@ -1353,6 +1363,11 @@ emc1403@3c {
+ 				compatible = "smsc,emc1403";
+ 				reg = <0x3c>;
+ 			};
++
++			eeprom@50 {
++				compatible = "atmel,24c64";
++				reg = <0x50>;
++			};
+ 		};
+ 
+ 		imux27: i2c@3 {
+@@ -1369,6 +1384,11 @@ emc1403@3c {
+ 				compatible = "smsc,emc1403";
+ 				reg = <0x3c>;
+ 			};
++
++			eeprom@50 {
++				compatible = "atmel,24c64";
++				reg = <0x50>;
++			};
+ 		};
+ 	};
+ };
+-- 
+2.43.0
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0511-Add-ina233-and-ina238-devicetree-config.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0511-Add-ina233-and-ina238-devicetree-config.patch
new file mode 100644
index 000000000000..da429a082ff2
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0511-Add-ina233-and-ina238-devicetree-config.patch
@@ -0,0 +1,37 @@
+From 408b51c446230ee77a2508783eb6653aa694c17f Mon Sep 17 00:00:00 2001
+From: Eric <Eric_LC_Chen@wiwynn.com>
+Date: Mon, 29 Jan 2024 16:59:19 +0800
+Subject: [PATCH] Add ina233 and ina238 devicetree config for EVT schematic
+ change
+
+---
+ .../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts    | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+index 6933e40291a5..1befc0f67394 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+@@ -919,6 +919,19 @@ power-sensor@40 {
+ 			reg = <0x40>;
+ 	};
+ 
++	power-sensor@41 {
++		compatible = "ti,ina233";
++		resistor-calibration = /bits/ 16 <0x0a00>;
++		current-lsb= /bits/ 16 <0x0001>;
++		reg = <0x41>;
++	};
++
++	power-sensor@44 {
++		compatible = "ti,ina238";
++		shunt-resistor = <1000>;
++		reg = <0x44>;
++	};
++
+ 	temperature-sensor@48 {
+ 		compatible = "ti,tmp75";
+ 		reg = <0x48>;
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0512-Adjust-resistor-calibration-for-matching-hardware-de.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0512-Adjust-resistor-calibration-for-matching-hardware-de.patch
new file mode 100644
index 000000000000..c17d77977808
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0512-Adjust-resistor-calibration-for-matching-hardware-de.patch
@@ -0,0 +1,62 @@
+From 6e15f71291c5b1ab7bbed0d97ab5e865888fbfbe Mon Sep 17 00:00:00 2001
+From: PeterHo-wiwynn <Peter_MH_Ho@wiwynn.com>
+Date: Tue, 5 Mar 2024 15:15:49 +0800
+Subject: [PATCH] Adjust resistor-calibration for matching hardware design
+
+This patch is for hardware testing. According to the datasheet and
+upstream review comment, resistor-calibration should be calculated,
+and we should set external shunt on DTS instead. We will revise the
+ina233 driver by the upstream review comment and contribute the code
+once we finish.
+---
+ .../boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts  | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+index 45248c31db22..a8b724049e83 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+@@ -1079,35 +1079,35 @@ adc@37 {
+ 	power-sensor@40 {
+ 		compatible = "ti,ina233";
+ 		reg = <0x40>;
+-		resistor-calibration = /bits/ 16 <0x0a00>;
++		resistor-calibration = /bits/ 16 <0x0400>;
+ 		current-lsb= /bits/ 16 <0x0001>;
+ 	};
+ 
+ 	power-sensor@41 {
+ 		compatible = "ti,ina233";
+ 		reg = <0x41>;
+-		resistor-calibration = /bits/ 16 <0x0a00>;
++		resistor-calibration = /bits/ 16 <0x0400>;
+ 		current-lsb= /bits/ 16 <0x0001>;
+ 	};
+ 
+ 	power-sensor@42 {
+ 		compatible = "ti,ina233";
+ 		reg = <0x42>;
+-		resistor-calibration = /bits/ 16 <0x0a00>;
++		resistor-calibration = /bits/ 16 <0x0400>;
+ 		current-lsb= /bits/ 16 <0x0001>;
+ 	};
+ 
+ 	power-sensor@43 {
+ 		compatible = "ti,ina233";
+ 		reg = <0x43>;
+-		resistor-calibration = /bits/ 16 <0x0a00>;
++		resistor-calibration = /bits/ 16 <0x0400>;
+ 		current-lsb= /bits/ 16 <0x0001>;
+ 	};
+ 
+ 	power-sensor@44 {
+ 		compatible = "ti,ina233";
+ 		reg = <0x44>;
+-		resistor-calibration = /bits/ 16 <0x0a00>;
++		resistor-calibration = /bits/ 16 <0x0400>;
+ 		current-lsb= /bits/ 16 <0x0001>;
+ 	};
+ 
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0513-ARM-dts-aspeed-yosemite4-Revise-i2c-duty-cycle.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0513-ARM-dts-aspeed-yosemite4-Revise-i2c-duty-cycle.patch
new file mode 100644
index 000000000000..c15a72dd20d7
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0513-ARM-dts-aspeed-yosemite4-Revise-i2c-duty-cycle.patch
@@ -0,0 +1,37 @@
+From 52447ede2e12edd8d58a682dd31ff443035577c4 Mon Sep 17 00:00:00 2001
+From: Eric <Eric_LC_Chen@wiwynn.com>
+Date: Tue, 5 Mar 2024 10:57:35 +0800
+Subject: [PATCH] ARM: dts: aspeed: yosemite4: Revise i2c duty cycle
+
+To meet 400kHz-i2c clock low time spec (> 1.3 us)
+Revise duty cycle SMB11 and SMB16 to 40:60.
+
+https://lore.kernel.org/all/20240312061556.496605-23-Delphine_CC_Chiu@wiwynn.com/
+
+---
+ arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+index 45248c31db22..a1b7169e1e63 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+@@ -765,6 +765,7 @@ eeprom@54 {
+ &i2c10 {
+ 	status = "okay";
+ 	bus-frequency = <400000>;
++        i2c-clk-high-min-percent = <40>;
+ 	i2c-mux@74 {
+ 		compatible = "nxp,pca9544";
+ 		i2c-mux-idle-disconnect;
+@@ -1310,6 +1311,7 @@ &i2c15 {
+ 	mctp-controller;
+ 	multi-master;
+ 	bus-frequency = <400000>;
++        i2c-clk-high-min-percent = <40>;
+ 
+ 	mctp@10 {
+ 		compatible = "mctp-i2c-controller";
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0514-ARM-dts-aspeed-yosemite4-Enable-ipmb-device-for-OCP-.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0514-ARM-dts-aspeed-yosemite4-Enable-ipmb-device-for-OCP-.patch
new file mode 100644
index 000000000000..11cdc14cfba4
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0514-ARM-dts-aspeed-yosemite4-Enable-ipmb-device-for-OCP-.patch
@@ -0,0 +1,39 @@
+From 7ef356e12bd3e58695877111e3420c090170effb Mon Sep 17 00:00:00 2001
+From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+Date: Tue, 12 Mar 2024 16:24:52 +0800
+Subject: [PATCH] ARM: dts: aspeed: yosemite4: Enable ipmb device for OCP debug
+ card
+
+Add OCP debug card devicetree config
+
+This commit depends on the patch below:
+[1] https://lore.kernel.org/lkml/20240312053320.380997-1-Delphine_CC_Chiu@wiwynn.com/
+
+Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+---
+ .../boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts    | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+index a8b724049e83..c736e342a427 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+@@ -1026,6 +1026,15 @@ imux37: i2c@3 {
+ &i2c13 {
+ 	status = "okay";
+ 	bus-frequency = <400000>;
++	multi-master;
++
++	ipmb@10 {
++		compatible = "ipmb-dev";
++		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
++		i2c-protocol;
++	};
++
++
+ 	gpio@20 {
+ 		compatible = "nxp,pca9506";
+ 		reg = <0x20>;
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0515-pinctrl-pinctrl-aspeed-g6-correct-the-offset-of-SCU6.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0515-pinctrl-pinctrl-aspeed-g6-correct-the-offset-of-SCU6.patch
new file mode 100644
index 000000000000..56784ac19f3f
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0515-pinctrl-pinctrl-aspeed-g6-correct-the-offset-of-SCU6.patch
@@ -0,0 +1,83 @@
+From c0031257d36506ee057fcea167dfad66d8aa2869 Mon Sep 17 00:00:00 2001
+From: RickyWu-wiwynn <ricky_cx_wu@wiwynn.com>
+Date: Tue, 5 Mar 2024 09:30:21 +0800
+Subject: [PATCH] pinctrl: pinctrl-aspeed-g6: correct the offset of SCU630
+
+Description:
+Correct the offset of "Disable GPIO Internal Pull-Down #4" register that
+should be 630h according to the AST2620 datasheet.
+---
+ drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +++++++++++-----------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
+index 80838dc54b3a..7938741136a2 100644
+--- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
++++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c
+@@ -43,7 +43,7 @@
+ #define SCU614		0x614 /* Disable GPIO Internal Pull-Down #1 */
+ #define SCU618		0x618 /* Disable GPIO Internal Pull-Down #2 */
+ #define SCU61C		0x61c /* Disable GPIO Internal Pull-Down #3 */
+-#define SCU620		0x620 /* Disable GPIO Internal Pull-Down #4 */
++#define SCU630		0x630 /* Disable GPIO Internal Pull-Down #4 */
+ #define SCU634		0x634 /* Disable GPIO Internal Pull-Down #5 */
+ #define SCU638		0x638 /* Disable GPIO Internal Pull-Down #6 */
+ #define SCU690		0x690 /* Multi-function Pin Control #24 */
+@@ -2494,38 +2494,38 @@ static struct aspeed_pin_config aspeed_g6_configs[] = {
+ 	ASPEED_PULL_DOWN_PINCONF(D14, SCU61C, 0),
+ 
+ 	/* GPIOS7 */
+-	ASPEED_PULL_DOWN_PINCONF(T24, SCU620, 23),
++	ASPEED_PULL_DOWN_PINCONF(T24, SCU630, 23),
+ 	/* GPIOS6 */
+-	ASPEED_PULL_DOWN_PINCONF(P23, SCU620, 22),
++	ASPEED_PULL_DOWN_PINCONF(P23, SCU630, 22),
+ 	/* GPIOS5 */
+-	ASPEED_PULL_DOWN_PINCONF(P24, SCU620, 21),
++	ASPEED_PULL_DOWN_PINCONF(P24, SCU630, 21),
+ 	/* GPIOS4 */
+-	ASPEED_PULL_DOWN_PINCONF(R26, SCU620, 20),
++	ASPEED_PULL_DOWN_PINCONF(R26, SCU630, 20),
+ 	/* GPIOS3*/
+-	ASPEED_PULL_DOWN_PINCONF(R24, SCU620, 19),
++	ASPEED_PULL_DOWN_PINCONF(R24, SCU630, 19),
+ 	/* GPIOS2 */
+-	ASPEED_PULL_DOWN_PINCONF(T26, SCU620, 18),
++	ASPEED_PULL_DOWN_PINCONF(T26, SCU630, 18),
+ 	/* GPIOS1 */
+-	ASPEED_PULL_DOWN_PINCONF(T25, SCU620, 17),
++	ASPEED_PULL_DOWN_PINCONF(T25, SCU630, 17),
+ 	/* GPIOS0 */
+-	ASPEED_PULL_DOWN_PINCONF(R23, SCU620, 16),
++	ASPEED_PULL_DOWN_PINCONF(R23, SCU630, 16),
+ 
+ 	/* GPIOR7 */
+-	ASPEED_PULL_DOWN_PINCONF(U26, SCU620, 15),
++	ASPEED_PULL_DOWN_PINCONF(U26, SCU630, 15),
+ 	/* GPIOR6 */
+-	ASPEED_PULL_DOWN_PINCONF(W26, SCU620, 14),
++	ASPEED_PULL_DOWN_PINCONF(W26, SCU630, 14),
+ 	/* GPIOR5 */
+-	ASPEED_PULL_DOWN_PINCONF(T23, SCU620, 13),
++	ASPEED_PULL_DOWN_PINCONF(T23, SCU630, 13),
+ 	/* GPIOR4 */
+-	ASPEED_PULL_DOWN_PINCONF(U25, SCU620, 12),
++	ASPEED_PULL_DOWN_PINCONF(U25, SCU630, 12),
+ 	/* GPIOR3*/
+-	ASPEED_PULL_DOWN_PINCONF(V26, SCU620, 11),
++	ASPEED_PULL_DOWN_PINCONF(V26, SCU630, 11),
+ 	/* GPIOR2 */
+-	ASPEED_PULL_DOWN_PINCONF(V24, SCU620, 10),
++	ASPEED_PULL_DOWN_PINCONF(V24, SCU630, 10),
+ 	/* GPIOR1 */
+-	ASPEED_PULL_DOWN_PINCONF(U24, SCU620, 9),
++	ASPEED_PULL_DOWN_PINCONF(U24, SCU630, 9),
+ 	/* GPIOR0 */
+-	ASPEED_PULL_DOWN_PINCONF(V25, SCU620, 8),
++	ASPEED_PULL_DOWN_PINCONF(V25, SCU630, 8),
+ 
+ 	/* GPIOX7 */
+ 	ASPEED_PULL_DOWN_PINCONF(AB10, SCU634, 31),
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0516-ARM-dts-aspeed-yosemite4-disable-GPIO-internal-Pull-.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0516-ARM-dts-aspeed-yosemite4-disable-GPIO-internal-Pull-.patch
new file mode 100644
index 000000000000..2bc9de7922c7
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0516-ARM-dts-aspeed-yosemite4-disable-GPIO-internal-Pull-.patch
@@ -0,0 +1,72 @@
+From 757798b2585876c3cedeebf097956b0f70010ae9 Mon Sep 17 00:00:00 2001
+From: RickyWu-wiwynn <ricky_cx_wu@wiwynn.com>
+Date: Mon, 4 Mar 2024 17:48:40 +0800
+Subject: [PATCH] ARM: dts: aspeed: yosemite4: disable GPIO internal Pull-Down
+
+Disable GPIO internal Pull-Down for hardware validation.
+---
+ .../aspeed/aspeed-bmc-facebook-yosemite4.dts  | 45 ++++++++++++++++++-
+ 1 file changed, 44 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+index 45248c31db22..90d1c792ce2d 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+@@ -1445,10 +1445,53 @@ &sgpiom0 {
+ 	bus-frequency = <48000>;
+ };
+ 
++&pinctrl {
++	pinctrl_gpio0_unbiased: gpio0_unbiased {
++		/* GPIOB0, GPIOB1 */
++		pins = "J26", "K23";
++		bias-disable;
++	};
++	pinctrl_gpio2_unbiased: gpio2_unbiased {
++		/* GPIOI5, GPIOI6, GPIOI7,
++		   GPIOL6 */
++		pins = "E16", "B16", "A15", "B14";
++		bias-disable;
++	};
++	pinctrl_gpio3_unbiased: gpio3_unbiased {
++		/* GPIOM2, GPIOM3, GPIOM4, GPIOM5,
++		   GPION0, GPION1, GPION2, GPION3, GPION5,
++		   GPIOO0, GPIOO1, GPIOO2, GPIOO3,
++		   GPIOP0, GPIOP1, GPIOP2, GPIOP3, GPIOP4, GPIOP5, GPIOP6 */
++		pins = "A12", "E14", "B12", "C12", "P25", "N23", "N25", "N24", "M23", "AD26", "AD22", "AD23", "AD24", "AB22", "W24", "AA23", "AA24", "W23", "AB23", "AB24";
++		bias-disable;
++	};
++	pinctrl_gpio4_unbiased: gpio4_unbiased {
++		/* GPIOR0, GPIOR1, GPIOR2, GPIOR3, GPIOR4, GPIOR5, GPIOR6, GPIOR7
++		   GPIOS0, GPIOS1, GPIOS2, GPIOS3, GPIOS5, GPIOS6, GPIOS7 */
++		pins = "V25", "U24", "V24", "V26", "U25", "T23", "W26", "U26", "R23", "T25", "T26", "R24", "P24", "P23", "T24";
++		bias-disable;
++	};
++	pinctrl_gpio5_unbiased: gpio5_unbiased {
++		/* GPIOV0, GPIOV1, GPIOV2, GPIOV3, GPIOV4, GPIOV5, GPIOV6, GPIOV7
++		   GPIOX1, GPIOX2 */
++		pins = "AB15", "AF14", "AD14", "AC15", "AE15", "AE14", "AD15", "AF15", "AA9", "AC9";
++		bias-disable;
++	};
++	pinctrl_gpio6_unbiased: gpio6_unbiased {
++		/* GPIOY2, GPIOY5, GPIOY6
++		   GPIOZ0, GPIOZ1, GPIOZ3, GPIOZ4 */
++		pins = "AE11", "AF12", "AC12", "AC10", "AD10", "AB11", "AC11";
++		bias-disable;
++	};
++};
++
+ &gpio0 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_gpiu2_default &pinctrl_gpiu3_default
+-		     &pinctrl_gpiu4_default &pinctrl_gpiu6_default>;
++		     &pinctrl_gpiu4_default &pinctrl_gpiu6_default
++		     &pinctrl_gpio0_unbiased &pinctrl_gpio2_unbiased
++		     &pinctrl_gpio3_unbiased &pinctrl_gpio4_unbiased
++		     &pinctrl_gpio5_unbiased &pinctrl_gpio6_unbiased>;
+ 	gpio-line-names =
+ 	/*A0-A7*/       "","","","","","","","",
+ 	/*B0-B7*/       "FLT_HSC_SERVER_SLOT8_N","AC_ON_OFF_BTN_CPLD_SLOT5_N",
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0517-yosemite4-Change-IOE-i2c-address.patch b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0517-yosemite4-Change-IOE-i2c-address.patch
new file mode 100644
index 000000000000..4a309a242ea4
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed/0517-yosemite4-Change-IOE-i2c-address.patch
@@ -0,0 +1,125 @@
+From 45c59e5eb87637d63e10a25b0b04a2b77fa2b786 Mon Sep 17 00:00:00 2001
+From: Sara Lin <sara_sy_lin@wiwynn.com>
+Date: Wed, 20 Mar 2024 19:13:34 +0800
+Subject: [PATCH] yosemite4: Change IOE i2c address
+
+Description
+1. Change CPLD IOE i2c address to avoid i2c address conflict.
+2. LF-link: https://lore.kernel.org/all/20240321021236.1823693-8-Delphine_CC_Chiu@wiwynn.com/
+
+Motivation
+1. Current CPLD IOE is same as SB BIC, this may cause
+unexpected transmission issues.
+
+Test plan
+1. Check i2c address.
+
+Log
+1. Check i2c address of IOE and SB BIC.
+---
+ .../aspeed/aspeed-bmc-facebook-yosemite4.dts  | 32 +++++++++----------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+index 9fdd0d60bef4..c887a6c3ee2e 100644
+--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
++++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+@@ -183,9 +183,9 @@ mctp@10 {
+ 		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ 	};
+ 
+-	gpio@20 {
++	gpio@24 {
+ 		compatible = "nxp,pca9506";
+-		reg = <0x20>;
++		reg = <0x24>;
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+ 	};
+@@ -229,9 +229,9 @@ mctp@10 {
+ 		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ 	};
+ 
+-	gpio@20 {
++	gpio@24 {
+ 		compatible = "nxp,pca9506";
+-		reg = <0x20>;
++		reg = <0x24>;
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+ 	};
+@@ -275,9 +275,9 @@ mctp@10 {
+ 		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ 	};
+ 
+-	gpio@20 {
++	gpio@24 {
+ 		compatible = "nxp,pca9506";
+-		reg = <0x20>;
++		reg = <0x24>;
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+ 	};
+@@ -321,9 +321,9 @@ mctp@10 {
+ 		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ 	};
+ 
+-	gpio@20 {
++	gpio@24 {
+ 		compatible = "nxp,pca9506";
+-		reg = <0x20>;
++		reg = <0x24>;
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+ 	};
+@@ -367,9 +367,9 @@ mctp@10 {
+ 		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ 	};
+ 
+-	gpio@20 {
++	gpio@24 {
+ 		compatible = "nxp,pca9506";
+-		reg = <0x20>;
++		reg = <0x24>;
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+ 	};
+@@ -413,9 +413,9 @@ mctp@10 {
+ 		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ 	};
+ 
+-	gpio@20 {
++	gpio@24 {
+ 		compatible = "nxp,pca9506";
+-		reg = <0x20>;
++		reg = <0x24>;
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+ 	};
+@@ -459,9 +459,9 @@ mctp@10 {
+ 		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ 	};
+ 
+-	gpio@20 {
++	gpio@24 {
+ 		compatible = "nxp,pca9506";
+-		reg = <0x20>;
++		reg = <0x24>;
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+ 	};
+@@ -505,9 +505,9 @@ mctp@10 {
+ 		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+ 	};
+ 
+-	gpio@20 {
++	gpio@24 {
+ 		compatible = "nxp,pca9506";
+-		reg = <0x20>;
++		reg = <0x24>;
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+ 	};
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed_%.bbappend
index ca3b723b8c4d..bea99d2b7aae 100644
--- a/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -7,6 +7,15 @@ SRC_URI += " \
     file://0504-hwmon-max31790-add-fanN_enable-for-all-fans.patch \
     file://0505-ARM-dts-aspeed-yosemite4-support-mux-to-cpld.patch \
     file://0506-ARM-dts-aspeed-yosemite4-Revise-gpio-name.patch \
-    file://0507-remove-pincontrol-to-GPIO-U5.patch \
+    file://0507-remove-pincontrol-on-GPIO-U5.patch \
+    file://0508-NCSI-Add-propety-no-channel-monitor-and-start-redo-p.patch \
+    file://0509-Meta-yv4-dts-add-mac-config-property.patch \
+    file://0510-yosemite4-Add-EEPROMs-for-NICs-in-DTS.patch \
+    file://0511-Add-ina233-and-ina238-devicetree-config.patch \
+    file://0512-Adjust-resistor-calibration-for-matching-hardware-de.patch \
+    file://0513-ARM-dts-aspeed-yosemite4-Revise-i2c-duty-cycle.patch \
+    file://0514-ARM-dts-aspeed-yosemite4-Enable-ipmb-device-for-OCP-.patch \
+    file://0515-pinctrl-pinctrl-aspeed-g6-correct-the-offset-of-SCU6.patch \
+    file://0516-ARM-dts-aspeed-yosemite4-disable-GPIO-internal-Pull-.patch \
+    file://0517-yosemite4-Change-IOE-i2c-address.patch \
 "
-
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/0500-Support-get-static-eid-config-from-entity-manager.patch b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/0500-Support-get-static-eid-config-from-entity-manager.patch
index 9fdbd5d2ddb6..383df1349f8f 100644
--- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/0500-Support-get-static-eid-config-from-entity-manager.patch
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/0500-Support-get-static-eid-config-from-entity-manager.patch
@@ -1,4 +1,4 @@
-From 7b1baed4dd450d872c25d2570763950a488562af Mon Sep 17 00:00:00 2001
+From 8de7934b54bd371f78af52e9806729613ab36646 Mon Sep 17 00:00:00 2001
 From: PeterHo-wiwynn <Peter_MH_Ho@wiwynn.com>
 Date: Wed, 11 Oct 2023 14:31:47 +0800
 Subject: [PATCH] Support get static eid config from entity manager
@@ -29,12 +29,14 @@ root@bmc:~# pldmtool base GetTID -m 60
 {
     "Response": 134
 }
+
+Signed-off-by: PeterHo-wiwynn <Peter_MH_Ho@wiwynn.com>
 ---
- src/mctpd.c | 385 ++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 377 insertions(+), 8 deletions(-)
+ src/mctpd.c | 525 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 517 insertions(+), 8 deletions(-)
 
 diff --git a/src/mctpd.c b/src/mctpd.c
-index 88a8506..49537d5 100644
+index 88a8506..6431788 100644
 --- a/src/mctpd.c
 +++ b/src/mctpd.c
 @@ -38,6 +38,12 @@
@@ -50,7 +52,15 @@ index 88a8506..49537d5 100644
  
  // an arbitrary constant for use with sd_id128_get_machine_app_specific()
  static const char* mctpd_appid = "67369c05-4b97-4b7e-be72-65cfd8639f10";
-@@ -71,6 +77,13 @@ struct ctx;
+@@ -47,6 +53,7 @@ static mctp_eid_t eid_alloc_max = 0xfe;
+ 
+ // arbitrary sanity
+ static size_t MAX_PEER_SIZE = 1000000;
++static size_t MAX_STRING_SIZE = 256;
+ 
+ static const uint8_t RQDI_REQ = 1<<7;
+ static const uint8_t RQDI_RESP = 0x0;
+@@ -71,6 +78,13 @@ struct ctx;
  // all local peers have the same phys
  static const dest_phys local_phys = { .ifindex = 0 };
  
@@ -64,7 +74,7 @@ index 88a8506..49537d5 100644
  struct peer {
  	int net;
  	mctp_eid_t eid;
-@@ -110,6 +123,9 @@ struct peer {
+@@ -110,6 +124,9 @@ struct peer {
  	// From Get Endpoint UUID. A malloced 16 bytes */
  	uint8_t *uuid;
  
@@ -74,7 +84,7 @@ index 88a8506..49537d5 100644
  	// Stuff the ctx pointer into peer for tidier parameter passing
  	struct ctx *ctx;
  };
-@@ -214,6 +230,18 @@ static peer * find_peer_by_addr(ctx *ctx, mctp_eid_t eid, int net)
+@@ -214,6 +231,18 @@ static peer * find_peer_by_addr(ctx *ctx, mctp_eid_t eid, int net)
  	return NULL;
  }
  
@@ -93,7 +103,7 @@ index 88a8506..49537d5 100644
  /* Returns a deferred free pointer */
  static const char* dest_phys_tostr(const dest_phys *dest)
  {
-@@ -1121,7 +1149,7 @@ out:
+@@ -1121,7 +1150,7 @@ out:
  /* Returns the newly added peer.
   * Error is -EEXISTS if it exists */
  static int add_peer(ctx *ctx, const dest_phys *dest, mctp_eid_t eid,
@@ -102,7 +112,7 @@ index 88a8506..49537d5 100644
  {
  	ssize_t idx;
  	size_t new_size;
-@@ -1183,6 +1211,14 @@ static int add_peer(ctx *ctx, const dest_phys *dest, mctp_eid_t eid,
+@@ -1183,6 +1212,14 @@ static int add_peer(ctx *ctx, const dest_phys *dest, mctp_eid_t eid,
  	// Update network eid map
  	n->peeridx[eid] = idx;
  
@@ -117,7 +127,7 @@ index 88a8506..49537d5 100644
  	*ret_peer = peer;
  	return 0;
  }
-@@ -1243,6 +1279,12 @@ static int remove_peer(peer *peer)
+@@ -1243,6 +1280,12 @@ static int remove_peer(peer *peer)
  	n->peeridx[peer->eid] = -1;
  	free(peer->message_types);
  	free(peer->uuid);
@@ -130,7 +140,7 @@ index 88a8506..49537d5 100644
  	memset(peer, 0x0, sizeof(struct peer));
  	return 0;
  }
-@@ -1324,7 +1366,7 @@ static int endpoint_assign_eid(ctx *ctx, sd_bus_error *berr, const dest_phys *de
+@@ -1324,7 +1367,7 @@ static int endpoint_assign_eid(ctx *ctx, sd_bus_error *berr, const dest_phys *de
  	/* Find an unused EID */
  	for (e = eid_alloc_min; e <= eid_alloc_max; e++) {
  		if (n->peeridx[e] == -1) {
@@ -139,7 +149,7 @@ index 88a8506..49537d5 100644
  			if (rc < 0)
  				return rc;
  			break;
-@@ -1503,7 +1545,7 @@ static int get_endpoint_peer(ctx *ctx, sd_bus_error *berr,
+@@ -1503,7 +1546,7 @@ static int get_endpoint_peer(ctx *ctx, sd_bus_error *berr,
  			return 0;
  		}
  		/* New endpoint */
@@ -148,7 +158,7 @@ index 88a8506..49537d5 100644
  		if (rc == -EEXIST)
  			return sd_bus_error_setf(berr, SD_BUS_ERROR_FILE_EXISTS,
  					"Endpoint claimed EID %d which is already used",
-@@ -1666,6 +1708,156 @@ static int message_read_hwaddr(sd_bus_message *call, dest_phys* dest)
+@@ -1666,6 +1709,160 @@ static int message_read_hwaddr(sd_bus_message *call, dest_phys* dest)
  	return 0;
  }
  
@@ -233,7 +243,7 @@ index 88a8506..49537d5 100644
 +			break;
 +		}
 +		uint64_t bus = 0;
-+		char ifname[256];
++		char ifname[MAX_STRING_SIZE];
 +		sd_bus_message_read(message, "t", &bus);
 +		// TODO: handle different interface name
 +		sprintf(ifname, "mctpi2c%ld", bus);
@@ -260,7 +270,11 @@ index 88a8506..49537d5 100644
 +
 +		// The s[i] is like ../chassis/device so we need to get its parent path
 +		// for the chassis path.
-+		char object_path[256];
++		char object_path[MAX_STRING_SIZE];
++		if (strlen(object_paths[i]) >= MAX_STRING_SIZE) {
++			warnx("Object path too large >= %d", MAX_STRING_SIZE);
++			continue;
++		}
 +		strcpy(object_path, object_paths[i]);
 +		char *ret = strrchr(object_path, '/');
 +		if (ret)
@@ -305,7 +319,7 @@ index 88a8506..49537d5 100644
  /* SetupEndpoint method tries the following in order:
    - request Get Endpoint ID to add to the known table, return that
    - request Set Endpoint ID, return that */
-@@ -1832,6 +2024,20 @@ err:
+@@ -1832,6 +2029,20 @@ err:
  	return rc;
  }
  
@@ -326,7 +340,7 @@ index 88a8506..49537d5 100644
  // Query various properties of a peer.
  // To be called when a new peer is discovered/assigned, once an EID is known
  // and routable.
-@@ -2274,6 +2480,11 @@ static const sd_bus_vtable bus_mctpd_vtable[] = {
+@@ -2274,6 +2485,11 @@ static const sd_bus_vtable bus_mctpd_vtable[] = {
  		SD_BUS_PARAM(found),
  		method_learn_endpoint,
  		0),
@@ -338,7 +352,7 @@ index 88a8506..49537d5 100644
  	SD_BUS_VTABLE_END,
  
  };
-@@ -2337,6 +2548,10 @@ static int bus_endpoint_get_prop(sd_bus *bus,
+@@ -2337,6 +2553,10 @@ static int bus_endpoint_get_prop(sd_bus *bus,
  	} else if (strcmp(property, "UUID") == 0 && peer->uuid) {
  		const char *s = dfree(bytes_to_uuid(peer->uuid));
  		rc = sd_bus_message_append(reply, "s", s);
@@ -349,7 +363,7 @@ index 88a8506..49537d5 100644
  	} else {
  		printf("Unknown property '%s' for %s iface %s\n", property, path, interface);
  		rc = -ENOENT;
-@@ -2390,6 +2605,16 @@ static const sd_bus_vtable bus_endpoint_cc_vtable[] = {
+@@ -2390,6 +2610,16 @@ static const sd_bus_vtable bus_endpoint_cc_vtable[] = {
  	SD_BUS_VTABLE_END
  };
  
@@ -366,7 +380,7 @@ index 88a8506..49537d5 100644
  static int bus_endpoint_find(sd_bus *bus, const char *path,
  	const char *interface, void *userdata, void **ret_found,
  	sd_bus_error *ret_error)
-@@ -2425,6 +2650,24 @@ static int bus_endpoint_find_uuid(sd_bus *bus, const char *path,
+@@ -2425,6 +2655,24 @@ static int bus_endpoint_find_uuid(sd_bus *bus, const char *path,
  	return 0;
  }
  
@@ -382,8 +396,8 @@ index 88a8506..49537d5 100644
 +
 +	rc = peer_from_path(ctx, path, &peer);
 +	if (rc >= 0 && peer->published && peer->association) {
-+			*ret_found = peer;
-+			return 1;
++		*ret_found = peer;
++		return 1;
 +	}
 +	return 0;
 +}
@@ -391,14 +405,13 @@ index 88a8506..49537d5 100644
  static char* net_path(int net)
  {
  	size_t l;
-@@ -2584,6 +2827,90 @@ out:
+@@ -2584,6 +2832,225 @@ out:
  	return rc;
  }
  
 +static int on_interface_added(sd_bus_message *m, void *userdata, sd_bus_error *ret_error)
 +{
 +	int rc = 0;
-+	bool update = false;
 +	ctx *ctx = userdata;
 +	char *object_path, *iface;
 +
@@ -422,15 +435,148 @@ index 88a8506..49537d5 100644
 +		if (strcmp(iface, OPENBMC_MCTP_CONFIG_IFACE) != 0) {
 +			sd_bus_message_skip(m, "a{sv}");
 +		} else {
-+			sd_bus_message_skip(m, "a{sv}");
-+			update = true;
++			sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "{sv}");
++			uint64_t data;
++			int net;
++			mctp_eid_t eid;
++			dest_phys desti = {0}, *dest = &desti;
++			peer *peer = NULL;
++			char ifname[MAX_STRING_SIZE];
++			while (!sd_bus_message_at_end(m, false)) {
++				const char *key;
++				rc = sd_bus_message_enter_container(m, SD_BUS_TYPE_DICT_ENTRY, "sv");
++				if (rc < 0) {
++					return rc;
++				}
++
++				rc = sd_bus_message_read(m, "s", &key);
++				if (rc < 0) {
++					return rc;
++				}
++
++				if (strcmp(key, "Address") == 0) {
++					rc = sd_bus_message_enter_container(m, SD_BUS_TYPE_VARIANT, NULL);
++					if (rc < 0) {
++						return rc;
++					}
++					rc = sd_bus_message_read(m, "t", &data);
++					if (rc < 0) {
++						return rc;
++					}
++					size_t size = sizeof(uint8_t);
++					memcpy(dest->hwaddr, &data, size);
++					dest->hwaddr_len = size;
++					rc = sd_bus_message_exit_container(m); //exit variant
++					if (rc < 0) {
++						return rc;
++					}
++				} else if (strcmp(key, "Bus") == 0) {
++					rc = sd_bus_message_enter_container(m, SD_BUS_TYPE_VARIANT, NULL);
++					if (rc < 0) {
++						return rc;
++					}
++					rc = sd_bus_message_read(m, "t", &data);
++					if (rc < 0) {
++						return rc;
++					}
++					// TODO: handle different interface name
++					sprintf(ifname, "mctpi2c%ld", data);
++					rc = sd_bus_message_exit_container(m); //exit variant
++					if (rc < 0) {
++						return rc;
++					}
++				} else if (strcmp(key, "EndpointId") == 0) {
++					rc = sd_bus_message_enter_container(m, SD_BUS_TYPE_VARIANT, NULL);
++					if (rc < 0) {
++						return rc;
++					}
++					rc = sd_bus_message_read(m, "t", &data);
++					if (rc < 0) {
++						return rc;
++					}
++					eid = (mctp_eid_t)data;
++					rc = sd_bus_message_exit_container(m); //exit variant
++					if (rc < 0) {
++						return rc;
++					}
++				} else {
++					sd_bus_message_skip(m, "v"); //skip data not needed
++				}
++
++				rc = sd_bus_message_exit_container(m); //exit dict
++				if (rc < 0) {
++					return rc;
++				}
++			}
++			rc = sd_bus_message_exit_container(m); //exit array
++			if (rc < 0) {
++				return rc;
++			}
++
++			dest->ifindex = mctp_nl_ifindex_byname(ctx->nl, ifname);
++			if (dest->ifindex <= 0) {
++				warnx("Unknown ifname: %s", ifname);
++				break;
++			}
++
++			rc = validate_dest_phys(ctx, dest);
++			if (rc < 0) {
++				warnx("Bad phys: 0x%02x", dest->hwaddr[0]);
++				break;
++			}
++
++			net = mctp_nl_net_byindex(ctx->nl, dest->ifindex);
++			if (net < 1) {
++				warnx("No net for ifindex");
++				break;
++			}
++			// The s[i] is like ../chassis/device so we need to get its parent path
++			// for the chassis path.
++			char *ret = strrchr(object_path, '/');
++			if (ret)
++				*ret = '\0';
++
++			rc = add_peer(ctx, dest, eid, net, object_path, &peer);
++			if (rc < 0) {
++				warnx("Failed to add peer for EID %d", eid);
++				break;
++			}
++
++			add_peer_route(peer);
++
++			uint8_t* buf = NULL;
++			size_t buf_size = 0;
++			struct sockaddr_mctp_ext addr;
++			struct mctp_ctrl_cmd_get_eid req = {0};
++			req.ctrl_hdr.rq_dgram_inst = RQDI_REQ;
++			req.ctrl_hdr.command_code = MCTP_CTRL_CMD_GET_ENDPOINT_ID;
++			rc = endpoint_query_peer(peer, MCTP_CTRL_HDR_MSG_TYPE,
++				&req, sizeof(req), &buf, &buf_size, &addr);
++			if (rc < 0) {
++				warnx("Response timeout for EID %d.", eid);
++				remove_peer(peer);
++				free(buf);
++				break;
++			}
++			free(buf);
++
++			rc = query_peer_properties(peer);
++
++			rc = publish_peer(peer, true);
++			if (rc < 0) {
++				warnx("Error publishing remote eid %d net %d", eid, net);
++				break;
++			}
 +		}
-+		sd_bus_message_exit_container(m);
++		sd_bus_message_exit_container(m); //exit dict
++		if (rc < 0) {
++			return rc;
++		}
++	}
++	sd_bus_message_exit_container(m); //exit array
++	if (rc < 0) {
++		return rc;
 +	}
-+	sd_bus_message_exit_container(m);
-+	//TODO: parse message from signal instead of rescanning
-+	if (update)
-+		setup_static_eid(ctx);
 +
 +	return rc;
 +}
@@ -445,11 +591,11 @@ index 88a8506..49537d5 100644
 +
 +	rc = sd_bus_message_read(m, "o", &object_path);
 +	if (rc < 0)
-+		goto out;
++		return rc;
 +
 +	rc = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "s");
 +	if (rc < 0)
-+		goto out;
++		return rc;
 +
 +	for (;;) {
 +		rc = sd_bus_message_read(m, "s", &iface);
@@ -464,7 +610,11 @@ index 88a8506..49537d5 100644
 +		return rc;
 +	}
 +
-+	char temp[100];
++	char temp[MAX_STRING_SIZE];
++	if (strlen(object_path) >= MAX_STRING_SIZE) {
++		warnx("Object path too large >= %d", MAX_STRING_SIZE);
++		return -1;
++	}
 +	strcpy(temp, object_path);
 +	char *ret = strrchr(temp, '/');
 +	if (ret)
@@ -475,14 +625,13 @@ index 88a8506..49537d5 100644
 +		remove_peer(peer);
 +	}
 +
-+out:
 +	return rc;
 +}
 +
  static int setup_bus(ctx *ctx)
  {
  	int rc;
-@@ -2655,6 +2982,17 @@ static int setup_bus(ctx *ctx)
+@@ -2655,6 +3122,17 @@ static int setup_bus(ctx *ctx)
  		goto out;
  	}
  
@@ -500,7 +649,7 @@ index 88a8506..49537d5 100644
  	rc = sd_bus_add_object_manager(ctx->bus, NULL, MCTP_DBUS_PATH);
  	if (rc < 0) {
  		warnx("Adding object manager failed: %s", strerror(-rc));
-@@ -2668,6 +3006,36 @@ static int setup_bus(ctx *ctx)
+@@ -2668,6 +3146,36 @@ static int setup_bus(ctx *ctx)
  		goto out;
  	}
  
@@ -537,7 +686,7 @@ index 88a8506..49537d5 100644
  	rc = 0;
  out:
  	return rc;
-@@ -2870,7 +3238,7 @@ static int add_local_eid(ctx *ctx, int net, int eid)
+@@ -2870,7 +3378,7 @@ static int add_local_eid(ctx *ctx, int net, int eid)
  		}
  	}
  
@@ -546,7 +695,7 @@ index 88a8506..49537d5 100644
  	if (rc < 0) {
  		warn("BUG: Error adding local eid %d net %d", eid, net);
  		return rc;
-@@ -3021,7 +3389,7 @@ static int setup_testing(ctx *ctx) {
+@@ -3021,7 +3529,7 @@ static int setup_testing(ctx *ctx) {
  			for (i = 0; i < 256; i++)
  				ctx->nets[j].peeridx[i] = -1;
  
@@ -555,7 +704,7 @@ index 88a8506..49537d5 100644
  		if (rc < 0) {
  			warnx("%s failed add_peer, %s", __func__, strerror(-rc));
  			return rc;
-@@ -3031,7 +3399,7 @@ static int setup_testing(ctx *ctx) {
+@@ -3031,7 +3539,7 @@ static int setup_testing(ctx *ctx) {
  		sd_id128_randomize((void*)peer->uuid);
  		publish_peer(peer, false);
  
@@ -564,7 +713,7 @@ index 88a8506..49537d5 100644
  		if (rc < 0) {
  			warnx("%s failed add_peer, %s", __func__, strerror(-rc));
  			return rc;
-@@ -3044,7 +3412,7 @@ static int setup_testing(ctx *ctx) {
+@@ -3044,7 +3552,7 @@ static int setup_testing(ctx *ctx) {
  		peer->message_types[2] = 0x04;
  		publish_peer(peer, false);
  
@@ -573,16 +722,16 @@ index 88a8506..49537d5 100644
  		if (rc < 0) {
  			warnx("%s failed add_peer, %s", __func__, strerror(-rc));
  			return rc;
-@@ -3192,6 +3560,8 @@ int main(int argc, char **argv)
+@@ -3192,6 +3700,8 @@ int main(int argc, char **argv)
  	if (rc < 0 && !ctx->testing)
  		return 1;
  
-+	rc = setup_static_eid(ctx);
++	setup_static_eid(ctx);
 +
  	// TODO add net argument?
  	rc = listen_control_msg(ctx, MCTP_NET_ANY);
  	if (rc < 0) {
-@@ -3210,7 +3580,6 @@ int main(int argc, char **argv)
+@@ -3210,7 +3720,6 @@ int main(int argc, char **argv)
  	if (rc < 0)
  		return 1;
  
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/0502-mctpd-Add-AssignEndpointStatic-dbus-interface.patch b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/0502-mctpd-Add-AssignEndpointStatic-dbus-interface.patch
new file mode 100644
index 000000000000..c5f828e2c9d5
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/files/0502-mctpd-Add-AssignEndpointStatic-dbus-interface.patch
@@ -0,0 +1,653 @@
+From 5470f3bcc3d25e990d0473f65169deeffff3a591 Mon Sep 17 00:00:00 2001
+From: Jeremy Kerr <jk@codeconstruct.com.au>
+Date: Thu, 11 Jan 2024 15:50:19 +0800
+Subject: [PATCH] mctpd: Add AssignEndpointStatic dbus interface
+
+Add a new dbus call to create a new peer with a predefined EID, provided
+by the caller. This allows other infrastructure to define static EID
+alocations, have mctpd set up the appropriate routes, neighbours and
+dbus objects, and have the static EID removed from mctpd's EID pool.
+
+Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
+---
+ CHANGELOG.md        |  27 ++++
+ docs/mctpd.md       |  14 ++
+ src/mctpd.c         | 142 +++++++++++++++--
+ tests/test_mctpd.py | 370 ++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 537 insertions(+), 16 deletions(-)
+ create mode 100644 CHANGELOG.md
+ create mode 100644 tests/test_mctpd.py
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+new file mode 100644
+index 0000000..432e1cf
+--- /dev/null
++++ b/CHANGELOG.md
+@@ -0,0 +1,27 @@
++# Changelog
++
++All notable changes to this project will be documented in this file.
++
++The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
++
++## Unreleased
++
++### Added
++
++1. mctpd: Add support for endpoint recovery
++2. mctpd: Allow recovery of devices reporting a nil UUID for development
++3. mctpd: Allow configuring .Connectivity as writable for development
++4. mctpd: Add AssignEndpointStatic for static EID allocations
++
++### Changed
++
++1. dbus interface: the NetworkID field is now a `u` rather than an `i`, to
++   match OpenBMC's MCTP endpoint specification
++
++### Fixed
++
++1. mctpd: EID assignments now work in the case where a new endpoint has a
++   pre-configured EID that would conflict with other (already enumerated)
++   endpoints. The new endpoint will get a non-conflicting address assigned.
++
++## [1.1] - 2023-04-13
+diff --git a/docs/mctpd.md b/docs/mctpd.md
+index 6333917..0ff827b 100644
+--- a/docs/mctpd.md
++++ b/docs/mctpd.md
+@@ -45,6 +45,20 @@ busctl call xyz.openbmc_project.MCTP /xyz/openbmc_project/mctp \
+ Similar to SetupEndpoint, but will always assign an EID rather than querying for existing ones.
+ Will return `new = false` when an endpoint is already known to `mctpd`.
+ 
++### `.AssignEndpointStatic`
++
++Similar to AssignEndpoint, but takes an additional EID argument:
++
++```
++AssignEndpointStatic <interface name> <hwaddr> <static-EID>
++```
++
++to assign `<static-EID>` to the endpoint with hardware address `hwaddr`.
++
++This call will fail if the endpoint already has an EID, and that EID is
++different from `static-EID`, or if `static-EID` is already assigned to another
++endpoint.
++
+ ### `.LearnEndpoint`
+ 
+ Like SetupEndpoint but will not assign EIDs, will only query endpoints for a current EID.
+diff --git a/src/mctpd.c b/src/mctpd.c
+index 49537d5..d68865b 100644
+--- a/src/mctpd.c
++++ b/src/mctpd.c
+@@ -1343,7 +1343,7 @@ static int peer_set_mtu(ctx *ctx, peer *peer, uint32_t mtu) {
+ }
+ 
+ static int endpoint_assign_eid(ctx *ctx, sd_bus_error *berr, const dest_phys *dest,
+-	peer **ret_peer)
++	peer **ret_peer, mctp_eid_t static_eid)
+ {
+ 	mctp_eid_t e, new_eid;
+ 	net_det *n = NULL;
+@@ -1363,20 +1363,28 @@ static int endpoint_assign_eid(ctx *ctx, sd_bus_error *berr, const dest_phys *de
+ 		return -EPROTO;
+ 	}
+ 
+-	/* Find an unused EID */
+-	for (e = eid_alloc_min; e <= eid_alloc_max; e++) {
+-		if (n->peeridx[e] == -1) {
+-			rc = add_peer(ctx, dest, e, net, NULL, &peer);
+-			if (rc < 0)
+-				return rc;
+-			break;
++	if (static_eid) {
++		rc = add_peer(ctx, dest, static_eid, net, NULL, &peer);
++		if (rc < 0)
++			return rc;
++
++		new_eid = static_eid;
++	} else {
++		/* Find an unused EID */
++		for (e = eid_alloc_min; e <= eid_alloc_max; e++) {
++			if (n->peeridx[e] == -1) {
++				rc = add_peer(ctx, dest, e, net, NULL, &peer);
++				if (rc < 0)
++					return rc;
++				break;
++			}
++		}
++		if (e > eid_alloc_max) {
++			warnx("Ran out of EIDs for net %d, allocating %s", net, dest_phys_tostr(dest));
++			sd_bus_error_setf(berr, SD_BUS_ERROR_FAILED,
++				"Ran out of EIDs");
++			return -EADDRNOTAVAIL;
+ 		}
+-	}
+-	if (e > eid_alloc_max) {
+-		warnx("Ran out of EIDs for net %d, allocating %s", net, dest_phys_tostr(dest));
+-		sd_bus_error_setf(berr, SD_BUS_ERROR_FAILED,
+-			"Ran out of EIDs");
+-		return -EADDRNOTAVAIL;
+ 	}
+ 
+ 	rc = endpoint_send_set_endpoint_id(peer, &new_eid);
+@@ -1907,7 +1915,7 @@ static int method_setup_endpoint(sd_bus_message *call, void *data, sd_bus_error
+ 	}
+ 
+ 	/* Set Endpoint ID */
+-	rc = endpoint_assign_eid(ctx, berr, dest, &peer);
++	rc = endpoint_assign_eid(ctx, berr, dest, &peer, 0);
+ 	if (rc < 0)
+ 		goto err;
+ 
+@@ -1964,7 +1972,7 @@ static int method_assign_endpoint(sd_bus_message *call, void *data, sd_bus_error
+ 			peer->eid, peer->net, peer_path, 0);
+ 	}
+ 
+-	rc = endpoint_assign_eid(ctx, berr, dest, &peer);
++	rc = endpoint_assign_eid(ctx, berr, dest, &peer, 0);
+ 	if (rc < 0)
+ 		goto err;
+ 
+@@ -1980,6 +1988,84 @@ err:
+ 	return rc;
+ }
+ 
++static int method_assign_endpoint_static(sd_bus_message *call, void *data,
++					 sd_bus_error *berr)
++{
++	dest_phys desti, *dest = &desti;
++	const char *ifname = NULL;
++	char *peer_path = NULL;
++	peer *peer = NULL;
++	ctx *ctx = data;
++	uint8_t eid;
++	int rc;
++
++	rc = sd_bus_message_read(call, "s", &ifname);
++	if (rc < 0)
++		goto err;
++
++	rc = message_read_hwaddr(call, dest);
++	if (rc < 0)
++		goto err;
++
++	rc = sd_bus_message_read(call, "y", &eid);
++	if (rc < 0)
++		goto err;
++
++	dest->ifindex = mctp_nl_ifindex_byname(ctx->nl, ifname);
++	if (dest->ifindex <= 0)
++		return sd_bus_error_setf(berr, SD_BUS_ERROR_INVALID_ARGS,
++			"Unknown MCTP ifname '%s'", ifname);
++
++	rc = validate_dest_phys(ctx, dest);
++	if (rc < 0)
++		return sd_bus_error_setf(berr, SD_BUS_ERROR_INVALID_ARGS,
++			"Bad physaddr");
++
++	peer = find_peer_by_phys(ctx, dest);
++	if (peer) {
++		if (peer->eid != eid) {
++			return sd_bus_error_setf(berr, SD_BUS_ERROR_INVALID_ARGS,
++				"Already assigned a different EID");
++		}
++
++		// Return existing record.
++		rc = path_from_peer(peer, &peer_path);
++		if (rc < 0)
++			goto err;
++		dfree(peer_path);
++
++		return sd_bus_reply_method_return(call, "yisb",
++			peer->eid, peer->net, peer_path, 0);
++	} else {
++		int netid;
++
++		// is the requested EID already in use? if so, reject
++		netid = mctp_nl_net_byindex(ctx->nl, dest->ifindex);
++		peer = find_peer_by_addr(ctx, eid, netid);
++		if (peer) {
++			return sd_bus_error_setf(berr, SD_BUS_ERROR_INVALID_ARGS,
++				"Address in use");
++		}
++	}
++
++	rc = endpoint_assign_eid(ctx, berr, dest, &peer, eid);
++	if (rc < 0) {
++		goto err;
++	}
++
++	rc = path_from_peer(peer, &peer_path);
++	if (rc < 0) {
++		goto err;
++	}
++	dfree(peer_path);
++
++	return sd_bus_reply_method_return(call, "yisb",
++		peer->eid, peer->net, peer_path, 1);
++err:
++	set_berr(ctx, rc, berr);
++	return rc;
++}
++
+ static int method_learn_endpoint(sd_bus_message *call, void *data, sd_bus_error *berr)
+ {
+ 	int rc;
+@@ -2363,6 +2449,17 @@ out:
+ 	return rc;
+ }
+ 
++/* FIXME: I2C-specific */
++/* DSP0237 v1.2.0 Table 9 */
++#define MCTP_I2C_TSYM_TRECLAIM_MIN_US 5000000
++#define MCTP_I2C_TSYM_MN1_MIN 2
++#define MCTP_I2C_TSYM_MT1_MAX_US 100000
++#define MCTP_I2C_TSYM_MT3_MAX_US 100000
++#define MCTP_I2C_TSYM_MT4_MIN_US 5000000
++#define MCTP_I2C_TSYM_MT2_MIN_US \
++	(MCTP_I2C_TSYM_MT1_MAX_US + 2 * MCTP_I2C_TSYM_MT3_MAX_US)
++#define MCTP_I2C_TSYM_MT2_MAX_MS MCTP_I2C_TSYM_MT4_MIN_US
++
+ static int method_endpoint_set_mtu(sd_bus_message *call, void *data,
+ 	sd_bus_error *berr)
+ {
+@@ -2469,6 +2566,19 @@ static const sd_bus_vtable bus_mctpd_vtable[] = {
+ 		method_assign_endpoint,
+ 		0),
+ 
++	SD_BUS_METHOD_WITH_NAMES("AssignEndpointStatic",
++		"sayy",
++		SD_BUS_PARAM(ifname)
++		SD_BUS_PARAM(physaddr)
++		SD_BUS_PARAM(eid),
++		"yisb",
++		SD_BUS_PARAM(eid)
++		SD_BUS_PARAM(net)
++		SD_BUS_PARAM(path)
++		SD_BUS_PARAM(new),
++		method_assign_endpoint_static,
++		0),
++
+ 	SD_BUS_METHOD_WITH_NAMES("LearnEndpoint",
+ 		"say",
+ 		SD_BUS_PARAM(ifname)
+diff --git a/tests/test_mctpd.py b/tests/test_mctpd.py
+new file mode 100644
+index 0000000..052e0a4
+--- /dev/null
++++ b/tests/test_mctpd.py
+@@ -0,0 +1,370 @@
++import pytest
++import trio
++import uuid
++import asyncdbus
++
++from mctp_test_utils import mctpd_mctp_obj, mctpd_mctp_endpoint_obj
++from conftest import Endpoint
++
++# DBus constant symbol suffixes:
++#
++# - C: Connection
++# - P: Path
++# - I: Interface
++MCTPD_C = 'xyz.openbmc_project.MCTP'
++MCTPD_MCTP_P = '/xyz/openbmc_project/mctp'
++MCTPD_MCTP_I = 'au.com.CodeConstruct.MCTP'
++MCTPD_ENDPOINT_I = 'au.com.CodeConstruct.MCTP.Endpoint'
++DBUS_OBJECT_MANAGER_I = 'org.freedesktop.DBus.ObjectManager'
++DBUS_PROPERTIES_I = 'org.freedesktop.DBus.Properties'
++
++MCTPD_TRECLAIM = 5
++
++""" Test the SetupEndpoint dbus call
++
++Using the default system & network ojects, call SetupEndpoint on our mock
++endpoint. We expect the dbus call to return the endpoint details, and
++the new kernel neighbour and route entries.
++
++We have a few things provided by the test infrastructure:
++
++ - dbus is the dbus connection, call the mctpd_mctp_obj helper to
++   get the MCTP dbus object
++
++ - mctpd is our wrapper for the mctpd process and mock MCTP environment. This
++   has two properties that represent external state:
++
++   mctp.system: the local system info - containing MCTP interfaces
++     (mctp.system.interfaces), addresses (.addresses), neighbours (.neighbours)
++     and routes (.routes). These may be updated by the running mctpd process
++     during tests, over the simlated netlink socket.
++
++   mctp.network: the set of remote MCTP endpoints connected to the system. Each
++     endpoint has a physical address (.lladdr) and an EID (.eid), and a tiny
++     MCTP control protocol implementation, which the mctpd process will
++     interact with over simulated AF_MCTP sockets.
++
++By default, we get some minimal defaults for .system and .network:
++
++ - The system has one interface ('mctp0'), assigned local EID 8. This is
++   similar to a MCTP-over-i2c interface, in that physical addresses are
++   a single byte.
++
++ - The network has one endpoint (lladdr 0x1d) connected to mctp0, with no EID
++   assigned. It also has a random UUID, and advertises support for MCTP
++   Control Protocol and PLDM (but note that it doesn't actually implement
++   any PLDM!).
++
++But these are only defaults; .system and .network can be altered as required
++for each test.
++"""
++async def test_setup_endpoint(dbus, mctpd):
++    # shortcuts to the default system/network configuration
++    iface = mctpd.system.interfaces[0]
++    ep = mctpd.network.endpoints[0]
++
++    # our proxy dbus object for mctpd
++    mctp = await mctpd_mctp_obj(dbus)
++
++    # call SetupEndpoint. This will raise an exception on any dbus error.
++    (eid, net, path, new) = await mctp.call_setup_endpoint(iface.name, ep.lladdr)
++
++    # ep.eid will be updated (through the Set Endpoint ID message); this
++    # should match the returned EID
++    assert eid == ep.eid
++
++    # we should have a neighbour for the new endpoint
++    assert len(mctpd.system.neighbours) == 1
++    neigh = mctpd.system.neighbours[0]
++    assert neigh.lladdr == ep.lladdr
++    assert neigh.eid == ep.eid
++
++    # we should have a route for the new endpoint too
++    assert len(mctpd.system.routes) == 2
++
++""" Test that we correctly handle address conflicts on EID assignment.
++
++We have the following scenario:
++
++ 1. A configured peer at physaddr 1, EID A, allocated by mctpd
++ 2. A non-configured peer at physaddr 2, somehow carrying a default EID also A
++ 3. Attempt to enumerate physaddr 2
++
++At (3), we should reconfigure the EID to B.
++"""
++async def test_setup_endpoint_conflict(dbus, mctpd):
++    mctp = await mctpd_mctp_obj(dbus)
++
++    iface = mctpd.system.interfaces[0]
++    ep1 = mctpd.network.endpoints[0]
++    (eid1, _, _, _) = await mctp.call_setup_endpoint(iface.name, ep1.lladdr)
++
++    # endpoint configured with eid1 already
++    ep2 = Endpoint(iface, bytes([0x1e]), eid=eid1)
++    mctpd.network.add_endpoint(ep2)
++
++    (eid2, _, _, _) = await mctp.call_setup_endpoint(iface.name, ep2.lladdr)
++    assert eid1 != eid2
++
++""" Test neighbour removal """
++async def test_remove_endpoint(dbus, mctpd):
++    mctp = await mctpd_mctp_obj(dbus)
++
++    iface = mctpd.system.interfaces[0]
++    ep1 = mctpd.network.endpoints[0]
++    (_, _, path, _) = await mctp.call_setup_endpoint(iface.name, ep1.lladdr)
++
++    assert(len(mctpd.system.neighbours) == 1)
++
++    ep = await mctpd_mctp_endpoint_obj(dbus, path)
++
++    await ep.call_remove()
++    assert(len(mctpd.system.neighbours) == 0)
++
++async def test_recover_endpoint_present(dbus, mctpd):
++    iface = mctpd.system.interfaces[0]
++    dev = mctpd.network.endpoints[0]
++    mctp = await mctpd_mctp_obj(dbus)
++    (eid, net, path, new) = await mctp.call_setup_endpoint(iface.name, dev.lladdr)
++
++    ep = await dbus.get_proxy_object(MCTPD_C, path)
++    ep_props = await ep.get_interface(DBUS_PROPERTIES_I)
++
++    recovered = trio.Semaphore(initial_value = 0)
++    def ep_connectivity_changed(iface, changed, invalidated):
++        if iface == MCTPD_ENDPOINT_I and 'Connectivity' in changed:
++            if 'Available' == changed['Connectivity'].value:
++                recovered.release()
++
++    await ep_props.on_properties_changed(ep_connectivity_changed)
++
++    ep_ep = await ep.get_interface(MCTPD_ENDPOINT_I)
++    await ep_ep.call_recover()
++
++    with trio.move_on_after(2 * MCTPD_TRECLAIM) as expected:
++        await recovered.acquire()
++
++    # Cancellation implies failure to acquire recovered, which implies failure
++    # to transition 'Connectivity' to 'Available', which is a test failure.
++    assert not expected.cancelled_caught
++
++async def test_recover_endpoint_removed(dbus, mctpd):
++    iface = mctpd.system.interfaces[0]
++    dev = mctpd.network.endpoints[0]
++    mctp = await dbus.get_proxy_object(MCTPD_C, MCTPD_MCTP_P)
++    mctp_mctp = await mctp.get_interface(MCTPD_MCTP_I)
++    (eid, net, path, new) = await mctp_mctp.call_setup_endpoint(iface.name, dev.lladdr)
++
++    ep = await dbus.get_proxy_object(MCTPD_C, path)
++    ep_props = await ep.get_interface(DBUS_PROPERTIES_I)
++
++    degraded = trio.Semaphore(initial_value = 0)
++    def ep_connectivity_changed(iface, changed, invalidated):
++        if iface == MCTPD_ENDPOINT_I and 'Connectivity' in changed:
++            if 'Degraded' == changed['Connectivity'].value:
++                degraded.release()
++
++    await ep_props.on_properties_changed(ep_connectivity_changed)
++
++    mctp_objmgr = await mctp.get_interface(DBUS_OBJECT_MANAGER_I)
++
++    removed = trio.Semaphore(initial_value = 0)
++    def ep_removed(ep_path, interfaces):
++        if ep_path == path and MCTPD_ENDPOINT_I in interfaces:
++            removed.release()
++
++    await mctp_objmgr.on_interfaces_removed(ep_removed)
++
++    del mctpd.network.endpoints[0]
++    ep_ep = await ep.get_interface(MCTPD_ENDPOINT_I)
++    await ep_ep.call_recover()
++
++    with trio.move_on_after(2 * MCTPD_TRECLAIM) as expected:
++        await removed.acquire()
++        await degraded.acquire()
++
++    assert not expected.cancelled_caught
++
++async def test_recover_endpoint_reset(dbus, mctpd):
++    iface = mctpd.system.interfaces[0]
++    dev = mctpd.network.endpoints[0]
++    mctp = await dbus.get_proxy_object(MCTPD_C, MCTPD_MCTP_P)
++    mctp_mctp = await mctp.get_interface(MCTPD_MCTP_I)
++    (eid, net, path, new) = await mctp_mctp.call_setup_endpoint(iface.name, dev.lladdr)
++
++    ep = await dbus.get_proxy_object(MCTPD_C, path)
++    ep_props = await ep.get_interface(DBUS_PROPERTIES_I)
++
++    recovered = trio.Semaphore(initial_value = 0)
++    def ep_connectivity_changed(iface, changed, invalidated):
++        if iface == MCTPD_ENDPOINT_I and 'Connectivity' in changed:
++            if 'Available' == changed['Connectivity'].value:
++                recovered.release()
++
++    await ep_props.on_properties_changed(ep_connectivity_changed)
++
++    # Disable the endpoint device
++    del mctpd.network.endpoints[0]
++
++    ep_ep = await ep.get_interface(MCTPD_ENDPOINT_I)
++    await ep_ep.call_recover()
++
++    # Force the first poll to fail
++    await trio.sleep(1)
++
++    # Reset the endpoint device and re-enable it
++    dev.reset()
++    mctpd.network.add_endpoint(dev)
++
++    with trio.move_on_after(2 * MCTPD_TRECLAIM) as expected:
++        await recovered.acquire()
++
++    assert not expected.cancelled_caught
++
++async def test_recover_endpoint_exchange(dbus, mctpd):
++    iface = mctpd.system.interfaces[0]
++    dev = mctpd.network.endpoints[0]
++    mctp = await dbus.get_proxy_object(MCTPD_C, MCTPD_MCTP_P)
++    mctp_mctp = await mctp.get_interface(MCTPD_MCTP_I)
++    (eid, net, path, new) = await mctp_mctp.call_setup_endpoint(iface.name, dev.lladdr)
++
++    ep = await dbus.get_proxy_object(MCTPD_C, path)
++    ep_props = await ep.get_interface(DBUS_PROPERTIES_I)
++
++    degraded = trio.Semaphore(initial_value = 0)
++    def ep_connectivity_changed(iface, changed, invalidated):
++        if iface == MCTPD_ENDPOINT_I and 'Connectivity' in changed:
++            if 'Degraded' == changed['Connectivity'].value:
++                degraded.release()
++
++    await ep_props.on_properties_changed(ep_connectivity_changed)
++
++    mctp_objmgr = await mctp.get_interface(DBUS_OBJECT_MANAGER_I)
++
++    removed = trio.Semaphore(initial_value = 0)
++    def ep_removed(ep_path, interfaces):
++        if ep_path == path and MCTPD_ENDPOINT_I in interfaces:
++            removed.release()
++
++    await mctp_objmgr.on_interfaces_removed(ep_removed)
++
++    added = trio.Semaphore(initial_value = 0)
++    def ep_added(ep_path, content):
++        if MCTPD_ENDPOINT_I in content:
++            added.release()
++
++    await mctp_objmgr.on_interfaces_added(ep_added)
++
++    # Remove the current device
++    del mctpd.network.endpoints[0]
++
++    ep_ep = await ep.get_interface(MCTPD_ENDPOINT_I)
++    await ep_ep.call_recover()
++
++    # Force the first poll to fail
++    await trio.sleep(1)
++
++    # Add a new the endpoint device at the same physical address (different UUID)
++    mctpd.network.add_endpoint(Endpoint(dev.iface, dev.lladdr, types = dev.types))
++
++    with trio.move_on_after(2 * MCTPD_TRECLAIM) as expected:
++        await added.acquire()
++        await removed.acquire()
++        await degraded.acquire()
++
++    assert not expected.cancelled_caught
++
++""" Test that we get the correct EID allocated (and the usual route/neigh setup)
++on an AssignEndpointStatic call """
++async def test_assign_endpoint_static(dbus, mctpd):
++    iface = mctpd.system.interfaces[0]
++    dev = mctpd.network.endpoints[0]
++    mctp = await mctpd_mctp_obj(dbus)
++    static_eid = 12
++
++    (eid, _, _, new) = await mctp.call_assign_endpoint_static(
++        iface.name,
++        dev.lladdr,
++        static_eid
++    )
++
++    assert eid == static_eid
++    assert new
++
++    assert len(mctpd.system.neighbours) == 1
++    neigh = mctpd.system.neighbours[0]
++    assert neigh.lladdr == dev.lladdr
++    assert neigh.eid == static_eid
++    assert len(mctpd.system.routes) == 2
++
++""" Test that we can repeat an AssignEndpointStatic call with the same static
++EID"""
++async def test_assign_endpoint_static_allocated(dbus, mctpd):
++    iface = mctpd.system.interfaces[0]
++    mctp = await mctpd_mctp_obj(dbus)
++    dev = mctpd.network.endpoints[0]
++    static_eid = 12
++
++    (eid, _, _, new) = await mctp.call_assign_endpoint_static(
++        iface.name,
++        dev.lladdr,
++        static_eid,
++    )
++
++    assert eid == static_eid
++    assert new
++
++    # repeat, same EID
++    (eid, _, _, new) = await mctp.call_assign_endpoint_static(
++        iface.name,
++        dev.lladdr,
++        static_eid,
++    )
++
++    assert eid == static_eid
++    assert not new
++
++""" Test that we cannot assign a conflicting static EID """
++async def test_assign_endpoint_static_conflict(dbus, mctpd):
++    iface = mctpd.system.interfaces[0]
++    mctp = await mctpd_mctp_obj(dbus)
++    dev1 = mctpd.network.endpoints[0]
++
++    dev2 = Endpoint(iface, bytes([0x1e]))
++    mctpd.network.add_endpoint(dev2)
++
++    # dynamic EID assigment for dev1
++    (eid, _, _, new) = await mctp.call_assign_endpoint(
++        iface.name,
++        dev1.lladdr,
++    )
++
++    assert new
++
++    # try to assign dev2 with the dev1's existing EID
++    with pytest.raises(asyncdbus.errors.DBusError) as ex:
++        await mctp.call_assign_endpoint_static(iface.name, dev2.lladdr, eid)
++
++    assert str(ex.value) == "Address in use"
++
++""" Test that we cannot re-assign a static EID to an endpoint that already has
++a different EID allocated"""
++async def test_assign_endpoint_static_varies(dbus, mctpd):
++    iface = mctpd.system.interfaces[0]
++    dev = mctpd.network.endpoints[0]
++    mctp = await mctpd_mctp_obj(dbus)
++    static_eid = 12
++
++    (eid, _, _, new) = await mctp.call_assign_endpoint_static(
++        iface.name,
++        dev.lladdr,
++        static_eid
++    )
++
++    assert eid == static_eid
++    assert new
++
++    with pytest.raises(asyncdbus.errors.DBusError) as ex:
++        await mctp.call_assign_endpoint_static(iface.name, dev.lladdr, 13)
++
++    assert str(ex.value) == "Already assigned a different EID"
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend b/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
index f153d58a9e50..d704b176926c 100644
--- a/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-networking/mctp/mctp_%.bbappend
@@ -3,4 +3,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI += " \
     file://0500-Support-get-static-eid-config-from-entity-manager.patch \
     file://0501-Modified-the-type-of-NetworkId-to-uint32_t.patch \
+    file://0502-mctpd-Add-AssignEndpointStatic-dbus-interface.patch \
 "
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/entity-manager_%.bbappend
new file mode 100644
index 000000000000..1725c338806c
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI += " \
+    file://0001-yosemite4-Support-CX7-NIC-card-temperature-sensor.patch \
+    file://0002-configurations-yosemite4-Add-IANA-for-sentinel-dome.patch \
+"
+
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0001-yosemite4-Support-CX7-NIC-card-temperature-sensor.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0001-yosemite4-Support-CX7-NIC-card-temperature-sensor.patch
new file mode 100644
index 000000000000..2b8de7bdd03a
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0001-yosemite4-Support-CX7-NIC-card-temperature-sensor.patch
@@ -0,0 +1,153 @@
+From 04075a44d060e987078e521190dc393add828964 Mon Sep 17 00:00:00 2001
+From: Eric <Eric_LC_Chen@wiwynn.com>
+Date: Tue, 12 Mar 2024 18:34:24 +0800
+Subject: [PATCH 1/2] yosemite4: Support CX7 NIC card temperature sensor
+
+Summary:
+Description
+Add project cx7_ocp.json to override the common one,
+which was named by i2c bus number.
+
+Motivation
+Correct sensor name for temperature of CX7 NIC card
+
+Test plan:
+Get NIC temperature sensor reading by mfg-tool
+
+Test log:
+root@bmc:~# mfg-tool sensor-display
+...
+    "NIC2_TEMP_C": {
+        "critical": {
+            "high": 105.0
+        },
+        "hard-shutdown": {
+            "high": 120.0
+        },
+        "max": 127.0,
+        "min": -128.0,
+        "status": "ok",
+        "unit": "DegreesC",
+        "value": 61.0
+    },
+...
+---
+ configurations/cx7_ocp.json | 91 ++++++++++++++++++++++++++++++++++---
+ 1 file changed, 85 insertions(+), 6 deletions(-)
+
+diff --git a/configurations/cx7_ocp.json b/configurations/cx7_ocp.json
+index 0968760..01e91be 100644
+--- a/configurations/cx7_ocp.json
++++ b/configurations/cx7_ocp.json
+@@ -8,19 +8,97 @@
+         },
+         {
+             "Address": "0x1f",
+-            "Bus": "$bus",
++            "Bus": "24",
++            "Labels": [
++                "temp2"
++            ],
++            "Name": "NIC0_REMOTE_TEMP_C",
++            "Name1": "NIC0_TEMP_C",
++            "Thresholds": [
++                {
++                    "Direction": "greater than",
++                    "Index": 2,
++                    "Name": "upper non recoverable",
++                    "Severity": 4,
++                    "Value": 120
++                },
++                {
++                    "Direction": "greater than",
++                    "Index": 2,
++                    "Name": "upper critical",
++                    "Severity": 1,
++                    "Value": 105
++                }
++            ],
++	    "Type": "TMP421"
++        },
++        {
++            "Address": "0x1f",
++            "Bus": "25",
++            "Labels": [
++                "temp2"
++            ],
++            "Name": "NIC1_REMOTE_TEMP_C",
++            "Name1": "NIC1_TEMP_C",
++            "Thresholds": [
++                {
++                    "Direction": "greater than",
++                    "Index": 2,
++                    "Name": "upper non recoverable",
++                    "Severity": 4,
++                    "Value": 120
++                },
++                {
++                    "Direction": "greater than",
++                    "Index": 2,
++                    "Name": "upper critical",
++                    "Severity": 1,
++                    "Value": 105
++                }
++            ],
++            "Type": "TMP421"
++        },
++        {
++            "Address": "0x1f",
++            "Bus": "26",
+             "Labels": [
+                 "temp2"
+             ],
+-            "Name": "NIC Temp $bus",
+-            "Name1": "NIC Temp $bus",
++            "Name": "NIC2_REMOTE_TEMP_C",
++            "Name1": "NIC2_TEMP_C",
+             "Thresholds": [
+                 {
+-                    "Direction": "less than",
++                    "Direction": "greater than",
++                    "Index": 2,
++                    "Name": "upper non recoverable",
++                    "Severity": 4,
++                    "Value": 120
++                },
++                {
++                    "Direction": "greater than",
+                     "Index": 2,
+-                    "Name": "lower critical",
++                    "Name": "upper critical",
+                     "Severity": 1,
+-                    "Value": 5
++                    "Value": 105
++                }
++            ],
++            "Type": "TMP421"
++        },
++        {
++            "Address": "0x1f",
++            "Bus": "27",
++            "Labels": [
++                "temp2"
++            ],
++            "Name": "NIC3_REMOTE_TEMP_C",
++            "Name1": "NIC3_TEMP_C",
++            "Thresholds": [
++                {
++                    "Direction": "greater than",
++                    "Index": 2,
++                    "Name": "upper non recoverable",
++                    "Severity": 4,
++                    "Value": 120
+                 },
+                 {
+                     "Direction": "greater than",
+@@ -43,3 +121,4 @@
+         "SerialNumber": "$BOARD_SERIAL_NUMBER"
+     }
+ }
++
+-- 
+2.43.0
+
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0002-configurations-yosemite4-Add-IANA-for-sentinel-dome.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0002-configurations-yosemite4-Add-IANA-for-sentinel-dome.patch
new file mode 100644
index 000000000000..d0bc9c6fdd00
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/configuration/files/0002-configurations-yosemite4-Add-IANA-for-sentinel-dome.patch
@@ -0,0 +1,59 @@
+From 07bb49afc40b6775eb1c20841d8194a776699434 Mon Sep 17 00:00:00 2001
+From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+Date: Thu, 7 Mar 2024 10:41:16 +0800
+Subject: [PATCH 2/2] configurations: yosemite4: Add IANA for sentinel dome
+
+Configuring IANA for devices indicates which OEM sets we should be
+using on which hardware.
+
+schemas: Add IANA with type of string.
+
+Use case for PLDM OEM command:
+https://gerrit.openbmc.org/c/openbmc/pldm/+/69246
+
+Change-Id: Ifcd410f6548c5f28d399c2ef64a2aadd57554e41
+Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+---
+ configurations/yosemite4_sentineldome.json | 1 +
+ schemas/legacy.json                        | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/configurations/yosemite4_sentineldome.json b/configurations/yosemite4_sentineldome.json
+index 383a284..328df2d 100644
+--- a/configurations/yosemite4_sentineldome.json
++++ b/configurations/yosemite4_sentineldome.json
+@@ -4,6 +4,7 @@
+             "Address": "0x20",
+             "Bus": "$bus % 16",
+             "EndpointId": "$bus % 15 * 10",
++            "IANA": "0015A000",
+             "Name": "BIC",
+             "Type": "MCTPEndpoint"
+         }
+diff --git a/schemas/legacy.json b/schemas/legacy.json
+index 1752c3b..9f98a9e 100644
+--- a/schemas/legacy.json
++++ b/schemas/legacy.json
+@@ -84,6 +84,9 @@
+                 "GpioPolarity": {
+                     "$ref": "#/definitions/Types/GpioPolarity"
+                 },
++                "IANA": {
++                    "$ref": "#/definitions/Types/IANA"
++                },
+                 "Index": {
+                     "$ref": "#/definitions/Types/Index"
+                 },
+@@ -755,6 +758,9 @@
+             "GpioPolarity": {
+                 "enum": ["Low"]
+             },
++            "IANA": {
++                "type": "string"
++            },
+             "Index": {
+                 "type": "number"
+             },
+-- 
+2.43.0
+
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/entity-manager/entity-manager_git.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/entity-manager/entity-manager_git.bbappend
deleted file mode 100644
index 883db24dae67..000000000000
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/entity-manager/entity-manager_git.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
-    file://0001-Add-property-SlotNumber-for-multi-host-system.patch \
-"
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/entity-manager/files/0001-Add-property-SlotNumber-for-multi-host-system.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/entity-manager/files/0001-Add-property-SlotNumber-for-multi-host-system.patch
deleted file mode 100644
index 527084c0e6ba..000000000000
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/entity-manager/files/0001-Add-property-SlotNumber-for-multi-host-system.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From e259c25212b2d51ab809cd1d603ad5c288aa00e2 Mon Sep 17 00:00:00 2001
-From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
-Date: Thu, 28 Dec 2023 11:05:54 +0800
-Subject: [PATCH] Add property SlotNumber for multi-host system
-
-Add property `SlotNumber` to Hosts' configuration in Yosemite4 to obtain
-Host's slot number by getting the property instead of parsing the string
-of Dbus path.
-
-schemas: add `SlotNumber` with type `string` and `number`.
-
-Tested: verify that the properties have been generated.
-
-Change-Id: I0f1412fcb74790d6da9b48f8dbf739d35f34c2c7
-Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
----
- configurations/yosemite4_floatingfalls.json |  3 +++
- configurations/yosemite4_sentineldome.json  |  3 +++
- configurations/yosemite4_wailuafalls.json   |  3 +++
- schemas/global.json                         |  3 +++
- schemas/openbmc-dbus.json                   | 10 ++++++++++
- 5 files changed, 22 insertions(+)
-
-diff --git a/configurations/yosemite4_floatingfalls.json b/configurations/yosemite4_floatingfalls.json
-index e0075c4..bc17bb0 100644
---- a/configurations/yosemite4_floatingfalls.json
-+++ b/configurations/yosemite4_floatingfalls.json
-@@ -23,5 +23,8 @@
-         "Model": "$PRODUCT_PRODUCT_NAME",
-         "PartNumber": "$PRODUCT_PART_NUMBER",
-         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-+    },
-+    "xyz.openbmc_project.Inventory.Decorator.Slot": {
-+        "SlotNumber": "$bus % 15"
-     }
- }
-diff --git a/configurations/yosemite4_sentineldome.json b/configurations/yosemite4_sentineldome.json
-index cdfe8bd..383a284 100644
---- a/configurations/yosemite4_sentineldome.json
-+++ b/configurations/yosemite4_sentineldome.json
-@@ -16,5 +16,8 @@
-         "Model": "$PRODUCT_PRODUCT_NAME",
-         "PartNumber": "$PRODUCT_PART_NUMBER",
-         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-+    },
-+    "xyz.openbmc_project.Inventory.Decorator.Slot": {
-+        "SlotNumber": "$bus % 15"
-     }
- }
-diff --git a/configurations/yosemite4_wailuafalls.json b/configurations/yosemite4_wailuafalls.json
-index 97dfae1..b86c336 100644
---- a/configurations/yosemite4_wailuafalls.json
-+++ b/configurations/yosemite4_wailuafalls.json
-@@ -30,5 +30,8 @@
-         "Model": "$PRODUCT_PRODUCT_NAME",
-         "PartNumber": "$PRODUCT_PART_NUMBER",
-         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-+    },
-+    "xyz.openbmc_project.Inventory.Decorator.Slot": {
-+        "SlotNumber": "$bus % 15"
-     }
- }
-diff --git a/schemas/global.json b/schemas/global.json
-index 3cbf519..11cd8bf 100644
---- a/schemas/global.json
-+++ b/schemas/global.json
-@@ -147,6 +147,9 @@
-                 "xyz.openbmc_project.Inventory.Decorator.Replaceable": {
-                     "$ref": "openbmc-dbus.json#/definitions/xyz/openbmc_project/Inventory/Decorator/Replaceable"
-                 },
-+                "xyz.openbmc_project.Inventory.Decorator.Slot": {
-+                    "$ref": "openbmc-dbus.json#/definitions/xyz/openbmc_project/Inventory/Decorator/Slot"
-+                },
-                 "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
-                     "$ref": "openbmc-dbus.json#/definitions/xyz/openbmc_project/Inventory/Item/Board/Motherboard"
-                 },
-diff --git a/schemas/openbmc-dbus.json b/schemas/openbmc-dbus.json
-index 10c9ea9..36f4baf 100644
---- a/schemas/openbmc-dbus.json
-+++ b/schemas/openbmc-dbus.json
-@@ -65,6 +65,16 @@
-                             },
-                             "required": ["FieldReplaceable", "HotPluggable"],
-                             "type": "object"
-+                        },
-+                        "Slot": {
-+                            "additionalProperties": false,
-+                            "properties": {
-+                                "SlotNumber": {
-+                                    "type": ["string", "number"]
-+                                }
-+                            },
-+                            "required": ["SlotNumber"],
-+                            "type": "object"
-                         }
-                     },
-                     "Item": {
--- 
-2.25.1
-
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/libpldm/libpldm_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/libpldm/libpldm_%.bbappend
index 0ff410a204c3..72f07e72cdc9 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/libpldm/libpldm_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/libpldm/libpldm_%.bbappend
@@ -1,3 +1 @@
-PACKAGECONFIG = "abi-development"
-
 EXTRA_OEMESON:append = " -Doem-meta=enabled"
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0001-requester-Modified-MctpDiscovery-class.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0001-requester-Modified-MctpDiscovery-class.patch
index 010813ce9fb1..621ac349a8a8 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0001-requester-Modified-MctpDiscovery-class.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0001-requester-Modified-MctpDiscovery-class.patch
@@ -1,7 +1,7 @@
-From 735b201df86ceebeb72f4d3be26dec7455287c32 Mon Sep 17 00:00:00 2001
+From 424010b18998dc487f7f2175821c806abb6102e0 Mon Sep 17 00:00:00 2001
 From: Gilbert Chen <gilbert.chen@arm.com>
 Date: Mon, 14 Feb 2022 12:12:25 +0000
-Subject: [PATCH 1/9] requester: Modified MctpDiscovery class
+Subject: [PATCH 01/11] requester: Modified MctpDiscovery class
 
 Modified MctpDiscovery class to take list of managers instead of single
 fwManager. The change is for adding platform-mc manager.
@@ -14,27 +14,29 @@ https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/47252
 Signed-off-by: Gilbert Chen <gilbert.chen@arm.com>
 Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
 Change-Id: I1e1673504583a87f2a9bc3adf76fb49c2dc30254
+
+%% original patch: 0001-requester-Modified-MctpDiscovery-class.patch
 ---
- common/types.hpp                              |   6 +
+ common/types.hpp                              |   7 +
  fw-update/manager.hpp                         |  25 +-
  meson.build                                   |   1 +
  pldmd/pldmd.cpp                               |   4 +-
- requester/mctp_endpoint_discovery.cpp         | 248 +++++++++++++++---
+ requester/mctp_endpoint_discovery.cpp         | 249 +++++++++++++++---
  requester/mctp_endpoint_discovery.hpp         | 110 +++++++-
  .../test/mctp_endpoint_discovery_test.cpp     |  37 +++
  requester/test/meson.build                    |   7 +
  .../test/mock_mctp_discovery_handler_intf.hpp |  20 ++
  requester/test/static_eid_table.json          |  14 +
- 10 files changed, 425 insertions(+), 47 deletions(-)
+ 10 files changed, 426 insertions(+), 48 deletions(-)
  create mode 100644 requester/test/mctp_endpoint_discovery_test.cpp
  create mode 100644 requester/test/mock_mctp_discovery_handler_intf.hpp
  create mode 100644 requester/test/static_eid_table.json
 
 diff --git a/common/types.hpp b/common/types.hpp
-index 6f06ecc..138c48e 100644
+index 0c7514c..443566f 100644
 --- a/common/types.hpp
 +++ b/common/types.hpp
-@@ -16,10 +16,16 @@ namespace pldm
+@@ -16,10 +16,17 @@ namespace pldm
  {
  
  using eid = uint8_t;
@@ -47,12 +49,13 @@ index 6f06ecc..138c48e 100644
 +using NetworkId = uint32_t;
 +using MctpInfo = std::tuple<eid, UUID, MctpMedium, NetworkId>;
 +using MctpInfos = std::vector<MctpInfo>;
++using tid_t = uint8_t;
 +
  namespace dbus
  {
  
 diff --git a/fw-update/manager.hpp b/fw-update/manager.hpp
-index 018a703..06440b5 100644
+index 018a703..e750571 100644
 --- a/fw-update/manager.hpp
 +++ b/fw-update/manager.hpp
 @@ -6,6 +6,7 @@
@@ -100,7 +103,7 @@ index 018a703..06440b5 100644
 +     *
 +     *  @return return PLDM_SUCCESS on success and PLDM_ERROR otherwise
 +     */
-+    void handleRemovedMctpEndpoints(const MctpInfos&)
++    void handleRemovedMctpEndpoints([[maybe_unused]] const MctpInfos& mctpInfos)
 +    {
 +        return;
 +    }
@@ -109,7 +112,7 @@ index 018a703..06440b5 100644
       *         specification
       *
 diff --git a/meson.build b/meson.build
-index 0576048..04d6acf 100644
+index 1336ba8..07069e5 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -69,6 +69,7 @@ if get_option('transport-implementation') == 'mctp-demux'
@@ -121,10 +124,10 @@ index 0576048..04d6acf 100644
    configuration: conf_data
  )
 diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
-index fa68f17..70b2f88 100644
+index 7b932fa..ae269e6 100644
 --- a/pldmd/pldmd.cpp
 +++ b/pldmd/pldmd.cpp
-@@ -293,7 +293,9 @@ int main(int argc, char** argv)
+@@ -302,7 +302,9 @@ int main(int argc, char** argv)
      std::unique_ptr<fw_update::Manager> fwManager =
          std::make_unique<fw_update::Manager>(event, reqHandler, instanceIdDb);
      std::unique_ptr<MctpDiscovery> mctpDiscoveryHandler =
@@ -136,7 +139,7 @@ index fa68f17..70b2f88 100644
                       TID](IO& io, int fd, uint32_t revents) mutable {
          if (!(revents & EPOLLIN))
 diff --git a/requester/mctp_endpoint_discovery.cpp b/requester/mctp_endpoint_discovery.cpp
-index c766a70..1004e50 100644
+index 1a8a6a9..1004e50 100644
 --- a/requester/mctp_endpoint_discovery.cpp
 +++ b/requester/mctp_endpoint_discovery.cpp
 @@ -1,9 +1,15 @@
@@ -155,7 +158,7 @@ index c766a70..1004e50 100644
  #include <map>
  #include <string>
  #include <string_view>
-@@ -11,92 +17,264 @@
+@@ -11,93 +17,264 @@
  
  namespace pldm
  {
@@ -220,6 +223,7 @@ index c766a70..1004e50 100644
 -    catch (const std::exception& e)
 +    catch (const sdbusplus::exception_t& e)
      {
+-        error("Failed to call the D-Bus Method: {ERROR}", "ERROR", e);
 +        std::cerr << "Error in mapper GetSubTree call for MCTP Endpoint:"
 +                  << e.what() << std::endl;
          return;
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0002-requester-Added-coroutine-APIs.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0002-requester-Added-coroutine-APIs.patch
index f497262a8a8e..666a4eaf1375 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0002-requester-Added-coroutine-APIs.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0002-requester-Added-coroutine-APIs.patch
@@ -1,7 +1,7 @@
-From 2b143789b4abd5a37461ff32f1654717cbb31680 Mon Sep 17 00:00:00 2001
+From 43e0f040e0486fa66cbd728e3eff0a8f41a30506 Mon Sep 17 00:00:00 2001
 From: Gilbert Chen <gilbert.chen@arm.com>
 Date: Sun, 29 May 2022 18:44:19 +0100
-Subject: [PATCH 2/9] requester: Added coroutine APIs
+Subject: [PATCH 02/11] requester: Added coroutine APIs
 
 Added Coroutine struct and SendRecvPldmMsg awaiter struct to send PLDM
 command and receive response in the same function instead of handling
@@ -28,6 +28,8 @@ do
 
 Signed-off-by: Gilbert Chen <gilbert.chen@arm.com>
 Change-Id: I7b47d15ac15f6ae661ec94dca6a281844b939a44
+
+%% original patch: 0002-requester-Added-coroutine-APIs.patch
 ---
  requester/handler.hpp           | 245 ++++++++++++++++++++++++++++++++
  requester/test/handler_test.cpp |  50 +++++++
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0003-platform-mc-Added-Terminus-TerminusManager-class.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0003-platform-mc-Added-Terminus-TerminusManager-class.patch
index 0d126c0d69db..9e3772991c4a 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0003-platform-mc-Added-Terminus-TerminusManager-class.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0003-platform-mc-Added-Terminus-TerminusManager-class.patch
@@ -1,7 +1,7 @@
-From 97958600acc2eaa5bd5f82bfd2edbe9032c79f5f Mon Sep 17 00:00:00 2001
+From 7c3ef92ec015e6fb407040b878d68628918d22c1 Mon Sep 17 00:00:00 2001
 From: Gilbert Chen <gilbert.chen@arm.com>
 Date: Tue, 22 Feb 2022 15:40:17 +0000
-Subject: [PATCH 3/9] platform-mc: Added Terminus/TerminusManager class
+Subject: [PATCH 03/11] platform-mc: Added Terminus/TerminusManager class
 
 Added requester::sendRecvPldmMsg awaiter type to be able to send and
 receive PLDM message by coroutine.
@@ -15,6 +15,8 @@ repository to maintain terminus locator PDR information yet.
 Signed-off-by: Gilbert Chen <gilbert.chen@arm.com>
 Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
 Change-Id: Ifa5bdfff50648f1d7fba8710e160de662e8f9e06
+
+%% original patch: 0003-platform-mc-Added-Terminus-TerminusManager-class.patch
 ---
  meson.build                                |   4 +
  platform-mc/manager.hpp                    |  70 ++++
@@ -43,7 +45,7 @@ Change-Id: Ifa5bdfff50648f1d7fba8710e160de662e8f9e06
  create mode 100644 platform-mc/test/terminus_test.cpp
 
 diff --git a/meson.build b/meson.build
-index 04d6acf..6680bd2 100644
+index 07069e5..c61c16c 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -180,6 +180,9 @@ executable(
@@ -1556,7 +1558,7 @@ index 0000000..b2783c3
 +    EXPECT_EQ(tid, t1.getTid());
 +}
 diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
-index 70b2f88..8c07316 100644
+index ae269e6..5a14169 100644
 --- a/pldmd/pldmd.cpp
 +++ b/pldmd/pldmd.cpp
 @@ -6,6 +6,7 @@
@@ -1567,7 +1569,7 @@ index 70b2f88..8c07316 100644
  #include "requester/handler.hpp"
  #include "requester/mctp_endpoint_discovery.hpp"
  #include "requester/request.hpp"
-@@ -292,10 +293,12 @@ int main(int argc, char** argv)
+@@ -301,10 +302,12 @@ int main(int argc, char** argv)
  
      std::unique_ptr<fw_update::Manager> fwManager =
          std::make_unique<fw_update::Manager>(event, reqHandler, instanceIdDb);
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0004-platform-mc-PDR-handling.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0004-platform-mc-PDR-handling.patch
index e5236a0a77fa..5e5955bcf297 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0004-platform-mc-PDR-handling.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0004-platform-mc-PDR-handling.patch
@@ -1,7 +1,7 @@
-From e0784146771370e26dc443a639f8d56609bf76e2 Mon Sep 17 00:00:00 2001
+From e1634757669481fd44065b785c6bc84cd6170fe9 Mon Sep 17 00:00:00 2001
 From: Gilbert Chen <gilbert.chen@arm.com>
 Date: Tue, 24 May 2022 15:35:21 +0100
-Subject: [PATCH 4/9] platform-mc: PDR handling
+Subject: [PATCH 04/11] platform-mc: PDR handling
 
 Added parse PDR member functions to terminus class for parsing Numeric
 sensor PDR and sensor auxiliary names PDR.
@@ -11,6 +11,8 @@ PDR struct in libpldm/platform.h
 Signed-off-by: Gilbert Chen <gilbert.chen@arm.com>
 Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
 Change-Id: I30a0cc594a3c08fc17f2dad861b5c5d41c80ebdd
+
+%% original patch: 0004-platform-mc-PDR-handling.patch
 ---
  platform-mc/platform_manager.cpp           |   6 +-
  platform-mc/terminus.cpp                   | 199 +++++++++++++++++++++
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0005-platform-mc-Sensor-handling.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0005-platform-mc-Sensor-handling.patch
index e0ca9677ac31..77d7138cdbe7 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0005-platform-mc-Sensor-handling.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0005-platform-mc-Sensor-handling.patch
@@ -1,7 +1,7 @@
-From cda015b1796b54fed420cea82fe0786c576b9a94 Mon Sep 17 00:00:00 2001
+From 9294ae294ebd6a56db6d32e86ff5555ad1aec854 Mon Sep 17 00:00:00 2001
 From: Gilbert Chen <gilbert.chen@arm.com>
 Date: Wed, 23 Feb 2022 20:56:19 +0000
-Subject: [PATCH 5/9] platform-mc: Sensor handling
+Subject: [PATCH 05/11] platform-mc: Sensor handling
 
 Added sensor_manager and numeric_sensor class. The sensor_manager
 class manages the timing of sensor polling. The NumericSensor class
@@ -13,6 +13,8 @@ over I2C. bmcweb can display the state of numeric sensor.
 Signed-off-by: Gilbert Chen <gilbert.chen@arm.com>
 Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
 Change-Id: I4257f823ea26d7fdb322cc82d847e94db056258c
+
+%% original patch: 0005-platform-mc-Sensor-handling.patch
 ---
  meson.build                                |   4 +
  meson.options                              |  12 +
@@ -42,7 +44,7 @@ Change-Id: I4257f823ea26d7fdb322cc82d847e94db056258c
  create mode 100644 platform-mc/test/sensor_manager_test.cpp
 
 diff --git a/meson.build b/meson.build
-index 6680bd2..7a47722 100644
+index c61c16c..d51c5f7 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -70,6 +70,8 @@ elif get_option('transport-implementation') == 'af-mctp'
@@ -913,7 +915,7 @@ index 0000000..06239a2
 +} // namespace pldm
 diff --git a/platform-mc/sensor_manager.cpp b/platform-mc/sensor_manager.cpp
 new file mode 100644
-index 0000000..ef3e928
+index 0000000..73f5702
 --- /dev/null
 +++ b/platform-mc/sensor_manager.cpp
 @@ -0,0 +1,351 @@
@@ -1006,7 +1008,7 @@ index 0000000..ef3e928
 +
 +        if (sensorPollTimers.find(tid) == sensorPollTimers.end())
 +        {
-+            sensorPollTimers[tid] = std::make_unique<phosphor::Timer>(
++            sensorPollTimers[tid] = std::make_unique<sdbusplus::Timer>(
 +                event.get(),
 +                std::bind_front(&SensorManager::doSensorPolling, this, tid));
 +        }
@@ -1270,7 +1272,7 @@ index 0000000..ef3e928
 +} // namespace pldm
 diff --git a/platform-mc/sensor_manager.hpp b/platform-mc/sensor_manager.hpp
 new file mode 100644
-index 0000000..fbff40d
+index 0000000..ef9a79e
 --- /dev/null
 +++ b/platform-mc/sensor_manager.hpp
 @@ -0,0 +1,105 @@
@@ -1355,7 +1357,7 @@ index 0000000..fbff40d
 +    uint32_t pollingTime;
 +
 +    /** @brief sensor polling timers */
-+    std::map<tid_t, std::unique_ptr<phosphor::Timer>> sensorPollTimers;
++    std::map<tid_t, std::unique_ptr<sdbusplus::Timer>> sensorPollTimers;
 +
 +    /** @brief coroutine handle of doSensorPollingTasks */
 +    std::map<tid_t, std::coroutine_handle<>> doSensorPollingTaskHandles;
@@ -2059,10 +2061,10 @@ index 0000000..56e1d36
 +    runEventLoopForSeconds(seconds);
 +}
 diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
-index 8c07316..8c6b63f 100644
+index 5a14169..401ca01 100644
 --- a/pldmd/pldmd.cpp
 +++ b/pldmd/pldmd.cpp
-@@ -182,7 +182,7 @@ int main(int argc, char** argv)
+@@ -181,7 +181,7 @@ int main(int argc, char** argv)
      auto event = Event::get_default();
      auto& bus = pldm::utils::DBusHandler::getBus();
      sdbusplus::server::manager_t objManager(bus,
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0006-platform-mc-Added-EventManager.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0006-platform-mc-Added-EventManager.patch
index 5fdac92439f7..5e4668729885 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0006-platform-mc-Added-EventManager.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0006-platform-mc-Added-EventManager.patch
@@ -1,7 +1,7 @@
-From e3eda5ea90fbc73b3214a14241b9a7baa825bb0d Mon Sep 17 00:00:00 2001
+From 1e3f077c7870bf8cb2d089334451a4f7abda9907 Mon Sep 17 00:00:00 2001
 From: Gilbert Chen <gilbertc@nvidia.com>
 Date: Tue, 2 May 2023 10:20:10 +0000
-Subject: [PATCH 6/9] platform-mc: Added EventManager
+Subject: [PATCH 06/11] platform-mc: Added EventManager
 
 Added eventManager to handle sensor event class(00h),
 pldmMessagePollEvent class(05h)  and OEM CPER event class(FAh)
@@ -12,6 +12,8 @@ synchronously if terminus sends pldmMessagePollEvent.
 Change-Id: I1b337ccae454067841ffbbd8754631216a995542
 Signed-off-by: Thu Nguyen <thu@os.amperecomputing.com>
 Signed-off-by: Gilbert Chen <gilbertc@nvidia.com>
+
+%% original patch: 0006-platform-mc-Added-EventManager.patch
 ---
  libpldmresponder/platform.cpp              |   9 +-
  meson.build                                |   2 +
@@ -42,10 +44,10 @@ Signed-off-by: Gilbert Chen <gilbertc@nvidia.com>
  create mode 100644 platform-mc/test/mock_event_manager.hpp
 
 diff --git a/libpldmresponder/platform.cpp b/libpldmresponder/platform.cpp
-index 57315a4..aa0b3b7 100644
+index 0e5455c..fce004a 100644
 --- a/libpldmresponder/platform.cpp
 +++ b/libpldmresponder/platform.cpp
-@@ -345,15 +345,20 @@ Response Handler::platformEventMessage(const pldm_msg* request,
+@@ -368,15 +368,20 @@ Response Handler::platformEventMessage(const pldm_msg* request,
          try
          {
              const auto& handlers = eventHandlers.at(eventClass);
@@ -69,7 +71,7 @@ index 57315a4..aa0b3b7 100644
          catch (const std::out_of_range& e)
          {
 diff --git a/meson.build b/meson.build
-index 7a47722..8b52af8 100644
+index d51c5f7..0221ad3 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -72,6 +72,7 @@ endif
@@ -1264,7 +1266,7 @@ index ee8a498..11c178a 100644
  
      /** @brief Managed termini list */
 diff --git a/platform-mc/sensor_manager.cpp b/platform-mc/sensor_manager.cpp
-index ef3e928..949ba1c 100644
+index 73f5702..21c3a3c 100644
 --- a/platform-mc/sensor_manager.cpp
 +++ b/platform-mc/sensor_manager.cpp
 @@ -1,5 +1,6 @@
@@ -1304,7 +1306,7 @@ index ef3e928..949ba1c 100644
          for (auto& sensor : prioritySensors[tid])
          {
 diff --git a/platform-mc/sensor_manager.hpp b/platform-mc/sensor_manager.hpp
-index fbff40d..94dc4f2 100644
+index ef9a79e..6bd3ac5 100644
 --- a/platform-mc/sensor_manager.hpp
 +++ b/platform-mc/sensor_manager.hpp
 @@ -32,7 +32,7 @@ class SensorManager
@@ -1989,10 +1991,10 @@ index b77a197..2fb3f1e 100644
      {}
  
 diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
-index 8c6b63f..f3bbe37 100644
+index 401ca01..78289c7 100644
 --- a/pldmd/pldmd.cpp
 +++ b/pldmd/pldmd.cpp
-@@ -269,10 +269,37 @@ int main(int argc, char** argv)
+@@ -272,11 +272,38 @@ int main(int argc, char** argv)
      // FRU table is built lazily when a FRU command or Get PDR command is
      // handled. To enable building FRU table, the FRU handler is passed to the
      // Platform handler.
@@ -2026,12 +2028,13 @@ index 8c6b63f..f3bbe37 100644
      auto platformHandler = std::make_unique<platform::Handler>(
          &dbusHandler, hostEID, &instanceIdDb, PDR_JSONS_DIR, pdrRepo.get(),
          hostPDRHandler.get(), dbusToPLDMEventHandler.get(), fruHandler.get(),
--        oemPlatformHandler.get(), &reqHandler, event, true);
-+        oemPlatformHandler.get(), &reqHandler, event, true, addOnEventHandlers);
+         oemPlatformHandler.get(), platformConfigHandler.get(), &reqHandler,
+-        event, true);
++        event, true, addOnEventHandlers);
  #ifdef OEM_IBM
      pldm::responder::oem_ibm_platform::Handler* oemIbmPlatformHandler =
          dynamic_cast<pldm::responder::oem_ibm_platform::Handler*>(
-@@ -293,8 +320,6 @@ int main(int argc, char** argv)
+@@ -302,8 +329,6 @@ int main(int argc, char** argv)
  
      std::unique_ptr<fw_update::Manager> fwManager =
          std::make_unique<fw_update::Manager>(event, reqHandler, instanceIdDb);
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0007-requester-support-multi-host-MCTP-devices-hot-plug.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0007-requester-support-multi-host-MCTP-devices-hot-plug.patch
index 61da540e93d0..89c5ed9e21cd 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0007-requester-support-multi-host-MCTP-devices-hot-plug.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0007-requester-support-multi-host-MCTP-devices-hot-plug.patch
@@ -1,7 +1,7 @@
-From 548220e19a4aca0f03fc05f1250c01c4f0d326d0 Mon Sep 17 00:00:00 2001
+From c43ef8b5012f6637939dc2f0b54a6697491d9018 Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
 Date: Mon, 18 Dec 2023 18:40:23 +0800
-Subject: [PATCH 7/9] requester: support multi-host MCTP devices hot plug
+Subject: [PATCH 07/11] requester: support multi-host MCTP devices hot plug
 
 Currently, pldmd listens for new MCTP endpoint exposed by mctpd, but
 they only shows their EID, Network Id, and SupportedMessageTypes, which
@@ -20,21 +20,21 @@ when needed.
 
 TESTED:
 A series of unit test case to simulate the response of dbus call,
-confirm that the configurations are succesfully stored.
+confirm that the configurations are successfully stored.
 
 Change-Id: I59b8bf434576cbdea651848a8da11e5b870e2dfa
 Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
 ---
  common/test/mocked_utils.hpp                  |   4 +
- common/utils.cpp                              |  17 ++
- common/utils.hpp                              |   7 +
+ common/utils.cpp                              |  32 ++++
+ common/utils.hpp                              |  25 +++
  meson.build                                   |   1 +
- pldmd/pldmd.cpp                               |   7 +-
- requester/configuration_discovery_handler.cpp | 165 ++++++++++++++++++
- requester/configuration_discovery_handler.hpp | 133 ++++++++++++++
- .../configuration_discovery_handler_test.cpp  | 114 ++++++++++++
- requester/test/meson.build                    |   3 +
- 9 files changed, 450 insertions(+), 1 deletion(-)
+ pldmd/pldmd.cpp                               |   8 +-
+ requester/configuration_discovery_handler.cpp | 170 ++++++++++++++++++
+ requester/configuration_discovery_handler.hpp | 134 ++++++++++++++
+ .../configuration_discovery_handler_test.cpp  | 115 ++++++++++++
+ requester/test/meson.build                    |   4 +
+ 9 files changed, 492 insertions(+), 1 deletion(-)
  create mode 100644 requester/configuration_discovery_handler.cpp
  create mode 100644 requester/configuration_discovery_handler.hpp
  create mode 100644 requester/test/configuration_discovery_handler_test.cpp
@@ -53,13 +53,28 @@ index 71bc6e7..baaeecb 100644
 +                (const override));
  };
 diff --git a/common/utils.cpp b/common/utils.cpp
-index 8afa1f4..446f7e9 100644
+index 076cd5c..7b5d92c 100644
 --- a/common/utils.cpp
 +++ b/common/utils.cpp
-@@ -558,6 +558,23 @@ PropertyValue DBusHandler::getDbusPropertyVariant(
-     return value;
+@@ -559,6 +559,38 @@ PropertyValue DBusHandler::getDbusPropertyVariant(
+     return bus.call(method, dbusTimeout).unpack<PropertyValue>();
  }
  
++PropertyMap
++    DBusHandler::getDbusPropertiesVariant(const char* serviceName,
++                                          const char* objPath,
++                                          const char* dbusInterface) const
++{
++    auto& bus = DBusHandler::getBus();
++    auto method = bus.new_method_call(serviceName, objPath, dbusProperties,
++                                      "GetAll");
++    method.append(dbusInterface);
++    auto reply = bus.call(method, dbusTimeout);
++    PropertyMap properties;
++    reply.read(properties);
++    return properties;
++}
++
 +PropertyMap DBusHandler::getAll(const std::string& service,
 +                                const std::string& objPath,
 +                                const std::string& dbusInterface) const
@@ -81,24 +96,42 @@ index 8afa1f4..446f7e9 100644
                                   const nlohmann::json& value)
  {
 diff --git a/common/utils.hpp b/common/utils.hpp
-index cdc539b..dda1b10 100644
+index 5f24322..4e69006 100644
 --- a/common/utils.hpp
 +++ b/common/utils.hpp
-@@ -213,6 +213,10 @@ class DBusHandlerInterface
+@@ -213,6 +213,14 @@ class DBusHandlerInterface
      virtual PropertyValue
          getDbusPropertyVariant(const char* objPath, const char* dbusProp,
                                 const char* dbusInterface) const = 0;
 +
++    virtual PropertyMap
++        getDbusPropertiesVariant(const char* serviceName, const char* objPath,
++                                 const char* dbusInterface) const = 0;
++
 +    virtual PropertyMap getAll(const std::string& service,
 +                               const std::string& objPath,
 +                               const std::string& dbusInterface) const = 0;
  };
  
  /**
-@@ -277,6 +281,9 @@ class DBusHandler : public DBusHandlerInterface
+@@ -277,6 +285,23 @@ class DBusHandler : public DBusHandlerInterface
          getDbusPropertyVariant(const char* objPath, const char* dbusProp,
                                 const char* dbusInterface) const override;
  
++    /** @brief Get All properties(type: variant) from the requested dbus
++     *
++     *  @param[in] serviceName - The Dbus service name
++     *  @param[in] objPath - The Dbus object path
++     *  @param[in] dbusInterface - The Dbus interface
++     *
++     *  @return The values of the properties(type: variant)
++     *
++     *  @throw sdbusplus::exception_t when it fails
++     */
++    PropertyMap
++        getDbusPropertiesVariant(const char* serviceName, const char* objPath,
++                                 const char* dbusInterface) const override;
++
 +    PropertyMap getAll(const std::string& service, const std::string& objPath,
 +                       const std::string& dbusInterface) const override;
 +
@@ -106,7 +139,7 @@ index cdc539b..dda1b10 100644
       *         path
       *
 diff --git a/meson.build b/meson.build
-index 8b52af8..9328b08 100644
+index 0221ad3..69a8f82 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -190,6 +190,7 @@ executable(
@@ -118,7 +151,7 @@ index 8b52af8..9328b08 100644
    dependencies: deps,
    install: true,
 diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
-index f3bbe37..e59f8dc 100644
+index 78289c7..9da29a9 100644
 --- a/pldmd/pldmd.cpp
 +++ b/pldmd/pldmd.cpp
 @@ -7,6 +7,7 @@
@@ -129,7 +162,7 @@ index f3bbe37..e59f8dc 100644
  #include "requester/handler.hpp"
  #include "requester/mctp_endpoint_discovery.hpp"
  #include "requester/request.hpp"
-@@ -226,6 +227,9 @@ int main(int argc, char** argv)
+@@ -225,6 +226,9 @@ int main(int argc, char** argv)
          hostEffecterParser;
      std::unique_ptr<DbusToPLDMEvent> dbusToPLDMEventHandler;
      DBusHandler dbusHandler;
@@ -137,24 +170,25 @@ index f3bbe37..e59f8dc 100644
 +        std::make_unique<pldm::ConfigurationDiscoveryHandler>(&dbusHandler);
 +
      std::unique_ptr<oem_platform::Handler> oemPlatformHandler{};
-     std::unique_ptr<oem_bios::Handler> oemBiosHandler{};
- 
-@@ -323,7 +327,8 @@ int main(int argc, char** argv)
+     std::unique_ptr<platform_config::Handler> platformConfigHandler{};
+     platformConfigHandler = std::make_unique<platform_config::Handler>();
+@@ -332,7 +336,9 @@ int main(int argc, char** argv)
      std::unique_ptr<MctpDiscovery> mctpDiscoveryHandler =
          std::make_unique<MctpDiscovery>(
              bus, std::initializer_list<MctpDiscoveryHandlerIntf*>{
 -                     fwManager.get(), platformManager.get()});
 +                     fwManager.get(), platformManager.get(),
 +                     configurationDiscovery.get()});
++
      auto callback = [verbose, &invoker, &reqHandler, &fwManager, &pldmTransport,
                       TID](IO& io, int fd, uint32_t revents) mutable {
          if (!(revents & EPOLLIN))
 diff --git a/requester/configuration_discovery_handler.cpp b/requester/configuration_discovery_handler.cpp
 new file mode 100644
-index 0000000..4e43d2c
+index 0000000..ac297e1
 --- /dev/null
 +++ b/requester/configuration_discovery_handler.cpp
-@@ -0,0 +1,165 @@
+@@ -0,0 +1,170 @@
 +#include "configuration_discovery_handler.hpp"
 +
 +#include <phosphor-logging/lg2.hpp>
@@ -278,8 +312,13 @@ index 0000000..4e43d2c
 +        auto eid = std::get<uint64_t>(response.at("EndpointId"));
 +        auto bus = std::get<uint64_t>(response.at("Bus"));
 +        auto componentName = std::get<std::string>(response.at("Name"));
++        if (response.contains("IANA"))
++        {
++            auto iana = std::get<std::string>(response.at("IANA"));
++            return MctpEndpoint{address, eid, bus, componentName, iana};
++        }
 +
-+        return MctpEndpoint{address, eid, bus, componentName};
++        return MctpEndpoint{address, eid, bus, componentName, std::nullopt};
 +    }
 +    else
 +    {
@@ -322,10 +361,10 @@ index 0000000..4e43d2c
 +} // namespace pldm
 diff --git a/requester/configuration_discovery_handler.hpp b/requester/configuration_discovery_handler.hpp
 new file mode 100644
-index 0000000..59bc384
+index 0000000..58d64dc
 --- /dev/null
 +++ b/requester/configuration_discovery_handler.hpp
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,134 @@
 +#pragma once
 +
 +#include "common/utils.hpp"
@@ -342,6 +381,7 @@ index 0000000..59bc384
 +    uint64_t EndpointId;
 +    uint64_t bus;
 +    std::string name;
++    std::optional<std::string> iana;
 +};
 +
 +class ConfigurationDiscoveryHandler : public MctpDiscoveryHandlerIntf
@@ -461,10 +501,10 @@ index 0000000..59bc384
 +} // namespace pldm
 diff --git a/requester/test/configuration_discovery_handler_test.cpp b/requester/test/configuration_discovery_handler_test.cpp
 new file mode 100644
-index 0000000..2d23879
+index 0000000..a8230a8
 --- /dev/null
 +++ b/requester/test/configuration_discovery_handler_test.cpp
-@@ -0,0 +1,114 @@
+@@ -0,0 +1,115 @@
 +#include "config.h"
 +
 +#include "common/test/mocked_utils.hpp"
@@ -568,7 +608,8 @@ index 0000000..2d23879
 +        std::make_unique<pldm::ConfigurationDiscoveryHandler>(&mockedUtils);
 +
 +    pldm::MctpEndpoint mockedMctpEndpoint = {uint64_t(0x1), uint64_t(EID),
-+                                             uint64_t(0), "MockedDevice"};
++                                             uint64_t(0), "MockedDevice",
++                                             std::nullopt};
 +    handler->getConfigurations().emplace(
 +        "/xyz/openbmc_project/inventory/system/board/Mocked_Board_Slot_1/MockedDevice",
 +        mockedMctpEndpoint);
@@ -580,13 +621,14 @@ index 0000000..2d23879
 +    ASSERT_EQ(0, handler->getConfigurations().size());
 +}
 diff --git a/requester/test/meson.build b/requester/test/meson.build
-index 80c27c1..6e89e1d 100644
+index 80c27c1..acc112e 100644
 --- a/requester/test/meson.build
 +++ b/requester/test/meson.build
-@@ -1,12 +1,14 @@
+@@ -1,12 +1,15 @@
  test_src = declare_dependency(
            sources: [
              '../mctp_endpoint_discovery.cpp',
++            '../../common/utils.cpp',
 +            '../configuration_discovery_handler.cpp'
            ])
  
@@ -598,7 +640,7 @@ index 80c27c1..6e89e1d 100644
  ]
  
  foreach t : tests
-@@ -20,6 +22,7 @@ foreach t : tests
+@@ -20,6 +23,7 @@ foreach t : tests
                           gmock,
                           libpldm_dep,
                           nlohmann_json_dep,
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0008-Support-OEM-META-write-file-request-for-post-code-hi.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0008-Support-OEM-META-write-file-request-for-post-code-hi.patch
index 6fc01a7a7689..23faf126ce11 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0008-Support-OEM-META-write-file-request-for-post-code-hi.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0008-Support-OEM-META-write-file-request-for-post-code-hi.patch
@@ -1,7 +1,8 @@
-From 4d13727c7f93e524bc41afc30ee6c25af49ca3a3 Mon Sep 17 00:00:00 2001
+From e083cdd84acb1680fe080c5da8a51f984e9b5cde Mon Sep 17 00:00:00 2001
 From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
 Date: Mon, 23 Oct 2023 17:06:54 +0800
-Subject: [PATCH 8/9] Support OEM-META write file request for post code history
+Subject: [PATCH 08/11] Support OEM-META write file request for post code
+ history
 
 Support write file req when multiple hosts send postcode to BMC
 and store its post code history.
@@ -28,10 +29,10 @@ Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
  create mode 100644 oem/meta/libpldmresponder/oem_meta_file_io_type_post_code.hpp
 
 diff --git a/common/utils.cpp b/common/utils.cpp
-index 446f7e9..ac705a7 100644
+index 7b5d92c..206bd93 100644
 --- a/common/utils.cpp
 +++ b/common/utils.cpp
-@@ -445,6 +445,20 @@ GetSubTreeResponse
+@@ -448,6 +448,20 @@ GetSubTreeResponse
      return response;
  }
  
@@ -40,8 +41,8 @@ index 446f7e9..ac705a7 100644
 +                              const std::vector<std::string>& ifaceList) const
 +{
 +    auto& bus = pldm::utils::DBusHandler::getBus();
-+    auto method = bus.new_method_call(mapperBusName, mapperPath,
-+                                      mapperInterface, "GetAncestors");
++    auto method = bus.new_method_call(ObjectMapper::default_service, ObjectMapper::instance_path,
++                                      ObjectMapper::interface, "GetAncestors");
 +    method.append(searchPath, ifaceList);
 +    auto reply = bus.call(method, dbusTimeout);
 +    GetAncestorsResponse response;
@@ -51,9 +52,9 @@ index 446f7e9..ac705a7 100644
 +
  void reportError(const char* errorMsg)
  {
-     static constexpr auto logObjPath = "/xyz/openbmc_project/logging";
+     auto& bus = pldm::utils::DBusHandler::getBus();
 diff --git a/common/utils.hpp b/common/utils.hpp
-index dda1b10..1d5fc69 100644
+index 4e69006..733156b 100644
 --- a/common/utils.hpp
 +++ b/common/utils.hpp
 @@ -190,6 +190,8 @@ using ServiceName = std::string;
@@ -76,7 +77,7 @@ index dda1b10..1d5fc69 100644
      virtual void setDbusProperty(const DBusMapping& dBusMap,
                                   const PropertyValue& value) const = 0;
  
-@@ -266,6 +272,20 @@ class DBusHandler : public DBusHandlerInterface
+@@ -270,6 +276,20 @@ class DBusHandler : public DBusHandlerInterface
      GetSubTreeResponse
          getSubtree(const std::string& path, int depth,
                     const std::vector<std::string>& ifaceList) const override;
@@ -98,10 +99,10 @@ index dda1b10..1d5fc69 100644
      /** @brief Get property(type: variant) from the requested dbus
       *
 diff --git a/libpldmresponder/meson.build b/libpldmresponder/meson.build
-index 687fa82..3f71b1f 100644
+index 50bafe3..92bcae1 100644
 --- a/libpldmresponder/meson.build
 +++ b/libpldmresponder/meson.build
-@@ -27,6 +27,7 @@ sources = [
+@@ -28,6 +28,7 @@ sources = [
    '../host-bmc/dbus_to_host_effecters.cpp',
    '../host-bmc/host_condition.cpp',
    '../host-bmc/custom_dbus.cpp',
@@ -109,7 +110,7 @@ index 687fa82..3f71b1f 100644
    'event_parser.cpp'
  ]
  
-@@ -54,6 +55,16 @@ if get_option('oem-ibm').allowed()
+@@ -55,6 +56,16 @@ if get_option('oem-ibm').allowed()
    ]
  endif
  
@@ -127,7 +128,7 @@ index 687fa82..3f71b1f 100644
    'pldmresponder',
    sources,
 diff --git a/meson.build b/meson.build
-index 9328b08..c46b719 100644
+index 69a8f82..0654ac2 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -58,6 +58,9 @@ if get_option('oem-ibm').allowed()
@@ -515,7 +516,7 @@ index 0000000..780f0ef
 +
 +} // namespace pldm::responder::oem_meta
 diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
-index e59f8dc..e163e83 100644
+index 9da29a9..9c55fef 100644
 --- a/pldmd/pldmd.cpp
 +++ b/pldmd/pldmd.cpp
 @@ -67,6 +67,10 @@ PHOSPHOR_LOG2_USING;
@@ -529,7 +530,7 @@ index e59f8dc..e163e83 100644
  constexpr uint8_t MCTP_MSG_TYPE_PLDM = 1;
  
  using namespace pldm;
-@@ -264,6 +268,13 @@ int main(int argc, char** argv)
+@@ -265,6 +269,13 @@ int main(int argc, char** argv)
          dbusToPLDMEventHandler = std::make_unique<DbusToPLDMEvent>(
              pldmTransport.getEventSource(), hostEID, instanceIdDb, &reqHandler);
      }
@@ -542,7 +543,7 @@ index e59f8dc..e163e83 100644
 +
      auto biosHandler = std::make_unique<bios::Handler>(
          pldmTransport.getEventSource(), hostEID, &instanceIdDb, &reqHandler,
-         oemBiosHandler.get());
+         platformConfigHandler.get());
 -- 
 2.25.1
 
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0009-platform-mc-Add-OEM-Meta-event-handler.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0009-platform-mc-Add-OEM-Meta-event-handler.patch
new file mode 100644
index 000000000000..ad4cb40cfb73
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0009-platform-mc-Add-OEM-Meta-event-handler.patch
@@ -0,0 +1,969 @@
+From 74dce7f204abba780daba4827e8a599277b8bb77 Mon Sep 17 00:00:00 2001
+From: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+Date: Wed, 7 Feb 2024 13:52:07 +0800
+Subject: [PATCH 09/11] platform-mc: Add OEM Meta event handler
+
+Add OEM Meta handler with event type 0xFB. It will print the logs
+with prefix "BIOS_IPMI_SEL", so the user can utilize it to filter
+the journal logs. It will also send logs on D-Bus.
+
+Tested: tested and verified on yosemite4 system.
+Test Log:
+root@bmc:~# journalctl |grep BIOS_IPMI_SEL
+Feb 07 07:14:34 bmc pldmd[897]: BIOS_IPMI_SEL: Host 4: GeneralInfo:
+ MEMORY_ECC_ERR(0x21), DIMM Slot Location: Sled 0/Socket 0, Channel
+ 0, Slot 0, DIMM A0, DIMM Failure Event: Memory correctable error
+
+```
+root@bmc:~# busctl introspect xyz.openbmc_project.Logging  /xyz/openbmc_project/logging/entry/3 -l
+NAME                                        TYPE      SIGNATURE RESULT/VALUE                                                                                                                                                                                  FLAGS
+org.freedesktop.DBus.Introspectable         interface -         -                                                                                                                                                                                             -
+.Introspect                                 method    -         s                                                                                                                                                                                             -
+org.freedesktop.DBus.Peer                   interface -         -                                                                                                                                                                                             -
+.GetMachineId                               method    -         s                                                                                                                                                                                             -
+.Ping                                       method    -         -                                                                                                                                                                                             -
+org.freedesktop.DBus.Properties             interface -         -                                                                                                                                                                                             -
+.Get                                        method    ss        v                                                                                                                                                                                             -
+.GetAll                                     method    s         a{sv}                                                                                                                                                                                         -
+.Set                                        method    ssv       -                                                                                                                                                                                             -
+.PropertiesChanged                          signal    sa{sv}as  -                                                                                                                                                                                             -
+xyz.openbmc_project.Association.Definitions interface -         -                                                                                                                                                                                             -
+.Associations                               property  a(sss)    0                                                                                                                                                                                             emits-change writable
+xyz.openbmc_project.Common.FilePath         interface -         -                                                                                                                                                                                             -
+.Path                                       property  s         "/var/lib/phosphor-logging/errors/3"                                                                                                                                                          emits-change writable
+xyz.openbmc_project.Logging.Entry           interface -         -                                                                                                                                                                                             -
+.GetEntry                                   method    -         h                                                                                                                                                                                             -
+.AdditionalData                             property  as        0                                                                                                                                                                                             emits-change writable
+.EventId                                    property  s         ""                                                                                                                                                                                            emits-change writable
+.Id                                         property  u         3                                                                                                                                                                                             emits-change writable
+.Message                                    property  s         "BIOS_IPMI_SEL: Host 4: GeneralInfo: MEMORY_ECC_ERR(0x21), DIMM Slot Location: Sled 0/Socket 0, Channel 0, Slot 0, DIMM A0, DIMM Failure Event: Memory correctable error" emits-change writable
+.Resolution                                 property  s         ""                                                                                                                                                                                            emits-change writable
+.Resolved                                   property  b         false                                                                                                                                                                                         emits-change writable
+.ServiceProviderNotify                      property  s         "xyz.openbmc_project.Logging.Entry.Notify.NotSupported"                                                                                                                                       emits-change writable
+.Severity                                   property  s         "xyz.openbmc_project.Logging.Entry.Level.Error"                                                                                                                                               emits-change writable
+.Timestamp                                  property  t         1706147743858                                                                                                                                                                                 emits-change writable
+.UpdateTimestamp                            property  t         1706147743858                                                                                                                                                                                 emits-change writable
+xyz.openbmc_project.Object.Delete           interface -         -                                                                                                                                                                                             -
+.Delete                                     method    -         -                                                                                                                                                                                             -
+xyz.openbmc_project.Software.Version        interface -         -                                                                                                                                                                                             -
+.Purpose                                    property  s         "xyz.openbmc_project.Software.Version.VersionPurpose.BMC"                                                                                                                                     emits-change writable
+.Version                                    property  s         "yosemite4-b23efa40c0f-dirty"                                                                                                                                                                 emits-change writable
+
+```
+
+Change-Id: I722d8e09e7aea8dfa533e921d41beb505b59fb95
+Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
+---
+ meson.build                             |   1 +
+ oem/meta/platform-mc/event_oem_meta.cpp | 626 ++++++++++++++++++++++++
+ oem/meta/platform-mc/event_oem_meta.hpp |  21 +
+ platform-mc/event_manager.cpp           |  36 +-
+ platform-mc/event_manager.hpp           |  14 +-
+ platform-mc/manager.hpp                 |  29 +-
+ platform-mc/test/meson.build            |   4 +-
+ pldmd/pldmd.cpp                         |  10 +-
+ 8 files changed, 729 insertions(+), 12 deletions(-)
+ create mode 100644 oem/meta/platform-mc/event_oem_meta.cpp
+ create mode 100644 oem/meta/platform-mc/event_oem_meta.hpp
+
+diff --git a/meson.build b/meson.build
+index 0654ac2..01912e4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -194,6 +194,7 @@ executable(
+   'platform-mc/event_manager.cpp',
+   'requester/mctp_endpoint_discovery.cpp',
+   'requester/configuration_discovery_handler.cpp',
++  'oem/meta/platform-mc/event_oem_meta.cpp',
+   implicit_include_directories: false,
+   dependencies: deps,
+   install: true,
+diff --git a/oem/meta/platform-mc/event_oem_meta.cpp b/oem/meta/platform-mc/event_oem_meta.cpp
+new file mode 100644
+index 0000000..ca467aa
+--- /dev/null
++++ b/oem/meta/platform-mc/event_oem_meta.cpp
+@@ -0,0 +1,626 @@
++#include "event_oem_meta.hpp"
++
++#include "common/utils.hpp"
++
++#include <phosphor-logging/lg2.hpp>
++#include <xyz/openbmc_project/Inventory/Decorator/Slot/client.hpp>
++
++#include <cstdint>
++#include <iostream>
++#include <sstream>
++
++namespace pldm
++{
++namespace platform_mc
++{
++namespace oem_meta
++{
++
++typedef struct _dimm_info
++{
++    uint8_t sled;
++    uint8_t socket;
++    uint8_t channel;
++    uint8_t slot;
++} _dimm_info;
++
++constexpr auto slotNumberProperty = "SlotNumber";
++using DecoratorSlot =
++    sdbusplus::client::xyz::openbmc_project::inventory::decorator::Slot<>;
++
++void covertToDimmString(uint8_t cpu, uint8_t channel, uint8_t slot,
++                        std::string& str)
++{
++    constexpr char label[] = {'A', 'C', 'B', 'D'};
++    constexpr size_t labelSize = sizeof(label);
++
++    size_t idx = cpu * 2 + slot;
++    if (idx < labelSize)
++    {
++        str = label[idx] + std::to_string(channel);
++    }
++    else
++    {
++        str = "NA";
++    }
++}
++
++void getCommonDimmLocation(const _dimm_info& dimmInfo,
++                           std::string& dimmLocation, std::string& dimm)
++{
++    std::string sled_str = std::to_string(dimmInfo.sled);
++    std::string socket_str = std::to_string(dimmInfo.socket);
++
++    // Check Channel and Slot
++    if (dimmInfo.channel == 0xFF && dimmInfo.slot == 0xFF)
++    {
++        dimm = "unknown";
++        dimmLocation = "DIMM Slot Location: Sled " + sled_str + "/Socket " +
++                       socket_str +
++                       ", Channel unknown, Slot unknown, DIMM unknown";
++    }
++    else
++    {
++        uint8_t channel = dimmInfo.channel & 0x0F;
++        uint8_t slot = dimmInfo.slot & 0x07;
++        covertToDimmString(dimmInfo.socket, channel, slot, dimm);
++
++        std::string channel_str = std::to_string(channel);
++        std::string slot_str = std::to_string(slot);
++
++        dimmLocation = "DIMM Slot Location: Sled " + sled_str + "/Socket " +
++                       socket_str + ", Channel " + channel_str + ", Slot " +
++                       slot_str + ", DIMM " + dimm;
++    }
++}
++
++static inline auto to_hex_string(uint8_t value)
++{
++    return std::format("{:2x}", value);
++}
++
++std::string getSlotNumberString(
++    tid_t tid, const std::map<std::string, MctpEndpoint>& configurations)
++{
++    std::string slotNumber = "Unknown";
++    for (const auto& [configDbusPath, mctpEndpoint] : configurations)
++    {
++        if (mctpEndpoint.EndpointId == tid)
++        {
++            std::string endpointDbusPath;
++            try
++            {
++                auto response = pldm::utils::DBusHandler().getAncestors(
++                    configDbusPath.c_str(), {DecoratorSlot::interface});
++                if (response.size() != 1)
++                {
++                    lg2::error(
++                        "Only Board layer should have Decorator.Slot interface, got {SIZE} Dbus Object(s) have interface Decorator.Slot}",
++                        "SIZE", response.size());
++                    return slotNumber; // return "Unknown"
++                }
++                endpointDbusPath = std::get<0>(response.front());
++            }
++            catch (const sdbusplus::exception_t& e)
++            {
++                lg2::error("{FUNC}: Failed to call GetAncestors, ERROR={ERROR}",
++                           "FUNC", std::string(__func__), "ERROR", e.what());
++                return slotNumber; // return "Unknown";
++            }
++
++            try
++            {
++                auto number =
++                    pldm::utils::DBusHandler().getDbusProperty<uint64_t>(
++                        endpointDbusPath.c_str(), slotNumberProperty,
++                        DecoratorSlot::interface);
++                slotNumber = std::to_string(number);
++            }
++            catch (const sdbusplus::exception_t& e)
++            {
++                lg2::error("{FUNC}: Failed to execute Dbus call, ERROR={ERROR}",
++                           "FUNC", std::string(__func__), "ERROR", e.what());
++                return slotNumber; // return "Unknown"
++            }
++        }
++    }
++    return slotNumber;
++}
++
++int processOemMetaEvent(
++    tid_t tid, const uint8_t* eventData, [[maybe_unused]] size_t eventDataSize,
++    const std::map<std::string, MctpEndpoint>& configurations)
++{
++    enum class UnifiedError : uint8_t
++    {
++        UNIFIED_PCIE_ERR = 0x0,
++        UNIFIED_MEM_ERR = 0x1,
++        UNIFIED_UPI_ERR = 0x2,
++        UNIFIED_IIO_ERR = 0x3,
++        UNIFIED_RP_PIO_1st = 0x6,
++        UNIFIED_RP_PIO_2nd = 0x7,
++        UNIFIED_POST_ERR = 0x8,
++        UNIFIED_PCIE_EVENT = 0x9,
++        UNIFIED_MEM_EVENT = 0xA,
++        UNIFIED_UPI_EVENT = 0xB,
++        UNIFIED_BOOT_GUARD = 0xC,
++        UNIFIED_PPR_EVENT = 0xD,
++        UNIFIED_CXL_MEM_ERR = 0xE,
++    };
++
++    enum class MemoryError : uint8_t
++    {
++        MEMORY_TRAINING_ERR = 0x0,
++        MEMORY_CORRECTABLE_ERR = 0x1,
++        MEMORY_UNCORRECTABLE_ERR = 0x2,
++        MEMORY_CORR_ERR_PTRL_SCR = 0x3,
++        MEMORY_UNCORR_ERR_PTRL_SCR = 0x4,
++        MEMORY_PARITY_ERR_PCC0 = 0x5,
++        MEMORY_PARITY_ERR_PCC1 = 0x6,
++        MEMORY_PMIC_ERR = 0x7,
++    };
++
++    enum class PostError : uint8_t
++    {
++        POST_PXE_BOOT_FAIL = 0x0,
++        POST_CMOS_CLEARED = 0x1,
++        POST_TPM_SELF_TEST_FAIL = 0x2,
++        POST_BOOT_DRIVE_FAIL = 0x3,
++        POST_DATA_DRIVE_FAIL = 0x4,
++        POST_INVALID_BOOT_ORDER = 0x5,
++        POST_HTTP_BOOT_FAIL = 0x6,
++        POST_GET_CERT_FAIL = 0x7,
++        POST_AMD_ABL_FAIL = 0xA,
++    };
++
++    enum class PcieEvent : uint8_t
++    {
++        PCIE_DPC = 0x0,
++    };
++
++    enum MemoryEvent : uint8_t
++    {
++        MEM_PPR = 0x0,
++        MEM_ADDDC = 0x5,
++        MEM_NO_DIMM = 0x7,
++    };
++
++    enum class UpiError : uint8_t
++    {
++        UPI_INIT_ERR = 0x0,
++    };
++
++    static constexpr auto memoryError = std::to_array(
++        {"Memory training failure", "Memory correctable error",
++         "Memory uncorrectable error",
++         "Memory correctable error (Patrol scrub)",
++         "Memory uncorrectable error (Patrol scrub)",
++         "Memory Parity Error (PCC=0)", "Memory Parity Error (PCC=1)",
++         "Memory PMIC Error", "CXL Memory training error", "Reserved"});
++
++    static constexpr auto certEvent =
++        std::to_array({"No certificate at BMC", "IPMI transaction fail",
++                       "Certificate data corrupted", "Reserved"});
++
++    static constexpr auto postError = std::to_array(
++        {"System PXE boot fail", "CMOS/NVRAM configuration cleared",
++         "TPM Self-Test Fail", "Boot Drive failure", "Data Drive failure",
++         "Received invalid boot order request from BMC",
++         "System HTTP boot fail", "BIOS fails to get the certificate from BMC",
++         "Password cleared by jumper", "DXE FV check failure",
++         "AMD ABL failure", "Reserved"});
++
++    static constexpr auto pcieEvent = std::to_array(
++        {"PCIe DPC Event", "PCIe LER Event",
++         "PCIe Link Retraining and Recovery",
++         "PCIe Link CRC Error Check and Retry", "PCIe Corrupt Data Containment",
++         "PCIe Express ECRC", "Reserved"});
++
++    static constexpr auto memoryEvent = std::to_array(
++        {"Memory PPR event", "Memory Correctable Error logging limit reached",
++         "Memory disable/map-out for FRB", "Memory SDDC",
++         "Memory Address range/Partial mirroring", "Memory ADDDC",
++         "Memory SMBus hang recovery", "No DIMM in System", "Reserved"});
++
++    static constexpr auto memoryPprRepairTime =
++        std::to_array({"Boot time", "Autonomous", "Run time", "Reserved"});
++
++    static constexpr auto memoryPprEvent =
++        std::to_array({"PPR success", "PPR fail", "PPR request", "Reserved"});
++
++    static constexpr auto memoryAdddcEvent =
++        std::to_array({"Bank VLS", "r-Bank VLS + re-buddy",
++                       "r-Bank VLS + Rank VLS", "r-Rank VLS + re-buddy"});
++
++    static constexpr auto upiEvent = std::to_array(
++        {"Successful LLR without Phy Reinit", "Successful LLR with Phy Reinit",
++         "COR Phy Lane failure, recovery in x8 width", "Reserved"});
++
++    static constexpr auto pprEvent =
++        std::to_array({"PPR disable", "Soft PPR", "Hard PPR"});
++
++    static constexpr auto upiError =
++        std::to_array({"UPI Init error", "Reserved"});
++
++    uint8_t generalInfo = eventData[0];
++    UnifiedError errorType = static_cast<UnifiedError>(generalInfo & 0xF);
++    _dimm_info dimmInfo = {
++        static_cast<uint8_t>((eventData[5] >> 4) & 0x03), // Sled
++        static_cast<uint8_t>(eventData[5] & 0x0F),        // Socket
++        static_cast<uint8_t>(eventData[6]),               // Channel
++        static_cast<uint8_t>(eventData[7])                // Slot
++    };
++    std::string errorLog;
++    switch (errorType)
++    {
++        case UnifiedError::UNIFIED_PCIE_ERR:
++        {
++            uint8_t plat = (generalInfo & 0x10) >> 4;
++            if (plat == 0)
++            { // x86
++                errorLog =
++                    "GeneralInfo: x86/PCIeErr(0x" + to_hex_string(generalInfo) +
++                    "), Bus " + to_hex_string(eventData[8]) + "/Dev " +
++                    to_hex_string(eventData[7] >> 3) + "/Fun " +
++                    to_hex_string(eventData[7] & 0x7) + ", TotalErrID1Cnt: 0x" +
++                    to_hex_string((eventData[10] << 8) | eventData[9]) +
++                    ", ErrID2: 0x" + to_hex_string(eventData[11]) +
++                    ", ErrID1: 0x" + to_hex_string(eventData[12]);
++            }
++            else
++            {
++                errorLog = "GeneralInfo: ARM/PCIeErr(0x" +
++                           to_hex_string(generalInfo) + "), Aux. Info: 0x" +
++                           to_hex_string((eventData[6] << 8) | eventData[5]) +
++                           ", Bus " + to_hex_string(eventData[8]) + "/Dev " +
++                           to_hex_string(eventData[7] >> 3) + "/Fun " +
++                           to_hex_string(eventData[7] & 0x7) +
++                           ", TotalErrID1Cnt: 0x" +
++                           to_hex_string((eventData[10] << 8) | eventData[9]) +
++                           ", ErrID2: 0x" + to_hex_string(eventData[11]) +
++                           ", ErrID1: 0x" + to_hex_string(eventData[12]);
++            }
++            break;
++        }
++        case UnifiedError::UNIFIED_MEM_ERR:
++        {
++            std::string dimmLocation, dimm;
++            getCommonDimmLocation(dimmInfo, dimmLocation, dimm);
++            uint8_t plat = (eventData[9] & 0x80) >> 7;
++            MemoryError eventType =
++                static_cast<MemoryError>(eventData[9] & 0xF);
++            switch (eventType)
++            {
++                case MemoryError::MEMORY_TRAINING_ERR:
++                case MemoryError::MEMORY_PMIC_ERR:
++                {
++                    if (plat == 0)
++                    { // Intel
++                        errorLog =
++                            "GeneralInfo: MEMORY_ECC_ERR(0x" +
++                            to_hex_string(generalInfo) + "), " + dimmLocation +
++                            ", DIMM Failure Event: " +
++                            memoryError[static_cast<uint8_t>(eventType)] +
++                            ", Major Code: 0x" + to_hex_string(eventData[10]) +
++                            ", Minor Code: 0x" + to_hex_string(eventData[11]);
++                    }
++                    else
++                    { // AMD
++                        errorLog =
++                            "GeneralInfo: MEMORY_ECC_ERR(0x" +
++                            to_hex_string(generalInfo) + "), " + dimmLocation +
++                            ", DIMM Failure Event: " +
++                            memoryError[static_cast<uint8_t>(eventType)] +
++                            ", Major Code: 0x" + to_hex_string(eventData[10]) +
++                            ", Minor Code: 0x" +
++                            to_hex_string((eventData[12] << 8) | eventData[11]);
++                    }
++                    break;
++                }
++                default:
++                    covertToDimmString(dimmInfo.socket, dimmInfo.channel,
++                                       dimmInfo.slot, dimm);
++                    uint8_t estrIdx =
++                        (static_cast<uint8_t>(eventType) < memoryError.size())
++                            ? static_cast<uint8_t>(eventType)
++                            : (memoryError.size() - 1);
++                    errorLog = "GeneralInfo: MEMORY_ECC_ERR(0x" +
++                               to_hex_string(generalInfo) + "), " +
++                               dimmLocation +
++                               ", DIMM Failure Event: " + memoryError[estrIdx];
++                    break;
++            }
++            break;
++        }
++        case UnifiedError::UNIFIED_UPI_ERR:
++        {
++            UpiError eventType = static_cast<UpiError>(eventData[9] & 0xF);
++            uint8_t estrIdx =
++                (static_cast<uint8_t>(eventType) < upiError.size())
++                    ? static_cast<uint8_t>(eventType)
++                    : (upiError.size() - 1);
++
++            switch (eventType)
++            {
++                case UpiError::UPI_INIT_ERR:
++                {
++                    errorLog =
++                        "GeneralInfo: UPIErr(0x" + to_hex_string(generalInfo) +
++                        "), UPI Port Location: Sled " +
++                        std::to_string(dimmInfo.sled) + "/Socket " +
++                        std::to_string(dimmInfo.socket) + ", Port " +
++                        std::to_string(eventData[3] & 0xF) +
++                        ", UPI Failure Event: " + upiError[estrIdx] +
++                        ", Major Code: 0x" + to_hex_string(eventData[7]) +
++                        ", Minor Code: 0x" + to_hex_string(eventData[8]);
++                    break;
++                }
++                default:
++                {
++                    errorLog = "GeneralInfo: UPIErr(0x" +
++                               to_hex_string(generalInfo) +
++                               "), UPI Port Location: Sled " +
++                               std::to_string(dimmInfo.sled) + "/Socket " +
++                               std::to_string(dimmInfo.socket) + ", Port " +
++                               std::to_string(eventData[3] & 0xF) +
++                               ", UPI Failure Event: " + upiError[estrIdx];
++                    break;
++                }
++            }
++            break;
++        }
++        case UnifiedError::UNIFIED_IIO_ERR:
++        {
++            uint8_t stack = eventData[6];
++            uint8_t selErrorType = eventData[10];
++            uint8_t selErrorSeverity = eventData[11];
++            uint8_t selErrorId = eventData[12];
++
++            errorLog = "GeneralInfo: IIOErr(0x" + to_hex_string(generalInfo) +
++                       "), IIO Port Location: Sled " +
++                       std::to_string(dimmInfo.sled) + "/Socket " +
++                       std::to_string(dimmInfo.socket) + ", Stack 0x" +
++                       to_hex_string(stack) + ", Error Type: 0x" +
++                       to_hex_string(selErrorType) + ", Error Severity: 0x" +
++                       to_hex_string(selErrorSeverity) + ", Error ID: 0x" +
++                       to_hex_string(selErrorId);
++            break;
++        }
++        case UnifiedError::UNIFIED_RP_PIO_1st:
++        case UnifiedError::UNIFIED_RP_PIO_2nd:
++        {
++            auto offset =
++                static_cast<uint8_t>(errorType) -
++                static_cast<uint8_t>(UnifiedError::UNIFIED_RP_PIO_1st);
++            errorLog =
++                "GeneralInfo: RP_PIOEvent(0x" + to_hex_string(generalInfo) +
++                "), RP_PIO Header Log" + std::to_string(1 + offset * 2) +
++                ": 0x" + to_hex_string(eventData[8]) +
++                to_hex_string(eventData[7]) + to_hex_string(eventData[6]) +
++                to_hex_string(eventData[5]) + ", RP_PIO Header Log" +
++                std::to_string(2 + offset * 2) + ": 0x" +
++                to_hex_string(eventData[12]) + to_hex_string(eventData[11]) +
++                to_hex_string(eventData[10]) + to_hex_string(eventData[9]);
++            break;
++        }
++        case UnifiedError::UNIFIED_POST_ERR:
++        {
++            uint8_t certEventIdx = (eventData[9] < certEvent.size())
++                                       ? eventData[9]
++                                       : (certEvent.size() - 1);
++            uint8_t failType = eventData[10] & 0xF;
++            uint8_t errCode = eventData[11];
++            PostError eventType = static_cast<PostError>(eventData[5] & 0xF);
++            uint8_t estrIdx =
++                (static_cast<uint8_t>(eventType) < postError.size())
++                    ? static_cast<uint8_t>(eventType)
++                    : (postError.size() - 1);
++
++            switch (eventType)
++            {
++                case PostError::POST_PXE_BOOT_FAIL:
++                case PostError::POST_HTTP_BOOT_FAIL:
++                {
++                    std::string tempLog;
++                    if (failType == 4 || failType == 6)
++                    {
++                        tempLog = "IPv" + std::to_string(failType) + " fail";
++                    }
++                    else
++                    {
++                        tempLog = "0x" + to_hex_string(eventData[10]);
++                    }
++                    errorLog = "GeneralInfo: POST(0x" +
++                               to_hex_string(generalInfo) +
++                               "), POST Failure Event: " + postError[estrIdx] +
++                               ", Fail Type: " + tempLog + ", Error Code: 0x" +
++                               to_hex_string(errCode);
++                    break;
++                }
++                case PostError::POST_GET_CERT_FAIL:
++                {
++                    errorLog = "GeneralInfo: POST(0x" +
++                               to_hex_string(generalInfo) +
++                               "), POST Failure Event: " + postError[estrIdx] +
++                               ", Failure Detail: " + certEvent[certEventIdx];
++                    break;
++                }
++                case PostError::POST_AMD_ABL_FAIL:
++                {
++                    uint16_t ablErrCode = (eventData[12] << 8) | eventData[11];
++                    errorLog =
++                        "GeneralInfo: POST(0x" + to_hex_string(generalInfo) +
++                        "), POST Failure Event: " + postError[estrIdx] +
++                        ", ABL Error Code: 0x" + to_hex_string(ablErrCode);
++                    break;
++                }
++                default:
++                {
++                    errorLog = "GeneralInfo: POST(0x" +
++                               to_hex_string(generalInfo) +
++                               "), POST Failure Event: " + postError[estrIdx];
++                    break;
++                }
++            }
++            break;
++        }
++        case UnifiedError::UNIFIED_PCIE_EVENT:
++        {
++            PcieEvent eventType = static_cast<PcieEvent>(eventData[5] & 0xF);
++            uint8_t estrIdx =
++                (static_cast<uint8_t>(eventType) < pcieEvent.size())
++                    ? static_cast<uint8_t>(eventType)
++                    : (pcieEvent.size() - 1);
++            switch (eventType)
++            {
++                case PcieEvent::PCIE_DPC:
++                {
++                    errorLog =
++                        "GeneralInfo: PCIeEvent(0x" +
++                        to_hex_string(generalInfo) +
++                        "), PCIe Failure Event: " + pcieEvent[estrIdx] +
++                        ", Status: 0x" +
++                        to_hex_string((eventData[8] << 8) | eventData[7]) +
++                        ", Source ID: 0x" +
++                        to_hex_string((eventData[10] << 8) | eventData[9]);
++                    break;
++                }
++                default:
++                {
++                    errorLog = "GeneralInfo: PCIeEvent(0x" +
++                               to_hex_string(generalInfo) +
++                               "), PCIe Failure Event: " + pcieEvent[estrIdx];
++                    break;
++                }
++            }
++            break;
++        }
++        case UnifiedError::UNIFIED_MEM_EVENT:
++        {
++            // get dimm location data string.
++            std::string dimmLocation, dimm;
++            getCommonDimmLocation(dimmInfo, dimmLocation, dimm);
++
++            // Event-Type Bit[3:0]
++            MemoryEvent eventType =
++                static_cast<MemoryEvent>(eventData[9] & 0x0F);
++            switch (eventType)
++            {
++                case MemoryEvent::MEM_PPR:
++                {
++                    errorLog = "GeneralInfo: MemEvent(0x" +
++                               to_hex_string(generalInfo) + "), " +
++                               dimmLocation + ", DIMM Failure Event: " +
++                               memoryPprRepairTime[eventData[10] >> 2 & 0x03] +
++                               ", " + memoryPprEvent[eventData[10] & 0x03];
++                    break;
++                }
++                case MemoryEvent::MEM_ADDDC:
++                {
++                    uint8_t estrIdx = eventData[11] & 0x03;
++                    if (estrIdx >= memoryAdddcEvent.size())
++                        estrIdx = memoryAdddcEvent.size() - 1;
++                    errorLog = "GeneralInfo: MemEvent(0x" +
++                               to_hex_string(generalInfo) + "), " +
++                               dimmLocation + ", DIMM Failure Event: " +
++                               memoryEvent[static_cast<uint8_t>(eventType)] +
++                               " " + memoryAdddcEvent[estrIdx];
++                    break;
++                }
++                case MemoryEvent::MEM_NO_DIMM:
++                {
++                    errorLog = "GeneralInfo: MemEvent(0x" +
++                               to_hex_string(generalInfo) +
++                               "), DIMM Failure Event: " +
++                               memoryEvent[static_cast<uint8_t>(eventType)];
++                    break;
++                }
++                default:
++                {
++                    uint8_t estrIdx =
++                        (static_cast<uint8_t>(eventType) < memoryEvent.size())
++                            ? static_cast<uint8_t>(eventType)
++                            : (memoryEvent.size() - 1);
++                    errorLog = "GeneralInfo: MemEvent(0x" +
++                               to_hex_string(generalInfo) + "), " +
++                               dimmLocation +
++                               ", DIMM Failure Event: " + memoryEvent[estrIdx];
++                    break;
++                }
++            }
++            break;
++        }
++        case UnifiedError::UNIFIED_UPI_EVENT:
++        {
++            uint8_t eventType = eventData[9] & 0x0F;
++            uint8_t estrIdx = (eventType < upiEvent.size())
++                                  ? eventType
++                                  : (upiEvent.size() - 1);
++            errorLog = "GeneralInfo: UPIEvent(0x" + to_hex_string(generalInfo) +
++                       "), UPI Port Location: Sled " +
++                       std::to_string(dimmInfo.sled) + "/Socket " +
++                       std::to_string(dimmInfo.socket) + ", Port " +
++                       std::to_string(eventData[6] & 0xF) +
++                       ", UPI Failure Event: " + upiEvent[estrIdx];
++            break;
++        }
++        case UnifiedError::UNIFIED_BOOT_GUARD:
++        {
++            errorLog = "GeneralInfo: Boot Guard ACM Failure Events(0x" +
++                       to_hex_string(generalInfo) + "), Error Class(0x" +
++                       to_hex_string(eventData[9]) + "), Major Error Code(0x" +
++                       to_hex_string(eventData[10]) + "), Minor Error Code(0x" +
++                       to_hex_string(eventData[11]) + ")";
++            break;
++        }
++        case UnifiedError::UNIFIED_PPR_EVENT:
++        {
++            uint8_t eventType = eventData[5] & 0x0F;
++            errorLog =
++                "GeneralInfo: PPR Events(0x" + to_hex_string(generalInfo) +
++                "), " + pprEvent[eventType] + ". DIMM Info: (" +
++                to_hex_string(eventData[6]) + to_hex_string(eventData[7]) +
++                to_hex_string(eventData[8]) + to_hex_string(eventData[9]) +
++                to_hex_string(eventData[10]) + to_hex_string(eventData[11]) +
++                to_hex_string(eventData[12]) + ")";
++            break;
++        }
++        case UnifiedError::UNIFIED_CXL_MEM_ERR:
++        {
++            uint8_t eventType = eventData[9] & 0xF;
++            errorLog = "GeneralInfo: CXL Memory Error(0x" +
++                       to_hex_string(generalInfo) + "), Bus " +
++                       to_hex_string(eventData[6]) + "/Dev " +
++                       to_hex_string(eventData[7] >> 4) + "/Fun " +
++                       to_hex_string(eventData[7] & 0xF) +
++                       ", Controller ID(0x" + to_hex_string(eventData[10]) +
++                       "), DIMM Failure Event: " + memoryError[eventType];
++            break;
++        }
++        default:
++        {
++            errorLog =
++                "Undefined Error Type(0x" +
++                to_hex_string(static_cast<uint8_t>(errorType)) +
++                "), Raw: " + to_hex_string(eventData[0]) +
++                to_hex_string(eventData[1]) + to_hex_string(eventData[2]) +
++                to_hex_string(eventData[3]) + to_hex_string(eventData[4]) +
++                to_hex_string(eventData[5]) + to_hex_string(eventData[6]) +
++                to_hex_string(eventData[7]) + to_hex_string(eventData[8]) +
++                to_hex_string(eventData[9]) + to_hex_string(eventData[10]) +
++                to_hex_string(eventData[11]) + to_hex_string(eventData[12]);
++            break;
++        }
++    }
++
++    auto slotNumber = getSlotNumberString(tid, configurations);
++    std::string message = "Host " + slotNumber + ": " + errorLog;
++    lg2::error("BIOS_IPMI_SEL: {ERROR}", "ERROR",
++               message);                       // Create log in journal
++    pldm::utils::reportError(message.c_str()); // Create log on Dbus
++    return 0;
++}
++
++} // namespace oem_meta
++} // namespace platform_mc
++} // namespace pldm
+diff --git a/oem/meta/platform-mc/event_oem_meta.hpp b/oem/meta/platform-mc/event_oem_meta.hpp
+new file mode 100644
+index 0000000..ae6a09f
+--- /dev/null
++++ b/oem/meta/platform-mc/event_oem_meta.hpp
+@@ -0,0 +1,21 @@
++#pragma once
++
++#define PLDM_OEM_EVENT_CLASS_0xFB 0xFB
++
++#include "common/types.hpp"
++#include "requester/configuration_discovery_handler.hpp"
++
++namespace pldm
++{
++namespace platform_mc
++{
++namespace oem_meta
++{
++
++int processOemMetaEvent(
++    tid_t tid, const uint8_t* eventData, size_t eventDataSize,
++    const std::map<std::string, MctpEndpoint>& configurations);
++
++} // namespace oem_meta
++} // namespace platform_mc
++} // namespace pldm
+diff --git a/platform-mc/event_manager.cpp b/platform-mc/event_manager.cpp
+index dcc39ca..67c280d 100644
+--- a/platform-mc/event_manager.cpp
++++ b/platform-mc/event_manager.cpp
+@@ -2,13 +2,17 @@
+ 
+ #include "libpldm/utils.h"
+ 
++#include "requester/configuration_discovery_handler.hpp"
+ #include "terminus_manager.hpp"
+ 
++#include <oem/meta/platform-mc/event_oem_meta.hpp>
+ #include <phosphor-logging/lg2.hpp>
+ #include <xyz/openbmc_project/Logging/Entry/server.hpp>
+ 
+ #include <cerrno>
+ 
++constexpr auto MetaIANA = "0015A000";
++
+ namespace pldm
+ {
+ namespace platform_mc
+@@ -79,7 +83,23 @@ int decode_pldm_cper_event_data(const uint8_t* event_data,
+     return PLDM_SUCCESS;
+ }
+ 
+-int EventManager::handlePlatformEvent(tid_t tid, uint8_t eventClass,
++bool EventManager::checkMetaIana(
++    tid_t tid, const std::map<std::string, MctpEndpoint>& configurations)
++{
++    for (const auto& [configDbusPath, mctpEndpoint] : configurations)
++    {
++        if (mctpEndpoint.EndpointId == tid)
++        {
++            if (mctpEndpoint.iana.has_value() && mctpEndpoint.iana.value() == MetaIANA)
++            {
++                return true;
++            }
++        }
++    }
++    return false;
++}
++
++int EventManager::handlePlatformEvent(pldm_tid_t tid, uint8_t eventClass,
+                                       const uint8_t* eventData,
+                                       size_t eventDataSize)
+ {
+@@ -128,7 +148,19 @@ int EventManager::handlePlatformEvent(tid_t tid, uint8_t eventClass,
+     {
+         return processCperEvent(eventData, eventDataSize);
+     }
+-
++    else if (eventClass == PLDM_OEM_EVENT_CLASS_0xFB)
++    {
++        const std::map<std::string, MctpEndpoint>& configurations =
++            configurationDiscovery->getConfigurations();
++        if (!checkMetaIana(tid, configurations))
++        {
++            lg2::error("Recieve OEM Meta event from not Meta specific device");
++            return PLDM_ERROR;
++        }
++        pldm::platform_mc::oem_meta::processOemMetaEvent(
++            tid, eventData, eventDataSize, configurations);
++        return PLDM_SUCCESS;
++    }
+     lg2::info("unhandled event, event class={EVENTCLASS}", "EVENTCLASS",
+               eventClass);
+ 
+diff --git a/platform-mc/event_manager.hpp b/platform-mc/event_manager.hpp
+index 170a55b..0862a01 100644
+--- a/platform-mc/event_manager.hpp
++++ b/platform-mc/event_manager.hpp
+@@ -6,6 +6,7 @@
+ #include "common/types.hpp"
+ #include "numeric_sensor.hpp"
+ #include "pldmd/dbus_impl_requester.hpp"
++#include "requester/configuration_discovery_handler.hpp"
+ #include "requester/handler.hpp"
+ #include "terminus.hpp"
+ #include "terminus_manager.hpp"
+@@ -54,9 +55,11 @@ class EventManager
+ 
+     explicit EventManager(
+         TerminusManager& terminusManager,
+-        std::map<mctp_eid_t, std::shared_ptr<Terminus>>& termini) :
++        std::map<mctp_eid_t, std::shared_ptr<Terminus>>& termini,
++        pldm::ConfigurationDiscoveryHandler* configurationDiscovery = nullptr) :
+         terminusManager(terminusManager),
+-        termini(termini){};
++        termini(termini), configurationDiscovery(configurationDiscovery)
++    {}
+ 
+     /** @brief Handle platform event
+      *
+@@ -108,6 +111,9 @@ class EventManager
+     virtual int processCperEvent(const uint8_t* eventData,
+                                  size_t eventDataSize);
+ 
++    bool checkMetaIana(
++        tid_t tid, const std::map<std::string, MctpEndpoint>& configurations);
++
+     int createCperDumpEntry(const std::string& dataType,
+                             const std::string& dataPath);
+ 
+@@ -124,7 +130,9 @@ class EventManager
+     TerminusManager& terminusManager;
+ 
+     /** @brief List of discovered termini */
+-    std::map<tid_t, std::shared_ptr<Terminus>>& termini;
++    std::map<pldm_tid_t, std::shared_ptr<Terminus>>& termini;
++
++    pldm::ConfigurationDiscoveryHandler* configurationDiscovery;
+ };
+ } // namespace platform_mc
+ } // namespace pldm
+diff --git a/platform-mc/manager.hpp b/platform-mc/manager.hpp
+index 8f8d27a..bd8df91 100644
+--- a/platform-mc/manager.hpp
++++ b/platform-mc/manager.hpp
+@@ -6,11 +6,14 @@
+ #include "common/types.hpp"
+ #include "event_manager.hpp"
+ #include "platform_manager.hpp"
++#include "requester/configuration_discovery_handler.hpp"
+ #include "requester/handler.hpp"
+ #include "requester/mctp_endpoint_discovery.hpp"
+ #include "sensor_manager.hpp"
+ #include "terminus_manager.hpp"
+ 
++#include <oem/meta/platform-mc/event_oem_meta.hpp>
++
+ namespace pldm
+ {
+ namespace platform_mc
+@@ -33,13 +36,16 @@ class Manager : public pldm::MctpDiscoveryHandlerIntf
+     Manager& operator=(Manager&&) = delete;
+     ~Manager() = default;
+ 
+-    explicit Manager(sdeventplus::Event& event,
+-                     requester::Handler<requester::Request>& handler,
+-                     pldm::InstanceIdDb& instanceIdDb) :
++    explicit Manager(
++        sdeventplus::Event& event,
++        requester::Handler<requester::Request>& handler,
++        pldm::InstanceIdDb& instanceIdDb,
++        pldm::ConfigurationDiscoveryHandler* configurationDiscovery) :
+         terminusManager(event, handler, instanceIdDb, termini, LOCAL_EID, this),
+         platformManager(terminusManager, termini),
+         sensorManager(event, terminusManager, termini, this),
+-        eventManager(terminusManager, termini)
++        eventManager(terminusManager, termini, configurationDiscovery),
++        configurationDiscovery(configurationDiscovery)
+     {}
+ 
+     requester::Coroutine beforeDiscoverTerminus()
+@@ -110,7 +116,19 @@ class Manager : public pldm::MctpDiscoveryHandlerIntf
+         return PLDM_SUCCESS;
+     }
+ 
+-    requester::Coroutine pollForPlatformEvent(tid_t tid)
++    int handleOemMetaEvent(const pldm_msg* request, size_t payloadLength,
++                           uint8_t /* formatVersion */, uint8_t tid,
++                           size_t eventDataOffset)
++    {
++        auto eventData = reinterpret_cast<const uint8_t*>(request->payload) +
++                         eventDataOffset;
++        auto eventDataSize = payloadLength - eventDataOffset;
++        eventManager.handlePlatformEvent(tid, PLDM_OEM_EVENT_CLASS_0xFB,
++                                         eventData, eventDataSize);
++        return PLDM_SUCCESS;
++    }
++
++    requester::Coroutine pollForPlatformEvent(pldm_tid_t tid)
+     {
+         auto it = termini.find(tid);
+         if (it != termini.end())
+@@ -130,6 +148,7 @@ class Manager : public pldm::MctpDiscoveryHandlerIntf
+     PlatformManager platformManager;
+     SensorManager sensorManager;
+     EventManager eventManager;
++    pldm::ConfigurationDiscoveryHandler* configurationDiscovery;
+ };
+ } // namespace platform_mc
+ } // namespace pldm
+diff --git a/platform-mc/test/meson.build b/platform-mc/test/meson.build
+index abf990d..ff36161 100644
+--- a/platform-mc/test/meson.build
++++ b/platform-mc/test/meson.build
+@@ -6,7 +6,9 @@ test_src = declare_dependency(
+             '../sensor_manager.cpp',
+             '../numeric_sensor.cpp',
+             '../event_manager.cpp',
+-            '../../requester/mctp_endpoint_discovery.cpp'],
++            '../../requester/mctp_endpoint_discovery.cpp',
++            '../../requester/configuration_discovery_handler.cpp',
++            '../../oem/meta/platform-mc/event_oem_meta.cpp'],
+             include_directories: ['../../requester', '../../pldmd'])
+ 
+ tests = [
+diff --git a/pldmd/pldmd.cpp b/pldmd/pldmd.cpp
+index 9c55fef..52be834 100644
+--- a/pldmd/pldmd.cpp
++++ b/pldmd/pldmd.cpp
+@@ -289,7 +289,8 @@ int main(int argc, char** argv)
+     // Platform handler.
+ 
+     std::unique_ptr<platform_mc::Manager> platformManager =
+-        std::make_unique<platform_mc::Manager>(event, reqHandler, instanceIdDb);
++        std::make_unique<platform_mc::Manager>(event, reqHandler, instanceIdDb,
++                                               configurationDiscovery.get());
+ 
+     pldm::responder::platform::EventMap addOnEventHandlers{
+         {PLDM_OEM_EVENT_CLASS_0xFA,
+@@ -312,6 +313,13 @@ int main(int argc, char** argv)
+                              size_t eventDataOffset) {
+         return platformManager->handleSensorEvent(
+             request, payloadLength, formatVersion, tid, eventDataOffset);
++    }}},
++        {PLDM_OEM_EVENT_CLASS_0xFB,
++         {[&platformManager](const pldm_msg* request, size_t payloadLength,
++                             uint8_t formatVersion, uint8_t tid,
++                             size_t eventDataOffset) {
++        return platformManager->handleOemMetaEvent(
++            request, payloadLength, formatVersion, tid, eventDataOffset);
+     }}}};
+ 
+     auto platformHandler = std::make_unique<platform::Handler>(
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0009-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0010-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch
similarity index 90%
rename from meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0009-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch
rename to meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0010-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch
index 2e2745e1e82c..4d51da2e055b 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0009-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0010-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch
@@ -1,7 +1,7 @@
-From ea90ef25eb11328067e8f86e460cbeef077f36c8 Mon Sep 17 00:00:00 2001
+From 80a1acfe52be3552c7555725373a45bd09a4d28c Mon Sep 17 00:00:00 2001
 From: Patrick Williams <patrick@stwcx.xyz>
 Date: Wed, 3 Jan 2024 11:26:32 -0600
-Subject: [PATCH 9/9] platform-mc: fix up tid_t to pldm_tid_t conversions
+Subject: [PATCH 10/11] platform-mc: fix up tid_t to pldm_tid_t conversions
 
 An earlier patch in this sequence had defined a typedef `tid_t`
 at one point in its history and some later patches rely on it.
@@ -12,10 +12,17 @@ before the code gets submitted.
 
 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
 Change-Id: I527d77fcd18cb69aa1e2ae0c5cef5929d25f6ede
+
+%% original patch: 0009-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch
+
+Change-Id: I65cc965651617995b32078d3f3985f66e6f4590e
 ---
+ common/types.hpp                           |  1 -
+ oem/meta/platform-mc/event_oem_meta.cpp    |  4 +--
+ oem/meta/platform-mc/event_oem_meta.hpp    |  2 +-
  platform-mc/event_manager.cpp              |  8 +++---
  platform-mc/event_manager.hpp              | 19 +++++++-------
- platform-mc/manager.hpp                    |  8 +++---
+ platform-mc/manager.hpp                    |  6 ++---
  platform-mc/numeric_sensor.cpp             |  4 +--
  platform-mc/numeric_sensor.hpp             |  6 ++---
  platform-mc/platform_manager.cpp           | 26 ++++++++++---------
@@ -33,22 +40,69 @@ Change-Id: I527d77fcd18cb69aa1e2ae0c5cef5929d25f6ede
  platform-mc/test/sensor_manager_test.cpp   |  4 +--
  platform-mc/test/terminus_manager_test.cpp |  2 +-
  platform-mc/test/terminus_test.cpp         |  2 +-
- 20 files changed, 110 insertions(+), 103 deletions(-)
+ 23 files changed, 112 insertions(+), 106 deletions(-)
 
+diff --git a/common/types.hpp b/common/types.hpp
+index 443566f..90c94c6 100644
+--- a/common/types.hpp
++++ b/common/types.hpp
+@@ -25,7 +25,6 @@ using MctpMedium = std::string;
+ using NetworkId = uint32_t;
+ using MctpInfo = std::tuple<eid, UUID, MctpMedium, NetworkId>;
+ using MctpInfos = std::vector<MctpInfo>;
+-using tid_t = uint8_t;
+ 
+ namespace dbus
+ {
+diff --git a/oem/meta/platform-mc/event_oem_meta.cpp b/oem/meta/platform-mc/event_oem_meta.cpp
+index ca467aa..660ab94 100644
+--- a/oem/meta/platform-mc/event_oem_meta.cpp
++++ b/oem/meta/platform-mc/event_oem_meta.cpp
+@@ -80,7 +80,7 @@ static inline auto to_hex_string(uint8_t value)
+ }
+ 
+ std::string getSlotNumberString(
+-    tid_t tid, const std::map<std::string, MctpEndpoint>& configurations)
++    pldm_tid_t tid, const std::map<std::string, MctpEndpoint>& configurations)
+ {
+     std::string slotNumber = "Unknown";
+     for (const auto& [configDbusPath, mctpEndpoint] : configurations)
+@@ -128,7 +128,7 @@ std::string getSlotNumberString(
+ }
+ 
+ int processOemMetaEvent(
+-    tid_t tid, const uint8_t* eventData, [[maybe_unused]] size_t eventDataSize,
++    pldm_tid_t tid, const uint8_t* eventData, [[maybe_unused]] size_t eventDataSize,
+     const std::map<std::string, MctpEndpoint>& configurations)
+ {
+     enum class UnifiedError : uint8_t
+diff --git a/oem/meta/platform-mc/event_oem_meta.hpp b/oem/meta/platform-mc/event_oem_meta.hpp
+index ae6a09f..55822a8 100644
+--- a/oem/meta/platform-mc/event_oem_meta.hpp
++++ b/oem/meta/platform-mc/event_oem_meta.hpp
+@@ -13,7 +13,7 @@ namespace oem_meta
+ {
+ 
+ int processOemMetaEvent(
+-    tid_t tid, const uint8_t* eventData, size_t eventDataSize,
++    pldm_tid_t tid, const uint8_t* eventData, size_t eventDataSize,
+     const std::map<std::string, MctpEndpoint>& configurations);
+ 
+ } // namespace oem_meta
 diff --git a/platform-mc/event_manager.cpp b/platform-mc/event_manager.cpp
-index dcc39ca..75400a5 100644
+index 67c280d..ceca9a5 100644
 --- a/platform-mc/event_manager.cpp
 +++ b/platform-mc/event_manager.cpp
-@@ -79,7 +79,7 @@ int decode_pldm_cper_event_data(const uint8_t* event_data,
-     return PLDM_SUCCESS;
+@@ -84,7 +84,7 @@ int decode_pldm_cper_event_data(const uint8_t* event_data,
  }
  
--int EventManager::handlePlatformEvent(tid_t tid, uint8_t eventClass,
-+int EventManager::handlePlatformEvent(pldm_tid_t tid, uint8_t eventClass,
-                                       const uint8_t* eventData,
-                                       size_t eventDataSize)
+ bool EventManager::checkMetaIana(
+-    tid_t tid, const std::map<std::string, MctpEndpoint>& configurations)
++    pldm_tid_t tid, const std::map<std::string, MctpEndpoint>& configurations)
  {
-@@ -135,7 +135,7 @@ int EventManager::handlePlatformEvent(tid_t tid, uint8_t eventClass,
+     for (const auto& [configDbusPath, mctpEndpoint] : configurations)
+     {
+@@ -167,7 +167,7 @@ int EventManager::handlePlatformEvent(pldm_tid_t tid, uint8_t eventClass,
      return PLDM_ERROR;
  }
  
@@ -57,7 +111,7 @@ index dcc39ca..75400a5 100644
  {
      uint8_t rc = 0;
      uint8_t transferOperationFlag = PLDM_GET_FIRSTPART;
-@@ -241,7 +241,7 @@ requester::Coroutine EventManager::pollForPlatformEventTask(tid_t tid)
+@@ -273,7 +273,7 @@ requester::Coroutine EventManager::pollForPlatformEventTask(tid_t tid)
  }
  
  requester::Coroutine EventManager::pollForPlatformEventMessage(
@@ -66,7 +120,7 @@ index dcc39ca..75400a5 100644
      uint16_t eventIdToAcknowledge, uint8_t& completionCode, uint8_t& eventTid,
      uint16_t& eventId, uint32_t& nextDataTransferHandle, uint8_t& transferFlag,
      uint8_t& eventClass, uint32_t& eventDataSize, uint8_t*& eventData,
-@@ -458,7 +458,7 @@ int EventManager::createSensorThresholdLogEntry(const std::string& messageId,
+@@ -490,7 +490,7 @@ int EventManager::createSensorThresholdLogEntry(const std::string& messageId,
      return PLDM_SUCCESS;
  }
  
@@ -76,10 +130,10 @@ index dcc39ca..75400a5 100644
                                              size_t sensorDataLength)
  {
 diff --git a/platform-mc/event_manager.hpp b/platform-mc/event_manager.hpp
-index 170a55b..303a9ec 100644
+index 0862a01..95b35ac 100644
 --- a/platform-mc/event_manager.hpp
 +++ b/platform-mc/event_manager.hpp
-@@ -67,7 +67,7 @@ class EventManager
+@@ -70,7 +70,7 @@ class EventManager
       *  @return PLDM completion code
       *
       */
@@ -88,7 +142,7 @@ index 170a55b..303a9ec 100644
                              const uint8_t* eventData, size_t eventDataSize);
  
      std::string getSensorThresholdMessageId(uint8_t previousEventState,
-@@ -77,7 +77,7 @@ class EventManager
+@@ -80,7 +80,7 @@ class EventManager
       *
       *  @param[in] dstTid - the destination TID
       */
@@ -97,7 +151,7 @@ index 170a55b..303a9ec 100644
  
    protected:
      /** @brief Send pollForPlatformEventMessage and return response
-@@ -99,11 +99,12 @@ class EventManager
+@@ -102,22 +102,23 @@ class EventManager
       *
       */
      requester::Coroutine pollForPlatformEventMessage(
@@ -115,7 +169,11 @@ index 170a55b..303a9ec 100644
  
      virtual int processCperEvent(const uint8_t* eventData,
                                   size_t eventDataSize);
-@@ -111,7 +112,7 @@ class EventManager
+ 
+     bool checkMetaIana(
+-        tid_t tid, const std::map<std::string, MctpEndpoint>& configurations);
++        pldm_tid_t tid, const std::map<std::string, MctpEndpoint>& configurations);
+ 
      int createCperDumpEntry(const std::string& dataType,
                              const std::string& dataPath);
  
@@ -124,20 +182,11 @@ index 170a55b..303a9ec 100644
                                    const uint8_t* sensorData,
                                    size_t sensorDataLength);
  
-@@ -124,7 +125,7 @@ class EventManager
-     TerminusManager& terminusManager;
- 
-     /** @brief List of discovered termini */
--    std::map<tid_t, std::shared_ptr<Terminus>>& termini;
-+    std::map<pldm_tid_t, std::shared_ptr<Terminus>>& termini;
- };
- } // namespace platform_mc
- } // namespace pldm
 diff --git a/platform-mc/manager.hpp b/platform-mc/manager.hpp
-index 8f8d27a..baaeb5c 100644
+index bd8df91..a9ad507 100644
 --- a/platform-mc/manager.hpp
 +++ b/platform-mc/manager.hpp
-@@ -63,12 +63,12 @@ class Manager : public pldm::MctpDiscoveryHandlerIntf
+@@ -69,12 +69,12 @@ class Manager : public pldm::MctpDiscoveryHandlerIntf
          terminusManager.removeMctpTerminus(mctpInfos);
      }
  
@@ -152,16 +201,7 @@ index 8f8d27a..baaeb5c 100644
      {
          sensorManager.stopPolling(tid);
      }
-@@ -110,7 +110,7 @@ class Manager : public pldm::MctpDiscoveryHandlerIntf
-         return PLDM_SUCCESS;
-     }
- 
--    requester::Coroutine pollForPlatformEvent(tid_t tid)
-+    requester::Coroutine pollForPlatformEvent(pldm_tid_t tid)
-     {
-         auto it = termini.find(tid);
-         if (it != termini.end())
-@@ -124,7 +124,7 @@ class Manager : public pldm::MctpDiscoveryHandlerIntf
+@@ -142,7 +142,7 @@ class Manager : public pldm::MctpDiscoveryHandlerIntf
  
    private:
      /** @brief List of discovered termini */
@@ -360,7 +400,7 @@ index 11c178a..3e0e8a3 100644
  } // namespace platform_mc
  } // namespace pldm
 diff --git a/platform-mc/sensor_manager.cpp b/platform-mc/sensor_manager.cpp
-index 949ba1c..98b20cf 100644
+index 21c3a3c..4ea734d 100644
 --- a/platform-mc/sensor_manager.cpp
 +++ b/platform-mc/sensor_manager.cpp
 @@ -14,7 +14,7 @@ using namespace std::chrono;
@@ -409,7 +449,7 @@ index 949ba1c..98b20cf 100644
      uint64_t t0 = 0;
      uint64_t t1 = 0;
 diff --git a/platform-mc/sensor_manager.hpp b/platform-mc/sensor_manager.hpp
-index 94dc4f2..7191f57 100644
+index 6bd3ac5..98400ff 100644
 --- a/platform-mc/sensor_manager.hpp
 +++ b/platform-mc/sensor_manager.hpp
 @@ -32,26 +32,26 @@ class SensorManager
@@ -456,8 +496,8 @@ index 94dc4f2..7191f57 100644
      uint32_t pollingTime;
  
      /** @brief sensor polling timers */
--    std::map<tid_t, std::unique_ptr<phosphor::Timer>> sensorPollTimers;
-+    std::map<pldm_tid_t, std::unique_ptr<phosphor::Timer>> sensorPollTimers;
+-    std::map<tid_t, std::unique_ptr<sdbusplus::Timer>> sensorPollTimers;
++    std::map<pldm_tid_t, std::unique_ptr<sdbusplus::Timer>> sensorPollTimers;
  
      /** @brief coroutine handle of doSensorPollingTasks */
 -    std::map<tid_t, std::coroutine_handle<>> doSensorPollingTaskHandles;
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0011-Workaround-for-pldmd-memory-leak.patch b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0011-Workaround-for-pldmd-memory-leak.patch
new file mode 100644
index 000000000000..d8549935457d
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/0011-Workaround-for-pldmd-memory-leak.patch
@@ -0,0 +1,28 @@
+From 2620c4e1097c9316e6248983b6a9d0e6276e86a0 Mon Sep 17 00:00:00 2001
+From: SeanChuangWiwynn <Sean_Chuang@wiwynn.com>
+Date: Tue, 12 Mar 2024 16:06:58 +0800
+Subject: [PATCH 11/11] Workaround for pldmd memory leak
+
+Set memory limit for pldmd, if memeory is over the threshold,
+systemd would restart the service.
+---
+ pldmd/service_files/pldmd.service | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pldmd/service_files/pldmd.service b/pldmd/service_files/pldmd.service
+index 4972822..be22fb4 100644
+--- a/pldmd/service_files/pldmd.service
++++ b/pldmd/service_files/pldmd.service
+@@ -4,6 +4,9 @@ Wants=xyz.openbmc_project.biosconfig_manager.service
+ After=xyz.openbmc_project.biosconfig_manager.service
+ 
+ [Service]
++MemoryAccounting=yes
++MemoryMax=450M
++MemoryHigh=400M
+ Restart=always
+ Type=dbus
+ BusName=xyz.openbmc_project.PLDM
+-- 
+2.25.1
+
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-monitor-memory.service b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-monitor-memory.service
new file mode 100644
index 000000000000..57b767ed39d0
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-monitor-memory.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Monitor system memory - this is a backup solution
+After=pldm-slow-restart.service
+
+[Service]
+Type=simple
+Restart=always
+ExecStart=/usr/share/pldm/pldm-monitor-memory.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-monitor-memory.sh b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-monitor-memory.sh
new file mode 100644
index 000000000000..9343b5f7890d
--- /dev/null
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-monitor-memory.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+while true; do
+    pid=$(pidof pldmd)
+
+    if [ -z "$pid" ]; then
+        sleep 60
+        continue
+    fi
+
+    total_memory=$(free | awk 'NR==2 {print $2}')
+    free_memory=$(free | awk 'NR==2 {print $4}')
+    free_memory_percentage=$(awk "BEGIN {printf \"%.0f\", ($free_memory / $total_memory) * 100}")
+
+    if [ "$free_memory_percentage" -le 20 ]; then
+        systemctl restart pldmd
+    fi
+
+    sleep 60
+done
+
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-restart.sh b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-restart.sh
index 757984a384af..02def7150e9e 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-restart.sh
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/files/pldm-restart.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-sleep 15
-systemctl restart pldmd
\ No newline at end of file
+sleep 30
+systemctl restart pldmd
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend
index e4176e30d53b..ba89b7c6e526 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/pldm/pldm_%.bbappend
@@ -12,16 +12,24 @@ SRC_URI += " \
     file://0006-platform-mc-Added-EventManager.patch \
     file://0007-requester-support-multi-host-MCTP-devices-hot-plug.patch \
     file://0008-Support-OEM-META-write-file-request-for-post-code-hi.patch \
-    file://0009-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch \
+    file://0009-platform-mc-Add-OEM-Meta-event-handler.patch \
+    file://0010-platform-mc-fix-up-tid_t-to-pldm_tid_t-conversions.patch \
+    file://0011-Workaround-for-pldmd-memory-leak.patch \
     file://pldm-restart.sh \
     file://pldm-slow-restart.service \
+    file://pldm-monitor-memory.sh\
+    file://pldm-monitor-memory.service \
 "
 
 FILES:${PN}:append = " \
     ${systemd_system_unitdir}/pldm-restart.sh \
+    ${systemd_system_unitdir}/pldm-monitor-memory.sh \
 "
 
-SYSTEMD_SERVICE:${PN} += "pldm-slow-restart.service"
+SYSTEMD_SERVICE:${PN} += " \
+    pldm-slow-restart.service \
+    pldm-monitor-memory.service \
+    "
 SYSTEMD_AUTO_ENABLE:${PN} = "enable"
 
 do_install:append() {
@@ -29,5 +37,7 @@ do_install:append() {
     install -m 0444 ${WORKDIR}/host_eid ${D}/usr/share/pldm
     install -m 0755 ${WORKDIR}/pldm-restart.sh ${D}${datadir}/pldm/
     install -m 0644 ${WORKDIR}/pldm-slow-restart.service ${D}${systemd_system_unitdir}
+    install -m 0755 ${WORKDIR}/pldm-monitor-memory.sh ${D}${datadir}/pldm/
+    install -m 0644 ${WORKDIR}/pldm-monitor-memory.service ${D}${systemd_system_unitdir}
 }
 
diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend
index 1b733dcdd61e..b6e13e09d0c5 100644
--- a/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend
+++ b/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:openbmc-fb := "${THISDIR}/files:"
 
 SRC_URI:append:openbmc-fb = "\
     file://rsyslog.conf \
diff --git a/meta-facebook/recipes-utils/pem/libpem_0.1.bb b/meta-facebook/recipes-utils/pem/libpem_0.1.bb
index a4b2cffa3ea7..c0dc14588f34 100644
--- a/meta-facebook/recipes-utils/pem/libpem_0.1.bb
+++ b/meta-facebook/recipes-utils/pem/libpem_0.1.bb
@@ -33,8 +33,8 @@ LOCAL_URI = " \
 
 LDFLAGS = "-lfruid -lpal -lobmc-i2c -lobmc-pmbus -lwedge_eeprom"
 
-DEPENDS += "libfruid libpal libobmc-i2c libobmc-pmbus"
-RDEPENDS:${PN} += "libfruid libpal libobmc-i2c libobmc-pmbus"
+DEPENDS += "libfruid libpal libobmc-i2c libobmc-pmbus libwedge-eeprom"
+RDEPENDS:${PN} += "libfruid libpal libobmc-i2c libobmc-pmbus libwedge-eeprom"
 
 
 do_install() {
diff --git a/meta-facebook/spec/javaisland/OVERVIEW.md b/meta-facebook/spec/javaisland/OVERVIEW.md
new file mode 100644
index 000000000000..5fd21622fc9a
--- /dev/null
+++ b/meta-facebook/spec/javaisland/OVERVIEW.md
@@ -0,0 +1,20 @@
+## Overview
+
+Java Island is a chassis hosting four (4) slots based on the Yosemite v3.5
+(YV3.5) program.  Within the chassis is a baseboard containing AST2620 as BMC
+to provide system management for the entire Java Island unit. Each slot
+contains a Bridge IC (BIC) which is used to manage the individual slots. The
+motherboard is all a FRU with the CPU and LPDDR memory soldered to it. Java
+Island will use PLDM over MCTP over I3C as the communication interface between
+the BMC and BIC.
+
+### BMC Software
+
+The Java Island BMC is planned to run the Facebook OpenBMC software.
+
+The Facebook OpenBMC code is based on the fby35 (Yosemite v3.5) codebase and
+is kept in the meta-fby35/meta-javaisland meta-layer in the FB OpenBMC source
+tree.
+
+openBMC software will use the same utilities and checks as in prior platforms
+such as Halfdome and Craterlake.
diff --git a/meta-facebook/spec/javaisland/PLATFORM-FEATURES.yaml b/meta-facebook/spec/javaisland/PLATFORM-FEATURES.yaml
new file mode 100644
index 000000000000..4aaaa8be9ad0
--- /dev/null
+++ b/meta-facebook/spec/javaisland/PLATFORM-FEATURES.yaml
@@ -0,0 +1,4 @@
+Javaisland Specific Requirements:
+  PRoT Support:
+    file: platform-root-of-trust-support.md
+    priority: P2
diff --git a/meta-facebook/spec/javaisland/javaisland.yaml b/meta-facebook/spec/javaisland/javaisland.yaml
new file mode 100644
index 000000000000..f5de9c412a2d
--- /dev/null
+++ b/meta-facebook/spec/javaisland/javaisland.yaml
@@ -0,0 +1,26 @@
+name: Javaisland
+tags:
+- javaisland
+- nvidia
+- meta-openbmc
+- compute
+sections:
+  - overview
+  - features
+feature_list:
+  - default-meta-multihost-features
+  - platform-features
+status:
+  BIC Support:
+    BIC Secure Boot: unsupported
+    BIC Slot Clear CMOS Support: unsupported
+  BMC Hardware Support:
+    Nuvoton Arbel: unsupported
+  Security:
+    PRoT Support: unsupported
+  Serial-Over-Lan:
+    SOL Host Logger: unsupported
+  User Interface:
+    host2bmc USB: unsupported
+  Javaisland Specific Requirements:
+    PRoT Support: unsupported
diff --git a/meta-portwell/meta-pwneptune/conf/bblayers.conf.sample b/meta-portwell/meta-pwneptune/conf/bblayers.conf.sample
index 1c5e35f39952..e04b076be564 100644
--- a/meta-portwell/meta-pwneptune/conf/bblayers.conf.sample
+++ b/meta-portwell/meta-pwneptune/conf/bblayers.conf.sample
@@ -7,7 +7,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-yocto-bsp \
   ##OEROOT##/../meta-openembedded/meta-oe \
   ##OEROOT##/../meta-openembedded/meta-networking \
@@ -18,7 +17,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../../meta-portwell/meta-pwneptune \
   ##OEROOT##/../../../meta-portwell/meta-python3 \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/openbmc-init-build-env b/openbmc-init-build-env
index 08bbd489c7c8..86193d8c7135 100644
--- a/openbmc-init-build-env
+++ b/openbmc-init-build-env
@@ -39,9 +39,12 @@ PLAT_DISTRO_OVERRIDES=(
   meta-greatlakes:lf-master
   meta-gtartemis:lf-master
   meta-halfdome:lf-master
+  meta-harma:lf-master
   meta-inspirationpoint:lf-master
   meta-janga:lf-master
+  meta-javaisland:lf-master
   meta-meru:lf-master
+  meta-minerva:lf-master
   meta-morgan800cc:lf-master
   meta-montblanc:lf-master
   meta-qemux86:lf-master
@@ -84,7 +87,7 @@ else
   _distro="${DISTRO_OVERRIDE}"
 fi
 
-if [ -n "$BASH_SOURCE" ]; then
+if [ -n "${BASH_SOURCE[0]}" ]; then
     THIS_SCRIPT=$BASH_SOURCE
 elif [ -n "$ZSH_NAME" ]; then
     THIS_SCRIPT=$0
@@ -124,7 +127,7 @@ if [ -z "$TEMPLATECONF" ]; then
             machine=$(basename "$md" | sed 's/\.conf//')
             meta=$(dirname "$(dirname "$md")")
             meta=$(echo "$meta" | sed 's/\.\///')
-            if [ "x$machine" = "x$platform" ]; then
+            if [ "$machine" = "$platform" ]; then
                 TEMPLATECONF="$(pwd)/$meta/templates/default"
                 platform=$(basename "$(dirname "$meta")")
                 export MACHINE="${machine/-lf/}"
@@ -143,7 +146,7 @@ fi
 # If user is not overriding the distro, then see
 # if there are platform overrides.
 if [ -z "$DISTRO_OVERRIDE" ]; then
-    for override in ${PLAT_DISTRO_OVERRIDES[*]}; do
+    for override in "${PLAT_DISTRO_OVERRIDES[@]}"; do
         override_plat=${override%%:*}
         override_distro=${override##*:}
         if [ -z "${platform/${override_plat}/}" ]; then
diff --git a/tests2/cit_runner.py b/tests2/cit_runner.py
index 282cf21dfbfe..4a8d2e7e40db 100644
--- a/tests2/cit_runner.py
+++ b/tests2/cit_runner.py
@@ -8,7 +8,7 @@
 
 from utils.test_utils import tests_dir
 
-ADDITIONAL_CIT_NAMES = ["churchillmono", "janga", "tahan", "wedge400c"]
+ADDITIONAL_CIT_NAMES = ["churchillmono", "janga", "morgan800cc", "tahan", "wedge400c"]
 
 
 class RunTest:
@@ -54,7 +54,7 @@ class Tests:
         "meru": [
             "common",
             "minipack",
-        ],  # So fbdarwin can import minipack tests and run them only one time
+        ],  # So meru can import minipack tests and run them only one time
     }
 
     def __init__(self, platform, start_dir, pattern, denylist):
diff --git a/tests2/common/base_fans_test.py b/tests2/common/base_fans_test.py
index 6e50dcb03ca9..571d8df6203f 100644
--- a/tests2/common/base_fans_test.py
+++ b/tests2/common/base_fans_test.py
@@ -282,9 +282,9 @@ def get_speed(self, info, fan_id=None):
             if m is not None:
                 self.assertIn(m.group(1), self.names, "Unknown fan name")
                 if fan_id is not None:
-                    self.assertEquals(fan_id, self.names[m.group(1)], "Bad fan index")
+                    self.assertEqual(fan_id, self.names[m.group(1)], "Bad fan index")
                 else:
-                    self.assertEquals(num, self.names[m.group(1)], "Bad fan index")
+                    self.assertEqual(num, self.names[m.group(1)], "Bad fan index")
                 ret.append(int(m.group(3)))
                 num += 1
         return ret
diff --git a/tests2/common/base_rest_endpoint_test.py b/tests2/common/base_rest_endpoint_test.py
index ae5d825bb3cb..51d2a33a7a7c 100644
--- a/tests2/common/base_rest_endpoint_test.py
+++ b/tests2/common/base_rest_endpoint_test.py
@@ -41,7 +41,7 @@
 
 # Some endpoints may respond with a code != 200 on tests environments
 ALLOWED_NON_OK_RESPONSES = {
-    re.compile("^/api/(sys|spb|iom|sled/mb)/fscd_sensor_data$"): {
+    re.compile("^/api/(sys|spb|iom|sled/mb)/(fscd_sensor_data|optics_thermal)$"): {
         405  # This endpoint is POST only
     },
     re.compile("^/api/(sys|spb|iom|sled/mb)/ntp$"): {
diff --git a/tests2/tests/elbert/test_gpio.py b/tests2/tests/elbert/test_gpio.py
index 2858df7a4b5b..22435201e0e4 100755
--- a/tests2/tests/elbert/test_gpio.py
+++ b/tests2/tests/elbert/test_gpio.py
@@ -34,8 +34,8 @@ def set_gpios(self):
         # Add PIM2-9 GPIOs for available pims
         for pim in range(2, 9 + 1):
             cmd = "head -n 1 /sys/bus/i2c/devices/4-0023/pim{}_present"
-            pim_type = run_shell_cmd("/usr/bin/kv get pim{}_type".format(pim))
             if "0x1" in run_shell_cmd(cmd.format(pim)):
+                pim_type = run_shell_cmd("/usr/bin/kv get pim{}_type".format(pim))
                 # Create GPIOS for inserted PIMs only
                 if pim_type.strip() != "16q2":
                     # PIM16Q2 has no pim gpios
diff --git a/tests2/tests/elbert/test_oob_status.py b/tests2/tests/elbert/test_oob_status.py
index e4910608e8c2..d207ba3c7fd1 100644
--- a/tests2/tests/elbert/test_oob_status.py
+++ b/tests2/tests/elbert/test_oob_status.py
@@ -71,7 +71,7 @@ def oobStatusTesterOutput(self, cmd, output, args):
         for arg in args.split(" "):
             self.assertTrue(
                 "Port: {} {}".format(arg, self.status_dict[cmd][arg]) in output,
-                "Port {} not found in output".format(arg),
+                "Port {} not found in output\n{}".format(arg, output),
             )
 
     def oobStatusTester(self, cmd):
diff --git a/tests2/tests/elbert/test_system_airflow_config.py b/tests2/tests/elbert/test_system_airflow_config.py
index 587af5d56b9d..e28611d336ea 100644
--- a/tests2/tests/elbert/test_system_airflow_config.py
+++ b/tests2/tests/elbert/test_system_airflow_config.py
@@ -43,14 +43,16 @@ def get_pim_count(self):
         pim16q_count = 0
         pim8ddm_count = 0
         for pim in range(2, 10):
-            cmd = "/usr/bin/kv get pim{}_type".format(pim)
-            pim_type = run_shell_cmd(cmd)
-            if pim_type.strip() == "16q2":
-                pim16q_count += 1
-            elif pim_type.strip() == "16q":
-                pim16q_count += 1
-            elif pim_type.strip() == "8ddm":
-                pim8ddm_count += 1
+            cmd = "head -n 1 /sys/bus/i2c/devices/4-0023/pim{}_present"
+            if "0x1" in run_shell_cmd(cmd.format(pim)):
+                cmd = "/usr/bin/kv get pim{}_type".format(pim)
+                pim_type = run_shell_cmd(cmd)
+                if pim_type.strip() == "16q2":
+                    pim16q_count += 1
+                elif pim_type.strip() == "16q":
+                    pim16q_count += 1
+                elif pim_type.strip() == "8ddm":
+                    pim8ddm_count += 1
         return pim16q_count, pim8ddm_count
 
     def get_psu_count(self):
diff --git a/tests2/tests/fuji/test_rest_endpoint.py b/tests2/tests/fuji/test_rest_endpoint.py
index ed48c2c1f583..881acb3c8dcd 100644
--- a/tests2/tests/fuji/test_rest_endpoint.py
+++ b/tests2/tests/fuji/test_rest_endpoint.py
@@ -570,6 +570,7 @@ def set_endpoint_firmware_info_scm_attributes(self):
             "P1V05 VR Version",
         ]
 
+    @unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
     def test_endpoint_api_sys_firmware_info_scm(self):
         self.set_endpoint_firmware_info_scm_attributes()
         self.verify_endpoint_attributes(
@@ -608,6 +609,7 @@ def set_endpoint_firmware_info_all_attributes(self):
             "P1V05 VR Version",
         ]
 
+    @unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
     def test_endpoint_api_sys_firmware_info_all(self):
         self.set_endpoint_firmware_info_all_attributes()
         self.verify_endpoint_attributes(
diff --git a/tests2/tests/grandcanyon/test_bic.py b/tests2/tests/grandcanyon/test_bic.py
index e14fca23215c..4e8783972cb4 100755
--- a/tests2/tests/grandcanyon/test_bic.py
+++ b/tests2/tests/grandcanyon/test_bic.py
@@ -20,8 +20,10 @@
 import unittest
 
 from common.base_bic_test import CommonBicTest
+from utils.test_utils import qemu_check
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class BicTest(CommonBicTest, unittest.TestCase):
     def set_bic_cmd(self):
         self.bic_cmd = "/usr/bin/bic-util server"
diff --git a/tests2/tests/grandcanyon/test_bios_util.py b/tests2/tests/grandcanyon/test_bios_util.py
index ca38a5c9523f..03f10a4a5042 100644
--- a/tests2/tests/grandcanyon/test_bios_util.py
+++ b/tests2/tests/grandcanyon/test_bios_util.py
@@ -24,7 +24,7 @@
 FRU_LIST = ["server"]
 
 
-@unittest.skip("currently unsupported on north dome")
+@unittest.skip("currently unsupported on grandcanyon")
 class BiosUtilTest(BaseBiosUtilTest):
     def set_fru_list(self):
         self.fru_list = FRU_LIST
diff --git a/tests2/tests/grandcanyon/test_enclosure_util.py b/tests2/tests/grandcanyon/test_enclosure_util.py
index 12a57b2eb0c9..bf2b3bed177b 100644
--- a/tests2/tests/grandcanyon/test_enclosure_util.py
+++ b/tests2/tests/grandcanyon/test_enclosure_util.py
@@ -18,11 +18,14 @@
 # Boston, MA 02110-1301 USA
 #
 import re
+import unittest
 
 from common.base_enclosure_util_test import BaseEnclosureUtilTest
 from utils.shell_util import run_cmd
+from utils.test_utils import qemu_check
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class EnclosureUtilTest(BaseEnclosureUtilTest):
     def testHddStatus(self):
         """
diff --git a/tests2/tests/grandcanyon/test_fans.py b/tests2/tests/grandcanyon/test_fans.py
index 77d86b0bd534..f94a7350364e 100644
--- a/tests2/tests/grandcanyon/test_fans.py
+++ b/tests2/tests/grandcanyon/test_fans.py
@@ -22,6 +22,7 @@
 
 from common.base_fans_test import CommonFanUtilBasedFansTest
 from utils.cit_logger import Logger
+from utils.test_utils import qemu_check
 
 
 UNKNOWN_FAN_CNT = 0
@@ -29,6 +30,7 @@
 DUAL_FAN_CNT = 8
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class FansTest(CommonFanUtilBasedFansTest, unittest.TestCase):
     def pal_get_tach_cnt(self) -> int:
         libpal = ctypes.CDLL("libpal.so.0")
diff --git a/tests2/tests/grandcanyon/test_fru.py b/tests2/tests/grandcanyon/test_fru.py
index 34aee2696363..e92b7efcd36e 100644
--- a/tests2/tests/grandcanyon/test_fru.py
+++ b/tests2/tests/grandcanyon/test_fru.py
@@ -20,8 +20,10 @@
 import unittest
 
 from common.base_fru_test import CommonFruTest
+from utils.test_utils import qemu_check
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class FruBMCTest(CommonFruTest, unittest.TestCase):
     def setUp(self):
         self.fru_cmd = ["/usr/local/bin/fruid-util", "bmc"]
diff --git a/tests2/tests/grandcanyon/test_libpal.py b/tests2/tests/grandcanyon/test_libpal.py
index c91d73ca071b..b69e615bb110 100644
--- a/tests2/tests/grandcanyon/test_libpal.py
+++ b/tests2/tests/grandcanyon/test_libpal.py
@@ -19,6 +19,7 @@
 import unittest
 
 import common.base_libpal_test
+from utils.test_utils import qemu_check
 
 try:
     import pal
@@ -28,8 +29,9 @@
     pass
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class LibPalTest(common.base_libpal_test.LibPalTest):
-    PLATFORM_NAME = "northdome"
+    PLATFORM_NAME = "grandcanyon"
 
     @unittest.skip("disable due to T92189295")
     def test_sensor_raw_read(self):
diff --git a/tests2/tests/grandcanyon/test_me_util.py b/tests2/tests/grandcanyon/test_me_util.py
index c8893a2e55f3..9be5a637daa1 100644
--- a/tests2/tests/grandcanyon/test_me_util.py
+++ b/tests2/tests/grandcanyon/test_me_util.py
@@ -20,8 +20,10 @@
 import unittest
 
 from common.base_me_util_test import CommonMETest
+from utils.test_utils import qemu_check
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class METest(CommonMETest, unittest.TestCase):
     def set_me_cmd(self):
         self.me_cmd = "/usr/bin/me-util server"
diff --git a/tests2/tests/grandcanyon/test_sensor.py b/tests2/tests/grandcanyon/test_sensor.py
index 7234e3258f37..163ad3a3abfa 100644
--- a/tests2/tests/grandcanyon/test_sensor.py
+++ b/tests2/tests/grandcanyon/test_sensor.py
@@ -21,8 +21,10 @@
 
 from common.base_sensor_test import SensorUtilTest
 from tests.grandcanyon.test_data.sensors.sensors import SENSORS
+from utils.test_utils import qemu_check
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class MBSensorTest(SensorUtilTest, unittest.TestCase):
     FRU_NAME = "server"
 
@@ -44,6 +46,7 @@ class DPBSensorTest(MBSensorTest):
     FRU_NAME = "dpb"
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class SCCSensorTest(MBSensorTest):
     FRU_NAME = "scc"
 
diff --git a/tests2/tests/meru/test_data/gpio/gpio.py b/tests2/tests/meru/test_data/gpio/gpio.py
index 17a3089423b5..a48c3b0934e5 100755
--- a/tests2/tests/meru/test_data/gpio/gpio.py
+++ b/tests2/tests/meru/test_data/gpio/gpio.py
@@ -33,13 +33,6 @@
         "uevent": "",
         "value": "1",
     },
-    "BMC_EMMC_RST": {
-        "active_low": "0",
-        "direction": "out",
-        "edge": "none",
-        "uevent": "",
-        "value": "1",
-    },
     "BMC_LITE_L": {
         "active_low": "0",
         "direction": "out",
@@ -145,4 +138,4 @@
         "uevent": "",
         "value": "0",
     }
-}
\ No newline at end of file
+}
diff --git a/tests2/tests/meru/test_emmc.py b/tests2/tests/meru/test_emmc.py
deleted file mode 100644
index 12055b08df5d..000000000000
--- a/tests2/tests/meru/test_emmc.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2022-present Facebook. All Rights Reserved.
-#
-# This program file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program in a file named COPYING; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-#
-import unittest
-
-from common.base_emmc_test import BaseEmmcTest
-from utils.test_utils import qemu_check
-
-
-class MeruEmmcTest(BaseEmmcTest, unittest.TestCase):
-    def set_emmc_mount_point(self):
-        self.emmc_mountpoint = "/mnt/data1"
-
-    @unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
-    def test_emmc(self):
-        super().test_emmc()
diff --git a/tests2/tests/meru/test_host_mac.py b/tests2/tests/meru/test_host_mac.py
index 9c08af0bc549..a6eaeed8cceb 100644
--- a/tests2/tests/meru/test_host_mac.py
+++ b/tests2/tests/meru/test_host_mac.py
@@ -20,8 +20,10 @@
 import unittest
 
 from common.base_host_mac_test import BaseHostMacTest
+from utils.test_utils import qemu_check
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class HostMacTest(BaseHostMacTest, unittest.TestCase):
     def set_host_mac(self):
         self.host_mac_cmd = ["/usr/local/bin/wedge_us_mac.sh"]
diff --git a/tests2/tests/meru/test_i2c.py b/tests2/tests/meru/test_i2c.py
index d0e86ec512df..59caa8fd303d 100644
--- a/tests2/tests/meru/test_i2c.py
+++ b/tests2/tests/meru/test_i2c.py
@@ -21,8 +21,10 @@
 
 from common.base_i2c_test import BaseI2cTest
 from tests.meru.test_data.i2c.i2c import plat_i2c_tree
+from utils.test_utils import qemu_check
 
 
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
 class I2cTest(BaseI2cTest, unittest.TestCase):
     def load_golden_i2c_tree(self):
         self.i2c_tree = plat_i2c_tree
diff --git a/tests2/tests/montblanc/test_data/gpio/gpio.py b/tests2/tests/montblanc/test_data/gpio/gpio.py
index 9b76c56b01c4..1ba27f255c34 100755
--- a/tests2/tests/montblanc/test_data/gpio/gpio.py
+++ b/tests2/tests/montblanc/test_data/gpio/gpio.py
@@ -19,62 +19,6 @@
 #
 
 GPIOS = {
-    "BMC_DEBUG_JUMPER1": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "BMC_DEBUG_JUMPER2": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "BMC_DEBUG_JUMPER3": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "DEBUG_PRSNT": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "PWRGD_PCH_PWROK": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "PWR_BTN_L": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "RST_BTN_L": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "BMC_PWRGD_R": {
-        "active_low": "0",
-        "direction": "out",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
     "FM_BMC_READY_R_L": {
         "active_low": "0",
         "direction": "out",
@@ -82,20 +26,6 @@
         "edge": "none",
         "value": 0,
     },
-    "BMC_PTH_PWR_BTN_L": {
-        "active_low": "0",
-        "direction": "out",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "BMC_PTH_RST_BTN_L": {
-        "active_low": "0",
-        "direction": "out",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
     "BMC_I2C1_EN": {
         "active_low": "0",
         "direction": "out",
@@ -138,60 +68,4 @@
         "edge": "none",
         "value": 0,
     },
-    "BMC_CPU_RST": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "BMC_GPIO126_USB2APWREN": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "COME_ISO_PWRGD_CPU_LVC3": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "FM_CPU_MSMI_CATERR_LVT3_BUF_N": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "ISO_FM_BMC_NMI_L": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "ISO_FM_BMC_ONCTL_L": {
-        "active_low": "0",
-        "direction": "out",
-        "uevent": "",
-        "edge": "none",
-        "value": 0,
-    },
-    "ISO_FPGA_CRC_ERROR": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
-    "ISO_SMB_FPGA_VPP_ALERT_L": {
-        "active_low": "0",
-        "direction": "in",
-        "uevent": "",
-        "edge": "none",
-        "value": 1,
-    },
 }
diff --git a/tests2/tests/montblanc/test_data/process/process.py b/tests2/tests/montblanc/test_data/process/process.py
index d1cc280d28ee..ddfbb6bf6595 100644
--- a/tests2/tests/montblanc/test_data/process/process.py
+++ b/tests2/tests/montblanc/test_data/process/process.py
@@ -22,7 +22,6 @@
 EXPECTED_PROCS = [
     "systemd-networkd.service",
     "mTerm_server",
-    "emmcd",
     "restapi.service",
     "ipmid",
     "kcsd",
diff --git a/tests2/tests/montblanc/test_emmc.py b/tests2/tests/montblanc/test_emmc.py
deleted file mode 100644
index 7c00be68385f..000000000000
--- a/tests2/tests/montblanc/test_emmc.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
-#
-# This program file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program in a file named COPYING; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-#
-import unittest
-
-from common.base_emmc_test import BaseEmmcTest
-from utils.test_utils import qemu_check
-
-
-@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
-class MontblancEmmcTest(BaseEmmcTest, unittest.TestCase):
-    def set_emmc_mount_point(self):
-        self.emmc_mountpoint = "/mnt/data1"
diff --git a/tests2/tests/montblanc/test_obmc_mmc.py b/tests2/tests/montblanc/test_obmc_mmc.py
deleted file mode 100644
index 61488c70b6ab..000000000000
--- a/tests2/tests/montblanc/test_obmc_mmc.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
-#
-# This program file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program in a file named COPYING; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-#
-
-import unittest
-
-import common.base_obmc_mmc_test
-from utils.test_utils import qemu_check
-
-
-@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
-class LibObmcMmcTest(common.base_obmc_mmc_test.LibObmcMmcTest):
-    pass  # just run common tests
diff --git a/tests2/tests/montblanc/test_rest_mmc.py b/tests2/tests/montblanc/test_rest_mmc.py
deleted file mode 100644
index 739c3f4f9e42..000000000000
--- a/tests2/tests/montblanc/test_rest_mmc.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
-#
-# This program file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program in a file named COPYING; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-#
-
-import unittest
-
-import common.base_rest_mmc
-from utils.test_utils import qemu_check
-
-
-@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
-class RestMMCTest(common.base_rest_mmc.RestMMCTest):
-    pass  # just run common tests
diff --git a/tests2/tests/morgan800cc/test_bmc_mac_address.py b/tests2/tests/morgan800cc/test_bmc_mac_address.py
new file mode 100644
index 000000000000..7de3aca0d300
--- /dev/null
+++ b/tests2/tests/morgan800cc/test_bmc_mac_address.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+# Copyright (c) Facebook, Inc. and its affiliates.
+
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+import unittest
+
+from utils.test_utils import qemu_check
+from utils.shell_util import run_shell_cmd
+
+
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
+class bmc_mac_address(unittest.TestCase):
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_bmc_mac_address(self):
+
+        eth0_mac_address = run_shell_cmd("cat /sys/class/net/eth0/address")
+
+        output = run_shell_cmd("weutil")
+        line = output.split("\n")
+        weutil_bmc_mac = "00:00:00:00:00:00"
+
+        for i in range(len(line)):
+            if "BMC MAC Base" in line[i]:
+                weutil_bmc_mac = line[i].split("BMC MAC Base:")[1]
+                break
+
+        self.assertIn(
+            eth0_mac_address.strip("\n"),
+            weutil_bmc_mac.lstrip(),
+            "Bmc mac address check is failed",
+        )
diff --git a/tests2/tests/morgan800cc/test_interface.py b/tests2/tests/morgan800cc/test_interface.py
new file mode 100644
index 000000000000..dfe9e0a65fcc
--- /dev/null
+++ b/tests2/tests/morgan800cc/test_interface.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# Copyright (c) Facebook, Inc. and its affiliates.
+
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+#
+
+import unittest
+
+from common.base_interface_test import CommonInterfaceTest
+from utils.cit_logger import Logger
+
+
+"""
+Tests eth0 v4 interface
+"""
+
+
+class InterfaceTest(CommonInterfaceTest, unittest.TestCase):
+    def test_eth0_v4_interface(self):
+        """
+        Tests eth0 v4 interface
+        """
+        self.set_ifname("eth0")
+        Logger.log_testname(self._testMethodName)
+        self.assertEqual(self.ping_v4(), 0, "Ping test for eth0 v4 failed")
\ No newline at end of file
diff --git a/tests2/tests/morgan800cc/test_mTerm.py b/tests2/tests/morgan800cc/test_mTerm.py
new file mode 100644
index 000000000000..10ad7d6ade6d
--- /dev/null
+++ b/tests2/tests/morgan800cc/test_mTerm.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+# Copyright (c) Facebook, Inc. and its affiliates.
+
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+import unittest
+
+from utils.test_utils import qemu_check
+from utils.shell_util import run_shell_cmd
+
+
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
+class mTerm(unittest.TestCase):
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_mTerm(self):
+
+        output = run_shell_cmd('ps | grep "mTerm"')
+        lines = output.split("\n")
+        result = "0"
+        if "57600" in lines[0]:
+            result = "57600"
+
+        self.assertIn(
+            result,
+            "57600",
+            "mTerm check is failed",
+        )
\ No newline at end of file
diff --git a/tests2/tests/morgan800cc/test_pid_serialnum.py b/tests2/tests/morgan800cc/test_pid_serialnum.py
new file mode 100644
index 000000000000..1683e74bd129
--- /dev/null
+++ b/tests2/tests/morgan800cc/test_pid_serialnum.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+# Copyright (c) Facebook, Inc. and its affiliates.
+
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+import unittest
+
+from utils.test_utils import qemu_check
+from utils.shell_util import run_shell_cmd
+
+
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
+class sys_networkd_config(unittest.TestCase):
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_pid(self):
+        output = run_shell_cmd("weutil")
+        line = output.split("\n")
+
+        for i in range(len(line)):
+            if "Product Name:" in line[i]:
+                field = line[i].split("Product Name:")[1]
+
+        output = run_shell_cmd("grep -w model /etc/systemd/network/10-eth0.network")
+        line = output.split(":")
+        for i in range(len(line)):
+            if "model" in line[i]:
+                pid = line[i].split("=")[1]
+
+        self.assertEqual(
+            field.lstrip(),
+            pid,
+            "pid config in sys-networkd is failed ",
+        )
+
+    def test_serial_num(self):
+        output = run_shell_cmd("weutil")
+        line = output.split("\n")
+
+        for i in range(len(line)):
+            if "Product Serial Number:" in line[i]:
+                field = line[i].split("Product Serial Number:")[1]
+
+        output = run_shell_cmd("grep -w model /etc/systemd/network/10-eth0.network")
+        line = output.split(":")
+        for i in range(len(line)):
+            if "serial" in line[i]:
+                serial_num = line[i].split("=")[1]
+
+        self.assertEqual(
+            field.lstrip(),
+            serial_num.strip("\n"),
+            "serial number config in sys-networkd failed ",
+        )
diff --git a/tests2/tests/morgan800cc/test_uboot_version_check.py b/tests2/tests/morgan800cc/test_uboot_version_check.py
new file mode 100644
index 000000000000..7812b9b2f390
--- /dev/null
+++ b/tests2/tests/morgan800cc/test_uboot_version_check.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+# Copyright (c) Facebook, Inc. and its affiliates.
+
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+import json
+import re
+import subprocess
+import unittest
+
+from shlex import quote
+
+from utils.test_utils import qemu_check
+
+
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
+class UbootVersionCheck(unittest.TestCase):
+    def setUp(self):
+        self.PROC_MTD_PATH = "/proc/mtd"
+        pass
+
+    def tearDown(self):
+        pass
+
+    def getMTD(self, name):
+        mtd_name = quote(name)
+        with open(self.PROC_MTD_PATH) as f:
+            lines = f.readlines()
+            for line in lines:
+                if mtd_name in line:
+                    return line.split(":")[0]
+        return None
+
+    def test_uboot_version_check(self):
+
+        uboot_version = ""
+
+        # Matching the u-boot version from the o/p of the cmd:
+        #     "/usr/bin/strings /dev/mtd0"
+        #      Example: "U-Boot 2019.04"
+        uboot_ver_regex = r"^U-Boot\W+(?P<uboot_ver>20\d{2}\.\d{2})\W+.*$"
+        uboot_ver_re = re.compile(uboot_ver_regex)
+        mtd_meta = self.getMTD("meta")
+
+        if mtd_meta is None:
+            stdout = subprocess.check_output(["/usr/bin/strings", "/dev/mtd0"])
+
+            for line in stdout.splitlines():
+                matched = uboot_ver_re.fullmatch(line.decode().strip())
+                if matched:
+                    uboot_version = matched.group("uboot_ver")
+                    break
+
+        else:
+            try:
+                mtd_dev = "/dev/" + mtd_meta
+                with open(mtd_dev, "r") as f:
+                    raw_data = f.readline()
+                    uboot_version = json.loads(raw_data)["version_infos"]["uboot_ver"]
+            except Exception:
+                uboot_version = " "
+
+        self.assertIn(
+            "2019.04",
+            uboot_version,
+            "uboot-version check is failed. Received={}".format(uboot_version),
+        )
\ No newline at end of file
diff --git a/tests2/tests/morgan800cc/test_wedge_power.py b/tests2/tests/morgan800cc/test_wedge_power.py
new file mode 100644
index 000000000000..89fb65a0ce0d
--- /dev/null
+++ b/tests2/tests/morgan800cc/test_wedge_power.py
@@ -0,0 +1,208 @@
+#!/usr/bin/env python3
+# Copyright (c) Facebook, Inc. and its affiliates.
+
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+import subprocess
+import threading
+import unittest
+import time
+
+from utils.cit_logger import Logger
+from utils.shell_util import run_shell_cmd
+
+"""
+Tests Wedge Power
+"""
+
+
+class BaseWedgePowerTest(unittest.TestCase):
+    """
+    Base class for testing the power control functionalities of a system.
+
+    This class provides common setup, teardown, and utility methods for testing
+    various power control commands. It is designed to be extended by specific
+    test classes that implement actual test cases.
+    """
+    CMD_EXECUTION_TIME_LIMIT = 15  # seconds
+    EBUSY_ERR = 16
+    NUM_INSTANCES = 3  # Number of instances for concurrent testing
+
+    def setUp(self):
+        Logger.start(name=self._testMethodName)
+
+    def tearDown(self):
+        Logger.info("Finished logging for {}".format(self._testMethodName))
+
+    def run_power_cmd(self, command):
+        """
+        Executes a wedge power command and returns its output and status.
+
+        Constructs and runs a command using 'wedge_power.sh', handling its output and
+        standard error. Manages execution timeouts to ensure it doesn't exceed a set limit.
+
+        Args:
+            command (str): The specific wedge power command (e.g., 'on', 'off', 'reset').
+
+        Returns:
+            tuple: A tuple containing the command's return code (int) and output (str).
+
+        Raises:
+            Exception: If there's an error in command execution.
+        """
+        full_command = f"wedge_power.sh {command}"
+        Logger.debug("Executing: " + str(full_command))
+        process = subprocess.Popen(
+            full_command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+        try:
+            stdout, stderr = process.communicate(timeout=self.CMD_EXECUTION_TIME_LIMIT)
+            if stderr:
+                raise Exception(stderr.decode())
+            return process.returncode, stdout.decode()
+        except subprocess.TimeoutExpired:
+            Logger.error(f"Command '{full_command}' timed out after {self.CMD_EXECUTION_TIME_LIMIT} seconds.")
+            process.kill()
+            process.communicate()  # Clean up the process
+            return -1, ""
+
+    def power_status(self):
+        """
+        Checks the current power status of the system.
+
+        Returns:
+            str: The current power status ("on" or "off").
+        """
+        return_code, output = self.run_power_cmd("status")
+        if return_code != 0:
+            Logger.error(f"Failed to get power status. Return code: {return_code}")
+            return "error"
+        return output.strip()
+
+    def run_power_cmd_test(self, cmd):
+        """
+        Executes a power control command within a time limit and verifies its
+        outcome as part of a test case.
+
+        Args:
+            cmd (str): The power control command to execute ("off", "on",
+            "reset", "on -f").
+
+        Returns:
+            int: 0 if the command executed successfully within the time limit
+            and the power status matches the command, 1 otherwise.
+        """
+        Logger.info(f"Executing cmd={cmd}")
+
+        return_code, _ = self.run_power_cmd(cmd)
+        if return_code != 0:
+            Logger.error(f"Command '{cmd}' failed with return code {return_code}.")
+            return 1
+
+        status_code, output = self.run_power_cmd("status")
+        expected_status = "on" if cmd in ["on", "reset", "on -f"] else "off"
+
+        if status_code == 0 and expected_status in output:
+            return 0
+        return 1
+
+    def execute_power_cmd_thread(self, cmd, results, index):
+        """
+        Executes a power control command in a threaded context and stores its exit code.
+
+        Designed to be used in a multithreaded test setup, this method runs the specified
+        command in a thread and records its exit code in a shared results list. It's part of
+        testing how power control commands perform when executed concurrently.
+
+        Args:
+            cmd (str): Command to execute.
+            results (list): List to store exit codes from each thread.
+            index (int): Position in the results list for this thread's exit code.
+        """
+        try:
+            exit_code, _ = self.run_power_cmd(cmd)
+            results[index] = exit_code
+        except Exception as e:
+            results[index] = str(e)
+
+    def run_concurrent_power_command_test(self, cmd):
+        """
+        Test multiple instances running a specified power command concurrently.
+        """
+        threads = []
+        results = [None] * self.NUM_INSTANCES
+
+        for i in range(self.NUM_INSTANCES):
+            thread = threading.Thread(target=self.execute_power_cmd_thread, args=(cmd, results, i))
+            threads.append(thread)
+            thread.start()
+
+        for thread in threads:
+            thread.join()
+
+        success_count = results.count(0)
+        busy_count = results.count(self.EBUSY_ERR)
+
+        # Assert that only one instance succeeded and others received the EBUSY_ERR
+        self.assertEqual(success_count, 1, "Only one instance should succeed")
+        self.assertEqual(busy_count, self.NUM_INSTANCES - 1, "Other instances should receive busy error")
+
+
+class WedgePowerTest(BaseWedgePowerTest):
+    def test_wedge_power_status(self):
+        """
+        Tests wedge power status
+        """
+        Logger.log_testname(name=self._testMethodName)
+        status = self.power_status()
+        self.assertIn(status, ["Microserver power is on", "Microserver power is off"], "Invalid power status returned")
+
+    def test_wedge_power_off(self):
+        """
+        Tests wedge power off
+        """
+        Logger.log_testname(name=self._testMethodName)
+        self.assertEqual(self.run_power_cmd_test("off"), 0, "Power off test failed")
+
+    def test_wedge_power_on(self):
+        """
+        Tests wedge power on
+        """
+        Logger.log_testname(name=self._testMethodName)
+        self.assertEqual(self.run_power_cmd_test("on"), 0, "Power on test failed")
+
+    def test_wedge_power_on_force(self):
+        """
+        Tests wedge power on with force
+        """
+        Logger.log_testname(name=self._testMethodName)
+        self.assertEqual(self.run_power_cmd_test("on -f"), 0, "Power on with force test failed")
+
+    def test_wedge_power_reset(self):
+        """
+        Tests wedge power reset
+        """
+        Logger.log_testname(name=self._testMethodName)
+        self.assertEqual(self.run_power_cmd_test("reset"), 0, "Power reset test failed")
+
+    def test_wedge_power_off_concurrent(self):
+        """
+        Test multiple instances running 'off' command concurrently.
+        """
+        Logger.log_testname(name=self._testMethodName)
+        status = self.power_status()
+        if "off" in status:
+            self.run_power_cmd("on")
+        self.run_concurrent_power_command_test("off")
+
+    def test_wedge_power_reset_concurrent(self):
+        """
+        Test multiple instances running 'reset' command concurrently.
+        """
+        Logger.log_testname(name=self._testMethodName)
+        status = self.power_status()
+        if "off" in status:
+            self.run_power_cmd("on")
+        self.run_concurrent_power_command_test("reset")
+
diff --git a/tests2/tests/morgan800cc/test_weutil.py b/tests2/tests/morgan800cc/test_weutil.py
new file mode 100644
index 000000000000..71c2908650ac
--- /dev/null
+++ b/tests2/tests/morgan800cc/test_weutil.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python3
+# Copyright (c) Facebook, Inc. and its affiliates.
+
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+import unittest
+import json
+
+from utils.test_utils import qemu_check
+from utils.shell_util import run_shell_cmd
+
+
+@unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
+class Weutil(unittest.TestCase):
+    def setUp(self):
+        weutil_json_string = run_shell_cmd ("weutil --json")
+        self.weutil_json = json.loads(weutil_json_string)
+        pass
+
+    def tearDown(self):
+        pass
+
+    def weutil_check(self, keyToCheck):
+        result = False
+        if keyToCheck in self.weutil_json and self.weutil_json[keyToCheck]:
+            result = True
+
+        return result
+
+    def test_weutil_crc(self):
+        self.assertEqual(
+            self.weutil_check("CRC16"),
+            True,
+            "weutil does not contain a valid CRC",
+        )
+
+    def test_weutil_product_serial(self):
+        self.assertEqual(
+            self.weutil_check("Product Serial Number"),
+            True,
+            "weutil does not contain a valid Product Serial Number",
+        )
+
+    def test_weutil_local_mac(self):
+        self.assertEqual(
+            self.weutil_check("BMC MAC Base"),
+            True,
+            "weutil does not contain a valid local mac",
+        )
+
+    def test_weutil_product_name(self):
+        self.assertEqual(
+            self.weutil_check("Product Name"),
+            True,
+            "weutil does not contain a valid CRC",
+        )
+
+    def test_weutil_local_asset_tag(self):
+        self.assertEqual(
+            self.weutil_check("System Assembly Part Number"),
+            True,
+            "weutil does not contain a valid Asset Tag",
+        )
+
+    def test_weutil_part_number(self):
+        self.assertEqual(
+            self.weutil_check("Product Part Number"),
+            True,
+            "weutil does not contain a valid Product Part Number",
+        )
+
+    def test_weutil_product_version(self):
+        self.assertEqual(
+            self.weutil_check("Product Version"),
+            True,
+            "weutil does not contain a valid Product Version",
+        )
+
+    def test_weutil_product_sub_version(self):
+        self.assertEqual(
+            self.weutil_check("Product Sub-Version"),
+            True,
+            "weutil does not contain a valid Product Sub-Version",
+        )
+
diff --git a/tests2/tests/tahan/test_eeprom.py b/tests2/tests/tahan/test_eeprom.py
index 7dbe113d5fbc..5992869e42c6 100644
--- a/tests2/tests/tahan/test_eeprom.py
+++ b/tests2/tests/tahan/test_eeprom.py
@@ -48,3 +48,39 @@ def set_odm_pcba_number(self):
     # not asset tag field for FBOSS EEPROMv4 format
     def test_asset_tag(self):
         pass
+
+
+class BMCEepromTest(CommonEepromTest, unittest.TestCase):
+    """
+    Test for BMC EEPROM
+    """
+
+    def set_eeprom_cmd(self):
+        self.eeprom_cmd = ["weutil -e bmc_eeprom"]
+
+    def set_product_name(self):
+        self.product_name = ["MINERVA_BMC"]
+
+    def set_location_on_fabric(self):
+        self.location_on_fabric = ["BMC"]
+
+    # overide for FBOSS EEPROMv4 format, display different
+    def set_eeprom_location(self):
+        self.test_eeprom_location = "EEPROM location on Fabric"
+
+    # overide for FBOSS EEPROMv4 format, display different
+    def set_odm_pcba_number(self):
+        self.odm_pcba_part_number = "ODM/JDM PCBA Part Number"
+        self.odm_pcba_serial_number = "ODM/JDM PCBA Serial Number"
+
+    # not asset tag field for FBOSS EEPROMv4 format
+    def test_asset_tag(self):
+        pass
+
+    # no mac field for BMC EEPROM
+    def test_extended_mac_base(self):
+        pass
+
+    # no mac field for BMC EEPROM
+    def test_local_mac(self):
+        pass
diff --git a/tests2/tests/tahan/test_emmc.py b/tests2/tests/tahan/test_emmc.py
deleted file mode 100644
index 70a40947af55..000000000000
--- a/tests2/tests/tahan/test_emmc.py
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2022-present Facebook. All Rights Reserved.
-#
-# This program file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program in a file named COPYING; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-#
-import unittest
-
-from common.base_emmc_test import BaseEmmcTest
-from utils.test_utils import qemu_check
-
-
-class TahanEmmcTest(BaseEmmcTest, unittest.TestCase):
-    def set_emmc_mount_point(self):
-        self.emmc_mountpoint = "/mnt/data1"
-
-    @unittest.skipIf(qemu_check(), "test env is QEMU, skipped")
-    def test_emmc(self):
-        super().test_emmc()
diff --git a/tests2/utils/platforms.py b/tests2/utils/platforms.py
index 2d54a94dfac8..b152ed102fea 100644
--- a/tests2/utils/platforms.py
+++ b/tests2/utils/platforms.py
@@ -19,13 +19,17 @@
     "greatlakes",
     "gtartemis",
     "halfdome",
+    "harma",
     "inspirationpoint",
     "janga",
     "lightning",
     "meru",
+    "minerva",
     "minipack",
     "montblanc",
+    "morgan800cc",
     "northdome",
+    "tahan",
     "wedge100",
     "wedge400",
     "yamp",
diff --git a/tools/fboss-lite/fblite-ref-layer/conf/machine/@FBMODEL@.conf b/tools/fboss-lite/fblite-ref-layer/conf/machine/@FBMODEL@.conf
index c26368e67bbe..2020aa9dfe0b 100644
--- a/tools/fboss-lite/fblite-ref-layer/conf/machine/@FBMODEL@.conf
+++ b/tools/fboss-lite/fblite-ref-layer/conf/machine/@FBMODEL@.conf
@@ -23,7 +23,7 @@ require conf/machine/fboss-lite.inc
 
 UBOOT_MACHINE:@FBMODEL@ = "facebook-fblite_defconfig"
 
-KERNEL_DEVICETREE = "aspeed-bmc-facebook-@FBMODEL@.dtb"
-PREFERRED_VERSION_linux-aspeed = "6.1.%"
+KERNEL_DEVICETREE = "aspeed/aspeed-bmc-facebook-fblite-r1.dtb"
+PREFERRED_VERSION_linux-aspeed = "6.6.%"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-module-cpld"
diff --git a/tools/fboss-lite/fblite-ref-layer/conf/templates/default/bblayers.conf.sample b/tools/fboss-lite/fblite-ref-layer/conf/templates/default/bblayers.conf.sample
index ec359ca815c8..212df38f181f 100644
--- a/tools/fboss-lite/fblite-ref-layer/conf/templates/default/bblayers.conf.sample
+++ b/tools/fboss-lite/fblite-ref-layer/conf/templates/default/bblayers.conf.sample
@@ -24,7 +24,6 @@ BBFILES ?= ""
 
 BBLAYERS ?= " \
   ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
   ##OEROOT##/meta-openembedded/meta-python \
@@ -39,7 +38,3 @@ BBLAYERS ?= " \
   ##OEROOT##/../../meta-facebook/meta-python3 \
   ##OEROOT##/../../meta-facebook/meta-backports \
   "
-BBLAYERS_NON_REMOVABLE ?= " \
-  ##OEROOT##/meta \
-  ##OEROOT##/meta-poky \
-  "
diff --git a/tools/fboss-lite/fblite-ref-layer/recipes-kernel/kmods/files/pwrcpld.c b/tools/fboss-lite/fblite-ref-layer/recipes-kernel/kmods/files/pwrcpld.c
index 44def1810a72..45fcb568b6d6 100644
--- a/tools/fboss-lite/fblite-ref-layer/recipes-kernel/kmods/files/pwrcpld.c
+++ b/tools/fboss-lite/fblite-ref-layer/recipes-kernel/kmods/files/pwrcpld.c
@@ -34,8 +34,7 @@ static const struct i2c_device_id pwrcpld_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, pwrcpld_id);
 
-static int pwrcpld_probe(struct i2c_client *client,
-			 const struct i2c_device_id *id)
+static int pwrcpld_probe(struct i2c_client *client)
 {
 	i2c_dev_data_st *pdata;
 
@@ -45,24 +44,16 @@ static int pwrcpld_probe(struct i2c_client *client,
 
 	i2c_set_clientdata(client, pdata);
 
-	return i2c_dev_sysfs_data_init(client, pdata, pwrcpld_attrs,
+	return devm_i2c_dev_sysfs_init(client, pdata, pwrcpld_attrs,
 				       ARRAY_SIZE(pwrcpld_attrs));
 }
 
-static void pwrcpld_remove(struct i2c_client *client)
-{
-	i2c_dev_data_st *pdata = i2c_get_clientdata(client);
-
-	i2c_dev_sysfs_data_clean(client, pdata);
-}
-
 static struct i2c_driver pwrcpld_driver = {
 	.class    = I2C_CLASS_HWMON,
 	.driver = {
 		.name = "pwrcpld",
 	},
 	.probe    = pwrcpld_probe,
-	.remove   = pwrcpld_remove,
 	.id_table = pwrcpld_id,
 };
 
diff --git a/tools/fboss-lite/fblite-ref-layer/recipes-kernel/linux/patches/1001-ARM-dts-aspeed-Add-Facebook-@FBMODEL@-BMC.patch b/tools/fboss-lite/fblite-ref-layer/recipes-kernel/linux/patches/1001-ARM-dts-aspeed-Add-Facebook-@FBMODEL@-BMC.patch
deleted file mode 100644
index bdbe06a1728a..000000000000
--- a/tools/fboss-lite/fblite-ref-layer/recipes-kernel/linux/patches/1001-ARM-dts-aspeed-Add-Facebook-@FBMODEL@-BMC.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From f1fd024f6e9d02ec3d36226caf386e6be499135c Mon Sep 17 00:00:00 2001
-From: Tao Ren <taoren@meta.com>
-Date: Fri, 28 Oct 2022 11:50:15 -0700
-Subject: [PATCH] ARM: dts: aspeed: Add Facebook @FBMODEL@ BMC
-
-Add initial version of device tree for Facebook @FBMODEL@ (AST2600) BMC.
-
-@FBMODEL@ is Facebook's next generation switch platform with an AST2600
-BMC integrated for health monitoring purpose.
----
- .../dts/aspeed-bmc-facebook-@FBMODEL@.dts     | 51 +++++++++++++++++++
- 1 file changed, 51 insertions(+)
- create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-@FBMODEL@.dts
-
-diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-@FBMODEL@.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-@FBMODEL@.dts
-new file mode 100644
-index 000000000000..b9c2edc22fe7
---- /dev/null
-+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-@FBMODEL@.dts
-@@ -0,0 +1,51 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// Copyright (c) Meta Platforms, Inc. and affiliates.
-+
-+/dts-v1/;
-+
-+#include "ast2600-facebook-netbmc-common.dtsi"
-+
-+/ {
-+	model = "Facebook @FBMODEL@ BMC";
-+	compatible = "facebook,@FBMODEL@-bmc", "aspeed,ast2600";
-+
-+	chosen {
-+		stdout-path = &uart1;
-+	};
-+
-+	spi_gpio: spi-gpio {
-+		num-chipselects = <1>;
-+		cs-gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&mac3 {
-+	status = "okay";
-+	phy-mode = "rgmii";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_rgmii4_default>;
-+	fixed-link {
-+		speed = <1000>;
-+		full-duplex;
-+	};
-+};
-+
-+&lpc_ctrl {
-+	status = "okay";
-+	flash = <&spi1>;
-+};
-+
-+&kcs1 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca0>;
-+};
-+
-+&kcs2 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca8>;
-+};
-+
-+&kcs3 {
-+	status = "okay";
-+	aspeed,lpc-io-reg = <0xca2>;
-+};
--- 
-2.39.3
-
diff --git a/tools/flashy/checks_and_remediations/bletchley/00_check_version.go b/tools/flashy/checks_and_remediations/bletchley/00_check_version.go
index 98ef32244730..2a8d64543da7 100644
--- a/tools/flashy/checks_and_remediations/bletchley/00_check_version.go
+++ b/tools/flashy/checks_and_remediations/bletchley/00_check_version.go
@@ -20,6 +20,8 @@
 package remediations_bletchley
 
 import (
+	"log"
+	"strings"
 	"strconv"
 
 	"github.com/facebook/openbmc/tools/flashy/lib/step"
@@ -41,8 +43,13 @@ func checkVersion(stepParams step.StepParams) step.StepExitError {
 	const re = `bletchley-v(?P<year>[0-9]+).(?P<week>[0-9]+)`
 	versionMap, err := utils.GetRegexSubexpMap(re, version)
 	if err != nil {
-		errMsg := errors.Errorf("Unable to parse version info: %v", err)
-		return step.ExitUnsafeToReboot{Err: errMsg}
+		if strings.HasPrefix(version, "bletchley-") {
+			log.Printf("Upgrading from dirty version. Skipping year check")
+			return nil
+		} else {
+			errMsg := errors.Errorf("Unable to parse version info: %v", err)
+			return step.ExitUnsafeToReboot{Err: errMsg}
+		}
 	}
 
 	year, err := strconv.Atoi(versionMap["year"])
diff --git a/tools/flashy/checks_and_remediations/bletchley/00_check_version_test.go b/tools/flashy/checks_and_remediations/bletchley/00_check_version_test.go
index 19620c4a6c3d..f63536ed9706 100644
--- a/tools/flashy/checks_and_remediations/bletchley/00_check_version_test.go
+++ b/tools/flashy/checks_and_remediations/bletchley/00_check_version_test.go
@@ -53,6 +53,18 @@ func TestCheckVersion(t *testing.T) {
 			err:       nil,
 			want:      nil,
 		},
+		{
+			name:      "bitbaked",
+			version:   "bletchley-123abc",
+			err:       nil,
+			want:      nil,
+		},
+		{
+			name:      "dirty",
+			version:   "bletchley-123abc-dirty",
+			err:       nil,
+			want:      nil,
+		},
 		{
 			name:      "garbage",
 			version:   "garbage",
diff --git a/tools/flashy/flash_procedure/flash_harma.go b/tools/flashy/flash_procedure/flash_harma.go
new file mode 100644
index 000000000000..2d02d19d42d5
--- /dev/null
+++ b/tools/flashy/flash_procedure/flash_harma.go
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2020-present Facebook. All Rights Reserved.
+ *
+ * This program file is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program in a file named COPYING; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+package flash_procedure
+
+import (
+	"github.com/facebook/openbmc/tools/flashy/lib/flash"
+	"github.com/facebook/openbmc/tools/flashy/lib/step"
+)
+
+func init() {
+	step.RegisterStep(flash.FlashCp)
+}
diff --git a/tools/flashy/flash_procedure/flash_minerva.go b/tools/flashy/flash_procedure/flash_minerva.go
new file mode 100644
index 000000000000..2d02d19d42d5
--- /dev/null
+++ b/tools/flashy/flash_procedure/flash_minerva.go
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2020-present Facebook. All Rights Reserved.
+ *
+ * This program file is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program in a file named COPYING; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+package flash_procedure
+
+import (
+	"github.com/facebook/openbmc/tools/flashy/lib/flash"
+	"github.com/facebook/openbmc/tools/flashy/lib/step"
+)
+
+func init() {
+	step.RegisterStep(flash.FlashCp)
+}
diff --git a/tools/flashy/flash_procedure/flash_morgan800cc.go b/tools/flashy/flash_procedure/flash_morgan800cc.go
new file mode 100644
index 000000000000..67cafa1ed410
--- /dev/null
+++ b/tools/flashy/flash_procedure/flash_morgan800cc.go
@@ -0,0 +1,30 @@
+	
+/**
+ * Copyright 2020-present Facebook. All Rights Reserved.
+ *
+ * This program file is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program in a file named COPYING; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+package flash_procedure
+
+import (
+	"github.com/facebook/openbmc/tools/flashy/lib/flash"
+	"github.com/facebook/openbmc/tools/flashy/lib/step"
+)
+
+func init() {
+	step.RegisterStep(flash.FlashCp)
+}
diff --git a/tools/flashy/flash_procedure/flash_tahan.go b/tools/flashy/flash_procedure/flash_tahan.go
new file mode 100644
index 000000000000..67cafa1ed410
--- /dev/null
+++ b/tools/flashy/flash_procedure/flash_tahan.go
@@ -0,0 +1,30 @@
+	
+/**
+ * Copyright 2020-present Facebook. All Rights Reserved.
+ *
+ * This program file is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program in a file named COPYING; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
+package flash_procedure
+
+import (
+	"github.com/facebook/openbmc/tools/flashy/lib/flash"
+	"github.com/facebook/openbmc/tools/flashy/lib/step"
+)
+
+func init() {
+	step.RegisterStep(flash.FlashCp)
+}
diff --git a/tools/platforms/platform_build_names b/tools/platforms/platform_build_names
index c0e6c2598803..f7f4ab16df4f 100644
--- a/tools/platforms/platform_build_names
+++ b/tools/platforms/platform_build_names
@@ -21,15 +21,19 @@
   "greatlakes-lf",
   "gtartemis",
   "halfdome",
+  "harma",
   "inspirationpoint",
   "janga",
   "lightning",
   "meru",
+  "minerva",
   "minipack",
   "montblanc",
+  "morgan800cc",
   "northdome",
   "sandia",
   "sonorapass",
+  "tahan",
   "wedge",
   "wedge100",
   "wedge400",
diff --git a/yocto_repos.sh b/yocto_repos.sh
index afcade3d2c93..efbf3d9b739b 100644
--- a/yocto_repos.sh
+++ b/yocto_repos.sh
@@ -12,7 +12,7 @@ rocko_repos=(
 )
 rocko_poky_patch="0001-rocko-backport-support-for-override.patch 0002-Remove-checks-on-python.patch 0003-Add-support-to-build-on-centOS9.patch"
 lf_master_repos=(
-    lf-openbmc:a271c7c19
+    lf-openbmc:d287a5cef
 )
 lf_dunfell_repos=(
     lf-openbmc:c2858f16b