linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1633 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

between commit:

  3d206e6899a0 ("iwlwifi: fw api: support new API for scan config cmd")

from the wireless-drivers tree and commit:

  65b9425ce9aa ("iwlwifi: rx: use new api to get band from rx mpdu")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 5ca50f39a023,a25712cce4ab..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@@ -1405,12 -1409,12 +1409,18 @@@ static inline bool iwl_mvm_is_scan_ext_
  			  IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER);
  }
  
 +static inline bool iwl_mvm_is_reduced_config_scan_supported(struct iwl_mvm *mvm)
 +{
 +	return fw_has_api(&mvm->fw->ucode_capa,
 +			  IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG);
 +}
 +
+ static inline bool iwl_mvm_is_band_in_rx_supported(struct iwl_mvm *mvm)
+ {
+ 	return fw_has_api(&mvm->fw->ucode_capa,
+ 			   IWL_UCODE_TLV_API_BAND_IN_RX_DATA);
+ }
+ 
  static inline bool iwl_mvm_has_new_rx_stats_api(struct iwl_mvm *mvm)
  {
  	return fw_has_api(&mvm->fw->ucode_capa,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
>
> between commit:
>
>   3d206e6899a0 ("iwlwifi: fw api: support new API for scan config cmd")
>
> from the wireless-drivers tree and commit:
>
>   65b9425ce9aa ("iwlwifi: rx: use new api to get band from rx mpdu")
>
> from the wireless-drivers-next tree.

Thanks, the resolution looked simple enough so I'm not taking any extra
actions because of this (for example merging wireless-drivers to
wireless-drivers-next etc).

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Kalle Valo]

Luca Coelho <luca@coelho.fi> writes:

> On Tue, 2020-03-24 at 09:00 +0200, Kalle Valo wrote:
>> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>> 
>> > Today's linux-next merge of the wireless-drivers-next tree got a
>> > conflict in:
>> > 
>> >   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>> > 
>> > between commit:
>> > 
>> >   cf52c8a776d1 ("iwlwifi: pcie: add 0x2526/0x401* devices back to cfg detection")
>> > 
>> > from the wireless-drivers tree and commits:
>> > 
>> >   67eb556da609 ("iwlwifi: combine 9260 cfgs that only change names")
>> >   d6f2134a3831 ("iwlwifi: add mac/rf types and 160MHz to the device tables")
>> > 
>> > from the wireless-drivers-next tree.
>> > 
>> > I fixed it up (I am not sure wat to do with this, so I just dropped
>> > the former changes for now) and can carry the fix as necessary. This
>> > is now fixed as far as linux-next is concerned, but any non trivial
>> > conflicts should be mentioned to your upstream maintainer when your tree
>> > is submitted for merging.  You may also want to consider cooperating
>> > with the maintainer of the conflicting tree to minimise any particularly
>> > complex conflicts.
>> 
>> Thanks Stephen. Luca, how do you propose to fix this conflict?
>
> The resolution is correct.  Just drop the cf52c8a776d1 changes, since
> the list of specific subsytem device IDs are not necessary after
> d6f2134a3831 anymore.  The detection is based on other characteristics
> of the devices.

Thanks, I'll mention this in my pull request to Dave.

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luca Coelho]

On Tue, 2020-03-24 at 09:00 +0200, Kalle Valo wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > Today's linux-next merge of the wireless-drivers-next tree got a
> > conflict in:
> > 
> >   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> > 
> > between commit:
> > 
> >   cf52c8a776d1 ("iwlwifi: pcie: add 0x2526/0x401* devices back to cfg detection")
> > 
> > from the wireless-drivers tree and commits:
> > 
> >   67eb556da609 ("iwlwifi: combine 9260 cfgs that only change names")
> >   d6f2134a3831 ("iwlwifi: add mac/rf types and 160MHz to the device tables")
> > 
> > from the wireless-drivers-next tree.
> > 
> > I fixed it up (I am not sure wat to do with this, so I just dropped
> > the former changes for now) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> 
> Thanks Stephen. Luca, how do you propose to fix this conflict?

The resolution is correct.  Just drop the cf52c8a776d1 changes, since
the list of specific subsytem device IDs are not necessary after
d6f2134a3831 anymore.  The detection is based on other characteristics
of the devices.

Thanks!

--
Cheers,
Luca.

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>
> between commit:
>
>   cf52c8a776d1 ("iwlwifi: pcie: add 0x2526/0x401* devices back to cfg detection")
>
> from the wireless-drivers tree and commits:
>
>   67eb556da609 ("iwlwifi: combine 9260 cfgs that only change names")
>   d6f2134a3831 ("iwlwifi: add mac/rf types and 160MHz to the device tables")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (I am not sure wat to do with this, so I just dropped
> the former changes for now) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks Stephen. Luca, how do you propose to fix this conflict?

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 965 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/pcie/drv.c

between commit:

  cf52c8a776d1 ("iwlwifi: pcie: add 0x2526/0x401* devices back to cfg detection")

from the wireless-drivers tree and commits:

  67eb556da609 ("iwlwifi: combine 9260 cfgs that only change names")
  d6f2134a3831 ("iwlwifi: add mac/rf types and 160MHz to the device tables")

from the wireless-drivers-next tree.

I fixed it up (I am not sure wat to do with this, so I just dropped
the former changes for now) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luciano Coelho]

On Tue, 2019-04-30 at 14:08 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/fw/file.h
> 
> between commit:
> 
>   b35f63972c5c ("iwlwifi: dbg_ini: check debug TLV type explicitly")
> 
> from the wireless-drivers tree and commit:
> 
>   aee1b6385e29 ("iwlwifi: support fseq tlv and print fseq version")
> 
> from the wireless-drivers-next tree.
> 
> I fixed it up (the latter is a superset of the former) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging.  You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.

Thanks, Stephen!

Your resolution is correct, thanks.  I accidentally included the block
that was already in b35f63972c5c when I rebased aee1b6385e29, but it's
harmless (except for the minimal conflict it causes).

--
Cheers,
Luca.

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/fw/file.h

between commit:

  b35f63972c5c ("iwlwifi: dbg_ini: check debug TLV type explicitly")

from the wireless-drivers tree and commit:

  aee1b6385e29 ("iwlwifi: support fseq tlv and print fseq version")

from the wireless-drivers-next tree.

I fixed it up (the latter is a superset of the former) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/fw/file.h

between commit:

  b35f63972c5c ("iwlwifi: dbg_ini: check debug TLV type explicitly")

from the wireless-drivers tree and commit:

  aee1b6385e29 ("iwlwifi: support fseq tlv and print fseq version")

from the wireless-drivers-next tree.

I fixed it up (the latter is a superset of the former) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>
> between commits:
>
>   0d5bad14226a ("iwlwifi: rename structs to fit the new names")
>   972d8e137779 ("iwlwifi: add new 0x2723/0x2080 card for 22000")
>
> from the wireless-drivers tree and commit:
>
>   ef8a913766cd ("iwlwifi: remove misconfigured pci ids from 22260 series")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks, I'll let Dave know about this when he pulls w-d-next.

-- 
Kalle Valo

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Kalle Valo]

Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>
> between commits:
>
>   0d5bad14226a ("iwlwifi: rename structs to fit the new names")
>   972d8e137779 ("iwlwifi: add new 0x2723/0x2080 card for 22000")
>
> from the wireless-drivers tree and commit:
>
>   ef8a913766cd ("iwlwifi: remove misconfigured pci ids from 22260 series")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks, I'll let Dave know about this when he pulls w-d-next.

-- 
Kalle Valo

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the wireless-drivers-next tree got a conflict
> in:
>
>   drivers/net/wireless/intel/iwlwifi/iwl-trans.h
>
> between commit:
>
>   07d35b4270ef ("iwlwifi: use sync nmi in case of init flow failure")
>
> from the wireless-drivers tree and commit:
>
>   4b1831e48974 ("iwlwifi: dbg_ini: support HW error trigger")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks, I'll let Dave know about this when he pulls w-d-next.

-- 
Kalle Valo

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2512 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/pcie/drv.c

between commits:

  0d5bad14226a ("iwlwifi: rename structs to fit the new names")
  972d8e137779 ("iwlwifi: add new 0x2723/0x2080 card for 22000")

from the wireless-drivers tree and commit:

  ef8a913766cd ("iwlwifi: remove misconfigured pci ids from 22260 series")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 9f1af8da9dc1,0329b626ada6..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@@ -953,19 -953,15 +953,15 @@@ static const struct pci_device_id iwl_h
  	{IWL_PCI_DEVICE(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)},
  	{IWL_PCI_DEVICE(0xA0F0, 0x4070, iwl_ax101_cfg_qu_hr)},
  
 -	{IWL_PCI_DEVICE(0x2723, 0x0080, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x0084, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x0088, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x008C, iwl22260_2ax_cfg)},
 +	{IWL_PCI_DEVICE(0x2723, 0x0080, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x0084, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x0088, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x008C, iwl_ax200_cfg_cc)},
  	{IWL_PCI_DEVICE(0x2723, 0x1653, killer1650w_2ax_cfg)},
  	{IWL_PCI_DEVICE(0x2723, 0x1654, killer1650x_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x2080, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x4080, iwl22260_2ax_cfg)},
 -	{IWL_PCI_DEVICE(0x2723, 0x4088, iwl22260_2ax_cfg)},
 +	{IWL_PCI_DEVICE(0x2723, 0x2080, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x4080, iwl_ax200_cfg_cc)},
 +	{IWL_PCI_DEVICE(0x2723, 0x4088, iwl_ax200_cfg_cc)},
- 
- 	{IWL_PCI_DEVICE(0x1a56, 0x1653, killer1650w_2ax_cfg)},
- 	{IWL_PCI_DEVICE(0x1a56, 0x1654, killer1650x_2ax_cfg)},
- 
  	{IWL_PCI_DEVICE(0x2725, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},
  	{IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax210_2ax_cfg_so_hr_a0)},
  	{IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax210_2ax_cfg_so_hr_a0)},

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1352 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a conflict
in:

  drivers/net/wireless/intel/iwlwifi/iwl-trans.h

between commit:

  07d35b4270ef ("iwlwifi: use sync nmi in case of init flow failure")

from the wireless-drivers tree and commit:

  4b1831e48974 ("iwlwifi: dbg_ini: support HW error trigger")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index d8690acee40c,2235978adf70..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@@ -830,6 -831,8 +830,7 @@@ struct iwl_trans 
  	u32 lmac_error_event_table[2];
  	u32 umac_error_event_table;
  	unsigned int error_event_table_tlv_status;
 -	wait_queue_head_t fw_halt_waitq;
+ 	bool hw_error;
  
  	/* pointer to trans specific struct */
  	/*Ensure that this pointer will always be aligned to sizeof pointer */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luciano Coelho]

On Thu, 2018-04-26 at 13:33 +0300, Kalle Valo wrote:
> Luciano Coelho <luciano.coelho@intel.com> writes:
> 
> > On Thu, 2018-04-26 at 11:09 +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the wireless-drivers-next tree got a
> > > conflict in:
> > > 
> > >   drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> > > 
> > > between commit:
> > > 
> > >   77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if
> > > needed")
> > > 
> > > from the wireless-drivers tree and commits:
> > > 
> > >   9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common
> > > files")
> > >   4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")
> > > 
> > > from the wireless-drivers-next tree.
> > > 
> > > I fixed it up (see below) and can carry the fix as necessary.
> > > This
> > > is now fixed as far as linux-next is concerned, but any non
> > > trivial
> > > conflicts should be mentioned to your upstream maintainer when
> > > your
> > > tree
> > > is submitted for merging.  You may also want to consider
> > > cooperating
> > > with the maintainer of the conflicting tree to minimise any
> > > particularly
> > > complex conflicts.
> > 
> > Thanks for resolving this, Stephen!
> > 
> > I checked your resolution and it's spot on.
> 
> I now merged w-d to w-d-next to fix this, please check:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-driver
> s-next.git/commit/?id=0ddcf3e76ae4d02918e609342a1020b50258fadd
> 
> I was not sure what to do with these includes so I left them in:
> 
> #include "fw/api/commands.h"
> #include "fw/api/cmdhdr.h"
> #include "fw/img.h"

That's fine, these are all in our internal tree too.

Thanks!

--
Cheers,
Luca.

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Kalle Valo]

Luciano Coelho <luciano.coelho@intel.com> writes:

> On Thu, 2018-04-26 at 11:09 +1000, Stephen Rothwell wrote:
>> Hi all,
>> 
>> Today's linux-next merge of the wireless-drivers-next tree got a
>> conflict in:
>> 
>>   drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
>> 
>> between commit:
>> 
>>   77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")
>> 
>> from the wireless-drivers tree and commits:
>> 
>>   9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common
>> files")
>>   4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")
>> 
>> from the wireless-drivers-next tree.
>> 
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your
>> tree
>> is submitted for merging.  You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any
>> particularly
>> complex conflicts.
>
> Thanks for resolving this, Stephen!
>
> I checked your resolution and it's spot on.

I now merged w-d to w-d-next to fix this, please check:

https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=0ddcf3e76ae4d02918e609342a1020b50258fadd

I was not sure what to do with these includes so I left them in:

#include "fw/api/commands.h"
#include "fw/api/cmdhdr.h"
#include "fw/img.h"

-- 
Kalle Valo

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luciano Coelho]

On Thu, 2018-04-26 at 11:09 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> 
> between commit:
> 
>   77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")
> 
> from the wireless-drivers tree and commits:
> 
>   9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common
> files")
>   4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")
> 
> from the wireless-drivers-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your
> tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any
> particularly
> complex conflicts.

Thanks for resolving this, Stephen!

I checked your resolution and it's spot on.

--
Cheers,
Luca.

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luciano Coelho]

On Thu, 2018-04-26 at 11:09 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> 
> between commit:
> 
>   77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")
> 
> from the wireless-drivers tree and commits:
> 
>   9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common
> files")
>   4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")
> 
> from the wireless-drivers-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your
> tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any
> particularly
> complex conflicts.

Thanks for resolving this, Stephen!

I checked your resolution and it's spot on.

--
Cheers,
Luca.

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 11178 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

between commit:

  77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")

from the wireless-drivers tree and commits:

  9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common files")
  4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index ca0174680af9,6d33c14579d9..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@@ -978,42 -943,302 +990,333 @@@ iwl_parse_nvm_mcc_info(struct device *d
  	}
  
  	regd->n_reg_rules = valid_rules;
 +	regd->n_wmm_rules = n_wmms;
  
 -	/* set alpha2 from FW. */
 -	regd->alpha2[0] = fw_mcc >> 8;
 -	regd->alpha2[1] = fw_mcc & 0xff;
 +	/*
 +	 * Narrow down regdom for unused regulatory rules to prevent hole
 +	 * between reg rules to wmm rules.
 +	 */
 +	regd_to_copy = sizeof(struct ieee80211_regdomain) +
 +		valid_rules * sizeof(struct ieee80211_reg_rule);
 +
 +	wmms_to_copy = sizeof(struct ieee80211_wmm_rule) * n_wmms;
 +
 +	copy_rd = kzalloc(regd_to_copy + wmms_to_copy, GFP_KERNEL);
 +	if (!copy_rd) {
 +		copy_rd = ERR_PTR(-ENOMEM);
 +		goto out;
 +	}
 +
 +	memcpy(copy_rd, regd, regd_to_copy);
 +	memcpy((u8 *)copy_rd + regd_to_copy, (u8 *)regd + size_of_regd,
 +	       wmms_to_copy);
 +
 +	d_wmm = (struct ieee80211_wmm_rule *)((u8 *)copy_rd + regd_to_copy);
 +	s_wmm = (struct ieee80211_wmm_rule *)((u8 *)regd + size_of_regd);
 +
 +	for (i = 0; i < regd->n_reg_rules; i++) {
 +		if (!regd->reg_rules[i].wmm_rule)
 +			continue;
 +
 +		copy_rd->reg_rules[i].wmm_rule = d_wmm +
 +			(regd->reg_rules[i].wmm_rule - s_wmm) /
 +			sizeof(struct ieee80211_wmm_rule);
 +	}
  
 -	return regd;
 +out:
 +	kfree(regdb_ptrs);
 +	kfree(regd);
 +	return copy_rd;
  }
  IWL_EXPORT_SYMBOL(iwl_parse_nvm_mcc_info);
+ 
+ #define IWL_MAX_NVM_SECTION_SIZE	0x1b58
+ #define IWL_MAX_EXT_NVM_SECTION_SIZE	0x1ffc
+ #define MAX_NVM_FILE_LEN	16384
+ 
+ void iwl_nvm_fixups(u32 hw_id, unsigned int section, u8 *data,
+ 		    unsigned int len)
+ {
+ #define IWL_4165_DEVICE_ID	0x5501
+ #define NVM_SKU_CAP_MIMO_DISABLE BIT(5)
+ 
+ 	if (section == NVM_SECTION_TYPE_PHY_SKU &&
+ 	    hw_id == IWL_4165_DEVICE_ID && data && len >= 5 &&
+ 	    (data[4] & NVM_SKU_CAP_MIMO_DISABLE))
+ 		/* OTP 0x52 bug work around: it's a 1x1 device */
+ 		data[3] = ANT_B | (ANT_B << 4);
+ }
+ IWL_EXPORT_SYMBOL(iwl_nvm_fixups);
+ 
+ /*
+  * Reads external NVM from a file into mvm->nvm_sections
+  *
+  * HOW TO CREATE THE NVM FILE FORMAT:
+  * ------------------------------
+  * 1. create hex file, format:
+  *      3800 -> header
+  *      0000 -> header
+  *      5a40 -> data
+  *
+  *   rev - 6 bit (word1)
+  *   len - 10 bit (word1)
+  *   id - 4 bit (word2)
+  *   rsv - 12 bit (word2)
+  *
+  * 2. flip 8bits with 8 bits per line to get the right NVM file format
+  *
+  * 3. create binary file from the hex file
+  *
+  * 4. save as "iNVM_xxx.bin" under /lib/firmware
+  */
+ int iwl_read_external_nvm(struct iwl_trans *trans,
+ 			  const char *nvm_file_name,
+ 			  struct iwl_nvm_section *nvm_sections)
+ {
+ 	int ret, section_size;
+ 	u16 section_id;
+ 	const struct firmware *fw_entry;
+ 	const struct {
+ 		__le16 word1;
+ 		__le16 word2;
+ 		u8 data[];
+ 	} *file_sec;
+ 	const u8 *eof;
+ 	u8 *temp;
+ 	int max_section_size;
+ 	const __le32 *dword_buff;
+ 
+ #define NVM_WORD1_LEN(x) (8 * (x & 0x03FF))
+ #define NVM_WORD2_ID(x) (x >> 12)
+ #define EXT_NVM_WORD2_LEN(x) (2 * (((x) & 0xFF) << 8 | (x) >> 8))
+ #define EXT_NVM_WORD1_ID(x) ((x) >> 4)
+ #define NVM_HEADER_0	(0x2A504C54)
+ #define NVM_HEADER_1	(0x4E564D2A)
+ #define NVM_HEADER_SIZE	(4 * sizeof(u32))
+ 
+ 	IWL_DEBUG_EEPROM(trans->dev, "Read from external NVM\n");
+ 
+ 	/* Maximal size depends on NVM version */
+ 	if (trans->cfg->nvm_type != IWL_NVM_EXT)
+ 		max_section_size = IWL_MAX_NVM_SECTION_SIZE;
+ 	else
+ 		max_section_size = IWL_MAX_EXT_NVM_SECTION_SIZE;
+ 
+ 	/*
+ 	 * Obtain NVM image via request_firmware. Since we already used
+ 	 * request_firmware_nowait() for the firmware binary load and only
+ 	 * get here after that we assume the NVM request can be satisfied
+ 	 * synchronously.
+ 	 */
+ 	ret = request_firmware(&fw_entry, nvm_file_name, trans->dev);
+ 	if (ret) {
+ 		IWL_ERR(trans, "ERROR: %s isn't available %d\n",
+ 			nvm_file_name, ret);
+ 		return ret;
+ 	}
+ 
+ 	IWL_INFO(trans, "Loaded NVM file %s (%zu bytes)\n",
+ 		 nvm_file_name, fw_entry->size);
+ 
+ 	if (fw_entry->size > MAX_NVM_FILE_LEN) {
+ 		IWL_ERR(trans, "NVM file too large\n");
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+ 
+ 	eof = fw_entry->data + fw_entry->size;
+ 	dword_buff = (__le32 *)fw_entry->data;
+ 
+ 	/* some NVM file will contain a header.
+ 	 * The header is identified by 2 dwords header as follow:
+ 	 * dword[0] = 0x2A504C54
+ 	 * dword[1] = 0x4E564D2A
+ 	 *
+ 	 * This header must be skipped when providing the NVM data to the FW.
+ 	 */
+ 	if (fw_entry->size > NVM_HEADER_SIZE &&
+ 	    dword_buff[0] == cpu_to_le32(NVM_HEADER_0) &&
+ 	    dword_buff[1] == cpu_to_le32(NVM_HEADER_1)) {
+ 		file_sec = (void *)(fw_entry->data + NVM_HEADER_SIZE);
+ 		IWL_INFO(trans, "NVM Version %08X\n", le32_to_cpu(dword_buff[2]));
+ 		IWL_INFO(trans, "NVM Manufacturing date %08X\n",
+ 			 le32_to_cpu(dword_buff[3]));
+ 
+ 		/* nvm file validation, dword_buff[2] holds the file version */
+ 		if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&
+ 		    CSR_HW_REV_STEP(trans->hw_rev) == SILICON_C_STEP &&
+ 		    le32_to_cpu(dword_buff[2]) < 0xE4A) {
+ 			ret = -EFAULT;
+ 			goto out;
+ 		}
+ 	} else {
+ 		file_sec = (void *)fw_entry->data;
+ 	}
+ 
+ 	while (true) {
+ 		if (file_sec->data > eof) {
+ 			IWL_ERR(trans,
+ 				"ERROR - NVM file too short for section header\n");
+ 			ret = -EINVAL;
+ 			break;
+ 		}
+ 
+ 		/* check for EOF marker */
+ 		if (!file_sec->word1 && !file_sec->word2) {
+ 			ret = 0;
+ 			break;
+ 		}
+ 
+ 		if (trans->cfg->nvm_type != IWL_NVM_EXT) {
+ 			section_size =
+ 				2 * NVM_WORD1_LEN(le16_to_cpu(file_sec->word1));
+ 			section_id = NVM_WORD2_ID(le16_to_cpu(file_sec->word2));
+ 		} else {
+ 			section_size = 2 * EXT_NVM_WORD2_LEN(
+ 						le16_to_cpu(file_sec->word2));
+ 			section_id = EXT_NVM_WORD1_ID(
+ 						le16_to_cpu(file_sec->word1));
+ 		}
+ 
+ 		if (section_size > max_section_size) {
+ 			IWL_ERR(trans, "ERROR - section too large (%d)\n",
+ 				section_size);
+ 			ret = -EINVAL;
+ 			break;
+ 		}
+ 
+ 		if (!section_size) {
+ 			IWL_ERR(trans, "ERROR - section empty\n");
+ 			ret = -EINVAL;
+ 			break;
+ 		}
+ 
+ 		if (file_sec->data + section_size > eof) {
+ 			IWL_ERR(trans,
+ 				"ERROR - NVM file too short for section (%d bytes)\n",
+ 				section_size);
+ 			ret = -EINVAL;
+ 			break;
+ 		}
+ 
+ 		if (WARN(section_id >= NVM_MAX_NUM_SECTIONS,
+ 			 "Invalid NVM section ID %d\n", section_id)) {
+ 			ret = -EINVAL;
+ 			break;
+ 		}
+ 
+ 		temp = kmemdup(file_sec->data, section_size, GFP_KERNEL);
+ 		if (!temp) {
+ 			ret = -ENOMEM;
+ 			break;
+ 		}
+ 
+ 		iwl_nvm_fixups(trans->hw_id, section_id, temp, section_size);
+ 
+ 		kfree(nvm_sections[section_id].data);
+ 		nvm_sections[section_id].data = temp;
+ 		nvm_sections[section_id].length = section_size;
+ 
+ 		/* advance to the next section */
+ 		file_sec = (void *)(file_sec->data + section_size);
+ 	}
+ out:
+ 	release_firmware(fw_entry);
+ 	return ret;
+ }
+ IWL_EXPORT_SYMBOL(iwl_read_external_nvm);
+ 
+ struct iwl_nvm_data *iwl_get_nvm(struct iwl_trans *trans,
+ 				 const struct iwl_fw *fw)
+ {
+ 	struct iwl_nvm_get_info cmd = {};
+ 	struct iwl_nvm_get_info_rsp *rsp;
+ 	struct iwl_nvm_data *nvm;
+ 	struct iwl_host_cmd hcmd = {
+ 		.flags = CMD_WANT_SKB | CMD_SEND_IN_RFKILL,
+ 		.data = { &cmd, },
+ 		.len = { sizeof(cmd) },
+ 		.id = WIDE_ID(REGULATORY_AND_NVM_GROUP, NVM_GET_INFO)
+ 	};
+ 	int  ret;
+ 	bool lar_fw_supported = !iwlwifi_mod_params.lar_disable &&
+ 				fw_has_capa(&fw->ucode_capa,
+ 					    IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
+ 	u32 mac_flags;
+ 	u32 sbands_flags = 0;
+ 
+ 	ret = iwl_trans_send_cmd(trans, &hcmd);
+ 	if (ret)
+ 		return ERR_PTR(ret);
+ 
+ 	if (WARN(iwl_rx_packet_payload_len(hcmd.resp_pkt) != sizeof(*rsp),
+ 		 "Invalid payload len in NVM response from FW %d",
+ 		 iwl_rx_packet_payload_len(hcmd.resp_pkt))) {
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+ 
+ 	rsp = (void *)hcmd.resp_pkt->data;
+ 	if (le32_to_cpu(rsp->general.flags) & NVM_GENERAL_FLAGS_EMPTY_OTP)
+ 		IWL_INFO(trans, "OTP is empty\n");
+ 
+ 	nvm = kzalloc(sizeof(*nvm) +
+ 		      sizeof(struct ieee80211_channel) * IWL_NUM_CHANNELS,
+ 		      GFP_KERNEL);
+ 	if (!nvm) {
+ 		ret = -ENOMEM;
+ 		goto out;
+ 	}
+ 
+ 	iwl_set_hw_address_from_csr(trans, nvm);
+ 	/* TODO: if platform NVM has MAC address - override it here */
+ 
+ 	if (!is_valid_ether_addr(nvm->hw_addr)) {
+ 		IWL_ERR(trans, "no valid mac address was found\n");
+ 		ret = -EINVAL;
+ 		goto err_free;
+ 	}
+ 
+ 	IWL_INFO(trans, "base HW address: %pM\n", nvm->hw_addr);
+ 
+ 	/* Initialize general data */
+ 	nvm->nvm_version = le16_to_cpu(rsp->general.nvm_version);
+ 
+ 	/* Initialize MAC sku data */
+ 	mac_flags = le32_to_cpu(rsp->mac_sku.mac_sku_flags);
+ 	nvm->sku_cap_11ac_enable =
+ 		!!(mac_flags & NVM_MAC_SKU_FLAGS_802_11AC_ENABLED);
+ 	nvm->sku_cap_11n_enable =
+ 		!!(mac_flags & NVM_MAC_SKU_FLAGS_802_11N_ENABLED);
+ 	nvm->sku_cap_band_24ghz_enable =
+ 		!!(mac_flags & NVM_MAC_SKU_FLAGS_BAND_2_4_ENABLED);
+ 	nvm->sku_cap_band_52ghz_enable =
+ 		!!(mac_flags & NVM_MAC_SKU_FLAGS_BAND_5_2_ENABLED);
+ 	nvm->sku_cap_mimo_disabled =
+ 		!!(mac_flags & NVM_MAC_SKU_FLAGS_MIMO_DISABLED);
+ 
+ 	/* Initialize PHY sku data */
+ 	nvm->valid_tx_ant = (u8)le32_to_cpu(rsp->phy_sku.tx_chains);
+ 	nvm->valid_rx_ant = (u8)le32_to_cpu(rsp->phy_sku.rx_chains);
+ 
+ 	if (le32_to_cpu(rsp->regulatory.lar_enabled) && lar_fw_supported) {
+ 		nvm->lar_enabled = true;
+ 		sbands_flags |= IWL_NVM_SBANDS_FLAGS_LAR;
+ 	}
+ 
+ 	iwl_init_sbands(trans->dev, trans->cfg, nvm,
+ 			rsp->regulatory.channel_profile,
+ 			nvm->valid_tx_ant & fw->valid_tx_ant,
+ 			nvm->valid_rx_ant & fw->valid_rx_ant,
+ 			sbands_flags);
+ 
+ 	iwl_free_resp(&hcmd);
+ 	return nvm;
+ 
+ err_free:
+ 	kfree(nvm);
+ out:
+ 	iwl_free_resp(&hcmd);
+ 	return ERR_PTR(ret);
+ }
+ IWL_EXPORT_SYMBOL(iwl_get_nvm);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/pcie/drv.c
>
> between commit:
>
>   567deca8e72d ("iwlwifi: add new cards for 9260 and 22000 series")
>
> from the wireless-drivers tree and commit:
>
>   2f7a3863191a ("iwlwifi: rename the temporary name of A000 to the official 22000")
>
> from the wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

The fix looks good, thanks! I'll try to resolve the conflict before I
send a wireless-drivers-next pull request to Dave.

-- 
Kalle Valo

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/pcie/drv.c

between commit:

  567deca8e72d ("iwlwifi: add new cards for 9260 and 22000 series")

from the wireless-drivers tree and commit:

  2f7a3863191a ("iwlwifi: rename the temporary name of A000 to the official 22000")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index ccd7c33c4c28,5ed89d7ac4b2..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@@ -652,20 -651,19 +652,20 @@@ static const struct pci_device_id iwl_h
  	{IWL_PCI_DEVICE(0xA370, 0x4034, iwl9560_2ac_cfg_soc)},
  	{IWL_PCI_DEVICE(0xA370, 0x40A4, iwl9462_2ac_cfg_soc)},
  
- /* a000 Series */
- 	{IWL_PCI_DEVICE(0x2720, 0x0A10, iwla000_2ac_cfg_hr_cdb)},
- 	{IWL_PCI_DEVICE(0x34F0, 0x0310, iwla000_2ac_cfg_jf)},
- 	{IWL_PCI_DEVICE(0x2720, 0x0000, iwla000_2ax_cfg_hr)},
- 	{IWL_PCI_DEVICE(0x34F0, 0x0070, iwla000_2ax_cfg_hr)},
- 	{IWL_PCI_DEVICE(0x2720, 0x0078, iwla000_2ax_cfg_hr)},
- 	{IWL_PCI_DEVICE(0x2720, 0x0070, iwla000_2ac_cfg_hr_cdb)},
- 	{IWL_PCI_DEVICE(0x2720, 0x0030, iwla000_2ac_cfg_hr_cdb)},
- 	{IWL_PCI_DEVICE(0x2720, 0x1080, iwla000_2ax_cfg_hr)},
- 	{IWL_PCI_DEVICE(0x2720, 0x0090, iwla000_2ac_cfg_hr_cdb)},
- 	{IWL_PCI_DEVICE(0x2720, 0x0310, iwla000_2ac_cfg_hr_cdb)},
- 	{IWL_PCI_DEVICE(0x40C0, 0x0000, iwla000_2ax_cfg_hr)},
- 	{IWL_PCI_DEVICE(0x40C0, 0x0A10, iwla000_2ax_cfg_hr)},
- 	{IWL_PCI_DEVICE(0xA0F0, 0x0000, iwla000_2ax_cfg_hr)},
+ /* 22000 Series */
+ 	{IWL_PCI_DEVICE(0x2720, 0x0A10, iwl22000_2ac_cfg_hr_cdb)},
+ 	{IWL_PCI_DEVICE(0x34F0, 0x0310, iwl22000_2ac_cfg_jf)},
+ 	{IWL_PCI_DEVICE(0x2720, 0x0000, iwl22000_2ax_cfg_hr)},
+ 	{IWL_PCI_DEVICE(0x34F0, 0x0070, iwl22000_2ax_cfg_hr)},
+ 	{IWL_PCI_DEVICE(0x2720, 0x0078, iwl22000_2ax_cfg_hr)},
+ 	{IWL_PCI_DEVICE(0x2720, 0x0070, iwl22000_2ac_cfg_hr_cdb)},
+ 	{IWL_PCI_DEVICE(0x2720, 0x0030, iwl22000_2ac_cfg_hr_cdb)},
+ 	{IWL_PCI_DEVICE(0x2720, 0x1080, iwl22000_2ax_cfg_hr)},
+ 	{IWL_PCI_DEVICE(0x2720, 0x0090, iwl22000_2ac_cfg_hr_cdb)},
+ 	{IWL_PCI_DEVICE(0x2720, 0x0310, iwl22000_2ac_cfg_hr_cdb)},
+ 	{IWL_PCI_DEVICE(0x40C0, 0x0000, iwl22000_2ax_cfg_hr)},
+ 	{IWL_PCI_DEVICE(0x40C0, 0x0A10, iwl22000_2ax_cfg_hr)},
++	{IWL_PCI_DEVICE(0xA0F0, 0x0000, iwl22000_2ax_cfg_hr)},
  
  #endif /* CONFIG_IWLMVM */
  

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

On Thu, Oct 12, 2017 at 09:29:39PM +0300, Luca Coelho wrote:
> On Thu, 2017-10-12 at 18:25 +0100, Mark Brown wrote:

> > @@@ -382,7 -371,9 +384,8 @@@ struct iwl_cfg 
> >   	    use_tfh:1,
> >   	    gen2:1,
> >   	    cdb:1,
> >  -	    ext_nvm:1,

> nvm_type seems to be missing from here?

Oh bother.  Either my error or git's...  but it does seem to be
building so I'm a bit confused about what's going on there.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luca Coelho]

On Thu, 2017-10-12 at 19:59 +0100, Mark Brown wrote:
> On Thu, Oct 12, 2017 at 09:50:51PM +0300, Luca Coelho wrote:
> > On Thu, 2017-10-12 at 19:35 +0100, Mark Brown wrote:
> > > With trees like this that don't coordinate with their fixes
> > > branch
> > > there
> > > are frequently multiple conflicts introduced so I generally
> > > report
> > > things file by file without even looking at the new ones.
> > Sorry for the trouble.  But how do you suggest that we "coordinate
> > our
> > fixes branch"? Merge fixes into the main tree?
> 
> That'd be easiest for me!  It's not of necessity a problem if the
> conflicts are easy enough to resolve if you just let things get
> merged
> in -next, it's just more an observation that that's a thing that
> happens
> and that this is how I cope with it.  Stephen may do things a bit
> differently.

Cool, I'll discuss this with Kalle and make sure I note these potential
conflicts early enough so everyone is aware when they're coming.

Thanks for taking over while Stephen is away! I really appreciate it,
since linux-next is a very important part of our process. :)

--
Luca.

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 744 bytes --]

On Thu, Oct 12, 2017 at 09:50:51PM +0300, Luca Coelho wrote:
> On Thu, 2017-10-12 at 19:35 +0100, Mark Brown wrote:

> > With trees like this that don't coordinate with their fixes branch
> > there
> > are frequently multiple conflicts introduced so I generally report
> > things file by file without even looking at the new ones.

> Sorry for the trouble.  But how do you suggest that we "coordinate our
> fixes branch"? Merge fixes into the main tree?

That'd be easiest for me!  It's not of necessity a problem if the
conflicts are easy enough to resolve if you just let things get merged
in -next, it's just more an observation that that's a thing that happens
and that this is how I cope with it.  Stephen may do things a bit
differently.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luca Coelho]

On Thu, 2017-10-12 at 19:35 +0100, Mark Brown wrote:
> On Thu, Oct 12, 2017 at 09:27:46PM +0300, Luciano Coelho wrote:
> > On Thu, 2017-10-12 at 19:21 +0100, Mark Brown wrote:
> > > I may have confused the trees when I was pasting things in, the
> > > commits
> > > are filled in by hand.
> > 
> > Ah, okay.  But still, if the same patches conflicted twice, why
> > wasn't
> > there only one occurrence with both conflicts at once?
> 
> With trees like this that don't coordinate with their fixes branch
> there
> are frequently multiple conflicts introduced so I generally report
> things file by file without even looking at the new ones.

Sorry for the trouble.  But how do you suggest that we "coordinate our
fixes branch"? Merge fixes into the main tree?

--
Luca.

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 557 bytes --]

On Thu, Oct 12, 2017 at 09:27:46PM +0300, Luciano Coelho wrote:
> On Thu, 2017-10-12 at 19:21 +0100, Mark Brown wrote:

> > I may have confused the trees when I was pasting things in, the
> > commits
> > are filled in by hand.

> Ah, okay.  But still, if the same patches conflicted twice, why wasn't
> there only one occurrence with both conflicts at once?

With trees like this that don't coordinate with their fixes branch there
are frequently multiple conflicts introduced so I generally report
things file by file without even looking at the new ones.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luca Coelho]

On Thu, 2017-10-12 at 18:25 +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/iwl-config.h
> 
> between commit:
> 
>    dd05f9aab4426f ("iwlwifi: pcie: dynamic Tx command queue size")
> 
> from the wireless-drivers tree and commit:
> 
>    44fd09dad5d2b7 ("iwlwifi: nvm: set the correct offsets to 3168
> series")
> 
> from the wireless-drivers-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your
> tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any
> particularly
> complex conflicts.
> 
> diff --cc drivers/net/wireless/intel/iwlwifi/iwl-config.h
> index 71cb1ecde0f7,b9f3b350fe34..000000000000
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
> @@@ -332,7 -320,9 +332,9 @@@ struct iwl_pwr_tx_backoff 
>    * @integrated: discrete or integrated
>    * @gen2: a000 and on transport operation
>    * @cdb: CDB support
>  - * @ext_nvm: extended NVM format
>  + * @nvm_type: see &enum iwl_nvm_type
> +  * @tx_cmd_queue_size: size of the cmd queue. If zero, use the same
> value as
> +  *	the regular queues
>    *
>    * We enable the driver to be backward compatible wrt. hardware
> features.
>    * API differences in uCode shouldn't be handled here but through
> TLVs
> @@@ -382,7 -371,9 +384,8 @@@ struct iwl_cfg 
>   	    use_tfh:1,
>   	    gen2:1,
>   	    cdb:1,
>  -	    ext_nvm:1,

nvm_type seems to be missing from here?

>   	    dbgc_supported:1;
> + 	u16 tx_cmd_queue_size;
>   	u8 valid_tx_ant;
>   	u8 valid_rx_ant;
>   	u8 non_shared_ant;

--
Luca.

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luciano Coelho]

On Thu, 2017-10-12 at 19:21 +0100, Mark Brown wrote:
> On Thu, Oct 12, 2017 at 09:16:36PM +0300, Luciano Coelho wrote:
> 
> > This is weird... The previous conflict was the exact opposite of
> > this. 
> > 44fd09 came in from wireless-drivers and dd05f9 came from wireless-
> > drivers-next.  I don't understand why it is saying the opposite
> > here...
> 
> I may have confused the trees when I was pasting things in, the
> commits
> are filled in by hand.

Ah, okay.  But still, if the same patches conflicted twice, why wasn't
there only one occurrence with both conflicts at once?

--
Luca.

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

On Thu, Oct 12, 2017 at 09:16:36PM +0300, Luciano Coelho wrote:

> This is weird... The previous conflict was the exact opposite of this. 
> 44fd09 came in from wireless-drivers and dd05f9 came from wireless-
> drivers-next.  I don't understand why it is saying the opposite here...

I may have confused the trees when I was pasting things in, the commits
are filled in by hand.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Luciano Coelho]

On Thu, 2017-10-12 at 18:25 +0100, Mark Brown wrote:
> Hi all,

Hi Mark,


> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
> 
>   drivers/net/wireless/intel/iwlwifi/iwl-config.h
> 
> between commit:
> 
>    dd05f9aab4426f ("iwlwifi: pcie: dynamic Tx command queue size")
> 
> from the wireless-drivers tree and commit:
> 
>    44fd09dad5d2b7 ("iwlwifi: nvm: set the correct offsets to 3168
> series")
> 
> from the wireless-drivers-next tree.

This is weird... The previous conflict was the exact opposite of this. 
44fd09 came in from wireless-drivers and dd05f9 came from wireless-
drivers-next.  I don't understand why it is saying the opposite here...

--
Cheers,
Luca.

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1731 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/iwl-config.h

between commit:

   dd05f9aab4426f ("iwlwifi: pcie: dynamic Tx command queue size")

from the wireless-drivers tree and commit:

   44fd09dad5d2b7 ("iwlwifi: nvm: set the correct offsets to 3168 series")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 71cb1ecde0f7,b9f3b350fe34..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@@ -332,7 -320,9 +332,9 @@@ struct iwl_pwr_tx_backoff 
   * @integrated: discrete or integrated
   * @gen2: a000 and on transport operation
   * @cdb: CDB support
 - * @ext_nvm: extended NVM format
 + * @nvm_type: see &enum iwl_nvm_type
+  * @tx_cmd_queue_size: size of the cmd queue. If zero, use the same value as
+  *	the regular queues
   *
   * We enable the driver to be backward compatible wrt. hardware features.
   * API differences in uCode shouldn't be handled here but through TLVs
@@@ -382,7 -371,9 +384,8 @@@ struct iwl_cfg 
  	    use_tfh:1,
  	    gen2:1,
  	    cdb:1,
 -	    ext_nvm:1,
  	    dbgc_supported:1;
+ 	u16 tx_cmd_queue_size;
  	u8 valid_tx_ant;
  	u8 valid_rx_ant;
  	u8 non_shared_ant;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1996 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/cfg/a000.c

between commit:

  44fd09dad5d2b78ef ("iwlwifi: nvm: set the correct offsets to 3168 series")

from the wireless-drivers tree and commit:

   dd05f9aab4426ff1 ("iwlwifi: pcie: dynamic Tx command queue size")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/net/wireless/intel/iwlwifi/cfg/a000.c
index a440140ed8dd,076f8d6d1124..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
@@@ -133,17 -133,18 +133,18 @@@ static const struct iwl_ht_params iwl_a
  	.use_tfh = true,						\
  	.rf_id = true,							\
  	.gen2 = true,							\
 -	.ext_nvm = true,						\
 +	.nvm_type = IWL_NVM_EXT,					\
- 	.dbgc_supported = true
+ 	.dbgc_supported = true,						\
+ 	.tx_cmd_queue_size = 32
  
  const struct iwl_cfg iwla000_2ac_cfg_hr = {
- 		.name = "Intel(R) Dual Band Wireless AC a000",
- 		.fw_name_pre = IWL_A000_HR_FW_PRE,
- 		IWL_DEVICE_A000,
- 		.ht_params = &iwl_a000_ht_params,
- 		.nvm_ver = IWL_A000_NVM_VERSION,
- 		.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
- 		.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
+ 	.name = "Intel(R) Dual Band Wireless AC a000",
+ 	.fw_name_pre = IWL_A000_HR_FW_PRE,
+ 	IWL_DEVICE_A000,
+ 	.ht_params = &iwl_a000_ht_params,
+ 	.nvm_ver = IWL_A000_NVM_VERSION,
+ 	.nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
+ 	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
  };
  
  const struct iwl_cfg iwla000_2ac_cfg_hr_cdb = {

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2291 bytes --]

Hi all,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

between commit:

  44fd09dad5d2b78e ("iwlwifi: nvm: set the correct offsets to 3168 series")

from the wireless-drivers tree and commit:

  a2ff48af65ad661a ("iwlwifi: remove redundant reading from NVM file")

from the wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index c3a5d8ccc95e,d9a2ea9dd93f..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@@ -75,9 -75,10 +75,10 @@@
  #include "iwl-prph.h"
  #include "iwl-io.h"
  #include "iwl-csr.h"
+ #include "fw/acpi.h"
  
  /* NVM offsets (in words) definitions */
 -enum wkp_nvm_offsets {
 +enum nvm_offsets {
  	/* NVM HW-Section offset (in words) definitions */
  	SUBSYSTEM_ID = 0x0A,
  	HW_ADDR = 0x15,
@@@ -89,13 -90,6 +90,9 @@@
  	SKU = 2,
  	N_HW_ADDRS = 3,
  	NVM_CHANNELS = 0x1E0 - NVM_SW_SECTION,
 +
- 	/* NVM calibration section offset (in words) definitions */
- 	NVM_CALIB_SECTION = 0x2B8,
- 	XTAL_CALIB = 0x316 - NVM_CALIB_SECTION,
- 
 +	/* NVM REGULATORY -Section offset (in words) definitions */
 +	NVM_CHANNELS_SDP = 0,
  };
  
  enum ext_nvm_offsets {
@@@ -758,15 -745,8 +755,12 @@@ iwl_parse_nvm_data(struct iwl_trans *tr
  			kfree(data);
  			return NULL;
  		}
 +
 +		ch_section = cfg->nvm_type == IWL_NVM_SDP ?
 +			     &regulatory[NVM_CHANNELS_SDP] :
 +			     &nvm_sw[NVM_CHANNELS];
 +
- 		/* in family 8000 Xtal calibration values moved to OTP */
- 		data->xtal_calib[0] = *(nvm_calib + XTAL_CALIB);
- 		data->xtal_calib[1] = *(nvm_calib + XTAL_CALIB + 1);
  		lar_enabled = true;
 -		ch_section = &nvm_sw[NVM_CHANNELS];
  	} else {
  		u16 lar_offset = data->nvm_version < 0xE39 ?
  				 NVM_LAR_OFFSET_OLD :

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Geert Uytterhoeven]

On Mon, May 25, 2015 at 5:07 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in drivers/net/wireless/iwlwifi/Kconfig between commit
> ed65918735a5 ("iwlwifi: 7000: modify the firmware name for 3165") from
> the wireless-drivers tree and commit 87411456834a ("iwlwifi: clarify
> the device / firmware mapping in Kconfig") from the
> wireless-drivers-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>
> diff --cc drivers/net/wireless/iwlwifi/Kconfig
> index f89f446e5c8a,99f9760fc11e..000000000000
> --- a/drivers/net/wireless/iwlwifi/Kconfig
> +++ b/drivers/net/wireless/iwlwifi/Kconfig
> @@@ -21,7 -21,7 +21,8 @@@ config IWLWIF
>                 Intel 7260 Wi-Fi Adapter
>                 Intel 3160 Wi-Fi Adapter
>                 Intel 7265 Wi-Fi Adapter
>  +              Intel 3165 Wi-Fi Adapter
> +               Intel 8260 Wi-Fi Adapter

Sorting would be nice...

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 972 bytes --]

Hi Kalle,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in drivers/net/wireless/iwlwifi/Kconfig between commit
ed65918735a5 ("iwlwifi: 7000: modify the firmware name for 3165") from
the wireless-drivers tree and commit 87411456834a ("iwlwifi: clarify
the device / firmware mapping in Kconfig") from the
wireless-drivers-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/Kconfig
index f89f446e5c8a,99f9760fc11e..000000000000
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@@ -21,7 -21,7 +21,8 @@@ config IWLWIF
  		Intel 7260 Wi-Fi Adapter
  		Intel 3160 Wi-Fi Adapter
  		Intel 7265 Wi-Fi Adapter
 +		Intel 3165 Wi-Fi Adapter
+ 		Intel 8260 Wi-Fi Adapter
  
  
  	  This driver uses the kernel's mac80211 subsystem.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 606 bytes --]

Hi Kalle,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in drivers/net/wireless/iwlwifi/mvm/scan.c between commit
1f9c418fd94c ("iwlwifi: mvm: fix EBS on single scan") from the
wireless-drivers tree and commit a1ed4025765c ("iwlwifi: mvm: Configure
EBS scan ratio") from the wireless-drivers-next tree.

I fixed it up (the latter moved the code modified by the former, but
also seems to have included the fix from the former patch) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]