Implement a shutdown callback to ensure ETR/ETF hardware is
properly shutdown in reboot/shutdown path. This is required
for ETR/ETF which has SMMU address translation enabled like
on SC7180 SoC and few others. If the hardware is still accessing
memory after SMMU translation is disabled as part of SMMU
shutdown callback in system reboot or shutdown path, then
IOVAs(I/O virtual address) which it was using will go on the bus
as the physical addresses which might result in unknown crashes
(NoC/interconnect errors). So we make sure from this shutdown
callback that the ETR/ETF is shutdown before SMMU translation is
disabled and device_link in SMMU driver will take care of ordering
of shutdown callbacks such that SMMU shutdown callback is not
called before any of its consumer shutdown callbacks.
Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan(a)codeaurora.org>
---
Changes since v1:
* Use mode flag and drop enable flag as Mike suggested.
* Use spinlock before tmc hw disable as Mike suggested.
---
.../hwtracing/coresight/coresight-tmc-etf.c | 4 +--
.../hwtracing/coresight/coresight-tmc-etr.c | 2 +-
drivers/hwtracing/coresight/coresight-tmc.c | 33 +++++++++++++++++++
drivers/hwtracing/coresight/coresight-tmc.h | 3 ++
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c
index 36cce2bfb744..cba3e7592820 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etf.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c
@@ -85,7 +85,7 @@ static void __tmc_etb_disable_hw(struct tmc_drvdata *drvdata)
CS_LOCK(drvdata->base);
}
-static void tmc_etb_disable_hw(struct tmc_drvdata *drvdata)
+void tmc_etb_disable_hw(struct tmc_drvdata *drvdata)
{
__tmc_etb_disable_hw(drvdata);
coresight_disclaim_device(drvdata->base);
@@ -118,7 +118,7 @@ static int tmc_etf_enable_hw(struct tmc_drvdata *drvdata)
return 0;
}
-static void tmc_etf_disable_hw(struct tmc_drvdata *drvdata)
+void tmc_etf_disable_hw(struct tmc_drvdata *drvdata)
{
CS_UNLOCK(drvdata->base);
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index 625882bc8b08..b29c2db94d96 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -1110,7 +1110,7 @@ static void __tmc_etr_disable_hw(struct tmc_drvdata *drvdata)
}
-static void tmc_etr_disable_hw(struct tmc_drvdata *drvdata)
+void tmc_etr_disable_hw(struct tmc_drvdata *drvdata)
{
__tmc_etr_disable_hw(drvdata);
/* Disable CATU device if this ETR is connected to one */
diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c
index 39fba1d16e6e..c7902ce0bd3b 100644
--- a/drivers/hwtracing/coresight/coresight-tmc.c
+++ b/drivers/hwtracing/coresight/coresight-tmc.c
@@ -538,6 +538,38 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}
+static void tmc_shutdown(struct amba_device *adev)
+{
+ unsigned long flags;
+ struct tmc_drvdata *drvdata = amba_get_drvdata(adev);
+
+ spin_lock_irqsave(&drvdata->spinlock, flags);
+
+ if (drvdata->mode == CS_MODE_DISABLED)
+ goto out;
+
+ /*
+ * We do not care about the active trace sessions here
+ * since the system is going down unlike remove callback,
+ * just make sure that the hardware is shutdown.
+ */
+ switch (drvdata->config_type) {
+ case TMC_CONFIG_TYPE_ETB:
+ tmc_etb_disable_hw(drvdata);
+ break;
+ case TMC_CONFIG_TYPE_ETF:
+ tmc_etf_disable_hw(drvdata);
+ break;
+ case TMC_CONFIG_TYPE_ETR:
+ tmc_etr_disable_hw(drvdata);
+ }
+
+out:
+ spin_unlock_irqrestore(&drvdata->spinlock, flags);
+ misc_deregister(&drvdata->miscdev);
+ coresight_unregister(drvdata->csdev);
+}
+
static const struct amba_id tmc_ids[] = {
CS_AMBA_ID(0x000bb961),
/* Coresight SoC 600 TMC-ETR/ETS */
@@ -556,6 +588,7 @@ static struct amba_driver tmc_driver = {
.suppress_bind_attrs = true,
},
.probe = tmc_probe,
+ .shutdown = tmc_shutdown,
.id_table = tmc_ids,
};
builtin_amba_driver(tmc_driver);
diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h
index 71de978575f3..0a77f2f25090 100644
--- a/drivers/hwtracing/coresight/coresight-tmc.h
+++ b/drivers/hwtracing/coresight/coresight-tmc.h
@@ -260,6 +260,8 @@ u32 tmc_get_memwidth_mask(struct tmc_drvdata *drvdata);
/* ETB/ETF functions */
int tmc_read_prepare_etb(struct tmc_drvdata *drvdata);
int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata);
+void tmc_etb_disable_hw(struct tmc_drvdata *drvdata);
+void tmc_etf_disable_hw(struct tmc_drvdata *drvdata);
extern const struct coresight_ops tmc_etb_cs_ops;
extern const struct coresight_ops tmc_etf_cs_ops;
@@ -268,6 +270,7 @@ ssize_t tmc_etb_get_sysfs_trace(struct tmc_drvdata *drvdata,
/* ETR functions */
int tmc_read_prepare_etr(struct tmc_drvdata *drvdata);
int tmc_read_unprepare_etr(struct tmc_drvdata *drvdata);
+void tmc_etr_disable_hw(struct tmc_drvdata *drvdata);
extern const struct coresight_ops tmc_etr_cs_ops;
ssize_t tmc_etr_get_sysfs_trace(struct tmc_drvdata *drvdata,
loff_t pos, size_t len, char **bufpp);
base-commit: 059e38815950dbec65beafe03757bce9436e89a4
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Hi guys,
On 2020-05-28 14:16, Sai Prakash Ranjan wrote:
> Hi folks,
>
> I was trying to enable SMMU translation for coresight TMC ETR
> component via "iommus" property on SC7180 SoC.
> And on enabling the trace, I observe random softlockups everytime. For
> enabling trace, I just select ETR as
> the sink and ETM as the source via sysfs and immediately start seeing
> lockups. I have looked from the hardware
> point of view and there is no errata as such and it works fine on
> downstream kernel which is very old - 4.14 kernel.
> This is reproducible even with KASAN disabled as well. Also I have
> dumped other CPU stacks as well during softlockup
> via adding dump_stack in ipi_cpu_stop and and no interesting logs
> there as other cpus are idle.
>
As an update, this turned out to be due to firmware misconfiguration.
Thanks,
Sai
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member
of Code Aurora Forum, hosted by The Linux Foundation
This series adds support to skip powering up of trace unit on systems
with an errata which stops CPU watchdog counter when power up bit is
set (TRCPDCR.PU = 1). Setting this bit is not required on Qualcomm
Technologies Inc. chipsets where this errata exists since the ETMs
are in the same power domain as their respective CPU cores.
Changes since v2:
* Fix checkpatch warning for 80 characters.
Changes since v1:
* Use qcom,skip-power-up for naming as suggested by Mathieu.
* Have check for DT property in initialization as per Mathieu.
* Reword description for property as per Mathieu.
* Split up dt-binding patch as checkpatch complains.
Tingwei Zhang (2):
coresight: etm4x: Add support to skip trace unit power up
dt-bindings: arm: coresight: Add support to skip trace unit power up
.../devicetree/bindings/arm/coresight.txt | 7 +++++
drivers/hwtracing/coresight/coresight-etm4x.c | 27 ++++++++++++-------
drivers/hwtracing/coresight/coresight-etm4x.h | 3 +++
3 files changed, 27 insertions(+), 10 deletions(-)
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
This patchset provides a proposed infrastructure to allow for the automatic
selection of a sink during CoreSight tracing operations.
Currently starting tracing using perf requires a sink selection on the
command line:-
sudo ./perf record -e cs_etm/@tmc_etr0/ --per-thread uname -a
After this set the infrastructure will be able to select a default sink:-
sudo ./perf record -e cs_etm// --per-thread uname -a
This matches with the default operation provided with perf and intelpt.
Where no sink is specified at the start of a trace session, the CoreSight
system will walk the connection graph from the source ETM, to find a
suitable sink using the first encountered highest priority device.
The CoreSight infrastructure is updated to define sink sub_types to
differentiate between sinks with built in buffers (ETB / ETF) - BUFFER type
, and those that use system memory (ETR) - SYSMEM - types.
SYSMEM types are considered higher priority.
When two sinks are found of equal priority, then the closest sink to the
source in terms of connection nodes is chosen.
The automatic sink selection will also operate if an ETM is enabled using
sysfs commands, and no sink is currently enabled.
Applies to Linux coresight/next branch
Changes since v2:
1) changed from explicit set priority value to using the sink_subtype in the
coresight_device as the selection priority value.
2) Added in search depth to the find algorithm to ensure that the closest sink
to the source with the highest priority is chosen.
3) A default sink is cached with the source when the search is first
undertaken, reducing the need for repeat searches for a given source.
Changes since v1:
1) Dropped the device-tree attribute labelling of sinks for selection and
implemented the priority schema preferring first encountered ETR,
after mailing list discussions.
2) Added in sysfs support for auto sink selection.
Mike Leach (6):
coresight: Fix comment in main header file.
coresight: Add default sink selection to CoreSight base
coresight: tmc: Update sink types for default selection.
coresight: etm: perf: Add default sink selection to etm perf
coresight: sysfs: Allow select default sink on source enable.
perf: cs-etm: Allow no CoreSight sink to be specified on command line
.../hwtracing/coresight/coresight-etm-perf.c | 17 +-
drivers/hwtracing/coresight/coresight-priv.h | 2 +
drivers/hwtracing/coresight/coresight-tmc.c | 3 +-
drivers/hwtracing/coresight/coresight.c | 148 +++++++++++++++++-
include/linux/coresight.h | 6 +-
tools/perf/arch/arm/util/cs-etm.c | 6 +-
6 files changed, 172 insertions(+), 10 deletions(-)
--
2.17.1
This series is mainly to add support for replicators
which lose context on removing AMBA clock like on SC7180
SoC where replicator in AOSS domain loses context.
Patch 1 and 2 are minor cleanups to use macros.
Patch 3 and 4 adds support for replicators which loses
context on removing AMBA clock.
Previous version is here - https://lore.kernel.org/patchwork/patch/1239923/
More discussion is found here - https://lore.kernel.org/patchwork/patch/1231182/
There were no patch 1 and patch 2 in v1.
Sai Prakash Ranjan (4):
coresight: replicator: Use CS_AMBA_ID macro for id table
coresight: catu: Use CS_AMBA_ID macro for id table
coresight: replicator: Reset replicator if context is lost
dt-bindings: arm: coresight: Add optional property to replicators
.../devicetree/bindings/arm/coresight.txt | 6 ++
drivers/hwtracing/coresight/coresight-catu.c | 5 +-
.../coresight/coresight-replicator.c | 66 +++++++++++--------
3 files changed, 46 insertions(+), 31 deletions(-)
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
I updated debian to 0.14.1.
I am also trying out a dgit-based workflow for the package, so the
package uploaded to the archive is also available as
https://browse.dgit.debian.org/libopencsd.git/
You can pull down the latest version with:
From the archive, as tarball+diff: apt
From the archive, as git repo: dgit
From a URL, as tarball+diff: dget
None of this should make much difference to any of you, but this does
make it much easier for people used to a git workflow to contribute to
the debian package if need be. It should also mean that the debian
package matches the git history of upstream much more closely.
In case anyone cares I have chosen the dgit 'merge' workflow about of
about 11 possible schemes (https://wiki.debian.org/GitPackagingSurvey)
(debian never has just one way of doing anything :-)
For those not familiar: dgit is a tool to provide bi-direcitonal
translation between the debian archive format (.dsc, tarball and
debian diff) and git repositories. Package maintainers can continue to
use either system and the git/tarball views of the world are
synchonised at upload.
I've also added a development view of the package on debian's gitlab instance:
https://salsa.debian.org/wookey/libopencsd
I would prefer patches as patches in bug reports, but I have left the
'merge request' thingy turned on so I guess people can use that too
(but I don't know how to drive it yet :-).
I reserve the right to give up with all this complicated fancy stuff
and go back to uploading debianised tarballs, which is quick, simple
and I understand it properly :-) but this stuff should make things a
little more accessible. I'd be interested to hear if anyone actually
finds it useful (nearly everyone on this list will be working with
upstream primarily so rarely/never fiddle with the debian packages, I
presume).
----- Forwarded message from Debian testing watch <noreply(a)release.debian.org> -----
Date: Tue, 19 May 2020 04:39:06 +0000
From: Debian testing watch <noreply(a)release.debian.org>
To: libopencsd(a)packages.debian.org
Subject: libopencsd 0.14.1-1 MIGRATED to testing
FYI: The status of the libopencsd source package
in Debian's testing distribution has changed.
Previous version: 0.14.0-1
Current version: 0.14.1-1
--
This email is automatically generated once a day. As the installation of
new packages into testing happens multiple times a day you will receive
later changes on the next day.
See https://release.debian.org/testing-watch/ for more information.
----- End forwarded message -----
Wookey
--
Principal hats: Linaro, Debian, Wookware, ARM
http://wookware.org/
Hi Poonam,
Please CC the coresight mailing list (as I did) when asking questions
- there is a lot of well informed people on there that can also help
you.
On Thu, 23 Jan 2020 at 22:33, Poonam Aggrwal <poonam.aggrwal(a)nxp.com> wrote:
>
> Hello Mathieu
>
>
>
> Greetings!
>
>
>
> I have started to take a look at the Linux coresight framework, and get this enabled on a NXP ARMv8 device.
>
>
>
> Can you share some documentation on the configs required to be enabled and the device tree nodes?
For V8 we have to reference implementation - ARM Juno and the
dragonboard 410c. I highly recommend purchasing the latter (because
it is very cheap) in order to get an understanding of what a working
coresight system look like. It is much easier to start from a working
example than nothing at all. Other than that the coresight bindings
[1] are full of good examples. I would also have a look at the DT for
Juno [2] and the dragonboard[3]. The HOWTO.md [4] on github is a
really good starting point when you'll get to test things out.
[1]. https://elixir.bootlin.com/linux/latest/source/Documentation/devicetree/bin…
[2]. https://elixir.bootlin.com/linux/latest/source/arch/arm64/boot/dts/arm/juno…
[3]. https://elixir.bootlin.com/linux/latest/source/arch/arm64/boot/dts/qcom/msm…
[4]. https://github.com/Linaro/OpenCSD/blob/master/HOWTO.md
>
> To start I am looking to enable the ARMv8 ETM tracing.
Before going further I advise you to look at the source and sink
configuration on your platform. Up to now we've been working with
configurations where sources share a single sink (N:1 topology).
Newer SoC will have one source per sink (1:1 topology). At this time
only the former is supported by the framework. Supporting 1:1
topologies would require a fair amount of refactoring, something we
haven't had the opportunity to do for lack of HW platform to work
with.
Regards,
Mathieu
>
> Is there a reference which I can check in Linux for device tree and config.
>
>
>
> Many Thanks
>
> Poonam