From nobody Tue Apr 29 11:41:33 2025 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 4Zmz1B2lZyz5tvBf; Tue, 29 Apr 2025 11:41:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zmz1B19xkz3wgK; Tue, 29 Apr 2025 11:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926894; 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=H49jQ+yaoGYwHQ1TTMrSS+l5qyIr76qNeN3RuG16r4A=; b=qle/4HId3JQYq+MpohanMxgu2NJKnQ39Pq02VT/J4IKWMCp3WhDxebqHNvN8vLt8jNuZb+ E1UXjiGPGNn+89FgCOo6BThGY0oWjAEgzTZhvd0NYVXh3n3g1WVceQXwkt26E+FpgX+CGD 4KTVL4mh5aUHI2xhF/DtYLiBKJUa1b/AdWn3B9U7x4GHGHQSQBY57XGXpzYaAku30iGAKI oNPSiy03AHBth8GumuNaUJhsEgCA0Rg3JGZ3PLse8c0TEDWc0NXTt8+PLL8SeVcjbyKxSm QXYCWm97pY8/9R+bsapaH4Hyu6ZOaunes2YOEzzZhoR4kv8LtV3d3kOUiO9Iqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926894; a=rsa-sha256; cv=none; b=qPgfBiI3jAdL7OjTuvX5YHhAUtrZhnD+N0I6HXixr7DxhIZaWoBCOZvMS6226RAOmlyvru g4KJFRQ2PrOisIYB7I+MeL22g2xj89I5RlTKxx2nQ5k4rn2tfJwOCbaaYNrMhGhCYk4dX6 VMgMNOh37EVlGmys4sbFqMiq7jpWWUzEe8TZM03KDrFuTY4ByLfn5EJ6htwquBdQ7zebEB IW+rB77kyg7uFO51G+dCi0yBYx2svFKXI1t6jE7Plpdgp+sas2js/DPgKAaoXTTB3910WT kmTXkXkEH5oVUbkvJXYPSHvsnLrFhX/g/CwIin34EMPQyB0Jh1upU0JdHJUNIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926894; 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=H49jQ+yaoGYwHQ1TTMrSS+l5qyIr76qNeN3RuG16r4A=; b=rzCctSEIj9Grq7KQvEvxxxeT9Yb668AIS4WhD6c8/QI0QZ5ieUvVXJy8nvNannorybuTuA Ks7GC4nJoLtuirpiytNUtdQXUzoN6lBNxTAKHh1YjjHU9cxUeZ0Yp6Q+4Gat+z0RwH1UA5 mQNl6NZEybzRxHIPEGwgpL9FBjRtdmoCjl+pgF7JTXFWhNMyKLZ1BDpsxd8BvULzQ5zICb 2mv1hXq81mU38mEY72EcxMl7SvPrqyM6aiPWJuyY+kRfCUr2/g66CkuLi68eLiowLo/PvM si4CTXhgoVHYndN0JD5K1Npb976cB/UBW1c1ivA+J4oUf91ydeCz7+GKB0TwUg== 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 4Zmz196Y3Qz3SS; Tue, 29 Apr 2025 11:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TBfX0P045613; Tue, 29 Apr 2025 11:41:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBfXRO045610; Tue, 29 Apr 2025 11:41:33 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:41:33 GMT Message-Id: <202504291141.53TBfXRO045610@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: e56928111450 - stable/14 - iwlwifi: make mvm/d3.c compile again 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: e569281114500b58e04d64891a884286295d4cae Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e569281114500b58e04d64891a884286295d4cae commit e569281114500b58e04d64891a884286295d4cae Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:08:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:27 +0000 iwlwifi: make mvm/d3.c compile again Given we currently do not ompile the file by default make it compile again after the last vendor import. Sponsored by: The FreeBSD Foundation (cherry picked from commit 52a43041d2a864961f0a1a109a7a7c4c6ebed918) --- sys/contrib/dev/iwlwifi/mvm/d3.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/d3.c b/sys/contrib/dev/iwlwifi/mvm/d3.c index 0fbafd5f0dbb..11d9911eabb1 100644 --- a/sys/contrib/dev/iwlwifi/mvm/d3.c +++ b/sys/contrib/dev/iwlwifi/mvm/d3.c @@ -9,6 +9,7 @@ #include #if defined(__FreeBSD__) #include +#include #endif #include #include @@ -3702,7 +3703,11 @@ static ssize_t iwl_mvm_d3_test_read(struct file *file, char __user *user_buf, break; } +#if defined(__linux__) if (msleep_interruptible(100)) +#elif defined(__FreeBSD__) + if (linux_msleep_interruptible(100)) +#endif break; if (time_is_before_jiffies(end)) { @@ -3756,7 +3761,11 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file) while (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) && remaining_time > 0) { remaining_time--; +#if defined(__linux__) msleep(1000); +#elif defined(__FreeBSD__) + linux_msleep(1000); +#endif } if (remaining_time == 0)