diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 40a80090a3d..f08ddc0482b 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -530,6 +530,7 @@ write_platform_specific_cmdline() {
     if in_array "$platform" "rook" "sprucefish"; then
         cmdline_add iommu=on
         cmdline_add intel_iommu=on
+        cmdline_add intel_idle.max_cstate=0
         read_system_eeprom
     fi
     if in_array "$platform" "crow" "magpie"; then
@@ -542,6 +543,7 @@ write_platform_specific_cmdline() {
         read_system_eeprom
     fi
     if in_array "$platform" "lorikeet" "hedgehog"; then
+        cmdline_add processor.max_cstate=1
         read_system_eeprom
     fi
 
diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
index 6343e5304d1..adf10841989 160000
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 6343e5304d10eff8cbfbbcc894b63fb2f0346515
+Subproject commit adf108419894f3b58c0c69722e0be3c72613180e
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 6343e5304d1..adf10841989 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 6343e5304d10eff8cbfbbcc894b63fb2f0346515
+Subproject commit adf108419894f3b58c0c69722e0be3c72613180e
diff --git a/src/sonic-swss b/src/sonic-swss
index c0f951cbfe4..450bd07cf52 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit c0f951cbfe40dba6017ff7853d0d6cbb7f3b5448
+Subproject commit 450bd07cf52a186f3ce4ae5483793a29d33a1edb