Skip to content

platform/surface: omit duplicate SP11 SAM power supplies - #90

Draft
ooaklee wants to merge 2 commits into
jglathe:jg/ubuntu-qcom-x1e-7.2.yfrom
ooaklee:x/sp11-battery-provider
Draft

platform/surface: omit duplicate SP11 SAM power supplies#90
ooaklee wants to merge 2 commits into
jglathe:jg/ubuntu-qcom-x1e-7.2.yfrom
ooaklee:x/sp11-battery-provider

Conversation

@ooaklee

@ooaklee ooaklee commented Sep 1, 2026

Copy link
Copy Markdown

Summary

  • keep Qualcomm battmgr as the authoritative Surface Pro 11 battery and mains provider
  • omit the duplicate Surface Aggregator Module battery and AC-adapter nodes from the Denali registry group
  • preserve the original battery extraction as a Justin White-authored commit and carry the AC correction separately under Leon's authorship

Dependency and status

This PR targets jg/ubuntu-qcom-x1e-7.2.y directly and follows the split audio topics in review order:

There is no code dependency on #89. The two-commit branch is based directly on the release branch and does not merge #89, any other prerequisite head, the broad -sp11 staging branch, or the correction merged through #81.

  • base: 032e174490d2ede881771cb368e86540b3a8818b
  • head: 688be66e78fd1d04ea49eba86f46d3818f23aec2
  • range: two commits, one file, two deletions

This PR is a draft until the exact branch has passed the battery/AC and non-SP11 registry checks below.

Containment

  • the registry-only change affects only the ssam_node_group_sp11 software-node group
  • it removes ssam_node_bat_main and ssam_node_bat_ac
  • the X1E battmgr variant already registers qcom-battmgr-bat and qcom-battmgr-ac, so Denali keeps one kernel provider for each role
  • no shared battery driver, Qualcomm battmgr driver, ACPI path, or other Surface registry group changes
  • systems outside the Surface Pro 11 Denali group retain their existing SAM battery and AC nodes

This follows upstream commit 0488073a6c84, which removes both SAM nodes on Surface Laptop 7 because Qualcomm battmgr otherwise creates duplicate battery and mains power supplies.

Provenance

The first focused commit preserves @kyjus25 (Justin White) as author with his source author date and original Signed-off-by: Justin White <kyjus25@gmail.com>. Leon Silcott's authorized Signed-off-by: Leon Silcott <leon@boasi.io> is appended for the rewritten submission.

That commit links to the original combined touchscreen-and-battery change 3fc7c5249f4a, keeping Justin's contribution visible. The second commit is authored and signed off by Leon and links to the upstream dual-provider precedent; it does not broaden Justin's authored rewrite.

Validation completed at the exact head

  • git diff --check 032e174490d2ede881771cb368e86540b3a8818b..688be66e78fd1d04ea49eba86f46d3818f23aec2: pass
  • strict per-commit checkpatch: 0 errors, 0 warnings, 0 checks on both commits
  • ARM64 ubuntu_x1e_defconfig W=1 build of surface_aggregator_registry.o with 10 jobs: pass
  • exact-diff audit confirms that only the SP11 battery and AC nodes are omitted: pass
  • registry-group audit confirms that every non-SP11 Surface model retains its existing SAM battery and AC nodes: pass
  • public commit/body leakage scan: pass

Hardware checks still required

  • boot this exact branch on both the X1E/OLED and X1P/LCD Surface Pro 11 variants, or keep the untested variant disclosed before ready
  • confirm /sys/class/power_supply/ contains qcom-battmgr-bat and qcom-battmgr-ac but no Denali BAT1 or ADP1
  • verify battery percentage, charge/discharge state, voltage, current, and charge-rate updates
  • connect and disconnect external power repeatedly and verify qcom-battmgr-ac/online and the battery charge state follow it without a second mains interface
  • verify suspend/resume and reboot do not reintroduce duplicate battery devices or stale power-supply state
  • exercise a non-SP11 Surface that uses the SAM battery node and confirm its battery and AC devices remain present

kyjus25 and others added 2 commits August 31, 2026 22:18
Qualcomm battmgr is the authoritative battery provider on the Surface
Pro 11. Do not instantiate the primary Surface Aggregator Module battery
device in the Denali-specific software-node group, avoiding a duplicate
battery provider without adding a machine quirk to the shared driver.

Keep the separate SAM AC-adapter node registered. This extracts and
narrows the Denali battery fix from the original combined touchscreen and
battery commit.

Link: 3fc7c52
Signed-off-by: Justin White <kyjus25@gmail.com>
Signed-off-by: Leon Silcott <leon@boasi.io>
The X1E Qualcomm battery manager registers qcom-battmgr-ac as the
authoritative mains supply. Retaining the Surface Aggregator ADP1 node
creates a second mains interface for the same Denali power source.

Follow the upstream Surface Laptop 7 precedent and omit the SAM AC node
from the Denali-only registry group. Keep this correction separate from
the Justin White battery-node extraction so its original authorship and
sign-off remain intact.

Link: torvalds@0488073
Signed-off-by: Leon Silcott <leon@boasi.io>
@ooaklee ooaklee changed the title platform/surface: registry: omit SP11 SAM battery node platform/surface: omit duplicate SP11 SAM power supplies Sep 1, 2026
ooaklee added a commit to ooaklee/linux_ms_dev_kit-sp11 that referenced this pull request Sep 1, 2026
Integrate jglathe#90 as the prerequisite for the SP11 platform-profile topic.
ooaklee added a commit to ooaklee/linux_ms_dev_kit-sp11 that referenced this pull request Sep 1, 2026
Integrate jglathe#91 for combined SP11 testing.

Resolve the jglathe#90 prerequisite overlap by retaining the Denali-scoped battery-provider omissions alongside the profile and fan nodes.

Signed-off-by: Leon Silcott <leon@boasi.io>
@jglathe
jglathe force-pushed the jg/ubuntu-qcom-x1e-7.2.y branch from 87bcf07 to 4943ee7 Compare September 3, 2026 10:32
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