Re: [PATCH v1 1/1] pc-bios/s390-ccw: fix sclp_get_loadparm_ascii

[Cornelia Huck]

On Thu, 28 Nov 2019 14:11:38 +0100
Thomas Huth <address@hidden> wrote:

> On 28/11/2019 13.35, Christian Borntraeger wrote:
> > Ack.
> > 
> > Conny, I think this would be really nice to have for 4.2 (together with a 
> > bios rebuild)
> > as this fixes a regression. Opinions?  
> 
> If we do another rc of 4.2, I think we definitely want this to be 
> included, otherwise quite a bunch of things don't work anymore as 
> expected, e.g. "-boot menu=on"...

I do agree we want this if possible; the question is really the
"possible" part...

> 
> >> diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
> >> index c0223fa..7251f9a 100644
> >> --- a/pc-bios/s390-ccw/sclp.c
> >> +++ b/pc-bios/s390-ccw/sclp.c
> >> @@ -112,7 +112,7 @@ void sclp_get_loadparm_ascii(char *loadparm)
> >>       ReadInfo *sccb = (void *)_sccb;
> >>   
> >>       memset((char *)_sccb, 0, sizeof(ReadInfo));
> >> -    sccb->h.length = sizeof(ReadInfo);
> >> +    sccb->h.length = SCCB_SIZE;
> >>       if (!sclp_service_call(SCLP_CMDW_READ_SCP_INFO, sccb)) {
> >>           ebcdic_to_ascii((char *) sccb->loadparm, loadparm, LOADPARM_LEN);
> >>       }  
> 
> I gave it a quick try, and this fixes "-boot menu=on" for me, so:
> 
> Tested-by: Thomas Huth <address@hidden>

Thanks.

FWIW, I'm currently working to put this + the rebuild on my s390-fixes
branch.