git: f52154a2044a - main - hptrr: Better error recovery

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=f52154a2044a4d1f324952af05542f93fdf0a088

commit f52154a2044a4d1f324952af05542f93fdf0a088
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-02-05 01:31:25 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-02-05 01:38:02 +0000

    hptrr: Better error recovery
    
    This bug and https://www.mail-archive.com/freebsd-stable@freebsd.org/msg124458.html
    both have this fix. It turns unknown errors into an autosense failure, which causes
    us to grab the sense buffer manually. It also sets a condition that we use to retry
    timed out commands that jmg reports as being helpful.
    
    I'm torn on committing it. The code seems fine in terms of fixing
    things. But this is a 10-year-old bug with few other bugs and a short CC
    list for a driver that might go away in 15 anyway. I'm going to commit
    and close the bug, and MFC it in a week, unless someone complains (which
    seems unliekly, given the age of this hardware, I susepct most of it is
    out of service).
    
    Suggested by: jmg, Scott Long
    PR: 191135
    MFC After: 1 week
    Reviewed by: imp
---
 sys/dev/hptrr/hptrr_osm_bsd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c
index 42866c1d4297..78a051d54cf8 100644
--- a/sys/dev/hptrr/hptrr_osm_bsd.c
+++ b/sys/dev/hptrr/hptrr_osm_bsd.c
@@ -463,7 +463,7 @@ static void os_cmddone(PCOMMAND pCmd)
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	default:
-		ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;
+		ccb->ccb_h.status = CAM_AUTOSENSE_FAIL;
 		break;
 	}
 
@@ -557,7 +557,7 @@ static void hpt_scsi_io(PVBUS_EXT vbus_ext, union ccb *ccb)
 		ccb->ccb_h.target_id >= osm_max_targets ||
 		(ccb->ccb_h.flags & CAM_CDB_PHYS))
 	{
-		ccb->ccb_h.status = CAM_TID_INVALID;
+		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
 		xpt_done(ccb);
 		return;
 	}