From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D15072AE90; Thu, 8 May 2025 03:25:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746674718; cv=none; b=nE5JJFatKTmUe+BZPeclRT/VqXtCyM5AqeCFUmm59z/TVI6kSLIhclUmh2BGA7QEtov2mdc5pf+TDNX7hs9n/p1eojFFcuK0rZMOhtYgJDmOoEVhh1h7bMsv5iZcbd63heaYY9E2lwER5+N/UNKMs52YBkZmZk7wDtidZi9iI1Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746674718; c=relaxed/simple; bh=oamHO/+rh+Yf/azxupnezS+7RwfHm0i6EHnHXW8htgY=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ls0/aesAYHvb4Sknfksa+mXfDXr16kAbYm/3hXUDfJhSy2SG+LaJ4UvBxyfp2qC9BGTrDooj0poSeQMwDbjXR+Bgy+KNKc4XGL3EdirMOjvhbJHw8DrYd8dWbMAYPeOcoTUFzonLy6DsZlXK4wYVvHKai8dJ6XoXeJcs3yBEpD8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=KFp/GX24; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="KFp/GX24" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1746674701; bh=F3SmnObXDIw29iBy0rIvhuVqwcl9dtw97tqeyALjVmI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=KFp/GX24duDBknV+evjFDqwEfccHZB048wvi9+c4tMum5DY/WdHp0+ZlHVjXd3a8e sZumjJlgDtC9khytaW7KxlyX9wkoWd+EGc1Fqet1rzXmCsf5Gmmbm9FQaZZeuCJSME ig1PNNP5I5UpWkSRerNX5ZMYS3ppsFUcv3KvjFwaSuECVPdEO7Pvh2F5GlN3Mpn3xe 36HT9qKyVkIE3es3220OKMzCZ8GVPcMRKaIRco6bFlf1ATx0U2FtPk5SasOJbeoSuv WDmgLJBh2Ubd+8GNMX76XkXmFwR4TNDBzRibX6aCyvz9hUwiimvqT5g07t8zqLLYcQ zOCUZBt4m91Qw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4ZtHZ52vmmz4x8P; Thu, 8 May 2025 13:25:01 +1000 (AEST) Date: Thu, 8 May 2025 13:24:59 +1000 From: Stephen Rothwell To: Johannes Berg Cc: Miriam Rachel Korenblit , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree Message-ID: <20250508132459.04bd8e70@canb.auug.org.au> In-Reply-To: <3d5761da40d0ddf4109d10d6f3c3d2538c4d89d4.camel@sipsolutions.net> References: <20250506114402.2f440664@canb.auug.org.au> <20250507111026.4700e392@canb.auug.org.au> <3d5761da40d0ddf4109d10d6f3c3d2538c4d89d4.camel@sipsolutions.net> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/r2y7vj6hlDKtpg+JURmkHh1"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/r2y7vj6hlDKtpg+JURmkHh1 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Johannes, On Wed, 07 May 2025 07:37:46 +0200 Johannes Berg wrote: > > > So, at your suggestion, I just used the latter versions of these files, > > but I then got the following build failure: =20 >=20 > 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. >=20 > 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). =20 >=20 > 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 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 --- .../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/n= et/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_r= egions, struct device *dev); =20 -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))) =20 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 *t= rans, 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); =20 /* 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, en= um iwl_reset_mode mode) struct iwl_trans_pcie_removal *removal; char _msg =3D 0, *msg =3D &_msg; =20 - if (WARN_ON(mode < IWL_RESET_MODE_REMOVE_ONLY || - mode =3D=3D IWL_RESET_MODE_BACKOFF)) + if (WARN_ON(mode < IWL_RESET_MODE_REMOVE_ONLY)) return; =20 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 =3D IWL_TRANS_GET_PCIE_TRANS(trans); @@ -2440,11 +2439,6 @@ bool __iwl_trans_pcie_grab_nic_access(struct iwl_tra= ns *trans, bool silent) if (unlikely(ret < 0)) { u32 cntrl =3D iwl_read32(trans, CSR_GP_CNTRL); =20 - 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; =20 local_bh_disable(); - ret =3D __iwl_trans_pcie_grab_nic_access(trans, false); + ret =3D __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; } =20 -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 =3D IWL_TRANS_GET_PCIE_TRANS(trans); =20 @@ -2513,7 +2506,6 @@ iwl_trans_pcie_release_nic_access(struct iwl_trans *t= rans) * scheduled on different CPUs (after we drop reg_lock). */ out: - __release(nic_access_nobh); spin_unlock_bh(&trans_pcie->reg_lock); } =20 diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wir= eless/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_tran= s *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; =20 /* --=20 2.47.2 --=20 Cheers, Stephen Rothwell --Sig_/r2y7vj6hlDKtpg+JURmkHh1 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmgcJAsACgkQAVBC80lX 0GzjPQf/dr4ZL+j+tt6hu+B76FCI5H23szLlDs+Vd7iiemGgZ0RqNYcw3m0MSvUj gv+mZbtK6lZYqB50NbNSuRIOH5S2vQNEy/96hd/AXahuK4l6D2nkINTsneEoiWgL UXREksUPMpdDdE0aKO1VuOoxDNYu2dFo1SBw18HRmCaZinb5AIWJPEC1DVdbWhGT uvsYoA7DeBvlMQmxHpJIKeoXwCBtPgsuy3bCwkEGSIJDyYnEoQ82DHPDtQeXiGFL ahSTPiYTTwkPv0OLBMLLYkBlVJe9tOkMoQgUI4bH8fkJ0IB7KyzYartFGprRlqTC IzKqimSNXiBMtOLNW6+mKJZxpA0ahg== =XjJy -----END PGP SIGNATURE----- --Sig_/r2y7vj6hlDKtpg+JURmkHh1--