[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] megasas: remove unnecessary megasas_use_msix()
From: |
Cao jin |
Subject: |
[Qemu-devel] [PATCH 5/6] megasas: remove unnecessary megasas_use_msix() |
Date: |
Wed, 17 Aug 2016 22:39:06 +0800 |
megasas overwrites user configuration when msix_init() fail,
to indicate internal msi state, which is unsuitable.
And megasa_use_msix() is unnecessary, so remove it.
cc: Hannes Reinecke <address@hidden>
cc: Paolo Bonzini <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
---
hw/scsi/megasas.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 61efb0f..bde408d 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -155,11 +155,6 @@ static bool megasas_use_queue64(MegasasState *s)
return s->flags & MEGASAS_MASK_USE_QUEUE64;
}
-static bool megasas_use_msix(MegasasState *s)
-{
- return s->msix != ON_OFF_AUTO_OFF;
-}
-
static bool megasas_is_jbod(MegasasState *s)
{
return s->flags & MEGASAS_MASK_USE_JBOD;
@@ -2295,9 +2290,7 @@ static void megasas_scsi_uninit(PCIDevice *d)
{
MegasasState *s = MEGASAS(d);
- if (megasas_use_msix(s)) {
- msix_uninit(d, &s->mmio_io, &s->mmio_io);
- }
+ msix_uninit(d, &s->mmio_io, &s->mmio_io);
msi_uninit(d);
}
@@ -2349,7 +2342,7 @@ static void megasas_scsi_realize(PCIDevice *dev, Error
**errp)
memory_region_init_io(&s->mmio_io, OBJECT(s), &megasas_mmio_ops, s,
"megasas-mmio", 0x4000);
- if (megasas_use_msix(s)) {
+ if (s->msix != ON_OFF_AUTO_OFF) {
ret = msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000,
&s->mmio_io, b->mmio_bar, 0x3800, 0x68, &err);
/* Any error other than -ENOTSUP(board's MSI support is broken)
@@ -2362,11 +2355,14 @@ static void megasas_scsi_realize(PCIDevice *dev, Error
**errp)
object_unref(OBJECT(&s->mmio_io));
error_propagate(errp, err);
return;
- } else if (ret) {
- /* With msix=auto, we fall back to MSI off silently */
- s->msix = ON_OFF_AUTO_OFF;
- error_free(err);
}
+ assert(!err || s->msix == ON_OFF_AUTO_AUTO);
+ /* With msix=auto, we fall back to MSI off silently */
+ error_free(err);
+ }
+
+ if (msix_enabled(dev)) {
+ msix_vector_use(dev, 0);
}
memory_region_init_io(&s->port_io, OBJECT(s), &megasas_port_ops, s,
@@ -2384,10 +2380,6 @@ static void megasas_scsi_realize(PCIDevice *dev, Error
**errp)
pci_register_bar(dev, b->mmio_bar, bar_type, &s->mmio_io);
pci_register_bar(dev, 3, bar_type, &s->queue_io);
- if (megasas_use_msix(s)) {
- msix_vector_use(dev, 0);
- }
-
s->fw_state = MFI_FWSTATE_READY;
if (!s->sas_addr) {
s->sas_addr = ((NAA_LOCALLY_ASSIGNED_ID << 24) |
--
2.1.0
- [Qemu-devel] [PATCH 4/6] e1000e: drop unnecessary funtions, (continued)
[Qemu-devel] [PATCH 5/6] megasas: remove unnecessary megasas_use_msix(),
Cao jin <=
[Qemu-devel] [PATCH 6/6] megasas: undo the overwrites of user configuration, Cao jin, 2016/08/17
[Qemu-devel] [PATCH 1/6] msix_init: assert programming error, Cao jin, 2016/08/17
[Qemu-devel] [PATCH 2/6] pci: Convert msix_init() to Error and fix callers to check it, Cao jin, 2016/08/17