From: Dou Liyang <douly.fnst@cn.fujitsu.com>
To: <x86@kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <tglx@linutronix.de>, <mingo@kernel.org>, <hpa@zytor.com>,
<yinghai@kernel.org>, <bhe@redhat.com>,
Dou Liyang <douly.fnst@cn.fujitsu.com>
Subject: [PATCH v9 09/12] x86/init: add intr_mode_init to x86_init_ops
Date: Wed, 13 Sep 2017 17:12:52 +0800 [thread overview]
Message-ID: <1505293975-26005-10-git-send-email-douly.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1505293975-26005-1-git-send-email-douly.fnst@cn.fujitsu.com>
X86 and XEN initialize interrupt delivery mode in different way.
Ordinary conditional function calls will make the code mess.
Add an unconditional x86_init_ops function which defaults to the
standard function and can be overridden by the early platform code.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
---
arch/x86/include/asm/x86_init.h | 2 ++
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/smpboot.c | 2 +-
arch/x86/kernel/x86_init.c | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 7ba7e90..f45acdf 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -50,11 +50,13 @@ struct x86_init_resources {
* are set up.
* @intr_init: interrupt init code
* @trap_init: platform specific trap setup
+ * @intr_mode_init: interrupt delivery mode setup
*/
struct x86_init_irqs {
void (*pre_vector_init)(void);
void (*intr_init)(void);
void (*trap_init)(void);
+ void (*intr_mode_init)(void);
};
/**
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index efc5fbd..8dbcff2 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2423,7 +2423,7 @@ void __init apic_bsp_setup(bool upmode)
#ifdef CONFIG_UP_LATE_INIT
void __init up_late_init(void)
{
- apic_intr_mode_init();
+ x86_init.irqs.intr_mode_init();
if (apic_intr_mode == APIC_PIC)
return;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index fa535d4..76fc857 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1293,7 +1293,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
set_cpu_sibling_map(0);
- apic_intr_mode_init();
+ x86_init.irqs.intr_mode_init();
smp_sanity_check();
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index a088b2c..a7889b9 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -55,6 +55,7 @@ struct x86_init_ops x86_init __initdata = {
.pre_vector_init = init_ISA_irqs,
.intr_init = native_init_IRQ,
.trap_init = x86_init_noop,
+ .intr_mode_init = apic_intr_mode_init
},
.oem = {
--
2.5.5
next prev parent reply other threads:[~2017-09-13 9:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-13 9:12 [PATCH v9 00/12] Unify the interrupt delivery mode and do its setup in advance Dou Liyang
2017-09-13 9:12 ` [PATCH v9 01/12] x86/apic: Construct a selector for the interrupt delivery mode Dou Liyang
2017-09-13 9:12 ` [PATCH v9 02/12] x86/apic: Prepare for unifying the interrupt delivery modes setup Dou Liyang
2017-09-13 9:12 ` [PATCH v9 03/12] x86/apic: Split local APIC timer setup from the APIC setup Dou Liyang
2017-09-13 9:12 ` [PATCH v9 04/12] x86/apic: Move logical APIC ID away from apic_bsp_setup() Dou Liyang
2017-09-13 9:12 ` [PATCH v9 05/12] x86/apic: Unify interrupt mode setup for SMP-capable system Dou Liyang
2017-09-13 9:12 ` [PATCH v9 06/12] x86/apic: Mark the apic_intr_mode extern for sanity check cleanup Dou Liyang
2017-09-13 9:12 ` [PATCH v9 07/12] x86/apic: Unify interrupt mode setup for UP system Dou Liyang
2017-09-13 9:12 ` [PATCH v9 08/12] x86/ioapic: Refactor the delay logic in timer_irq_works() Dou Liyang
2017-09-13 9:12 ` Dou Liyang [this message]
2017-09-13 9:12 ` [PATCH v9 10/12] x86/xen: Bypass intr mode setup in enlighten_pv system Dou Liyang
2017-09-13 9:45 ` [Xen-devel] " Juergen Gross
2017-09-13 10:09 ` Dou Liyang
2017-09-13 10:22 ` [PATCH v10 " Dou Liyang
2017-09-13 9:12 ` [PATCH v9 11/12] x86/time: Initialize interrupt mode behind timer init Dou Liyang
2017-09-13 9:12 ` [PATCH v9 12/12] x86/apic: Remove the init_bsp_APIC() Dou Liyang
2017-09-13 9:17 ` [PATCH v9] ACPI / init: Invoke early ACPI initialization earlier Dou Liyang
2017-09-27 1:41 ` Dou Liyang
2017-09-27 7:19 ` Thomas Gleixner
2017-09-27 7:33 ` Dou Liyang
2017-09-27 9:02 ` Borislav Petkov
2017-09-27 10:06 ` Dou Liyang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1505293975-26005-10-git-send-email-douly.fnst@cn.fujitsu.com \
--to=douly.fnst@cn.fujitsu.com \
--cc=bhe@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®