Commit 044610f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4d099c33 a357f7b4

drivers/ata/libata-eh.c

+1 −0
Original line number Diff line number Diff line
@@ -2122,6 +2122,7 @@ const char *ata_get_cmd_name(u8 command) 
		{ ATA_CMD_WRITE_QUEUED_FUA_EXT, "WRITE DMA QUEUED FUA EXT" },

		{ ATA_CMD_FPDMA_READ,		"READ FPDMA QUEUED" },

		{ ATA_CMD_FPDMA_WRITE,		"WRITE FPDMA QUEUED" },

		{ ATA_CMD_NCQ_NON_DATA,		"NCQ NON-DATA" },

		{ ATA_CMD_FPDMA_SEND,		"SEND FPDMA QUEUED" },

		{ ATA_CMD_FPDMA_RECV,		"RECEIVE FPDMA QUEUED" },

		{ ATA_CMD_PIO_READ,		"READ SECTOR(S)" },

include/linux/libata.h

+2 −1
Original line number Diff line number Diff line
@@ -1382,7 +1382,8 @@ extern const struct attribute_group *ata_common_sdev_groups[]; 
	.proc_name		= drv_name,			\

	.slave_destroy		= ata_scsi_slave_destroy,	\

	.bios_param		= ata_std_bios_param,		\

	.unlock_native_capacity	= ata_scsi_unlock_native_capacity

	.unlock_native_capacity	= ata_scsi_unlock_native_capacity,\

	.max_sectors		= ATA_MAX_SECTORS_LBA48



#define ATA_SUBBASE_SHT(drv_name)				\

	__ATA_BASE_SHT(drv_name),				\