The branch stable/15 has been updated by cperciva:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7cbc2604282f2a96c138305f3727a3064c1b5ed7

commit 7cbc2604282f2a96c138305f3727a3064c1b5ed7
Author:     Colin Percival <[email protected]>
AuthorDate: 2026-07-14 17:41:03 +0000
Commit:     Colin Percival <[email protected]>
CommitDate: 2026-09-15 22:49:41 +0000

    nvme: Add quirk for broken namespace-change log
    
    Add a QUIRK_EMPTY_NAMESPACE_CHANGED_LOG quirk which indicates that the
    nvme controller may not properly populate the namespace-changed log
    page.  If we receive a NVME_LOG_CHANGED_NAMESPACE page for a device
    with this quirk and the page is empty, probe all of the namespaces
    rather than none of them.
    
    Reviewed by:    imp
    MFC after:      1 week
    Sponsored by:   Amazon
    Differential Revision:  https://reviews.freebsd.org/D58231
    
    (cherry picked from commit 954098103ee287f39ecbf5d3144bcdfd16e7c41d)
---
 sys/dev/nvme/nvme_ctrlr.c   | 10 ++++++++++
 sys/dev/nvme/nvme_private.h |  1 +
 2 files changed, 11 insertions(+)

diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 9fb5b4d9eb9e..54158d29243b 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -1244,6 +1244,16 @@ nvme_ctrlr_aer_task(void *arg, int pending)
                        nvme_notify_ns(ctrlr, id);
                        ns->flags &= ~NVME_NS_CHANGED;
                }
+               if (nsl->ns[0] == 0 && ctrlr->quirks & 
QUIRK_EMPTY_NAMESPACE_CHANGED_LOG) {
+                       for (int i = 0; i < min(ctrlr->cdata.nn, 
NVME_MAX_NAMESPACES); i++) {
+                               struct nvme_namespace * ns = &ctrlr->ns[i];
+
+                               ns->flags |= NVME_NS_CHANGED;
+                               nvme_ns_construct(ns, i + 1, ctrlr);
+                               nvme_notify_ns(ctrlr, i + 1);
+                               ns->flags &= ~NVME_NS_CHANGED;
+                       }
+               }
        }
 
        /*
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index 20c13373a90d..f839e1b9a618 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -232,6 +232,7 @@ struct nvme_controller {
 #define        QUIRK_APPLE_SHARED_CID_SPACE            0x20    /* Admin/IO 
share a single CID table */
 #define        QUIRK_APPLE_NO_ASYNC_EVENT              0x40    /* Skip NVMe 
async event requests */
 #define        QUIRK_APPLE_SINGLE_VECTOR               0x80    /* Single MSI 
vector, one IO queue */
+#define        QUIRK_EMPTY_NAMESPACE_CHANGED_LOG       0x100   /* Change 
Namespace List Log is always empty */
 
        int                     resource_id;
        struct resource         *resource;

Reply via email to