From nobody Fri Nov 14 19:46:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1761813379; cv=none; d=zohomail.com; s=zohoarc; b=H/2ksJLqjoR8uPFLt7v/skaCJVllwye4lh/Fl7O3QpMXd/r37naQlbxQ4si+DDNEqox9wKncHm/0xZRYdNv+WbT6nVVXyxo7fqWxvM7xj5cMruEPOJr75Sb4BMwE8eE+cNkTQYicCyNnE/BnUkaJCiM/5YWj7JvQw9M5Zs6JEVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761813379; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YzdPcxBguDcfDhuvTfhOR7tTr35pGCOMLQekTqhiba4=; b=hgMbvZVKRW2HXPKX5IPSG3/oJzT++xx0k5XPH/TScAJ59gF+dmJ5+H2dZNqbNuj+h82IonDO3jcoAGSiMqVOwYqt5puBHQ2OF1sQyuwXT171T1e5jKr1wF4Qib8L4kVf4NCrmrir1BHpwo4bcIGh+TFJSwRuysohbZDmx5Hk5H8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761813379353435.57108144168865; Thu, 30 Oct 2025 01:36:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEO7f-0001B1-69; Thu, 30 Oct 2025 04:35:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEO7a-00019C-58 for qemu-devel@nongnu.org; Thu, 30 Oct 2025 04:35:02 -0400 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vEO7T-0005b5-LH for qemu-devel@nongnu.org; Thu, 30 Oct 2025 04:35:00 -0400 Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 59U7P5Ed1598398; Thu, 30 Oct 2025 08:34:51 GMT Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4a3ta7sqbh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Oct 2025 08:34:51 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 59U8Yoil027476 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 30 Oct 2025 08:34:50 GMT Received: from haixcui1-gv.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.24; Thu, 30 Oct 2025 01:34:48 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= YzdPcxBguDcfDhuvTfhOR7tTr35pGCOMLQekTqhiba4=; b=oxcyz3qAb1WSYh73 mA8VxKPSBtRYDUy54HPTRwHH5hsB+mkW8z5PYiDIfz8dz0P3AOhG9w0BHMt2qumx un41HIT0bz/lPs9ertRUd0VXNifRR7rvnMv2ijjUjLK53oc1/ixPp4LVM/KIWQk5 VUHDBfoPiUwpnU0oNsQ1pRuzs8Mep+TvqbHVM8syePO2NKOUgcF18IAxJNHz3Amm LWU8KeNl+P0WHLB3zE9sHSJhVFVGmhABUwTqBkmrvqb2S/hOH6lKQ1A4BBhH7Z+u m6h+IXNZVj1sD5Ey89TlYUCVwkP4rbYXluDcaHmD69HsIj5/o2l2dAuQ3a4jJ3sA TtXt6Q== From: Haixu Cui To: , , , , , , CC: Haixu Cui Subject: [PATCH v2 3/3] virtio-spi: Add vhost-user-spi device support Date: Thu, 30 Oct 2025 16:34:13 +0800 Message-ID: <20251030083413.1532360-4-quic_haixcui@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251030083413.1532360-1-quic_haixcui@quicinc.com> References: <20251030083413.1532360-1-quic_haixcui@quicinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Authority-Analysis: v=2.4 cv=aaVsXBot c=1 sm=1 tr=0 ts=6903232b cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=NEAV23lmAAAA:8 a=VwQbUJbxAAAA:8 a=COk6AnOGAAAA:8 a=i0EeH86SAAAA:8 a=8x0lwGbhQW9GwtfvS4EA:9 a=TjNXssC_j7lpFel5tvFf:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-ORIG-GUID: dT9Za1IoKibUTOg0waD22WWuHSEIXx2h X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDMwMDA2OSBTYWx0ZWRfXzfCCieriDD5n Epw4oIGzHzrNg4QhKtSnAF7csGGNdrjkTBjV/IEiytnUa9nAcmh/rJl/NZAonC1HJ9QWJCQ7mOa erxy1BSgfkRS5YU3u1VN0/VI57pAH1Pet2o6znIlCAiw6837tu2KWEGWB/nbOUdR715TYCBtiq+ xNsOtIQ2sN5zyi958f3UV8jzwPUUMdOUb8OpKm90fltAptgp0Q9BXuyRc9rBBhaZVVwNCHzL+cv 7UlrcHnBWxS7hd+oWYF1ZmbUBvZK9vNeQME3q/2CvxSHisjclzPv2nmhjtuAoK14miw1Yf+BuFH wi5Mkgxp5L+xmJy7bj1B1ejMiI68Aav+21TKXmkBsni8Ord2aO0a2yXvKfGQTKR7QkTLDc1ByyY jEE35UFBu0SQ6CMuIgKTZRF09fNixQ== X-Proofpoint-GUID: dT9Za1IoKibUTOg0waD22WWuHSEIXx2h X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-10-30_02,2025-10-29_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1011 impostorscore=0 suspectscore=0 spamscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2510300069 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.220.180.131; envelope-from=quic_haixcui@quicinc.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @quicinc.com) X-ZM-MESSAGEID: 1761813384741158500 Content-Type: text/plain; charset="utf-8" This patch introduces support for vhost-user-spi and vhost-user-spi-pci devices in QEMU, enabling virtio-based SPI communication via the vhost-user protocol. The implementation follows the virtio-spi specification and leverages the upstream virtio-spi driver in Linux. Relevant references: - Virtio SPI specification: https://github.com/oasis-tcs/virtio-spec/tree/master/device-types/spi - Linux virtio-spi driver: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/d= rivers/spi/spi-virtio.c?h=3Dv6.18-rc3 - vhost-user-spi daemon: https://github.com/rust-vmm/vhost-device/tree/main/vhost-device-spi Example usage with rust-vmm vhost-user-spi daemon: Start the vhost-user-spi daemon: vhost-device-spi --socket-path=3Dvspi.sock --socket-count=3D1 \ --device "/dev/spidev0.0" Launch QEMU with: qemu-system-aarch64 -m 1G \ -chardev socket,path=3D/home/root/vspi.sock0,id=3Dvspi \ -device vhost-user-spi-device,chardev=3Dvspi,id=3Dspi \ -object memory-backend-file,id=3Dmem,size=3D1G,mem-path=3D/dev/shm,= share=3Don \ -numa node,memdev=3Dmem Signed-off-by: Haixu Cui Reviewed-by: Manos Pitsidianakis --- MAINTAINERS | 6 ++ docs/system/devices/virtio/vhost-user.rst | 3 + hw/virtio/Kconfig | 5 ++ hw/virtio/meson.build | 3 + hw/virtio/vhost-user-spi-pci.c | 69 +++++++++++++++++++++++ hw/virtio/vhost-user-spi.c | 65 +++++++++++++++++++++ hw/virtio/virtio.c | 4 +- include/hw/virtio/vhost-user-spi.h | 25 ++++++++ 8 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 hw/virtio/vhost-user-spi-pci.c create mode 100644 hw/virtio/vhost-user-spi.c create mode 100644 include/hw/virtio/vhost-user-spi.h diff --git a/MAINTAINERS b/MAINTAINERS index f33f95ceea..9ce2e16140 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2520,6 +2520,12 @@ F: hw/virtio/vhost-user-scmi* F: include/hw/virtio/vhost-user-scmi.h F: tests/qtest/libqos/virtio-scmi.* =20 +vhost-user-spi +M: Haixu Cui +S: Maintained +F: include/hw/virtio/vhost-user-spi.h +F: hw/virtio/vhost-user-spi* + virtio-crypto M: Gonglei S: Supported diff --git a/docs/system/devices/virtio/vhost-user.rst b/docs/system/device= s/virtio/vhost-user.rst index f556a840e9..2806d81ca2 100644 --- a/docs/system/devices/virtio/vhost-user.rst +++ b/docs/system/devices/virtio/vhost-user.rst @@ -58,6 +58,9 @@ platform details for what sort of virtio bus to use. * - vhost-user-vsock - Socket based communication - `vhost-device-vsock `_ + * - vhost-user-spi + - Proxy spi devices to host + - `vhost-device-spi `_ =20 The referenced *daemons* are not exhaustive, any conforming backend implementing the device and using the vhost-user protocol should work. diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 10f5c53ac0..8895682c61 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -127,6 +127,11 @@ config VHOST_USER_SCMI default y depends on VIRTIO && VHOST_USER && ARM =20 +config VHOST_USER_SPI + bool + default y + depends on VIRTIO && VHOST_USER + config VHOST_USER_TEST bool default y diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index affd66887d..6675b63ce6 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -28,6 +28,7 @@ if have_vhost system_virtio_ss.add(when: 'CONFIG_VHOST_USER_RNG', if_true: files('vh= ost-user-rng.c')) system_virtio_ss.add(when: 'CONFIG_VHOST_USER_SND', if_true: files('vh= ost-user-snd.c')) system_virtio_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('= vhost-user-input.c')) + system_virtio_ss.add(when: 'CONFIG_VHOST_USER_SPI', if_true: files('vh= ost-user-spi.c')) =20 # PCI Stubs system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_TE= ST'], @@ -42,6 +43,8 @@ if have_vhost if_true: files('vhost-user-snd-pci.c')) system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_IN= PUT'], if_true: files('vhost-user-input-pci.c')) + system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_SP= I'], + if_true: files('vhost-user-spi-pci.c')) endif if have_vhost_vdpa system_virtio_ss.add(files('vhost-vdpa.c')) diff --git a/hw/virtio/vhost-user-spi-pci.c b/hw/virtio/vhost-user-spi-pci.c new file mode 100644 index 0000000000..095aba5760 --- /dev/null +++ b/hw/virtio/vhost-user-spi-pci.c @@ -0,0 +1,69 @@ +/* + * Vhost-user spi virtio device PCI glue + * + * Copyright (C) 2025 Qualcomm Innovation Center, Inc. All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/vhost-user-spi.h" +#include "hw/virtio/virtio-pci.h" + +struct VHostUserSPIPCI { + VirtIOPCIProxy parent_obj; + VHostUserSPI vdev; +}; + +typedef struct VHostUserSPIPCI VHostUserSPIPCI; + +#define TYPE_VHOST_USER_SPI_PCI "vhost-user-spi-pci-base" + +DECLARE_INSTANCE_CHECKER(VHostUserSPIPCI, VHOST_USER_SPI_PCI, + TYPE_VHOST_USER_SPI_PCI) + +static void vhost_user_spi_pci_realize(VirtIOPCIProxy *vpci_dev, Error **e= rrp) +{ + VHostUserSPIPCI *dev =3D VHOST_USER_SPI_PCI(vpci_dev); + DeviceState *vdev =3D DEVICE(&dev->vdev); + + vpci_dev->nvectors =3D 1; + qdev_realize(vdev, BUS(&vpci_dev->bus), errp); +} + +static void vhost_user_spi_pci_class_init(ObjectClass *klass, const void *= data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + VirtioPCIClass *k =3D VIRTIO_PCI_CLASS(klass); + PCIDeviceClass *pcidev_k =3D PCI_DEVICE_CLASS(klass); + k->realize =3D vhost_user_spi_pci_realize; + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); + pcidev_k->vendor_id =3D PCI_VENDOR_ID_REDHAT_QUMRANET; + pcidev_k->device_id =3D 0; /* Set by virtio-pci based on virtio id */ + pcidev_k->revision =3D 0x00; + pcidev_k->class_id =3D PCI_CLASS_COMMUNICATION_OTHER; +} + +static void vhost_user_spi_pci_instance_init(Object *obj) +{ + VHostUserSPIPCI *dev =3D VHOST_USER_SPI_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VHOST_USER_SPI); +} + +static const VirtioPCIDeviceTypeInfo vhost_user_spi_pci_info =3D { + .base_name =3D TYPE_VHOST_USER_SPI_PCI, + .non_transitional_name =3D "vhost-user-spi-pci", + .instance_size =3D sizeof(VHostUserSPIPCI), + .instance_init =3D vhost_user_spi_pci_instance_init, + .class_init =3D vhost_user_spi_pci_class_init, +}; + +static void vhost_user_spi_pci_register(void) +{ + virtio_pci_types_register(&vhost_user_spi_pci_info); +} + +type_init(vhost_user_spi_pci_register); diff --git a/hw/virtio/vhost-user-spi.c b/hw/virtio/vhost-user-spi.c new file mode 100644 index 0000000000..0d44dec46a --- /dev/null +++ b/hw/virtio/vhost-user-spi.c @@ -0,0 +1,65 @@ +/* + * Vhost-user spi virtio device + * + * Copyright (C) 2025 Qualcomm Innovation Center, Inc. All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/virtio-bus.h" +#include "hw/virtio/vhost-user-spi.h" +#include "qemu/error-report.h" +#include "standard-headers/linux/virtio_ids.h" +#include "standard-headers/linux/virtio_spi.h" + +static const Property vspi_properties[] =3D { + DEFINE_PROP_CHR("chardev", VHostUserBase, chardev), +}; + +static void vspi_realize(DeviceState *dev, Error **errp) +{ + VHostUserBase *vub =3D VHOST_USER_BASE(dev); + VHostUserBaseClass *vubc =3D VHOST_USER_BASE_GET_CLASS(dev); + + /* Fixed for SPI */ + vub->virtio_id =3D VIRTIO_ID_SPI; + vub->num_vqs =3D 1; + vub->vq_size =3D 4; + vub->config_size =3D sizeof(struct virtio_spi_config); + + vubc->parent_realize(dev, errp); +} + +static const VMStateDescription vu_spi_vmstate =3D { + .name =3D "vhost-user-spi", + .unmigratable =3D 1, +}; + +static void vu_spi_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + VHostUserBaseClass *vubc =3D VHOST_USER_BASE_CLASS(klass); + + dc->vmsd =3D &vu_spi_vmstate; + device_class_set_props(dc, vspi_properties); + device_class_set_parent_realize(dc, vspi_realize, + &vubc->parent_realize); + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); +} + +static const TypeInfo vu_spi_info =3D { + .name =3D TYPE_VHOST_USER_SPI, + .parent =3D TYPE_VHOST_USER_BASE, + .instance_size =3D sizeof(VHostUserSPI), + .class_init =3D vu_spi_class_init, +}; + +static void vu_spi_register_types(void) +{ + type_register_static(&vu_spi_info); +} + +type_init(vu_spi_register_types) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 153ee0a0cf..242b95e702 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -48,6 +48,7 @@ #include "standard-headers/linux/virtio_iommu.h" #include "standard-headers/linux/virtio_mem.h" #include "standard-headers/linux/virtio_vsock.h" +#include "standard-headers/linux/virtio_spi.h" =20 /* * Maximum size of virtio device config space @@ -196,7 +197,8 @@ const char *virtio_device_names[] =3D { [VIRTIO_ID_PARAM_SERV] =3D "virtio-param-serv", [VIRTIO_ID_AUDIO_POLICY] =3D "virtio-audio-pol", [VIRTIO_ID_BT] =3D "virtio-bluetooth", - [VIRTIO_ID_GPIO] =3D "virtio-gpio" + [VIRTIO_ID_GPIO] =3D "virtio-gpio", + [VIRTIO_ID_SPI] =3D "virtio-spi" }; =20 static const char *virtio_id_to_name(uint16_t device_id) diff --git a/include/hw/virtio/vhost-user-spi.h b/include/hw/virtio/vhost-u= ser-spi.h new file mode 100644 index 0000000000..a1a65820cd --- /dev/null +++ b/include/hw/virtio/vhost-user-spi.h @@ -0,0 +1,25 @@ +/* + * Vhost-user spi virtio device + * + * Copyright (C) 2025 Qualcomm Innovation Center, Inc. All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QEMU_VHOST_USER_SPI_H +#define QEMU_VHOST_USER_SPI_H + +#include "hw/virtio/virtio.h" +#include "hw/virtio/vhost.h" +#include "hw/virtio/vhost-user.h" +#include "hw/virtio/vhost-user-base.h" + +#define TYPE_VHOST_USER_SPI "vhost-user-spi-device" + +OBJECT_DECLARE_SIMPLE_TYPE(VHostUserSPI, VHOST_USER_SPI) + +struct VHostUserSPI { + VHostUserBase parent_obj; +}; + +#endif /* QEMU_VHOST_USER_SPI_H */ --=20 2.34.1