From: Leo Yan <leo.yan@linaro.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org,
Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
Rajendra Nayak <rnayak@codeaurora.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Marc Gonzalez <marc.w.gonzalez@free.fr>,
linux-kernel@vger.kernel.org,
Bjorn Andersson <bjorn.andersson@linaro.org>,
David Brown <david.brown@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Sibi Sankar <sibis@codeaurora.org>,
Vivek Gautam <vivek.gautam@codeaurora.org>,
linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Mike Leach <mike.leach@linaro.org>
Subject: Re: [PATCHv8 5/5] coresight: cpu-debug: Add support for Qualcomm Kryo
Date: Sun, 21 Jul 2019 22:35:53 +0800 [thread overview]
Message-ID: <20190721143553.GA25136@leoy-ThinkPad-X240s> (raw)
In-Reply-To: <20190717165602.GA4271@xps15>
On Wed, Jul 17, 2019 at 10:56:02AM -0600, Mathieu Poirier wrote:
> On Fri, Jul 12, 2019 at 07:46:27PM +0530, Sai Prakash Ranjan wrote:
> > Add support for coresight CPU debug module on Qualcomm
> > Kryo CPUs. This patch adds the UCI entries for Kryo CPUs
> > found on MSM8996 which shares the same PIDs as ETMs.
> >
> > Without this, below error is observed on MSM8996:
> >
> > [ 5.429867] OF: graph: no port node found in /soc/debug@3810000
> > [ 5.429938] coresight-etm4x: probe of 3810000.debug failed with error -22
> > [ 5.435415] coresight-cpu-debug 3810000.debug: Coresight debug-CPU0 initialized
> > [ 5.446474] OF: graph: no port node found in /soc/debug@3910000
> > [ 5.448927] coresight-etm4x: probe of 3910000.debug failed with error -22
> > [ 5.454681] coresight-cpu-debug 3910000.debug: Coresight debug-CPU1 initialized
> > [ 5.487765] OF: graph: no port node found in /soc/debug@3a10000
> > [ 5.488007] coresight-etm4x: probe of 3a10000.debug failed with error -22
> > [ 5.493024] coresight-cpu-debug 3a10000.debug: Coresight debug-CPU2 initialized
> > [ 5.501802] OF: graph: no port node found in /soc/debug@3b10000
> > [ 5.512901] coresight-etm4x: probe of 3b10000.debug failed with error -22
> > [ 5.513192] coresight-cpu-debug 3b10000.debug: Coresight debug-CPU3 initialized
> >
> > Signed-off-by: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
> > ---
> > .../hwtracing/coresight/coresight-cpu-debug.c | 33 +++++++++----------
> > drivers/hwtracing/coresight/coresight-priv.h | 10 +++---
> > 2 files changed, 21 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/hwtracing/coresight/coresight-cpu-debug.c b/drivers/hwtracing/coresight/coresight-cpu-debug.c
> > index 2463aa7ab4f6..96544b348c27 100644
> > --- a/drivers/hwtracing/coresight/coresight-cpu-debug.c
> > +++ b/drivers/hwtracing/coresight/coresight-cpu-debug.c
> > @@ -646,24 +646,23 @@ static int debug_remove(struct amba_device *adev)
> > return 0;
> > }
> >
> > +static const struct amba_cs_uci_id uci_id_debug[] = {
> > + {
> > + /* CPU Debug UCI data */
> > + .devarch = 0x47706a15,
> > + .devarch_mask = 0xfff0ffff,
> > + .devtype = 0x00000015,
> > + }
> > +};
> > +
> > static const struct amba_id debug_ids[] = {
> > - { /* Debug for Cortex-A53 */
> > - .id = 0x000bbd03,
> > - .mask = 0x000fffff,
> > - },
> > - { /* Debug for Cortex-A57 */
> > - .id = 0x000bbd07,
> > - .mask = 0x000fffff,
> > - },
> > - { /* Debug for Cortex-A72 */
> > - .id = 0x000bbd08,
> > - .mask = 0x000fffff,
> > - },
> > - { /* Debug for Cortex-A73 */
> > - .id = 0x000bbd09,
> > - .mask = 0x000fffff,
> > - },
> > - { 0, 0 },
> > + CS_AMBA_ID(0x000bbd03), /* Cortex-A53 */
> > + CS_AMBA_ID(0x000bbd07), /* Cortex-A57 */
> > + CS_AMBA_ID(0x000bbd08), /* Cortex-A72 */
> > + CS_AMBA_ID(0x000bbd09), /* Cortex-A73 */
> > + CS_AMBA_UCI_ID(0x000f0205, uci_id_debug), /* Qualcomm Kryo */
> > + CS_AMBA_UCI_ID(0x000f0211, uci_id_debug), /* Qualcomm Kryo */
> > + {},
> > };
> >
> > static struct amba_driver debug_driver = {
> > diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h
> > index 7d401790dd7e..41ae5863104d 100644
> > --- a/drivers/hwtracing/coresight/coresight-priv.h
> > +++ b/drivers/hwtracing/coresight/coresight-priv.h
> > @@ -185,11 +185,11 @@ static inline int etm_writel_cp14(u32 off, u32 val) { return 0; }
> > }
> >
> > /* coresight AMBA ID, full UCI structure: id table entry. */
> > -#define CS_AMBA_UCI_ID(pid, uci_ptr) \
> > - { \
> > - .id = pid, \
> > - .mask = 0x000fffff, \
> > - .data = uci_ptr \
> > +#define CS_AMBA_UCI_ID(pid, uci_ptr) \
> > + { \
> > + .id = pid, \
> > + .mask = 0x000fffff, \
> > + .data = (void *)uci_ptr \
> > }
>
> I will pickup this patch - it will show up in my next tree when rc1 comes out.
I tested this patch on the mainline kernel with latest commit
f1a3b43cc1f5 ("Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input"). FWIW:
Tested-by: Leo Yan <leo.yan@linaro.org>
P.s. Acutally I tested this patch for 5.2-rcx a few days ago and found
a regression for CPU debug module: I observed the CPU debug module
panic dump will stuck. After I pulled to latest kernel code base the
CPU debug module can work well; also works well with this patch. F.Y.I.
Thanks,
Leo Yan
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-21 14:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 14:16 [PATCHv8 0/5] Add coresight support for SDM845, MSM8998 and MSM8996 Sai Prakash Ranjan
2019-07-12 14:16 ` [PATCHv8 1/5] arm64: dts: qcom: sdm845: Add Coresight support Sai Prakash Ranjan
2019-07-12 16:44 ` Suzuki K Poulose
2019-07-12 16:49 ` saiprakash.ranjan
2019-07-19 9:46 ` Suzuki K Poulose
2019-07-19 10:28 ` Sai Prakash Ranjan
2019-07-12 14:16 ` [PATCHv8 2/5] arm64: dts: qcom: msm8998: " Sai Prakash Ranjan
2019-07-18 8:28 ` Suzuki K Poulose
2019-07-18 9:14 ` Sai Prakash Ranjan
2019-07-18 9:37 ` Suzuki K Poulose
2019-07-18 9:53 ` Sai Prakash Ranjan
2019-07-12 14:16 ` [PATCHv8 3/5] arm64: dts: qcom: msm8996: " Sai Prakash Ranjan
2019-07-17 17:00 ` Mathieu Poirier
2019-07-18 5:47 ` Sai Prakash Ranjan
2019-07-18 15:31 ` Mathieu Poirier
2019-07-18 15:48 ` Bjorn Andersson
2019-07-12 14:16 ` [PATCHv8 4/5] coresight: etm4x: Add ETM PIDs for SDM845 and MSM8996 Sai Prakash Ranjan
2019-07-17 17:40 ` Mathieu Poirier
2019-07-12 14:16 ` [PATCHv8 5/5] coresight: cpu-debug: Add support for Qualcomm Kryo Sai Prakash Ranjan
2019-07-17 16:56 ` Mathieu Poirier
2019-07-21 14:35 ` Leo Yan [this message]
2019-07-22 5:48 ` Sai Prakash Ranjan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190721143553.GA25136@leoy-ThinkPad-X240s \
--to=leo.yan@linaro.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bjorn.andersson@linaro.org \
--cc=david.brown@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.w.gonzalez@free.fr \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=rnayak@codeaurora.org \
--cc=robh+dt@kernel.org \
--cc=saiprakash.ranjan@codeaurora.org \
--cc=sibis@codeaurora.org \
--cc=suzuki.poulose@arm.com \
--cc=vivek.gautam@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).