[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 06/15] usb xhci: change msi/msix property type
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH v7 06/15] usb xhci: change msi/msix property type |
Date: |
Mon, 6 Jun 2016 16:00:53 +0800 |
>From bit to enum OnOffAuto
cc: Gerd Hoffmann <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
Signed-off-by: Cao jin <address@hidden>
---
hw/usb/hcd-xhci.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 43ba615..0a5510f 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -461,6 +461,8 @@ struct XHCIState {
uint32_t numslots;
uint32_t flags;
uint32_t max_pstreams_mask;
+ OnOffAuto msi;
+ OnOffAuto msix;
/* Operational Registers */
uint32_t usbcmd;
@@ -498,9 +500,7 @@ typedef struct XHCIEvRingSeg {
} XHCIEvRingSeg;
enum xhci_flags {
- XHCI_FLAG_USE_MSI = 1,
- XHCI_FLAG_USE_MSI_X,
- XHCI_FLAG_SS_FIRST,
+ XHCI_FLAG_SS_FIRST = 1,
XHCI_FLAG_FORCE_PCIE_ENDCAP,
XHCI_FLAG_ENABLE_STREAMS,
};
@@ -3648,10 +3648,12 @@ static void usb_xhci_realize(struct PCIDevice *dev,
Error **errp)
assert(ret >= 0);
}
- if (xhci_get_flag(xhci, XHCI_FLAG_USE_MSI)) {
+ if (xhci->msi != ON_OFF_AUTO_OFF) {
+ /* TODO check for errors */
msi_init(dev, 0x70, xhci->numintrs, true, false);
}
- if (xhci_get_flag(xhci, XHCI_FLAG_USE_MSI_X)) {
+ if (xhci->msix != ON_OFF_AUTO_OFF) {
+ /* TODO check for errors */
msix_init(dev, xhci->numintrs,
&xhci->mem, 0, OFF_MSIX_TABLE,
&xhci->mem, 0, OFF_MSIX_PBA,
@@ -3872,8 +3874,8 @@ static const VMStateDescription vmstate_xhci = {
};
static Property xhci_properties[] = {
- DEFINE_PROP_BIT("msi", XHCIState, flags, XHCI_FLAG_USE_MSI, true),
- DEFINE_PROP_BIT("msix", XHCIState, flags, XHCI_FLAG_USE_MSI_X, true),
+ DEFINE_PROP_ON_OFF_AUTO("msi", XHCIState, msi, ON_OFF_AUTO_AUTO),
+ DEFINE_PROP_ON_OFF_AUTO("msix", XHCIState, msix, ON_OFF_AUTO_AUTO),
DEFINE_PROP_BIT("superspeed-ports-first",
XHCIState, flags, XHCI_FLAG_SS_FIRST, true),
DEFINE_PROP_BIT("force-pcie-endcap", XHCIState, flags,
--
2.1.0
- [Qemu-devel] [PATCH v7 00/15] Add param Error ** for msi_init(), Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 10/15] pci bridge dev: change msi property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 01/15] pci core: assert ENOSPC when add capability, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 02/15] fix some coding style problems, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 06/15] usb xhci: change msi/msix property type,
Cao jin <=
- [Qemu-devel] [PATCH v7 08/15] mptsas: change msi property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 04/15] megasas: Fix check for msi_init() failure, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 14/15] mptsas: remove unnecessary internal msi state flag, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 03/15] change pvscsi_init_msi() type to void, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 07/15] intel-hda: change msi property type, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 05/15] mptsas: change .realize function name, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 15/15] vmw_pvscsi: remove unnecessary internal msi state flag, Cao jin, 2016/06/06
- [Qemu-devel] [PATCH v7 12/15] pci: Convert msi_init() to Error and fix callers to check it, Cao jin, 2016/06/06