Skip to content

Integrate HW-MGMT Version 7.0060.1047#584

Open
DannyIsa wants to merge 3 commits into
sonic-net:masterfrom
DannyIsa:master_d58f058_integrate_7.0060.1047_2026-05-31
Open

Integrate HW-MGMT Version 7.0060.1047#584
DannyIsa wants to merge 3 commits into
sonic-net:masterfrom
DannyIsa:master_d58f058_integrate_7.0060.1047_2026-05-31

Conversation

@DannyIsa

@DannyIsa DannyIsa commented May 31, 2026

Copy link
Copy Markdown

Why I did it

Integrate HW-MGMT 7.0060.1047 changes into the SONiC kernel.

What's in this PR

Commit 1 — Integrate HW-MGMT 7.0060.1047 patches
Adds the new kernel patches that come with this HW-MGMT version:

  • 0060-leds-mlxreg...: show the correct LED color in sysfs when the LED is still controlled by hardware.
  • 0060-platform-mellanox-nvsw-bmc-Downstream-Add-protection...: only let the current owner (CPU or BMC) set the I2C mux, so we don't cut off I2C traffic.
  • 0061-platform-mellanox-mlxreg-io-Increase-max...: raise the max number of mlxreg-io attributes from 128 to 250 for newer platforms.
  • 0062-Add-support-for-NXP-s-PCF85053A-RTC-chip...: add a driver for the NXP PCF85053A RTC chip.
  • 0063-reset-phy-using-polling...: reset the Realtek PHY by polling until it's done instead of just writing a register, fixing random init failures.

BMC patches (for sonic-aspeed):

  • 0001-mctp-driver-net-Extend-MCTP-support...: add new MCTP transports (SPI, NVIDIA OP-TEE VRoT) plus tracepoints, stats and test helpers.
  • 0002-mctp-aspeed-IRoT-Add-initial-support...: add NVIDIA IRoT support on Aspeed AST27xx as an MCTP transport over the HW mailbox.
  • 0003-mctp-driver-net-Add-global-APIs...: export MCTP tracepoints so transport drivers can be built as modules.
  • 0004-mctp-driver-net-Fix-MCTP-over-VDM-PCIe...: fix MCTP over VDM/PCIe so it works when built as a module.
  • 0005-mctp-driver-net-Fix-MCTP-over-USB...: fix MCTP over USB error counting and add the f_mctp USB gadget.
  • 0006-jtag-Add-JTAG-core-headers...: add JTAG core headers, GPIO mux control, single-open locking and the Aspeed internal JTAG driver.
  • 0007-JTAG-Aspeed-Fix-kernel-configuration...: wire JTAG into the kernel build so its options show up and get compiled.

Note: several patches are marked Upstream-Status: Pending (not upstreamed yet).

Commit 2 — Enable BMC Kconfig for sonic-aspeed
Turns on the kernel config options needed by the BMC patches above (MCTP transports, IRoT and JTAG) in config.sonic-aspeed.

Commit 3 — Update patch commit descriptions
Cleanup only: fill in / fix the description text of the patches. No code changes.

Signed-off-by: Daniel Isakov disakov@nvidia.com

@DannyIsa DannyIsa marked this pull request as ready for review May 31, 2026 08:37
@DannyIsa DannyIsa requested a review from a team as a code owner May 31, 2026 08:37
abelamit
abelamit previously approved these changes May 31, 2026
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@paulmenzel paulmenzel left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the merge/pull requests. Some notes:

Bots cannot sign off anything. Please avoid this:

Signed-off-by: sw-r2d2-bot sw-r2d2-bot@nvidia.com

Additionally, it’d be great if the upstream status of the commits could be more clear. I assume they have been sent for review. Could you maybe add the URLs of lore.kernel.org?

Comment thread config.local/arm64/config.sonic-aspeed

From 9f11c71d770ea5a66ef3a4e6bea134aaaf62adaa Mon Sep 17 00:00:00 2001
From: Aaron Komisar <akomisar@nvidia.com>
Date: Thu, 28 Aug 2025 20:57:42 +0300

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the upstream status really pending?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those patches are not up-streamed and are not sent for review, so marked as pending.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange over half a year later.

@DannyIsa DannyIsa force-pushed the master_d58f058_integrate_7.0060.1047_2026-05-31 branch from de20d0d to e9de66b Compare June 1, 2026 17:42
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

DannyIsa added 2 commits June 2, 2026 14:25
These patches are not yet upstreamed and have not been sent for review,
hence marked Upstream-Status: Pending.

Signed-off-by: Daniel Isakov <disakov@nvidia.com>
Signed-off-by: Daniel Isakov <disakov@nvidia.com>
@DannyIsa DannyIsa force-pushed the master_d58f058_integrate_7.0060.1047_2026-05-31 branch from e9de66b to aa30808 Compare June 2, 2026 11:26
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@DannyIsa DannyIsa requested a review from paulmenzel June 2, 2026 11:28
@DannyIsa

DannyIsa commented Jun 3, 2026

Copy link
Copy Markdown
Author

@paulmenzel

Could you maybe add the URLs of lore.kernel.org?

All these patches were not sent for review yet.

@paulmenzel paulmenzel left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some more comments. Feel free to mark them as resolved.

Comment thread patches-sonic/0007-JTAG-Aspeed-Fix-kernel-configuration.patch Outdated
Comment thread config.local/arm64/config.sonic-aspeed
Comment thread patches-sonic/0004-mctp-driver-net-Fix-MCTP-over-VDM-PCIe.patch Outdated
Comment thread patches-sonic/0063-reset-phy-using-polling-function-not-register-write.patch Outdated
Comment thread patches-sonic/0063-reset-phy-using-polling-function-not-register-write.patch Outdated
return 0;
}

+#ifdef CONFIG_RTL_RGMII_SGMII_3809

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use if in C and not preprocessor?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a workaround patch that we don't plan to upstream, which is exactly why it's gated behind #ifdef CONFIG_RTL_RGMII_SGMII_3809 , the same code already ships in our OpenBMC tree.

Signed-off-by: Daniel Isakov <disakov@nvidia.com>
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@DannyIsa DannyIsa requested a review from paulmenzel June 8, 2026 10:10
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.

5 participants