Skip to contentSkip to conversation

cpufreq: Introduce macros for cpufreq_frequency_table iteration

PATCH Superseded Stratos Karafotis 2 participants 2 messages Apr 14, 2014 – Apr 15, 2014

Subsystems (2)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/20 cpufreq: Introduce macros for cpufreq_frequency_table iteration

Most cpufreq drivers need to iterate over the cpufreq_frequency_table for various tasks.

This patch introduces two macros which can be used for iteration over cpufreq_frequency_table keeping a common coding style across drivers:

- cpufreq_for_each_entry: iterate over each entry of the table
- cpufreq_for_each_valid_entry: iterate over each entry that contains a valid frequency.

Also, make changes in frequency table helper functions to use these macros.

It should have no functional changes.

---
 Documentation/cpu-freq/cpu-drivers.txt | 16 ++++++++++
 drivers/cpufreq/cpufreq.c              | 11 +++++++
 drivers/cpufreq/freq_table.c           | 55 ++++++++++++++++------------------
 include/linux/cpufreq.h                | 21 +++++++++++++
 4 files changed, 73 insertions(+), 30 deletions(-)
Documentation/cpu-freq/cpu-drivers.txt +16 -0
index 48da5fd..f769f4c 100644
@@ -228,3 +228,19 @@ is the corresponding frequency table helper for the ->target
 stage. Just pass the values to this function, and the unsigned int
 index returns the number of the frequency table entry which contains
 the frequency the CPU shall be set to.
+
+The following macros can be used as iterators over cpufreq_frequency_table:
+cpufreq_for_each_entry(pos, table) - iterates over all entries of frequency
+table.
+cpufreq-for_each_valid_entry(pos, table) - iterates over all entries,
+excluding CPUFREQ_ENTRY_INVALID frequencies.
+Use arguments "pos" - a cpufreq_frequency_table * as a loop cursor and
+"table" - the cpufreq_frequency_table * you want to iterate over.
+For example:
+
+	struct cpufreq_frequency_table *pos, *driver_freq_table;
+
+	cpufreq_for_each_entry(pos, driver_freq_table) {
+		/* Do something with pos */
+		pos->frequency = ...
+	}
drivers/cpufreq/cpufreq.c +11 -0
index abda660..a517da9 100644
@@ -237,6 +237,17 @@ void cpufreq_cpu_put(struct cpufreq_policy *policy)
 }
 EXPORT_SYMBOL_GPL(cpufreq_cpu_put);
 
+bool cpufreq_next_valid(struct cpufreq_frequency_table **pos)
+{
+	while ((*pos)->frequency != CPUFREQ_TABLE_END)
+		if ((*pos)->frequency != CPUFREQ_ENTRY_INVALID)
+			return true;
+		else
+			(*pos)++;
+	return false;
+}
+EXPORT_SYMBOL_GPL(cpufreq_next_valid);
+
 /*********************************************************************
  *            EXTERNALLY AFFECTING FREQUENCY CHANGES                 *
  *********************************************************************/
drivers/cpufreq/freq_table.c +25 -30

123 lines not on this page · raw message

include/linux/cpufreq.h +21 -0
index 5ae5100..4f913b5 100644
@@ -468,6 +468,27 @@ struct cpufreq_frequency_table {
 				    * order */
 };
 
+bool cpufreq_next_valid(struct cpufreq_frequency_table **pos);
+
+/*
+ * cpufreq_for_each_entry -	iterate over a cpufreq_frequency_table
+ * @pos:	the cpufreq_frequency_table * to use as a loop cursor.
+ * @table:	the cpufreq_frequency_table * to iterate over.
+ */
+
+#define cpufreq_for_each_entry(pos, table)	\
+	for (pos = table; pos->frequency != CPUFREQ_TABLE_END; pos++)
+
+/*
+ * cpufreq_for_each_valid_entry -     iterate over a cpufreq_frequency_table
+ *	exluding CPUFREQ_ENTRY_INVALID frequencies.
+ * @pos:        the cpufreq_frequency_table * to use as a loop cursor.
+ * @table:      the cpufreq_frequency_table * to iterate over.
+ */
+
+#define cpufreq_for_each_valid_entry(pos, table)	\
+	for (pos = table; cpufreq_next_valid(&pos); pos++)
+
 int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
 				    struct cpufreq_frequency_table *table);
 
Signature · 1 line
1.9.0
maintainer
#1 lore raw

drivers/cpufreq/freq_table.c int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy, · line 197

Quoted 12 lines · Stratos Karafotis
drivers/cpufreq/freq_table.c +3 -3
@@ -193,9 +191,9 @@ int cpufreq_frequency_table_get_index(struct cpufreq_policy *policy,
                return -ENOENT;
        }
 
-       for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
-               if (table[i].frequency == freq)
-                       return i;
+       cpufreq_for_each_entry(pos, table) {
+               if (pos->frequency == freq)
+                       return pos - table;
        }

I asked you to do this in V1:

use cpufreq_for_each_valid_entry() here as well.