[202608] Resolve kernel code-sync conflicts for 288cc3645d5d - #76
Open
mssonicbld wants to merge 2 commits into
Open
[202608] Resolve kernel code-sync conflicts for 288cc3645d5d#76mssonicbld wants to merge 2 commits into
mssonicbld wants to merge 2 commits into
Conversation
* Integrate HW-MGMT 7.0070.1013 patches
Update the SONiC kernel patch stack on the 202605 branch from HW-MGMT
7.0060.1002 to 7.0070.1013. This branch was several versions behind, so
the series covers 7.0060.1047, 7.0070.1004 and 7.0070.1013.
Added patches:
* 0060-leds-mlxreg-Provide-conversion-for-hardware-LED-colo.patch:
report the correct LED colour in sysfs while the LED is still driven
by hardware.
* 0060-platform-mellanox-nvsw-bmc-Downstream-Add-protection.patch:
only allow the current owner (CPU or BMC) to set the I2C mux, so I2C
traffic is not cut off.
* 0061-platform-mellanox-mlxreg-io-Increase-max-supported-a.patch:
raise the maximum number of mlxreg-io attributes from 128 to 250 for
newer platforms.
* 0062-Add-support-for-NXP-s-PCF85053A-RTC-chip.patch:
add a driver for the NXP PCF85053A I2C real-time clock.
* 0063-reset-phy-using-polling-function-not-register-write.patch:
reset the Realtek PHY by polling until the reset completes instead of
writing the reset bit and continuing, which caused intermittent
initialisation failures.
* 0064-hwmon-pmbus-isl68137-Add-support-for-Renesas-RAA2289.patch:
add the I2C device IDs for the Renesas RAA228942 and RAA228943
regulators.
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):
* 0001-mctp-driver-net-Extend-MCTP-support.patch:
add further MCTP transports together with tracepoints, transport
statistics and error-injection test helpers.
* 0002-mctp-aspeed-IRoT-Add-initial-support.patch:
add an MCTP transport over the hardware mailbox on Aspeed AST27xx.
* 0003-mctp-driver-net-Add-global-APIs-for-MCTP.patch:
export the MCTP tracepoints so transport drivers can be built as
loadable modules.
* 0004-mctp-driver-net-Fix-MCTP-over-VDM-PCIe.patch:
add the missing module metadata and use IS_ENABLED() so the VDM/PCIe
transport works when built as a module.
* 0005-mctp-driver-net-Fix-MCTP-over-USB.patch:
account TX errors that cannot be attributed to a single destination
EID separately, and add the f_mctp USB gadget function.
* 0006-jtag-Add-JTAG-core-headers-GPIO-mux-and-locking-support.patch:
add the JTAG core headers, GPIO mux control, single-open locking and
the Aspeed internal JTAG driver.
* 0007-JTAG-Aspeed-Fix-kernel-configuration.patch:
source drivers/jtag/Kconfig from drivers/Kconfig and build
drivers/jtag/ on CONFIG_JTAG, so the JTAG options are selectable and
actually compiled.
* 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>
* Enable BMC Kconfig for sonic-aspeed (HW-MGMT 7.0070.1013)
Populate the nvidia_aspeed_bmc block in
config.local/arm64/config.sonic-aspeed with the 86 options required by
the BMC patches added in this series. The 202605 branch did not carry
this block yet, so the change is purely additive.
The options cover the MCTP stack and its I2C, I3C and IRoT transports;
JTAG; the Aspeed AST2700 platform (clocks, mailbox, eSPI, LPC snoop,
SGPIO, UART routing, USB and SPI); networking (FTGMAC100, Realtek PHY,
fixed-PHY settings and the USB gadget ethernet functions); sensors
(ADT7475, SBTSI, SBRMI, EMC1403, LM25066, MP2855, MP2888, MP2975 and the
mlxreg fan driver); platform drivers (mlxreg-io, hotplug, LEDs, watchdog
and the BMC HID driver); the PCF85053A RTC added by 0062; the I2C and
I3C controllers and muxes; and MTD phram backing the U-Boot environment
reserved by 0008.
Signed-off-by: Daniel Isakov <disakov@nvidia.com>
* Remove duplicate options from the sonic-aspeed BMC Kconfig block
Eight of the options added to the nvidia_aspeed_bmc block in
config.local/arm64/config.sonic-aspeed are already set to the same value
earlier in the same file: CONFIG_MCTP, CONFIG_SPI_ASPEED_TXRX,
CONFIG_ASPEED_MCTP, CONFIG_COMMON_CLK_AST2700, CONFIG_GPIO_ASPEED_SGPIO,
CONFIG_ASPEED_LPC_SNOOP, CONFIG_AST2700_ESPI and
CONFIG_ASPEED_UART_ROUTING.
Drop the repeated entries. All eight options stay enabled, so the
resulting kernel configuration is unchanged.
Signed-off-by: Daniel Isakov <disakov@nvidia.com>
* Address review: move CONFIG_MODVERSIONS out of the BMC block, drop FAT options
CONFIG_MODVERSIONS is not BMC specific, so move it out of the
nvidia_aspeed_bmc block into the common part of the file.
CONFIG_MSDOS_FS and CONFIG_FAT_DEFAULT_UTF8 are not needed by the BMC
stack, so remove them.
Signed-off-by: Daniel Isakov <disakov@nvidia.com>
---------
Signed-off-by: Daniel Isakov <disakov@nvidia.com>
Merge sonic-net/sonic-linux-kernel at 288cc36 into the Azure 202608 history starting at ae70a31. Preserve Azure Aspeed 6.12-00.07.02, MMC, Micas and filesystem configuration changes while integrating the incoming BMC fixes and ordered DTS, network, USB and Renesas patches. Honor the removed bootctl constification patch and align HID181/HID191 event masks with their data arrays. Work item: https://dev.azure.com/msazure/One/_workitems/edit/39560341 Complete the repair PR with merge/no-fast-forward, not squash or rebase, to retain the exact source ancestry. Signed-off-by: Elastictest AI Worker <sonicbld@microsoft.com>
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.
Resolves work item 39560341, reported by the code-sync pipeline.
Exact-source provenance
202608, starting at ae70a319ba19202605, exact requested commit 288cc3645d5dThe live submodule-sync policy maps Azure
202608to public202605;codesync.jsonincludessrc/sonic-linux-kernel. Only the requested immutable source was merged, not a newer branch tip. This repairs the child repository; no buildimage gitlink is changed.Before publication,
HEADwas the recorded Azure starting commit andMERGE_HEADwas the exact source commit. Trusted publication produced the repair above, and the local reflog recordscommit (merge)from the recorded target.Conflict resolutions
CONFIG_MTD_PHRAM; retain Azure NCSI PHY handling, MSDOS and UTF-8 FAT settings; remove only redundant equal-valued definitions already enabled earlier in the fragment.patches-sonic/0001-mlxbf-bootctl-Constify-struct-bin_attribute.patch. It is absent from the exact source and unreferenced by the merged series.0046: integrate holder events, matching masks, the HID191 thermtrip-register correction and non-sticky temperature handling while retaining target kernel contexts. Keep the moved HID191 VR1 item exactly once. Also fix a marker-free HID181 merge mismatch: its seven-entry event array requires the source's bits 0-6 mask, not the five-bit target mask. Reconcile the unified-diff counts to 7,304 BMC lines and 10,916 total insertions.0008-0012after their prerequisites and Renesas patch0064; do not duplicate the Aspeed/NVIDIA blocks or restore obsolete filenames.Validation and limits
Static review accounted for all four conflict paths, found no remaining conflict markers, confirmed files for all 221 enabled series entries, checked new-file hunk lengths and insertion totals, and checked event-mask/data consistency and relevant adjacent patch contexts.
This worker has no command runner. Full patch-series application to Linux 6.12.41, kernel/DTB compilation and runtime tests were not executed. Normal kernel CI, including the affected arm64 Aspeed configuration, must run before merge; static inspection does not prove full series applicability.
Merge requirement
Complete with a merge commit/no-fast-forward. Do not squash or rebase: those methods can discard the exact source ancestry needed by code sync. Auto-complete has not been enabled.