From: Cao jin <caoj.fnst@cn.fujitsu.com>
To: <x86@kernel.org>, <linux-pm@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-acpi@vger.kernel.org>
Cc: <rjw@rjwysocki.net>, <len.brown@intel.com>, <pavel@ucw.cz>,
<tglx@linutronix.de>, <mingo@redhat.com>, <hpa@zytor.com>
Subject: [RFC PATCH 1/2] x86/acpi: Improve code readablity of early madt processing
Date: Thu, 23 Jan 2020 09:41:43 +0800 [thread overview]
Message-ID: <20200123014144.19155-2-caoj.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <20200123014144.19155-1-caoj.fnst@cn.fujitsu.com>
Current processing logic is confusing.
Return value of early_acpi_parse_madt_lapic_addr_ovr() indicates error(< 0),
parsed entry number(>= 0). So, it makes no sense to initialize acpi_lapic &
smp_found_config seeing no override entry, instead, initialize them seeing
MADT.
Put register_lapic_address() into override entry processing doesn't make
sense either.
Improved all the related comments too.
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
arch/x86/kernel/acpi/boot.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 04205ce127a1..2131035bba98 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1003,11 +1003,7 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
}
#ifdef CONFIG_X86_LOCAL_APIC
-/*
- * Parse LAPIC entries in MADT
- * returns 0 on success, < 0 on error
- */
-
+/* Returns >= 0 on success, indicates parsed entry number; < 0 on error. */
static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
{
int count;
@@ -1025,11 +1021,8 @@ static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
if (count < 0) {
printk(KERN_ERR PREFIX
"Error parsing LAPIC address override entry\n");
- return count;
}
- register_lapic_address(acpi_lapic_addr);
-
return count;
}
@@ -1234,19 +1227,16 @@ static inline int acpi_parse_madt_ioapic_entries(void)
static void __init early_acpi_process_madt(void)
{
#ifdef CONFIG_X86_LOCAL_APIC
- int error;
+ int ret;
if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {
+ /* Found MADT */
+ acpi_lapic = 1;
+ smp_found_config = 1;
- /*
- * Parse MADT LAPIC entries
- */
- error = early_acpi_parse_madt_lapic_addr_ovr();
- if (!error) {
- acpi_lapic = 1;
- smp_found_config = 1;
- }
- if (error == -EINVAL) {
+ /* See if override entry exists. */
+ ret = early_acpi_parse_madt_lapic_addr_ovr();
+ if (ret == -EINVAL) {
/*
* Dell Precision Workstation 410, 610 come here.
*/
@@ -1254,6 +1244,8 @@ static void __init early_acpi_process_madt(void)
"Invalid BIOS MADT, disabling ACPI\n");
disable_acpi();
}
+
+ register_lapic_address(acpi_lapic_addr);
}
#endif
}
--
2.21.0
next prev parent reply other threads:[~2020-01-23 1:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 1:41 [RFC PATCH 0/2] x86/boot: early ACPI MADT processing cleanup Cao jin
2020-01-23 1:41 ` Cao jin [this message]
2020-02-24 13:21 ` [RFC PATCH 1/2] x86/acpi: Improve code readablity of early madt processing Borislav Petkov
2020-02-25 7:02 ` Cao jin
2020-03-16 9:20 ` Cao jin
2020-01-23 1:41 ` [RFC PATCH 2/2] x86/acpi: Cleanup acpi_process_madt() Cao jin
2020-02-19 7:32 ` [RFC PATCH 0/2] x86/boot: early ACPI MADT processing cleanup Cao jin
2020-03-27 12:30 ` Cao jin
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=20200123014144.19155-2-caoj.fnst@cn.fujitsu.com \
--to=caoj.fnst@cn.fujitsu.com \
--cc=hpa@zytor.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).