Repository navigation
Conversation
kernel/configs/apple-16k/config: CONFIG_DRM_APPLE_G5P=y These options provide g5p and its Kconfig dependencies on both page sizes. Assisted-by: LLM
kernel/configs/apple-16k/config: CONFIG_APPLE_AOP_GYRO=m CONFIG_APPLE_AOP_PRESSURE=m These options provide aop and its Kconfig dependencies on both page sizes. Assisted-by: LLM
kernel/configs/apple-16k/config: # CONFIG_NVME_APPLE_ANS_EARLY_USB is not set These options provide warm-storage and its Kconfig dependencies on both page sizes. kernel/configs/apple-4k/config: # CONFIG_NVME_APPLE_ANS_EARLY_USB is not set These options provide warm-storage and its Kconfig dependencies on both page sizes. Assisted-by: LLM
Assisted-by: LLM
Assisted-by: LLM
Assisted-by: LLM
kernel/configs/apple-16k/config: CONFIG_APPLE_AOP_GYRO=m CONFIG_APPLE_AOP_PRESSURE=m These options provide aop and its Kconfig dependencies on both page sizes. Assisted-by: LLM
Assisted-by: LLM
Assisted-by: LLM
Assisted-by: LLM
kernel/configs/apple-16k/config: # CONFIG_NVME_APPLE_ANS_EARLY_USB is not set These options provide warm-storage and its Kconfig dependencies on both page sizes. kernel/configs/apple-4k/config: # CONFIG_NVME_APPLE_ANS_EARLY_USB is not set These options provide warm-storage and its Kconfig dependencies on both page sizes. Assisted-by: LLM
Assisted-by: LLM
Assisted-by: LLM
Bring this branch onto current main and the series it depends on. The merge keeps the other side's tree; the next commit carries the reworked version of this branch's change.
A Mac grants an iPad more than the standard USB current, but the charger took the gadget's reported budget unchecked and the composite gadget could draw the extra current while the bus was suspended. Cap and log the USB host budget in the TriStar charger, draw no extra Apple current while suspended, and let the initramfs and orchard USB helpers opt J71t into the Mac current profile. Documented in docs/bring-up/charging/j71t-mac-current.md, with tests. Assisted-by: LLM
Bring this branch onto current main and the series it depends on. The merge keeps the other side's tree; the next commit carries the reworked version of this branch's change.
Bring this branch onto current main and the series it depends on. The merge keeps the other side's tree; the next commit carries the reworked version of this branch's change.
The A9 AOP hosts the accelerometer, gyroscope, pressure and ambient-light sensors. Its firmware needs boot arguments and per-device calibration that m1n1 did not pass on S8003, and a reloaded AOP (after kexec or sleep) lost its sensor firmware state, so the sensors did not come back. m1n1 passes the A9 AOP boot arguments and sensor calibration. The kernel selects a certified AOP reload path through device-tree match data (bindings, DT, mailbox, pmdomain, IIO and AOP driver patches), keeps the AOP power domain and firmware state for that reload, and refuses a suspend that would interrupt the firmware's boot. The J71t firmware recipe gains the AOP pieces, the gyroscope and pressure drivers are enabled, and J71t's accelerometer and gyroscope move from missing to working, and its light sensor from untested to working. Assisted-by: LLM
The USB serial number changed between installed boots and RAM sessions, so the host saw a new device every boot and could not keep its SSH known_hosts entry or serial console name. Share one BOARD/hashed-ID serial format between installed boots and RAM sessions (usb-identity), and get the per-boot SSH identity through the existing ACM console. Documented in docs/device-protocol.md, with tests. Assisted-by: LLM
Bring this branch onto current main. The merge keeps the other side's tree; the next commit carries the reworked version of this branch's change.
Bring this branch onto current main and the series it depends on. The merge keeps the other side's tree; the next commit carries the reworked version of this branch's change.
Bring this branch onto current main and the series it depends on. The merge keeps the other side's tree; the next commit carries the reworked version of this branch's change.
Bring this branch onto current main and the series it depends on. The merge keeps the other side's tree; the next commit carries the reworked version of this branch's change.
Bring this branch onto current main and the series it depends on. The merge keeps the other side's tree; the next commit carries the reworked version of this branch's change.
A7-A9 have no EL2 and boot without any PSCI firmware, so Linux on an iPad 5 could not bring secondary CPUs down and up again, and a kexec had nowhere to park them. CPU hotplug, kexec and a clean poweroff all need a PSCI implementation that stays resident after m1n1 hands over. Carry m1n1 patches that keep a small EL3 PSCI implementation resident: CPU_ON/CPU_OFF with a firmware rendezvous (EL1 WFI/WFE trap to EL3), SYSTEM_OFF, and a guarded SYSTEM_RESET that boots the default entry again. The loader marks retained hardware in the device tree after a PSCI re-entry. The resident PSCI is on by default on these SoCs; the shipped boot framing keeps psci_reset=0, so SYSTEM_RESET stays off unless a loader enables it. Adds boot/m1n1/psci-loader and its tests. Assisted-by: LLM
The TriStar charger subscribed to the PMU's RTC event 16 for source identification. An acknowledgement there could take the RTC's wake event, and the polled cover inputs had no driver enabled. Give RTC event 16 to the RTC alone and keep the PMU and RTC event split (DT, RTC and USB patches), so one consumer's acknowledgement cannot take the other's wake event. Enable KEYBOARD_GPIO_POLLED for the polled cover inputs. Assisted-by: LLM
On J71t the NVMe controller (ANS) sits behind the H9P PCIe port, and resetting that port loses the controller until a cold boot. A kexec therefore has to hand over a stopped but powered ANS, with its DART translations retained, or the next kernel loses its root filesystem. The first version of this handoff panicked when a step failed, which with panic=0 is an indefinite hang. Keep the certified ANS kexec handoff: DT and bindings describe it, the DART, H9P and NVMe drivers stop queues and translations in order and the next kernel picks them up, and core/printk export what the modules need. Every failure on the outgoing side now ends in a native cold reset through apple_cold_reset() instead of a panic, with explicit returns after it. The port is handed over powered, with PERST# asserted and the link stopped, and the incoming kernel brings it up with the cold-boot sequence (port power cycle, NVMe mode, port enable, then link training). Retraining the powered port by PERST# alone, as iOS never does, left the root port in Detect.Quiet and cost a timeout on every warm boot. Assisted-by: LLM
After a kexec the next kernel found the S8000 GPIO controller with interrupt modes armed by the previous kernel, the PIO SPI controller with queued transfers and an asserted chip select, and the touch controller still running. An orphaned GPIO interrupt fires forever and touch did not come back. Retire inherited GPIO interrupt modes before the chained parent interrupts are enabled, drain and idle the S8000 PIO SPI controller on shutdown and at probe, and stop the Apple Z2 touch controller before its SPI parent shuts down. Assisted-by: LLM
A warm restart through kexec needs the next kernel to see the pristine device tree from boot, the pstore region, the display state and the power domains that must not be cut while the next kernel starts. DT, OF, DRM, pmdomain and pstore patches retain the board-selected warm handoff state, so probe and shutdown keep what the next kernel needs: the pristine boot device tree, the pstore region, the display state and the Apple pmgr warm hold. The Orchard service file learns the retained state. Assisted-by: LLM
On a tethered J71t boot a restart must be a native cold reset, but the watchdog's restart handler ran below PSCI's, and its restart guard dereferenced a parent that probe never set. Describe J71t's tethered boot in DT. On such a board the watchdog restart handler registers above PSCI and performs the native cold reset; in the warm and soft modes it leaves the watchdog alone and returns success, so PSCI's restart runs. Probe sets the parent before registering, and the restart callback tolerates a missing one. Other devices keep the current priority. Assisted-by: LLM
Bring this branch onto current main. Main has since merged OrchardLinux#124, OrchardLinux#122, OrchardLinux#118, OrchardLinux#121, OrchardLinux#110, OrchardLinux#127, OrchardLinux#101, OrchardLinux#126, OrchardLinux#108 and OrchardLinux#111, several in part or reworked, and OrchardLinux#123 and OrchardLinux#128 were closed. Where main carries a topic, main's version is kept; the left-out parts that warm restart and suspend need come back in OrchardLinux#107 and OrchardLinux#117.
Bring this branch onto current main. Main has since merged OrchardLinux#124, OrchardLinux#122, OrchardLinux#118, OrchardLinux#121, OrchardLinux#110, OrchardLinux#127, OrchardLinux#101, OrchardLinux#126, OrchardLinux#108 and OrchardLinux#111, several in part or reworked, and OrchardLinux#123 and OrchardLinux#128 were closed. Where main carries a topic, main's version is kept; the left-out parts that warm restart and suspend need come back in OrchardLinux#107 and OrchardLinux#117. This branch's own patches in drivers/usb are renumbered to follow main's.
Bring this branch onto current main. Main has since merged OrchardLinux#124, OrchardLinux#122, OrchardLinux#118, OrchardLinux#121, OrchardLinux#110, OrchardLinux#127, OrchardLinux#101, OrchardLinux#126, OrchardLinux#108 and OrchardLinux#111, several in part or reworked, and OrchardLinux#123 and OrchardLinux#128 were closed. Where main carries a topic, main's version is kept; the left-out parts that warm restart and suspend need come back in OrchardLinux#107 and OrchardLinux#117. This branch's own patches in devices/s8000, drivers/base and drivers/usb are renumbered to follow main's.
Bring this branch onto current main. Main has since merged OrchardLinux#124, OrchardLinux#122, OrchardLinux#118, OrchardLinux#121, OrchardLinux#110, OrchardLinux#127, OrchardLinux#101, OrchardLinux#126, OrchardLinux#108 and OrchardLinux#111, several in part or reworked, and OrchardLinux#123 and OrchardLinux#128 were closed. Where main carries a topic, main's version is kept; the left-out parts that warm restart and suspend need come back in OrchardLinux#107 and OrchardLinux#117. This branch's own patches in devices/s8000, drivers/base and drivers/usb are renumbered to follow main's.
Bring this branch onto current main. Main has since merged OrchardLinux#124, OrchardLinux#122, OrchardLinux#118, OrchardLinux#121, OrchardLinux#110, OrchardLinux#127, OrchardLinux#101, OrchardLinux#126, OrchardLinux#108 and OrchardLinux#111, several in part or reworked, and OrchardLinux#123 and OrchardLinux#128 were closed. Where main carries a topic, main's version is kept; the left-out parts that warm restart and suspend need come back in OrchardLinux#107 and OrchardLinux#117. This branch's own patches in devices/s8000, drivers/base, drivers/pmdomain and drivers/usb are renumbered to follow main's.
The A9 AOP driver on main reads apple,aop-target, apple,chip-id and apple,chip-revision, and the motion sensor drivers read their factory calibration, from properties the bootloader fills in. Nothing on main fills them in; going by the driver's probe, the A9 AOP cannot start without them (read from the code, not run). This is the m1n1 patch that fills them in, from OrchardLinux#101, unchanged. Assisted-by: LLM
From OrchardLinux#101, the part that main did not take with the sensors: the retained AOP reload across kexec (checksummed shutdown log, power-state observer, pr_flush export, warm_state attribute). The sensor parts that main carries are left out of these patches; what remains applies on top of main's AOP driver and its fresh-start order. Assisted-by: LLM
From OrchardLinux#110, the part main did not take with the stable USB serial: the platform layer embeds each supported board's pristine DTB and a compatible-to-file map in the initrd. Before switching root, the initrd copies the running board's tree to /run/orchard-kexec/pristine.dtb, or, after a warm restart, the retained tree the previous kernel named with orchard_warm.dtb=, and records the boot ID next to it. Warm restart boots the next kernel with that tree, never with one rebuilt from an updated /boot. No feature table is added: whether warm restart is offered is decided from the mechanisms it uses, not from a feature state. Assisted-by: LLM
Bring this branch onto current main. Main has since merged OrchardLinux#124, OrchardLinux#122, OrchardLinux#118, OrchardLinux#121, OrchardLinux#110, OrchardLinux#127, OrchardLinux#101, OrchardLinux#126, OrchardLinux#108 and OrchardLinux#111, several in part or reworked, and OrchardLinux#123 and OrchardLinux#128 were closed. Where main carries a topic, main's version is kept; the left-out parts that warm restart and suspend need come back in OrchardLinux#107 and OrchardLinux#117. This branch's own patches in devices/s8000, drivers/base, drivers/pmdomain and drivers/usb are renumbered to follow main's.
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
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.
Part 6 of 11 of the iPad 5 (J71t) series in this repository; merge after #107.
Problem
On a tethered J71t boot a restart must be a native cold reset, but the watchdog's restart handler ran below PSCI's, and its restart guard dereferenced a parent that probe never set.
Change
Describe J71t's tethered boot in DT. On such a board the watchdog restart handler registers above PSCI and performs the native cold reset; in the warm and soft modes it leaves the watchdog alone and returns success, so PSCI's restart runs. Probe sets the parent before registering, and the restart callback tolerates a missing one. Other devices keep the current priority.
Testing
psci_reset=0), so the guarded cold reset remains the restart path.Dependencies
Depends on #107.
This branch is stacked on the PRs it depends on and carries their commits; the change of this PR is the commit "watchdog: apple: Prefer a cold reset and guard the warm reset path", and the merge commits after it bring the branch onto current main.
This update keeps the branch's history: it merges current main and the updated branch below it into this branch. Nothing is forced.
🤖 Generated with Claude Code