From nobody Sun Jun 26 21:27:08 2022 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 E863E87F22B; Sun, 26 Jun 2022 21:27:08 +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 4LWP7w4fTBz3j9G; Sun, 26 Jun 2022 21:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656278828; 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=yl1KvvYk0+IMIcRIar5OxYRpdeYGmc6gEIUCPYtQasw=; b=TlDBzwtFxZJZIIwLqDaqSVGDsQSe5a5qSEygNNBz91wpATKZOfxwKj+fmS5/PdNS/+jRRg fvzgwe7AWNgmiysCxBXo65TMvRtXdKgJ1w7bJizJM1lv2eCluTsU5v4ZITViRgDv2ZuBIQ Wx4RKwb/LYX3pxbdbfBCCvKnhD4/TMsUpLFu8/uSyEDF8VtUNhULrj24m1O35zmuVcdrDq TsxvaKSJLLOyVCUSsCLnBYKc0X1mHiOo1he97vlK7Fq3nHSaYrROTeNgetP4L7ooZtysn8 i3YjR+RWkIoCXECjrX+NAzdFEEBm87tmz/z2x6P6i6kaFShxiiuvyKllUyADvQ== 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 6AC521B8BD; Sun, 26 Jun 2022 21:27:08 +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 25QLR8c8007151; Sun, 26 Jun 2022 21:27:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25QLR8kB007150; Sun, 26 Jun 2022 21:27:08 GMT (envelope-from git) Date: Sun, 26 Jun 2022 21:27:08 GMT Message-Id: <202206262127.25QLR8kB007150@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: 841719c08fd3 - main - LinuxKPI: 802.11: remove an early bandaid to make sure queues are allocated 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/main X-Git-Reftype: branch X-Git-Commit: 841719c08fd3635a396f62a58aa017ae0bf563e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656278828; 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=yl1KvvYk0+IMIcRIar5OxYRpdeYGmc6gEIUCPYtQasw=; b=jmpCByDQvtccbIefy963ZNdrwdwCl/HkX20kL/8/PcM9DnSlOq+1kvpCeoRG7D2UcDEmZr z05MtER/I5Hv3lLivkIAImQpG8WafheJUtXDV3wFTC+iOVt2cnMLq+7uGm/UXhfpgkUg9x A4v3GH1Y2gsrpDXxRS+pckoQbRcEfxZgUnGrZTie5RWMGfaBQXiFqveMHMrRc6DnutWXWT 5+67OKYcQ3sjnaWhGm07SypGgNJUcYNOjOk1tsVmODQ4g22Tg6Os3PLKzh9rKazR/d7R5q PJVha//5pzRmTH5DYODZYtYBCxKrU3rRU3NBx1wPXxHtNJuxd1Tmp4EDXAZ97Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656278828; a=rsa-sha256; cv=none; b=c+66aswhY8ruRpvDBmqFM0M5s+gDo9HWAlt2fTvkwvC8kQfnG+Ms0jCZiO74Z3sZnRwFzK nqQN4i9s5sSG3g1pGjfIRD3jebZeOQE8e/nBnxUR4q15ypB5ubgoSMnEs5YntHzBraFJDX QUOfq0fyXVqGt5X9YmcVIlZSvAKWxGQCJTUv+V/PeEcn5hOHbhndOXMeOgJ7HoGQ0TMdCY l9GwP/HR456VQclTt67dxT1NulTn3B7MGO2h262Mcd3ds3v7xUfM7j8wNTPrY/ouy/S7yQ KzBl+M9Fd9lZBgxSJxqoH+Igk+VHa7YCo/PzRKWb1puM+dF9QCMr093vEME+Ew== 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=841719c08fd3635a396f62a58aa017ae0bf563e0 commit 841719c08fd3635a396f62a58aa017ae0bf563e0 Author: Bjoern A. Zeeb AuthorDate: 2022-06-26 19:17:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-06-26 19:17:04 +0000 LinuxKPI: 802.11: remove an early bandaid to make sure queues are allocated iwlwifi allocates queues on first wakeup. This takes a lot longer on FreeBSD's work implementation that it seems to on Linux based on some discussion. That meant that we couldn't get non-data frames out quickly enough initially and failed to associate. d0d2911035192473e8bd3f6b99ed5ca9b1b29e47 should have solved most of this for us with iwlwifi. None of the other drivers ported to LinuxKPI/802.11 up to today will call a dequeue so we get notified when the queus are allocated or even need to do so. Remove the bandaid initilly put in for iwlwifi now and speed up the overall process of getting us associated. MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 41 ---------------------------- 1 file changed, 41 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0bb01a633e09..8f72215614c6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1036,47 +1036,6 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int */ lkpi_wake_tx_queues(hw, sta, false, false); - { - int i, count; - - for (i = 3 * (hw->queues + 1); i > 0; i--) { - struct lkpi_txq *ltxq; - int tid; - - count = 0; - /* Wake up all queues to know they are allocated in the driver. */ - for (tid = 0; tid < nitems(sta->txq); tid++) { - - if (tid == IEEE80211_NUM_TIDS) { - IMPROVE("station specific?"); - if (!ieee80211_hw_check(hw, STA_MMPDU_TXQ)) - continue; - } else if (tid >= hw->queues) - continue; - - if (sta->txq[tid] == NULL) - continue; - - ltxq = TXQ_TO_LTXQ(sta->txq[tid]); - if (!ltxq->seen_dequeue) - count++; - } - if (count == 0) - break; -#ifdef LINUXKPI_DEBUG_80211 - if (count > 0) - ic_printf(vap->iv_ic, "%s: waiting for %d queues " - "to be allocated by driver\n", __func__, count); -#endif - pause("lkpi80211txq", hz/10); - } -#ifdef LINUXKPI_DEBUG_80211 - if (count > 0) - ic_printf(vap->iv_ic, "%s: %d queues still not " - "allocated by driver\n", __func__, count); -#endif - } - /* Start mgd_prepare_tx. */ memset(&prep_tx_info, 0, sizeof(prep_tx_info)); prep_tx_info.duration = PREP_TX_INFO_DURATION;