From mboxrd@z Thu Jan 1 00:00:00 1970 From: hanjun.guo@linaro.org (Hanjun Guo) Date: Sun, 04 May 2014 16:56:28 +0800 Subject: [PATCH v3 part1 01/11] ACPI / processor: Rework _PDC related stuff to make it more arch-independent In-Reply-To: <20140429093637.75573C4095B@trevor.secretlab.ca> References: <1398432017-8506-1-git-send-email-hanjun.guo@linaro.org> <1398432017-8506-2-git-send-email-hanjun.guo@linaro.org> <20140429093637.75573C4095B@trevor.secretlab.ca> Message-ID: <536600BC.3060205@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Grant, On 2014-4-29 17:36, Grant Likely wrote: > On Fri, 25 Apr 2014 21:20:07 +0800, Hanjun Guo wrote: >> _PDC related stuff in processor_core.c is little bit X86/IA64 >> dependent, macros of ACPI_PDC_* are _PDC bit definitions for >> Intel processors, if we use these macros in processor_core.c, >> we will meet compile error when ACPI is enabled on ARM64. >> >> This patch reworks the code to make it more arch-independent, >> moving Intel related _PDC bits into architecture directory, >> no functional change. >> >> Cc: Tony Luck >> Cc: Fenghua Yu >> Cc: Thomas Gleixner >> Cc: "H. Peter Anvin" >> Cc: x86 at kernel.org >> Cc: linux-ia64 at vger.kernel.org >> Signed-off-by: Hanjun Guo >> Signed-off-by: Graeme Gregory >> --- >> arch/ia64/include/asm/acpi.h | 5 +---- >> arch/ia64/kernel/acpi.c | 15 +++++++++++++++ >> arch/x86/include/asm/acpi.h | 19 +------------------ >> arch/x86/kernel/acpi/cstate.c | 27 +++++++++++++++++++++++++++ >> drivers/acpi/processor_core.c | 19 +------------------ >> 5 files changed, 45 insertions(+), 40 deletions(-) >> >> diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h >> index d651102..d2b8b9d 100644 >> --- a/arch/ia64/include/asm/acpi.h >> +++ b/arch/ia64/include/asm/acpi.h >> @@ -152,10 +152,7 @@ extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; >> #endif >> >> static inline bool arch_has_acpi_pdc(void) { return true; } >> -static inline void arch_acpi_set_pdc_bits(u32 *buf) >> -{ >> - buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP; >> -} >> +extern void arch_acpi_set_pdc_bits(u32 *buf); >> >> #define acpi_unlazy_tlb(x) >> >> diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c >> index 0d407b3..23e9b40 100644 >> --- a/arch/ia64/kernel/acpi.c >> +++ b/arch/ia64/kernel/acpi.c >> @@ -996,3 +996,18 @@ EXPORT_SYMBOL(acpi_unregister_ioapic); >> * TBD when when IA64 starts to support suspend... >> */ >> int acpi_suspend_lowlevel(void) { return 0; } >> + >> +void arch_acpi_set_pdc_bits(u32 *buf) >> +{ >> + /* Enable coordination with firmware's _TSD info */ >> + buf[2] |= ACPI_PDC_SMP_T_SWCOORD | ACPI_PDC_EST_CAPABILITY_SMP; >> + >> + if (boot_option_idle_override == IDLE_NOMWAIT) { >> + /* >> + * If mwait is disabled for CPU C-states, the C2C3_FFH access >> + * mode will be disabled in the parameter of _PDC object. >> + * Of course C1_FFH access mode will also be disabled. >> + */ >> + buf[2] &= ~(ACPI_PDC_C_C2C3_FFH | ACPI_PDC_C_C1_FFH); >> + } >> +} > > The commit text makes no comment about why this function is being moved > from a static inline to an extern in the acpi.c file. I assume it is > because it needs access to the boot_option_idle_override global > variable, but it isn't immediately obvious, and should be described in > the commit text. Ok, we will update the commit text as you suggested. > > Otherwise, the patch looks sane. > > Reviewed-by: Grant Likely Thanks? Hanjun