wireless-drivers fixes for v5.15
First set of fixes for v5.15 and only iwlwifi patches this time. Most important being support for new hardware and new firmware API. I had already earlier applied a fix which also Linus applied to this tree as commit1476ff21ab
("iwl: fix debug printf format strings"), but this doesn't seem to cause any conflicts so I left it there. iwlwifi * add support for firmware API 66 * add support for Samsung Galaxy Book Flex2 Alpha * fix a leak happening every time module is loaded * fix a printk compiler warning -----BEGIN PGP SIGNATURE----- iQFJBAABCgAzFiEEiBjanGPFTz4PRfLobhckVSbrbZsFAmE23kUVHGt2YWxvQGNv ZGVhdXJvcmEub3JnAAoJEG4XJFUm622blQYH/3LSvbLw2jPBdqQiDsYCRrOzpx2T V0sjkrumsCberLfLZpFfMYKeuQD2GaJUI9mHeJ1sZlc9hi9EIaHpTkK+LZpH4OU1 wISTpr4l13sDmr5snV0sSoRbuyZGQ93jOasoloU1qM9eCvwMw7rUT6QYvm9KXnx5 +rP1WJ9N94OLVvaCDwFPqJQAPROqSY8ySdknYdZlI8hOo+wWCE1G8IS+q75865BH uSu6ZdUb5r36ha99v4UAtTbvS/+BXnqbQbIdcqYVG8vnaM9FAJPkNp8+ewlUN0Lh ZG+Uk+sLS9Ll1PXJEavNKdw/RdxEZ0aLb5kFIYLVI2t7WcnY7JYBEu98FJo= =kwaC -----END PGP SIGNATURE----- Merge tag 'wireless-drivers-2021-09-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers Kalle Valo says: ==================== wireless-drivers fixes for v5.15 First set of fixes for v5.15 and only iwlwifi patches this time. Most important being support for new hardware and new firmware API. I had already earlier applied a fix which also Linus applied to this tree as commit1476ff21ab
("iwl: fix debug printf format strings"), but this doesn't seem to cause any conflicts so I left it there. iwlwifi * add support for firmware API 66 * add support for Samsung Galaxy Book Flex2 Alpha * fix a leak happening every time module is loaded * fix a printk compiler warning ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Коммит
8f110f35f9
|
@ -9,7 +9,7 @@
|
|||
#include "iwl-prph.h"
|
||||
|
||||
/* Highest firmware API version supported */
|
||||
#define IWL_22000_UCODE_API_MAX 65
|
||||
#define IWL_22000_UCODE_API_MAX 66
|
||||
|
||||
/* Lowest firmware API version supported */
|
||||
#define IWL_22000_UCODE_API_MIN 39
|
||||
|
|
|
@ -231,6 +231,7 @@ static int iwl_pnvm_get_from_fs(struct iwl_trans *trans, u8 **data, size_t *len)
|
|||
{
|
||||
const struct firmware *pnvm;
|
||||
char pnvm_name[MAX_PNVM_NAME];
|
||||
size_t new_len;
|
||||
int ret;
|
||||
|
||||
iwl_pnvm_get_fs_name(trans, pnvm_name, sizeof(pnvm_name));
|
||||
|
@ -242,11 +243,14 @@ static int iwl_pnvm_get_from_fs(struct iwl_trans *trans, u8 **data, size_t *len)
|
|||
return ret;
|
||||
}
|
||||
|
||||
new_len = pnvm->size;
|
||||
*data = kmemdup(pnvm->data, pnvm->size, GFP_KERNEL);
|
||||
release_firmware(pnvm);
|
||||
|
||||
if (!*data)
|
||||
return -ENOMEM;
|
||||
|
||||
*len = pnvm->size;
|
||||
*len = new_len;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -49,14 +49,14 @@ void *iwl_uefi_get_pnvm(struct iwl_trans *trans, size_t *len)
|
|||
err = efivar_entry_get(pnvm_efivar, NULL, &package_size, data);
|
||||
if (err) {
|
||||
IWL_DEBUG_FW(trans,
|
||||
"PNVM UEFI variable not found %d (len %zd)\n",
|
||||
"PNVM UEFI variable not found %d (len %lu)\n",
|
||||
err, package_size);
|
||||
kfree(data);
|
||||
data = ERR_PTR(err);
|
||||
goto out;
|
||||
}
|
||||
|
||||
IWL_DEBUG_FW(trans, "Read PNVM from UEFI with size %zd\n", package_size);
|
||||
IWL_DEBUG_FW(trans, "Read PNVM from UEFI with size %lu\n", package_size);
|
||||
*len = package_size;
|
||||
|
||||
out:
|
||||
|
|
|
@ -558,6 +558,7 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
|
|||
IWL_DEV_INFO(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, NULL),
|
||||
IWL_DEV_INFO(0xA0F0, 0x2074, iwl_ax201_cfg_qu_hr, NULL),
|
||||
IWL_DEV_INFO(0xA0F0, 0x4070, iwl_ax201_cfg_qu_hr, NULL),
|
||||
IWL_DEV_INFO(0xA0F0, 0x6074, iwl_ax201_cfg_qu_hr, NULL),
|
||||
IWL_DEV_INFO(0x02F0, 0x0070, iwl_ax201_cfg_quz_hr, NULL),
|
||||
IWL_DEV_INFO(0x02F0, 0x0074, iwl_ax201_cfg_quz_hr, NULL),
|
||||
IWL_DEV_INFO(0x02F0, 0x6074, iwl_ax201_cfg_quz_hr, NULL),
|
||||
|
|
Загрузка…
Ссылка в новой задаче