Commit a066f906 authored by Kory Maincent's avatar Kory Maincent Committed by Jakub Kicinski
Browse files

firmware_loader: Expand Firmware upload error codes with firmware invalid error 



No error code are available to signal an invalid firmware content.
Drivers that can check the firmware content validity can not return this
specific failure to the user-space

Expand the firmware error code with an additional code:
- "firmware invalid" code which can be used when the provided firmware
  is invalid

Sync lib/test_firmware.c file accordingly.

Acked-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20231122-feature_firmware_error_code-v3-1-04ec753afb71@bootlin.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b85ea95d

drivers/base/firmware_loader/sysfs_upload.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ static const char * const fw_upload_err_str[] = { 
	[FW_UPLOAD_ERR_INVALID_SIZE] = "invalid-file-size",

	[FW_UPLOAD_ERR_RW_ERROR]     = "read-write-error",

	[FW_UPLOAD_ERR_WEAROUT]	     = "flash-wearout",

	[FW_UPLOAD_ERR_FW_INVALID]   = "firmware-invalid",

};



static const char *fw_upload_progress(struct device *dev,

include/linux/firmware.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ struct firmware { 
 * @FW_UPLOAD_ERR_INVALID_SIZE: invalid firmware image size

 * @FW_UPLOAD_ERR_RW_ERROR: read or write to HW failed, see kernel log

 * @FW_UPLOAD_ERR_WEAROUT: FLASH device is approaching wear-out, wait & retry

 * @FW_UPLOAD_ERR_FW_INVALID: invalid firmware file

 * @FW_UPLOAD_ERR_MAX: Maximum error code marker

 */

enum fw_upload_err {
@@ -38,6 +39,7 @@ enum fw_upload_err { 
	FW_UPLOAD_ERR_INVALID_SIZE,

	FW_UPLOAD_ERR_RW_ERROR,

	FW_UPLOAD_ERR_WEAROUT,

	FW_UPLOAD_ERR_FW_INVALID,

	FW_UPLOAD_ERR_MAX

};

lib/test_firmware.c

+1 −0
Original line number Diff line number Diff line
@@ -1132,6 +1132,7 @@ static const char * const fw_upload_err_str[] = { 
	[FW_UPLOAD_ERR_INVALID_SIZE] = "invalid-file-size",

	[FW_UPLOAD_ERR_RW_ERROR]     = "read-write-error",

	[FW_UPLOAD_ERR_WEAROUT]	     = "flash-wearout",

	[FW_UPLOAD_ERR_FW_INVALID]   = "firmware-invalid",

};



static void upload_err_inject_error(struct test_firmware_upload *tst,