Branch: refs/heads/staging Home: https://github.com/qemu/qemu Commit: e976459b3b127838befaef57f1587770452a0827 https://github.com/qemu/qemu/commit/e976459b3b127838befaef57f1587770452a0827 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021)
Changed paths: M hw/misc/mac_via.c Log Message: ----------- mac_via: update comment for VIA1B_vMystery bit According to both Linux and NetBSD, port B bit 6 is used on the Quadra 800 to configure the GLUE logic in A/UX mode. Whilst the name VIA1B_vMystery isn't particularly descriptive, the patch leaves this to ensure that the constants in mac_via.c remain in sync with Linux's mac_via.h. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Message-Id: <20211020134131.4392-2-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 39950b16ecc21bce3bbea3fddcdf1aaefa0d6cef https://github.com/qemu/qemu/commit/39950b16ecc21bce3bbea3fddcdf1aaefa0d6cef Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021) Changed paths: M hw/m68k/q800.c Log Message: ----------- q800: move VIA1 IRQ from level 1 to level 6 On a Quadra 800 machine Linux sets via_alt_mapping to 1 and clears port B bit 6 to ensure that the VIA1 IRQ is delivered at level 6 rather than level 1. Even though QEMU doesn't yet emulate this behaviour, Linux still installs the VIA1 level 1 IRQ handler regardless of the value of via_alt_mapping which is why the kernel has been able to boot until now. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Message-Id: <20211020134131.4392-3-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 91ff5e4dcd855c6f93b91ef8c5d43b18a1d080d0 https://github.com/qemu/qemu/commit/91ff5e4dcd855c6f93b91ef8c5d43b18a1d080d0 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021) Changed paths: M hw/m68k/q800.c Log Message: ----------- q800: use GLUE IRQ numbers instead of IRQ level for GLUE IRQs In order to allow dynamic routing of IRQs to different IRQ levels on the CPU depending upon port B bit 6, use GLUE IRQ numbers and map them to the the corresponding CPU IRQ level accordingly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Message-Id: <20211020134131.4392-4-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 291bc1809a0ec75f283717850003c08953d80e7c https://github.com/qemu/qemu/commit/291bc1809a0ec75f283717850003c08953d80e7c Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021) Changed paths: M hw/misc/mac_via.c M hw/misc/trace-events M include/hw/misc/mac_via.h Log Message: ----------- mac_via: add GPIO for A/UX mode Add a new auxmode GPIO that is updated when port B bit 6 is changed indicating whether the hardware is configured for A/UX mode. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Message-Id: <20211020134131.4392-5-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: a85d18aabdd4632bb0eeb496c97472746ba35d3c https://github.com/qemu/qemu/commit/a85d18aabdd4632bb0eeb496c97472746ba35d3c Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021) Changed paths: M hw/m68k/q800.c Log Message: ----------- q800: wire up auxmode GPIO to GLUE This enables the GLUE logic to change its CPU level IRQ routing depending upon whether the hardware has been configured for A/UX mode. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Message-Id: <20211020134131.4392-6-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: f7c6e12e24a736f7f3f0bf2c4e34a598e3274130 https://github.com/qemu/qemu/commit/f7c6e12e24a736f7f3f0bf2c4e34a598e3274130 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021) Changed paths: M hw/m68k/q800.c Log Message: ----------- q800: route SONIC on-board Ethernet IRQ via nubus IRQ 9 in classic mode When the hardware is operating in classic mode the SONIC on-board Ethernet IRQ is routed to nubus IRQ 9 instead of directly to the CPU at level 3. This does not affect the framebuffer which although it exists in slot 9, has its own dedicated IRQ on the Quadra 800 hardware. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Message-Id: <20211020134131.4392-7-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: c7710c1ebf0b316ac0ab517fa8ceaa2824904474 https://github.com/qemu/qemu/commit/c7710c1ebf0b316ac0ab517fa8ceaa2824904474 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021) Changed paths: M hw/m68k/q800.c Log Message: ----------- q800: wire up remaining IRQs in classic mode 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-ayl...@ilande.co.uk> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Message-Id: <20211020134131.4392-8-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 3ea74abe2ddfd0741d4aa75484c88b346b85fb26 https://github.com/qemu/qemu/commit/3ea74abe2ddfd0741d4aa75484c88b346b85fb26 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021) Changed paths: M hw/m68k/q800.c Log Message: ----------- q800: add NMI handler This allows the programmer's switch to be triggered via the monitor for debugging purposes. Since the CPU level 7 interrupt is level-triggered, use a timer to hold the NMI active for 100ms before releasing it again. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Reviewied-by: Laurent Vivier <laur...@vivier.eu> Message-Id: <20211020134131.4392-9-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: a56c12fb760a57c1419df4a34e930160f1d8d428 https://github.com/qemu/qemu/commit/a56c12fb760a57c1419df4a34e930160f1d8d428 Author: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Date: 2021-10-20 (Wed, 20 Oct 2021) Changed paths: M hw/m68k/q800.c Log Message: ----------- q800: drop 8-bit graphic_depth check for Apple 21 inch display The graphic_depth check is no longer required since commit df8abbbadf ("macfb: add common monitor modes supported by the MacOS toolbox ROM") which introduced code in macfb_common_realize() to only allow the resolutions/depths provided in macfb_mode_table to be specified for each display type. Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> Fixes: df8abbbadf ("macfb: add common monitor modes supported by the MacOS toolbox ROM") Message-Id: <20211020141810.7875-1-mark.cave-ayl...@ilande.co.uk> Signed-off-by: Laurent Vivier <laur...@vivier.eu> Commit: 1dafe7656a9c2770065e91208edd4c073f5f98a9 https://github.com/qemu/qemu/commit/1dafe7656a9c2770065e91208edd4c073f5f98a9 Author: Richard Henderson <richard.hender...@linaro.org> Date: 2021-10-22 (Fri, 22 Oct 2021) Changed paths: M hw/m68k/q800.c M hw/misc/mac_via.c M hw/misc/trace-events M include/hw/misc/mac_via.h Log Message: ----------- Merge remote-tracking branch 'remotes/vivier-m68k/tags/q800-pull-request' into staging Pull request Q800 20211022 GLUE updates for A/UX mode # gpg: Signature made Fri 22 Oct 2021 12:16:29 AM PDT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laur...@vivier.eu" # gpg: Good signature from "Laurent Vivier <lviv...@redhat.com>" [full] # gpg: aka "Laurent Vivier <laur...@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lviv...@redhat.com>" [full] * remotes/vivier-m68k/tags/q800-pull-request: q800: drop 8-bit graphic_depth check for Apple 21 inch display q800: add NMI handler q800: wire up remaining IRQs in classic mode q800: route SONIC on-board Ethernet IRQ via nubus IRQ 9 in classic mode q800: wire up auxmode GPIO to GLUE mac_via: add GPIO for A/UX mode q800: use GLUE IRQ numbers instead of IRQ level for GLUE IRQs q800: move VIA1 IRQ from level 1 to level 6 mac_via: update comment for VIA1B_vMystery bit Signed-off-by: Richard Henderson <richard.hender...@linaro.org> Compare: https://github.com/qemu/qemu/compare/78d98bfbd39d...1dafe7656a9c