On 04.05.20 08:46, Janosch Frank wrote:
> On 4/30/20 5:42 PM, David Hildenbrand wrote:
>> On 24.03.20 16:08, Janosch Frank wrote:
>>> panic() was defined for the ccw and net bios, i.e. twice, so it's
>>> cleaner to rather put it into the header.
>>>
>>> Also let's add an infinite loop into the assembly of disabled_wait() so
>>> the caller doesn't need to take care of it.
>>>
>>> Signed-off-by: Janosch Frank <fran...@linux.ibm.com>
>>> Reviewed-by: Pierre Morel <pmo...@linux.ibm.com>
>>> ---
>>> pc-bios/s390-ccw/main.c | 7 -------
>>> pc-bios/s390-ccw/netmain.c | 8 --------
>>> pc-bios/s390-ccw/s390-ccw.h | 7 ++++++-
>>> pc-bios/s390-ccw/start.S | 5 +++--
>>> 4 files changed, 9 insertions(+), 18 deletions(-)
>>>
>>> diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
>>> index 8b912454c940a390..146a50760bc70af7 100644
>>> --- a/pc-bios/s390-ccw/main.c
>>> +++ b/pc-bios/s390-ccw/main.c
>>> @@ -46,13 +46,6 @@ void write_iplb_location(void)
>>> lowcore->ptr_iplb = ptr2u32(&iplb);
>>> }
>>>
>>> -void panic(const char *string)
>>> -{
>>> - sclp_print(string);
>>> - disabled_wait();
>>> - while (1) { }
>>> -}
>>
>> I remember there was a reason why to add the endless loop afterwards.
>> Maybe because some special machine checks can actually wake it up? Or
>> buggy hypervisor?
>>
>> Anyhow, the kernel also does
>>
>> __load_psw(psw);
>> while (1);
>>
>> so it's best we keep that.
>>
>>
>> With the endless loop re-added
>
> Well, I added a loop into the disabled_wait assembly and removed it from
> the C code. It's even in the commit message.
Whops, missed that, looks good to me then!
--
Thanks,
David / dhildenb
