View | Details | Raw Unified | Return to bug 278533
Collapse All | Expand All

(-)00_libata-dev/drivers/ata/libata-core.c (-9 / +15 lines)
Lines 4695-4701 static void atapi_pio_bytes(struct ata_q Link Here
4695
	if (do_write != i_write)
4695
	if (do_write != i_write)
4696
		goto err_out;
4696
		goto err_out;
4697
4697
4698
	VPRINTK("ata%u: xfering %d bytes\n", ap->print_id, bytes);
4698
	if (ap->print_id == 2)
4699
		printk(KERN_ERR "ata%u: xfering %d bytes\n", ap->print_id, bytes);
4699
4700
4700
	__atapi_pio_bytes(qc, bytes);
4701
	__atapi_pio_bytes(qc, bytes);
4701
4702
Lines 4809-4816 int ata_hsm_move(struct ata_port *ap, st Link Here
4809
	WARN_ON(in_wq != ata_hsm_ok_in_wq(ap, qc));
4810
	WARN_ON(in_wq != ata_hsm_ok_in_wq(ap, qc));
4810
4811
4811
fsm_start:
4812
fsm_start:
4812
	DPRINTK("ata%u: protocol %d task_state %d (dev_stat 0x%X)\n",
4813
	if (ap->print_id == 2)
4813
		ap->print_id, qc->tf.protocol, ap->hsm_task_state, status);
4814
		printk(KERN_ERR "ata%u: protocol %d task_state %d (dev_stat 0x%X)\n",
4815
		       ap->print_id, qc->tf.protocol, ap->hsm_task_state, status);
4814
4816
4815
	switch (ap->hsm_task_state) {
4817
	switch (ap->hsm_task_state) {
4816
	case HSM_ST_FIRST:
4818
	case HSM_ST_FIRST:
Lines 4988-4995 fsm_start: Link Here
4988
		}
4990
		}
4989
4991
4990
		/* no more data to transfer */
4992
		/* no more data to transfer */
4991
		DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n",
4993
		if (ap->print_id == 2)
4992
			ap->print_id, qc->dev->devno, status);
4994
			printk(KERN_ERR "ata%u: dev %u command complete, drv_stat 0x%x\n",
4995
			       ap->print_id, qc->dev->devno, status);
4993
4996
4994
		WARN_ON(qc->err_mask);
4997
		WARN_ON(qc->err_mask);
4995
4998
Lines 5522-5529 inline unsigned int ata_host_intr (struc Link Here
5522
	struct ata_eh_info *ehi = &ap->eh_info;
5525
	struct ata_eh_info *ehi = &ap->eh_info;
5523
	u8 status, host_stat = 0;
5526
	u8 status, host_stat = 0;
5524
5527
5525
	VPRINTK("ata%u: protocol %d task_state %d\n",
5528
	if (ap->print_id == 2)
5526
		ap->print_id, qc->tf.protocol, ap->hsm_task_state);
5529
		printk(KERN_ERR "ata%u: protocol %d task_state %d\n",
5530
		       ap->print_id, qc->tf.protocol, ap->hsm_task_state);
5527
5531
5528
	/* Check whether we are expecting interrupt in this state */
5532
	/* Check whether we are expecting interrupt in this state */
5529
	switch (ap->hsm_task_state) {
5533
	switch (ap->hsm_task_state) {
Lines 5544-5551 inline unsigned int ata_host_intr (struc Link Here
5544
		    qc->tf.protocol == ATA_PROT_ATAPI_DMA) {
5548
		    qc->tf.protocol == ATA_PROT_ATAPI_DMA) {
5545
			/* check status of DMA engine */
5549
			/* check status of DMA engine */
5546
			host_stat = ap->ops->bmdma_status(ap);
5550
			host_stat = ap->ops->bmdma_status(ap);
5547
			VPRINTK("ata%u: host_stat 0x%X\n",
5551
5548
				ap->print_id, host_stat);
5552
			if (ap->print_id == 2)
5553
				printk(KERN_ERR "ata%u: host_stat 0x%X\n",
5554
				       ap->print_id, host_stat);
5549
5555
5550
			/* if it's not our irq... */
5556
			/* if it's not our irq... */
5551
			if (!(host_stat & ATA_DMA_INTR))
5557
			if (!(host_stat & ATA_DMA_INTR))
(-)00_libata-dev/drivers/ata/libata-scsi.c (-8 / +7 lines)
Lines 2729-2745 static inline ata_xlat_func_t ata_get_xl Link Here
2729
static inline void ata_scsi_dump_cdb(struct ata_port *ap,
2729
static inline void ata_scsi_dump_cdb(struct ata_port *ap,
2730
				     struct scsi_cmnd *cmd)
2730
				     struct scsi_cmnd *cmd)
2731
{
2731
{
2732
#ifdef ATA_DEBUG
2733
	struct scsi_device *scsidev = cmd->device;
2732
	struct scsi_device *scsidev = cmd->device;
2734
	u8 *scsicmd = cmd->cmnd;
2733
	u8 *scsicmd = cmd->cmnd;
2735
2734
2736
	DPRINTK("CDB (%u:%d,%d,%d) %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
2735
	if (ap->print_id == 2)
2737
		ap->print_id,
2736
		printk(KERN_ERR "CDB (%u:%d,%d,%d) %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
2738
		scsidev->channel, scsidev->id, scsidev->lun,
2737
		       ap->print_id,
2739
		scsicmd[0], scsicmd[1], scsicmd[2], scsicmd[3],
2738
		       scsidev->channel, scsidev->id, scsidev->lun,
2740
		scsicmd[4], scsicmd[5], scsicmd[6], scsicmd[7],
2739
		       scsicmd[0], scsicmd[1], scsicmd[2], scsicmd[3],
2741
		scsicmd[8]);
2740
		       scsicmd[4], scsicmd[5], scsicmd[6], scsicmd[7],
2742
#endif
2741
		       scsicmd[8]);
2743
}
2742
}
2744
2743
2745
static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
2744
static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,

Return to bug 278533