x86/ACPI: Insert missing newlines into FACS error messages

[PATCH] x86/ACPI: Insert missing newlines into FACS error messages

Posted by Andrew Cooper 2 years, 8 months ago

Booting Xen as a PVH guest currently yields:

  (XEN) ACPI: SLEEP INFO: pm1x_cnt[1:b004,1:0], pm1x_evt[1:b000,1:0]
  (XEN) ACPI: FACS is not 64-byte aligned: 0xfc001010<2>ACPI: wakeup_vec[fc00101c], vec_size[20]
  (XEN) ACPI: Local APIC address 0xfee00000

Insert newlines as appropriate.

Fixes: d3faf9badf52 ("[host s3] Retrieve necessary sleep information from plain-text ACPI tables (FADT/FACS), and keep one hypercall remained for sleep notification.")
Fixes: 0f089bbf43ec ("x86/ACPI: fix S3 wakeup vector mapping")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Wei Liu <wl@xen.org>

As to why the FACS is misaligned, clearly that is a bug in the domain builder
for PVH guests, but I don't have time to go debugging.
---
 xen/arch/x86/acpi/boot.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index ff4685279f68..8fe2d6fe0f42 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -432,19 +432,19 @@ acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt)
 	}
 
 	if (facs->length < 24) {
-		printk(KERN_ERR PREFIX "Invalid FACS table length: %#x",
+		printk(KERN_ERR PREFIX "Invalid FACS table length: %#x\n",
 			facs->length);
 		goto done;
 	}
 
 	if (facs->length < 64)
 		printk(KERN_WARNING PREFIX
-			"FACS is shorter than ACPI spec allow: %#x",
+			"FACS is shorter than ACPI spec allow: %#x\n",
 			facs->length);
 
 	if (facs_pa % 64)
 		printk(KERN_WARNING PREFIX
-			"FACS is not 64-byte aligned: %#lx",
+			"FACS is not 64-byte aligned: %#lx\n",
 			facs_pa);
 
 	acpi_sinfo.wakeup_vector = facs_pa + 
-- 
2.11.0

Re: [PATCH] x86/ACPI: Insert missing newlines into FACS error messages

Posted by Jan Beulich 2 years, 8 months ago

On 16.08.2021 15:35, Andrew Cooper wrote:
> Booting Xen as a PVH guest currently yields:
> 
>   (XEN) ACPI: SLEEP INFO: pm1x_cnt[1:b004,1:0], pm1x_evt[1:b000,1:0]
>   (XEN) ACPI: FACS is not 64-byte aligned: 0xfc001010<2>ACPI: wakeup_vec[fc00101c], vec_size[20]
>   (XEN) ACPI: Local APIC address 0xfee00000
> 
> Insert newlines as appropriate.
> 
> Fixes: d3faf9badf52 ("[host s3] Retrieve necessary sleep information from plain-text ACPI tables (FADT/FACS), and keep one hypercall remained for sleep notification.")
> Fixes: 0f089bbf43ec ("x86/ACPI: fix S3 wakeup vector mapping")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Jan Beulich <jbeulich@suse.com>

I'm curious though how you came to notice: I hope there isn't any
hardware/firmware actually triggering emission of these log messages?

Jan

Re: [PATCH] x86/ACPI: Insert missing newlines into FACS error messages

Posted by Jan Beulich 2 years, 8 months ago

On 16.08.2021 15:58, Jan Beulich wrote:
> On 16.08.2021 15:35, Andrew Cooper wrote:
>> Booting Xen as a PVH guest currently yields:
>>
>>   (XEN) ACPI: SLEEP INFO: pm1x_cnt[1:b004,1:0], pm1x_evt[1:b000,1:0]
>>   (XEN) ACPI: FACS is not 64-byte aligned: 0xfc001010<2>ACPI: wakeup_vec[fc00101c], vec_size[20]
>>   (XEN) ACPI: Local APIC address 0xfee00000
>>
>> Insert newlines as appropriate.
>>
>> Fixes: d3faf9badf52 ("[host s3] Retrieve necessary sleep information from plain-text ACPI tables (FADT/FACS), and keep one hypercall remained for sleep notification.")
>> Fixes: 0f089bbf43ec ("x86/ACPI: fix S3 wakeup vector mapping")
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> 
> Acked-by: Jan Beulich <jbeulich@suse.com>
> 
> I'm curious though how you came to notice: I hope there isn't any
> hardware/firmware actually triggering emission of these log messages?

And actually you answer this in the first line of the description,
while when reading I skipped straight to the quoted output. I'm sorry.

Jan

Re: [PATCH] x86/ACPI: Insert missing newlines into FACS error messages

Posted by Andrew Cooper 2 years, 8 months ago

On 16/08/2021 14:58, Jan Beulich wrote:
> On 16.08.2021 15:35, Andrew Cooper wrote:
>> Booting Xen as a PVH guest currently yields:
>>
>>   (XEN) ACPI: SLEEP INFO: pm1x_cnt[1:b004,1:0], pm1x_evt[1:b000,1:0]
>>   (XEN) ACPI: FACS is not 64-byte aligned: 0xfc001010<2>ACPI: wakeup_vec[fc00101c], vec_size[20]
>>   (XEN) ACPI: Local APIC address 0xfee00000
>>
>> Insert newlines as appropriate.
>>
>> Fixes: d3faf9badf52 ("[host s3] Retrieve necessary sleep information from plain-text ACPI tables (FADT/FACS), and keep one hypercall remained for sleep notification.")
>> Fixes: 0f089bbf43ec ("x86/ACPI: fix S3 wakeup vector mapping")
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Acked-by: Jan Beulich <jbeulich@suse.com>
>
> I'm curious though how you came to notice: I hope there isn't any
> hardware/firmware actually triggering emission of these log messages?

I was demoing "boot Xen/XTF as virtual machine".  It will be the
dombuilder in libxenguest which is causing the error.

~Andrew