Unverified Commit a138ac26 authored by Jithu Joseph's avatar Jithu Joseph Committed by Ilpo Järvinen
Browse files

platform/x86/intel/ifs: Refactor image loading code 



IFS image loading flow is slightly different for newer IFS generations.

In preparation for adding support for newer IFS generations, refactor
portions of existing image loading code for reuse.

Signed-off-by: default avatarJithu Joseph <jithu.joseph@intel.com>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tested-by: default avatarPengfei Xu <pengfei.xu@intel.com>
Link: https://lore.kernel.org/r/20231005195137.3117166-3-jithu.joseph@intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 97a5e801

drivers/platform/x86/intel/ifs/load.c

+19 −12
Original line number Diff line number Diff line
@@ -80,6 +80,23 @@ static struct metadata_header *find_meta_data(void *ucode, unsigned int meta_typ 
	return NULL;

}



static void hashcopy_err_message(struct device *dev, u32 err_code)

{

	if (err_code >= ARRAY_SIZE(scan_hash_status))

		dev_err(dev, "invalid error code 0x%x for hash copy\n", err_code);

	else

		dev_err(dev, "Hash copy error : %s\n", scan_hash_status[err_code]);

}



static void auth_err_message(struct device *dev, u32 err_code)

{

	if (err_code >= ARRAY_SIZE(scan_authentication_status))

		dev_err(dev, "invalid error code 0x%x for authentication\n", err_code);

	else

		dev_err(dev, "Chunk authentication error : %s\n",

			scan_authentication_status[err_code]);

}



/*

 * To copy scan hashes and authenticate test chunks, the initiating cpu must point

 * to the EDX:EAX to the test image in linear address.
@@ -109,11 +126,7 @@ static void copy_hashes_authenticate_chunks(struct work_struct *work) 


	if (!hashes_status.valid) {

		ifsd->loading_error = true;

		if (err_code >= ARRAY_SIZE(scan_hash_status)) {

			dev_err(dev, "invalid error code 0x%x for hash copy\n", err_code);

			goto done;

		}

		dev_err(dev, "Hash copy error : %s", scan_hash_status[err_code]);

		hashcopy_err_message(dev, err_code);

		goto done;

	}
@@ -133,13 +146,7 @@ static void copy_hashes_authenticate_chunks(struct work_struct *work) 


		if (err_code) {

			ifsd->loading_error = true;

			if (err_code >= ARRAY_SIZE(scan_authentication_status)) {

				dev_err(dev,

					"invalid error code 0x%x for authentication\n", err_code);

				goto done;

			}

			dev_err(dev, "Chunk authentication error %s\n",

				scan_authentication_status[err_code]);

			auth_err_message(dev, err_code);

			goto done;

		}

	}