Skip to content

Commit a65721c

Browse files
bbinxiebbinxie
authored
Merge pull request #107 from Azure/master
update master branch
2 parents d92d9f8 + 8b674c8 commit a65721c

File tree

36 files changed

+177
-207
lines changed

36 files changed

+177
-207
lines changed

‎device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"p4_pipelines": [
2323
{
2424
"p4_pipeline_name": "pipe",
25-
"config": "share/tofinopd/switch/pipe/tofino.bin",
26-
"context": "share/tofinopd/switch/pipe/context.json"
25+
"config": "share/switch/pipe/tofino.bin",
26+
"context": "share/switch/pipe/context.json"
2727
}
2828
],
2929
"program-name": "switch",
3030
"switchsai": "lib/libswitchsai.so",
31-
"bfrt-config": "share/tofinopd/switch/bf-rt.json",
31+
"bfrt-config": "share/switch/bf-rt.json",
3232
"model_json_path" : "share/switch/aug_model.json",
3333
"switchapi_port_add": false,
3434
"non_default_port_ppgs": 5

‎device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"p4_pipelines": [
2323
{
2424
"p4_pipeline_name": "pipe",
25-
"config": "share/tofinopd/switch/pipe/tofino.bin",
26-
"context": "share/tofinopd/switch/pipe/context.json"
25+
"config": "share/switch/pipe/tofino.bin",
26+
"context": "share/switch/pipe/context.json"
2727
}
2828
],
2929
"program-name": "switch",
3030
"switchsai": "lib/libswitchsai.so",
31-
"bfrt-config": "share/tofinopd/switch/bf-rt.json",
31+
"bfrt-config": "share/switch/bf-rt.json",
3232
"model_json_path" : "share/switch/aug_model.json",
3333
"switchapi_port_add": false,
3434
"non_default_port_ppgs": 5

‎device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"p4_pipelines": [
2424
{
2525
"p4_pipeline_name": "pipe",
26-
"config": "share/tofinopd/switch/pipe/tofino.bin",
27-
"context": "share/tofinopd/switch/pipe/context.json"
26+
"config": "share/switch/pipe/tofino.bin",
27+
"context": "share/switch/pipe/context.json"
2828
}
2929
],
3030
"program-name": "switch",
3131
"switchsai": "lib/libswitchsai.so",
32-
"bfrt-config": "share/tofinopd/switch/bf-rt.json",
32+
"bfrt-config": "share/switch/bf-rt.json",
3333
"model_json_path" : "share/switch/aug_model.json",
3434
"switchapi_port_add": false,
3535
"non_default_port_ppgs": 5

‎device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"p4_pipelines": [
2424
{
2525
"p4_pipeline_name": "pipe",
26-
"config": "share/tofinopd/switch/pipe/tofino.bin",
27-
"context": "share/tofinopd/switch/pipe/context.json"
26+
"config": "share/switch/pipe/tofino.bin",
27+
"context": "share/switch/pipe/context.json"
2828
}
2929
],
3030
"program-name": "switch",
3131
"switchsai": "lib/libswitchsai.so",
32-
"bfrt-config": "share/tofinopd/switch/bf-rt.json",
32+
"bfrt-config": "share/switch/bf-rt.json",
3333
"model_json_path" : "share/switch/aug_model.json",
3434
"switchapi_port_add": false,
3535
"non_default_port_ppgs": 5

‎device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"p4_pipelines": [
2424
{
2525
"p4_pipeline_name": "pipe",
26-
"config": "share/tofinopd/switch/pipe/tofino.bin",
27-
"context": "share/tofinopd/switch/pipe/context.json"
26+
"config": "share/switch/pipe/tofino.bin",
27+
"context": "share/switch/pipe/context.json"
2828
}
2929
],
3030
"program-name": "switch",
3131
"switchsai": "lib/libswitchsai.so",
32-
"bfrt-config": "share/tofinopd/switch/bf-rt.json",
32+
"bfrt-config": "share/switch/bf-rt.json",
3333
"model_json_path" : "share/switch/aug_model.json",
3434
"switchapi_port_add": false,
3535
"non_default_port_ppgs": 5

‎device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"p4_pipelines": [
2424
{
2525
"p4_pipeline_name": "pipe",
26-
"config": "share/tofinopd/switch/pipe/tofino.bin",
27-
"context": "share/tofinopd/switch/pipe/context.json"
26+
"config": "share/switch/pipe/tofino.bin",
27+
"context": "share/switch/pipe/context.json"
2828
}
2929
],
3030
"program-name": "switch",
3131
"switchsai": "lib/libswitchsai.so",
32-
"bfrt-config": "share/tofinopd/switch/bf-rt.json",
32+
"bfrt-config": "share/switch/bf-rt.json",
3333
"model_json_path" : "share/switch/aug_model.json",
3434
"switchapi_port_add": false,
3535
"non_default_port_ppgs": 5

‎device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ declare -r EXIT_SUCCESS="0"
44
declare -r EXIT_ERROR="1"
55

66
declare -r FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh"
7+
declare -r SYSFS_PWR_CYCLE="/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_cycle"
78

89
FORCE_REBOOT="no"
910

@@ -20,7 +21,7 @@ function ParseArguments() {
2021

2122
ParseArguments "$@"
2223

23-
${FW_UPGRADE_SCRIPT} --upgrade
24+
${FW_UPGRADE_SCRIPT} --upgrade --verbose
2425
EXIT_CODE="$?"
2526
if [[ "${EXIT_CODE}" != "${EXIT_SUCCESS}" ]]; then
2627
echo "Failed to burn MLNX FW: errno=${EXIT_CODE}"
@@ -31,4 +32,7 @@ if [[ "${EXIT_CODE}" != "${EXIT_SUCCESS}" ]]; then
3132
fi
3233
fi
3334

34-
exec /sbin/reboot $@
35+
# perform "hardware" reboot
36+
echo 1 > $SYSFS_PWR_CYCLE
37+
sleep 3
38+
echo 0 > $SYSFS_PWR_CYCLE

‎device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎device/mellanox/x86_64-mlnx_msn2700_simx-r0/platform_reboot

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
declare -r EXIT_SUCCESS="0"
4+
declare -r EXIT_ERROR="1"
5+
6+
FORCE_REBOOT="no"
7+
8+
function ParseArguments() {
9+
while [ $# -ge 1 ]; do
10+
case "$1" in
11+
-f|--force)
12+
FORCE_REBOOT="yes"
13+
;;
14+
esac
15+
shift
16+
done
17+
}
18+
19+
ParseArguments "$@"
20+
21+
exec /sbin/reboot $@

‎device/mellanox/x86_64-mlnx_msn3700_simx-r0/platform_reboot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-mlnx_msn3700-r0/platform_reboot
1+
../x86_64-mlnx_msn2700_simx-r0/platform_reboot

0 commit comments

Comments
 (0)