From owner-freebsd-bugs@FreeBSD.ORG Thu Apr 22 23:10:02 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 286C91065672 for ; Thu, 22 Apr 2010 23:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DA8968FC23 for ; Thu, 22 Apr 2010 23:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o3MNA1Hk027714 for ; Thu, 22 Apr 2010 23:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o3MNA1Gu027713; Thu, 22 Apr 2010 23:10:01 GMT (envelope-from gnats) Resent-Date: Thu, 22 Apr 2010 23:10:01 GMT Resent-Message-Id: <201004222310.o3MNA1Gu027713@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8754106564A for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: kern/145960: [patch] mfi(4) - make MFI_STAT_INVALID_STATUS error more apparent in mfi_aen_complete X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 23:10:02 -0000 >Number: 145960 >Category: kern >Synopsis: [patch] mfi(4) - make MFI_STAT_INVALID_STATUS error more apparent in mfi_aen_complete >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Apr 22 23:10:01 UTC 2010 >Closed-Date: >Last-Modified: >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: >Unformatted: