Skip to content

PMP support #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WhatAmISupposedToPutHere wants to merge 4 commits into
base: asahi-wip
Choose a base branch
from
+1,397 −15
Open

PMP support #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
362844f
rust: bindings: WIP(?): Export various bits for PMP driver
WhatAmISupposedToPutHere Feb 26, 2026
9cd5557
soc: apple: Add support for the PMP co-processor
WhatAmISupposedToPutHere Feb 26, 2026
3bda44d
pmdomain: apple: Add PMP reporting interface
WhatAmISupposedToPutHere Feb 26, 2026
7c135f2
arm64: dts: apple: Add PMP nodes and hook up power reporting
WhatAmISupposedToPutHere Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions arch/arm64/boot/dts/apple/t6000.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,21 @@
};

/delete-node/ &pmgr_south;
/delete-node/ &pmp_report_dispext2;
/delete-node/ &pmp_report_dispext3;
/delete-node/ &pmp_report_venc1;
/delete-node/ &pmp_report_msr1;
/delete-node/ &pmp_report_prores;

&pmp {
apple,pio-ranges = <0x2 0x82000000 0x0 0x1000000>,
<0x3 0x4000000 0x0 0x1000000>,
<0x3 0x83000000 0x0 0x1000000>,
<0x4 0x2000000 0x0 0x1000000>,
<0x2 0x10e70000 0x0 0x90000>,
<0x2 0x11e70000 0x0 0x90000>,
<0x2 0x12e70000 0x0 0x90000>;
};

&gpu {
compatible = "apple,agx-t6000", "apple,agx-g13x";
Expand Down
12 changes: 12 additions & 0 deletions arch/arm64/boot/dts/apple/t6001.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,18 @@
};
};

&pmp {
apple,pio-ranges = <0x2 0x82000000 0x0 0x1000000>,
<0x3 0x4000000 0x0 0x1000000>,
<0x3 0x83000000 0x0 0x1000000>,
<0x4 0x2000000 0x0 0x1000000>,
<0x2 0x10e70000 0x0 0x90000>,
<0x2 0x11e70000 0x0 0x90000>,
<0x2 0x12e70000 0x0 0x90000>,
<0x4 0x82000000 0x0 0x1000000>,
<0x5 0x2000000 0x0 0x1000000>;
};

&gpu {
compatible = "apple,agx-t6001", "apple,agx-g13c", "apple,agx-g13s";
};
57 changes: 57 additions & 0 deletions arch/arm64/boot/dts/apple/t6002.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,63 @@
power-domains = <&ps_afr>, <&ps_afr_die1>;
};

&pmp {
apple,pio-ranges = <0x2 0x82000000 0x0 0x1000000>,
<0x3 0x4000000 0x0 0x1000000>,
<0x3 0x83000000 0x0 0x1000000>,
<0x4 0x2000000 0x0 0x1000000>,
<0x2 0x10e70000 0x0 0x90000>,
<0x2 0x11e70000 0x0 0x90000>,
<0x2 0x12e70000 0x0 0x90000>,
<0x4 0x82000000 0x0 0x1000000>,
<0x5 0x2000000 0x0 0x1000000>,
<0x22 0x82000000 0x0 0x1000000>,
<0x23 0x4000000 0x0 0x1000000>,
<0x23 0x83000000 0x0 0x1000000>,
<0x24 0x2000000 0x0 0x1000000>,
<0x24 0x82000000 0x0 0x1000000>,
<0x25 0x2000000 0x0 0x1000000>,
<0x22 0x10e70000 0x0 0x90000>,
<0x22 0x11e70000 0x0 0x90000>,
<0x22 0x12e70000 0x0 0x90000>;
};

&pmp_report {
pmp_report_dispext0_die1: report@33 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x33>;
label = "pmp-dispext0_die1";
#power-domain-cells = <0>;
power-domains = <&ps_dispext0_cpu0_die1>;
};

pmp_report_dispext1_die1: report@34 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x34>;
label = "pmp-dispext1_die1";
#power-domain-cells = <0>;
power-domains = <&ps_dispext1_cpu0_die1>;
};

pmp_report_dispext2_die1: report@35 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x35>;
label = "pmp-dispext2_die1";
#power-domain-cells = <0>;
power-domains = <&ps_dispext1_cpu0_die1>;
status = "disabled";
};

pmp_report_dispext3_die1: report@36 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x36>;
label = "pmp-dispext3_die1";
#power-domain-cells = <0>;
power-domains = <&ps_dispext1_cpu0_die1>;
status = "disabled";
};
};

&gpu {
compatible = "apple,agx-t6002", "apple,agx-g13d", "apple,agx-g13s";
};
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/apple/t600x-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

aliases {
gpu = &gpu;
pmp = &pmp;
};

cpus {
Expand Down
190 changes: 187 additions & 3 deletions arch/arm64/boot/dts/apple/t600x-die0.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,190 @@
#apple,bw-scratch-cells = <3>;
};

pmp_dart: iommu@28e300000 {
compatible = "apple,t6000-dart";
reg = <0x2 0x8e300000 0x0 0x4000>;
#iommu-cells = <1>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1010 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_pmp>;
};

pmp_report: pmp_report@28e3c0000 {
compatible = "apple,t6000-pmp-v2-report";
reg = <0x2 0x8e3c0000 0x0 0x20000>;
power-domains = <&ps_pms_sram>;
#address-cells = <1>;
#size-cells = <0>;

pmp_report_gfx: report@9 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x9>;
label = "pmp-gfx";
#power-domain-cells = <0>;
power-domains = <&ps_gfx>;
};

pmp_report_ane_sys: report@a {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0xa>;
label = "pmp-ane-sys";
#power-domain-cells = <0>;
power-domains = <&ps_ane_sys>;
status = "disabled";
};

pmp_report_isp_sys: report@b {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0xb>;
label = "pmp-isp-sys";
#power-domain-cells = <0>;
power-domains = <&ps_isp_sys>;
};

pmp_report_disp0: report@c {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0xc>;
label = "pmp-disp0";
#power-domain-cells = <0>;
power-domains = <&ps_disp0_cpu0>;
apple,always-on;
};

pmp_report_dispext0: report@d {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0xd>;
label = "pmp-dispext0";
#power-domain-cells = <0>;
power-domains = <&ps_dispext0_cpu0>;
};

pmp_report_dispext1: report@e {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0xe>;
label = "pmp-dispext1";
#power-domain-cells = <0>;
power-domains = <&ps_dispext1_cpu0>;
};

pmp_report_venc_sys: report@10 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x10>;
label = "pmp-venc-sys";
#power-domain-cells = <0>;
power-domains = <&ps_venc_sys>;
status = "disabled";
};

pmp_report_avd_sys: report@11 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x11>;
label = "pmp-avd-sys";
#power-domain-cells = <0>;
power-domains = <&ps_avd_sys>;
status = "disabled";
};

pmp_report_msr0: report@12 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x12>;
label = "pmp-msr0";
#power-domain-cells = <0>;
power-domains = <&ps_msr0>;
status = "disabled";
};

pmp_report_jpg: report@13 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x13>;
label = "pmp-jpg";
#power-domain-cells = <0>;
power-domains = <&ps_jpg>;
status = "disabled";
};

pmp_report_scodec: report@14 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x14>;
label = "pmp-scodec";
#power-domain-cells = <0>;
power-domains = <&ps_scodec>;
status = "disabled";
};

pmp_report_dispext2: report@20 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x20>;
label = "pmp-dispext2";
#power-domain-cells = <0>;
power-domains = <&ps_dispext2_cpu0>;
status = "disabled";
};

pmp_report_dispext3: report@21 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x21>;
label = "pmp-dispext3";
#power-domain-cells = <0>;
power-domains = <&ps_dispext3_cpu0>;
status = "disabled";
};

pmp_report_venc1: report@22 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x22>;
label = "pmp-venc1";
#power-domain-cells = <0>;
power-domains = <&ps_venc1_sys>;
status = "disabled";
};

pmp_report_msr1: report@23 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x23>;
label = "pmp-msr1";
#power-domain-cells = <0>;
power-domains = <&ps_msr1>;
status = "disabled";
};

pmp_report_prores: report@24 {
compatible = "apple,t6000-pmp-v2-report-entry";
reg = <0x24>;
label = "pmp-prores";
#power-domain-cells = <0>;
power-domains = <&ps_prores>;
status = "disabled";
};
};

pmp: pmp@28e700000 {
compatible = "apple,t6000-pmp-v2";
reg = <0x2 0x8e700000 0x0 0x100000>,
<0x2 0x8ec00000 0x0 0x4000>;
reg-names = "pmp", "asc";
mboxes = <&pmp_mbox>;
mbox-names = "mbox";
iommus = <&pmp_dart 0>;
power-domains = <&ps_pmp>;
tunables {
};
};

pmp_mbox: mbox@28ec08000 {
compatible = "apple,t6000-asc-mailbox", "apple,asc-mailbox-v4";
reg = <0x2 0x8ec08000 0x0 0x4000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1006 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1007 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1008 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1009 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "send-empty", "send-not-empty",
"recv-empty", "recv-not-empty";
#mbox-cells = <0>;
power-domains = <&ps_pmp>, <&ps_pms_sram>;
};

smc: smc@290400000 {
compatible = "apple,t6000-smc", "apple,smc";
reg = <0x2 0x90400000 0x0 0x4000>,
Expand Down Expand Up @@ -333,7 +517,7 @@
<0x3 0x8b344000 0x0 0x4000>,
<0x3 0x8b800000 0x0 0x800000>;
apple,bw-scratch = <&pmgr_dcp 0 4 0x988>;
power-domains = <&ps_disp0_cpu0>;
power-domains = <&pmp_report_disp0>;
resets = <&ps_disp0_cpu0>;
clocks = <&clk_disp0>;
phandle = <&dcp>;
Expand Down Expand Up @@ -545,7 +729,7 @@
<0x4 0x4000000 0 0x1000000>;
reg-names = "asc", "sgx";
mboxes = <&agx_mbox>;
power-domains = <&ps_gfx>;
power-domains = <&pmp_report_gfx>;
memory-region = <&uat_ttbs>, <&uat_pagetables>, <&uat_handoff>,
<&gpu_hw_cal_a>, <&gpu_hw_cal_b>, <&gpu_globals>;
memory-region-names = "ttbs", "pagetables", "handoff",
Expand Down Expand Up @@ -644,7 +828,7 @@
<0x3 0x861043f0 0x0 0x100>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 538 IRQ_TYPE_LEVEL_HIGH>;
power-domains = <&ps_isp_sys>, <&ps_isp_set0>,
power-domains = <&pmp_report_isp_sys>, <&ps_isp_set0>,
<&ps_isp_set1>, <&ps_isp_fe>, <&ps_isp_set3>,
<&ps_isp_set4>, <&ps_isp_set5>, <&ps_isp_set6>,
<&ps_isp_set7>, <&ps_isp_set8>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/apple/t600x-dieX.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<0x2 0x89344000 0x0 0x4000>,
<0x2 0x89800000 0x0 0x800000>;
apple,bw-scratch = <&pmgr_dcp 0 4 0x990>;
power-domains = <&DIE_NODE(ps_dispext0_cpu0)>;
power-domains = <&DIE_NODE(pmp_report_dispext0)>;
resets = <&DIE_NODE(ps_dispext0_cpu0)>;
clocks = <&DIE_NODE(clk_dispext0)>;
phandle = <&DIE_NODE(dcpext0)>;
Expand Down Expand Up @@ -152,7 +152,7 @@
<0x2 0x8c344000 0x0 0x4000>,
<0x2 0x8c800000 0x0 0x800000>;
apple,bw-scratch = <&pmgr_dcp 0 4 0x998>;
power-domains = <&DIE_NODE(ps_dispext1_cpu0)>;
power-domains = <&DIE_NODE(pmp_report_dispext1)>;
resets = <&DIE_NODE(ps_dispext1_cpu0)>;
clocks = <&DIE_NODE(clk_dispext1)>;
phandle = <&DIE_NODE(dcpext1)>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@

/* remove once m1n1 enables sio nodes after setup */
&sio {
status = "okay";
status = "okay";
};

&dpaudio1 {
Expand Down
16 changes: 16 additions & 0 deletions arch/arm64/boot/dts/apple/t6020.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,22 @@
};

/delete-node/ &pmgr_south;
/delete-node/ &pmp_report_dispext2;
/delete-node/ &pmp_report_dispext3;
/delete-node/ &pmp_report_venc1;
/delete-node/ &pmp_report_msr1;
/delete-node/ &pmp_report_prores;

&pmp {
apple,pio-ranges = <0x2 0x80000000 0x0 0x1000000>,
<0x3 0x0 0x0 0x1000000>,
<0x3 0x80000000 0x0 0x1000000>,
<0x4 0x0 0x0 0x1000000>,
<0x3 0x40000000 0x0 0x1000000>,
<0x2 0x10e70000 0x0 0x90000>,
<0x2 0x11e70000 0x0 0x90000>,
<0x2 0x12e70000 0x0 0x90000>;
};

&gpu {
compatible = "apple,agx-t6020", "apple,agx-g14x", "apple,agx-g14s";
Expand Down
Loading