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.

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

Add markers to faciliate easy parsing of kconfig-inclusion and series #309

Merged
merged 11 commits into from
Mar 16, 2023

Conversation

vivekrnv
Copy link
Contributor

@vivekrnv vivekrnv commented Mar 11, 2023

What I did it

  • Added markers in the kconfig-inclusion & series files for easy parsing by any automation scripts

…ate mlnx kconfig

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
@vivekrnv
Copy link
Contributor Author

@dgsudharsan @saiarcot895 Please review

@vivekrnv
Copy link
Contributor Author

/azpw run Azure.sonic-linux-kernel

@mssonicbld
Copy link

/AzurePipelines run Azure.sonic-linux-kernel

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
@paulmenzel
Copy link
Contributor

Thank you for the clean-up, and fix. Could you please amend the commit message and write a more elaborate message?

  1. Update the option name to mellanox – Why is the -amd64 suffix unwanted?
  2. Re-org options – According to what goal are the reorganized?

@saiarcot895
Copy link
Contributor

Is there an actual need to have a per-platform kernel? Right now, the kernel is the same whether it's running on a Mellanox, Arista, Dell, or even KVM. I would like to keep that platform independence, and not introduce platform-specific logic here.

@vivekrnv
Copy link
Contributor Author

vivekrnv commented Mar 15, 2023

Is there an actual need to have a per-platform kernel? Right now, the kernel is the same whether it's running on a Mellanox, Arista, Dell, or even KVM. I would like to keep that platform independence, and not introduce platform-specific logic here.

We are developing a script which can automatically update the Kconfig opts based on new mlnx hw-mgmt version. For that to work, we need kconfig options specific to mellanox and thus i've moved them to a separate section.

I suppose other vendors shouldn't be affected by this change, do you foresee any functional impact of this? Besides the logic to include vendor specific options was already present, i've just made some fixes

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
@vivekrnv vivekrnv changed the title [Kconfig] [mlnx] Fix platform specific logic and consolidate mlnx kconfig [Kconfig] Fix platform specific logic and added markers for easy parsing Mar 15, 2023
@vivekrnv vivekrnv requested review from dgsudharsan and removed request for dgsudharsan March 15, 2023 21:50
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
@vivekrnv vivekrnv changed the title [Kconfig] Fix platform specific logic and added markers for easy parsing Add markers to faciliate easy parsing of kconfig and series file Mar 15, 2023
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
@vivekrnv vivekrnv changed the title Add markers to faciliate easy parsing of kconfig and series file Add markers to faciliate easy parsing of kconfig-inclusion and series Mar 15, 2023
@dgsudharsan
Copy link
Collaborator

@saiarcot895 Can you please review?

@saiarcot895 saiarcot895 merged commit 42ad073 into sonic-net:master Mar 16, 2023
@vivekrnv
Copy link
Contributor Author

Request for 202211

@dgsudharsan
Copy link
Collaborator

@StormLiangMS @saiarcot895 Can you please add label for 202211?

vivekrnv added a commit to vivekrnv/sonic-buildimage that referenced this pull request Mar 17, 2023
Update sonic-linux-kernel submodule pointer to include the following:
* 6847319 Read ID register for optoe1 to find pageable bit in optoe driver  ([sonic-net#308](sonic-net/sonic-linux-kernel#308))
* 42ad073 Add markers to faciliate easy parsing of kconfig-inclusion and series ([sonic-net#309](sonic-net/sonic-linux-kernel#309))

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
@dgsudharsan
Copy link
Collaborator

@StormLiangMS Can you please cherry-pick to 202211?

liat-grozovik pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Mar 21, 2023
Update sonic-linux-kernel submodule pointer to include the following:
* 6847319 Read ID register for optoe1 to find pageable bit in optoe driver  ([#308](sonic-net/sonic-linux-kernel#308))
* 42ad073 Add markers to faciliate easy parsing of kconfig-inclusion and series ([#309](sonic-net/sonic-linux-kernel#309))

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
StormLiangMS pushed a commit that referenced this pull request Apr 13, 2023
…#309)

* [Kconfig] [mellanox] Fix platform specific kconfig logic and consolidate mlnx kconfig

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Re-org options

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Include Secure boot cfg

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update the option name to mellanox

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Remove duplicate mlnx options

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Revert kconfig option changes

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Added consistent marker format in the inclusions file

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update markers and description for series file

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Fix in series mlnx sdk marker

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update marker id

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Remove manager-config changes

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

---------

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
vivekrnv added a commit to vivekrnv/sonic-linux-kernel that referenced this pull request May 19, 2023
…sonic-net#309)

* [Kconfig] [mellanox] Fix platform specific kconfig logic and consolidate mlnx kconfig

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Re-org options

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Include Secure boot cfg

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update the option name to mellanox

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Remove duplicate mlnx options

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Revert kconfig option changes

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Added consistent marker format in the inclusions file

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update markers and description for series file

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Fix in series mlnx sdk marker

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update marker id

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Remove manager-config changes

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

---------

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants