* pull-request: iwlwifi-next 2017-04-19-2
@ 2017-04-20 4:59 Luca Coelho
2017-04-20 5:04 ` Luca Coelho
2017-04-20 8:04 ` Kalle Valo
0 siblings, 2 replies; 6+ messages in thread
From: Luca Coelho @ 2017-04-20 4:59 UTC (permalink / raw)
To: kvalo; +Cc: linux-wireless, linuxwifi
[-- Attachment #1: Type: text/plain, Size: 7600 bytes --]
Hi Kalle,
Here's v2 of my second pull-request intended for v4.12. It includes the
last three patch series I sent out, namely 2017-04-13, 2017-04-19 and
the 2 fixes by Johannes that I sent a few minutes ago.
I also removed the "bump API to 31" patch. I'll send a diff between
this tag and the HEAD of the patches I sent in the 2017-04-19 series.
Please let me know if there are any issues.
Cheers,
Luca.
The following changes since commit 26ecfe01790381c4caa65ec9cce484c623f092c4:
brcmfmac: only build fwsignal module for CONFIG_BRCMFMAC_PROTO_BCDC (2017-04-19 14:39:44 +0300)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2017-04-19-2
for you to fetch changes up to 718ceb22a0ccd0b3a02a4bd401d944a1eb16f3ce:
iwlwifi: pcie: free context info in case of failures (2017-04-20 07:28:03 +0300)
----------------------------------------------------------------
Another series of patches intended for v4.12. These are the changes:
* Heavy work for the A000 device series;
* Some cleanup patches;
* A few fixes;
* Dynamic SAR support;
* Geographical SAR support;
* Support a few new PCI device IDs;
----------------------------------------------------------------
David Spinadel (1):
iwlwifi: mvm: change TX_CMD_SEC_KEY_FROM_TABLE value
Emmanuel Grumbach (3):
iwlwifi: mvm: tell the firmware about the U-APSD parameters
iwlwifi: mvm: provide the actual number of frames for the SP len
iwlwifi: split the handler and the wake parts of the notification infra
Goodstein, Mordechay (1):
iwlwifi: mvm: move new API code to the end
Haim Dreyfuss (2):
iwlwifi: mvm: refactor SAR init to prepare for dynamic SAR
iwlwifi: mvm: add GEO_TX_POWER_LIMIT cmd for geographic tx power table
Johannes Berg (2):
iwlwifi: pcie: fix mutex leak in gen2 start
iwlwifi: pcie: free context info in case of failures
Liad Kaufman (2):
iwlwifi: mvm: remove unneeded reg write in iwl_mvm_up()
iwlwifi: a000: fix memory offsets and lengths
Luca Coelho (5):
iwlwifi: mvm: spin off SAR profile selection function
iwlwifi: mvm: add support for EWRD (Dynamic SAR) ACPI table
iwlwifi: mvm: remove unnecessary debugging from UMAC scan
iwlwifi: mvm: remove unnecessary label in iwl_mvm_handle_rx_statistics()
iwlwifi: pcie: remove RSA race workaround
Sara Sharon (34):
iwlwifi: mvm: read new secure boot registers
iwlwifi: mvm: add queues after adding station
iwlwifi: cleanup unused function
iwlwifi: mvm: prepare for station count change
iwlwifi: mvm: use same scan API for all a000 devices
iwlwifi: mvm: disable multi-queue for a000 devices
iwlwifi: mvm: support new TX API
iwlwifi: pcie: introduce a000 TX queues management
iwlwifi: mvm: support a000 SCD queue configuration
iwlwifi: mvm: support moving to mgmt tid
iwlwifi: pcie: copy TX functions to new transport
iwlwifi: pcie: cleanup old transport code from gen2
iwlwifi: pcie: support new TX command
iwlwifi: pcie: rewrite TFD creation
iwlwifi: pcie: support host commands in new transport
iwlwifi: pcie: support new write pointer width
iwlwifi: pcie: remove block and freeze operations from new transport
iwlwifi: pcie: prepare for dynamic queue allocation
iwlwifi: pcie: introduce new stop_device
iwlwifi: pcie: alloc queues dynamically
iwlwifi: pcie: get rid of txq id assignment
iwlwifi: mvm: support new TX response for TVQM
iwlwifi: move to TVQM mode
iwlwifi: mvm: do not turn on RX_FLAG_AMSDU_MORE
iwlwifi: mvm: work around HW issue with AMSDU de-aggregation
iwlwifi: mvm: ignore BAID for SN smaller than SSN
iwlwifi: mvm: support change to a000 smem API
iwlwifi: support a000 CDB product
iwlwifi: mvm: support init extended command
iwlwifi: mvm: disable RX queue notification for a000 devices
iwlwifi: mvm: dump frames early on invalid rate
iwlwifi: mvm: flip address 4 of AMSDU frames
iwlwifi: mvm: support changing band for phy context
iwlwifi: mvm: allow block ack response without data
Tzipi Peres (1):
iwlwifi: add four new 8265 and 8275 series PCI IDs
drivers/net/wireless/intel/iwlwifi/Makefile | 2 +-
drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 2 +-
drivers/net/wireless/intel/iwlwifi/iwl-a000.c | 26 +-
drivers/net/wireless/intel/iwlwifi/iwl-config.h | 15 +-
drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.c | 10 +-
drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.h | 25 +-
drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 7 +-
drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 77 +++++-
drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 +-
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-mac.h | 4 +-
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-power.h | 43 ++-
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-scan.h | 14 +-
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 16 +-
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 86 ++++--
drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 67 ++++-
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 287 ++++++++++++---------
drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 498 +++++++++++++++++++++++++++--------
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 10 +-
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 19 +-
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 58 ++++-
drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 14 +-
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 21 +-
drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 93 ++++---
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 67 +++--
drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 85 +++---
drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 6 +-
drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 291 ++++++++++++++-------
drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 22 +-
drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 124 +++++++--
drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 74 +++++-
drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 7 +-
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 11 +-
drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 42 ++-
drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 9 +-
drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 152 ++++++++++-
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 94 ++-----
drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 1018 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 232 ++++++-----------
43 files changed, 2818 insertions(+), 826 deletions(-)
create mode 100644 drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: iwlwifi-next 2017-04-19-2
2017-04-20 4:59 pull-request: iwlwifi-next 2017-04-19-2 Luca Coelho
@ 2017-04-20 5:04 ` Luca Coelho
2017-04-20 6:55 ` Kalle Valo
2017-04-20 8:04 ` Kalle Valo
1 sibling, 1 reply; 6+ messages in thread
From: Luca Coelho @ 2017-04-20 5:04 UTC (permalink / raw)
To: kvalo; +Cc: linux-wireless, linuxwifi
On Thu, 2017-04-20 at 07:59 +0300, Luca Coelho wrote:
> Here's v2 of my second pull-request intended for v4.12. It includes the
> last three patch series I sent out, namely 2017-04-13, 2017-04-19 and
> the 2 fixes by Johannes that I sent a few minutes ago.
>
> I also removed the "bump API to 31" patch. I'll send a diff between
> this tag and the HEAD of the patches I sent in the 2017-04-19 series.
This is the diffenrece between my pending branch (which contains all the
patches up to 2017-04-19) and this pull-request. For the record of what
I had to change.
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index 904e17956e2c..b9718c0cf174 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -70,8 +70,8 @@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
-#define IWL8000_UCODE_API_MAX 31
-#define IWL8265_UCODE_API_MAX 31
+#define IWL8000_UCODE_API_MAX 30
+#define IWL8265_UCODE_API_MAX 30
/* Lowest firmware API version supported */
#define IWL8000_UCODE_API_MIN 17
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
index 42a6e723191e..110ceefccc15 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
@@ -55,7 +55,7 @@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
-#define IWL9000_UCODE_API_MAX 31
+#define IWL9000_UCODE_API_MAX 30
/* Lowest firmware API version supported */
#define IWL9000_UCODE_API_MIN 30
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
index 6d745c36f1d8..097cb45c8ad9 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
@@ -55,7 +55,7 @@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
-#define IWL_A000_UCODE_API_MAX 31
+#define IWL_A000_UCODE_API_MAX 30
/* Lowest firmware API version supported */
#define IWL_A000_UCODE_API_MIN 24
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index 7b33ff398332..402846650cbe 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -1056,6 +1056,8 @@ static ssize_t iwl_dbgfs_fw_dbg_collect_write(struct iwl_mvm *mvm,
if (ret)
return ret;
+ if (count == 0)
+ return 0;
iwl_mvm_fw_dbg_collect(mvm, FW_DBG_TRIGGER_USER, buf,
(count - 1), NULL);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index edaaa3bcf0b2..9e69b9d2012c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -216,7 +216,8 @@ u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif)
qmask |= BIT(vif->hw_queue[ac]);
}
- if (vif->type == NL80211_IFTYPE_AP)
+ if (vif->type == NL80211_IFTYPE_AP ||
+ vif->type == NL80211_IFTYPE_ADHOC)
qmask |= BIT(vif->cab_queue);
return qmask;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index 839596c7a562..a2a1fa06b781 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -1908,7 +1908,8 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
lockdep_assert_held(&mvm->mutex);
if (iwl_mvm_is_dqa_supported(mvm) && !iwl_mvm_has_new_tx_api(mvm)) {
- if (vif->type == NL80211_IFTYPE_AP)
+ if (vif->type == NL80211_IFTYPE_AP ||
+ vif->type == NL80211_IFTYPE_ADHOC)
queue = mvm->probe_queue;
else if (vif->type == NL80211_IFTYPE_P2P_DEVICE)
queue = mvm->p2p_dev_queue;
@@ -1959,6 +1960,11 @@ static void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm,
lockdep_assert_held(&mvm->mutex);
+ if (vif->type == NL80211_IFTYPE_AP ||
+ vif->type == NL80211_IFTYPE_ADHOC)
+ iwl_mvm_disable_txq(mvm, vif->cab_queue, vif->cab_queue,
+ IWL_MAX_TID_COUNT, 0);
+
if (mvmvif->bcast_sta.tfd_queue_msk & BIT(mvm->probe_queue)) {
iwl_mvm_disable_txq(mvm, mvm->probe_queue,
vif->hw_queue[0], IWL_MAX_TID_COUNT,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index a3de91e5e543..8f737f6cdd80 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -543,6 +543,7 @@ static int iwl_mvm_get_ctrl_vif_queue(struct iwl_mvm *mvm,
switch (info->control.vif->type) {
case NL80211_IFTYPE_AP:
+ case NL80211_IFTYPE_ADHOC:
/*
* Handle legacy hostapd as well, where station may be added
* only after assoc. Take care of the case where we send a
@@ -554,7 +555,8 @@ static int iwl_mvm_get_ctrl_vif_queue(struct iwl_mvm *mvm,
if (info->hw_queue == info->control.vif->cab_queue)
return info->hw_queue;
- WARN_ONCE(1, "fc=0x%02x", le16_to_cpu(fc));
+ WARN_ONCE(info->control.vif->type != NL80211_IFTYPE_ADHOC,
+ "fc=0x%02x", le16_to_cpu(fc));
return mvm->probe_queue;
case NL80211_IFTYPE_P2P_DEVICE:
if (ieee80211_is_mgmt(fc))
@@ -620,7 +622,8 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)
iwl_mvm_vif_from_mac80211(info.control.vif);
if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE ||
- info.control.vif->type == NL80211_IFTYPE_AP) {
+ info.control.vif->type == NL80211_IFTYPE_AP ||
+ info.control.vif->type == NL80211_IFTYPE_ADHOC) {
sta_id = mvmvif->bcast_sta.sta_id;
queue = iwl_mvm_get_ctrl_vif_queue(mvm, &info,
hdr->frame_control);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
index 854d61888f4d..1d95512361b2 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c
@@ -241,8 +241,11 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans,
/* allocate ucode sections in dram and set addresses */
ret = iwl_pcie_ctxt_info_init_fw_sec(trans, fw, ctxt_info);
- if (ret)
+ if (ret) {
+ dma_free_coherent(trans->dev, sizeof(*trans_pcie->ctxt_info),
+ ctxt_info, trans_pcie->ctxt_info_dma_addr);
return ret;
+ }
trans_pcie->ctxt_info = ctxt_info;
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index ef8f563a48d9..ac60a282d6de 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -359,8 +359,9 @@ int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,
goto out;
}
- if (iwl_pcie_ctxt_info_init(trans, fw))
- return -ENOMEM;
+ ret = iwl_pcie_ctxt_info_init(trans, fw);
+ if (ret)
+ goto out;
/* re-check RF-Kill state since we may have missed the interrupt */
hw_rfkill = iwl_trans_check_hw_rf_kill(trans);
--
Cheers,
Luca.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: pull-request: iwlwifi-next 2017-04-19-2
2017-04-20 5:04 ` Luca Coelho
@ 2017-04-20 6:55 ` Kalle Valo
2017-04-20 7:11 ` Luca Coelho
0 siblings, 1 reply; 6+ messages in thread
From: Kalle Valo @ 2017-04-20 6:55 UTC (permalink / raw)
To: Luca Coelho; +Cc: linux-wireless, linuxwifi
Luca Coelho <luca@coelho.fi> writes:
> On Thu, 2017-04-20 at 07:59 +0300, Luca Coelho wrote:
>> Here's v2 of=C2=A0my second pull-request intended for v4.12. It include=
s the
>> last three patch series I sent out, namely 2017-04-13, 2017-04-19 and
>> the 2 fixes by Johannes that I sent a few minutes ago.
>>=20
>> I also removed the "bump API to 31" patch. I'll send a diff=C2=A0between
>> this tag and the HEAD of the patches I sent in the 2017-04-19 series.
>
> This is the diffenrece between my pending branch (which contains all the
> patches up to 2017-04-19) and this pull-request. For the record of what
> I had to change.
>
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
> b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
> index 904e17956e2c..b9718c0cf174 100644
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
> @@ -70,8 +70,8 @@
> =C2=A0#include "iwl-agn-hw.h"
> =C2=A0
> =C2=A0/* Highest firmware API version supported */
> -#define IWL8000_UCODE_API_MAX=C2=A0=C2=A031
> -#define IWL8265_UCODE_API_MAX=C2=A0=C2=A031
> +#define IWL8000_UCODE_API_MAX=C2=A0=C2=A030
> +#define IWL8265_UCODE_API_MAX=C2=A0=C2=A030
> =C2=A0
> =C2=A0/* Lowest firmware API version supported */
> =C2=A0#define IWL8000_UCODE_API_MIN=C2=A0=C2=A017
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
> b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
> index 42a6e723191e..110ceefccc15 100644
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-9000.c
> @@ -55,7 +55,7 @@
> =C2=A0#include "iwl-agn-hw.h"
> =C2=A0
> =C2=A0/* Highest firmware API version supported */
> -#define IWL9000_UCODE_API_MAX=C2=A0=C2=A031
> +#define IWL9000_UCODE_API_MAX=C2=A0=C2=A030
> =C2=A0
> =C2=A0/* Lowest firmware API version supported */
> =C2=A0#define IWL9000_UCODE_API_MIN=C2=A0=C2=A030
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
> b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
> index 6d745c36f1d8..097cb45c8ad9 100644
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
> @@ -55,7 +55,7 @@
> =C2=A0#include "iwl-agn-hw.h"
> =C2=A0
> =C2=A0/* Highest firmware API version supported */
> -#define IWL_A000_UCODE_API_MAX 31
> +#define IWL_A000_UCODE_API_MAX 30
Good that you dropped this. I was a bit worried that if it the API bump
was too soon and inconvenient for the users.
--=20
Kalle Valo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: iwlwifi-next 2017-04-19-2
2017-04-20 6:55 ` Kalle Valo
@ 2017-04-20 7:11 ` Luca Coelho
2017-04-20 7:20 ` Kalle Valo
0 siblings, 1 reply; 6+ messages in thread
From: Luca Coelho @ 2017-04-20 7:11 UTC (permalink / raw)
To: Kalle Valo; +Cc: linux-wireless, linuxwifi
On Thu, 2017-04-20 at 09:55 +0300, Kalle Valo wrote:
> Luca Coelho <luca@coelho.fi> writes:
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
> > b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
> > index 6d745c36f1d8..097cb45c8ad9 100644
> > --- a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
> > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
> > @@ -55,7 +55,7 @@
> > #include "iwl-agn-hw.h"
> >
> > /* Highest firmware API version supported */
> > -#define IWL_A000_UCODE_API_MAX 31
> > +#define IWL_A000_UCODE_API_MAX 30
>
> Good that you dropped this. I was a bit worried that if it the API bump
> was too soon and inconvenient for the users.
Yes, we usually bump it up internally *before* we get all the actual API
changes in the firmware, so both the driver and the FW evolve together.
So, in practice, I should bump the API to 30 upstream when we reach the
bump to 31 internally (which means 30 is frozen at that point).
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: iwlwifi-next 2017-04-19-2
2017-04-20 7:11 ` Luca Coelho
@ 2017-04-20 7:20 ` Kalle Valo
0 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2017-04-20 7:20 UTC (permalink / raw)
To: Luca Coelho; +Cc: linux-wireless, linuxwifi
Luca Coelho <luca@coelho.fi> writes:
> On Thu, 2017-04-20 at 09:55 +0300, Kalle Valo wrote:
>> Luca Coelho <luca@coelho.fi> writes:
>> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
>> > b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
>> > index 6d745c36f1d8..097cb45c8ad9 100644
>> > --- a/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
>> > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-a000.c
>> > @@ -55,7 +55,7 @@
>> > =C2=A0#include "iwl-agn-hw.h"
>> > =C2=A0
>> > =C2=A0/* Highest firmware API version supported */
>> > -#define IWL_A000_UCODE_API_MAX 31
>> > +#define IWL_A000_UCODE_API_MAX 30
>>=20
>> Good that you dropped this. I was a bit worried that if it the API bump
>> was too soon and inconvenient for the users.
>
> Yes, we usually bump it up internally *before* we get all the actual API
> changes in the firmware, so both the driver and the FW evolve together.
>
> So, in practice, I should bump the API to 30 upstream when we reach the
> bump to 31 internally (which means 30 is frozen at that point).
Sorry, I got confused. I guess I haven't even still properly woken up. I
was thinking the MIN API level and worried about forcing users to update
the firmware image too early.
--=20
Kalle Valo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pull-request: iwlwifi-next 2017-04-19-2
2017-04-20 4:59 pull-request: iwlwifi-next 2017-04-19-2 Luca Coelho
2017-04-20 5:04 ` Luca Coelho
@ 2017-04-20 8:04 ` Kalle Valo
1 sibling, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2017-04-20 8:04 UTC (permalink / raw)
To: Luca Coelho; +Cc: linux-wireless, linuxwifi
Luca Coelho <luca@coelho.fi> writes:
> Here's v2 of=C2=A0my second pull-request intended for v4.12. It includes=
the
> last three patch series I sent out, namely 2017-04-13, 2017-04-19 and
> the 2 fixes by Johannes that I sent a few minutes ago.
>
> I also removed the "bump API to 31" patch. I'll send a diff=C2=A0between
> this tag and the HEAD of the patches I sent in the 2017-04-19 series.
>
> Please let me know if there are any issues.
>
> Cheers,
> Luca.
>
>
> The following changes since commit 26ecfe01790381c4caa65ec9cce484c623f092=
c4:
>
> brcmfmac: only build fwsignal module for CONFIG_BRCMFMAC_PROTO_BCDC (20=
17-04-19 14:39:44 +0300)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git =
tags/iwlwifi-next-for-kalle-2017-04-19-2
>
> for you to fetch changes up to 718ceb22a0ccd0b3a02a4bd401d944a1eb16f3ce:
>
> iwlwifi: pcie: free context info in case of failures (2017-04-20 07:28:=
03 +0300)
>
> ----------------------------------------------------------------
> Another series of patches intended for v4.12. These are the changes:
>
> * Heavy work for the A000 device series;
> * Some cleanup patches;
> * A few fixes;
> * Dynamic SAR support;
> * Geographical SAR support;
> * Support a few new PCI device IDs;
>
> ----------------------------------------------------------------
Pulled, thanks.
--=20
Kalle Valo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-04-20 8:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-20 4:59 pull-request: iwlwifi-next 2017-04-19-2 Luca Coelho
2017-04-20 5:04 ` Luca Coelho
2017-04-20 6:55 ` Kalle Valo
2017-04-20 7:11 ` Luca Coelho
2017-04-20 7:20 ` Kalle Valo
2017-04-20 8:04 ` Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.