From 9e282abf7b31e497213b2bccc1a397edd2ebfc89 Mon Sep 17 00:00:00 2001 From: William Tsai Date: Thu, 16 Apr 2026 11:11:58 -0700 Subject: [PATCH] Add nvidia_aspeed_bmc marker Introduce a `nvidia_aspeed_bmc` marker block in two locations: * patches-sonic/series * config.local/arm64/config.sonic-aspeed The marker delimits a region that the NVIDIA/Mellanox hw-mgmt integration scripts in sonic-buildimage own. The scripts use the markers to insert BMC-only kernel patches and Kconfig fragments for ASPEED BMCs (e.g. AST2700) without colliding with the existing `mellanox_hw_mgmt` block, and to clean stale BMC content from previous integration runs. The consumer of this marker is sonic-buildimage PR #27038 ("Add ASPEED BMC support to hw-mgmt integration scripts"), which extends platform/mellanox/integration-scripts/hwmgmt_kernel_patches.py to: * Look up the `nvidia_aspeed_bmc` markers in patches-sonic/series via `find_marker_indices` and rebuild the block from a BMC-only patch list on every integration run. * Remove old BMC patch files from patches-sonic/ that fall between the markers, then copy the new BMC patches in. * Apply BMC Kconfig fragments to config.local/arm64/config.sonic-aspeed using the same marker pair. The block is populated only when an hw-mgmt integration run produces BMC content. The upstream hw-mgmt repository is at https://github.com/Mellanox/hw-mgmt Signed-off-by: William Tsai --- config.local/arm64/config.sonic-aspeed | 3 +++ patches-sonic/series | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config.local/arm64/config.sonic-aspeed b/config.local/arm64/config.sonic-aspeed index 4427f8fd6..bfd866811 100644 --- a/config.local/arm64/config.sonic-aspeed +++ b/config.local/arm64/config.sonic-aspeed @@ -105,3 +105,6 @@ CONFIG_CRYPTO_DEV_ASPEED=y # CONFIG_CRYPTO_DEV_ASPEED_RSSS is not set # CONFIG_CRYPTO_DEV_ASPEED_ECDSA is not set +###-> nvidia_aspeed_bmc-start +###-> nvidia_aspeed_bmc-end + diff --git a/patches-sonic/series b/patches-sonic/series index b84d84667..1442388f9 100644 --- a/patches-sonic/series +++ b/patches-sonic/series @@ -235,6 +235,9 @@ nexthop-b27-dts.patch 0001-Add-device-tree-for-Nokia-BMC-H6-128-platform.patch ###-> aspeed-end +###-> nvidia_aspeed_bmc-start +###-> nvidia_aspeed_bmc-end + # QID-45097: Crackarmor fixes qsa-2026-apparmor/0001-apparmor-validate-DFA-start-states-are-in-bounds-in-.patch qsa-2026-apparmor/0002-apparmor-fix-memory-leak-in-verify_header.patch