[Copybara Auto Merge] Merge branch pro into android13-gs-pixel-5.10-udc

edgetpu: Continue powering up if the block is still on
Bug: 272701322
edgetpu: retry and sleep until block down
Bug: 272701322 (repeat)
edgetpu: Add etdev as private data for syncfences
Bug: 264971968
edgetpu: usage_stats add cluster reconfigurations counters
Bug: 271372136
Bug: 271374892
edgetpu: usage_stats: process metrics v2 data
Bug: 271372136 (repeat)
Bug: 271374892 (repeat)
edgetpu: pm: reject power up if thermal suspended
GitOrigin-RevId: cb79837d6fe24112fabf8c0385bfaa5eb3220197
Change-Id: I5f18886750d6f9703286b6e2441fcd6da09c9382

6 files changed, 232 insertions, 210 deletions

diff --git a/drivers/edgetpu/edgetpu-fs.c b/drivers/edgetpu/edgetpu-fs.c
index 68ff32e..e87c276 100644
--- a/drivers/edgetpu/edgetpu-fs.c
+++ b/drivers/edgetpu/edgetpu-fs.c
@@ -597,17 +597,14 @@ static int edgetpu_ioctl_acquire_wakelock(struct edgetpu_client *client)
 	 */
 	client->pid = current->pid;
 	client->tgid = current->tgid;
-	edgetpu_thermal_lock(thermal);
 	if (edgetpu_thermal_is_suspended(thermal)) {
 		/* TPU is thermal suspended, so fail acquiring wakelock */
 		ret = -EAGAIN;
 		etdev_warn_ratelimited(client->etdev,
-				       "wakelock acquire rejected due to thermal suspend");
-		edgetpu_thermal_unlock(thermal);
+		       "wakelock acquire rejected due to device thermal limit exceeded");
 		goto error_client_unlock;
 	} else {
 		ret = edgetpu_pm_get(client->etdev->pm);
-		edgetpu_thermal_unlock(thermal);
 		if (ret) {
 			etdev_warn(client->etdev, "%s: pm_get failed (%d)",
 				   __func__, ret);
@@ -1030,6 +1027,19 @@ static const struct file_operations mappings_ops = {
 	.release = single_release,
 };
 
+static int syncfences_open(struct inode *inode, struct file *file)
+{
+	return single_open(file, edgetpu_sync_fence_debugfs_show, inode->i_private);
+}
+
+static const struct file_operations syncfences_ops = {
+	.open = syncfences_open,
+	.read = seq_read,
+	.llseek = seq_lseek,
+	.owner = THIS_MODULE,
+	.release = single_release,
+};
+
 static int edgetpu_pm_debugfs_set_wakelock(void *data, u64 val)
 {
 	struct edgetpu_dev *etdev = data;
@@ -1054,6 +1064,7 @@ static void edgetpu_fs_setup_debugfs(struct edgetpu_dev *etdev)
 	}
 	debugfs_create_file("mappings", 0440, etdev->d_entry,
 			    etdev, &mappings_ops);
+	debugfs_create_file("syncfences", 0440, etdev->d_entry, etdev, &syncfences_ops);
 	debugfs_create_file("wakelock", 0220, etdev->d_entry, etdev,
 			    &fops_wakelock);
 #ifndef EDGETPU_FEATURE_MOBILE
@@ -1295,20 +1306,6 @@ void edgetpu_fs_remove(struct edgetpu_dev *etdev)
 	debugfs_remove_recursive(etdev->d_entry);
 }
 
-static int syncfences_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, edgetpu_sync_fence_debugfs_show,
-			   inode->i_private);
-}
-
-static const struct file_operations syncfences_ops = {
-	.open = syncfences_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.owner = THIS_MODULE,
-	.release = single_release,
-};
-
 static void edgetpu_debugfs_global_setup(void)
 {
 	edgetpu_debugfs_dir = debugfs_create_dir("edgetpu", NULL);
@@ -1316,9 +1313,6 @@ static void edgetpu_debugfs_global_setup(void)
 		pr_warn(DRIVER_NAME " error creating edgetpu debugfs dir\n");
 		return;
 	}
-
-	debugfs_create_file("syncfences", 0440, edgetpu_debugfs_dir, NULL,
-			    &syncfences_ops);
 }
 
 int __init edgetpu_fs_init(void)
diff --git a/drivers/edgetpu/edgetpu-thermal.h b/drivers/edgetpu/edgetpu-thermal.h
index dbd283f..0c163e0 100644
--- a/drivers/edgetpu/edgetpu-thermal.h
+++ b/drivers/edgetpu/edgetpu-thermal.h
@@ -56,17 +56,6 @@ int edgetpu_thermal_suspend(struct device *dev);
 int edgetpu_thermal_resume(struct device *dev);
 
 /*
- * Holds thermal->lock.
- *
- * Does nothing if the thermal management is not supported.
- */
-static inline void edgetpu_thermal_lock(struct edgetpu_thermal *thermal)
-{
-	if (!IS_ERR_OR_NULL(thermal))
-		mutex_lock(&thermal->lock);
-}
-
-/*
  * Checks whether device is thermal suspended.
  * Returns false if the thermal management is not supported.
  */
@@ -77,15 +66,4 @@ static inline bool edgetpu_thermal_is_suspended(struct edgetpu_thermal *thermal)
 	return false;
 }
 
-/*
- * Releases thermal->lock.
- *
- * Does nothing if the thermal management is not supported.
- */
-static inline void edgetpu_thermal_unlock(struct edgetpu_thermal *thermal)
-{
-	if (!IS_ERR_OR_NULL(thermal))
-		mutex_unlock(&thermal->lock);
-}
-
 #endif /* __EDGETPU_THERMAL_H__ */
diff --git a/drivers/edgetpu/edgetpu-usage-stats.c b/drivers/edgetpu/edgetpu-usage-stats.c
index 60751dd..9934ca6 100644
--- a/drivers/edgetpu/edgetpu-usage-stats.c
+++ b/drivers/edgetpu/edgetpu-usage-stats.c
@@ -74,6 +74,7 @@ int edgetpu_usage_add(struct edgetpu_dev *etdev, struct tpu_usage *tpu_usage)
 	if (!ustats)
 		return 0;
 
+	/* Note: as of metrics v2 the cluster_id is always zero and is ignored. */
 	etdev_dbg(etdev, "%s: uid=%u state=%u dur=%u", __func__,
 		  tpu_usage->uid, tpu_usage->power_state,
 		  tpu_usage->duration_us);
@@ -125,63 +126,78 @@ static void edgetpu_utilization_update(
 	mutex_unlock(&ustats->usage_stats_lock);
 }
 
-static void edgetpu_counter_update(
-	struct edgetpu_dev *etdev,
-	struct edgetpu_usage_counter *counter)
+static void edgetpu_counter_update(struct edgetpu_dev *etdev, struct edgetpu_usage_counter *counter,
+				   uint version)
 {
 	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
+	uint component = version > 1 ? counter->component_id : 0;
 
 	if (!ustats)
 		return;
 
-	etdev_dbg(etdev, "%s: type=%d value=%llu\n", __func__,
-		  counter->type, counter->value);
+	etdev_dbg(etdev, "%s: type=%d value=%llu comp=%u\n", __func__, counter->type,
+		  counter->value, component);
 
 	mutex_lock(&ustats->usage_stats_lock);
 	if (counter->type >= 0 && counter->type < EDGETPU_COUNTER_COUNT)
-		ustats->counter[counter->type] += counter->value;
+		ustats->counter[counter->type][component] += counter->value;
 	mutex_unlock(&ustats->usage_stats_lock);
 }
 
-static void edgetpu_counter_clear(
-	struct edgetpu_dev *etdev,
-	enum edgetpu_usage_counter_type counter_type)
+static void edgetpu_counter_clear(struct edgetpu_dev *etdev,
+				  enum edgetpu_usage_counter_type counter_type)
 {
 	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
+	int i;
 
-	if (!ustats)
-		return;
 	if (counter_type >= EDGETPU_COUNTER_COUNT)
 		return;
 
 	mutex_lock(&ustats->usage_stats_lock);
-	ustats->counter[counter_type] = 0;
+	for (i = 0; i < EDGETPU_TPU_CLUSTER_COUNT; i++)
+		ustats->counter[counter_type][i] = 0;
 	mutex_unlock(&ustats->usage_stats_lock);
 }
 
-static void edgetpu_max_watermark_update(
-	struct edgetpu_dev *etdev,
-	struct edgetpu_usage_max_watermark *max_watermark)
+static void edgetpu_max_watermark_update(struct edgetpu_dev *etdev,
+					 struct edgetpu_usage_max_watermark *max_watermark,
+					 uint version)
 {
 	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
+	uint component = version > 1 ? max_watermark->component_id : 0;
 
 	if (!ustats)
 		return;
 
-	etdev_dbg(etdev, "%s: type=%d value=%llu\n", __func__,
-		  max_watermark->type, max_watermark->value);
+	etdev_dbg(etdev, "%s: type=%d value=%llu comp=%u\n", __func__, max_watermark->type,
+		  max_watermark->value, component);
 
 	if (max_watermark->type < 0 ||
 	    max_watermark->type >= EDGETPU_MAX_WATERMARK_TYPE_COUNT)
 		return;
 
 	mutex_lock(&ustats->usage_stats_lock);
-	if (max_watermark->value > ustats->max_watermark[max_watermark->type])
-		ustats->max_watermark[max_watermark->type] =
+	if (max_watermark->value > ustats->max_watermark[max_watermark->type][component])
+		ustats->max_watermark[max_watermark->type][component] =
 			max_watermark->value;
 	mutex_unlock(&ustats->usage_stats_lock);
 }
 
+static void edgetpu_max_watermark_clear(struct edgetpu_dev *etdev,
+					enum edgetpu_usage_max_watermark_type max_watermark_type)
+{
+	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
+	int i;
+
+	if (max_watermark_type < 0 || max_watermark_type >= EDGETPU_MAX_WATERMARK_TYPE_COUNT)
+		return;
+
+	mutex_lock(&ustats->usage_stats_lock);
+	for (i = 0; i < EDGETPU_TPU_CLUSTER_COUNT; i++)
+		ustats->max_watermark[max_watermark_type][i] = 0;
+	mutex_unlock(&ustats->usage_stats_lock);
+}
+
 static void edgetpu_thread_stats_update(
 	struct edgetpu_dev *etdev,
 	struct edgetpu_thread_stats *thread_stats)
@@ -288,19 +304,16 @@ void edgetpu_usage_stats_process_buffer(struct edgetpu_dev *etdev, void *buf)
 				etdev, &metric->component_activity);
 			break;
 		case EDGETPU_METRIC_TYPE_COUNTER:
-			edgetpu_counter_update(etdev, &metric->counter);
+			edgetpu_counter_update(etdev, &metric->counter, version);
 			break;
 		case EDGETPU_METRIC_TYPE_MAX_WATERMARK:
-			edgetpu_max_watermark_update(
-				etdev, &metric->max_watermark);
+			edgetpu_max_watermark_update(etdev, &metric->max_watermark, version);
 			break;
 		case EDGETPU_METRIC_TYPE_THREAD_STATS:
-			edgetpu_thread_stats_update(
-				etdev, &metric->thread_stats);
+			edgetpu_thread_stats_update(etdev, &metric->thread_stats);
 			break;
 		case EDGETPU_METRIC_TYPE_DVFS_FREQUENCY_INFO:
-			edgetpu_dvfs_frequency_update(
-				etdev, metric->dvfs_frequency_info);
+			edgetpu_dvfs_frequency_update(etdev, metric->dvfs_frequency_info);
 			break;
 		default:
 			etdev_dbg(etdev, "%s: %d: skip unknown type=%u",
@@ -328,36 +341,72 @@ int edgetpu_usage_get_utilization(struct edgetpu_dev *etdev,
 	return val;
 }
 
-static int64_t edgetpu_usage_get_counter(
-	struct edgetpu_dev *etdev,
-	enum edgetpu_usage_counter_type counter_type)
+/*
+ * Resyncs firmware stats and formats the requested counter in the supplied buffer.
+ *
+ * If @report_per_cluster is true, and if the firmware implements metrics V2 or higher,
+ * then one value is formatted per cluster (for chips with only one cluster only one value is
+ * formatted).
+ *
+ * Returns the number of bytes written to buf.
+ */
+static ssize_t edgetpu_usage_format_counter(struct edgetpu_dev *etdev, char *buf,
+					    enum edgetpu_usage_counter_type counter_type,
+					    bool report_per_cluster)
 {
 	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
-	int64_t val;
+	uint ncomponents = report_per_cluster && !etdev->usage_stats->use_metrics_v1 ?
+		EDGETPU_TPU_CLUSTER_COUNT : 1;
+	uint i;
+	ssize_t ret = 0;
 
 	if (counter_type >= EDGETPU_COUNTER_COUNT)
-		return -1;
+		return 0;
 	edgetpu_kci_update_usage(etdev);
 	mutex_lock(&ustats->usage_stats_lock);
-	val = ustats->counter[counter_type];
+	for (i = 0; i < ncomponents; i++) {
+		if (i)
+			ret += scnprintf(buf + ret, PAGE_SIZE - ret, " ");
+		ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%llu",
+				 ustats->counter[counter_type][i]);
+	}
 	mutex_unlock(&ustats->usage_stats_lock);
-	return val;
+	ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n");
+	return ret;
 }
 
-static int64_t edgetpu_usage_get_max_watermark(
-	struct edgetpu_dev *etdev,
-	enum edgetpu_usage_max_watermark_type max_watermark_type)
+/*
+ * Resyncs firmware stats and formats the requested max watermark in the supplied buffer.
+ *
+ * If @report_per_cluster is true, and if the firmware implements metrics V2 or higher,
+ * then one value is formatted per cluster (for chips with only one cluster only one value is
+ * formatted).
+ *
+ * Returns the number of bytes written to buf.
+ */
+static ssize_t edgetpu_usage_format_max_watermark(
+	struct edgetpu_dev *etdev, char *buf,
+	enum edgetpu_usage_max_watermark_type max_watermark_type, bool report_per_cluster)
 {
 	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
-	int64_t val;
+	uint ncomponents = report_per_cluster && !etdev->usage_stats->use_metrics_v1 ?
+		EDGETPU_TPU_CLUSTER_COUNT : 1;
+	uint i;
+	ssize_t ret = 0;
 
 	if (max_watermark_type >= EDGETPU_MAX_WATERMARK_TYPE_COUNT)
-		return -1;
+		return 0;
 	edgetpu_kci_update_usage(etdev);
 	mutex_lock(&ustats->usage_stats_lock);
-	val = ustats->max_watermark[max_watermark_type];
+	for (i = 0; i < ncomponents; i++) {
+		if (i)
+			ret += scnprintf(buf + ret, PAGE_SIZE - ret, " ");
+		ret += scnprintf(buf + ret, PAGE_SIZE - ret, "%llu",
+				 ustats->max_watermark[max_watermark_type][i]);
+	}
 	mutex_unlock(&ustats->usage_stats_lock);
-	return val;
+	ret += scnprintf(buf + ret, PAGE_SIZE - ret, "\n");
+	return ret;
 }
 
 static ssize_t tpu_usage_show(struct device *dev,
@@ -471,11 +520,8 @@ static ssize_t tpu_active_cycle_count_show(struct device *dev,
 					   char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev,
-					EDGETPU_COUNTER_TPU_ACTIVE_CYCLES);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_TPU_ACTIVE_CYCLES, false);
 }
 
 static ssize_t tpu_active_cycle_count_store(struct device *dev,
@@ -496,11 +542,8 @@ static ssize_t tpu_throttle_stall_count_show(struct device *dev,
 					     char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev,
-					EDGETPU_COUNTER_TPU_THROTTLE_STALLS);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_TPU_THROTTLE_STALLS, false);
 }
 
 static ssize_t tpu_throttle_stall_count_store(struct device *dev,
@@ -521,11 +564,8 @@ static ssize_t inference_count_show(struct device *dev,
 				    struct device_attribute *attr, char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev,
-					EDGETPU_COUNTER_INFERENCES);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_INFERENCES, true);
 }
 
 static ssize_t inference_count_store(struct device *dev,
@@ -541,21 +581,15 @@ static ssize_t inference_count_store(struct device *dev,
 static DEVICE_ATTR(inference_count, 0664, inference_count_show,
 		   inference_count_store);
 
-static ssize_t tpu_op_count_show(struct device *dev,
-				 struct device_attribute *attr, char *buf)
+static ssize_t tpu_op_count_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev,
-					EDGETPU_COUNTER_TPU_OPS);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_TPU_OPS, true);
 }
 
-static ssize_t tpu_op_count_store(struct device *dev,
-				  struct device_attribute *attr,
-				  const char *buf,
-				  size_t count)
+static ssize_t tpu_op_count_store(struct device *dev, struct device_attribute *attr,
+				  const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
 
@@ -564,22 +598,16 @@ static ssize_t tpu_op_count_store(struct device *dev,
 }
 static DEVICE_ATTR(tpu_op_count, 0664, tpu_op_count_show, tpu_op_count_store);
 
-static ssize_t param_cache_hit_count_show(struct device *dev,
-					  struct device_attribute *attr,
+static ssize_t param_cache_hit_count_show(struct device *dev, struct device_attribute *attr,
 					  char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev,
-					EDGETPU_COUNTER_PARAM_CACHE_HITS);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_PARAM_CACHE_HITS, false);
 }
 
-static ssize_t param_cache_hit_count_store(struct device *dev,
-					   struct device_attribute *attr,
-					   const char *buf,
-					   size_t count)
+static ssize_t param_cache_hit_count_store(struct device *dev, struct device_attribute *attr,
+					   const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
 
@@ -589,22 +617,16 @@ static ssize_t param_cache_hit_count_store(struct device *dev,
 static DEVICE_ATTR(param_cache_hit_count, 0664, param_cache_hit_count_show,
 		   param_cache_hit_count_store);
 
-static ssize_t param_cache_miss_count_show(struct device *dev,
-					   struct device_attribute *attr,
+static ssize_t param_cache_miss_count_show(struct device *dev, struct device_attribute *attr,
 					   char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev,
-					EDGETPU_COUNTER_PARAM_CACHE_MISSES);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_PARAM_CACHE_MISSES, false);
 }
 
-static ssize_t param_cache_miss_count_store(struct device *dev,
-					    struct device_attribute *attr,
-					    const char *buf,
-					    size_t count)
+static ssize_t param_cache_miss_count_store(struct device *dev, struct device_attribute *attr,
+					    const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
 
@@ -614,22 +636,16 @@ static ssize_t param_cache_miss_count_store(struct device *dev,
 static DEVICE_ATTR(param_cache_miss_count, 0664, param_cache_miss_count_show,
 		   param_cache_miss_count_store);
 
-static ssize_t context_preempt_count_show(struct device *dev,
-					  struct device_attribute *attr,
+static ssize_t context_preempt_count_show(struct device *dev, struct device_attribute *attr,
 					  char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev,
-					EDGETPU_COUNTER_CONTEXT_PREEMPTS);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_CONTEXT_PREEMPTS, true);
 }
 
-static ssize_t context_preempt_count_store(struct device *dev,
-					   struct device_attribute *attr,
-					   const char *buf,
-					   size_t count)
+static ssize_t context_preempt_count_store(struct device *dev, struct device_attribute *attr,
+					   const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
 
@@ -643,10 +659,8 @@ static ssize_t hardware_preempt_count_show(struct device *dev, struct device_att
 					   char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev, EDGETPU_COUNTER_HARDWARE_PREEMPTS);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_HARDWARE_PREEMPTS, true);
 }
 
 static ssize_t hardware_preempt_count_store(struct device *dev, struct device_attribute *attr,
@@ -664,10 +678,9 @@ static ssize_t hardware_ctx_save_time_show(struct device *dev, struct device_att
 					   char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev, EDGETPU_COUNTER_HARDWARE_CTX_SAVE_TIME_US);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_HARDWARE_CTX_SAVE_TIME_US,
+					    true);
 }
 
 static ssize_t hardware_ctx_save_time_store(struct device *dev, struct device_attribute *attr,
@@ -685,10 +698,9 @@ static ssize_t scalar_fence_wait_time_show(struct device *dev, struct device_att
 					   char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev, EDGETPU_COUNTER_SCALAR_FENCE_WAIT_TIME_US);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_SCALAR_FENCE_WAIT_TIME_US,
+					    true);
 }
 
 static ssize_t scalar_fence_wait_time_store(struct device *dev, struct device_attribute *attr,
@@ -703,13 +715,11 @@ static DEVICE_ATTR(scalar_fence_wait_time, 0664, scalar_fence_wait_time_show,
 		   scalar_fence_wait_time_store);
 
 static ssize_t long_suspend_count_show(struct device *dev, struct device_attribute *attr,
-					   char *buf)
+				       char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_counter(etdev, EDGETPU_COUNTER_LONG_SUSPEND);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_LONG_SUSPEND, false);
 }
 
 static ssize_t long_suspend_count_store(struct device *dev, struct device_attribute *attr,
@@ -723,15 +733,53 @@ static ssize_t long_suspend_count_store(struct device *dev, struct device_attrib
 static DEVICE_ATTR(long_suspend_count, 0664, long_suspend_count_show,
 		   long_suspend_count_store);
 
+#if EDGETPU_TPU_CLUSTER_COUNT > 1
+static ssize_t reconfigurations_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
+
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_RECONFIGURATIONS, false);
+}
+
+static ssize_t reconfigurations_store(struct device *dev, struct device_attribute *attr,
+				      const char *buf, size_t count)
+{
+	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
+
+	edgetpu_counter_clear(etdev, EDGETPU_COUNTER_RECONFIGURATIONS);
+	return count;
+}
+static DEVICE_ATTR(reconfigurations, 0664, reconfigurations_show, reconfigurations_store);
+
+static ssize_t preempt_reconfigurations_show(struct device *dev, struct device_attribute *attr,
+					     char *buf)
+{
+	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
+
+	return edgetpu_usage_format_counter(etdev, buf, EDGETPU_COUNTER_PREEMPT_RECONFIGURATIONS,
+					    false);
+}
+
+static ssize_t preempt_reconfigurations_store(struct device *dev, struct device_attribute *attr,
+					      const char *buf, size_t count)
+{
+	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
+
+	edgetpu_counter_clear(etdev, EDGETPU_COUNTER_PREEMPT_RECONFIGURATIONS);
+	return count;
+}
+static DEVICE_ATTR(preempt_reconfigurations, 0664, preempt_reconfigurations_show,
+		   preempt_reconfigurations_store);
+#endif /* EDGETPU_TPU_CLUSTER_COUNT > 1 */
+
+
 static ssize_t outstanding_commands_max_show(
 	struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_max_watermark(
-			etdev, EDGETPU_MAX_WATERMARK_OUT_CMDS);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_max_watermark(etdev, buf, EDGETPU_MAX_WATERMARK_OUT_CMDS,
+						  false);
 }
 
 static ssize_t outstanding_commands_max_store(
@@ -739,14 +787,8 @@ static ssize_t outstanding_commands_max_store(
 	const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
-
-	if (ustats) {
-		mutex_lock(&ustats->usage_stats_lock);
-		ustats->max_watermark[EDGETPU_MAX_WATERMARK_OUT_CMDS] = 0;
-		mutex_unlock(&ustats->usage_stats_lock);
-	}
 
+	edgetpu_max_watermark_clear(etdev, EDGETPU_MAX_WATERMARK_OUT_CMDS);
 	return count;
 }
 static DEVICE_ATTR(outstanding_commands_max, 0664,
@@ -757,11 +799,9 @@ static ssize_t preempt_depth_max_show(
 	struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_max_watermark(
-			etdev, EDGETPU_MAX_WATERMARK_PREEMPT_DEPTH);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_max_watermark(etdev, buf, EDGETPU_MAX_WATERMARK_PREEMPT_DEPTH,
+						  true);
 }
 
 static ssize_t preempt_depth_max_store(
@@ -769,14 +809,8 @@ static ssize_t preempt_depth_max_store(
 	const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
-
-	if (ustats) {
-		mutex_lock(&ustats->usage_stats_lock);
-		ustats->max_watermark[EDGETPU_MAX_WATERMARK_PREEMPT_DEPTH] = 0;
-		mutex_unlock(&ustats->usage_stats_lock);
-	}
 
+	edgetpu_max_watermark_clear(etdev, EDGETPU_MAX_WATERMARK_PREEMPT_DEPTH);
 	return count;
 }
 static DEVICE_ATTR(preempt_depth_max, 0664, preempt_depth_max_show,
@@ -786,11 +820,10 @@ static ssize_t hardware_ctx_save_time_max_show(
 	struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_max_watermark(
-			etdev, EDGETPU_MAX_WATERMARK_HARDWARE_CTX_SAVE_TIME_US);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_max_watermark(etdev, buf,
+						  EDGETPU_MAX_WATERMARK_HARDWARE_CTX_SAVE_TIME_US,
+						  true);
 }
 
 static ssize_t hardware_ctx_save_time_max_store(
@@ -798,14 +831,8 @@ static ssize_t hardware_ctx_save_time_max_store(
 	const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
-
-	if (ustats) {
-		mutex_lock(&ustats->usage_stats_lock);
-		ustats->max_watermark[EDGETPU_MAX_WATERMARK_HARDWARE_CTX_SAVE_TIME_US] = 0;
-		mutex_unlock(&ustats->usage_stats_lock);
-	}
 
+	edgetpu_max_watermark_clear(etdev, EDGETPU_MAX_WATERMARK_HARDWARE_CTX_SAVE_TIME_US);
 	return count;
 }
 static DEVICE_ATTR(hardware_ctx_save_time_max, 0664, hardware_ctx_save_time_max_show,
@@ -815,11 +842,9 @@ static ssize_t scalar_fence_wait_time_max_show(
 	struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_max_watermark(
-			etdev, EDGETPU_MAX_WATERMARK_SCALAR_FENCE_WAIT_TIME_US);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_max_watermark(
+			etdev, buf, EDGETPU_MAX_WATERMARK_SCALAR_FENCE_WAIT_TIME_US, true);
 }
 
 static ssize_t scalar_fence_wait_time_max_store(
@@ -827,14 +852,8 @@ static ssize_t scalar_fence_wait_time_max_store(
 	const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
-
-	if (ustats) {
-		mutex_lock(&ustats->usage_stats_lock);
-		ustats->max_watermark[EDGETPU_MAX_WATERMARK_SCALAR_FENCE_WAIT_TIME_US] = 0;
-		mutex_unlock(&ustats->usage_stats_lock);
-	}
 
+	edgetpu_max_watermark_clear(etdev, EDGETPU_MAX_WATERMARK_SCALAR_FENCE_WAIT_TIME_US);
 	return count;
 }
 static DEVICE_ATTR(scalar_fence_wait_time_max, 0664, scalar_fence_wait_time_max_show,
@@ -844,11 +863,9 @@ static ssize_t suspend_time_max_show(
 	struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	int64_t val;
 
-	val = edgetpu_usage_get_max_watermark(
-			etdev, EDGETPU_MAX_WATERMARK_SUSPEND_TIME_US);
-	return scnprintf(buf, PAGE_SIZE, "%llu\n", val);
+	return edgetpu_usage_format_max_watermark(etdev, buf, EDGETPU_MAX_WATERMARK_SUSPEND_TIME_US,
+						  false);
 }
 
 static ssize_t suspend_time_max_store(
@@ -856,14 +873,8 @@ static ssize_t suspend_time_max_store(
 	const char *buf, size_t count)
 {
 	struct edgetpu_dev *etdev = dev_get_drvdata(dev);
-	struct edgetpu_usage_stats *ustats = etdev->usage_stats;
-
-	if (ustats) {
-		mutex_lock(&ustats->usage_stats_lock);
-		ustats->max_watermark[EDGETPU_MAX_WATERMARK_SUSPEND_TIME_US] = 0;
-		mutex_unlock(&ustats->usage_stats_lock);
-	}
 
+	edgetpu_max_watermark_clear(etdev, EDGETPU_MAX_WATERMARK_SUSPEND_TIME_US);
 	return count;
 }
 static DEVICE_ATTR(suspend_time_max, 0664, suspend_time_max_show,
@@ -924,6 +935,10 @@ static struct attribute *usage_stats_dev_attrs[] = {
 	&dev_attr_hardware_ctx_save_time.attr,
 	&dev_attr_scalar_fence_wait_time.attr,
 	&dev_attr_long_suspend_count.attr,
+#if EDGETPU_TPU_CLUSTER_COUNT > 1
+	&dev_attr_reconfigurations.attr,
+	&dev_attr_preempt_reconfigurations.attr,
+#endif
 	&dev_attr_outstanding_commands_max.attr,
 	&dev_attr_preempt_depth_max.attr,
 	&dev_attr_hardware_ctx_save_time_max.attr,
diff --git a/drivers/edgetpu/edgetpu-usage-stats.h b/drivers/edgetpu/edgetpu-usage-stats.h
index ee908e1..2d97043 100644
--- a/drivers/edgetpu/edgetpu-usage-stats.h
+++ b/drivers/edgetpu/edgetpu-usage-stats.h
@@ -13,6 +13,9 @@
 /* The highest version of usage metrics handled by this driver. */
 #define EDGETPU_USAGE_METRIC_VERSION	2
 
+/* Max # of TPU clusters accounted for in the highest supported metrics version. */
+#define EDGETPU_USAGE_CLUSTERS_MAX	3
+
 /*
  * Size in bytes of usage metric v1.
  * If fewer bytes than this are received then discard the invalid buffer.
@@ -54,6 +57,7 @@ struct tpu_usage {
 
 	/* Compute Core: TPU cluster ID. */
 	/* Called core_id in FW. */
+	/* Note: as of metrics v2 the cluster_id is always zero and is ignored. */
 	uint8_t cluster_id;
 	/* Reserved.  Filling out the next 32-bit boundary. */
 	uint8_t reserved[3];
@@ -69,6 +73,7 @@ enum edgetpu_usage_component {
 	/* Just the TPU core (scalar core and tiles) */
 	EDGETPU_USAGE_COMPONENT_TPU = 1,
 	/* Control core (ARM Cortex-R52 CPU) */
+	/* Note: this component is not reported as of metrics v2. */
 	EDGETPU_USAGE_COMPONENT_CONTROLCORE = 2,
 
 	EDGETPU_USAGE_COMPONENT_COUNT = 3, /* number of components above */
@@ -114,10 +119,16 @@ enum edgetpu_usage_counter_type {
 
 	/* The following counters are added in metrics v2. */
 
-	/* Number of context switches on a compute core. */
+	/* Counter 11 not used on TPU. */
 	EDGETPU_COUNTER_CONTEXT_SWITCHES = 11,
 
-	EDGETPU_COUNTER_COUNT = 12, /* number of counters above */
+	/* Number of TPU Cluster Reconfigurations. */
+	EDGETPU_COUNTER_RECONFIGURATIONS = 12,
+
+	/* Number of TPU Cluster Reconfigurations motivated exclusively by a preemption. */
+	EDGETPU_COUNTER_PREEMPT_RECONFIGURATIONS = 13,
+
+	EDGETPU_COUNTER_COUNT = 14, /* number of counters above */
 };
 
 /* Generic counter. Only reported if it has a value larger than 0. */
@@ -173,10 +184,11 @@ struct __packed edgetpu_usage_max_watermark {
 /* Must be kept in sync with firmware enum class UsageTrackerThreadId. */
 enum edgetpu_usage_threadid {
 	/* Individual thread IDs do not have identifiers assigned. */
-	/* Thread ID 14, used for other IP, is not used for TPU */
+
+	/* Thread ID 14 is not used for TPU */
 
 	/* Number of task identifiers. */
-	EDGETPU_FW_THREAD_COUNT = 14,
+	EDGETPU_FW_THREAD_COUNT = 17,
 };
 
 /* Statistics related to a single thread in firmware. */
@@ -225,8 +237,8 @@ struct edgetpu_usage_stats {
 	DECLARE_HASHTABLE(uid_hash_table, UID_HASH_BITS);
 	/* component utilization values reported by firmware */
 	int32_t component_utilization[EDGETPU_USAGE_COMPONENT_COUNT];
-	int64_t counter[EDGETPU_COUNTER_COUNT];
-	int64_t max_watermark[EDGETPU_MAX_WATERMARK_TYPE_COUNT];
+	int64_t counter[EDGETPU_COUNTER_COUNT][EDGETPU_USAGE_CLUSTERS_MAX];
+	int64_t max_watermark[EDGETPU_MAX_WATERMARK_TYPE_COUNT][EDGETPU_USAGE_CLUSTERS_MAX];
 	int32_t thread_stack_max[EDGETPU_FW_THREAD_COUNT];
 	struct mutex usage_stats_lock;
 };
diff --git a/drivers/edgetpu/janeiro/config.h b/drivers/edgetpu/janeiro/config.h
index 01781ef..13170f5 100644
--- a/drivers/edgetpu/janeiro/config.h
+++ b/drivers/edgetpu/janeiro/config.h
@@ -40,6 +40,9 @@
 /* Is able to support external workloads */
 #define EDGETPU_FEATURE_INTEROP
 
+/* Metrics are reported for a single default "cluster" component. */
+#define EDGETPU_TPU_CLUSTER_COUNT	1
+
 /*
  * The TPU VA where the firmware is located.
  *
diff --git a/drivers/edgetpu/mobile-pm.c b/drivers/edgetpu/mobile-pm.c
index 50c3866..63dc60e 100644
--- a/drivers/edgetpu/mobile-pm.c
+++ b/drivers/edgetpu/mobile-pm.c
@@ -21,6 +21,7 @@
 #include "edgetpu-mailbox.h"
 #include "edgetpu-mobile-platform.h"
 #include "edgetpu-pm.h"
+#include "edgetpu-thermal.h"
 #include "mobile-firmware.h"
 #include "mobile-pm.h"
 
@@ -40,6 +41,10 @@ module_param(power_state, int, 0660);
 
 #define MAX_VOLTAGE_VAL 1250000
 
+#define BLOCK_DOWN_RETRY_TIMES 50
+#define BLOCK_DOWN_MIN_DELAY_US 1000
+#define BLOCK_DOWN_MAX_DELAY_US 1500
+
 enum edgetpu_pwr_state edgetpu_active_states[EDGETPU_NUM_STATES] = {
 	TPU_ACTIVE_UUD,
 	TPU_ACTIVE_SUD,
@@ -434,8 +439,23 @@ static int mobile_power_up(struct edgetpu_pm *etpm)
 	struct edgetpu_mobile_platform_pwr *platform_pwr = &etmdev->platform_pwr;
 	int ret;
 
-	if (platform_pwr->is_block_down && !platform_pwr->is_block_down(etdev))
+	if (platform_pwr->is_block_down) {
+		int times = 0;
+
+		do {
+			if (platform_pwr->is_block_down(etdev))
+				break;
+			usleep_range(BLOCK_DOWN_MIN_DELAY_US, BLOCK_DOWN_MAX_DELAY_US);
+		} while (++times < BLOCK_DOWN_RETRY_TIMES);
+		if (times >= BLOCK_DOWN_RETRY_TIMES && !platform_pwr->is_block_down(etdev))
+			etdev_warn(etdev, "Block is still on\n");
+	}
+
+	if (edgetpu_thermal_is_suspended(etdev->thermal)) {
+		etdev_warn_ratelimited(etdev,
+				       "power up rejected due to device thermal limit exceeded");
 		return -EAGAIN;
+	}
 
 	ret = mobile_pwr_state_set(etpm->etdev, mobile_get_initial_pwr_state(etdev->dev));