| Message ID | 1511505729-19082-1-git-send-email-acelan.kao@canonical.com |
|---|---|
| Headers | show |
| Series | Intel 9260/9462/9560 driver support | expand |
> On 24 Nov 2017, at 2:42 PM, AceLan Kao <acelan.kao@canonical.com> wrote: > Above commits have not been merged into iwlwifi-next yet, > but we need to verify the driver on our platform as soon as possible, > so merge it to linux-oem first, and will sutbmit SRU for artful later. The changes are massive so it’s definitely not suitable for Artful kernel. But I think it’s okay to put them linux-oem. Acked-By: Kai-Heng Feng <kai.heng.feng@canonical.com>
The last 3 patches are already in upstream:
commit dac4df1c5f2c34903f61b1bc4fc722e31b4199e7
Author: Luca Coelho <luciano.coelho@intel.com>
Date: Fri Nov 10 14:03:36 2017 +0200
iwlwifi: mvm: support version 7 of the SCAN_REQ_UMAC FW command
commit dbc89253a7e15f8f031fb1eeb956de91204655e3
Author: Luca Coelho <luciano.coelho@intel.com>
Date: Wed Nov 15 18:28:04 2017 +0200
iwlwifi: fix PCI IDs and configuration mapping for 9000 series
commit c2c48ddfc8b03b9ecb51d2832b586497b37531bc
Author: Thomas Backlund <tmb@mageia.org>
Date: Tue Nov 14 12:37:51 2017 +0200
iwlwifi: fix firmware names for 9000 and A000 series hw
The cherry-pick info should be in the patches.
Regards,
Aaron
On 11/24/2017 02:42 PM, AceLan Kao wrote:
> BugLink: http://bugs.launchpad.net/bugs/1734242
>
> Some new 9260/9462/9560 module doesn't work on artful kernel(v4.13)
> and require some other new commits
> They are
> https://marc.info/?l=linux-wireless&m=151076478931107&w=2
> https://marc.info/?l=linux-wireless&m=151082205418762&w=2
> https://marc.info/?l=linux-wireless&m=151082213518769&w=2
>
> Above commits have not been merged into iwlwifi-next yet,
> but we need to verify the driver on our platform as soon as possible,
> so merge it to linux-oem first, and will sutbmit SRU for artful later.
>
> Johannes Berg (3):
> iwlwifi: refactor out paging code
> iwlwifi: refactor shared mem parsing
> iwlwifi: reorganize firmware API
>
> Luca Coelho (2):
> iwlwifi: mvm: support version 7 of the SCAN_REQ_UMAC FW command
> iwlwifi: fix PCI IDs and configuration mapping for 9000 series
>
> Thomas Backlund (1):
> iwlwifi: fix firmware names for 9000 and A000 series hw
>
> drivers/net/wireless/intel/iwlwifi/Makefile | 1 +
> drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 73 +-
> drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 4 +-
> drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 190 ++
> .../net/wireless/intel/iwlwifi/fw/api/binding.h | 144 +
> .../intel/iwlwifi/fw/{api.h => api/cmdhdr.h} | 56 +-
> .../iwlwifi/{mvm/fw-api-coex.h => fw/api/coex.h} | 11 +-
> .../net/wireless/intel/iwlwifi/fw/api/commands.h | 657 +++++
> drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 192 ++
> .../net/wireless/intel/iwlwifi/fw/api/context.h | 94 +
> .../intel/iwlwifi/{mvm/fw-api-d3.h => fw/api/d3.h} | 11 +-
> .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 127 +
> drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 345 +++
> drivers/net/wireless/intel/iwlwifi/fw/api/filter.h | 183 ++
> .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 152 ++
> .../iwlwifi/{mvm/fw-api-mac.h => fw/api/mac.h} | 33 +-
> .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 378 +++
> .../net/wireless/intel/iwlwifi/fw/api/offload.h | 101 +
> drivers/net/wireless/intel/iwlwifi/fw/api/paging.h | 108 +
> .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 164 ++
> drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 258 ++
> .../iwlwifi/{mvm/fw-api-power.h => fw/api/power.h} | 13 +-
> .../intel/iwlwifi/{mvm/fw-api-rs.h => fw/api/rs.h} | 13 +-
> .../intel/iwlwifi/{mvm/fw-api-rx.h => fw/api/rx.h} | 31 +-
> .../iwlwifi/{mvm/fw-api-scan.h => fw/api/scan.h} | 70 +-
> drivers/net/wireless/intel/iwlwifi/fw/api/sf.h | 138 +
> .../iwlwifi/{mvm/fw-api-sta.h => fw/api/sta.h} | 15 +-
> .../iwlwifi/{mvm/fw-api-stats.h => fw/api/stats.h} | 13 +-
> drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h | 208 ++
> .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 386 +++
> .../iwlwifi/{mvm/fw-api-tof.h => fw/api/tof.h} | 9 +-
> .../intel/iwlwifi/{mvm/fw-api-tx.h => fw/api/tx.h} | 11 +-
> drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 156 ++
> drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 +
> drivers/net/wireless/intel/iwlwifi/fw/paging.c | 414 +++
> drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 119 +
> drivers/net/wireless/intel/iwlwifi/fw/smem.c | 152 ++
> drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 +
> drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 3 +-
> drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 2 +-
> .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 +-
> drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 2845 +-------------------
> drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 30 +-
> drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 435 +--
> drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 32 +-
> drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 +-
> drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +-
> drivers/net/wireless/intel/iwlwifi/mvm/power.c | 2 +-
> drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 88 +-
> drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 2 +-
> drivers/net/wireless/intel/iwlwifi/mvm/tof.h | 2 +-
> drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +-
> drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 2 +-
> drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 150 +-
> drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 2 +-
> drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 +-
> 56 files changed, 5114 insertions(+), 3535 deletions(-)
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/alive.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/binding.h
> rename drivers/net/wireless/intel/iwlwifi/fw/{api.h => api/cmdhdr.h} (83%)
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-coex.h => fw/api/coex.h} (96%)
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/config.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/context.h
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-d3.h => fw/api/d3.h} (98%)
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/debug.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/filter.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-mac.h => fw/api/mac.h} (93%)
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/offload.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/paging.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/phy.h
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-power.h => fw/api/power.h} (98%)
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-rs.h => fw/api/rs.h} (97%)
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-rx.h => fw/api/rx.h} (95%)
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-scan.h => fw/api/scan.h} (94%)
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/sf.h
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-sta.h => fw/api/sta.h} (98%)
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-stats.h => fw/api/stats.h} (97%)
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-tof.h => fw/api/tof.h} (98%)
> rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-tx.h => fw/api/tx.h} (99%)
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/txq.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/paging.c
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/runtime.h
> create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/smem.c
>
On 24.11.2017 16:44, Aaron Ma wrote: > The last 3 patches are already in upstream: > > commit dac4df1c5f2c34903f61b1bc4fc722e31b4199e7 > Author: Luca Coelho <luciano.coelho@intel.com> > Date: Fri Nov 10 14:03:36 2017 +0200 > > iwlwifi: mvm: support version 7 of the SCAN_REQ_UMAC FW command > > commit dbc89253a7e15f8f031fb1eeb956de91204655e3 > Author: Luca Coelho <luciano.coelho@intel.com> > Date: Wed Nov 15 18:28:04 2017 +0200 > > iwlwifi: fix PCI IDs and configuration mapping for 9000 series > > commit c2c48ddfc8b03b9ecb51d2832b586497b37531bc > Author: Thomas Backlund <tmb@mageia.org> > Date: Tue Nov 14 12:37:51 2017 +0200 > > iwlwifi: fix firmware names for 9000 and A000 series hw > > The cherry-pick info should be in the patches. I've done that and added these in -1009.10
BugLink: http://bugs.launchpad.net/bugs/1734242 Some new 9260/9462/9560 module doesn't work on artful kernel(v4.13) and require some other new commits They are https://marc.info/?l=linux-wireless&m=151076478931107&w=2 https://marc.info/?l=linux-wireless&m=151082205418762&w=2 https://marc.info/?l=linux-wireless&m=151082213518769&w=2 Above commits have not been merged into iwlwifi-next yet, but we need to verify the driver on our platform as soon as possible, so merge it to linux-oem first, and will sutbmit SRU for artful later. Johannes Berg (3): iwlwifi: refactor out paging code iwlwifi: refactor shared mem parsing iwlwifi: reorganize firmware API Luca Coelho (2): iwlwifi: mvm: support version 7 of the SCAN_REQ_UMAC FW command iwlwifi: fix PCI IDs and configuration mapping for 9000 series Thomas Backlund (1): iwlwifi: fix firmware names for 9000 and A000 series hw drivers/net/wireless/intel/iwlwifi/Makefile | 1 + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 73 +- drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 4 +- drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 190 ++ .../net/wireless/intel/iwlwifi/fw/api/binding.h | 144 + .../intel/iwlwifi/fw/{api.h => api/cmdhdr.h} | 56 +- .../iwlwifi/{mvm/fw-api-coex.h => fw/api/coex.h} | 11 +- .../net/wireless/intel/iwlwifi/fw/api/commands.h | 657 +++++ drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 192 ++ .../net/wireless/intel/iwlwifi/fw/api/context.h | 94 + .../intel/iwlwifi/{mvm/fw-api-d3.h => fw/api/d3.h} | 11 +- .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 127 + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 345 +++ drivers/net/wireless/intel/iwlwifi/fw/api/filter.h | 183 ++ .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 152 ++ .../iwlwifi/{mvm/fw-api-mac.h => fw/api/mac.h} | 33 +- .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 378 +++ .../net/wireless/intel/iwlwifi/fw/api/offload.h | 101 + drivers/net/wireless/intel/iwlwifi/fw/api/paging.h | 108 + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 164 ++ drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 258 ++ .../iwlwifi/{mvm/fw-api-power.h => fw/api/power.h} | 13 +- .../intel/iwlwifi/{mvm/fw-api-rs.h => fw/api/rs.h} | 13 +- .../intel/iwlwifi/{mvm/fw-api-rx.h => fw/api/rx.h} | 31 +- .../iwlwifi/{mvm/fw-api-scan.h => fw/api/scan.h} | 70 +- drivers/net/wireless/intel/iwlwifi/fw/api/sf.h | 138 + .../iwlwifi/{mvm/fw-api-sta.h => fw/api/sta.h} | 15 +- .../iwlwifi/{mvm/fw-api-stats.h => fw/api/stats.h} | 13 +- drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h | 208 ++ .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 386 +++ .../iwlwifi/{mvm/fw-api-tof.h => fw/api/tof.h} | 9 +- .../intel/iwlwifi/{mvm/fw-api-tx.h => fw/api/tx.h} | 11 +- drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 156 ++ drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 + drivers/net/wireless/intel/iwlwifi/fw/paging.c | 414 +++ drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 119 + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 152 ++ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 2 +- .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 2845 +------------------- drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 30 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 435 +-- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 32 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/power.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 88 +- drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tof.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 150 +- drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 2 +- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 +- 56 files changed, 5114 insertions(+), 3535 deletions(-) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/alive.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/binding.h rename drivers/net/wireless/intel/iwlwifi/fw/{api.h => api/cmdhdr.h} (83%) rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-coex.h => fw/api/coex.h} (96%) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/commands.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/config.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/context.h rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-d3.h => fw/api/d3.h} (98%) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/debug.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/filter.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-mac.h => fw/api/mac.h} (93%) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/offload.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/paging.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/phy.h rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-power.h => fw/api/power.h} (98%) rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-rs.h => fw/api/rs.h} (97%) rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-rx.h => fw/api/rx.h} (95%) rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-scan.h => fw/api/scan.h} (94%) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/sf.h rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-sta.h => fw/api/sta.h} (98%) rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-stats.h => fw/api/stats.h} (97%) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-tof.h => fw/api/tof.h} (98%) rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-tx.h => fw/api/tx.h} (99%) create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/txq.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/paging.c create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/runtime.h create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/smem.c