Commit d96a0ac7 authored by Alex Williamson's avatar Alex Williamson Committed by Michael S. Tsirkin
Browse files

pcie: Create enums for link speed and width 



In preparation for reporting higher virtual link speeds and widths,
create enums and macros to help us manage them.

Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Tested-by: default avatarGeoffrey McRae <geoff@hostfission.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent e7176cdb

hw/pci/pcie.c

+4 −3
Original line number Diff line number Diff line
@@ -68,11 +68,12 @@ pcie_cap_v1_fill(PCIDevice *dev, uint8_t port, uint8_t type, uint8_t version) 
    pci_set_long(exp_cap + PCI_EXP_LNKCAP,

                 (port << PCI_EXP_LNKCAP_PN_SHIFT) |

                 PCI_EXP_LNKCAP_ASPMS_0S |

                 PCI_EXP_LNK_MLW_1 |

                 PCI_EXP_LNK_LS_25);

                 QEMU_PCI_EXP_LNKCAP_MLW(QEMU_PCI_EXP_LNK_X1) |

                 QEMU_PCI_EXP_LNKCAP_MLS(QEMU_PCI_EXP_LNK_2_5GT));



    pci_set_word(exp_cap + PCI_EXP_LNKSTA,

                 PCI_EXP_LNK_MLW_1 | PCI_EXP_LNK_LS_25);

                 QEMU_PCI_EXP_LNKSTA_NLW(QEMU_PCI_EXP_LNK_X1) |

                 QEMU_PCI_EXP_LNKSTA_CLS(QEMU_PCI_EXP_LNK_2_5GT));



    if (dev->cap_present & QEMU_PCIE_LNKSTA_DLLLA) {

        pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA,

hw/vfio/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -1897,7 +1897,8 @@ static int vfio_setup_pcie_cap(VFIOPCIDevice *vdev, int pos, uint8_t size, 
                                   PCI_EXP_TYPE_ENDPOINT << 4,

                                   PCI_EXP_FLAGS_TYPE);

            vfio_add_emulated_long(vdev, pos + PCI_EXP_LNKCAP,

                                   PCI_EXP_LNK_MLW_1 | PCI_EXP_LNK_LS_25, ~0);

                           QEMU_PCI_EXP_LNKCAP_MLW(QEMU_PCI_EXP_LNK_X1) |

                           QEMU_PCI_EXP_LNKCAP_MLS(QEMU_PCI_EXP_LNK_2_5GT), ~0);

            vfio_add_emulated_word(vdev, pos + PCI_EXP_LNKCTL, 0, ~0);

        }

include/hw/pci/pcie_regs.h

+21 −2
Original line number Diff line number Diff line
@@ -34,10 +34,29 @@ 


/* PCI_EXP_LINK{CAP, STA} */

/* link speed */

#define PCI_EXP_LNK_LS_25               1

typedef enum PCIExpLinkSpeed {

    QEMU_PCI_EXP_LNK_2_5GT = 1,

    QEMU_PCI_EXP_LNK_5GT,

    QEMU_PCI_EXP_LNK_8GT,

    QEMU_PCI_EXP_LNK_16GT,

} PCIExpLinkSpeed;



#define QEMU_PCI_EXP_LNKCAP_MLS(speed)  (speed)

#define QEMU_PCI_EXP_LNKSTA_CLS         QEMU_PCI_EXP_LNKCAP_MLS



typedef enum PCIExpLinkWidth {

    QEMU_PCI_EXP_LNK_X1 = 1,

    QEMU_PCI_EXP_LNK_X2 = 2,

    QEMU_PCI_EXP_LNK_X4 = 4,

    QEMU_PCI_EXP_LNK_X8 = 8,

    QEMU_PCI_EXP_LNK_X12 = 12,

    QEMU_PCI_EXP_LNK_X16 = 16,

    QEMU_PCI_EXP_LNK_X32 = 32,

} PCIExpLinkWidth;



#define PCI_EXP_LNK_MLW_SHIFT           ctz32(PCI_EXP_LNKCAP_MLW)

#define PCI_EXP_LNK_MLW_1               (1 << PCI_EXP_LNK_MLW_SHIFT)

#define QEMU_PCI_EXP_LNKCAP_MLW(width)  (width << PCI_EXP_LNK_MLW_SHIFT)

#define QEMU_PCI_EXP_LNKSTA_NLW         QEMU_PCI_EXP_LNKCAP_MLW



/* PCI_EXP_LINKCAP */

#define PCI_EXP_LNKCAP_ASPMS_SHIFT      ctz32(PCI_EXP_LNKCAP_ASPMS)