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>,
<ebiederm@xmission.com>, <bhe@redhat.com>,
<izumi.taku@jp.fujitsu.com>,
Dou Liyang <douly.fnst@cn.fujitsu.com>
Subject: [RFC PATCH v3 02/12] x86/apic: Construct a selector for the interrupt delivery mode
Date: Wed, 10 May 2017 21:44:39 +0800 [thread overview]
Message-ID: <1494423889-25799-3-git-send-email-douly.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1494423889-25799-1-git-send-email-douly.fnst@cn.fujitsu.com>
Now, there are many switches in kernel which are used to determine
the final interrupt delivery mode, as shown below:
1) kconfig:
CONFIG_X86_64; CONFIG_X86_LOCAL_APIC; CONFIG_x86_IO_APIC
2) kernel option: disable_apic; skip_ioapic_setup
3) CPU Capability: boot_cpu_has(X86_FEATURE_APIC)
4) MP table: smp_found_config
5) ACPI: acpi_lapic; acpi_ioapic; nr_ioapic
These switches are disordered and scattered and there are also some
dependencies between each other. These make the code difficult to
maintain and read.
Construct a selector to unify them into a single function, then,
Use this selector to get an interrupt delivery mode directly.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
---
The selector logic:
+------------+
|disable_apic+--------------------+
+------------+ true |
|false |
| |
+------------v------------------+ |
|!boot_cpu_has(X86_FEATURE_APIC)+-------+
+-------------------------------+ true |
|false |
| |
+-------v---------+ v
|!smp_found_config| PIC MODE
+---------------+-+
|false |true
| |
v +---v---------+
SYMMETRIC IO MODE | !acpi_lapic |
+------+------+
|
v
VIRTUAL WIRE MODE
v2 --> v3:
modify some comments.
arch/x86/kernel/apic/apic.c | 61 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 6bf7249..3342f144 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1157,6 +1157,67 @@ void __init sync_Arb_IDs(void)
APIC_INT_LEVELTRIG | APIC_DM_INIT);
}
+enum apic_interrupt_mode {
+ APIC_PIC = 0,
+ APIC_VIRTUAL_WIRE,
+ APIC_SYMMETRIC_IO,
+ APIC_MODE_COUNT
+};
+
+static int __init apic_interrupt_mode_select(void)
+{
+ /* Check kernel option */
+ if (disable_apic) {
+ pr_info("APIC disabled via kernel command line\n");
+ return APIC_PIC;
+ }
+
+ /* Check BIOS */
+#ifdef CONFIG_X86_64
+ /* On 64-bit, the APIC must be integrated */
+ if (!boot_cpu_has(X86_FEATURE_APIC)) {
+ disable_apic = 1;
+ pr_info("APIC disabled by BIOS\n");
+ return APIC_PIC;
+ }
+#else
+ /*
+ * On 32-bit, check whether there is a separate chip or integrated
+ * APIC
+ */
+
+ /* Has a local APIC ? */
+ if (!boot_cpu_has(X86_FEATURE_APIC) &&
+ APIC_INTEGRATED(boot_cpu_apic_version)) {
+ disable_apic = 1;
+ pr_err(FW_BUG "Local APIC %d not detected, force emulation\n",
+ boot_cpu_physical_apicid);
+ return APIC_PIC;
+ }
+
+ /* Has a separate chip ? */
+ if (!boot_cpu_has(X86_FEATURE_APIC) && !smp_found_config) {
+ disable_apic = 1;
+
+ return APIC_PIC;
+ }
+#endif
+
+ /* Check MP table or ACPI MADT configuration */
+ if (!smp_found_config) {
+ disable_ioapic_support();
+
+ if (!acpi_lapic)
+ pr_info("ACPI MADT or MP table not detected\n");
+
+ return APIC_VIRTUAL_WIRE;
+ }
+
+ /* Other checks of APIC options will be done in each setup function */
+
+ return APIC_SYMMETRIC_IO;
+}
+
/*
* Setup the through-local-APIC virtual wire mode.
*/
--
2.5.5
next prev parent reply other threads:[~2017-05-10 13:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-10 13:44 [RFC PATCH v3 00/12] Unify interrupt mode and setup it as soon as possible Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 01/12] x86/apic: Replace init_bsp_APIC() with apic_virtual_wire_mode_setup() Dou Liyang
2017-05-10 13:44 ` Dou Liyang [this message]
2017-05-10 13:44 ` [RFC PATCH v3 03/12] x86/apic: Prepare for unifying the interrupt delivery modes setup Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 04/12] x86/time: Initialize interrupt mode behind timer init Dou Liyang
2017-06-06 6:00 ` [RFC PATCH v4 " Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 05/12] x86/ioapic: Refactor the delay logic in timer_irq_works() Dou Liyang
2017-05-26 8:10 ` [RFC PATCH v4 " Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 06/12] x86/apic: Split local APIC timer setup from the APIC setup Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 07/12] x86/apic: Move the logical APIC ID setup from apic_bsp_setup() Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 08/12] x86/apic: Make interrupt mode setup earlier for SMP-capable system Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 09/12] x86/apic: Setup interrupt mode earlier in case of no SMP motherboard Dou Liyang
2017-05-12 9:55 ` [RFC PATCH v4 " Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 10/12] x86/apic: Make the interrupt mode setup earlier for UP system Dou Liyang
2017-05-11 10:57 ` [RFC PATCH v4 " Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 11/12] x86/apic: Mark the apic_interrupt_mode extern for disable_smp() Dou Liyang
2017-05-10 13:44 ` [RFC PATCH v3 12/12] x86/apic: Remove the apic_virtual_wire_mode_setup() Dou Liyang
2017-05-22 20:23 ` [RFC PATCH v3 00/12] Unify interrupt mode and setup it as soon as possible Thomas Gleixner
2017-05-23 1:29 ` Dou Liyang
2017-06-06 6:50 ` Dou Liyang
2017-06-26 10:08 ` Dou Liyang
2017-06-26 11:50 ` Thomas Gleixner
2017-06-27 1:50 ` 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=1494423889-25799-3-git-send-email-douly.fnst@cn.fujitsu.com \
--to=douly.fnst@cn.fujitsu.com \
--cc=bhe@redhat.com \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.