Skip to content

Commit

Permalink
ACPI: processor: Use CPUIDLE_FLAG_TLB_FLUSHED
Browse files Browse the repository at this point in the history
Make acpi_processor_idle() use the generic TLB flushing code.
This again removes RCU usage after rcu_idle_enter().

(XXX make every C3 invalidate TLBs, not just C3-BM)

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Peter Zijlstra authored and Rafael J. Wysocki committed Sep 16, 2020
1 parent aa6b43d commit a889a23
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 0 additions & 2 deletions arch/ia64/include/asm/acpi.h
Original file line number Diff line number Diff line change
@@ -74,8 +74,6 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf)
buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;
}

#define acpi_unlazy_tlb(x)

#ifdef CONFIG_ACPI_NUMA
extern cpumask_t early_cpu_possible_map;
#define for_each_possible_early_cpu(cpu) \
2 changes: 0 additions & 2 deletions arch/x86/include/asm/acpi.h
Original file line number Diff line number Diff line change
@@ -159,8 +159,6 @@ static inline u64 x86_default_get_root_pointer(void)
extern int x86_acpi_numa_init(void);
#endif /* CONFIG_ACPI_NUMA */

#define acpi_unlazy_tlb(x) leave_mm(x)

#ifdef CONFIG_ACPI_APEI
static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr)
{
10 changes: 5 additions & 5 deletions drivers/acpi/processor_idle.c
Original file line number Diff line number Diff line change
@@ -564,8 +564,6 @@ static DEFINE_RAW_SPINLOCK(c3_lock);
static void acpi_idle_enter_bm(struct acpi_processor *pr,
struct acpi_processor_cx *cx)
{
acpi_unlazy_tlb(smp_processor_id());

/*
* disable bus master
* bm_check implies we need ARB_DIS
@@ -665,17 +663,19 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
max_cstate = 1;

for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) {
state = &acpi_idle_driver.states[count];
cx = &pr->power.states[i];

if (!cx->valid)
continue;

per_cpu(acpi_cstate[count], dev->cpu) = cx;

if (lapic_timer_needs_broadcast(pr, cx)) {
state = &acpi_idle_driver.states[count];
if (lapic_timer_needs_broadcast(pr, cx))
state->flags |= CPUIDLE_FLAG_TIMER_STOP;
}

if (cx->type == ACPI_STATE_C3)
state->flags |= CPUIDLE_FLAG_TLB_FLUSHED;

count++;
if (count == CPUIDLE_STATE_MAX)

0 comments on commit a889a23

Please sign in to comment.