From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bc7rb-0000Zj-Lj for qemu-devel@nongnu.org; Tue, 23 Aug 2016 05:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bc7rW-00077l-EO for qemu-devel@nongnu.org; Tue, 23 Aug 2016 05:19:18 -0400 Received: from [59.151.112.132] (port=10901 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bc7rV-00073H-Vk for qemu-devel@nongnu.org; Tue, 23 Aug 2016 05:19:14 -0400 From: Cao jin Date: Tue, 23 Aug 2016 17:27:33 +0800 Message-ID: <1471944454-13895-5-git-send-email-caoj.fnst@cn.fujitsu.com> In-Reply-To: <1471944454-13895-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1471944454-13895-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v2 4/5] megasas: remove unnecessary megasas_use_msix() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hannes Reinecke , Paolo Bonzini , Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" 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 CC: Paolo Bonzini CC: Markus Armbruster CC: Marcel Apfelbaum CC: Michael S. Tsirkin Signed-off-by: Cao jin --- 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 6d45025..90cd873 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) @@ -2363,11 +2356,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, @@ -2385,10 +2381,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