| Message ID | 20180313224719.4954-51-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Mar 13, 2018 at 23:47:00 +0100, Paolo Bonzini wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Message-Id: <20180308223946.26784-25-f4bug@amsat.org> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > default-configs/alpha-softmmu.mak | 3 +++ > hw/alpha/dp264.c | 10 ++++------ > 2 files changed, 7 insertions(+), 6 deletions(-) This commit breaks alpha-softmmu bootup for me. I get no console output whatsoever -- not even the green "Hello" when invoking the alpha-softmmu binary with no arguments. Did anybody else notice this? Thanks, Emilio
On 06/01/2018 11:51 AM, Emilio G. Cota wrote: > On Tue, Mar 13, 2018 at 23:47:00 +0100, Paolo Bonzini wrote: >> From: Philippe Mathieu-Daudé <f4bug@amsat.org> >> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> Message-Id: <20180308223946.26784-25-f4bug@amsat.org> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> --- >> default-configs/alpha-softmmu.mak | 3 +++ >> hw/alpha/dp264.c | 10 ++++------ >> 2 files changed, 7 insertions(+), 6 deletions(-) > > This commit breaks alpha-softmmu bootup for me. I get no console > output whatsoever -- not even the green "Hello" when invoking > the alpha-softmmu binary with no arguments. > > Did anybody else notice this? I hadn't tested before, but I can certainly confirm. r~
On 01/06/2018 20:51, Emilio G. Cota wrote: > On Tue, Mar 13, 2018 at 23:47:00 +0100, Paolo Bonzini wrote: >> From: Philippe Mathieu-Daudé <f4bug@amsat.org> >> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> Message-Id: <20180308223946.26784-25-f4bug@amsat.org> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> --- >> default-configs/alpha-softmmu.mak | 3 +++ >> hw/alpha/dp264.c | 10 ++++------ >> 2 files changed, 7 insertions(+), 6 deletions(-) > > This commit breaks alpha-softmmu bootup for me. I get no console > output whatsoever -- not even the green "Hello" when invoking > the alpha-softmmu binary with no arguments. > > Did anybody else notice this? Philippe, are you going to take a look? I tested 2.12 and I get the same result as latest mainline: nothing on the VGA and PCI: 00:00:0 class 0300 id 1013:00b8 PCI: region 0: 10000000 PCI: region 1: 12000000 PCI: 00:01:0 class 0200 id 8086:100e PCI: region 0: 12020000 PCI: region 1: 0000c000 PCI: 00:02:0 class 0101 id 1095:0646 PCI: region 0: 0000c040 PCI: region 1: 0000c048 PCI: region 3: 0000c04c on the serial console, respectively for VGA/network/IDE. Paolo
On 06/13/2018 01:21 PM, Paolo Bonzini wrote: > On 01/06/2018 20:51, Emilio G. Cota wrote: >> On Tue, Mar 13, 2018 at 23:47:00 +0100, Paolo Bonzini wrote: >>> From: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> >>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> Message-Id: <20180308223946.26784-25-f4bug@amsat.org> >>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >>> --- >>> default-configs/alpha-softmmu.mak | 3 +++ >>> hw/alpha/dp264.c | 10 ++++------ >>> 2 files changed, 7 insertions(+), 6 deletions(-) >> >> This commit breaks alpha-softmmu bootup for me. I get no console >> output whatsoever -- not even the green "Hello" when invoking >> the alpha-softmmu binary with no arguments. >> >> Did anybody else notice this? > > Philippe, are you going to take a look? I tested 2.12 and I get the Sure. Sorry I didn't notice earlier, my mail-filter demotes subject with PULL :/ > same result as latest mainline: nothing on the VGA and > > PCI: 00:00:0 class 0300 id 1013:00b8 > PCI: region 0: 10000000 > PCI: region 1: 12000000 > PCI: 00:01:0 class 0200 id 8086:100e > PCI: region 0: 12020000 > PCI: region 1: 0000c000 > PCI: 00:02:0 class 0101 id 1095:0646 > PCI: region 0: 0000c040 > PCI: region 1: 0000c048 > PCI: region 3: 0000c04c > > on the serial console, respectively for VGA/network/IDE. > > Paolo >
On 06/13/2018 01:35 PM, Philippe Mathieu-Daudé wrote: > On 06/13/2018 01:21 PM, Paolo Bonzini wrote: >> On 01/06/2018 20:51, Emilio G. Cota wrote: >>> On Tue, Mar 13, 2018 at 23:47:00 +0100, Paolo Bonzini wrote: >>>> From: Philippe Mathieu-Daudé <f4bug@amsat.org> >>>> >>>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>>> Message-Id: <20180308223946.26784-25-f4bug@amsat.org> >>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >>>> --- >>>> default-configs/alpha-softmmu.mak | 3 +++ >>>> hw/alpha/dp264.c | 10 ++++------ >>>> 2 files changed, 7 insertions(+), 6 deletions(-) >>> >>> This commit breaks alpha-softmmu bootup for me. I get no console >>> output whatsoever -- not even the green "Hello" when invoking >>> the alpha-softmmu binary with no arguments. >>> >>> Did anybody else notice this? >> >> Philippe, are you going to take a look? I tested 2.12 and I get the > > Sure. Sorry I didn't notice earlier, my mail-filter demotes subject with > PULL :/ > >> same result as latest mainline: nothing on the VGA and >> >> PCI: 00:00:0 class 0300 id 1013:00b8 >> PCI: region 0: 10000000 >> PCI: region 1: 12000000 >> PCI: 00:01:0 class 0200 id 8086:100e >> PCI: region 0: 12020000 >> PCI: region 1: 0000c000 >> PCI: 00:02:0 class 0101 id 1095:0646 >> PCI: region 0: 0000c040 >> PCI: region 1: 0000c048 >> PCI: region 3: 0000c04c >> >> on the serial console, respectively for VGA/network/IDE. Creating the Super I/O _before_ the VGA setup fixes this issue... I suppose the problem is some ISA global variable? I'll keep digging. -- >8 -- diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c @@ -83,6 +83,12 @@ static void clipper_init(MachineState *machine) i8254_pit_init(isa_bus, 0x40, 0, NULL); + /* 2 82C37 (dma) */ + isa_create_simple(isa_bus, "i82374"); + + /* Super I/O */ + isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); + /* VGA setup. Don't bother loading the bios. */ pci_vga_init(pci_bus); @@ -91,12 +97,6 @@ static void clipper_init(MachineState *machine) pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); } - /* 2 82C37 (dma) */ - isa_create_simple(isa_bus, "i82374"); - - /* Super I/O */ - isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); - /* IDE disk setup. */ { DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; --
On 06/13/2018 02:17 PM, Philippe Mathieu-Daudé wrote: > On 06/13/2018 01:35 PM, Philippe Mathieu-Daudé wrote: >> On 06/13/2018 01:21 PM, Paolo Bonzini wrote: >>> On 01/06/2018 20:51, Emilio G. Cota wrote: >>>> On Tue, Mar 13, 2018 at 23:47:00 +0100, Paolo Bonzini wrote: >>>>> From: Philippe Mathieu-Daudé <f4bug@amsat.org> >>>>> >>>>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>>>> Message-Id: <20180308223946.26784-25-f4bug@amsat.org> >>>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >>>>> --- >>>>> default-configs/alpha-softmmu.mak | 3 +++ >>>>> hw/alpha/dp264.c | 10 ++++------ >>>>> 2 files changed, 7 insertions(+), 6 deletions(-) >>>> >>>> This commit breaks alpha-softmmu bootup for me. I get no console >>>> output whatsoever -- not even the green "Hello" when invoking >>>> the alpha-softmmu binary with no arguments. >>>> >>>> Did anybody else notice this? >>> >>> Philippe, are you going to take a look? I tested 2.12 and I get the >> >> Sure. Sorry I didn't notice earlier, my mail-filter demotes subject with >> PULL :/ >> >>> same result as latest mainline: nothing on the VGA and >>> >>> PCI: 00:00:0 class 0300 id 1013:00b8 >>> PCI: region 0: 10000000 >>> PCI: region 1: 12000000 >>> PCI: 00:01:0 class 0200 id 8086:100e >>> PCI: region 0: 12020000 >>> PCI: region 1: 0000c000 >>> PCI: 00:02:0 class 0101 id 1095:0646 >>> PCI: region 0: 0000c040 >>> PCI: region 1: 0000c048 >>> PCI: region 3: 0000c04c >>> >>> on the serial console, respectively for VGA/network/IDE. > > Creating the Super I/O _before_ the VGA setup fixes this issue... > > I suppose the problem is some ISA global variable? I'll keep digging. Mark Cave-Ayland figured out yesterday than some VGA I/O space was shadowed by the parallel device: .. 00000801fc0002f8-00000801fc0002ff (prio 0, i/o): serial 00000801fc0003b4-00000801fc0003b5 (prio 0, i/o): vga 00000801fc0003ba-00000801fc0003ba (prio 0, i/o): vga 00000801fc0003bc-00000801fc0003c3 (prio 0, i/o): parallel ^^^ ^^^^^^^^ 00000801fc0003c0-00000801fc0003cf (prio 0, i/o): vga ^^^ 00000801fc0003d4-00000801fc0003d5 (prio 0, i/o): vga 00000801fc0003da-00000801fc0003da (prio 0, i/o): vga 00000801fc0003f1-00000801fc0003f5 (prio 0, i/o): fdc 00000801fc0003f7-00000801fc0003f7 (prio 0, i/o): fdc > > -- >8 -- > diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c > @@ -83,6 +83,12 @@ static void clipper_init(MachineState *machine) > > i8254_pit_init(isa_bus, 0x40, 0, NULL); > > + /* 2 82C37 (dma) */ > + isa_create_simple(isa_bus, "i82374"); > + > + /* Super I/O */ > + isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); > + > /* VGA setup. Don't bother loading the bios. */ > pci_vga_init(pci_bus); > > @@ -91,12 +97,6 @@ static void clipper_init(MachineState *machine) > pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); > } > > - /* 2 82C37 (dma) */ > - isa_create_simple(isa_bus, "i82374"); > - > - /* Super I/O */ > - isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); > - > /* IDE disk setup. */ > { > DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; >
diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index 3740adc5e9..bbe361f01a 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -7,6 +7,9 @@ CONFIG_SERIAL_ISA=y CONFIG_I82374=y CONFIG_I8254=y CONFIG_I8257=y +CONFIG_PARALLEL=y +CONFIG_PARALLEL_ISA=y +CONFIG_FDC=y CONFIG_PCKBD=y CONFIG_VGA_CIRRUS=y CONFIG_IDE_CORE=y diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index ffad678ea7..80b987f7fb 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -19,8 +19,7 @@ #include "hw/timer/mc146818rtc.h" #include "hw/ide.h" #include "hw/timer/i8254.h" -#include "hw/input/i8042.h" -#include "hw/char/serial.h" +#include "hw/isa/superio.h" #include "hw/dma/i8257.h" #include "qemu/cutils.h" @@ -83,14 +82,10 @@ static void clipper_init(MachineState *machine) mc146818_rtc_init(isa_bus, 1900, rtc_irq); i8254_pit_init(isa_bus, 0x40, 0, NULL); - isa_create_simple(isa_bus, TYPE_I8042); /* VGA setup. Don't bother loading the bios. */ pci_vga_init(pci_bus); - /* Serial code setup. */ - serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); - /* Network setup. e1000 is good enough, failing Tulip support. */ for (i = 0; i < nb_nics; i++) { pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); @@ -99,6 +94,9 @@ static void clipper_init(MachineState *machine) /* 2 82C37 (dma) */ isa_create_simple(isa_bus, "i82374"); + /* Super I/O */ + isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO); + /* IDE disk setup. */ { DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];