On 2011-10-12 18:02, Andreas Färber wrote: > Hello Jan, > > Since the last round of pulls, PReP magically boots again. :) > > Am 07.10.2011 09:19, schrieb Jan Kiszka: >> There is nothing in the i8259 spec that justifies the special >> pic_intack_read. At least the Linux PREP kernels configure the PICs >> properly so that pic_read_irq returns identical values, and setting >> read_reg_select in PIC0 cannot be derived from any special i8259 mode. >> >> So switch ppc_prep to pic_read_irq and drop the now unused PIC code. > > Seems to resolve an existing XXX in the code. > >> CC: Andreas Färber <andreas.faer...@web.de> >> Signed-off-by: Jan Kiszka <jan.kis...@siemens.com> > > Linux is the only thing we can boot with -M prep that I'm aware of, via > -kernel. And the 40p series doesn't use this at all. I see no regression > on my Debian Etch, so I'm fine with the simplification. > > Tested-by: Andreas Färber <andreas.faer...@web.de>
Thanks! > >> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c >> index d26049b..6427baa 100644 >> --- a/hw/ppc_prep.c >> +++ b/hw/ppc_prep.c >> @@ -130,7 +130,7 @@ static inline uint32_t >> _PPC_intack_read(target_phys_addr_t addr) >> uint32_t retval = 0; >> >> if ((addr & 0xf) == 0) >> - retval = pic_intack_read(isa_pic); >> + retval = pic_read_irq(isa_pic); > > Mind to add the braces while touching it? Will do if I have to repost this series (I hope not...). Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux
