Re: [PATCH 3/9] rasdaemon: decode submodule of OEM type1 for hip08

[Xiaofei Tan <tanxiaofei@huawei.com>]

Hi Mauro,

On 2019/11/26 14:07, Mauro Carvalho Chehab wrote:
> Em Tue, 12 Nov 2019 20:27:08 +0800
> Xiaofei Tan <tanxiaofei@huawei.com> escreveu:
> 
>> Decode submodule of OEM type1 for hip08, and reconstruct the functions
>> of geting OEM module name and submodule name.
>>
>> Signed-off-by: Xiaofei Tan <tanxiaofei@huawei.com>

...

>> +		const char *str = oem_module_name(hisi_oem_type1_module,
>> +						  err->module_id);
>> +
>> +		p += snprintf(p, end - p, "module=%s ", str);
> 
> 
> 
> Rasdaemon doesn't build after applying this patch, as "end" doesn't exist
> yet.
> 
> I suspect that a latter patch in this series could be adding it, but
> the better is to not break rasdaemon build on some random patch, as, if
> we ever need to do a git bisect, this would make it harder for it to
> work.
> 

Oh, Yes, this is my fault. I will fix this issue and send v2 patch set after removing two applied. thanks.

> 
>>  		record_vendor_data(dec_tab, hisi_oem_data_type_text,
>>  				   hip08_oem_type1_field_module_id,
>> -				   0, oem_type1_module_name(err->module_id));
>> +				   0, str);
>>  	}
>>  
>>  	if (err->val_bits & HISI_OEM_VALID_SUB_MODULE_ID) {
>> -		char submodule_name[64];
>> +		const char *str = oem_submodule_name(hisi_oem_type1_module,
>> +						     err->module_id,
>> +						     err->sub_module_id);
>>  
>> -		sprintf(submodule_name, "%s%d",
>> -			oem_type1_module_name(err->module_id),
>> -			err->sub_module_id);
>> -		p += sprintf(p, "submodule=%s ", submodule_name);
>> +		p += snprintf(p, end - p, "submodule=%s ", str);
>>  		record_vendor_data(dec_tab, hisi_oem_data_type_text,
>>  				   hip08_oem_type1_field_sub_module_id,
>> -				   0, submodule_name);
>> +				   0, str);
>>  	}
>>  
>>  	if (err->val_bits & HISI_OEM_VALID_ERR_SEVERITY) {
>> @@ -596,18 +749,21 @@ static int decode_hip08_oem_type2_error(struct ras_events *ras,
>>  	}
>>  
>>  	if (err->val_bits & HISI_OEM_VALID_MODULE_ID) {
>> -		p += sprintf(p, "module=%s ",
>> -			     oem_type2_module_name(err->module_id));
>> +		const char *str = oem_module_name(hisi_oem_type2_module,
>> +						  err->module_id);
>> +
>> +		p += snprintf(p, end - p, "module=%s ", str);
>>  		record_vendor_data(dec_tab, hisi_oem_data_type_text,
>>  				   hip08_oem_type2_field_module_id,
>> -				   0, oem_type2_module_name(err->module_id));
>> +				   0, str);
>>  	}
>>  
>>  	if (err->val_bits & HISI_OEM_VALID_SUB_MODULE_ID) {
>> -		const char *str = oem_type2_sub_module_name(err->module_id,
>> -							    err->sub_module_id);
>> +		const char *str = oem_submodule_name(hisi_oem_type2_module,
>> +						     err->module_id,
>> +						     err->sub_module_id);
>>  
>> -		p += sprintf(p, "submodule=%s ", str);
>> +		p += snprintf(p, end - p, "submodule=%s ", str);
>>  		record_vendor_data(dec_tab, hisi_oem_data_type_text,
>>  				   hip08_oem_type2_field_sub_module_id,
>>  				   0, str);
> 
> 
> 
> 
> Cheers,
> Mauro
> 
> .
> 

-- 
 thanks
tanxiaofei