cacheinfo: rename of_node to fw_token

Rename and change the type of of_node to indicate
it is a generic pointer which is generally only used
for comparison purposes. In a later patch we will put
an ACPI/PPTT token pointer in fw_token so that
the code which builds the shared cpu masks can be reused.

Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Vijaya Kumar K <vkilari@codeaurora.org>
Tested-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Tested-by: Tomasz Nowicki <Tomasz.Nowicki@cavium.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index a872523e895195e2df2b0e5bb79011d74f632675..597aacb233fc210cd9cabe171c4b6bd33c334ce8 100644 (file)
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -35,7 +35,7 @@ struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu)
 static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,
                                           struct cacheinfo *sib_leaf)
 {
-       return sib_leaf->of_node == this_leaf->of_node;
+       return sib_leaf->fw_token == this_leaf->fw_token;
 }
 
 /* OF properties to query for a given cache type */
@@ -167,9 +167,10 @@ static int cache_setup_of_node(unsigned int cpu)
        struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
        unsigned int index = 0;
 
-       /* skip if of_node is already populated */
-       if (this_cpu_ci->info_list->of_node)
+       /* skip if fw_token is already populated */
+       if (this_cpu_ci->info_list->fw_token) {
                return 0;
+       }
 
        if (!cpu_dev) {
                pr_err("No cpu device for CPU %d\n", cpu);
@@ -190,7 +191,7 @@ static int cache_setup_of_node(unsigned int cpu)
                if (!np)
                        break;
                cache_of_set_props(this_leaf, np);
-               this_leaf->of_node = np;
+               this_leaf->fw_token = np;
                index++;
        }
 
@@ -278,7 +279,7 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
                        cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
                        cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
                }
-               of_node_put(this_leaf->of_node);
+               of_node_put(this_leaf->fw_token);
        }
 }
 
@@ -323,8 +324,9 @@ static int detect_cache_attributes(unsigned int cpu)
        if (ret)
                goto free_ci;
        /*
-        * For systems using DT for cache hierarchy, of_node and shared_cpu_map
-        * will be set up here only if they are not populated already
+        * For systems using DT for cache hierarchy, fw_token
+        * and shared_cpu_map will be set up here only if they are
+        * not populated already
         */
        ret = cache_shared_cpu_map_setup(cpu);
        if (ret) {

diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index 3d9805297cda826e5f2f26ac2669259258088957..0c6f658054d2a5bb2f575757ed2ba39035c95d91 100644 (file)
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -34,9 +34,8 @@ enum cache_type {
  * @shared_cpu_map: logical cpumask representing all the cpus sharing
  *     this cache node
  * @attributes: bitfield representing various cache attributes
- * @of_node: if devicetree is used, this represents either the cpu node in
- *     case there's no explicit cache node or the cache node itself in the
- *     device tree
+ * @fw_token: Unique value used to determine if different cacheinfo
+ *     structures represent a single hardware cache instance.
  * @disable_sysfs: indicates whether this node is visible to the user via
  *     sysfs or not
  * @priv: pointer to any private data structure specific to particular
@@ -65,8 +64,7 @@ struct cacheinfo {
 #define CACHE_ALLOCATE_POLICY_MASK     \
        (CACHE_READ_ALLOCATE | CACHE_WRITE_ALLOCATE)
 #define CACHE_ID               BIT(4)
-
-       struct device_node *of_node;
+       void *fw_token;
        bool disable_sysfs;
        void *priv;
 };