Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'firmware_loader'
Kory says:
====================
This patch was initially submitted as part of a net patch series.
Conor expressed interest in using it in a different subsystem.
https://lore.kernel.org/netdev/20231116-feature_poe-v1-7-be48044bf249@bootlin.com/
Consequently, I extracted it from the series and submitted it separately.
I first tried to send it to driver-core but it seems also not the best
choice:
https://lore.kernel.org/lkml/2023111720-slicer-exes-7d9f@gregkh/
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+4
+1
drivers/base/firmware_loader/sysfs_upload.c
+1
drivers/base/firmware_loader/sysfs_upload.c
+2
include/linux/firmware.h
+2
include/linux/firmware.h
···
27
27
* @FW_UPLOAD_ERR_INVALID_SIZE: invalid firmware image size
28
28
* @FW_UPLOAD_ERR_RW_ERROR: read or write to HW failed, see kernel log
29
29
* @FW_UPLOAD_ERR_WEAROUT: FLASH device is approaching wear-out, wait & retry
30
+
* @FW_UPLOAD_ERR_FW_INVALID: invalid firmware file
30
31
* @FW_UPLOAD_ERR_MAX: Maximum error code marker
31
32
*/
32
33
enum fw_upload_err {
···
39
38
FW_UPLOAD_ERR_INVALID_SIZE,
40
39
FW_UPLOAD_ERR_RW_ERROR,
41
40
FW_UPLOAD_ERR_WEAROUT,
41
+
FW_UPLOAD_ERR_FW_INVALID,
42
42
FW_UPLOAD_ERR_MAX
43
43
};
44
44
+1
lib/test_firmware.c
+1
lib/test_firmware.c
···
1132
1132
[FW_UPLOAD_ERR_INVALID_SIZE] = "invalid-file-size",
1133
1133
[FW_UPLOAD_ERR_RW_ERROR] = "read-write-error",
1134
1134
[FW_UPLOAD_ERR_WEAROUT] = "flash-wearout",
1135
+
[FW_UPLOAD_ERR_FW_INVALID] = "firmware-invalid",
1135
1136
};
1136
1137
1137
1138
static void upload_err_inject_error(struct test_firmware_upload *tst,