Skip to content

Chander.linux 6.12.94 update - #601

Closed
chander-nexthop wants to merge 8 commits into
sonic-net:masterfrom
nexthop-ai:chander.linux-6.12.94-update
Closed

Chander.linux 6.12.94 update#601
chander-nexthop wants to merge 8 commits into
sonic-net:masterfrom
nexthop-ai:chander.linux-6.12.94-update

Conversation

@chander-nexthop

Copy link
Copy Markdown
Contributor

No description provided.

Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
@chander-nexthop
chander-nexthop requested a review from a team as a code owner July 17, 2026 10:28
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

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

@azure-pipelines

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

@chander-nexthop
chander-nexthop marked this pull request as draft July 17, 2026 10:29
Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

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

…for the Aspeed kernel 6.12

Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

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

@tirupatihemanth

tirupatihemanth commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Hi @chander-nexthop is this planned to be merged to @saiarcot895's 6.12.94 branch ?

@chander-nexthop

chander-nexthop commented Sep 2, 2026 via email

Copy link
Copy Markdown
Contributor Author

@tirupatihemanth

tirupatihemanth commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

@chander-nexthop can you please help rebase these changes on top of latest saikrishna's changes so that I can verify them for nvidia bmc ?

Also when do you plan to get this merged to saikrishna's branch?

@chander-nexthop

chander-nexthop commented Sep 2, 2026 via email

Copy link
Copy Markdown
Contributor Author

… patches

Integrate 13 commits from master (incl. q54sj108a2 upstream changes) and
regenerate Aspeed AST2700 support against pristine 6.12.94 using tag v00.07.04.

Aspeed baseline reset:
- Rename aspeed-ast2700-support.patch -> 0001-aspeed-ast2700-support.patch
  (regenerated full platform diff on 6.12.94 / v00.07.04).
- Add Rule-B split: 0002 (non-aspeed new-file deps) and
  0003 (shared-kernel changes) for 6.12.94-00.07.04.
- Refresh series: v7.04 split block; drop MMC patches now subsumed by the
  vendor tag; keep aspeed-spi-txrx-fix-full-duplex-capture.patch after the
  upstream block; nvidia_aspeed_bmc and int0002 remain commented out.

Toolchain:
- generate-aspeed-patch.sh: add --baseline (skip aspeed-upstream apply for a
  full patch on kernel-version bumps) and --help.
- Add split-aspeed-patch.py: parameterized Rule-B splitter (0001/0002/0003)
  reusable for future kernel-version changes.

Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

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

Two patches in patches-sonic/series failed to apply with strict
(--fuzz=0) context matching after the 6.12.94 kernel bump and the
Aspeed base regeneration. Both are context-only realignments; the
functional intent of each patch is unchanged.

driver-arista-pci-clear-aer-error-on-recovery-failure.patch:
  pcie_do_recovery()'s failure path was refactored upstream, replacing
  the trailing pci_uevent_ers(bridge, PCI_ERS_RESULT_DISCONNECT) call
  with pci_walk_bridge(bridge, report_perm_failure_detected, NULL).
  Update Hunk sonic-net#2's trailing context to match; the inserted
  enable_aer_clear_on_recovery_failure block still lands after failed:.

aspeed-spi-txrx-fix-full-duplex-capture.patch:
  The regenerated Aspeed base now selects the RX IO mode from the
  per-transfer xfer->rx_nbits instead of spi->mode. Update Hunk sonic-net#2's
  trailing context (spi->mode & SPI_RX_DUAL ->
  xfer->rx_nbits == SPI_NBITS_DUAL); the changed guard line is unchanged.

Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
@mssonicbld

Copy link
Copy Markdown

/azp run

@azure-pipelines

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

@chander-nexthop

Copy link
Copy Markdown
Contributor Author

@saiarcot895 and @tirupatihemanth Please have a look at saiarcot895#28

saiarcot895 pushed a commit to saiarcot895/sonic-linux-kernel that referenced this pull request Sep 10, 2026
Bring in changes from sonic-net#601

- Aspeed AST2700 patch regeneration to Aspeed tag v7.04 (shared-kernel
  and non-aspeed dependency splits updated to 6.12.94-00.07.04),
  additional SPC6 BMC DTS, ftgmac100 SGMII, and USB EHCI AST2700 patches.
- HW-MGMT 7.0070.1013 integration and associated BMC Kconfig enablement.
- Nexthop B27 / Nokia H6-128 DTS updates and Arista Goldfinch DTS refresh.
- New PMBus device support (Delta Q54SN120A1/Q54SW120A7, Renesas RAA2289).
- Aspeed patch-generation tooling: aspeed_content_scan.py,
  split-aspeed-patch.py, and reworked generate-aspeed-patch.sh.
- Context-only rebases of the Arista AER and Aspeed SPI full-duplex
  patches so the full series applies cleanly on 6.12.94.
- config.local: enable CONFIG_NCSI_OEM_CMD_KEEP_PHY, WATCHDOG_HANDLE_
  BOOT_ENABLED, MTD_PHRAM, and SENSORS_Q54SJ108A2.

Signed-off-by: Chandrasekaran Swaminathan <chander@nexthop.ai>
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@saiarcot895

Copy link
Copy Markdown
Contributor

Incorporated into #596

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.

4 participants