Re: [PATCH 34/50] ps2: add gpio for output IRQ and optionally use it in ps2_raise_irq() and ps2_lower_irq()

[Mark Cave-Ayland]

On 09/06/2022 12:05, Peter Maydell wrote:

> On Sun, 22 May 2022 at 19:20, Mark Cave-Ayland
> <mark.cave-ayland@ilande.co.uk> wrote:
> > Define the gpio for the PS2 output IRQ in ps2_init() and add logic to optionally
> > use it in ps2_raise_irq() and ps2_lower_irq() if the gpio is connected. If the
> > gpio is not connected then call the legacy update_irq() function as before.
> >
> > This allows the incremental conversion of devices from the legacy update_irq()
> > function to use gpios instead.
> >
> > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > ---
> >   hw/input/ps2.c         | 21 +++++++++++++++++++--
> >   include/hw/input/ps2.h |  4 ++++
> >   2 files changed, 23 insertions(+), 2 deletions(-)
> >
> > diff --git a/hw/input/ps2.c b/hw/input/ps2.c
> > index 214dda60bf..891eb7181c 100644
> > --- a/hw/input/ps2.c
> > +++ b/hw/input/ps2.c
> > @@ -24,6 +24,7 @@
> >
> >   #include "qemu/osdep.h"
> >   #include "qemu/log.h"
> > +#include "hw/irq.h"
> >   #include "hw/sysbus.h"
> >   #include "hw/input/ps2.h"
> >   #include "migration/vmstate.h"
> > @@ -174,12 +175,20 @@ void ps2_queue_noirq(PS2State *s, int b)
> >
> >   static void ps2_raise_irq(PS2State *s)
> >   {
> > -    s->update_irq(s->update_arg, 1);
> > +    if (s->irq) {
>
> I know this code is going to go away in patch 50, but cleaner to write
>   if (qemu_irq_is_connected(s->irq))
> rather than directly testing for NULL.

Thanks, I wasn't aware of that function. I'll update it for v2.

> > +        qemu_set_irq(s->irq, 1);
> > +    } else {
> > +        s->update_irq(s->update_arg, 1);
> > +    }
> >   }
>
> Otherwise
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> thanks
> -- PMM


ATB,

Mark.