From nobody@FreeBSD.org  Thu Apr 22 23:02:41 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A8754106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Apr 2010 23:02:41 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 9696E8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Apr 2010 23:02:41 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o3MN2fwr052054
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 22 Apr 2010 23:02:41 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o3MN2fY7052053;
	Thu, 22 Apr 2010 23:02:41 GMT
	(envelope-from nobody)
Message-Id: <201004222302.o3MN2fY7052053@www.freebsd.org>
Date: Thu, 22 Apr 2010 23:02:41 GMT
From: Garrett Cooper <yaneurabeya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] mfi(4) - make MFI_STAT_INVALID_STATUS error more apparent in mfi_aen_complete
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         145960
>Category:       kern
>Synopsis:       [mfi] [patch] make MFI_STAT_INVALID_STATUS error more apparent in mfi_aen_complete
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jhb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 22 23:10:01 UTC 2010
>Closed-Date:    Fri Sep 16 17:44:58 UTC 2011
>Last-Modified:  Sun Feb 03 22:28:42 UTC 2013
>Originator:     Garrett Cooper
>Release:        9-CURRENT
>Organization:
Cisco Systems, Inc.
>Environment:
FreeBSD bioshock.cisco.com 9.0-CURRENT FreeBSD 9.0-CURRENT #7 r206031: Sat Apr 17 20:20:46 PDT 2010     root@bioshock.cisco.com:/usr/obj/usr/src/sys/BIOSHOCK  amd64
>Description:
The proposed change just makes the error code returned in mfi_aen_complete more apparent by changing 0xff to MFI_STAT_INVALID_STATUS, as MFI_STAT_INVALID_STATUS is 0xff:

$ grep -r MFI_STAT_INVALID_STATUS sys/dev/mfi/mfireg.h 
	MFI_STAT_INVALID_STATUS =	0xFF
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: sys/dev/mfi/mfi.c
===================================================================
--- sys/dev/mfi/mfi.c	(revision 206031)
+++ sys/dev/mfi/mfi.c	(working copy)
@@ -1149,7 +1149,8 @@
 	if (sc->mfi_aen_cm == NULL)
 		return;
 
-	if (sc->mfi_aen_cm->cm_aen_abort || hdr->cmd_status == 0xff) {
+	if (sc->mfi_aen_cm->cm_aen_abort ||
+	    hdr->cmd_status == MFI_STAT_INVALID_STATUS) {
 		sc->mfi_aen_cm->cm_aen_abort = 0;
 		aborted = 1;
 	} else {


>Release-Note:
>Audit-Trail:

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/145960: commit references a PR
Date: Thu, 14 Jul 2011 20:11:41 +0000 (UTC)

 Author: jhb
 Date: Thu Jul 14 20:11:27 2011
 New Revision: 224039
 URL: http://svn.freebsd.org/changeset/base/224039
 
 Log:
   Use MFI_STAT_* constants for cmd_status field values rather than magic
   numbers in a few places.
   
   PR:		bin/145960
   Submitted by:	gcooper
   MFC after:	1 week
 
 Modified:
   head/sys/dev/mfi/mfi.c
 
 Modified: head/sys/dev/mfi/mfi.c
 ==============================================================================
 --- head/sys/dev/mfi/mfi.c	Thu Jul 14 19:25:42 2011	(r224038)
 +++ head/sys/dev/mfi/mfi.c	Thu Jul 14 20:11:27 2011	(r224039)
 @@ -1149,7 +1149,8 @@ mfi_aen_complete(struct mfi_command *cm)
  	if (sc->mfi_aen_cm == NULL)
  		return;
  
 -	if (sc->mfi_aen_cm->cm_aen_abort || hdr->cmd_status == 0xff) {
 +	if (sc->mfi_aen_cm->cm_aen_abort ||
 +	    hdr->cmd_status == MFI_STAT_INVALID_STATUS) {
  		sc->mfi_aen_cm->cm_aen_abort = 0;
  		aborted = 1;
  	} else {
 @@ -1405,7 +1406,7 @@ mfi_bio_complete(struct mfi_command *cm)
  	hdr = &cm->cm_frame->header;
  	sc = cm->cm_sc;
  
 -	if ((hdr->cmd_status != 0) || (hdr->scsi_status != 0)) {
 +	if ((hdr->cmd_status != MFI_STAT_OK) || (hdr->scsi_status != 0)) {
  		bio->bio_flags |= BIO_ERROR;
  		bio->bio_error = EIO;
  		device_printf(sc->mfi_dev, "I/O error, status= %d "
 @@ -1549,7 +1550,7 @@ mfi_send_frame(struct mfi_softc *sc, str
  		cm->cm_timestamp = time_uptime;
  		mfi_enqueue_busy(cm);
  	} else {
 -		hdr->cmd_status = 0xff;
 +		hdr->cmd_status = MFI_STAT_INVALID_STATUS;
  		hdr->flags |= MFI_FRAME_DONT_POST_IN_REPLY_QUEUE;
  	}
  
 @@ -1574,14 +1575,14 @@ mfi_send_frame(struct mfi_softc *sc, str
  		return (0);
  
  	/* This is a polled command, so busy-wait for it to complete. */
 -	while (hdr->cmd_status == 0xff) {
 +	while (hdr->cmd_status == MFI_STAT_INVALID_STATUS) {
  		DELAY(1000);
  		tm -= 1;
  		if (tm <= 0)
  			break;
  	}
  
 -	if (hdr->cmd_status == 0xff) {
 +	if (hdr->cmd_status == MFI_STAT_INVALID_STATUS) {
  		device_printf(sc->mfi_dev, "Frame %p timed out "
  			      "command 0x%X\n", hdr, cm->cm_frame->dcmd.opcode);
  		return (ETIMEDOUT);
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: jhb 
State-Changed-When: Thu Jul 14 20:21:40 UTC 2011 
State-Changed-Why:  
I applied this fix to HEAD and fixed several other instances along the way. 


Responsible-Changed-From-To: freebsd-bugs->jhb 
Responsible-Changed-By: jhb 
Responsible-Changed-When: Thu Jul 14 20:21:40 UTC 2011 
Responsible-Changed-Why:  
I applied this fix to HEAD and fixed several other instances along the way. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145960 
State-Changed-From-To: patched->closed 
State-Changed-By: jhb 
State-Changed-When: Fri Sep 16 17:44:43 UTC 2011 
State-Changed-Why:  
Fix merged to 8. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145960 
>Unformatted:
