| Message ID | ee6d5faebc25c8fa447cf870cbc80b4236178756.camel@coelho.fi (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | pull-request: iwlwifi-next 2021-04-12 | expand |
Luca Coelho <luca@coelho.fi> writes: > Here's the first batch of patches intended for v5.13. This includes > the four last patchsets I sent out for v5.13 with the usual development > work. It also includes Emmanuel's series for adding the iwlmei driver, > including one patch by Alexander Usyskin in the misc drivers directory. > (which Greg asked us to push via our tree). But no Acked-by from Greg? I would like to have that in the commit log. > include/net/cfg80211.h | 11 +- > net/wireless/core.c | 7 +- Why are you changing cfg80211? Has this been checked with Johannes, at least I don't see any acks from him? I prefer making cfg80211 changes via Johannes' tree, smaller risk of conflicts that way. Also every commit seems to have Change-Id tag.
On Mon, 2021-04-12 at 14:43 +0300, Kalle Valo wrote: > > > include/net/cfg80211.h | 11 +- > > net/wireless/core.c | 7 +- > > Why are you changing cfg80211? Has this been checked with Johannes, at > least I don't see any acks from him? I prefer making cfg80211 changes > via Johannes' tree, smaller risk of conflicts that way. Hm. I believe I even have that commit already in my tree. Maybe we talked about it and said you could include it and I forgot? But in any case, it's in my tree now, so probably shouldn't go through iwlwifi as well. johannes
On Mon, 2021-04-12 at 13:49 +0200, Johannes Berg wrote: > On Mon, 2021-04-12 at 14:43 +0300, Kalle Valo wrote: > > > > > include/net/cfg80211.h | 11 +- > > > net/wireless/core.c | 7 +- > > > > Why are you changing cfg80211? Has this been checked with Johannes, at > > least I don't see any acks from him? I prefer making cfg80211 changes > > via Johannes' tree, smaller risk of conflicts that way. > > Hm. I believe I even have that commit already in my tree. Maybe we > talked about it and said you could include it and I forgot? But in any > case, it's in my tree now, so probably shouldn't go through iwlwifi as > well. commit 6f779a66dc84 ("cfg80211: allow specifying a reason for hw_rfkill") johannes
On Mon, 2021-04-12 at 14:43 +0300, Kalle Valo wrote: > Luca Coelho <luca@coelho.fi> writes: > > > Here's the first batch of patches intended for v5.13. This includes > > the four last patchsets I sent out for v5.13 with the usual development > > work. It also includes Emmanuel's series for adding the iwlmei driver, > > including one patch by Alexander Usyskin in the misc drivers directory. > > (which Greg asked us to push via our tree). > > But no Acked-by from Greg? I would like to have that in the commit log. Ugh, sorry, I thought Emmanuel had taken care of this and didn't check. I'll check with him what's the situation with Ack'ing this. > > include/net/cfg80211.h | 11 +- > > net/wireless/core.c | 7 +- > > Why are you changing cfg80211? Has this been checked with Johannes, at > least I don't see any acks from him? I prefer making cfg80211 changes > via Johannes' tree, smaller risk of conflicts that way. Hmmm, this is a patch that I already sent to Johannes too, but I had a mistake in it (some backport stuff slipped through). I guess I'll send him a v2 and then we need to wait with this pull-req until mac80211- next reaches wireless-drivers-next... :( > Also every commit seems to have Change-Id tag. Argh. Sorry about that. Another of my hooks that was not installed on my new machine. -- Luca.
+ Greg Hi Greg, > > Luca Coelho <luca@coelho.fi> writes: > > > Here's the first batch of patches intended for v5.13. This includes > > the four last patchsets I sent out for v5.13 with the usual > > development work. It also includes Emmanuel's series for adding the > > iwlmei driver, including one patch by Alexander Usyskin in the misc drivers > directory. > > (which Greg asked us to push via our tree). > > But no Acked-by from Greg? I would like to have that in the commit log. Not sure if you remember, but Tomas sent a patch to you and then asked to route the patch through the user's tree. So here it is :) Kalle would like to get an ACK from you. This is the latest version of the patch: https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git/commit/?id=1b1910e2c82ed5392b90470885d91f3abc1619e2 Thanks!
On Mon, 2021-04-12 at 13:50 +0200, Johannes Berg wrote: > On Mon, 2021-04-12 at 13:49 +0200, Johannes Berg wrote: > > On Mon, 2021-04-12 at 14:43 +0300, Kalle Valo wrote: > > > > > > > include/net/cfg80211.h | 11 +- > > > > net/wireless/core.c | 7 +- > > > > > > Why are you changing cfg80211? Has this been checked with Johannes, at > > > least I don't see any acks from him? I prefer making cfg80211 changes > > > via Johannes' tree, smaller risk of conflicts that way. > > > > Hm. I believe I even have that commit already in my tree. Maybe we > > talked about it and said you could include it and I forgot? But in any > > case, it's in my tree now, so probably shouldn't go through iwlwifi as > > well. > > commit 6f779a66dc84 ("cfg80211: allow specifying a reason for > hw_rfkill") Ah, so you applied it without the backport stuff I left there. Thanks! But this is not in net-next yet, right? So we still need to wait till that reaches net-next and Kalle pulls from there... -- Luca.
On Mon, 2021-04-12 at 14:56 +0300, Luca Coelho wrote: > On Mon, 2021-04-12 at 13:50 +0200, Johannes Berg wrote: > > On Mon, 2021-04-12 at 13:49 +0200, Johannes Berg wrote: > > > On Mon, 2021-04-12 at 14:43 +0300, Kalle Valo wrote: > > > > > > > > > include/net/cfg80211.h | 11 +- > > > > > net/wireless/core.c | 7 +- > > > > > > > > Why are you changing cfg80211? Has this been checked with Johannes, at > > > > least I don't see any acks from him? I prefer making cfg80211 changes > > > > via Johannes' tree, smaller risk of conflicts that way. > > > > > > Hm. I believe I even have that commit already in my tree. Maybe we > > > talked about it and said you could include it and I forgot? But in any > > > case, it's in my tree now, so probably shouldn't go through iwlwifi as > > > well. > > > > commit 6f779a66dc84 ("cfg80211: allow specifying a reason for > > hw_rfkill") > > Ah, so you applied it without the backport stuff I left there. Thanks! > > But this is not in net-next yet, right? So we still need to wait till > that reaches net-next and Kalle pulls from there... Yeah, apparently I got side-tracked after doing mac80211 and forgot mac80211-next ... johannes
On Mon, Apr 12, 2021 at 11:55:23AM +0000, Grumbach, Emmanuel wrote: > + Greg > > Hi Greg, > > > > > Luca Coelho <luca@coelho.fi> writes: > > > > > Here's the first batch of patches intended for v5.13. This includes > > > the four last patchsets I sent out for v5.13 with the usual > > > development work. It also includes Emmanuel's series for adding the > > > iwlmei driver, including one patch by Alexander Usyskin in the misc drivers > > directory. > > > (which Greg asked us to push via our tree). > > > > But no Acked-by from Greg? I would like to have that in the commit log. > > Not sure if you remember, but Tomas sent a patch to you and then asked to route the patch through the user's tree. So here it is :) > Kalle would like to get an ACK from you. This is the latest version of the patch: > > https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git/commit/?id=1b1910e2c82ed5392b90470885d91f3abc1619e2 I do not remember anything like this, do you have a pointer to the lore.kernel.org thread? Remember I get about 1000 emails a day to do something with (usually ignore...) And I can't review a random commit on a random webpage, that's not how any of this works, you know better. greg k-h
> > On Mon, Apr 12, 2021 at 11:55:23AM +0000, Grumbach, Emmanuel wrote: > > + Greg > > > > Hi Greg, > > > > > > > > Luca Coelho <luca@coelho.fi> writes: > > > > > > > Here's the first batch of patches intended for v5.13. This > > > > includes the four last patchsets I sent out for v5.13 with the > > > > usual development work. It also includes Emmanuel's series for > > > > adding the iwlmei driver, including one patch by Alexander Usyskin > > > > in the misc drivers > > > directory. > > > > (which Greg asked us to push via our tree). > > > > > > But no Acked-by from Greg? I would like to have that in the commit log. > > > > Not sure if you remember, but Tomas sent a patch to you and then asked > > to route the patch through the user's tree. So here it is :) Kalle would like to > get an ACK from you. This is the latest version of the patch: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.g > > it/commit/?id=1b1910e2c82ed5392b90470885d91f3abc1619e2 > > I do not remember anything like this, do you have a pointer to the > lore.kernel.org thread? Remember I get about 1000 emails a day to do > something with (usually ignore...) Bah, I forgot to add this link which I had prepared to paste here: https://lore.kernel.org/lkml/20210206144325.25682-6-tomas.winkler@intel.com/ > > And I can't review a random commit on a random webpage, that's not how > any of this works, you know better. I guess I can resend the patch and CC you to it so that you can review it. > > greg k-h
On Mon, Apr 12, 2021 at 12:19:52PM +0000, Grumbach, Emmanuel wrote: > > > > On Mon, Apr 12, 2021 at 11:55:23AM +0000, Grumbach, Emmanuel wrote: > > > + Greg > > > > > > Hi Greg, > > > > > > > > > > > Luca Coelho <luca@coelho.fi> writes: > > > > > > > > > Here's the first batch of patches intended for v5.13. This > > > > > includes the four last patchsets I sent out for v5.13 with the > > > > > usual development work. It also includes Emmanuel's series for > > > > > adding the iwlmei driver, including one patch by Alexander Usyskin > > > > > in the misc drivers > > > > directory. > > > > > (which Greg asked us to push via our tree). > > > > > > > > But no Acked-by from Greg? I would like to have that in the commit log. > > > > > > Not sure if you remember, but Tomas sent a patch to you and then asked > > > to route the patch through the user's tree. So here it is :) Kalle would like to > > get an ACK from you. This is the latest version of the patch: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.g > > > it/commit/?id=1b1910e2c82ed5392b90470885d91f3abc1619e2 > > > > I do not remember anything like this, do you have a pointer to the > > lore.kernel.org thread? Remember I get about 1000 emails a day to do > > something with (usually ignore...) > > Bah, I forgot to add this link which I had prepared to paste here: > https://lore.kernel.org/lkml/20210206144325.25682-6-tomas.winkler@intel.com/ > > > > > And I can't review a random commit on a random webpage, that's not how > > any of this works, you know better. > > I guess I can resend the patch and CC you to it so that you can review it. The whole series is needed to be resent as the single patch doesn't make sense alone. thanks, greg k-h
Hi Kalle, Here's the first batch of patches intended for v5.13. This includes the four last patchsets I sent out for v5.13 with the usual development work. It also includes Emmanuel's series for adding the iwlmei driver, including one patch by Alexander Usyskin in the misc drivers directory. (which Greg asked us to push via our tree). More details about the contents in the tag description. Please let me know if there are any issues. Cheers, Luca. The following changes since commit fa9f5d0e0b45a06802f7cb3afed237be6066821e: iwlegacy: avoid -Wempty-body warning (2021-04-11 12:31:01 +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-2021-04-12 for you to fetch changes up to 1a9674efd5364f875a04d4ae2f499dfc4bf22e3b: iwlwifi: dbg: disable ini debug in 9000 family and below (2021-04-12 13:27:04 +0300) ---------------------------------------------------------------- iwlwifi patches for v5.13 * Add support for new FTM FW APIs; * Add new iwlmei driver; * Some CSA fixes; * Support for new HW family and other HW detection fixes; * Robustness improvement in the HW detection code; * One fix in PMF; * Some new regulatory features; * Support for passive scan in 6GHz; * Some improvements in the sync queue implementation; * Support for new devices; * Support for a new FW API command version; * Some locking fixes; * Bump the FW API version support for AX devices; * Some other small fixes, clean-ups and improvements. ---------------------------------------------------------------- Alexander Usyskin (1): mei: bus: add client dma interface Avraham Stern (3): iwlwifi: mvm: support range request command version 12 iwlwifi: mvm: responder: support responder config command version 8 iwlwifi: mvm: when associated with PMF, use protected NDP ranging negotiation Emmanuel Grumbach (8): cfg80211: allow to specifying a reason for hw_rfkill iwlwifi: mei: add the driver to allow cooperation with CSME iwlwifi: integrate with iwlmei iwlwifi: mvm: don't allow CSA if we haven't been fully associated iwlwifi: remove TCM events iwlwifi: don't warn if we can't wait for empty tx queues iwlwifi: mvm: don't disconnect immediately if we don't hear beacons after CSA iwlwifi: mvm: don't WARN if we can't remove a time event Harish Mitty (1): iwlwifi: mvm: refactor ACPI DSM evaluation function Ilan Peer (1): iwlwifi: mvm: Add support for 6GHz passive scan Johannes Berg (10): iwlwifi: pcie: avoid unnecessarily taking spinlock iwlwifi: pcie: normally grab NIC access for inflight-hcmd iwlwifi: pcie: make cfg vs. trans_cfg more robust iwlwifi: mvm: write queue_sync_state only for sync iwlwifi: mvm: clean up queue sync implementation iwlwifi: remove remaining software checksum code iwlwifi: mvm: don't lock mutex in RCU critical section iwlwifi: warn on SKB free w/o op-mode iwlwifi: trans/pcie: defer transport initialisation iwlwifi: fw: print out trigger delay when collecting data Luca Coelho (1): iwlwifi: bump FW API to 63 for AX devices Matti Gottlieb (2): iwlwifi: pcie: Add support for Bz Family iwlwifi: pcie: Change ma product string name Miri Korenblit (3): iwlwifi: mvm: enable PPAG in China iwlwifi: mvm: support BIOS enable/disable for 11ax in Ukraine iwlwifi: mvm: add support for version 3 of LARI_CONFIG_CHANGE command. Mordechay Goodstein (7): iwlwifi: pcie: clear only FH bits handle in the interrupt iwlwifi: move iwl_configure_rxq to be used by other op_modes iwlwifi: queue: avoid memory leak in reset flow iwlwifi: mvm: remove PS from lower rates. iwlwifi: pcie: merge napi_poll_msix functions iwlwifi: pcie: add ISR debug info for msix debug iwlwifi: rs-fw: don't support stbc for HE 160 Mukesh Sisodiya (1): iwlwifi: dbg: disable ini debug in 9000 family and below Ravi Darsi (1): iwlwifi: mvm: Use IWL_INFO in fw_reset_handshake() Roee Goldfiner (1): iwlwifi: mvm: umac error table mismatch Sara Sharon (1): iwlwifi: mvm: enable TX on new CSA channel before disconnecting ybaruch (5): iwlwifi: change step in so-gf struct iwlwifi: change name to AX 211 and 411 family iwlwifi: add 160Mhz to killer 1550 name iwlwifi: add ax201 killer device iwlwifi: add new so-gf device drivers/misc/mei/bus.c | 67 +++- drivers/misc/mei/client.c | 3 + drivers/misc/mei/hw.h | 5 + drivers/net/wireless/intel/iwlwifi/Kconfig | 13 + drivers/net/wireless/intel/iwlwifi/Makefile | 2 + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 72 +++- drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 2 +- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 78 +++- drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 13 +- drivers/net/wireless/intel/iwlwifi/fw/api/location.h | 173 +++++++- drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 20 +- drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 22 +- drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 30 -- drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 8 + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 +- drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + drivers/net/wireless/intel/iwlwifi/fw/img.h | 5 +- drivers/net/wireless/intel/iwlwifi/fw/init.c | 59 +++ drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 12 +- drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 3 + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 5 +- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 +- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 61 +++ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 11 +- drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 4 +- drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 91 +++-- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 8 +- drivers/net/wireless/intel/iwlwifi/mei/Makefile | 8 + drivers/net/wireless/intel/iwlwifi/mei/internal.h | 20 + drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h | 440 ++++++++++++++++++++ drivers/net/wireless/intel/iwlwifi/mei/main.c | 2026 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/wireless/intel/iwlwifi/mei/net.c | 409 +++++++++++++++++++ drivers/net/wireless/intel/iwlwifi/mei/sap.h | 736 ++++++++++++++++++++++++++++++++++ drivers/net/wireless/intel/iwlwifi/mei/trace-data.h | 69 ++++ drivers/net/wireless/intel/iwlwifi/mei/trace.c | 15 + drivers/net/wireless/intel/iwlwifi/mei/trace.h | 62 +++ drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 11 + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 +- drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 85 +++- drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 27 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 235 ++++------- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 101 ++++- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 82 +++- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 205 +++++++++- drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 20 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 58 +-- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 128 ++++++ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 10 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 38 +- drivers/net/wireless/intel/iwlwifi/mvm/time-event.c | 27 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 7 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 18 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 107 ++++- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 68 ++-- drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 8 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 21 +- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 80 ++-- drivers/net/wireless/intel/iwlwifi/queue/tx.c | 41 +- drivers/net/wireless/intel/iwlwifi/queue/tx.h | 3 +- include/linux/mei_cl_bus.h | 3 + include/net/cfg80211.h | 11 +- net/wireless/core.c | 7 +- 65 files changed, 5415 insertions(+), 568 deletions(-) create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/Makefile create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/internal.h create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/main.c create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/net.c create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/sap.h create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace-data.h create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace.c create mode 100644 drivers/net/wireless/intel/iwlwifi/mei/trace.h