diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index bfc095956dd11b9b64c15fc97228dc2920d9a3a7..4bcfb06a781e8b09086d436b5decbe5e55a7d8d3 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -213,6 +213,34 @@ int __weak cache_setup_acpi(unsigned int cpu)
 	return -ENOTSUPP;
 }
 
+/**
+ * cacheinfo_shared_cpu_map_search() - find an instance of struct cacheinfo
+ * from the provided firmware description.
+ * Caller must hold cpus_read_lock() until its finished with the cacheinfo.
+ *
+ * Return a CPUs cache leaf described @fw_desc, or NULL.
+ */
+struct cacheinfo *cacheinfo_shared_cpu_map_search(void *fw_token)
+{
+	struct cacheinfo *iter;
+	unsigned int cpu, index;
+	struct cpu_cacheinfo *cpu_ci;
+
+	for_each_online_cpu(cpu) {
+		cpu_ci = get_cpu_cacheinfo(cpu);
+
+		for (index = 0; index < cache_leaves(cpu); index++) {
+			iter = cpu_ci->info_list + index;
+
+			if (iter->fw_token == fw_token) {
+				return iter;
+			}
+		}
+	}
+
+	return NULL;
+}
+
 unsigned int coherency_max_size;
 
 static int cache_shared_cpu_map_setup(unsigned int cpu)
diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index 4f72b47973c304e2d90ca3720438efa1c22ea5c9..78d7300607e3c00506933015a1c14375efed0a54 100644
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -98,6 +98,7 @@ int func(unsigned int cpu)					\
 }
 
 struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu);
+struct cacheinfo *cacheinfo_shared_cpu_map_search(void *fw_desc);
 int init_cache_level(unsigned int cpu);
 int populate_cache_leaves(unsigned int cpu);
 int cache_setup_acpi(unsigned int cpu);