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

Commit ac3d6b86 authored by Robert Hancock's avatar Robert Hancock Committed by Jeff Garzik
Browse files

sata_nv: Cleanup taskfile setup 



This edits the taskfile setup to more closely match the way that libata
sends the taskfile for other controllers. This avoids putting taskfile writes
into the CPB buffer that are not needed according to the taskfile flags.

Signed-off-by: default avatarRobert Hancock <hancockr@shaw.ca>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 41949ed5

drivers/ata/sata_nv.c

+21 −20
Original line number Diff line number Diff line
@@ -662,30 +662,31 @@ static unsigned int nv_adma_tf_to_cpb(struct ata_taskfile *tf, __le16 *cpb) 
{

	unsigned int idx = 0;



	cpb[idx++] = cpu_to_le16((ATA_REG_DEVICE << 8) | tf->device | WNB);



	if ((tf->flags & ATA_TFLAG_LBA48) == 0) {

		cpb[idx++] = cpu_to_le16(IGN);

		cpb[idx++] = cpu_to_le16(IGN);

		cpb[idx++] = cpu_to_le16(IGN);

		cpb[idx++] = cpu_to_le16(IGN);

		cpb[idx++] = cpu_to_le16(IGN);

	}

	else {

		cpb[idx++] = cpu_to_le16((ATA_REG_ERR   << 8) | tf->hob_feature);

	if(tf->flags & ATA_TFLAG_ISADDR) {

		if (tf->flags & ATA_TFLAG_LBA48) {

			cpb[idx++] = cpu_to_le16((ATA_REG_ERR   << 8) | tf->hob_feature | WNB);

			cpb[idx++] = cpu_to_le16((ATA_REG_NSECT << 8) | tf->hob_nsect);

			cpb[idx++] = cpu_to_le16((ATA_REG_LBAL  << 8) | tf->hob_lbal);

			cpb[idx++] = cpu_to_le16((ATA_REG_LBAM  << 8) | tf->hob_lbam);

			cpb[idx++] = cpu_to_le16((ATA_REG_LBAH  << 8) | tf->hob_lbah);

	}

			cpb[idx++] = cpu_to_le16((ATA_REG_ERR    << 8) | tf->feature);

		} else

			cpb[idx++] = cpu_to_le16((ATA_REG_ERR    << 8) | tf->feature | WNB);

			

		cpb[idx++] = cpu_to_le16((ATA_REG_NSECT  << 8) | tf->nsect);

		cpb[idx++] = cpu_to_le16((ATA_REG_LBAL   << 8) | tf->lbal);

		cpb[idx++] = cpu_to_le16((ATA_REG_LBAM   << 8) | tf->lbam);

		cpb[idx++] = cpu_to_le16((ATA_REG_LBAH   << 8) | tf->lbah);

	}

	

	if(tf->flags & ATA_TFLAG_DEVICE)

		cpb[idx++] = cpu_to_le16((ATA_REG_DEVICE << 8) | tf->device);



	cpb[idx++] = cpu_to_le16((ATA_REG_CMD    << 8) | tf->command | CMDEND);

	

	while(idx < 12)

		cpb[idx++] = cpu_to_le16(IGN);



	return idx;

}