[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 2/7] libqos: add iteration support to qpci_find_capability
From: |
Sergio Lopez |
Subject: |
Re: [PATCH v2 2/7] libqos: add iteration support to qpci_find_capability() |
Date: |
Fri, 11 Oct 2019 14:22:01 +0200 |
User-agent: |
mu4e 1.2.0; emacs 26.2 |
Stefan Hajnoczi <address@hidden> writes:
> VIRTIO 1.0 PCI devices have multiple PCI_CAP_ID_VNDR capabilities so we
> need a way to iterate over them. Extend qpci_find_capability() to take
> the last address.
>
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> ---
> tests/libqos/pci.h | 2 +-
> tests/libqos/pci.c | 18 ++++++++++++------
> 2 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/tests/libqos/pci.h b/tests/libqos/pci.h
> index a5389a5845..590c175190 100644
> --- a/tests/libqos/pci.h
> +++ b/tests/libqos/pci.h
> @@ -86,7 +86,7 @@ bool qpci_has_buggy_msi(QPCIDevice *dev);
> bool qpci_check_buggy_msi(QPCIDevice *dev);
>
> void qpci_device_enable(QPCIDevice *dev);
> -uint8_t qpci_find_capability(QPCIDevice *dev, uint8_t id);
> +uint8_t qpci_find_capability(QPCIDevice *dev, uint8_t id, uint8_t
> start_addr);
> void qpci_msix_enable(QPCIDevice *dev);
> void qpci_msix_disable(QPCIDevice *dev);
> bool qpci_msix_pending(QPCIDevice *dev, uint16_t entry);
> diff --git a/tests/libqos/pci.c b/tests/libqos/pci.c
> index 662ee7a517..b8679dff1d 100644
> --- a/tests/libqos/pci.c
> +++ b/tests/libqos/pci.c
> @@ -115,10 +115,16 @@ void qpci_device_enable(QPCIDevice *dev)
> g_assert_cmphex(cmd & PCI_COMMAND_MASTER, ==, PCI_COMMAND_MASTER);
> }
>
> -uint8_t qpci_find_capability(QPCIDevice *dev, uint8_t id)
> +uint8_t qpci_find_capability(QPCIDevice *dev, uint8_t id, uint8_t start_addr)
> {
> uint8_t cap;
> - uint8_t addr = qpci_config_readb(dev, PCI_CAPABILITY_LIST);
> + uint8_t addr;
> +
> + if (start_addr) {
> + addr = qpci_config_readb(dev, start_addr + PCI_CAP_LIST_NEXT);
> + } else {
> + addr = qpci_config_readb(dev, PCI_CAPABILITY_LIST);
> + }
>
> do {
> cap = qpci_config_readb(dev, addr);
> @@ -138,7 +144,7 @@ void qpci_msix_enable(QPCIDevice *dev)
> uint8_t bir_table;
> uint8_t bir_pba;
>
> - addr = qpci_find_capability(dev, PCI_CAP_ID_MSIX);
> + addr = qpci_find_capability(dev, PCI_CAP_ID_MSIX, 0);
> g_assert_cmphex(addr, !=, 0);
>
> val = qpci_config_readw(dev, addr + PCI_MSIX_FLAGS);
> @@ -167,7 +173,7 @@ void qpci_msix_disable(QPCIDevice *dev)
> uint16_t val;
>
> g_assert(dev->msix_enabled);
> - addr = qpci_find_capability(dev, PCI_CAP_ID_MSIX);
> + addr = qpci_find_capability(dev, PCI_CAP_ID_MSIX, 0);
> g_assert_cmphex(addr, !=, 0);
> val = qpci_config_readw(dev, addr + PCI_MSIX_FLAGS);
> qpci_config_writew(dev, addr + PCI_MSIX_FLAGS,
> @@ -203,7 +209,7 @@ bool qpci_msix_masked(QPCIDevice *dev, uint16_t entry)
> uint64_t vector_off = dev->msix_table_off + entry * PCI_MSIX_ENTRY_SIZE;
>
> g_assert(dev->msix_enabled);
> - addr = qpci_find_capability(dev, PCI_CAP_ID_MSIX);
> + addr = qpci_find_capability(dev, PCI_CAP_ID_MSIX, 0);
> g_assert_cmphex(addr, !=, 0);
> val = qpci_config_readw(dev, addr + PCI_MSIX_FLAGS);
>
> @@ -221,7 +227,7 @@ uint16_t qpci_msix_table_size(QPCIDevice *dev)
> uint8_t addr;
> uint16_t control;
>
> - addr = qpci_find_capability(dev, PCI_CAP_ID_MSIX);
> + addr = qpci_find_capability(dev, PCI_CAP_ID_MSIX, 0);
> g_assert_cmphex(addr, !=, 0);
>
> control = qpci_config_readw(dev, addr + PCI_MSIX_FLAGS);
Reviewed-by: Sergio Lopez <address@hidden>
signature.asc
Description: PGP signature
- [PATCH v2 0/7] libqos: add VIRTIO PCI 1.0 support, Stefan Hajnoczi, 2019/10/11
- [PATCH v2 1/7] libqos: extract Legacy virtio-pci.c code, Stefan Hajnoczi, 2019/10/11
- [PATCH v2 2/7] libqos: add iteration support to qpci_find_capability(), Stefan Hajnoczi, 2019/10/11
- [PATCH v2 3/7] libqos: pass full QVirtQueue to set_queue_address(), Stefan Hajnoczi, 2019/10/11
- [PATCH v2 4/7] libqos: add MSI-X callbacks to QVirtioPCIDevice, Stefan Hajnoczi, 2019/10/11
- [PATCH v2 5/7] libqos: expose common virtqueue setup/cleanup functions, Stefan Hajnoczi, 2019/10/11