Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b49d7d87 authored by Fernando Luis Vazquez Cao's avatar Fernando Luis Vazquez Cao Committed by Ingo Molnar
Browse files

x86: Convert per-cpu counter icr_read_retry_count into a member of irq_stat 



LAPIC related statistics are grouped inside the per-cpu
structure irq_stat, so there is no need for icr_read_retry_count
to be a standalone per-cpu variable.

This patch moves icr_read_retry_count to where it belongs.

Suggested-y: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Cc: Jörn Engel <joern@logfs.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 346b46be

arch/x86/include/asm/apic.h

+0 −2
Original line number Diff line number Diff line
@@ -411,8 +411,6 @@ extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip); 


#ifdef CONFIG_X86_LOCAL_APIC



DECLARE_PER_CPU(unsigned, icr_read_retry_count);



static inline u32 apic_read(u32 reg)

{

	return apic->read(reg);

arch/x86/include/asm/hardirq.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ typedef struct { 
#ifdef CONFIG_X86_LOCAL_APIC

	unsigned int apic_timer_irqs;	/* arch dependent */

	unsigned int irq_spurious_count;

	unsigned int icr_read_retry_count;

#endif

	unsigned int x86_platform_ipis;	/* arch dependent */

	unsigned int apic_perf_irqs;

arch/x86/kernel/apic/apic.c

+1 −6
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ DEFINE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid, BAD_APICID); 
EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_apicid);

EXPORT_EARLY_PER_CPU_SYMBOL(x86_bios_cpu_apicid);



/*

 * ICR read retry counter

 */

DEFINE_PER_CPU(unsigned, icr_read_retry_count);



#ifdef CONFIG_X86_32



/*
@@ -255,7 +250,7 @@ u32 native_safe_apic_wait_icr_idle(void) 
		send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;

		if (!send_status)

			break;

		percpu_inc(icr_read_retry_count);

		inc_irq_stat(icr_read_retry_count);

		udelay(100);

	} while (timeout++ < 1000);

arch/x86/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int arch_show_interrupts(struct seq_file *p, int prec) 
	seq_printf(p, "  IRQ work interrupts\n");

	seq_printf(p, "%*s: ", prec, "RTR");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(icr_read_retry_count, j));

		seq_printf(p, "%10u ", irq_stats(j)->icr_read_retry_count);

	seq_printf(p, "  APIC ICR read retries\n");

#endif

	if (x86_platform_ipi_callback) {
@@ -140,7 +140,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu) 
	sum += irq_stats(cpu)->irq_spurious_count;

	sum += irq_stats(cpu)->apic_perf_irqs;

	sum += irq_stats(cpu)->apic_irq_work_irqs;

	sum += per_cpu(icr_read_retry_count, cpu);

	sum += irq_stats(cpu)->icr_read_retry_count;

#endif

	if (x86_platform_ipi_callback)

		sum += irq_stats(cpu)->x86_platform_ipis;