[202205][nvidia] Place FW binaries under platform directory instead of squashfs#91
Closed
stepanblyschak wants to merge 3 commits into202205from
Closed
[202205][nvidia] Place FW binaries under platform directory instead of squashfs#91stepanblyschak wants to merge 3 commits into202205from
stepanblyschak wants to merge 3 commits into202205from
Conversation
Upgrade from old image always requires squashfs mount to get the next image FW binary. This can be avoided if we put FW binary under platform directory which is easily accessible after installation: ``` admin@r-spider-05:~$ ls /host/image-fw-new-loc.0-dirty-20230208.193534/platform/fw-SPC.mfa /host/image-fw-new-loc.0-dirty-20230208.193534/platform/fw-SPC.mfa admin@r-spider-05:~$ ls -al /tmp/image-fw-new-loc.0-dirty-20230208.193534-fs/etc/mlnx/fw-SPC.mfa lrwxrwxrwx 1 root root 66 Feb 8 17:57 /tmp/image-fw-new-loc.0-dirty-20230208.193534-fs/etc/mlnx/fw-SPC.mfa -> /host/image-fw-new-loc.0-dirty-20230208.193534/platform/fw-SPC.mfa ``` Signed-off-by: Stepan Blyschak <[email protected]>
nazariig
suggested changes
Feb 16, 2023
platform/mellanox/mlnx-fw-upgrade.j2
Outdated
|
|
||
| # /host/image-<version>/platform/fw/asic is now the new location for FW binaries. | ||
| # Prefere this path and if it does not exist use squashfs as a fallback. | ||
| local -r _NEXT_IMAGE_FW_BIN_PATH="/host/image-${_NEXT_SONIC_IMAGE#SONiC-OS-}/platform/fw/asic/" |
There was a problem hiding this comment.
@stepanblyschak please move this under if condition and rename: _NEXT_IMAGE_FW_BIN_PATH -> _FW_BIN_PATH
Owner
Author
There was a problem hiding this comment.
The _NEXT_IMAGE_FW_BIN_PATH is used in the if statement. _NEXT_IMAGE is to distinguish between current and next image locations
| else | ||
| local -r _FS_PATH="/host/image-${_NEXT_SONIC_IMAGE#SONiC-OS-}/fs.squashfs" | ||
| local -r _FS_MOUNTPOINT="/tmp/image-${_NEXT_SONIC_IMAGE#SONiC-OS-}-fs" | ||
| local -r _FW_BIN_PATH="${_FS_MOUNTPOINT}/etc/mlnx/" |
There was a problem hiding this comment.
@stepanblyschak do we really need a trailing slash here? The same for above ...
Owner
Author
There was a problem hiding this comment.
I prefer trailing slash to indicate it is a directory
Co-authored-by: Nazarii Hnydyn <[email protected]>
Signed-off-by: Stepan Blyschak <[email protected]>
nazariig
approved these changes
Feb 16, 2023
stepanblyschak
pushed a commit
that referenced
this pull request
Sep 24, 2025
…e latest HEAD automatically (sonic-net#23949) #### Why I did it src/wpasupplicant/sonic-wpa-supplicant ``` * fff91558d - (HEAD -> master, origin/master, origin/HEAD) HOSTPAD driver changes for PAC (#91) (18 hours ago) [Vijaya Kumar Abbaraju] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upgrade from old image always requires squashfs mount to get the next image FW binary. This can be avoided if we put FW binary under platform directory which is easily accessible after installation:
Signed-off-by: Stepan Blyschak [email protected]
Why I did it
202211 and above uses different squashfs compression type that 201911 kernel can not handle. Therefore, we avoid mounting squashfs altogather with this change.
How I did it
How to verify it
Which release branch to backport (provide reason below if selected)
Description for the changelog
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)