Skip to content
Snippets Groups Projects
  1. Jan 18, 2021
  2. Jan 17, 2021
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · e0cbcf1e
      Peter Maydell authored
      
      pc,pci,virtio: fixes, features
      
      Fixes all over the place.
      PXB support for ARM.
      boot index for vhost-user-fs.
      
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Sun 17 Jan 2021 11:44:55 GMT
      # gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
      # gpg:                issuer "mst@redhat.com"
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
      # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
      #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
      
      * remotes/mst/tags/for_upstream:
        acpi: Update _DSM method in expected files
        acpi: Enable pxb unit-test for ARM virt machine
        Kconfig: Compile PXB for ARM_VIRT
        acpi/gpex: Exclude pxb's resources from PCI0
        acpi/gpex: Inform os to keep firmware resource map
        acpi: Add addr offset in build_crs
        acpi: Fix unmatched expected DSDT.pxb file
        acpi: Allow DSDT acpi table changes
        vhost-user-fs: add the "bootindex" property
        pci/shpc: don't push attention button when ejecting powered-off device
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      e0cbcf1e
    • Jiahui Cen's avatar
      acpi: Update _DSM method in expected files · ccee1a81
      Jiahui Cen authored
      
      A new _DSM #5 method is added.
      
      Update expected DSDT files accordingly, and re-enable their testing.
      
      Full diff of changed files disassembly:
      
      tests/data/acpi/microvm/DSDT.pcie.dsl:
      @@ -5,13 +5,13 @@
        *
        * Disassembling to symbolic ASL+ operators
        *
      - * Disassembly of tests/data/acpi/microvm/DSDT.pcie, Thu Jan 14 13:39:35 2021
      + * Disassembly of tests/data/acpi/microvm/DSDT.pcie, Thu Jan 14 13:51:13 2021
        *
        * Original Table Header:
        *     Signature        "DSDT"
      - *     Length           0x00000BCF (3023)
      + *     Length           0x00000BD7 (3031)
        *     Revision         0x02
      - *     Checksum         0x29
      + *     Checksum         0x99
        *     OEM ID           "BOCHS "
        *     OEM Table ID     "BXPCDSDT"
        *     OEM Revision     0x00000001 (1)
      @@ -1302,9 +1302,14 @@
                           {
                               Return (Buffer (One)
                               {
      -                             0x01                                             // .
      +                             0x21                                             // !
                               })
                           }
      +
      +                    If ((Arg2 == 0x05))
      +                    {
      +                        Return (Zero)
      +                    }
                       }
      
                       Return (Buffer (One)
      
      tests/data/acpi/virt/DSDT.dsl:
      @@ -5,13 +5,13 @@
        *
        * Disassembling to symbolic ASL+ operators
        *
      - * Disassembly of tests/data/acpi/virt/DSDT, Thu Jan 14 13:39:35 2021
      + * Disassembly of tests/data/acpi/virt/DSDT, Thu Jan 14 13:51:13 2021
        *
        * Original Table Header:
        *     Signature        "DSDT"
      - *     Length           0x0000144C (5196)
      + *     Length           0x00001454 (5204)
        *     Revision         0x02
      - *     Checksum         0xF0
      + *     Checksum         0x60
        *     OEM ID           "BOCHS "
        *     OEM Table ID     "BXPCDSDT"
        *     OEM Revision     0x00000001 (1)
      @@ -1838,9 +1838,14 @@
                           {
                               Return (Buffer (One)
                               {
      -                             0x01                                             // .
      +                             0x21                                             // !
                               })
                           }
      +
      +                    If ((Arg2 == 0x05))
      +                    {
      +                        Return (Zero)
      +                    }
                       }
      
                       Return (Buffer (One)
      
      tests/data/acpi/virt/DSDT.memhp.dsl:
      @@ -5,13 +5,13 @@
        *
        * Disassembling to symbolic ASL+ operators
        *
      - * Disassembly of tests/data/acpi/virt/DSDT.memhp, Thu Jan 14 13:39:35 2021
      + * Disassembly of tests/data/acpi/virt/DSDT.memhp, Thu Jan 14 13:51:13 2021
        *
        * Original Table Header:
        *     Signature        "DSDT"
      - *     Length           0x0000199D (6557)
      + *     Length           0x000019A5 (6565)
        *     Revision         0x02
      - *     Checksum         0x11
      + *     Checksum         0x90
        *     OEM ID           "BOCHS "
        *     OEM Table ID     "BXPCDSDT"
        *     OEM Revision     0x00000001 (1)
      @@ -1840,9 +1840,14 @@
                           {
                               Return (Buffer (One)
                               {
      -                             0x01                                             // .
      +                             0x21                                             // !
                               })
                           }
      +
      +                    If ((Arg2 == 0x05))
      +                    {
      +                        Return (Zero)
      +                    }
                       }
      
                       Return (Buffer (One)
      
      tests/data/acpi/virt/DSDT.numamem.dsl:
      @@ -5,13 +5,13 @@
        *
        * Disassembling to symbolic ASL+ operators
        *
      - * Disassembly of tests/data/acpi/virt/DSDT.numamem, Thu Jan 14 13:39:35 2021
      + * Disassembly of tests/data/acpi/virt/DSDT.numamem, Thu Jan 14 13:51:13 2021
        *
        * Original Table Header:
        *     Signature        "DSDT"
      - *     Length           0x0000144C (5196)
      + *     Length           0x00001454 (5204)
        *     Revision         0x02
      - *     Checksum         0xF0
      + *     Checksum         0x60
        *     OEM ID           "BOCHS "
        *     OEM Table ID     "BXPCDSDT"
        *     OEM Revision     0x00000001 (1)
      @@ -1838,9 +1838,14 @@
                           {
                               Return (Buffer (One)
                               {
      -                             0x01                                             // .
      +                             0x21                                             // !
                               })
                           }
      +
      +                    If ((Arg2 == 0x05))
      +                    {
      +                        Return (Zero)
      +                    }
                       }
      
                       Return (Buffer (One)
      
      tests/data/acpi/virt/DSDT.pxb.dsl:
      @@ -5,13 +5,13 @@
        *
        * Disassembling to symbolic ASL+ operators
        *
      - * Disassembly of tests/data/acpi/virt/DSDT.pxb, Thu Jan 14 13:39:35 2021
      + * Disassembly of tests/data/acpi/virt/DSDT.pxb, Thu Jan 14 13:51:13 2021
        *
        * Original Table Header:
        *     Signature        "DSDT"
      - *     Length           0x00001DF9 (7673)
      + *     Length           0x00001E09 (7689)
        *     Revision         0x02
      - *     Checksum         0x42
      + *     Checksum         0x30
        *     OEM ID           "BOCHS "
        *     OEM Table ID     "BXPCDSDT"
        *     OEM Revision     0x00000001 (1)
      @@ -1810,9 +1810,14 @@
                           {
                               Return (Buffer (One)
                               {
      -                             0x01                                             // .
      +                             0x21                                             // !
                               })
                           }
      +
      +                    If ((Arg2 == 0x05))
      +                    {
      +                        Return (Zero)
      +                    }
                       }
      
                       Return (Buffer (One)
      @@ -3025,9 +3030,14 @@
                           {
                               Return (Buffer (One)
                               {
      -                             0x01                                             // .
      +                             0x21                                             // !
                               })
                           }
      +
      +                    If ((Arg2 == 0x05))
      +                    {
      +                        Return (Zero)
      +                    }
                       }
      
                       Return (Buffer (One)
      
      Acked-by: default avatarIgor Mammedov <imammedo@redhat.com>
      Signed-off-by: default avatarJiahui Cen <cenjiahui@huawei.com>
      Message-Id: <20210114100643.10617-9-cenjiahui@huawei.com>
      Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      ccee1a81
Loading