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

Commit 284b3b77 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Tejun Heo
Browse files

libata: NCQ encapsulation for ZAC MANAGEMENT OUT 



Add NCQ encapsulation for ZAC MANAGEMENT OUT and evaluate
NCQ Non-Data log pages to figure out if NCQ encapsulation
is supported.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 27708a95

drivers/ata/libata-core.c

+40 −3
Original line number Diff line number Diff line
@@ -2121,6 +2121,40 @@ static void ata_dev_config_ncq_send_recv(struct ata_device *dev) 
	}

}



static void ata_dev_config_ncq_non_data(struct ata_device *dev)

{

	struct ata_port *ap = dev->link->ap;

	unsigned int err_mask;

	int log_index = ATA_LOG_NCQ_NON_DATA * 2;

	u16 log_pages;



	err_mask = ata_read_log_page(dev, ATA_LOG_DIRECTORY,

				     0, ap->sector_buf, 1);

	if (err_mask) {

		ata_dev_dbg(dev,

			    "failed to get Log Directory Emask 0x%x\n",

			    err_mask);

		return;

	}

	log_pages = get_unaligned_le16(&ap->sector_buf[log_index]);

	if (!log_pages) {

		ata_dev_warn(dev,

			     "NCQ Send/Recv Log not supported\n");

		return;

	}

	err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_NON_DATA,

				     0, ap->sector_buf, 1);

	if (err_mask) {

		ata_dev_dbg(dev,

			    "failed to get NCQ Non-Data Log Emask 0x%x\n",

			    err_mask);

	} else {

		u8 *cmds = dev->ncq_non_data_cmds;



		memcpy(cmds, ap->sector_buf, ATA_LOG_NCQ_NON_DATA_SIZE);

	}

}



static int ata_dev_config_ncq(struct ata_device *dev,

			       char *desc, size_t desc_sz)

{
@@ -2165,9 +2199,12 @@ static int ata_dev_config_ncq(struct ata_device *dev, 
		snprintf(desc, desc_sz, "NCQ (depth %d/%d)%s", hdepth,

			ddepth, aa_desc);



	if ((ap->flags & ATA_FLAG_FPDMA_AUX) &&

	    ata_id_has_ncq_send_and_recv(dev->id))

	if ((ap->flags & ATA_FLAG_FPDMA_AUX)) {

		if (ata_id_has_ncq_send_and_recv(dev->id))

			ata_dev_config_ncq_send_recv(dev);

		if (ata_id_has_ncq_non_data(dev->id))

			ata_dev_config_ncq_non_data(dev);

	}



	return 0;

}

drivers/ata/libata-scsi.c

+13 −5
Original line number Diff line number Diff line
@@ -3506,11 +3506,19 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc) 


	reset_all = cdb[14] & 0x1;



	if (ata_ncq_enabled(qc->dev) &&

	    ata_fpdma_zac_mgmt_out_supported(qc->dev)) {

		tf->protocol = ATA_PROT_NCQ;

		tf->command = ATA_CMD_NCQ_NON_DATA;

		tf->hob_nsect = ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT;

		tf->nsect = qc->tag << 3;

		tf->auxiliary = sa | (reset_all & 0x1) << 8;

	} else {

		tf->protocol = ATA_PROT_NODATA;

		tf->command = ATA_CMD_ZAC_MGMT_OUT;

		tf->feature = sa;

		tf->hob_feature = reset_all & 0x1;



	}

	tf->lbah = (block >> 16) & 0xff;

	tf->lbam = (block >> 8) & 0xff;

	tf->lbal = block & 0xff;

drivers/ata/libata-trace.c

+3 −0
Original line number Diff line number Diff line
@@ -188,6 +188,9 @@ libata_trace_parse_subcmd(struct trace_seq *p, unsigned char cmd, 
		case ATA_SUBCMD_NCQ_NON_DATA_ZERO_EXT:

			trace_seq_printf(p, " ZERO_EXT");

			break;

		case ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT:

			trace_seq_printf(p, " ZAC_MGMT_OUT");

			break;

		}

		break;

	case ATA_CMD_ZAC_MGMT_IN:

include/linux/ata.h

+7 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ enum { 
	ATA_SUBCMD_NCQ_NON_DATA_ABORT_QUEUE  = 0x00,

	ATA_SUBCMD_NCQ_NON_DATA_SET_FEATURES = 0x05,

	ATA_SUBCMD_NCQ_NON_DATA_ZERO_EXT     = 0x06,

	ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT = 0x07,



	/* Subcmds for ATA_CMD_ZAC_MGMT_IN */

	ATA_SUBCMD_ZAC_MGMT_IN_REPORT_ZONES = 0x00,
@@ -333,6 +334,7 @@ enum { 
	/* READ_LOG_EXT pages */

	ATA_LOG_DIRECTORY	= 0x0,

	ATA_LOG_SATA_NCQ	= 0x10,

	ATA_LOG_NCQ_NON_DATA	  = 0x12,

	ATA_LOG_NCQ_SEND_RECV	  = 0x13,

	ATA_LOG_SATA_ID_DEV_DATA  = 0x30,

	ATA_LOG_SATA_SETTINGS	  = 0x08,
@@ -877,6 +879,11 @@ static inline bool ata_id_has_ncq_send_and_recv(const u16 *id) 
	return id[ATA_ID_SATA_CAPABILITY_2] & BIT(6);

}



static inline bool ata_id_has_ncq_non_data(const u16 *id)

{

	return id[ATA_ID_SATA_CAPABILITY_2] & BIT(5);

}



static inline bool ata_id_has_trim(const u16 *id)

{

	if (ata_id_major_version(id) >= 7 &&

include/linux/libata.h

+7 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ struct ata_device { 


	/* NCQ send and receive log subcommand support */

	u8			ncq_send_recv_cmds[ATA_LOG_NCQ_SEND_RECV_SIZE];

	u8			ncq_non_data_cmds[ATA_LOG_NCQ_NON_DATA_SIZE];



	/* error history */

	int			spdn_cnt;
@@ -1658,6 +1659,12 @@ static inline bool ata_fpdma_zac_mgmt_in_supported(struct ata_device *dev) 
		ATA_LOG_NCQ_SEND_RECV_ZAC_MGMT_IN_SUPPORTED);

}



static inline bool ata_fpdma_zac_mgmt_out_supported(struct ata_device *dev)

{

	return (dev->ncq_non_data_cmds[ATA_LOG_NCQ_NON_DATA_ZAC_MGMT_OFFSET] &

		ATA_LOG_NCQ_NON_DATA_ZAC_MGMT_OUT);

}



static inline void ata_qc_set_polling(struct ata_queued_cmd *qc)

{

	qc->tf.ctl |= ATA_NIEN;