Patchwork [v2,1/2] lsi: Purge request queue on soft reset

login
register
mail settings
Submitter Jan Kiszka
Date April 30, 2010, 12:06 p.m.
Message ID <4BDAC7B4.2040006@siemens.com>
Download mbox | patch
Permalink /patch/51327/
State New
Headers show

Comments

Jan Kiszka - April 30, 2010, 12:06 p.m.
Avoid keeping zombie requests across controller reset by purging the
queue and also dropping the currently active request.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 hw/lsi53c895a.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
Anthony Liguori - May 3, 2010, 5:14 p.m.
On 04/30/2010 07:06 AM, Jan Kiszka wrote:
> Avoid keeping zombie requests across controller reset by purging the
> queue and also dropping the currently active request.
>
> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori
> ---
>   hw/lsi53c895a.c |   11 +++++++++++
>   1 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
> index 98b7f54..ad23ece 100644
> --- a/hw/lsi53c895a.c
> +++ b/hw/lsi53c895a.c
> @@ -283,6 +283,8 @@ static inline int lsi_irq_on_rsl(LSIState *s)
>
>   static void lsi_soft_reset(LSIState *s)
>   {
> +    lsi_request *p;
> +
>       DPRINTF("Reset\n");
>       s->carry = 0;
>
> @@ -345,6 +347,15 @@ static void lsi_soft_reset(LSIState *s)
>       s->sbc = 0;
>       s->csbc = 0;
>       s->sbr = 0;
> +    while (!QTAILQ_EMPTY(&s->queue)) {
> +        p = QTAILQ_FIRST(&s->queue);
> +        QTAILQ_REMOVE(&s->queue, p, next);
> +        qemu_free(p);
> +    }
> +    if (s->current) {
> +        qemu_free(s->current);
> +        s->current = NULL;
> +    }
>   }
>
>   static int lsi_dma_40bit(LSIState *s)
>
>
>
>

Patch

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 98b7f54..ad23ece 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -283,6 +283,8 @@  static inline int lsi_irq_on_rsl(LSIState *s)
 
 static void lsi_soft_reset(LSIState *s)
 {
+    lsi_request *p;
+
     DPRINTF("Reset\n");
     s->carry = 0;
 
@@ -345,6 +347,15 @@  static void lsi_soft_reset(LSIState *s)
     s->sbc = 0;
     s->csbc = 0;
     s->sbr = 0;
+    while (!QTAILQ_EMPTY(&s->queue)) {
+        p = QTAILQ_FIRST(&s->queue);
+        QTAILQ_REMOVE(&s->queue, p, next);
+        qemu_free(p);
+    }
+    if (s->current) {
+        qemu_free(s->current);
+        s->current = NULL;
+    }
 }
 
 static int lsi_dma_40bit(LSIState *s)