x86: Allow platforms to force enable apic
PATCH 1/1 x86: Allow platforms to force enable apic
From: Thomas Gleixner <[email protected]>
Some embedded x86 platforms don't setup the APIC in the BIOS/bootloader and would be forced to add "lapic" on the kernel command line. That's a bit akward.
Split out the force enable code from detect_init_APIC() and allow platform code to call it from the platform setup.
--- arch/x86/include/asm/apic.h | 1 + arch/x86/kernel/apic/apic.c | 87 ++++++++++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 33 deletions(-)
arch/x86/include/asm/apic.h +1 -0
@@ -238,6 +238,7 @@ extern void setup_boot_APIC_clock(void);extern void setup_secondary_APIC_clock (void );extern int APIC_init_uniprocessor (void );extern void enable_NMI_through_LVT0 (void ); +extern int apic_force_enable (void );/* * On 32bit this is mach-xxx local
arch/x86/kernel/apic/apic.c +54 -33
105 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 1/1 x86/apic: move probe_nr_irqs_gsi() into ioapic_init_mappings()
From: Thomas Gleixner <[email protected]>
It is called right after ioapic_init_mappings() and there are no other users. Move into ioapic_init_mappings() so the declaration can disappear and the function can become static.
--- arch/x86/include/asm/io_apic.h | 3 --- arch/x86/kernel/apic/io_apic.c | 4 +++- arch/x86/kernel/setup.c | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-)
arch/x86/include/asm/io_apic.h +0 -3
@@ -168,8 +168,6 @@ extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);extern void mask_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries);extern int restore_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries); -extern void probe_nr_irqs_gsi (void ); - extern int setup_ioapic_entry(int apic, int irq, struct IO_APIC_route_entry *entry, unsigned int destination, int trigger,
@@ -196,7 +194,6 @@ extern void __init pre_init_apic_IRQ0(void);static const int timer_through_8259 =0 ;static inline void ioapic_init_mappings (void ) { }static inline void ioapic_insert_resources (void ) { } -static inline void probe_nr_irqs_gsi (void ) { }#define gsi_top (NR_IRQS_LEGACY)static inline int mp_find_ioapic (u32 gsi) {return 0 ; }
arch/x86/kernel/apic/io_apic.c +3 -1
@@ -3856,7 +3856,7 @@ int __init io_apic_get_redir_entries (int ioapic)return reg_01.bits.entries +1 ; } -void __init probe_nr_irqs_gsi (void ) +static void __init probe_nr_irqs_gsi (void ) {int nr;
@@ -4210,6 +4210,8 @@ fake_ioapic_page: ioapic_res->end = ioapic_phys +IO_APIC_SLOT_SIZE -1 ; ioapic_res++; } + +probe_nr_irqs_gsi (); }void __init ioapic_insert_resources (void )
arch/x86/kernel/setup.c +0 -3
@@ -1055,9 +1055,6 @@ void __init setup_arch(char **cmdline_p)init_apic_mappings ();ioapic_init_mappings (); -/* need to wait for io_apic is mapped */ -probe_nr_irqs_gsi (); -kvm_guest_init ();e820_reserve_resources ();
Signature · 1 line
1.7.2.3
[tip:x86/apic] x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
Commit-ID: 77966712d17bd44e8ea2d106c37223ef7938ee66 Gitweb: http://git.kernel.org/tip/77966712d17bd44e8ea2d106c37223ef7938ee66 Author: Thomas Gleixner <[email protected]> AuthorDate: Fri, 15 Oct 2010 15:38:50 -0700 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 23 Oct 2010 10:43:33 +0200
x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
probe_br_irqs_gsi() is called right after ioapic_init_mappings() and there are no other users. Move it into ioapic_init_mappings() so the declaration can disappear and the function can become static.
Rename ioapic_init_mappings() to ioapic_and_gsi_init() to reflect that change.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io_apic.h | 5 +---- arch/x86/kernel/apic/io_apic.c | 6 ++++-- arch/x86/kernel/setup.c | 5 +---- 3 files changed, 6 insertions(+), 10 deletions(-)
arch/x86/include/asm/io_apic.h +1 -4
@@ -159,7 +159,7 @@ struct io_apic_irq_attr;extern int io_apic_set_pci_routing (struct device *dev,int irq,struct io_apic_irq_attr *irq_attr);void setup_IO_APIC_irq_extra (u32 gsi); -extern void ioapic_init_mappings (void ); +extern void ioapic_and_gsi_init (void );extern void ioapic_insert_resources (void );extern struct IO_APIC_route_entry **alloc_ioapic_entries (void );
@@ -168,8 +168,6 @@ extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);extern void mask_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries);extern int restore_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries); -extern void probe_nr_irqs_gsi (void ); -extern void setup_ioapic_ids_from_mpc (void );struct mp_ioapic_gsi {
@@ -190,7 +188,6 @@ extern void __init pre_init_apic_IRQ0(void);static const int timer_through_8259 =0 ;static inline void ioapic_init_mappings (void ) { }static inline void ioapic_insert_resources (void ) { } -static inline void probe_nr_irqs_gsi (void ) { }#define gsi_top (NR_IRQS_LEGACY)static inline int mp_find_ioapic (u32 gsi) {return 0 ; }
arch/x86/kernel/apic/io_apic.c +4 -2
@@ -3639,7 +3639,7 @@ int __init io_apic_get_redir_entries (int ioapic)return reg_01.bits.entries +1 ; } -void __init probe_nr_irqs_gsi (void ) +static void __init probe_nr_irqs_gsi (void ) {int nr;
@@ -3951,7 +3951,7 @@ static struct resource * __init ioapic_setup_resources(int nr_ioapics)return res; } -void __init ioapic_init_mappings (void ) +void __init ioapic_and_gsi_init (void ) {unsigned long ioapic_phys, idx =FIX_IO_APIC_BASE_0 ;struct resource *ioapic_res;
@@ -3989,6 +3989,8 @@ fake_ioapic_page: ioapic_res->end = ioapic_phys +IO_APIC_SLOT_SIZE -1 ; ioapic_res++; } + +probe_nr_irqs_gsi (); }void __init ioapic_insert_resources (void )
arch/x86/kernel/setup.c +1 -4
@@ -1033,10 +1033,7 @@ void __init setup_arch(char **cmdline_p)#endif init_apic_mappings (); -ioapic_init_mappings (); - -/* need to wait for io_apic is mapped */ -probe_nr_irqs_gsi (); +ioapic_and_gsi_init ();kvm_guest_init ();
[tip:x86/apic] x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
In reply to [email protected]Commit-ID: 23f9b267159b4c7ff59d2e6c8ed31693eff841e3 Gitweb: http://git.kernel.org/tip/23f9b267159b4c7ff59d2e6c8ed31693eff841e3 Author: Thomas Gleixner <[email protected]> AuthorDate: Fri, 15 Oct 2010 15:38:50 -0700 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 23 Oct 2010 17:27:50 +0200
x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
probe_br_irqs_gsi() is called right after ioapic_init_mappings() and there are no other users. Move it into ioapic_init_mappings() so the declaration can disappear and the function can become static.
Rename ioapic_init_mappings() to ioapic_and_gsi_init() to reflect that change.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/io_apic.h | 5 +---- arch/x86/kernel/apic/io_apic.c | 6 ++++-- arch/x86/kernel/setup.c | 5 +---- 3 files changed, 6 insertions(+), 10 deletions(-)
arch/x86/include/asm/io_apic.h +1 -4
@@ -159,7 +159,7 @@ struct io_apic_irq_attr;extern int io_apic_set_pci_routing (struct device *dev,int irq,struct io_apic_irq_attr *irq_attr);void setup_IO_APIC_irq_extra (u32 gsi); -extern void ioapic_init_mappings (void ); +extern void ioapic_and_gsi_init (void );extern void ioapic_insert_resources (void );extern struct IO_APIC_route_entry **alloc_ioapic_entries (void );
@@ -168,8 +168,6 @@ extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);extern void mask_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries);extern int restore_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries); -extern void probe_nr_irqs_gsi (void ); -extern void setup_ioapic_ids_from_mpc (void );struct mp_ioapic_gsi {
@@ -190,7 +188,6 @@ extern void __init pre_init_apic_IRQ0(void);static const int timer_through_8259 =0 ;static inline void ioapic_init_mappings (void ) { }static inline void ioapic_insert_resources (void ) { } -static inline void probe_nr_irqs_gsi (void ) { }#define gsi_top (NR_IRQS_LEGACY)static inline int mp_find_ioapic (u32 gsi) {return 0 ; }
arch/x86/kernel/apic/io_apic.c +4 -2
@@ -3639,7 +3639,7 @@ int __init io_apic_get_redir_entries (int ioapic)return reg_01.bits.entries +1 ; } -void __init probe_nr_irqs_gsi (void ) +static void __init probe_nr_irqs_gsi (void ) {int nr;
@@ -3951,7 +3951,7 @@ static struct resource * __init ioapic_setup_resources(int nr_ioapics)return res; } -void __init ioapic_init_mappings (void ) +void __init ioapic_and_gsi_init (void ) {unsigned long ioapic_phys, idx =FIX_IO_APIC_BASE_0 ;struct resource *ioapic_res;
@@ -3989,6 +3989,8 @@ fake_ioapic_page: ioapic_res->end = ioapic_phys +IO_APIC_SLOT_SIZE -1 ; ioapic_res++; } + +probe_nr_irqs_gsi (); }void __init ioapic_insert_resources (void )
arch/x86/kernel/setup.c +1 -4
@@ -1017,10 +1017,7 @@ void __init setup_arch(char **cmdline_p)#endif init_apic_mappings (); -ioapic_init_mappings (); - -/* need to wait for io_apic is mapped */ -probe_nr_irqs_gsi (); +ioapic_and_gsi_init ();kvm_guest_init ();
Commit-ID: f6e3a8e1bacfe5013becf416ce9dd2cb025d4177 Gitweb: http://git.kernel.org/tip/f6e3a8e1bacfe5013becf416ce9dd2cb025d4177 Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 19 Oct 2010 10:46:28 -0700 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 23 Oct 2010 10:43:19 +0200
x86: Allow platforms to force enable apic
Some embedded x86 platforms don't setup the APIC in the BIOS/bootloader and would be forced to add "lapic" on the kernel command line. That's a bit akward.
Split out the force enable code from detect_init_APIC() and allow platform code to call it from the platform setup. That avoids the command line parameter and possible replication of the MSR dance in the force enable code.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/apic.h | 1 + arch/x86/kernel/apic/apic.c | 87 ++++++++++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 33 deletions(-)
arch/x86/include/asm/apic.h +1 -0
@@ -238,6 +238,7 @@ extern void setup_boot_APIC_clock(void);extern void setup_secondary_APIC_clock (void );extern int APIC_init_uniprocessor (void );extern void enable_NMI_through_LVT0 (void ); +extern int apic_force_enable (void );/* * On 32bit this is mach-xxx local
arch/x86/kernel/apic/apic.c +54 -33
105 lines not on this page · raw message
Commit-ID: 5a7ae78fd478624df3059cb6f55056b85d074acc Gitweb: http://git.kernel.org/tip/5a7ae78fd478624df3059cb6f55056b85d074acc Author: Thomas Gleixner <[email protected]> AuthorDate: Tue, 19 Oct 2010 10:46:28 -0700 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 23 Oct 2010 17:27:43 +0200
x86: Allow platforms to force enable apic
Some embedded x86 platforms don't setup the APIC in the BIOS/bootloader and would be forced to add "lapic" on the kernel command line. That's a bit akward.
Split out the force enable code from detect_init_APIC() and allow platform code to call it from the platform setup. That avoids the command line parameter and possible replication of the MSR dance in the force enable code.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/apic.h | 1 + arch/x86/kernel/apic/apic.c | 87 ++++++++++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 33 deletions(-)
arch/x86/include/asm/apic.h +1 -0
@@ -238,6 +238,7 @@ extern void setup_boot_APIC_clock(void);extern void setup_secondary_APIC_clock (void );extern int APIC_init_uniprocessor (void );extern void enable_NMI_through_LVT0 (void ); +extern int apic_force_enable (void );/* * On 32bit this is mach-xxx local
arch/x86/kernel/apic/apic.c +54 -33
105 lines not on this page · raw message