Date: Mon, 2 Nov 2009 17:41:22 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 170086 for review Message-ID: <200911021741.nA2HfM5b083565@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=170086 Change 170086 by mav@mav_mavtest on 2009/11/02 17:41:17 Do not treat soft-reset timeout as fatal error. Let XPT handle it. Workaround ATI bug. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#73 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#73 (text+ko) ==== @@ -1221,6 +1221,13 @@ et = AHCI_ERR_TFE; break; } + /* Workaround for ATI SB600/SB700 chipsets. */ + if (ccb->ccb_h.target_id == 15 && + pci_get_vendor(device_get_parent(dev)) == 0x1002 && + (ATA_INL(ch->r_mem, AHCI_P_IS) & AHCI_P_IX_IPM)) { + et = AHCI_ERR_TIMEOUT; + break; + } } if (timeout && (count >= timeout)) { device_printf(ch->dev, @@ -1383,7 +1390,10 @@ ccb->ccb_h.status |= CAM_UNCOR_PARITY; break; case AHCI_ERR_TIMEOUT: - ch->fatalerr = 1; + /* Do no treat soft-reset timeout as fatal here. */ + if (ccb->ccb_h.func_code != XPT_ATA_IO || + !(ccb->ataio.cmd.flags & CAM_ATAIO_CONTROL)) + ch->fatalerr = 1; if (!ch->readlog) { xpt_freeze_simq(ch->sim, 1); ccb->ccb_h.status &= ~CAM_STATUS_MASK;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911021741.nA2HfM5b083565>