[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 39/47] megasas: remove unnecessary megasas_use_msix()
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 39/47] megasas: remove unnecessary megasas_use_msix() |
Date: |
Thu, 10 Nov 2016 18:14:18 +0200 |
From: Cao jin <address@hidden>
Also move certain hunk above, to place msix init related code together.
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>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Acked-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/scsi/megasas.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 6cef9a3..ba79e7a 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;
@@ -2299,9 +2294,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);
}
@@ -2353,7 +2346,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)
@@ -2373,6 +2366,10 @@ static void megasas_scsi_realize(PCIDevice *dev, Error
**errp)
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,
"megasas-io", 256);
memory_region_init_io(&s->queue_io, OBJECT(s), &megasas_queue_ops, s,
@@ -2388,10 +2385,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) |
--
MST
- [Qemu-devel] [PULL 33/47] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE, (continued)
- [Qemu-devel] [PULL 33/47] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 34/47] msix: Follow CODING_STYLE, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 35/47] hcd-xhci: check & correct param before using it, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 38/47] hcd-xhci: change behaviour of msix switch, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 37/47] megasas: change behaviour of msix switch, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 40/47] megasas: undo the overwrites of msi user configuration, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 36/47] pci: Convert msix_init() to Error and fix callers to check it, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 39/47] megasas: remove unnecessary megasas_use_msix(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 42/47] vmxnet3: remove unnecessary internal msix flag, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 41/47] vmxnet3: fix reference leak issue, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 43/47] msi_init: convert assert to return -errno, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 45/47] vhost: drop legacy vring layout bits, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 44/47] vhost: adapt vhost_verify_ring_mappings() to virtio 1 ring layout, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 46/47] virtio: drop virtio_queue_get_ring_{size, addr}(), Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 47/47] docs: add PCIe devices placement guidelines, Michael S. Tsirkin, 2016/11/10
- Re: [Qemu-devel] [PULL 00/47] virtio, vhost, pc, pci: tests, documentation, fixes and cleanups, Alex Williamson, 2016/11/10