redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

x86/apic: Consolidate the apic local headers 

Now there are three small local headers. Some contain functions which are
only used in one source file.

Move all the inlines and declarations into a single local header and the
inlines which are only used in one source file into that.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190722105219.618612624@linutronix.de
alistair/sunxi64-5.4-dsi
Thomas Gleixner 2019-07-22 20:47:14 +02:00
parent ba77b2a02e
commit c94f0718fb
12 changed files with 83 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/apic/apic_flat_64.c
View File

@ -15,8 +15,7 @@
#include <asm/jailhouse_para.h>
#include <asm/apic.h>
#include "apic_flat_64.h"
#include "ipi.h"
#include "local.h"
static struct apic apic_physflat;
static struct apic apic_flat;

8
arch/x86/kernel/apic/apic_flat_64.h
View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_APIC_FLAT_64_H
#define _ASM_X86_APIC_FLAT_64_H
extern void flat_init_apic_ldr(void);
#endif

3
arch/x86/kernel/apic/apic_numachip.c
View File

@ -18,8 +18,7 @@
#include <asm/pgtable.h>
#include "apic_flat_64.h"
#include "ipi.h"
#include "local.h"
u8 numachip_system __read_mostly;
static const struct apic apic_numachip1;

2
arch/x86/kernel/apic/bigsmp_32.c
View File

@ -10,7 +10,7 @@
#include <asm/apic.h>
#include "ipi.h"
#include "local.h"
static unsigned bigsmp_get_apic_id(unsigned long x)
{

14
arch/x86/kernel/apic/ipi.c
View File

@ -1,10 +1,20 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/cpumask.h>
#include <linux/smp.h>
#include <asm/apic.h>
#include "local.h"
#include "ipi.h"
static inline int __prepare_ICR2(unsigned int mask)
{
return SET_APIC_DEST_FIELD(mask);
}
static inline void __xapic_wait_icr_idle(void)
{
while (native_apic_mem_read(APIC_ICR) & APIC_ICR_BUSY)
cpu_relax();
}
void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest)
{

90
arch/x86/kernel/apic/ipi.h
View File

@ -1,90 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _ASM_X86_IPI_H
#define _ASM_X86_IPI_H
#ifdef CONFIG_X86_LOCAL_APIC
/*
* Copyright 2004 James Cleverdon, IBM.
*
* Generic APIC InterProcessor Interrupt code.
*
* Moved to include file by James Cleverdon from
* arch/x86-64/kernel/smp.c
*
* Copyrights from kernel/smp.c:
*
* (c) 1995 Alan Cox, Building #3 <alan@redhat.com>
* (c) 1998-99, 2000 Ingo Molnar <mingo@redhat.com>
* (c) 2002,2003 Andi Kleen, SuSE Labs.
*/
#include <asm/hw_irq.h>
#include <asm/apic.h>
#include <asm/smp.h>
/*
* the following functions deal with sending IPIs between CPUs.
*
* We use 'broadcast', CPU->CPU IPIs and self-IPIs too.
*/
static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector,
unsigned int dest)
{
unsigned int icr = shortcut | dest;
switch (vector) {
default:
icr |= APIC_DM_FIXED | vector;
break;
case NMI_VECTOR:
icr |= APIC_DM_NMI;
break;
}
return icr;
}
static inline int __prepare_ICR2(unsigned int mask)
{
return SET_APIC_DEST_FIELD(mask);
}
static inline void __xapic_wait_icr_idle(void)
{
while (native_apic_mem_read(APIC_ICR) & APIC_ICR_BUSY)
cpu_relax();
}
void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest);
/*
* This is used to send an IPI with no shorthand notation (the destination is
* specified in bits 56 to 63 of the ICR).
*/
void __default_send_IPI_dest_field(unsigned int mask, int vector, unsigned int dest);
extern void default_send_IPI_single(int cpu, int vector);
extern void default_send_IPI_single_phys(int cpu, int vector);
extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask,
int vector);
extern void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask,
int vector);
extern int no_broadcast;
#ifdef CONFIG_X86_32
extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask,
int vector);
extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask,
int vector);
extern void default_send_IPI_mask_logical(const struct cpumask *mask,
int vector);
extern void default_send_IPI_allbutself(int vector);
extern void default_send_IPI_all(int vector);
extern void default_send_IPI_self(int vector);
#endif
#endif
#endif /* _ASM_X86_IPI_H */

63
arch/x86/kernel/apic/local.h 100644
View File

@ -0,0 +1,63 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Historical copyright notices:
*
* Copyright 2004 James Cleverdon, IBM.
* (c) 1995 Alan Cox, Building #3 <alan@redhat.com>
* (c) 1998-99, 2000 Ingo Molnar <mingo@redhat.com>
* (c) 2002,2003 Andi Kleen, SuSE Labs.
*/
#include <asm/apic.h>
/* APIC flat 64 */
void flat_init_apic_ldr(void);
/* X2APIC */
int x2apic_apic_id_valid(u32 apicid);
int x2apic_apic_id_registered(void);
void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest);
unsigned int x2apic_get_apic_id(unsigned long id);
u32 x2apic_set_apic_id(unsigned int id);
int x2apic_phys_pkg_id(int initial_apicid, int index_msb);
void x2apic_send_IPI_self(int vector);
/* IPI */
static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector,
unsigned int dest)
{
unsigned int icr = shortcut | dest;
switch (vector) {
default:
icr |= APIC_DM_FIXED | vector;
break;
case NMI_VECTOR:
icr |= APIC_DM_NMI;
break;
}
return icr;
}
void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest);
/*
* This is used to send an IPI with no shorthand notation (the destination is
* specified in bits 56 to 63 of the ICR).
*/
void __default_send_IPI_dest_field(unsigned int mask, int vector, unsigned int dest);
void default_send_IPI_single(int cpu, int vector);
void default_send_IPI_single_phys(int cpu, int vector);
void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, int vector);
void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask, int vector);
extern int no_broadcast;
#ifdef CONFIG_X86_32
void default_send_IPI_mask_sequence_logical(const struct cpumask *mask, int vector);
void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask, int vector);
void default_send_IPI_mask_logical(const struct cpumask *mask, int vector);
void default_send_IPI_allbutself(int vector);
void default_send_IPI_all(int vector);
void default_send_IPI_self(int vector);
#endif

3
arch/x86/kernel/apic/probe_32.c
View File

@ -8,11 +8,12 @@
*/
#include <linux/export.h>
#include <linux/errno.h>
#include <linux/smp.h>
#include <asm/apic.h>
#include <asm/acpi.h>
#include "ipi.h"
#include "local.h"
#ifdef CONFIG_HOTPLUG_CPU
#define DEFAULT_SEND_IPI (1)

2
arch/x86/kernel/apic/probe_64.c
View File

@ -10,7 +10,7 @@
*/
#include <asm/apic.h>
#include "ipi.h"
#include "local.h"
/*
* Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.

9
arch/x86/kernel/apic/x2apic.h
View File

@ -1,9 +0,0 @@
/* Common bits for X2APIC cluster/physical modes. */
int x2apic_apic_id_valid(u32 apicid);
int x2apic_apic_id_registered(void);
void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest);
unsigned int x2apic_get_apic_id(unsigned long id);
u32 x2apic_set_apic_id(unsigned int id);
int x2apic_phys_pkg_id(int initial_apicid, int index_msb);
void x2apic_send_IPI_self(int vector);

2
arch/x86/kernel/apic/x2apic_cluster.c
View File

@ -7,7 +7,7 @@
#include <asm/apic.h>
#include "x2apic.h"
#include "local.h"
struct cluster_mask {
unsigned int clusterid;

3
arch/x86/kernel/apic/x2apic_phys.c
View File

@ -3,8 +3,7 @@
#include <linux/cpumask.h>
#include <linux/acpi.h>
#include "x2apic.h"
#include "ipi.h"
#include "local.h"
int x2apic_phys;