From patchwork Mon Sep 12 08:33:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 4020 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 19A8323E51 for ; Mon, 12 Sep 2011 08:33:22 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 09845A18882 for ; Mon, 12 Sep 2011 08:33:22 +0000 (UTC) Received: by fxe23 with SMTP id 23so1487277fxe.11 for ; Mon, 12 Sep 2011 01:33:21 -0700 (PDT) Received: by 10.223.33.19 with SMTP id f19mr1174387fad.122.1315816401784; Mon, 12 Sep 2011 01:33:21 -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.152.11.8 with SMTP id m8cs93521lab; Mon, 12 Sep 2011 01:33:21 -0700 (PDT) Received: by 10.216.154.145 with SMTP id h17mr2273825wek.39.1315816400489; Mon, 12 Sep 2011 01:33:20 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id l49si12608802weq.109.2011.09.12.01.33.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Sep 2011 01:33:20 -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 1R31x5-00076p-8R; Mon, 12 Sep 2011 09:33:15 +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: Mon, 12 Sep 2011 09:33:15 +0100 Message-Id: <1315816395-27304-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;