On Thu, Jan 23, 2020 at 12:34 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> On Thu, Jan 23, 2020 at 12:28 AM Philippe Mathieu-Daudé
> <philmd@redhat.com> wrote:
> >
> > On 1/22/20 3:47 AM, Richard Henderson wrote:
> > > On 1/21/20 4:32 PM, Richard Henderson wrote:
> > >> The following changes since commit 3e08b2b9cb64bff2b73fa9128c0e49bfcde0dd40:
> > >>
> > >> Merge remote-tracking branch 'remotes/philmd-gitlab/tags/edk2-next-20200121' into staging (2020-01-21 15:29:25 +0000)
> > >>
> > >> are available in the Git repository at:
> > >>
> > >> https://github.com/rth7680/qemu.git tags/pull-pa-20200121
> > >>
> > >> for you to fetch changes up to a66cfb7306b7cf7a023e11536fdd942f3f9276b9:
> > >>
> > >> target/hppa: Allow, but diagnose, LDCW aligned only mod 4 (2020-01-21 15:51:54 -1000)
> > >>
> > >> ----------------------------------------------------------------
> > >> Improve LASI emulation
> > >> Add Artist graphics
> > >> Fix main memory allocation
> > >> Improve LDCW emulation wrt real hw
> > >
> > > Ho hum. Cancel this. It breaks the hppa boot-serial test.
> >
> > This is due to patch #7 "Add emulation of Artist graphics":
> >
> > 130 /* Graphics setup. */
> > 131 if (machine->enable_graphics && vga_interface_type != VGA_NONE) {
> > 132 dev = qdev_create(NULL, "artist");
> > 133 qdev_init_nofail(dev);
> > 134 s = SYS_BUS_DEVICE(dev);
> > 135 sysbus_mmio_map(s, 0, LASI_GFX_HPA);
> > 136 sysbus_mmio_map(s, 1, ARTIST_FB_ADDR);
> > 137 }
> >
> > The hppa boot-serial test use the default options, so the Artist chipset
> > is mapped, and the firmware test/use it.
Since gitweb seems broken...
https://git.qemu.org/git?p=seabios-hppa.git;a=commit;h=ba3c6473baf
Here is the relevant commit information:
- if Artist is mapped:
https://github.com/hdeller/seabios-hppa/commit/ba3c6473baf#diff-c47fa882864c690c7dc1dce8b4ac2c99R1739-R1742
- then use it as console (instead of the uart)
https://github.com/hdeller/seabios-hppa/commit/ba3c6473baf#diff-c47fa882864c690c7dc1dce8b4ac2c99R477-R483
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Btw ;)
>
> > We can test like the 40p, using VGA_NONE:
> >
> > -- >8 --
> > diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
> > index 05c7f44457..971254ae62 100644
> > --- a/tests/qtest/boot-serial-test.c
> > +++ b/tests/qtest/boot-serial-test.c
> > @@ -135,7 +135,7 @@ static testdef_t tests[] = {
> > sizeof(kernel_plml605), kernel_plml605 },
> > { "moxie", "moxiesim", "", "TT", sizeof(bios_moxiesim), 0,
> > bios_moxiesim },
> > { "arm", "raspi2", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 },
> > - { "hppa", "hppa", "", "SeaBIOS wants SYSTEM HALT" },
> > + { "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" },
> > { "aarch64", "virt", "-cpu cortex-a57", "TT", sizeof(kernel_aarch64),
> > kernel_aarch64 },
> > { "arm", "microbit", "", "T", sizeof(kernel_nrf51), kernel_nrf51 },
> > ---
> >
> > You should squash this change in patch #7 (because it belongs there) but
> > please add a comment, because it is not obvious.
> >
> > Thanks,
> >
> > Phil.