[xen stable-4.14] x86/ACPI: don't overwrite FADT

[patchbot@xxxxxxx]

commit cad784fb8fcfd8f32ca4a787a95abbabc0059736
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Jan 21 16:19:34 2021 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jan 21 16:19:34 2021 +0100

    x86/ACPI: don't overwrite FADT
    
    When marking fields invalid for our own purposes, we should do so in our
    local copy (so we will notice later on), not in the firmware provided
    one (which another entity may want to look at again, e.g. after kexec).
    Also mark the function parameter const to notice such issues right away.
    
    Instead use the pointer at the firmware copy for specifying an adjacent
    printk()'s arguments. If nothing else this at least reduces the number
    of relocations the assembler hasto emit and the linker has to process.
    
    Fixes: 62d1a69a4e9f ("ACPI: support v5 (reduced HW) sleep interface")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    master commit: 654c917d94d24587bb6b4a8d862baf04b25cbe33
    master date: 2021-01-11 14:55:52 +0100
---
 xen/arch/x86/acpi/boot.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index ed40ce56b4..38c2b76e00 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -349,7 +349,7 @@ static int __init acpi_invalidate_bgrt(struct 
acpi_table_header *table)
 
 /* Get pm1x_cnt and pm1x_evt information for ACPI sleep */
 static void __init
-acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt)
+acpi_fadt_parse_sleep_info(const struct acpi_table_fadt *fadt)
 {
        struct acpi_table_facs *facs = NULL;
        uint64_t facs_pa;
@@ -362,10 +362,10 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt)
                printk(KERN_INFO PREFIX
                       "v5 SLEEP INFO: control[%d:%"PRIx64"],"
                       " status[%d:%"PRIx64"]\n",
-                      acpi_sinfo.sleep_control.space_id,
-                      acpi_sinfo.sleep_control.address,
-                      acpi_sinfo.sleep_status.space_id,
-                      acpi_sinfo.sleep_status.address);
+                      fadt->sleep_control.space_id,
+                      fadt->sleep_control.address,
+                      fadt->sleep_status.space_id,
+                      fadt->sleep_status.address);
 
                if ((fadt->sleep_control.address &&
                     (fadt->sleep_control.bit_offset ||
@@ -384,8 +384,8 @@ acpi_fadt_parse_sleep_info(struct acpi_table_fadt *fadt)
                               fadt->sleep_status.bit_offset,
                               fadt->sleep_status.bit_width,
                               fadt->sleep_status.access_width);
-                       fadt->sleep_control.address = 0;
-                       fadt->sleep_status.address = 0;
+                       acpi_sinfo.sleep_control.address = 0;
+                       acpi_sinfo.sleep_status.address = 0;
                }
        }
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.14