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 04/12] x86/apic: Move logical APIC ID away from apic_bsp_setup()
Date: Wed, 13 Sep 2017 17:12:47 +0800 [thread overview]
Message-ID: <1505293975-26005-5-git-send-email-douly.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1505293975-26005-1-git-send-email-douly.fnst@cn.fujitsu.com>
apic_bsp_setup() sets and returns logical APIC ID for initializing
cpu0_logical_apicid in SMP-capable system.
The id has nothing to do with the initialization of local APIC and
I/O APIC. And apic_bsp_setup() should be called for interrupt mode
setup intently.
Move the id setup into a separate helper function for cleanup and
mark apic_bsp_setup() void.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
---
arch/x86/include/asm/apic.h | 2 +-
arch/x86/kernel/apic/apic.c | 10 +---------
arch/x86/kernel/smpboot.c | 12 +++++++++++-
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 1a970f5..4e550c7 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -146,7 +146,7 @@ static inline int apic_force_enable(unsigned long addr)
extern int apic_force_enable(unsigned long addr);
#endif
-extern int apic_bsp_setup(bool upmode);
+extern void apic_bsp_setup(bool upmode);
extern void apic_ap_setup(void);
/*
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index ad37324..eafed8f 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2379,25 +2379,17 @@ static void __init apic_bsp_up_setup(void)
* Returns:
* apic_id of BSP APIC
*/
-int __init apic_bsp_setup(bool upmode)
+void __init apic_bsp_setup(bool upmode)
{
- int id;
-
connect_bsp_APIC();
if (upmode)
apic_bsp_up_setup();
setup_local_APIC();
- if (x2apic_mode)
- id = apic_read(APIC_LDR);
- else
- id = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));
-
enable_IO_APIC();
end_local_APIC_setup();
irq_remap_enable_fault_handling();
setup_IO_APIC();
- return id;
}
/*
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index dde8f1c..82f2e79 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1291,6 +1291,14 @@ static void __init smp_cpu_index_default(void)
}
}
+static void __init smp_get_logical_apicid(void)
+{
+ if (x2apic_mode)
+ cpu0_logical_apicid = apic_read(APIC_LDR);
+ else
+ cpu0_logical_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));
+}
+
/*
* Prepare for SMP bootup. The MP table or ACPI has been read
* earlier. Just do some sanity checking here and enable APIC mode.
@@ -1351,11 +1359,13 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
}
default_setup_apic_routing();
- cpu0_logical_apicid = apic_bsp_setup(false);
+ apic_bsp_setup(false);
/* Setup local timer */
x86_init.timers.setup_percpu_clockev();
+ smp_get_logical_apicid();
+
pr_info("CPU0: ");
print_cpu_info(&cpu_data(0));
--
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 ` Dou Liyang [this message]
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 ` [PATCH v9 09/12] x86/init: add intr_mode_init to x86_init_ops Dou Liyang
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-5-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®