shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: coresight: etm4x: Run arch feature detection on the CPU

Browse Source 
As we are about to add support for system register based devices,
we don't get an AMBA pid. So, the detection code could check
the system registers running on the CPU to check for the architecture
specific features. Thus we move the arch feature detection to
run on the CPU. We cannot always read the PID from the HW, as the
PID could be overridden by DT for broken devices. So, use the
PID from AMBA layer if available.

Bug: 174685394
Link: https://lore.kernel.org/r/20210110224850.1880240-25-suzuki.poulose@arm.com
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: liuqi115@huawei.com
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20210201181351.1475223-27-mathieu.poirier@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit e97db2cf09)
Signed-off-by: Qais Yousef <qais.yousef@arm.com>
Change-Id: I6872de0c7a4457853f02cfae175ede1cf8ef3cf3
This commit is contained in:
Suzuki K Poulose
2021-02-01 11:13:46 -07:00
committed by Todd Kjos
parent e293a5c64d
commit 924bda3def
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/hwtracing/coresight/coresight-etm4x-core.c
View File

@@ -60,6 +60,7 @@ static u64 etm4_get_access_type(struct etmv4_config *config);
static enum cpuhp_state hp_online;
struct etm4_init_arg {
unsigned int pid;
struct etmv4_drvdata *drvdata;
struct csdev_access *csa;
};
@@ -884,6 +885,8 @@ static void etm4_init_arch_data(void *info)
etm4_os_unlock_csa(drvdata, csa);
etm4_cs_unlock(drvdata, csa);
etm4_check_arch_features(drvdata, init_arg->pid);
/* find all capabilities of the tracing unit */
etmidr0 = etm4x_relaxed_read32(csa, TRCIDR0);
@@ -1745,6 +1748,7 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid)
init_arg.drvdata = drvdata;
init_arg.csa = &desc.access;
init_arg.pid = etm_pid;
if (smp_call_function_single(drvdata->cpu,
etm4_init_arch_data, &init_arg, 1))
@@ -1789,8 +1793,6 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid)
drvdata->boot_enable = true;
}
etm4_check_arch_features(drvdata, etm_pid);
return 0;
}