qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"John G Johnson" <john.g.johnson@oracle.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Jagannathan Raman" <jag.raman@oracle.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
	"Denis V. Lunev" <den@openvz.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [PULL v3 25/27] multi-process: Retrieve PCI info from remote process
Date: Fri,  5 Feb 2021 16:44:57 +0000	[thread overview]
Message-ID: <20210205164459.432714-26-stefanha@redhat.com> (raw)
In-Reply-To: <20210205164459.432714-1-stefanha@redhat.com>

From: Jagannathan Raman <jag.raman@oracle.com>

Retrieve PCI configuration info about the remote device and
configure the Proxy PCI object based on the returned information

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 85ee367bbb993aa23699b44cfedd83b4ea6d5221.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/remote/proxy.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index 555b3103f4..a082709881 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -25,6 +25,8 @@
 #include "sysemu/kvm.h"
 #include "util/event_notifier-posix.c"
 
+static void probe_pci_info(PCIDevice *dev, Error **errp);
+
 static void proxy_intx_update(PCIDevice *pci_dev)
 {
     PCIProxyDev *dev = PCI_PROXY_DEV(pci_dev);
@@ -77,6 +79,7 @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
 {
     ERRP_GUARD();
     PCIProxyDev *dev = PCI_PROXY_DEV(device);
+    uint8_t *pci_conf = device->config;
     int fd;
 
     if (!dev->fd) {
@@ -106,9 +109,14 @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
     qemu_mutex_init(&dev->io_mutex);
     qio_channel_set_blocking(dev->ioc, true, NULL);
 
+    pci_conf[PCI_LATENCY_TIMER] = 0xff;
+    pci_conf[PCI_INTERRUPT_PIN] = 0x01;
+
     proxy_memory_listener_configure(&dev->proxy_listener, dev->ioc);
 
     setup_irqfd(dev);
+
+    probe_pci_info(PCI_DEVICE(dev), errp);
 }
 
 static void pci_proxy_dev_exit(PCIDevice *pdev)
@@ -274,3 +282,79 @@ const MemoryRegionOps proxy_mr_ops = {
         .max_access_size = 8,
     },
 };
+
+static void probe_pci_info(PCIDevice *dev, Error **errp)
+{
+    PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
+    uint32_t orig_val, new_val, base_class, val;
+    PCIProxyDev *pdev = PCI_PROXY_DEV(dev);
+    DeviceClass *dc = DEVICE_CLASS(pc);
+    uint8_t type;
+    int i, size;
+
+    config_op_send(pdev, PCI_VENDOR_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
+    pc->vendor_id = (uint16_t)val;
+
+    config_op_send(pdev, PCI_DEVICE_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
+    pc->device_id = (uint16_t)val;
+
+    config_op_send(pdev, PCI_CLASS_DEVICE, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
+    pc->class_id = (uint16_t)val;
+
+    config_op_send(pdev, PCI_SUBSYSTEM_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
+    pc->subsystem_id = (uint16_t)val;
+
+    base_class = pc->class_id >> 4;
+    switch (base_class) {
+    case PCI_BASE_CLASS_BRIDGE:
+        set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
+        break;
+    case PCI_BASE_CLASS_STORAGE:
+        set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+        break;
+    case PCI_BASE_CLASS_NETWORK:
+        set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
+        break;
+    case PCI_BASE_CLASS_INPUT:
+        set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
+        break;
+    case PCI_BASE_CLASS_DISPLAY:
+        set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
+        break;
+    case PCI_BASE_CLASS_PROCESSOR:
+        set_bit(DEVICE_CATEGORY_CPU, dc->categories);
+        break;
+    default:
+        set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+        break;
+    }
+
+    for (i = 0; i < PCI_NUM_REGIONS; i++) {
+        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &orig_val, 4,
+                       MPQEMU_CMD_PCI_CFGREAD);
+        new_val = 0xffffffff;
+        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &new_val, 4,
+                       MPQEMU_CMD_PCI_CFGWRITE);
+        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &new_val, 4,
+                       MPQEMU_CMD_PCI_CFGREAD);
+        size = (~(new_val & 0xFFFFFFF0)) + 1;
+        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &orig_val, 4,
+                       MPQEMU_CMD_PCI_CFGWRITE);
+        type = (new_val & 0x1) ?
+                   PCI_BASE_ADDRESS_SPACE_IO : PCI_BASE_ADDRESS_SPACE_MEMORY;
+
+        if (size) {
+            g_autofree char *name;
+            pdev->region[i].dev = pdev;
+            pdev->region[i].present = true;
+            if (type == PCI_BASE_ADDRESS_SPACE_MEMORY) {
+                pdev->region[i].memory = true;
+            }
+            name = g_strdup_printf("bar-region-%d", i);
+            memory_region_init_io(&pdev->region[i].mr, OBJECT(pdev),
+                                  &proxy_mr_ops, &pdev->region[i],
+                                  name, size);
+            pci_register_bar(dev, i, type, &pdev->region[i].mr);
+        }
+    }
+}
-- 
2.29.2


  parent reply	other threads:[~2021-02-05 17:43 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-05 16:44 [PULL v3 00/27] Block patches Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 01/27] .github: point Repo Lockdown bot to GitLab repo Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 02/27] gitmodules: use GitLab repos instead of qemu.org Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 03/27] gitlab-ci: remove redundant GitLab repo URL command Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 04/27] docs: update README to use GitLab repo URLs Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 05/27] pc-bios: update mirror URLs to GitLab Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 06/27] get_maintainer: update repo URL " Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 07/27] multi-process: add the concept description to docs/devel/qemu-multiprocess Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 08/27] multi-process: add configure and usage information Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 09/27] memory: alloc RAM from file at offset Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 10/27] multi-process: Add config option for multi-process QEMU Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 11/27] multi-process: setup PCI host bridge for remote device Stefan Hajnoczi
2021-02-06 17:57   ` Philippe Mathieu-Daudé
2021-02-08  5:43     ` Thomas Huth
2021-02-05 16:44 ` [PULL v3 12/27] multi-process: setup a machine object for remote device process Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 13/27] io: add qio_channel_writev_full_all helper Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 14/27] io: add qio_channel_readv_full_all_eof & qio_channel_readv_full_all helpers Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 15/27] multi-process: define MPQemuMsg format and transmission functions Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 16/27] multi-process: Initialize message handler in remote device Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 17/27] multi-process: Associate fd of a PCIDevice with its object Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 18/27] multi-process: setup memory manager for remote device Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 19/27] multi-process: introduce proxy object Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 20/27] multi-process: add proxy communication functions Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 21/27] multi-process: Forward PCI config space acceses to the remote process Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 22/27] multi-process: PCI BAR read/write handling for proxy & remote endpoints Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 23/27] multi-process: Synchronize remote memory Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 24/27] multi-process: create IOHUB object to handle irq Stefan Hajnoczi
2021-02-05 16:44 ` Stefan Hajnoczi [this message]
2021-02-05 16:44 ` [PULL v3 26/27] multi-process: perform device reset in the remote process Stefan Hajnoczi
2021-02-05 16:44 ` [PULL v3 27/27] docs: fix Parallels Image "dirty bitmap" section Stefan Hajnoczi
2021-02-05 22:53 ` [PULL v3 00/27] Block patches Peter Maydell
2021-02-06 17:03   ` Peter Maydell
2021-02-08  9:27     ` Stefan Hajnoczi
2021-02-08 10:02       ` Philippe Mathieu-Daudé
2021-02-08 19:32         ` Jag Raman
2021-02-08 21:29           ` Alex Bennée
2021-02-08 20:21         ` Stefan Hajnoczi
2021-02-09  6:03           ` Thomas Huth
2021-02-09 16:22             ` Jag Raman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210205164459.432714-26-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=den@openvz.org \
    --cc=ehabkost@redhat.com \
    --cc=elena.ufimtseva@oracle.com \
    --cc=fam@euphon.net \
    --cc=imammedo@redhat.com \
    --cc=jag.raman@oracle.com \
    --cc=john.g.johnson@oracle.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).