powerpc/83xx: Add power management support for MPC837x boards
Subsystems (2)
PATCH v2 1/1 powerpc/83xx: Add power management support for MPC837x boards
This patch adds pmc nodes to the device tree files so that the boards will able to use standby capability of MPC837x processors. The MPC837x PMC controllers are compatible with MPC8349 ones (i.e. no deep sleep).
sleep = <> properties are used to specify SCCR masks as described in "Specifying Device Power Management Information (sleep property)" chapter in Documentation/powerpc/booting-without-of.txt.
Since I2C1 and eSDHC controllers share the same clock source, they are now placed under sleep-nexus nodes.
A processor is able to wakeup the boards on LAN events (Wake-On-Lan), console events (with no_console_suspend kernel command line), GPIO events and external IRQs (IRQ1 and IRQ2).
The processor can also wakeup the boards by the fourth general purpose timer in GTM1 block, but the GTM wakeup support isn't yet implemented (it's tested to work, but it's unclear how can we use the quite short GTM timers, and how do we want to expose the GTM to userspace).
---
This is corrected version, with i2c1 and esdhc nodes placed inside the sleep-nexus, as suggested by Scott Wood.
arch/powerpc/boot/dts/mpc8377_mds.dts | 68 ++++++++++++++++------- arch/powerpc/boot/dts/mpc8377_rdb.dts | 98 +++++++++++++++++++++------------ arch/powerpc/boot/dts/mpc8378_mds.dts | 66 +++++++++++++++------- arch/powerpc/boot/dts/mpc8378_rdb.dts | 96 ++++++++++++++++++++------------ arch/powerpc/boot/dts/mpc8379_mds.dts | 68 ++++++++++++++++------- arch/powerpc/boot/dts/mpc8379_rdb.dts | 98 +++++++++++++++++++++------------ 6 files changed, 323 insertions(+), 171 deletions(-)
arch/powerpc/boot/dts/mpc8377_mds.dts +47 -21
@@ -129,21 +129,38 @@ reg = <0x200 0x100>; }; - i2c@3000 { + sleep-nexus { #address-cells = <1>; - #size-cells = <0>; - cell-index = <0>; - compatible = "fsl-i2c"; - reg = <0x3000 0x100>; - interrupts = <14 0x8>; - interrupt-parent = <&ipic>; - dfsrr; + #size-cells = <1>; + compatible = "simple-bus"; + sleep = <&pmc 0x0c000000>; + ranges; - rtc@68 { - compatible = "dallas,ds1374"; - reg = <0x68>; - interrupts = <19 0x8>; + i2c@3000 { + #address-cells = <1>; + #size-cells = <0>; + cell-index = <0>; + compatible = "fsl-i2c"; + reg = <0x3000 0x100>; + interrupts = <14 0x8>; interrupt-parent = <&ipic>; + dfsrr; + + rtc@68 { + compatible = "dallas,ds1374"; + reg = <0x68>; + interrupts = <19 0x8>; + interrupt-parent = <&ipic>; + }; + }; + + sdhci@2e000 { + compatible = "fsl,mpc8377-esdhc", "fsl,mpc8379-esdhc"; + reg = <0x2e000 0x1000>; + interrupts = <42 0x8>; + interrupt-parent = <&ipic>; + /* Filled in by U-Boot */ + clock-frequency = <0>; }; };
@@ -176,6 +193,7 @@ interrupts = <38 0x8>; dr_mode = "host"; phy_type = "ulpi"; + sleep = <&pmc 0x00c00000>; }; mdio@24520 {
@@ -226,6 +244,8 @@ interrupt-parent = <&ipic>; tbi-handle = <&tbi0>; phy-handle = <&phy2>; + sleep = <&pmc 0xc0000000>; + fsl,magic-packet; }; enet1: ethernet@25000 {
@@ -240,6 +260,8 @@ interrupt-parent = <&ipic>; tbi-handle = <&tbi1>; phy-handle = <&phy3>; + sleep = <&pmc 0x30000000>; + fsl,magic-packet; }; serial0: serial@4500 {
@@ -311,15 +333,7 @@ fsl,channel-fifo-len = <24>; fsl,exec-units-mask = <0x9fe>; fsl,descriptor-types-mask = <0x3ab0ebf>; - }; - - sdhci@2e000 { - compatible = "fsl,mpc8377-esdhc", "fsl,mpc8379-esdhc"; - reg = <0x2e000 0x1000>; - interrupts = <42 0x8>; - interrupt-parent = <&ipic>; - /* Filled in by U-Boot */ - clock-frequency = <0>; + sleep = <&pmc 0x03000000>; }; sata@18000 {
@@ -327,6 +341,7 @@ reg = <0x18000 0x1000>; interrupts = <44 0x8>; interrupt-parent = <&ipic>; + sleep = <&pmc 0x000000c0>; }; sata@19000 {
@@ -334,6 +349,7 @@ reg = <0x19000 0x1000>; interrupts = <45 0x8>; interrupt-parent = <&ipic>; + sleep = <&pmc 0x00000030>; }; /* IPIC
@@ -349,6 +365,13 @@ #interrupt-cells = <2>; reg = <0x700 0x100>; }; + + pmc: power@b00 { + compatible = "fsl,mpc8377-pmc", "fsl,mpc8349-pmc"; + reg = <0xb00 0x100 0xa00 0x100>; + interrupts = <80 0x8>; + interrupt-parent = <&ipic>; + }; }; pci0: pci@e0008500 {
@@ -403,6 +426,7 @@ ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>; + sleep = <&pmc 0x00010000>; clock-frequency = <0>; #interrupt-cells = <1>; #size-cells = <2>;
@@ -428,6 +452,7 @@ 0 0 0 2 &ipic 1 8 0 0 0 3 &ipic 1 8 0 0 0 4 &ipic 1 8>; + sleep = <&pmc 0x00300000>; clock-frequency = <0>; pcie@0 {
@@ -459,6 +484,7 @@ 0 0 0 2 &ipic 2 8 0 0 0 3 &ipic 2 8 0 0 0 4 &ipic 2 8>; + sleep = <&pmc 0x000c0000>; clock-frequency = <0>; pcie@0 {
arch/powerpc/boot/dts/mpc8377_rdb.dts +62 -36
168 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8378_mds.dts +45 -21
123 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8378_rdb.dts +60 -36
154 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8379_mds.dts +47 -21
137 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8379_rdb.dts +62 -36
168 lines not on this page · raw message
Signature · 1 line
1.5.6.5
arch/powerpc/boot/dts/mpc8377_mds.dts line 249
Quoted 8 lines · Anton Vorontsov
arch/powerpc/boot/dts/mpc8377_mds.dts +2
-0mdio@24520 {@@ -226,6 +244,8 @@ interrupt-parent = <&ipic>; tbi-handle = <&tbi0>; phy-handle = <&phy2>; + sleep = <&pmc 0xc0000000>; + fsl,magic-packet; };
Note that this makes it look to the kernel like enet0 can be put to sleep without putting the mdio (which is shared with enet1) to sleep. This is why I moved mdio under the ethernet node on 8313erdb.
-Scott
Quoted 13 lines · Scott Wood
arch/powerpc/boot/dts/mpc8377_mds.dts line 249
Quoted 8 lines · Anton Vorontsov
arch/powerpc/boot/dts/mpc8377_mds.dts +2
-0mdio@24520 {@@ -226,6 +244,8 @@ interrupt-parent = <&ipic>; tbi-handle = <&tbi0>; phy-handle = <&phy2>; + sleep = <&pmc 0xc0000000>; + fsl,magic-packet; };Note that this makes it look to the kernel like enet0 can be put to sleep without putting the mdio (which is shared with enet1) to sleep. This is why I moved mdio under the ethernet node on 8313erdb.
And that isn't absolutely correct either, since enet1 depends on net0... If enet0's mdio goes into sleep mode before enet1, then enet1 will fail to send power-down command to its PHY...
So the better solution would be
sleep-nexus {
sleep = <enet0-sccr>;
enet0 {
mdio {
};
};
enet1 {
sleep = <enet1-sccr>;
};
};..which isn't 100% correct either, but will work (because we use a separate driver for the Gianfar MDIO).
What do you think?
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
Quoted 14 lines · Anton Vorontsov
Quoted 12 lines · Scott Wood
arch/powerpc/boot/dts/mpc8377_mds.dts line 249
Quoted 8 lines · Anton Vorontsov
arch/powerpc/boot/dts/mpc8377_mds.dts +2
-0mdio@24520 {@@ -226,6 +244,8 @@ interrupt-parent = <&ipic>; tbi-handle = <&tbi0>; phy-handle = <&phy2>; + sleep = <&pmc 0xc0000000>; + fsl,magic-packet; };Note that this makes it look to the kernel like enet0 can be put to sleep without putting the mdio (which is shared with enet1) to sleep. This is why I moved mdio under the ethernet node on 8313erdb.
Quoted 3 lines
And that isn't absolutely correct either, since enet1 depends on net0... If enet0's mdio goes into sleep mode before enet1, then enet1 will fail to send power-down command to its PHY...
But the kernel knows that enet1 depends on mdio0. Getting the kernel to act on that knowledge isn't the device tree's problem.
-Scott
RFC PATCH 1/1 powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes
Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep = <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.
---
Quoted 15 lines · Scott Wood
Quoted 14 lines · Anton Vorontsov
Quoted 12 lines · Scott Wood
Review line 249
Quoted 8 lines · Anton Vorontsov
(quoted diff) +2
-0mdio@24520 {@@ -226,6 +244,8 @@ interrupt-parent = <&ipic>; tbi-handle = <&tbi0>; phy-handle = <&phy2>; + sleep = <&pmc 0xc0000000>; + fsl,magic-packet; };Note that this makes it look to the kernel like enet0 can be put to sleep without putting the mdio (which is shared with enet1) to sleep. This is why I moved mdio under the ethernet node on 8313erdb.
Quoted 6 lines
Quoted 3 lines
And that isn't absolutely correct either, since enet1 depends on net0... If enet0's mdio goes into sleep mode before enet1, then enet1 will fail to send power-down command to its PHY...
But the kernel knows that enet1 depends on mdio0. Getting the kernel to act on that knowledge isn't the device tree's problem.
Well, that makes sense. I'd like to move mdio nodes in a separate patch though, since the original patch becomes difficult to review because of too many changes...
A question though... do we want real addr translation via ranges, or the dummy "ranges;" are OK?
Here is the RFC. It's tested to work on MPC8377-RDB.
Please review carefully..
Thanks,
arch/powerpc/boot/dts/mpc8315erdb.dts | 84 ++++++++++++++++------------- arch/powerpc/boot/dts/mpc8349emitx.dts | 73 ++++++++++++++------------ arch/powerpc/boot/dts/mpc8349emitxgp.dts | 44 ++++++++------- arch/powerpc/boot/dts/mpc834x_mds.dts | 85 ++++++++++++++++-------------- arch/powerpc/boot/dts/mpc8377_mds.dts | 84 ++++++++++++++++------------- arch/powerpc/boot/dts/mpc8377_rdb.dts | 71 ++++++++++++++----------- arch/powerpc/boot/dts/mpc8378_mds.dts | 84 ++++++++++++++++------------- arch/powerpc/boot/dts/mpc8378_rdb.dts | 73 ++++++++++++++----------- arch/powerpc/boot/dts/mpc8379_mds.dts | 83 ++++++++++++++++------------- arch/powerpc/boot/dts/mpc8379_rdb.dts | 70 ++++++++++++++----------- 10 files changed, 413 insertions(+), 338 deletions(-)
arch/powerpc/boot/dts/mpc8315erdb.dts +46 -38
@@ -190,66 +190,74 @@ phy_type = "utmi"; }; - mdio@24520 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,gianfar-mdio"; - reg = <0x24520 0x20>; - phy0: ethernet-phy@0 { - interrupt-parent = <&ipic>; - interrupts = <20 0x8>; - reg = <0x0>; - device_type = "ethernet-phy"; - }; - phy1: ethernet-phy@1 { - interrupt-parent = <&ipic>; - interrupts = <19 0x8>; - reg = <0x1>; - device_type = "ethernet-phy"; - }; - tbi0: tbi-phy@11 { - reg = <0x11>; - device_type = "tbi-phy"; - }; - }; - - mdio@25520 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,gianfar-tbi"; - reg = <0x25520 0x20>; - - tbi1: tbi-phy@11 { - reg = <0x11>; - device_type = "tbi-phy"; - }; - }; - - enet0: ethernet@24000 { + #address-cells = <1>; + #size-cells = <1>; cell-index = <0>; device_type = "network"; model = "eTSEC"; - compatible = "gianfar"; + compatible = "gianfar", "simple-bus"; reg = <0x24000 0x1000>; + ranges; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <32 0x8 33 0x8 34 0x8>; interrupt-parent = <&ipic>; tbi-handle = <&tbi0>; phy-handle = < &phy0 >; + + mdio@24520 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,gianfar-mdio"; + reg = <0x24520 0x20>; + + phy0: ethernet-phy@0 { + interrupt-parent = <&ipic>; + interrupts = <20 0x8>; + reg = <0x0>; + device_type = "ethernet-phy"; + }; + + phy1: ethernet-phy@1 { + interrupt-parent = <&ipic>; + interrupts = <19 0x8>; + reg = <0x1>; + device_type = "ethernet-phy"; + }; + + tbi0: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; }; enet1: ethernet@25000 { + #address-cells = <1>; + #size-cells = <1>; cell-index = <1>; device_type = "network"; model = "eTSEC"; - compatible = "gianfar"; + compatible = "gianfar", "simple-bus"; reg = <0x25000 0x1000>; + ranges; local-mac-address = [ 00 00 00 00 00 00 ]; interrupts = <35 0x8 36 0x8 37 0x8>; interrupt-parent = <&ipic>; tbi-handle = <&tbi1>; phy-handle = < &phy1 >; + + mdio@25520 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,gianfar-tbi"; + reg = <0x25520 0x20>; + + tbi1: tbi-phy@11 { + reg = <0x11>; + device_type = "tbi-phy"; + }; + }; }; serial0: serial@4500 {
arch/powerpc/boot/dts/mpc8349emitx.dts +40 -33
103 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8349emitxgp.dts +24 -20
61 lines not on this page · raw message
arch/powerpc/boot/dts/mpc834x_mds.dts +46 -39
115 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8377_mds.dts +46 -38
114 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8377_rdb.dts +39 -32
101 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8378_mds.dts +46 -38
114 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8378_rdb.dts +41 -32
105 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8379_mds.dts +46 -37
113 lines not on this page · raw message
arch/powerpc/boot/dts/mpc8379_rdb.dts +39 -31
100 lines not on this page · raw message
Signature · 1 line
1.5.6.5
Re: [PATCH RFC] powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes
Quoted 11 lines · Anton Vorontsov
Currently it doesn't matter where the mdio nodes are placed, but with power management support (i.e. when sleep =3D <> properties will take effect), mdio nodes placement will become important: mdio controller is a part of the ethernet block, so the mdio nodes should be placed correctly. Otherwise we may wrongly assume that MDIO controllers are available during sleep.
Suggested-by Scott Wood <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>---
Quoted 7 lines
Quoted 6 lines · Scott Wood
Quoted 5 lines · Anton Vorontsov
Quoted 4 lines · Scott Wood
Quoted 3 lines · Anton Vorontsov
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mdio@24520 {
(quoted diff) +0
-0@@ -226,6 +244,8 @@=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
interrupt-parent =3D <&ipic>;
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
tbi-handle =3D <&tbi0>;
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
phy-handle =3D <&phy2>;
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0sleep=
=3D <&pmc 0xc0000000>;
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fsl,m=
agic-packet;
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0};
Note that this makes it look to the kernel like enet0 can be put to sl=
eep
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
without putting the mdio (which is shared with enet1) to sleep. =C2=A0=
This is
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
why I moved mdio under the ethernet node on 8313erdb.
And that isn't absolutely correct either, since enet1 depends on net0... If enet0's mdio goes into sleep mode before enet1, then enet1 will fail to send power-down command to its PHY...
But the kernel knows that enet1 depends on mdio0. =C2=A0Getting the kern=
el to
Quoted 10 lines
Quoted 1 line
act on that knowledge isn't the device tree's problem.
Well, that makes sense. I'd like to move mdio nodes in a separate patch though, since the original patch becomes difficult to review because of too many changes...
A question though... do we want real addr translation via ranges, or the dummy "ranges;" are OK?
Here is the RFC. It's tested to work on MPC8377-RDB.
Last time I brought up a similar issue with a MPC8313 patch. Looks like the consensus is that we shouldn't use compatible =3D "simple-bus" for gianfar nodes.
- Leo