From patchwork Tue Aug 23 18:24:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 111166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 954B9B6F62 for ; Wed, 24 Aug 2011 04:24:52 +1000 (EST) Received: from localhost ([::1]:38551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvveb-0005vX-3S for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 14:24:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvveV-0005vO-Ux for qemu-devel@nongnu.org; Tue, 23 Aug 2011 14:24:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QvveU-0001UH-Io for qemu-devel@nongnu.org; Tue, 23 Aug 2011 14:24:43 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:41388) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvveU-0001Ta-Cj for qemu-devel@nongnu.org; Tue, 23 Aug 2011 14:24:42 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QvveK-0004O6-Kd; Tue, 23 Aug 2011 19:24:32 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 23 Aug 2011 19:24:32 +0100 Message-Id: <1314123872-16843-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Blue Swirl , Avi Kivity , patches@linaro.org Subject: [Qemu-devel] [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset 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 Remove a spurious second map of the OMAP GPMC CS0 region on reset. This fixes an assertion failure when we try to add the region to its container when it was already added. (The old code did not complain about mismatched map/unmap calls, but the new MemoryRegion implementation does.) Signed-off-by: Peter Maydell --- hw/omap_gpmc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/hw/omap_gpmc.c b/hw/omap_gpmc.c index 922d622..673dddd 100644 --- a/hw/omap_gpmc.c +++ b/hw/omap_gpmc.c @@ -135,7 +135,6 @@ void omap_gpmc_reset(struct omap_gpmc_s *s) s->cs_file[i].config[6] & 0x1f, /* MASKADDR */ (s->cs_file[i].config[6] >> 8 & 0xf)); /* BASEADDR */ } - omap_gpmc_cs_map(s->cs_file, 0, 0xf); s->ecc_cs = 0; s->ecc_ptr = 0; s->ecc_cfg = 0x3fcff000;