From nobody Fri Jul 01 14:57:47 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 2A2C88A3AF3; Fri, 1 Jul 2022 14:57:49 +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 4LZJGN2B1pz4djN; Fri, 1 Jul 2022 14:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656687468; 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=GtEQEJiQEKuqiVt3eKgd9gertuy54tHjYa9gBpbT5Ng=; b=mmmZHjXpoi6Gc6wOtF21ZFyulolNO8hrno9la5DpHRQZRlH/CNwP6X2nMYXX06tmc0k9vc KY/XtmcBDmiqsdTd00tzagEkRfDxD6WIes0/2URYrT4LyEQRVVchEz+g8Fp11j5ByuauJi 0tKx/si3IV+UkrCb2va/iQqMz6P5EzJdOTq//dCjJXcBggifPSnI0yUJowVbKO3qx6+Fgm ce0X+ng8TP6LodjwiS/Rs3tAN2qLmkHAexfgzG2j8HoW0IRZIgiJ8saO9/GsI8MO5tUeFJ gmgZs4thErPn6tkEnpS7tXZj9fmv7H2Rx54FXwNIFE7Y+Fq0QFEPcRwuLFWnvg== 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 C51701D6A2; Fri, 1 Jul 2022 14:57:47 +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 261EvlDx057967; Fri, 1 Jul 2022 14:57:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 261Evlif057966; Fri, 1 Jul 2022 14:57:47 GMT (envelope-from git) Date: Fri, 1 Jul 2022 14:57:47 GMT Message-Id: <202207011457.261Evlif057966@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: 05b1792754ea - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 05b1792754ea397bd8147dd15df5e12f8fc1d2db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656687468; 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=GtEQEJiQEKuqiVt3eKgd9gertuy54tHjYa9gBpbT5Ng=; b=UiOSIS7wy/381VFGTjyMQ3mOy/is9O+ZMjEwVWtRtyPJe4y5iwAgUdA6f26UVPz90Qk2ZU OAQ/HLc/HtuI2QulI8Kmh93/qCptUT44aeFTE1obu1rFJCNMKKqSt2SLObWT/YNpyR3awG +A3sl3ZmDL86Lk/7KFxolT34qgghOQCUHSJp8GO6Cu89akllzeFSG5mm/9erTTGxZKKTk0 VypMeHNWe6I2XKahjo4hohaX7gu+2WmuR68TykU7wpf3CDt7ODNq/evjtolY0dfJ/twd+4 PeKfkGhzEfqjO3PuDP/mArrggq363CFJl/qvno6gW6FkCvHOqVmob1s8wG49Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656687468; a=rsa-sha256; cv=none; b=YwBQNnDrZZtBdfn4Ug70RlJpPNGZeJoERpX3zg0frq3ofD6kF8UFlLSh5zY2jDpQQCWJAe LPHyJ+bmHbyCpBYB56Py6wzXwRp5AGY8Ujst8mz3h2au8CpZdE2jn0oxCpCAmlMFeU7BpD 6m5u77ak45MEtPBseektp+RlgQ4G4eJrd7Cv9kseKYSpAs/m1znhQ8M9ZKmL29LPn/kiLa pkYr4E4Fxjy7agQOonSSU9qa3xkHXZ2J8QmXufiNEBKJyhIR6KIVQvvnVkPki+clRwQcsC zsJq14k5LK7kKnzkKnrZeNXWB6R2buX/XJtubQIK+zyLHfcrwvOBX1UFfHF6yg== 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=05b1792754ea397bd8147dd15df5e12f8fc1d2db commit 05b1792754ea397bd8147dd15df5e12f8fc1d2db Author: Bjoern A. Zeeb AuthorDate: 2022-06-26 19:17:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-07-01 13:49:55 +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. (cherry picked from commit 841719c08fd3635a396f62a58aa017ae0bf563e0) --- 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 c19dca862d0a..728f732e5a75 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1030,47 +1030,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;