Skip to content

Carry 13 fixes from omacom/linux-aurora - #1989

Draft
RyanTheTide wants to merge 14 commits into
integration/aurorafrom
omacom-port/misc-fixes
Draft

RyanTheTide wants to merge 14 commits into
integration/aurorafrom
omacom-port/misc-fixes

Conversation

@RyanTheTide

@RyanTheTide RyanTheTide commented Nov 15, 2026 •

Copy link
Copy Markdown
Contributor

Carries 13 commits from omacom/linux-aurora integration/aurora (39d5f88a, 2026-11-14) that this tree did not have. Each one keeps its original author, author date and message. A Link: to the source commit is added, and where a pick conflicted, a bracketed note says how it was resolved.

Their branch forked from ours at 44d5afc (#139, 2026-10-20). It has 2792 commits since then. 2683 of them are already here, matched by author and date or by subject. None of the other 109 has a patch-id match here. Those 109 were reviewed one by one, and the 13 below are the ones kept.

Carried

ours source change conflict
93e4c34 6b34040 media: apple: isp: correct the T8122 PMU base address (0x2d07040000 has an extra zero; PMGR is at 0x2d0700000) none
19b4be4 bb2885b PCI: apple: enable the root-port prefetchable window on cold-initialized tunnel ports (T600x, T8112, T6050) yes, one line moved below our cio_cfg_lock / MPS timer hook
60de232 3a936edf wifi: brcmfmac: pcie: don't drop ring completions in the hard IRQ handler (irq_ready race since f04be34) none
f485a0b eb6549c wifi: mt7932: join WPA2-PSK APs with a TKIP group key (WPA/WPA2 mixed-mode APs) yes, kept our 6 GHz band check, PSK-SHA256 and AES-CMAC
8ca5abf a2b0f53 docs: wifi: mt7932: describe the TKIP group key yes, text merged into our cipher list
b9ce87f 6ba4695 tools/aurora-bindgen: accept unformatted bindgen output in the layout test none
b697ea8 6447458 drm/asahi: g15: decline probes before activation with -ENODEV yes, host test counts our third (G16) registration
70e38c6 10a8340 pmdomain: apple: name the explicit T6031 display fallback (enable=0, as T6030/T8122) none; note added because J514C is still opt-in here
3613c60 d8ecb2e pmdomain: apple: pmp-report: keep the T8122 14.x GPU readiness for the M3 runtime yes, placed in front of our T8132 branch
8ea5e7e b53dc2b dt-bindings: display: apple: describe a common scanout aperture (adds the apple,t8122-display-subsystem compatible our DT already uses) yes, folded into our oneOf list
1674013 21d3646 iommu/apple-dart: honor consumer apertures before intersecting streams none
2d9dfb6 56e6f92 arm64: dts: apple: t8122: retain the common scanout DMA alias yes, comment only
b908da4 b9ed257 drm/apple: v14.7: take primary planes that reach past the mode's edge none

Credit: Naeem Malik, zoan37, Joshua Warren, garymeyerca, Scott Jones, Kallisti, Chris Kearney, DjDeveloperr and Eryk Wieliczko wrote these in omacom/linux-aurora (https://github.com/omacom/linux-aurora). Issues cited in the commits: omacom/linux-aurora#117 and #398.

Checks

  • Build: fleet74 config (LLVM=1 ARCH=arm64, W=1), every touched directory, plus the Apple DTBs. No errors and no new warnings in the touched files; all 137 Apple DTBs build.
  • KUnit (arm64, qemu): 99/99 pass, including apple-dart (with the new apple_dart_test_consumer_window and apple_dart_test_invalid_consumer_window) and mt7932-association (mt_connect_auth_test with the TKIP rows).
  • Host tests: g15-probe-init-tests.py --mutations passes, and all 11 mutants fail as intended, including the new pre-activation-defers mutant. t6030-pmp-graph-tests.py and t6030-pmp-supplier-tests.py --mutations pass. The aurora-bindgen compile test passes with the changed test.py.
  • range-diff of each carried commit against its source: below.

Not carried

  • 84687606 brcmfmac D3-ACK timeout: it continues suspend and reloads firmware on resume. That conflicts with the retained-firmware sleep path here (apple_radio_sleep), where losing firmware across a lease returns -EUCLEAN.
  • cda9c909 dwc3-apple drvdata: probe here already calls platform_set_drvdata().
  • 23e938c leds-pwm zero period: already handled here (the warning is only printed for an enabled PWM).
  • 4433ef5, 7bdc743 ISP temporal filter 0 on J613/J615 firmware 14.7: board workaround for a firmware version that is not the J613 default here (26.6.2).
  • b5677f7, 88c4f98 aop_sensors CT720 RGBC: CCT is already published here, and the RGBC part has not been run on hardware.
  • 1f45121, 6848e89, 06cf15d, ece3dac, 5447fa2 SEP xART first-setup window: the same first-keybag rewrite is already handled here by 15825b4, e89d4a2 and 0f3fda0 (policy window, recoverable create intent).
  • a29de95, bcedca0 AVD AV1 host tests: superseded by 53bb661.
  • 6c66b41 module owner: this tree takes it from OwnerModule. Driver::MODULE does not exist here.
  • 1032928 G17-only memory limits: this tree applies the ledger to every GPU (464cb2e).
  • 1ab55e9 g15 input-error test: already modelled here.
  • 9dff537 T8122 runtime without G15: large Kconfig and glue refactor for a configuration that is not built. The build fixes are already in cc35ef2 and its predecessors.
  • J514C series (5ce904e, fbf4224, a5d1ca2, f35f6cf, 09dec8c, 24a62a3, c64bc80, 03d5e5e, 9a70815, 1563cff): turns the J514C on by default using J516C power and thermal values never measured on that chassis, and depends on the old display-gate file and their CI test list. The firmware identity pins in it are not carried either.
  • T6034 J514M/J516M series (49a61bd, eb5e5af, 3492c47, c03e2a0, 95eeb91, 90cbb5e, aaf73ec, e473812, b4cff0e, 4f58c0c, 44ef4d9, baf4955, 0944b8e, 60b5cbc, e13e53e, a5ba431, 5b4485d, 469d9ab): built on a separate apple,t6034-* display path. Here the T6034 is described as the T6031 die (3aa8b5f). The firmware identity pins in it are not carried.
  • T6030 firmware identity pins (c547885, 455b498, 83725f6, 9ef29ba): not carried.
  • J504 (a33400b GPU runtime, e5991e9 panel record, 61cf178 brightness, 1144c88 panel DT): no J504 boot has been reported for them. The panel DT is already here (208d693).
  • 36bef1a, 6f96bfb, 86a999a J313 panel power-cycle and backlight cap: not booted, and 6f96bfb changes the backlight service for all pre-26 firmware. The cap belongs in the J313 DT.
  • d77c556 J516C EDID: duplicates the EDID builder here (dcp-display-metadata.c).
  • a6d7f52 t8103 SIO alias: only moves the alias. 3afa738 here also enabled &sio on every T8103 board, but 5417d5b later put both back on J274 only. Restoring 3afa738 is the fix and goes separately.
  • 1acf619 T8132 CLPC binding: already present (b811bfe).
  • CI, CODEOWNERS, VOUCHED and tools/aurora-ci commits, and the tools/aurora-sep/recipes/mesa-m3 packaging commits: not part of this tree.

Hardware rows owed

  • J700 (Neo): join a WPA/WPA2 mixed-mode (CCMP pairwise, TKIP group) PSK network and pass unicast and broadcast traffic. Confirm an existing WPA2/WPA3 network still joins. Run the mt7932 association KUnit.
  • M1 Pro and M2: Wi-Fi traffic under load plus s2idle cycles (brcmfmac IRQ change). Boot plus a Thunderbolt/USB4 PCIe device with a prefetchable BAR (or at least tunnel hotplug, for no regression).
  • All four (J616s, J700, M1 Pro, M2): boot with display up and the DART-backed devices probing, and no new apple-dart errors (the of_xlate change reads apple,dma-range on every consumer). Run the apple-dart KUnit.
  • No row is possible here for the T8122, T6030 or T6031 changes (no M3 machine). They are covered by the build and host tests only.
range-diff (source commit vs carried commit)
1:  6b3404044e17 ! 1:  93e4c349e1b4 media: apple: isp: correct the T8122 PMU base address
    @@ Commit message
         Link: https://github.com/omacom/linux-aurora/issues/117
         Assisted-by: Codex:GPT-6
         Signed-off-by: Scott Jones <scottajones@gmail.com>
    +    Link: https://github.com/omacom/linux-aurora/commit/6b3404044e17da6b5afb9a6c54214701eb54a0fd
     
      ## drivers/media/platform/apple/isp/isp-drv.c ##
     @@ drivers/media/platform/apple/isp/isp-drv.c: static const struct apple_isp_hw apple_isp_hw_t6020 = {
1:  bb2885b7169d ! 1:  19b4be432b17 PCI: apple: enable the root-port prefetchable window on cold-initialized tunnel ports
    @@ Commit message
         itself has not been booted: a rebuilt kernel changes the BTF base of the modules.
     
         (cherry picked from commit 4466fe2ad955d47290fc79c13963c51c0b253706)
    +    [conflict: our config_write takes the cio_cfg_lock and runs the MPS timer
    +     hook first, so the kernel_init test moved below them; the change is applied
    +     to that test]
         Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
    +    Link: https://github.com/omacom/linux-aurora/commit/bb2885b7169d4252c2462a214911188f168a7a0d
     
      ## drivers/pci/controller/pcie-apple.c ##
     @@ drivers/pci/controller/pcie-apple.c: static int apple_pcie_config_write(struct pci_bus *bus, unsigned int devfn,
    - 	int ret;
    - 
    - 	ret = pci_generic_config_write(bus, devfn, where, size, val);
    --	if (ret || !pcie || !pcie->kernel_init)
    -+	if (ret || !pcie || !(pcie->kernel_init || pcie->tunnel_cold_init))
    + 	if (pcie->hw->mps_timers && where == PCIEC_RP_DEVCTL)
    + 		apple_pcie_update_mps_timers(pcie,
    + 					     FIELD_GET(PCI_EXP_DEVCTL_PAYLOAD, val));
    +-	if (!pcie->kernel_init)
    ++	if (!(pcie->kernel_init || pcie->tunnel_cold_init))
      		return ret;
      	/* Root-port prefetchable window. The port block has to be told too. */
    - 	if (bus->number != cfg->busr.start || devfn)
    + 	if (where < 0x24 || where >= 0x30)
1:  3a936edf2c49 ! 1:  60de23202956 wifi: brcmfmac: pcie: don't drop ring completions in the hard IRQ handler
    @@ Commit message
         Fixes: f04be345ad51 ("wifi: brcmfmac: Do not service msgbuf IRQs until ready in MSI mode")
         Assisted-by: Claude:claude-opus-5-5
         Signed-off-by: Naeem Malik <malik2015naeem@gmail.com>
    +    Link: https://github.com/omacom/linux-aurora/commit/3a936edf2c49afddf0e173ad7c8593ae2ba4d885
     
      ## drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c ##
     @@ drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c: static irqreturn_t brcmf_pcie_quick_check_isr(int irq, void *arg)
1:  eb6549c0c2ae ! 1:  f485a0bbc94f wifi: mt7932: join WPA2-PSK APs with a TKIP group key
    @@ Commit message
     
         Link: https://github.com/omacom/linux-aurora/issues/398
         Assisted-by: Claude:claude-opus-5-5
    +    [conflict: kept our 6 GHz band check and PSK_SHA256/AES-CMAC entries and
    +     our PMF-required PSK test row; the TKIP group rule follows the band check]
         Signed-off-by: zoan37 <104385984+zoan37@users.noreply.github.com>
         Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
    +    Link: https://github.com/omacom/linux-aurora/commit/eb6549c0c2aec4759d55151834fc95c7a1dfef6e
     
      ## drivers/net/wireless/mediatek/mt7932/association-test.c ##
     @@ drivers/net/wireless/mediatek/mt7932/association-test.c: enum mt_auth_change {
    @@ drivers/net/wireless/mediatek/mt7932/association-test.c: enum mt_auth_change {
     @@ drivers/net/wireless/mediatek/mt7932/association-test.c: static void mt_connect_auth_test(struct kunit *test)
      		{ "pure PSK", MT_AUTH_PSK, 0, WLAN_AKM_SUITE_PSK },
      		{ "PSK missing PMK", MT_AUTH_PSK, 1, -EOPNOTSUPP },
    - 		{ "PSK required MFP", MT_AUTH_PSK, 2, -EOPNOTSUPP },
    + 		{ "PSK required MFP", MT_AUTH_PSK, 2, WLAN_AKM_SUITE_PSK },
     +		{ "PSK TKIP group", MT_AUTH_PSK, 3, WLAN_AKM_SUITE_PSK },
     +		{ "PSK TKIP pairwise", MT_AUTH_PSK, 4, -EOPNOTSUPP },
     +		{ "PSK WEP group", MT_AUTH_PSK, 5, -EOPNOTSUPP },
    @@ drivers/net/wireless/mediatek/mt7932/association.h: mt7932_connect_auth(const st
      	    p->crypto.n_akm_suites < 1)
      		return -EOPNOTSUPP;
      
    +@@ drivers/net/wireless/mediatek/mt7932/association.h: mt7932_connect_auth(const struct cfg80211_connect_params *p)
    + 						       p->crypto.sae_pwe))
    + 		return -EOPNOTSUPP;
    + 
     +	/* WPA/WPA2 mixed-mode APs pair a CCMP unicast key with a TKIP group
     +	 * key. The firmware owns the handshake and both keys. Only plain
     +	 * WPA2-PSK may do this; pairwise TKIP stays refused.
    @@ drivers/net/wireless/mediatek/mt7932/association.h: mt7932_connect_auth(const st
     +
      	switch (p->crypto.akm_suites[0]) {
      	case WLAN_AKM_SUITE_PSK:
    - 		if ((versions & NL80211_WPA_VERSION_2) && p->crypto.psk &&
    + 		/* iwd and wpa_supplicant both send REQUIRED once they have
     
      ## drivers/net/wireless/mediatek/mt7932/startup.c ##
    -@@ drivers/net/wireless/mediatek/mt7932/startup.c: static const struct cfg80211_ops mt_cfg_ops = {
    - int mt_register_regulatory_gate(struct mt7932 *m)
    +@@ drivers/net/wireless/mediatek/mt7932/startup.c: int mt_register_regulatory_gate(struct mt7932 *m)
      {
      	static const int rates[] = {10,20,55,110,60,90,120,180,240,360,480,540};
    --	static const u32 ciphers[] = { WLAN_CIPHER_SUITE_CCMP };
    -+	static const u32 ciphers[] = { WLAN_CIPHER_SUITE_CCMP, WLAN_CIPHER_SUITE_TKIP };
    + 	static const u32 ciphers[] = { WLAN_CIPHER_SUITE_CCMP,
    +-				       WLAN_CIPHER_SUITE_AES_CMAC };
    ++				       WLAN_CIPHER_SUITE_AES_CMAC,
    ++				       WLAN_CIPHER_SUITE_TKIP };
      	static const u32 akms[] = {
    - 		WLAN_AKM_SUITE_PSK, WLAN_AKM_SUITE_SAE, WLAN_AKM_SUITE_OWE,
    - 	};
    + 		WLAN_AKM_SUITE_PSK,
    + 		WLAN_AKM_SUITE_PSK_SHA256,
1:  a2b0f533cbe0 ! 1:  8ca5abfd706a docs: wifi: mt7932: describe the TKIP group key
    @@ Commit message
     
         Link: https://github.com/omacom/linux-aurora/issues/398
         Assisted-by: Claude:claude-opus-5-5
    +    [conflict: our notes already list PSK-SHA256, OWE and BIP-CMAC-128; the
    +     TKIP text is added to them]
         Signed-off-by: zoan37 <104385984+zoan37@users.noreply.github.com>
         Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
    +    Link: https://github.com/omacom/linux-aurora/commit/a2b0f533cbe05ff03597c790a58c2de53a50350b
     
      ## Documentation/networking/device_drivers/wifi/mt7932-neo.rst ##
    -@@ Documentation/networking/device_drivers/wifi/mt7932-neo.rst: lookup.
    +@@ Documentation/networking/device_drivers/wifi/mt7932-neo.rst: fallback reason and the result of each lookup.
      Station security
      ----------------
      
    --The driver advertises PSK and SAE with CCMP only. Firmware performs SAE
    -+The driver advertises PSK and SAE with CCMP as the pairwise cipher. PSK also
    -+accepts a TKIP group key, described below. Firmware performs SAE
    +-The driver advertises PSK, PSK-SHA256, SAE and OWE with CCMP, plus
    +-BIP-CMAC-128 for management protection. Firmware performs SAE
    ++The driver advertises PSK, PSK-SHA256, SAE and OWE with CCMP as the pairwise
    ++cipher, plus BIP-CMAC-128 for management protection. PSK also accepts a TKIP
    ++group key, described below. Firmware performs SAE
      authentication and the four-way handshake and owns PTK, GTK and IGTK;
      there is no host key-install interface or external-auth exchange.
      
    -@@ Documentation/networking/device_drivers/wifi/mt7932-neo.rst: NetworkManager with wpa_supplicant, pending the hardware qualification below.
    +@@ Documentation/networking/device_drivers/wifi/mt7932-neo.rst: follows the AP's RSN capabilities; it is not a firmware readback. Selectors
      The standard SAE PWE settings (unspecified, hunting-and-pecking,
      hash-to-element and both) are accepted; firmware chooses the exchange without
      a host PWE field. Exact PWE policy behavior on 2.4 and 5 GHz still needs
    --qualification. SAE-PK, SAE-EXT-KEY and additional ciphers are not
    --advertised.
    -+qualification. SAE-PK and SAE-EXT-KEY are not advertised.
    -+
    +-qualification. SAE-PK, SAE-EXT-KEY and additional ciphers are not advertised. OWE and
    ++qualification. SAE-PK and SAE-EXT-KEY are not advertised. OWE and
    + 6 GHz support are described below.
    + 
     +TKIP is registered so that WPA2-PSK can join a WPA/WPA2 mixed-mode access point,
     +which pairs a CCMP unicast key with a TKIP group key. Pairwise TKIP, WPA1, and a
     +TKIP group key with SAE or OWE are refused. Firmware owns the TKIP group key like
    @@ Documentation/networking/device_drivers/wifi/mt7932-neo.rst: NetworkManager with
     +connected to a hostapd access point through 14 group rekeys at 60 second intervals
     +with ARP and mDNS still received. DHCP renewal, IPv6 router advertisements and a
     +commercial access point's own rekey still need qualification.
    - 
    ++
      J700 hardware testing with NetworkManager and wpa_supplicant on a PSK+SAE
      transition network has confirmed, on 2.4 GHz channel 6 and 5 GHz channel 149:
    + 
1:  6ba4695259f3 ! 1:  b9ce87f698f9 fix bindgen layout checks without rustfmt
    @@ Commit message
     
         Assisted-by: LLM
         Signed-off-by: Kallisti <kallisti@kallisti.io>
    +    Link: https://github.com/omacom/linux-aurora/commit/6ba4695259f3d207f8d26aed8bf203f46abc8772
     
      ## tools/aurora-bindgen/test.py ##
     @@ tools/aurora-bindgen/test.py: for fixture,language,extra in [('aligned-empty.h','c',[]),('aligned-empty.hpp','
1:  6447458068e3 ! 1:  b697ea8bda27 drm/asahi: g15: decline probes before activation with -ENODEV
    @@ Commit message
     
         Assisted-by: Claude:claude-opus-5-5
         Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
    +    [conflict: our module also registers the G16 adapter, so the host test
    +     counts each attempted registration instead of assuming two, and the
    +     mutant table keeps our activation-before-g16-registration entry]
         Signed-off-by: Scott Jones <scottajones@gmail.com>
    +    Link: https://github.com/omacom/linux-aurora/commit/6447458068e3df86c978386925481ddb439e5164
     
      ## drivers/gpu/drm/asahi/g15/mod.rs ##
     @@ drivers/gpu/drm/asahi/g15/mod.rs: fn probe<'bound>(
    @@ drivers/gpu/drm/asahi/g15/mod.rs: fn probe<'bound>(
     +                    return Err(ENODEV);
                      }
                      let cfg = *info.ok_or(ENODEV)?;
    -                 let cfg = if cfg.chip_id == 0x6034 && boot::glue::machine(c_str!("apple,j516m")) {
    +                 dev_info!(pdev.as_ref(), "G15: probing ({})\n", cfg.name);
     
      ## tools/asahi/g15-probe-init-tests.py ##
     @@ tools/asahi/g15-probe-init-tests.py: thread_local! {
    -     static ACTIVATED: Cell<bool> = const { Cell::new(false) };
    +     static EXEC_SHARE_READY: Cell<bool> = const { Cell::new(false) };
          static ATTACH_ERROR: Cell<bool> = const { Cell::new(false) };
          static PROBE_ERROR: Cell<i32> = const { Cell::new(0) };
     +    static PRE_ACTIVATION: Cell<u32> = const { Cell::new(0) };
    ++    static ATTEMPTED_REGISTRATION: Cell<u32> = const { Cell::new(0) };
      }
      struct Core<'a>(PhantomData<&'a ()>);
      struct Device { data: Cell<*mut core::ffi::c_void> }
     @@ tools/asahi/g15-probe-init-tests.py: mod driver {
    -                     let stage = if name.to_bytes() == b"asahi-g15" { 1 } else { 2 };
    +                     };
                          // Model driver_attach and a late driver_add_groups failure. A deferred
                          // worker can also retry G15 while the other registration is in progress.
     -                    let _ = callback::<Driver<'static>>(&PDEV, Some(&&CFG));
    ++                    ATTEMPTED_REGISTRATION.set(ATTEMPTED_REGISTRATION.get() + 1);
     +                    let ready = MODULE_READY.load(Ordering::Acquire);
     +                    let started = PROBES.get();
     +                    let result = callback::<Driver<'static>>(&PDEV, Some(&&CFG));
    @@ tools/asahi/g15-probe-init-tests.py: fn module_cases() {
              MODULE_READY.store(false, Ordering::Release);
              COMPLETED_REGISTRATION.set(0); FAIL_REGISTRATION.set(failure);
     -        ACTIVATED.set(false); ATTACH_ERROR.set(failure == 0);
    -+        ACTIVATED.set(false); ATTACH_ERROR.set(failure == 0); PRE_ACTIVATION.set(0);
    ++        ACTIVATED.set(false); ATTACH_ERROR.set(failure == 0); PRE_ACTIVATION.set(0); ATTEMPTED_REGISTRATION.set(0);
              let init = <DriverModule as InPlaceModule>::init(&MODULE);
              assert_eq!(PROBES.get(), 0, "module initializer eagerly started firmware");
              let result = KBox::pin_init(init, GFP_KERNEL);
    @@ tools/asahi/g15-probe-init-tests.py: fn module_cases() {
                  unsafe { drop(Box::from_raw(PDEV.base.data.get().cast::<Driver<'_>>())); }
              }
     +        // Every probe before activation declined: one per completed or failing registration.
    -+        assert_eq!(PRE_ACTIVATION.get(), if failure == 1 { 1 } else { 2 }, "pre-activation probes");
    ++        assert_eq!(PRE_ACTIVATION.get(), ATTEMPTED_REGISTRATION.get(), "pre-activation probes");
              println!("module-registration-{failure}: PASS");
          }
      }
    @@ tools/asahi/g15-probe-init-tests.py: int main(void) {
              assert module_code.count(late) == 1
              early = module_code.replace(late, "").replace("            _driver <-", late + "            _driver <-", 1)
     @@ tools/asahi/g15-probe-init-tests.py: int main(void) {
    -         else:
    -             receipt["mutants"][name] = result
    -             if r.returncode == 0: raise SystemExit("SURVIVED: " + name)
    --            intended = {"eager-probe-before-allocation": "allocation-before-start: firmware probe before drvdata allocation", "retained-error-unbinds": "retained-start-failure-binds: callback result", "no-registration-readiness-gate": "late registration failure started firmware", "activation-before-last-registration": "activation before all registrations completed"}[name]
    -+            intended = {"eager-probe-before-allocation": "allocation-before-start: firmware probe before drvdata allocation", "retained-error-unbinds": "retained-start-failure-binds: callback result", "no-registration-readiness-gate": "late registration failure started firmware", "activation-before-last-registration": "activation before all registrations completed", "pre-activation-defers": "pre-activation probe deferred instead of ENODEV"}[name]
    -             result["intended_failure"] = intended in r.stderr
    -             if not result["intended_failure"]: raise SystemExit("INVALID unrelated failure: " + name + "\n" + r.stderr)
    +             else:
    +                 receipt["mutants"][label] = result
    +                 if r.returncode == 0: raise SystemExit("SURVIVED: " + name)
    +-                intended = {"eager-probe-before-allocation": "allocation-before-start: firmware probe before drvdata allocation", "retained-error-unbinds": "retained-start-failure-binds: callback result", "no-registration-readiness-gate": "late registration failure started firmware", "activation-before-last-registration": "activation before all registrations completed", "activation-before-g16-registration": "activation before all registrations completed"}[name]
    ++                intended = {"eager-probe-before-allocation": "allocation-before-start: firmware probe before drvdata allocation", "retained-error-unbinds": "retained-start-failure-binds: callback result", "no-registration-readiness-gate": "late registration failure started firmware", "activation-before-last-registration": "activation before all registrations completed", "activation-before-g16-registration": "activation before all registrations completed", "pre-activation-defers": "pre-activation probe deferred instead of ENODEV"}[name]
    +                 result["intended_failure"] = intended in r.stderr
    +                 if not result["intended_failure"]: raise SystemExit("INVALID unrelated failure: " + name + "\n" + r.stderr)
          (out / "result.json").write_text(json.dumps(receipt, indent=2) + "\n")
1:  10a834038f4b ! 1:  70e38c6ab598 pmdomain: apple: name the explicit T6031 display fallback
    @@ Commit message
         selector/owner-opt-out host checks pass. Normal kernel CI will run on
         the new head; the prior8c309ed2a18d full technical CI remains recorded.
     
    +    [on this tree J514C is still opt-in and b55bcaaba520 is not present; the
    +     string is still wrong on the J516C, whose native display is on by default,
    +     and enable=0 matches the T6030 and T8122 diagnostics]
         Fixes: b55bcaaba520 ("soc: apple: default J514C native display on normal boots")
         Assisted-by: Codex:GPT-6
         Signed-off-by: Scott Jones <scottajones@gmail.com>
    +    Link: https://github.com/omacom/linux-aurora/commit/10a834038f4b4309c1c5b251acea1da6b11287c1
     
      ## drivers/pmdomain/apple/pmp-report.c ##
     @@ drivers/pmdomain/apple/pmp-report.c: static const struct apple_pmp_report_offsets apple_pmp_offsets_t6031 = {
1:  d8ecb2e70637 ! 1:  3613c60de224 pmdomain: apple: pmp-report: keep the T8122 14.x GPU readiness for the M3 runtime
    @@ Commit message
         T8122 wait too, built off there; their mutations still target the T6030
         path.
     
    +    [conflict: our dispatch also selects the T8132 report; the T8122 14.x
    +     branch is added in front of it unchanged]
         Generated-by: LLM
         Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
         Signed-off-by: Scott Jones <scottajones@gmail.com>
    +    Link: https://github.com/omacom/linux-aurora/commit/d8ecb2e706378e853c4a749fb8bb84a1d862d123
     
      ## drivers/gpu/drm/asahi/Kconfig ##
     @@ drivers/gpu/drm/asahi/Kconfig: config DRM_ASAHI_M3_T8122
    @@ drivers/pmdomain/apple/pmp-report.c: int apple_pmp_report_wait_supplier_ready(st
     +			return apple_pmp_report_wait_t8122_14(supplier, timeout_ms);
      		return apple_pmp_report_wait_t6030_14(supplier, timeout_ms);
     +	}
    - 	if (!np || !of_device_is_compatible(np, "apple,j613-25g83-pmp-report")) {
    + 	if (!np || !of_device_is_compatible(np, t8132 ?
    + 		"apple,t8132-pmp-v2-report" : "apple,j613-25g83-pmp-report")) {
      		of_node_put(np);
    - 		return -ENODEV;
     
      ## drivers/soc/apple/Kconfig ##
    -@@ drivers/soc/apple/Kconfig: config APPLE_T6030_DISPLAY_GATE
    - 
    - 	  Say 'y' if you want the native display on M3 Pro MacBook Pros.
    +@@ drivers/soc/apple/Kconfig: config APPLE_DISPLAY_GATE
    + 	  Say 'y' if you want the native display on M3 Pro, M3 Max, M3 and
    + 	  M4 Pro Macs.
      
     +config APPLE_T8122_GPU_PMP_LINK
     +	bool
    @@ drivers/soc/apple/Kconfig: config APPLE_T6030_DISPLAY_GATE
     +
      config APPLE_T6030_GPU_PMP_LINK
      	bool
    - 	depends on APPLE_T6030_DISPLAY_GATE
    + 	depends on APPLE_DISPLAY_GATE
     
      ## tools/asahi/t6030-pmp-graph-tests.c ##
     @@ tools/asahi/t6030-pmp-graph-tests.c: typedef uint8_t u8;
    @@ tools/asahi/t6030-pmp-graph-tests.c: typedef uint8_t u8;
     
      ## tools/asahi/t6030-pmp-graph-tests.py ##
     @@ tools/asahi/t6030-pmp-graph-tests.py: def main():
    -         names.insert(names.index('static struct device_node *apple_pmp_report_t6030_entry('), 'static int apple_pmp_report_wait_t6030_bound(')
    +                         'static int apple_pmp_report_entry_resume_noirq(']
          offsets = re.search(r'static const struct apple_pmp_report_offsets apple_pmp_offsets_t6030 = \{.*?\n\};', source, re.S)[0]
          functions = '\n'.join(extract.function(source, n) for n in names)
     +    # The T8122 14.x wait (CONFIG_APPLE_T8122_GPU_PMP_LINK=0 here) precedes the dispatch; it is
    @@ tools/asahi/t6030-pmp-graph-tests.py: def main():
     +    def with_t8122(text):
     +        return text.replace(dispatch, t8122 + dispatch, 1)
          validation = re.sub(r'^#include .*\n', '', (ROOT / 'drivers/pmdomain/apple/pmp-report-validation.h').read_text(), flags=re.M)
    -     code = offsets + '\n' + validation + '\n' + functions
    +     dram_type = re.search(r'struct apple_pmp_dram \{.*?\n\};',
    +                           (ROOT / 'drivers/pmdomain/apple/pmp-dram.h').read_text(), re.S)[0]
    +@@ tools/asahi/t6030-pmp-graph-tests.py: def main():
    +             '\n' + dram_attrs + '\n' + functions)
          # The actual overlay must still describe a halted supplier and disabled DMA/mailbox.
          assert overlay.count('status = \"disabled\";') >= 3
     -    (args.output / 'production.h').write_text(code)
    @@ tools/asahi/t6030-pmp-graph-tests.py: def main():
          compiler = shlex.split(os.environ.get('CC', 'clang'))
          command = compiler + ['-std=gnu11', '-g', '-O1', '-Wall', '-Wextra', '-Werror',
     @@ tools/asahi/t6030-pmp-graph-tests.py: def main():
    -         ]
    +             ]
              for name, old, new in controls:
                  assert code.count(old) == 1, (name, code.count(old))
     -            (args.output / 'production.h').write_text(code.replace(old, new))
1:  b53dc2bc4df5 ! 1:  8ea5e7e01730 dt-bindings: display: apple: describe a common scanout aperture
    @@ Commit message
         subsystem compatible so its shared aperture is checked by this binding.
     
         Assisted-by: OpenAI Codex (gpt-6.1-sol)
    +    [conflict: our binding lists compatibles under oneOf and adds the J713
    +     memory-region properties; the T8122 compatible and apple,dma-range are
    +     added to it]
         Signed-off-by: DjDeveloperr <hey@djdev.me>
    +    Link: https://github.com/omacom/linux-aurora/commit/b53dc2bc4df51a2c48060d43b737d0f704f49024
     
      ## Documentation/devicetree/bindings/display/apple,display-subsystem.yaml ##
    -@@ Documentation/devicetree/bindings/display/apple,display-subsystem.yaml: description:
    - 
    - properties:
    -   compatible:
    --    const: apple,display-subsystem
    -+    enum:
    -+      - apple,display-subsystem
    -+      - apple,t8122-display-subsystem
    - 
    -   iommus:
    -     minItems: 1
    -     maxItems: 8
    +@@ Documentation/devicetree/bindings/display/apple,display-subsystem.yaml: properties:
    +       - enum:
    +           - apple,display-subsystem
    +           - apple,t6031-display-subsystem
    ++          - apple,t8122-display-subsystem
    +           - apple,t8132-display-subsystem
    +       - const: apple,t8132-display-diagnostics
    +         deprecated: true
    +@@ Documentation/devicetree/bindings/display/apple,display-subsystem.yaml: properties:
    +     type: boolean
    +     description: The loader validated the inherited J713 SID0 scanout mapping.
      
     +  apple,dma-range:
     +    $ref: /schemas/types.yaml#/definitions/uint64-array
1:  21d3646b87af ! 1:  16740137c47c iommu/apple-dart: honor consumer apertures before intersecting streams
    @@ Commit message
     
         Assisted-by: OpenAI Codex (gpt-6.1-sol)
         Signed-off-by: DjDeveloperr <hey@djdev.me>
    +    Link: https://github.com/omacom/linux-aurora/commit/21d3646b87af3dc7bb7095d06a232572b5d479e5
     
      ## drivers/iommu/apple-dart-test.c ##
     @@ drivers/iommu/apple-dart-test.c: static void apple_dart_test_iommu_specifiers(struct kunit *test)
    @@ drivers/iommu/apple-dart-test.c: static void apple_dart_test_iommu_specifiers(st
      static void apple_dart_test_before_attach(struct kunit *test)
      {
      	struct apple_dart_master_cfg master = {};
    -@@ drivers/iommu/apple-dart-test.c: static void apple_dart_test_resume_reset_retry(struct kunit *test)
    - 
    - static struct kunit_case apple_dart_test_cases[] = {
    +@@ drivers/iommu/apple-dart-test.c: static struct kunit_case apple_dart_test_cases[] = {
    + 	KUNIT_CASE(apple_dart_test_strict_engines),
    + 	KUNIT_CASE(apple_dart_test_topology),
      	KUNIT_CASE(apple_dart_test_iommu_specifiers),
     +	KUNIT_CASE(apple_dart_test_consumer_window),
     +	KUNIT_CASE(apple_dart_test_invalid_consumer_window),
1:  56e6f927515d ! 1:  2d9dfb63ed51 arm64: dts: apple: t8122: retain the common scanout DMA alias
    @@ Commit message
         qualification remains pending.
     
         Assisted-by: OpenAI Codex (gpt-6.1-sol)
    +    [conflict: our dispext0 comment was shortened in 3b1f90e0; the sentence
    +     about the display subsystem aperture is added to it]
         Signed-off-by: DjDeveloperr <hey@djdev.me>
    +    Link: https://github.com/omacom/linux-aurora/commit/56e6f927515df12d689b6736ce0942361f714203
     
      ## arch/arm64/boot/dts/apple/t8122-dcp.dtsi ##
     @@ arch/arm64/boot/dts/apple/t8122-dcp.dtsi: clk_dispext0: clock-dispext0 {
    @@ arch/arm64/boot/dts/apple/t8122-dcp.dtsi: clk_dispext0: clock-dispext0 {
      	};
      };
     @@ arch/arm64/boot/dts/apple/t8122-dcp.dtsi: pmgr_dcp: power-management@2d03d0000 {
    - 	 * The DMA windows are the ones the working asahi-based kernel uses per
    - 	 * stream: dcpext stream 5 at 0x8_0000_0000 and PIODMA stream 4 from 0
    - 	 * (as on T8112). The display subsystem's stream 0 on dispext0_dart
    --	 * takes its window from disp0_dart, the first DART of that device.
    -+	 * uses the display subsystem's own high scanout aperture. Its PIODMA
    -+	 * stream keeps the low window below.
    + 	/*
    + 	 * External display processor: the boot loader only reserves its
    + 	 * firmware, the driver starts it. DMA windows as on T8112.
    ++	 * The display subsystem's stream 0 on dispext0_dart uses the display
    ++	 * subsystem's own high scanout aperture; its PIODMA stream keeps the
    ++	 * low window below.
      	 */
      	dispext0_dart: iommu@319304000 {
      		compatible = "apple,t8122-dart", "apple,t8110-dart";
1:  b9ed2578d00a ! 1:  b908da42f83e drm/apple: v14.7: take primary planes that reach past the mode's edge
    @@ Commit message
         Fixes: 98d767ecf921 ("drm/apple, media: apple: avd: T6030 internal panel, external display and AVD fixes")
         Signed-off-by: Eryk Wieliczko <eryk@wieliczko.ninja>
         Assisted-by: Claude:claude-opus-5-5
    +    Link: https://github.com/omacom/linux-aurora/commit/b9ed2578d00a89e8e8809ed3cf9f5a29c462ef19
     
      ## drivers/gpu/drm/apple/Makefile ##
     @@ drivers/gpu/drm/apple/Makefile: obj-$(CONFIG_DRM_APPLE_PARSER_KUNIT_TEST) += afkv2-test.o

On top of the carried commits, 99b2d3a selects the T8122 GPU readiness wait by the apple,t8122-pmp-v2 PMP and its linked report node only, dropping the APPLE_T8122_GPU_PMP_LINK Kconfig symbol and the machine checks.

Assisted-by: LLM (Claude:Opus 5.5)

garymeyerca and others added 13 commits November 16, 2026 00:18
The extra trailing zero places the PMU address outside the PMGR range
on J613. Correcting it resolves the probe-time firmware translation
fault on a J613 running firmware compatibility 14.7.

Hardware tested as a module override on the original PR95 kernel,
7.1.12-2-20261013.95-sep-ARCH. Rebased integration source has separate
hardware qualification pending.

Link: omacom/linux-aurora#117
Assisted-by: Codex:GPT-6
Signed-off-by: Scott Jones <scottajones@gmail.com>
Link: omacom/linux-aurora@6b34040
…zed tunnel ports

apple_pcie_config_write() tells the port block about the root port's
prefetchable window (PORT_PREFMEM_ENABLE, port register 0x994) when the PCI core
programs PREF_MEMORY_BASE/LIMIT, but only if pcie->kernel_init is set.
kernel_init is true for apple,t8103-pciec with apple,pciec-kernel-init. The
T600x/T602x tunnel ports use pcie->tunnel_cold_init instead, so on those ports
the hook never runs and the enable bit stays 0.

Measured on a 16-inch M1 Max (T6001), Intel Arc Pro B60 in a Sonnet Breakaway
Box on USB4 tunnel 2 (pcie@f30000000), kernel 7.1.12-2-20261013.18:

 - Every CPU read of a BAR behind the root port's prefetchable window returned
   all-ones, with no AER, abort or UR bits on any bridge. This held for the
   64-bit window with the identity DT range, for the 32-bit prefetchable window,
   and with the BARs placed inside the working non-prefetchable CPU window. A
   function behind the same chain in the non-prefetchable window read correct
   data in every configuration.
 - A runtime bisect with setpci gave each bridge in turn its prefetchable window
   while the others forwarded through widened non-prefetchable windows: the
   windows of 04:01.0, 03:00.0, 02:00.0 and 01:00.0 each read data; only the
   root port's own prefetchable window (0001:00:00.0) read all-ones.
 - PORT_PREFMEM_ENABLE (phys 0xf21000994) read 0 on that boot (0x990 read 1).
   With the kernel's original bridge windows in place and the BARs reachable
   only through the prefetchable windows, reads returned all-ones; after one
   32-bit write of 1 to the register (writel_relaxed, mb, isb, non-posted
   mapping) the same reads returned correct data (B60 BAR0 registers and VRAM).
   The register reads back 0 after the write, so it is a write strobe.

Run the existing hook for tunnel_cold_init ports too.

T6001 only until it is tested on T6021: on a 14-inch M2 Max (T6021) the
prefetchable window forwarded once the DT range was identity.

Tested: the register write above (direct, from a test module). The hook path
itself has not been booted: a rebuilt kernel changes the BTF base of the modules.

(cherry picked from commit 4466fe2ad955d47290fc79c13963c51c0b253706)
[conflict: our config_write takes the cio_cfg_lock and runs the MPS timer
 hook first, so the kernel_init test moved below them; the change is applied
 to that test]
Signed-off-by: Joshua Warren <816217+joshuaswarren@users.noreply.github.com>
Link: omacom/linux-aurora@bb2885b
…dler

brcmf_pcie_quick_check_isr() masks the dongle with
brcmf_pcie_intr_disable() whenever mailboxint reads non-zero.  Since
commit f04be34 ("wifi: brcmfmac: Do not service msgbuf IRQs until
ready in MSI mode") that helper also clears irq_ready, and the threaded
handler services the rings only while irq_ready is set.  The thread
therefore skips brcmf_proto_msgbuf_rx_trigger() for exactly the
interrupts the hard handler caught with mailboxint still set, and then
sets irq_ready again on its way out.

In MSI mode the firmware clears mailboxint itself, so whether the hard
handler sees it set is a race.  When it does, completions that arrived
with that interrupt stay in the D2H rings until a later interrupt.  On
firmware that sends mailbox data over the control ring (no
BRCMF_PCIE_SHARED_USE_MAILBOX) that includes the D3 ACK, and ioctl
responses: brcmf_msgbuf_query_dcmd_len() and brcmf_pcie_pm_enter_D3()
then time out, the latter aborting system suspend.  On a MacBook Air (M1)
with BCM4378 this became frequent with PCIe ASPM L1.2 enabled.  In INTx
mode the hard handler always clears irq_ready first, so the rings are
never serviced at all.

Let the hard handler mask the dongle without touching irq_ready, and let
the thread unmask without setting it, so irq_ready is controlled only by
the code that sets the rings up and tears them down.

Fixes: f04be34 ("wifi: brcmfmac: Do not service msgbuf IRQs until ready in MSI mode")
Assisted-by: Claude:claude-opus-5-5
Signed-off-by: Naeem Malik <malik2015naeem@gmail.com>
Link: omacom/linux-aurora@3a936ed
An AP in WPA/WPA2 mixed mode offers CCMP and TKIP pairwise ciphers with a
TKIP group cipher. The driver registers only CCMP, so iwd refuses the BSS
with NotSupported before any association attempt, and the failure looks
like a wrong password.

The firmware runs the handshake and owns the keys, and it joined such an
AP and passed unicast and group traffic with no other change. Register
TKIP and accept it as the group cipher for WPA2-PSK. Pairwise TKIP, WPA1,
and a TKIP group with SAE or OWE stay refused.

Tested on J700 against one AP's 5 GHz network: gateway and internet
traffic, DNS, and mDNS discovery of other LAN devices through the group
key.

Link: omacom/linux-aurora#398
Assisted-by: Claude:claude-opus-5-5
[conflict: kept our 6 GHz band check and PSK_SHA256/AES-CMAC entries and
 our PMF-required PSK test row; the TKIP group rule follows the band check]
Signed-off-by: zoan37 <104385984+zoan37@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Link: omacom/linux-aurora@eb6549c
The station security notes still say CCMP only. Describe what the driver
accepts, and record that MIC failure reporting and TKIP countermeasures
are left to firmware and have not been verified.

Link: omacom/linux-aurora#398
Assisted-by: Claude:claude-opus-5-5
[conflict: our notes already list PSK-SHA256, OWE and BIP-CMAC-128; the
 TKIP text is added to them]
Signed-off-by: zoan37 <104385984+zoan37@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Link: omacom/linux-aurora@a2b0f53
bindgen emits valid unformatted Rust when rustfmt is unavailable. Accept whitespace around the unconditional const assertion and reject both formatted and unformatted test attributes. Keep the C/Rust compilation and layout assertions unchanged.

Assisted-by: LLM
Signed-off-by: Kallisti <kallisti@kallisti.io>
Link: omacom/linux-aurora@6ba4695
Before the module's final activate() step, the G15 probe returned
-EPROBE_DEFER. That put the GPU on the driver core's deferred-probe list.
activate() then runs the real probe through driver_attach(), but if that
probe fails for good, for example because the firmware is rejected, the
driver core does not take the device off the list. It stays in
/sys/kernel/debug/devices_deferred until the deferred-probe work next
runs, so anything that waits on that list keeps waiting.

Return -ENODEV instead. activate() already reprobes every unbound device
once MODULE_READY is set, and a device added later sees it set, so
nothing needs the deferred list to retry. The display and PMP waits
inside the real probe still return -EPROBE_DEFER.

g15-probe-init-tests.py now checks that every probe before activation
returns -ENODEV, and adds a mutant that defers again.

Assisted-by: Claude:claude-opus-5-5
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
[conflict: our module also registers the G16 adapter, so the host test
 counts each attempted registration instead of assuming two, and the
 mutant table keeps our activation-before-g16-registration entry]
Signed-off-by: Scott Jones <scottajones@gmail.com>
Link: omacom/linux-aurora@6447458
J514C and J516C native display now starts on normal boots. The PMP
failure diagnostic still recommends omitting enable=1, which no longer
requests the boot-framebuffer fallback on those boards. Name the explicit
apple_t6031_display.enable=0 owner opt-out instead.

This changes only the diagnostic string. It does not change PMP startup,
matching, handoff checks, display defaults or GPU admission. Checkpatch
passes with sign-off checking disabled, and the existing production
selector/owner-opt-out host checks pass. Normal kernel CI will run on
the new head; the prior8c309ed2a18d full technical CI remains recorded.

[on this tree J514C is still opt-in and b55bcaaba520 is not present; the
 string is still wrong on the J516C, whose native display is on by default,
 and enable=0 matches the T6030 and T8122 diagnostics]
Fixes: b55bcaaba520 ("soc: apple: default J514C native display on normal boots")
Assisted-by: Codex:GPT-6
Signed-off-by: Scott Jones <scottajones@gmail.com>
Link: omacom/linux-aurora@10a8340
…e M3 runtime

The 7.2 rebase replaced the T8122 14.x branch of
apple_pmp_report_wait_supplier_ready() with a T6030-only one, so on an M3
MacBook Air every GPU power vote returns -ENODEV even with the PMP
running. With the new hidden APPLE_T8122_GPU_PMP_LINK, which
DRM_ASAHI_M3_T8122 selects (as DRM_ASAHI_G15 selects
APPLE_T6030_GPU_PMP_LINK), wait for the unique T8122 report's display
request (DISP, reg 7) to be ready and acknowledged before AGX, as on the
7.1.12 kernel the runtime was qualified with.

The PMP graph and supplier host tests copy the dispatch, so they copy the
T8122 wait too, built off there; their mutations still target the T6030
path.

[conflict: our dispatch also selects the T8132 report; the T8122 14.x
 branch is added in front of it unchanged]
Generated-by: LLM
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Scott Jones <scottajones@gmail.com>
Link: omacom/linux-aurora@d8ecb2e
Document the display consumer's optional DMA aperture, which can differ
from the defaults of individual scanout DARTs. Include the T8122 display
subsystem compatible so its shared aperture is checked by this binding.

Assisted-by: OpenAI Codex (gpt-6.1-sol)
[conflict: our binding lists compatibles under oneOf and adds the J713
 memory-region properties; the T8122 compatible and apple,dma-range are
 added to it]
Signed-off-by: DjDeveloperr <hey@djdev.me>
Link: omacom/linux-aurora@b53dc2b
Domain allocation already lets a consumer specify apple,dma-range, but
of_xlate intersects the provider defaults before that override is read.
A consumer with a common scanout alias and DARTs with disjoint defaults
therefore fails configuration before its domain can be allocated.

Apply the same consumer aperture while parsing each specifier, retaining
validation of both explicit five-cell windows and the override. Share the
alignment, overflow and alias-width checks. Consumers without an override
keep their existing windows.

Add KUnit cases for the J613 high scanout alias across internal/external
DART defaults, independent low PIODMA, malformed overrides and invalid
five-cell specifiers. An ASAN/UBSAN fixture executing the production parser
and of_xlate reproduces the old rejection and accepts the common window.

Assisted-by: OpenAI Codex (gpt-6.1-sol)
Signed-off-by: DjDeveloperr <hey@djdev.me>
Link: omacom/linux-aurora@21d3646
The display gate adds the external display DART to the shared display
subsystem. Its low PIODMA default does not overlap the internal display's
inherited 1 TiB alias, so their defaults cannot be intersected for scanout.

Describe the subsystem's common scanout aperture explicitly, matching the
internal DART. The external PIODMA consumer retains its existing low
aperture and the external processor still requires the firmware-ready
gate. This is a software-validated candidate; hardware external-display
qualification remains pending.

Assisted-by: OpenAI Codex (gpt-6.1-sol)
[conflict: our dispext0 comment was shortened in 3b1f90e; the sentence
 about the display subsystem aperture is added to it]
Signed-off-by: DjDeveloperr <hey@djdev.me>
Link: omacom/linux-aurora@56e6f92
The 14.7 presenter scans out one unscaled image of the mode's size from
the top-left of the framebuffer, and iomfb_v14_7_atomic_check() admitted
only planes that describe exactly that. It compared the plane's raw
src_* and crtc_* fields with the mode, so it rejected a plane whose
destination reaches past the right or bottom edge of the CRTC with
-EINVAL. The DRM uAPI allows such a plane: apple_plane_atomic_check()
has already clipped it with drm_atomic_helper_check_plane_state()
(can_position is true), and the part left on the mode is what the
presenter shows.

KWin puts up such a plane when it mirrors one output on another. On a
J514S (M3 Pro), with the 3024x1964 panel at scale 1.7 mirrored onto an
XREAL One (1920x1080 over DisplayPort alt mode), it centres a 1663-pixel
wide picture and rounds the 128.5-pixel border up on both sides, so the
external primary plane is 1921x1080 on a 1920x1080 mode. Every frame on
the glasses then failed its commit, and they showed nothing. Once the
glasses dropped and asserted HPD again, the connector's link-status
went bad and KWin forced a modeset that included the panel. That commit
failed on the same plane, and KWin retried it on every frame, so the
panel froze too, with the pointer: around 350 failed commits a second
until the mirror was turned off.

Judge the plane by its clipped rectangles instead: the clipped source
must start at the framebuffer's origin and, like the clipped
destination, be of the mode's size. Hand the presenter the clipped
source size on external pipes. Planes that start left of or above the
mode, are offset into the framebuffer, are scaled or do not cover the
mode are still rejected, and the panel still takes only a framebuffer of
its mode's size, as before. A plane that the old check admitted has
clipped rectangles equal to its raw ones, so it is judged and shown as
before.

The new KUnit suite runs drm_atomic_helper_check_plane_state() with the
limits apple_plane_atomic_check() passes it, and checks which planes are
admitted and, through the helper flush uses, what size the presenter is
given.

Fixes: 98d767e ("drm/apple, media: apple: avd: T6030 internal panel, external display and AVD fixes")
Signed-off-by: Eryk Wieliczko <eryk@wieliczko.ninja>
Assisted-by: Claude:claude-opus-5-5
Link: omacom/linux-aurora@b9ed257
@RyanTheTide

Copy link
Copy Markdown
Contributor Author

Hardware status for b908da4: the M2 (T8112) rows pass: brcmfmac traffic and s2idle x3 on rtc1, the same DART bindings and 0 apple-dart errors through boot, Wi-Fi, s2idle, DPMS and GPU.

Before merge: 1674013 applies a consumer's apple,dma-range in xlate now, and consumers with that property also sit in t600x-pciec.dtsi, t604x.dtsi / t6040-j616s.dts and t8140.dtsi / t8140-j700.dts. The T6000, T6040 and T8140 boots each need the same DART row (bindings identical, 0 apple-dart errors through boot, display and s2idle). Also still open: a USB4/TB hotplug row with a PCIe endpoint behind the tunnel (prefetchable BAR) for 19b4be4, and a T8140 mt7932 join to a CCMP-pairwise, TKIP-group PSK AP for f485a0b.

The T8122 14.x GPU readiness wait was gated three times: by a hidden
per-machine Kconfig symbol (APPLE_T8122_GPU_PMP_LINK, selected by the
M3 runtime), by the "apple,t8122" machine compatible, and by the
hardware itself, an "apple,t8122-pmp-v2" supplier with exactly one
available "apple,t8122-pmp-v2-report" node whose "apple,pmp" points
back at it.

The hardware match is enough. Drop the Kconfig symbol and both machine
checks, and try the T8122 wait first for every supplier without a
declared report: it returns -ENODEV unless the PMP and its report are
there, and the T6030 wait follows as before. Suppliers on other SoCs
get the same results as before. On a T8122 whose device tree has the
report, the wait now also runs in kernels built without the M3 GPU
runtime. The host tests lose their CONFIG_APPLE_T8122_GPU_PMP_LINK=0
define.

Signed-off-by: Ryan <ryan@aurorasilicon.org>
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.

10 participants