Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a115173 authored by Mohammed Mirza Mandayappurath Manzoor's avatar Mohammed Mirza Mandayappurath Manzoor Committed by Gerrit - the friendly Code Review server
Browse files

msm: kgsl: Add a sysfs node to control performance counter reads 



Currently performance counters are global and can be read by anyone. Change
the behaviour to disable reading global counters as default and add a sysfs
node to enable/disable reads.

Change-Id: Ic3785acd9bd7425c2a844ed103d7b870d9f80adf
Signed-off-by: default avatarMohammed Mirza Mandayappurath Manzoor <quic_mmandaya@quicinc.com>
Signed-off-by: default avatarPranav Patel <quic_pranavp@quicinc.com>
parent 95cb0280

drivers/gpu/msm/adreno.c

+3 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2002,2007-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * 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
@@ -1445,6 +1446,8 @@ static int adreno_probe(struct platform_device *pdev) 
	adreno_debugfs_init(adreno_dev);

	adreno_profile_init(adreno_dev);



	adreno_dev->perfcounter = false;



	adreno_sysfs_init(adreno_dev);



	kgsl_pwrscale_init(&pdev->dev, CONFIG_QCOM_ADRENO_DEFAULT_GOVERNOR);

drivers/gpu/msm/adreno.h

+6 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * 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
@@ -604,6 +605,11 @@ struct adreno_device { 
	void *zap_handle_ptr;

	unsigned int soc_hw_rev;

	bool gaming_bin;

	/*

	 * @perfcounter: Flag to clear perfcounters across contexts and

	 * controls perfcounter ioctl read

	 */

	bool perfcounter;

};



/**

drivers/gpu/msm/adreno_compat.c

+9 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * 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
@@ -230,6 +231,14 @@ static long adreno_ioctl_perfcounter_read_compat( 
	struct kgsl_perfcounter_read_compat *read32 = data;

	struct kgsl_perfcounter_read read;



	/*

	 * When performance counter zapping is enabled, the counters are cleared

	 * across context switches. Reading the counters when they are zapped is

	 * not permitted.

	 */

	if (!adreno_dev->perfcounter)

		return -EPERM;



	read.reads = (struct kgsl_perfcounter_read_group __user *)

		(uintptr_t)read32->reads;

	read.count = read32->count;

drivers/gpu/msm/adreno_ioctl.c

+9 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2002,2007-2018,2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * 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
@@ -141,6 +142,14 @@ static long adreno_ioctl_perfcounter_read(struct kgsl_device_private *dev_priv, 
	struct adreno_device *adreno_dev = ADRENO_DEVICE(dev_priv->device);

	struct kgsl_perfcounter_read *read = data;



	/*

	 * When performance counter zapping is enabled, the counters are cleared

	 * across context switches. Reading the counters when they are zapped is

	 * not permitted.

	 */

	if (!adreno_dev->perfcounter)

		return -EPERM;



	return (long) adreno_perfcounter_read_group(adreno_dev, read->reads,

		read->count);

}

drivers/gpu/msm/adreno_sysfs.c

+32 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * 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
@@ -528,6 +529,31 @@ static int _acd_data_store(struct adreno_device *adreno_dev, unsigned int val) 
	return 0;

}



static unsigned int _perfcounter_show(struct adreno_device *adreno_dev)

{

	return adreno_dev->perfcounter;

}



static int _perfcounter_store(struct adreno_device *adreno_dev,

		unsigned int val)

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);



	if (adreno_dev->perfcounter == val)

		return 0;



	mutex_lock(&device->mutex);



	/* Power down the GPU before changing the state */

	kgsl_pwrctrl_change_state(device, KGSL_STATE_SUSPEND);

	adreno_dev->perfcounter = val;

	kgsl_pwrctrl_change_state(device, KGSL_STATE_SLUMBER);



	mutex_unlock(&device->mutex);



	return 0;

}



static ssize_t _sysfs_store_u32(struct device *dev,

		struct device_attribute *attr,

		const char *buf, size_t count)
@@ -633,6 +659,7 @@ static ADRENO_SYSFS_BOOL(throttling); 
static ADRENO_SYSFS_BOOL(ifpc);

static ADRENO_SYSFS_RO_U32(ifpc_count);

static ADRENO_SYSFS_BOOL(acd);

static ADRENO_SYSFS_BOOL(perfcounter);



static ADRENO_SYSFS_U32(acd_data_index);

static ADRENO_SYSFS_U32(acd_version);
@@ -662,6 +689,7 @@ static const struct device_attribute *_attr_list[] = { 
	&adreno_attr_ifpc_count.attr,

	&adreno_attr_preempt_count.attr,

	&adreno_attr_acd.attr,

	&adreno_attr_perfcounter.attr,

	&adreno_attr_acd_data_index.attr,

	&adreno_attr_acd_version.attr,

	&adreno_attr_acd_stride.attr,
@@ -820,8 +848,11 @@ int adreno_sysfs_init(struct adreno_device *adreno_dev) 
	ret = kgsl_create_device_sysfs_files(device->dev, _attr_list);



	/* Add the PPD directory and files */

	if (ret == 0)

	if (ret == 0) {

		/* Notify userspace */

		kobject_uevent(&device->dev->kobj, KOBJ_ADD);

		ppd_sysfs_init(adreno_dev);

	}



	return 0;

}