Latitude 7430 nvme SSD does not enter into suspend mode (D3cold) and causes battery drain

Hello,

I've recently started to use a Latitude 7430 and noticed a battery drain when suspending the laptop,
on both Windows and Linux. The BIOS is up-to-date (version 1.32.1).
I used the intel S0ixSelftestTool which outputs an error for the nvme ssd, which stays in D0 power mode whereas D3cold is expected. I checked the nvme ssd capabilities and it implements a low power state.
When completely disabling the NVMe port from BIOS and booting with Live USB, there is no problem anymore.

Has anyone faced a similar problem?

The fact that it happens on both Windows and Linux makes me think that it is related to the SSD or the laptop firmware, but the SSD declares the right power management capabilities (checked via nvme tool).
I've tried various kernel and BIOS configurations, without success.

(S0ixSelfTestTool log excerpt)

---Check whether your system supports S0ix or not---:

Low Power S0 Idle is:1
Your system supports low power S0 idle capability.

---Check whether intel_pmc_core sysfs files exit---:

The pmc_core debug sysfs files are OK on your system.

---Judge PC10, S0ix residency available status---:

Test system supports S0ix.y substate

S0ix substate before S2idle:
  S0i2.0 S0i3.0

S0ix substate residency before S2idle:
  0 0

Turbostat output: 
[...]

The PCIe bridge link power management state is:
0000:00:06.0 Link is in L0

The link power management state of PCIe bridge: 0000:00:06.0 is not expected. 
which is expected to be L1.1 or L1.2, or user would run this script again.

The L1SubCap of the failed 0000:00:06.0 is:
  L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM_L1.2+ ASPM_L1.1+ L1_PM_Substates+

The L1SubCtl1 of the failed 0000:00:06.0 is:
  L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1- ASPM_L1.2- ASPM_L1.1-

[...]
Checking PCI Devices D3 States:
[  626.619023] snd_hda_intel 0000:00:1f.3: PCI PM: Suspend power state: D3hot
[  626.619132] i915 0000:00:02.0: PCI PM: Suspend power state: D3hot
[  626.622881] xhci_hcd 0000:00:0d.0: PCI PM: Suspend power state: D3cold
[  626.638866] i801_smbus 0000:00:1f.4: PCI PM: Suspend power state: D0
[  626.638871] i801_smbus 0000:00:1f.4: PCI PM: Skipped
[  626.639012] intel_ish_ipc 0000:00:12.0: PCI PM: Suspend power state: D0
[  626.639020] intel_ish_ipc 0000:00:12.0: PCI PM: Skipped
[  626.650943] nvme 0000:01:00.0: PCI PM: Suspend power state: D3hot
[  626.651237] pcieport 0000:00:06.0: PCI PM: Suspend power state: D0
[  626.651247] pcieport 0000:00:06.0: PCI PM: Skipped
[  626.653532] serial 0000:00:16.3: PCI PM: Suspend power state: D3hot
[  626.653550] mei_me 0000:00:16.0: PCI PM: Suspend power state: D3hot
[  626.654840] proc_thermal_pci 0000:00:04.0: PCI PM: Suspend power state: D3hot
[  626.656446] intel-lpss 0000:00:15.1: PCI PM: Suspend power state: D3hot
[  626.657475] xhci_hcd 0000:00:14.0: PCI PM: Suspend power state: D3hot
[  626.658047] iwlwifi 0000:00:14.3: PCI PM: Suspend power state: D3hot
[  626.661460] thunderbolt 0000:00:0d.2: PCI PM: Suspend power state: D3cold

Checking PCI Devices tree diagram:
-[0000:00]-+-00.0  Intel Corporation Alder Lake-U15 Host and DRAM Controller
           +-02.0  Intel Corporation Alder Lake-UP3 GT2 [Iris Xe Graphics]
           +-04.0  Intel Corporation Alder Lake Innovation Platform Framework Processor Participant
           +-06.0-[01]----00.0  Kingston Technology Company, Inc. Device 5025
           +-07.0-[02-39]--
           +-07.1-[3a-71]--
           +-08.0  Intel Corporation 12th Gen Core Processor Gaussian & Neural Accelerator
           +-0d.0  Intel Corporation Alder Lake-P Thunderbolt 4 USB Controller
           +-0d.2  Intel Corporation Alder Lake-P Thunderbolt 4 NHI #0
           +-12.0  Intel Corporation Alder Lake-P Integrated Sensor Hub
           +-14.0  Intel Corporation Alder Lake PCH USB 3.2 xHCI Host Controller
           +-14.2  Intel Corporation Alder Lake PCH Shared SRAM
           +-14.3  Intel Corporation Alder Lake-P PCH CNVi WiFi
           +-15.0  Intel Corporation Alder Lake PCH Serial IO I2C Controller #0
           +-15.1  Intel Corporation Alder Lake PCH Serial IO I2C Controller #1
           +-16.0  Intel Corporation Alder Lake PCH HECI Controller
           +-16.3  Intel Corporation Alder Lake AMT SOL Redirection
           +-1f.0  Intel Corporation Alder Lake PCH eSPI Controller
           +-1f.3  Intel Corporation Alder Lake PCH-P High Definition Audio Controller
           +-1f.4  Intel Corporation Alder Lake PCH-P SMBus Host Controller
           \-1f.5  Intel Corporation Alder Lake-P PCH SPI Controller

The pcieport 0000:00:06.0 ASPM enable status:
  LnkCtl: ASPM L1 Enabled; RCB 64 bytes, Disabled- CommClk+

Pcieport is not in D3cold：          
0000:00:06.0

The pcieroot port 0000:00:06.0 ASPM setting is Enabled, its D state and Link PM are not expected,
please investigate or report a bug.

(dmesg log is too long for this post, but in any case there is no kernel error)