Commit 1132e6de authored by Ionela Voinescu's avatar Ionela Voinescu Committed by Rafael J. Wysocki
Browse files

x86, ACPI: rename init_freq_invariance_cppc() to arch_init_invariance_cppc() 



init_freq_invariance_cppc() was called in acpi_cppc_processor_probe(),
after CPU performance information and controls were populated from the
per-cpu _CPC objects.

But these _CPC objects provide information that helps with both CPU
(u-arch) and frequency invariance. Therefore, change the function name
to a more generic one, while adding the arch_ prefix, as this function
is expected to be defined differently by different architectures.

Signed-off-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e702196b

arch/x86/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static inline void init_freq_invariance(bool secondary, bool cppc_ready) 


#ifdef CONFIG_ACPI_CPPC_LIB

void init_freq_invariance_cppc(void);

#define init_freq_invariance_cppc init_freq_invariance_cppc

#define arch_init_invariance_cppc init_freq_invariance_cppc



bool amd_set_max_freq_ratio(u64 *ratio);

#else

drivers/acpi/cppc_acpi.c

+3 −3
Original line number Diff line number Diff line
@@ -633,8 +633,8 @@ static bool is_cppc_supported(int revision, int num_ent) 
 *  )

 */



#ifndef init_freq_invariance_cppc

static inline void init_freq_invariance_cppc(void) { }

#ifndef arch_init_invariance_cppc

static inline void arch_init_invariance_cppc(void) { }

#endif



/**
@@ -816,7 +816,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) 
		goto out_free;

	}



	init_freq_invariance_cppc();

	arch_init_invariance_cppc();



	kfree(output.pointer);

	return 0;