From: Peter Xu <peterx@redhat.com>
To: kvm@vger.kernel.org
Cc: jan.kiszka@web.de, agordeev@redhat.com, drjones@redhat.com,
rkrcmar@redhat.com, pbonzini@redhat.com, peterx@redhat.com
Subject: [kvm-unit-tests PATCH 13/14] pci: add msi support for 32/64bit address
Date: Fri, 14 Oct 2016 20:40:51 +0800 [thread overview]
Message-ID: <1476448852-30062-14-git-send-email-peterx@redhat.com> (raw)
In-Reply-To: <1476448852-30062-1-git-send-email-peterx@redhat.com>
During each PCI device init, we walk through all the capability list,
and see what we support. If a cap handler is provided, it'll be
triggered if the cap is detected. MSI cap handler is the first one. We
can add more cap handler in the future.
Meanwhile, pci_setup_msi() API is provided to support basic 32/64 bit
address MSI setup.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
lib/pci.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/pci.h | 2 ++
2 files changed, 61 insertions(+)
diff --git a/lib/pci.c b/lib/pci.c
index 044e4db..1037ae3 100644
--- a/lib/pci.c
+++ b/lib/pci.c
@@ -7,6 +7,35 @@
#include "pci.h"
#include "asm/pci.h"
+typedef void (*pci_cap_handler)(pci_dev *dev, int cap_offset);
+
+static void pci_cap_msi_handler(pci_dev *dev, int cap_offset)
+{
+ printf("Detected MSI for device 0x%x offset 0x%x\n",
+ dev->pci_addr, cap_offset);
+ dev->msi_offset = cap_offset;
+}
+
+static pci_cap_handler cap_handlers[0xff] = {
+ [PCI_CAP_ID_MSI] = pci_cap_msi_handler,
+};
+
+static void pci_cap_walk(pci_dev *dev)
+{
+ uint8_t cap_offset;
+ uint8_t cap_id;
+
+ cap_offset = pci_config_readb(dev->pci_addr, PCI_CAPABILITY_LIST);
+ while (cap_offset) {
+ cap_id = pci_config_readb(dev->pci_addr, cap_offset);
+ printf("PCI detected cap 0x%x\n", cap_id);
+ if (cap_handlers[cap_id]) {
+ cap_handlers[cap_id](dev, cap_offset);
+ }
+ cap_offset = pci_config_readb(dev->pci_addr, cap_offset + 1);
+ }
+}
+
static void pci_set_master(pci_dev *dev, int master)
{
uint32_t val = pci_config_read(dev->pci_addr, PCI_COMMAND);
@@ -14,6 +43,35 @@ static void pci_set_master(pci_dev *dev, int master)
pci_config_write(dev->pci_addr, PCI_COMMAND, val);
}
+void pci_setup_msi(pci_dev *dev, uint64_t msi_addr, uint32_t msi_data)
+{
+ uint16_t msi_control;
+ pcidevaddr_t addr;
+ uint16_t offset;
+
+ assert(dev && dev->inited && dev->msi_offset);
+
+ offset = dev->msi_offset;
+ addr = dev->pci_addr;
+ msi_control = pci_config_readw(addr, offset + PCI_MSI_FLAGS);
+ pci_config_write(addr, offset + PCI_MSI_ADDRESS_LO,
+ msi_addr & 0xffffffff);
+
+ if (msi_control & PCI_MSI_FLAGS_64BIT) {
+ pci_config_write(addr, offset + PCI_MSI_ADDRESS_HI,
+ (uint32_t)(msi_addr >> 32));
+ pci_config_write(addr, offset + PCI_MSI_DATA_64, msi_data);
+ printf("MSI: dev 0x%x init 64bit address: ", addr);
+ } else {
+ pci_config_write(addr, offset + PCI_MSI_DATA_32, msi_data);
+ printf("MSI: dev 0x%x init 32bit address: ", addr);
+ }
+ printf("addr=0x%lx, data=0x%x\n", msi_addr, msi_data);
+
+ msi_control |= PCI_MSI_FLAGS_ENABLE;
+ pci_config_writew(addr, offset + PCI_MSI_FLAGS, msi_control);
+}
+
/*
* Scan bus look for a specific device. Only bus 0 scanned for now.
* After the scan, a pci_dev is returned with correct BAR information.
@@ -49,6 +107,7 @@ int pci_dev_init(pci_dev *dev, uint16_t vendor_id, uint16_t device_id)
dev->inited = true;
pci_set_master(dev, 1);
+ pci_cap_walk(dev);
return 0;
}
diff --git a/lib/pci.h b/lib/pci.h
index 6a1c3c9..5581446 100644
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -27,6 +27,7 @@ enum {
struct pci_dev {
bool inited;
uint16_t pci_addr;
+ uint16_t msi_offset;
phys_addr_t pci_bar[PCI_BAR_NUM];
};
typedef struct pci_dev pci_dev;
@@ -35,6 +36,7 @@ int pci_dev_init(pci_dev *dev, uint16_t vendor_id, uint16_t device_id);
phys_addr_t pci_bar_addr(pci_dev *dev, int bar_num);
bool pci_bar_is_memory(pci_dev *dev, int bar_num);
bool pci_bar_is_valid(pci_dev *dev, int bar_num);
+void pci_setup_msi(pci_dev *dev, uint64_t msi_addr, uint32_t msi_data);
/*
* pci-testdev is a driver for the pci-testdev qemu pci device. The
--
2.7.4
next prev parent reply other threads:[~2016-10-14 12:41 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-14 12:40 [kvm-unit-tests RFC PATCH 00/14] VT-d unit test Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 01/14] x86: vm: allow multiple init for vm setup Peter Xu
2016-10-20 8:17 ` Andrew Jones
2016-10-20 8:24 ` Peter Xu
2016-10-20 8:41 ` Andrew Jones
2016-10-20 8:55 ` Peter Xu
2016-10-20 9:39 ` Andrew Jones
2016-10-20 11:01 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 02/14] x86: smp: allow multiple init for smp setup Peter Xu
2016-10-19 20:23 ` Radim Krčmář
2016-10-20 1:27 ` Peter Xu
2016-10-20 8:20 ` Andrew Jones
2016-10-20 8:27 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 03/14] x86: intel-iommu: add vt-d init test Peter Xu
2016-10-20 9:30 ` Andrew Jones
2016-10-21 9:52 ` Peter Xu
2016-10-21 12:18 ` Andrew Jones
2016-10-24 6:36 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 04/14] pci: refactor init process to pci_dev_init() Peter Xu
2016-10-20 10:02 ` Andrew Jones
2016-10-24 7:00 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 05/14] page: add page alignment checker Peter Xu
2016-10-20 12:23 ` Andrew Jones
2016-10-20 12:30 ` Andrew Jones
2016-10-24 9:58 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 06/14] util: move MAX/MIN macro into util.h Peter Xu
2016-10-20 12:28 ` Andrew Jones
2016-10-24 10:02 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 07/14] vm/page: provide PGDIR_OFFSET() macro Peter Xu
2016-10-20 12:40 ` Andrew Jones
2016-10-14 12:40 ` [kvm-unit-tests PATCH 08/14] x86: pci: add pci_config_{read|write}[bw]() helpers Peter Xu
2016-10-20 12:43 ` Andrew Jones
2016-10-24 10:08 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 09/14] pci: provide pci_set_master() Peter Xu
2016-10-20 12:49 ` Andrew Jones
2016-10-24 10:11 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 10/14] pci: add bdf helpers Peter Xu
2016-10-20 12:55 ` Andrew Jones
2016-10-24 14:44 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 11/14] pci: edu: introduce pci-edu helpers Peter Xu
2016-10-20 13:19 ` Andrew Jones
2016-10-25 3:34 ` Peter Xu
2016-10-25 10:43 ` Andrew Jones
2016-10-25 11:33 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 12/14] x86: intel-iommu: add dmar test Peter Xu
2016-10-19 20:33 ` Radim Krčmář
2016-10-20 5:41 ` Peter Xu
2016-10-14 12:40 ` Peter Xu [this message]
2016-10-20 13:30 ` [kvm-unit-tests PATCH 13/14] pci: add msi support for 32/64bit address Andrew Jones
2016-10-25 6:21 ` Peter Xu
2016-10-14 12:40 ` [kvm-unit-tests PATCH 14/14] x86: intel-iommu: add IR test Peter Xu
2016-10-20 13:45 ` Andrew Jones
2016-10-25 6:52 ` Peter Xu
2016-10-19 20:21 ` [kvm-unit-tests RFC PATCH 00/14] VT-d unit test Radim Krčmář
2016-10-20 6:05 ` Peter Xu
2016-10-20 11:08 ` Radim Krčmář
2016-10-20 11:23 ` Peter Xu
2016-10-20 11:28 ` Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476448852-30062-14-git-send-email-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=agordeev@redhat.com \
--cc=drjones@redhat.com \
--cc=jan.kiszka@web.de \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).