* [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion
@ 2012-12-19 12:09 Julien Grall
2013-01-09 23:59 ` Julien Grall
2013-01-10 16:02 ` Stefan Hajnoczi
0 siblings, 2 replies; 6+ messages in thread
From: Julien Grall @ 2012-12-19 12:09 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, gson, 1089996, mtosatti, armbru, Julien Grall, hpoussin,
stefanha, afaerber
The commit 582299336879504353e60c7937fbc70fea93f3da introduced a 1-shift for
some offset in dma emulation.
Before the previous commit, which converted ioport_register_* to MemoryRegion,
the DMA controller registered 8 ioports with the following formula:
base + ((8 + i) << d->shift) where 0 <= i < 8
When an IO occured within a Memory Region, DMA callback receives an offset
relative to the started address. Here the started address is:
base + (8 << d->shift).
The offset should be: (i << d->shift). After the shift is reverted, the offset
are 0..7 not 1..8.
Cc: 1089996@bugs.launchpad.net
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reported-by: Andreas Gustafsson <gson@gson.org>
Signed-off-by: Julien Grall <julien.grall@citrix.com>
---
Modification between V1 and V2:
* Modify the commit message to explain the problem.
hw/dma.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/dma.c b/hw/dma.c
index c2d7b21..1b1d406 100644
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -200,7 +200,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
iport = (nport >> d->dshift) & 0x0f;
switch (iport) {
- case 0x01: /* command */
+ case 0x00: /* command */
if ((data != 0) && (data & CMD_NOT_SUPPORTED)) {
dolog("command %"PRIx64" not supported\n", data);
return;
@@ -208,7 +208,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
d->command = data;
break;
- case 0x02:
+ case 0x01:
ichan = data & 3;
if (data & 4) {
d->status |= 1 << (ichan + 4);
@@ -220,7 +220,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
DMA_run();
break;
- case 0x03: /* single mask */
+ case 0x02: /* single mask */
if (data & 4)
d->mask |= 1 << (data & 3);
else
@@ -228,7 +228,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
DMA_run();
break;
- case 0x04: /* mode */
+ case 0x03: /* mode */
{
ichan = data & 3;
#ifdef DEBUG_DMA
@@ -247,23 +247,23 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
break;
}
- case 0x05: /* clear flip flop */
+ case 0x04: /* clear flip flop */
d->flip_flop = 0;
break;
- case 0x06: /* reset */
+ case 0x05: /* reset */
d->flip_flop = 0;
d->mask = ~0;
d->status = 0;
d->command = 0;
break;
- case 0x07: /* clear mask for all channels */
+ case 0x06: /* clear mask for all channels */
d->mask = 0;
DMA_run();
break;
- case 0x08: /* write mask for all channels */
+ case 0x07: /* write mask for all channels */
d->mask = data;
DMA_run();
break;
@@ -288,11 +288,11 @@ static uint64_t read_cont(void *opaque, hwaddr nport, unsigned size)
iport = (nport >> d->dshift) & 0x0f;
switch (iport) {
- case 0x08: /* status */
+ case 0x00: /* status */
val = d->status;
d->status &= 0xf0;
break;
- case 0x0f: /* mask */
+ case 0x01: /* mask */
val = d->mask;
break;
default:
@@ -467,7 +467,7 @@ void DMA_schedule(int nchan)
static void dma_reset(void *opaque)
{
struct dma_cont *d = opaque;
- write_cont(d, (0x06 << d->dshift), 0, 1);
+ write_cont(d, (0x05 << d->dshift), 0, 1);
}
static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len)
--
Julien Grall
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion
2012-12-19 12:09 [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion Julien Grall
@ 2013-01-09 23:59 ` Julien Grall
2013-01-10 16:02 ` Stefan Hajnoczi
1 sibling, 0 replies; 6+ messages in thread
From: Julien Grall @ 2013-01-09 23:59 UTC (permalink / raw)
To: Julien Grall
Cc: Kevin Wolf, gson, 1089996, Marcelo Tosatti, qemu-devel@nongnu.org,
Markus Armbruster, Hervé Poussineau, Stefan Hajnoczi,
afaerber@suse.de
On Wed, Dec 19, 2012 at 12:09 PM, Julien Grall <julien.grall@citrix.com> wrote:
> The commit 582299336879504353e60c7937fbc70fea93f3da introduced a 1-shift for
> some offset in dma emulation.
>
> Before the previous commit, which converted ioport_register_* to MemoryRegion,
> the DMA controller registered 8 ioports with the following formula:
> base + ((8 + i) << d->shift) where 0 <= i < 8
> When an IO occured within a Memory Region, DMA callback receives an offset
> relative to the started address. Here the started address is:
> base + (8 << d->shift).
> The offset should be: (i << d->shift). After the shift is reverted, the offset
> are 0..7 not 1..8.
>
> Cc: 1089996@bugs.launchpad.net
> Reviewed-by: Andreas Färber <afaerber@suse.de>
> Reported-by: Andreas Gustafsson <gson@gson.org>
> Signed-off-by: Julien Grall <julien.grall@citrix.com>
> ---
>
> Modification between V1 and V2:
> * Modify the commit message to explain the problem.
>
> hw/dma.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/hw/dma.c b/hw/dma.c
> index c2d7b21..1b1d406 100644
> --- a/hw/dma.c
> +++ b/hw/dma.c
> @@ -200,7 +200,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
>
> iport = (nport >> d->dshift) & 0x0f;
> switch (iport) {
> - case 0x01: /* command */
> + case 0x00: /* command */
> if ((data != 0) && (data & CMD_NOT_SUPPORTED)) {
> dolog("command %"PRIx64" not supported\n", data);
> return;
> @@ -208,7 +208,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
> d->command = data;
> break;
>
> - case 0x02:
> + case 0x01:
> ichan = data & 3;
> if (data & 4) {
> d->status |= 1 << (ichan + 4);
> @@ -220,7 +220,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
> DMA_run();
> break;
>
> - case 0x03: /* single mask */
> + case 0x02: /* single mask */
> if (data & 4)
> d->mask |= 1 << (data & 3);
> else
> @@ -228,7 +228,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
> DMA_run();
> break;
>
> - case 0x04: /* mode */
> + case 0x03: /* mode */
> {
> ichan = data & 3;
> #ifdef DEBUG_DMA
> @@ -247,23 +247,23 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
> break;
> }
>
> - case 0x05: /* clear flip flop */
> + case 0x04: /* clear flip flop */
> d->flip_flop = 0;
> break;
>
> - case 0x06: /* reset */
> + case 0x05: /* reset */
> d->flip_flop = 0;
> d->mask = ~0;
> d->status = 0;
> d->command = 0;
> break;
>
> - case 0x07: /* clear mask for all channels */
> + case 0x06: /* clear mask for all channels */
> d->mask = 0;
> DMA_run();
> break;
>
> - case 0x08: /* write mask for all channels */
> + case 0x07: /* write mask for all channels */
> d->mask = data;
> DMA_run();
> break;
> @@ -288,11 +288,11 @@ static uint64_t read_cont(void *opaque, hwaddr nport, unsigned size)
>
> iport = (nport >> d->dshift) & 0x0f;
> switch (iport) {
> - case 0x08: /* status */
> + case 0x00: /* status */
> val = d->status;
> d->status &= 0xf0;
> break;
> - case 0x0f: /* mask */
> + case 0x01: /* mask */
> val = d->mask;
> break;
> default:
> @@ -467,7 +467,7 @@ void DMA_schedule(int nchan)
> static void dma_reset(void *opaque)
> {
> struct dma_cont *d = opaque;
> - write_cont(d, (0x06 << d->dshift), 0, 1);
> + write_cont(d, (0x05 << d->dshift), 0, 1);
> }
>
> static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len)
Hello,
Is there any plan to apply this patch in QEMU upstream? I think this
bug is still opened.
Sincerely yours,
--
Grall Julien
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion
2012-12-19 12:09 [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion Julien Grall
2013-01-09 23:59 ` Julien Grall
@ 2013-01-10 16:02 ` Stefan Hajnoczi
2013-01-10 17:00 ` Andreas Färber
1 sibling, 1 reply; 6+ messages in thread
From: Stefan Hajnoczi @ 2013-01-10 16:02 UTC (permalink / raw)
To: Julien Grall
Cc: kwolf, gson, 1089996, mtosatti, qemu-devel, armbru, hpoussin,
stefanha, afaerber
On Wed, Dec 19, 2012 at 12:09:21PM +0000, Julien Grall wrote:
> The commit 582299336879504353e60c7937fbc70fea93f3da introduced a 1-shift for
> some offset in dma emulation.
>
> Before the previous commit, which converted ioport_register_* to MemoryRegion,
> the DMA controller registered 8 ioports with the following formula:
> base + ((8 + i) << d->shift) where 0 <= i < 8
> When an IO occured within a Memory Region, DMA callback receives an offset
> relative to the started address. Here the started address is:
> base + (8 << d->shift).
> The offset should be: (i << d->shift). After the shift is reverted, the offset
> are 0..7 not 1..8.
>
> Cc: 1089996@bugs.launchpad.net
> Reviewed-by: Andreas Färber <afaerber@suse.de>
> Reported-by: Andreas Gustafsson <gson@gson.org>
> Signed-off-by: Julien Grall <julien.grall@citrix.com>
> ---
>
> Modification between V1 and V2:
> * Modify the commit message to explain the problem.
>
> hw/dma.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
This patch resolves "dma: unknown iport 0" warnings for my Windows 8 guest.
Tested-by: Stefan Hajnoczi <stefanha@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion
2013-01-10 16:02 ` Stefan Hajnoczi
@ 2013-01-10 17:00 ` Andreas Färber
2013-01-11 7:38 ` Stefan Hajnoczi
2013-01-11 8:32 ` Stefan Hajnoczi
0 siblings, 2 replies; 6+ messages in thread
From: Andreas Färber @ 2013-01-10 17:00 UTC (permalink / raw)
To: Stefan Hajnoczi
Cc: kwolf, gson, 1089996, mtosatti, qemu-devel, armbru, Julien Grall,
hpoussin, stefanha
Am 10.01.2013 17:02, schrieb Stefan Hajnoczi:
> On Wed, Dec 19, 2012 at 12:09:21PM +0000, Julien Grall wrote:
>> The commit 582299336879504353e60c7937fbc70fea93f3da introduced a 1-shift for
>> some offset in dma emulation.
>>
>> Before the previous commit, which converted ioport_register_* to MemoryRegion,
>> the DMA controller registered 8 ioports with the following formula:
>> base + ((8 + i) << d->shift) where 0 <= i < 8
>> When an IO occured within a Memory Region, DMA callback receives an offset
>> relative to the started address. Here the started address is:
>> base + (8 << d->shift).
>> The offset should be: (i << d->shift). After the shift is reverted, the offset
>> are 0..7 not 1..8.
>>
>> Cc: 1089996@bugs.launchpad.net
>> Reviewed-by: Andreas Färber <afaerber@suse.de>
>> Reported-by: Andreas Gustafsson <gson@gson.org>
>> Signed-off-by: Julien Grall <julien.grall@citrix.com>
>> ---
>>
>> Modification between V1 and V2:
>> * Modify the commit message to explain the problem.
>>
>> hw/dma.c | 22 +++++++++++-----------
>> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> This patch resolves "dma: unknown iport 0" warnings for my Windows 8 guest.
>
> Tested-by: Stefan Hajnoczi <stefanha@redhat.com>
If you don't want to queue it for the trivial tree, I'll queue it
together with Hervé's conversions.
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion
2013-01-10 17:00 ` Andreas Färber
@ 2013-01-11 7:38 ` Stefan Hajnoczi
2013-01-11 8:32 ` Stefan Hajnoczi
1 sibling, 0 replies; 6+ messages in thread
From: Stefan Hajnoczi @ 2013-01-11 7:38 UTC (permalink / raw)
To: Andreas Färber
Cc: kwolf, gson, 1089996, Stefan Hajnoczi, mtosatti, qemu-devel,
armbru, Julien Grall, hpoussin
On Thu, Jan 10, 2013 at 06:00:25PM +0100, Andreas Färber wrote:
> Am 10.01.2013 17:02, schrieb Stefan Hajnoczi:
> > On Wed, Dec 19, 2012 at 12:09:21PM +0000, Julien Grall wrote:
> >> The commit 582299336879504353e60c7937fbc70fea93f3da introduced a 1-shift for
> >> some offset in dma emulation.
> >>
> >> Before the previous commit, which converted ioport_register_* to MemoryRegion,
> >> the DMA controller registered 8 ioports with the following formula:
> >> base + ((8 + i) << d->shift) where 0 <= i < 8
> >> When an IO occured within a Memory Region, DMA callback receives an offset
> >> relative to the started address. Here the started address is:
> >> base + (8 << d->shift).
> >> The offset should be: (i << d->shift). After the shift is reverted, the offset
> >> are 0..7 not 1..8.
> >>
> >> Cc: 1089996@bugs.launchpad.net
> >> Reviewed-by: Andreas Färber <afaerber@suse.de>
> >> Reported-by: Andreas Gustafsson <gson@gson.org>
> >> Signed-off-by: Julien Grall <julien.grall@citrix.com>
> >> ---
> >>
> >> Modification between V1 and V2:
> >> * Modify the commit message to explain the problem.
> >>
> >> hw/dma.c | 22 +++++++++++-----------
> >> 1 file changed, 11 insertions(+), 11 deletions(-)
> >
> > This patch resolves "dma: unknown iport 0" warnings for my Windows 8 guest.
> >
> > Tested-by: Stefan Hajnoczi <stefanha@redhat.com>
>
> If you don't want to queue it for the trivial tree, I'll queue it
> together with Hervé's conversions.
Thanks, please queue it in your tree.
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion
2013-01-10 17:00 ` Andreas Färber
2013-01-11 7:38 ` Stefan Hajnoczi
@ 2013-01-11 8:32 ` Stefan Hajnoczi
1 sibling, 0 replies; 6+ messages in thread
From: Stefan Hajnoczi @ 2013-01-11 8:32 UTC (permalink / raw)
To: Andreas Färber
Cc: kwolf, gson, 1089996, Stefan Hajnoczi, mtosatti, qemu-devel,
armbru, Julien Grall, hpoussin
On Thu, Jan 10, 2013 at 06:00:25PM +0100, Andreas Färber wrote:
> Am 10.01.2013 17:02, schrieb Stefan Hajnoczi:
> > On Wed, Dec 19, 2012 at 12:09:21PM +0000, Julien Grall wrote:
> >> The commit 582299336879504353e60c7937fbc70fea93f3da introduced a 1-shift for
> >> some offset in dma emulation.
> >>
> >> Before the previous commit, which converted ioport_register_* to MemoryRegion,
> >> the DMA controller registered 8 ioports with the following formula:
> >> base + ((8 + i) << d->shift) where 0 <= i < 8
> >> When an IO occured within a Memory Region, DMA callback receives an offset
> >> relative to the started address. Here the started address is:
> >> base + (8 << d->shift).
> >> The offset should be: (i << d->shift). After the shift is reverted, the offset
> >> are 0..7 not 1..8.
> >>
> >> Cc: 1089996@bugs.launchpad.net
> >> Reviewed-by: Andreas Färber <afaerber@suse.de>
> >> Reported-by: Andreas Gustafsson <gson@gson.org>
> >> Signed-off-by: Julien Grall <julien.grall@citrix.com>
> >> ---
> >>
> >> Modification between V1 and V2:
> >> * Modify the commit message to explain the problem.
> >>
> >> hw/dma.c | 22 +++++++++++-----------
> >> 1 file changed, 11 insertions(+), 11 deletions(-)
> >
> > This patch resolves "dma: unknown iport 0" warnings for my Windows 8 guest.
> >
> > Tested-by: Stefan Hajnoczi <stefanha@redhat.com>
>
> If you don't want to queue it for the trivial tree, I'll queue it
> together with Hervé's conversions.
Thanks, please take it through your tree.
Stefan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-11 8:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-19 12:09 [Qemu-devel] [Bug 108996 V2] hw/dma.c: Fix converting of ioport_register* to MemoryRegion Julien Grall
2013-01-09 23:59 ` Julien Grall
2013-01-10 16:02 ` Stefan Hajnoczi
2013-01-10 17:00 ` Andreas Färber
2013-01-11 7:38 ` Stefan Hajnoczi
2013-01-11 8:32 ` Stefan Hajnoczi
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).