From nobody Wed Feb 16 03:11:37 2022 X-Original-To: dev-commits-src-main@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 F3CDF19DAF69; Wed, 16 Feb 2022 03:11:37 +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 4Jz2zs6bxYz3CDs; Wed, 16 Feb 2022 03:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644981097; 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=aQssXxJV7leS9lJmzxXhUYGIkLMLbsYhRDDx05OmlxY=; b=KOwhBr0HrtEcSdl3T8SnQgOjcs7ck0XqxBYJ0QSr0RzZLIsNF/GUmIhSvRER9FyiiFWqj2 IMkuBhf6vJH3futk+A5agpbUyNejfdzCnLE5E0d9M+T8o/oe+oqmgk99YhMa4CHz5LAw3V c/gO0R4MHrXK+Usdq6OR6uD/b50KLGvQLdWY5PvV83bKdujskx6MVVyf1JbtHGSZadx6JX /Hkho/lMegGOnRiL8S2rXJU5htHrd6kcpq/j40AzS4qoBZkdkxFlb08qWixU4w1qZdD6Cp 9Kbk1wxLWCjHkRrg429sYk0Po1naxOwf32AZ7tGPmR5XoGz1tcOw1B2vdveN4g== 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 C27BE66E4; Wed, 16 Feb 2022 03:11: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 21G3BbDB071963; Wed, 16 Feb 2022 03:11:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21G3BbMn071946; Wed, 16 Feb 2022 03:11:37 GMT (envelope-from git) Date: Wed, 16 Feb 2022 03:11:37 GMT Message-Id: <202202160311.21G3BbMn071946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d3ef7fb459ff - main - LinuxKPI: 802.11 scan update List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d3ef7fb459ff924911e5276db0c04b13cd8074d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644981097; 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=aQssXxJV7leS9lJmzxXhUYGIkLMLbsYhRDDx05OmlxY=; b=Ypby+Vf9ObzF0vdeq7eNQCGYnY3vLSJiUS+zy7AZ3ZqMv88r6Zhuq4WrPAP7IMIX2v7rZR 2/vmHzRwUIUDr9fHsI4rFptB8TPcLJnzuzNjROVXDLCZq3DWbjXMRbZgbfKtxSjXhfjLNK QJDYRCltykRil0+gQCxj+1wxhNVAPRJopV2dsX2EtNVvPUz8clLdZgW1KoZgc/Hfci9TaZ G/WvQV1hgEM49rIh81g5NMTyn0fmNPI8jMi2qUvFAd1Nqme6OvginXB6onzxyHbpkuUt6B Fc7nEFY6Knz5KNhW1J/CWJbS0Mu/g1cEWrGH653dBNaRqiA6HO4RJbRz69ipYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644981097; a=rsa-sha256; cv=none; b=a1tp0NL2JeMSn/0dAUHPKDzJNR4HZ9XI6fa5rwDHvwF3cJdui0IH8/epFUrcVmJPROI38R uMKV74l0ClA5KHchUXqc6GjvJP8CGL5mi+9z+lNNLgIIertW/yYftyPnsKks9bvKKs592Y p2bc5f1lf75uheLjshXJXP3Zjapqn3ceJyuCz/Fh2AFMPXnKMsPDqYKxZDgEob3UBz53K7 ZtDBR/9ZTmb6wHyUFknC6u2IyVdLalZ77uit/8Dl0/JY7W+ehpi6i6Ehdz/6ua68KAJNQR dIX8XQLlDVnXhsG1VEKZMKUPyCAN0K98aOgKcxMhooVqDlzXKT1O9sf7guBt0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d3ef7fb459ff924911e5276db0c04b13cd8074d9 commit d3ef7fb459ff924911e5276db0c04b13cd8074d9 Author: Bjoern A. Zeeb AuthorDate: 2022-02-16 03:00:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-16 03:11:01 +0000 LinuxKPI: 802.11 scan update Realtek's rtw88 is returning a hard-coded 1 in case they cannot hw_scan (fw not advertising it). In that case if we want any scan to run we need to fall-back to sw scan. Start dealing with this. Long-term we probably need to keep internal state. MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index a1010b23f76f..5cbbf269172f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1899,13 +1899,13 @@ lkpi_ic_scan_start(struct ieee80211com *ic) ss = ic->ic_scan; vap = ss->ss_vap; if (vap->iv_state != IEEE80211_S_SCAN) { - /* Do not start a scan for now. */ + IMPROVE("We need to be able to scan if not in S_SCAN"); return; } hw = LHW_TO_HW(lhw); if ((ic->ic_flags_ext & IEEE80211_FEXT_SCAN_OFFLOAD) == 0) { - +sw_scan: lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); @@ -1965,6 +1965,10 @@ lkpi_ic_scan_start(struct ieee80211com *ic) hw_req->req.ie_len = ; hw_req->req.ie = ; #endif +#if 0 + hw->wiphy->max_scan_ie_len + hw->wiphy->max_scan_ssids +#endif hw_req->req.n_channels = nchan; cpp = (struct linuxkpi_ieee80211_channel **)(hw_req + 1); @@ -2010,12 +2014,21 @@ lkpi_ic_scan_start(struct ieee80211com *ic) vif = LVIF_TO_VIF(lvif); error = lkpi_80211_mo_hw_scan(hw, vif, hw_req); if (error != 0) { - ic_printf(ic, "ERROR: %s: hw_scan returned %d\n", - __func__, error); - ieee80211_cancel_scan(vap); free(hw_req->ies.common_ies, M_80211_VAP); free(hw_req, M_LKPI80211); lhw->hw_req = NULL; + + /* + * XXX-SIGH magic number. + * rtw88 has a magic "return 1" if offloading scan is + * not possible. Fall back to sw scan in that case. + */ + if (error == 1) + goto sw_scan; + + ic_printf(ic, "ERROR: %s: hw_scan returned %d\n", + __func__, error); + ieee80211_cancel_scan(vap); } } }