Skip to contentSkip to conversation

pcie: simplify pcie_add_capability()

PATCH Superseded Peter Xu 3 participants 5 messages Feb 14, 2017 – Feb 16, 2017

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Peter Xu

author
#0 lore raw

PATCH 1/1 pcie: simplify pcie_add_capability()

When we add PCIe extended capabilities, we should be following the rule that we add the head extended cap (at offset 0x100) first, then the rest of them. Meanwhile, we are always adding new capability bits at the end of the list. Here the "next" looks meaningless in all cases since it should always be zero (along with the "header").

Simplify the function a bit, and it looks more readable now.

---
 hw/pci/pcie.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
hw/pci/pcie.c +4 -11
index cbd4bb4..e0e6f6a 100644
@@ -664,30 +664,23 @@ void pcie_add_capability(PCIDevice *dev,
                          uint16_t cap_id, uint8_t cap_ver,
                          uint16_t offset, uint16_t size)
 {
-    uint32_t header;
-    uint16_t next;
-
     assert(offset >= PCI_CONFIG_SPACE_SIZE);
     assert(offset < offset + size);
     assert(offset + size <= PCIE_CONFIG_SPACE_SIZE);
     assert(size >= 8);
     assert(pci_is_express(dev));
 
-    if (offset == PCI_CONFIG_SPACE_SIZE) {
-        header = pci_get_long(dev->config + offset);
-        next = PCI_EXT_CAP_NEXT(header);
-    } else {
+    if (offset != PCI_CONFIG_SPACE_SIZE) {
         uint16_t prev;
 
         /* 0 is reserved cap id. use internally to find the last capability
            in the linked list */
-        next = pcie_find_capability_list(dev, 0, &prev);
-
+        assert(pcie_find_capability_list(dev, 0, &prev) == 0);
         assert(prev >= PCI_CONFIG_SPACE_SIZE);
-        assert(next == 0);
         pcie_ext_cap_set_next(dev, prev, offset);
     }
-    pci_set_long(dev->config + offset, PCI_EXT_CAP(cap_id, cap_ver, next));
+
+    pci_set_long(dev->config + offset, PCI_EXT_CAP(cap_id, cap_ver, 0));
 
     /* Make capability read-only by default */
     memset(dev->wmask + offset, 0, size);
Signature · 1 line
2.7.4
#1 lore raw
Quoted 32 lines · Peter Xu

When we add PCIe extended capabilities, we should be following the rule that we add the head extended cap (at offset 0x100) first, then the rest of them. Meanwhile, we are always adding new capability bits at the end of the list. Here the "next" looks meaningless in all cases since it should always be zero (along with the "header").

Simplify the function a bit, and it looks more readable now.

---
 hw/pci/pcie.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
hw/pci/pcie.c +0 -5
index cbd4bb4..e0e6f6a 100644
@@ -664,30 +664,23 @@ void pcie_add_capability(PCIDevice *dev,
                          uint16_t cap_id, uint8_t cap_ver,
                          uint16_t offset, uint16_t size)
 {
-    uint32_t header;
-    uint16_t next;
-
     assert(offset >= PCI_CONFIG_SPACE_SIZE);
     assert(offset < offset + size);
     assert(offset + size <= PCIE_CONFIG_SPACE_SIZE);
     assert(size >= 8);
     assert(pci_is_express(dev));
 
-    if (offset == PCI_CONFIG_SPACE_SIZE) {
-        header = pci_get_long(dev->config + offset);

hw/pci/pcie.c void pcie_add_capability(PCIDevice *dev, · line 678

Quoted 10 lines
hw/pci/pcie.c +2 -4
-        next = PCI_EXT_CAP_NEXT(header);
-    } else {
+    if (offset != PCI_CONFIG_SPACE_SIZE) {
         uint16_t prev;
 
         /* 0 is reserved cap id. use internally to find the last capability
            in the linked list */
-        next = pcie_find_capability_list(dev, 0, &prev);
-
+        assert(pcie_find_capability_list(dev, 0, &prev) == 0);

Hi Peter,

It is not recommended to use assert with an expression with side-effects.

Thanks,
Marcel

Quoted 11 lines
hw/pci/pcie.c +2 -2
         assert(prev >= PCI_CONFIG_SPACE_SIZE);
-        assert(next == 0);
         pcie_ext_cap_set_next(dev, prev, offset);
     }
-    pci_set_long(dev->config + offset, PCI_EXT_CAP(cap_id, cap_ver, next));
+
+    pci_set_long(dev->config + offset, PCI_EXT_CAP(cap_id, cap_ver, 0));
 
     /* Make capability read-only by default */
     memset(dev->wmask + offset, 0, size);
author
#2 lore raw
Quoted 46 lines · Marcel Apfelbaum
Quoted 32 lines · Peter Xu

When we add PCIe extended capabilities, we should be following the rule that we add the head extended cap (at offset 0x100) first, then the rest of them. Meanwhile, we are always adding new capability bits at the end of the list. Here the "next" looks meaningless in all cases since it should always be zero (along with the "header").

Simplify the function a bit, and it looks more readable now.

---
hw/pci/pcie.c | 15 ++++-----------

1 file changed, 4 insertions(+), 11 deletions(-)
hw/pci/pcie.c +0 -5
index cbd4bb4..e0e6f6a 100644
@@ -664,30 +664,23 @@ void pcie_add_capability(PCIDevice *dev,
                         uint16_t cap_id, uint8_t cap_ver,
                         uint16_t offset, uint16_t size)
 {
-    uint32_t header;
-    uint16_t next;
-
    assert(offset >= PCI_CONFIG_SPACE_SIZE);
    assert(offset < offset + size);
    assert(offset + size <= PCIE_CONFIG_SPACE_SIZE);
    assert(size >= 8);
    assert(pci_is_express(dev));
 
-    if (offset == PCI_CONFIG_SPACE_SIZE) {
-        header = pci_get_long(dev->config + offset);

hw/pci/pcie.c void pcie_add_capability(PCIDevice *dev, · line 678

Quoted 10 lines
hw/pci/pcie.c +2 -4
-        next = PCI_EXT_CAP_NEXT(header);
-    } else {
+    if (offset != PCI_CONFIG_SPACE_SIZE) {
        uint16_t prev;
 
        /* 0 is reserved cap id. use internally to find the last capability
           in the linked list */
-        next = pcie_find_capability_list(dev, 0, &prev);
-
+        assert(pcie_find_capability_list(dev, 0, &prev) == 0);

Hi Peter,

Quoted 1 line

It is not recommended to use assert with an expression with side-effects.

Exactly. Thanks Marcel, I'll repost.

-- peterx

#3 lore raw
In reply to Peter Xu

Hi peter

Quoted 8 lines · Peter Xu

When we add PCIe extended capabilities, we should be following the rule that we add the head extended cap (at offset 0x100) first, then the rest of them. Meanwhile, we are always adding new capability bits at the end of the list. Here the "next" looks meaningless in all cases since it should always be zero (along with the "header").

Simplify the function a bit, and it looks more readable now.

See if this suggestion could be incorporated into your patch:)
http://lists.nongnu.org/archive/html/qemu-devel/2017-01/msg01418.html

Signature · 2 lines
Sincerely,
Cao jin
Quoted 45 lines
---
 hw/pci/pcie.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
hw/pci/pcie.c +4 -11
index cbd4bb4..e0e6f6a 100644
@@ -664,30 +664,23 @@ void pcie_add_capability(PCIDevice *dev,
                          uint16_t cap_id, uint8_t cap_ver,
                          uint16_t offset, uint16_t size)
 {
-    uint32_t header;
-    uint16_t next;
-
     assert(offset >= PCI_CONFIG_SPACE_SIZE);
     assert(offset < offset + size);
     assert(offset + size <= PCIE_CONFIG_SPACE_SIZE);
     assert(size >= 8);
     assert(pci_is_express(dev));
 
-    if (offset == PCI_CONFIG_SPACE_SIZE) {
-        header = pci_get_long(dev->config + offset);
-        next = PCI_EXT_CAP_NEXT(header);
-    } else {
+    if (offset != PCI_CONFIG_SPACE_SIZE) {
         uint16_t prev;
 
         /* 0 is reserved cap id. use internally to find the last capability
            in the linked list */
-        next = pcie_find_capability_list(dev, 0, &prev);
-
+        assert(pcie_find_capability_list(dev, 0, &prev) == 0);
         assert(prev >= PCI_CONFIG_SPACE_SIZE);
-        assert(next == 0);
         pcie_ext_cap_set_next(dev, prev, offset);
     }
-    pci_set_long(dev->config + offset, PCI_EXT_CAP(cap_id, cap_ver, next));
+
+    pci_set_long(dev->config + offset, PCI_EXT_CAP(cap_id, cap_ver, 0));
 
     /* Make capability read-only by default */
     memset(dev->wmask + offset, 0, size);
author
#4 lore raw
Quoted 9 lines · Cao jin

Hi peter

Quoted 6 lines · Peter Xu

When we add PCIe extended capabilities, we should be following the rule that we add the head extended cap (at offset 0x100) first, then the rest of them. Meanwhile, we are always adding new capability bits at the end of the list. Here the "next" looks meaningless in all cases since it should always be zero (along with the "header").

Quoted 5 lines
Quoted 2 lines

Simplify the function a bit, and it looks more readable now.

See if this suggestion could be incorporated into your patch:)
http://lists.nongnu.org/archive/html/qemu-devel/2017-01/msg01418.html

Sure. But imho that's really trivial and as long as the assertions are working correctly (no matter in which order) I can live with both. :)

Anyway, thanks for the pointer!

-- peterx