Modify PFC WD values being configured to be same as what will be prog…

…rammed

Summary:
As titled, this bridges the gap with the value configured, but there are 2 CSPs open
which are also needed to fix this test fully.

Reviewed By: jasmeetbagga

Differential Revision: D66739282

fbshipit-source-id: a11b982d7784d5cde9530970f50ca653bac1209d

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

@@ -458,6 +458,16 @@ void SaiPortManager::attributesFromSaiStore(
       SaiPortTraits::Attributes::QosPfcPriorityToQueueMap{});
   getAndSetAttribute(
       port->attributes(), attributes, SaiPortTraits::Attributes::TamObject{});
+#if SAI_API_VERSION >= SAI_VERSION(1, 10, 2)
+  getAndSetAttribute(
+      port->attributes(),
+      attributes,
+      SaiPortTraits::Attributes::PfcTcDldInterval{});
+  getAndSetAttribute(
+      port->attributes(),
+      attributes,
+      SaiPortTraits::Attributes::PfcTcDlrInterval{});
+#endif
   if (platform_->getAsic()->isSupported(
           HwAsic::Feature::PORT_TTL_DECREMENT_DISABLE)) {
     getAndSetAttribute(

fboss/agent/test/agent_hw_tests/AgentTrafficPfcTests.cpp

@@ -576,12 +576,17 @@ class AgentTrafficPfcWatchdogTest : public AgentTrafficPfcTest {
     cfg::PfcWatchdog pfcWatchdog;
     if (enable) {
       pfcWatchdog.recoveryAction() = cfg::PfcWatchdogRecoveryAction::NO_DROP;
+      // Configure values that works for specific HW, include ASIC type checks
+      // if needed, given some HW has limitations on the specific values that
+      // can be programmed and we need to ensure that the configured value here
+      // is in sync with what is in SAI/SDK to avoid a reprogramming attempt
+      // during warmboot.
       if (canTriggerPfcDeadlockDetectionWithTraffic()) {
         pfcWatchdog.recoveryTimeMsecs() = 10;
         pfcWatchdog.detectionTimeMsecs() = 1;
       } else {
         pfcWatchdog.recoveryTimeMsecs() = 1000;
-        pfcWatchdog.detectionTimeMsecs() = 200;
+        pfcWatchdog.detectionTimeMsecs() = 198;
       }
     }