Re: [PATCH 7/8] q800: wire up remaining IRQs in classic mode

[Laurent Vivier]

Le 13/10/2021 à 23:21, Mark Cave-Ayland a écrit :
> Explicitly wire up the remaining IRQs in classic mode to enable the use of
> g_assert_not_reached() in the default case to detect any unexpected IRQs.
> 
> Add a comment explaining the IRQ routing differences in A/UX mode based
> upon the comments in NetBSD (also noting that at least A/UX 3.0.1 still
> uses classic mode).
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>  hw/m68k/q800.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 46 insertions(+)
> 
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index d55e6a7541..fa851e2ec9 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -111,6 +111,37 @@ struct GLUEState {
>  
>  #define GLUE_IRQ_NUBUS_9       0
>  
> +/*
> + * The GLUE logic on the Quadra 800 supports 2 different IRQ routing modes
> + * controlled from the VIA1 auxmode GPIO (port B bit 6) which are documented
> + * in NetBSD as follows:
> + *
> + * A/UX mode (Linux, NetBSD, auxmode GPIO low)
> + *
> + *   Level 0:        Spurious: ignored
> + *   Level 1:        Software
> + *   Level 2:        VIA2 (except ethernet, sound)
> + *   Level 3:        Ethernet
> + *   Level 4:        Serial (SCC)
> + *   Level 5:        Sound
> + *   Level 6:        VIA1
> + *   Level 7:        NMIs: parity errors, RESET button, YANCC error
> + *
> + * Classic mode (default: used by MacOS, A/UX 3.0.1, auxmode GPIO high)
> + *
> + *   Level 0:        Spurious: ignored
> + *   Level 1:        VIA1 (clock, ADB)
> + *   Level 2:        VIA2 (NuBus, SCSI)
> + *   Level 3:
> + *   Level 4:        Serial (SCC)
> + *   Level 5:
> + *   Level 6:
> + *   Level 7:        Non-maskable: parity errors, RESET button
> + *
> + * Note that despite references to A/UX mode in Linux and NetBSD, at least
> + * A/UX 3.0.1 still uses Classic mode.
> + */
> +
>  static void GLUE_set_irq(void *opaque, int irq, int level)
>  {
>      GLUEState *s = opaque;
> @@ -144,10 +175,25 @@ static void GLUE_set_irq(void *opaque, int irq, int 
> level)
>      case 1:
>          /* Classic mode */
>          switch (irq) {
> +        case GLUE_IRQ_IN_VIA1:
> +            irq = 0;
> +            break;
> +
> +        case GLUE_IRQ_IN_VIA2:
> +            irq = 1;
> +            break;
> +
>          case GLUE_IRQ_IN_SONIC:
>              /* Route to VIA2 instead */
>              qemu_set_irq(s->irqs[GLUE_IRQ_NUBUS_9], level);
>              return;
> +
> +        case GLUE_IRQ_IN_ESCC:
> +            irq = 3;
> +            break;
> +
> +        default:
> +            g_assert_not_reached();
>          }
>          break;
>  
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>