From nobody Mon Nov 28 17:27:11 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 4NLXTX2Jbrz4jQr6; Mon, 28 Nov 2022 17:27:12 +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 4NLXTX01DPz445T; Mon, 28 Nov 2022 17:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656432; 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=GyqKBUAPGaQ/LJif18rVhw1QqiERGPC1aNKPR9D9eDU=; b=cuLSfjMfoKmt9ndMk/InxDePI2o5j//KqSIZ/hWmfUsspjsi6a6AA4RaPnMLy7eaq3iU9r moEW/Rm6mTFzVM2wHNF5PlIwZWy6YAaNhVbGdBHg9uzAVv0RwVT+49YtoczagpTIWNQKKW 5ii9MoDIFLtc142Jqr9r7RNDp00Ydd3zfLep7ZE+hBnrhWH5XKDZvVjWf+lMmqVmPFXcnZ v2IPUUkbhVxOaIGL5EwsPEWQ+wVP5C5jGjFnlVAoaaEHPmhHc4y7zRcBCzIIWODXWwVUXs rIJVsDphWEB0aZoVc1dkEudnTAQirM2sbDS/gp8hcFJXJcQJhDnZo0L5KnkfkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656432; 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=GyqKBUAPGaQ/LJif18rVhw1QqiERGPC1aNKPR9D9eDU=; b=TxgNbbFmjzXBOIcu7vYP9URhqtjnKDMJdyNZjSGaSBC4AdvnJ895/9HObiO6wbgcrDsAdf /uhX/RnF8bB4HSDsZ4RWtmfmbVpJWidKTw0zZY33d0E1t75s8sPUAFppA1Y5vYyBexnVdB dfOfGhhHNvupVu5hAGqNRYJML4NmXCH1C1WmFaWTk9iDPCNqHNuPMF6U/U4cxfPTLlggxL 3bXaT85m1EQv1RY6C7wIIDd8UuuYdjoYgJnigL+4Fus/TWGGYJYeXHyhM7aLUG7U52xlCY Wvk2227XiWGO4omntBNwPN7wmq0yOWLHax6MCZNseHTaUvumLNj7sFTfRhXXiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669656432; a=rsa-sha256; cv=none; b=ECSX1L4+Gmaphy+XOvQ0BYqNf9IqnYeYT7TEJfd34Wf9jO1GFPJWR/x25S8rfNafyKY6M7 DSFmaJehBr8iXeC9srEKsAptl7xRHYzrY2iRRHNpmQyw6Cur/NLySPiOUB2z+u6aNoK5cm mJsHWfbj5YPNHlYfvPxudG2UUTaKe8cjMkaEQM0rHLYsXnSX+1ZCKRY6YJz1MkNZWzPy5z GV6qyibCiDARkuGjqcvqGRt+UmTFyr6CYMdiE7RJMRmSU4FWOUCYnlN/pzZYg2AinW4pTp MKv93LYKNZ2kxjxmazmawhSzSo5l0okBVoCxZDIBLCPd5Rwx8TczBKfICm/Diw== 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 4NLXTW6CN7zld1; Mon, 28 Nov 2022 17:27:11 +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 2ASHRBiQ081415; Mon, 28 Nov 2022 17:27:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASHRBJ9081414; Mon, 28 Nov 2022 17:27:11 GMT (envelope-from git) Date: Mon, 28 Nov 2022 17:27:11 GMT Message-Id: <202211281727.2ASHRBJ9081414@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: 46c09d766d26 - stable/13 - iwlwifi: fix hang on unloading driver 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: 46c09d766d265a886a7fd11ee5dd88bb17e9a0af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=46c09d766d265a886a7fd11ee5dd88bb17e9a0af commit 46c09d766d265a886a7fd11ee5dd88bb17e9a0af Author: Bjoern A. Zeeb AuthorDate: 2022-11-22 17:29:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-28 16:34:46 +0000 iwlwifi: fix hang on unloading driver f808c43ad9234670770601ba32a7426b00bbf528 introduced a FreeBSD specific behaviour to wait for firmware load completion before returning from loading the driver. This does no longer allow iwl_drv_stop to detect that startup has completed and it will wait indefinitely for a completion event that will not happen. We could change the complete() call to a complete_all() but to avoid confusion, future side effects, and for simplicity daisy-chain two complete events in FreeBSD. PR: 267869 Reported by: Peter Much (pmc citylink.dinoex.sub.org) Tested by: Peter Much (pmc citylink.dinoex.sub.org) Sponsored by: The FreeBSD Foundation (cherry picked from commit bee60c98974593d25aa18743f9413a78e0d57dc9) --- sys/contrib/dev/iwlwifi/iwl-drv.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/iwl-drv.c b/sys/contrib/dev/iwlwifi/iwl-drv.c index 6daba537262b..cecbacbe62c2 100644 --- a/sys/contrib/dev/iwlwifi/iwl-drv.c +++ b/sys/contrib/dev/iwlwifi/iwl-drv.c @@ -77,6 +77,9 @@ struct iwl_drv { char firmware_name[64]; /* name of firmware file to load */ struct completion request_firmware_complete; +#if defined(__FreeBSD__) + struct completion drv_start_complete; +#endif #ifdef CONFIG_IWLWIFI_DEBUGFS struct dentry *dbgfs_drv; @@ -1736,6 +1739,9 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) drv->dev = trans->dev; init_completion(&drv->request_firmware_complete); +#if defined(__FreeBSD__) + init_completion(&drv->drv_start_complete); +#endif INIT_LIST_HEAD(&drv->list); #ifdef CONFIG_IWLWIFI_DEBUGFS @@ -1763,6 +1769,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) * returned before it was all done that is what could happen. */ wait_for_completion(&drv->request_firmware_complete); + complete(&drv->drv_start_complete); #endif return drv; @@ -1779,7 +1786,11 @@ err: void iwl_drv_stop(struct iwl_drv *drv) { +#if defined(__linux__) wait_for_completion(&drv->request_firmware_complete); +#elif defined(__FreeBSD__) + wait_for_completion(&drv->drv_start_complete); +#endif _iwl_op_mode_stop(drv);