Attachment 150401 Details for Bug 278533

[patch] Debug patch for port 2 only

01_debug.diff (text/plain), 3.38 KB, created by Albert Lee on 2007-07-10 07:39:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Albert Lee

Created: 2007-07-10 07:39:17 UTC

Size: 3.38 KB

patch

obsolete

>diff -Nrup 00_libata-dev/drivers/ata/libata-core.c 01_debug/drivers/ata/libata-core.c
>--- 00_libata-dev/drivers/ata/libata-core.c	2007-07-07 09:58:55.000000000 +0800
>+++ 01_debug/drivers/ata/libata-core.c	2007-07-10 15:31:58.000000000 +0800
>@@ -4695,7 +4695,8 @@ static void atapi_pio_bytes(struct ata_q
> 	if (do_write != i_write)
> 		goto err_out;
> 
>-	VPRINTK("ata%u: xfering %d bytes\n", ap->print_id, bytes);
>+	if (ap->print_id == 2)
>+		printk(KERN_ERR "ata%u: xfering %d bytes\n", ap->print_id, bytes);
> 
> 	__atapi_pio_bytes(qc, bytes);
> 
>@@ -4809,8 +4810,9 @@ int ata_hsm_move(struct ata_port *ap, st
> 	WARN_ON(in_wq != ata_hsm_ok_in_wq(ap, qc));
> 
> fsm_start:
>-	DPRINTK("ata%u: protocol %d task_state %d (dev_stat 0x%X)\n",
>-		ap->print_id, qc->tf.protocol, ap->hsm_task_state, status);
>+	if (ap->print_id == 2)
>+		printk(KERN_ERR "ata%u: protocol %d task_state %d (dev_stat 0x%X)\n",
>+		       ap->print_id, qc->tf.protocol, ap->hsm_task_state, status);
> 
> 	switch (ap->hsm_task_state) {
> 	case HSM_ST_FIRST:
>@@ -4988,8 +4990,9 @@ fsm_start:
> 		}
> 
> 		/* no more data to transfer */
>-		DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n",
>-			ap->print_id, qc->dev->devno, status);
>+		if (ap->print_id == 2)
>+			printk(KERN_ERR "ata%u: dev %u command complete, drv_stat 0x%x\n",
>+			       ap->print_id, qc->dev->devno, status);
> 
> 		WARN_ON(qc->err_mask);
> 
>@@ -5522,8 +5525,9 @@ inline unsigned int ata_host_intr (struc
> 	struct ata_eh_info *ehi = &ap->eh_info;
> 	u8 status, host_stat = 0;
> 
>-	VPRINTK("ata%u: protocol %d task_state %d\n",
>-		ap->print_id, qc->tf.protocol, ap->hsm_task_state);
>+	if (ap->print_id == 2)
>+		printk(KERN_ERR "ata%u: protocol %d task_state %d\n",
>+		       ap->print_id, qc->tf.protocol, ap->hsm_task_state);
> 
> 	/* Check whether we are expecting interrupt in this state */
> 	switch (ap->hsm_task_state) {
>@@ -5544,8 +5548,10 @@ inline unsigned int ata_host_intr (struc
> 		    qc->tf.protocol == ATA_PROT_ATAPI_DMA) {
> 			/* check status of DMA engine */
> 			host_stat = ap->ops->bmdma_status(ap);
>-			VPRINTK("ata%u: host_stat 0x%X\n",
>-				ap->print_id, host_stat);
>+
>+			if (ap->print_id == 2)
>+				printk(KERN_ERR "ata%u: host_stat 0x%X\n",
>+				       ap->print_id, host_stat);
> 
> 			/* if it's not our irq... */
> 			if (!(host_stat & ATA_DMA_INTR))
>diff -Nrup 00_libata-dev/drivers/ata/libata-scsi.c 01_debug/drivers/ata/libata-scsi.c
>--- 00_libata-dev/drivers/ata/libata-scsi.c	2007-07-07 09:58:55.000000000 +0800
>+++ 01_debug/drivers/ata/libata-scsi.c	2007-07-10 15:32:21.000000000 +0800
>@@ -2729,17 +2729,16 @@ static inline ata_xlat_func_t ata_get_xl
> static inline void ata_scsi_dump_cdb(struct ata_port *ap,
> 				     struct scsi_cmnd *cmd)
> {
>-#ifdef ATA_DEBUG
> 	struct scsi_device *scsidev = cmd->device;
> 	u8 *scsicmd = cmd->cmnd;
> 
>-	DPRINTK("CDB (%u:%d,%d,%d) %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
>-		ap->print_id,
>-		scsidev->channel, scsidev->id, scsidev->lun,
>-		scsicmd[0], scsicmd[1], scsicmd[2], scsicmd[3],
>-		scsicmd[4], scsicmd[5], scsicmd[6], scsicmd[7],
>-		scsicmd[8]);
>-#endif
>+	if (ap->print_id == 2)
>+		printk(KERN_ERR "CDB (%u:%d,%d,%d) %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
>+		       ap->print_id,
>+		       scsidev->channel, scsidev->id, scsidev->lun,
>+		       scsicmd[0], scsicmd[1], scsicmd[2], scsicmd[3],
>+		       scsicmd[4], scsicmd[5], scsicmd[6], scsicmd[7],
>+		       scsicmd[8]);
> }
> 
> static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,

Actions: View | Diff

Attachments on bug 278533: 145201 | 145362 | 145363 | 145779 | 145985 | 146256 | 146392 | 146692 | 147306 | 147483 | 147484 | 147515 | 150145 | 150327 | 150401 | 150596 | 156739 | 156868 | 173973 | 179366 | 184967 | 186964 | 187272