1f0277483b
- block: bugfix: Don't pause vm when NOSPACE EIO happened - block: enable cache mode of empty cdrom - block/mirror: fix file-system went to read-only after block-mirror - scsi-bus: fix incorrect call for blk_error_retry_reset_timeout() - scsi-bus: fix unmatched object_unref() - block: Add sanity check when setting retry parameters - block-backend: Stop retrying when draining - scsi-disk: Add support for retry on errors - scsi-bus: Refactor the code that retries requests - virtio_blk: Add support for retry on errors - block: Add error retry param setting - block-backend: Add timeout support for retry - block-backend: Enable retry action on errors - block-backend: Add device specific retry callback - block-backend: Introduce retry timer - qapi/block-core: Add retry option for error action - scsi: bugfix: fix division by zero - scsi: cdrom: Fix crash after remote cdrom detached - qemu-pr: fixed ioctl failed for multipath disk - scsi-disk: define props in scsi_block_disk to avoid memleaks - bugfix: fix possible memory leak - bugfix: fix some illegal memory access and memory leak - util/log: add CONFIG_DISABLE_QEMU_LOG macro - log: Add some logs on VM runtime path - bugfix: fix eventfds may double free when vm_id reused in ivshmem - hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() - hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() - qemu-img create: 'cache' paramter only use for reg file image - qemu-img: add qemu-img direct create - qemu-img block: set zero flags only when discard_zeros of the block supported - Revert "file-posix: Remove unused s->discard_zeroes" - pcie_sriov: Validate NumVFs (CVE-2024-26327) - hw/nvme: Use pcie_sriov_num_vfs() (CVE-2024-26328) - hw/acpi/cpu: Use CPUState typedef - target/i386/sev: Fix missing ERRP_GUARD() for error_prepend() - virtio-gpu: remove needless condition - hw/i2c/smbus_slave: Add object path on error prints - vfio/pci: Ascend710 change to bar2 quirk - vfio/pci: Ascend910 need 4Bytes quirk in bar0 - vfio/pci: Ascend710 need 4Bytes quirk in bar0 - vfio/pci: Ascend310 need 4Bytes quirk in bar4 - chardev/char-socket: Fix TLS io channels sending too much data to the backend - i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - blkio: Respect memory-alignment for bounce buffer allocations - virtio-gpu: Correct virgl_renderer_resource_get_info() error check - hw/usb: Style cleanup - tests/qemu-iotests: resolved the problem that the 108 test cases in the container fail Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 404d45bf9147058a475a8031c454a6c8e0acc123)
106 lines
3.4 KiB
Diff
106 lines
3.4 KiB
Diff
From 9558ea5d0bded6c9189adf2ce317cca205604c15 Mon Sep 17 00:00:00 2001
|
|
From: Binfeng Wu <wubinfeng@huawei.com>
|
|
Date: Tue, 8 Feb 2022 17:00:39 +0800
|
|
Subject: [PATCH] vfio/pci: Ascend310 need 4Bytes quirk in bar4
|
|
|
|
---
|
|
hw/vfio/pci-quirks.c | 75 ++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 75 insertions(+)
|
|
|
|
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
|
|
index 84b1a7b948..8fb190ce3c 100644
|
|
--- a/hw/vfio/pci-quirks.c
|
|
+++ b/hw/vfio/pci-quirks.c
|
|
@@ -1209,6 +1209,80 @@ int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
|
|
return 0;
|
|
}
|
|
|
|
+#define PCI_VENDOR_ID_HUAWEI 0x19e5
|
|
+#define PCI_DEVICE_ID_ASCEND310 0xd100
|
|
+#define ASCEND310_XLOADER_SIZE 4
|
|
+#define ASCEND310_XLOADER_OFFSET 0x400
|
|
+
|
|
+typedef struct VFIOAscendBarQuirk {
|
|
+ struct VFIOPCIDevice *vdev;
|
|
+ pcibus_t offset;
|
|
+ uint8_t bar;
|
|
+ MemoryRegion *mem;
|
|
+} VFIOAscendBarQuirk;
|
|
+
|
|
+static uint64_t vfio_ascend_quirk_read(void *opaque,
|
|
+ hwaddr addr, unsigned size)
|
|
+{
|
|
+ VFIOAscendBarQuirk *quirk = opaque;
|
|
+ VFIOPCIDevice *vdev = quirk->vdev;
|
|
+
|
|
+ qemu_log("read RO region! addr=0x%" HWADDR_PRIx ", size=%d\n",
|
|
+ addr + quirk->offset, size);
|
|
+
|
|
+ return vfio_region_read(&vdev->bars[quirk->bar].region,
|
|
+ addr + quirk->offset, size);
|
|
+}
|
|
+
|
|
+static void vfio_ascend_quirk_write(void *opaque, hwaddr addr,
|
|
+ uint64_t data, unsigned size)
|
|
+{
|
|
+ VFIOAscendBarQuirk *quirk = opaque;
|
|
+
|
|
+ qemu_log("modifying RO region is not allowed! addr=0x%"
|
|
+ HWADDR_PRIx ", data=0x%" PRIx64 ", size=%d\n",
|
|
+ addr + quirk->offset, data, size);
|
|
+}
|
|
+
|
|
+static const MemoryRegionOps vfio_ascend_intercept_regs_quirk = {
|
|
+ .read = vfio_ascend_quirk_read,
|
|
+ .write = vfio_ascend_quirk_write,
|
|
+ .endianness = DEVICE_LITTLE_ENDIAN,
|
|
+};
|
|
+
|
|
+static void vfio_probe_ascend310_bar4_quirk(VFIOPCIDevice *vdev, int nr)
|
|
+{
|
|
+ VFIOQuirk *quirk;
|
|
+ VFIOAscendBarQuirk *bar4_quirk;
|
|
+
|
|
+ if (vdev->vendor_id != PCI_VENDOR_ID_HUAWEI || nr != 4 ||
|
|
+ vdev->device_id != PCI_DEVICE_ID_ASCEND310) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ quirk = g_malloc0(sizeof(*quirk));
|
|
+ quirk->nr_mem = 1;
|
|
+ quirk->mem = g_new0(MemoryRegion, quirk->nr_mem);
|
|
+ bar4_quirk = quirk->data = g_new0(typeof(*bar4_quirk), quirk->nr_mem);
|
|
+ bar4_quirk[0].vdev = vdev;
|
|
+ bar4_quirk[0].offset = ASCEND310_XLOADER_OFFSET;
|
|
+ bar4_quirk[0].bar = nr;
|
|
+
|
|
+ /*
|
|
+ * intercept w/r to the xloader-updating register,
|
|
+ * so the vm can't enable xloader-updating
|
|
+ */
|
|
+ memory_region_init_io(&quirk->mem[0], OBJECT(vdev),
|
|
+ &vfio_ascend_intercept_regs_quirk,
|
|
+ &bar4_quirk[0],
|
|
+ "vfio-ascend310-bar4-intercept-regs-quirk",
|
|
+ ASCEND310_XLOADER_SIZE);
|
|
+ memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,
|
|
+ bar4_quirk[0].offset,
|
|
+ &quirk->mem[0], 1);
|
|
+ QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);
|
|
+}
|
|
+
|
|
/*
|
|
* Common quirk probe entry points.
|
|
*/
|
|
@@ -1261,6 +1335,7 @@ void vfio_bar_quirk_setup(VFIOPCIDevice *vdev, int nr)
|
|
#ifdef CONFIG_VFIO_IGD
|
|
vfio_probe_igd_bar4_quirk(vdev, nr);
|
|
#endif
|
|
+ vfio_probe_ascend310_bar4_quirk(vdev, nr);
|
|
}
|
|
|
|
void vfio_bar_quirk_exit(VFIOPCIDevice *vdev, int nr)
|
|
--
|
|
2.27.0
|
|
|