tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'ata-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

Pull ata fixes from Niklas Cassel:

- Add a quirk for three different devices that have shown issues with
LPM (link power management). These devices appear to not implement
LPM properly, since we see command timeouts when enabling LPM. The
quirk disables LPM for these problematic devices. (Me)

- Do not apply the Intel PCS quirk on Alder Lake. The quirk is not
needed and was originally added by mistake when LPM support was
enabled for this AHCI controller. Enabling the quirk when not needed
causes the the controller to not be able to detect the connected
devices on some platforms.

* tag 'ata-6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
ata: libata-core: Add ATA_HORKAGE_NOLPM for Apacer AS340
ata: libata-core: Add ATA_HORKAGE_NOLPM for AMD Radeon S3 SSD
ata: libata-core: Add ATA_HORKAGE_NOLPM for Crucial CT240BX500SSD1
ata: ahci: Do not apply Intel PCS quirk on Intel Alder Lake

Linus Torvalds 58d89ee8 a693b9c9

options
unified split
Changed files
+8 -2
drivers
ata
ahci.c
libata-core.c
-1
drivers/ata/ahci.c
··· 429 429 { PCI_VDEVICE(INTEL, 0x02d7), board_ahci_pcs_quirk }, /* Comet Lake PCH RAID */ 430 430 /* Elkhart Lake IDs 0x4b60 & 0x4b62 https://sata-io.org/product/8803 not tested yet */ 431 431 { PCI_VDEVICE(INTEL, 0x4b63), board_ahci_pcs_quirk }, /* Elkhart Lake AHCI */ 432 - { PCI_VDEVICE(INTEL, 0x7ae2), board_ahci_pcs_quirk }, /* Alder Lake-P AHCI */ 433 432 434 433 /* JMicron 360/1/3/5/6, match class to avoid IDE function */ 435 434 { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+8 -1
drivers/ata/libata-core.c
··· 4136 4136 { "PIONEER BD-RW BDR-207M", NULL, ATA_HORKAGE_NOLPM }, 4137 4137 { "PIONEER BD-RW BDR-205", NULL, ATA_HORKAGE_NOLPM }, 4138 4138 4139 - /* Crucial BX100 SSD 500GB has broken LPM support */ 4139 + /* Crucial devices with broken LPM support */ 4140 4140 { "CT500BX100SSD1", NULL, ATA_HORKAGE_NOLPM }, 4141 + { "CT240BX500SSD1", NULL, ATA_HORKAGE_NOLPM }, 4141 4142 4142 4143 /* 512GB MX100 with MU01 firmware has both queued TRIM and LPM issues */ 4143 4144 { "Crucial_CT512MX100*", "MU01", ATA_HORKAGE_NO_NCQ_TRIM | ··· 4155 4154 { "Crucial_CT960M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | 4156 4155 ATA_HORKAGE_ZERO_AFTER_TRIM | 4157 4156 ATA_HORKAGE_NOLPM }, 4157 + 4158 + /* AMD Radeon devices with broken LPM support */ 4159 + { "R3SL240G", NULL, ATA_HORKAGE_NOLPM }, 4160 + 4161 + /* Apacer models with LPM issues */ 4162 + { "Apacer AS340*", NULL, ATA_HORKAGE_NOLPM }, 4158 4163 4159 4164 /* These specific Samsung models/firmware-revs do not handle LPM well */ 4160 4165 { "SAMSUNG MZMPC128HBFU-000MV", "CXM14M1Q", ATA_HORKAGE_NOLPM },