drm: apple: isolate an experimental T8140 external display profile

Documentation/devicetree/bindings/phy/apple,atcphy.yaml

@@ -50,6 +50,11 @@ allOf:
         reg-names:
           maxItems: 5
         apple,tunable-usb2phy-reg-dflt: false
+        apple,tunable-dp-common-pre: false
+        apple,tunable-dp-lpdptx: false
+        apple,tunable-dp-common-post: false
+      patternProperties:
+        "^apple,dp-training-table(-rbr|-hbr|-hbr2|-hbr3)?$": false
 
 $defs:
   apple,tunable:
@@ -179,13 +184,44 @@ properties:
       Note that lane here refers to a USB RX and TX pair re-used for DisplayPort
       and not to an individual DisplayPort differential lane.
 
+  apple,tunable-dp-common-pre:
+    $ref: "#/$defs/apple,tunable"
+    maxItems: 5461
+    description: >
+      T8140 DisplayPort core setup applied before the LPDPTX list. The
+      bootloader supplies device-specific values for the core register region.
+
+  apple,tunable-dp-lpdptx:
+    $ref: "#/$defs/apple,tunable"
+    maxItems: 5461
+    description: >
+      T8140 DisplayPort setup for the lpdptx register region, applied between
+      the common-pre and common-post lists.
+
+  apple,tunable-dp-common-post:
+    $ref: "#/$defs/apple,tunable"
+    maxItems: 5461
+    description: >
+      T8140 DisplayPort core setup applied after the LPDPTX list. All three
+      DisplayPort lists are needed before selecting a DisplayPort PHY mode.
+
   apple,tunable-usb2phy-reg-dflt:
     $ref: "#/$defs/apple,tunable"
     description: >
       Per-device defaults for the secondary eUSB2 PHY register bank of the
       T8140, copied from Apple's Device Tree by the bootloader. Unlike the
       other tunables these are applied to the usb2phy-reg region.
 
+patternProperties:
+  "^apple,dp-training-table(-rbr|-hbr|-hbr2|-hbr3)?$":
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 16
+    maxItems: 16
+    description: >
+      Firmware-provided T8140 drive presets indexed by voltage swing times
+      four plus pre-emphasis. The unsuffixed table is the required fallback;
+      a link-rate suffix selects an optional rate-specific override.
+
 required:
   - compatible
   - reg

MAINTAINERS

@@ -1952,6 +1952,7 @@ L:	dri-devel@lists.freedesktop.org
 S:	Maintained
 T:	git git://anongit.freedesktop.org/drm/drm-misc
 F:	drivers/gpu/drm/apple/
+F:	tools/testing/selftests/drivers/gpu/apple-afkv2/
 
 APPLE PCIE CONTROLLER DRIVER
 M:	Marc Zyngier <maz@kernel.org>
@@ -2005,6 +2006,7 @@ F:	arch/arm64/include/asm/apple-idle.h
 F:	arch/arm64/kernel/idle-apple.S
 F:	drivers/hid/dockchannel-hid/dockchannel-hid-protocol*
 F:	drivers/iio/common/aop_sensors/
+F:	drivers/phy/apple/atc-j700-dp.h
 F:	drivers/rtc/rtc-apple-pmu.c
 F:	drivers/soc/apple/aop.rs
 F:	drivers/soc/apple/mcc.c
@@ -2014,6 +2016,18 @@ F:	include/linux/soc/apple/pci-apple-piodma.h
 F:	rust/kernel/iio/common/aop_sensors.rs
 F:	rust/kernel/soc/apple/aop.rs
 F:	sound/soc/apple/t8140_aop_audio.rs
+F:	tools/diagnostics/apple-dptx-training-test.c
+F:	tools/diagnostics/apple-j700-dp-test.c
+F:	tools/diagnostics/test-apple-afk-admission.py
+F:	tools/diagnostics/test-apple-atc-unwind.py
+F:	tools/diagnostics/test-apple-dcp-readiness.py
+F:	tools/diagnostics/test-apple-j700-crossbar.py
+F:	tools/diagnostics/test-apple-j700-d134.py
+F:	tools/diagnostics/test-apple-j700-dp.py
+F:	tools/diagnostics/test-apple-j700-opaque-scope.py
+F:	tools/diagnostics/test-apple-j700-provider.py
+F:	tools/diagnostics/test-apple-j700-tuning.py
+F:	tools/diagnostics/wayland-output-frame-test.py
 F:	tools/testing/apple/
 
 APPLETALK NETWORK LAYER
@@ -2635,6 +2649,8 @@ F:	drivers/nvme/host/apple.c
 F:	drivers/nvmem/apple-efuses.c
 F:	drivers/nvmem/apple-spmi-nvmem.c
 F:	drivers/phy/apple/
+F:	tools/diagnostics/apple-atc-readback.py
+F:	tools/diagnostics/test-apple-atc-aux.py
 F:	drivers/pinctrl/pinctrl-apple-gpio.c
 F:	drivers/pmdomain/apple/
 F:	drivers/power/reset/macsmc-reboot.c

arch/arm64/boot/dts/apple/Makefile

@@ -111,4 +111,5 @@ dtb-$(CONFIG_ARCH_APPLE) += t8122-j504.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t8122-j613.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t8122-j615.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t8140-j700.dtb
+dtb-$(CONFIG_ARCH_APPLE) += t8140-j700-external-test.dtb
 dtb-$(CONFIG_ARCH_APPLE) += t8142-j813.dtb

arch/arm64/boot/dts/apple/t8140-j700-dcpext.dtsi

@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * T8140 external display resources measured through the public ADT API.
+ * Generated-by: LLM
+ * Assisted-by: LLM
+ *
+ * The controller and route remain disabled. Their live firmware
+ * profile, bandwidth request, routing selector and handoff must be qualified
+ * before enabling the controller. The existing T8140 refusal remains in force.
+ */
+
+&{/soc} {
+	dcpext: dcp@416e00000 {
+		compatible = "apple,t8140-dcpext", "apple,dcp";
+		reg = <0x4 0x16e00000 0x0 0x4000>,
+		      <0x4 0x14000000 0x0 0xafc000>,
+		      <0x4 0x16240000 0x0 0x10000>,
+		      <0x4 0x163ac000 0x0 0x4000>,
+		      <0x4 0x16800000 0x0 0x800000>,
+		      <0x3 0x02800000 0x0 0xbc000>,
+		      <0x4 0x16850000 0x0 0x4000>;
+		reg-names = "coproc", "disp-0", "disp-1", "disp-2",
+			    "disp-3", "disp-4", "iop-vbar";
+		mboxes = <&dcpext_mbox>;
+		mbox-names = "mbox";
+		/* First mapper in the measured ADT iommu-parent list. */
+		iommus = <&dcpext0_dart 23>;
+		power-domains = <&ps_dispext0_cpu>;
+		apple,connector-type = "USB-C";
+		status = "disabled";
+
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		dispext0_piodma: piodma {
+			iommus = <&dispext0_dart 16>;
+		};
+
+		typec-routes {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			route@0 {
+				reg = <0>;
+				status = "disabled";
+				mode-switch;
+
+				port {
+					dcpext_typec0: endpoint {
+						remote-endpoint = <&typec0_dcp>;
+					};
+				};
+			};
+		};
+	};
+};
+
+&typec0 {
+	ports {
+		port@3 {
+			reg = <3>;
+
+			typec0_dcp: endpoint {
+				remote-endpoint = <&dcpext_typec0>;
+			};
+		};
+	};
+};
+
+/* Retain the inherited firmware supply once the loader publishes it. */
+&ps_dispext0_cpu {
+	apple,always-on;
+};

arch/arm64/boot/dts/apple/t8140-j700-external-test.dts

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/* Explicit external-display trial; the ordinary J700 tree is unchanged. */
+#include "t8140-j700.dts"
+#include <dt-bindings/phy/phy.h>
+
+&display {
+	iommus = <&disp0_dart 0>, <&dispext0_dart 0>;
+};
+
+&dcpext {
+	clocks = <&clk_disp0_154>, <&clk_disp0_194>;
+	clock-names = "clock-154", "clock-194";
+	phys = <&atcphy0 PHY_TYPE_DP>;
+	phy-names = "typec0";
+	mux-controls = <&dpxbar0 0>;
+	mux-control-names = "typec0";
+	apple,typec-mux-indices = <2>;
+	apple,typec-dptx-phys = <0>;
+	apple,dcp-index = <1>;
+};
+
+&{/soc/dcp@416e00000/typec-routes/route@0} {
+	status = "okay";
+};
+
+/* Match the external firmware buffer window rather than allocating below it. */
+&dcpext0_dart {
+	apple,dma-range = <0x100 0x0 0x10 0x0>;
+};

arch/arm64/boot/dts/apple/t8140-j700.dts

@@ -1918,3 +1918,6 @@
 		local-mac-address = [00 00 00 00 00 00];
 	};
 };
+
+/* External resources stay disabled pending the separate firmware profile. */
+#include "t8140-j700-dcpext.dtsi"

drivers/gpu/drm/apple/Makefile

@@ -21,3 +21,5 @@ appledrm-$(CONFIG_TRACING) += trace.o
 obj-$(CONFIG_DRM_APPLE) += appledrm.o
 obj-$(CONFIG_DRM_APPLE_KUNIT_TEST) += afk_test.o
 obj-$(CONFIG_DRM_APPLE_KUNIT_TEST) += dcp_backlight_test.o
+
+obj-$(CONFIG_DRM_APPLE_KUNIT_TEST) += afk-service-test.o

drivers/gpu/drm/apple/afk-service-test.c

@@ -3,6 +3,7 @@
 #include <linux/module.h>
 
 #include "afk.h"
+#include "dptx-service.h"
 
 static const struct apple_epic_service_ops reusable_ops = {
 	.name = "reusable",
@@ -122,7 +123,105 @@ static void afk_service_unconverted_owner_test(struct kunit *test)
 	KUNIT_EXPECT_FALSE(test, afk_service_reinit(service, NULL, &reusable_ops, 2));
 }
 
+static int afk_test_prepare(struct apple_epic_service *service,
+			    const char *name, const char *class, s64 unit)
+{
+	return 0;
+}
+
+static const struct apple_epic_service_ops prepared_ops = {
+	.name = "prepared",
+	.prepare = afk_test_prepare,
+	.teardown = dptx_service_unbind,
+};
+
+static void afk_service_admission_test(struct kunit *test)
+{
+	struct apple_epic_service *service = test->priv;
+
+	KUNIT_ASSERT_TRUE(test, afk_service_reinit(service, NULL, &prepared_ops, 1));
+	/* Neither callback dispatch nor command callers can observe preparation. */
+	KUNIT_EXPECT_FALSE(test, afk_service_matches(service, 1));
+	KUNIT_EXPECT_PTR_EQ(test, afk_service_get(service), NULL);
+	/* A rejected announcement or failed OPEN consumes no service slot. */
+	afk_service_discard(service);
+	KUNIT_ASSERT_TRUE(test, afk_service_reinit(service, NULL, &prepared_ops, 2));
+	/* Cookie-less services are valid: admission does not test cookie != NULL. */
+	afk_service_publish(service);
+	KUNIT_EXPECT_TRUE(test, afk_service_matches(service, 2));
+	KUNIT_ASSERT_PTR_EQ(test, afk_service_get(service), service);
+	afk_service_put(service);
+}
+
+static void dptx_service_identity_test(struct kunit *test)
+{
+	const char *name = "dcpdptx-port-epic";
+	const char *class = "AppleDCPDPTXRemotePort";
+
+	KUNIT_EXPECT_EQ(test, dptx_service_port(name, class, 3, true, 3, 1), 0);
+	KUNIT_EXPECT_EQ(test, dptx_service_port(name, class, 0, true, 3, 1), -EINVAL);
+	KUNIT_EXPECT_EQ(test, dptx_service_port(name, class, -1, true, 3, 1), -EINVAL);
+	KUNIT_EXPECT_EQ(test, dptx_service_port(name, class, 3, true, 3, 2), -EINVAL);
+	KUNIT_EXPECT_EQ(test, dptx_service_port(NULL, class, 3, true, 3, 1), -EINVAL);
+	KUNIT_EXPECT_EQ(test, dptx_service_port(name, NULL, 3, true, 3, 1), -EINVAL);
+	KUNIT_EXPECT_EQ(test, dptx_service_port("wrong", class, 3, true, 3, 1), -EINVAL);
+	KUNIT_EXPECT_EQ(test, dptx_service_port(name, "wrong", 3, true, 3, 1), -EINVAL);
+	KUNIT_EXPECT_EQ(test, dptx_service_port(name, class, 1, false, 3, 2), 1);
+	KUNIT_EXPECT_EQ(test, dptx_service_port(name, class, 2, false, 3, 2), -EINVAL);
+}
+
+static void dptx_service_duplicate_close_test(struct kunit *test)
+{
+	struct apple_epic_service *first = test->priv;
+	struct apple_epic_service *next;
+	struct dptx_port port = {};
+
+	next = kunit_kzalloc(test, sizeof(*next), GFP_KERNEL);
+	KUNIT_ASSERT_NOT_NULL(test, next);
+	spin_lock_init(&next->lock);
+	init_completion(&port.enable_completion);
+	KUNIT_ASSERT_TRUE(test, afk_service_reinit(first, NULL, &prepared_ops, 1));
+	KUNIT_ASSERT_EQ(test, dptx_service_bind(first, &port, 3), 0);
+	/* An observer during preparation/OPEN sees no available port or owner. */
+	KUNIT_EXPECT_FALSE(test, dptx_service_available(&port));
+	KUNIT_EXPECT_PTR_EQ(test, port.service, NULL);
+	KUNIT_EXPECT_PTR_EQ(test, first->cookie, &port);
+	/* Failed OPEN does not publish anything and permits a fresh attempt. */
+	afk_service_discard(first);
+	KUNIT_EXPECT_FALSE(test, port.enabled);
+	KUNIT_EXPECT_PTR_EQ(test, port.service, NULL);
+	KUNIT_ASSERT_TRUE(test, afk_service_reinit(first, NULL, &prepared_ops, 1));
+	KUNIT_ASSERT_EQ(test, dptx_service_bind(first, &port, 3), 0);
+	afk_service_publish(first);
+	KUNIT_EXPECT_FALSE(test, port.enabled);
+	dptx_service_publish(first);
+	KUNIT_EXPECT_TRUE(test, dptx_service_available(&port));
+	KUNIT_EXPECT_PTR_EQ(test, port.service->cookie, &port);
+	KUNIT_ASSERT_TRUE(test, afk_service_reinit(next, NULL, &prepared_ops, 2));
+	KUNIT_EXPECT_EQ(test, dptx_service_bind(next, &port, 3), -EBUSY);
+	afk_service_discard(next);
+	KUNIT_EXPECT_TRUE(test, port.enabled);
+	KUNIT_EXPECT_PTR_EQ(test, port.service, first);
+	/* CLOSE invalidates a connected session without publishing a replacement. */
+	port.connected = true;
+	afk_test_retire(first);
+	dptx_service_unbind(first);
+	KUNIT_EXPECT_FALSE(test, port.enabled);
+	KUNIT_EXPECT_FALSE(test, port.connected);
+	KUNIT_EXPECT_PTR_EQ(test, first->cookie, &port);
+	KUNIT_ASSERT_TRUE(test, afk_service_reinit(next, NULL, &prepared_ops, 3));
+	KUNIT_EXPECT_EQ(test, dptx_service_bind(next, &port, 3), -EBUSY);
+	afk_service_discard(next);
+	/* Old work between validate/connect/request still names the old session. */
+	KUNIT_EXPECT_PTR_EQ(test, port.service, first);
+	KUNIT_EXPECT_PTR_EQ(test, afk_service_get(port.service), NULL);
+	KUNIT_EXPECT_FALSE(test, port.enabled);
+}
+
 static struct kunit_case afk_service_cases[] = {
+	KUNIT_CASE(afk_service_admission_test),
+	KUNIT_CASE(dptx_service_identity_test),
+	KUNIT_CASE(dptx_service_duplicate_close_test),
 	KUNIT_CASE(afk_service_many_generations_test),
 	KUNIT_CASE(afk_service_reader_pin_test),
 	KUNIT_CASE(afk_service_pending_reply_test),