[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] msi: Add msi_get_message()
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH 5/6] msi: Add msi_get_message() |
Date: |
Tue, 02 Oct 2012 13:22:07 -0600 |
User-agent: |
StGIT/0.14.3 |
vfio-pci and pci-assign both do this on their own for setting up
direct MSI injection through KVM. Provide a helper function for
this in MSI code.
Signed-off-by: Alex Williamson <address@hidden>
---
hw/msi.c | 45 +++++++++++++++++++++++++++++----------------
hw/msi.h | 1 +
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/hw/msi.c b/hw/msi.c
index e2273a0..33037a8 100644
--- a/hw/msi.c
+++ b/hw/msi.c
@@ -122,6 +122,31 @@ void msi_set_message(PCIDevice *dev, MSIMessage msg)
pci_set_word(dev->config + msi_data_off(dev, msi64bit), msg.data);
}
+MSIMessage msi_get_message(PCIDevice *dev, unsigned int vector)
+{
+ uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev));
+ bool msi64bit = flags & PCI_MSI_FLAGS_64BIT;
+ unsigned int nr_vectors = msi_nr_vectors(flags);
+ MSIMessage msg;
+
+ assert(vector < nr_vectors);
+
+ if (msi64bit) {
+ msg.address = pci_get_quad(dev->config + msi_address_lo_off(dev));
+ } else {
+ msg.address = pci_get_long(dev->config + msi_address_lo_off(dev));
+ }
+
+ /* upper bit 31:16 is zero */
+ msg.data = pci_get_word(dev->config + msi_data_off(dev, msi64bit));
+ if (nr_vectors > 1) {
+ msg.data &= ~(nr_vectors - 1);
+ msg.data |= vector;
+ }
+
+ return msg;
+}
+
bool msi_enabled(const PCIDevice *dev)
{
return msi_present(dev) &&
@@ -249,8 +274,7 @@ void msi_notify(PCIDevice *dev, unsigned int vector)
uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev));
bool msi64bit = flags & PCI_MSI_FLAGS_64BIT;
unsigned int nr_vectors = msi_nr_vectors(flags);
- uint64_t address;
- uint32_t data;
+ MSIMessage msg;
assert(vector < nr_vectors);
if (msi_is_masked(dev, vector)) {
@@ -261,24 +285,13 @@ void msi_notify(PCIDevice *dev, unsigned int vector)
return;
}
- if (msi64bit) {
- address = pci_get_quad(dev->config + msi_address_lo_off(dev));
- } else {
- address = pci_get_long(dev->config + msi_address_lo_off(dev));
- }
-
- /* upper bit 31:16 is zero */
- data = pci_get_word(dev->config + msi_data_off(dev, msi64bit));
- if (nr_vectors > 1) {
- data &= ~(nr_vectors - 1);
- data |= vector;
- }
+ msg = msi_get_message(dev, vector);
MSI_DEV_PRINTF(dev,
"notify vector 0x%x"
" address: 0x%"PRIx64" data: 0x%"PRIx32"\n",
- vector, address, data);
- stl_le_phys(address, data);
+ vector, msg.address, msg.data);
+ stl_le_phys(msg.address, msg.data);
}
/* Normally called by pci_default_write_config(). */
diff --git a/hw/msi.h b/hw/msi.h
index 6ec1f99..150b09a 100644
--- a/hw/msi.h
+++ b/hw/msi.h
@@ -32,6 +32,7 @@ struct MSIMessage {
extern bool msi_supported;
void msi_set_message(PCIDevice *dev, MSIMessage msg);
+MSIMessage msi_get_message(PCIDevice *dev, unsigned int vector);
bool msi_enabled(const PCIDevice *dev);
int msi_init(struct PCIDevice *dev, uint8_t offset,
unsigned int nr_vectors, bool msi64bit, bool msi_per_vector_mask);
[Qemu-devel] [PATCH 3/6] pci: Helper function for testing if an INTx route changed, Alex Williamson, 2012/10/02
[Qemu-devel] [PATCH 4/6] pci-assign: Use pci_intx_route_changed(), Alex Williamson, 2012/10/02
[Qemu-devel] [PATCH 5/6] msi: Add msi_get_message(),
Alex Williamson <=
[Qemu-devel] [PATCH 6/6] pci-assign: Use msi_get_message(), Alex Williamson, 2012/10/02
Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Alex Williamson, 2012/10/08
- Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Jan Kiszka, 2012/10/08
- Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Michael S. Tsirkin, 2012/10/08
- Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Alex Williamson, 2012/10/08
- Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Michael S. Tsirkin, 2012/10/08
- Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Alex Williamson, 2012/10/08
- Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Michael S. Tsirkin, 2012/10/08
- Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Alex Williamson, 2012/10/08
- Re: [Qemu-devel] [PATCH 0/6] Misc PCI cleanups, Michael S. Tsirkin, 2012/10/08