From nobody Wed Apr 2 20:14:39 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 4ZSbgg4WPqz5rYV6; Wed, 02 Apr 2025 20:14:39 +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 4ZSbgg3bkGz3Vjd; Wed, 02 Apr 2025 20:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743624879; 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=2m1nqpEMNUoaXHxqgzZaNchB9EICGesOsafhIH9o+QY=; b=ATRMVqnfcu2eCsVRdnw+6pSCGEU4z/R36WjbNbc0E3drj7omDG694svg390eG6qzcpGBs7 8faowrrTUAChQiVUgPapIHpmccg+Wmd2lNviOterdK7qY6FZ6QKlTA//fbU6fGk6THEX35 vapmDBiNZ/ZVP8z0vF1YhMYmNqpW45Z/ukrunx2ta19xyAI0cH65iltOYqa0NfxjC782rz ZTTnnl52DizJD0n832kQSRzTqPqKe/1FcvzOUFnqQ/LKAenqNaHaVzHlenj5QcxF+CD36k nimUPgf58lVzaUZf0QXzjmr/gmSow4N4xDemrvQyqMKUTab+tWmWE8jsMrko3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743624879; a=rsa-sha256; cv=none; b=bIYLwDIaQjqJnPtVFG/hnqARpETueHXRCpjBxRBOLrXKUTR5oJVtVRwlpTBxa+OCJVnwDu KY7r+mPcAWq+l6PkxccIVcgAMvDcXCU9+88ErvWGfSgFLPRfHpIdhPZq9gJaLO5Edoo/0y j7cSiAv2XjVYUTOKn08Y+9XxmaBgnh1G2UGmvxNfO7t9SGnCYEpMftQ4sQvg3IQHLg5p4k 29dlBEUk0dSsDbeiFalC17XyW9kbHnrcD5inka67ha7FepGb5jDzF6C1UuXFJyfOpJ19jf UkU23ZAn0DXxb+o7qnapt+i04RX/9rR88ey9+DHBcT2/N2bePNtbhYSzkPJJ7w== 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=1743624879; 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=2m1nqpEMNUoaXHxqgzZaNchB9EICGesOsafhIH9o+QY=; b=rJaOJz7cmHrSJJaCDbQJp9eHOEhx4GrgCLxbnLHAYnGLmftaL9JylLEGMePnXtZMm2RK10 X8aFZOCb7l33K2cJSMsKXg2seHi7qTcpjKFzWXwzTL6VN9aBEy3DMSeifGXyukb9vX+vfM FOiS6TsZsqosbq3n7epBz/BDrpfClzOzwp7f3B4HSU39UL7oESjzUsZceFRGfg4g/cGDL2 dtbNN1pf8heLYsDpTZBt4/SvT73OhHUxuYeV0PM5WJTMgUt/v3Cbxtqpm2jjJmkpPe2I7a OC1eEp96+NwaPQzWK+/C38sb/xjTbcRuX3XVum1T/QOzszRJ0zy14WrNeHySDw== 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 4ZSbgg3B1FzX1S; Wed, 02 Apr 2025 20:14:39 +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 532KEdqf024260; Wed, 2 Apr 2025 20:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 532KEdTG024257; Wed, 2 Apr 2025 20:14:39 GMT (envelope-from git) Date: Wed, 2 Apr 2025 20:14:39 GMT Message-Id: <202504022014.532KEdTG024257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 9be42ee6c9c7 - main - pci: Make PCIe Eject timeout configurable 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9be42ee6c9c741052bdc49f13bc953bf88a24423 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9be42ee6c9c741052bdc49f13bc953bf88a24423 commit 9be42ee6c9c741052bdc49f13bc953bf88a24423 Author: Colin Percival AuthorDate: 2025-03-31 04:08:44 +0000 Commit: Colin Percival CommitDate: 2025-04-02 20:14:24 +0000 pci: Make PCIe Eject timeout configurable PCIe mandates a 5 second delay between when the "Attention Button" is pressed and when the associated device is detached; this is to allow for the button to be pressed a second time to cancel the ejection. On some systems this 5 second delay may not be desireable; so introduce a hw.pci.pcie_hp_detach_timeout sysctl (which can also be set as a loader tunable) which specifies the timeout in milliseconds (default 5000). If set to zero, the device is detached immediately. Reviewed by: jhb MFC after: 2 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49585 --- sys/dev/pci/pci_pci.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 10133c0c68d9..5e71a376604b 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -800,6 +800,11 @@ SYSCTL_INT(_hw_pci, OID_AUTO, enable_pcie_hp, CTLFLAG_RDTUN, &pci_enable_pcie_hp, 0, "Enable support for native PCI-express HotPlug."); +static sbintime_t pcie_hp_detach_timeout = 5 * SBT_1S; +SYSCTL_SBINTIME_MSEC(_hw_pci, OID_AUTO, pcie_hp_detach_timeout, CTLFLAG_RWTUN, + &pcie_hp_detach_timeout, + "Attention Button delay for PCI-express Eject."); + static void pcib_probe_hotplug(struct pcib_softc *sc) { @@ -1068,11 +1073,17 @@ pcib_pcie_intr_hotplug(void *arg) &sc->pcie_ab_task, NULL); } else if (old_slot_sta & PCIEM_SLOT_STA_PDS) { /* Only initiate detach sequence if device present. */ - device_printf(dev, - "Attention Button Pressed: Detaching in 5 seconds\n"); - sc->flags |= PCIB_DETACH_PENDING; - taskqueue_enqueue_timeout(taskqueue_bus, - &sc->pcie_ab_task, 5 * hz); + if (pcie_hp_detach_timeout != 0) { + device_printf(dev, + "Attention Button Pressed: Detaching in %ld ms\n", + (long)(pcie_hp_detach_timeout / SBT_1MS)); + sc->flags |= PCIB_DETACH_PENDING; + taskqueue_enqueue_timeout_sbt(taskqueue_bus, + &sc->pcie_ab_task, pcie_hp_detach_timeout, + SBT_1S, 0); + } else { + sc->flags |= PCIB_DETACHING; + } } } if (sc->pcie_slot_sta & PCIEM_SLOT_STA_PFD)