A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 04:12:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

coresight: cti: Solve boot up issue

Browse source 
Move the read register DVID operation to function show_info_show()
to avoid boot up issue.

Change-Id: Ice7f09f6dc77a93c2709cb3c34ae80efb67095c6
Signed-off-by: Yuanfang Zhang <zhangyuanfang@codeaurora.org>
This commit is contained in:
Yuanfang Zhang 2021-01-14 19:02:32 +08:00 • committed by Gerrit - the friendly Code Review server
commit c20a1bfcc7
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/hwtracing/coresight/coresight-cti.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.
*/
#include <linux/kernel.h>
@ -87,8 +87,6 @@ struct cti_drvdata {
struct coresight_cti cti;
int refcnt;
int cpu;
unsigned int trig_num_max;
unsigned int ch_num_max;
bool cti_save;
bool cti_hwclk;
bool l2_off;
@ -1362,9 +1360,18 @@ static ssize_t show_info_show(struct device *dev, struct device_attribute *attr,
{
struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent);
ssize_t size = 0;
unsigned int ctidevid, trig_num_max, ch_num_max;
pm_runtime_get_sync(drvdata->dev);
ctidevid = cti_readl(drvdata, DEVID);
trig_num_max = (ctidevid & GENMASK(15, 8)) >> 8;
ch_num_max = (ctidevid & GENMASK(21, 16)) >> 16;
pm_runtime_put(drvdata->dev);
size = scnprintf(&buf[size], PAGE_SIZE, "%d %d\n",
drvdata->trig_num_max, drvdata->ch_num_max);
trig_num_max, ch_num_max);
return size;
}
@ -1528,7 +1535,6 @@ EXPORT_SYMBOL(of_get_coresight_cti_data);
static int cti_probe(struct amba_device *adev, const struct amba_id *id)
{
int ret;
unsigned int ctidevid;
struct device *dev = &adev->dev;
struct coresight_platform_data *pdata;
struct cti_drvdata *drvdata;
@ -1595,9 +1601,6 @@ static int cti_probe(struct amba_device *adev, const struct amba_id *id)
cpu_pm_register_notifier(&cti_cpu_pm_notifier);
registered++;
}
ctidevid = cti_readl(drvdata, DEVID);
drvdata->trig_num_max = (ctidevid & GENMASK(15, 8)) >> 8;
drvdata->ch_num_max = (ctidevid & GENMASK(21, 16)) >> 16;
pm_runtime_put(&adev->dev);
dev_dbg(dev, "CTI initialized\n");
return 0;