Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

coresight: implement new tmc etr to usb flush procedure

Browse source 
Recommended ETR to usb flush procedure changed. This implements
the new recommended procedure.

Conflicts:

	drivers/coresight/coresight-priv.h

CRs-Fixed: 443106
Change-Id: I18a6d457686905cbee75ce081ee4c6b4f6fdc62c
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
This commit is contained in:
Pratik Patel 2013-01-26 12:14:59 -08:00 committed by Iliyan Malchev
parent e1c4c42acd
commit 33192b8cf9
3 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/coresight/coresight-csr.c
View file

@ -119,6 +119,21 @@ void msm_qdss_csr_disable_bam_to_usb(void)
} }
EXPORT_SYMBOL_GPL(msm_qdss_csr_disable_bam_to_usb); EXPORT_SYMBOL_GPL(msm_qdss_csr_disable_bam_to_usb);
void msm_qdss_csr_disable_flush(void)
{
struct csr_drvdata *drvdata = csrdrvdata;
uint32_t usbflshctrl;
CSR_UNLOCK(drvdata);
usbflshctrl = csr_readl(drvdata, CSR_USBFLSHCTRL);
usbflshctrl &= ~0x2;
csr_writel(drvdata, usbflshctrl, CSR_USBFLSHCTRL);
CSR_LOCK(drvdata);
}
EXPORT_SYMBOL_GPL(msm_qdss_csr_disable_flush);
static int __devinit csr_probe(struct platform_device *pdev) static int __devinit csr_probe(struct platform_device *pdev)
{ {
int ret; int ret;

4
drivers/coresight/coresight-priv.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -39,9 +39,11 @@
#ifdef CONFIG_CORESIGHT_CSR #ifdef CONFIG_CORESIGHT_CSR
extern void msm_qdss_csr_enable_bam_to_usb(void); extern void msm_qdss_csr_enable_bam_to_usb(void);
extern void msm_qdss_csr_disable_bam_to_usb(void); extern void msm_qdss_csr_disable_bam_to_usb(void);
extern void msm_qdss_csr_disable_flush(void);
#else #else
static inline void msm_qdss_csr_enable_bam_to_usb(void) {} static inline void msm_qdss_csr_enable_bam_to_usb(void) {}
static inline void msm_qdss_csr_disable_bam_to_usb(void) {} static inline void msm_qdss_csr_disable_bam_to_usb(void) {}
static inline void msm_qdss_csr_disable_flush(void) {}
#endif #endif
#ifdef CONFIG_CORESIGHT_ETM #ifdef CONFIG_CORESIGHT_ETM
extern unsigned int etm_readl_cp14(uint32_t off); extern unsigned int etm_readl_cp14(uint32_t off);

20
drivers/coresight/coresight-tmc.c
View file

@ -155,6 +155,18 @@ struct tmc_drvdata {
uint32_t trigger_cntr; uint32_t trigger_cntr;
}; };
static void tmc_wait_for_flush(struct tmc_drvdata *drvdata)
{
int count;
/* Ensure no flush is in progress */
for (count = TIMEOUT_US; BVAL(tmc_readl(drvdata, TMC_FFSR), 0) != 0
&& count > 0; count--)
udelay(1);
WARN(count == 0, "timeout while waiting for TMC flush, TMC_FFSR: %#x\n",
tmc_readl(drvdata, TMC_FFSR));
}
static void tmc_wait_for_ready(struct tmc_drvdata *drvdata) static void tmc_wait_for_ready(struct tmc_drvdata *drvdata)
{ {
int count; int count;
@ -238,7 +250,7 @@ static void __tmc_etr_enable_to_bam(struct tmc_drvdata *drvdata)
tmc_writel(drvdata, bamdata->data_fifo.phys_base, TMC_DBALO); tmc_writel(drvdata, bamdata->data_fifo.phys_base, TMC_DBALO);
tmc_writel(drvdata, 0x0, TMC_DBAHI); tmc_writel(drvdata, 0x0, TMC_DBAHI);
tmc_writel(drvdata, 0x133, TMC_FFCR); tmc_writel(drvdata, 0x103, TMC_FFCR);
tmc_writel(drvdata, drvdata->trigger_cntr, TMC_TRG); tmc_writel(drvdata, drvdata->trigger_cntr, TMC_TRG);
__tmc_enable(drvdata); __tmc_enable(drvdata);
@ -298,14 +310,18 @@ static void __tmc_etr_disable_to_bam(struct tmc_drvdata *drvdata)
if (!drvdata->enable_to_bam) if (!drvdata->enable_to_bam)
return; return;
/* Ensure periodic flush is disabled in CSR block */
msm_qdss_csr_disable_flush();
TMC_UNLOCK(drvdata); TMC_UNLOCK(drvdata);
tmc_wait_for_flush(drvdata);
tmc_flush_and_stop(drvdata); tmc_flush_and_stop(drvdata);
__tmc_disable(drvdata); __tmc_disable(drvdata);
TMC_LOCK(drvdata); TMC_LOCK(drvdata);
/* Disable CSR registers */ /* Disable CSR configuration */
msm_qdss_csr_disable_bam_to_usb(); msm_qdss_csr_disable_bam_to_usb();
drvdata->enable_to_bam = false; drvdata->enable_to_bam = false;
} }