Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #96

Merged
merged 6 commits into from
Sep 2, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #96

merged 6 commits into from
Sep 2, 2023

Conversation

mssonicbld
Copy link
Contributor 

* f7f2e654c - (head/202205) [chassis] Chassis DB cleanup when asic comes up (#16213) (#16378) (2023-09-01) [mssonicbld]
* 88d692f98 - [Nokia][DeviceData] Update the Nokia platform IXR-7250E device data (#16028) (#16381) (2023-09-01) [mssonicbld]
* 35bb47260 - [installer] add processor.max_cstate=1 to intel kernel cmdline for intel cpu (#16371) (2023-09-01) [Xichen96]
* 896b8e720 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#16333) (2023-09-01) [mssonicbld]
* 95d7d440c - [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (#16331) (2023-09-01) [mssonicbld]<br>```

mssonicbld and others added 6 commits September 1, 2023 09:10
@mssonicbld
[submodule] Update submodule sonic-linux-kernel to the latest HEAD au…
95d7d44 
…tomatically (#16331)

src/sonic-linux-kernel

* db00eb9 - (HEAD -> 202205, origin/202205) PATCH] net: allow user to set metric on default route learned via Router Advertisement (Azure#326) (2 days ago) [abdosi]
@mssonicbld
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
896b8e7 
…lly (#16333)

src/sonic-swss

* d787d50d - (HEAD -> 202205, origin/202205) Remove fabric queue counters. (#2862) (2 days ago) [jfeng-arista]
* 4579d43f - update portStatIds for cisco (#2876) (3 days ago) [Zhixin Zhu]
@Xichen96
[installer] add processor.max_cstate=1 to intel kernel cmdline for in…
35bb472 
…tel cpu (#16371)

This is a fix for PR #6051

The original PR will disable intel idle driver but it cannot limit the max c-state to 1 due to system will fall back to acpi idle driver.

Currently intel_idle.max_cstate=0 is already present, which will disable intel idle driver. With the added option, common idle driver will be disabled as well, so there will not be idle management. This is to prevent a bug that can be triggered by idle instruction on intel platform.

Work item tracking
Microsoft ADO (number only): 24867921

How I did it
Add the option to installer file beside intel_idle.max_cstate=0

Signed-off-by: Xichen Lin <lukelin0907@gmail.com>
@mssonicbld @mlok-nokia
[Nokia][DeviceData] Update the Nokia platform IXR-7250E device data (…
88d692f 
…#16028) (#16381)

Why I did it
Update the platform_reboot of Nokia Platform IXR-7250E-36x400G to displays the correct reboot-cause history when reboot from supervisor card.

Work item tracking
Microsoft ADO (number only):
How I did it
Modify the platform_reboot script to copy the correct reboo-cause.txt file from NDK to the /host/reboot-cause directory at the down cycle when the reboot is issued from Supervisor (for both reboot right after install a new image and normal reboot)

Signed-off-by: mlok <marty.lok@nokia.com>
Co-authored-by: Marty Y. Lok <76118573+mlok-nokia@users.noreply.github.com>
@mssonicbld @vganesan-nokia
[chassis] Chassis DB cleanup when asic comes up (#16213) (#16378)
f7f2e65 
* [chassis]Chassis DB cleanup when asic comes up

Cleanup the entries from the following tables in chassis app db in
redis_chassis server in the supervisor
(1) SYSTEM_NEIGH
(2) SYSTEM_INTERFACE
(3) SYSTEM_LAG_MEMBER_TABLE
(4) SYSTEM_LAG_TABLE
As part of the clean up only those entries created by the asic that
is coming up are deleted. The LAG IDs used by the asics are also
de-allocated from SYSTEM_LAG_ID_TABLE and SYSTEM_LAG_ID_SET

- Added check to run the chassis db clean up only for voq switches.

Signed-off-by: vedganes <veda.ganesan@nokia.com>
Co-authored-by: vganesan-nokia <67648637+vganesan-nokia@users.noreply.github.com>
@mssonicbld
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage …
870690b 
…into 202205
@mssonicbld mssonicbld requested review from a team, qiluo-msft and lguohan as code owners September 2, 2023 03:01
@mssonicbld mssonicbld merged commit 19dfc8d into Azure:202205 Sep 2, 2023
2 of 3 checks passed
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
@mssonicbld
[submodule] Update submodule sonic-mgmt-common to the latest HEAD aut…
dae7022 
…omatically (#16495)

#### Why I did it
src/sonic-mgmt-common
```
* ee3029d - (HEAD -> master, origin/master, origin/HEAD) DB Access Layer Merges: (Azure#96) (11 hours ago) [a-barboza]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qiluo-msft qiluo-msft Awaiting requested review from qiluo-msft qiluo-msft is a code owner

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mssonicbld @Xichen96