Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d51d5f3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tejun Heo
Browse files

libata: clarify log page naming / grouping 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent efe205a3

drivers/ata/libata-core.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -2226,7 +2226,7 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev) 
	}

	}





	err_mask = ata_read_log_page(dev,

	err_mask = ata_read_log_page(dev,

				     ATA_LOG_SATA_ID_DEV_DATA,

				     ATA_LOG_IDENTIFY_DEVICE,

				     ATA_LOG_SATA_SETTINGS,

				     ATA_LOG_SATA_SETTINGS,

				     ap->sector_buf,

				     ap->sector_buf,

				     1);

				     1);
@@ -2346,7 +2346,7 @@ static void ata_dev_config_zac(struct ata_device *dev) 
	if (!(dev->flags & ATA_DFLAG_ZAC))

	if (!(dev->flags & ATA_DFLAG_ZAC))

		return;

		return;





	if (!ata_log_supported(dev, ATA_LOG_SATA_ID_DEV_DATA)) {

	if (!ata_log_supported(dev, ATA_LOG_IDENTIFY_DEVICE)) {

		ata_dev_warn(dev, "ATA Identify Device Log not supported\n");

		ata_dev_warn(dev, "ATA Identify Device Log not supported\n");

		return;

		return;

	}

	}
@@ -2355,7 +2355,7 @@ static void ata_dev_config_zac(struct ata_device *dev) 
	 * Read IDENTIFY DEVICE data log, page 0, to figure out

	 * Read IDENTIFY DEVICE data log, page 0, to figure out

	 * if page 9 is supported.

	 * if page 9 is supported.

	 */

	 */

	err_mask = ata_read_log_page(dev, ATA_LOG_SATA_ID_DEV_DATA, 0,

	err_mask = ata_read_log_page(dev, ATA_LOG_IDENTIFY_DEVICE, 0,

				     identify_buf, 1);

				     identify_buf, 1);

	if (err_mask) {

	if (err_mask) {

		ata_dev_info(dev,

		ata_dev_info(dev,
@@ -2379,7 +2379,7 @@ static void ata_dev_config_zac(struct ata_device *dev) 
	/*

	/*

	 * Read IDENTIFY DEVICE data log, page 9 (Zoned-device information)

	 * Read IDENTIFY DEVICE data log, page 9 (Zoned-device information)

	 */

	 */

	err_mask = ata_read_log_page(dev, ATA_LOG_SATA_ID_DEV_DATA,

	err_mask = ata_read_log_page(dev, ATA_LOG_IDENTIFY_DEVICE,

				     ATA_LOG_ZONED_INFORMATION,

				     ATA_LOG_ZONED_INFORMATION,

				     identify_buf, 1);

				     identify_buf, 1);

	if (!err_mask) {

	if (!err_mask) {
@@ -2608,7 +2608,7 @@ int ata_dev_configure(struct ata_device *dev) 




			dev->flags |= ATA_DFLAG_DEVSLP;

			dev->flags |= ATA_DFLAG_DEVSLP;

			err_mask = ata_read_log_page(dev,

			err_mask = ata_read_log_page(dev,

						     ATA_LOG_SATA_ID_DEV_DATA,

						     ATA_LOG_IDENTIFY_DEVICE,

						     ATA_LOG_SATA_SETTINGS,

						     ATA_LOG_SATA_SETTINGS,

						     sata_setting,

						     sata_setting,

						     1);

						     1);

include/linux/ata.h

+7 −3
Original line number Original line Diff line number Diff line
@@ -338,9 +338,13 @@ enum { 
	ATA_LOG_SATA_NCQ	= 0x10,

	ATA_LOG_SATA_NCQ	= 0x10,

	ATA_LOG_NCQ_NON_DATA	= 0x12,

	ATA_LOG_NCQ_NON_DATA	= 0x12,

	ATA_LOG_NCQ_SEND_RECV	= 0x13,

	ATA_LOG_NCQ_SEND_RECV	= 0x13,

	ATA_LOG_SATA_ID_DEV_DATA  = 0x30,

	ATA_LOG_IDENTIFY_DEVICE	= 0x30,



	/* Identify device log pages: */

	ATA_LOG_SATA_SETTINGS	  = 0x08,

	ATA_LOG_SATA_SETTINGS	  = 0x08,

	ATA_LOG_ZONED_INFORMATION = 0x09,

	ATA_LOG_ZONED_INFORMATION = 0x09,



	/* Identify device SATA settings log:*/

	ATA_LOG_DEVSLP_OFFSET	  = 0x30,

	ATA_LOG_DEVSLP_OFFSET	  = 0x30,

	ATA_LOG_DEVSLP_SIZE	  = 0x08,

	ATA_LOG_DEVSLP_SIZE	  = 0x08,

	ATA_LOG_DEVSLP_MDAT	  = 0x00,

	ATA_LOG_DEVSLP_MDAT	  = 0x00,