From patchwork Fri Jul 9 05:00:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 471796 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp963648jao; Thu, 8 Jul 2021 22:04:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQJmIxTcJ6XPfxe01/6lzY2B46rojk3Cnv014oXsoTQX+o1JTjCtmqYXRwTT196VO7QlJ3 X-Received: by 2002:a1f:9f0c:: with SMTP id i12mr29648338vke.4.1625807059935; Thu, 08 Jul 2021 22:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625807059; cv=none; d=google.com; s=arc-20160816; b=dhmQLbwiv/90RCiBph1holLEuak4EhF6oNl/oUa5sog2G/NCIK3o03uTXFEu7UC4mB 1HwYt21bAbvk5zYMJAnUQkx9BeNkH07hRRwAqSafo7ShuzpjkduqO4UQphLUgafT4h8u uTxS8BOwaSt+WGpLRUzJ9LwL0ZWn5+H9T9ITyBX9luSg3RcWQvdHr9SAoeWynTuBxlpS 2qZsUK+YHEGEhskn4zW8J9ZTUyPajGhvVy8HPjrin6VJwRVVeMNHvUGsrh1ULTz1aXa9 LtI+v1r5kLf21CYz1+5T04T2gKPA21bACu/DgAg/v2PzvR6hIzgURn55IxMtQlhqRZ6Z QjuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=p9Fy0zR/oY9ljMxigzCfbUSambW+z1dJgVvEjF1TVVQ=; b=mPbjfvI/tu+6l6OaBpEFZpOoHBxI/HOH4rySPlLeDvJscH5b7RgDJU2mxWd43KoOa8 DgKDhTDX9Xxl4kCv3NcL3QKAzlbDH5GKhvPkqYVnoc+Hza3tUScV9n4KtJQ7rRS1PWZZ fZnAONt3mNxEbOhswy4gZ+m2zEC1VO/NyeRaR1RfFKsWNKd6OHfZq/NrnY2vlvtVoIRN 5dtczwdVJTLdmvdHlWZHjPYwhUuYHJA1KCTU9ZfVHYqD398ABfS+25VZSxr8Wx+ofLsK 9nHtDpYV6pkv85+MqWNqUD1qIgBneWdVKmJdKyQszGS6HH99BwMnqWTrjn6qBUjHIM8u S9kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XUEUN2c9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q3si5118947vsk.130.2021.07.08.22.04.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 22:04:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XUEUN2c9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1igV-0004D7-9v for patch@linaro.org; Fri, 09 Jul 2021 01:04:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1icr-0007kM-PC for qemu-devel@nongnu.org; Fri, 09 Jul 2021 01:00:34 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]:40908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1icp-0001rT-TB for qemu-devel@nongnu.org; Fri, 09 Jul 2021 01:00:33 -0400 Received: by mail-pg1-x530.google.com with SMTP id k20so1787957pgg.7 for ; Thu, 08 Jul 2021 22:00:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p9Fy0zR/oY9ljMxigzCfbUSambW+z1dJgVvEjF1TVVQ=; b=XUEUN2c9LiPKnTKlSFqfsigdZWJfEKmiiKa8TjufU4O5ndiLwZda+KsZ4cQgLjJIKo dcA0zmbWNYV0S0jhT2d/eyB1oPCg1BDOhZ/pWo+8XcKh6a3Rbexpht58vgRX/BKK11P9 XkrQMMHaDJeP6CyP66lvp1rZJx6KnAZx7dfsDW9AvvQGNs3NNRwY4692XgFt9bkXJPhy TsB8IqT4f+ZUuZLLEGl1IzSvms1hOSQj+HxLSTTPSIf6iKzb//mwHHFeVqI15sgp+BSt O5xxQMa55BMP4wDLwcZvn+/RwAhmHhcJXPqumQPEt2mvSGqJEGHVxyhIpLInQPB1L/Xn 0JQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p9Fy0zR/oY9ljMxigzCfbUSambW+z1dJgVvEjF1TVVQ=; b=O/AE45HlNAYqF9BOwLbMWyNXox+WXJOj6xtT4C/jqCFniEksBrYCYwmv+oG72bpCE+ TiHhzsB4K4Z9PjpYQpr+WJTE57rlme8WCi/VcTUBMQvmHZu84vskpuZ/ydYdNUL2QWaF uIgEjOlQ4b3Ce1Kh+XHw9+4zVgsnGhivjkW84rJD3JaHAPhQxGcYf8D+a0h3H+WlYqKO 0I9BzmwR5LOLTX6ZsN24AbZVubpbnHRaN3MzlzvY7eLr+fEssZSa0GD7faTB4BwGvuii Mdl2+F4I0/D6hVPhhpSmNjMY5Y9RuvPHuybw/CdzicRVK2rvBmsfL/ujuE7S6FvyJOX4 ORSw== X-Gm-Message-State: AOAM5319rrr1j6Abj+xy7ywWMR1GbQsb8f6dAbY5k+lHyFx4CET58tFw CqUU6T1P5mtmrxRxcat91MO41itE1yt/JQ== X-Received: by 2002:a63:ef44:: with SMTP id c4mr35313558pgk.162.1625806830636; Thu, 08 Jul 2021 22:00:30 -0700 (PDT) Received: from localhost ([106.201.108.2]) by smtp.gmail.com with ESMTPSA id b33sm5098095pgb.92.2021.07.08.22.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 22:00:30 -0700 (PDT) From: Viresh Kumar To: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , "Michael S. Tsirkin" , Viresh Kumar Subject: [PATCH V2 2/3] hw/virtio: add vhost-user-i2c-pci boilerplate Date: Fri, 9 Jul 2021 10:30:17 +0530 Message-Id: <8a083eaa57d93feaab12acd1f94b225879212f20.1625806763.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=viresh.kumar@linaro.org; helo=mail-pg1-x530.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vincent Guittot , Jie Deng , Bill Mills , Arnd Bergmann , Mike Holmes , stratos-dev@op-lists.linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This allows is to instantiate a vhost-user-i2c device as part of a PCI bus. It is mostly boilerplate which looks pretty similar to the vhost-user-fs-pci device. Reviewed-by: Alex Bennée Signed-off-by: Viresh Kumar --- hw/virtio/meson.build | 1 + hw/virtio/vhost-user-i2c-pci.c | 69 ++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 hw/virtio/vhost-user-i2c-pci.c -- 2.31.1.272.g89b43f80a514 diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 1a0d736a0db5..bc352a600911 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -26,6 +26,7 @@ virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) virtio_ss.add(when: 'CONFIG_VHOST_USER_I2C', if_true: files('vhost-user-i2c.c')) +virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_I2C'], if_true: files('vhost-user-i2c-pci.c')) virtio_pci_ss = ss.source_set() virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c')) diff --git a/hw/virtio/vhost-user-i2c-pci.c b/hw/virtio/vhost-user-i2c-pci.c new file mode 100644 index 000000000000..70b7b65fd970 --- /dev/null +++ b/hw/virtio/vhost-user-i2c-pci.c @@ -0,0 +1,69 @@ +/* + * Vhost-user i2c virtio device PCI glue + * + * Copyright (c) 2021 Viresh Kumar + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/qdev-properties.h" +#include "hw/virtio/vhost-user-i2c.h" +#include "virtio-pci.h" + +struct VHostUserI2CPCI { + VirtIOPCIProxy parent_obj; + VHostUserI2C vdev; +}; + +typedef struct VHostUserI2CPCI VHostUserI2CPCI; + +#define TYPE_VHOST_USER_I2C_PCI "vhost-user-i2c-pci-base" + +DECLARE_INSTANCE_CHECKER(VHostUserI2CPCI, VHOST_USER_I2C_PCI, + TYPE_VHOST_USER_I2C_PCI) + +static void vhost_user_i2c_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) +{ + VHostUserI2CPCI *dev = VHOST_USER_I2C_PCI(vpci_dev); + DeviceState *vdev = DEVICE(&dev->vdev); + + vpci_dev->nvectors = 1; + qdev_realize(vdev, BUS(&vpci_dev->bus), errp); +} + +static void vhost_user_i2c_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass); + PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass); + k->realize = vhost_user_i2c_pci_realize; + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); + pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; + pcidev_k->device_id = 0; /* Set by virtio-pci based on virtio id */ + pcidev_k->revision = 0x00; + pcidev_k->class_id = PCI_CLASS_COMMUNICATION_OTHER; +} + +static void vhost_user_i2c_pci_instance_init(Object *obj) +{ + VHostUserI2CPCI *dev = VHOST_USER_I2C_PCI(obj); + + virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), + TYPE_VHOST_USER_I2C); +} + +static const VirtioPCIDeviceTypeInfo vhost_user_i2c_pci_info = { + .base_name = TYPE_VHOST_USER_I2C_PCI, + .non_transitional_name = "vhost-user-i2c-pci", + .instance_size = sizeof(VHostUserI2CPCI), + .instance_init = vhost_user_i2c_pci_instance_init, + .class_init = vhost_user_i2c_pci_class_init, +}; + +static void vhost_user_i2c_pci_register(void) +{ + virtio_pci_types_register(&vhost_user_i2c_pci_info); +} + +type_init(vhost_user_i2c_pci_register);