[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 05/11] usb xhci: change msi/msix property type
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH v5 05/11] usb xhci: change msi/msix property type |
Date: |
Fri, 6 May 2016 12:20:36 +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 bcde8a2..6d70289 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,
};
@@ -3645,10 +3645,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_ON ||
+ xhci->msi == ON_OFF_AUTO_AUTO) {
msi_init(dev, 0x70, xhci->numintrs, true, false);
}
- if (xhci_get_flag(xhci, XHCI_FLAG_USE_MSI_X)) {
+ if (xhci->msix == ON_OFF_AUTO_ON ||
+ xhci->msix == ON_OFF_AUTO_AUTO) {
msix_init(dev, xhci->numintrs,
&xhci->mem, 0, OFF_MSIX_TABLE,
&xhci->mem, 0, OFF_MSIX_PBA,
@@ -3869,8 +3871,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 v5 07/11] mptsas: change msi property type, Cao jin, 2016/05/06
[Qemu-devel] [PATCH v5 05/11] usb xhci: change msi/msix property type,
Cao jin <=
[Qemu-devel] [PATCH v5 01/11] fix some coding style problems, Cao jin, 2016/05/06
[Qemu-devel] [PATCH v5 06/11] intel-hda: change msi property type, Cao jin, 2016/05/06
[Qemu-devel] [PATCH v5 08/11] megasas: change msi/msix property type, Cao jin, 2016/05/06
[Qemu-devel] [PATCH v5 10/11] pci core: assert ENOSPC when add capability, Cao jin, 2016/05/06
[Qemu-devel] [PATCH v5 11/11] pci: Convert msi_init() to Error and fix callers to check it, Cao jin, 2016/05/06