From nobody Sat Nov 18 04:32:03 2023 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 4SXLTH5KHkz51lL0; Sat, 18 Nov 2023 04:32:03 +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 4SXLTH4T3mz3CYb; Sat, 18 Nov 2023 04:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700281923; 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=2tGGLQqCrTHZSnrwMpOaIK/1mecsgSWOyObIgeQMKog=; b=orUOY/2QZsAVKPdFeUwEqQTRgQXXI3lAxESPUiOlq4ywTbJ6tkA62lU2ja/kfV1mm4q2I9 KsEfnwtJBkkBwYUavmauZGkEOEXef1zXtPDInh7FqNVYHYtQ+3fsVNB3cAR7C+H1HChnbn 64bf+Im80eptElwMpH238Mz6iTWmSptA3QPgWkQd0L0vKvbf8oQhZtuWQkHPgHGyMwzuEk T2zXvbJbSXDQCSqNUTtAJaOwxLUAKh6oEmMU/wl09Ig8GsRn8mRrtxZdtRFaV6Jeztp4Oc dF144K8WoHr9MTGbcv/H2cNBQHoHGas8zd2oOozYgiY+dZzO3xksp5o1rXjpNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700281923; 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=2tGGLQqCrTHZSnrwMpOaIK/1mecsgSWOyObIgeQMKog=; b=VoYytop7pf+YS13EH4WMss++qHMqXYsp3bJ8GiBe0p8GjIfqrWEyRtaG8xoAe2Dgis8bDI vexrIHVMsxsNrAbR8z49/jJ/ie+IfKtHYWGHtI/eh7ovr2vCxCnRGJGt4GqMZXuuhp7j4q JB77jQmuEdlINU1zE6RWWE5ByNiZKTHIY3wXX4gh69eiQXESGZY7wbK9lDXjsZHC9fqsGn tVhRoL7xkkyh6vFy56hWVYo7fM7QuGxpPmIUW7lRluykNzElcuRos5WyuIdJcD+SGqo3rD XpUpSylfIKzGNOVFXhNh2aW9OlI77pOTdayfKuk8liNt7hAyOcFt6h8tScx5Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700281923; a=rsa-sha256; cv=none; b=sx2dD/g6trV26StoqqZbLoWhMJRXAPF/faXSKJmKBuJz2FfyFD1zrZeAMvkdv8j+k7SAjc JP5n3Fh6KqiPMDhUsP3gl2NOqmrS3RG7NL3/wr4nxKuLysfnARy6WgnQFV0ztICpisEqHp TPlbzmmJXvKfpcSAnIf3lRiZO88PwCUE4GzhWcw4NlCcGtXoMXZqUVU+lB2hmKo8jhuPEM vcnPs6IR4vz6ZOlGvwoeZ7uf+t+c2HumUDsdaPgifQfpnktwtQcpS0xl+UVJNZjixcJ9SC Ivh7VgmRUpCWcFAR3GcdhD2jwhtfdBoVWU+zy67wQ13YpHNA+5IV84/BZw6xAw== 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 4SXLTH3ZMsz1Bt6; Sat, 18 Nov 2023 04:32:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AI4W3Vg029179; Sat, 18 Nov 2023 04:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AI4W3YM029176; Sat, 18 Nov 2023 04:32:03 GMT (envelope-from git) Date: Sat, 18 Nov 2023 04:32:03 GMT Message-Id: <202311180432.3AI4W3YM029176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 34a6ad848fbf - main - nvme: Don't use version to listen for events for ns and fw changes 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34a6ad848fbf471773a430a7e457bf49816e756e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=34a6ad848fbf471773a430a7e457bf49816e756e commit 34a6ad848fbf471773a430a7e457bf49816e756e Author: Warner Losh AuthorDate: 2023-11-18 04:24:00 +0000 Commit: Warner Losh CommitDate: 2023-11-18 04:25:57 +0000 nvme: Don't use version to listen for events for ns and fw changes Instead, use the attribtue bits from the identification data to determine if we should listen to namespace changes and firmware activation. Should have no functional change, though we may stop listening for events that will never happen. Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 5d72f707d3b1..836d13eaa16d 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -826,8 +826,9 @@ nvme_ctrlr_configure_aer(struct nvme_controller *ctrlr) NVME_CRIT_WARN_ST_READ_ONLY | NVME_CRIT_WARN_ST_VOLATILE_MEMORY_BACKUP; if (ctrlr->cdata.ver >= NVME_REV(1, 2)) - ctrlr->async_event_config |= NVME_ASYNC_EVENT_NS_ATTRIBUTE | - NVME_ASYNC_EVENT_FW_ACTIVATE; + ctrlr->async_event_config |= + ctrlr->cdata.oaes & (NVME_ASYNC_EVENT_NS_ATTRIBUTE | + NVME_ASYNC_EVENT_FW_ACTIVATE); status.done = 0; nvme_ctrlr_cmd_get_feature(ctrlr, NVME_FEAT_TEMPERATURE_THRESHOLD,