* [PATCH v3 1/3] dt-bindings: soc: apple: Add Apple PMGR misc controls
2026-07-05 8:16 [PATCH v3 0/3] soc: apple: Add "PMGR misc" power controls driver Sasha Finkelstein
@ 2026-07-05 8:16 ` Sasha Finkelstein
2026-07-05 8:16 ` [PATCH v3 2/3] soc: apple: Add driver for " Sasha Finkelstein
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Finkelstein @ 2026-07-05 8:16 UTC (permalink / raw)
To: Sven Peter, Janne Grunau, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel,
Sasha Finkelstein, Conor Dooley
Certain Apple SoCs include additional PMGR power states that are
controlled via a different "misc" control block. On existing SoCs, this
includes the fabric and memory controller state.
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Sasha Finkelstein <k@chaosmail.tech>
---
Documentation/devicetree/bindings/soc/apple/apple,t6000-pmgr-misc.yaml | 45 +++++++++++++++++++++++++++++++++++++++++++++
MAINTAINERS | 1 +
2 files changed, 46 insertions(+)
diff --git a/Documentation/devicetree/bindings/soc/apple/apple,t6000-pmgr-misc.yaml b/Documentation/devicetree/bindings/soc/apple/apple,t6000-pmgr-misc.yaml
new file mode 100644
index 000000000000..588100222f89
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/apple/apple,t6000-pmgr-misc.yaml
@@ -0,0 +1,45 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/soc/apple/apple,t6000-pmgr-misc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Apple SoC PMGR Misc Power States
+
+maintainers:
+ - Sasha Finkelstein <k@chaosmail.tech>
+
+description: |
+ Certain Apple SoCs include additional PMGR power states that are controlled
+ via a different "misc" control block. This includes the fabric and memory
+ controller states.
+
+properties:
+ compatible:
+ enum:
+ - apple,t6000-pmgr-misc
+ - apple,t6020-pmgr-misc
+
+ reg:
+ maxItems: 2
+
+ reg-names:
+ items:
+ - const: fabric-ps
+ - const: dcs-ps
+
+required:
+ - compatible
+ - reg
+ - reg-names
+
+additionalProperties: false
+
+examples:
+ - |
+ power-management@8e20c000 {
+ compatible = "apple,t6000-pmgr-misc";
+ reg = <0x8e20c000 0x400>,
+ <0x8e20c800 0x400>;
+ reg-names = "fabric-ps", "dcs-ps";
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 15011f5752a9..5a29bb86499f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2607,6 +2607,7 @@ F: Documentation/devicetree/bindings/power/apple*
F: Documentation/devicetree/bindings/power/reset/apple,smc-reboot.yaml
F: Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
F: Documentation/devicetree/bindings/rtc/apple,smc-rtc.yaml
+F: Documentation/devicetree/bindings/soc/apple/apple,t6000-pmgr-misc.yaml
F: Documentation/devicetree/bindings/spi/apple,spi.yaml
F: Documentation/devicetree/bindings/spmi/apple,spmi.yaml
F: Documentation/devicetree/bindings/usb/apple,dwc3.yaml
--
2.55.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v3 2/3] soc: apple: Add driver for Apple PMGR misc controls
2026-07-05 8:16 [PATCH v3 0/3] soc: apple: Add "PMGR misc" power controls driver Sasha Finkelstein
2026-07-05 8:16 ` [PATCH v3 1/3] dt-bindings: soc: apple: Add Apple PMGR misc controls Sasha Finkelstein
@ 2026-07-05 8:16 ` Sasha Finkelstein
2026-07-05 8:16 ` [PATCH v3 3/3] arm64: dts: apple: Add pmgr-misc nodes to t60xx Sasha Finkelstein
2026-07-06 23:29 ` [PATCH v3 0/3] soc: apple: Add "PMGR misc" power controls driver Joshua Peisach
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Finkelstein @ 2026-07-05 8:16 UTC (permalink / raw)
To: Sven Peter, Janne Grunau, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel,
Sasha Finkelstein, Hector Martin
From: Hector Martin <marcan@marcan.st>
Apple SoCs have PMGR blocks that control a bunch of power-related
features. Besides the existing device power state controls (which are
very uniform and handled by apple-pmgr-pwrstate), we also need to manage
more random registers such as SoC-wide fabric and memory controller
power states, which have a different interface.
Add a driver for these kitchen sink controls. Right now it implements
fabric and memory controller power state switching on system
standby/s2idle, which saves about 1W of power or so on t60xx platforms.
Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Sven Peter <sven@kernel.org>
Co-developed-by: Sasha Finkelstein <k@chaosmail.tech>
Signed-off-by: Sasha Finkelstein <k@chaosmail.tech>
---
drivers/soc/apple/Kconfig | 10 ++++++++
drivers/soc/apple/Makefile | 2 ++
drivers/soc/apple/apple-pmgr-misc.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 193 insertions(+)
diff --git a/drivers/soc/apple/Kconfig b/drivers/soc/apple/Kconfig
index d0ff32182a2b..db30c0ade948 100644
--- a/drivers/soc/apple/Kconfig
+++ b/drivers/soc/apple/Kconfig
@@ -16,6 +16,16 @@ config APPLE_MAILBOX
Say Y here if you have an Apple SoC.
+config APPLE_PMGR_MISC
+ tristate "Apple SoC PMGR miscellaneous support"
+ depends on PM
+ help
+ The PMGR block in Apple SoCs provides high-level power state
+ controls for SoC devices. This driver manages miscellaneous
+ power controls.
+
+ Say 'y' here if you have a Pro/Max/Ultra Apple SoC.
+
config APPLE_RTKIT
tristate "Apple RTKit co-processor IPC protocol"
depends on APPLE_MAILBOX
diff --git a/drivers/soc/apple/Makefile b/drivers/soc/apple/Makefile
index 0b85ab61aefe..0481f7f43b06 100644
--- a/drivers/soc/apple/Makefile
+++ b/drivers/soc/apple/Makefile
@@ -3,6 +3,8 @@
obj-$(CONFIG_APPLE_MAILBOX) += apple-mailbox.o
apple-mailbox-y = mailbox.o
+obj-$(CONFIG_APPLE_PMGR_MISC) += apple-pmgr-misc.o
+
obj-$(CONFIG_APPLE_RTKIT) += apple-rtkit.o
apple-rtkit-y = rtkit.o rtkit-crashlog.o
diff --git a/drivers/soc/apple/apple-pmgr-misc.c b/drivers/soc/apple/apple-pmgr-misc.c
new file mode 100644
index 000000000000..7db29f7de329
--- /dev/null
+++ b/drivers/soc/apple/apple-pmgr-misc.c
@@ -0,0 +1,181 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
+/*
+ * Apple SoC PMGR device power state driver
+ *
+ * Copyright The Asahi Linux Contributors
+ */
+
+#include <linux/bitfield.h>
+#include <linux/bitops.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+
+#define APPLE_CLKGEN_PSTATE 0
+#define APPLE_CLKGEN_PSTATE_DESIRED GENMASK(3, 0)
+
+#define DCS_DEV_PSTATE_MIN_T600X 7
+#define SYS_DEV_PSTATE_SUSPEND 1
+
+enum sys_device {
+ DEV_FABRIC,
+ DEV_DCS,
+ DEV_MAX,
+};
+
+struct apple_pmgr_sys_device {
+ void __iomem *base;
+ u32 active_state;
+ u32 suspend_state;
+};
+
+struct apple_pmgr_misc_hw {
+ u32 dev_min_ps[DEV_MAX];
+};
+
+struct apple_pmgr_misc {
+ struct device *dev;
+ struct apple_pmgr_sys_device devices[DEV_MAX];
+};
+
+static void apple_pmgr_sys_dev_set_pstate(struct apple_pmgr_misc *misc,
+ enum sys_device dev, bool active)
+{
+ u32 pstate;
+ u32 val;
+
+ if (!misc->devices[dev].base)
+ return;
+
+ if (active)
+ pstate = misc->devices[dev].active_state;
+ else
+ pstate = misc->devices[dev].suspend_state;
+
+ dev_dbg(misc->dev, "set %d ps to pstate %d\n", dev, pstate);
+
+ val = readl_relaxed(misc->devices[dev].base + APPLE_CLKGEN_PSTATE);
+ FIELD_MODIFY(APPLE_CLKGEN_PSTATE_DESIRED, &val, pstate);
+ writel_relaxed(val, misc->devices[dev].base + APPLE_CLKGEN_PSTATE);
+}
+
+static int __maybe_unused apple_pmgr_misc_suspend_noirq(struct device *dev)
+{
+ struct apple_pmgr_misc *misc = dev_get_drvdata(dev);
+ int i;
+
+ for (i = 0; i < DEV_MAX; i++)
+ apple_pmgr_sys_dev_set_pstate(misc, i, false);
+
+ return 0;
+}
+
+static int __maybe_unused apple_pmgr_misc_resume_noirq(struct device *dev)
+{
+ struct apple_pmgr_misc *misc = dev_get_drvdata(dev);
+ int i;
+
+ for (i = 0; i < DEV_MAX; i++)
+ apple_pmgr_sys_dev_set_pstate(misc, i, true);
+
+ return 0;
+}
+
+static int apple_pmgr_init_device(struct apple_pmgr_misc *misc,
+ const struct apple_pmgr_misc_hw *hw,
+ enum sys_device dev,
+ const char *device_name)
+{
+ void __iomem *base;
+ char name[32];
+ u32 val;
+
+ snprintf(name, sizeof(name), "%s-ps", device_name);
+
+ base = devm_platform_ioremap_resource_byname(
+ to_platform_device(misc->dev), name);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
+ val = readl_relaxed(base + APPLE_CLKGEN_PSTATE);
+
+ misc->devices[dev].base = base;
+ misc->devices[dev].active_state =
+ FIELD_GET(APPLE_CLKGEN_PSTATE_DESIRED, val);
+ misc->devices[dev].suspend_state = hw->dev_min_ps[dev];
+
+ return 0;
+}
+
+static int apple_pmgr_misc_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ const struct apple_pmgr_misc_hw *hw;
+ struct apple_pmgr_misc *misc;
+ int ret;
+
+ misc = devm_kzalloc(dev, sizeof(*misc), GFP_KERNEL);
+ if (!misc)
+ return -ENOMEM;
+
+ misc->dev = dev;
+ hw = of_device_get_match_data(dev);
+ if (!hw)
+ return -EINVAL;
+
+ ret = apple_pmgr_init_device(misc, hw, DEV_FABRIC, "fabric");
+ if (ret)
+ return ret;
+
+ ret = apple_pmgr_init_device(misc, hw, DEV_DCS, "dcs");
+ if (ret)
+ return ret;
+
+ platform_set_drvdata(pdev, misc);
+
+ return 0;
+}
+
+static const struct apple_pmgr_misc_hw apple_pmgr_misc_hw_t600x = {
+ .dev_min_ps = {
+ [DEV_FABRIC] = SYS_DEV_PSTATE_SUSPEND,
+ [DEV_DCS] = DCS_DEV_PSTATE_MIN_T600X,
+ },
+};
+
+static const struct apple_pmgr_misc_hw apple_pmgr_misc_hw_t602x = {
+ .dev_min_ps = {
+ [DEV_FABRIC] = SYS_DEV_PSTATE_SUSPEND,
+ [DEV_DCS] = SYS_DEV_PSTATE_SUSPEND,
+ },
+};
+
+static const struct of_device_id apple_pmgr_misc_of_match[] = {
+ { .compatible = "apple,t6000-pmgr-misc", .data = &apple_pmgr_misc_hw_t600x },
+ { .compatible = "apple,t6020-pmgr-misc", .data = &apple_pmgr_misc_hw_t602x },
+ {}
+};
+
+MODULE_DEVICE_TABLE(of, apple_pmgr_misc_of_match);
+
+static const struct dev_pm_ops apple_pmgr_misc_pm_ops = {
+ SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(apple_pmgr_misc_suspend_noirq,
+ apple_pmgr_misc_resume_noirq)
+};
+
+static struct platform_driver apple_pmgr_misc_driver = {
+ .probe = apple_pmgr_misc_probe,
+ .driver = {
+ .name = "apple-pmgr-misc",
+ .of_match_table = apple_pmgr_misc_of_match,
+ .pm = pm_ptr(&apple_pmgr_misc_pm_ops),
+ },
+};
+
+MODULE_AUTHOR("Hector Martin <marcan@marcan.st>");
+MODULE_DESCRIPTION("PMGR misc driver for Apple SoCs");
+MODULE_LICENSE("GPL");
+
+module_platform_driver(apple_pmgr_misc_driver);
--
2.55.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v3 3/3] arm64: dts: apple: Add pmgr-misc nodes to t60xx
2026-07-05 8:16 [PATCH v3 0/3] soc: apple: Add "PMGR misc" power controls driver Sasha Finkelstein
2026-07-05 8:16 ` [PATCH v3 1/3] dt-bindings: soc: apple: Add Apple PMGR misc controls Sasha Finkelstein
2026-07-05 8:16 ` [PATCH v3 2/3] soc: apple: Add driver for " Sasha Finkelstein
@ 2026-07-05 8:16 ` Sasha Finkelstein
2026-07-06 23:29 ` [PATCH v3 0/3] soc: apple: Add "PMGR misc" power controls driver Joshua Peisach
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Finkelstein @ 2026-07-05 8:16 UTC (permalink / raw)
To: Sven Peter, Janne Grunau, Neal Gompa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel,
Sasha Finkelstein
Adds the PMGR misc control nodes for M1/2 Pro/Max/Ultra series devices.
Reviewed-by: Sven Peter <sven@kernel.org>
Signed-off-by: Sasha Finkelstein <k@chaosmail.tech>
---
arch/arm64/boot/dts/apple/t600x-die0.dtsi | 7 +++++++
arch/arm64/boot/dts/apple/t602x-die0.dtsi | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
index f715b19efd16..3271d234b483 100644
--- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi
@@ -24,6 +24,13 @@ aic: interrupt-controller@28e100000 {
power-domains = <&ps_aic>;
};
+ pmgr_misc: power-management@28e20c000 {
+ compatible = "apple,t6000-pmgr-misc";
+ reg = <0x2 0x8e20c000 0 0x400>,
+ <0x2 0x8e20c800 0 0x400>;
+ reg-names = "fabric-ps", "dcs-ps";
+ };
+
smc: smc@290400000 {
compatible = "apple,t6000-smc", "apple,smc";
reg = <0x2 0x90400000 0x0 0x4000>,
diff --git a/arch/arm64/boot/dts/apple/t602x-die0.dtsi b/arch/arm64/boot/dts/apple/t602x-die0.dtsi
index 8622ddea7b44..121f2cf75915 100644
--- a/arch/arm64/boot/dts/apple/t602x-die0.dtsi
+++ b/arch/arm64/boot/dts/apple/t602x-die0.dtsi
@@ -23,6 +23,13 @@ aic: interrupt-controller@28e100000 {
power-domains = <&ps_aic>;
};
+ pmgr_misc: power-management@28e20c000 {
+ compatible = "apple,t6020-pmgr-misc";
+ reg = <0x2 0x8e20c000 0 0x400>,
+ <0x2 0x8e20c400 0 0x400>;
+ reg-names = "fabric-ps", "dcs-ps";
+ };
+
nub_spmi0: spmi@29e114000 {
compatible = "apple,t6020-spmi", "apple,t8103-spmi";
reg = <0x2 0x9e114000 0x0 0x100>;
--
2.55.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v3 0/3] soc: apple: Add "PMGR misc" power controls driver
2026-07-05 8:16 [PATCH v3 0/3] soc: apple: Add "PMGR misc" power controls driver Sasha Finkelstein
` (2 preceding siblings ...)
2026-07-05 8:16 ` [PATCH v3 3/3] arm64: dts: apple: Add pmgr-misc nodes to t60xx Sasha Finkelstein
@ 2026-07-06 23:29 ` Joshua Peisach
3 siblings, 0 replies; 5+ messages in thread
From: Joshua Peisach @ 2026-07-06 23:29 UTC (permalink / raw)
To: Sasha Finkelstein, Sven Peter, Janne Grunau, Neal Gompa,
Rob Herring, Krzysztof Kozlowski, Conor Dooley
Cc: asahi, linux-arm-kernel, devicetree, linux-kernel, Conor Dooley,
Hector Martin
On Sun Jul 5, 2026 at 4:16 AM EDT, Sasha Finkelstein wrote:
> Certain Apple SoCs have additional power state controls that are using
> a separate "misc" mmio interface. Currently this includes the fabric
> and memory controllers on pro/max/ultra SoCs.
>
> This series adds a driver to put those in a low power state when the
> machine enters sleep. The power savings are SoC-dependent and are
> around 1W.
>
> Signed-off-by: Sasha Finkelstein <k@chaosmail.tech>
> ---
> Changes in v3:
> - Remove ability to probe only one control, it is not used anyway
> - Allow building as module
> - Style fixes
> - Link to v2: https://patch.msgid.link/20260703-pmgr-misc-v2-0-4b26ba10c5a4@chaosmail.tech
>
> Changes in v2:
> - Error handling fixes
> - Reword binding description
> - Link to v1: https://patch.msgid.link/20260702-pmgr-misc-v1-0-4f075a3a95c1@chaosmail.tech
>
> ---
> Hector Martin (1):
> soc: apple: Add driver for Apple PMGR misc controls
>
> Sasha Finkelstein (2):
> dt-bindings: soc: apple: Add Apple PMGR misc controls
> arm64: dts: apple: Add pmgr-misc nodes to t60xx
>
> Documentation/devicetree/bindings/soc/apple/apple,t6000-pmgr-misc.yaml | 45 +++++++++++++++++++++++++++
> MAINTAINERS | 1 +
> arch/arm64/boot/dts/apple/t600x-die0.dtsi | 7 +++++
> arch/arm64/boot/dts/apple/t602x-die0.dtsi | 7 +++++
> drivers/soc/apple/Kconfig | 10 ++++++
> drivers/soc/apple/Makefile | 2 ++
> drivers/soc/apple/apple-pmgr-misc.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 7 files changed, 253 insertions(+)
> ---
> base-commit: e5d9690657844a2645a518cdf838206f6daf513e
> change-id: 20260702-pmgr-misc-ae1cbd5bc2c7
>
> Best regards,
> --
> Sasha Finkelstein <k@chaosmail.tech>
Seems fine.
Reviewed-by: Joshua Peisach <jpeisach@ubuntu.com>
^ permalink raw reply [flat|nested] 5+ messages in thread