Hi Alex,
On 12/4/18 5:26 PM, Alex Williamson wrote:
> 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 <ebl...@redhat.com>
> Cc: Markus Armbruster <arm...@redhat.com>
> Tested-by: Geoffrey McRae <ge...@hostfission.com>
> Signed-off-by: Alex Williamson <alex.william...@redhat.com>
> ---
> hw/core/qdev-properties.c | 178
> ++++++++++++++++++++++++++++++++++++++++++
> include/hw/qdev-properties.h | 8 ++
> qapi/common.json | 42 ++++++++++
> 3 files changed, 228 insertions(+)
>
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 35072dec1ecf..f5ca5b821a79 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -1327,3 +1327,181 @@ 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);
> + PCIELinkSpeed 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();
nit: g_assert_not_reached() here and below.
> + }
> +
> + visit_type_enum(v, prop->name, (int *)&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);
> + PCIELinkSpeed speed;
> + Error *local_err = NULL;
> +
> + if (dev->realized) {
> + qdev_prop_set_after_realize(dev, name, errp);
> + return;
> + }
> +
> + visit_type_enum(v, prop->name, (int *)&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);
> + PCIELinkWidth 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, (int *)&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);
> + PCIELinkWidth width;
> + Error *local_err = NULL;
> +
> + if (dev->realized) {
> + qdev_prop_set_after_realize(dev, name, errp);
> + return;
> + }
> +
> + visit_type_enum(v, prop->name, (int *)&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,
> +};
> diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
> index 4f60cc88f325..6a13a284c48c 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/qapi/common.json b/qapi/common.json
> index 021174f04ea4..b6f3cca35c7e 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: 3.2
4.0 here and below
Thanks
Eric
> +##
> +{ '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: 3.2
> +##
> +{ 'enum': 'PCIELinkWidth',
> + 'data': [ '1', '2', '4', '8', '12', '16', '32' ] }
> +
> ##
> # @SysEmuTarget:
> #
>
>
