Re: [PATCH 0/4] xen/arm: Unbreak ACPI

[Masami Hiramatsu <masami.hiramatsu@linaro.org>]

[-- Attachment #1: Type: text/plain, Size: 1375 bytes --]

Hello,

This made progress with my Xen boot on DeveloperBox (
https://www.96boards.org/product/developerbox/ ) with ACPI.

Thank you,


2020年9月27日(日) 5:56 Julien Grall <julien@xen.org>:

>
> From: Julien Grall <jgrall@amazon.com>
>
> Hi all,
>
> Xen on ARM has been broken for quite a while on ACPI systems. This
> series aims to fix it.
>
> Unfortunately I don't have a system with ACPI v6.0 or later (QEMU seems
> to only support 5.1). So I did only some light testing.
>
> I have only build tested the x86 side so far.
>
> Cheers,
>
> *** BLURB HERE ***
>
> Julien Grall (4):
>   xen/acpi: Rework acpi_os_map_memory() and acpi_os_unmap_memory()
>   xen/arm: acpi: The fixmap area should always be cleared during
>     failure/unmap
>   xen/arm: Check if the platform is not using ACPI before initializing
>     Dom0less
>   xen/arm: Introduce fw_unreserved_regions() and use it
>
>  xen/arch/arm/acpi/lib.c     | 79 ++++++++++++++++++++++++++++++-------
>  xen/arch/arm/kernel.c       |  2 +-
>  xen/arch/arm/setup.c        | 25 +++++++++---
>  xen/arch/x86/acpi/lib.c     | 18 +++++++++
>  xen/drivers/acpi/osl.c      | 34 ++++++++--------
>  xen/include/asm-arm/setup.h |  2 +-
>  xen/include/xen/acpi.h      |  1 +
>  7 files changed, 123 insertions(+), 38 deletions(-)
>
> --
> 2.17.1
>


--
Masami Hiramatsu

[-- Attachment #2: xen-acpi-hide-uart-address --]
[-- Type: application/octet-stream, Size: 2134 bytes --]

xen: acpi: Hide UART address only if STAO table specified it

From: Masami Hiramatsu <masami.hiramatsu@linaro.org>

Since SPCR table may not exit if STAO->ignore_uart is not set
or STAO table does not exist, at first check the STAO table.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org>
---
 xen/arch/arm/acpi/domain_build.c |   29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c
index 1b1cfabb00..97d1cddfb6 100644
--- a/xen/arch/arm/acpi/domain_build.c
+++ b/xen/arch/arm/acpi/domain_build.c
@@ -28,8 +28,9 @@
 
 static int __init acpi_iomem_deny_access(struct domain *d)
 {
-    acpi_status status;
+    struct acpi_table_stao *stao = NULL;
     struct acpi_table_spcr *spcr = NULL;
+    acpi_status status;
     unsigned long mfn;
     int rc;
 
@@ -39,21 +40,25 @@ static int __init acpi_iomem_deny_access(struct domain *d)
         return rc;
 
     /* TODO: Deny MMIO access for SMMU, GIC ITS */
-    status = acpi_get_table(ACPI_SIG_SPCR, 0,
+    status = acpi_get_table(ACPI_SIG_STAO, 0,
+                            (struct acpi_table_header **)&stao);
+    if ( ACPI_SUCCESS(status) && stao->ignore_uart) {
+        /* Deny UART access only when STAO specified it */
+        status = acpi_get_table(ACPI_SIG_SPCR, 0,
                             (struct acpi_table_header **)&spcr);
+        if ( ACPI_FAILURE(status) )
+        {
+            printk("Failed to get SPCR table\n");
+            return -EINVAL;
+        }
 
-    if ( ACPI_FAILURE(status) )
-    {
-        printk("Failed to get SPCR table\n");
-        return -EINVAL;
+        mfn = spcr->serial_port.address >> PAGE_SHIFT;
+        /* Deny MMIO access for UART */
+        rc = iomem_deny_access(d, mfn, mfn + 1);
+        if ( rc )
+            return rc;
     }
 
-    mfn = spcr->serial_port.address >> PAGE_SHIFT;
-    /* Deny MMIO access for UART */
-    rc = iomem_deny_access(d, mfn, mfn + 1);
-    if ( rc )
-        return rc;
-
     /* Deny MMIO access for GIC regions */
     return gic_iomem_deny_access(d);
 }