3:32 a.m.
This new element is there to represent PCI-Express capabilities
of a PCI devices, like link speed, number of lanes, etc.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
docs/formatnode.html.in | 19 ++++
docs/schemas/nodedev.rng | 26 +++++
src/conf/node_device_conf.c | 123 ++++++++++++++++++++-
src/conf/node_device_conf.h | 31 +++++-
src/node_device/node_device_udev.c | 31 ++++++
.../pci_8086_4238_pcie_wireless.xml | 26 +++++
tests/nodedevxml2xmltest.c | 1 +
7 files changed, 254 insertions(+), 3 deletions(-)
create mode 100644 tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml
diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in
index b424c96..46ec2bc 100644
--- a/docs/formatnode.html.in
+++ b/docs/formatnode.html.in
@@ -110,6 +110,21 @@
have a list of <code>address</code> subelements, one
for each VF on this PF.
</dd>
+ <dt><code>pci-express</code></dt>
+ <dd>
+ This optional element contains information on PCI Express part of
+ the device. For example, it can contain a child element
+ <code>link</code> which addresses the PCI Express device's
link.
+ While a device has it's own capabilities
+ (<code>validity='cap'</code>), the actual run time
capabilities
+ are negotiated on the device initialization
+ (<code>validity='sta'</code>). The
<code>link</code> element then
+ contains three attributes: <code>port</code> which says in
which
+ port is the device plugged in, <code>speed</code> (in
+ GigaTransfers per second) and <code>width</code> for the
number
+ of lanes used. Since the port can't be negotiated, it's not
+ exposed in
<code>./pci-express/link/[@validity='sta']</code>.
+ </dd>
</dl>
</dd>
<dt><code>usb_device</code></dt>
@@ -291,6 +306,10 @@
<address domain='0x0000' bus='0x02' slot='0x00'
function='0x0'/>
<address domain='0x0000' bus='0x02' slot='0x00'
function='0x1'/>
</iommuGroup>
+ <pci-express>
+ <link validity='cap' port='1' speed='2.5'
width='1'/>
+ <link validity='sta' speed='2.5' width='1'/>
+ </pci-express>
</capability>
</device>
</pre>
diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
index 81ab4d4..79e8fd2 100644
--- a/docs/schemas/nodedev.rng
+++ b/docs/schemas/nodedev.rng
@@ -158,6 +158,32 @@
</element>
</optional>
+ <optional>
+ <element name='pci-express'>
+ <zeroOrMore>
+ <element name='link'>
+ <attribute name='validity'>
+ <choice>
+ <value>cap</value>
+ <value>sta</value>
+ </choice>
+ </attribute>
+ <optional>
+ <attribute name='port'>
+ <ref name='unsignedInt'/>
+ </attribute>
+ </optional>
+ <optional>
+ <attribute name='speed'>
+ </attribute>
+ </optional>
+ <attribute name='width'>
+ <ref name='unsignedInt'/>
+ </attribute>
+ </element>
+ </zeroOrMore>
+ </element>
+ </optional>
</define>
<define name='capusbdev'>
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index e65b5e4..70634cc 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -58,6 +58,9 @@ VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST,
"80203",
"80211")
+VIR_ENUM_IMPL(virPCIELinkSpeed, VIR_PCIE_LINK_SPEED_LAST,
+ "", "2.5", "5", "8")
+
static int
virNodeDevCapsDefParseString(const char *xpath,
xmlXPathContextPtr ctxt,
@@ -218,6 +221,35 @@ void virNodeDeviceObjRemove(virNodeDeviceObjListPtr devs,
}
}
+static void
+virPCIELinkFormat(virBufferPtr buf,
+ virPCIELinkPtr lnk,
+ const char *attrib)
+{
+ virBufferAsprintf(buf, "<link validity='%s'", attrib);
+ if (lnk->port >= 0)
+ virBufferAsprintf(buf, " port='%d'", lnk->port);
+ if (lnk->speed)
+ virBufferAsprintf(buf, " speed='%s'",
+ virPCIELinkSpeedTypeToString(lnk->speed));
+ virBufferAsprintf(buf, " width='%d'", lnk->width);
+ virBufferAddLit(buf, "/>\n");
+}
+
+static void
+virPCIEDeviceInfoFormat(virBufferPtr buf,
+ virPCIEDeviceInfoPtr info)
+{
+ virBufferAddLit(buf, "<pci-express>\n");
+ virBufferAdjustIndent(buf, 2);
+
+ virPCIELinkFormat(buf, &info->link_cap, "cap");
+ virPCIELinkFormat(buf, &info->link_sta, "sta");
+
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</pci-express>\n");
+}
+
char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -346,6 +378,8 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
virBufferAdjustIndent(&buf, -2);
virBufferAddLit(&buf, "</iommuGroup>\n");
}
+ if (data->pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCIE)
+ virPCIEDeviceInfoFormat(&buf, data->pci_dev.pci_express);
break;
case VIR_NODE_DEV_CAP_USB_DEV:
virBufferAsprintf(&buf, "<bus>%d</bus>\n",
data->usb_dev.bus);
@@ -1043,6 +1077,87 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt,
return ret;
}
+static int
+virNodeDevCapPCIDevPCIExpressParseLinkXML(xmlXPathContextPtr ctxt,
+ xmlNodePtr linkNode,
+ virPCIELinkPtr lnk)
+{
+ xmlNodePtr origNode = ctxt->node;
+ int ret = -1, speed;
+ char *speedStr = NULL, *portStr = NULL;
+
+ ctxt->node = linkNode;
+
+ if (virXPathUInt("number(./@width)", ctxt, &lnk->width) < 0) {
+ virReportError(VIR_ERR_XML_DETAIL, "%s",
+ _("mandatory attribute 'width' is missing or
malformed"));
+ goto cleanup;
+ }
+
+ if ((speedStr = virXPathString("string(./@speed)", ctxt))) {
+ if ((speed = virPCIELinkSpeedTypeFromString(speedStr)) < 0) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("malformed 'speed' attribute: %s"),
+ speedStr);
+ goto cleanup;
+ }
+ lnk->speed = speed;
+ }
+
+ if ((portStr = virXPathString("string(./@port)", ctxt))) {
+ if (virStrToLong_i(portStr, NULL, 10, &lnk->port) < 0) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("malformed 'port' attribute: %s"),
+ portStr);
+ goto cleanup;
+ }
+ } else {
+ lnk->port = -1;
+ }
+
+ ret = 0;
+ cleanup:
+ VIR_FREE(portStr);
+ VIR_FREE(speedStr);
+ ctxt->node = origNode;
+ return ret;
+}
+
+static int
+virNodeDevCapPCIDevPCIExpressParseXML(xmlXPathContextPtr ctxt,
+ xmlNodePtr pciExpressNode,
+ union _virNodeDevCapData *data)
+{
+ xmlNodePtr lnk, origNode = ctxt->node;
+ int ret = -1;
+ virPCIEDeviceInfoPtr pci_express = NULL;
+
+ ctxt->node = pciExpressNode;
+
+ if (VIR_ALLOC(pci_express) < 0)
+ goto cleanup;
+
+ if ((lnk = virXPathNode("./link[@validity='cap']", ctxt))
&&
+ virNodeDevCapPCIDevPCIExpressParseLinkXML(ctxt, lnk,
+ &pci_express->link_cap) < 0)
+ goto cleanup;
+
+ if ((lnk = virXPathNode("./link[@validity='sta']", ctxt))
&&
+ virNodeDevCapPCIDevPCIExpressParseLinkXML(ctxt, lnk,
+ &pci_express->link_sta) < 0)
+ goto cleanup;
+
+
+ data->pci_dev.pci_express = pci_express;
+ pci_express = NULL;
+ data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCIE;
+ ret = 0;
+ cleanup:
+ VIR_FREE(pci_express);
+ ctxt->node = origNode;
+ return ret;
+}
+
static int
virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt,
@@ -1050,7 +1165,7 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt,
xmlNodePtr node,
union _virNodeDevCapData *data)
{
- xmlNodePtr orignode, iommuGroupNode;
+ xmlNodePtr orignode, iommuGroupNode, pciExpress;
int ret = -1;
orignode = ctxt->node;
@@ -1101,6 +1216,12 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt,
goto out;
}
}
+
+ if ((pciExpress = virXPathNode("./pci-express[1]", ctxt))) {
+ if (virNodeDevCapPCIDevPCIExpressParseXML(ctxt, pciExpress, data) < 0)
+ goto out;
+ }
+
ret = 0;
out:
ctxt->node = orignode;
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 50e6805..563bf6a 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -75,10 +75,36 @@ typedef enum {
} virNodeDevSCSIHostCapFlags;
typedef enum {
- VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION = (1 << 0),
- VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION = (1 << 1),
+ VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION = (1 << 0),
+ VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION = (1 << 1),
+ VIR_NODE_DEV_CAP_FLAG_PCIE = (1 << 2),
} virNodeDevPCICapFlags;
+typedef enum {
+ VIR_PCIE_LINK_SPEED_NA = 0,
+ VIR_PCIE_LINK_SPEED_25,
+ VIR_PCIE_LINK_SPEED_5,
+ VIR_PCIE_LINK_SPEED_8,
+ VIR_PCIE_LINK_SPEED_LAST
+} virPCIELinkSpeed;
+
+VIR_ENUM_DECL(virPCIELinkSpeed)
+
+typedef struct _virPCIELink virPCIELink;
+typedef virPCIELink *virPCIELinkPtr;
+struct _virPCIELink {
+ int port;
+ virPCIELinkSpeed speed;
+ unsigned int width;
+};
+
+typedef struct _virPCIEDeviceInfo virPCIEDeviceInfo;
+typedef virPCIEDeviceInfo *virPCIEDeviceInfoPtr;
+struct _virPCIEDeviceInfo {
+ virPCIELink link_cap; /* PCIe device link capabilities */
+ virPCIELink link_sta; /* Actually negotiated capabilities */
+};
+
typedef struct _virNodeDevCapsDef virNodeDevCapsDef;
typedef virNodeDevCapsDef *virNodeDevCapsDefPtr;
struct _virNodeDevCapsDef {
@@ -115,6 +141,7 @@ struct _virNodeDevCapsDef {
virPCIDeviceAddressPtr *iommuGroupDevices;
size_t nIommuGroupDevices;
unsigned int iommuGroupNumber;
+ virPCIEDeviceInfoPtr pci_express;
} pci_dev;
struct {
unsigned int bus;
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 9a951d9..9ed869b 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -425,6 +425,8 @@ static int udevProcessPCI(struct udev_device *device,
const char *syspath = NULL;
union _virNodeDevCapData *data = &def->caps->data;
virPCIDeviceAddress addr;
+ virPCIEDeviceInfoPtr pci_express = NULL;
+ virPCIDevicePtr pciDev = NULL;
int tmpGroup, ret = -1;
char *p;
int rc;
@@ -522,9 +524,38 @@ static int udevProcessPCI(struct udev_device *device,
data->pci_dev.iommuGroupNumber = tmpGroup;
}
+ if (!(pciDev = virPCIDeviceNew(data->pci_dev.domain,
+ data->pci_dev.bus,
+ data->pci_dev.slot,
+ data->pci_dev.function)))
+ goto out;
+
+ if (virPCIDeviceIsPCIExpress(pciDev) > 0) {
+ if (VIR_ALLOC(pci_express) < 0)
+ goto out;
+
+ if (virPCIDeviceGetLinkCap(pciDev,
+ &pci_express->link_cap.port,
+ &pci_express->link_cap.speed,
+ &pci_express->link_cap.width) < 0)
+ goto out;
+
+ if (virPCIDeviceGetLinkSta(pciDev,
+ &pci_express->link_sta.speed,
+ &pci_express->link_sta.width) < 0)
+ goto out;
+
+ pci_express->link_sta.port = -1; /* PCIe can't negotiate port. Yet :) */
+ data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCIE;
+ data->pci_dev.pci_express = pci_express;
+ pci_express = NULL;
+ }
+
ret = 0;
out:
+ virPCIDeviceFree(pciDev);
+ VIR_FREE(pci_express);
return ret;
}
diff --git a/tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml
b/tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml
new file mode 100644
index 0000000..18172e9
--- /dev/null
+++ b/tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml
@@ -0,0 +1,26 @@
+<device>
+ <name>pci_0000_03_00_0</name>
+ <parent>pci_0000_00_1c_1</parent>
+ <capability type='pci'>
+ <domain>0</domain>
+ <bus>3</bus>
+ <slot>0</slot>
+ <function>0</function>
+ <product id='0x4238'>Centrino Ultimate-N 6300</product>
+ <vendor id='0x8086'>Intel Corporation</vendor>
+ <iommuGroup number='8'>
+ <address domain='0x0000' bus='0x00' slot='0x1c'
function='0x0'/>
+ <address domain='0x0000' bus='0x00' slot='0x1c'
function='0x1'/>
+ <address domain='0x0000' bus='0x00' slot='0x1c'
function='0x3'/>
+ <address domain='0x0000' bus='0x00' slot='0x1c'
function='0x4'/>
+ <address domain='0x0000' bus='0x03' slot='0x00'
function='0x0'/>
+ <address domain='0x0000' bus='0x0d' slot='0x00'
function='0x0'/>
+ <address domain='0x0000' bus='0x0d' slot='0x00'
function='0x1'/>
+ <address domain='0x0000' bus='0x0d' slot='0x00'
function='0x3'/>
+ </iommuGroup>
+ <pci-express>
+ <link validity='cap' port='1' speed='2.5'
width='1'/>
+ <link validity='sta' speed='2.5' width='1'/>
+ </pci-express>
+ </capability>
+</device>
diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c
index 9390bf5..6d57318 100644
--- a/tests/nodedevxml2xmltest.c
+++ b/tests/nodedevxml2xmltest.c
@@ -88,6 +88,7 @@ mymain(void)
DO_TEST("storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE");
DO_TEST("usb_device_1d6b_1_0000_00_1d_0_if0");
DO_TEST("usb_device_1d6b_1_0000_00_1d_0");
+ DO_TEST("pci_8086_4238_pcie_wireless");
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
--
1.9.3