From nobody Tue Nov 22 17:46:10 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 4NGsBB1q0Sz4j9Cl; Tue, 22 Nov 2022 17:46:10 +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 4NGsBB1PLqz3jpP; Tue, 22 Nov 2022 17:46:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669139170; 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=KAeUWTOG0dVASjBvlRbg28tp+QHX1CFcAdB5ulJpez4=; b=pD2VjqrNLzYN+yp/Tt7UV2eIMlmoJUN5kUNA3yILJtU6lmTuuxXVo82FDsM71pBobaPORG vybd05n3U9Bv7mYAGWYUBXLYIn0DRZ6Mc0T5TiugE5iYlD4bkgTGY9yb4qv4OclvLkTb+K WhHpCMMZBFcFlXQlYqin5/2ofz9NFttX+0sEaYTBWBXHGohMDKTTRlq0C7JnwIWnk7NDZ5 AkkvMSYXC7RxK45x1CUorJhATn9QRgTdf93CE1JRTSnUsb8Kfh5BCum/JBJANDXyrGXYoy W5HO9d+JSh8ycA/uq3vAq701uBnjPBYf+7VJoLIGHqmE7ZvemFBASL5N2u0zfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669139170; 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=KAeUWTOG0dVASjBvlRbg28tp+QHX1CFcAdB5ulJpez4=; b=YYx4MH/u3Y4/rAFgBxAPJ/G9TB3/NPlU5tMUZV2Ja/UiUy2qBoF+2EhTPB2l6yomseHQ2o 6SZpfUkKomU1rc2EjZJ6M0aH4fTqVg6oAbg27oDQcCMT2QmdrjzoqK5D2YrpuKbfHS9Ifd g+SIz2SV9OxWS64KZuIWEFM3rOJwWsr2PQrhfOyGxhkbbXOHk8H5S12XQ6L/+Dfw6vCeNI jrmWwFHe6+XKgfvDIMvb4OguhbB+B64Hv0ZDpvbjF6N9/QvWHAgcu0BounHJVZYYrmnfEs JFkY/C5pux7m0LMAZg/DDgIfCueQW25YKJKVl0IZpabkumclG183Hpheg92aPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669139170; a=rsa-sha256; cv=none; b=sdyIgOZ5r+JfvDQQ7LcesVj8ULHArdLTqtCso7H07QAVk/XNcz+eZwUT7Aw02FO80u8Q19 LhNP93hVJf/oKNqHF+S7V/ILywai/B4L7nzlI7jqZm7/sJEPZKjt7oQZTAoIukIsQDFITF 2d/dKSHmXqou6BqGJ6U3nxzaR5EhEgShi6f93jJu2NSpIEj10l4mGDptpfF0krtKLJmo59 V7P5DXSiw9Gcuv4bqSlR+8VTwiAsQAmw9rnH7N72cEBJvENln9/nLozm3UeEQNN4rf5wLJ UaPUNNJJsQbUxI9IdQGc7QOZwofIuO3mt2keGa0Ic4q3NB4/Ekb2K9iAX2s2BA== 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 4NGsBB0SGlzrjn; Tue, 22 Nov 2022 17:46:10 +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 2AMHkAa0053979; Tue, 22 Nov 2022 17:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AMHkAD7053978; Tue, 22 Nov 2022 17:46:10 GMT (envelope-from git) Date: Tue, 22 Nov 2022 17:46:10 GMT Message-Id: <202211221746.2AMHkAD7053978@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: bee60c989745 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bee60c98974593d25aa18743f9413a78e0d57dc9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bee60c98974593d25aa18743f9413a78e0d57dc9 commit bee60c98974593d25aa18743f9413a78e0d57dc9 Author: Bjoern A. Zeeb AuthorDate: 2022-11-22 17:29:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-22 17:29:41 +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 MFC after: 3 days --- 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);