qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Alex Williamson <alex.williamson@redhat.com>,
	Eric Blake <eblake@redhat.com>,
	Geoffrey McRae <geoff@hostfission.com>,
	Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PULL v3 12/44] qapi: Define PCIe link speed and width properties
Date: Thu, 20 Dec 2018 13:38:43 -0500	[thread overview]
Message-ID: <20181220183059.20726-13-mst@redhat.com> (raw)
In-Reply-To: <20181220183059.20726-1-mst@redhat.com>

From: Alex Williamson <alex.williamson@redhat.com>

Create properties to be able to define speeds and widths for PCIe
links.  The only tricky bit here is that our get and set callbacks
translate from the fixed QAPI automagic enums to those we define
in PCI code to represent the actual register segment value.

Cc: Eric Blake <eblake@redhat.com>
Tested-by: Geoffrey McRae <geoff@hostfission.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 qapi/common.json             |  42 +++++++++
 include/hw/qdev-properties.h |   8 ++
 hw/core/qdev-properties.c    | 176 +++++++++++++++++++++++++++++++++++
 3 files changed, 226 insertions(+)

diff --git a/qapi/common.json b/qapi/common.json
index 021174f04e..99d313ef3b 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -127,6 +127,48 @@
 { 'enum': 'OffAutoPCIBAR',
   'data': [ 'off', 'auto', 'bar0', 'bar1', 'bar2', 'bar3', 'bar4', 'bar5' ] }
 
+##
+# @PCIELinkSpeed:
+#
+# An enumeration of PCIe link speeds in units of GT/s
+#
+# @2_5: 2.5GT/s
+#
+# @5: 5.0GT/s
+#
+# @8: 8.0GT/s
+#
+# @16: 16.0GT/s
+#
+# Since: 4.0
+##
+{ 'enum': 'PCIELinkSpeed',
+  'data': [ '2_5', '5', '8', '16' ] }
+
+##
+# @PCIELinkWidth:
+#
+# An enumeration of PCIe link width
+#
+# @1: x1
+#
+# @2: x2
+#
+# @4: x4
+#
+# @8: x8
+#
+# @12: x12
+#
+# @16: x16
+#
+# @32: x32
+#
+# Since: 4.0
+##
+{ 'enum': 'PCIELinkWidth',
+  'data': [ '1', '2', '4', '8', '12', '16', '32' ] }
+
 ##
 # @SysEmuTarget:
 #
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 3ab9cd2eb6..b6758c852e 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -36,6 +36,8 @@ extern const PropertyInfo qdev_prop_uuid;
 extern const PropertyInfo qdev_prop_arraylen;
 extern const PropertyInfo qdev_prop_link;
 extern const PropertyInfo qdev_prop_off_auto_pcibar;
+extern const PropertyInfo qdev_prop_pcie_link_speed;
+extern const PropertyInfo qdev_prop_pcie_link_width;
 
 #define DEFINE_PROP(_name, _state, _field, _prop, _type) { \
         .name      = (_name),                                    \
@@ -217,6 +219,12 @@ extern const PropertyInfo qdev_prop_off_auto_pcibar;
 #define DEFINE_PROP_OFF_AUTO_PCIBAR(_n, _s, _f, _d) \
     DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_off_auto_pcibar, \
                         OffAutoPCIBAR)
+#define DEFINE_PROP_PCIE_LINK_SPEED(_n, _s, _f, _d) \
+    DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_pcie_link_speed, \
+                        PCIExpLinkSpeed)
+#define DEFINE_PROP_PCIE_LINK_WIDTH(_n, _s, _f, _d) \
+    DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_pcie_link_width, \
+                        PCIExpLinkWidth)
 
 #define DEFINE_PROP_UUID(_name, _state, _field) {                  \
         .name      = (_name),                                      \
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index bd84c4ea4c..943dc2654b 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1297,3 +1297,179 @@ const PropertyInfo qdev_prop_off_auto_pcibar = {
     .set = set_enum,
     .set_default_value = set_default_value_enum,
 };
+
+/* --- PCIELinkSpeed 2_5/5/8/16 -- */
+
+static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
+                                   void *opaque, Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    PCIExpLinkSpeed *p = qdev_get_prop_ptr(dev, prop);
+    int speed;
+
+    switch (*p) {
+    case QEMU_PCI_EXP_LNK_2_5GT:
+        speed = PCIE_LINK_SPEED_2_5;
+        break;
+    case QEMU_PCI_EXP_LNK_5GT:
+        speed = PCIE_LINK_SPEED_5;
+        break;
+    case QEMU_PCI_EXP_LNK_8GT:
+        speed = PCIE_LINK_SPEED_8;
+        break;
+    case QEMU_PCI_EXP_LNK_16GT:
+        speed = PCIE_LINK_SPEED_16;
+        break;
+    default:
+        /* Unreachable */
+        abort();
+    }
+
+    visit_type_enum(v, prop->name, &speed, prop->info->enum_table, errp);
+}
+
+static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
+                                   void *opaque, Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    PCIExpLinkSpeed *p = qdev_get_prop_ptr(dev, prop);
+    int speed;
+    Error *local_err = NULL;
+
+    if (dev->realized) {
+        qdev_prop_set_after_realize(dev, name, errp);
+        return;
+    }
+
+    visit_type_enum(v, prop->name, &speed, prop->info->enum_table, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
+
+    switch (speed) {
+    case PCIE_LINK_SPEED_2_5:
+        *p = QEMU_PCI_EXP_LNK_2_5GT;
+        break;
+    case PCIE_LINK_SPEED_5:
+        *p = QEMU_PCI_EXP_LNK_5GT;
+        break;
+    case PCIE_LINK_SPEED_8:
+        *p = QEMU_PCI_EXP_LNK_8GT;
+        break;
+    case PCIE_LINK_SPEED_16:
+        *p = QEMU_PCI_EXP_LNK_16GT;
+        break;
+    default:
+        /* Unreachable */
+        abort();
+    }
+}
+
+const PropertyInfo qdev_prop_pcie_link_speed = {
+    .name = "PCIELinkSpeed",
+    .description = "2_5/5/8/16",
+    .enum_table = &PCIELinkSpeed_lookup,
+    .get = get_prop_pcielinkspeed,
+    .set = set_prop_pcielinkspeed,
+    .set_default_value = set_default_value_enum,
+};
+
+/* --- PCIELinkWidth 1/2/4/8/12/16/32 -- */
+
+static void get_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
+                                   void *opaque, Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    PCIExpLinkWidth *p = qdev_get_prop_ptr(dev, prop);
+    int width;
+
+    switch (*p) {
+    case QEMU_PCI_EXP_LNK_X1:
+        width = PCIE_LINK_WIDTH_1;
+        break;
+    case QEMU_PCI_EXP_LNK_X2:
+        width = PCIE_LINK_WIDTH_2;
+        break;
+    case QEMU_PCI_EXP_LNK_X4:
+        width = PCIE_LINK_WIDTH_4;
+        break;
+    case QEMU_PCI_EXP_LNK_X8:
+        width = PCIE_LINK_WIDTH_8;
+        break;
+    case QEMU_PCI_EXP_LNK_X12:
+        width = PCIE_LINK_WIDTH_12;
+        break;
+    case QEMU_PCI_EXP_LNK_X16:
+        width = PCIE_LINK_WIDTH_16;
+        break;
+    case QEMU_PCI_EXP_LNK_X32:
+        width = PCIE_LINK_WIDTH_32;
+        break;
+    default:
+        /* Unreachable */
+        abort();
+    }
+
+    visit_type_enum(v, prop->name, &width, prop->info->enum_table, errp);
+}
+
+static void set_prop_pcielinkwidth(Object *obj, Visitor *v, const char *name,
+                                   void *opaque, Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    PCIExpLinkWidth *p = qdev_get_prop_ptr(dev, prop);
+    int width;
+    Error *local_err = NULL;
+
+    if (dev->realized) {
+        qdev_prop_set_after_realize(dev, name, errp);
+        return;
+    }
+
+    visit_type_enum(v, prop->name, &width, prop->info->enum_table, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
+
+    switch (width) {
+    case PCIE_LINK_WIDTH_1:
+        *p = QEMU_PCI_EXP_LNK_X1;
+        break;
+    case PCIE_LINK_WIDTH_2:
+        *p = QEMU_PCI_EXP_LNK_X2;
+        break;
+    case PCIE_LINK_WIDTH_4:
+        *p = QEMU_PCI_EXP_LNK_X4;
+        break;
+    case PCIE_LINK_WIDTH_8:
+        *p = QEMU_PCI_EXP_LNK_X8;
+        break;
+    case PCIE_LINK_WIDTH_12:
+        *p = QEMU_PCI_EXP_LNK_X12;
+        break;
+    case PCIE_LINK_WIDTH_16:
+        *p = QEMU_PCI_EXP_LNK_X16;
+        break;
+    case PCIE_LINK_WIDTH_32:
+        *p = QEMU_PCI_EXP_LNK_X32;
+        break;
+    default:
+        /* Unreachable */
+        abort();
+    }
+}
+
+const PropertyInfo qdev_prop_pcie_link_width = {
+    .name = "PCIELinkWidth",
+    .description = "1/2/4/8/12/16/32",
+    .enum_table = &PCIELinkWidth_lookup,
+    .get = get_prop_pcielinkwidth,
+    .set = set_prop_pcielinkwidth,
+    .set_default_value = set_default_value_enum,
+};
-- 
MST

  parent reply	other threads:[~2018-12-20 18:39 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-20 18:37 [Qemu-devel] [PULL v3 00/44] pci, pc, virtio: fixes, features Michael S. Tsirkin
2018-12-20 18:37 ` [Qemu-devel] [PULL v3 01/44] pcie: set link state inactive/active after hot unplug/plug Michael S. Tsirkin
2018-12-20 18:37 ` [Qemu-devel] [PULL v3 02/44] pc:piix4: Update smbus I/O space after a migration Michael S. Tsirkin
2018-12-20 18:37 ` [Qemu-devel] [PULL v3 03/44] virtio: Helper for registering virtio device types Michael S. Tsirkin
2018-12-20 18:37 ` [Qemu-devel] [PULL v3 04/44] virtio: Provide version-specific variants of virtio PCI devices Michael S. Tsirkin
2018-12-20 18:37 ` [Qemu-devel] [PULL v3 05/44] tests: Remove unused include Michael S. Tsirkin
2018-12-20 18:37 ` [Qemu-devel] [PULL v3 06/44] hw/smbios: Restrict access to "hw/smbios/ipmi.h" Michael S. Tsirkin
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 07/44] hw/smbios: Remove "smbios_ipmi.h" Michael S. Tsirkin
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 08/44] hw/smbios: Move to the hw/firmware/ subdirectory Michael S. Tsirkin
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 09/44] hw/pci-bridge: Fix invalid free() Michael S. Tsirkin
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 10/44] pcie: Create enums for link speed and width Michael S. Tsirkin
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 11/44] pci: Sync PCIe downstream port LNKSTA on read Michael S. Tsirkin
2018-12-20 18:38 ` Michael S. Tsirkin [this message]
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 13/44] pcie: Add link speed and width fields to PCIESlot Michael S. Tsirkin
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 14/44] pcie: Fill PCIESlot link fields to support higher speeds and widths Michael S. Tsirkin
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 15/44] pcie: Allow generic PCIe root port to specify link speed and width Michael S. Tsirkin
2018-12-20 18:38 ` [Qemu-devel] [PULL v3 16/44] vfio/pci: Remove PCIe Link Status emulation Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 17/44] pcie: Fast PCIe root ports for new machines Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 18/44] intel_iommu: dump correct iova when failed Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 19/44] intel_iommu: convert invalid traces into error reports Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 20/44] intel_iommu: dma read/write draining support Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 21/44] intel_iommu: remove "x-" prefix for "aw-bits" Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 22/44] hw: acpi: The RSDP build API can return void Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 23/44] hw: arm: acpi: Fix incorrect checksums in RSDP Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 24/44] hw: i386: Use correct RSDT length for checksum Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 25/44] hw: arm: Carry RSDP specific data through AcpiRsdpData Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 26/44] hw: arm: Convert the RSDP build to the buid_append_foo() API Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 27/44] hw: arm: Support both legacy and current RSDP build Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 28/44] hw: acpi: Export and share the ARM " Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 29/44] hw: acpi: Remove AcpiRsdpDescriptor and fix tests Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 30/44] hw/i386: Remove deprecated machines pc-0.10 and pc-0.11 Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 31/44] pci/pcie: rename hotplug handler callbacks Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 32/44] pci/shpc: " Michael S. Tsirkin
2018-12-20 18:39 ` [Qemu-devel] [PULL v3 33/44] s390x/pci: " Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 34/44] pci/pcihp: perform check for bus capability in pre_plug handler Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 35/44] pci/pcihp: overwrite hotplug handler recursively from the start Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 36/44] pci/pcihp: perform unplug via the hotplug handler Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 37/44] pci/pcie: " Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 38/44] pci: Reuse pci-bridge hotplug handler handlers for pcie-pci-bridge Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 39/44] pci/shpc: perform unplug via the hotplug handler Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 40/44] spapr_pci: " Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 41/44] pci: Adjust PCI config limit based on bus topology Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 42/44] q35: set split kernel irqchip as default Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 43/44] x86-iommu: switch intr_supported to OnOffAuto type Michael S. Tsirkin
2018-12-20 18:40 ` [Qemu-devel] [PULL v3 44/44] x86-iommu: turn on IR by default if proper Michael S. Tsirkin
2018-12-21 15:49 ` [Qemu-devel] [PULL v3 00/44] pci, pc, virtio: fixes, features Peter Maydell
2018-12-26  4:41 ` no-reply

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=20181220183059.20726-13-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=geoff@hostfission.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).