Commit b3545192 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

locking, arch/ia64: Reduce <asm/smp.h> header dependencies by moving XTP bits... 


locking, arch/ia64: Reduce <asm/smp.h> header dependencies by moving XTP bits into the new <asm/xtp.h> header

We want to remove the #include <asm/io.h> from <asm/smp.h>, but for this
we have to move the XTP bits into a separate header first (as these bits
rely on <asm/io.h> definitions), and include them in the .c files that rely
on those APIs.

Co-developed-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 13c01139

arch/ia64/include/asm/smp.h

+0 −35
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/bitops.h>

#include <linux/irqreturn.h>



#include <asm/io.h>

#include <asm/param.h>

#include <asm/processor.h>

#include <asm/ptrace.h>
@@ -44,11 +43,6 @@ ia64_get_lid (void) 


#ifdef CONFIG_SMP



#define XTP_OFFSET		0x1e0008



#define SMP_IRQ_REDIRECTION	(1 << 0)

#define SMP_IPI_REDIRECTION	(1 << 1)



#define raw_smp_processor_id() (current_thread_info()->cpu)



extern struct smp_boot_data {
@@ -62,7 +56,6 @@ extern cpumask_t cpu_core_map[NR_CPUS]; 
DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);

extern int smp_num_siblings;

extern void __iomem *ipi_base_addr;

extern unsigned char smp_int_redirect;



extern volatile int ia64_cpu_to_sapicid[];

#define cpu_physical_id(i)	ia64_cpu_to_sapicid[i]
@@ -84,34 +77,6 @@ cpu_logical_id (int cpuid) 
	return i;

}



/*

 * XTP control functions:

 *	min_xtp   : route all interrupts to this CPU

 *	normal_xtp: nominal XTP value

 *	max_xtp   : never deliver interrupts to this CPU.

 */



static inline void

min_xtp (void)

{

	if (smp_int_redirect & SMP_IRQ_REDIRECTION)

		writeb(0x00, ipi_base_addr + XTP_OFFSET); /* XTP to min */

}



static inline void

normal_xtp (void)

{

	if (smp_int_redirect & SMP_IRQ_REDIRECTION)

		writeb(0x08, ipi_base_addr + XTP_OFFSET); /* XTP normal */

}



static inline void

max_xtp (void)

{

	if (smp_int_redirect & SMP_IRQ_REDIRECTION)

		writeb(0x0f, ipi_base_addr + XTP_OFFSET); /* Set XTP to max */

}



/* Upping and downing of CPUs */

extern int __cpu_disable (void);

extern void __cpu_die (unsigned int cpu);

arch/ia64/include/asm/xtp.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_IA64_XTP_H

#define _ASM_IA64_XTP_H



#include <asm/io.h>



#ifdef CONFIG_SMP



#define XTP_OFFSET		0x1e0008



#define SMP_IRQ_REDIRECTION	(1 << 0)

#define SMP_IPI_REDIRECTION	(1 << 1)



extern unsigned char smp_int_redirect;



/*

 * XTP control functions:

 *	min_xtp   : route all interrupts to this CPU

 *	normal_xtp: nominal XTP value

 *	max_xtp   : never deliver interrupts to this CPU.

 */



static inline void

min_xtp (void)

{

	if (smp_int_redirect & SMP_IRQ_REDIRECTION)

		writeb(0x00, ipi_base_addr + XTP_OFFSET); /* XTP to min */

}



static inline void

normal_xtp (void)

{

	if (smp_int_redirect & SMP_IRQ_REDIRECTION)

		writeb(0x08, ipi_base_addr + XTP_OFFSET); /* XTP normal */

}



static inline void

max_xtp (void)

{

	if (smp_int_redirect & SMP_IRQ_REDIRECTION)

		writeb(0x0f, ipi_base_addr + XTP_OFFSET); /* Set XTP to max */

}



#endif /* CONFIG_SMP */



#endif /* _ASM_IA64_XTP_Hy */

arch/ia64/kernel/iosapic.c

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
#include <asm/iosapic.h>

#include <asm/processor.h>

#include <asm/ptrace.h>

#include <asm/xtp.h>



#undef DEBUG_INTERRUPT_ROUTING

arch/ia64/kernel/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/kernel_stat.h>



#include <asm/mca.h>

#include <asm/xtp.h>



/*

 * 'what should we do if we get a hw irq event on an illegal vector'.

arch/ia64/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <linux/uaccess.h>

#include <asm/unwind.h>

#include <asm/user.h>

#include <asm/xtp.h>



#include "entry.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE