* linux-next: manual merge of the iwlwifi-next tree with Linus' tree
@ 2025-05-08 3:48 Stephen Rothwell
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2025-05-08 3:48 UTC (permalink / raw)
To: Miriam Rachel Korenblit, Johannes Berg
Cc: Johannes Berg, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 795 bytes --]
Hi all,
Today's linux-next merge of the iwlwifi-next tree got a conflict in:
drivers/net/wireless/intel/iwlwifi/mld/agg.c
between commit:
60d418e85404 ("wifi: iwlwifi: mld: fix BAID validity check")
from Linus' tree and commit:
cc2b6a0bf340 ("wifi: iwlwifi: mld: remove one more error in unallocated BAID")
from the iwlwifi-next tree.
I fixed it up (I just used the latter version) 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 --]
^ permalink raw reply [flat|nested] 10+ messages in thread* linux-next: manual merge of the iwlwifi-next tree with Linus' tree @ 2025-05-06 1:44 Stephen Rothwell 2025-05-06 6:26 ` Johannes Berg 0 siblings, 1 reply; 10+ messages in thread From: Stephen Rothwell @ 2025-05-06 1:44 UTC (permalink / raw) To: Miriam Rachel Korenblit, Johannes Berg Cc: Johannes Berg, Linux Kernel Mailing List, Linux Next Mailing List [-- Attachment #1: Type: text/plain, Size: 736 bytes --] Hi all, Today's linux-next merge of the iwlwifi-next tree got conflicts in: drivers/net/wireless/intel/iwlwifi/cfg/sc.c drivers/net/wireless/intel/iwlwifi/iwl-config.h drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c drivers/net/wireless/intel/iwlwifi/iwl-trans.c drivers/net/wireless/intel/iwlwifi/iwl-trans.h drivers/net/wireless/intel/iwlwifi/pcie/drv.c drivers/net/wireless/intel/iwlwifi/tests/devinfo.c between various commits from Linus' tree and various commits from the iwlwifi-next tree. At least one of the commits in Linus' tree is duplicated in the iwlwifi-next tree. I couldn't figure out how to fix it up, so I dropped the iwlwifi tree for today. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree 2025-05-06 1:44 Stephen Rothwell @ 2025-05-06 6:26 ` Johannes Berg 2025-05-07 1:10 ` Stephen Rothwell 0 siblings, 1 reply; 10+ messages in thread From: Johannes Berg @ 2025-05-06 6:26 UTC (permalink / raw) To: Stephen Rothwell, Miriam Rachel Korenblit Cc: Linux Kernel Mailing List, Linux Next Mailing List Hi Stephen, > Today's linux-next merge of the iwlwifi-next tree got conflicts in: > > drivers/net/wireless/intel/iwlwifi/cfg/sc.c > drivers/net/wireless/intel/iwlwifi/iwl-config.h > drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c > drivers/net/wireless/intel/iwlwifi/iwl-trans.c > drivers/net/wireless/intel/iwlwifi/iwl-trans.h > drivers/net/wireless/intel/iwlwifi/pcie/drv.c > drivers/net/wireless/intel/iwlwifi/tests/devinfo.c > > between various commits from Linus' tree and various commits from the > iwlwifi-next tree. Yeah, no surprise, there were some reverts in this area. The good thing is that we also already fixed the bugs that necessitated the reverts differently, so (eventually, need to check how much is in there now) this will just be "take next". > At least one of the commits in Linus' tree is duplicated in the > iwlwifi-next tree. Right, saw your other mail too, we'll see what happened and drop those. Thanks! johannes ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree 2025-05-06 6:26 ` Johannes Berg @ 2025-05-07 1:10 ` Stephen Rothwell 2025-05-07 5:37 ` Johannes Berg 0 siblings, 1 reply; 10+ messages in thread From: Stephen Rothwell @ 2025-05-07 1:10 UTC (permalink / raw) To: Johannes Berg Cc: Miriam Rachel Korenblit, Linux Kernel Mailing List, Linux Next Mailing List [-- Attachment #1: Type: text/plain, Size: 2852 bytes --] Hi Johannes, On Tue, 06 May 2025 08:26:31 +0200 Johannes Berg <johannes@sipsolutions•net> wrote: > > > Today's linux-next merge of the iwlwifi-next tree got conflicts in: > > > > drivers/net/wireless/intel/iwlwifi/cfg/sc.c > > drivers/net/wireless/intel/iwlwifi/iwl-config.h > > drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c > > drivers/net/wireless/intel/iwlwifi/iwl-trans.c > > drivers/net/wireless/intel/iwlwifi/iwl-trans.h > > drivers/net/wireless/intel/iwlwifi/pcie/drv.c > > drivers/net/wireless/intel/iwlwifi/tests/devinfo.c > > > > between various commits from Linus' tree and various commits from the > > iwlwifi-next tree. > > Yeah, no surprise, there were some reverts in this area. The good thing > is that we also already fixed the bugs that necessitated the reverts > differently, so (eventually, need to check how much is in there now) > this will just be "take next". So, at your suggestion, I just used the latter versions of these files, but I then got the following build failure: In file included from arch/x86/include/asm/bug.h:103, from include/linux/bug.h:5, from include/linux/fortify-string.h:6, from include/linux/string.h:392, from include/linux/uuid.h:11, from include/linux/mod_devicetable.h:14, from include/linux/pci.h:27, from drivers/net/wireless/intel/iwlwifi/pcie/trans.c:7: drivers/net/wireless/intel/iwlwifi/pcie/trans.c: In function 'iwl_trans_pcie_reset': drivers/net/wireless/intel/iwlwifi/pcie/trans.c:2337:29: error: 'IWL_RESET_MODE_BACKOFF' undeclared (first use in this function); did you mean 'IWL_RESET_MODE_REPROBE'? 2337 | mode == IWL_RESET_MODE_BACKOFF)) | ^~~~~~~~~~~~~~~~~~~~~~ include/asm-generic/bug.h:123:32: note: in definition of macro 'WARN_ON' 123 | int __ret_warn_on = !!(condition); \ | ^~~~~~~~~ drivers/net/wireless/intel/iwlwifi/pcie/trans.c:2337:29: note: each undeclared identifier is reported only once for each function it appears in 2337 | mode == IWL_RESET_MODE_BACKOFF)) | ^~~~~~~~~~~~~~~~~~~~~~ include/asm-generic/bug.h:123:32: note: in definition of macro 'WARN_ON' 123 | int __ret_warn_on = !!(condition); \ | ^~~~~~~~~ So, today I have merged the iwlwifi-next tree from next-20250505 (which was effectively empty). You may want to try merging the iwlwifi tree into the iwlwifi-next tree and resolve any conflicts yourself (now that the iwlwifi tree has been merged into Linus' tree). -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree 2025-05-07 1:10 ` Stephen Rothwell @ 2025-05-07 5:37 ` Johannes Berg 2025-05-08 3:24 ` Stephen Rothwell 0 siblings, 1 reply; 10+ messages in thread From: Johannes Berg @ 2025-05-07 5:37 UTC (permalink / raw) To: Stephen Rothwell Cc: Miriam Rachel Korenblit, Linux Kernel Mailing List, Linux Next Mailing List Hi Stephen, Thanks! > So, at your suggestion, I just used the latter versions of these files, > but I then got the following build failure: Ouch, sorry about that. That sounds like it's due to the duplicate commits you had pointed out, which Miri dropped from iwlwifi-next now. On the plus side, I'm going to be the one who has to resolve these conflicts (soon) :) > So, today I have merged the iwlwifi-next tree from next-20250505 (which > was effectively empty). You may want to try merging the iwlwifi tree > into the iwlwifi-next tree and resolve any conflicts yourself (now that > the iwlwifi tree has been merged into Linus' tree). Not sure what you mean by "iwlwifi tree", I think iwlwifi-next/fixes was empty, so perhaps you meant "wireless tree" instead? But yeah, I know what all the code is and what's going on, though evidently less than I thought after the recent updates. johannes ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree 2025-05-07 5:37 ` Johannes Berg @ 2025-05-08 3:24 ` Stephen Rothwell 2025-05-14 2:41 ` Stephen Rothwell 0 siblings, 1 reply; 10+ messages in thread From: Stephen Rothwell @ 2025-05-08 3:24 UTC (permalink / raw) To: Johannes Berg Cc: Miriam Rachel Korenblit, Linux Kernel Mailing List, Linux Next Mailing List [-- Attachment #1: Type: text/plain, Size: 6954 bytes --] Hi Johannes, On Wed, 07 May 2025 07:37:46 +0200 Johannes Berg <johannes@sipsolutions•net> wrote: > > > So, at your suggestion, I just used the latter versions of these files, > > but I then got the following build failure: > > Ouch, sorry about that. That sounds like it's due to the duplicate > commits you had pointed out, which Miri dropped from iwlwifi-next now. > > On the plus side, I'm going to be the one who has to resolve these > conflicts (soon) :) There are real conficts (see below). > > So, today I have merged the iwlwifi-next tree from next-20250505 (which > > was effectively empty). You may want to try merging the iwlwifi tree > > into the iwlwifi-next tree and resolve any conflicts yourself (now that > > the iwlwifi tree has been merged into Linus' tree). > > Not sure what you mean by "iwlwifi tree", I think iwlwifi-next/fixes was > empty, so perhaps you meant "wireless tree" instead? Yeah, that or just commit 175e69e33c66 (which has been merged into Linus' tree). > But yeah, I know what all the code is and what's going on, though > evidently less than I thought after the recent updates. So today, I have applied the following clean up patch, but it does mean that the 2 commits mentioned from Linus' tree have been reverted in linus-next. This means that linux-next builds today with the iwlwifi-next tree merged. From: Stephen Rothwell <sfr@canb•auug.org.au> Date: Thu, 8 May 2025 12:26:09 +1000 Subject: [PATCH] iwlwifi: remove the left over bits of 2 commits from Linus' tree Commits d49437a6afc7 ("wifi: iwlwifi: back off on continuous errors") 15220a257319 ("wifi: iwlwifi: don't warn if the NIC is gone in resume") were partly removed by just taking the MERGE_HAD versions of drivers/net/wireless/intel/iwlwifi/cfg/sc.c drivers/net/wireless/intel/iwlwifi/iwl-config.h drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c drivers/net/wireless/intel/iwlwifi/iwl-trans.c drivers/net/wireless/intel/iwlwifi/iwl-trans.h drivers/net/wireless/intel/iwlwifi/pcie/drv.c drivers/net/wireless/intel/iwlwifi/tests/devinfo.c This removes the rest. Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au> --- .../net/wireless/intel/iwlwifi/pcie/internal.h | 9 ++++----- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 ++++------------ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h index b5368b256e20..8adeddeb0e4c 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h +++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h @@ -542,10 +542,10 @@ void iwl_trans_pcie_free(struct iwl_trans *trans); void iwl_trans_pcie_free_pnvm_dram_regions(struct iwl_dram_regions *dram_regions, struct device *dev); -bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent); -#define _iwl_trans_pcie_grab_nic_access(trans, silent) \ +bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans); +#define _iwl_trans_pcie_grab_nic_access(trans) \ __cond_lock(nic_access_nobh, \ - likely(__iwl_trans_pcie_grab_nic_access(trans, silent))) + likely(__iwl_trans_pcie_grab_nic_access(trans))) void iwl_trans_pcie_check_product_reset_status(struct pci_dev *pdev); void iwl_trans_pcie_check_product_reset_mode(struct pci_dev *pdev); @@ -1101,8 +1101,7 @@ void iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans, u32 reg, int iwl_trans_pcie_read_config32(struct iwl_trans *trans, u32 ofs, u32 *val); bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans); -void __releases(nic_access_nobh) -iwl_trans_pcie_release_nic_access(struct iwl_trans *trans); +void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans); /* transport gen 1 exported functions */ void iwl_trans_pcie_fw_alive(struct iwl_trans *trans); diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c index 799d651ddd8a..4d281c702eec 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c @@ -2333,8 +2333,7 @@ void iwl_trans_pcie_reset(struct iwl_trans *trans, enum iwl_reset_mode mode) struct iwl_trans_pcie_removal *removal; char _msg = 0, *msg = &_msg; - if (WARN_ON(mode < IWL_RESET_MODE_REMOVE_ONLY || - mode == IWL_RESET_MODE_BACKOFF)) + if (WARN_ON(mode < IWL_RESET_MODE_REMOVE_ONLY)) return; if (test_bit(STATUS_TRANS_DEAD, &trans->status)) @@ -2388,7 +2387,7 @@ EXPORT_SYMBOL(iwl_trans_pcie_reset); * This version doesn't disable BHs but rather assumes they're * already disabled. */ -bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent) +bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans) { int ret; struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); @@ -2440,11 +2439,6 @@ bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent) if (unlikely(ret < 0)) { u32 cntrl = iwl_read32(trans, CSR_GP_CNTRL); - if (silent) { - spin_unlock(&trans_pcie->reg_lock); - return false; - } - WARN_ONCE(1, "Timeout waiting for hardware access (CSR_GP_CNTRL 0x%08x)\n", cntrl); @@ -2476,7 +2470,7 @@ bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans) bool ret; local_bh_disable(); - ret = __iwl_trans_pcie_grab_nic_access(trans, false); + ret = __iwl_trans_pcie_grab_nic_access(trans); if (ret) { /* keep BHs disabled until iwl_trans_pcie_release_nic_access */ return ret; @@ -2485,8 +2479,7 @@ bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans) return false; } -void __releases(nic_access_nobh) -iwl_trans_pcie_release_nic_access(struct iwl_trans *trans) +void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans) { struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); @@ -2513,7 +2506,6 @@ iwl_trans_pcie_release_nic_access(struct iwl_trans *trans) * scheduled on different CPUs (after we drop reg_lock). */ out: - __release(nic_access_nobh); spin_unlock_bh(&trans_pcie->reg_lock); } diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c index f142b8beb396..c876912e9aaf 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -1018,7 +1018,7 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans, * returned. This needs to be done only on NICs that have * apmg_wake_up_wa set (see above.) */ - if (!_iwl_trans_pcie_grab_nic_access(trans, false)) + if (!_iwl_trans_pcie_grab_nic_access(trans)) return -EIO; /* -- 2.47.2 -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree 2025-05-08 3:24 ` Stephen Rothwell @ 2025-05-14 2:41 ` Stephen Rothwell 2025-05-14 2:55 ` Stephen Rothwell 0 siblings, 1 reply; 10+ messages in thread From: Stephen Rothwell @ 2025-05-14 2:41 UTC (permalink / raw) To: Johannes Berg Cc: Miriam Rachel Korenblit, Linux Kernel Mailing List, Linux Next Mailing List [-- Attachment #1: Type: text/plain, Size: 7867 bytes --] Hi all, On Thu, 8 May 2025 13:24:59 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote: > > On Wed, 07 May 2025 07:37:46 +0200 Johannes Berg <johannes@sipsolutions•net> wrote: > > > > > So, at your suggestion, I just used the latter versions of these files, > > > but I then got the following build failure: > > > > Ouch, sorry about that. That sounds like it's due to the duplicate > > commits you had pointed out, which Miri dropped from iwlwifi-next now. > > > > On the plus side, I'm going to be the one who has to resolve these > > conflicts (soon) :) > > There are real conficts (see below). > > > > So, today I have merged the iwlwifi-next tree from next-20250505 (which > > > was effectively empty). You may want to try merging the iwlwifi tree > > > into the iwlwifi-next tree and resolve any conflicts yourself (now that > > > the iwlwifi tree has been merged into Linus' tree). > > > > Not sure what you mean by "iwlwifi tree", I think iwlwifi-next/fixes was > > empty, so perhaps you meant "wireless tree" instead? > > Yeah, that or just commit 175e69e33c66 (which has been merged into > Linus' tree). > > > But yeah, I know what all the code is and what's going on, though > > evidently less than I thought after the recent updates. > > So today, I have applied the following clean up patch, but it does mean > that the 2 commits mentioned from Linus' tree have been reverted in > linus-next. This means that linux-next builds today with the > iwlwifi-next tree merged. > > From: Stephen Rothwell <sfr@canb•auug.org.au> > Date: Thu, 8 May 2025 12:26:09 +1000 > Subject: [PATCH] iwlwifi: remove the left over bits of 2 commits from Linus' tree > > Commits > > d49437a6afc7 ("wifi: iwlwifi: back off on continuous errors") > 15220a257319 ("wifi: iwlwifi: don't warn if the NIC is gone in resume") > > were partly removed by just taking the MERGE_HAD versions of > > drivers/net/wireless/intel/iwlwifi/cfg/sc.c > drivers/net/wireless/intel/iwlwifi/iwl-config.h > drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c > drivers/net/wireless/intel/iwlwifi/iwl-trans.c > drivers/net/wireless/intel/iwlwifi/iwl-trans.h > drivers/net/wireless/intel/iwlwifi/pcie/drv.c > drivers/net/wireless/intel/iwlwifi/tests/devinfo.c > > This removes the rest. > > Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au> > --- > .../net/wireless/intel/iwlwifi/pcie/internal.h | 9 ++++----- > drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 ++++------------ > drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +- > 3 files changed, 9 insertions(+), 18 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > index b5368b256e20..8adeddeb0e4c 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h > @@ -542,10 +542,10 @@ void iwl_trans_pcie_free(struct iwl_trans *trans); > void iwl_trans_pcie_free_pnvm_dram_regions(struct iwl_dram_regions *dram_regions, > struct device *dev); > > -bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent); > -#define _iwl_trans_pcie_grab_nic_access(trans, silent) \ > +bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans); > +#define _iwl_trans_pcie_grab_nic_access(trans) \ > __cond_lock(nic_access_nobh, \ > - likely(__iwl_trans_pcie_grab_nic_access(trans, silent))) > + likely(__iwl_trans_pcie_grab_nic_access(trans))) > > void iwl_trans_pcie_check_product_reset_status(struct pci_dev *pdev); > void iwl_trans_pcie_check_product_reset_mode(struct pci_dev *pdev); > @@ -1101,8 +1101,7 @@ void iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans, u32 reg, > int iwl_trans_pcie_read_config32(struct iwl_trans *trans, u32 ofs, > u32 *val); > bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans); > -void __releases(nic_access_nobh) > -iwl_trans_pcie_release_nic_access(struct iwl_trans *trans); > +void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans); > > /* transport gen 1 exported functions */ > void iwl_trans_pcie_fw_alive(struct iwl_trans *trans); > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > index 799d651ddd8a..4d281c702eec 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c > @@ -2333,8 +2333,7 @@ void iwl_trans_pcie_reset(struct iwl_trans *trans, enum iwl_reset_mode mode) > struct iwl_trans_pcie_removal *removal; > char _msg = 0, *msg = &_msg; > > - if (WARN_ON(mode < IWL_RESET_MODE_REMOVE_ONLY || > - mode == IWL_RESET_MODE_BACKOFF)) > + if (WARN_ON(mode < IWL_RESET_MODE_REMOVE_ONLY)) > return; > > if (test_bit(STATUS_TRANS_DEAD, &trans->status)) > @@ -2388,7 +2387,7 @@ EXPORT_SYMBOL(iwl_trans_pcie_reset); > * This version doesn't disable BHs but rather assumes they're > * already disabled. > */ > -bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent) > +bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans) > { > int ret; > struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); > @@ -2440,11 +2439,6 @@ bool __iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent) > if (unlikely(ret < 0)) { > u32 cntrl = iwl_read32(trans, CSR_GP_CNTRL); > > - if (silent) { > - spin_unlock(&trans_pcie->reg_lock); > - return false; > - } > - > WARN_ONCE(1, > "Timeout waiting for hardware access (CSR_GP_CNTRL 0x%08x)\n", > cntrl); > @@ -2476,7 +2470,7 @@ bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans) > bool ret; > > local_bh_disable(); > - ret = __iwl_trans_pcie_grab_nic_access(trans, false); > + ret = __iwl_trans_pcie_grab_nic_access(trans); > if (ret) { > /* keep BHs disabled until iwl_trans_pcie_release_nic_access */ > return ret; > @@ -2485,8 +2479,7 @@ bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans) > return false; > } > > -void __releases(nic_access_nobh) > -iwl_trans_pcie_release_nic_access(struct iwl_trans *trans) > +void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans) > { > struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); > > @@ -2513,7 +2506,6 @@ iwl_trans_pcie_release_nic_access(struct iwl_trans *trans) > * scheduled on different CPUs (after we drop reg_lock). > */ > out: > - __release(nic_access_nobh); > spin_unlock_bh(&trans_pcie->reg_lock); > } > > diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > index f142b8beb396..c876912e9aaf 100644 > --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c > @@ -1018,7 +1018,7 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans, > * returned. This needs to be done only on NICs that have > * apmg_wake_up_wa set (see above.) > */ > - if (!_iwl_trans_pcie_grab_nic_access(trans, false)) > + if (!_iwl_trans_pcie_grab_nic_access(trans)) > return -EIO; > > /* > -- > 2.47.2 I keep getting more conflicts in the above files (each time one of them get modified in the iwlwifi-next tree. Could you please merge commit ebedf8b7f05b ("wifi: iwlwifi: add support for Killer on MTL") or the current net tree (git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main) into the iwlwifi-next tree and fix up the conflicts. I believe that will clean up all the conflicts - that are really just between bug fixes for iwlwifi and the new development). -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree 2025-05-14 2:41 ` Stephen Rothwell @ 2025-05-14 2:55 ` Stephen Rothwell 2025-05-14 6:41 ` Johannes Berg 0 siblings, 1 reply; 10+ messages in thread From: Stephen Rothwell @ 2025-05-14 2:55 UTC (permalink / raw) To: Johannes Berg Cc: Miriam Rachel Korenblit, Linux Kernel Mailing List, Linux Next Mailing List [-- Attachment #1: Type: text/plain, Size: 751 bytes --] Hi all, On Wed, 14 May 2025 12:41:31 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote: > > I keep getting more conflicts in the above files (each time one of them > get modified in the iwlwifi-next tree. Could you please merge commit > > ebedf8b7f05b ("wifi: iwlwifi: add support for Killer on MTL") > > or the current net tree > (git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main) > into the iwlwifi-next tree and fix up the conflicts. I believe that > will clean up all the conflicts - that are really just between bug > fixes for iwlwifi and the new development). Or, of course, I assume the iwlwifi-next tree will be merged into the net-next tree at some point soon ... -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree 2025-05-14 2:55 ` Stephen Rothwell @ 2025-05-14 6:41 ` Johannes Berg 2025-05-14 7:36 ` Stephen Rothwell 0 siblings, 1 reply; 10+ messages in thread From: Johannes Berg @ 2025-05-14 6:41 UTC (permalink / raw) To: Stephen Rothwell Cc: Miriam Rachel Korenblit, Linux Kernel Mailing List, Linux Next Mailing List Hi Stephen, > > I keep getting more conflicts in the above files (each time one of them > > get modified in the iwlwifi-next tree. Could you please merge commit > > > > ebedf8b7f05b ("wifi: iwlwifi: add support for Killer on MTL") > > > > or the current net tree > > (git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main) > > into the iwlwifi-next tree and fix up the conflicts. I believe that > > will clean up all the conflicts - that are really just between bug > > fixes for iwlwifi and the new development). > > Or, of course, I assume the iwlwifi-next tree will be merged into the > net-next tree at some point soon ... > Yes, should be really soon now, though into wireless-next. But that's up-to-date with net, so would resolve all of these issues. In fact that was the plan all along, it's just been taking a bit longer than expected, sorry about that. johannes ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree 2025-05-14 6:41 ` Johannes Berg @ 2025-05-14 7:36 ` Stephen Rothwell 0 siblings, 0 replies; 10+ messages in thread From: Stephen Rothwell @ 2025-05-14 7:36 UTC (permalink / raw) To: Johannes Berg Cc: Miriam Rachel Korenblit, Linux Kernel Mailing List, Linux Next Mailing List [-- Attachment #1: Type: text/plain, Size: 399 bytes --] Hi Johannes, On Wed, 14 May 2025 08:41:35 +0200 Johannes Berg <johannes@sipsolutions•net> wrote: > > Yes, should be really soon now, though into wireless-next. But that's > up-to-date with net, so would resolve all of these issues. In fact that > was the plan all along, it's just been taking a bit longer than > expected, sorry about that. OK, thanks. -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2025-05-14 7:37 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-05-08 3:48 linux-next: manual merge of the iwlwifi-next tree with Linus' tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2025-05-06 1:44 Stephen Rothwell 2025-05-06 6:26 ` Johannes Berg 2025-05-07 1:10 ` Stephen Rothwell 2025-05-07 5:37 ` Johannes Berg 2025-05-08 3:24 ` Stephen Rothwell 2025-05-14 2:41 ` Stephen Rothwell 2025-05-14 2:55 ` Stephen Rothwell 2025-05-14 6:41 ` Johannes Berg 2025-05-14 7:36 ` Stephen Rothwell
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox