Commit 9773afb9 authored by Jakub Byczkowski's avatar Jakub Byczkowski Committed by Doug Ledford
Browse files

IB/hfi1: Add parsing for platform configuration format version 4 



Platform configuration format version 4, that didn't use the file
size field, is not parsed by the host driver. Only version 5 is
supported. Add logic in parsing procedure to determine what format
is being used and allow to read data from version 4 files.

Reviewed-by: default avatarJan Sokolowski <jan.sokolowski@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarAndrzej Kacprowski <andrzej.kacprowski@intel.com>
Signed-off-by: default avatarJakub Byczkowski <jakub.byczkowski@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 40837273

drivers/infiniband/hw/hfi1/firmware.c

+22 −2
Original line number Diff line number Diff line
@@ -113,6 +113,12 @@ struct css_header { 
#define MU_SIZE		8

#define EXPONENT_SIZE	4



/* size of platform configuration partition */

#define MAX_PLATFORM_CONFIG_FILE_SIZE 4096



/* size of file of plaform configuration encoded in format version 4 */

#define PLATFORM_CONFIG_FORMAT_4_FILE_SIZE 528



/* the file itself */

struct firmware_file {

	struct css_header css_header;
@@ -1774,7 +1780,20 @@ int parse_platform_config(struct hfi1_devdata *dd) 


	/* Field is file size in DWORDs */

	file_length = (*ptr) * 4;



	/*

	 * Length can't be larger than partition size. Assume platform

	 * config format version 4 is being used. Interpret the file size

	 * field as header instead by not moving the pointer.

	 */

	if (file_length > MAX_PLATFORM_CONFIG_FILE_SIZE) {

		dd_dev_info(dd,

			    "%s:File length out of bounds, using alternative format\n",

			    __func__);

		file_length = PLATFORM_CONFIG_FORMAT_4_FILE_SIZE;

	} else {

		ptr++;

	}



	if (file_length > dd->platform_config.size) {

		dd_dev_info(dd, "%s:File claims to be larger than read size\n",
@@ -1789,7 +1808,8 @@ int parse_platform_config(struct hfi1_devdata *dd) 


	/*

	 * In both cases where we proceed, using the self-reported file length

	 * is the safer option

	 * is the safer option. In case of old format a predefined value is

	 * being used.

	 */

	while (ptr < (u32 *)(dd->platform_config.data + file_length)) {

		header1 = *ptr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE