coresight: etm4x: save/restore ETMv4 context across CPU low power states
Subsystems (4)
v2 cover coresight: etm4x: save/restore ETMv4 context across CPU low power states
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter 'pm_save_enable' is also introduced which can be configured to override the firmware property.
The hardware state is only ever saved and restored when the claim tags indicate that self-hosted mode is in use.
Changes since v1:
- Rebased onto coresight/next
- Correcly pass bit number rather than BIT macro to coresight_timeout
- Abort saving state if a timeout occurs
- Fix completely broken pm_notify handling and unregister handler on error
- Use state_needs_restore to ensure state is restored only once
- Add module parameter description to existing boot_enable parameter and use module_param instead of module_param_named
- Add firmware bindings for coresight-needs-save-restore
- Rename 'disable_pm_save' to 'pm_save_enable' which allows for disabled, enabled or firmware
- Update comment on etm4_os_lock, it incorrectly indicated that the code unlocks the trace registers
- Add comments to explain use of OS lock during save/restore
- Fix incorrect error description whilst waiting for PM stable
- Add WARN_ON_ONCE when cpu isn't as expected during save/restore
- Various updates to commit messages
Andrew Murray (5):
coresight: etm4x: remove superfluous setting of os_unlock
coresight: etm4x: use explicit barriers on enable/disable
coresight: etm4x: use module_param instead of module_param_named
coresight: etm4x: improve clarity of etm4_os_unlock comment
coresight: etm4x: save/restore state across CPU low power states
.../devicetree/bindings/arm/coresight.txt | 3 + drivers/hwtracing/coresight/coresight-etm4x.c | 315 +++++++++++++++++- drivers/hwtracing/coresight/coresight-etm4x.h | 66 ++++ drivers/hwtracing/coresight/coresight.c | 2 +- include/linux/coresight.h | 8 + 5 files changed, 387 insertions(+), 7 deletions(-)
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/5 coresight: etm4x: remove superfluous setting of os_unlock
In addition to unlocking the OS lock, etm4_os_unlock will also set the os_unlock flag. Therefore let's avoid unnecessarily setting os_unlock flag outside of this function.
--- drivers/hwtracing/coresight/coresight-etm4x.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x.c +1 -3
@@ -1047,10 +1047,8 @@ static int etm4_starting_cpu(unsigned int cpu)return 0 ;spin_lock (&etmdrvdata[cpu]->spinlock); -if (!etmdrvdata[cpu]->os_unlock) { +if (!etmdrvdata[cpu]->os_unlock)etm4_os_unlock (etmdrvdata[cpu]); - etmdrvdata[cpu]->os_unlock = true; - }if (local_read (&etmdrvdata[cpu]->mode))etm4_enable_hw (etmdrvdata[cpu]);
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/5 coresight: etm4x: use explicit barriers on enable/disable
In reply to Andrew MurraySynchronization is recommended before disabling the trace registers to prevent any start or stop points being speculative at the point of disabling the unit (section 7.3.77 of ARM IHI 0064D).
Synchronization is also recommended after programming the trace registers to ensure all updates are committed prior to normal code resuming (section 4.3.7 of ARM IHI 0064D).
Let's ensure these syncronization points are present in the code and clearly commented.
Note that we could rely on the barriers in CS_LOCK and coresight_disclaim_device_unlocked or the context switch to user space - however coresight may be of use in the kernel.
--- drivers/hwtracing/coresight/coresight-etm4x.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-etm4x.c +6 -1
@@ -188,6 +188,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)dev_err (etm_dev,"timeout while waiting for Idle Trace Status\n" ); +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); + done:CS_LOCK (drvdata->base);
@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */ +dsb (sy);isb ();writel_relaxed (control, drvdata->base +TRCPRGCTLR );
Signature · 1 line
2.21.0
Re: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
Hi Andrew,
Quoted 10 lines · Andrew Murray
Synchronization is recommended before disabling the trace registers to prevent any start or stop points being speculative at the point of disabling the unit (section 7.3.77 of ARM IHI 0064D).
Synchronization is also recommended after programming the trace registers to ensure all updates are committed prior to normal code resuming (section 4.3.7 of ARM IHI 0064D).
Let's ensure these syncronization points are present in the code and clearly commented.
Please could you also mention why we switched from mb() ?
Quoted 19 lines
Note that we could rely on the barriers in
CS_LOCKandcoresight_disclaim_device_unlockedor the context switch to user space - however coresight may be of use in the kernel.Signed-off-by Andrew Murray <[email protected]>--- drivers/hwtracing/coresight/coresight-etm4x.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/hwtracing/coresight/coresight-etm4x.c +0
-0
drivers/hwtracing/coresight/coresight-etm4x.c static int etm4_enable_hw(struct etmv4_drvdata *drvdata) · line 191
Quoted 4 lines
drivers/hwtracing/coresight/coresight-etm4x.c +1
-0@@ -188,6 +188,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)dev_err (etm_dev,"timeout while waiting for Idle Trace Status\n" ); +/* As recommended by 4.3.7 of ARM IHI 0064D */
nit: It would be good to mention the "section name" to help the reader find the same on a different version of the document. Also within the same version, this is listed in the subsection:
"Synchronization when using the memory-mapped interface"
Please could you update the comment to reflect the same ?
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_disable_hw(void *info) · line 461
Quoted 12 lines
drivers/hwtracing/coresight/coresight-etm4x.c +4
-1+dsb (sy); +isb (); + done:CS_LOCK (drvdata->base);@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */
Nit: This refers to completely unrelated section. Shouldn't this be the same as above ?
With the above fixed:
Re: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
Quoted 7 lines · Suzuki K Poulose
Hi Andrew,
Quoted 4 lines · Andrew Murray
Synchronization is recommended before disabling the trace registers to prevent any start or stop points being speculative at the point of disabling the unit (section 7.3.77 of ARM IHI 0064D).
Quoted 8 lines
Quoted 6 lines
Synchronization is also recommended after programming the trace registers to ensure all updates are committed prior to normal code resuming (section 4.3.7 of ARM IHI 0064D).
Let's ensure these syncronization points are present in the code and clearly commented.
Please could you also mention why we switched from
mb()?
No problem.
Quoted 29 lines
Quoted 20 lines
Note that we could rely on the barriers in
CS_LOCKandcoresight_disclaim_device_unlockedor the context switch to user space - however coresight may be of use in the kernel.Signed-off-by Andrew Murray <[email protected]>--- drivers/hwtracing/coresight/coresight-etm4x.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/hwtracing/coresight/coresight-etm4x.c +0
-0drivers/hwtracing/coresight/coresight-etm4x.c static int etm4_enable_hw(struct etmv4_drvdata *drvdata) · line 190
Quoted 3 lines
drivers/hwtracing/coresight/coresight-etm4x.c +1
-0@@ -188,6 +188,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)dev_err (etm_dev,"timeout while waiting for Idle Trace Status\n" ); +/* As recommended by 4.3.7 of ARM IHI 0064D */ nit: It would be good to mention the "section name" to help the reader find the same on a different version of the document. Also within the same version, this is listed in the subsection:
"Synchronization when using the memory-mapped interface"
Quoted 2 lines
Please could you update the comment to reflect the same ?
Yes sure.
Quoted 5 lines
Quoted 5 lines
drivers/hwtracing/coresight/coresight-etm4x.c +3
-0+dsb (sy); +isb (); + done:CS_LOCK (drvdata->base);
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_disable_hw(void *info) · line 460
Quoted 5 lines
drivers/hwtracing/coresight/coresight-etm4x.c +1
-1@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */ Nit: This refers to completely unrelated section. Shouldn't this be the same as above ?
Actually 4.3.7 relates to using dsb/isb after programming the trace unit registers and indicates this is to 'ensure that all updates are committed to the trace unit before normal code execution resumes'.
Whereas 7.3.77 (hidden awawy in the SSTATUS description) relates to using dsb/isb before disabling the trace unit to 'prevent any start or stop points being specualtive at the point of disabling the trace unit'.
Both sections suggest the same course of action - however I felt that the description in 7.3.77 better related to the context of etm4_disable_hw.
Perhaps if I also add the section name, readers are more likely to find this text?
Quoted 4 lines
With the above fixed:
Reviewed-by Suzuki K Poulose <[email protected]>
Thanks,
Andrew Murray
Re: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
In reply to Andrew MurrayHi Andrew,
Quoted 26 lines · Andrew Murray
Synchronization is recommended before disabling the trace registers to prevent any start or stop points being speculative at the point of disabling the unit (section 7.3.77 of ARM IHI 0064D).
Synchronization is also recommended after programming the trace registers to ensure all updates are committed prior to normal code resuming (section 4.3.7 of ARM IHI 0064D).
Let's ensure these syncronization points are present in the code and clearly commented.
Note that we could rely on the barriers in
CS_LOCKandcoresight_disclaim_device_unlockedor the context switch to user space - however coresight may be of use in the kernel.Signed-off-by Andrew Murray <[email protected]>--- drivers/hwtracing/coresight/coresight-etm4x.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/hwtracing/coresight/coresight-etm4x.c +0
-0
drivers/hwtracing/coresight/coresight-etm4x.c static int etm4_enable_hw(struct etmv4_drvdata *drvdata) · line 194
Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm4x.c +4
-0@@ -188,6 +188,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)dev_err (etm_dev,"timeout while waiting for Idle Trace Status\n" ); +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); +
I read the spec, it recommends to use dsb/isb after accessing trace unit, so here I think dsb(sy) is the most safe way.
arm64 defines barrier in arch/arm64/include/asm/barrier.h:
#define mb() dsb(sy)
so here I suggest to use barriers:
mb(); isb();
I wrongly assumed that mb() is for dmb operations, but actually it's defined for dsb operation. So we should use it and this is a common function between arm64 and arm.
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_disable_hw(void *info) · line 462
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +2
-1done:CS_LOCK (drvdata->base);@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */ +dsb (sy);
Here the old code should be right, mb() is the same thing with dsb(sy).
So we don't need to change at here?
Thanks,
Leo Yan
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +0
-0isb ();writel_relaxed (control, drvdata->base +TRCPRGCTLR );Signature · 6 lines
2.21.0 _______________________________________________ CoreSight mailing list [email protected] https://lists.linaro.org/mailman/listinfo/coresight
Re: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
Quoted 67 lines · Leo Yan
Hi Andrew,
Quoted 26 lines · Andrew Murray
Synchronization is recommended before disabling the trace registers to prevent any start or stop points being speculative at the point of disabling the unit (section 7.3.77 of ARM IHI 0064D).
Synchronization is also recommended after programming the trace registers to ensure all updates are committed prior to normal code resuming (section 4.3.7 of ARM IHI 0064D).
Let's ensure these syncronization points are present in the code and clearly commented.
Note that we could rely on the barriers in
CS_LOCKandcoresight_disclaim_device_unlockedor the context switch to user space - however coresight may be of use in the kernel.Signed-off-by Andrew Murray <[email protected]>--- drivers/hwtracing/coresight/coresight-etm4x.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/hwtracing/coresight/coresight-etm4x.c +0
-0drivers/hwtracing/coresight/coresight-etm4x.c static int etm4_enable_hw(struct etmv4_drvdata *drvdata) · line 194
Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm4x.c +4
-0@@ -188,6 +188,10 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)dev_err (etm_dev,"timeout while waiting for Idle Trace Status\n" ); +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); +I read the spec, it recommends to use dsb/isb after accessing trace unit, so here I think dsb(sy) is the most safe way.
arm64 defines barrier in
arch/arm64/include/asm/barrier.h:#define mb() dsb(sy)so here I suggest to use barriers:
mb(); isb();I wrongly assumed that
mb()is for dmb operations, but actually it's defined for dsb operation. So we should use it and this is a common function between arm64 and arm.drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_disable_hw(void *info) · line 462
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +2
-1done:CS_LOCK (drvdata->base);@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */ +dsb (sy);Here the old code should be right,
mb()is the same thing with dsb(sy).
Quoted 1 line
So we don't need to change at here?
Correct - on arm64 there is no difference between mb and dsb(sy) so no functional change on this hunk.
In repsonse to Suzuki's feedback on this patch, I've updated the commit message to describe why I've made this change, as follows:
"On armv8 the mb macro is defined as dsb(sy) - Given that the etm4x is only used on armv8 let's directly use dsb(sy) instead of mb(). This removes some ambiguity and makes it easier to correlate the code with the TRM."
Does that make sense?
Thanks,
Andrew Murray
Quoted 14 lines
Thanks,
Leo YanQuoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +0
-0isb ();writel_relaxed (control, drvdata->base +TRCPRGCTLR );Signature · 6 lines
2.21.0 _______________________________________________ CoreSight mailing list [email protected] https://lists.linaro.org/mailman/listinfo/coresight
Re: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
Hi Andrew,
On Fri, Jun 28, 2019 at 09:35:24AM +0100, Andrew Murray wrote:
[...]
Quoted 19 lines
Quoted 11 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_disable_hw(void *info) · line 462
Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm4x.c +2
-1@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */ +dsb (sy);Here the old code should be right,
mb()is the same thing with dsb(sy).Quoted 1 line
So we don't need to change at here?
Correct - on arm64 there is no difference between mb and dsb(sy) so no functional change on this hunk.
In repsonse to Suzuki's feedback on this patch, I've updated the commit message to describe why I've made this change, as follows:
Quoted 6 lines
"On armv8 the mb macro is defined as dsb(sy) - Given that the etm4x is only used on armv8 let's directly use dsb(sy) instead of
mb(). This removes some ambiguity and makes it easier to correlate the code with the TRM."Does that make sense?
On reason for preferring to use mb() rather than dsb(sy) is for compatibility cross different architectures (armv7, armv8, and so on ...). Seems to me mb() is a general API and transparent for architecture's difference.
dsb(sy) is quite dependent on specific Arm architecture, e.g. some old Arm architecures might don't support dsb(sy); and we are not sure later it will change for new architectures.
Thanks,
Leo Yan
Re: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
Quoted 32 lines · Leo Yan
Hi Andrew,
On Fri, Jun 28, 2019 at 09:35:24AM +0100, Andrew Murray wrote:
[...]
Quoted 19 lines
Quoted 11 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_disable_hw(void *info) · line 462
Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm4x.c +2
-1@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */ +dsb (sy);Here the old code should be right,
mb()is the same thing with dsb(sy).Quoted 1 line
So we don't need to change at here?
Correct - on arm64 there is no difference between mb and dsb(sy) so no functional change on this hunk.
In repsonse to Suzuki's feedback on this patch, I've updated the commit message to describe why I've made this change, as follows:
Quoted 6 lines
"On armv8 the mb macro is defined as dsb(sy) - Given that the etm4x is only used on armv8 let's directly use dsb(sy) instead of
mb(). This removes some ambiguity and makes it easier to correlate the code with the TRM."Does that make sense?
Quoted 8 lines
On reason for preferring to use
mb()rather than dsb(sy) is for compatibility cross different architectures (armv7, armv8, and so on ...). Seems to memb()is a general API and transparent for architecture's difference.dsb(sy) is quite dependent on specific Arm architecture, e.g. some old Arm architecures might don't support dsb(sy); and we are not sure later it will change for new architectures.
Yes but please note that the KConfig for this driver depends on ARM64.
Thanks,
Andrew Murray
Quoted 3 lines
Thanks,
Leo Yan
Re: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
Hi Andrew,
Quoted 38 lines · Andrew Murray
Quoted 37 lines · Leo Yan
Hi Andrew,
On Fri, Jun 28, 2019 at 09:35:24AM +0100, Andrew Murray wrote:
[...]
Quoted 19 lines
Quoted 11 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_disable_hw(void *info) · line 462
Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm4x.c +2
-1@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */ +dsb (sy);Here the old code should be right,
mb()is the same thing with dsb(sy).Quoted 1 line
So we don't need to change at here?
Correct - on arm64 there is no difference between mb and dsb(sy) so no functional change on this hunk.
In repsonse to Suzuki's feedback on this patch, I've updated the commit message to describe why I've made this change, as follows:
Quoted 6 lines
"On armv8 the mb macro is defined as dsb(sy) - Given that the etm4x is only used on armv8 let's directly use dsb(sy) instead of
mb(). This removes some ambiguity and makes it easier to correlate the code with the TRM."Does that make sense?
On reason for preferring to use
mb()rather than dsb(sy) is for compatibility cross different architectures (armv7, armv8, and so on ...). Seems to memb()is a general API and transparent for architecture's difference.
Quoted 5 lines
Quoted 3 lines
dsb(sy) is quite dependent on specific Arm architecture, e.g. some old Arm architecures might don't support dsb(sy); and we are not sure later it will change for new architectures.
Yes but please note that the KConfig for this driver depends on ARM64.
Understood your point.
I am a bit suspect it's right thing to always set dependency on ARM64 for ETMv4 driver. The reason is Armv8 CPU can also run with aarch32 mode in EL1.
If we let ETMv4 driver to support both aarch32 and aarch64, then we will see dsb(sy) might break building for some old Arm arches.
Thanks,
Leo Yan
Suzuki K Poulose
maintainerRe: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
Hi Leo,
Quoted 47 lines · Leo Yan
Hi Andrew,
Quoted 38 lines · Andrew Murray
Quoted 37 lines · Leo Yan
Hi Andrew,
On Fri, Jun 28, 2019 at 09:35:24AM +0100, Andrew Murray wrote:
[...]
Quoted 19 lines
Quoted 11 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_disable_hw(void *info) · line 462
Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm4x.c +2
-1@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1 ;/* make sure everything completes before disabling */ -mb (); +/* As recommended by 7.3.77 of ARM IHI 0064D */ +dsb (sy);Here the old code should be right,
mb()is the same thing with dsb(sy).Quoted 1 line
So we don't need to change at here?
Correct - on arm64 there is no difference between mb and dsb(sy) so no functional change on this hunk.
In repsonse to Suzuki's feedback on this patch, I've updated the commit message to describe why I've made this change, as follows:
Quoted 6 lines
"On armv8 the mb macro is defined as dsb(sy) - Given that the etm4x is only used on armv8 let's directly use dsb(sy) instead of
mb(). This removes some ambiguity and makes it easier to correlate the code with the TRM."Does that make sense?
On reason for preferring to use
mb()rather than dsb(sy) is for compatibility cross different architectures (armv7, armv8, and so on ...). Seems to memb()is a general API and transparent for architecture's difference.Quoted 5 lines
Quoted 3 lines
dsb(sy) is quite dependent on specific Arm architecture, e.g. some old Arm architecures might don't support dsb(sy); and we are not sure later it will change for new architectures.
Yes but please note that the KConfig for this driver depends on ARM64.
Quoted 8 lines
Understood your point.
I am a bit suspect it's right thing to always set dependency on ARM64 for ETMv4 driver. The reason is Armv8 CPU can also run with aarch32 mode in EL1.
If we let ETMv4 driver to support both aarch32 and aarch64, then we will see dsb(sy) might break building for some old Arm arches.
If we add support for ETMv4 on aarch32, I would recommend adding a "dsb" explicitly for aarch32 to make sure, it doesn't default to something else that the mb() may cover up as. There is no point in creating another level of indirection when the architecture is clear about it and the ETMv4 supporting architectures must implement "dsb". Had this been in a generic code, I would be happy to retain mb(). But this is specific to the ETMv4 driver and we know that dsb must be there.
Cheers
Suzuki
Re: [PATCH v2 2/5] coresight: etm4x: use explicit barriers on enable/disable
Hi Suzuki,
Quoted 54 lines · Suzuki K Poulose
Hi Leo,
Quoted 51 lines · Leo Yan
Hi Andrew,
Quoted 36 lines · Andrew Murray
Quoted 35 lines · Leo Yan
Hi Andrew,
On Fri, Jun 28, 2019 at 09:35:24AM +0100, Andrew Murray wrote:
[...]
Quoted 15 lines
Quoted 11 lines
Review static void etm4_disable_hw(void *info) · line 461
Quoted 6 lines
(quoted diff) +2
-1@@ -454,7 +458,8 @@ static void etm4_disable_hw(void *info) control &= ~0x1; /* make sure everything completes before disabling */ - mb(); + /* As recommended by 7.3.77 of ARM IHI 0064D */ + dsb(sy);Here the old code should be right,
mb()is the same thing with dsb(sy).So we don't need to change at here?
Correct - on arm64 there is no difference between mb and dsb(sy) so no functional change on this hunk.
Quoted 8 lines
In repsonse to Suzuki's feedback on this patch, I've updated the commit message to describe why I've made this change, as follows:
"On armv8 the mb macro is defined as dsb(sy) - Given that the etm4x is only used on armv8 let's directly use dsb(sy) instead ofmb(). This removes some ambiguity and makes it easier to correlate the code with the TRM."Does that make sense?
On reason for preferring to use
mb()rather than dsb(sy) is for compatibility cross different architectures (armv7, armv8, and so on ...). Seems to memb()is a general API and transparent for architecture's difference.Quoted 5 lines
Quoted 3 lines
dsb(sy) is quite dependent on specific Arm architecture, e.g. some old Arm architecures might don't support dsb(sy); and we are not sure later it will change for new architectures.
Yes but please note that the KConfig for this driver depends on ARM64.
Understood your point.
I am a bit suspect it's right thing to always set dependency on ARM64 for ETMv4 driver. The reason is Armv8 CPU can also run with aarch32 mode in EL1.
Quoted 6 lines
Quoted 2 lines
If we let ETMv4 driver to support both aarch32 and aarch64, then we will see dsb(sy) might break building for some old Arm arches.
If we add support for ETMv4 on aarch32, I would recommend adding a "dsb" explicitly for aarch32 to make sure, it doesn't default to something else that the
mb()may cover up as.
For aarch32, mb() should work well with below definition:
#ifdef CONFIG_ARM_HEAVY_MB
#define __arm_heavy_mb(x...) do { dsb(x); arm_heavy_mb(); } while (0) #else
#define __arm_heavy_mb(x...) dsb(x)
#endif
#if defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)
#define mb() __arm_heavy_mb()
#else
#define mb() barrier()
#endif
Quoted 5 lines
There is no point in creating another level
of indirection when the architecture is clear about it and the ETMv4 supporting architectures must implement "dsb". Had this been in a generic code, I would be happy to retainmb(). But this is specific to the ETMv4 driver and we know that dsb must be there.
Okay, I understand the purpose for more explict barrier in the code; this would be fine for me.
Thanks,
Leo Yan
PATCH v2 3/5 coresight: etm4x: use module_param instead of module_param_named
In reply to Andrew MurrayGiven that the user-exposed module parameter for 'boot_enable' matches the variable that it sets, let's use module_param instead of module_param_named.
Let's also use octal permissions (checkpatch recommends this) and provide a module parameter description.
--- drivers/hwtracing/coresight/coresight-etm4x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-etm4x.c +2 -1
@@ -34,7 +34,8 @@#include "coresight-etm-perf.h" static int boot_enable; -module_param_named (boot_enable, boot_enable, int,S_IRUGO ); +module_param (boot_enable, int,0444 ); +MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" );/* The number of ETMv4 currently registered */ static int etm4_count;
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 4/5 coresight: etm4x: improve clarity of etm4_os_unlock comment
In reply to Andrew MurrayTo improve clarity, let's update the comment for etm4_os_unlock to use the name of the register as per the ETM architecture specification.
The existing comment is also misleading as it suggests any value written to TRCOSLAR unlocks the trace registers, however it must be '0' - let's also correct this.
--- drivers/hwtracing/coresight/coresight-etm4x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-etm4x.c +1 -1
@@ -48,7 +48,7 @@ static enum cpuhp_state hp_online;static void etm4_os_unlock (struct etmv4_drvdata *drvdata) { -/* Writing any value to ETMOSLAR unlocks the trace registers */ +/* Writing 0 to TRCOSLAR unlocks the trace registers */ writel_relaxed (0x0 , drvdata->base +TRCOSLAR ); drvdata->os_unlock = true;isb ();
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 5/5 coresight: etm4x: save/restore state across CPU low power states
In reply to Andrew MurraySome hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter 'pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).
The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
--- .../devicetree/bindings/arm/coresight.txt | 3 + drivers/hwtracing/coresight/coresight-etm4x.c | 299 ++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm4x.h | 66 ++++ drivers/hwtracing/coresight/coresight.c | 2 +- include/linux/coresight.h | 8 + 5 files changed, 377 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/coresight.txt +3 -0
@@ -90,6 +90,9 @@ its hardware characteristcs. * cpu: the cpu phandle this ETM/PTM is affined to. When omitted the source is considered to belong to CPU0. + * arm,coresight-needs-save-restore: boolean. Indicates that software + should save/restore state across power down. + * Optional property for TMC: * arm,buffer-size: size of contiguous buffer space for TMC ETR
drivers/hwtracing/coresight/coresight-etm4x.c +299 -0
347 lines not on this page · raw message
drivers/hwtracing/coresight/coresight-etm4x.h +66 -0
96 lines not on this page · raw message
drivers/hwtracing/coresight/coresight.c +1 -1
@@ -140,7 +140,7 @@ static inline bool coresight_is_claimed_self_hosted(void __iomem *base)return coresight_read_claim_tags (base) ==CORESIGHT_CLAIM_SELF_HOSTED ; } -static inline bool coresight_is_claimed_any (void __iomem *base) +bool coresight_is_claimed_any (void __iomem *base) {return coresight_read_claim_tags (base) !=0 ; }
include/linux/coresight.h +8 -0
@@ -285,6 +285,9 @@ extern void coresight_disclaim_device(void __iomem *base);extern void coresight_disclaim_device_unlocked (void __iomem *base);extern char *coresight_alloc_device_name (struct coresight_dev_list *devs,struct device *dev); + +extern bool coresight_is_claimed_any (void __iomem *base); +#else static inline struct coresight_device *coresight_register (struct coresight_desc *desc) {return NULL ; }
@@ -307,6 +310,11 @@ static inline int coresight_claim_device(void __iomem *base)static inline void coresight_disclaim_device (void __iomem *base) {}static inline void coresight_disclaim_device_unlocked (void __iomem *base) {} +static inline bool coresight_is_claimed_any (void __iomem *base) +{ +return false; +} +#endif extern int coresight_get_cpu (struct device *dev);
Signature · 7 lines
2.21.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Hi Andrew,
Quoted 195 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
Signed-off-by Andrew Murray <[email protected]>--- .../devicetree/bindings/arm/coresight.txt | 3 + drivers/hwtracing/coresight/coresight-etm4x.c | 299 ++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm4x.h | 66 ++++ drivers/hwtracing/coresight/coresight.c | 2 +- include/linux/coresight.h | 8 + 5 files changed, 377 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/arm/coresight.txt +3
-0@@ -90,6 +90,9 @@ its hardware characteristcs. * cpu: the cpu phandle this ETM/PTM is affined to. When omitted the source is considered to belong to CPU0. + * arm,coresight-needs-save-restore: boolean. Indicates that software + should save/restore state across power down. + * Optional property for TMC: * arm,buffer-size: size of contiguous buffer space for TMC ETRdrivers/hwtracing/coresight/coresight-etm4x.c +118
-0@@ -18,6 +18,7 @@#include <linux/stat.h> #include <linux/clk.h> #include <linux/cpu.h> +#include <linux/cpu_pm.h> #include <linux/coresight.h> #include <linux/coresight-pmu.h> #include <linux/pm_wakeup.h> @@ -26,6 +27,7 @@#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <asm/sections.h> #include <asm/local.h> #include <asm/virt.h> @@ -37,6 +39,16 @@ static int boot_enable;module_param (boot_enable, int,0444 );MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" ); + +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" ); +/* The number of ETMv4 currently registered */ static int etm4_count;static struct etmv4_drvdata *etmdrvdata[NR_CPUS ];@@ -54,6 +66,14 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)isb (); } +static void etm4_os_lock (struct etmv4_drvdata *drvdata) +{ +/* Writing 0x1 to TRCOSLAR locks the trace registers */ +writel_relaxed (0x1 , drvdata->base +TRCOSLAR ); + drvdata->os_unlock = false; +isb (); +} +static bool etm4_arch_supported (u8 arch) {/* Mask out the minor version number */ @@ -1079,6 +1099,277 @@ static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) drvdata->trcid =coresight_get_trace_id (drvdata->cpu); } +#ifdef CONFIG_CPU_PM +static int etm4_cpu_save (struct etmv4_drvdata *drvdata) +{ +int i, ret =0 ; +u32 control; +struct etmv4_save_state *state; +struct device *etm_dev = &drvdata->csdev->dev; + +/* As recommended by 3.4.1 of ARM IHI 0064D */ +dsb (sy); +isb (); + +CS_UNLOCK (drvdata->base); + +/* Lock the OS lock to disable trace and external debugger access */ +etm4_os_lock (drvdata); + +/* wait for TRCSTATR.PMSTABLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR , +TRCSTATR_PMSTABLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for PM Stable Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + state = &drvdata->save_state; + + state->trcprgctlr =readl (drvdata->base +TRCPRGCTLR ); + state->trcprocselr =readl (drvdata->base +TRCPROCSELR ); + state->trcconfigr =readl (drvdata->base +TRCCONFIGR ); + state->trcauxctlr =readl (drvdata->base +TRCAUXCTLR ); + state->trceventctl0r =readl (drvdata->base +TRCEVENTCTL0R ); + state->trceventctl1r =readl (drvdata->base +TRCEVENTCTL1R ); + state->trcstallctlr =readl (drvdata->base +TRCSTALLCTLR ); + state->trctsctlr =readl (drvdata->base +TRCTSCTLR ); + state->trcsyncpr =readl (drvdata->base +TRCSYNCPR ); + state->trcccctlr =readl (drvdata->base +TRCCCCTLR ); + state->trcbbctlr =readl (drvdata->base +TRCBBCTLR ); + state->trctraceidr =readl (drvdata->base +TRCTRACEIDR ); + state->trcqctlr =readl (drvdata->base +TRCQCTLR ); + + state->trcvictlr =readl (drvdata->base +TRCVICTLR ); + state->trcviiectlr =readl (drvdata->base +TRCVIIECTLR ); + state->trcvissctlr =readl (drvdata->base +TRCVISSCTLR ); + state->trcvipcssctlr =readl (drvdata->base +TRCVIPCSSCTLR ); + state->trcvdctlr =readl (drvdata->base +TRCVDCTLR ); + state->trcvdsacctlr =readl (drvdata->base +TRCVDSACCTLR ); + state->trcvdarcctlr =readl (drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) + state->trcseqevr[i] =readl (drvdata->base +TRCSEQEVRn (i)); + + state->trcseqrstevr =readl (drvdata->base +TRCSEQRSTEVR ); + state->trcseqstr =readl (drvdata->base +TRCSEQSTR ); + state->trcextinselr =readl (drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { + state->trccntrldvr[i] =readl (drvdata->base +TRCCNTRLDVRn (i)); + state->trccntctlr[i] =readl (drvdata->base +TRCCNTCTLRn (i)); + state->trccntvr[i] =readl (drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) + state->trcrsctlr[i] =readl (drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { + state->trcssccr[i] =readl (drvdata->base +TRCSSCCRn (i)); + state->trcsscsr[i] =readl (drvdata->base +TRCSSCSRn (i)); + state->trcsspcicr[i] =readl (drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { + state->trcacvr[i] =readl (drvdata->base +TRCACVRn (i)); + state->trcacatr[i] =readl (drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) + state->trccidcvr[i] =readl (drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) + state->trcvmidcvr[i] =readl (drvdata->base +TRCVMIDCVRn (i)); + + state->trccidcctlr0 =readl (drvdata->base +TRCCIDCCTLR0 ); + state->trccidcctlr1 =readl (drvdata->base +TRCCIDCCTLR1 ); + + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR0 ); + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR1 ); + + state->trcclaimset =readl (drvdata->base +TRCCLAIMCLR ); + +/* wait for TRCSTATR.IDLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for Idle Trace Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ;
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1209
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+ goto out; + } + + drvdata->state_needs_restore = true; + +/* power can be removed from the trace unit now */ + control =readl_relaxed (drvdata->base +TRCPDCR ); + control &= ~TRCPDCR_PU ; +writel_relaxed (control, drvdata->base +TRCPDCR ); +
Do we need to manipulate PU here? The premise of this set is PU is ignored. That said, there might be a scenario where PU is honoured but we are forcing this anyway, in which case, why is PU not manipulated in the _restore() function?
Quoted 245 lines
drivers/hwtracing/coresight/coresight-etm4x.c +171
-0+out: +CS_LOCK (drvdata->base); +return ret; +} + +static void etm4_cpu_restore (struct etmv4_drvdata *drvdata) +{ +int i; +struct etmv4_save_state *state; + + state = &drvdata->save_state; + +CS_UNLOCK (drvdata->base); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + +writel_relaxed (state->trcprgctlr, drvdata->base +TRCPRGCTLR ); +writel_relaxed (state->trcprocselr, drvdata->base +TRCPROCSELR ); +writel_relaxed (state->trcconfigr, drvdata->base +TRCCONFIGR ); +writel_relaxed (state->trcauxctlr, drvdata->base +TRCAUXCTLR ); +writel_relaxed (state->trceventctl0r, drvdata->base +TRCEVENTCTL0R ); +writel_relaxed (state->trceventctl1r, drvdata->base +TRCEVENTCTL1R ); +writel_relaxed (state->trcstallctlr, drvdata->base +TRCSTALLCTLR ); +writel_relaxed (state->trctsctlr, drvdata->base +TRCTSCTLR ); +writel_relaxed (state->trcsyncpr, drvdata->base +TRCSYNCPR ); +writel_relaxed (state->trcccctlr, drvdata->base +TRCCCCTLR ); +writel_relaxed (state->trcbbctlr, drvdata->base +TRCBBCTLR ); +writel_relaxed (state->trctraceidr, drvdata->base +TRCTRACEIDR ); +writel_relaxed (state->trcqctlr, drvdata->base +TRCQCTLR ); + +writel_relaxed (state->trcvictlr, drvdata->base +TRCVICTLR ); +writel_relaxed (state->trcviiectlr, drvdata->base +TRCVIIECTLR ); +writel_relaxed (state->trcvissctlr, drvdata->base +TRCVISSCTLR ); +writel_relaxed (state->trcvipcssctlr, drvdata->base +TRCVIPCSSCTLR ); +writel_relaxed (state->trcvdctlr, drvdata->base +TRCVDCTLR ); +writel_relaxed (state->trcvdsacctlr, drvdata->base +TRCVDSACCTLR ); +writel_relaxed (state->trcvdarcctlr, drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) +writel_relaxed (state->trcseqevr[i], + drvdata->base +TRCSEQEVRn (i)); + +writel_relaxed (state->trcseqrstevr, drvdata->base +TRCSEQRSTEVR ); +writel_relaxed (state->trcseqstr, drvdata->base +TRCSEQSTR ); +writel_relaxed (state->trcextinselr, drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { +writel_relaxed (state->trccntrldvr[i], + drvdata->base +TRCCNTRLDVRn (i)); +writel_relaxed (state->trccntctlr[i], + drvdata->base +TRCCNTCTLRn (i)); +writel_relaxed (state->trccntvr[i], + drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) +writel_relaxed (state->trcrsctlr[i], + drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { +writel_relaxed (state->trcssccr[i], + drvdata->base +TRCSSCCRn (i)); +writel_relaxed (state->trcsscsr[i], + drvdata->base +TRCSSCSRn (i)); +writel_relaxed (state->trcsspcicr[i], + drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { +writel_relaxed (state->trcacvr[i], + drvdata->base +TRCACVRn (i)); +writel_relaxed (state->trcacatr[i], + drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) +writel_relaxed (state->trccidcvr[i], + drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) +writel_relaxed (state->trcvmidcvr[i], + drvdata->base +TRCVMIDCVRn (i)); + +writel_relaxed (state->trccidcctlr0, drvdata->base +TRCCIDCCTLR0 ); +writel_relaxed (state->trccidcctlr1, drvdata->base +TRCCIDCCTLR1 ); + +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR0 ); +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR1 ); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + + drvdata->state_needs_restore = false; + +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); + +/* Unlock the OS lock to re-enable trace and external debug access */ +etm4_os_unlock (drvdata); +CS_LOCK (drvdata->base); +} + +static int etm4_cpu_pm_notify (struct notifier_block *nb,unsigned long cmd, +void *v) +{ +struct etmv4_drvdata *drvdata; +unsigned int cpu =smp_processor_id (); + +if (!etmdrvdata[cpu]) +return 0 ; + + drvdata = etmdrvdata[cpu]; + +if (pm_save_enable ==PARAM_PM_SAVE_DISABLE || + (pm_save_enable ==PARAM_PM_SAVE_FIRMWARE && + !drvdata->pm_save_enable)) +return NOTIFY_OK ; + +if (WARN_ON_ONCE (drvdata->cpu !=smp_processor_id ())) +return NOTIFY_BAD ; + +switch (cmd) { +case CPU_PM_ENTER : +/* save the state if coresight is in use */ +if (coresight_is_claimed_any (drvdata->base)) +if (etm4_cpu_save (drvdata)) +return NOTIFY_BAD ; +break ; +case CPU_PM_EXIT : +case CPU_PM_ENTER_FAILED : +/* trcclaimset is set when there is state to restore */ +if (drvdata->state_needs_restore) +etm4_cpu_restore (drvdata); +break ; +default : +return NOTIFY_DONE ; + } + +return NOTIFY_OK ; +} + +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) +{ + drvdata->nb.notifier_call = etm4_cpu_pm_notify; +return cpu_pm_register_notifier (&drvdata->nb); +} + +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) +{ +if (drvdata->nb.notifier_call) +cpu_pm_unregister_notifier (&drvdata->nb); +} +#else +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) {return 0 ; } +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) { } +#endif + +static inline bool etm4_needs_save_restore (struct device *dev) +{ +return fwnode_property_present (dev->fwnode, +"arm,coresight-needs-save-restore" ); +} +static int etm4_probe (struct amba_device *adev,const struct amba_id *id) {int ret;@@ -1095,6 +1386,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)dev_set_drvdata (dev, drvdata); + drvdata->pm_save_enable =etm4_needs_save_restore (dev); +/* Validity for the resource is already checked by the AMBA core */ base =devm_ioremap_resource (dev, res);if (IS_ERR (base))@@ -1126,6 +1419,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (ret <0 ) goto err_arch_supported; hp_online = ret; + + ret =etm4_cpu_pm_register (drvdata); +if (ret) + goto err_arch_supported; }cpus_read_unlock ();@@ -1176,6 +1473,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) err_arch_supported:if (--etm4_count ==0 ) { +etm4_cpu_pm_unregister (drvdata); +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING );if (hp_online)cpuhp_remove_state_nocalls (hp_online);drivers/hwtracing/coresight/coresight-etm4x.h +35
-0@@ -175,6 +175,7 @@ ETM_MODE_EXCL_USER)#define TRCSTATR_IDLE_BIT 0 +#define TRCSTATR_PMSTABLE_BIT 1#define ETM_DEFAULT_ADDR_COMP 0/* PowerDown Control Register bits */ @@ -281,6 +282,65 @@ struct etmv4_config {u32 ext_inp; }; +/** +* struct etm4_save_state - state to be preserved when ETM is without power +*/ +struct etmv4_save_state { +u32 trcprgctlr; +u32 trcprocselr; +u32 trcconfigr; +u32 trcauxctlr; +u32 trceventctl0r; +u32 trceventctl1r; +u32 trcstallctlr; +u32 trctsctlr; +u32 trcsyncpr; +u32 trcccctlr; +u32 trcbbctlr; +u32 trctraceidr; +u32 trcqctlr; + +u32 trcvictlr; +u32 trcviiectlr; +u32 trcvissctlr; +u32 trcvipcssctlr; +u32 trcvdctlr; +u32 trcvdsacctlr; +u32 trcvdarcctlr; + +u32 trcseqevr[ETM_MAX_SEQ_STATES ]; +u32 trcseqrstevr; +u32 trcseqstr; +u32 trcextinselr; +u32 trccntrldvr[ETMv4_MAX_CNTR]; +u32 trccntctlr[ETMv4_MAX_CNTR]; +u32 trccntvr[ETMv4_MAX_CNTR]; +
drivers/hwtracing/coresight/coresight-etm4x.h struct etmv4_config { · line 328
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.h +10
-0+u32 trcrsctlr[ETM_MAX_RES_SEL *2 ]; + +u32 trcssccr[ETM_MAX_SS_CMP ]; +u32 trcsscsr[ETM_MAX_SS_CMP ]; +u32 trcsspcicr[ETM_MAX_SS_CMP ]; + +u64 trcacvr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcacatr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcdvcvr[ETM_MAX_DATA_VAL_CMP ]; +u64 trcdvcmr[ETM_MAX_DATA_VAL_CMP ];
These two sets of DATA registers - never used in the main code. Either use them or lose them.
I recommend that we lose them - data trace is architecturally prohibited for A class cores in ETMv4.
Regards
Mike
Quoted 85 lines
drivers/hwtracing/coresight/coresight-etm4x.h +21
-0+u64 trccidcvr[ETMv4_MAX_CTXID_CMP]; +u32 trcvmidcvr[ETM_MAX_VMID_CMP ]; +u32 trccidcctlr0; +u32 trccidcctlr1; +u32 trcvmidcctlr0; +u32 trcvmidcctlr1; + +u32 trcclaimset; + +u32 cntr_val[ETMv4_MAX_CNTR]; +u32 seq_state; +u32 vinst_ctrl; +u32 ss_status[ETM_MAX_SS_CMP ]; +}; +/** * struct etm4_drvdata - specifics associated to an ETM component * @base: Memory mapped base address for this component. @@ -336,6 +396,8 @@ struct etmv4_config {* @atbtrig: If the implementation can support ATB triggers * @lpoverride: If the implementation can support low-power state over. * @config: structure holding configuration parameters. +* @save_state: State to be preserved across power loss +* @nb: CPU PM notifier */ struct etmv4_drvdata {void __iomem *base;@@ -367,6 +429,7 @@ struct etmv4_drvdata {u8 q_support;bool sticky_enable;bool boot_enable; +bool pm_save_enable;bool os_unlock;bool instrp0;bool trcbb;@@ -381,6 +444,9 @@ struct etmv4_drvdata {bool atbtrig;bool lpoverride;struct etmv4_config config; +struct etmv4_save_state save_state; +bool state_needs_restore; +struct notifier_block nb; };/* Address comparator access types */ drivers/hwtracing/coresight/coresight.c +1
-1@@ -140,7 +140,7 @@ static inline bool coresight_is_claimed_self_hosted(void __iomem *base)return coresight_read_claim_tags (base) ==CORESIGHT_CLAIM_SELF_HOSTED ; } -static inline bool coresight_is_claimed_any (void __iomem *base) +bool coresight_is_claimed_any (void __iomem *base) {return coresight_read_claim_tags (base) !=0 ; }include/linux/coresight.h +8
-1@@ -285,6 +285,9 @@ extern void coresight_disclaim_device(void __iomem *base);extern void coresight_disclaim_device_unlocked (void __iomem *base);extern char *coresight_alloc_device_name (struct coresight_dev_list *devs,struct device *dev); + +extern bool coresight_is_claimed_any (void __iomem *base); +#else static inline struct coresight_device *coresight_register (struct coresight_desc *desc) {return NULL ; }@@ -307,6 +310,11 @@ static inline int coresight_claim_device(void __iomem *base)static inline void coresight_disclaim_device (void __iomem *base) {}static inline void coresight_disclaim_device_unlocked (void __iomem *base) {} +static inline bool coresight_is_claimed_any (void __iomem *base) +{ +return false; +} +#endif extern int coresight_get_cpu (struct device *dev); --
Quoted 2 lines
2.21.0
--
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 205 lines · Mike Leach
Hi Andrew,
Quoted 202 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
Signed-off-by Andrew Murray <[email protected]>--- .../devicetree/bindings/arm/coresight.txt | 3 + drivers/hwtracing/coresight/coresight-etm4x.c | 299 ++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm4x.h | 66 ++++ drivers/hwtracing/coresight/coresight.c | 2 +- include/linux/coresight.h | 8 + 5 files changed, 377 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/arm/coresight.txt +3
-0@@ -90,6 +90,9 @@ its hardware characteristcs. * cpu: the cpu phandle this ETM/PTM is affined to. When omitted the source is considered to belong to CPU0. + * arm,coresight-needs-save-restore: boolean. Indicates that software + should save/restore state across power down. + * Optional property for TMC: * arm,buffer-size: size of contiguous buffer space for TMC ETRdrivers/hwtracing/coresight/coresight-etm4x.c +125
-0@@ -18,6 +18,7 @@#include <linux/stat.h> #include <linux/clk.h> #include <linux/cpu.h> +#include <linux/cpu_pm.h> #include <linux/coresight.h> #include <linux/coresight-pmu.h> #include <linux/pm_wakeup.h> @@ -26,6 +27,7 @@#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <asm/sections.h> #include <asm/local.h> #include <asm/virt.h> @@ -37,6 +39,16 @@ static int boot_enable;module_param (boot_enable, int,0444 );MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" ); + +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" ); +/* The number of ETMv4 currently registered */ static int etm4_count;static struct etmv4_drvdata *etmdrvdata[NR_CPUS ];@@ -54,6 +66,14 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)isb (); } +static void etm4_os_lock (struct etmv4_drvdata *drvdata) +{ +/* Writing 0x1 to TRCOSLAR locks the trace registers */ +writel_relaxed (0x1 , drvdata->base +TRCOSLAR ); + drvdata->os_unlock = false; +isb (); +} +static bool etm4_arch_supported (u8 arch) {/* Mask out the minor version number */ @@ -1079,6 +1099,277 @@ static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) drvdata->trcid =coresight_get_trace_id (drvdata->cpu); } +#ifdef CONFIG_CPU_PM +static int etm4_cpu_save (struct etmv4_drvdata *drvdata) +{ +int i, ret =0 ; +u32 control; +struct etmv4_save_state *state; +struct device *etm_dev = &drvdata->csdev->dev; + +/* As recommended by 3.4.1 of ARM IHI 0064D */ +dsb (sy); +isb (); + +CS_UNLOCK (drvdata->base); + +/* Lock the OS lock to disable trace and external debugger access */ +etm4_os_lock (drvdata); + +/* wait for TRCSTATR.PMSTABLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR , +TRCSTATR_PMSTABLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for PM Stable Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + state = &drvdata->save_state; + + state->trcprgctlr =readl (drvdata->base +TRCPRGCTLR ); + state->trcprocselr =readl (drvdata->base +TRCPROCSELR ); + state->trcconfigr =readl (drvdata->base +TRCCONFIGR ); + state->trcauxctlr =readl (drvdata->base +TRCAUXCTLR ); + state->trceventctl0r =readl (drvdata->base +TRCEVENTCTL0R ); + state->trceventctl1r =readl (drvdata->base +TRCEVENTCTL1R ); + state->trcstallctlr =readl (drvdata->base +TRCSTALLCTLR ); + state->trctsctlr =readl (drvdata->base +TRCTSCTLR ); + state->trcsyncpr =readl (drvdata->base +TRCSYNCPR ); + state->trcccctlr =readl (drvdata->base +TRCCCCTLR ); + state->trcbbctlr =readl (drvdata->base +TRCBBCTLR ); + state->trctraceidr =readl (drvdata->base +TRCTRACEIDR ); + state->trcqctlr =readl (drvdata->base +TRCQCTLR ); + + state->trcvictlr =readl (drvdata->base +TRCVICTLR ); + state->trcviiectlr =readl (drvdata->base +TRCVIIECTLR ); + state->trcvissctlr =readl (drvdata->base +TRCVISSCTLR ); + state->trcvipcssctlr =readl (drvdata->base +TRCVIPCSSCTLR ); + state->trcvdctlr =readl (drvdata->base +TRCVDCTLR ); + state->trcvdsacctlr =readl (drvdata->base +TRCVDSACCTLR ); + state->trcvdarcctlr =readl (drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) + state->trcseqevr[i] =readl (drvdata->base +TRCSEQEVRn (i)); + + state->trcseqrstevr =readl (drvdata->base +TRCSEQRSTEVR ); + state->trcseqstr =readl (drvdata->base +TRCSEQSTR ); + state->trcextinselr =readl (drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { + state->trccntrldvr[i] =readl (drvdata->base +TRCCNTRLDVRn (i)); + state->trccntctlr[i] =readl (drvdata->base +TRCCNTCTLRn (i)); + state->trccntvr[i] =readl (drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) + state->trcrsctlr[i] =readl (drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { + state->trcssccr[i] =readl (drvdata->base +TRCSSCCRn (i)); + state->trcsscsr[i] =readl (drvdata->base +TRCSSCSRn (i)); + state->trcsspcicr[i] =readl (drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { + state->trcacvr[i] =readl (drvdata->base +TRCACVRn (i)); + state->trcacatr[i] =readl (drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) + state->trccidcvr[i] =readl (drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) + state->trcvmidcvr[i] =readl (drvdata->base +TRCVMIDCVRn (i)); + + state->trccidcctlr0 =readl (drvdata->base +TRCCIDCCTLR0 ); + state->trccidcctlr1 =readl (drvdata->base +TRCCIDCCTLR1 ); + + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR0 ); + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR1 ); + + state->trcclaimset =readl (drvdata->base +TRCCLAIMCLR ); + +/* wait for TRCSTATR.IDLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for Idle Trace Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + drvdata->state_needs_restore = true; + +/* power can be removed from the trace unit now */ + control =readl_relaxed (drvdata->base +TRCPDCR );
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1209
Quoted 3 lines
drivers/hwtracing/coresight/coresight-etm4x.c +3
-0+ control &= ~TRCPDCR_PU ; +writel_relaxed (control, drvdata->base +TRCPDCR ); +Do we need to manipulate PU here? The premise of this set is PU is ignored. That said, there might be a scenario where PU is honoured but we are forcing this anyway, in which case, why is PU not manipulated in the
_restore()function?
I don't think this should be here. The TRM doesn't suggest this so I'm not sure how I ended up with this.
As you suggest, if we are using this save/restore code then we really don't care if the unit remains powered or not.
I'll remove this.
Quoted 254 lines
Quoted 254 lines
drivers/hwtracing/coresight/coresight-etm4x.c +171
-0+out: +CS_LOCK (drvdata->base); +return ret; +} + +static void etm4_cpu_restore (struct etmv4_drvdata *drvdata) +{ +int i; +struct etmv4_save_state *state; + + state = &drvdata->save_state; + +CS_UNLOCK (drvdata->base); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + +writel_relaxed (state->trcprgctlr, drvdata->base +TRCPRGCTLR ); +writel_relaxed (state->trcprocselr, drvdata->base +TRCPROCSELR ); +writel_relaxed (state->trcconfigr, drvdata->base +TRCCONFIGR ); +writel_relaxed (state->trcauxctlr, drvdata->base +TRCAUXCTLR ); +writel_relaxed (state->trceventctl0r, drvdata->base +TRCEVENTCTL0R ); +writel_relaxed (state->trceventctl1r, drvdata->base +TRCEVENTCTL1R ); +writel_relaxed (state->trcstallctlr, drvdata->base +TRCSTALLCTLR ); +writel_relaxed (state->trctsctlr, drvdata->base +TRCTSCTLR ); +writel_relaxed (state->trcsyncpr, drvdata->base +TRCSYNCPR ); +writel_relaxed (state->trcccctlr, drvdata->base +TRCCCCTLR ); +writel_relaxed (state->trcbbctlr, drvdata->base +TRCBBCTLR ); +writel_relaxed (state->trctraceidr, drvdata->base +TRCTRACEIDR ); +writel_relaxed (state->trcqctlr, drvdata->base +TRCQCTLR ); + +writel_relaxed (state->trcvictlr, drvdata->base +TRCVICTLR ); +writel_relaxed (state->trcviiectlr, drvdata->base +TRCVIIECTLR ); +writel_relaxed (state->trcvissctlr, drvdata->base +TRCVISSCTLR ); +writel_relaxed (state->trcvipcssctlr, drvdata->base +TRCVIPCSSCTLR ); +writel_relaxed (state->trcvdctlr, drvdata->base +TRCVDCTLR ); +writel_relaxed (state->trcvdsacctlr, drvdata->base +TRCVDSACCTLR ); +writel_relaxed (state->trcvdarcctlr, drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) +writel_relaxed (state->trcseqevr[i], + drvdata->base +TRCSEQEVRn (i)); + +writel_relaxed (state->trcseqrstevr, drvdata->base +TRCSEQRSTEVR ); +writel_relaxed (state->trcseqstr, drvdata->base +TRCSEQSTR ); +writel_relaxed (state->trcextinselr, drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { +writel_relaxed (state->trccntrldvr[i], + drvdata->base +TRCCNTRLDVRn (i)); +writel_relaxed (state->trccntctlr[i], + drvdata->base +TRCCNTCTLRn (i)); +writel_relaxed (state->trccntvr[i], + drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) +writel_relaxed (state->trcrsctlr[i], + drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { +writel_relaxed (state->trcssccr[i], + drvdata->base +TRCSSCCRn (i)); +writel_relaxed (state->trcsscsr[i], + drvdata->base +TRCSSCSRn (i)); +writel_relaxed (state->trcsspcicr[i], + drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { +writel_relaxed (state->trcacvr[i], + drvdata->base +TRCACVRn (i)); +writel_relaxed (state->trcacatr[i], + drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) +writel_relaxed (state->trccidcvr[i], + drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) +writel_relaxed (state->trcvmidcvr[i], + drvdata->base +TRCVMIDCVRn (i)); + +writel_relaxed (state->trccidcctlr0, drvdata->base +TRCCIDCCTLR0 ); +writel_relaxed (state->trccidcctlr1, drvdata->base +TRCCIDCCTLR1 ); + +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR0 ); +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR1 ); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + + drvdata->state_needs_restore = false; + +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); + +/* Unlock the OS lock to re-enable trace and external debug access */ +etm4_os_unlock (drvdata); +CS_LOCK (drvdata->base); +} + +static int etm4_cpu_pm_notify (struct notifier_block *nb,unsigned long cmd, +void *v) +{ +struct etmv4_drvdata *drvdata; +unsigned int cpu =smp_processor_id (); + +if (!etmdrvdata[cpu]) +return 0 ; + + drvdata = etmdrvdata[cpu]; + +if (pm_save_enable ==PARAM_PM_SAVE_DISABLE || + (pm_save_enable ==PARAM_PM_SAVE_FIRMWARE && + !drvdata->pm_save_enable)) +return NOTIFY_OK ; + +if (WARN_ON_ONCE (drvdata->cpu !=smp_processor_id ())) +return NOTIFY_BAD ; + +switch (cmd) { +case CPU_PM_ENTER : +/* save the state if coresight is in use */ +if (coresight_is_claimed_any (drvdata->base)) +if (etm4_cpu_save (drvdata)) +return NOTIFY_BAD ; +break ; +case CPU_PM_EXIT : +case CPU_PM_ENTER_FAILED : +/* trcclaimset is set when there is state to restore */ +if (drvdata->state_needs_restore) +etm4_cpu_restore (drvdata); +break ; +default : +return NOTIFY_DONE ; + } + +return NOTIFY_OK ; +} + +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) +{ + drvdata->nb.notifier_call = etm4_cpu_pm_notify; +return cpu_pm_register_notifier (&drvdata->nb); +} + +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) +{ +if (drvdata->nb.notifier_call) +cpu_pm_unregister_notifier (&drvdata->nb); +} +#else +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) {return 0 ; } +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) { } +#endif + +static inline bool etm4_needs_save_restore (struct device *dev) +{ +return fwnode_property_present (dev->fwnode, +"arm,coresight-needs-save-restore" ); +} +static int etm4_probe (struct amba_device *adev,const struct amba_id *id) {int ret;@@ -1095,6 +1386,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)dev_set_drvdata (dev, drvdata); + drvdata->pm_save_enable =etm4_needs_save_restore (dev); +/* Validity for the resource is already checked by the AMBA core */ base =devm_ioremap_resource (dev, res);if (IS_ERR (base))@@ -1126,6 +1419,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (ret <0 ) goto err_arch_supported; hp_online = ret; + + ret =etm4_cpu_pm_register (drvdata); +if (ret) + goto err_arch_supported; }cpus_read_unlock ();@@ -1176,6 +1473,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) err_arch_supported:if (--etm4_count ==0 ) { +etm4_cpu_pm_unregister (drvdata); +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING );if (hp_online)cpuhp_remove_state_nocalls (hp_online);drivers/hwtracing/coresight/coresight-etm4x.h +42
-0@@ -175,6 +175,7 @@ ETM_MODE_EXCL_USER)#define TRCSTATR_IDLE_BIT 0 +#define TRCSTATR_PMSTABLE_BIT 1#define ETM_DEFAULT_ADDR_COMP 0/* PowerDown Control Register bits */ @@ -281,6 +282,65 @@ struct etmv4_config {u32 ext_inp; }; +/** +* struct etm4_save_state - state to be preserved when ETM is without power +*/ +struct etmv4_save_state { +u32 trcprgctlr; +u32 trcprocselr; +u32 trcconfigr; +u32 trcauxctlr; +u32 trceventctl0r; +u32 trceventctl1r; +u32 trcstallctlr; +u32 trctsctlr; +u32 trcsyncpr; +u32 trcccctlr; +u32 trcbbctlr; +u32 trctraceidr; +u32 trcqctlr; + +u32 trcvictlr; +u32 trcviiectlr; +u32 trcvissctlr; +u32 trcvipcssctlr; +u32 trcvdctlr; +u32 trcvdsacctlr; +u32 trcvdarcctlr; + +u32 trcseqevr[ETM_MAX_SEQ_STATES ]; +u32 trcseqrstevr; +u32 trcseqstr; +u32 trcextinselr; +u32 trccntrldvr[ETMv4_MAX_CNTR]; +u32 trccntctlr[ETMv4_MAX_CNTR]; +u32 trccntvr[ETMv4_MAX_CNTR]; + +u32 trcrsctlr[ETM_MAX_RES_SEL *2 ]; + +u32 trcssccr[ETM_MAX_SS_CMP ]; +u32 trcsscsr[ETM_MAX_SS_CMP ]; +u32 trcsspcicr[ETM_MAX_SS_CMP ]; + +u64 trcacvr[ETM_MAX_SINGLE_ADDR_CMP ];
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.h struct etmv4_config { · line 328
Quoted 3 lines
drivers/hwtracing/coresight/coresight-etm4x.h +3
-0+u64 trcacatr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcdvcvr[ETM_MAX_DATA_VAL_CMP ]; +u64 trcdvcmr[ETM_MAX_DATA_VAL_CMP ];These two sets of DATA registers - never used in the main code. Either use them or lose them.
I recommend that we lose them - data trace is architecturally prohibited for A class cores in ETMv4.
The trcdvcvr and trcdvcmr registers are here because the TRM (ARM IHI 0064D, section 3.4.3 "Guidelines for trace unit registers to be saved and restored") lists these are registers that must be saved.
I'm happy to drop them, however can you point me in the direction of some documentation that specifies this? I'll add a comment.
Thanks for the review.
Thanks,
Andrew Murray
Quoted 88 lines
Regards
Mike
Quoted 83 lines
drivers/hwtracing/coresight/coresight-etm4x.h +21
-0+u64 trccidcvr[ETMv4_MAX_CTXID_CMP]; +u32 trcvmidcvr[ETM_MAX_VMID_CMP ]; +u32 trccidcctlr0; +u32 trccidcctlr1; +u32 trcvmidcctlr0; +u32 trcvmidcctlr1; + +u32 trcclaimset; + +u32 cntr_val[ETMv4_MAX_CNTR]; +u32 seq_state; +u32 vinst_ctrl; +u32 ss_status[ETM_MAX_SS_CMP ]; +}; +/** * struct etm4_drvdata - specifics associated to an ETM component * @base: Memory mapped base address for this component. @@ -336,6 +396,8 @@ struct etmv4_config {* @atbtrig: If the implementation can support ATB triggers * @lpoverride: If the implementation can support low-power state over. * @config: structure holding configuration parameters. +* @save_state: State to be preserved across power loss +* @nb: CPU PM notifier */ struct etmv4_drvdata {void __iomem *base;@@ -367,6 +429,7 @@ struct etmv4_drvdata {u8 q_support;bool sticky_enable;bool boot_enable; +bool pm_save_enable;bool os_unlock;bool instrp0;bool trcbb;@@ -381,6 +444,9 @@ struct etmv4_drvdata {bool atbtrig;bool lpoverride;struct etmv4_config config; +struct etmv4_save_state save_state; +bool state_needs_restore; +struct notifier_block nb; };/* Address comparator access types */ drivers/hwtracing/coresight/coresight.c +1
-1@@ -140,7 +140,7 @@ static inline bool coresight_is_claimed_self_hosted(void __iomem *base)return coresight_read_claim_tags (base) ==CORESIGHT_CLAIM_SELF_HOSTED ; } -static inline bool coresight_is_claimed_any (void __iomem *base) +bool coresight_is_claimed_any (void __iomem *base) {return coresight_read_claim_tags (base) !=0 ; }include/linux/coresight.h +8
-0@@ -285,6 +285,9 @@ extern void coresight_disclaim_device(void __iomem *base);extern void coresight_disclaim_device_unlocked (void __iomem *base);extern char *coresight_alloc_device_name (struct coresight_dev_list *devs,struct device *dev); + +extern bool coresight_is_claimed_any (void __iomem *base); +#else static inline struct coresight_device *coresight_register (struct coresight_desc *desc) {return NULL ; }@@ -307,6 +310,11 @@ static inline int coresight_claim_device(void __iomem *base)static inline void coresight_disclaim_device (void __iomem *base) {}static inline void coresight_disclaim_device_unlocked (void __iomem *base) {} +static inline bool coresight_is_claimed_any (void __iomem *base) +{ +return false; +} +#endif
Quoted 10 lines
Quoted 4 lines
include/linux/coresight.h +0
-1extern int coresight_get_cpu (struct device *dev); --2.21.0
--
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Suzuki K Poulose
maintainerRe: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 23 lines · Andrew Murray
Quoted 22 lines · Mike Leach
Hi Andrew,
Quoted 19 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
Signed-off-by Andrew Murray <[email protected]>
...
Quoted 27 lines
Quoted 18 lines
Quoted 18 lines
drivers/hwtracing/coresight/coresight-etm4x.c +18
-0+ state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR0 ); + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR1 ); + + state->trcclaimset =readl (drvdata->base +TRCCLAIMCLR ); + +/* wait for TRCSTATR.IDLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for Idle Trace Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + drvdata->state_needs_restore = true; + +/* power can be removed from the trace unit now */ + control =readl_relaxed (drvdata->base +TRCPDCR );Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1209
Quoted 3 lines
drivers/hwtracing/coresight/coresight-etm4x.c +3
-0+ control &= ~TRCPDCR_PU ; +writel_relaxed (control, drvdata->base +TRCPDCR ); +Do we need to manipulate PU here? The premise of this set is PU is ignored. That said, there might be a scenario where PU is honoured but we are forcing this anyway, in which case, why is PU not manipulated in the
_restore()function?
Quoted 5 lines
I don't think this should be here. The TRM doesn't suggest this so I'm not sure how I ended up with this.
As you suggest, if we are using this save/restore code then we really don't care if the unit remains powered or not.
I personally think keeping the code is a good idea. Its just 1 read and 1 write. If it serves to reduce the power consumption on "compliant" systems (where this option could be passed on by default), then why not ?
Quoted 3 lines
I'll remove this.
As I said above, I am in favor of keeping this.
Quoted 10 lines
Quoted 9 lines
drivers/hwtracing/coresight/coresight-etm4x.h struct etmv4_config { · line 328
Quoted 4 lines
drivers/hwtracing/coresight/coresight-etm4x.h +4
-0+u64 trcacvr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcacatr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcdvcvr[ETM_MAX_DATA_VAL_CMP ]; +u64 trcdvcmr[ETM_MAX_DATA_VAL_CMP ];These two sets of DATA registers - never used in the main code. Either use them or lose them.
I recommend that we lose them - data trace is architecturally prohibited for A class cores in ETMv4.
Quoted 6 lines
The trcdvcvr and trcdvcmr registers are here because the TRM (ARM IHI 0064D, section 3.4.3 "Guidelines for trace unit registers to be saved and restored") lists these are registers that must be saved.
I'm happy to drop them, however can you point me in the direction of some documentation that specifies this? I'll add a comment.
Section "1.3.4 Possible functional configurations of an ETMv4 trace unit"
"Table 1-2 A summary of the features of an ETMv4 trace unit"
Cheers
Suzuki
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 57 lines · Suzuki K Poulose
Quoted 23 lines · Andrew Murray
Quoted 22 lines · Mike Leach
Hi Andrew,
Quoted 19 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
Signed-off-by Andrew Murray <[email protected]>...
Quoted 30 lines
Quoted 18 lines
Quoted 18 lines
drivers/hwtracing/coresight/coresight-etm4x.c +18
-0+ state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR0 ); + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR1 ); + + state->trcclaimset =readl (drvdata->base +TRCCLAIMCLR ); + +/* wait for TRCSTATR.IDLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for Idle Trace Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + drvdata->state_needs_restore = true; + +/* power can be removed from the trace unit now */ + control =readl_relaxed (drvdata->base +TRCPDCR );Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1209
Quoted 3 lines
drivers/hwtracing/coresight/coresight-etm4x.c +3
-0+ control &= ~TRCPDCR_PU ; +writel_relaxed (control, drvdata->base +TRCPDCR ); +Do we need to manipulate PU here? The premise of this set is PU is ignored. That said, there might be a scenario where PU is honoured but we are forcing this anyway, in which case, why is PU not manipulated in the
_restore()function?I don't think this should be here. The TRM doesn't suggest this so I'm not sure how I ended up with this.
Quoted 7 lines
Quoted 2 lines
As you suggest, if we are using this save/restore code then we really don't care if the unit remains powered or not.
I personally think keeping the code is a good idea. Its just 1 read and 1 write. If it serves to reduce the power consumption on "compliant" systems (where this option could be passed on by default), then why not ?
OK, in that case I'll also take Mike's suggestion to set the PU bit on restore. There is only a single use-case where this is useful - this is where a user, at run-time, switches off saving/restoring on a system that respects the PU bit (following on from a wake-up where we restore the state). On the next CPU power down the PU bit will be respected and the associated power domain kept up.
Thanks,
Andrew Murray
Quoted 25 lines
Quoted 5 lines
I'll remove this.
As I said above, I am in favor of keeping this.
Quoted 10 lines
Quoted 9 lines
drivers/hwtracing/coresight/coresight-etm4x.h struct etmv4_config { · line 328
Quoted 4 lines
drivers/hwtracing/coresight/coresight-etm4x.h +4
-0+u64 trcacvr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcacatr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcdvcvr[ETM_MAX_DATA_VAL_CMP ]; +u64 trcdvcmr[ETM_MAX_DATA_VAL_CMP ];These two sets of DATA registers - never used in the main code. Either use them or lose them.
I recommend that we lose them - data trace is architecturally prohibited for A class cores in ETMv4.Quoted 6 lines
The trcdvcvr and trcdvcmr registers are here because the TRM (ARM IHI 0064D, section 3.4.3 "Guidelines for trace unit registers to be saved and restored") lists these are registers that must be saved.
I'm happy to drop them, however can you point me in the direction of some documentation that specifies this? I'll add a comment.
Quoted 6 lines
Section "1.3.4 Possible functional configurations of an ETMv4 trace unit"
"Table 1-2 A summary of the features of an ETMv4 trace unit"
Cheers
Suzuki
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
In reply to Andrew MurrayQuoted 64 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
Signed-off-by Andrew Murray <[email protected]>--- .../devicetree/bindings/arm/coresight.txt | 3 + drivers/hwtracing/coresight/coresight-etm4x.c | 299 ++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm4x.h | 66 ++++ drivers/hwtracing/coresight/coresight.c | 2 +- include/linux/coresight.h | 8 + 5 files changed, 377 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/arm/coresight.txt +3
-0@@ -90,6 +90,9 @@ its hardware characteristcs. * cpu: the cpu phandle this ETM/PTM is affined to. When omitted the source is considered to belong to CPU0. + * arm,coresight-needs-save-restore: boolean. Indicates that software + should save/restore state across power down. + * Optional property for TMC: * arm,buffer-size: size of contiguous buffer space for TMC ETRdrivers/hwtracing/coresight/coresight-etm4x.c +2
-0@@ -18,6 +18,7 @@#include <linux/stat.h> #include <linux/clk.h> #include <linux/cpu.h> +#include <linux/cpu_pm.h> #include <linux/coresight.h> #include <linux/coresight-pmu.h> #include <linux/pm_wakeup.h> @@ -26,6 +27,7 @@#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <asm/sections.h> #include <asm/local.h> #include <asm/virt.h> @@ -37,6 +39,16 @@ static int boot_enable;module_param (boot_enable, int,0444 );MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" );
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 51
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" ); +
I understand if set pm_save_enable = 2 (firmware), then driver will depend on drvdata->pm_save_enable to make decision for context saving and restoring.
Maybe we can simplize to set pm_save_enable for binary value:
0 (disabled) or 1 (enabled). The reason is if we set the module parameter 'pm_save_enable = 1', then we can set every ETM device's drvdata->pm_save_enable in initialization phase. So in the probe function, we can use below code:
drvdata->pm_save_enable = pm_save_enable ? : etm4_needs_save_restore(dev);
Quoted 23 lines
drivers/hwtracing/coresight/coresight-etm4x.c +9
-0/* The number of ETMv4 currently registered */ static int etm4_count;static struct etmv4_drvdata *etmdrvdata[NR_CPUS ];@@ -54,6 +66,14 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)isb (); } +static void etm4_os_lock (struct etmv4_drvdata *drvdata) +{ +/* Writing 0x1 to TRCOSLAR locks the trace registers */ +writel_relaxed (0x1 , drvdata->base +TRCOSLAR ); + drvdata->os_unlock = false; +isb (); +} +static bool etm4_arch_supported (u8 arch) {/* Mask out the minor version number */ @@ -1079,6 +1099,277 @@ static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) drvdata->trcid =coresight_get_trace_id (drvdata->cpu); } +#ifdef CONFIG_CPU_PM
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1112
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+static int etm4_cpu_save (struct etmv4_drvdata *drvdata) +{ +int i, ret =0 ; +u32 control; +struct etmv4_save_state *state; +struct device *etm_dev = &drvdata->csdev->dev; + +/* As recommended by 3.4.1 of ARM IHI 0064D */ +dsb (sy); +isb ();
As I mentioned in another email mb(), should be:
s/dsb(sy)/mb()?
Quoted 86 lines
drivers/hwtracing/coresight/coresight-etm4x.c +86
-0+ +CS_UNLOCK (drvdata->base); + +/* Lock the OS lock to disable trace and external debugger access */ +etm4_os_lock (drvdata); + +/* wait for TRCSTATR.PMSTABLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR , +TRCSTATR_PMSTABLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for PM Stable Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + state = &drvdata->save_state; + + state->trcprgctlr =readl (drvdata->base +TRCPRGCTLR ); + state->trcprocselr =readl (drvdata->base +TRCPROCSELR ); + state->trcconfigr =readl (drvdata->base +TRCCONFIGR ); + state->trcauxctlr =readl (drvdata->base +TRCAUXCTLR ); + state->trceventctl0r =readl (drvdata->base +TRCEVENTCTL0R ); + state->trceventctl1r =readl (drvdata->base +TRCEVENTCTL1R ); + state->trcstallctlr =readl (drvdata->base +TRCSTALLCTLR ); + state->trctsctlr =readl (drvdata->base +TRCTSCTLR ); + state->trcsyncpr =readl (drvdata->base +TRCSYNCPR ); + state->trcccctlr =readl (drvdata->base +TRCCCCTLR ); + state->trcbbctlr =readl (drvdata->base +TRCBBCTLR ); + state->trctraceidr =readl (drvdata->base +TRCTRACEIDR ); + state->trcqctlr =readl (drvdata->base +TRCQCTLR ); + + state->trcvictlr =readl (drvdata->base +TRCVICTLR ); + state->trcviiectlr =readl (drvdata->base +TRCVIIECTLR ); + state->trcvissctlr =readl (drvdata->base +TRCVISSCTLR ); + state->trcvipcssctlr =readl (drvdata->base +TRCVIPCSSCTLR ); + state->trcvdctlr =readl (drvdata->base +TRCVDCTLR ); + state->trcvdsacctlr =readl (drvdata->base +TRCVDSACCTLR ); + state->trcvdarcctlr =readl (drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) + state->trcseqevr[i] =readl (drvdata->base +TRCSEQEVRn (i)); + + state->trcseqrstevr =readl (drvdata->base +TRCSEQRSTEVR ); + state->trcseqstr =readl (drvdata->base +TRCSEQSTR ); + state->trcextinselr =readl (drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { + state->trccntrldvr[i] =readl (drvdata->base +TRCCNTRLDVRn (i)); + state->trccntctlr[i] =readl (drvdata->base +TRCCNTCTLRn (i)); + state->trccntvr[i] =readl (drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) + state->trcrsctlr[i] =readl (drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { + state->trcssccr[i] =readl (drvdata->base +TRCSSCCRn (i)); + state->trcsscsr[i] =readl (drvdata->base +TRCSSCSRn (i)); + state->trcsspcicr[i] =readl (drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { + state->trcacvr[i] =readl (drvdata->base +TRCACVRn (i)); + state->trcacatr[i] =readl (drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) + state->trccidcvr[i] =readl (drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) + state->trcvmidcvr[i] =readl (drvdata->base +TRCVMIDCVRn (i)); + + state->trccidcctlr0 =readl (drvdata->base +TRCCIDCCTLR0 ); + state->trccidcctlr1 =readl (drvdata->base +TRCCIDCCTLR1 ); + + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR0 ); + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR1 ); + + state->trcclaimset =readl (drvdata->base +TRCCLAIMCLR ); + +/* wait for TRCSTATR.IDLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for Idle Trace Status\n" ); +etm4_os_unlock (drvdata);
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1208
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+ ret = -EBUSY ; + goto out; + } + + drvdata->state_needs_restore = true; + +/* power can be removed from the trace unit now */ + control =readl_relaxed (drvdata->base +TRCPDCR ); + control &= ~TRCPDCR_PU ; +writel_relaxed (control, drvdata->base +TRCPDCR );
Do we need to disable trace unit at the end of saving flow?
Thanks,
Leo Yan
Quoted 347 lines
drivers/hwtracing/coresight/coresight-etm4x.c +172
-0+ +out: +CS_LOCK (drvdata->base); +return ret; +} + +static void etm4_cpu_restore (struct etmv4_drvdata *drvdata) +{ +int i; +struct etmv4_save_state *state; + + state = &drvdata->save_state; + +CS_UNLOCK (drvdata->base); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + +writel_relaxed (state->trcprgctlr, drvdata->base +TRCPRGCTLR ); +writel_relaxed (state->trcprocselr, drvdata->base +TRCPROCSELR ); +writel_relaxed (state->trcconfigr, drvdata->base +TRCCONFIGR ); +writel_relaxed (state->trcauxctlr, drvdata->base +TRCAUXCTLR ); +writel_relaxed (state->trceventctl0r, drvdata->base +TRCEVENTCTL0R ); +writel_relaxed (state->trceventctl1r, drvdata->base +TRCEVENTCTL1R ); +writel_relaxed (state->trcstallctlr, drvdata->base +TRCSTALLCTLR ); +writel_relaxed (state->trctsctlr, drvdata->base +TRCTSCTLR ); +writel_relaxed (state->trcsyncpr, drvdata->base +TRCSYNCPR ); +writel_relaxed (state->trcccctlr, drvdata->base +TRCCCCTLR ); +writel_relaxed (state->trcbbctlr, drvdata->base +TRCBBCTLR ); +writel_relaxed (state->trctraceidr, drvdata->base +TRCTRACEIDR ); +writel_relaxed (state->trcqctlr, drvdata->base +TRCQCTLR ); + +writel_relaxed (state->trcvictlr, drvdata->base +TRCVICTLR ); +writel_relaxed (state->trcviiectlr, drvdata->base +TRCVIIECTLR ); +writel_relaxed (state->trcvissctlr, drvdata->base +TRCVISSCTLR ); +writel_relaxed (state->trcvipcssctlr, drvdata->base +TRCVIPCSSCTLR ); +writel_relaxed (state->trcvdctlr, drvdata->base +TRCVDCTLR ); +writel_relaxed (state->trcvdsacctlr, drvdata->base +TRCVDSACCTLR ); +writel_relaxed (state->trcvdarcctlr, drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) +writel_relaxed (state->trcseqevr[i], + drvdata->base +TRCSEQEVRn (i)); + +writel_relaxed (state->trcseqrstevr, drvdata->base +TRCSEQRSTEVR ); +writel_relaxed (state->trcseqstr, drvdata->base +TRCSEQSTR ); +writel_relaxed (state->trcextinselr, drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { +writel_relaxed (state->trccntrldvr[i], + drvdata->base +TRCCNTRLDVRn (i)); +writel_relaxed (state->trccntctlr[i], + drvdata->base +TRCCNTCTLRn (i)); +writel_relaxed (state->trccntvr[i], + drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) +writel_relaxed (state->trcrsctlr[i], + drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { +writel_relaxed (state->trcssccr[i], + drvdata->base +TRCSSCCRn (i)); +writel_relaxed (state->trcsscsr[i], + drvdata->base +TRCSSCSRn (i)); +writel_relaxed (state->trcsspcicr[i], + drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { +writel_relaxed (state->trcacvr[i], + drvdata->base +TRCACVRn (i)); +writel_relaxed (state->trcacatr[i], + drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) +writel_relaxed (state->trccidcvr[i], + drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) +writel_relaxed (state->trcvmidcvr[i], + drvdata->base +TRCVMIDCVRn (i)); + +writel_relaxed (state->trccidcctlr0, drvdata->base +TRCCIDCCTLR0 ); +writel_relaxed (state->trccidcctlr1, drvdata->base +TRCCIDCCTLR1 ); + +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR0 ); +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR1 ); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + + drvdata->state_needs_restore = false; + +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); + +/* Unlock the OS lock to re-enable trace and external debug access */ +etm4_os_unlock (drvdata); +CS_LOCK (drvdata->base); +} + +static int etm4_cpu_pm_notify (struct notifier_block *nb,unsigned long cmd, +void *v) +{ +struct etmv4_drvdata *drvdata; +unsigned int cpu =smp_processor_id (); + +if (!etmdrvdata[cpu]) +return 0 ; + + drvdata = etmdrvdata[cpu]; + +if (pm_save_enable ==PARAM_PM_SAVE_DISABLE || + (pm_save_enable ==PARAM_PM_SAVE_FIRMWARE && + !drvdata->pm_save_enable)) +return NOTIFY_OK ; + +if (WARN_ON_ONCE (drvdata->cpu !=smp_processor_id ())) +return NOTIFY_BAD ; + +switch (cmd) { +case CPU_PM_ENTER : +/* save the state if coresight is in use */ +if (coresight_is_claimed_any (drvdata->base)) +if (etm4_cpu_save (drvdata)) +return NOTIFY_BAD ; +break ; +case CPU_PM_EXIT : +case CPU_PM_ENTER_FAILED : +/* trcclaimset is set when there is state to restore */ +if (drvdata->state_needs_restore) +etm4_cpu_restore (drvdata); +break ; +default : +return NOTIFY_DONE ; + } + +return NOTIFY_OK ; +} + +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) +{ + drvdata->nb.notifier_call = etm4_cpu_pm_notify; +return cpu_pm_register_notifier (&drvdata->nb); +} + +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) +{ +if (drvdata->nb.notifier_call) +cpu_pm_unregister_notifier (&drvdata->nb); +} +#else +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) {return 0 ; } +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) { } +#endif + +static inline bool etm4_needs_save_restore (struct device *dev) +{ +return fwnode_property_present (dev->fwnode, +"arm,coresight-needs-save-restore" ); +} +static int etm4_probe (struct amba_device *adev,const struct amba_id *id) {int ret;@@ -1095,6 +1386,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)dev_set_drvdata (dev, drvdata); + drvdata->pm_save_enable =etm4_needs_save_restore (dev); +/* Validity for the resource is already checked by the AMBA core */ base =devm_ioremap_resource (dev, res);if (IS_ERR (base))@@ -1126,6 +1419,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (ret <0 ) goto err_arch_supported; hp_online = ret; + + ret =etm4_cpu_pm_register (drvdata); +if (ret) + goto err_arch_supported; }cpus_read_unlock ();@@ -1176,6 +1473,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) err_arch_supported:if (--etm4_count ==0 ) { +etm4_cpu_pm_unregister (drvdata); +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING );if (hp_online)cpuhp_remove_state_nocalls (hp_online);drivers/hwtracing/coresight/coresight-etm4x.h +66
-0@@ -175,6 +175,7 @@ ETM_MODE_EXCL_USER)#define TRCSTATR_IDLE_BIT 0 +#define TRCSTATR_PMSTABLE_BIT 1#define ETM_DEFAULT_ADDR_COMP 0/* PowerDown Control Register bits */ @@ -281,6 +282,65 @@ struct etmv4_config {u32 ext_inp; }; +/** +* struct etm4_save_state - state to be preserved when ETM is without power +*/ +struct etmv4_save_state { +u32 trcprgctlr; +u32 trcprocselr; +u32 trcconfigr; +u32 trcauxctlr; +u32 trceventctl0r; +u32 trceventctl1r; +u32 trcstallctlr; +u32 trctsctlr; +u32 trcsyncpr; +u32 trcccctlr; +u32 trcbbctlr; +u32 trctraceidr; +u32 trcqctlr; + +u32 trcvictlr; +u32 trcviiectlr; +u32 trcvissctlr; +u32 trcvipcssctlr; +u32 trcvdctlr; +u32 trcvdsacctlr; +u32 trcvdarcctlr; + +u32 trcseqevr[ETM_MAX_SEQ_STATES ]; +u32 trcseqrstevr; +u32 trcseqstr; +u32 trcextinselr; +u32 trccntrldvr[ETMv4_MAX_CNTR]; +u32 trccntctlr[ETMv4_MAX_CNTR]; +u32 trccntvr[ETMv4_MAX_CNTR]; + +u32 trcrsctlr[ETM_MAX_RES_SEL *2 ]; + +u32 trcssccr[ETM_MAX_SS_CMP ]; +u32 trcsscsr[ETM_MAX_SS_CMP ]; +u32 trcsspcicr[ETM_MAX_SS_CMP ]; + +u64 trcacvr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcacatr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcdvcvr[ETM_MAX_DATA_VAL_CMP ]; +u64 trcdvcmr[ETM_MAX_DATA_VAL_CMP ]; +u64 trccidcvr[ETMv4_MAX_CTXID_CMP]; +u32 trcvmidcvr[ETM_MAX_VMID_CMP ]; +u32 trccidcctlr0; +u32 trccidcctlr1; +u32 trcvmidcctlr0; +u32 trcvmidcctlr1; + +u32 trcclaimset; + +u32 cntr_val[ETMv4_MAX_CNTR]; +u32 seq_state; +u32 vinst_ctrl; +u32 ss_status[ETM_MAX_SS_CMP ]; +}; +/** * struct etm4_drvdata - specifics associated to an ETM component * @base: Memory mapped base address for this component. @@ -336,6 +396,8 @@ struct etmv4_config {* @atbtrig: If the implementation can support ATB triggers * @lpoverride: If the implementation can support low-power state over. * @config: structure holding configuration parameters. +* @save_state: State to be preserved across power loss +* @nb: CPU PM notifier */ struct etmv4_drvdata {void __iomem *base;@@ -367,6 +429,7 @@ struct etmv4_drvdata {u8 q_support;bool sticky_enable;bool boot_enable; +bool pm_save_enable;bool os_unlock;bool instrp0;bool trcbb;@@ -381,6 +444,9 @@ struct etmv4_drvdata {bool atbtrig;bool lpoverride;struct etmv4_config config; +struct etmv4_save_state save_state; +bool state_needs_restore; +struct notifier_block nb; };/* Address comparator access types */ drivers/hwtracing/coresight/coresight.c +1
-1@@ -140,7 +140,7 @@ static inline bool coresight_is_claimed_self_hosted(void __iomem *base)return coresight_read_claim_tags (base) ==CORESIGHT_CLAIM_SELF_HOSTED ; } -static inline bool coresight_is_claimed_any (void __iomem *base) +bool coresight_is_claimed_any (void __iomem *base) {return coresight_read_claim_tags (base) !=0 ; }include/linux/coresight.h +8
-0@@ -285,6 +285,9 @@ extern void coresight_disclaim_device(void __iomem *base);extern void coresight_disclaim_device_unlocked (void __iomem *base);extern char *coresight_alloc_device_name (struct coresight_dev_list *devs,struct device *dev); + +extern bool coresight_is_claimed_any (void __iomem *base); +#else static inline struct coresight_device *coresight_register (struct coresight_desc *desc) {return NULL ; }@@ -307,6 +310,11 @@ static inline int coresight_claim_device(void __iomem *base)static inline void coresight_disclaim_device (void __iomem *base) {}static inline void coresight_disclaim_device_unlocked (void __iomem *base) {} +static inline bool coresight_is_claimed_any (void __iomem *base) +{ +return false; +} +#endif extern int coresight_get_cpu (struct device *dev);Signature · 6 lines
2.21.0 _______________________________________________ CoreSight mailing list [email protected] https://lists.linaro.org/mailman/listinfo/coresight
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 80 lines · Leo Yan
Quoted 64 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
Signed-off-by Andrew Murray <[email protected]>--- .../devicetree/bindings/arm/coresight.txt | 3 + drivers/hwtracing/coresight/coresight-etm4x.c | 299 ++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm4x.h | 66 ++++ drivers/hwtracing/coresight/coresight.c | 2 +- include/linux/coresight.h | 8 + 5 files changed, 377 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/arm/coresight.txt +3
-0@@ -90,6 +90,9 @@ its hardware characteristcs. * cpu: the cpu phandle this ETM/PTM is affined to. When omitted the source is considered to belong to CPU0. + * arm,coresight-needs-save-restore: boolean. Indicates that software + should save/restore state across power down. + * Optional property for TMC: * arm,buffer-size: size of contiguous buffer space for TMC ETRdrivers/hwtracing/coresight/coresight-etm4x.c +2
-0@@ -18,6 +18,7 @@#include <linux/stat.h> #include <linux/clk.h> #include <linux/cpu.h> +#include <linux/cpu_pm.h> #include <linux/coresight.h> #include <linux/coresight-pmu.h> #include <linux/pm_wakeup.h> @@ -26,6 +27,7 @@#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <asm/sections.h> #include <asm/local.h> #include <asm/virt.h> @@ -37,6 +39,16 @@ static int boot_enable;module_param (boot_enable, int,0444 );MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" );drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 51
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" ); +I understand if set
pm_save_enable= 2 (firmware), then driver will depend ondrvdata->pm_save_enableto make decision for context saving and restoring.
Quoted 7 lines
Maybe we can simplize to set
pm_save_enablefor binary value:
0 (disabled) or 1 (enabled). The reason is if we set the module parameter 'pm_save_enable= 1', then we can set every ETM device'sdrvdata->pm_save_enablein initialization phase. So in the probe function, we can use below code:drvdata->pm_save_enable = pm_save_enable ? : etm4_needs_save_restore(dev);
This means that when the module parameter is set to 1, then we only save/restore if the firmware suggests it is needed.
However - what happens on hardware that ignores the PU bit (and thus requires save/restore), yet it's firmware doesn't have the 'arm,coresight-needs-save-restore' property? There is no way to override the firmware and always save/restore.
(It's also quite helpful for debugging to be able to change the module parameter at run time.)
Quoted 128 lines
Quoted 24 lines
drivers/hwtracing/coresight/coresight-etm4x.c +9
-0/* The number of ETMv4 currently registered */ static int etm4_count;static struct etmv4_drvdata *etmdrvdata[NR_CPUS ];@@ -54,6 +66,14 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)isb (); } +static void etm4_os_lock (struct etmv4_drvdata *drvdata) +{ +/* Writing 0x1 to TRCOSLAR locks the trace registers */ +writel_relaxed (0x1 , drvdata->base +TRCOSLAR ); + drvdata->os_unlock = false; +isb (); +} +static bool etm4_arch_supported (u8 arch) {/* Mask out the minor version number */ @@ -1079,6 +1099,277 @@ static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) drvdata->trcid =coresight_get_trace_id (drvdata->cpu); } +#ifdef CONFIG_CPU_PM drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1112
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+static int etm4_cpu_save (struct etmv4_drvdata *drvdata) +{ +int i, ret =0 ; +u32 control; +struct etmv4_save_state *state; +struct device *etm_dev = &drvdata->csdev->dev; + +/* As recommended by 3.4.1 of ARM IHI 0064D */ +dsb (sy); +isb ();As I mentioned in another email
mb(), should be:
s/dsb(sy)/mb()?Quoted 90 lines
drivers/hwtracing/coresight/coresight-etm4x.c +90
-0+ +CS_UNLOCK (drvdata->base); + +/* Lock the OS lock to disable trace and external debugger access */ +etm4_os_lock (drvdata); + +/* wait for TRCSTATR.PMSTABLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR , +TRCSTATR_PMSTABLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for PM Stable Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + state = &drvdata->save_state; + + state->trcprgctlr =readl (drvdata->base +TRCPRGCTLR ); + state->trcprocselr =readl (drvdata->base +TRCPROCSELR ); + state->trcconfigr =readl (drvdata->base +TRCCONFIGR ); + state->trcauxctlr =readl (drvdata->base +TRCAUXCTLR ); + state->trceventctl0r =readl (drvdata->base +TRCEVENTCTL0R ); + state->trceventctl1r =readl (drvdata->base +TRCEVENTCTL1R ); + state->trcstallctlr =readl (drvdata->base +TRCSTALLCTLR ); + state->trctsctlr =readl (drvdata->base +TRCTSCTLR ); + state->trcsyncpr =readl (drvdata->base +TRCSYNCPR ); + state->trcccctlr =readl (drvdata->base +TRCCCCTLR ); + state->trcbbctlr =readl (drvdata->base +TRCBBCTLR ); + state->trctraceidr =readl (drvdata->base +TRCTRACEIDR ); + state->trcqctlr =readl (drvdata->base +TRCQCTLR ); + + state->trcvictlr =readl (drvdata->base +TRCVICTLR ); + state->trcviiectlr =readl (drvdata->base +TRCVIIECTLR ); + state->trcvissctlr =readl (drvdata->base +TRCVISSCTLR ); + state->trcvipcssctlr =readl (drvdata->base +TRCVIPCSSCTLR ); + state->trcvdctlr =readl (drvdata->base +TRCVDCTLR ); + state->trcvdsacctlr =readl (drvdata->base +TRCVDSACCTLR ); + state->trcvdarcctlr =readl (drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) + state->trcseqevr[i] =readl (drvdata->base +TRCSEQEVRn (i)); + + state->trcseqrstevr =readl (drvdata->base +TRCSEQRSTEVR ); + state->trcseqstr =readl (drvdata->base +TRCSEQSTR ); + state->trcextinselr =readl (drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { + state->trccntrldvr[i] =readl (drvdata->base +TRCCNTRLDVRn (i)); + state->trccntctlr[i] =readl (drvdata->base +TRCCNTCTLRn (i)); + state->trccntvr[i] =readl (drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) + state->trcrsctlr[i] =readl (drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { + state->trcssccr[i] =readl (drvdata->base +TRCSSCCRn (i)); + state->trcsscsr[i] =readl (drvdata->base +TRCSSCSRn (i)); + state->trcsspcicr[i] =readl (drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { + state->trcacvr[i] =readl (drvdata->base +TRCACVRn (i)); + state->trcacatr[i] =readl (drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) + state->trccidcvr[i] =readl (drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) + state->trcvmidcvr[i] =readl (drvdata->base +TRCVMIDCVRn (i)); + + state->trccidcctlr0 =readl (drvdata->base +TRCCIDCCTLR0 ); + state->trccidcctlr1 =readl (drvdata->base +TRCCIDCCTLR1 ); + + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR0 ); + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR1 ); + + state->trcclaimset =readl (drvdata->base +TRCCLAIMCLR ); + +/* wait for TRCSTATR.IDLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for Idle Trace Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } +
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1208
Quoted 6 lines
drivers/hwtracing/coresight/coresight-etm4x.c +6
-0+ drvdata->state_needs_restore = true; + +/* power can be removed from the trace unit now */ + control =readl_relaxed (drvdata->base +TRCPDCR ); + control &= ~TRCPDCR_PU ; +writel_relaxed (control, drvdata->base +TRCPDCR );Do we need to disable trace unit at the end of saving flow?
At the start of this function we take the OS lock, this has the effect of also disabling the trace. Therefore I don't think it's necessary to do more.
Thanks,
Andrew Murray
Quoted 343 lines
Thanks,
Leo YanQuoted 339 lines
drivers/hwtracing/coresight/coresight-etm4x.c +172
-0+ +out: +CS_LOCK (drvdata->base); +return ret; +} + +static void etm4_cpu_restore (struct etmv4_drvdata *drvdata) +{ +int i; +struct etmv4_save_state *state; + + state = &drvdata->save_state; + +CS_UNLOCK (drvdata->base); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + +writel_relaxed (state->trcprgctlr, drvdata->base +TRCPRGCTLR ); +writel_relaxed (state->trcprocselr, drvdata->base +TRCPROCSELR ); +writel_relaxed (state->trcconfigr, drvdata->base +TRCCONFIGR ); +writel_relaxed (state->trcauxctlr, drvdata->base +TRCAUXCTLR ); +writel_relaxed (state->trceventctl0r, drvdata->base +TRCEVENTCTL0R ); +writel_relaxed (state->trceventctl1r, drvdata->base +TRCEVENTCTL1R ); +writel_relaxed (state->trcstallctlr, drvdata->base +TRCSTALLCTLR ); +writel_relaxed (state->trctsctlr, drvdata->base +TRCTSCTLR ); +writel_relaxed (state->trcsyncpr, drvdata->base +TRCSYNCPR ); +writel_relaxed (state->trcccctlr, drvdata->base +TRCCCCTLR ); +writel_relaxed (state->trcbbctlr, drvdata->base +TRCBBCTLR ); +writel_relaxed (state->trctraceidr, drvdata->base +TRCTRACEIDR ); +writel_relaxed (state->trcqctlr, drvdata->base +TRCQCTLR ); + +writel_relaxed (state->trcvictlr, drvdata->base +TRCVICTLR ); +writel_relaxed (state->trcviiectlr, drvdata->base +TRCVIIECTLR ); +writel_relaxed (state->trcvissctlr, drvdata->base +TRCVISSCTLR ); +writel_relaxed (state->trcvipcssctlr, drvdata->base +TRCVIPCSSCTLR ); +writel_relaxed (state->trcvdctlr, drvdata->base +TRCVDCTLR ); +writel_relaxed (state->trcvdsacctlr, drvdata->base +TRCVDSACCTLR ); +writel_relaxed (state->trcvdarcctlr, drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) +writel_relaxed (state->trcseqevr[i], + drvdata->base +TRCSEQEVRn (i)); + +writel_relaxed (state->trcseqrstevr, drvdata->base +TRCSEQRSTEVR ); +writel_relaxed (state->trcseqstr, drvdata->base +TRCSEQSTR ); +writel_relaxed (state->trcextinselr, drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { +writel_relaxed (state->trccntrldvr[i], + drvdata->base +TRCCNTRLDVRn (i)); +writel_relaxed (state->trccntctlr[i], + drvdata->base +TRCCNTCTLRn (i)); +writel_relaxed (state->trccntvr[i], + drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) +writel_relaxed (state->trcrsctlr[i], + drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { +writel_relaxed (state->trcssccr[i], + drvdata->base +TRCSSCCRn (i)); +writel_relaxed (state->trcsscsr[i], + drvdata->base +TRCSSCSRn (i)); +writel_relaxed (state->trcsspcicr[i], + drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { +writel_relaxed (state->trcacvr[i], + drvdata->base +TRCACVRn (i)); +writel_relaxed (state->trcacatr[i], + drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) +writel_relaxed (state->trccidcvr[i], + drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) +writel_relaxed (state->trcvmidcvr[i], + drvdata->base +TRCVMIDCVRn (i)); + +writel_relaxed (state->trccidcctlr0, drvdata->base +TRCCIDCCTLR0 ); +writel_relaxed (state->trccidcctlr1, drvdata->base +TRCCIDCCTLR1 ); + +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR0 ); +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR1 ); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + + drvdata->state_needs_restore = false; + +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); + +/* Unlock the OS lock to re-enable trace and external debug access */ +etm4_os_unlock (drvdata); +CS_LOCK (drvdata->base); +} + +static int etm4_cpu_pm_notify (struct notifier_block *nb,unsigned long cmd, +void *v) +{ +struct etmv4_drvdata *drvdata; +unsigned int cpu =smp_processor_id (); + +if (!etmdrvdata[cpu]) +return 0 ; + + drvdata = etmdrvdata[cpu]; + +if (pm_save_enable ==PARAM_PM_SAVE_DISABLE || + (pm_save_enable ==PARAM_PM_SAVE_FIRMWARE && + !drvdata->pm_save_enable)) +return NOTIFY_OK ; + +if (WARN_ON_ONCE (drvdata->cpu !=smp_processor_id ())) +return NOTIFY_BAD ; + +switch (cmd) { +case CPU_PM_ENTER : +/* save the state if coresight is in use */ +if (coresight_is_claimed_any (drvdata->base)) +if (etm4_cpu_save (drvdata)) +return NOTIFY_BAD ; +break ; +case CPU_PM_EXIT : +case CPU_PM_ENTER_FAILED : +/* trcclaimset is set when there is state to restore */ +if (drvdata->state_needs_restore) +etm4_cpu_restore (drvdata); +break ; +default : +return NOTIFY_DONE ; + } + +return NOTIFY_OK ; +} + +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) +{ + drvdata->nb.notifier_call = etm4_cpu_pm_notify; +return cpu_pm_register_notifier (&drvdata->nb); +} + +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) +{ +if (drvdata->nb.notifier_call) +cpu_pm_unregister_notifier (&drvdata->nb); +} +#else +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) {return 0 ; } +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) { } +#endif + +static inline bool etm4_needs_save_restore (struct device *dev) +{ +return fwnode_property_present (dev->fwnode, +"arm,coresight-needs-save-restore" ); +} +static int etm4_probe (struct amba_device *adev,const struct amba_id *id) {int ret;@@ -1095,6 +1386,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)dev_set_drvdata (dev, drvdata); + drvdata->pm_save_enable =etm4_needs_save_restore (dev); +/* Validity for the resource is already checked by the AMBA core */ base =devm_ioremap_resource (dev, res);if (IS_ERR (base))@@ -1126,6 +1419,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (ret <0 ) goto err_arch_supported; hp_online = ret; + + ret =etm4_cpu_pm_register (drvdata); +if (ret) + goto err_arch_supported; }cpus_read_unlock ();@@ -1176,6 +1473,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) err_arch_supported:if (--etm4_count ==0 ) { +etm4_cpu_pm_unregister (drvdata); +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING );if (hp_online)cpuhp_remove_state_nocalls (hp_online);drivers/hwtracing/coresight/coresight-etm4x.h +66
-0@@ -175,6 +175,7 @@ ETM_MODE_EXCL_USER)#define TRCSTATR_IDLE_BIT 0 +#define TRCSTATR_PMSTABLE_BIT 1#define ETM_DEFAULT_ADDR_COMP 0/* PowerDown Control Register bits */ @@ -281,6 +282,65 @@ struct etmv4_config {u32 ext_inp; }; +/** +* struct etm4_save_state - state to be preserved when ETM is without power +*/ +struct etmv4_save_state { +u32 trcprgctlr; +u32 trcprocselr; +u32 trcconfigr; +u32 trcauxctlr; +u32 trceventctl0r; +u32 trceventctl1r; +u32 trcstallctlr; +u32 trctsctlr; +u32 trcsyncpr; +u32 trcccctlr; +u32 trcbbctlr; +u32 trctraceidr; +u32 trcqctlr; + +u32 trcvictlr; +u32 trcviiectlr; +u32 trcvissctlr; +u32 trcvipcssctlr; +u32 trcvdctlr; +u32 trcvdsacctlr; +u32 trcvdarcctlr; + +u32 trcseqevr[ETM_MAX_SEQ_STATES ]; +u32 trcseqrstevr; +u32 trcseqstr; +u32 trcextinselr; +u32 trccntrldvr[ETMv4_MAX_CNTR]; +u32 trccntctlr[ETMv4_MAX_CNTR]; +u32 trccntvr[ETMv4_MAX_CNTR]; + +u32 trcrsctlr[ETM_MAX_RES_SEL *2 ]; + +u32 trcssccr[ETM_MAX_SS_CMP ]; +u32 trcsscsr[ETM_MAX_SS_CMP ]; +u32 trcsspcicr[ETM_MAX_SS_CMP ]; + +u64 trcacvr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcacatr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcdvcvr[ETM_MAX_DATA_VAL_CMP ]; +u64 trcdvcmr[ETM_MAX_DATA_VAL_CMP ]; +u64 trccidcvr[ETMv4_MAX_CTXID_CMP]; +u32 trcvmidcvr[ETM_MAX_VMID_CMP ]; +u32 trccidcctlr0; +u32 trccidcctlr1; +u32 trcvmidcctlr0; +u32 trcvmidcctlr1; + +u32 trcclaimset; + +u32 cntr_val[ETMv4_MAX_CNTR]; +u32 seq_state; +u32 vinst_ctrl; +u32 ss_status[ETM_MAX_SS_CMP ]; +}; +/** * struct etm4_drvdata - specifics associated to an ETM component * @base: Memory mapped base address for this component. @@ -336,6 +396,8 @@ struct etmv4_config {* @atbtrig: If the implementation can support ATB triggers * @lpoverride: If the implementation can support low-power state over. * @config: structure holding configuration parameters. +* @save_state: State to be preserved across power loss +* @nb: CPU PM notifier */ struct etmv4_drvdata {void __iomem *base;@@ -367,6 +429,7 @@ struct etmv4_drvdata {u8 q_support;bool sticky_enable;bool boot_enable; +bool pm_save_enable;bool os_unlock;bool instrp0;bool trcbb;@@ -381,6 +444,9 @@ struct etmv4_drvdata {bool atbtrig;bool lpoverride;struct etmv4_config config; +struct etmv4_save_state save_state; +bool state_needs_restore; +struct notifier_block nb; };/* Address comparator access types */ drivers/hwtracing/coresight/coresight.c +1
-1@@ -140,7 +140,7 @@ static inline bool coresight_is_claimed_self_hosted(void __iomem *base)return coresight_read_claim_tags (base) ==CORESIGHT_CLAIM_SELF_HOSTED ; } -static inline bool coresight_is_claimed_any (void __iomem *base) +bool coresight_is_claimed_any (void __iomem *base) {return coresight_read_claim_tags (base) !=0 ; }include/linux/coresight.h +8
-0@@ -285,6 +285,9 @@ extern void coresight_disclaim_device(void __iomem *base);extern void coresight_disclaim_device_unlocked (void __iomem *base);extern char *coresight_alloc_device_name (struct coresight_dev_list *devs,struct device *dev); + +extern bool coresight_is_claimed_any (void __iomem *base); +#else static inline struct coresight_device *coresight_register (struct coresight_desc *desc) {return NULL ; }@@ -307,6 +310,11 @@ static inline int coresight_claim_device(void __iomem *base)static inline void coresight_disclaim_device (void __iomem *base) {}static inline void coresight_disclaim_device_unlocked (void __iomem *base) {} +static inline bool coresight_is_claimed_any (void __iomem *base) +{ +return false; +} +#endif
Quoted 8 lines
Quoted 8 lines
include/linux/coresight.h +0
-0extern int coresight_get_cpu (struct device *dev);Signature · 6 lines
2.21.0 _______________________________________________ CoreSight mailing list [email protected] https://lists.linaro.org/mailman/listinfo/coresight
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
On Fri, Jun 28, 2019 at 09:53:58AM +0100, Andrew Murray wrote:
[...]
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/hwtracing/coresight/coresight-etm4x.c +0
-0
[...]
Quoted 21 lines
Quoted 21 lines
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 51
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" ); +I understand if set
pm_save_enable= 2 (firmware), then driver will depend ondrvdata->pm_save_enableto make decision for context saving and restoring.Maybe we can simplize to set
pm_save_enablefor binary value:
0 (disabled) or 1 (enabled). The reason is if we set the module parameter 'pm_save_enable= 1', then we can set every ETM device'sdrvdata->pm_save_enablein initialization phase. So in the probe function, we can use below code:
Quoted 4 lines
Quoted 1 line
drvdata->pm_save_enable = pm_save_enable ? : etm4_needs_save_restore(dev);This means that when the module parameter is set to 1, then we only save/restore if the firmware suggests it is needed.
If the module parameter is set to 1, then we will always set every device 'drvdata->pm_save_enable' to 1. So in this case, the module parameter will override the firmware property and always save/restore contexts for ETM.
Quoted 4 lines
However - what happens on hardware that ignores the PU bit (and thus requires save/restore), yet it's firmware doesn't have the 'arm,coresight-needs-save-restore' property? There is no way to override the firmware and always save/restore.
Actually I suggested to give the module parameter with high priority and when the module parameter has set to 1, then it can override firmware 'arm,coresight-needs-save-restore' property.
If we set the module parameter in kernel command line or when load the module, its value can be used in the function etm4_probe(). So in the driver probing, it detects the module parameter is 1, then it can directly set every device 'drvdata->pm_save_enable' to 1. Thus we can always save/restore context for ignoring the PU bit case.
Quoted 2 lines
(It's also quite helpful for debugging to be able to change the module parameter at run time.)
[...]
Quoted 4 lines
Quoted 1 line
Do we need to disable trace unit at the end of saving flow?
At the start of this function we take the OS lock, this has the effect of also disabling the trace. Therefore I don't think it's necessary to do more.
Okay, I read the comment and thanks for reminding.
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 33 lines · Leo Yan
On Fri, Jun 28, 2019 at 09:53:58AM +0100, Andrew Murray wrote:
[...]
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/hwtracing/coresight/coresight-etm4x.c +0
-0[...]
Quoted 25 lines
Quoted 15 lines
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 51
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" ); +I understand if set
pm_save_enable= 2 (firmware), then driver will depend ondrvdata->pm_save_enableto make decision for context saving and restoring.Quoted 7 lines
Maybe we can simplize to set
pm_save_enablefor binary value:
0 (disabled) or 1 (enabled). The reason is if we set the module parameter 'pm_save_enable= 1', then we can set every ETM device'sdrvdata->pm_save_enablein initialization phase. So in the probe function, we can use below code:drvdata->pm_save_enable = pm_save_enable ? : etm4_needs_save_restore(dev);This means that when the module parameter is set to 1, then we only save/restore if the firmware suggests it is needed.
Sorry, I seemingly can't read code today.
Quoted 15 lines
If the module parameter is set to 1, then we will always set every device '
drvdata->pm_save_enable' to 1. So in this case, the module parameter will override the firmware property and always save/restore contexts for ETM.Quoted 4 lines
However - what happens on hardware that ignores the PU bit (and thus requires save/restore), yet it's firmware doesn't have the 'arm,coresight-needs-save-restore' property? There is no way to override the firmware and always save/restore.
Actually I suggested to give the module parameter with high priority and when the module parameter has set to 1, then it can override firmware 'arm,coresight-needs-save-restore' property.
Quoted 5 lines
If we set the module parameter in kernel command line or when load the module, its value can be used in the function
etm4_probe(). So in the driver probing, it detects the module parameter is 1, then it can directly set every device 'drvdata->pm_save_enable' to 1. Thus we can always save/restore context for ignoring the PU bit case.
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks,
Andrew Murray
Quoted 8 lines
Quoted 3 lines
(It's also quite helpful for debugging to be able to change the module parameter at run time.)
[...]
Quoted 2 lines
Quoted 1 line
Do we need to disable trace unit at the end of saving flow?
Quoted 7 lines
Quoted 2 lines
At the start of this function we take the OS lock, this has the effect of also disabling the trace. Therefore I don't think it's necessary to do more.
Okay, I read the comment and thanks for reminding.
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Hi Andrew,
Quoted 58 lines · Andrew Murray
Quoted 33 lines · Leo Yan
On Fri, Jun 28, 2019 at 09:53:58AM +0100, Andrew Murray wrote:
[...]
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/hwtracing/coresight/coresight-etm4x.c +0
-0[...]
Quoted 25 lines
Quoted 15 lines
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 51
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" ); +I understand if set
pm_save_enable= 2 (firmware), then driver will depend ondrvdata->pm_save_enableto make decision for context saving and restoring.Quoted 7 lines
Maybe we can simplize to set
pm_save_enablefor binary value:
0 (disabled) or 1 (enabled). The reason is if we set the module parameter 'pm_save_enable= 1', then we can set every ETM device'sdrvdata->pm_save_enablein initialization phase. So in the probe function, we can use below code:drvdata->pm_save_enable = pm_save_enable ? : etm4_needs_save_restore(dev);This means that when the module parameter is set to 1, then we only save/restore if the firmware suggests it is needed.
Sorry, I seemingly can't read code today.
Quoted 15 lines
If the module parameter is set to 1, then we will always set every device '
drvdata->pm_save_enable' to 1. So in this case, the module parameter will override the firmware property and always save/restore contexts for ETM.Quoted 4 lines
However - what happens on hardware that ignores the PU bit (and thus requires save/restore), yet it's firmware doesn't have the 'arm,coresight-needs-save-restore' property? There is no way to override the firmware and always save/restore.
Actually I suggested to give the module parameter with high priority and when the module parameter has set to 1, then it can override firmware 'arm,coresight-needs-save-restore' property.
Quoted 5 lines
If we set the module parameter in kernel command line or when load the module, its value can be used in the function
etm4_probe(). So in the driver probing, it detects the module parameter is 1, then it can directly set every device 'drvdata->pm_save_enable' to 1. Thus we can always save/restore context for ignoring the PU bit case.
Quoted 8 lines
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks for explanation and agree with this. Just a suggestion, maybe we can initialize 'drvdata->pm_save_enable' in probe as below:
if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE)
drvdata->pm_save_enable = etm4_needs_save_restore(dev);
else
drvdata->pm_save_enable = pm_save_enable;From then on, we can only use 'drvdata->pm_save_enable' and don't need to check the module parameter anymore.
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 73 lines · Leo Yan
Hi Andrew,
Quoted 58 lines · Andrew Murray
Quoted 33 lines · Leo Yan
On Fri, Jun 28, 2019 at 09:53:58AM +0100, Andrew Murray wrote:
[...]
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/hwtracing/coresight/coresight-etm4x.c +0
-0[...]
Quoted 25 lines
Quoted 15 lines
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 51
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" ); +I understand if set
pm_save_enable= 2 (firmware), then driver will depend ondrvdata->pm_save_enableto make decision for context saving and restoring.Quoted 7 lines
Maybe we can simplize to set
pm_save_enablefor binary value:
0 (disabled) or 1 (enabled). The reason is if we set the module parameter 'pm_save_enable= 1', then we can set every ETM device'sdrvdata->pm_save_enablein initialization phase. So in the probe function, we can use below code:drvdata->pm_save_enable = pm_save_enable ? : etm4_needs_save_restore(dev);This means that when the module parameter is set to 1, then we only save/restore if the firmware suggests it is needed.
Sorry, I seemingly can't read code today.
Quoted 15 lines
If the module parameter is set to 1, then we will always set every device '
drvdata->pm_save_enable' to 1. So in this case, the module parameter will override the firmware property and always save/restore contexts for ETM.Quoted 4 lines
However - what happens on hardware that ignores the PU bit (and thus requires save/restore), yet it's firmware doesn't have the 'arm,coresight-needs-save-restore' property? There is no way to override the firmware and always save/restore.
Actually I suggested to give the module parameter with high priority and when the module parameter has set to 1, then it can override firmware 'arm,coresight-needs-save-restore' property.
Quoted 5 lines
If we set the module parameter in kernel command line or when load the module, its value can be used in the function
etm4_probe(). So in the driver probing, it detects the module parameter is 1, then it can directly set every device 'drvdata->pm_save_enable' to 1. Thus we can always save/restore context for ignoring the PU bit case.Quoted 8 lines
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks for explanation and agree with this. Just a suggestion, maybe we can initialize '
drvdata->pm_save_enable' in probe as below:
Quoted 7 lines
if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE) drvdata->pm_save_enable = etm4_needs_save_restore(dev); else drvdata->pm_save_enable = pm_save_enable;From then on, we can only use '
drvdata->pm_save_enable' and don't need to check the module parameter anymore.
This is OK, however it means you can't then change the mode once the driver is probed. I.e. you can't echo values into /sys/module/coresight-etm4x/pm_save_enable at runtime. This was useful to me during testing, I assumed it may be useful for others too (especially given that you can't unload the module).
Thanks,
Andrew Murray
Quoted 3 lines
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
On Mon, Jul 01, 2019 at 10:34:58AM +0100, Andrew Murray wrote:
[...]
Quoted 17 lines
Quoted 17 lines
Quoted 8 lines
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks for explanation and agree with this. Just a suggestion, maybe we can initialize '
drvdata->pm_save_enable' in probe as below:if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE) drvdata->pm_save_enable = etm4_needs_save_restore(dev); else drvdata->pm_save_enable = pm_save_enable;
Quoted 8 lines
Quoted 2 lines
From then on, we can only use '
drvdata->pm_save_enable' and don't need to check the module parameter anymore.This is OK, however it means you can't then change the mode once the driver is probed. I.e. you can't echo values into
/sys/module/coresight-etm4x/pm_save_enableat runtime. This was useful to me during testing, I assumed it may be useful for others too (especially given that you can't unload the module).
Ah, okay, this is fine for me. Thanks for sharing the knowledge.
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 24 lines · Leo Yan
On Mon, Jul 01, 2019 at 10:34:58AM +0100, Andrew Murray wrote:
[...]
Quoted 20 lines
Quoted 19 lines
Quoted 8 lines
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks for explanation and agree with this. Just a suggestion, maybe we can initialize '
drvdata->pm_save_enable' in probe as below:if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE) drvdata->pm_save_enable = etm4_needs_save_restore(dev); else drvdata->pm_save_enable = pm_save_enable;From then on, we can only use '
drvdata->pm_save_enable' and don't need to check the module parameter anymore.
Quoted 7 lines
Quoted 5 lines
This is OK, however it means you can't then change the mode once the driver is probed. I.e. you can't echo values into
/sys/module/coresight-etm4x/pm_save_enableat runtime. This was useful to me during testing, I assumed it may be useful for others too (especially given that you can't unload the module).Ah, okay, this is fine for me. Thanks for sharing the knowledge.
Thanks for the review, can I add your Reviewed-By?
Andrew Murray
Quoted 3 lines
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 31 lines · Andrew Murray
Quoted 30 lines · Leo Yan
On Mon, Jul 01, 2019 at 10:34:58AM +0100, Andrew Murray wrote:
[...]
Quoted 25 lines
Quoted 12 lines
Quoted 8 lines
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks for explanation and agree with this. Just a suggestion, maybe we can initialize '
drvdata->pm_save_enable' in probe as below:Quoted 7 lines
if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE) drvdata->pm_save_enable = etm4_needs_save_restore(dev); else drvdata->pm_save_enable = pm_save_enable;From then on, we can only use '
drvdata->pm_save_enable' and don't need to check the module parameter anymore.This is OK, however it means you can't then change the mode once the driver is probed. I.e. you can't echo values into
/sys/module/coresight-etm4x/pm_save_enableat runtime. This was useful to me during testing, I assumed it may be useful for others too (especially given that you can't unload the module).
Quoted 3 lines
Quoted 1 line
Ah, okay, this is fine for me. Thanks for sharing the knowledge.
Thanks for the review, can I add your Reviewed-By?
Yes, please. Usually, I would like to give a test for patches, this patch is important for productions after enable CoreSight with CPU idle; but some platforms are easily to hang after enable CPU idle with Coresight.
So if you suggest to test this patch set on some public platform, I can give a testing on it (if I have the boards).
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 36 lines · Leo Yan
Quoted 31 lines · Andrew Murray
Quoted 30 lines · Leo Yan
On Mon, Jul 01, 2019 at 10:34:58AM +0100, Andrew Murray wrote:
[...]
Quoted 25 lines
Quoted 12 lines
Quoted 8 lines
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks for explanation and agree with this. Just a suggestion, maybe we can initialize '
drvdata->pm_save_enable' in probe as below:Quoted 7 lines
if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE) drvdata->pm_save_enable = etm4_needs_save_restore(dev); else drvdata->pm_save_enable = pm_save_enable;From then on, we can only use '
drvdata->pm_save_enable' and don't need to check the module parameter anymore.This is OK, however it means you can't then change the mode once the driver is probed. I.e. you can't echo values into
/sys/module/coresight-etm4x/pm_save_enableat runtime. This was useful to me during testing, I assumed it may be useful for others too (especially given that you can't unload the module).Quoted 3 lines
Quoted 1 line
Ah, okay, this is fine for me. Thanks for sharing the knowledge.
Thanks for the review, can I add your Reviewed-By?
Quoted 7 lines
Yes, please. Usually, I would like to give a test for patches, this patch is important for productions after enable CoreSight with CPU idle; but some platforms are easily to hang after enable CPU idle with Coresight.
So if you suggest to test this patch set on some public platform, I can give a testing on it (if I have the boards).
I've only been able to test this on a Juno (which doesn't suffer from this issue). Perhaps Mathieu can suggest known platforms that require cpuidle disabled to use coresight?
Thanks,
Andrew Murray
Quoted 3 lines
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 43 lines · Andrew Murray
Quoted 41 lines · Leo Yan
Quoted 31 lines · Andrew Murray
Quoted 30 lines · Leo Yan
On Mon, Jul 01, 2019 at 10:34:58AM +0100, Andrew Murray wrote:
[...]
Quoted 25 lines
Quoted 12 lines
Quoted 8 lines
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks for explanation and agree with this. Just a suggestion, maybe we can initialize '
drvdata->pm_save_enable' in probe as below:Quoted 7 lines
if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE) drvdata->pm_save_enable = etm4_needs_save_restore(dev); else drvdata->pm_save_enable = pm_save_enable;From then on, we can only use '
drvdata->pm_save_enable' and don't need to check the module parameter anymore.This is OK, however it means you can't then change the mode once the driver is probed. I.e. you can't echo values into
/sys/module/coresight-etm4x/pm_save_enableat runtime. This was useful to me during testing, I assumed it may be useful for others too (especially given that you can't unload the module).Quoted 3 lines
Quoted 1 line
Ah, okay, this is fine for me. Thanks for sharing the knowledge.
Thanks for the review, can I add your Reviewed-By?
Yes, please. Usually, I would like to give a test for patches, this patch is important for productions after enable CoreSight with CPU idle; but some platforms are easily to hang after enable CPU idle with Coresight.
Quoted 7 lines
Quoted 2 lines
So if you suggest to test this patch set on some public platform, I can give a testing on it (if I have the boards).
I've only been able to test this on a Juno (which doesn't suffer from this issue). Perhaps Mathieu can suggest known platforms that require cpuidle disabled to use coresight?
The dragonboard 410c will be perfect for that.
Quoted 7 lines
Thanks,
Andrew Murray
Quoted 3 lines
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 47 lines · Mathieu Poirier
Quoted 46 lines · Andrew Murray
Quoted 43 lines · Leo Yan
Quoted 31 lines · Andrew Murray
Quoted 30 lines · Leo Yan
On Mon, Jul 01, 2019 at 10:34:58AM +0100, Andrew Murray wrote:
[...]
Quoted 25 lines
Quoted 12 lines
Quoted 8 lines
In any case, not only do we want to override the firmware to always save/restore. Sometimes we may also want to override the firmware to never save/restore (despite the firmware having the 'arm,coresight-needs-save-restore' flag present). For example to debug power management.
Thus with this current approach you can override the firmware to either enable or disable save/restore.
Thanks for explanation and agree with this. Just a suggestion, maybe we can initialize '
drvdata->pm_save_enable' in probe as below:Quoted 7 lines
if (pm_save_enable == PARAM_PM_SAVE_FIRMWARE) drvdata->pm_save_enable = etm4_needs_save_restore(dev); else drvdata->pm_save_enable = pm_save_enable;From then on, we can only use '
drvdata->pm_save_enable' and don't need to check the module parameter anymore.This is OK, however it means you can't then change the mode once the driver is probed. I.e. you can't echo values into
/sys/module/coresight-etm4x/pm_save_enableat runtime. This was useful to me during testing, I assumed it may be useful for others too (especially given that you can't unload the module).Quoted 3 lines
Quoted 1 line
Ah, okay, this is fine for me. Thanks for sharing the knowledge.
Thanks for the review, can I add your Reviewed-By?
Yes, please. Usually, I would like to give a test for patches, this patch is important for productions after enable CoreSight with CPU idle; but some platforms are easily to hang after enable CPU idle with Coresight.
So if you suggest to test this patch set on some public platform, I can give a testing on it (if I have the boards).
Quoted 6 lines
Quoted 4 lines
I've only been able to test this on a Juno (which doesn't suffer from this issue). Perhaps Mathieu can suggest known platforms that require cpuidle disabled to use coresight?
The dragonboard 410c will be perfect for that.
Thanks for suggestion. After Andrew work out the new patch set, I will test it on DB410c board.
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Suzuki K Poulose
maintainerRe: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
In reply to Andrew MurrayQuoted 41 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
drivers/hwtracing/coresight/coresight-etm4x.c +2
-0@@ -18,6 +18,7 @@#include <linux/stat.h> #include <linux/clk.h> #include <linux/cpu.h> +#include <linux/cpu_pm.h> #include <linux/coresight.h> #include <linux/coresight-pmu.h> #include <linux/pm_wakeup.h> @@ -26,6 +27,7 @@#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <asm/sections.h> #include <asm/local.h> #include <asm/virt.h> @@ -37,6 +39,16 @@ static int boot_enable;module_param (boot_enable, int,0444 );MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" );
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 50
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +9
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" );
nit: Please could you add a comment to explain the implications of "firmware" and how this interacts with "disabled" as it is explained in your thread with Leo. That will be quite helpful for someone looking to use the parameter.
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1355
Quoted 6 lines
drivers/hwtracing/coresight/coresight-etm4x.c +6
-0+ +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) +{ + drvdata->nb.notifier_call = etm4_cpu_pm_notify; +return cpu_pm_register_notifier (&drvdata->nb); +}
Do we need to tie the notifer_block to etmv4_drvdata ? We could simply use a static one for the entire driver, given we don't rely on the "drvdata". Also, we register for only one ETM device at the moment, which is problematic if that CPU goes down and we decide to unregister the ETM device (in the future).
Quoted 60 lines
drivers/hwtracing/coresight/coresight-etm4x.c +23
-0+ +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) +{ +if (drvdata->nb.notifier_call) +cpu_pm_unregister_notifier (&drvdata->nb); +} +#else +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) {return 0 ; } +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) { } +#endif + +static inline bool etm4_needs_save_restore (struct device *dev) +{ +return fwnode_property_present (dev->fwnode, +"arm,coresight-needs-save-restore" ); +} +static int etm4_probe (struct amba_device *adev,const struct amba_id *id) {int ret;@@ -1095,6 +1386,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)dev_set_drvdata (dev, drvdata); + drvdata->pm_save_enable =etm4_needs_save_restore (dev); +/* Validity for the resource is already checked by the AMBA core */ base =devm_ioremap_resource (dev, res);if (IS_ERR (base))@@ -1126,6 +1419,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (ret <0 ) goto err_arch_supported; hp_online = ret; + + ret =etm4_cpu_pm_register (drvdata); +if (ret) + goto err_arch_supported; }/** * struct
etm4_drvdata- specifics associated to an ETM component
* @base: Memory mapped base address for this component.drivers/hwtracing/coresight/coresight-etm4x.c +3
-0@@ -336,6 +396,8 @@ struct etmv4_config {* @atbtrig: If the implementation can support ATB triggers * @lpoverride: If the implementation can support low-power state over. * @config: structure holding configuration parameters. +* @save_state: State to be preserved across power loss +* @nb: CPU PM notifier */ struct etmv4_drvdata {void __iomem *base;@@ -367,6 +429,7 @@ struct etmv4_drvdata {u8 q_support;bool sticky_enable;bool boot_enable; +bool pm_save_enable;bool os_unlock;bool instrp0;bool trcbb;
drivers/hwtracing/coresight/coresight-etm4x.c struct etmv4_drvdata { · line 447
Quoted 4 lines
drivers/hwtracing/coresight/coresight-etm4x.c +1
-0@@ -381,6 +444,9 @@ struct etmv4_drvdata {bool atbtrig;bool lpoverride;struct etmv4_config config; +struct etmv4_save_state save_state;
We may potentially reduce the memory usage by dynamically allocating this structure the variable below. So you may make this a ptr instead.
drivers/hwtracing/coresight/coresight-etm4x.c struct etmv4_drvdata { · line 448
Quoted 1 line
drivers/hwtracing/coresight/coresight-etm4x.c +1
-0+bool state_needs_restore;
Rest looks good to me.
Suzuki
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 49 lines · Suzuki K Poulose
Quoted 46 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
drivers/hwtracing/coresight/coresight-etm4x.c +7
-0@@ -18,6 +18,7 @@#include <linux/stat.h> #include <linux/clk.h> #include <linux/cpu.h> +#include <linux/cpu_pm.h> #include <linux/coresight.h> #include <linux/coresight-pmu.h> #include <linux/pm_wakeup.h> @@ -26,6 +27,7 @@#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <asm/sections.h> #include <asm/local.h> #include <asm/virt.h> @@ -37,6 +39,16 @@ static int boot_enable;module_param (boot_enable, int,0444 );MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" ); + +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 +
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 50
Quoted 4 lines
drivers/hwtracing/coresight/coresight-etm4x.c +4
-0+static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" );nit: Please could you add a comment to explain the implications of "firmware" and how this interacts with "disabled" as it is explained in your thread with Leo. That will be quite helpful for someone looking to use the parameter.
Sure.
Quoted 13 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1355
Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm4x.c +6
-0+ +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) +{ + drvdata->nb.notifier_call = etm4_cpu_pm_notify; +return cpu_pm_register_notifier (&drvdata->nb); +}Do we need to tie the
notifer_blocktoetmv4_drvdata? We could simply use a static one for the entire driver, given we don't rely on the "drvdata". Also, we register for only one ETM device at the moment, which is problematic if that CPU goes down and we decide to unregister the ETM device (in the future).
Yes there is no reason to tie this up with drvdata, it can be static to the driver. I'll make this change and ensure there is no issue if any CPU goes down.
Quoted 58 lines
Quoted 58 lines
drivers/hwtracing/coresight/coresight-etm4x.c +23
-0+ +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) +{ +if (drvdata->nb.notifier_call) +cpu_pm_unregister_notifier (&drvdata->nb); +} +#else +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) {return 0 ; } +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) { } +#endif + +static inline bool etm4_needs_save_restore (struct device *dev) +{ +return fwnode_property_present (dev->fwnode, +"arm,coresight-needs-save-restore" ); +} +static int etm4_probe (struct amba_device *adev,const struct amba_id *id) {int ret;@@ -1095,6 +1386,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)dev_set_drvdata (dev, drvdata); + drvdata->pm_save_enable =etm4_needs_save_restore (dev); +/* Validity for the resource is already checked by the AMBA core */ base =devm_ioremap_resource (dev, res);if (IS_ERR (base))@@ -1126,6 +1419,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (ret <0 ) goto err_arch_supported; hp_online = ret; + + ret =etm4_cpu_pm_register (drvdata); +if (ret) + goto err_arch_supported; }/** * struct
etm4_drvdata- specifics associated to an ETM component
* @base: Memory mapped base address for this component.drivers/hwtracing/coresight/coresight-etm4x.c +3
-0@@ -336,6 +396,8 @@ struct etmv4_config {* @atbtrig: If the implementation can support ATB triggers * @lpoverride: If the implementation can support low-power state over. * @config: structure holding configuration parameters. +* @save_state: State to be preserved across power loss +* @nb: CPU PM notifier */ struct etmv4_drvdata {void __iomem *base;@@ -367,6 +429,7 @@ struct etmv4_drvdata {u8 q_support;bool sticky_enable;bool boot_enable; +bool pm_save_enable;bool os_unlock;bool instrp0;bool trcbb;
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.c struct etmv4_drvdata { · line 447
Quoted 5 lines
drivers/hwtracing/coresight/coresight-etm4x.c +1
-0@@ -381,6 +444,9 @@ struct etmv4_drvdata {bool atbtrig;bool lpoverride;struct etmv4_config config; +struct etmv4_save_state save_state;We may potentially reduce the memory usage by dynamically allocating this structure the variable below. So you may make this a ptr instead.
Sure.
Quoted 4 lines
drivers/hwtracing/coresight/coresight-etm4x.c struct etmv4_drvdata { · line 448
Quoted 2 lines
drivers/hwtracing/coresight/coresight-etm4x.c +1
-0+bool state_needs_restore;Rest looks good to me.
Thanks,
Andrew Murray
Quoted 2 lines
Suzuki
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
In reply to Andrew MurrayHi Andrew,
On top of what others have already commented on...
Quoted 14 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).
Quoted 6 lines
The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
Signed-off-by Andrew Murray <[email protected]>--- .../devicetree/bindings/arm/coresight.txt | 3 +
Please break this into a single patch to keep in line with the procedure (and keep checkpatch quiet). I understand the change is trivial but it gives the DT contingent an opportunity to know what is happening in their sub-system.
Quoted 43 lines
drivers/hwtracing/coresight/coresight-etm4x.c | 299 ++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm4x.h | 66 ++++ drivers/hwtracing/coresight/coresight.c | 2 +- include/linux/coresight.h | 8 + 5 files changed, 377 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/arm/coresight.txt +3
-0@@ -90,6 +90,9 @@ its hardware characteristcs. * cpu: the cpu phandle this ETM/PTM is affined to. When omitted the source is considered to belong to CPU0. + * arm,coresight-needs-save-restore: boolean. Indicates that software + should save/restore state across power down. + * Optional property for TMC: * arm,buffer-size: size of contiguous buffer space for TMC ETRdrivers/hwtracing/coresight/coresight-etm4x.c +2
-0@@ -18,6 +18,7 @@#include <linux/stat.h> #include <linux/clk.h> #include <linux/cpu.h> +#include <linux/cpu_pm.h> #include <linux/coresight.h> #include <linux/coresight-pmu.h> #include <linux/pm_wakeup.h> @@ -26,6 +27,7 @@#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <asm/sections.h> #include <asm/local.h> #include <asm/virt.h> @@ -37,6 +39,16 @@ static int boot_enable;module_param (boot_enable, int,0444 );MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" );
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 50
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +9
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" );
If the line is not broken it will end up being longer than 80 characters, which will also make checkpatch angry. Nevertheless I think it is better than braking it, making string searches in the kernel difficult.
Quoted 247 lines
drivers/hwtracing/coresight/coresight-etm4x.c +233
-0+/* The number of ETMv4 currently registered */ static int etm4_count;static struct etmv4_drvdata *etmdrvdata[NR_CPUS ];@@ -54,6 +66,14 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)isb (); } +static void etm4_os_lock (struct etmv4_drvdata *drvdata) +{ +/* Writing 0x1 to TRCOSLAR locks the trace registers */ +writel_relaxed (0x1 , drvdata->base +TRCOSLAR ); + drvdata->os_unlock = false; +isb (); +} +static bool etm4_arch_supported (u8 arch) {/* Mask out the minor version number */ @@ -1079,6 +1099,277 @@ static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) drvdata->trcid =coresight_get_trace_id (drvdata->cpu); } +#ifdef CONFIG_CPU_PM +static int etm4_cpu_save (struct etmv4_drvdata *drvdata) +{ +int i, ret =0 ; +u32 control; +struct etmv4_save_state *state; +struct device *etm_dev = &drvdata->csdev->dev; + +/* As recommended by 3.4.1 of ARM IHI 0064D */ +dsb (sy); +isb (); + +CS_UNLOCK (drvdata->base); + +/* Lock the OS lock to disable trace and external debugger access */ +etm4_os_lock (drvdata); + +/* wait for TRCSTATR.PMSTABLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR , +TRCSTATR_PMSTABLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for PM Stable Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + state = &drvdata->save_state; + + state->trcprgctlr =readl (drvdata->base +TRCPRGCTLR ); + state->trcprocselr =readl (drvdata->base +TRCPROCSELR ); + state->trcconfigr =readl (drvdata->base +TRCCONFIGR ); + state->trcauxctlr =readl (drvdata->base +TRCAUXCTLR ); + state->trceventctl0r =readl (drvdata->base +TRCEVENTCTL0R ); + state->trceventctl1r =readl (drvdata->base +TRCEVENTCTL1R ); + state->trcstallctlr =readl (drvdata->base +TRCSTALLCTLR ); + state->trctsctlr =readl (drvdata->base +TRCTSCTLR ); + state->trcsyncpr =readl (drvdata->base +TRCSYNCPR ); + state->trcccctlr =readl (drvdata->base +TRCCCCTLR ); + state->trcbbctlr =readl (drvdata->base +TRCBBCTLR ); + state->trctraceidr =readl (drvdata->base +TRCTRACEIDR ); + state->trcqctlr =readl (drvdata->base +TRCQCTLR ); + + state->trcvictlr =readl (drvdata->base +TRCVICTLR ); + state->trcviiectlr =readl (drvdata->base +TRCVIIECTLR ); + state->trcvissctlr =readl (drvdata->base +TRCVISSCTLR ); + state->trcvipcssctlr =readl (drvdata->base +TRCVIPCSSCTLR ); + state->trcvdctlr =readl (drvdata->base +TRCVDCTLR ); + state->trcvdsacctlr =readl (drvdata->base +TRCVDSACCTLR ); + state->trcvdarcctlr =readl (drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) + state->trcseqevr[i] =readl (drvdata->base +TRCSEQEVRn (i)); + + state->trcseqrstevr =readl (drvdata->base +TRCSEQRSTEVR ); + state->trcseqstr =readl (drvdata->base +TRCSEQSTR ); + state->trcextinselr =readl (drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { + state->trccntrldvr[i] =readl (drvdata->base +TRCCNTRLDVRn (i)); + state->trccntctlr[i] =readl (drvdata->base +TRCCNTCTLRn (i)); + state->trccntvr[i] =readl (drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) + state->trcrsctlr[i] =readl (drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { + state->trcssccr[i] =readl (drvdata->base +TRCSSCCRn (i)); + state->trcsscsr[i] =readl (drvdata->base +TRCSSCSRn (i)); + state->trcsspcicr[i] =readl (drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { + state->trcacvr[i] =readl (drvdata->base +TRCACVRn (i)); + state->trcacatr[i] =readl (drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) + state->trccidcvr[i] =readl (drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) + state->trcvmidcvr[i] =readl (drvdata->base +TRCVMIDCVRn (i)); + + state->trccidcctlr0 =readl (drvdata->base +TRCCIDCCTLR0 ); + state->trccidcctlr1 =readl (drvdata->base +TRCCIDCCTLR1 ); + + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR0 ); + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR1 ); + + state->trcclaimset =readl (drvdata->base +TRCCLAIMCLR ); + +/* wait for TRCSTATR.IDLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for Idle Trace Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + drvdata->state_needs_restore = true; + +/* power can be removed from the trace unit now */ + control =readl_relaxed (drvdata->base +TRCPDCR ); + control &= ~TRCPDCR_PU ; +writel_relaxed (control, drvdata->base +TRCPDCR ); + +out: +CS_LOCK (drvdata->base); +return ret; +} + +static void etm4_cpu_restore (struct etmv4_drvdata *drvdata) +{ +int i; +struct etmv4_save_state *state; + + state = &drvdata->save_state; + +CS_UNLOCK (drvdata->base); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + +writel_relaxed (state->trcprgctlr, drvdata->base +TRCPRGCTLR ); +writel_relaxed (state->trcprocselr, drvdata->base +TRCPROCSELR ); +writel_relaxed (state->trcconfigr, drvdata->base +TRCCONFIGR ); +writel_relaxed (state->trcauxctlr, drvdata->base +TRCAUXCTLR ); +writel_relaxed (state->trceventctl0r, drvdata->base +TRCEVENTCTL0R ); +writel_relaxed (state->trceventctl1r, drvdata->base +TRCEVENTCTL1R ); +writel_relaxed (state->trcstallctlr, drvdata->base +TRCSTALLCTLR ); +writel_relaxed (state->trctsctlr, drvdata->base +TRCTSCTLR ); +writel_relaxed (state->trcsyncpr, drvdata->base +TRCSYNCPR ); +writel_relaxed (state->trcccctlr, drvdata->base +TRCCCCTLR ); +writel_relaxed (state->trcbbctlr, drvdata->base +TRCBBCTLR ); +writel_relaxed (state->trctraceidr, drvdata->base +TRCTRACEIDR ); +writel_relaxed (state->trcqctlr, drvdata->base +TRCQCTLR ); + +writel_relaxed (state->trcvictlr, drvdata->base +TRCVICTLR ); +writel_relaxed (state->trcviiectlr, drvdata->base +TRCVIIECTLR ); +writel_relaxed (state->trcvissctlr, drvdata->base +TRCVISSCTLR ); +writel_relaxed (state->trcvipcssctlr, drvdata->base +TRCVIPCSSCTLR ); +writel_relaxed (state->trcvdctlr, drvdata->base +TRCVDCTLR ); +writel_relaxed (state->trcvdsacctlr, drvdata->base +TRCVDSACCTLR ); +writel_relaxed (state->trcvdarcctlr, drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) +writel_relaxed (state->trcseqevr[i], + drvdata->base +TRCSEQEVRn (i)); + +writel_relaxed (state->trcseqrstevr, drvdata->base +TRCSEQRSTEVR ); +writel_relaxed (state->trcseqstr, drvdata->base +TRCSEQSTR ); +writel_relaxed (state->trcextinselr, drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { +writel_relaxed (state->trccntrldvr[i], + drvdata->base +TRCCNTRLDVRn (i)); +writel_relaxed (state->trccntctlr[i], + drvdata->base +TRCCNTCTLRn (i)); +writel_relaxed (state->trccntvr[i], + drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) +writel_relaxed (state->trcrsctlr[i], + drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { +writel_relaxed (state->trcssccr[i], + drvdata->base +TRCSSCCRn (i)); +writel_relaxed (state->trcsscsr[i], + drvdata->base +TRCSSCSRn (i)); +writel_relaxed (state->trcsspcicr[i], + drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { +writel_relaxed (state->trcacvr[i], + drvdata->base +TRCACVRn (i)); +writel_relaxed (state->trcacatr[i], + drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) +writel_relaxed (state->trccidcvr[i], + drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) +writel_relaxed (state->trcvmidcvr[i], + drvdata->base +TRCVMIDCVRn (i)); + +writel_relaxed (state->trccidcctlr0, drvdata->base +TRCCIDCCTLR0 ); +writel_relaxed (state->trccidcctlr1, drvdata->base +TRCCIDCCTLR1 ); + +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR0 ); +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR1 ); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + + drvdata->state_needs_restore = false; + +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); + +/* Unlock the OS lock to re-enable trace and external debug access */ +etm4_os_unlock (drvdata); +CS_LOCK (drvdata->base); +} + +static int etm4_cpu_pm_notify (struct notifier_block *nb,unsigned long cmd, +void *v) +{ +struct etmv4_drvdata *drvdata; +unsigned int cpu =smp_processor_id (); + +if (!etmdrvdata[cpu]) +return 0 ; + + drvdata = etmdrvdata[cpu]; + +if (pm_save_enable ==PARAM_PM_SAVE_DISABLE || + (pm_save_enable ==PARAM_PM_SAVE_FIRMWARE && + !drvdata->pm_save_enable))
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1335
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm4x.c +10
-0+return NOTIFY_OK ; + +if (WARN_ON_ONCE (drvdata->cpu !=smp_processor_id ())) +return NOTIFY_BAD ; + +switch (cmd) { +case CPU_PM_ENTER : +/* save the state if coresight is in use */ +if (coresight_is_claimed_any (drvdata->base)) +if (etm4_cpu_save (drvdata))
Did you still plan on having more than one save/restore function, based on whether CS is self-hosted or driven by an external agent? Doing so might increase complexity that will end up making latency just as long as the current implementation. I'll let you be the judge of that.
Quoted 165 lines
drivers/hwtracing/coresight/coresight-etm4x.c +45
-0+return NOTIFY_BAD ; +break ; +case CPU_PM_EXIT : +case CPU_PM_ENTER_FAILED : +/* trcclaimset is set when there is state to restore */ +if (drvdata->state_needs_restore) +etm4_cpu_restore (drvdata); +break ; +default : + return NOTIFY_DONE; + } + +return NOTIFY_OK ; +} + +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) +{ + drvdata->nb.notifier_call = etm4_cpu_pm_notify; +return cpu_pm_register_notifier (&drvdata->nb); +} + +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) +{ +if (drvdata->nb.notifier_call) +cpu_pm_unregister_notifier (&drvdata->nb); +} +#else +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) {return 0 ; } +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) { } +#endif + +static inline bool etm4_needs_save_restore (struct device *dev) +{ +return fwnode_property_present (dev->fwnode, +"arm,coresight-needs-save-restore" ); +} +static int etm4_probe (struct amba_device *adev,const struct amba_id *id) {int ret;@@ -1095,6 +1386,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)dev_set_drvdata (dev, drvdata); + drvdata->pm_save_enable =etm4_needs_save_restore (dev); +/* Validity for the resource is already checked by the AMBA core */ base =devm_ioremap_resource (dev, res);if (IS_ERR (base))@@ -1126,6 +1419,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (ret <0 ) goto err_arch_supported; hp_online = ret; + + ret =etm4_cpu_pm_register (drvdata); +if (ret) + goto err_arch_supported; }cpus_read_unlock ();@@ -1176,6 +1473,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) err_arch_supported:if (--etm4_count ==0 ) { +etm4_cpu_pm_unregister (drvdata); +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING );if (hp_online)cpuhp_remove_state_nocalls (hp_online);drivers/hwtracing/coresight/coresight-etm4x.h +63
-0@@ -175,6 +175,7 @@ ETM_MODE_EXCL_USER)#define TRCSTATR_IDLE_BIT 0 +#define TRCSTATR_PMSTABLE_BIT 1#define ETM_DEFAULT_ADDR_COMP 0/* PowerDown Control Register bits */ @@ -281,6 +282,65 @@ struct etmv4_config {u32 ext_inp; }; +/** +* struct etm4_save_state - state to be preserved when ETM is without power +*/ +struct etmv4_save_state { +u32 trcprgctlr; +u32 trcprocselr; +u32 trcconfigr; +u32 trcauxctlr; +u32 trceventctl0r; +u32 trceventctl1r; +u32 trcstallctlr; +u32 trctsctlr; +u32 trcsyncpr; +u32 trcccctlr; +u32 trcbbctlr; +u32 trctraceidr; +u32 trcqctlr; + +u32 trcvictlr; +u32 trcviiectlr; +u32 trcvissctlr; +u32 trcvipcssctlr; +u32 trcvdctlr; +u32 trcvdsacctlr; +u32 trcvdarcctlr; + +u32 trcseqevr[ETM_MAX_SEQ_STATES ]; +u32 trcseqrstevr; +u32 trcseqstr; +u32 trcextinselr; +u32 trccntrldvr[ETMv4_MAX_CNTR]; +u32 trccntctlr[ETMv4_MAX_CNTR]; +u32 trccntvr[ETMv4_MAX_CNTR]; + +u32 trcrsctlr[ETM_MAX_RES_SEL *2 ]; + +u32 trcssccr[ETM_MAX_SS_CMP ]; +u32 trcsscsr[ETM_MAX_SS_CMP ]; +u32 trcsspcicr[ETM_MAX_SS_CMP ]; + +u64 trcacvr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcacatr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcdvcvr[ETM_MAX_DATA_VAL_CMP ]; +u64 trcdvcmr[ETM_MAX_DATA_VAL_CMP ]; +u64 trccidcvr[ETMv4_MAX_CTXID_CMP]; +u32 trcvmidcvr[ETM_MAX_VMID_CMP ]; +u32 trccidcctlr0; +u32 trccidcctlr1; +u32 trcvmidcctlr0; +u32 trcvmidcctlr1; + +u32 trcclaimset; + +u32 cntr_val[ETMv4_MAX_CNTR]; +u32 seq_state; +u32 vinst_ctrl; +u32 ss_status[ETM_MAX_SS_CMP ]; +}; +/** * struct etm4_drvdata - specifics associated to an ETM component * @base: Memory mapped base address for this component. @@ -336,6 +396,8 @@ struct etmv4_config {* @atbtrig: If the implementation can support ATB triggers * @lpoverride: If the implementation can support low-power state over. * @config: structure holding configuration parameters. +* @save_state: State to be preserved across power loss +* @nb: CPU PM notifier */ struct etmv4_drvdata {void __iomem *base;@@ -367,6 +429,7 @@ struct etmv4_drvdata {u8 q_support;bool sticky_enable;bool boot_enable; +bool pm_save_enable;bool os_unlock;bool instrp0;bool trcbb;
drivers/hwtracing/coresight/coresight-etm4x.h struct etmv4_drvdata { · line 449
Quoted 6 lines
drivers/hwtracing/coresight/coresight-etm4x.h +3
-0@@ -381,6 +444,9 @@ struct etmv4_drvdata {bool atbtrig;bool lpoverride;struct etmv4_config config; +struct etmv4_save_state save_state; +bool state_needs_restore; +struct notifier_block nb;
If I remember correctly Suzuki also commented on the notifier block being global to the driver.
Thanks,
Mathieu
Quoted 45 lines
drivers/hwtracing/coresight/coresight-etm4x.h +0
-0};/* Address comparator access types */ drivers/hwtracing/coresight/coresight.c +1
-1@@ -140,7 +140,7 @@ static inline bool coresight_is_claimed_self_hosted(void __iomem *base)return coresight_read_claim_tags (base) ==CORESIGHT_CLAIM_SELF_HOSTED ; } -static inline bool coresight_is_claimed_any (void __iomem *base) +bool coresight_is_claimed_any (void __iomem *base) {return coresight_read_claim_tags (base) !=0 ; }include/linux/coresight.h +8
-0@@ -285,6 +285,9 @@ extern void coresight_disclaim_device(void __iomem *base);extern void coresight_disclaim_device_unlocked (void __iomem *base);extern char *coresight_alloc_device_name (struct coresight_dev_list *devs,struct device *dev); + +extern bool coresight_is_claimed_any (void __iomem *base); +#else static inline struct coresight_device *coresight_register (struct coresight_desc *desc) {return NULL ; }@@ -307,6 +310,11 @@ static inline int coresight_claim_device(void __iomem *base)static inline void coresight_disclaim_device (void __iomem *base) {}static inline void coresight_disclaim_device_unlocked (void __iomem *base) {} +static inline bool coresight_is_claimed_any (void __iomem *base) +{ +return false; +} +#endif extern int coresight_get_cpu (struct device *dev);Signature · 1 line
2.21.0
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 5/5] coresight: etm4x: save/restore state across CPU low power states
Quoted 22 lines · Mathieu Poirier
Hi Andrew,
On top of what others have already commented on...
Quoted 17 lines · Andrew Murray
Some hardware will ignore bit TRCPDCR.PU which is used to signal to hardware that power should not be removed from the trace unit. Let's mitigate against this by conditionally saving and restoring the trace unit state when the CPU enters low power states.
This patchset introduces a firmware property named 'arm,coresight-needs-save-restore' - when this is present the hardware state will be conditionally saved and restored.
A module parameter '
pm_save_enable' is also introduced which can be configured to override the firmware property. This can be set to never allow save/restore, to conditionally allow it, or to do as the firmware indicates (default).The hardware state is only ever saved and restored when the claim tags indicate that coresight is in use.
Quoted 7 lines
Quoted 3 lines
Signed-off-by Andrew Murray <[email protected]>--- .../devicetree/bindings/arm/coresight.txt | 3 +Please break this into a single patch to keep in line with the procedure (and keep checkpatch quiet). I understand the change is trivial but it gives the DT contingent an opportunity to know what is happening in their sub-system.
Yes no problem, I did read the procedure about this, but somehow didn't follow it.
Quoted 45 lines
Quoted 45 lines
drivers/hwtracing/coresight/coresight-etm4x.c | 299 ++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm4x.h | 66 ++++ drivers/hwtracing/coresight/coresight.c | 2 +- include/linux/coresight.h | 8 + 5 files changed, 377 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/arm/coresight.txt +3
-0@@ -90,6 +90,9 @@ its hardware characteristcs. * cpu: the cpu phandle this ETM/PTM is affined to. When omitted the source is considered to belong to CPU0. + * arm,coresight-needs-save-restore: boolean. Indicates that software + should save/restore state across power down. + * Optional property for TMC: * arm,buffer-size: size of contiguous buffer space for TMC ETRdrivers/hwtracing/coresight/coresight-etm4x.c +2
-0@@ -18,6 +18,7 @@#include <linux/stat.h> #include <linux/clk.h> #include <linux/cpu.h> +#include <linux/cpu_pm.h> #include <linux/coresight.h> #include <linux/coresight-pmu.h> #include <linux/pm_wakeup.h> @@ -26,6 +27,7 @@#include <linux/uaccess.h> #include <linux/perf_event.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <asm/sections.h> #include <asm/local.h> #include <asm/virt.h> @@ -37,6 +39,16 @@ static int boot_enable;module_param (boot_enable, int,0444 );MODULE_PARM_DESC (boot_enable,"Enable tracing on boot" );
Quoted 13 lines
drivers/hwtracing/coresight/coresight-etm4x.c static int boot_enable; · line 50
Quoted 9 lines
drivers/hwtracing/coresight/coresight-etm4x.c +9
-0+ +#define PARAM_PM_SAVE_DISABLE 0 +#define PARAM_PM_SAVE_ENABLE 1 +#define PARAM_PM_SAVE_FIRMWARE 2 + +static int pm_save_enable =PARAM_PM_SAVE_FIRMWARE ; +module_param (pm_save_enable, int,0644 ); +MODULE_PARM_DESC (pm_save_enable,"Save/restore state on power down: " +"0 = disabled, 1 = enabled, 2 = firmware" );If the line is not broken it will end up being longer than 80 characters, which will also make checkpatch angry. Nevertheless I think it is better than braking it, making string searches in the kernel difficult.
OK.
Quoted 255 lines
Quoted 255 lines
drivers/hwtracing/coresight/coresight-etm4x.c +240
-0+/* The number of ETMv4 currently registered */ static int etm4_count;static struct etmv4_drvdata *etmdrvdata[NR_CPUS ];@@ -54,6 +66,14 @@ static void etm4_os_unlock(struct etmv4_drvdata *drvdata)isb (); } +static void etm4_os_lock (struct etmv4_drvdata *drvdata) +{ +/* Writing 0x1 to TRCOSLAR locks the trace registers */ +writel_relaxed (0x1 , drvdata->base +TRCOSLAR ); + drvdata->os_unlock = false; +isb (); +} +static bool etm4_arch_supported (u8 arch) {/* Mask out the minor version number */ @@ -1079,6 +1099,277 @@ static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) drvdata->trcid =coresight_get_trace_id (drvdata->cpu); } +#ifdef CONFIG_CPU_PM +static int etm4_cpu_save (struct etmv4_drvdata *drvdata) +{ +int i, ret =0 ; +u32 control; +struct etmv4_save_state *state; +struct device *etm_dev = &drvdata->csdev->dev; + +/* As recommended by 3.4.1 of ARM IHI 0064D */ +dsb (sy); +isb (); + +CS_UNLOCK (drvdata->base); + +/* Lock the OS lock to disable trace and external debugger access */ +etm4_os_lock (drvdata); + +/* wait for TRCSTATR.PMSTABLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR , +TRCSTATR_PMSTABLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for PM Stable Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + state = &drvdata->save_state; + + state->trcprgctlr =readl (drvdata->base +TRCPRGCTLR ); + state->trcprocselr =readl (drvdata->base +TRCPROCSELR ); + state->trcconfigr =readl (drvdata->base +TRCCONFIGR ); + state->trcauxctlr =readl (drvdata->base +TRCAUXCTLR ); + state->trceventctl0r =readl (drvdata->base +TRCEVENTCTL0R ); + state->trceventctl1r =readl (drvdata->base +TRCEVENTCTL1R ); + state->trcstallctlr =readl (drvdata->base +TRCSTALLCTLR ); + state->trctsctlr =readl (drvdata->base +TRCTSCTLR ); + state->trcsyncpr =readl (drvdata->base +TRCSYNCPR ); + state->trcccctlr =readl (drvdata->base +TRCCCCTLR ); + state->trcbbctlr =readl (drvdata->base +TRCBBCTLR ); + state->trctraceidr =readl (drvdata->base +TRCTRACEIDR ); + state->trcqctlr =readl (drvdata->base +TRCQCTLR ); + + state->trcvictlr =readl (drvdata->base +TRCVICTLR ); + state->trcviiectlr =readl (drvdata->base +TRCVIIECTLR ); + state->trcvissctlr =readl (drvdata->base +TRCVISSCTLR ); + state->trcvipcssctlr =readl (drvdata->base +TRCVIPCSSCTLR ); + state->trcvdctlr =readl (drvdata->base +TRCVDCTLR ); + state->trcvdsacctlr =readl (drvdata->base +TRCVDSACCTLR ); + state->trcvdarcctlr =readl (drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) + state->trcseqevr[i] =readl (drvdata->base +TRCSEQEVRn (i)); + + state->trcseqrstevr =readl (drvdata->base +TRCSEQRSTEVR ); + state->trcseqstr =readl (drvdata->base +TRCSEQSTR ); + state->trcextinselr =readl (drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { + state->trccntrldvr[i] =readl (drvdata->base +TRCCNTRLDVRn (i)); + state->trccntctlr[i] =readl (drvdata->base +TRCCNTCTLRn (i)); + state->trccntvr[i] =readl (drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) + state->trcrsctlr[i] =readl (drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { + state->trcssccr[i] =readl (drvdata->base +TRCSSCCRn (i)); + state->trcsscsr[i] =readl (drvdata->base +TRCSSCSRn (i)); + state->trcsspcicr[i] =readl (drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { + state->trcacvr[i] =readl (drvdata->base +TRCACVRn (i)); + state->trcacatr[i] =readl (drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) + state->trccidcvr[i] =readl (drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) + state->trcvmidcvr[i] =readl (drvdata->base +TRCVMIDCVRn (i)); + + state->trccidcctlr0 =readl (drvdata->base +TRCCIDCCTLR0 ); + state->trccidcctlr1 =readl (drvdata->base +TRCCIDCCTLR1 ); + + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR0 ); + state->trcvmidcctlr0 =readl (drvdata->base +TRCVMIDCCTLR1 ); + + state->trcclaimset =readl (drvdata->base +TRCCLAIMCLR ); + +/* wait for TRCSTATR.IDLE to go up */ +if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,1 )) { +dev_err (etm_dev, +"timeout while waiting for Idle Trace Status\n" ); +etm4_os_unlock (drvdata); + ret = -EBUSY ; + goto out; + } + + drvdata->state_needs_restore = true; + +/* power can be removed from the trace unit now */ + control =readl_relaxed (drvdata->base +TRCPDCR ); + control &= ~TRCPDCR_PU ; +writel_relaxed (control, drvdata->base +TRCPDCR ); + +out: +CS_LOCK (drvdata->base); +return ret; +} + +static void etm4_cpu_restore (struct etmv4_drvdata *drvdata) +{ +int i; +struct etmv4_save_state *state; + + state = &drvdata->save_state; + +CS_UNLOCK (drvdata->base); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + +writel_relaxed (state->trcprgctlr, drvdata->base +TRCPRGCTLR ); +writel_relaxed (state->trcprocselr, drvdata->base +TRCPROCSELR ); +writel_relaxed (state->trcconfigr, drvdata->base +TRCCONFIGR ); +writel_relaxed (state->trcauxctlr, drvdata->base +TRCAUXCTLR ); +writel_relaxed (state->trceventctl0r, drvdata->base +TRCEVENTCTL0R ); +writel_relaxed (state->trceventctl1r, drvdata->base +TRCEVENTCTL1R ); +writel_relaxed (state->trcstallctlr, drvdata->base +TRCSTALLCTLR ); +writel_relaxed (state->trctsctlr, drvdata->base +TRCTSCTLR ); +writel_relaxed (state->trcsyncpr, drvdata->base +TRCSYNCPR ); +writel_relaxed (state->trcccctlr, drvdata->base +TRCCCCTLR ); +writel_relaxed (state->trcbbctlr, drvdata->base +TRCBBCTLR ); +writel_relaxed (state->trctraceidr, drvdata->base +TRCTRACEIDR ); +writel_relaxed (state->trcqctlr, drvdata->base +TRCQCTLR ); + +writel_relaxed (state->trcvictlr, drvdata->base +TRCVICTLR ); +writel_relaxed (state->trcviiectlr, drvdata->base +TRCVIIECTLR ); +writel_relaxed (state->trcvissctlr, drvdata->base +TRCVISSCTLR ); +writel_relaxed (state->trcvipcssctlr, drvdata->base +TRCVIPCSSCTLR ); +writel_relaxed (state->trcvdctlr, drvdata->base +TRCVDCTLR ); +writel_relaxed (state->trcvdsacctlr, drvdata->base +TRCVDSACCTLR ); +writel_relaxed (state->trcvdarcctlr, drvdata->base +TRCVDARCCTLR ); + +for (i =0 ; i < drvdata->nrseqstate; i++) +writel_relaxed (state->trcseqevr[i], + drvdata->base +TRCSEQEVRn (i)); + +writel_relaxed (state->trcseqrstevr, drvdata->base +TRCSEQRSTEVR ); +writel_relaxed (state->trcseqstr, drvdata->base +TRCSEQSTR ); +writel_relaxed (state->trcextinselr, drvdata->base +TRCEXTINSELR ); + +for (i =0 ; i < drvdata->nr_cntr; i++) { +writel_relaxed (state->trccntrldvr[i], + drvdata->base +TRCCNTRLDVRn (i)); +writel_relaxed (state->trccntctlr[i], + drvdata->base +TRCCNTCTLRn (i)); +writel_relaxed (state->trccntvr[i], + drvdata->base +TRCCNTVRn (i)); + } + +for (i =0 ; i < drvdata->nr_resource *2 ; i++) +writel_relaxed (state->trcrsctlr[i], + drvdata->base +TRCRSCTLRn (i)); + +for (i =0 ; i < drvdata->nr_ss_cmp; i++) { +writel_relaxed (state->trcssccr[i], + drvdata->base +TRCSSCCRn (i)); +writel_relaxed (state->trcsscsr[i], + drvdata->base +TRCSSCSRn (i)); +writel_relaxed (state->trcsspcicr[i], + drvdata->base +TRCSSPCICRn (i)); + } + +for (i =0 ; i < drvdata->nr_addr_cmp *2 ; i++) { +writel_relaxed (state->trcacvr[i], + drvdata->base +TRCACVRn (i)); +writel_relaxed (state->trcacatr[i], + drvdata->base +TRCACATRn (i)); + } + +for (i =0 ; i < drvdata->numcidc; i++) +writel_relaxed (state->trccidcvr[i], + drvdata->base +TRCCIDCVRn (i)); + +for (i =0 ; i < drvdata->numvmidc; i++) +writel_relaxed (state->trcvmidcvr[i], + drvdata->base +TRCVMIDCVRn (i)); + +writel_relaxed (state->trccidcctlr0, drvdata->base +TRCCIDCCTLR0 ); +writel_relaxed (state->trccidcctlr1, drvdata->base +TRCCIDCCTLR1 ); + +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR0 ); +writel_relaxed (state->trcvmidcctlr0, drvdata->base +TRCVMIDCCTLR1 ); + +writel_relaxed (state->trcclaimset, drvdata->base +TRCCLAIMSET ); + + drvdata->state_needs_restore = false; + +/* As recommended by 4.3.7 of ARM IHI 0064D */ +dsb (sy); +isb (); + +/* Unlock the OS lock to re-enable trace and external debug access */ +etm4_os_unlock (drvdata); +CS_LOCK (drvdata->base); +} + +static int etm4_cpu_pm_notify (struct notifier_block *nb,unsigned long cmd, +void *v) +{ +struct etmv4_drvdata *drvdata; +unsigned int cpu =smp_processor_id (); + +if (!etmdrvdata[cpu]) +return 0 ; + + drvdata = etmdrvdata[cpu]; + +if (pm_save_enable ==PARAM_PM_SAVE_DISABLE || + (pm_save_enable ==PARAM_PM_SAVE_FIRMWARE && + !drvdata->pm_save_enable)) +return NOTIFY_OK ; + +if (WARN_ON_ONCE (drvdata->cpu !=smp_processor_id ())) +return NOTIFY_BAD ; + +switch (cmd) { +case CPU_PM_ENTER :
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.c static void etm4_init_trace_id(struct etmv4_drvdata *drvdata) · line 1335
Quoted 3 lines
drivers/hwtracing/coresight/coresight-etm4x.c +3
-0+/* save the state if coresight is in use */ +if (coresight_is_claimed_any (drvdata->base)) +if (etm4_cpu_save (drvdata))Did you still plan on having more than one save/restore function, based on whether CS is self-hosted or driven by an external agent? Doing so might increase complexity that will end up making latency just as long as the current implementation. I'll let you be the judge of that.
No, I don't plan on doing this in this series.
Whilst I do see some potential benefits from taking this type of approach, I feel that this should come as another series in the future - and only when the benefits can be proven.
Quoted 167 lines
Quoted 167 lines
drivers/hwtracing/coresight/coresight-etm4x.c +45
-0+return NOTIFY_BAD ; +break ; +case CPU_PM_EXIT : +case CPU_PM_ENTER_FAILED : +/* trcclaimset is set when there is state to restore */ +if (drvdata->state_needs_restore) +etm4_cpu_restore (drvdata); +break ; +default : + return NOTIFY_DONE; + } + +return NOTIFY_OK ; +} + +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) +{ + drvdata->nb.notifier_call = etm4_cpu_pm_notify; +return cpu_pm_register_notifier (&drvdata->nb); +} + +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) +{ +if (drvdata->nb.notifier_call) +cpu_pm_unregister_notifier (&drvdata->nb); +} +#else +static int etm4_cpu_pm_register (struct etmv4_drvdata *drvdata) {return 0 ; } +static void etm4_cpu_pm_unregister (struct etmv4_drvdata *drvdata) { } +#endif + +static inline bool etm4_needs_save_restore (struct device *dev) +{ +return fwnode_property_present (dev->fwnode, +"arm,coresight-needs-save-restore" ); +} +static int etm4_probe (struct amba_device *adev,const struct amba_id *id) {int ret;@@ -1095,6 +1386,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)dev_set_drvdata (dev, drvdata); + drvdata->pm_save_enable =etm4_needs_save_restore (dev); +/* Validity for the resource is already checked by the AMBA core */ base =devm_ioremap_resource (dev, res);if (IS_ERR (base))@@ -1126,6 +1419,10 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)if (ret <0 ) goto err_arch_supported; hp_online = ret; + + ret =etm4_cpu_pm_register (drvdata); +if (ret) + goto err_arch_supported; }cpus_read_unlock ();@@ -1176,6 +1473,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) err_arch_supported:if (--etm4_count ==0 ) { +etm4_cpu_pm_unregister (drvdata); +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING );if (hp_online)cpuhp_remove_state_nocalls (hp_online);drivers/hwtracing/coresight/coresight-etm4x.h +63
-0@@ -175,6 +175,7 @@ ETM_MODE_EXCL_USER)#define TRCSTATR_IDLE_BIT 0 +#define TRCSTATR_PMSTABLE_BIT 1#define ETM_DEFAULT_ADDR_COMP 0/* PowerDown Control Register bits */ @@ -281,6 +282,65 @@ struct etmv4_config {u32 ext_inp; }; +/** +* struct etm4_save_state - state to be preserved when ETM is without power +*/ +struct etmv4_save_state { +u32 trcprgctlr; +u32 trcprocselr; +u32 trcconfigr; +u32 trcauxctlr; +u32 trceventctl0r; +u32 trceventctl1r; +u32 trcstallctlr; +u32 trctsctlr; +u32 trcsyncpr; +u32 trcccctlr; +u32 trcbbctlr; +u32 trctraceidr; +u32 trcqctlr; + +u32 trcvictlr; +u32 trcviiectlr; +u32 trcvissctlr; +u32 trcvipcssctlr; +u32 trcvdctlr; +u32 trcvdsacctlr; +u32 trcvdarcctlr; + +u32 trcseqevr[ETM_MAX_SEQ_STATES ]; +u32 trcseqrstevr; +u32 trcseqstr; +u32 trcextinselr; +u32 trccntrldvr[ETMv4_MAX_CNTR]; +u32 trccntctlr[ETMv4_MAX_CNTR]; +u32 trccntvr[ETMv4_MAX_CNTR]; + +u32 trcrsctlr[ETM_MAX_RES_SEL *2 ]; + +u32 trcssccr[ETM_MAX_SS_CMP ]; +u32 trcsscsr[ETM_MAX_SS_CMP ]; +u32 trcsspcicr[ETM_MAX_SS_CMP ]; + +u64 trcacvr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcacatr[ETM_MAX_SINGLE_ADDR_CMP ]; +u64 trcdvcvr[ETM_MAX_DATA_VAL_CMP ]; +u64 trcdvcmr[ETM_MAX_DATA_VAL_CMP ]; +u64 trccidcvr[ETMv4_MAX_CTXID_CMP]; +u32 trcvmidcvr[ETM_MAX_VMID_CMP ]; +u32 trccidcctlr0; +u32 trccidcctlr1; +u32 trcvmidcctlr0; +u32 trcvmidcctlr1; + +u32 trcclaimset; + +u32 cntr_val[ETMv4_MAX_CNTR]; +u32 seq_state; +u32 vinst_ctrl; +u32 ss_status[ETM_MAX_SS_CMP ]; +}; +/** * struct etm4_drvdata - specifics associated to an ETM component * @base: Memory mapped base address for this component. @@ -336,6 +396,8 @@ struct etmv4_config {* @atbtrig: If the implementation can support ATB triggers * @lpoverride: If the implementation can support low-power state over. * @config: structure holding configuration parameters. +* @save_state: State to be preserved across power loss +* @nb: CPU PM notifier */ struct etmv4_drvdata {void __iomem *base;@@ -367,6 +429,7 @@ struct etmv4_drvdata {u8 q_support;bool sticky_enable;bool boot_enable; +bool pm_save_enable;bool os_unlock;bool instrp0;bool trcbb;@@ -381,6 +444,9 @@ struct etmv4_drvdata {bool atbtrig;
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm4x.h struct etmv4_drvdata { · line 449
Quoted 5 lines
drivers/hwtracing/coresight/coresight-etm4x.h +3
-0bool lpoverride;struct etmv4_config config; +struct etmv4_save_state save_state; +bool state_needs_restore; +struct notifier_block nb;If I remember correctly Suzuki also commented on the notifier block being global to the driver.
Yes I'll change this and respin the series next wekk.
Thanks,
Andrew Murray
Quoted 45 lines
Thanks,
MathieuQuoted 41 lines
drivers/hwtracing/coresight/coresight-etm4x.h +0
-0};/* Address comparator access types */ drivers/hwtracing/coresight/coresight.c +1
-1@@ -140,7 +140,7 @@ static inline bool coresight_is_claimed_self_hosted(void __iomem *base)return coresight_read_claim_tags (base) ==CORESIGHT_CLAIM_SELF_HOSTED ; } -static inline bool coresight_is_claimed_any (void __iomem *base) +bool coresight_is_claimed_any (void __iomem *base) {return coresight_read_claim_tags (base) !=0 ; }include/linux/coresight.h +8
-0@@ -285,6 +285,9 @@ extern void coresight_disclaim_device(void __iomem *base);extern void coresight_disclaim_device_unlocked (void __iomem *base);extern char *coresight_alloc_device_name (struct coresight_dev_list *devs,struct device *dev); + +extern bool coresight_is_claimed_any (void __iomem *base); +#else static inline struct coresight_device *coresight_register (struct coresight_desc *desc) {return NULL ; }@@ -307,6 +310,11 @@ static inline int coresight_claim_device(void __iomem *base)static inline void coresight_disclaim_device (void __iomem *base) {}static inline void coresight_disclaim_device_unlocked (void __iomem *base) {} +static inline bool coresight_is_claimed_any (void __iomem *base) +{ +return false; +} +#endif
Quoted 4 lines
Quoted 4 lines
include/linux/coresight.h +0
-0extern int coresight_get_cpu (struct device *dev);Signature · 1 line
2.21.0
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel