From nobody Sun Feb 18 21:11:03 2024 X-Original-To: dev-commits-src-all@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 4TdJHW6mScz5Bm2J; Sun, 18 Feb 2024 21:11:03 +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 4TdJHW4zzdz420t; Sun, 18 Feb 2024 21:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290663; 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=+fCyYkPJ3jrH+ydvZg26YvnMx+gHYO2sfb7Mm9883xw=; b=rnP6ceNJQIpgBjzPpXQpXf7yYl0OucSmxoNrj5lOJbL/DRE/0W3wZJuKg7L2MfwV1QXloS LmfCyhOAzm9bDTyw3cSdcEQaoqm1P22EyY2hPmyigLzOzcbPOqiQ9mF06nhabdZ/FIgWhj TX4150qzsSUhUwStfQF21BA+P+cWvJvTW/R/Cduxbhp5uDxPOcCAP8fm0nkaK5Nky5Gy+V j7OoZ+++85tsnJDNJHDLOFNfYsmDJDgjMqaSejj96752SP97/w2sUJy8qvYIHlAdGZwfGY 9jIyUsOn1sAVLqM0HqkaJSrO4Zw56ZTHIraZPEYYr++iIVGXXK/re/ilSV6Arg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290663; 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=+fCyYkPJ3jrH+ydvZg26YvnMx+gHYO2sfb7Mm9883xw=; b=BXwTzMRqzQkGqKM7guvhg+QQP9yLOISl88Lyb/iNLHq0AYqrhblsXtrC5ctCT5Y+kl9oDo ekAWmZpr8L8sh6Nry/jkhhq9fvhp2ri5T6YKMGTYoztZP4chzwdvI0b01taJ0eAXXXsxsv bYflsDTcT9uypH4IN8C9xSHLzzk2EYXTTG8n2Gf4S/Jt8GOHMrVgT4TMICkoKI6piOnXo1 tdKgFfMQjhk/72B09bT5UmYlJ5CFCENHPBDI85eyIgDo8BP/kNhHBS4mBzN++TTbc+U0Hb UHf6zgog36U2qwvR6JKPUoNzNKlJs3eFiNCV0EHmyeIFdMvbq7HmsRvXqEc+sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290663; a=rsa-sha256; cv=none; b=q/f2jWm8TEYTvJy8NAhQUIQyIZPEeYwTxymPbWVjM1EwrPIxgB09rPdoyeE1TlCcITTisp EBuuTTDWgbEWvfu+6HM2qgtJiOqM0YosYHUkJ1nMCRrph/9P8pxzhcerJDxXu9LsjWtVKO XF+3FjHL1dqD1b/U0kI3rKRcX+bl4qxvz7wCTxAYHZr3/mPPqcXugv1UdORVdZSX0dUKqj bSkq9/uWPi/+i9Drw/dp+uehIJdTDxfo+BNSG0FeKWZrF3ugURze47+G2OdIR8MBYNgBy7 ZnrzNAG7S9nUU56PAgFfnlXiNZKFSXm2ciOpb8QlsW6MprTCZ49BlBrvSV5VDQ== 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 4TdJHW456hz16Rq; Sun, 18 Feb 2024 21:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41ILB3Cn012850; Sun, 18 Feb 2024 21:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILB327012847; Sun, 18 Feb 2024 21:11:03 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:03 GMT Message-Id: <202402182111.41ILB327012847@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: fcc737d59ead - stable/14 - rtw89: improve debugging and fix a sleep issue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: fcc737d59eade538ee846b6fc63a6068758e2ae6 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fcc737d59eade538ee846b6fc63a6068758e2ae6 commit fcc737d59eade538ee846b6fc63a6068758e2ae6 Author: Bjoern A. Zeeb AuthorDate: 2023-09-06 16:47:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 16:41:34 +0000 rtw89: improve debugging and fix a sleep issue Improve log messages to be more helpful in error cases. Change one LinuxKPI sleep function as we cannot call the original one from a context we cannot sleep. Both cases were hit during testing. MFC after: 3 days (cherry picked from commit 118d0ff54d4f7cffe6a13a1e0cdb2fe23fbfce74) --- sys/contrib/dev/rtw89/fw.c | 9 +++++++++ sys/contrib/dev/rtw89/phy.c | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/sys/contrib/dev/rtw89/fw.c b/sys/contrib/dev/rtw89/fw.c index 17e4ce7cd64a..c1dade182d88 100644 --- a/sys/contrib/dev/rtw89/fw.c +++ b/sys/contrib/dev/rtw89/fw.c @@ -903,7 +903,12 @@ static void rtw89_fw_prog_cnt_dump(struct rtw89_dev *rtwdev) for (index = 0; index < 15; index++) { val32 = rtw89_read32(rtwdev, R_AX_DBG_PORT_SEL); rtw89_err(rtwdev, "[ERR]fw PC = 0x%x\n", val32); +#if defined(__linux__) fsleep(10); +#elif defined(__FreeBSD__) + /* Seems we are called from a context we cannot sleep. */ + udelay(10); +#endif } } @@ -3890,7 +3895,11 @@ static int rtw89_hw_scan_prehandle(struct rtw89_dev *rtwdev, ret = rtw89_hw_scan_update_probe_req(rtwdev, rtwvif); if (ret) { +#if defined(__linux__) rtw89_err(rtwdev, "Update probe request failed\n"); +#elif defined(__FreeBSD__) + rtw89_err(rtwdev, "Update probe request failed: ret %d\n", ret); +#endif goto out; } ret = rtw89_hw_scan_add_chan_list(rtwdev, rtwvif, connected); diff --git a/sys/contrib/dev/rtw89/phy.c b/sys/contrib/dev/rtw89/phy.c index e2b8303d3f63..138788b2ed05 100644 --- a/sys/contrib/dev/rtw89/phy.c +++ b/sys/contrib/dev/rtw89/phy.c @@ -1439,7 +1439,11 @@ static void rtw89_phy_init_rf_nctl(struct rtw89_dev *rtwdev) ret = read_poll_timeout(rtw89_phy_nctl_poll, val, val == 0x4, 10, 1000, false, rtwdev); if (ret) +#if defined(__linux__) rtw89_err(rtwdev, "failed to poll nctl block\n"); +#elif defined(__FreeBSD__) + rtw89_err(rtwdev, "failed to poll nctl block: ret %d val %#06x\n", ret, val); +#endif nctl_table = elm_info->rf_nctl ? elm_info->rf_nctl : chip->nctl_table; rtw89_phy_init_reg(rtwdev, nctl_table, rtw89_phy_config_bb_reg, NULL);