From nobody Tue Mar 18 09:22:16 2025 X-Original-To: dev-commits-src-main@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 4ZH5vs1vWvz5qL6G; Tue, 18 Mar 2025 09:22:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vr3Zypz45GQ; Tue, 18 Mar 2025 09:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289736; 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=o09jWHKt/V5r1VzV3GD8acFk0q8WPIBlc+TOeROxvyI=; b=BI0LmnEmAnN02os0/SBZ+r2gxVjl7Ht/+GIrM0Y/y4iZY6A5c4ubabeZfkBkpiBxL8U0Ae d/bzwtHiIahd5a8ZfZqlImGHKNXGRSXEC/+GVe49SKoAwvVtgHcR7mKDOR1KdbjbodeTQb RX3n/nK24lk0fhwdGG3SdG+ba8Iy2jYAyah8N1McGagtG5tnwujhzW/Z4qwUH5awKl5bCl cH0X6QD5mHhHGMGwDvA9I60oOfi5ViYaUXeQsK4f6oo06foqADGjUlMnK2r23Zolu9dgJ9 yLNNikU1iXno5FKbQgB+R8lNIAd0k2Ksf4UTu4RkLPf03YY4e+8RNJaCU1m5Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289736; a=rsa-sha256; cv=none; b=RPd76Wia7VK7krlYHJY6t8+gGU7FoEuiS5xgQmHkfzyMqp1stolsdLE5vNvGe/Q2aV88QD pKz/dLgZJVcfw8Jg2DpSAifEDEkDHHQPJQqn/AE7dtFLqJKXQd+jZ90NnyD6Z4sAUx/gJO cP+vrzyUcPrhznMEbIMoaNNrEaTT6LgUdoG5Pc4L3vFUbUwXG4M7Vzxa42b6VYvNIzRTWj 8clUWMhiP9IhFngnG4YoOCL94kOzhrIo3mb2vzXx2XakuK//TD3yQkapoQg4oy7GagPF3a M6/rjek/+UkzUO8rwaPUnQ7U3MT0OQtdGx9oAIvoKaXXDnWLt+09Q/AXRpzpYg== 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=1742289736; 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=o09jWHKt/V5r1VzV3GD8acFk0q8WPIBlc+TOeROxvyI=; b=SOtYhrY8uQBlU9wc9diS0ZwhMd4kClVEJKEMg/vDaaBUV7Ko04iEn5G7Yq6QQg703ezdXe sLHcGCvXdw2MXl12EJwZ/obgUvYJ0coUyecOalURnlucsAgFCKe0HiT4seN1jcrd51qOv0 saTaCfCEG3CvkLS6sp3a98ADpmaUo+Z6uG8V99gs9I2KapynuF2dVdtYAXi/9pjMpSdR38 78d55Ocd2bTxXl5NQipDhSYPPMw+AT0hRNOiSBPFcO8anF9gLZzkk16B3bucWzTrosNFgp 6NemGdWj/zMHH1xqUMgfzZe1gbBeWSx7lxBAr4QH1gLFNKmWL4jAHmpxTzZjhg== 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 4ZH5vr2yxyzBrj; Tue, 18 Mar 2025 09:22:16 +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 52I9MGWH076324; Tue, 18 Mar 2025 09:22:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MGNw076321; Tue, 18 Mar 2025 09:22:16 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:16 GMT Message-Id: <202503180922.52I9MGNw076321@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: 52a43041d2a8 - main - iwlwifi: make mvm/d3.c compile again List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 52a43041d2a864961f0a1a109a7a7c4c6ebed918 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=52a43041d2a864961f0a1a109a7a7c4c6ebed918 commit 52a43041d2a864961f0a1a109a7a7c4c6ebed918 Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:08:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:01 +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 MFC after: 3 days --- 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)