From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Marcel Apfelbaum <marcel@redhat.com>,
Andrea Bolognani <abologna@redhat.com>
Subject: [Qemu-devel] [PULL 09/16] hw/pcie: Introduce Generic PCI Express Root Port
Date: Wed, 25 Jan 2017 00:36:44 +0200 [thread overview]
Message-ID: <1485297322-10595-10-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1485297322-10595-1-git-send-email-mst@redhat.com>
From: Marcel Apfelbaum <marcel@redhat.com>
The Generic Root Port behaves almost the same as the
Intel's IOH device with id 3420, without having
Intel specific attributes.
The device has two purposes:
(1) Can be used on both X86 and ARM machines.
(2) It will allow us to tweak the behaviour
(e.g add vendor-specific PCI capabilities)
- something that obviously cannot be done
on a known device.
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Andrea Bolognani <abologna@redhat.com>
---
include/hw/pci/pci.h | 1 +
hw/pci-bridge/gen_pcie_root_port.c | 88 ++++++++++++++++++++++++++++++++++++++
hw/pci-bridge/Makefile.objs | 2 +-
3 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 hw/pci-bridge/gen_pcie_root_port.c
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 772692f..cbc1fdf 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -96,6 +96,7 @@
#define PCI_DEVICE_ID_REDHAT_PXB 0x0009
#define PCI_DEVICE_ID_REDHAT_BRIDGE_SEAT 0x000a
#define PCI_DEVICE_ID_REDHAT_PXB_PCIE 0x000b
+#define PCI_DEVICE_ID_REDHAT_PCIE_RP 0x000c
#define PCI_DEVICE_ID_REDHAT_QXL 0x0100
#define FMT_PCIBUS PRIx64
diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c
new file mode 100644
index 0000000..42bbe34
--- /dev/null
+++ b/hw/pci-bridge/gen_pcie_root_port.c
@@ -0,0 +1,88 @@
+/*
+ * Generic PCI Express Root Port emulation
+ *
+ * Copyright (C) 2017 Red Hat Inc
+ *
+ * Authors:
+ * Marcel Apfelbaum <marcel@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/pci/msix.h"
+#include "hw/pci/pcie_port.h"
+
+#define TYPE_GEN_PCIE_ROOT_PORT "pcie-root-port"
+
+#define GEN_PCIE_ROOT_PORT_AER_OFFSET 0x100
+#define GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR 1
+
+static uint8_t gen_rp_aer_vector(const PCIDevice *d)
+{
+ return 0;
+}
+
+static int gen_rp_interrupts_init(PCIDevice *d, Error **errp)
+{
+ int rc;
+
+ rc = msix_init_exclusive_bar(d, GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR, 0);
+
+ if (rc < 0) {
+ assert(rc == -ENOTSUP);
+ error_setg(errp, "Unable to init msix vectors");
+ } else {
+ msix_vector_use(d, 0);
+ }
+
+ return rc;
+}
+
+static void gen_rp_interrupts_uninit(PCIDevice *d)
+{
+ msix_uninit_exclusive_bar(d);
+}
+
+static const VMStateDescription vmstate_rp_dev = {
+ .name = "pcie-root-port",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .post_load = pcie_cap_slot_post_load,
+ .fields = (VMStateField[]) {
+ VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot),
+ VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log,
+ PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void gen_rp_dev_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+ PCIERootPortClass *rpc = PCIE_ROOT_PORT_CLASS(klass);
+
+ k->vendor_id = PCI_VENDOR_ID_REDHAT;
+ k->device_id = PCI_DEVICE_ID_REDHAT_PCIE_RP;
+ dc->desc = "PCI Express Root Port";
+ dc->vmsd = &vmstate_rp_dev;
+ rpc->aer_vector = gen_rp_aer_vector;
+ rpc->interrupts_init = gen_rp_interrupts_init;
+ rpc->interrupts_uninit = gen_rp_interrupts_uninit;
+ rpc->aer_offset = GEN_PCIE_ROOT_PORT_AER_OFFSET;
+}
+
+static const TypeInfo gen_rp_dev_info = {
+ .name = TYPE_GEN_PCIE_ROOT_PORT,
+ .parent = TYPE_PCIE_ROOT_PORT,
+ .class_init = gen_rp_dev_class_init,
+};
+
+ static void gen_rp_register_types(void)
+ {
+ type_register_static(&gen_rp_dev_info);
+ }
+ type_init(gen_rp_register_types)
diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
index 4f2039f..85e8e39 100644
--- a/hw/pci-bridge/Makefile.objs
+++ b/hw/pci-bridge/Makefile.objs
@@ -1,6 +1,6 @@
common-obj-y += pci_bridge_dev.o
common-obj-y += pci_expander_bridge.o
-common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o
+common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o gen_pcie_root_port.o
common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
common-obj-$(CONFIG_IOH3420) += ioh3420.o
common-obj-$(CONFIG_I82801B11) += i82801b11.o
--
MST
next prev parent reply other threads:[~2017-01-24 22:36 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 22:36 [Qemu-devel] [PULL 00/16] virtio, vhost, pci: fixes, features Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 01/16] compiler: drop ; after BUILD_BUG_ON Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 02/16] compiler: rework BUG_ON using a struct Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 03/16] compiler: expression version of QEMU_BUILD_BUG_ON Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 04/16] ARRAY_SIZE: check that argument is an array Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 05/16] pci: mark ROMs read-only Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 06/16] intel_iommu: fix and simplify size calculation in process_device_iotlb_desc() Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 07/16] hw/pcie: Introduce a base class for PCI Express Root Ports Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 08/16] hw/ioh3420: derive from PCI Express Root Port base class Michael S. Tsirkin
2017-01-24 22:36 ` Michael S. Tsirkin [this message]
2017-01-24 22:36 ` [Qemu-devel] [PULL 10/16] hw/i386: check if nvdimm is enabled before plugging Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 11/16] msix: Follow CODING_STYLE Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 12/16] hcd-xhci: check & correct param before using it Michael S. Tsirkin
2017-01-24 22:36 ` [Qemu-devel] [PULL 13/16] pci: Convert msix_init() to Error and fix callers Michael S. Tsirkin
2017-01-24 22:37 ` [Qemu-devel] [PULL 14/16] virtio: make virtio_should_notify static Michael S. Tsirkin
2017-01-24 22:37 ` [Qemu-devel] [PULL 15/16] vhost: skip ROM sections Michael S. Tsirkin
2017-01-24 22:37 ` [Qemu-devel] [PULL 16/16] vhost-user: delete chardev on cleanup Michael S. Tsirkin
2017-01-25 16:36 ` [Qemu-devel] [PULL 00/16] virtio, vhost, pci: fixes, features Peter Maydell
2017-01-25 18:02 ` Marcel Apfelbaum
2017-01-25 18:08 ` Peter Maydell
2017-01-25 18:45 ` Marcel Apfelbaum
2017-01-25 19:24 ` Peter Maydell
2017-01-25 21:57 ` Michael S. Tsirkin
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=1485297322-10595-10-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=abologna@redhat.com \
--cc=marcel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).