Unverified Commit 5bfcd84f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3982 ACPI: CPPC: Assume no transition latency if no PCCT 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QJ6NFI4QTBCTXXXDWIK2IHPEPTIUNVRY/ 
 
https://gitee.com/openeuler/kernel/issues/I8W708 
 
Link:https://gitee.com/openeuler/kernel/pulls/3982

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1b1f50a7 ed5f3513

drivers/acpi/cppc_acpi.c

+16 −1
Original line number Diff line number Diff line
@@ -101,6 +101,16 @@ static DEFINE_PER_CPU(struct cpc_desc *, cpc_desc_ptr); 
				(cpc)->cpc_entry.reg.space_id ==	\

				ACPI_ADR_SPACE_PLATFORM_COMM)



/* Check if a CPC register is in SystemMemory */

#define CPC_IN_SYSTEM_MEMORY(cpc) ((cpc)->type == ACPI_TYPE_BUFFER &&	\

				(cpc)->cpc_entry.reg.space_id ==	\

				ACPI_ADR_SPACE_SYSTEM_MEMORY)



/* Check if a CPC register is in SystemIo */

#define CPC_IN_SYSTEM_IO(cpc) ((cpc)->type == ACPI_TYPE_BUFFER &&	\

				(cpc)->cpc_entry.reg.space_id ==	\

				ACPI_ADR_SPACE_SYSTEM_IO)



/* Evalutes to True if reg is a NULL register descriptor */

#define IS_NULL_REG(reg) ((reg)->space_id ==  ACPI_ADR_SPACE_SYSTEM_MEMORY && \

				(reg)->address == 0 &&			\
@@ -1458,6 +1468,9 @@ EXPORT_SYMBOL_GPL(cppc_set_perf); 
 * transition latency for perfromance change requests. The closest we have

 * is the timing information from the PCCT tables which provides the info

 * on the number and frequency of PCC commands the platform can handle.

 *

 * If desired_reg is in the SystemMemory or SystemIo ACPI address space,

 * then assume there is no latency.

 */

unsigned int cppc_get_transition_latency(int cpu_num)

{
@@ -1483,7 +1496,9 @@ unsigned int cppc_get_transition_latency(int cpu_num) 
		return CPUFREQ_ETERNAL;



	desired_reg = &cpc_desc->cpc_regs[DESIRED_PERF];

	if (!CPC_IN_PCC(desired_reg))

	if (CPC_IN_SYSTEM_MEMORY(desired_reg) || CPC_IN_SYSTEM_IO(desired_reg))

		return 0;

	else if (!CPC_IN_PCC(desired_reg))

		return CPUFREQ_ETERNAL;



	if (pcc_ss_id < 0)