Skip to content

Commit 95cee7f

Browse files
mssonicbldmssonicbld
authored
Merge pull request #36 from mssonicbld/sonicbld/202205-merge
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
2 parents 53de739 + 857f3fe commit 95cee7f

File tree

31 files changed

+483
-70
lines changed

31 files changed

+483
-70
lines changed

‎.azure-pipelines/azure-pipelines-image-template.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ jobs:
2828
- template: .azure-pipelines/cleanup.yml@buildimage
2929
- ${{ parameters.preSteps }}
3030
- script: |
31-
BUILD_OPTIONS="$(BUILD_OPTIONS)"
31+
[ -n "$OVERRIDE_BUILD_OPTIONS" ] && OVERRIDE_BUILD_OPTIONS=$(OVERRIDE_BUILD_OPTIONS)
32+
BUILD_OPTIONS="$(BUILD_OPTIONS) $OVERRIDE_BUILD_OPTIONS"
3233
if [ -n "$(CACHE_MODE)" ] && echo $(PLATFORM_AZP) | grep -E -q "^(vs|broadcom|mellanox|marvell-armhf)$"; then
3334
CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=$(CACHE_MODE) SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/$(PLATFORM_AZP)"
34-
BUILD_OPTIONS="$(BUILD_OPTIONS) $CACHE_OPTIONS"
35+
BUILD_OPTIONS="$BUILD_OPTIONS $CACHE_OPTIONS"
3536
fi
37+
echo $BUILD_OPTIONS
3638
echo "##vso[task.setvariable variable=BUILD_OPTIONS]$BUILD_OPTIONS"
3739
displayName: "Set cache options"
3840
- checkout: self

‎device/arista/x86_64-arista_7050_qx32/platform.json‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,37 +53,43 @@
5353
"psus": [
5454
{
5555
"name": "psu1",
56-
"fans": []
56+
"fans": [
57+
{
58+
"name": "psu1/1",
59+
"speed": {
60+
"controllable": false
61+
}
62+
}
63+
]
5764
},
5865
{
5966
"name": "psu2",
60-
"fans": []
67+
"fans": [
68+
{
69+
"name": "psu2/1",
70+
"speed": {
71+
"controllable": false
72+
}
73+
}
74+
]
6175
}
6276
],
6377
"thermals": [
6478
{
65-
"name": "Cpu temp sensor"
66-
},
67-
{
68-
"name": "Board sensor"
69-
},
70-
{
71-
"name": "Front-panel temp sensor"
72-
},
73-
{
74-
"name": "Rear temp sensor"
75-
},
76-
{
77-
"name": "Power supply 1 inlet temp sensor"
79+
"name": "Cpu temp sensor",
80+
"controllable": false
7881
},
7982
{
80-
"name": "Power supply 1 internal sensor"
83+
"name": "Board sensor",
84+
"controllable": false
8185
},
8286
{
83-
"name": "Power supply 2 inlet temp sensor"
87+
"name": "Front-panel temp sensor",
88+
"controllable": false
8489
},
8590
{
86-
"name": "Power supply 2 internal sensor"
91+
"name": "Rear temp sensor",
92+
"controllable": false
8793
}
8894
],
8995
"sfps": [

‎device/arista/x86_64-arista_7050_qx32s/platform.json‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,46 +40,47 @@
4040
"psus": [
4141
{
4242
"name": "psu1",
43-
"fans": []
43+
"fans": [
44+
{
45+
"name": "psu1/1",
46+
"speed": {
47+
"controllable": false
48+
}
49+
}
50+
]
4451
},
4552
{
4653
"name": "psu2",
47-
"fans": []
54+
"fans": [
55+
{
56+
"name": "psu2/1",
57+
"speed": {
58+
"controllable": false
59+
}
60+
}
61+
]
4862
}
4963
],
5064
"thermals": [
5165
{
52-
"name": "Cpu temp sensor"
53-
},
54-
{
55-
"name": "Cpu board temp sensor"
56-
},
57-
{
58-
"name": "Back-panel temp sensor"
59-
},
60-
{
61-
"name": "Board Sensor"
62-
},
63-
{
64-
"name": "Front-panel temp sensor"
65-
},
66-
{
67-
"name": "Power supply 1 hotspot sensor"
68-
},
69-
{
70-
"name": "Power supply 1 inlet temp sensor"
66+
"name": "Cpu temp sensor",
67+
"controllable": false
7168
},
7269
{
73-
"name": "Power supply 1 exhaust temp sensor"
70+
"name": "Cpu board temp sensor",
71+
"controllable": false
7472
},
7573
{
76-
"name": "Power supply 2 hotspot sensor"
74+
"name": "Back-panel temp sensor",
75+
"controllable": false
7776
},
7877
{
79-
"name": "Power supply 2 inlet temp sensor"
78+
"name": "Board Sensor",
79+
"controllable": false
8080
},
8181
{
82-
"name": "Power supply 2 exhaust temp sensor"
82+
"name": "Front-panel temp sensor",
83+
"controllable": false
8384
}
8485
],
8586
"sfps": [

‎device/arista/x86_64-arista_7060_cx32s/platform_components.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"chassis": {
3-
"DCS-7050CX3-32S": {
3+
"DCS-7060CX-32S": {
44
"component": {
55
"Aboot()": {},
66
"Scd(addr=0000:02:00.0)": {},

‎files/Aboot/boot0.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ installer_image_path="$image_path/$installer_image"
8686

8787
boot_config="$target_path/boot-config"
8888

89-
cmdline_allowlist="crashkernel hwaddr_ma1 sonic_fips"
89+
cmdline_allowlist="crashkernel hwaddr_ma1 sonic_fips docker_inram"
9090

9191
# for backward compatibility with the sonic_upgrade= behavior
9292
install="${install:-${sonic_upgrade:-}}"

‎files/build_templates/buffers_config.j2‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ def
112112
{%- endmacro %}
113113

114114
{%- set PORT_ALL = [] %}
115+
{%- set PORT_BP = [] %}
115116
{%- set SYSTEM_PORT_ALL = [] %}
116117

117118
{%- if voq_chassis %}
@@ -136,6 +137,9 @@ def
136137
{%- if PORT_ALL.append(port) %}{%- endif %}
137138
{%- endif %}
138139
{%- endfor %}
140+
{%- if defs.generate_bp_port_list is defined %}
141+
{%- if defs.generate_bp_port_list(PORT,PORT_BP) %} {% endif %}
142+
{%- endif %}
139143
{%- endif %}
140144

141145
{%- set PORT_ACTIVE = [] %}
@@ -146,6 +150,9 @@ def
146150
{%- for port in DEVICE_NEIGHBOR.keys() %}
147151
{%- if PORT_ACTIVE.append(port) %}{%- endif %}
148152
{%- endfor %}
153+
{%- for port in PORT_BP %}
154+
{%- if PORT_ACTIVE.append(port) %}{%- endif %}
155+
{%- endfor %}
149156
{%- for port in PORT_ALL %}
150157
{%- if port not in DEVICE_NEIGHBOR.keys() %}
151158
{%- if PORT_INACTIVE.append(port) %}{%- endif %}

‎files/build_templates/qos_config.j2‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
{%- set PORT_ALL = [] %}
2+
{%- set PORT_BP = [] %}
23
{%- for port in PORT %}
34
{%- if not port.startswith('Ethernet-Rec') and not port.startswith('Ethernet-IB') %}
45
{%- if PORT_ALL.append(port) %}{% endif %}
56
{%- endif %}
67
{%- endfor %}
8+
{%- if generate_bp_port_list is defined %}
9+
{%- if generate_bp_port_list(PORT,PORT_BP) %} {% endif %}
10+
{%- endif %}
11+
712
{%- if PORT_ALL | sort_by_port_index %}{% endif %}
813

914
{%- set port_names_list_all = [] %}
@@ -20,6 +25,9 @@
2025
{%- for port in DEVICE_NEIGHBOR.keys() %}
2126
{%- if PORT_ACTIVE.append(port) %}{%- endif %}
2227
{%- endfor %}
28+
{%- for port in PORT_BP %}
29+
{%- if PORT_ACTIVE.append(port) %}{%- endif %}
30+
{%- endfor %}
2331
{%- endif %}
2432
{%- if PORT_ACTIVE | sort_by_port_index %}{% endif %}
2533

‎platform/broadcom/sonic-platform-modules-cel/haliburton/modules/emc2305.c‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,35 @@ emc2305_set_pwm(struct i2c_client *client, int fan_idx, long pwm)
407407
mutex_unlock(&data->update_lock);
408408
return status;
409409
}
410+
411+
static int
412+
emc2305_enable_timeout(struct i2c_client *client, bool enable)
413+
{
414+
struct emc2305_data *data = i2c_get_clientdata(client);
415+
int status = 0;
416+
u8 conf_val = 0;
417+
418+
mutex_lock(&data->update_lock);
419+
420+
status = read_u8_from_i2c(client, REG_CONFIGURATION, &conf_val);
421+
if (status < 0) {
422+
mutex_unlock(&data->update_lock);
423+
return status;
424+
}
425+
426+
// Section 6.2: CONFIG REGISTER DIS_TO bit(bit 6)
427+
if (enable) {
428+
conf_val &= ~(1 << 6);
429+
} else {
430+
conf_val |= (1 << 6);
431+
}
432+
433+
status = i2c_smbus_write_byte_data(client, REG_CONFIGURATION, conf_val);
434+
435+
mutex_unlock(&data->update_lock);
436+
return status;
437+
}
438+
410439
/*
411440
* sysfs callback functions
412441
*
@@ -744,6 +773,9 @@ emc2305_probe(struct i2c_client *client, const struct i2c_device_id *id)
744773
i2c_set_clientdata(client, data);
745774
mutex_init(&data->update_lock);
746775

776+
// Enable SMBus timeout feature
777+
emc2305_enable_timeout(client, true);
778+
747779
status = i2c_smbus_read_byte_data(client, REG_PRODUCT_ID);
748780
switch (status) {
749781
case 0x34: /* EMC2305 */

‎platform/checkout/cisco-8000.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[module]
22
repo[email protected]:Cisco-8000-sonic/platform-cisco-8000.git
3-
ref=202205.2.2.4
3+
ref=202205.2.2.5

‎platform/marvell-armhf/prestera.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export MRVL_PRESTERA_VER = 1.0
44
export MRVL_PRESTERA = mrvlprestera_$(MRVL_PRESTERA_VER)_$(PLATFORM_ARCH)
55
export MRVL_PRESTERA_DEB = $(MRVL_PRESTERA).deb
66
export MRVL_PRESTERA_SRC_URL = https://github.com/Marvell-switching/mrvl-prestera.git
7-
export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.2
7+
export MRVL_PRESTERA_SRC_TAG = MRVL_PRESTERA_DRIVER_1.4
88

99
$(MRVL_PRESTERA_DEB)_SRC_PATH = $(PLATFORM_PATH)/prestera
1010
$(MRVL_PRESTERA_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)

0 commit comments

Comments
 (0)