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

Commit 3f19859e authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: update ata_dev_try_classify() arguments 



Make ata_dev_try_classify() take a pointer to ata_device instead of
ata_port/port_number combination for consistency and add @present
argument.  @present indicates whether the device seems present during
reset.  It's the result of TF access during softreset and link
onlineness during hardreset.  @present will be used to improve
diagnostic failure handling.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7a234aff

drivers/ata/libata-core.c

+16 −14
Original line number Diff line number Diff line
@@ -701,8 +701,8 @@ unsigned int ata_dev_classify(const struct ata_taskfile *tf) 


/**

 *	ata_dev_try_classify - Parse returned ATA device signature

 *	@ap: ATA channel to examine

 *	@device: Device to examine (starting at zero)

 *	@dev: ATA device to classify (starting at zero)

 *	@present: device seems present

 *	@r_err: Value of error register on completion

 *

 *	After an event -- SRST, E.D.D., or SATA COMRESET -- occurs,
@@ -720,15 +720,15 @@ unsigned int ata_dev_classify(const struct ata_taskfile *tf) 
 *	RETURNS:

 *	Device type - %ATA_DEV_ATA, %ATA_DEV_ATAPI or %ATA_DEV_NONE.

 */



unsigned int

ata_dev_try_classify(struct ata_port *ap, unsigned int device, u8 *r_err)

unsigned int ata_dev_try_classify(struct ata_device *dev, int present,

				  u8 *r_err)

{

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

	struct ata_taskfile tf;

	unsigned int class;

	u8 err;



	ap->ops->dev_select(ap, device);

	ap->ops->dev_select(ap, dev->devno);



	memset(&tf, 0, sizeof(tf));
@@ -738,12 +738,12 @@ ata_dev_try_classify(struct ata_port *ap, unsigned int device, u8 *r_err) 
		*r_err = err;



	/* see if device passed diags: if master then continue and warn later */

	if (err == 0 && device == 0)

	if (err == 0 && dev->devno == 0)

		/* diagnostic fail : do nothing _YET_ */

		ap->link.device[device].horkage |= ATA_HORKAGE_DIAGNOSTIC;

		dev->horkage |= ATA_HORKAGE_DIAGNOSTIC;

	else if (err == 1)

		/* do nothing */ ;

	else if ((device == 0) && (err == 0x81))

	else if ((dev->devno == 0) && (err == 0x81))

		/* do nothing */ ;

	else

		return ATA_DEV_NONE;
@@ -3238,9 +3238,9 @@ void ata_bus_reset(struct ata_port *ap) 
	/*

	 * determine by signature whether we have ATA or ATAPI devices

	 */

	device[0].class = ata_dev_try_classify(ap, 0, &err);

	device[0].class = ata_dev_try_classify(&device[0], dev0, &err);

	if ((slave_possible) && (err != 0x81))

		device[1].class = ata_dev_try_classify(ap, 1, &err);

		device[1].class = ata_dev_try_classify(&device[1], dev1, &err);



	/* is double-select really necessary? */

	if (device[1].class != ATA_DEV_NONE)
@@ -3479,9 +3479,11 @@ int ata_std_softreset(struct ata_link *link, unsigned int *classes, 
	}



	/* determine by signature whether we have ATA or ATAPI devices */

	classes[0] = ata_dev_try_classify(ap, 0, &err);

	classes[0] = ata_dev_try_classify(&link->device[0],

					  devmask & (1 << 0), &err);

	if (slave_possible && err != 0x81)

		classes[1] = ata_dev_try_classify(ap, 1, &err);

		classes[1] = ata_dev_try_classify(&link->device[1],

						  devmask & (1 << 1), &err);



 out:

	DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]);
@@ -3600,7 +3602,7 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class, 


	ap->ops->dev_select(ap, 0);	/* probably unnecessary */



	*class = ata_dev_try_classify(ap, 0, NULL);

	*class = ata_dev_try_classify(link->device, 1, NULL);



	DPRINTK("EXIT, class=%u\n", *class);

	return 0;

drivers/ata/pata_scc.c

+4 −2
Original line number Diff line number Diff line
@@ -636,9 +636,11 @@ static int scc_std_softreset (struct ata_port *ap, unsigned int *classes, 
	}



	/* determine by signature whether we have ATA or ATAPI devices */

	classes[0] = ata_dev_try_classify(ap, 0, &err);

	classes[0] = ata_dev_try_classify(&ap->link.device[0],

					  devmask & (1 << 0), &err);

	if (slave_possible && err != 0x81)

		classes[1] = ata_dev_try_classify(ap, 1, &err);

		classes[1] = ata_dev_try_classify(&ap->link.device[1],

						  devmask & (1 << 1), &err);



 out:

	DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]);

drivers/ata/sata_mv.c

+1 −1
Original line number Diff line number Diff line
@@ -2248,7 +2248,7 @@ static void mv_phy_reset(struct ata_port *ap, unsigned int *class, 
	 */



	/* finally, read device signature from TF registers */

	*class = ata_dev_try_classify(ap, 0, NULL);

	*class = ata_dev_try_classify(ap->link.device, 1, NULL);



	writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);

include/linux/libata.h

+2 −1
Original line number Diff line number Diff line
@@ -781,7 +781,8 @@ extern void ata_port_queue_task(struct ata_port *ap, work_func_t fn, 
extern u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val,

			     unsigned long interval_msec,

			     unsigned long timeout_msec);

extern unsigned int ata_dev_try_classify(struct ata_port *, unsigned int, u8 *);

extern unsigned int ata_dev_try_classify(struct ata_device *dev, int present,

					 u8 *r_err);



/*

 * Default driver ops implementations