From nobody Sun Feb 27 23:43:37 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D755A19D43C3; Sun, 27 Feb 2022 23:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K6KpL2BcVz522T; Sun, 27 Feb 2022 23:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646005418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pLMUE3Uo3sYuTraScOEVfkRk2UhknZVaPJaKI6Z+i5k=; b=Ww+jFUArcKH5fbUq11xUdleTjtYJ0LPcuZiNGZOS2v43zwb9k6oxflOtidd+wF9V4kiU3Z 0NSwZY/XBWpRKkrPAK3ki9CrmH2p1ACSt/JhS/87hsfAZZwP+dBMu2nuyRD5GQXw5abWrj 3o4Xc5RbrPVfD7dleeafVfKK7C4knhVgyzgurkmp5s0O2X0V577FhoTHlTOdYnYGFpdqkg rKGHKrKnHFEFS5jmlKt6XLyBo8n3Z0BKrgpkMRZne7I2UiftpqcHnFzXkvWV4Iq0PRUsks dL92nm0s4T91A7PPd9JTmakWKDC2/U49MtP2Pla2O9XQb8PjJ7wd6CCvIPER+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00A1210F3D; Sun, 27 Feb 2022 23:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21RNhb7q003000; Sun, 27 Feb 2022 23:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RNhbXK002999; Sun, 27 Feb 2022 23:43:37 GMT (envelope-from git) Date: Sun, 27 Feb 2022 23:43:37 GMT Message-Id: <202202272343.21RNhbXK002999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 94ee6a9e0725 - stable/13 - iwlwifi: enhance debug information List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94ee6a9e07258e3609401776137c846ebe42d2ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646005418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pLMUE3Uo3sYuTraScOEVfkRk2UhknZVaPJaKI6Z+i5k=; b=rdt5FEVm+epuf2tfc6tlFkMZVGtKvQ6MZIHOcEDww5A+10bMGKbG8eNIkArVtbWHjls/c9 qBrpj1Ej0wZvZxIuCTspkmj7PF8KXCAolCnp5VuEB7tXFf4D1m9+0tQo0y934DmYczBGio 0ZzPbMKimy8KylRSEF9xR+9QxdnOYW3Q2FNOM01zSIP4irJoq6Ogaw3b2MhtqWigCDJ8/S ZJlD4B9uCWjrKtI3/Vv54nXMliqow0SxtyzLMnAjoZiCuzag7hWlxTKYCaxcQ3YUqXFvdc IJA85TJs49jRnQAqCgK6wGWO1n6IrVn+2yTiao0GHZm4Rv5fUfQBT1HpFOpkgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646005418; a=rsa-sha256; cv=none; b=sSndPJNes9iWFt7a/+qxvXRfaQWpqdkwui5+TRUIlWGyk7+/Fx540OgBPxguHrM+mlx77U f0V/5/W5BKah8Y/SK6AVTq4n7tW59sv1D7acuCCBlsZRtMl6zkWM6RqePHSbTE6TQ4yw6T wtvUh1nXATsTuAekmZKhPCeDmodtHK7PthW7EyCQhij1+bzrvgDgTVu2YCBJmp3VUOiV0d TT+8VWoMDuGiePGYbBvLaYxEqilPs+uy/eExgWhiDUpjp+XU01+cidLCnAFSKLD0/zs0MW YYC50HHBOBUd9Vxj7I5V6IM50GMBnVXBjc4w/433LVueB/ehSzosn2veX1Zaqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=94ee6a9e07258e3609401776137c846ebe42d2ad commit 94ee6a9e07258e3609401776137c846ebe42d2ad Author: Bjoern A. Zeeb AuthorDate: 2022-02-24 21:38:27 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-27 23:41:55 +0000 iwlwifi: enhance debug information Add a string of the debug type to the output of the debug message so it is easier to search for specific events in a trace with lots of debugging on. While here remove superflous (). Sponsored by: The FreeBSD Foundation (cherry picked from commit 51152e5e6150746ad5514f169c8fd1d04b010b35) --- sys/contrib/dev/iwlwifi/iwl-debug.h | 81 ++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.h b/sys/contrib/dev/iwlwifi/iwl-debug.h index e1316925442d..dac2c6b31562 100644 --- a/sys/contrib/dev/iwlwifi/iwl-debug.h +++ b/sys/contrib/dev/iwlwifi/iwl-debug.h @@ -89,11 +89,11 @@ void __iwl_warn(struct device *, const char *, ...); void __iwl_err(struct device *, enum iwl_err_mode, const char *, ...); #define IWL_CRIT(_subsys, _fmt, ...) \ - __iwl_crit((_subsys)->dev, (_fmt), ##__VA_ARGS__) + __iwl_crit((_subsys)->dev, _fmt, ##__VA_ARGS__) #define IWL_INFO(_subsys, _fmt, ...) \ - __iwl_info((_subsys)->dev, (_fmt), ##__VA_ARGS__) + __iwl_info((_subsys)->dev, _fmt, ##__VA_ARGS__) #define IWL_WARN(_subsys, _fmt, ...) \ - __iwl_warn((_subsys)->dev, (_fmt), ##__VA_ARGS__) + __iwl_warn((_subsys)->dev, _fmt, ##__VA_ARGS__) /* XXX Not sure what the two bools are good for if never passed. */ #define __IWL_ERR_DEV(_dev, _mode, _fmt, ...) \ __iwl_err((_dev), IWL_ERR_MODE_REGULAR, _fmt, ##__VA_ARGS__) @@ -112,82 +112,87 @@ bool iwl_have_debug_level(enum iwl_dl); void iwl_print_hex_dump(void *, enum iwl_dl, const char *, uint8_t *, size_t); void __iwl_dbg(struct device *, u32, bool, const char *, const char *fmt, ...); +#define IWL_DPRINTF_DEV_PREFIX(_dev, _e, _prefix, _fmt, ...) \ + __iwl_dbg(_dev, _e, false, __func__, #_prefix " " _fmt, ##__VA_ARGS__) #define IWL_DPRINTF_DEV(_dev, _e, _fmt, ...) \ - __iwl_dbg((_dev), (_e), false, __func__, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF_DEV_PREFIX(_dev, _e, _e, _fmt, ##__VA_ARGS__) #define IWL_DPRINTF(_subsys, _e, _fmt, ...) \ - IWL_DPRINTF_DEV((_subsys)->dev, (_e), (_fmt), ##__VA_ARGS__) + IWL_DPRINTF_DEV((_subsys)->dev, _e, _fmt, ##__VA_ARGS__) +#define IWL_DPRINTF_PREFIX(_subsys, _e, _prefix, _fmt, ...) \ + IWL_DPRINTF_DEV_PREFIX((_subsys)->dev, _e, _prefix, _fmt, ##__VA_ARGS__) #else /* !CONFIG_IWLWIFI_DEBUG */ #define IWL_DPRINTF_DEV(_dev, _e, _fmt, ...) #define IWL_DPRINTF(_subsys, _e, _fmt, ...) +#define IWL_DPRINTF_PREFIX(_subsys, _e, _prefix, _fmt, ...) #endif /* CONFIG_IWLWIFI_DEBUG */ #define IWL_DEBUG_ASSOC(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_ASSOC, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_ASSOC, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_CALIB(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_CALIB, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_CALIB, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_COEX(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_COEX, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_COEX, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_DEV(_dev, _level, _fmt, ...) \ - IWL_DPRINTF_DEV((_dev), (_level), (_fmt), ##__VA_ARGS__) + IWL_DPRINTF_DEV((_dev), (_level), _fmt, ##__VA_ARGS__) #define IWL_DEBUG_DROP(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_DROP, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_DROP, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_EEPROM(_dev, _fmt, ...) \ - IWL_DPRINTF_DEV((_dev), IWL_DL_EEPROM, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF_DEV((_dev), IWL_DL_EEPROM, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_FW(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_FW, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_FW, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_FW_INFO(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_FW | IWL_DL_INFO, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF_PREFIX(_subsys, IWL_DL_FW | IWL_DL_INFO, IWL_DL_FW_INFO, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_HC(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_HC, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_HC, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_HT(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_HT, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_HT, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_INFO(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_INFO, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_INFO, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_ISR(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_ISR, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_ISR, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_LAR(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_LAR, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_LAR, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_MAC80211(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_MAC80211, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_MAC80211, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_POWER(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_POWER, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_POWER, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_QUOTA(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_QUOTA, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_QUOTA, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_RADIO(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_RADIO, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_RADIO, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_RATE(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_RATE, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_RATE, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_RF_KILL(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_RF_KILL, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_RF_KILL, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_RX(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_RX, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_RX, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_SCAN(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_SCAN, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_SCAN, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_STATS(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_STATS, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_STATS, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_STATS_LIMIT(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_STATS, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_STATS, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TDLS(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_TDLS, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_TDLS, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TE(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_TE, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_TE, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TEMP(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_TEMP, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_TEMP, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TPT(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_TPT, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_TPT, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TX(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_TX, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_TX, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TX_QUEUES(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_TX_QUEUES, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_TX_QUEUES, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TX_REPLY(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_TX_REPLY, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_TX_REPLY, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_WEP(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_WEP, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_WEP, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_WOWLAN(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_WOWLAN, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_WOWLAN, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_PCI_RW(_subsys, _fmt, ...) \ - IWL_DPRINTF((_subsys), IWL_DL_PCI_RW, (_fmt), ##__VA_ARGS__) + IWL_DPRINTF(_subsys, IWL_DL_PCI_RW, _fmt, ##__VA_ARGS__) #endif /* _IWL_DEBUG_H */