[BFN] Update configuration files (#9913)

* [Barefoot] update switch-tna-sai.conf file * remove deprecated conf files * [Barefoot] update switch-tna-sai.conf file for Accton wedge100bf_32qs platform * pdated switch-tna-sai.conf
sonic-net · Mar 9, 2022 · bf5f9c2 · bf5f9c2
1 parent d112e7c
commit bf5f9c2
Show file tree

Hide file tree

Showing 17 changed files with 105 additions and 316 deletions.
diff --git a/device/accton/x86_64-accton_wedge100bf_32qs-r0/montara/switch-tna-sai.conf b/device/accton/x86_64-accton_wedge100bf_32qs-r0/montara/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -28,13 +20,20 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-sai.conf b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-sai.conf
diff --git a/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf
@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,13 +19,20 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-sai.conf b/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-sai.conf
diff --git a/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf
@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,13 +19,20 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf
@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,13 +19,20 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf
@@ -1,16 +1,8 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino",
             "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
             "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
         }
     ],
@@ -27,13 +19,20 @@
                         }
                     ],
                     "program-name": "switch",
-                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }
diff --git a/device/barefoot/x86_64-accton_as9516_32d-r0/newport/switch-tna-sai.conf b/device/barefoot/x86_64-accton_as9516_32d-r0/newport/switch-tna-sai.conf
@@ -1,17 +1,9 @@
 {
-    "instance": 0,
     "chip_list": [
         {
-            "id": "asic-0",
             "chip_family": "Tofino2",
-            "instance": 0,
-            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
-            "pcie_domain": 0,
-            "pcie_bus": 5,
-            "pcie_fn": 0,
-            "pcie_dev": 0,
-            "pcie_int_mode": 1,
-            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware",
+            "instance": 0
         }
     ],
     "p4_devices": [
@@ -20,21 +12,28 @@
             "agent0": "lib/platform/x86_64-accton_as9516bf_32d-r0/libpltfm_mgr.so",
             "p4_programs": [
                 {
+                    "program-name": "switch",
+                    "bfrt-config": "share/switch/bf-rt.json",
                     "p4_pipelines": [
                         {
                             "p4_pipeline_name": "pipe",
                             "config": "share/switch/pipe/tofino2.bin",
                             "context": "share/switch/pipe/context.json"
                         }
-                    ],
-                    "program-name": "switch",
-                    "sai": "lib/libsai.so",
-                    "bfrt-config": "share/switch/bf-rt.json",
+                    ],                   
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,
                     "non_default_port_ppgs": 5
                 }
             ]
         }
+    ],
+    "switch_options": [
+        {
+            "device-id": 0,
+            "model_json_path": "share/switch/aug_model.json",
+            "non_default_port_ppgs": 5,
+            "switchapi_port_add": false
+        }
     ]
 }