| Message ID | 20220223085720.12021-1-manishc@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e13ad1443684f7afaff24cf207e85e97885256bd |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] bnx2x: fix driver load from initrd | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 23 Feb 2022 00:57:20 -0800 you wrote: > Commit b7a49f73059f ("bnx2x: Utilize firmware 7.13.21.0") added > new firmware support in the driver with maintaining older firmware > compatibility. However, older firmware was not added in MODULE_FIRMWARE() > which caused missing firmware files in initrd image leading to driver load > failure from initrd. This patch adds MODULE_FIRMWARE() for older firmware > version to have firmware files included in initrd. > > [...] Here is the summary with links: - [net] bnx2x: fix driver load from initrd https://git.kernel.org/netdev/net/c/e13ad1443684 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 774c1f1a..eedb48d 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -100,6 +100,9 @@ MODULE_FIRMWARE(FW_FILE_NAME_E1); MODULE_FIRMWARE(FW_FILE_NAME_E1H); MODULE_FIRMWARE(FW_FILE_NAME_E2); +MODULE_FIRMWARE(FW_FILE_NAME_E1_V15); +MODULE_FIRMWARE(FW_FILE_NAME_E1H_V15); +MODULE_FIRMWARE(FW_FILE_NAME_E2_V15); int bnx2x_num_queues; module_param_named(num_queues, bnx2x_num_queues, int, 0444);
Commit b7a49f73059f ("bnx2x: Utilize firmware 7.13.21.0") added new firmware support in the driver with maintaining older firmware compatibility. However, older firmware was not added in MODULE_FIRMWARE() which caused missing firmware files in initrd image leading to driver load failure from initrd. This patch adds MODULE_FIRMWARE() for older firmware version to have firmware files included in initrd. Fixes: b7a49f73059f ("bnx2x: Utilize firmware 7.13.21.0") Link: https://bugzilla.kernel.org/show_bug.cgi?id=215627 Signed-off-by: Manish Chopra <manishc@marvell.com> Signed-off-by: Alok Prasad <palok@marvell.com> Signed-off-by: Ariel Elior <aelior@marvell.com> --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +++ 1 file changed, 3 insertions(+) -- 1.8.3.1