[PATCH 3.10 0/3] Enable 7000 device family on 3.10

[PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Emmanuel Grumbach]

This small patch series enables 7260 and 3160 devices on 3.10
kernel. Three patches are already in linux.git (3.11-rc1).
One patch is 3.10 specific and disables configuration that is not
supported in 3.10.

Emmanuel Grumbach (1):
  iwlwifi: mvm: support BSS only

Johannes Berg (2):
  iwlwifi: mvm: adjust firmware D3 configuration API
  iwlwifi: bump required firmware API version for 3160/7260

 drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h |    4 +++-
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c  |    4 ++--
 drivers/net/wireless/iwlwifi/mvm/mac80211.c  |   24 +-----------------------
 drivers/net/wireless/iwlwifi/pcie/7000.c     |   12 ++++++------
 4 files changed, 12 insertions(+), 32 deletions(-)

-- 
1.7.10.4

[PATCH 3.10 1/3] iwlwifi: mvm: support BSS only

[Emmanuel Grumbach]

Only BSS is supported in 3.10. In later kernels, other modes
have been fixed and tested to work.
This will at least allow user to use the regular wifi
functionality.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c |   36 +--------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index a5eb8c8..5b1b86f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -78,32 +78,6 @@
 #include "fw-api-scan.h"
 #include "iwl-phy-db.h"
 
-static const struct ieee80211_iface_limit iwl_mvm_limits[] = {
-	{
-		.max = 1,
-		.types = BIT(NL80211_IFTYPE_STATION) |
-			BIT(NL80211_IFTYPE_AP),
-	},
-	{
-		.max = 1,
-		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
-			BIT(NL80211_IFTYPE_P2P_GO),
-	},
-	{
-		.max = 1,
-		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),
-	},
-};
-
-static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
-	{
-		.num_different_channels = 1,
-		.max_interfaces = 3,
-		.limits = iwl_mvm_limits,
-		.n_limits = ARRAY_SIZE(iwl_mvm_limits),
-	},
-};
-
 #ifdef CONFIG_PM_SLEEP
 static const struct nl80211_wowlan_tcp_data_token_feature
 iwl_mvm_wowlan_tcp_token_feature = {
@@ -160,20 +134,12 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 	hw->vif_data_size = sizeof(struct iwl_mvm_vif);
 	hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt);
 
-	hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
-		BIT(NL80211_IFTYPE_P2P_CLIENT) |
-		BIT(NL80211_IFTYPE_AP) |
-		BIT(NL80211_IFTYPE_P2P_GO) |
-		BIT(NL80211_IFTYPE_P2P_DEVICE);
+	hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
 
 	hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
 			    WIPHY_FLAG_DISABLE_BEACON_HINTS |
 			    WIPHY_FLAG_IBSS_RSN;
 
-	hw->wiphy->iface_combinations = iwl_mvm_iface_combinations;
-	hw->wiphy->n_iface_combinations =
-		ARRAY_SIZE(iwl_mvm_iface_combinations);
-
 	hw->wiphy->max_remain_on_channel_duration = 10000;
 	hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
 
-- 
1.7.10.4

[PATCH 3.10 2/3] iwlwifi: mvm: adjust firmware D3 configuration API

[Emmanuel Grumbach]

From: Johannes Berg <johannes.berg@intel.com>

commit dfcb4c3aacedee6838e436fb575b31e138505203 upstream.

The D3 firmware API changed to include a new field, adjust
the driver to it to avoid getting an NMI when configuring.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
index 51e015d..6f8b2c1 100644
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
@@ -75,13 +75,15 @@ enum iwl_d3_wakeup_flags {
  * struct iwl_d3_manager_config - D3 manager configuration command
  * @min_sleep_time: minimum sleep time (in usec)
  * @wakeup_flags: wakeup flags, see &enum iwl_d3_wakeup_flags
+ * @wakeup_host_timer: force wakeup after this many seconds
  *
  * The structure is used for the D3_CONFIG_CMD command.
  */
 struct iwl_d3_manager_config {
 	__le32 min_sleep_time;
 	__le32 wakeup_flags;
-} __packed; /* D3_MANAGER_CONFIG_CMD_S_VER_3 */
+	__le32 wakeup_host_timer;
+} __packed; /* D3_MANAGER_CONFIG_CMD_S_VER_4 */
 
 
 /* TODO: OFFLOADS_QUERY_API_S_VER_1 */
-- 
1.7.10.4

[PATCH 3.10 3/3] iwlwifi: bump required firmware API version for 3160/7260

[Emmanuel Grumbach]

From: Johannes Berg <johannes.berg@intel.com>

commit a2d0909a687b4d250cc2b7481072e361678745ba upstream.

As the firmware API has changed significantly and we don't
have support code for the old APIs, bump the version to be
able to release the version 7 API firmware.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/net/wireless/iwlwifi/iwl-7000.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
index 50263e8..dc94d44 100644
--- a/drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
@@ -67,16 +67,16 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL7260_UCODE_API_MAX	6
-#define IWL3160_UCODE_API_MAX	6
+#define IWL7260_UCODE_API_MAX	7
+#define IWL3160_UCODE_API_MAX	7
 
 /* Oldest version we won't warn about */
-#define IWL7260_UCODE_API_OK	6
-#define IWL3160_UCODE_API_OK	6
+#define IWL7260_UCODE_API_OK	7
+#define IWL3160_UCODE_API_OK	7
 
 /* Lowest firmware API version supported */
-#define IWL7260_UCODE_API_MIN	6
-#define IWL3160_UCODE_API_MIN	6
+#define IWL7260_UCODE_API_MIN	7
+#define IWL3160_UCODE_API_MIN	7
 
 /* NVM versions */
 #define IWL7260_NVM_VERSION		0x0a1d
-- 
1.7.10.4

Re: [PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Greg KH]

On Mon, Jul 15, 2013 at 02:44:57PM +0300, Emmanuel Grumbach wrote:
> This small patch series enables 7260 and 3160 devices on 3.10
> kernel. Three patches are already in linux.git (3.11-rc1).
> One patch is 3.10 specific and disables configuration that is not
> supported in 3.10.

I need the git commit id of these patches in Linus's tree before I can
apply them.  Please resend them with that information.

thanks,

greg k-h

Re: [PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Johannes Berg]

[Emmanuel is on vacation, I'll cover for him]

On Fri, 2013-08-02 at 17:02 +0800, Greg KH wrote:
> On Mon, Jul 15, 2013 at 02:44:57PM +0300, Emmanuel Grumbach wrote:
> > This small patch series enables 7260 and 3160 devices on 3.10
> > kernel. Three patches are already in linux.git (3.11-rc1).
> > One patch is 3.10 specific and disables configuration that is not
> > supported in 3.10.
> 
> I need the git commit id of these patches in Linus's tree before I can
> apply them.  Please resend them with that information.

The second and third patch does have it, and the first patch is only
relevant for 3.10 since 3.11 will have more device types enabled, we
just didn't get all the code in. This seems to be described in the
commit log, do you want more details?

johannes

Re: [PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Greg KH]

On Tue, Aug 06, 2013 at 02:39:39PM +0200, Johannes Berg wrote:
> [Emmanuel is on vacation, I'll cover for him]
> 
> On Fri, 2013-08-02 at 17:02 +0800, Greg KH wrote:
> > On Mon, Jul 15, 2013 at 02:44:57PM +0300, Emmanuel Grumbach wrote:
> > > This small patch series enables 7260 and 3160 devices on 3.10
> > > kernel. Three patches are already in linux.git (3.11-rc1).
> > > One patch is 3.10 specific and disables configuration that is not
> > > supported in 3.10.
> > 
> > I need the git commit id of these patches in Linus's tree before I can
> > apply them.  Please resend them with that information.
> 
> The second and third patch does have it, and the first patch is only
> relevant for 3.10 since 3.11 will have more device types enabled, we
> just didn't get all the code in. This seems to be described in the
> commit log, do you want more details?

Yes, please resend them with those details.  For me to take a patch that
is not in Linus's tree is a big deal, I need a whole lot of
justification for it.

greg k-h

Re: [PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Emmanuel Grumbach]

On Tue, Aug 6, 2013 at 4:42 PM, Greg KH <greg@kroah.com> wrote:
> On Tue, Aug 06, 2013 at 02:39:39PM +0200, Johannes Berg wrote:
>> [Emmanuel is on vacation, I'll cover for him]
>>
>> On Fri, 2013-08-02 at 17:02 +0800, Greg KH wrote:
>> > On Mon, Jul 15, 2013 at 02:44:57PM +0300, Emmanuel Grumbach wrote:
>> > > This small patch series enables 7260 and 3160 devices on 3.10
>> > > kernel. Three patches are already in linux.git (3.11-rc1).
>> > > One patch is 3.10 specific and disables configuration that is not
>> > > supported in 3.10.
>> >
>> > I need the git commit id of these patches in Linus's tree before I can
>> > apply them.  Please resend them with that information.
>>
>> The second and third patch does have it, and the first patch is only
>> relevant for 3.10 since 3.11 will have more device types enabled, we
>> just didn't get all the code in. This seems to be described in the
>> commit log, do you want more details?
>
> Yes, please resend them with those details.  For me to take a patch that
> is not in Linus's tree is a big deal, I need a whole lot of
> justification for it.
>

Just got back. Sorry for the delay.
I guess I will just drop that patch that is not in Linus's tree.
This patch disables a feature that is not likely to be used but we
*know* it is buggy.
So people who want more than just associating to their router will see
a bug in 3.10.
I guess we can leave with that since I was suggesting to disable the
feature anyway.

So - do you want to resend, or you can apply the 2 patches I sent as is?

Re: [PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Greg KH]

On Tue, Aug 20, 2013 at 11:22:21PM +0300, Emmanuel Grumbach wrote:
> On Tue, Aug 6, 2013 at 4:42 PM, Greg KH <greg@kroah.com> wrote:
> > On Tue, Aug 06, 2013 at 02:39:39PM +0200, Johannes Berg wrote:
> >> [Emmanuel is on vacation, I'll cover for him]
> >>
> >> On Fri, 2013-08-02 at 17:02 +0800, Greg KH wrote:
> >> > On Mon, Jul 15, 2013 at 02:44:57PM +0300, Emmanuel Grumbach wrote:
> >> > > This small patch series enables 7260 and 3160 devices on 3.10
> >> > > kernel. Three patches are already in linux.git (3.11-rc1).
> >> > > One patch is 3.10 specific and disables configuration that is not
> >> > > supported in 3.10.
> >> >
> >> > I need the git commit id of these patches in Linus's tree before I can
> >> > apply them.  Please resend them with that information.
> >>
> >> The second and third patch does have it, and the first patch is only
> >> relevant for 3.10 since 3.11 will have more device types enabled, we
> >> just didn't get all the code in. This seems to be described in the
> >> commit log, do you want more details?
> >
> > Yes, please resend them with those details.  For me to take a patch that
> > is not in Linus's tree is a big deal, I need a whole lot of
> > justification for it.
> >
> 
> Just got back. Sorry for the delay.
> I guess I will just drop that patch that is not in Linus's tree.
> This patch disables a feature that is not likely to be used but we
> *know* it is buggy.
> So people who want more than just associating to their router will see
> a bug in 3.10.
> I guess we can leave with that since I was suggesting to disable the
> feature anyway.

Why would this patch not go to Linus's tree?  If it's broken, fix it,
and I can take the backported patch into the 3.10 tree.

> So - do you want to resend, or you can apply the 2 patches I sent as is?

Please resend.

thanks,

greg k-h

RE: [PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Grumbach, Emmanuel]

> On Tue, Aug 20, 2013 at 11:22:21PM +0300, Emmanuel Grumbach wrote:
> > On Tue, Aug 6, 2013 at 4:42 PM, Greg KH <greg@kroah.com> wrote:
> > > On Tue, Aug 06, 2013 at 02:39:39PM +0200, Johannes Berg wrote:
> > >> [Emmanuel is on vacation, I'll cover for him]
> > >>
> > >> On Fri, 2013-08-02 at 17:02 +0800, Greg KH wrote:
> > >> > On Mon, Jul 15, 2013 at 02:44:57PM +0300, Emmanuel Grumbach
> wrote:
> > >> > > This small patch series enables 7260 and 3160 devices on 3.10
> > >> > > kernel. Three patches are already in linux.git (3.11-rc1).
> > >> > > One patch is 3.10 specific and disables configuration that is
> > >> > > not supported in 3.10.
> > >> >
> > >> > I need the git commit id of these patches in Linus's tree before
> > >> > I can apply them.  Please resend them with that information.
> > >>
> > >> The second and third patch does have it, and the first patch is
> > >> only relevant for 3.10 since 3.11 will have more device types
> > >> enabled, we just didn't get all the code in. This seems to be
> > >> described in the commit log, do you want more details?
> > >
> > > Yes, please resend them with those details.  For me to take a patch
> > > that is not in Linus's tree is a big deal, I need a whole lot of
> > > justification for it.
> > >
> >
> > Just got back. Sorry for the delay.
> > I guess I will just drop that patch that is not in Linus's tree.
> > This patch disables a feature that is not likely to be used but we
> > *know* it is buggy.
> > So people who want more than just associating to their router will see
> > a bug in 3.10.
> > I guess we can leave with that since I was suggesting to disable the
> > feature anyway.
> 
> Why would this patch not go to Linus's tree?  If it's broken, fix it, and I can
> take the backported patch into the 3.10 tree.

It is actually a few patches and they are already in Linus's tree.
Sending them to you.

> 
> > So - do you want to resend, or you can apply the 2 patches I sent as is?
> 
> Please resend.
> 

On the way.

[PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Emmanuel Grumbach]

This small patch series enables 7260 and 3160 devices on 3.10
kernel. Three patches are already in linux.git (3.11-rc1).
One patch is 3.10 specific and disables configuration that is not
supported in 3.10.

Emmanuel Grumbach (1):
  iwlwifi: mvm: support BSS only

Johannes Berg (2):
  iwlwifi: mvm: adjust firmware D3 configuration API
  iwlwifi: bump required firmware API version for 3160/7260

 drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h |    4 +++-
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c  |    4 ++--
 drivers/net/wireless/iwlwifi/mvm/mac80211.c  |   24 +-----------------------
 drivers/net/wireless/iwlwifi/pcie/7000.c     |   12 ++++++------
 4 files changed, 12 insertions(+), 32 deletions(-)

-- 
1.7.10.4

[PATCH 3.10 0/3] Enable 7000 device family on 3.10

[Emmanuel Grumbach]

This small patch series enables 7260 and 3160 devices on 3.10
kernel. Three patches are already in linux.git (3.11-rc1).
One patch is 3.10 specific and disables configuration that is not
supported in 3.10.

Emmanuel Grumbach (1):
  iwlwifi: mvm: support BSS only

Johannes Berg (2):
  iwlwifi: mvm: adjust firmware D3 configuration API
  iwlwifi: bump required firmware API version for 3160/7260

 drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h |    4 +++-
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c  |    4 ++--
 drivers/net/wireless/iwlwifi/mvm/mac80211.c  |   24 +-----------------------
 drivers/net/wireless/iwlwifi/pcie/7000.c     |   12 ++++++------
 4 files changed, 12 insertions(+), 32 deletions(-)

-- 
1.7.10.4