[PATCH] libata irq-pio: merge the ata_dataout_task workqueue with ata_pio_task workqueue
- remove ap->dataout_task from struct ata_port - let ata_pio_task() handle the HSM_ST_FIRST state. - rename ata_dataout_task() to ata_pio_first_block() - replace the ata_dataout_task workqueue with ata_pio_task workqueue Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ======== Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
467b16d4be
commit
e27486db89
|
@ -3056,8 +3056,8 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ata_dataout_task - Write first data block to hardware
|
* ata_pio_first_block - Write first data block to hardware
|
||||||
* @_data: Port to which ATA/ATAPI device is attached.
|
* @ap: Port to which ATA/ATAPI device is attached.
|
||||||
*
|
*
|
||||||
* When device has indicated its readiness to accept
|
* When device has indicated its readiness to accept
|
||||||
* the data, this function sends out the CDB or
|
* the data, this function sends out the CDB or
|
||||||
|
@ -3070,9 +3070,8 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc)
|
||||||
* Kernel thread context (may sleep)
|
* Kernel thread context (may sleep)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void ata_dataout_task(void *_data)
|
static void ata_pio_first_block(struct ata_port *ap)
|
||||||
{
|
{
|
||||||
struct ata_port *ap = _data;
|
|
||||||
struct ata_queued_cmd *qc;
|
struct ata_queued_cmd *qc;
|
||||||
u8 status;
|
u8 status;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -3346,6 +3345,10 @@ fsm_start:
|
||||||
qc_completed = 0;
|
qc_completed = 0;
|
||||||
|
|
||||||
switch (ap->hsm_task_state) {
|
switch (ap->hsm_task_state) {
|
||||||
|
case HSM_ST_FIRST:
|
||||||
|
ata_pio_first_block(ap);
|
||||||
|
return;
|
||||||
|
|
||||||
case HSM_ST:
|
case HSM_ST:
|
||||||
ata_pio_block(ap);
|
ata_pio_block(ap);
|
||||||
break;
|
break;
|
||||||
|
@ -3796,10 +3799,10 @@ int ata_qc_issue_prot(struct ata_queued_cmd *qc)
|
||||||
if (qc->tf.flags & ATA_TFLAG_WRITE) {
|
if (qc->tf.flags & ATA_TFLAG_WRITE) {
|
||||||
/* PIO data out protocol */
|
/* PIO data out protocol */
|
||||||
ap->hsm_task_state = HSM_ST_FIRST;
|
ap->hsm_task_state = HSM_ST_FIRST;
|
||||||
queue_work(ata_wq, &ap->dataout_task);
|
queue_work(ata_wq, &ap->pio_task);
|
||||||
|
|
||||||
/* always send first data block using
|
/* always send first data block using
|
||||||
* the ata_dataout_task() codepath.
|
* the ata_pio_task() codepath.
|
||||||
*/
|
*/
|
||||||
} else {
|
} else {
|
||||||
/* PIO data in protocol */
|
/* PIO data in protocol */
|
||||||
|
@ -3826,7 +3829,7 @@ int ata_qc_issue_prot(struct ata_queued_cmd *qc)
|
||||||
/* send cdb by polling if no cdb interrupt */
|
/* send cdb by polling if no cdb interrupt */
|
||||||
if ((!(qc->dev->flags & ATA_DFLAG_CDB_INTR)) ||
|
if ((!(qc->dev->flags & ATA_DFLAG_CDB_INTR)) ||
|
||||||
(qc->tf.flags & ATA_TFLAG_POLLING))
|
(qc->tf.flags & ATA_TFLAG_POLLING))
|
||||||
queue_work(ata_wq, &ap->dataout_task);
|
queue_work(ata_wq, &ap->pio_task);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ATA_PROT_ATAPI_DMA:
|
case ATA_PROT_ATAPI_DMA:
|
||||||
|
@ -3838,7 +3841,7 @@ int ata_qc_issue_prot(struct ata_queued_cmd *qc)
|
||||||
|
|
||||||
/* send cdb by polling if no cdb interrupt */
|
/* send cdb by polling if no cdb interrupt */
|
||||||
if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR))
|
if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR))
|
||||||
queue_work(ata_wq, &ap->dataout_task);
|
queue_work(ata_wq, &ap->pio_task);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -4426,7 +4429,6 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,
|
||||||
ap->active_tag = ATA_TAG_POISON;
|
ap->active_tag = ATA_TAG_POISON;
|
||||||
ap->last_ctl = 0xFF;
|
ap->last_ctl = 0xFF;
|
||||||
|
|
||||||
INIT_WORK(&ap->dataout_task, ata_dataout_task, ap);
|
|
||||||
INIT_WORK(&ap->pio_task, ata_pio_task, ap);
|
INIT_WORK(&ap->pio_task, ata_pio_task, ap);
|
||||||
|
|
||||||
for (i = 0; i < ATA_MAX_DEVICES; i++)
|
for (i = 0; i < ATA_MAX_DEVICES; i++)
|
||||||
|
|
|
@ -346,8 +346,6 @@ struct ata_port {
|
||||||
struct ata_host_stats stats;
|
struct ata_host_stats stats;
|
||||||
struct ata_host_set *host_set;
|
struct ata_host_set *host_set;
|
||||||
|
|
||||||
struct work_struct dataout_task;
|
|
||||||
|
|
||||||
struct work_struct pio_task;
|
struct work_struct pio_task;
|
||||||
unsigned int hsm_task_state;
|
unsigned int hsm_task_state;
|
||||||
unsigned long pio_task_timeout;
|
unsigned long pio_task_timeout;
|
||||||
|
|
Loading…
Reference in New Issue