Skip to content

Integrate HW-MGMT Version 7.0070.1013 - #610

Draft
DannyIsa wants to merge 2 commits into
sonic-net:masterfrom
DannyIsa:master_6f03cb6_integrate_7.0070.1013_2026-08-12
Draft

Integrate HW-MGMT Version 7.0070.1013#610
DannyIsa wants to merge 2 commits into
sonic-net:masterfrom
DannyIsa:master_6f03cb6_integrate_7.0070.1013_2026-08-12

Conversation

@DannyIsa

@DannyIsa DannyIsa commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Why I did it

Integrate HW-MGMT 7.0070.1013 changes into the SONiC kernel (previous version: 7.0060.1047).

What's in this PR

Commit 1 — Integrate HW-MGMT 7.0070.1013 patches

Adds the new kernel patches that come with this HW-MGMT version:

  • 0064-hwmon-pmbus-isl68137-Add-support-for-Renesas-RAA2289...: add the I2C device IDs for the Renesas RAA228942 and RAA228943 regulators. Already upstream as 7c760db74c9f.
  • 8014-mlxsw-i2c-Downstream-Increase-I2C-timeout-for-HW-sem...: raise the I2C timeout from 5s to 10s. A firmware diagnostic operation can pause the device for around five seconds, which previously produced a spurious "HW semaphore is not released" error even though the device recovers normally.

BMC patches (for sonic-aspeed):

  • 0008-arm64-dts-aspeed-spc6-bmc-ext-phram-env...: in the Aspeed AST2700 BMC device tree, reserve a small phram region so the U-Boot environment survives warm boots, and fix TPM GPIO init, GPIO expander reset and I3C pull-ups.
  • 0009-arm64-dts-aspeed-split-SPC6-BMC-DTS...: build separate SONiC and OpenBMC device trees from the shared BMC DTS. OpenBMC boots its rootfs from SPI via phram; SONiC boots from eMMC and does not. Keeping the OpenBMC ramrofs reservation in the SONiC DTB overlaps the kernel load window and breaks early boot.
  • 0010-net-ftgmac100-hard-reset-mac-for-sgmii...: hard-reset the MAC on SGMII links to clear an RX stall.
  • 0011-arm64-dts-aspeed-spc6-bmc-fix-sgmii-phy-names...: fix the mac2 SGMII phy-names property.
  • 0012-usb-ehci-Add-Aspeed-AST2700-support...: select a 64-bit DMA mask for the AST2700 EHCI controller, which unlike earlier Aspeed SoCs is not limited to 32-bit DMA addressing. Already upstream as 274f2232a94f.

Updated patch:

  • 0046-platform-mellanox-nvsw-bmc-Add-system-control-and-mo...: update the BMC system control and monitoring driver for 7.0070.1013.

Removed patch:

  • 0001-mlxbf-bootctl-Constify-struct-bin_attribute...: no longer part of the HW-MGMT patch set. The change is upstream as 8ba0e61861ab.

Note: apart from 0064 and 0012 above, the patches in this series are downstream platform patches that have not been sent upstream for review, and are marked Upstream-Status: Pending.

Commit 2 — Enable BMC Kconfig for sonic-aspeed

  • CONFIG_MTD_PHRAM=y: required by 0008, which reserves the phram_env region backing /dev/mtd/by-name/phram-env.
  • CONFIG_AST2700_RTC_OVER_ESPI removed: the BMC device tree update in 0009 aliases rtc0 to the external PCF85053A RTC at rtc@6f and moves the Aspeed internal RTC to rtc1.

How I did it

Run make integrate-mlnx-hw-mgmt.

How to verify it

Build an image and run tests from sonic-mgmt.

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

Update the SONiC kernel patch stack from HW-MGMT 7.0060.1047 to
7.0070.1013.

Added patches:

* 0064-hwmon-pmbus-isl68137-Add-support-for-Renesas-RAA2289.patch:
  add the I2C device IDs for the Renesas RAA228942 and RAA228943
  regulators. At the PMBus level these are compatible with the existing
  2-rail non-TC controllers, so no dedicated OF match entries are added.
  Upstream: 7c760db74c9f ("hwmon: (pmbus/isl68137) Add support for
  Renesas RAA228942 and RAA228943")

* 8014-mlxsw-i2c-Downstream-Increase-I2C-timeout-for-HW-sem.patch:
  raise the I2C timeout from 5000 to 10000 ms. A firmware diagnostic
  operation can pause the device for around five seconds, which
  previously produced a spurious "HW semaphore is not released" error
  even though the device recovers normally.

Added BMC patches (sonic-aspeed):

* 0008-arm64-dts-aspeed-spc6-bmc-ext-phram-env-tpm-i3c-pull.patch:
  in the Aspeed AST2700 BMC device tree, reserve a small phram region so
  the U-Boot environment survives warm boots, and fix TPM GPIO init,
  GPIO expander reset and I3C pull-ups.

* 0009-arm64-dts-aspeed-split-SPC6-BMC-DTS-for-SONiC-and-Op.patch:
  build separate SONiC and OpenBMC device trees from the shared BMC DTS.
  OpenBMC boots its rootfs from SPI via phram; SONiC boots from eMMC and
  does not. Keeping the OpenBMC ramrofs reservation in the SONiC DTB
  overlaps the kernel load window and breaks early boot.

* 0010-net-ftgmac100-hard-reset-mac-for-sgmii.patch:
  hard-reset the MAC on SGMII links to clear an RX stall.

* 0011-arm64-dts-aspeed-spc6-bmc-fix-sgmii-phy-names.patch:
  fix the mac2 SGMII phy-names property.

* 0012-usb-ehci-Add-Aspeed-AST2700-support.patch:
  select a 64-bit DMA mask for the AST2700 EHCI controller, which unlike
  earlier Aspeed SoCs is not limited to 32-bit DMA addressing.
  Upstream: 274f2232a94f ("usb: ehci: Add Aspeed AST2700 support")

Updated patches:

* 0046-platform-mellanox-nvsw-bmc-Add-system-control-and-mo.patch:
  update the BMC system control and monitoring driver for 7.0070.1013.

Removed patches:

* 0001-mlxbf-bootctl-Constify-struct-bin_attribute.patch:
  no longer part of the HW-MGMT patch set. The change is upstream as
  8ba0e61861ab ("mlxbf-bootctl: Constify 'struct bin_attribute'").

Signed-off-by: Daniel Isakov <disakov@nvidia.com>
Adjust config.local/arm64/config.sonic-aspeed for the BMC patches added
in this series.

* CONFIG_MTD_PHRAM=y: required by
  0008-arm64-dts-aspeed-spc6-bmc-ext-phram-env-tpm-i3c-pull.patch, which
  reserves the phram_env region backing /dev/mtd/by-name/phram-env.

* CONFIG_AST2700_RTC_OVER_ESPI is removed. The BMC device tree update in
  0009 aliases rtc0 to the external PCF85053A RTC at rtc@6f and moves the
  Aspeed internal RTC to rtc1.

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

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

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

@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants