]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'for-7.1/cxl-consolidate-endpoint' into cxl-for-next
authorDave Jiang <dave.jiang@intel.com>
Fri, 3 Apr 2026 19:15:11 +0000 (12:15 -0700)
committerDave Jiang <dave.jiang@intel.com>
Fri, 3 Apr 2026 19:15:11 +0000 (12:15 -0700)
Add code to ensure the endpoint has completed initialization before
usage.

cxl/pci: Check memdev driver binding status in cxl_reset_done()
cxl/pci: Hold memdev lock in cxl_event_trace_record()

1  2 
drivers/cxl/core/region.c
drivers/cxl/pci.c

Simple merge
index 84cff73b39e59c2123ce2cbb360d03947cd1c768,a5922116db2a8f3e25894c9b605ea22fd3ccca42..6e04c8ef19121936cec864dcb80b5d7c71653d37
@@@ -1056,11 -1043,11 +1056,14 @@@ static void cxl_reset_done(struct pci_d
         * that no longer exists.
         */
        guard(device)(&cxlmd->dev);
+       if (!cxlmd->dev.driver)
+               return;
        if (cxlmd->endpoint &&
            cxl_endpoint_decoder_reset_detected(cxlmd->endpoint)) {
 +              device_for_each_child(&cxlmd->endpoint->dev, NULL,
 +                                    cxl_endpoint_decoder_clear_reset_flags);
 +
                dev_crit(dev, "SBR happened without memory regions removal.\n");
                dev_crit(dev, "System may be unstable if regions hosted system memory.\n");
                add_taint(TAINT_USER, LOCKDEP_STILL_OK);