Merge tag 'pull-riscv-to-apply-20241220' of https://github.com/alistair23/qemu into...
authorStefan Hajnoczi <stefanha@redhat.com>
Sat, 21 Dec 2024 13:13:16 +0000 (08:13 -0500)
committerStefan Hajnoczi <stefanha@redhat.com>
Sat, 21 Dec 2024 13:13:16 +0000 (08:13 -0500)
RISC-V PR for 10.0

* Correct the validness check of iova
* Fix APLIC in_clrip and clripnum write emulation
* Support riscv-iommu-sys device
* Add Tenstorrent Ascalon CPU
* Add AIA userspace irqchip_split support
* Add Microblaze V generic board
* Upgrade ACPI SPCR table to support SPCR table revision 4 format
* Remove tswap64() calls from HTIF
* Support 64-bit address of initrd
* Introduce svukte ISA extension
* Support ssstateen extension
* Support for RV64 Xiangshan Nanhu CPU

 # -----BEGIN PGP SIGNATURE-----
 #
 # iQIzBAABCAAdFiEEaukCtqfKh31tZZKWr3yVEwxTgBMFAmdkzjgACgkQr3yVEwxT
 # gBOcyA//e0XhAQciQglCZZCfINdOyI8qSh+P2K0qtrXZ4VERHEMp7UoD5CQr2cZv
 # h8ij1EkatXCwukVELx0rNckxG33bEFgG1oESnQSrwGE0Iu4csNW24nK5WlUS0/r+
 # A5oD2wtzEF+cbhTKrVSDBN/PvlnWTKGEoJRkuXWfz5d4uR9eyQhfED0S2j36lNEC
 # X1x/OZoKM89XuXtOFe9g55Z5UNzAatcdTISozL0FydiPh7QeVjTLHh28/tt559MX
 # 7v5aJFlQuZ78z1mIHkZmPSorSrJ0zqhkP6NWe1ae06oMgzwRQQhYLppDILV4ZgUF
 # 3mSDRoXmBycQXiYNPcHep3LdXfvxr+PpWHSevx8gH1jwm93On7Y/H7Uol6TDXzfC
 # mrFjalfV5tzrD90ZvB+s5bCMF1q5Z8Dlj0pYF9aN9P1ILoWy3dndFAPJB6uKKDP7
 # Qd4qOQ3dVyHAX9jLmVkB6QvAV/vTDrYTsAxaF/EaoLOy0IoKhjTvgda3XzE1MFKA
 # gVafLluADIfSEdqa2QR2ExL8d1SZVoiObCp5TMLRer0HIpg/vQZwjfdbo4BgQKL3
 # 7Q6wBxcZUNqrFgspXjm5WFIrdk2rfS/79OmvpNM6SZaK6BnklntdJHJHtAWujGsm
 # EM310AUFpHMp2h6Nqnemb3qr5l4d20KSt8DhoPAUq1IE59Kb8XY=
 # =0iQW
 # -----END PGP SIGNATURE-----
 # gpg: Signature made Thu 19 Dec 2024 20:54:00 EST
 # gpg:                using RSA key 6AE902B6A7CA877D6D659296AF7C95130C538013
 # gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [unknown]
 # gpg: WARNING: This key is not certified with a trusted signature!
 # gpg:          There is no indication that the signature belongs to the owner.
 # Primary key fingerprint: 6AE9 02B6 A7CA 877D 6D65  9296 AF7C 9513 0C53 8013

* tag 'pull-riscv-to-apply-20241220' of https://github.com/alistair23/qemu: (39 commits)
  target/riscv: add support for RV64 Xiangshan Nanhu CPU
  target/riscv: add ssstateen
  target/riscv/tcg: hide warn for named feats when disabling via priv_ver
  target/riscv: Include missing headers in 'internals.h'
  target/riscv: Include missing headers in 'vector_internals.h'
  target/riscv: Check svukte is not enabled in RV32
  target/riscv: Expose svukte ISA extension
  target/riscv: Check memory access to meet svukte rule
  target/riscv: Support hstatus[HUKTE] bit when svukte extension is enabled
  target/riscv: Support senvcfg[UKTE] bit when svukte extension is enabled
  target/riscv: Add svukte extension capability variable
  hw/riscv: Add the checking if DTB overlaps to kernel or initrd
  hw/riscv: Add a new struct RISCVBootInfo
  hw/riscv: Support to load DTB after 3GB memory on 64-bit system.
  hw/char/riscv_htif: Clarify MemoryRegionOps expect 32-bit accesses
  hw/char/riscv_htif: Explicit little-endian implementation
  MAINTAINERS: Cover RISC-V HTIF interface
  tests/qtest/bios-tables-test: Update virt SPCR golden reference for RISC-V
  hw/acpi: Upgrade ACPI SPCR table to support SPCR table revision 4 format
  qtest: allow SPCR acpi table changes
  ...

Conflicts:
  target/riscv/cpu.c

  Merge conflict with DEFINE_PROP_END_OF_LIST() removal. No Property
  array terminator is needed anymore.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
1  2 
hw/intc/riscv_aplic.c
hw/riscv/opentitan.c
hw/riscv/riscv-iommu-pci.c
hw/riscv/riscv-iommu-sys.c
hw/riscv/riscv-iommu.c
hw/riscv/sifive_u.c
target/riscv/cpu.c

Simple merge
Simple merge
index 257a5faa5f607420d3ec63b4b9d299fc992fc197,2c1ae72461ed938600f1554b1fd324cdf9869c95..12451869e41df9542b91ad79aaa609275d86ebfd
@@@ -163,8 -171,19 +171,18 @@@ static const Property riscv_iommu_pci_p
      DEFINE_PROP_UINT16("device-id", RISCVIOMMUStatePci, device_id,
                         PCI_DEVICE_ID_REDHAT_RISCV_IOMMU),
      DEFINE_PROP_UINT8("revision", RISCVIOMMUStatePci, revision, 0x01),
 -    DEFINE_PROP_END_OF_LIST(),
  };
  
+ static void riscv_iommu_pci_reset_hold(Object *obj, ResetType type)
+ {
+     RISCVIOMMUStatePci *pci = RISCV_IOMMU_PCI(obj);
+     RISCVIOMMUState *iommu = &pci->iommu;
+     riscv_iommu_reset(iommu);
+     trace_riscv_iommu_pci_reset_hold(type);
+ }
  static void riscv_iommu_pci_class_init(ObjectClass *klass, void *data)
  {
      DeviceClass *dc = DEVICE_CLASS(klass);
index 0000000000000000000000000000000000000000,605979a0aca907a6c9dede009c992389b921a6ed..28153f38da266d3adec0ba7a60ce29b9a379e520
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,256 +1,255 @@@
 -static Property riscv_iommu_sys_properties[] = {
+ /*
+  * QEMU emulation of an RISC-V IOMMU Platform Device
+  *
+  * Copyright (C) 2022-2023 Rivos Inc.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms and conditions of the GNU General Public License,
+  * version 2 or later, as published by the Free Software Foundation.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License along
+  * with this program; if not, see <http://www.gnu.org/licenses/>.
+  */
+ #include "qemu/osdep.h"
+ #include "hw/irq.h"
+ #include "hw/pci/pci_bus.h"
+ #include "hw/qdev-properties.h"
+ #include "hw/sysbus.h"
+ #include "qapi/error.h"
+ #include "qemu/error-report.h"
+ #include "qemu/host-utils.h"
+ #include "qemu/module.h"
+ #include "qom/object.h"
+ #include "exec/exec-all.h"
+ #include "trace.h"
+ #include "riscv-iommu.h"
+ #define RISCV_IOMMU_SYSDEV_ICVEC_VECTORS 0x3333
+ #define RISCV_IOMMU_PCI_MSIX_VECTORS 5
+ /* RISC-V IOMMU System Platform Device Emulation */
+ struct RISCVIOMMUStateSys {
+     SysBusDevice     parent;
+     uint64_t         addr;
+     uint32_t         base_irq;
+     DeviceState      *irqchip;
+     RISCVIOMMUState  iommu;
+     /* Wired int support */
+     qemu_irq         irqs[RISCV_IOMMU_INTR_COUNT];
+     /* Memory Regions for MSIX table and pending bit entries. */
+     MemoryRegion msix_table_mmio;
+     MemoryRegion msix_pba_mmio;
+     uint8_t *msix_table;
+     uint8_t *msix_pba;
+ };
+ struct RISCVIOMMUSysClass {
+     /*< public >*/
+     DeviceRealize parent_realize;
+     ResettablePhases parent_phases;
+ };
+ static uint64_t msix_table_mmio_read(void *opaque, hwaddr addr,
+                                      unsigned size)
+ {
+     RISCVIOMMUStateSys *s = opaque;
+     g_assert(addr + size <= RISCV_IOMMU_PCI_MSIX_VECTORS * PCI_MSIX_ENTRY_SIZE);
+     return pci_get_long(s->msix_table + addr);
+ }
+ static void msix_table_mmio_write(void *opaque, hwaddr addr,
+                                   uint64_t val, unsigned size)
+ {
+     RISCVIOMMUStateSys *s = opaque;
+     g_assert(addr + size <= RISCV_IOMMU_PCI_MSIX_VECTORS * PCI_MSIX_ENTRY_SIZE);
+     pci_set_long(s->msix_table + addr, val);
+ }
+ static const MemoryRegionOps msix_table_mmio_ops = {
+     .read = msix_table_mmio_read,
+     .write = msix_table_mmio_write,
+     .endianness = DEVICE_LITTLE_ENDIAN,
+     .valid = {
+         .min_access_size = 4,
+         .max_access_size = 8,
+     },
+     .impl = {
+         .max_access_size = 4,
+     },
+ };
+ static uint64_t msix_pba_mmio_read(void *opaque, hwaddr addr,
+                                    unsigned size)
+ {
+     RISCVIOMMUStateSys *s = opaque;
+     return pci_get_long(s->msix_pba + addr);
+ }
+ static void msix_pba_mmio_write(void *opaque, hwaddr addr,
+                                 uint64_t val, unsigned size)
+ {
+ }
+ static const MemoryRegionOps msix_pba_mmio_ops = {
+     .read = msix_pba_mmio_read,
+     .write = msix_pba_mmio_write,
+     .endianness = DEVICE_LITTLE_ENDIAN,
+     .valid = {
+         .min_access_size = 4,
+         .max_access_size = 8,
+     },
+     .impl = {
+         .max_access_size = 4,
+     },
+ };
+ static void riscv_iommu_sysdev_init_msi(RISCVIOMMUStateSys *s,
+                                         uint32_t n_vectors)
+ {
+     RISCVIOMMUState *iommu = &s->iommu;
+     uint32_t table_size = table_size = n_vectors * PCI_MSIX_ENTRY_SIZE;
+     uint32_t table_offset = RISCV_IOMMU_REG_MSI_CONFIG;
+     uint32_t pba_size = QEMU_ALIGN_UP(n_vectors, 64) / 8;
+     uint32_t pba_offset = RISCV_IOMMU_REG_MSI_CONFIG + 256;
+     s->msix_table = g_malloc0(table_size);
+     s->msix_pba = g_malloc0(pba_size);
+     memory_region_init_io(&s->msix_table_mmio, OBJECT(s), &msix_table_mmio_ops,
+                           s, "msix-table", table_size);
+     memory_region_add_subregion(&iommu->regs_mr, table_offset,
+                                 &s->msix_table_mmio);
+     memory_region_init_io(&s->msix_pba_mmio, OBJECT(s), &msix_pba_mmio_ops, s,
+                           "msix-pba", pba_size);
+     memory_region_add_subregion(&iommu->regs_mr, pba_offset,
+                                 &s->msix_pba_mmio);
+ }
+ static void riscv_iommu_sysdev_send_MSI(RISCVIOMMUStateSys *s,
+                                         uint32_t vector)
+ {
+     uint8_t *table_entry = s->msix_table + vector * PCI_MSIX_ENTRY_SIZE;
+     uint64_t msi_addr = pci_get_quad(table_entry + PCI_MSIX_ENTRY_LOWER_ADDR);
+     uint32_t msi_data = pci_get_long(table_entry + PCI_MSIX_ENTRY_DATA);
+     MemTxResult result;
+     address_space_stl_le(&address_space_memory, msi_addr,
+                          msi_data, MEMTXATTRS_UNSPECIFIED, &result);
+     trace_riscv_iommu_sys_msi_sent(vector, msi_addr, msi_data, result);
+ }
+ static void riscv_iommu_sysdev_notify(RISCVIOMMUState *iommu,
+                                       unsigned vector)
+ {
+     RISCVIOMMUStateSys *s = container_of(iommu, RISCVIOMMUStateSys, iommu);
+     uint32_t fctl =  riscv_iommu_reg_get32(iommu, RISCV_IOMMU_REG_FCTL);
+     if (fctl & RISCV_IOMMU_FCTL_WSI) {
+         qemu_irq_pulse(s->irqs[vector]);
+         trace_riscv_iommu_sys_irq_sent(vector);
+         return;
+     }
+     riscv_iommu_sysdev_send_MSI(s, vector);
+ }
+ static void riscv_iommu_sys_realize(DeviceState *dev, Error **errp)
+ {
+     RISCVIOMMUStateSys *s = RISCV_IOMMU_SYS(dev);
+     SysBusDevice *sysdev = SYS_BUS_DEVICE(s);
+     PCIBus *pci_bus;
+     qemu_irq irq;
+     qdev_realize(DEVICE(&s->iommu), NULL, errp);
+     sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iommu.regs_mr);
+     if (s->addr) {
+         sysbus_mmio_map(SYS_BUS_DEVICE(s), 0, s->addr);
+     }
+     pci_bus = (PCIBus *) object_resolve_path_type("", TYPE_PCI_BUS, NULL);
+     if (pci_bus) {
+         riscv_iommu_pci_setup_iommu(&s->iommu, pci_bus, errp);
+     }
+     s->iommu.notify = riscv_iommu_sysdev_notify;
+     /* 4 IRQs are defined starting from s->base_irq */
+     for (int i = 0; i < RISCV_IOMMU_INTR_COUNT; i++) {
+         sysbus_init_irq(sysdev, &s->irqs[i]);
+         irq = qdev_get_gpio_in(s->irqchip, s->base_irq + i);
+         sysbus_connect_irq(sysdev, i, irq);
+     }
+     riscv_iommu_sysdev_init_msi(s, RISCV_IOMMU_PCI_MSIX_VECTORS);
+ }
+ static void riscv_iommu_sys_init(Object *obj)
+ {
+     RISCVIOMMUStateSys *s = RISCV_IOMMU_SYS(obj);
+     RISCVIOMMUState *iommu = &s->iommu;
+     object_initialize_child(obj, "iommu", iommu, TYPE_RISCV_IOMMU);
+     qdev_alias_all_properties(DEVICE(iommu), obj);
+     iommu->icvec_avail_vectors = RISCV_IOMMU_SYSDEV_ICVEC_VECTORS;
+     riscv_iommu_set_cap_igs(iommu, RISCV_IOMMU_CAP_IGS_BOTH);
+ }
 -    DEFINE_PROP_END_OF_LIST(),
++static const Property riscv_iommu_sys_properties[] = {
+     DEFINE_PROP_UINT64("addr", RISCVIOMMUStateSys, addr, 0),
+     DEFINE_PROP_UINT32("base-irq", RISCVIOMMUStateSys, base_irq, 0),
+     DEFINE_PROP_LINK("irqchip", RISCVIOMMUStateSys, irqchip,
+                      TYPE_DEVICE, DeviceState *),
+ };
+ static void riscv_iommu_sys_reset_hold(Object *obj, ResetType type)
+ {
+     RISCVIOMMUStateSys *sys = RISCV_IOMMU_SYS(obj);
+     RISCVIOMMUState *iommu = &sys->iommu;
+     riscv_iommu_reset(iommu);
+     trace_riscv_iommu_sys_reset_hold(type);
+ }
+ static void riscv_iommu_sys_class_init(ObjectClass *klass, void *data)
+ {
+     DeviceClass *dc = DEVICE_CLASS(klass);
+     ResettableClass *rc = RESETTABLE_CLASS(klass);
+     rc->phases.hold = riscv_iommu_sys_reset_hold;
+     dc->realize = riscv_iommu_sys_realize;
+     set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+     device_class_set_props(dc, riscv_iommu_sys_properties);
+ }
+ static const TypeInfo riscv_iommu_sys = {
+     .name          = TYPE_RISCV_IOMMU_SYS,
+     .parent        = TYPE_SYS_BUS_DEVICE,
+     .class_init    = riscv_iommu_sys_class_init,
+     .instance_init = riscv_iommu_sys_init,
+     .instance_size = sizeof(RISCVIOMMUStateSys),
+ };
+ static void riscv_iommu_register_sys(void)
+ {
+     type_register_static(&riscv_iommu_sys);
+ }
+ type_init(riscv_iommu_register_sys)
Simple merge
Simple merge
index a5aa3a8670afeba1390e3cb4f5983dedea54355e,58bb5196a89a3d312aeb3e389143f632202b176a..f7d1da13f41c9514f3941c7e26f993ec67968957
@@@ -1597,7 -1693,8 +1693,9 @@@ const RISCVCPUMultiExtConfig riscv_cpu_
  
  /* These are experimental so mark with 'x-' */
  const RISCVCPUMultiExtConfig riscv_cpu_experimental_exts[] = {
 -    DEFINE_PROP_END_OF_LIST(),
+     MULTI_EXT_CFG_BOOL("x-svukte", ext_svukte, false),
++
 +    { },
  };
  
  /*
   */
  const RISCVCPUMultiExtConfig riscv_cpu_named_features[] = {
      MULTI_EXT_CFG_BOOL("zic64b", ext_zic64b, true),
+     MULTI_EXT_CFG_BOOL("ssstateen", ext_ssstateen, true),
  
 -    DEFINE_PROP_END_OF_LIST(),
 +    { },
  };
  
  /* Deprecated entries marked for future removal */