diff --git a/Documentation/devicetree/bindings/power/apple,pmgr-pwrstate.yaml b/Documentation/devicetree/bindings/power/apple,pmgr-pwrstate.yaml index d8c03b0a12702..5824e179a646b 100644 --- a/Documentation/devicetree/bindings/power/apple,pmgr-pwrstate.yaml +++ b/Documentation/devicetree/bindings/power/apple,pmgr-pwrstate.yaml @@ -25,11 +25,30 @@ allOf: apple,sleep-retained: false apple,sleep-driver-owned: false apple,always-on: false + apple,auto-managed: false apple,min-state: false apple,force-disable: false apple,force-reset: false apple,externally-clocked: false apple,consumer-switched: false + - if: + properties: + compatible: + contains: + const: apple,t8132-pmgr-pwrstate + required: + - compatible + then: + properties: + apple,auto-managed: false + - if: + required: + - apple,auto-managed + then: + properties: + apple,no-auto-pm: false + apple,firmware-owned: false + apple,inherited-on: false - if: required: - apple,consumer-switched @@ -135,6 +154,18 @@ properties: coprocessors' CPU domains. type: boolean + apple,auto-managed: + description: | + Hardware-managed power domain (such as a DRAM channel slice or memory + fabric) that the boot loader may leave forced on and that must be + switched to hardware automatic power management (auto-enable) early + at boot, before the PMP firmware starts. + + Once switched, the hardware gates the domain by itself and it has no + software-controlled power transitions. On parts where an instance is + fused off, its power-state register reads as off. + type: boolean + apple,sleep-retained: description: A coprocessor keeps running in this domain across system sleep with no diff --git a/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi b/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi index 34ecb3b560df9..6140cc718d11c 100644 --- a/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi +++ b/arch/arm64/boot/dts/apple/t6041-j614-j616-j575-scaler.dtsi @@ -26,19 +26,6 @@ }; }; -&pmgr_aux { - ps_fab5_soc: power-controller@440 { - compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; - reg = <0x440 4>; - #power-domain-cells = <0>; - #reset-cells = <0>; - label = "fab5_soc"; - power-domains = <&ps_afi>; - apple,always-on; - status = "disabled"; - }; -}; - /* PMGR group 1 resolves via ps-groups to the main bank at 0x502280000. */ &pmgr { ps_msr1: ps_msr1_dart: power-controller@3b0 { diff --git a/arch/arm64/boot/dts/apple/t6041-pmgr.dtsi b/arch/arm64/boot/dts/apple/t6041-pmgr.dtsi new file mode 100644 index 0000000000000..2f7a2f483b3ec --- /dev/null +++ b/arch/arm64/boot/dts/apple/t6041-pmgr.dtsi @@ -0,0 +1,424 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * T6041-specific PMGR power domains for hardware auto-managed DCS channels + * and memory/SoC fabrics. + * + * Offsets and parent links verified against the J616c ADT (/arm-io/pmgr + * devices and ps-groups). The DCS nodes omit their ADT parents, the AMCC + * power states, which are not described in this device tree. All 32 DCS + * channels (24 present on binned parts, 32 on full parts) and 12 fabrics + * are hardware auto-managed: the boot loader may leave them forced on, and + * they must be switched to hardware AUTO_ENABLE early at boot, before the + * PMP starts. On binned parts dcs_24-31 are fused off and read as off. + * + * Copyright The Asahi Linux Contributors + */ + +&pmgr_aux { + ps_fab0_soc: power-controller@168 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x168 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab0_soc"; + power-domains = <&ps_afi>; + apple,always-on; + apple,auto-managed; + }; + + ps_dcs_00: power-controller@188 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x188 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_00"; + apple,auto-managed; + }; + + ps_dcs_01: power-controller@1a0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1a0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_01"; + apple,auto-managed; + }; + + ps_dcs_02: power-controller@1b0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1b0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_02"; + apple,auto-managed; + }; + + ps_dcs_03: power-controller@1c0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1c0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_03"; + apple,auto-managed; + }; + + ps_dcs_08: power-controller@1d0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1d0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_08"; + apple,auto-managed; + }; + + ps_dcs_09: power-controller@1e0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1e0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_09"; + apple,auto-managed; + }; + + ps_dcs_10: power-controller@1f0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x1f0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_10"; + apple,auto-managed; + }; + + ps_dcs_11: power-controller@200 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x200 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_11"; + apple,auto-managed; + }; + + ps_dcs_16: power-controller@210 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x210 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_16"; + apple,auto-managed; + }; + + ps_dcs_17: power-controller@220 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x220 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_17"; + apple,auto-managed; + }; + + ps_dcs_18: power-controller@230 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x230 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_18"; + apple,auto-managed; + }; + + ps_dcs_19: power-controller@240 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x240 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_19"; + apple,auto-managed; + }; + + ps_dcs_24: power-controller@250 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x250 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_24"; + apple,auto-managed; + }; + + ps_dcs_25: power-controller@260 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x260 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_25"; + apple,auto-managed; + }; + + ps_dcs_26: power-controller@270 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x270 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_26"; + apple,auto-managed; + }; + + ps_fab_gw_0: power-controller@288 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x288 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab_gw_0"; + apple,always-on; + apple,auto-managed; + }; + + ps_fab_gw_1: power-controller@290 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x290 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab_gw_1"; + apple,always-on; + apple,auto-managed; + }; + + ps_fab_afr: power-controller@298 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x298 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab_afr"; + apple,always-on; + apple,auto-managed; + }; + + ps_fab1_soc: power-controller@2d0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2d0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab1_soc"; + power-domains = <&ps_afi>; + apple,always-on; + apple,auto-managed; + }; + + ps_fab2_soc: power-controller@338 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x338 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab2_soc"; + power-domains = <&ps_afi>; + apple,always-on; + apple,auto-managed; + }; + + ps_fab5_soc: power-controller@440 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x440 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab5_soc"; + power-domains = <&ps_afi>; + apple,always-on; + apple,auto-managed; + }; + + ps_fab7_soc: power-controller@488 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x488 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab7_soc"; + power-domains = <&ps_afi>; + apple,always-on; + apple,auto-managed; + }; + + /* dcs_27 sits at +0x530 rather than adjacent to dcs_26 (+0x280 is amcc27). */ + ps_dcs_27: power-controller@530 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x530 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_27"; + apple,auto-managed; + }; +}; + +&ps_fab6_soc { + apple,auto-managed; +}; + +&pmgr { + ps_fab4_soc: power-controller@128 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x128 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "fab4_soc"; + power-domains = <&ps_afc>; + apple,always-on; + apple,auto-managed; + }; + + ps_dcs_04: power-controller@2e0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2e0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_04"; + apple,auto-managed; + }; + + ps_dcs_05: power-controller@2e8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2e8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_05"; + apple,auto-managed; + }; + + ps_dcs_06: power-controller@2f0 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2f0 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_06"; + apple,auto-managed; + }; + + ps_dcs_07: power-controller@2f8 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x2f8 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_07"; + apple,auto-managed; + }; + + ps_dcs_12: power-controller@300 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x300 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_12"; + apple,auto-managed; + }; + + ps_dcs_13: power-controller@308 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x308 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_13"; + apple,auto-managed; + }; + + ps_dcs_14: power-controller@310 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x310 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_14"; + apple,auto-managed; + }; + + ps_dcs_15: power-controller@318 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x318 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_15"; + apple,auto-managed; + }; + + ps_dcs_20: power-controller@320 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x320 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_20"; + apple,auto-managed; + }; + + ps_dcs_21: power-controller@328 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x328 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_21"; + apple,auto-managed; + }; + + ps_dcs_22: power-controller@330 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x330 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_22"; + apple,auto-managed; + }; + + ps_dcs_23: power-controller@338 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x338 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_23"; + apple,auto-managed; + }; + + ps_dcs_28: power-controller@340 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x340 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_28"; + apple,auto-managed; + }; + + ps_dcs_29: power-controller@348 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x348 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_29"; + apple,auto-managed; + }; + + ps_dcs_30: power-controller@350 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x350 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_30"; + apple,auto-managed; + }; + + ps_dcs_31: power-controller@358 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x358 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "dcs_31"; + apple,auto-managed; + }; +}; + +&ps_fab3_soc { + apple,auto-managed; +}; + +&pmgr_mini { + ps_nub_fabric: power-controller@100 { + compatible = "apple,t6041-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate"; + reg = <0x100 4>; + #power-domain-cells = <0>; + #reset-cells = <0>; + label = "nub_fabric"; + apple,always-on; + apple,auto-managed; + }; +}; diff --git a/arch/arm64/boot/dts/apple/t6041.dtsi b/arch/arm64/boot/dts/apple/t6041.dtsi index 4c5719bc05605..f8a206ae082b2 100644 --- a/arch/arm64/boot/dts/apple/t6041.dtsi +++ b/arch/arm64/boot/dts/apple/t6041.dtsi @@ -720,3 +720,5 @@ &ave { status = "okay"; }; + +#include "t6041-pmgr.dtsi" diff --git a/drivers/pmdomain/apple/pmgr-pwrstate-test.c b/drivers/pmdomain/apple/pmgr-pwrstate-test.c index 66fb065523dee..17420f1bb8758 100644 --- a/drivers/pmdomain/apple/pmgr-pwrstate-test.c +++ b/drivers/pmdomain/apple/pmgr-pwrstate-test.c @@ -544,6 +544,78 @@ static void pmgr_ps_consumer_refused_test(struct kunit *test) APPLE_PMGR_PS_ACTIVE); } +/* Forced-on auto-managed words write target 0xf, wait for actual 0xf, then AUTO_ENABLE. */ +static void pmgr_ps_auto_enable_test(struct kunit *test) +{ + static const u32 seq[][2] = { + { 0, 0x0f0000ff }, + { 0, 0x1f0000ff }, + }; + struct pmgr_ps_test_bank *b; + struct pmgr_ps_test_reg *r; + struct apple_pmgr_ps *ps; + + ps = pmgr_ps_test_consumer(test, 0x0f0003ff, &b); + KUNIT_EXPECT_EQ(test, apple_pmgr_ps_auto_enable(ps->regmap, 0), 1); + pmgr_ps_test_expect_log(test, b, seq, ARRAY_SIZE(seq)); + KUNIT_EXPECT_TRUE(test, b->word[0] & APPLE_PMGR_AUTO_ENABLE); + + /* Delayed actual-state ACK completes before AUTO_ENABLE is written. */ + ps = pmgr_ps_test_domain(test, APPLE_PMGR_PS_CLKGATE, false, &r); + r->val = FIELD_PREP(APPLE_PMGR_PS_TARGET, APPLE_PMGR_PS_ACTIVE) | + FIELD_PREP(APPLE_PMGR_PS_ACTUAL, APPLE_PMGR_PS_CLKGATE) | + APPLE_PMGR_FLAGS; + r->active_reads = 3; + KUNIT_EXPECT_EQ(test, apple_pmgr_ps_auto_enable(ps->regmap, 0), 1); + KUNIT_EXPECT_EQ(test, r->active_reads, 0U); + KUNIT_EXPECT_EQ(test, FIELD_GET(APPLE_PMGR_PS_ACTUAL, r->val), APPLE_PMGR_PS_ACTIVE); + KUNIT_EXPECT_TRUE(test, r->val & APPLE_PMGR_AUTO_ENABLE); + KUNIT_EXPECT_EQ(test, r->auto_writes, 1U); + KUNIT_EXPECT_EQ(test, r->busy_writes, 0U); +} + +/* Fused-off, already-AUTO, and reset/disabled words are left completely untouched. */ +static void pmgr_ps_auto_enable_skip_test(struct kunit *test) +{ + static const u32 skipped[] = { + 0x0f000300, /* fused off (J616c dcs_24-31) */ + 0x1f0000ff, /* already on AUTO_ENABLE */ + 0x0f0000ff | APPLE_PMGR_RESET, /* held in reset */ + 0x0f0000ff | APPLE_PMGR_PS_RESET, /* PS reset set */ + 0x0f0000ff | APPLE_PMGR_DEV_DISABLE, /* device disabled */ + }; + struct pmgr_ps_test_bank *b; + struct apple_pmgr_ps *ps; + + for (unsigned int i = 0; i < ARRAY_SIZE(skipped); i++) { + ps = pmgr_ps_test_consumer(test, skipped[i], &b); + KUNIT_EXPECT_EQ_MSG(test, apple_pmgr_ps_auto_enable(ps->regmap, 0), 0, + "word %#x", skipped[i]); + KUNIT_EXPECT_EQ_MSG(test, b->nr_log, 0U, "word %#x", skipped[i]); + KUNIT_EXPECT_EQ_MSG(test, b->word[0], skipped[i], "word %#x", skipped[i]); + } +} + +/* Stuck actual state times out without setting AUTO_ENABLE; read errors propagate. */ +static void pmgr_ps_auto_enable_fail_test(struct kunit *test) +{ + struct pmgr_ps_test_reg *r; + struct apple_pmgr_ps *ps; + + ps = pmgr_ps_test_domain(test, APPLE_PMGR_PS_CLKGATE, false, &r); + r->val = FIELD_PREP(APPLE_PMGR_PS_TARGET, APPLE_PMGR_PS_ACTIVE) | + FIELD_PREP(APPLE_PMGR_PS_ACTUAL, APPLE_PMGR_PS_CLKGATE); + r->stuck = true; + KUNIT_EXPECT_EQ(test, apple_pmgr_ps_auto_enable(ps->regmap, 0), -ETIMEDOUT); + KUNIT_EXPECT_EQ(test, r->auto_writes, 0U); + KUNIT_EXPECT_FALSE(test, r->val & APPLE_PMGR_AUTO_ENABLE); + + ps = pmgr_ps_test_domain(test, APPLE_PMGR_PS_ACTIVE, false, &r); + r->parent_read_error = true; + KUNIT_EXPECT_EQ(test, apple_pmgr_ps_auto_enable(ps->regmap, 0), -EIO); + KUNIT_EXPECT_EQ(test, r->auto_writes, 0U); +} + static struct kunit_case pmgr_ps_test_cases[] = { KUNIT_CASE(pmgr_ps_power_on_test), KUNIT_CASE(pmgr_ps_power_off_undo_test), @@ -563,6 +635,9 @@ static struct kunit_case pmgr_ps_test_cases[] = { KUNIT_CASE(pmgr_ps_consumer_retention_mask_test), KUNIT_CASE(pmgr_ps_consumer_plain_test), KUNIT_CASE(pmgr_ps_consumer_refused_test), + KUNIT_CASE(pmgr_ps_auto_enable_test), + KUNIT_CASE(pmgr_ps_auto_enable_skip_test), + KUNIT_CASE(pmgr_ps_auto_enable_fail_test), {} }; diff --git a/drivers/pmdomain/apple/pmgr-pwrstate.c b/drivers/pmdomain/apple/pmgr-pwrstate.c index 6745b4916365b..709037c9b2787 100644 --- a/drivers/pmdomain/apple/pmgr-pwrstate.c +++ b/drivers/pmdomain/apple/pmgr-pwrstate.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -79,6 +80,8 @@ struct apple_pmgr_ps { bool sleep_wakeup_path; /* Never enable automatic power management (apple,no-auto-pm). */ bool no_auto_pm; + /* Hardware auto-managed domain armed early at boot (apple,auto-managed). */ + bool auto_managed; bool inherited_on; bool no_auto_enable; bool needs_reset_idle_wait; @@ -437,7 +440,7 @@ static int apple_pmgr_ps_power_off(struct generic_pm_domain *genpd) if (ps->firmware_owned) return 0; - if (ps->inherited_on) + if (ps->inherited_on || ps->auto_managed) return -EBUSY; /* A live coprocessor keeps this domain through system sleep. */ if (ps->sleep_retained && ps->system_sleep) @@ -478,7 +481,7 @@ int apple_pmgr_ps_verify_state(struct device *domain_dev, bool on) !(genpd->flags & GENPD_FLAG_IRQ_SAFE)) return -EOPNOTSUPP; ps = genpd_to_apple_pmgr_ps(genpd); - if (ps->firmware_owned || ps->inherited_on) + if (ps->firmware_owned || ps->inherited_on || ps->auto_managed) return -EPERM; if (!on) mask |= APPLE_PMGR_AUTO_ENABLE; @@ -516,7 +519,7 @@ int apple_pmgr_ps_cycle(struct device_node *np) ret = -EPROBE_DEFER; goto out; } - if (ps->firmware_owned || ps->inherited_on) { + if (ps->firmware_owned || ps->inherited_on || ps->auto_managed) { ret = -EPERM; goto out; } @@ -591,7 +594,7 @@ static int apple_pmgr_ps_suspend_noirq(struct device *dev) u32 reg; ps->sleep_raised_by_other = false; - if (ps->firmware_owned || ps->inherited_on) + if (ps->firmware_owned || ps->inherited_on || ps->auto_managed) return 0; spin_lock_irqsave(&ps->genpd.slock, flags); @@ -640,7 +643,8 @@ static int apple_pmgr_ps_resume_noirq(struct device *dev) int ret; if (!pm_resume_via_firmware() || ps->firmware_owned || ps->inherited_on || - ps->sleep_driver_owned || apple_sleep_domain_is_down(dev->of_node)) + ps->auto_managed || ps->sleep_driver_owned || + apple_sleep_domain_is_down(dev->of_node)) return 0; spin_lock_irqsave(&ps->genpd.slock, flags); @@ -680,7 +684,7 @@ static int apple_pmgr_reset_assert(struct reset_controller_dev *rcdev, unsigned int ret; u32 reg; - if (ps->firmware_owned || ps->inherited_on) + if (ps->firmware_owned || ps->inherited_on || ps->auto_managed) return -EPERM; spin_lock_irqsave(&ps->genpd.slock, flags); @@ -718,7 +722,7 @@ static int apple_pmgr_reset_deassert(struct reset_controller_dev *rcdev, unsigne struct apple_pmgr_ps *ps = rcdev_to_apple_pmgr_ps(rcdev); unsigned long flags; - if (ps->firmware_owned || ps->inherited_on) + if (ps->firmware_owned || ps->inherited_on || ps->auto_managed) return -EPERM; if (ps->reset_time_us == APPLE_PMGR_T8132_RESET_TIME) @@ -760,7 +764,7 @@ static int apple_pmgr_reset_status(struct reset_controller_dev *rcdev, unsigned struct apple_pmgr_ps *ps = rcdev_to_apple_pmgr_ps(rcdev); u32 reg = 0; - if (ps->firmware_owned || ps->inherited_on) + if (ps->firmware_owned || ps->inherited_on || ps->auto_managed) return -EPERM; regmap_read(ps->regmap, ps->offset, ®); @@ -951,6 +955,9 @@ static int apple_pmgr_ps_probe(struct platform_device *pdev) ps->sleep_retained = of_property_read_bool(node, "apple,sleep-retained"); ps->sleep_driver_owned = of_property_read_bool(node, "apple,sleep-driver-owned"); ps->sleep_wakeup_path = of_property_read_bool(node, "apple,sleep-wakeup-path"); + /* A cold-started coprocessor CPU must not be gated behind its firmware. */ + ps->no_auto_pm = of_property_read_bool(node, "apple,no-auto-pm"); + ps->auto_managed = of_property_read_bool(node, "apple,auto-managed"); /* * Only T8132 hands over inherited-on domains with this contract. Older * M3 device trees carry the property with another meaning; keep them @@ -958,7 +965,7 @@ static int apple_pmgr_ps_probe(struct platform_device *pdev) */ ps->inherited_on = t8132 && of_property_read_bool(node, "apple,inherited-on"); if (ps->inherited_on && - (ps->firmware_owned || ps->sleep_retained || + (ps->firmware_owned || ps->sleep_retained || ps->auto_managed || of_property_present(node, "apple,min-state") || of_property_present(node, "apple,always-on") || of_property_present(node, "apple,force-disable") || @@ -966,8 +973,13 @@ static int apple_pmgr_ps_probe(struct platform_device *pdev) of_property_present(node, "apple,externally-clocked"))) return dev_err_probe(dev, -EINVAL, "conflicting inherited power policy\n"); + if (ps->auto_managed && + (ps->firmware_owned || ps->no_auto_pm || ps->no_auto_enable || t8132)) + return dev_err_probe(dev, -EINVAL, "conflicting auto-managed power policy\n"); + ret = of_property_read_u32(node, "apple,min-state", &ps->min_state); - if (ret == 0 && ps->min_state <= APPLE_PMGR_PS_ACTIVE && !ps->firmware_owned) + if (ret == 0 && ps->min_state <= APPLE_PMGR_PS_ACTIVE && + !ps->firmware_owned && !ps->auto_managed) regmap_update_bits(regmap, ps->offset, APPLE_PMGR_FLAGS | APPLE_PMGR_PS_MIN, FIELD_PREP(APPLE_PMGR_PS_MIN, ps->min_state)); @@ -980,9 +992,6 @@ static int apple_pmgr_ps_probe(struct platform_device *pdev) if (of_property_read_bool(node, "apple,externally-clocked")) ps->externally_clocked = true; - /* A cold-started coprocessor CPU must not be gated behind its firmware. */ - ps->no_auto_pm = of_property_read_bool(node, "apple,no-auto-pm"); - /* * An inherited-on domain has readable state but no transition ownership. * A firmware-owned domain need not have a CPU-accessible state register; @@ -1003,9 +1012,19 @@ static int apple_pmgr_ps_probe(struct platform_device *pdev) return dev_err_probe(dev, ret, "cannot read power state\n"); active = ret; } - /* Legacy handoff DTs must also keep the throttle controller powered. */ - if (!ps->firmware_owned && !ps->inherited_on && - apple_pmgr_ps_always_on(node, ps->offset, name)) { + if (ps->auto_managed) { + if (!active) { + if (apple_pmgr_ps_always_on(node, ps->offset, name)) + return dev_err_probe(dev, -EIO, + "always-on auto-managed domain %s is off at boot\n", + name); + dev_dbg(dev, "auto-managed domain %s is off at boot, skipping\n", name); + return -ENODEV; + } + ps->genpd.flags |= GENPD_FLAG_ALWAYS_ON; + } else if (!ps->firmware_owned && !ps->inherited_on && + apple_pmgr_ps_always_on(node, ps->offset, name)) { + /* Legacy handoff DTs must also keep the throttle controller powered. */ ps->genpd.flags |= GENPD_FLAG_ALWAYS_ON; if (!active) { /* @@ -1035,7 +1054,8 @@ static int apple_pmgr_ps_probe(struct platform_device *pdev) } /* Turn on auto-PM if the domain is already on, unless it must stay off */ - if (active && !ps->firmware_owned && !ps->inherited_on && !ps->no_auto_enable) + if (active && !ps->firmware_owned && !ps->inherited_on && + !ps->no_auto_enable && !ps->auto_managed) regmap_update_bits(regmap, ps->offset, APPLE_PMGR_FLAGS | APPLE_PMGR_AUTO_ENABLE, ps->no_auto_pm ? 0 : APPLE_PMGR_AUTO_ENABLE); @@ -1390,6 +1410,124 @@ static const struct of_device_id apple_pmgr_ps_of_match[] = { MODULE_DEVICE_TABLE(of, apple_pmgr_ps_of_match); +/* + * Switch a power-state word left forced on by the boot loader (target 0xf, + * AUTO_ENABLE clear) to hardware automatic power management, early at boot, + * before the PMP starts: write target 0xf, wait for actual 0xf, then set + * AUTO_ENABLE. Words that are fused off, not forced on, held in reset, or + * already on AUTO_ENABLE are left untouched (returns 0). Returns 1 if + * switched, or a negative errno on read/write error or timeout. + */ +static int apple_pmgr_ps_auto_enable(struct regmap *regmap, u32 offset) +{ + u32 v; + int ret; + + ret = regmap_read(regmap, offset, &v); + if (ret) + return ret; + + if (FIELD_GET(APPLE_PMGR_PS_TARGET, v) != APPLE_PMGR_PS_ACTIVE || + (v & (APPLE_PMGR_AUTO_ENABLE | APPLE_PMGR_RESET | + APPLE_PMGR_PS_RESET | APPLE_PMGR_DEV_DISABLE))) + return 0; + + ret = regmap_write(regmap, offset, + (v & ~(APPLE_PMGR_FLAGS | APPLE_PMGR_BUSY | + APPLE_PMGR_PS_TARGET)) | + FIELD_PREP(APPLE_PMGR_PS_TARGET, APPLE_PMGR_PS_ACTIVE)); + if (ret) + return ret; + + ret = regmap_read_poll_timeout_atomic(regmap, offset, v, + FIELD_GET(APPLE_PMGR_PS_ACTUAL, v) == + APPLE_PMGR_PS_ACTIVE, + 1, APPLE_PMGR_PS_PARENT_TIMEOUT); + if (ret) + return ret; + + ret = regmap_write(regmap, offset, + (v & ~(APPLE_PMGR_FLAGS | APPLE_PMGR_BUSY)) | + APPLE_PMGR_AUTO_ENABLE); + return ret ?: 1; +} + +static const struct of_device_id apple_pmgr_of_match[] __initconst = { + { .compatible = "apple,t8103-pmgr" }, + { .compatible = "apple,pmgr" }, + {} +}; + +static bool __init apple_pmgr_ps_node_is_auto_managed(struct device_node *np) +{ + return of_match_node(apple_pmgr_ps_of_match, np) && + of_property_read_bool(np, "apple,auto-managed") && + !of_property_read_bool(np, "apple,no-auto-pm") && + !of_property_read_bool(np, "apple,firmware-owned") && + !of_property_read_bool(np, "apple,inherited-on") && + !of_device_is_compatible(np, "apple,t8132-pmgr-pwrstate"); +} + +/* + * Arm hardware automatic power management for DT-marked domains early at + * boot, before platform drivers (in particular the PMP) start: enabling + * AUTO_ENABLE on memory and fabric domains after the PMP is running freezes + * the SoC. + */ +static int __init apple_pmgr_ps_auto_init(void) +{ + struct device_node *pmgr_np; + unsigned int done = 0, failed = 0; + + for_each_matching_node(pmgr_np, apple_pmgr_of_match) { + struct regmap *regmap = NULL; + struct device_node *child; + + if (!of_device_is_available(pmgr_np)) + continue; + + for_each_available_child_of_node(pmgr_np, child) { + u32 offset; + int ret; + + if (!apple_pmgr_ps_node_is_auto_managed(child)) + continue; + + if (of_property_read_u32(child, "reg", &offset)) { + pr_warn("apple-pmgr-pwrstate: %pOF: missing reg property\n", + child); + continue; + } + + if (!regmap) { + regmap = syscon_node_to_regmap(pmgr_np); + if (IS_ERR(regmap)) { + pr_warn("apple-pmgr-pwrstate: %pOF: cannot map PMGR: %ld\n", + pmgr_np, PTR_ERR(regmap)); + of_node_put(child); + break; + } + } + + ret = apple_pmgr_ps_auto_enable(regmap, offset); + if (ret > 0) { + done++; + } else if (ret < 0) { + failed++; + pr_warn("apple-pmgr-pwrstate: %pOF: auto-enable failed: %d\n", + child, ret); + } + } + } + + if (done || failed) + pr_info("apple-pmgr-pwrstate: %u auto-managed domains enabled, %u failed\n", + done, failed); + + return 0; +} +arch_initcall(apple_pmgr_ps_auto_init); + static const struct dev_pm_ops apple_pmgr_ps_pm_ops = { LATE_SYSTEM_SLEEP_PM_OPS(apple_pmgr_ps_suspend_late, apple_pmgr_ps_resume_early) NOIRQ_SYSTEM_SLEEP_PM_OPS(apple_pmgr_ps_suspend_noirq, apple_pmgr_ps_resume_noirq) diff --git a/tools/testing/selftests/drivers/apple/pmgr-inherited.py b/tools/testing/selftests/drivers/apple/pmgr-inherited.py index affc0312450b1..ac2538d2364ac 100755 --- a/tools/testing/selftests/drivers/apple/pmgr-inherited.py +++ b/tools/testing/selftests/drivers/apple/pmgr-inherited.py @@ -223,7 +223,7 @@ def main(): assert(apple_pmgr_ps_power_off(&ps->genpd)==-EBUSY && !map.writes); puts("ok 3 - read errors and lost inherited activity never request a transition"); const char *conflicts[]={"apple,firmware-owned","apple,sleep-retained","apple,always-on","apple,min-state", - "apple,force-disable","apple,force-reset","apple,externally-clocked"}; + "apple,force-disable","apple,force-reset","apple,externally-clocked","apple,auto-managed"}; for(unsigned i=0;i