Re: [PATCH v3 0/10] CXL reset support for Type 2 devices

[Alison Schofield <alison.schofield@intel.com>]

On Tue, Jan 20, 2026 at 10:30:51PM +0000, Srirangan Madhavan wrote:
> Hi Alison,
> 
> Thank you for the heads‑up. I’ve respun the series as v4 and rebased it on pci/next as mentioned by the testbot. The v4 changes are limited to build‑fixes from the bot report + Reported‑by/Closes on the reset method patch. And the reproduce steps from testbot clear locally for me now.

pci/next? Ah, that's different than what we typically do in drivers/cxl.
I was expecting a mainline base commit - like 6.19-rc6. Anyway v4 still
has conflicts w that. What is the dependency that is on pci/next? I can
see the impact, appended below, but pci/next has a slew of things since
6.19-rc1.


drivers/cxl/pci.c:1090:6: error: redefinition of ‘cxl_is_type2_device’
 1090 | bool cxl_is_type2_device(struct pci_dev *pdev)
      |      ^~~~~~~~~~~~~~~~~~~
In file included from drivers/cxl/pci.c:11:
./include/linux/pci.h:1472:20: note: previous definition of ‘cxl_is_type2_device’ with type ‘bool(struct pci_dev *)’ {aka ‘_Bool(struct pci_dev *)’}
 1472 | static inline bool cxl_is_type2_device(struct pci_dev *dev)
      |                    ^~~~~~~~~~~~~~~~~~~
drivers/cxl/pci.c: In function ‘cxl_check_region_driver_bound’:
drivers/cxl/pci.c:1419:28: error: ‘cxl_region_rwsem’ undeclared (first use in this function); did you mean ‘cxl_region_ref’?
 1419 |         guard(rwsem_read)(&cxl_region_rwsem);
      |                            ^~~~~~~~~~~~~~~~
      |                            cxl_region_ref
drivers/cxl/pci.c:1419:28: note: each undeclared identifier is reported only once for each function it appears in
drivers/cxl/pci.c:1420:41: error: ‘struct cxl_region’ has no member named ‘driver’
 1420 |         if (cxld->region && cxld->region->driver)
      |                                         ^~
drivers/cxl/pci.c: In function ‘cxl_decoder_kill_region_iter’:
drivers/cxl/pci.c:1437:9: error: implicit declaration of function ‘cxl_decoder_kill_region_locked’; did you mean ‘cxl_decoder_kill_region_iter’? [-Werror=implicit-function-declaration]
 1437 |         cxl_decoder_kill_region_locked(cxled);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |         cxl_decoder_kill_region_iter
drivers/cxl/pci.c: In function ‘cxl_region_flush_device_caches’:
drivers/cxl/pci.c:1504:53: error: ‘struct cxl_dev_state’ has no member named ‘pdev’; did you mean ‘dev’?
 1504 |                 if (!target_cxlds || !target_cxlds->pdev)
      |                                                     ^~~~
      |                                                     dev
drivers/cxl/pci.c:1507:35: error: ‘struct cxl_dev_state’ has no member named ‘pdev’; did you mean ‘dev’?
 1507 |                 if (target_cxlds->pdev != target_pdev)
      |                                   ^~~~
      |                                   dev
drivers/cxl/pci.c: In function ‘cxl_reset_prepare_memdev’:
drivers/cxl/pci.c:1548:21: error: ‘cxl_region_rwsem’ undeclared (first use in this function); did you mean ‘cxl_region_ref’?
 1548 |         down_write(&cxl_region_rwsem);
      |                     ^~~~~~~~~~~~~~~~
      |                     cxl_region_ref
In file included from ./include/linux/spinlock.h:63,
                 from ./include/linux/sched.h:37,
                 from ./include/linux/percpu.h:12,
                 from ./arch/x86/include/asm/msr.h:16,
                 from ./arch/x86/include/asm/tsc.h:11,
                 from ./arch/x86/include/asm/timex.h:6,
                 from ./include/linux/timex.h:67,
                 from ./include/linux/time32.h:13,
                 from ./include/linux/time.h:60,
                 from ./include/linux/stat.h:19,
                 from ./include/linux/module.h:13,
                 from drivers/cxl/pci.c:6:
drivers/cxl/pci.c: In function ‘cxl_reset_cleanup_memdev’:
drivers/cxl/pci.c:1585:35: error: ‘cxl_region_rwsem’ undeclared (first use in this function); did you mean ‘cxl_region_ref’?
 1585 |         if (lockdep_is_held_type(&cxl_region_rwsem, -1))
      |                                   ^~~~~~~~~~~~~~~~
./include/linux/lockdep.h:253:61: note: in definition of macro ‘lockdep_is_held_type’
  253 | fine lockdep_is_held_type(lock, r)   lock_is_held_type(&(lock)->dep_map, (r))
      |                                                          ^~~~

drivers/cxl/pci.c: At top level:
drivers/cxl/pci.c:1665:5: error: redefinition of ‘cxl_reset_prepare_device’
 1665 | int cxl_reset_prepare_device(struct pci_dev *pdev)
      |     ^~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/pci.h:1477:19: note: previous definition of ‘cxl_reset_prepare_device’ with type ‘int(struct pci_dev *)’
 1477 | static inline int cxl_reset_prepare_device(struct pci_dev *pdev)
      |                   ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/cxl/pci.c:1696:6: error: redefinition of ‘cxl_reset_cleanup_device’
 1696 | void cxl_reset_cleanup_device(struct pci_dev *pdev)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~
./include/linux/pci.h:1482:20: note: previous definition of ‘cxl_reset_cleanup_device’ with type ‘void(struct pci_dev *)’
 1482 | static inline void cxl_reset_cleanup_device(struct pci_dev *pdev)
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors