qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] ceea95: x86: rewrite gsi_handler()


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] ceea95: x86: rewrite gsi_handler()
Date: Thu, 10 Dec 2020 05:09:15 -0800

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: ceea95cd88c8f90ad93a83bbad4a077590316342
      
https://github.com/qemu/qemu/commit/ceea95cd88c8f90ad93a83bbad4a077590316342
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M hw/i386/x86.c

  Log Message:
  -----------
  x86: rewrite gsi_handler()

Rewrite function to use switch() for IRQ number mapping.
Check i8259_irq exists before raising it so the function
also works in case no i8259 (aka pic) is present.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20201203105423.10431-3-kraxel@redhat.com


  Commit: 94c5a606379ddd04beecdb11fb34b51b4b28c7f2
      
https://github.com/qemu/qemu/commit/94c5a606379ddd04beecdb11fb34b51b4b28c7f2
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M hw/i386/acpi-common.c
    M hw/i386/x86.c
    M include/hw/i386/ioapic.h
    M include/hw/i386/ioapic_internal.h
    M include/hw/i386/x86.h

  Log Message:
  -----------
  x86: add support for second ioapic

Add ioapic_init_secondary to initialize it, wire up
in gsi handling and acpi apic table creation.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-4-kraxel@redhat.com


  Commit: c214a7bcb6320c37777a662f38aea2a7c6919148
      
https://github.com/qemu/qemu/commit/c214a7bcb6320c37777a662f38aea2a7c6919148
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M hw/i386/microvm.c
    M include/hw/i386/microvm.h

  Log Message:
  -----------
  microvm: make number of virtio transports runtime changeable

This will allow to increase the number of transports in
case we have enough irq lines available for them all.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-5-kraxel@redhat.com


  Commit: 3d09c00704adc1db4769cfa6291d96842f9674f1
      
https://github.com/qemu/qemu/commit/3d09c00704adc1db4769cfa6291d96842f9674f1
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M hw/i386/microvm.c
    M include/hw/i386/microvm.h

  Log Message:
  -----------
  microvm: make pcie irq base runtime changeable

Allows to move them in case we have enough
irq lines available.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-6-kraxel@redhat.com


  Commit: e57e9ae7992bde44d7938ca9a2ec0aa9c5f0bbb6
      
https://github.com/qemu/qemu/commit/e57e9ae7992bde44d7938ca9a2ec0aa9c5f0bbb6
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M hw/i386/microvm.c

  Log Message:
  -----------
  microvm: drop microvm_gsi_handler()

With the improved gsi_handler() we don't need
our private version any more.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-7-kraxel@redhat.com


  Commit: 4d01b8994ca5ce7f48e85e48fb1d31e73699108b
      
https://github.com/qemu/qemu/commit/4d01b8994ca5ce7f48e85e48fb1d31e73699108b
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M hw/i386/microvm.c
    M include/hw/i386/microvm.h
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  microvm: add second ioapic

Create second ioapic, route virtio-mmio IRQs to it,
allow more virtio-mmio devices (24 instead of 8).

Needs ACPI, enabled by default, can be turned off
using -machine ioapic2=off

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-8-kraxel@redhat.com


  Commit: cdecc3d39aa9940887b6e587faa8cf25f115c9dc
      
https://github.com/qemu/qemu/commit/cdecc3d39aa9940887b6e587faa8cf25f115c9dc
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  tests/acpi: allow updates for expected data files

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-9-kraxel@redhat.com


  Commit: 0d0f2a4578c5aaee7dbcd409918d8af780584ccd
      
https://github.com/qemu/qemu/commit/0d0f2a4578c5aaee7dbcd409918d8af780584ccd
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    A tests/data/acpi/microvm/APIC.ioapic2
    A tests/data/acpi/microvm/DSDT.ioapic2

  Log Message:
  -----------
  tests/acpi: add data files for ioapic2 test variant

Copy microvm/APIC -> microvm/APIC.ioapic2
Copy microvm/DSDT -> microvm/DSDT.ioapic2

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-10-kraxel@redhat.com


  Commit: 38ee397f3f46df4fd728bb38e08549ee7cace73f
      
https://github.com/qemu/qemu/commit/38ee397f3f46df4fd728bb38e08549ee7cace73f
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  tests/acpi: add ioapic2=on test for microvm

APIC table changes:

 [034h 0052   1]                Subtable Type : 01 [I/O APIC]
 [035h 0053   1]                       Length : 0C
 [036h 0054   1]                  I/O Apic ID : 00
 [037h 0055   1]                     Reserved : 00
 [038h 0056   4]                      Address : FEC00000
 [03Ch 0060   4]                    Interrupt : 00000000

+[040h 0064   1]                Subtable Type : 01 [I/O APIC]
+[041h 0065   1]                       Length : 0C
+[042h 0066   1]                  I/O Apic ID : 01
+[043h 0067   1]                     Reserved : 00
+[044h 0068   4]                      Address : FEC10000
+[048h 0072   4]                    Interrupt : 00000018

DSDT table changes:

-        Device (VR07)
+        Device (VR23)
         {
             Name (_HID, "LNRO0005")  // _HID: Hardware ID
-            Name (_UID, 0x07)  // _UID: Unique ID
+            Name (_UID, 0x17)  // _UID: Unique ID
             Name (_CCA, One)  // _CCA: Cache Coherency Attribute
             Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
             {
                 Memory32Fixed (ReadWrite,
-                    0xFEB00E00,         // Address Base
+                    0xFEB02E00,         // Address Base
                     0x00000200,         // Address Length
                     )
                 Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
                 {
-                    0x00000017,
+                    0x0000002F,
                 }
             })
         }
     }

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-11-kraxel@redhat.com


  Commit: 59775f563db272091237cad0c25b6cbb079010f1
      
https://github.com/qemu/qemu/commit/59775f563db272091237cad0c25b6cbb079010f1
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M tests/data/acpi/microvm/APIC.ioapic2
    M tests/data/acpi/microvm/DSDT.ioapic2

  Log Message:
  -----------
  tests/acpi: update expected data files

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-12-kraxel@redhat.com


  Commit: 08af4e13f8d4db099bc444f83879c32459df7f3a
      
https://github.com/qemu/qemu/commit/08af4e13f8d4db099bc444f83879c32459df7f3a
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M tests/qtest/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  tests/acpi: disallow updates for expected data files

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20201203105423.10431-13-kraxel@redhat.com


  Commit: 00ef48ff0de9c3e5834e7e3f6691bbc80d08c114
      
https://github.com/qemu/qemu/commit/00ef48ff0de9c3e5834e7e3f6691bbc80d08c114
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-12-10 (Thu, 10 Dec 2020)

  Changed paths:
    M hw/i386/acpi-common.c
    M hw/i386/microvm.c
    M hw/i386/x86.c
    M include/hw/i386/ioapic.h
    M include/hw/i386/ioapic_internal.h
    M include/hw/i386/microvm.h
    M include/hw/i386/x86.h
    A tests/data/acpi/microvm/APIC.ioapic2
    A tests/data/acpi/microvm/DSDT.ioapic2
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/kraxel/tags/microvm-20201210-pull-request' into staging

microvm: add support for second ioapic

# gpg: Signature made Thu 10 Dec 2020 12:13:42 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/microvm-20201210-pull-request:
  tests/acpi: disallow updates for expected data files
  tests/acpi: update expected data files
  tests/acpi: add ioapic2=on test for microvm
  tests/acpi: add data files for ioapic2 test variant
  tests/acpi: allow updates for expected data files
  microvm: add second ioapic
  microvm: drop microvm_gsi_handler()
  microvm: make pcie irq base runtime changeable
  microvm: make number of virtio transports runtime changeable
  x86: add support for second ioapic
  x86: rewrite gsi_handler()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/180834dcb827...00ef48ff0de9



reply via email to

[Prev in Thread] Current Thread [Next in Thread]