From patchwork Wed Mar 28 21:39:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 149338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ED464B6ED0 for ; Thu, 29 Mar 2012 11:29:56 +1100 (EST) Received: from localhost ([::1]:39269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SD3FS-0007Oc-Ni for incoming@patchwork.ozlabs.org; Wed, 28 Mar 2012 20:29:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SD2c7-0004HT-Dh for qemu-devel@nongnu.org; Wed, 28 Mar 2012 19:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SD0b1-0004aT-E8 for qemu-devel@nongnu.org; Wed, 28 Mar 2012 17:40:04 -0400 Received: from ozlabs.org ([203.10.76.45]:51272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SD0b1-0004Zl-3M; Wed, 28 Mar 2012 17:39:59 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 05D5EB6EEF; Thu, 29 Mar 2012 08:39:53 +1100 (EST) From: David Gibson To: afaerber@suse.de Date: Thu, 29 Mar 2012 08:39:46 +1100 Message-Id: <1332970787-14598-2-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1332970787-14598-1-git-send-email-david@gibson.dropbear.id.au> References: <1332970787-14598-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: scottwood@freescale.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 2/3] pseries: Fix bug with reset of VIO CRQs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org PAPR specifies a Command Response Queue (CRQ) mechanism used for virtual IO, which we implement. However, we don't correctly clean up registered CRQs when we reset the system. This patch adds a reset handler to fix this bug. While we're at it, add in some of the extra debug messages that were used to track the problem down. Signed-off-by: David Gibson --- hw/spapr_vio.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c index 1f67e64..97d029a 100644 --- a/hw/spapr_vio.c +++ b/hw/spapr_vio.c @@ -431,12 +431,13 @@ static target_ulong h_reg_crq(CPUPPCState *env, sPAPREnvironment *spapr, /* Check if device supports CRQs */ if (!dev->crq.SendFunc) { + hcall_dprintf("h_reg_crq, device does not support CRQ\n"); return H_NOT_FOUND; } - /* Already a queue ? */ if (dev->crq.qsize) { + hcall_dprintf("h_reg_crq, CRQ already registered\n"); return H_RESOURCE; } dev->crq.qladdr = queue_addr; @@ -449,6 +450,17 @@ static target_ulong h_reg_crq(CPUPPCState *env, sPAPREnvironment *spapr, return H_SUCCESS; } +static target_ulong free_crq(VIOsPAPRDevice *dev) +{ + dev->crq.qladdr = 0; + dev->crq.qsize = 0; + dev->crq.qnext = 0; + + dprintf("CRQ for dev 0x%" PRIx32 " freed\n", dev->reg); + + return H_SUCCESS; +} + static target_ulong h_free_crq(CPUPPCState *env, sPAPREnvironment *spapr, target_ulong opcode, target_ulong *args) { @@ -460,13 +472,7 @@ static target_ulong h_free_crq(CPUPPCState *env, sPAPREnvironment *spapr, return H_PARAMETER; } - dev->crq.qladdr = 0; - dev->crq.qsize = 0; - dev->crq.qnext = 0; - - dprintf("CRQ for dev 0x" TARGET_FMT_lx " freed\n", reg); - - return H_SUCCESS; + return free_crq(dev); } static target_ulong h_send_crq(CPUPPCState *env, sPAPREnvironment *spapr, @@ -642,6 +648,15 @@ static int spapr_vio_check_reg(VIOsPAPRDevice *sdev) return 0; } +static void spapr_vio_busdev_reset(void *opaque) +{ + VIOsPAPRDevice *dev = (VIOsPAPRDevice *)opaque; + + if (dev->crq.qsize) { + free_crq(dev); + } +} + static int spapr_vio_busdev_init(DeviceState *qdev) { VIOsPAPRDevice *dev = (VIOsPAPRDevice *)qdev; @@ -670,6 +685,8 @@ static int spapr_vio_busdev_init(DeviceState *qdev) rtce_init(dev); + qemu_register_reset(spapr_vio_busdev_reset, dev); + return pc->init(dev); }