* [Qemu-devel] [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset
@ 2011-09-12 8:33 Peter Maydell
2011-09-12 8:42 ` Peter Maydell
0 siblings, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2011-09-12 8:33 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Avi Kivity, patches
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 <peter.maydell@linaro.org>
---
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;
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset
2011-09-12 8:33 [Qemu-devel] [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset Peter Maydell
@ 2011-09-12 8:42 ` Peter Maydell
0 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2011-09-12 8:42 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Avi Kivity, patches
On 12 September 2011 09:33, Peter Maydell <peter.maydell@linaro.org> wrote:
> 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.)
Whoops; please ignore this, it's an old patch which I accidentally
resubmitted due to a fumble-fingered moment at the shell prompt and
the git-send-email command being in my shell history...
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset
@ 2011-08-23 18:24 Peter Maydell
2011-08-23 19:52 ` Edgar E. Iglesias
0 siblings, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2011-08-23 18:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl, Avi Kivity, patches
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 <peter.maydell@linaro.org>
---
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;
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset
2011-08-23 18:24 Peter Maydell
@ 2011-08-23 19:52 ` Edgar E. Iglesias
0 siblings, 0 replies; 4+ messages in thread
From: Edgar E. Iglesias @ 2011-08-23 19:52 UTC (permalink / raw)
To: Peter Maydell; +Cc: Blue Swirl, patches, qemu-devel, Avi Kivity
On Tue, Aug 23, 2011 at 07:24:32PM +0100, Peter Maydell wrote:
> 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 <peter.maydell@linaro.org>
Applied, thanks.
Cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-12 8:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-12 8:33 [Qemu-devel] [PATCH] hw/omap_gpmc: Don't try to map CS0 twice on reset Peter Maydell
2011-09-12 8:42 ` Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2011-08-23 18:24 Peter Maydell
2011-08-23 19:52 ` Edgar E. Iglesias
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).