| Message ID | 20220902043511.17130-5-quic_rjendra@quicinc.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | soc: qcom: icc-bwmon: Add support for llcc and cpu bwmon on sc7280 | expand |
Hi, On Fri, Sep 02, 2022 at 10:05:11AM +0530, Rajendra Nayak wrote: > Add cpu and llcc BWMON nodes and their corresponding > OPP tables for sc7280 SoC. > > Signed-off-by: Rajendra Nayak <quic_rjendra@quicinc.com> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> I found that with a v6.1 kernel AOSS on sc7280 doesn't reach it's low power state during system. This can be observed on herobrine based boards on which the AP_SUSPEND signal should transition to 1 during system suspend. If it doesn't the Embedded Controller (EC) notices it and wakes the system up again. Bisection points to this patch, the issue only occurs when CONFIG_QCOM_ICC_BWMON is *not* set. One might think the patch shouldn't have any impact at all when the driver is not enabled, but it does. Debugging shows that the issue is interconnect related. A bare platform device is created for each bwmon devices, which results in the average and peak bandwidth of the interconnect link to be set 'initially' to INT_MAX. The driver is supposed to call icc_sync_state() during probe, which would set the initially bandwidths to 0 and determine the actually needed bandwidth. But since the driver isn't probed the initial bandwidths stay at INT_MAX. This isn't actually an issue with this patch, but how the interconnect framework deals with devices that are registered on the bus, but aren't probed (yet). Not sure how this would be best fixed. Georgi, do you have any ideas? Thanks Matthias
On 13/01/2023 19:18, Matthias Kaehlcke wrote: > Hi, > > On Fri, Sep 02, 2022 at 10:05:11AM +0530, Rajendra Nayak wrote: >> Add cpu and llcc BWMON nodes and their corresponding >> OPP tables for sc7280 SoC. >> >> Signed-off-by: Rajendra Nayak <quic_rjendra@quicinc.com> >> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > I found that with a v6.1 kernel AOSS on sc7280 doesn't reach it's low > power state during system. This can be observed on herobrine based > boards on which the AP_SUSPEND signal should transition to 1 during > system suspend. If it doesn't the Embedded Controller (EC) notices > it and wakes the system up again. > > Bisection points to this patch, the issue only occurs when > CONFIG_QCOM_ICC_BWMON is *not* set. One might think the patch shouldn't > have any impact at all when the driver is not enabled, but it does. > > Debugging shows that the issue is interconnect related. A bare platform > device is created for each bwmon devices, which results in the average > and peak bandwidth of the interconnect link to be set 'initially' to > INT_MAX. The driver is supposed to call icc_sync_state() during probe, This is for interconnect providers, not consumers. > which would set the initially bandwidths to 0 and determine the actually > needed bandwidth. But since the driver isn't probed the initial > bandwidths stay at INT_MAX. > > This isn't actually an issue with this patch, but how the interconnect > framework deals with devices that are registered on the bus, but aren't > probed (yet). Not sure how this would be best fixed. Georgi, do you have > any ideas? Why the device is not probed (yet)? If it is registered, it will come soon during boot up. Best regards, Krzysztof
On Sun, Jan 15, 2023 at 04:13:40PM +0100, Krzysztof Kozlowski wrote: > On 13/01/2023 19:18, Matthias Kaehlcke wrote: > > Hi, > > > > On Fri, Sep 02, 2022 at 10:05:11AM +0530, Rajendra Nayak wrote: > >> Add cpu and llcc BWMON nodes and their corresponding > >> OPP tables for sc7280 SoC. > >> > >> Signed-off-by: Rajendra Nayak <quic_rjendra@quicinc.com> > >> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > > > I found that with a v6.1 kernel AOSS on sc7280 doesn't reach it's low > > power state during system. This can be observed on herobrine based > > boards on which the AP_SUSPEND signal should transition to 1 during > > system suspend. If it doesn't the Embedded Controller (EC) notices > > it and wakes the system up again. > > > > Bisection points to this patch, the issue only occurs when > > CONFIG_QCOM_ICC_BWMON is *not* set. One might think the patch shouldn't > > have any impact at all when the driver is not enabled, but it does. > > > > Debugging shows that the issue is interconnect related. A bare platform > > device is created for each bwmon devices, which results in the average > > and peak bandwidth of the interconnect link to be set 'initially' to > > INT_MAX. The driver is supposed to call icc_sync_state() during probe, > > This is for interconnect providers, not consumers. Ah, thanks for the clarification. Still, for the INT_MAX bandwidth setting remains in place unless the device is probed. > > which would set the initially bandwidths to 0 and determine the actually > > needed bandwidth. But since the driver isn't probed the initial > > bandwidths stay at INT_MAX. > > > > This isn't actually an issue with this patch, but how the interconnect > > framework deals with devices that are registered on the bus, but aren't > > probed (yet). Not sure how this would be best fixed. Georgi, do you have > > any ideas? > > Why the device is not probed (yet)? If it is registered, it will come > soon during boot up. Because CONFIG_QCOM_ICC_BWMON is not enabled for the board in question (see above). It could be enabled as a short term mitigtion, however we shouldn't require drivers to be enabled just because the DT has a corresponding node.
On 17/01/2023 18:27, Matthias Kaehlcke wrote: > >>> which would set the initially bandwidths to 0 and determine the actually >>> needed bandwidth. But since the driver isn't probed the initial >>> bandwidths stay at INT_MAX. >>> >>> This isn't actually an issue with this patch, but how the interconnect >>> framework deals with devices that are registered on the bus, but aren't >>> probed (yet). Not sure how this would be best fixed. Georgi, do you have >>> any ideas? >> >> Why the device is not probed (yet)? If it is registered, it will come >> soon during boot up. > > Because CONFIG_QCOM_ICC_BWMON is not enabled for the board in question (see > above). It could be enabled as a short term mitigtion, however we shouldn't > require drivers to be enabled just because the DT has a corresponding node. It's the same case as with all other interconnect leafs/consumers. The same behavior if you do not have it enabled, right? If not, I wonder what is here different? Best regards, Krzysztof
On Tue, Jan 17, 2023 at 06:33:41PM +0100, Krzysztof Kozlowski wrote: > On 17/01/2023 18:27, Matthias Kaehlcke wrote: > > > >>> which would set the initially bandwidths to 0 and determine the actually > >>> needed bandwidth. But since the driver isn't probed the initial > >>> bandwidths stay at INT_MAX. > >>> > >>> This isn't actually an issue with this patch, but how the interconnect > >>> framework deals with devices that are registered on the bus, but aren't > >>> probed (yet). Not sure how this would be best fixed. Georgi, do you have > >>> any ideas? > >> > >> Why the device is not probed (yet)? If it is registered, it will come > >> soon during boot up. > > > > Because CONFIG_QCOM_ICC_BWMON is not enabled for the board in question (see > > above). It could be enabled as a short term mitigtion, however we shouldn't > > require drivers to be enabled just because the DT has a corresponding node. > > It's the same case as with all other interconnect leafs/consumers. The > same behavior if you do not have it enabled, right? If not, I wonder > what is here different? Right, this is a general issue. The problem on sc7280 (and probably other Qualcomm SoCs) is that the interconnect link at full throttle prevents the SoC from entering its low power mode (AOSS sleep) during system suspend. On many boards this might go unnoticed, on herobrine the condition is detected by the embedded controller (EC) and considered a failed suspend, which results in waking up the system.
On Tue, Jan 17, 2023 at 05:47:14PM +0000, Matthias Kaehlcke wrote: > On Tue, Jan 17, 2023 at 06:33:41PM +0100, Krzysztof Kozlowski wrote: > > On 17/01/2023 18:27, Matthias Kaehlcke wrote: > > > > > >>> which would set the initially bandwidths to 0 and determine the actually > > >>> needed bandwidth. But since the driver isn't probed the initial > > >>> bandwidths stay at INT_MAX. > > >>> > > >>> This isn't actually an issue with this patch, but how the interconnect > > >>> framework deals with devices that are registered on the bus, but aren't > > >>> probed (yet). Not sure how this would be best fixed. Georgi, do you have > > >>> any ideas? > > >> > > >> Why the device is not probed (yet)? If it is registered, it will come > > >> soon during boot up. > > > > > > Because CONFIG_QCOM_ICC_BWMON is not enabled for the board in question (see > > > above). It could be enabled as a short term mitigtion, however we shouldn't > > > require drivers to be enabled just because the DT has a corresponding node. > > > > It's the same case as with all other interconnect leafs/consumers. The > > same behavior if you do not have it enabled, right? If not, I wonder > > what is here different? > > Right, this is a general issue. The problem on sc7280 (and probably other > Qualcomm SoCs) is that the interconnect link at full throttle prevents the > SoC from entering its low power mode (AOSS sleep) during system suspend. > On many boards this might go unnoticed, on herobrine the condition is > detected by the embedded controller (EC) and considered a failed suspend, > which results in waking up the system. I did some hackery to convince the EC to enter/stay in S3, despite AOSS no entering sleep mode. That allowed me to take power measurements. With the kernel suspended but the AOSS remaining on the power consumption of the Qcard is more than 7x higher than when the AOSS enters sleep mode! On a Qcard system I can't break the power consumption further down, but I think the extra power consumption must be coming mostly from the SoC itself, since the kernel and the EC are essentially in the same state as during a suspend with AOSS in sleep mode. The enormous increase in power consumption suggests that this is a serious issue for non-Chrome OS platforms as well. On herobrine and trogdor boards we have the 'luxury' of being able to detect that AOSS stays awake (though it comes with the caveat that the system can't suspend when that happens). On other boards this goes likely unnoticed until someone measures suspend power or notices a significant regression in S3 battery life. It seems something needs to be done at the interconnect core to fix this. Is it really necessary to init all link to max bandwidth? Maybe it is needed for certain links, but not all of them? What is the background here?
Hi Matthias, On 20.01.23 23:32, Matthias Kaehlcke wrote: > On Tue, Jan 17, 2023 at 05:47:14PM +0000, Matthias Kaehlcke wrote: >> On Tue, Jan 17, 2023 at 06:33:41PM +0100, Krzysztof Kozlowski wrote: >>> On 17/01/2023 18:27, Matthias Kaehlcke wrote: >>>> >>>>>> which would set the initially bandwidths to 0 and determine the actually >>>>>> needed bandwidth. But since the driver isn't probed the initial >>>>>> bandwidths stay at INT_MAX. >>>>>> >>>>>> This isn't actually an issue with this patch, but how the interconnect >>>>>> framework deals with devices that are registered on the bus, but aren't >>>>>> probed (yet). Not sure how this would be best fixed. Georgi, do you have >>>>>> any ideas? >>>>> >>>>> Why the device is not probed (yet)? If it is registered, it will come >>>>> soon during boot up. >>>> >>>> Because CONFIG_QCOM_ICC_BWMON is not enabled for the board in question (see >>>> above). It could be enabled as a short term mitigtion, however we shouldn't >>>> require drivers to be enabled just because the DT has a corresponding node. >>> >>> It's the same case as with all other interconnect leafs/consumers. The >>> same behavior if you do not have it enabled, right? If not, I wonder >>> what is here different? >> >> Right, this is a general issue. The problem on sc7280 (and probably other >> Qualcomm SoCs) is that the interconnect link at full throttle prevents the >> SoC from entering its low power mode (AOSS sleep) during system suspend. >> On many boards this might go unnoticed, on herobrine the condition is >> detected by the embedded controller (EC) and considered a failed suspend, >> which results in waking up the system. > > I did some hackery to convince the EC to enter/stay in S3, despite AOSS > no entering sleep mode. That allowed me to take power measurements. With > the kernel suspended but the AOSS remaining on the power consumption of > the Qcard is more than 7x higher than when the AOSS enters sleep mode! > On a Qcard system I can't break the power consumption further down, but > I think the extra power consumption must be coming mostly from the SoC > itself, since the kernel and the EC are essentially in the same state as > during a suspend with AOSS in sleep mode. > > The enormous increase in power consumption suggests that this is a serious > issue for non-Chrome OS platforms as well. On herobrine and trogdor boards > we have the 'luxury' of being able to detect that AOSS stays awake (though > it comes with the caveat that the system can't suspend when that happens). > On other boards this goes likely unnoticed until someone measures suspend > power or notices a significant regression in S3 battery life. > > It seems something needs to be done at the interconnect core to fix this. > Is it really necessary to init all link to max bandwidth? Maybe it is > needed for certain links, but not all of them? What is the background > here? The basic idea here is to do some initial configuration of the system and enable the interconnect buses until all consumers have probed. Otherwise it might disable the bus to some hardware, whose driver (module) is not loaded yet (and didn't had a chance to express it's bandwidth needs). The max bandwidth is the default, but we can implement the get_bw() for a given platform to return the current (or initial) value. It would be best if we could read this value from the hardware, but as this is not possible on this board, maybe we can implement get_bw() to return something else. I guess that you see some int_max values in interconnect_summary for the ebi and llcc nodes that stay forever? BR, Georgi
Hi Georgi, Thanks for your reply! On Tue, Jan 24, 2023 at 02:02:36AM +0200, Georgi Djakov wrote: > Hi Matthias, > > On 20.01.23 23:32, Matthias Kaehlcke wrote: > > On Tue, Jan 17, 2023 at 05:47:14PM +0000, Matthias Kaehlcke wrote: > > > On Tue, Jan 17, 2023 at 06:33:41PM +0100, Krzysztof Kozlowski wrote: > > > > On 17/01/2023 18:27, Matthias Kaehlcke wrote: > > > > > > > > > > > > which would set the initially bandwidths to 0 and determine the actually > > > > > > > needed bandwidth. But since the driver isn't probed the initial > > > > > > > bandwidths stay at INT_MAX. > > > > > > > > > > > > > > This isn't actually an issue with this patch, but how the interconnect > > > > > > > framework deals with devices that are registered on the bus, but aren't > > > > > > > probed (yet). Not sure how this would be best fixed. Georgi, do you have > > > > > > > any ideas? > > > > > > > > > > > > Why the device is not probed (yet)? If it is registered, it will come > > > > > > soon during boot up. > > > > > > > > > > Because CONFIG_QCOM_ICC_BWMON is not enabled for the board in question (see > > > > > above). It could be enabled as a short term mitigtion, however we shouldn't > > > > > require drivers to be enabled just because the DT has a corresponding node. > > > > > > > > It's the same case as with all other interconnect leafs/consumers. The > > > > same behavior if you do not have it enabled, right? If not, I wonder > > > > what is here different? > > > > > > Right, this is a general issue. The problem on sc7280 (and probably other > > > Qualcomm SoCs) is that the interconnect link at full throttle prevents the > > > SoC from entering its low power mode (AOSS sleep) during system suspend. > > > On many boards this might go unnoticed, on herobrine the condition is > > > detected by the embedded controller (EC) and considered a failed suspend, > > > which results in waking up the system. > > > > I did some hackery to convince the EC to enter/stay in S3, despite AOSS > > no entering sleep mode. That allowed me to take power measurements. With > > the kernel suspended but the AOSS remaining on the power consumption of > > the Qcard is more than 7x higher than when the AOSS enters sleep mode! > > On a Qcard system I can't break the power consumption further down, but > > I think the extra power consumption must be coming mostly from the SoC > > itself, since the kernel and the EC are essentially in the same state as > > during a suspend with AOSS in sleep mode. > > > > The enormous increase in power consumption suggests that this is a serious > > issue for non-Chrome OS platforms as well. On herobrine and trogdor boards > > we have the 'luxury' of being able to detect that AOSS stays awake (though > > it comes with the caveat that the system can't suspend when that happens). > > On other boards this goes likely unnoticed until someone measures suspend > > power or notices a significant regression in S3 battery life. > > > > It seems something needs to be done at the interconnect core to fix this. > > Is it really necessary to init all link to max bandwidth? Maybe it is > > needed for certain links, but not all of them? What is the background > > here? > > The basic idea here is to do some initial configuration of the system and > enable the interconnect buses until all consumers have probed. Otherwise > it might disable the bus to some hardware, whose driver (module) is not > loaded yet (and didn't had a chance to express it's bandwidth needs). I imagine this is an issue for a subset of consumers that are already using the interconnects before they are probed (like an early-console UART). For most consumers (like SPI, USB, eMMC, GPU, ...) I'd expect that it should be fine if the interconnect is disabled until the driver is probed and specifies the bandwidth requirements. > The max bandwidth is the default, but we can implement the get_bw() for a > given platform to return the current (or initial) value. It would be best > if we could read this value from the hardware, but as this is not possible > on this board, maybe we can implement get_bw() to return something else. If my above assumption is correct maybe it would be an option to return a bandwidth of zero, except for the select links that might be used before the driver is probed. > I guess that you see some int_max values in interconnect_summary for the > ebi and llcc nodes that stay forever? Exactly: grep -e llcc_mc -e ebi /sys/kernel/debug/interconnect/interconnect_summary llcc_mc 2148483647 2147483647 ebi 2148483647 2147483647
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 13d7f267b289..a839ba968d13 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -3275,6 +3275,82 @@ }; }; + pmu@9091000 { + compatible = "qcom,sc7280-llcc-bwmon"; + reg = <0 0x9091000 0 0x1000>; + + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; + + interconnects = <&mc_virt MASTER_LLCC 3 &mc_virt SLAVE_EBI1 3>; + + operating-points-v2 = <&llcc_bwmon_opp_table>; + + llcc_bwmon_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-0 { + opp-peak-kBps = <800000>; + }; + opp-1 { + opp-peak-kBps = <1804000>; + }; + opp-2 { + opp-peak-kBps = <2188000>; + }; + opp-3 { + opp-peak-kBps = <3072000>; + }; + opp-4 { + opp-peak-kBps = <4068000>; + }; + opp-5 { + opp-peak-kBps = <6220000>; + }; + opp-6 { + opp-peak-kBps = <6832000>; + }; + opp-7 { + opp-peak-kBps = <8532000>; + }; + }; + }; + + pmu@90b6000 { + compatible = "qcom,sc7280-cpu-bwmon", "qcom,msm8998-bwmon"; + reg = <0 0x090b6400 0 0x600>; + + interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>; + + interconnects = <&gem_noc MASTER_APPSS_PROC 3 &gem_noc SLAVE_LLCC 3>; + operating-points-v2 = <&cpu_bwmon_opp_table>; + + cpu_bwmon_opp_table: opp-table { + compatible = "operating-points-v2"; + + opp-0 { + opp-peak-kBps = <2400000>; + }; + opp-1 { + opp-peak-kBps = <4800000>; + }; + opp-2 { + opp-peak-kBps = <7456000>; + }; + opp-3 { + opp-peak-kBps = <9600000>; + }; + opp-4 { + opp-peak-kBps = <12896000>; + }; + opp-5 { + opp-peak-kBps = <14928000>; + }; + opp-6 { + opp-peak-kBps = <17056000>; + }; + }; + }; + dc_noc: interconnect@90e0000 { reg = <0 0x090e0000 0 0x5080>; compatible = "qcom,sc7280-dc-noc";