Skip to contentSkip to conversation

hw/acpi: Fix PM control register access

PATCH Superseded BALATON Zoltan 2 participants 5 messages May 28, 2023 – Jun 7, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/acpi: Fix PM control register access

On pegasos2 which has ACPI as part of VT8231 south bridge the board firmware writes PM control register by accessing the second byte so addr will be 1. This wasn't handled correctly and the write went to addr 0 instead. This fixes ACPI shutdown with pegasos2 firmware.

---
This is replacing the previous attempt which changed enduanness to NATIVE_ENDIAN that was found to be wrong. I'm still not sure what's happening as these functions are called with addr = 1 and size = 2 but maybe the guest really does word access to addr 1 when wanting to write 1 byte. This fixes the problem and should not break anything else but please review.

 hw/acpi/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/acpi/core.c +2 -2
index 6da275c599..bbc599a252 100644
@@ -593,13 +593,13 @@ void acpi_pm1_cnt_update(ACPIREGS *ar,
 static uint64_t acpi_pm_cnt_read(void *opaque, hwaddr addr, unsigned width)
 {
     ACPIREGS *ar = opaque;
-    return ar->pm1.cnt.cnt;
+    return ar->pm1.cnt.cnt >> addr * 8;
 }
 
 static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_t val,
                               unsigned width)
 {
-    acpi_pm1_cnt_write(opaque, val);
+    acpi_pm1_cnt_write(opaque, val << addr * 8);
 }
 
 static const MemoryRegionOps acpi_pm_cnt_ops = {
Signature · 1 line
2.30.9
#1 lore raw
Quoted 5 lines · BALATON Zoltan

On pegasos2 which has ACPI as part of VT8231 south bridge the board firmware writes PM control register by accessing the second byte so addr will be 1. This wasn't handled correctly and the write went to addr 0 instead. This fixes ACPI shutdown with pegasos2 firmware.

Quoted 8 lines

---
This is replacing the previous attempt which changed enduanness to NATIVE_ENDIAN that was found to be wrong. I'm still not sure what's happening as these functions are called with addr = 1 and size = 2 but maybe the guest really does word access to addr 1 when wanting to write 1 byte. This fixes the problem and should not break anything else but please review.

Ping?

Regards,
BALATON Zoltan

Quoted 24 lines

hw/acpi/core.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
hw/acpi/core.c +2 -2
index 6da275c599..bbc599a252 100644
@@ -593,13 +593,13 @@ void acpi_pm1_cnt_update(ACPIREGS *ar,
 static uint64_t acpi_pm_cnt_read(void *opaque, hwaddr addr, unsigned width)
 {
    ACPIREGS *ar = opaque;
-    return ar->pm1.cnt.cnt;
+    return ar->pm1.cnt.cnt >> addr * 8;
 }
 
 static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_t val,
                              unsigned width)
 {
-    acpi_pm1_cnt_write(opaque, val);
+    acpi_pm1_cnt_write(opaque, val << addr * 8);
 }
 
 static const MemoryRegionOps acpi_pm_cnt_ops = {
#2 lore raw
In reply to BALATON Zoltan
Quoted 22 lines · On Sun, 28 May 2023 15:57:50 +0200 (CEST) BALATON Zoltan <[email protected]>…

On pegasos2 which has ACPI as part of VT8231 south bridge the board firmware writes PM control register by accessing the second byte so addr will be 1. This wasn't handled correctly and the write went to addr 0 instead. This fixes ACPI shutdown with pegasos2 firmware.

---
This is replacing the previous attempt which changed enduanness to NATIVE_ENDIAN that was found to be wrong. I'm still not sure what's happening as these functions are called with addr = 1 and size = 2 but maybe the guest really does word access to addr 1 when wanting to write 1 byte. This fixes the problem and should not break anything else but please review.

 hw/acpi/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/acpi/core.c +0 -0
index 6da275c599..bbc599a252 100644

hw/acpi/core.c void acpi_pm1_cnt_update(ACPIREGS *ar, · line 597

Quoted 6 lines
hw/acpi/core.c +1 -1
@@ -593,13 +593,13 @@ void acpi_pm1_cnt_update(ACPIREGS *ar,
 static uint64_t acpi_pm_cnt_read(void *opaque, hwaddr addr, unsigned width)
 {
     ACPIREGS *ar = opaque;
-    return ar->pm1.cnt.cnt;
+    return ar->pm1.cnt.cnt >> addr * 8;
 }

that looks fine

hw/acpi/core.c void acpi_pm1_cnt_update(ACPIREGS *ar, · line 603

Quoted 7 lines
hw/acpi/core.c +1 -1
 static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_t val,
                               unsigned width)
 {
-    acpi_pm1_cnt_write(opaque, val);
+    acpi_pm1_cnt_write(opaque, val << addr * 8);
 }

however, if this is 1 byte write at offset 1,
wouldn't this wipe out lower byte
(aka:

#define ACPI_BITMASK_SCI_ENABLE                 0x0001                           
#define ACPI_BITMASK_BUS_MASTER_RLD             0x0002                           
#define ACPI_BITMASK_GLOBAL_LOCK_RELEASE        0x0004

)?

Quoted 2 lines
hw/acpi/core.c +0 -0
 static const MemoryRegionOps acpi_pm_cnt_ops = {
#3 lore raw
Quoted 40 lines · Igor Mammedov
Quoted 22 lines · On Sun, 28 May 2023 15:57:50 +0200 (CEST) BALATON Zoltan <[email protected]>…

On pegasos2 which has ACPI as part of VT8231 south bridge the board firmware writes PM control register by accessing the second byte so addr will be 1. This wasn't handled correctly and the write went to addr 0 instead. This fixes ACPI shutdown with pegasos2 firmware.

---
This is replacing the previous attempt which changed enduanness to NATIVE_ENDIAN that was found to be wrong. I'm still not sure what's happening as these functions are called with addr = 1 and size = 2 but maybe the guest really does word access to addr 1 when wanting to write 1 byte. This fixes the problem and should not break anything else but please review.

 hw/acpi/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/acpi/core.c +0 -0
index 6da275c599..bbc599a252 100644

hw/acpi/core.c void acpi_pm1_cnt_update(ACPIREGS *ar, · line 597

Quoted 6 lines
hw/acpi/core.c +1 -1
@@ -593,13 +593,13 @@ void acpi_pm1_cnt_update(ACPIREGS *ar,
 static uint64_t acpi_pm_cnt_read(void *opaque, hwaddr addr, unsigned width)
 {
     ACPIREGS *ar = opaque;
-    return ar->pm1.cnt.cnt;
+    return ar->pm1.cnt.cnt >> addr * 8;
 }

that looks fine

hw/acpi/core.c void acpi_pm1_cnt_update(ACPIREGS *ar, · line 603

Quoted 7 lines
hw/acpi/core.c +1 -1
 static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_t val,
                               unsigned width)
 {
-    acpi_pm1_cnt_write(opaque, val);
+    acpi_pm1_cnt_write(opaque, val << addr * 8);
 }
Quoted 7 lines

however, if this is 1 byte write at offset 1,
wouldn't this wipe out lower byte
(aka:

#define ACPI_BITMASK_SCI_ENABLE                 0x0001
#define ACPI_BITMASK_BUS_MASTER_RLD             0x0002
#define ACPI_BITMASK_GLOBAL_LOCK_RELEASE        0x0004

)?

Since this will either reset or power off the machine it probably does not really matter. But to fix that more we'd need to rewrite acpi_pm1_cnt_write() to replace acpi_pm_cnt_write() and handle that internally. Or is there another way to handle this? Does that worth the effort when the only known usage is in pegasos2 firmware when it calls power off?

Regards,
BALATON Zoltan

#4 lore raw
Quoted 49 lines · On Tue, 6 Jun 2023 18:59:48 +0200 (CEST) BALATON Zoltan <[email protected]>…
Quoted 40 lines · Igor Mammedov
Quoted 22 lines · On Sun, 28 May 2023 15:57:50 +0200 (CEST) BALATON Zoltan <[email protected]>…

On pegasos2 which has ACPI as part of VT8231 south bridge the board firmware writes PM control register by accessing the second byte so addr will be 1. This wasn't handled correctly and the write went to addr 0 instead. This fixes ACPI shutdown with pegasos2 firmware.

---
This is replacing the previous attempt which changed enduanness to NATIVE_ENDIAN that was found to be wrong. I'm still not sure what's happening as these functions are called with addr = 1 and size = 2 but maybe the guest really does word access to addr 1 when wanting to write 1 byte. This fixes the problem and should not break anything else but please review.

 hw/acpi/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
hw/acpi/core.c +0 -0
index 6da275c599..bbc599a252 100644

hw/acpi/core.c void acpi_pm1_cnt_update(ACPIREGS *ar, · line 597

Quoted 6 lines
hw/acpi/core.c +1 -1
@@ -593,13 +593,13 @@ void acpi_pm1_cnt_update(ACPIREGS *ar,
 static uint64_t acpi_pm_cnt_read(void *opaque, hwaddr addr, unsigned width)
 {
     ACPIREGS *ar = opaque;
-    return ar->pm1.cnt.cnt;
+    return ar->pm1.cnt.cnt >> addr * 8;
 }  

that looks fine

hw/acpi/core.c void acpi_pm1_cnt_update(ACPIREGS *ar, · line 603

Quoted 7 lines
hw/acpi/core.c +1 -1
 static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_t val,
                               unsigned width)
 {
-    acpi_pm1_cnt_write(opaque, val);
+    acpi_pm1_cnt_write(opaque, val << addr * 8);
 }  
Quoted 7 lines

however, if this is 1 byte write at offset 1,
wouldn't this wipe out lower byte
(aka:

#define ACPI_BITMASK_SCI_ENABLE                 0x0001
#define ACPI_BITMASK_BUS_MASTER_RLD             0x0002
#define ACPI_BITMASK_GLOBAL_LOCK_RELEASE        0x0004

)?

Quoted 6 lines

Since this will either reset or power off the machine it probably does not really matter. But to fix that more we'd need to rewrite acpi_pm1_cnt_write() to replace acpi_pm_cnt_write() and handle that internally. Or is there another way to handle this? Does that worth the effort when the only known usage is in pegasos2 firmware when it calls power off?

it maybe true for pegasos2 firmware, but this code is shared between several chipsets, so I'd rather do it correctly now, instead of tying to figure out where S3 got broken later (potentially we can go into sleep without reset).

maybe split acpi_pm1_cnt_write() into 2 functions
acpi_pm1_cnt_write(hi, lo) - updates register contents, or move contents to caller and drop function
and then

  if (ar->pm1.cnt.cnt & ACPI_BITMASK_SLEEP_ENABLE) { 
      acpi_pm1_cnt_handle_pm_req(ar->pm1.cnt.cnt)

}

Quoted 3 lines

Regards,
BALATON Zoltan