platform/surface: re-lift SP11 battery-provider containment - #37
Conversation
WITHDRAWN: aggregate qualification candidateDo not install or hardware-test A final-tree comparison against the hardware-qualified This correction supersedes the build notice below; the old results are retained Historical aggregate build record (withdrawn)The held qualification branch
The #37/#38 registry overlap was combined without simplifying either feature: These are historical composition and packaging results, not hardware |
|
Aggregate hardware qualification is tracked in #41 at exact candidate This topic remains draft. A green aggregate build or CI result does not satisfy PR #41 is a test-only aggregate and must close without merge. |
9cc0b14 to
efbd715
Compare
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>
efbd715 to
4eadf8d
Compare
Summary
Keep Qualcomm battmgr as the authoritative battery and mains provider on Surface Pro 11 by omitting duplicate SAM battery and AC nodes.
Containment and provenance
ssam_node_group_sp11changesHistorical pre-sync focused software evidence
At
9cc0b14b6ed7:git diff --check: passubuntu_x1e_defconfigW=1build ofsurface_aggregator_registry.o: passCurrent re-lift verification
The two-commit series was re-lifted unchanged onto current beta bf631f9, producing head 4eadf8d. Ordered stable patch IDs, author identities, and subjects match the pre-sync series, and git range-diff pairs both commits exactly. GitHub CI and a local detached-head rerun of the exact-current-head integration check pass. A fresh case-sensitive ARM64 W=1 build of surface_aggregator_registry.o passes at exact head 4eadf8d and tree e970d92e3744.
Blocking hardware gates
Both SP11 variants must expose only Qualcomm battery/AC providers with live telemetry across plug/unplug, suspend/resume, and reboot. A non-SP11 Surface must retain SAM battery and AC providers.
This PR intentionally remains draft.
Qualified-source replacement note
The hardware-qualified source achieved the same provider outcome with an
of_machine_is_compatible("microsoft,denali")early return inside the sharedsurface_batteryprobe. This relift deliberately does not carry that shared-driver change: removing only the SP11 registry nodes prevents those SAM devices from being created while leaving every other Surface probe path untouched. The final-tree coverage audit therefore classifiesdrivers/power/supply/surface_battery.cas a guarded replacement, not a lost behavior.