Skip to content

Commit 044610f

Browse files
committed
Merge tag 'ata-6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata
Pull ATA fixes from Damien Le Moal: - Add a missing command name definition for ata_get_cmd_name(), from me. - A fix to address a performance regression due to the default max_sectors queue limit for ATA devices connected to AHCI adapters being too small, from John. * tag 'ata-6.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata: ata: libata: Set __ATA_BASE_SHT max_sectors ata: libata-eh: Add missing command name
2 parents 4d099c3 + a357f7b commit 044610f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

drivers/ata/libata-eh.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2122,6 +2122,7 @@ const char *ata_get_cmd_name(u8 command)
21222122
{ ATA_CMD_WRITE_QUEUED_FUA_EXT, "WRITE DMA QUEUED FUA EXT" },
21232123
{ ATA_CMD_FPDMA_READ, "READ FPDMA QUEUED" },
21242124
{ ATA_CMD_FPDMA_WRITE, "WRITE FPDMA QUEUED" },
2125+
{ ATA_CMD_NCQ_NON_DATA, "NCQ NON-DATA" },
21252126
{ ATA_CMD_FPDMA_SEND, "SEND FPDMA QUEUED" },
21262127
{ ATA_CMD_FPDMA_RECV, "RECEIVE FPDMA QUEUED" },
21272128
{ ATA_CMD_PIO_READ, "READ SECTOR(S)" },

include/linux/libata.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,8 @@ extern const struct attribute_group *ata_common_sdev_groups[];
13821382
.proc_name = drv_name, \
13831383
.slave_destroy = ata_scsi_slave_destroy, \
13841384
.bios_param = ata_std_bios_param, \
1385-
.unlock_native_capacity = ata_scsi_unlock_native_capacity
1385+
.unlock_native_capacity = ata_scsi_unlock_native_capacity,\
1386+
.max_sectors = ATA_MAX_SECTORS_LBA48
13861387

13871388
#define ATA_SUBBASE_SHT(drv_name) \
13881389
__ATA_BASE_SHT(drv_name), \

0 commit comments

Comments
 (0)