Re: [PATCH 12/18] pc-bios/s390-ccw: Enable failed IPL to return after error

[Jared Rossi]

On 9/30/24 6:11 AM, Thomas Huth wrote:
> On 27/09/2024 02.51, jrossi@linux.ibm.com wrote:
> > From: Jared Rossi <jrossi@linux.ibm.com>
> ...
> >   unsigned long virtio_load_direct(unsigned long rec_list1, unsigned 
> > long rec_list2,
> > @@ -73,13 +73,13 @@ unsigned long virtio_load_direct(unsigned long 
> > rec_list1, unsigned long rec_list
> >       unsigned long addr = (unsigned long)load_addr;
> >         if (sec_len != virtio_get_block_size()) {
> > -        return -1;
> > +        return 0;
> >       }
> >         printf(".");
> >       status = virtio_read_many(sec, (void *)addr, sec_num);
> >       if (status) {
> > -        panic("I/O Error");
> > +        return 0;
> >       }
> >       addr += sec_num * virtio_get_block_size();
>
> Ah, here's the fix for virtio_load_direct() ... since you changed the 
> call site in patch 09 already, I think you should move this hunk to 
> patch 09, too.

Yes, that would be a more appropriate place for it.  Will do.
> > diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
> > index 8c6b0a8a92..e3fdb95b3c 100644
> > --- a/pc-bios/s390-ccw/virtio.c
> > +++ b/pc-bios/s390-ccw/virtio.c
> > @@ -217,16 +217,19 @@ int virtio_run(VDev *vdev, int vqid, VirtioCmd 
> > *cmd)
> >       return 0;
> >   }
> >   -void virtio_setup_ccw(VDev *vdev)
> > +int virtio_setup_ccw(VDev *vdev)
> >   {
> > -    int i, rc, cfg_size = 0;
> > +    int i, cfg_size = 0;
> >       uint8_t status;
> >       struct VirtioFeatureDesc {
> >           uint32_t features;
> >           uint8_t index;
> >       } __attribute__((packed)) feats;
> >   -    IPL_assert(virtio_is_supported(vdev->schid), "PE");
> > +    if (!virtio_is_supported(vdev->schid)) {
> > +        puts("PE");
>
> Do you remember what "PE" means here? ... might be a good opportunity 
> to fix this error message as well...

Unfortunately I don't know what it means. I guess it would be better to 
write
a new message than continue carrying this mysterious one forward, though.

I'll make those messages you pointed out more useful.

Jared Rossi