[PATCH] Handle additional e820 memmap type strings

[Eric DeVolder]

On 05/15/2017 09:07 AM, Baoquan He wrote:
> On 05/10/17 at 11:03am, Eric DeVolder wrote:
>> Keep pace with changes to linux arch/x86/kernel/e820.c to
>> function e820_type_to_string(). With this change, the following
>> messages from kexec are eliminated (and allows kexec to load):
>>
>>   Unknown type (Reserved) while parsing /sys/firmware/memmap/8/type.
>>   Please report this as bug. Using RANGE_RESERVED now.
>>
>>   Unknown type (Unknown E820 type) while parsing /sys/firmware/memmap/4/type.
>>   Please report this as bug. Using RANGE_RESERVED now.
>>
>> Signed-off-by: Eric DeVolder <eric.devolder at oracle.com>
>> ---
>>   kexec/firmware_memmap.c | 4 ++++
>>   1 file changed, 4 insertions(+)
>>
>> diff --git a/kexec/firmware_memmap.c b/kexec/firmware_memmap.c
>> index 4d84f00..1ee214a 100644
>> --- a/kexec/firmware_memmap.c
>> +++ b/kexec/firmware_memmap.c
>> @@ -164,6 +164,10 @@ static int parse_memmap_entry(const char *entry, struct memory_range *range)
>>   		range->type = RANGE_RESERVED;
>>   	else if (strcmp(type, "reserved") == 0)
>>   		range->type = RANGE_RESERVED;
>> +	else if (strcmp(type, "Reserved") == 0)
>> +		range->type = RANGE_RESERVED;
>> +	else if (strcmp(type, "Unknown E820 type") == 0)
>> +		range->type = RANGE_RESERVED;
> 
> Should we change the "reserved" one to "Reserved" so that we don't need
> to have "reserved" and "Reserved" at the same time?

The lower-case "reserved" has been in use by the kernel for quite a long 
while, and upper-case "Reserved" has been recently introduced. I think 
removing lower-case "reserved" would result in problems with existing, 
older, kernels that still would be using "reserved".

> 
>>   	else if (strcmp(type, "ACPI Non-volatile Storage") == 0)
>>   		range->type = RANGE_ACPI_NVS;
>>   	else if (strcmp(type, "Uncached RAM") == 0)
>> -- 
>> 2.7.4
>>
>>
>> _______________________________________________
>> kexec mailing list
>> kexec at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/kexec