Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'ata-6.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Pull ata fixes from Niklas Cassel:
- Fix a regression where the enablement of the PHYs would be skipped
for device trees without any port child nodes (me)
- Revert ATA_QUIRK_NOLPM for Samsung SSD 870 QVO drives, as it stops
systems from entering lower package states. LPM works on newer
firmware versions. We will need a more refined quirk that only
targets the older firmware versions (me)
* tag 'ata-6.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
Revert "ata: libata-core: Add ATA_QUIRK_NOLPM for Samsung SSD 870 QVO drives"
ata: ahci: Make ahci_ignore_port() handle empty mask_port_map
+7
-6
+6
-2
drivers/ata/ahci.h
+6
-2
drivers/ata/ahci.h
···
386
386
static inline bool ahci_ignore_port(struct ahci_host_priv *hpriv,
387
387
unsigned int portid)
388
388
{
389
-
return portid >= hpriv->nports ||
390
-
!(hpriv->mask_port_map & (1 << portid));
389
+
if (portid >= hpriv->nports)
390
+
return true;
391
+
/* mask_port_map not set means that all ports are available */
392
+
if (!hpriv->mask_port_map)
393
+
return false;
394
+
return !(hpriv->mask_port_map & (1 << portid));
391
395
}
392
396
393
397
extern int ahci_ignore_sss;
+1
drivers/ata/libahci.c
+1
drivers/ata/libahci.c
-4
drivers/ata/libata-core.c
-4
drivers/ata/libata-core.c
···
4143
4143
{ "Samsung SSD 860*", NULL, ATA_QUIRK_NO_NCQ_TRIM |
4144
4144
ATA_QUIRK_ZERO_AFTER_TRIM |
4145
4145
ATA_QUIRK_NO_NCQ_ON_ATI },
4146
-
{ "Samsung SSD 870 QVO*", NULL, ATA_QUIRK_NO_NCQ_TRIM |
4147
-
ATA_QUIRK_ZERO_AFTER_TRIM |
4148
-
ATA_QUIRK_NO_NCQ_ON_ATI |
4149
-
ATA_QUIRK_NOLPM },
4150
4146
{ "Samsung SSD 870*", NULL, ATA_QUIRK_NO_NCQ_TRIM |
4151
4147
ATA_QUIRK_ZERO_AFTER_TRIM |
4152
4148
ATA_QUIRK_NO_NCQ_ON_ATI },