BLACKWOLF800BANW: Add Initial Q4D ASIC definitions

fboss/agent/ApplyThriftConfig.cpp

@@ -1175,6 +1175,7 @@ void ThriftConfigApplier::processUpdatedDsfNodes() {
             asicCore = 1;
             break;
           case cfg::AsicType::ASIC_TYPE_JERICHO3:
+          case cfg::AsicType::ASIC_TYPE_Q4D:
             if (isDualStage3Q2QMode()) {
               asicCore = 447;
             } else {

fboss/agent/AsicUtils.cpp

@@ -10,6 +10,7 @@
 #include "fboss/agent/AsicUtils.h"
 #include "fboss/agent/hw/switch_asics/Jericho2Asic.h"
 #include "fboss/agent/hw/switch_asics/Jericho3Asic.h"
+#include "fboss/agent/hw/switch_asics/Q4DAsic.h"
 #include "fboss/agent/hw/switch_asics/Ramon3Asic.h"
 #include "fboss/agent/hw/switch_asics/RamonAsic.h"
 
@@ -39,6 +40,11 @@ const HwAsic& getHwAsicForAsicType(const cfg::AsicType& asicType) {
       static Jericho3Asic jericho3Asic{switchId, switchInfo};
       return jericho3Asic;
     }
+    case cfg::AsicType::ASIC_TYPE_Q4D: {
+      switchInfo.switchType() = cfg::SwitchType::VOQ;
+      static Q4DAsic q4dAsic{switchId, switchInfo};
+      return q4dAsic;
+    }
     case cfg::AsicType::ASIC_TYPE_RAMON: {
       switchInfo.switchType() = cfg::SwitchType::FABRIC;
       static RamonAsic ramonAsic{switchId, switchInfo};
@@ -81,6 +87,8 @@ uint32_t getFabricPortsPerVirtualDevice(const cfg::AsicType asicType) {
       return 192;
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
       return 160;
+    case cfg::AsicType::ASIC_TYPE_Q4D:
+      return 160;
     case cfg::AsicType::ASIC_TYPE_RAMON3:
       return 256;
     case cfg::AsicType::ASIC_TYPE_FAKE:

fboss/agent/PortUpdateHandler.cpp

@@ -299,6 +299,7 @@ void PortUpdateHandler::computeFabricOverdrainPct(const StateDelta& delta) {
       case cfg::AsicType::ASIC_TYPE_JERICHO2:
         return 1.12;
       case cfg::AsicType::ASIC_TYPE_JERICHO3:
+      case cfg::AsicType::ASIC_TYPE_Q4D:
         return 1.06;
       case cfg::AsicType::ASIC_TYPE_MOCK:
       case cfg::AsicType::ASIC_TYPE_FAKE:

fboss/agent/hw/bcm/BcmFieldProcessorUtils.cpp

@@ -542,6 +542,7 @@ bool needsExtraFPQsetQualifiers(cfg::AsicType asicType) {
     case cfg::AsicType::ASIC_TYPE_SANDIA_PHY:
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_RAMON:
     case cfg::AsicType::ASIC_TYPE_RAMON3:
     case cfg::AsicType::ASIC_TYPE_G202X:

fboss/agent/hw/bcm/BcmSwitch.cpp

@@ -4219,6 +4219,7 @@ void BcmSwitch::disableHotSwap() const {
       case cfg::AsicType::ASIC_TYPE_SANDIA_PHY:
       case cfg::AsicType::ASIC_TYPE_JERICHO2:
       case cfg::AsicType::ASIC_TYPE_JERICHO3:
+      case cfg::AsicType::ASIC_TYPE_Q4D:
       case cfg::AsicType::ASIC_TYPE_RAMON:
       case cfg::AsicType::ASIC_TYPE_RAMON3:
       case cfg::AsicType::ASIC_TYPE_G202X:

fboss/agent/hw/bcm/tests/HwTestTamUtils.cpp

@@ -20,6 +20,7 @@ void triggerParityError(HwSwitchEnsemble* ensemble) {
     case cfg::AsicType::ASIC_TYPE_SANDIA_PHY:
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_RAMON:
     case cfg::AsicType::ASIC_TYPE_RAMON3:
     case cfg::AsicType::ASIC_TYPE_EBRO:

fboss/agent/hw/bcm/tests/HwTestTamUtilsThriftHandler.cpp

@@ -19,6 +19,7 @@ void HwTestThriftHandler::triggerParityError() {
     case cfg::AsicType::ASIC_TYPE_SANDIA_PHY:
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_RAMON:
     case cfg::AsicType::ASIC_TYPE_RAMON3:
     case cfg::AsicType::ASIC_TYPE_EBRO:

fboss/agent/hw/sai/hw_test/HwTestTamUtils.cpp

@@ -140,6 +140,7 @@ void triggerParityError(HwSwitchEnsemble* ensemble) {
       triggerBcmJericho2ParityError(ensemble);
       break;
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
       triggerBcmJericho3ParityError(ensemble);
       break;
     case cfg::AsicType::ASIC_TYPE_CHENAB:

fboss/agent/hw/sai/hw_test/HwTestTamUtilsThriftHandler.cpp

@@ -235,6 +235,7 @@ void HwTestThriftHandler::triggerParityError() {
       triggerBcmJericho2ParityError(hwSwitch_);
       break;
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
       triggerBcmJericho3ParityError(hwSwitch_);
       break;
     case cfg::AsicType::ASIC_TYPE_CHENAB:

fboss/agent/hw/sai/switch/SaiBufferManager.cpp

@@ -108,6 +108,7 @@ void assertMaxBufferPoolSize(const SaiPlatform* platform) {
       break;
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_TRIDENT2:
       CHECK_EQ(maxEgressPoolSize, availableBuffer);
       break;
@@ -193,6 +194,7 @@ uint64_t SaiBufferManager::getMaxEgressPoolBytes(const SaiPlatform* platform) {
     }
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
       /*
        * XXX: TODO: Need to check if there is a way to compute the
        * buffers available for use in Jericho2 without using the

fboss/agent/hw/sai/switch/SaiPortManager.cpp

@@ -547,6 +547,7 @@ int getWorstCaseAssumedOpticsDelayNS(
     case cfg::AsicType::ASIC_TYPE_G202X:
       break;
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
       if (portType == cfg::PortType::FABRIC_PORT) {
         return 110;
       } else {

fboss/agent/hw/sai/switch/SaiVirtualRouterManager.cpp

@@ -99,6 +99,7 @@ SaiVirtualRouterManager::createMplsRouterInterface(VirtualRouterSaiId vrId) {
     case cfg::AsicType::ASIC_TYPE_SANDIA_PHY:
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_RAMON:
     case cfg::AsicType::ASIC_TYPE_RAMON3:
     case cfg::AsicType::ASIC_TYPE_CHENAB:

fboss/agent/hw/switch_asics/HwAsic.cpp

@@ -19,6 +19,7 @@
 #include "fboss/agent/hw/switch_asics/Jericho2Asic.h"
 #include "fboss/agent/hw/switch_asics/Jericho3Asic.h"
 #include "fboss/agent/hw/switch_asics/MockAsic.h"
+#include "fboss/agent/hw/switch_asics/Q4DAsic.h"
 #include "fboss/agent/hw/switch_asics/Ramon3Asic.h"
 #include "fboss/agent/hw/switch_asics/RamonAsic.h"
 #include "fboss/agent/hw/switch_asics/Tomahawk3Asic.h"
@@ -116,6 +117,8 @@ std::unique_ptr<HwAsic> HwAsic::makeAsic(
       return std::make_unique<Jericho2Asic>(switchId, switchInfo, sdkVersion);
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
       return std::make_unique<Jericho3Asic>(switchId, switchInfo, sdkVersion);
+    case cfg::AsicType::ASIC_TYPE_Q4D:
+      return std::make_unique<Q4DAsic>(switchId, switchInfo, sdkVersion);
     case cfg::AsicType::ASIC_TYPE_RAMON:
       return std::make_unique<RamonAsic>(switchId, switchInfo, sdkVersion);
     case cfg::AsicType::ASIC_TYPE_RAMON3:

fboss/agent/hw/switch_asics/Q4DAsic.h

@@ -0,0 +1,27 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+#pragma once
+
+#include <optional>
+#include "fboss/agent/hw/switch_asics/Jericho3Asic.h"
+
+namespace facebook::fboss {
+
+class Q4DAsic : public Jericho3Asic {
+ public:
+  Q4DAsic(
+      std::optional<int64_t> switchId,
+      cfg::SwitchInfo switchInfo,
+      std::optional<cfg::SdkVersion> sdkVersion = std::nullopt)
+      : Jericho3Asic(switchId, switchInfo, sdkVersion) {}
+
+  cfg::AsicType getAsicType() const override {
+    return cfg::AsicType::ASIC_TYPE_Q4D;
+  }
+
+  cfg::PortSpeed getMaxPortSpeed() const override {
+    return cfg::PortSpeed::EIGHTHUNDREDG;
+  }
+};
+
+} // namespace facebook::fboss

fboss/agent/hw/test/HwHashPolarizationTestUtils.cpp

@@ -56,6 +56,7 @@ std::unique_ptr<std::vector<utility::EthFrame>> getFullHashedPackets(
       case cfg::AsicType::ASIC_TYPE_AGERA3:
       case cfg::AsicType::ASIC_TYPE_JERICHO2:
       case cfg::AsicType::ASIC_TYPE_JERICHO3:
+      case cfg::AsicType::ASIC_TYPE_Q4D:
       case cfg::AsicType::ASIC_TYPE_RAMON:
       case cfg::AsicType::ASIC_TYPE_RAMON3:
       case cfg::AsicType::ASIC_TYPE_G202X:
@@ -86,6 +87,7 @@ std::unique_ptr<std::vector<utility::EthFrame>> getFullHashedPackets(
       case cfg::AsicType::ASIC_TYPE_SANDIA_PHY:
       case cfg::AsicType::ASIC_TYPE_JERICHO2:
       case cfg::AsicType::ASIC_TYPE_JERICHO3:
+      case cfg::AsicType::ASIC_TYPE_Q4D:
       case cfg::AsicType::ASIC_TYPE_RAMON:
       case cfg::AsicType::ASIC_TYPE_RAMON3:
       case cfg::AsicType::ASIC_TYPE_G202X:

fboss/agent/hw/test/dataplane_tests/HwProdInvariantHelper.cpp

@@ -174,6 +174,7 @@ void HwProdInvariantHelper::verifySafeDiagCmds() {
     case cfg::AsicType::ASIC_TYPE_SANDIA_PHY:
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_RAMON:
     case cfg::AsicType::ASIC_TYPE_RAMON3:
     case cfg::AsicType::ASIC_TYPE_TOMAHAWK5:

fboss/agent/switch_config.thrift

@@ -1535,7 +1535,8 @@ enum AsicType {
   ASIC_TYPE_TOMAHAWK6 = 18,
   ASIC_TYPE_AGERA3 = 19,
   ASIC_TYPE_G202X = 20,
-  ASIC_TYPE_FAKE_NO_WARMBOOT = 21,
+  ASIC_TYPE_Q4D = 21,
+  ASIC_TYPE_FAKE_NO_WARMBOOT = 22,
 }
 /**
  * The configuration for an interface

fboss/agent/test/agent_hw_tests/AgentDiagShellStressTests.cpp

@@ -33,6 +33,7 @@ class AgentDiagShellStressTest : public AgentHwTest {
           // No diag shell to test for these ASICs
           break;
         case cfg::AsicType::ASIC_TYPE_JERICHO3:
+        case cfg::AsicType::ASIC_TYPE_Q4D:
           runBcmDnxCmds(switchId);
           break;
         case cfg::AsicType::ASIC_TYPE_EBRO:

fboss/agent/test/prod_agent_tests/ProdInvariantTests.cpp

@@ -373,6 +373,7 @@ void ProdInvariantTest::verifySafeDiagCommands() {
     case cfg::AsicType::ASIC_TYPE_AGERA3:
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_RAMON:
     case cfg::AsicType::ASIC_TYPE_RAMON3:
     case cfg::AsicType::ASIC_TYPE_TOMAHAWK5:

fboss/agent/test/utils/CoppTestUtils.cpp

@@ -118,6 +118,7 @@ uint16_t getCoppHighPriQueueId(const HwAsic* hwAsic) {
     case cfg::AsicType::ASIC_TYPE_YUBA:
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_G202X:
       return 7;
     case cfg::AsicType::ASIC_TYPE_CHENAB:
@@ -164,6 +165,7 @@ cfg::ToCpuAction getCpuActionType(const HwAsic* hwAsic) {
       return cfg::ToCpuAction::COPY;
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
     case cfg::AsicType::ASIC_TYPE_CHENAB:
       return cfg::ToCpuAction::TRAP;
     case cfg::AsicType::ASIC_TYPE_ELBERT_8DD:

fboss/agent/test/utils/InvariantTestUtils.cpp

@@ -46,6 +46,7 @@ void verifySafeDiagCmds(TestEnsembleIf* ensemble) {
       case cfg::AsicType::ASIC_TYPE_AGERA3:
       case cfg::AsicType::ASIC_TYPE_JERICHO2:
       case cfg::AsicType::ASIC_TYPE_JERICHO3:
+      case cfg::AsicType::ASIC_TYPE_Q4D:
       case cfg::AsicType::ASIC_TYPE_RAMON:
       case cfg::AsicType::ASIC_TYPE_RAMON3:
       case cfg::AsicType::ASIC_TYPE_TOMAHAWK5:

fboss/agent/test/utils/PfcTestUtils.cpp

@@ -261,6 +261,7 @@ PfcBufferParams PfcBufferParams::getPfcBufferParams(
   switch (asicType) {
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
       buffer.globalShared = kSmallGlobalSharedBytes;
       break;
     default:

fboss/agent/test/utils/PortTestUtils.cpp

@@ -183,6 +183,7 @@ cfg::PortSpeed getDefaultInterfaceSpeed(const cfg::AsicType& asicType) {
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
       return cfg::PortSpeed::HUNDREDG;
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
       return cfg::PortSpeed::FOURHUNDREDG;
     default:
       throw FbossError(
@@ -196,6 +197,7 @@ cfg::PortSpeed getDefaultFabricSpeed(const cfg::AsicType& asicType) {
     case cfg::AsicType::ASIC_TYPE_JERICHO2:
       return cfg::PortSpeed::FIFTYTHREEPOINTONETWOFIVEG;
     case cfg::AsicType::ASIC_TYPE_JERICHO3:
+    case cfg::AsicType::ASIC_TYPE_Q4D:
       return cfg::PortSpeed::HUNDREDANDSIXPOINTTWOFIVEG;
     default:
       throw FbossError(

fboss/lib/platform_mapping_v2/platform_mapping_config.thrift

@@ -34,6 +34,7 @@ enum CoreType {
   J3_EVT = 7, // J3 Eventor Port
   CHENAB_NIF = 8,
   TH6_NIF = 9, // TH6
+  Q4D_NIF = 10, // Q4D
 
   // Transceivers
   OSFP = 100,