Commit c5e4d05d authored by Michal Wilczynski's avatar Michal Wilczynski Committed by Rafael J. Wysocki

ACPI: processor: Refactor arch_acpi_set_pdc_bits()

The capabilities buffer modified by the arch_acpi_set_pdc_bits() is not
_PDC-specific, as it can be used by _OSC too.

Change the name of that function to better reflect its independence from
_PDC and make it take the capabilities buffer address as the argument
directly, without any offset, as _OSC and _PDC use different capabilities
buffer offsets.

No intentional functional impact.
Suggested-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarMichal Wilczynski <michal.wilczynski@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
[ rjw: Subject and changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3272a4aa
...@@ -69,9 +69,9 @@ extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; ...@@ -69,9 +69,9 @@ extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
#endif #endif
static inline bool arch_has_acpi_pdc(void) { return true; } static inline bool arch_has_acpi_pdc(void) { return true; }
static inline void arch_acpi_set_pdc_bits(u32 *buf) static inline void arch_acpi_set_proc_cap_bits(u32 *cap)
{ {
buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP; *cap |= ACPI_PDC_EST_CAPABILITY_SMP;
} }
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
......
...@@ -100,23 +100,23 @@ static inline bool arch_has_acpi_pdc(void) ...@@ -100,23 +100,23 @@ static inline bool arch_has_acpi_pdc(void)
c->x86_vendor == X86_VENDOR_CENTAUR); c->x86_vendor == X86_VENDOR_CENTAUR);
} }
static inline void arch_acpi_set_pdc_bits(u32 *buf) static inline void arch_acpi_set_proc_cap_bits(u32 *cap)
{ {
struct cpuinfo_x86 *c = &cpu_data(0); struct cpuinfo_x86 *c = &cpu_data(0);
buf[2] |= ACPI_PDC_C_CAPABILITY_SMP; *cap |= ACPI_PDC_C_CAPABILITY_SMP;
if (cpu_has(c, X86_FEATURE_EST)) if (cpu_has(c, X86_FEATURE_EST))
buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP; *cap |= ACPI_PDC_EST_CAPABILITY_SWSMP;
if (cpu_has(c, X86_FEATURE_ACPI)) if (cpu_has(c, X86_FEATURE_ACPI))
buf[2] |= ACPI_PDC_T_FFH; *cap |= ACPI_PDC_T_FFH;
/* /*
* If mwait/monitor is unsupported, C2/C3_FFH will be disabled * If mwait/monitor is unsupported, C2/C3_FFH will be disabled
*/ */
if (!cpu_has(c, X86_FEATURE_MWAIT)) if (!cpu_has(c, X86_FEATURE_MWAIT))
buf[2] &= ~(ACPI_PDC_C_C2C3_FFH); *cap &= ~(ACPI_PDC_C_C2C3_FFH);
} }
static inline bool acpi_has_cpu_in_madt(void) static inline bool acpi_has_cpu_in_madt(void)
......
...@@ -24,7 +24,7 @@ static void acpi_set_pdc_bits(u32 *buf) ...@@ -24,7 +24,7 @@ static void acpi_set_pdc_bits(u32 *buf)
buf[2] = ACPI_PDC_SMP_T_SWCOORD; buf[2] = ACPI_PDC_SMP_T_SWCOORD;
/* Twiddle arch-specific bits needed for _PDC */ /* Twiddle arch-specific bits needed for _PDC */
arch_acpi_set_pdc_bits(buf); arch_acpi_set_proc_cap_bits(&buf[2]);
} }
static struct acpi_object_list *acpi_processor_alloc_pdc(void) static struct acpi_object_list *acpi_processor_alloc_pdc(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment