diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index fae8404..4bca85d 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -1161,9 +1161,12 @@ static int piix_sidpr_scr_write(struct ata_port *ap, unsigned int reg, u32 val) return -EINVAL; piix_sidpr_write(&ap->link.device[0], reg, val); + ata_port_printk(ap, KERN_INFO, "XXX SCR WRITE master %d:%x\n", reg, val); - if (ap->flags & ATA_FLAG_SLAVE_POSS) + if (ap->flags & ATA_FLAG_SLAVE_POSS) { piix_sidpr_write(&ap->link.device[1], reg, val); + ata_port_printk(ap, KERN_INFO, "XXX SCR WRITE slave %d:%x\n", reg, val); + } return 0; } diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index be95fdb..0350bec 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3966,7 +3966,13 @@ int ata_std_prereset(struct ata_link *link, unsigned long deadline) /* if SATA, resume link */ if (ap->flags & ATA_FLAG_SATA) { + ata_link_printk(link, KERN_INFO, "XXX about to resume\n"); + sata_print_link_status(link); rc = sata_link_resume(link, timing, deadline); + ata_link_printk(link, KERN_INFO, "XXX after resume\n"); + sata_print_link_status(link); + ssleep(1); + sata_print_link_status(link); /* whine about phy resume failure but proceed */ if (rc && rc != -EOPNOTSUPP) ata_link_printk(link, KERN_WARNING, "failed to resume " @@ -7172,7 +7178,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) ehi->probe_mask = (1 << ata_link_max_devices(&ap->link)) - 1; ehi->action |= ATA_EH_SOFTRESET; - ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; + ehi->flags |= ATA_EHI_NO_AUTOPSY/* | ATA_EHI_QUIET*/; ap->pflags &= ~ATA_PFLAG_INITIALIZING; ap->pflags |= ATA_PFLAG_LOADING; diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c