Skip to content

Commit c5e4d05

Browse files
mwilczyrafaeljw
authored andcommitted
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: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 3272a4a commit c5e4d05

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

arch/ia64/include/asm/acpi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
6969
#endif
7070

7171
static inline bool arch_has_acpi_pdc(void) { return true; }
72-
static inline void arch_acpi_set_pdc_bits(u32 *buf)
72+
static inline void arch_acpi_set_proc_cap_bits(u32 *cap)
7373
{
74-
buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;
74+
*cap |= ACPI_PDC_EST_CAPABILITY_SMP;
7575
}
7676

7777
#ifdef CONFIG_ACPI_NUMA

arch/x86/include/asm/acpi.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,23 @@ static inline bool arch_has_acpi_pdc(void)
100100
c->x86_vendor == X86_VENDOR_CENTAUR);
101101
}
102102

103-
static inline void arch_acpi_set_pdc_bits(u32 *buf)
103+
static inline void arch_acpi_set_proc_cap_bits(u32 *cap)
104104
{
105105
struct cpuinfo_x86 *c = &cpu_data(0);
106106

107-
buf[2] |= ACPI_PDC_C_CAPABILITY_SMP;
107+
*cap |= ACPI_PDC_C_CAPABILITY_SMP;
108108

109109
if (cpu_has(c, X86_FEATURE_EST))
110-
buf[2] |= ACPI_PDC_EST_CAPABILITY_SWSMP;
110+
*cap |= ACPI_PDC_EST_CAPABILITY_SWSMP;
111111

112112
if (cpu_has(c, X86_FEATURE_ACPI))
113-
buf[2] |= ACPI_PDC_T_FFH;
113+
*cap |= ACPI_PDC_T_FFH;
114114

115115
/*
116116
* If mwait/monitor is unsupported, C2/C3_FFH will be disabled
117117
*/
118118
if (!cpu_has(c, X86_FEATURE_MWAIT))
119-
buf[2] &= ~(ACPI_PDC_C_C2C3_FFH);
119+
*cap &= ~(ACPI_PDC_C_C2C3_FFH);
120120
}
121121

122122
static inline bool acpi_has_cpu_in_madt(void)

drivers/acpi/processor_pdc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static void acpi_set_pdc_bits(u32 *buf)
2424
buf[2] = ACPI_PDC_SMP_T_SWCOORD;
2525

2626
/* Twiddle arch-specific bits needed for _PDC */
27-
arch_acpi_set_pdc_bits(buf);
27+
arch_acpi_set_proc_cap_bits(&buf[2]);
2828
}
2929

3030
static struct acpi_object_list *acpi_processor_alloc_pdc(void)

0 commit comments

Comments
 (0)