From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk4yE-00086o-SJ for qemu-devel@nongnu.org; Wed, 14 Sep 2016 03:51:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bk4yD-0002dN-Pd for qemu-devel@nongnu.org; Wed, 14 Sep 2016 03:51:02 -0400 Received: from [59.151.112.132] (port=55931 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk4yD-0002bL-BE for qemu-devel@nongnu.org; Wed, 14 Sep 2016 03:51:01 -0400 From: Cao jin Date: Wed, 14 Sep 2016 15:51:00 +0800 Message-ID: <1473839464-8670-5-git-send-email-caoj.fnst@cn.fujitsu.com> In-Reply-To: <1473839464-8670-1-git-send-email-caoj.fnst@cn.fujitsu.com> References: <1473839464-8670-1-git-send-email-caoj.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v3 4/8] megasas: change behaviour of msix switch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Hannes Reinecke , Paolo Bonzini , Markus Armbruster , Marcel Apfelbaum Resolve the TODO, msix=auto means msix on; if user specify msix=on, then device creation fail on msix_init failure. Also undo the overwrites of user configuration of msix. CC: Michael S. Tsirkin CC: Hannes Reinecke CC: Paolo Bonzini CC: Markus Armbruster CC: Marcel Apfelbaum Signed-off-by: Cao jin --- hw/scsi/megasas.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 9db4bac..d801dd0 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2349,19 +2349,31 @@ 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)) { + 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) + * is a programming error */ + assert(!ret || ret == -ENOTSUP); + if (ret && s->msix == ON_OFF_AUTO_ON) { + /* Can't satisfy user's explicit msix=on request, fail */ + error_append_hint(&err, "You have to use msix=auto (default) or " + "msix=off with this machine type.\n"); + /* No instance_finalize method, need to free the resource here */ + object_unref(OBJECT(&s->mmio_io)); + error_propagate(errp, err); + return; + } + assert(!err || d->msix == ON_OFF_AUTO_AUTO); + /* With msix=auto, we fall back to MSI off silently */ + error_free(err); + } + 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, "megasas-queue", 0x40000); - if (megasas_use_msix(s) && - msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000, - &s->mmio_io, b->mmio_bar, 0x3800, 0x68, &err)) { - /*TODO: check msix_init's error, and should fail on msix=on */ - error_report_err(err); - s->msix = ON_OFF_AUTO_OFF; - } - if (pci_is_express(dev)) { pcie_endpoint_cap_init(dev, 0xa0); } -- 2.1.0