Commit daedb30f authored by Leo Yan's avatar Leo Yan Committed by Suzuki K Poulose
Browse files

coresight: cti: Remove hw_powered flag 



Since the CPU PM code has been removed from the CTI driver and the device
is enabled via runtime PM, pm_runtime_active() can be used to check
whether the device is powered.

As a result, the hw_powered flag is redundant, remove it.

Reviewed-by: default avatarMike Leach <mike.leach@arm.com>
Signed-off-by: default avatarLeo Yan <leo.yan@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20260226-arm_coresight_cti_refactor_v1-v2-6-b30fada3cfec@arm.com
parent b727e7bb

drivers/hwtracing/coresight/coresight-cti-core.c

+4 −7
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ static int cti_enable_hw(struct cti_drvdata *drvdata) 


	guard(raw_spinlock_irqsave)(&drvdata->spinlock);



	/* no need to do anything if enabled or unpowered*/

	if (config->hw_enabled || !config->hw_powered)

	/* no need to do anything if enabled */

	if (config->hw_enabled)

		goto cti_state_unchanged;



	/* claim the device */
@@ -114,8 +114,8 @@ static int cti_disable_hw(struct cti_drvdata *drvdata) 
	if (--drvdata->config.enable_req_count > 0)

		return 0;



	/* no need to do anything if disabled or cpu unpowered */

	if (!config->hw_enabled || !config->hw_powered)

	/* no need to do anything if disabled */

	if (!config->hw_enabled)

		return 0;



	CS_UNLOCK(drvdata->base);
@@ -702,9 +702,6 @@ static int cti_probe(struct amba_device *adev, const struct amba_id *id) 
		return  PTR_ERR(pdata);

	}



	/* default to powered - could change on PM notifications */

	drvdata->config.hw_powered = true;



	/*

	 * Set up device name - will depend if cpu bound or otherwise.

	 *

drivers/hwtracing/coresight/coresight-cti-sysfs.c

+7 −22
Original line number Diff line number Diff line
@@ -81,18 +81,11 @@ static ssize_t enable_show(struct device *dev, 
			   char *buf)

{

	int enable_req;

	bool enabled, powered;

	struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent);



	scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock) {

	scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock)

		enable_req = drvdata->config.enable_req_count;

		powered = drvdata->config.hw_powered;

		enabled = drvdata->config.hw_enabled;

	}



	if (powered)

		return sprintf(buf, "%d\n", enabled);

	else

	return sprintf(buf, "%d\n", !!enable_req);

}
@@ -131,11 +124,7 @@ static ssize_t powered_show(struct device *dev, 
			    struct device_attribute *attr,

			    char *buf)

{

	bool powered;

	struct cti_drvdata *drvdata = dev_get_drvdata(dev->parent);



	scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock)

		powered = drvdata->config.hw_powered;

	bool powered = pm_runtime_active(dev->parent);



	return sprintf(buf, "%d\n", powered);

}
@@ -181,10 +170,8 @@ static ssize_t coresight_cti_reg_show(struct device *dev, 


	pm_runtime_get_sync(dev->parent);



	scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock) {

		if (drvdata->config.hw_powered)

	scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock)

		val = cti_read_single_reg(drvdata, cti_attr->off);

	}



	pm_runtime_put_sync(dev->parent);

	return sysfs_emit(buf, "0x%x\n", val);
@@ -204,10 +191,8 @@ static __maybe_unused ssize_t coresight_cti_reg_store(struct device *dev, 


	pm_runtime_get_sync(dev->parent);



	scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock) {

		if (drvdata->config.hw_powered)

	scoped_guard(raw_spinlock_irqsave, &drvdata->spinlock)

		cti_write_single_reg(drvdata, cti_attr->off, val);

	}



	pm_runtime_put_sync(dev->parent);

	return size;

drivers/hwtracing/coresight/coresight-cti.h

+2 −4
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ struct cti_device { 
 * @asicctl_impl: true if asicctl is implemented.

 * @enable_req_count: CTI is enabled alongside >=1 associated devices.

 * @hw_enabled: true if hw is currently enabled.

 * @hw_powered: true if associated cpu powered on, or no cpu.

 * @trig_in_use: bitfield of in triggers registered as in use.

 * @trig_out_use: bitfield of out triggers registered as in use.

 * @trig_out_filter: bitfield of out triggers that are blocked if filter
@@ -146,7 +145,6 @@ struct cti_config { 
	/* cti enable control */

	int enable_req_count;

	bool hw_enabled;

	bool hw_powered;



	/* registered triggers and filtering */

	u32 trig_in_use;
@@ -235,10 +233,10 @@ struct coresight_platform_data * 
coresight_cti_get_platform_data(struct device *dev);

const char *cti_plat_get_node_name(struct fwnode_handle *fwnode);



/* cti powered and enabled */

/* Check if a cti device is enabled */

static inline bool cti_is_active(struct cti_config *cfg)

{

	return cfg->hw_powered && cfg->hw_enabled;

	return cfg->hw_enabled;

}



#endif  /* _CORESIGHT_CORESIGHT_CTI_H */