Commit efcef265 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Damien Le Moal
Browse files

ata: add/use ata_taskfile::{error|status} fields 



Add the explicit error and status register fields to 'struct ata_taskfile'
using the anonymous *union*s ('struct ide_taskfile' had that for ages!) and
update the libata taskfile code accordingly. There should be no object code
changes resulting from that...

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent f7220eac

drivers/ata/acard-ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc) 
	if (qc->tf.protocol == ATA_PROT_PIO && qc->dma_dir == DMA_FROM_DEVICE &&

	    !(qc->flags & ATA_QCFLAG_FAILED)) {

		ata_tf_from_fis(rx_fis + RX_FIS_PIO_SETUP, &qc->result_tf);

		qc->result_tf.command = (rx_fis + RX_FIS_PIO_SETUP)[15];

		qc->result_tf.status = (rx_fis + RX_FIS_PIO_SETUP)[15];

	} else

		ata_tf_from_fis(rx_fis + RX_FIS_D2H_REG, &qc->result_tf);

drivers/ata/ahci.c

+2 −2
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, 


	/* clear D2H reception area to properly wait for D2H FIS */

	ata_tf_init(link->device, &tf);

	tf.command = ATA_BUSY;

	tf.status = ATA_BUSY;

	ata_tf_to_fis(&tf, 0, 0, d2h_fis);



	rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),
@@ -808,7 +808,7 @@ static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, 


		/* clear D2H reception area to properly wait for D2H FIS */

		ata_tf_init(link->device, &tf);

		tf.command = ATA_BUSY;

		tf.status = ATA_BUSY;

		ata_tf_to_fis(&tf, 0, 0, d2h_fis);



		rc = sata_link_hardreset(link, timing, deadline, &online,

drivers/ata/ahci_qoriq.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class, 


	/* clear D2H reception area to properly wait for D2H FIS */

	ata_tf_init(link->device, &tf);

	tf.command = ATA_BUSY;

	tf.status = ATA_BUSY;

	ata_tf_to_fis(&tf, 0, 0, d2h_fis);



	rc = sata_link_hardreset(link, timing, deadline, &online,

drivers/ata/ahci_xgene.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static int xgene_ahci_do_hardreset(struct ata_link *link, 
	do {

		/* clear D2H reception area to properly wait for D2H FIS */

		ata_tf_init(link->device, &tf);

		tf.command = ATA_BUSY;

		tf.status = ATA_BUSY;

		ata_tf_to_fis(&tf, 0, 0, d2h_fis);

		rc = sata_link_hardreset(link, timing, deadline, online,

				 ahci_check_ready);

drivers/ata/libahci.c

+2 −2
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class, 


	/* clear D2H reception area to properly wait for D2H FIS */

	ata_tf_init(link->device, &tf);

	tf.command = ATA_BUSY;

	tf.status = ATA_BUSY;

	ata_tf_to_fis(&tf, 0, 0, d2h_fis);



	rc = sata_link_hardreset(link, timing, deadline, online,
@@ -2033,7 +2033,7 @@ static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc) 
	if (qc->tf.protocol == ATA_PROT_PIO && qc->dma_dir == DMA_FROM_DEVICE &&

	    !(qc->flags & ATA_QCFLAG_FAILED)) {

		ata_tf_from_fis(rx_fis + RX_FIS_PIO_SETUP, &qc->result_tf);

		qc->result_tf.command = (rx_fis + RX_FIS_PIO_SETUP)[15];

		qc->result_tf.status = (rx_fis + RX_FIS_PIO_SETUP)[15];

	} else

		ata_tf_from_fis(rx_fis + RX_FIS_D2H_REG, &qc->result_tf);