Enable i2c-xiic and add upstream patches by domingo-nexthop · Pull Request #564 · sonic-net/sonic-linux-kernel

domingo-nexthop · 2026-04-21T21:20:53Z

Include the i2c-xiic driver and backport kernel patches from linux 7.0.

Patches added (in series order, each cherry-picked from upstream;
v6.12.41 lacks 73db799bf5ef so 0001 is needed by 0010 and 0013):

0001-PM-runtime-Add-new-devm-functions.patch
(stable 69a837b75edc / mainline 73db799bf5ef, in v6.12.55+)
Adds devm_pm_runtime_set_active_enabled() and
devm_pm_runtime_get_noresume().
Link: https://lore.kernel.org/r/20250327195928.680771-3-csokas.bence@prolan.hu
0007-i2c-xiic-Relocate-xiic_i2c_runtime_suspend-and-xiic_.patch
Link: https://lore.kernel.org/r/20241210095242.1982770-2-manikanta.guntupalli@amd.com
0008-i2c-xiic-Add-atomic-transfer-support.patch
Link: https://lore.kernel.org/r/20241210095242.1982770-3-manikanta.guntupalli@amd.com
0009-i2c-i2c-xiic-Replace-dev_err-with-dev_err_probe-in-p.patch
Link: https://lore.kernel.org/r/20250415183447.396277-10-e.zanda1@gmail.com
0010-i2c-xiic-switch-to-devres-managed-APIs.patch
Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-1-b6c9ce4e4f3c@nexthop.ai
0011-i2c-xiic-remove-duplicate-error-message.patch
Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-2-b6c9ce4e4f3c@nexthop.ai
0012-i2c-xiic-switch-to-generic-device-property-accessors.patch
Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-3-b6c9ce4e4f3c@nexthop.ai
0013-i2c-xiic-cosmetic-cleanup.patch
Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-4-b6c9ce4e4f3c@nexthop.ai
0014-i2c-xiic-cosmetic-use-resource-format-specifier-in-d.patch
Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-5-b6c9ce4e4f3c@nexthop.ai
0015-i2c-xiic-use-numbered-adapter-registration.patch
Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-6-b6c9ce4e4f3c@nexthop.ai
0016-i2c-xiic-skip-input-clock-setup-on-non-OF-systems.patch
Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-7-b6c9ce4e4f3c@nexthop.ai

Resolves sonic-net/sonic-linux-kernel#543

Resolves sonic-net/sonic-linux-kernel#544

mssonicbld · 2026-04-21T21:21:01Z

/azp run

azure-pipelines · 2026-04-21T21:21:10Z

Azure Pipelines successfully started running 1 pipeline(s).

paulmenzel

I think the description of the merge/pull request is not copied when submitting, so please add the text to the commit, and also use the full name in the Signed-off-by line there.

Lastly, instead of the tag Fixes, please use Resolves: when referencing issues.

paulmenzel · 2026-04-22T06:25:34Z

@@ -0,0 +1,107 @@
+From d1520f927851bb76f562d2fd1067acc55179e866 Mon Sep 17 00:00:00 2001


No idea, how to do it with b4, but as the patches are in Linus’ branch master, please generate the patches from this, so the upstream commit hashes are used. The command below should do the trick:

git format-patch -7 dd0422eb1566a823587ede7780aef9c9c7a45b04

Thanks. I updated the commit hashes of the patch files. Note that the patches come from master and so won't apply cleanly to the 6.12 sonic-linux-kernel. They are a bit different and won't match master exactly, despite the same commit hashes.

Applying patch 0001-i2c-xiic-switch-to-devres-managed-APIs.patch 4 out of 7 hunks FAILED Patch 0001-i2c-xiic-switch-to-devres-managed-APIs.patch does not apply (enforce with -f)

Ah good observation. No idea, if this will cause more confusion later on compared to just having the commit hash in the commit message body. @saiarcot895, what do you think?

I'm fine with having the master branch commit hash either in the From line or in the commit body. When checking if a patch has been upstreamed, I'll use whatever's available.

mssonicbld · 2026-04-26T00:00:12Z

/azp run

mssonicbld · 2026-04-26T00:00:28Z

/azp run

azure-pipelines · 2026-04-26T00:01:06Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

azure-pipelines · 2026-04-26T00:01:12Z

Azure Pipelines successfully started running 1 pipeline(s).

domingo-nexthop · 2026-04-26T00:02:17Z

Regarding the commit message, I will update the commit message before squash merge

mssonicbld · 2026-04-26T00:05:16Z

/azp run

azure-pipelines · 2026-04-26T00:05:24Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-26T00:06:00Z

/azp run

azure-pipelines · 2026-04-26T00:06:10Z

Azure Pipelines successfully started running 1 pipeline(s).

domingo-nexthop · 2026-04-26T00:06:17Z

I updated the commit message and the sign-off line. Thank you!

mssonicbld · 2026-04-26T00:07:29Z

/azp run

azure-pipelines · 2026-04-26T00:07:38Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-04-26T00:26:02Z

/azp run

azure-pipelines · 2026-04-26T00:26:11Z

Azure Pipelines successfully started running 1 pipeline(s).

domingo-nexthop · 2026-04-26T00:38:18Z

Hi @saiarcot895 would you be able to review this change too? Thank you in advance.

paulmenzel

Too improve it even more, you could also put possibly new Linux log messages to the sonic-linux-kernel commit message, or document some commands how to verify that the i2c-xiic device works properly.

Anyway, for me this looks good, and @saiarcot895 needs to decide how to handle the upstream commit hashes.

In my opinion, these patches should also go into the stable series as it fixes a hardware quirk, but the cosmetic improvement patches might raise objections. (The reality also contradicts the document a little in my experience.) Anyway, you could ask Andy and Greg, what they think.

linux-foundation-easycla · 2026-05-01T20:17:50Z

The committers listed above are authorized under a signed CLA.

✅ login: domingo-nexthop / name: domingo-nexthop (1fa5bea, 8bc8857, d4e342b)

mssonicbld · 2026-05-01T20:18:07Z

/azp run

azure-pipelines · 2026-05-01T20:18:17Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-05-01T20:21:03Z

/azp run

azure-pipelines · 2026-05-01T20:21:12Z

Azure Pipelines successfully started running 1 pipeline(s).

Cherry-pick the i2c-xiic upstream patches and pull in the one PM-runtime devm helper they depend on, since v6.12.41 predates it. Patches added (in series order, each cherry-picked from upstream; v6.12.41 lacks 73db799bf5ef so 0006 is needed by 0010 and 0013): - 0006-PM-runtime-Add-new-devm-functions.patch (stable 69a837b75edc / mainline 73db799bf5ef, in v6.12.55+) Adds devm_pm_runtime_set_active_enabled() and devm_pm_runtime_get_noresume(). Link: https://lore.kernel.org/r/20250327195928.680771-3-csokas.bence@prolan.hu - 0007-i2c-xiic-Relocate-xiic_i2c_runtime_suspend-and-xiic_.patch Link: https://lore.kernel.org/r/20241210095242.1982770-2-manikanta.guntupalli@amd.com - 0008-i2c-xiic-Add-atomic-transfer-support.patch Link: https://lore.kernel.org/r/20241210095242.1982770-3-manikanta.guntupalli@amd.com - 0009-i2c-i2c-xiic-Replace-dev_err-with-dev_err_probe-in-p.patch Link: https://lore.kernel.org/r/20250415183447.396277-10-e.zanda1@gmail.com - 0010-i2c-xiic-switch-to-devres-managed-APIs.patch Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-1-b6c9ce4e4f3c@nexthop.ai - 0011-i2c-xiic-remove-duplicate-error-message.patch Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-2-b6c9ce4e4f3c@nexthop.ai - 0012-i2c-xiic-switch-to-generic-device-property-accessors.patch Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-3-b6c9ce4e4f3c@nexthop.ai - 0013-i2c-xiic-cosmetic-cleanup.patch Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-4-b6c9ce4e4f3c@nexthop.ai - 0014-i2c-xiic-cosmetic-use-resource-format-specifier-in-d.patch Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-5-b6c9ce4e4f3c@nexthop.ai - 0015-i2c-xiic-use-numbered-adapter-registration.patch Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-6-b6c9ce4e4f3c@nexthop.ai - 0016-i2c-xiic-skip-input-clock-setup-on-non-OF-systems.patch Link: https://lore.kernel.org/r/20260223-i2c-xiic-v12-7-b6c9ce4e4f3c@nexthop.ai Also enable CONFIG_I2C_XILINX=m in config.local/amd64/config.sonic so the driver is actually built into the SONIC kernel. Resolves [sonic-net#543](sonic-net#543) Resolves [sonic-net#544](sonic-net#544) Signed-off-by: domingo-nexthop <domingo@nexthop.ai>

mssonicbld · 2026-05-04T10:41:06Z

/azp run

azure-pipelines · 2026-05-04T10:41:16Z

Azure Pipelines successfully started running 1 pipeline(s).

paulmenzel · 2026-05-04T13:48:59Z

+From a085b9385bfbc6b6887a9fa21f3cd40bd3811b37 Mon Sep 17 00:00:00 2001
+From: Manikanta Guntupalli <manikanta.guntupalli@amd.com>
+Date: Tue, 10 Dec 2024 15:22:41 +0530
+Subject: [PATCH 07/22] i2c: xiic: Relocate xiic_i2c_runtime_suspend and


Having just a subset of a series included, might be confusing, but I won’t object.

paulmenzel

Any new Linux logs from this module, which you could add to the commit message?

mssonicbld · 2026-05-04T14:13:02Z

/azp run

azure-pipelines · 2026-05-04T14:13:12Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>

mssonicbld · 2026-05-04T14:14:56Z

/azp run

azure-pipelines · 2026-05-04T14:15:06Z

Azure Pipelines successfully started running 1 pipeline(s).

domingo-nexthop · 2026-05-04T14:18:08Z

Please see updated PR description. I have added more upstream patches to backport the i2c-xiic driver from 7.0.

mssonicbld · 2026-05-04T21:26:32Z

/azp run

azure-pipelines · 2026-05-04T21:26:42Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>

mssonicbld · 2026-05-04T21:28:25Z

/azp run

azure-pipelines · 2026-05-04T21:28:35Z

Azure Pipelines successfully started running 1 pipeline(s).

domingo-nexthop changed the title ~~add i2c-xiic patches~~ Enable i2c-xiic and add upstream patches Apr 22, 2026

domingo-nexthop marked this pull request as ready for review April 22, 2026 00:09

domingo-nexthop requested a review from a team as a code owner April 22, 2026 00:09

paulmenzel suggested changes Apr 22, 2026

View reviewed changes

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from 375ec17 to 5660848 Compare April 26, 2026 00:00

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from 5660848 to abef9ef Compare April 26, 2026 00:05

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from abef9ef to 144b7dc Compare April 26, 2026 00:05

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from 144b7dc to 95ac758 Compare April 26, 2026 00:07

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from 95ac758 to c5d970e Compare April 26, 2026 00:25

domingo-nexthop requested a review from paulmenzel April 26, 2026 00:28

paulmenzel approved these changes Apr 28, 2026

View reviewed changes

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from c5d970e to d3342f1 Compare May 1, 2026 20:17

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from d3342f1 to d6fc214 Compare May 1, 2026 20:20

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from d6fc214 to 1fa5bea Compare May 4, 2026 10:40

paulmenzel reviewed May 4, 2026

View reviewed changes

rename patch number

8bc8857

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from b07cade to 8bc8857 Compare May 4, 2026 14:14

domingo-nexthop requested a review from saiarcot895 May 4, 2026 14:18

revert whitespace changes

d4e342b

Signed-off-by: domingo-nexthop <domingo@nexthop.ai>

domingo-nexthop force-pushed the domingo.i2c-xiic-patch branch from 4bcb22c to d4e342b Compare May 4, 2026 21:28

		@@ -0,0 +1,107 @@
		From d1520f927851bb76f562d2fd1067acc55179e866 Mon Sep 17 00:00:00 2001

Conversation

domingo-nexthop commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mssonicbld commented Apr 21, 2026

Uh oh!

azure-pipelines Bot commented Apr 21, 2026

Uh oh!

paulmenzel left a comment

Choose a reason for hiding this comment

Uh oh!

paulmenzel Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

domingo-nexthop Apr 26, 2026

Choose a reason for hiding this comment

Uh oh!

paulmenzel Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

saiarcot895 Apr 28, 2026

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Apr 26, 2026

Uh oh!

mssonicbld commented Apr 26, 2026

Uh oh!

azure-pipelines Bot commented Apr 26, 2026

Uh oh!

azure-pipelines Bot commented Apr 26, 2026

Uh oh!

domingo-nexthop commented Apr 26, 2026

Uh oh!

mssonicbld commented Apr 26, 2026

Uh oh!

azure-pipelines Bot commented Apr 26, 2026

Uh oh!

mssonicbld commented Apr 26, 2026

Uh oh!

azure-pipelines Bot commented Apr 26, 2026

Uh oh!

domingo-nexthop commented Apr 26, 2026

Uh oh!

mssonicbld commented Apr 26, 2026

Uh oh!

azure-pipelines Bot commented Apr 26, 2026

Uh oh!

mssonicbld commented Apr 26, 2026

Uh oh!

azure-pipelines Bot commented Apr 26, 2026

Uh oh!

domingo-nexthop commented Apr 26, 2026

Uh oh!

paulmenzel left a comment

Choose a reason for hiding this comment

Uh oh!

linux-foundation-easycla Bot commented May 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mssonicbld commented May 1, 2026

Uh oh!

azure-pipelines Bot commented May 1, 2026

Uh oh!

mssonicbld commented May 1, 2026

Uh oh!

azure-pipelines Bot commented May 1, 2026

Uh oh!

mssonicbld commented May 4, 2026

Uh oh!

azure-pipelines Bot commented May 4, 2026

Uh oh!

paulmenzel May 4, 2026

Choose a reason for hiding this comment

Uh oh!

paulmenzel left a comment

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented May 4, 2026

Uh oh!

azure-pipelines Bot commented May 4, 2026

domingo-nexthop commented Apr 21, 2026 •

edited

Loading

linux-foundation-easycla Bot commented May 1, 2026 •

edited

Loading