Commit de4a76cb authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpufreq: intel_pstate: Move cpu_defaults definitions 



Move the definitions of the cpu_defaults structures after the
definitions of utilization update callback routines to avoid
extra declarations of the latter.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 67dd9bf4

drivers/cpufreq/intel_pstate.c

+62 −67
Original line number Diff line number Diff line
@@ -1508,73 +1508,6 @@ static int knl_get_turbo_pstate(void) 
	return ret;

}



static void intel_pstate_update_util_pid(struct update_util_data *data,

					 u64 time, unsigned int flags);

static void intel_pstate_update_util(struct update_util_data *data, u64 time,

				     unsigned int flags);



static struct cpu_defaults core_params = {

	.funcs = {

		.get_max = core_get_max_pstate,

		.get_max_physical = core_get_max_pstate_physical,

		.get_min = core_get_min_pstate,

		.get_turbo = core_get_turbo_pstate,

		.get_scaling = core_get_scaling,

		.get_val = core_get_val,

		.update_util = intel_pstate_update_util_pid,

	},

};



static const struct cpu_defaults silvermont_params = {

	.funcs = {

		.get_max = atom_get_max_pstate,

		.get_max_physical = atom_get_max_pstate,

		.get_min = atom_get_min_pstate,

		.get_turbo = atom_get_turbo_pstate,

		.get_val = atom_get_val,

		.get_scaling = silvermont_get_scaling,

		.get_vid = atom_get_vid,

		.update_util = intel_pstate_update_util,

	},

};



static const struct cpu_defaults airmont_params = {

	.funcs = {

		.get_max = atom_get_max_pstate,

		.get_max_physical = atom_get_max_pstate,

		.get_min = atom_get_min_pstate,

		.get_turbo = atom_get_turbo_pstate,

		.get_val = atom_get_val,

		.get_scaling = airmont_get_scaling,

		.get_vid = atom_get_vid,

		.update_util = intel_pstate_update_util,

	},

};



static const struct cpu_defaults knl_params = {

	.funcs = {

		.get_max = core_get_max_pstate,

		.get_max_physical = core_get_max_pstate_physical,

		.get_min = core_get_min_pstate,

		.get_turbo = knl_get_turbo_pstate,

		.get_scaling = core_get_scaling,

		.get_val = core_get_val,

		.update_util = intel_pstate_update_util_pid,

	},

};



static const struct cpu_defaults bxt_params = {

	.funcs = {

		.get_max = core_get_max_pstate,

		.get_max_physical = core_get_max_pstate_physical,

		.get_min = core_get_min_pstate,

		.get_turbo = core_get_turbo_pstate,

		.get_scaling = core_get_scaling,

		.get_val = core_get_val,

		.update_util = intel_pstate_update_util,

	},

};



static void intel_pstate_get_min_max(struct cpudata *cpu, int *min, int *max)

{

	int max_perf = cpu->pstate.turbo_pstate;
@@ -1876,6 +1809,68 @@ static void intel_pstate_update_util(struct update_util_data *data, u64 time, 
	}

}



static struct cpu_defaults core_params = {

	.funcs = {

		.get_max = core_get_max_pstate,

		.get_max_physical = core_get_max_pstate_physical,

		.get_min = core_get_min_pstate,

		.get_turbo = core_get_turbo_pstate,

		.get_scaling = core_get_scaling,

		.get_val = core_get_val,

		.update_util = intel_pstate_update_util_pid,

	},

};



static const struct cpu_defaults silvermont_params = {

	.funcs = {

		.get_max = atom_get_max_pstate,

		.get_max_physical = atom_get_max_pstate,

		.get_min = atom_get_min_pstate,

		.get_turbo = atom_get_turbo_pstate,

		.get_val = atom_get_val,

		.get_scaling = silvermont_get_scaling,

		.get_vid = atom_get_vid,

		.update_util = intel_pstate_update_util,

	},

};



static const struct cpu_defaults airmont_params = {

	.funcs = {

		.get_max = atom_get_max_pstate,

		.get_max_physical = atom_get_max_pstate,

		.get_min = atom_get_min_pstate,

		.get_turbo = atom_get_turbo_pstate,

		.get_val = atom_get_val,

		.get_scaling = airmont_get_scaling,

		.get_vid = atom_get_vid,

		.update_util = intel_pstate_update_util,

	},

};



static const struct cpu_defaults knl_params = {

	.funcs = {

		.get_max = core_get_max_pstate,

		.get_max_physical = core_get_max_pstate_physical,

		.get_min = core_get_min_pstate,

		.get_turbo = knl_get_turbo_pstate,

		.get_scaling = core_get_scaling,

		.get_val = core_get_val,

		.update_util = intel_pstate_update_util_pid,

	},

};



static const struct cpu_defaults bxt_params = {

	.funcs = {

		.get_max = core_get_max_pstate,

		.get_max_physical = core_get_max_pstate_physical,

		.get_min = core_get_min_pstate,

		.get_turbo = core_get_turbo_pstate,

		.get_scaling = core_get_scaling,

		.get_val = core_get_val,

		.update_util = intel_pstate_update_util,

	},

};



#define ICPU(model, policy) \

	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF,\

			(unsigned long)&policy }