SGkgS2FsbGUsDQoNCkkgaGF2ZSBoZXJlIGEgcHVsbCByZXF1ZXN0IGZvciA0LjYuIFRoZXJlIGlz
IHBhdGNoIGluIHRoaXMgcHVsbCByZXF1ZXN0DQp0aGF0IGhhcyBiZWVuIHNlbnQgdG8gLW5leHQg
YWxyZWFkeSBidXQgc2hvdWxkIHJlYWxseSBoYXZlIGJlZW4NCmluY2x1ZGVkIGluIHRoZSBjdXJy
ZW50IGN5Y2xlLiBTb3JyeSBmb3IgdGhlIG1lc3MuDQoNClRoZSBjb21taXQgYXBwZWFycyBpbiAt
bmV4dCBhczoNCg0KY29tbWl0IGEwYjA5ZjEzMDM2Y2VkZmQ2N2M5Y2I0YjlkMDUxMzhlNzAyMjcy
M2QNCkF1dGhvcjogQXlhbGEgQmVrZXIgPGF5YWxhLmJla2VyQGludGVsLmNvbT4NCkRhdGU6ICAg
V2VkIEZlYiAzIDE1OjM2OjUyIDIwMTYgKzAyMDANCg0KICAgIGl3bHdpZmk6IG12bTogdXBkYXRl
IEdTQ0FOIGNhcGFiaWxpdGllcw0KICAgIA0KICAgIEdzY2FuIGNhcGFiaWxpdGllcyB3ZXJlIHVw
ZGF0ZWQgd2l0aCBuZXcgY2FwYWJpbGl0aWVzIHN1cHBvcnRlZA0KICAgIGJ5IHRoZSBkZXZpY2Uu
IFVwZGF0ZSBHU0NBTiBjYXBhYmlsaXRpZXMgVExWLg0KDQpJIG1vZGlmaWVkIHRoZSBjb21taXQg
bWVzc2FnZSB0byBiZXR0ZXIgZW1waGFzaXMgdGhlIG5lZWQgdG8gaGF2ZSBpdCBpbg0KdGhlIGN1
cnJlbnQgcmVsZWFzZS4gWW91J2xsIHNlZSBpdCBpbiB0aGlzIHB1bGwgcmVxdWVzdCBhczoNCg0K
Y29tbWl0IGNkNDk3MjdlMWEyYmNjYzRmZjAwOGRkZTI0YzJmODQzMGRkOWUzNjgNCkF1dGhvcjog
QXlhbGEgQmVrZXIgPGF5YWxhLmJla2VyQGludGVsLmNvbT4NCkRhdGU6ICAgV2VkIEZlYiAzIDE1
OjM2OjUyIDIwMTYgKzAyMDANCg0KICAgIGl3bHdpZmk6IG12bTogYXZvaWQgdG8gV0FSTiBhYm91
dCBnc2NhbiBjYXBhYmlsaXRpZXMNCiAgICANCiAgICBHc2NhbiBjYXBhYmlsaXRpZXMgd2VyZSB1
cGRhdGVkIHdpdGggbmV3IGNhcGFiaWxpdGllcyBzdXBwb3J0ZWQNCiAgICBieSB0aGUgZGV2aWNl
LiBVcGRhdGUgR1NDQU4gY2FwYWJpbGl0aWVzIFRMViBhbmQgYXZvaWQgdG8gV0FSTg0KICAgIGlm
IHRoZSBmaXJtd2FyZSBkb2VzIG5vdCBoYXZlIHRoZSBuZXcgY2FwYWJpbGl0aWVzLg0KDQpCZXNp
ZGVzIHRoaXMsIGFsbCBpcyBmYWlybHkgbm9ybWFsLg0KUGxlYXNlIHB1bGwsIHRoYW5rcyENCg0K
DQpUaGUgZm9sbG93aW5nIGNoYW5nZXMgc2luY2UgY29tbWl0IDdmZGY5NjYzMjYxY2M3N2E1MTYz
OTZmZWM4MmNlZThhOGVhMDdlNzY6DQoNCiAgaXdsd2lmaTogbXZtOiBmaXggbWVtb3J5IGxlYWsg
aW4gcGFnaW5nICgyMDE2LTAzLTIwIDIzOjAxOjU0ICswMjAwKQ0KDQphcmUgYXZhaWxhYmxlIGlu
IHRoZSBnaXQgcmVwb3NpdG9yeSBhdDoNCg0KICBodHRwczovL2dpdC5rZXJuZWwub3JnL3B1Yi9z
Y20vbGludXgva2VybmVsL2dpdC9pd2x3aWZpL2l3bHdpZmktZml4ZXMuZ2l0IHRhZ3MvaXdsd2lm
aS1mb3Ita2FsbGUtMjAxNi0wNC0xMg0KDQpmb3IgeW91IHRvIGZldGNoIGNoYW5nZXMgdXAgdG8g
MmQyNWZiOGIzYTEzODcwNmI2M2JkMjZhZDcyYTk1YzU4MDI5OTU0YToNCg0KICBpd2x3aWZpOiBt
dm06IGZpeCBhY2Nlc3NpbmcgTnVsbCBwb2ludGVyIGR1cmluZyBmdyBkdW1wIGNvbGxlY3Rpb24g
KDIwMTYtMDQtMTIgMTA6MDM6MTcgKzAzMDApDQoNCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiogYWRkIG5ldyBkZXZpY2Ug
SURzIGZvciA4MjY1DQoqIGZpeCBhIE5VTEwgcG9pbnRlciBkZXJlZmVyZW5jZSB3aGVuIHBhZ2lu
ZyBmaXJtd2FyZSBhc3NlcnRzDQoqIHJlbW92ZSBhIFdBUk5JTkcgb24gZ3NjYW4gY2FwYWJpbGl0
aWVzDQoqIGZpeCBNT0RVTEVfRklSTVdBUkUgZm9yIDgyNjANCg0KLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KQXlhbGEgQmVr
ZXIgKDEpOg0KICAgICAgaXdsd2lmaTogbXZtOiBhdm9pZCB0byBXQVJOIGFib3V0IGdzY2FuIGNh
cGFiaWxpdGllcw0KDQpNYXR0aSBHb3R0bGllYiAoMSk6DQogICAgICBpd2x3aWZpOiBtdm06IGZp
eCBhY2Nlc3NpbmcgTnVsbCBwb2ludGVyIGR1cmluZyBmdyBkdW1wIGNvbGxlY3Rpb24NCg0KT3Jl
biBHaXZvbiAoMSk6DQogICAgICBpd2x3aWZpOiBhZGQgZGV2aWNlIElEcyBmb3IgdGhlIDgyNjUg
ZGV2aWNlDQoNClNhcmEgU2hhcm9uICgxKToNCiAgICAgIGl3bHdpZmk6IDgwMDA6IGZpeCBNT0RV
TEVfRklSTVdBUkUgaW5wdXQNCg0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkv
aXdsLTgwMDAuYyAgIHwgIDIgKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZp
L2l3bC1kcnYuYyAgICB8IDI2ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tDQogZHJpdmVycy9u
ZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9tdm0vZnctZGJnLmMgfCAgNiArKysrLS0NCiBkcml2
ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZpL212bS9mdy5jICAgICB8ICAyICsrDQogZHJp
dmVycy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9wY2llL2Rydi5jICAgfCAxMCArKysrKysr
KysrDQogNSBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSk=
From: Matti Gottlieb <[email protected]>
The firwmare file can come with data that is relevant for paging. This
data is availablet to the firmware upon request, but it stored in the
host's memory. During the firmware init flow, the driver configures the
firmware so that the firwmare knows where is the data.
When paging is used, the variable paging_mem_size is the number of bytes
that are available through paging. This variable is not zeror-ed if the
driver fails to configure the paging in the firmware, but the memory is
freed which is inconsistent.
This inconsistency led to a NULL pointer dereference in the code that
collects the debug data.
Fix this by zero-ing the paging_mem_size variable and NULLify the
relevant pointers, so that the code that collects the debug data will
know that the paging data is not available.
Signed-off-by: Matti Gottlieb <[email protected]>
Signed-off-by: Emmanuel Grumbach <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 6 ++++--
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
index 4856eac..6938cd3 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
@@ -526,7 +526,8 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
file_len += sizeof(*dump_data) + sizeof(*dump_mem) + sram2_len;
/* Make room for fw's virtual image pages, if it exists */
- if (mvm->fw->img[mvm->cur_ucode].paging_mem_size)
+ if (mvm->fw->img[mvm->cur_ucode].paging_mem_size &&
+ mvm->fw_paging_db[0].fw_paging_block)
file_len += mvm->num_of_paging_blk *
(sizeof(*dump_data) +
sizeof(struct iwl_fw_error_dump_paging) +
@@ -643,7 +644,8 @@ void iwl_mvm_fw_error_dump(struct iwl_mvm *mvm)
}
/* Dump fw's virtual image */
- if (mvm->fw->img[mvm->cur_ucode].paging_mem_size) {
+ if (mvm->fw->img[mvm->cur_ucode].paging_mem_size &&
+ mvm->fw_paging_db[0].fw_paging_block) {
for (i = 1; i < mvm->num_of_paging_blk + 1; i++) {
struct iwl_fw_error_dump_paging *paging;
struct page *pages =
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 594cd0d..09d895f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -144,9 +144,11 @@ void iwl_free_fw_paging(struct iwl_mvm *mvm)
__free_pages(mvm->fw_paging_db[i].fw_paging_block,
get_order(mvm->fw_paging_db[i].fw_paging_size));
+ mvm->fw_paging_db[i].fw_paging_block = NULL;
}
kfree(mvm->trans->paging_download_buf);
mvm->trans->paging_download_buf = NULL;
+ mvm->trans->paging_db = NULL;
memset(mvm->fw_paging_db, 0, sizeof(mvm->fw_paging_db));
}
--
2.5.0
"Grumbach, Emmanuel" <[email protected]> writes:
> I have here a pull request for 4.6. There is patch in this pull request
> that has been sent to -next already but should really have been
> included in the current cycle. Sorry for the mess.
>
> The commit appears in -next as:
>
> commit a0b09f13036cedfd67c9cb4b9d05138e7022723d
> Author: Ayala Beker <[email protected]>
> Date: Wed Feb 3 15:36:52 2016 +0200
>
> iwlwifi: mvm: update GSCAN capabilities
>
> Gscan capabilities were updated with new capabilities supported
> by the device. Update GSCAN capabilities TLV.
>
> I modified the commit message to better emphasis the need to have it in
> the current release. You'll see it in this pull request as:
>
> commit cd49727e1a2bccc4ff008dde24c2f8430dd9e368
> Author: Ayala Beker <[email protected]>
> Date: Wed Feb 3 15:36:52 2016 +0200
>
> iwlwifi: mvm: avoid to WARN about gscan capabilities
>
> Gscan capabilities were updated with new capabilities supported
> by the device. Update GSCAN capabilities TLV and avoid to WARN
> if the firmware does not have the new capabilities.
I feel uneasy having the same commit on both trees, but that might just
me. Dave, how do you suggest to handle cases like this when we want to
get a fix from -next to the current release -rc release?
This is the version I have in wireless-drivers-next:
https://git.kernel.org/cgit/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=a0b09f13036cedfd67c9cb4b9d05138e7022723d
And this is what Emmanuel wants to have in 4.6:
https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=cd49727e1a2bccc4ff008dde24c2f8430dd9e368
Luckily the patch is simple but still I would like hear Dave's opinion
about this. And at least the commit log in iwlwifi-fixes should mention
that it's cherry picked from iwlwifi-next.
--
Kalle Valo
"Grumbach, Emmanuel" <[email protected]> writes:
> On Tue, 2016-04-12 at 11:14 +0300, Emmanuel Grumbach wrote:
>> Hi Kalle,
>>
>> I have here a pull request for 4.6. There is patch in this pull
>> request
>> that has been sent to -next already but should really have been
>> included in the current cycle. Sorry for the mess.
>>
>> The commit appears in -next as:
>>
>> commit a0b09f13036cedfd67c9cb4b9d05138e7022723d
>> Author: Ayala Beker <[email protected]>
>> Date: Wed Feb 3 15:36:52 2016 +0200
>>
>> iwlwifi: mvm: update GSCAN capabilities
>>
>> Gscan capabilities were updated with new capabilities supported
>> by the device. Update GSCAN capabilities TLV.
>>
>> I modified the commit message to better emphasis the need to have it
>> in
>> the current release. You'll see it in this pull request as:
>>
>> commit cd49727e1a2bccc4ff008dde24c2f8430dd9e368
>> Author: Ayala Beker <[email protected]>
>> Date: Wed Feb 3 15:36:52 2016 +0200
>>
>> iwlwifi: mvm: avoid to WARN about gscan capabilities
>>
>> Gscan capabilities were updated with new capabilities supported
>> by the device. Update GSCAN capabilities TLV and avoid to WARN
>> if the firmware does not have the new capabilities.
>>
>> Besides this, all is fairly normal.
>> Please pull, thanks!
>>
>>
>> The following changes since commit
>> 7fdf9663261cc77a516396fec82cee8a8ea07e76:
>>
>> iwlwifi: mvm: fix memory leak in paging (2016-03-20 23:01:54 +0200)
>>
>> are available in the git repository at:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fix
>> es.git tags/iwlwifi-for-kalle-2016-04-12
>>
>> for you to fetch changes up to
>> 2d25fb8b3a138706b63bd26ad72a95c58029954a:
>>
>> iwlwifi: mvm: fix accessing Null pointer during fw dump collection
>> (2016-04-12 10:03:17 +0300)
>>
>
> Sara found an embarrassing last minute issue.
> New tag is iwlwifi-for-kalle-2016-04-12_2.
Pulled, thanks.
--
Kalle Valo
From: Ayala Beker <[email protected]>
Gscan capabilities were updated with new capabilities supported
by the device. Update GSCAN capabilities TLV and avoid to WARN
if the firmware does not have the new capabilities.
Signed-off-by: Ayala Beker <[email protected]>
Signed-off-by: Emmanuel Grumbach <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index f899666..33d0d51 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1060,11 +1060,18 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
return -EINVAL;
}
- if (WARN(fw_has_capa(capa, IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT) &&
- !gscan_capa,
- "GSCAN is supported but capabilities TLV is unavailable\n"))
+ /*
+ * If ucode advertises that it supports GSCAN but GSCAN
+ * capabilities TLV is not present, or if it has an old format,
+ * warn and continue without GSCAN.
+ */
+ if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT) &&
+ !gscan_capa) {
+ IWL_DEBUG_INFO(drv,
+ "GSCAN is supported but capabilities TLV is unavailable\n");
__clear_bit((__force long)IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT,
capa->_capa);
+ }
return 0;
--
2.5.0
From: Sara Sharon <[email protected]>
The firwmare name for 8000 is iwlwifi-8000C. The C is
appended based on a value read from a register. This
allows to load different firwmare versions based on
the hardware step during development. Now that the
hardware development is completed, we can hard code
the 'C' and along the way, fix the input to
MODULE_FIRMWARE.
This fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=116041
Signed-off-by: Sara Sharon <[email protected]>
Signed-off-by: Emmanuel Grumbach <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 +-
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 13 -------------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index 97be104..cf48122 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -93,7 +93,7 @@
#define IWL8260_SMEM_OFFSET 0x400000
#define IWL8260_SMEM_LEN 0x68000
-#define IWL8000_FW_PRE "iwlwifi-8000"
+#define IWL8000_FW_PRE "iwlwifi-8000C"
#define IWL8000_MODULE_FIRMWARE(api) \
IWL8000_FW_PRE "-" __stringify(api) ".ucode"
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 33d0d51..9e45bf9 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -238,19 +238,6 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
name_pre, tag);
- /*
- * Starting 8000B - FW name format has changed. This overwrites the
- * previous name and uses the new format.
- */
- if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
- char rev_step = 'A' + CSR_HW_REV_STEP(drv->trans->hw_rev);
-
- if (rev_step != 'A')
- snprintf(drv->firmware_name,
- sizeof(drv->firmware_name), "%s%c-%s.ucode",
- name_pre, rev_step, tag);
- }
-
IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n",
(drv->fw_index == UCODE_EXPERIMENTAL_INDEX)
? "EXPERIMENTAL " : "",
--
2.5.0
T24gVHVlLCAyMDE2LTA0LTEyIGF0IDExOjE0ICswMzAwLCBFbW1hbnVlbCBHcnVtYmFjaCB3cm90
ZToNCj4gSGkgS2FsbGUsDQo+IA0KPiBJIGhhdmUgaGVyZSBhIHB1bGwgcmVxdWVzdCBmb3IgNC42
LiBUaGVyZSBpcyBwYXRjaCBpbiB0aGlzIHB1bGwNCj4gcmVxdWVzdA0KPiB0aGF0IGhhcyBiZWVu
IHNlbnQgdG8gLW5leHQgYWxyZWFkeSBidXQgc2hvdWxkIHJlYWxseSBoYXZlIGJlZW4NCj4gaW5j
bHVkZWQgaW4gdGhlIGN1cnJlbnQgY3ljbGUuIFNvcnJ5IGZvciB0aGUgbWVzcy4NCj4gDQo+IFRo
ZSBjb21taXQgYXBwZWFycyBpbiAtbmV4dCBhczoNCj4gDQo+IGNvbW1pdCBhMGIwOWYxMzAzNmNl
ZGZkNjdjOWNiNGI5ZDA1MTM4ZTcwMjI3MjNkDQo+IEF1dGhvcjogQXlhbGEgQmVrZXIgPGF5YWxh
LmJla2VyQGludGVsLmNvbT4NCj4gRGF0ZTogICBXZWQgRmViIDMgMTU6MzY6NTIgMjAxNiArMDIw
MA0KPiANCj4gICAgIGl3bHdpZmk6IG12bTogdXBkYXRlIEdTQ0FOIGNhcGFiaWxpdGllcw0KPiAg
ICAgDQo+ICAgICBHc2NhbiBjYXBhYmlsaXRpZXMgd2VyZSB1cGRhdGVkIHdpdGggbmV3IGNhcGFi
aWxpdGllcyBzdXBwb3J0ZWQNCj4gICAgIGJ5IHRoZSBkZXZpY2UuIFVwZGF0ZSBHU0NBTiBjYXBh
YmlsaXRpZXMgVExWLg0KPiANCj4gSSBtb2RpZmllZCB0aGUgY29tbWl0IG1lc3NhZ2UgdG8gYmV0
dGVyIGVtcGhhc2lzIHRoZSBuZWVkIHRvIGhhdmUgaXQNCj4gaW4NCj4gdGhlIGN1cnJlbnQgcmVs
ZWFzZS4gWW91J2xsIHNlZSBpdCBpbiB0aGlzIHB1bGwgcmVxdWVzdCBhczoNCj4gDQo+IGNvbW1p
dCBjZDQ5NzI3ZTFhMmJjY2M0ZmYwMDhkZGUyNGMyZjg0MzBkZDllMzY4DQo+IEF1dGhvcjogQXlh
bGEgQmVrZXIgPGF5YWxhLmJla2VyQGludGVsLmNvbT4NCj4gRGF0ZTogICBXZWQgRmViIDMgMTU6
MzY6NTIgMjAxNiArMDIwMA0KPiANCj4gICAgIGl3bHdpZmk6IG12bTogYXZvaWQgdG8gV0FSTiBh
Ym91dCBnc2NhbiBjYXBhYmlsaXRpZXMNCj4gICAgIA0KPiAgICAgR3NjYW4gY2FwYWJpbGl0aWVz
IHdlcmUgdXBkYXRlZCB3aXRoIG5ldyBjYXBhYmlsaXRpZXMgc3VwcG9ydGVkDQo+ICAgICBieSB0
aGUgZGV2aWNlLiBVcGRhdGUgR1NDQU4gY2FwYWJpbGl0aWVzIFRMViBhbmQgYXZvaWQgdG8gV0FS
Tg0KPiAgICAgaWYgdGhlIGZpcm13YXJlIGRvZXMgbm90IGhhdmUgdGhlIG5ldyBjYXBhYmlsaXRp
ZXMuDQo+IA0KPiBCZXNpZGVzIHRoaXMsIGFsbCBpcyBmYWlybHkgbm9ybWFsLg0KPiBQbGVhc2Ug
cHVsbCwgdGhhbmtzIQ0KPiANCj4gDQo+IFRoZSBmb2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBjb21t
aXQNCj4gN2ZkZjk2NjMyNjFjYzc3YTUxNjM5NmZlYzgyY2VlOGE4ZWEwN2U3NjoNCj4gDQo+ICAg
aXdsd2lmaTogbXZtOiBmaXggbWVtb3J5IGxlYWsgaW4gcGFnaW5nICgyMDE2LTAzLTIwIDIzOjAx
OjU0ICswMjAwKQ0KPiANCj4gYXJlIGF2YWlsYWJsZSBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkgYXQ6
DQo+IA0KPiAgIGh0dHBzOi8vZ2l0Lmtlcm5lbC5vcmcvcHViL3NjbS9saW51eC9rZXJuZWwvZ2l0
L2l3bHdpZmkvaXdsd2lmaS1maXgNCj4gZXMuZ2l0IHRhZ3MvaXdsd2lmaS1mb3Ita2FsbGUtMjAx
Ni0wNC0xMg0KPiANCj4gZm9yIHlvdSB0byBmZXRjaCBjaGFuZ2VzIHVwIHRvDQo+IDJkMjVmYjhi
M2ExMzg3MDZiNjNiZDI2YWQ3MmE5NWM1ODAyOTk1NGE6DQo+IA0KPiAgIGl3bHdpZmk6IG12bTog
Zml4IGFjY2Vzc2luZyBOdWxsIHBvaW50ZXIgZHVyaW5nIGZ3IGR1bXAgY29sbGVjdGlvbg0KPiAo
MjAxNi0wNC0xMiAxMDowMzoxNyArMDMwMCkNCj4gDQoNClNhcmEgZm91bmQgYW4gZW1iYXJyYXNz
aW5nIGxhc3QgbWludXRlIGlzc3VlLg0KTmV3IHRhZyBpcyBpd2x3aWZpLWZvci1rYWxsZS0yMDE2
LTA0LTEyXzIuDQogDQpIZXJlIGlzIHRoZSBkaWZmOg0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0
L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLTgwMDAuYyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNz
L2ludGVsL2l3bHdpZmkvaXdsLTgwMDAuYw0KaW5kZXggY2Y0ODEyMi4uYjVjNTdlZSAxMDA2NDQN
Ci0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLTgwMDAuYw0KKysr
IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvaW50ZWwvaXdsd2lmaS9pd2wtODAwMC5jDQpAQCAtOTMs
NyArOTMsNyBAQA0KICNkZWZpbmUgSVdMODI2MF9TTUVNX09GRlNFVCAgICAgICAgICAgIDB4NDAw
MDAwDQogI2RlZmluZSBJV0w4MjYwX1NNRU1fTEVOICAgICAgICAgICAgICAgMHg2ODAwMA0KIA0K
LSNkZWZpbmUgSVdMODAwMF9GV19QUkUgIml3bHdpZmktODAwMEMiDQorI2RlZmluZSBJV0w4MDAw
X0ZXX1BSRSAiaXdsd2lmaS04MDAwQy0iDQogI2RlZmluZSBJV0w4MDAwX01PRFVMRV9GSVJNV0FS
RShhcGkpIFwNCiAgICAgICAgSVdMODAwMF9GV19QUkUgIi0iIF9fc3RyaW5naWZ5KGFwaSkgIi51
Y29kZSINCiANCg0KPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tDQo+ICogYWRkIG5ldyBkZXZpY2UgSURzIGZvciA4MjY1DQo+
ICogZml4IGEgTlVMTCBwb2ludGVyIGRlcmVmZXJlbmNlIHdoZW4gcGFnaW5nIGZpcm13YXJlIGFz
c2VydHMNCj4gKiByZW1vdmUgYSBXQVJOSU5HIG9uIGdzY2FuIGNhcGFiaWxpdGllcw0KPiAqIGZp
eCBNT0RVTEVfRklSTVdBUkUgZm9yIDgyNjANCj4gDQo+IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCj4gQXlhbGEgQmVrZXIg
KDEpOg0KPiAgICAgICBpd2x3aWZpOiBtdm06IGF2b2lkIHRvIFdBUk4gYWJvdXQgZ3NjYW4gY2Fw
YWJpbGl0aWVzDQo+IA0KPiBNYXR0aSBHb3R0bGllYiAoMSk6DQo+ICAgICAgIGl3bHdpZmk6IG12
bTogZml4IGFjY2Vzc2luZyBOdWxsIHBvaW50ZXIgZHVyaW5nIGZ3IGR1bXANCj4gY29sbGVjdGlv
bg0KPiANCj4gT3JlbiBHaXZvbiAoMSk6DQo+ICAgICAgIGl3bHdpZmk6IGFkZCBkZXZpY2UgSURz
IGZvciB0aGUgODI2NSBkZXZpY2UNCj4gDQo+IFNhcmEgU2hhcm9uICgxKToNCj4gICAgICAgaXds
d2lmaTogODAwMDogZml4IE1PRFVMRV9GSVJNV0FSRSBpbnB1dA0KPiANCj4gIGRyaXZlcnMvbmV0
L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLTgwMDAuYyAgIHwgIDIgKy0NCj4gIGRyaXZlcnMv
bmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvaXdsLWRydi5jICAgIHwgMjYgKysrKysrKysrKy0t
LS0tDQo+IC0tLS0tLS0tLS0tDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZp
L212bS9mdy1kYmcuYyB8ICA2ICsrKystLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaW50ZWwv
aXdsd2lmaS9tdm0vZncuYyAgICAgfCAgMiArKw0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaW50
ZWwvaXdsd2lmaS9wY2llL2Rydi5jICAgfCAxMCArKysrKysrKysrDQo+ICA1IGZpbGVzIGNoYW5n
ZWQsIDI3IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQ==
From: Oren Givon <[email protected]>
Add new 8265 series PCI IDs.
Signed-off-by: Oren Givon <[email protected]>
Signed-off-by: Emmanuel Grumbach <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 05b9685..79d7cd7 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -479,8 +479,18 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
{IWL_PCI_DEVICE(0x24F3, 0x0930, iwl8260_2ac_cfg)},
{IWL_PCI_DEVICE(0x24F3, 0x0000, iwl8265_2ac_cfg)},
{IWL_PCI_DEVICE(0x24FD, 0x0010, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x0110, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x1110, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x1010, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x0050, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x0150, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x9010, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x8110, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x8050, iwl8265_2ac_cfg)},
{IWL_PCI_DEVICE(0x24FD, 0x8010, iwl8265_2ac_cfg)},
{IWL_PCI_DEVICE(0x24FD, 0x0810, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x9110, iwl8265_2ac_cfg)},
+ {IWL_PCI_DEVICE(0x24FD, 0x8130, iwl8265_2ac_cfg)},
/* 9000 Series */
{IWL_PCI_DEVICE(0x9DF0, 0x2A10, iwl5165_2ac_cfg)},
--
2.5.0
Kalle Valo <[email protected]> writes:
> "Grumbach, Emmanuel" <[email protected]> writes:
>
>> I have here a pull request for 4.6. There is patch in this pull request
>> that has been sent to -next already but should really have been
>> included in the current cycle. Sorry for the mess.
>>
>> The commit appears in -next as:
>>
>> commit a0b09f13036cedfd67c9cb4b9d05138e7022723d
>> Author: Ayala Beker <[email protected]>
>> Date: Wed Feb 3 15:36:52 2016 +0200
>>
>> iwlwifi: mvm: update GSCAN capabilities
>>
>> Gscan capabilities were updated with new capabilities supported
>> by the device. Update GSCAN capabilities TLV.
>>
>> I modified the commit message to better emphasis the need to have it in
>> the current release. You'll see it in this pull request as:
>>
>> commit cd49727e1a2bccc4ff008dde24c2f8430dd9e368
>> Author: Ayala Beker <[email protected]>
>> Date: Wed Feb 3 15:36:52 2016 +0200
>>
>> iwlwifi: mvm: avoid to WARN about gscan capabilities
>>
>> Gscan capabilities were updated with new capabilities supported
>> by the device. Update GSCAN capabilities TLV and avoid to WARN
>> if the firmware does not have the new capabilities.
>
> I feel uneasy having the same commit on both trees, but that might just
> me. Dave, how do you suggest to handle cases like this when we want to
> get a fix from -next to the current release -rc release?
Dave replied privately that this is ok. So I'll pull this shortly.
--
Kalle Valo
Emmanuel Grumbach <[email protected]> writes:
> On Sun, Aug 7, 2016 at 7:35 AM, Grumbach, Emmanuel
> <[email protected]> wrote:
>>
>> Hi Kalle,
>>
>> Here is a pull request for 4.6. I have here a patch that was merged to
>> -next already, but clearly, it should have been routed through the
>> current cycle's trees. Sorry about that.
>> The patch is:
>
>
> Wow.. I knew evolution was sometimes stupid, but this is new to me..
> Obviously you should ignore that.
> Sorry...
Ok, I dropped this :)
--
Kalle Valo
On Sun, 2016-08-07 at 07:38 +0300, Emmanuel Grumbach wrote:
> On Sun, Aug 7, 2016 at 7:35 AM, Grumbach, Emmanuel
> <[email protected]> wrote:
> >
> >
> > Hi Kalle,
> >
> > Here is a pull request for 4.6. I have here a patch that was merged
> > to
> > -next already, but clearly, it should have been routed through the
> > current cycle's trees. Sorry about that.
> > The patch is:
>
>
> Wow.. I knew evolution was sometimes stupid, but this is new to me..
Which evolution are you blaming here? The email client or the evolution
of species? :D
--
Luca.