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: 3632 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 570EF23F27 for ; Tue, 23 Aug 2011 18:24:38 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 283F3A1807D for ; Tue, 23 Aug 2011 18:24:38 +0000 (UTC) Received: by bkbzs2 with SMTP id zs2so491486bkb.11 for ; Tue, 23 Aug 2011 11:24:37 -0700 (PDT) Received: by 10.204.133.215 with SMTP id g23mr1860188bkt.70.1314123877467; Tue, 23 Aug 2011 11:24:37 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.204.41.75 with SMTP id n11cs220915bke; Tue, 23 Aug 2011 11:24:36 -0700 (PDT) Received: by 10.216.230.36 with SMTP id i36mr938711weq.103.1314123876407; Tue, 23 Aug 2011 11:24:36 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id 47si661290wel.11.2011.08.23.11.24.35 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 11:24:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk 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 Cc: patches@linaro.org, Andrzej Zaborowski , Blue Swirl , Avi Kivity Subject: [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset 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 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;