From nobody Fri Mar 14 18:45:05 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 4ZDtb55Pjxz5qZmV; Fri, 14 Mar 2025 18:45:05 +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 4ZDtb54K4Lz3lDQ; Fri, 14 Mar 2025 18:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741977905; 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=/exwp9Aj1KRTNBnvDfEp74xbWphHG+RieGcSU30+tfw=; b=eWXQ46ockVgx92E9kc2dLTQpklnSpO7mQFDKbReMujkiKA0bZ1rbIOYTNQT3zj7TD1bW1f PtikoKLCoNXYWN8kIoWC4e2PX5YItqJae2RAgeAvtKzo4G5xwJYA3n8kfNkAPJTBjV20+7 5CjDXgogrqYnlND+ySa0pAHwhqZlvdst7LqZvVjNS30UHCc4KRsX2HWYASyZ4jsMdIYrN1 lqyOhQ/Ku8K4E3mW0ESZfVM2ju/I8fN8S3rDGkjdDJkfklyklGZiH4ks5mN8teEitjIPu4 aoCueGMiIfnaT+Mjqxs4v+N30owD7knewaHfVcb5Xbno4tYJLlHe4VJ26b8DeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741977905; a=rsa-sha256; cv=none; b=VWSsHtDA9679ZIs8TQA+56/jY3LZbloosTmUW5d4/ePRKIu3iz8Vh0iimKQqH3/2rgkbzM Ju3EuzJhlP1hyHT4XX3rjNdy+QmTkEddtZq3zEAtycU0/pXEKAztU1CyYj3UJ0JjlzGbAh UqkNQ9r3Sib0zIYULKfGKk7/zVmABrPHI/r6ju5FFOu4b15eZSpYmr7N2Vp/z2Xf3CeiP6 iWau3TjULib5JEkBrrFe9j1TVPVcTqF/F2ovBm+2Y4and0q1HxHl8Iw8MIuD36FP9ZMVak EY1SR6hNDZC+8d3X7kd4CO4IWq4LvgRo/YfsqEefn9kopfWeOXPqMW2rItPvlg== 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=1741977905; 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=/exwp9Aj1KRTNBnvDfEp74xbWphHG+RieGcSU30+tfw=; b=H7N/Ztf5nInWI0jUUqCXW3Xw07Uws6Cj4VW+Ts/vw+b9tLRJyKRRSUKFXWz/yHZlX4gMH9 YlDDgb7tXhB4xz6i3NE7L8LL8H4U2QPdCsUWcUfRRO9HzMlkKECedlVT/wcUy3n8tqZvjS m61M1zeQjBazDTCI90/bEW+Wwi7YxwStMh9ZzEPYk+wE+Yiek1OXapuUQjqSPHSwTi994P lTFMpnLZAlYKIefVcbrXfnCv9AftrCC9Yf8dsS8Nlw9dx8EtdNyGXj6Pjk7OQ2xL60k7k4 31c4lN2eGjsy6D+iYzYLM1/Upu6qwVZaTr19IxcB+88V18uWpPO9lOAZtzjbHw== 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 4ZDtb53bm6zwjv; Fri, 14 Mar 2025 18:45:05 +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 52EIj5sh056675; Fri, 14 Mar 2025 18:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52EIj5Qj056672; Fri, 14 Mar 2025 18:45:05 GMT (envelope-from git) Date: Fri, 14 Mar 2025 18:45:05 GMT Message-Id: <202503141845.52EIj5Qj056672@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: 55c3348ed78f - main - acpi_pci: Add quirk for DELAY-after-EJ0 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55c3348ed78fb1d0891e8bb51a8948f95da3560b Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=55c3348ed78fb1d0891e8bb51a8948f95da3560b commit 55c3348ed78fb1d0891e8bb51a8948f95da3560b Author: Colin Percival AuthorDate: 2025-03-06 05:22:33 +0000 Commit: Colin Percival CommitDate: 2025-03-14 18:35:35 +0000 acpi_pci: Add quirk for DELAY-after-EJ0 On some EC2 instances, there is a race between removing a device from the system and making the PCI bus stop reporting the presence of the device. As a result, a PCI BUS_RESCAN performed immediately after the _EJ0 method returns "sees" the device which is being ejected, which then causes problems later (e.g. we won't recognize a new device being plugged into that slot because we never knew it was vacant). On other operating systems the bus is synchronously marked as needing to be rescanned but the rescan does not occur until O(1) seconds later. Create a new ACPI_Q_DELAY_BEFORE_EJECT_RESCAN quirk and set it in EC2 AMIs, and add a 10 ms DELAY between _EJ0 and BUS_RESCAN when tht quirk is set. Reviewed by: jhb MFC after: 1 month Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D49252 --- release/tools/ec2.conf | 5 +++-- sys/dev/acpica/acpi_pci.c | 2 ++ sys/dev/acpica/acpivar.h | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index a8fc3854a0e2..4f78e5913e56 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -75,8 +75,9 @@ ec2_common() { # (in fact the PL061 has no pullup/pulldown resistors). Graviton 1 # through Graviton 3 have non-functional PCI _EJ0 and need a value # written to the PCI power status register in order to eject a - # device. - echo 'debug.acpi.quirks="24"' >> ${DESTDIR}/boot/loader.conf + # device. EC2 instances with PCI (not PCIe) buses need a short + # delay before rescanning upon device detach. + echo 'debug.acpi.quirks="56"' >> ${DESTDIR}/boot/loader.conf # Load the kernel module for the Amazon "Elastic Network Adapter" echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c index 97704111839b..b7a2bf70b4e0 100644 --- a/sys/dev/acpica/acpi_pci.c +++ b/sys/dev/acpica/acpi_pci.c @@ -432,6 +432,8 @@ acpi_pci_device_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context) acpi_name(h), AcpiFormatException(status)); return; } + if (acpi_quirks & ACPI_Q_DELAY_BEFORE_EJECT_RESCAN) + DELAY(10 * 1000); BUS_RESCAN(dev); bus_topo_unlock(); break; diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 830764434f48..d35504127c9c 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -232,6 +232,8 @@ extern struct mtx acpi_mutex; * as "PullUp" and they should be treated as "NoPull" instead. * ACPI_Q_CLEAR_PME_ON_DETACH: Specifies that PCIM_PSTAT_(PME & ~PMEENABLE) * should be written to the power status register as part of ACPI Eject. + * ACPI_Q_DELAY_BEFORE_EJECT_RESCAN: Specifies that we need a short (10ms) + * delay after _EJ0 returns before rescanning the PCI bus. */ extern int acpi_quirks; #define ACPI_Q_OK 0 @@ -240,6 +242,7 @@ extern int acpi_quirks; #define ACPI_Q_MADT_IRQ0 (1 << 2) #define ACPI_Q_AEI_NOPULL (1 << 3) #define ACPI_Q_CLEAR_PME_ON_DETACH (1 << 4) +#define ACPI_Q_DELAY_BEFORE_EJECT_RESCAN (1 << 5) #if defined(__amd64__) || defined(__i386__) /*