From owner-dev-commits-src-all@freebsd.org Mon Mar 8 00:11:39 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 24792555A6E; Mon, 8 Mar 2021 00:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DtzKR0RYpz4qsq; Mon, 8 Mar 2021 00:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 008CA1F7A1; Mon, 8 Mar 2021 00:11:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1280BcUh070228; Mon, 8 Mar 2021 00:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1280BcGT070227; Mon, 8 Mar 2021 00:11:38 GMT (envelope-from git) Date: Mon, 8 Mar 2021 00:11:38 GMT Message-Id: <202103080011.1280BcGT070227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: feef1047d646 - stable/13 - cam: add new ASC and ASCQ values related to drive depopulation MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: feef1047d646105b7ea5c7220ff7cd8e0ef6e3de Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2021 00:11:39 -0000 The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=feef1047d646105b7ea5c7220ff7cd8e0ef6e3de commit feef1047d646105b7ea5c7220ff7cd8e0ef6e3de Author: Warner Losh AuthorDate: 2021-02-26 18:43:35 +0000 Commit: Warner Losh CommitDate: 2021-03-07 23:07:44 +0000 cam: add new ASC and ASCQ values related to drive depopulation Add 04/25 Depopulation restoration in progress, 31/04 Depopulation failed, and 31/05 Depopulation restoration failed. These are defined in SPC-6r2 (though 31/4 was added in an earlier draft). They relate to different aspects of in-progress or failed depopulation removal and restoration commands. (cherry picked from commit 34d6961108bd47243236d086551459c52adabf49) --- sys/cam/scsi/scsi_all.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index 1d9b74e4fe0c..1b60003a4ac7 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -1191,6 +1191,9 @@ static struct asc_table_entry asc_table[] = { /* D */ { SST(0x04, 0x24, SS_FATAL | EBUSY, "Depopulation in progress") }, + /* D */ + { SST(0x04, 0x25, SS_FATAL | EBUSY, + "Depopulation restoration in progress") }, /* DTL WROMAEBKVF */ { SST(0x05, 0x00, SS_RDEF, "Logical unit does not respond to selection") }, @@ -2072,6 +2075,12 @@ static struct asc_table_entry asc_table[] = { /* D B */ { SST(0x31, 0x03, SS_FATAL | EIO, "SANITIZE command failed") }, + /* D */ + { SST(0x31, 0x04, SS_FATAL | EIO, + "Depopulation failed") }, + /* D */ + { SST(0x31, 0x05, SS_FATAL | EIO, + "Depopulation restoration failed") }, /* D W O BK */ { SST(0x32, 0x00, SS_RDEF, "No defect spare location available") },