From nobody Thu Jan 13 18:57:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4F8A31965347; Thu, 13 Jan 2022 18:57:41 +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 4JZYb91lDmz3nV9; Thu, 13 Jan 2022 18:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642100261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G80My4pkaITaztdCA5/xjX4dnjTPUKqouqvLBpFRje0=; b=xCGCKyytFoxWLrb956ThvUilHzOuzx+alZ+QQXXxCv8cwd20G9uhZ/A2HagKTBKYdksROu WDhnXHUFvXT18sSW9lSjt2OC0azSAGcb0KNnWFGQv0vP4Rp/mCmrNXWgEuu9kmoqyav/dl sgTmew79OCfJ8AJD6EthbO7ElH75MX1CtPIzwumKK1b4yahpszzc6mNX7DEqqgaFpK8O0q obIFO8UhnAkNuQmBLUcj/YlSkrkttzkqQ7NUENqnq0SAub2bxq1Xs5UNV54Dan7Fe1oFre K01WBQ97Lb7Lnmv/5Ijb/wIBg1YnvmgD07j37gQZ6oxXg/YpYCa/okyEU/q5iA== 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 1B51C25374; Thu, 13 Jan 2022 18:57:41 +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 20DIvfo6029297; Thu, 13 Jan 2022 18:57:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20DIvfmn029296; Thu, 13 Jan 2022 18:57:41 GMT (envelope-from git) Date: Thu, 13 Jan 2022 18:57:41 GMT Message-Id: <202201131857.20DIvfmn029296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 2e19fae49fd4 - main - sesutil: Avoid setting reserved bits. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e19fae49fd4ab2360971463cee99a62198973b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642100261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G80My4pkaITaztdCA5/xjX4dnjTPUKqouqvLBpFRje0=; b=A04XmfvRL7YplgX9QXYUW01Yi91rpznBw3ScaS0Wva3WsIbIv7OxoNU3voFgvolARa8KfR BX/gRCkJ7x79TxkbYtjHHD9hWMa0acMuqOM3c68ZLBbOaFkHimmtNyKa5deuANVn+1Tx4h gwXebTN3as38lO769vwfzzUmOv+xLEsuUMNpvxxGQio5RcHqE5ZShWg8rxwtRrUlXRslu3 mcfXi7fDHlFr9V3541+0bua9YuJvAQU8LvtOhixnngFPvduZmSFtimU3+ZTXe7kpFxYZH7 ESE+9qRwdGG5yIhal6/JYvE10CizD9hT7EgopJgum7txwJxhpW+Z33rCgYW2iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642100261; a=rsa-sha256; cv=none; b=hQbr+l3ruuJTQi6+MQCIrpVQxl42DIvz1znxH//mPCPyaK8egXy22Bf1/MnPeB5WjsKDDx BEmkXT14KB0uY5pdNzSeI61OPpGfcXkrc2obEN67frh3mamMYxsH49A46HfY9/O5mreXGD Ukp5ijIC0rzStUOxCS2r3kjogEGqsvllk8BTLfDuwxxa+XvkiKysC1p6Ghz9G4GMtmoCSA NOn8SOylTMpBxUQtjBA9Vp2BYHwjHTYKudpA2QVmF8HK0DEtQO1QN+3qpCaDRPhn9VKBRX K4lE0GOUgd+U+Is4M+NzMR4LCNX7M4EwGUSEjDPYEYuTNFirby2ndK7AYk/+OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=2e19fae49fd4ab2360971463cee99a62198973b1 commit 2e19fae49fd4ab2360971463cee99a62198973b1 Author: Alexander Motin AuthorDate: 2022-01-13 18:45:28 +0000 Commit: Alexander Motin CommitDate: 2022-01-13 18:57:35 +0000 sesutil: Avoid setting reserved bits. Weird side of SES specification is that some bits have different meaning or semantics in status and control pages. This patch fixes non-zero writes into reserved fields, that caused errors on some enclosures when trying to control locate/fault LEDs, keeping other bits unchanged. MFC after: 2 weeks Sposonred by: iXsystems, Inc. --- sys/cam/scsi/scsi_ses.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/sesutil/sesutil.c | 3 ++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/sys/cam/scsi/scsi_ses.h b/sys/cam/scsi/scsi_ses.h index 86cc88ad27f1..8a1c7118f99a 100644 --- a/sys/cam/scsi/scsi_ses.h +++ b/sys/cam/scsi/scsi_ses.h @@ -2058,6 +2058,50 @@ union ses_status_element { uint8_t bytes[4]; }; +/* + * Convert element status into control as much as possible. + * Some bits have different meaning in status and control, + * while others have the same and should be preserved. + */ +static inline void +ses_status_to_ctrl(uint8_t type, uint8_t *bytes) +{ + /* Updated to SES4r5. */ + static const uint8_t mask[][4] = { + { 0x60, 0x00, 0x00, 0x00 }, /* UNSPECIFIED */ + { 0x60, 0x00, 0x4e, 0x3c }, /* DEVICE */ + { 0x60, 0xc0, 0x00, 0x60 }, /* POWER */ + { 0x60, 0xc0, 0x00, 0x60 }, /* COOLING/FAN */ + { 0x60, 0xc0, 0x00, 0x80 }, /* THERM */ + { 0x60, 0xc0, 0x00, 0x01 }, /* DOORLOCK */ + { 0x60, 0xc0, 0x00, 0x5f }, /* ALARM */ + { 0x60, 0xf0, 0x01, 0x00 }, /* ESSC */ + { 0x60, 0xc0, 0x00, 0x00 }, /* SCC */ + { 0x60, 0xc0, 0x00, 0x00 }, /* NVRAM */ + { 0x60, 0x00, 0x00, 0x00 }, /* INV_OP_REASON */ + { 0x60, 0x00, 0x00, 0xe0 }, /* UPS */ + { 0x60, 0xc0, 0xff, 0xff }, /* DISPLAY */ + { 0x60, 0xc0, 0x00, 0x00 }, /* KEYPAD */ + { 0x60, 0x80, 0x00, 0xff }, /* ENCLOSURE */ + { 0x60, 0xc0, 0x00, 0x10 }, /* SCSIXVR */ + { 0x60, 0x80, 0xff, 0xff }, /* LANGUAGE */ + { 0x60, 0xc0, 0x00, 0x01 }, /* COMPORT */ + { 0x60, 0xc0, 0x00, 0x00 }, /* VOM */ + { 0x60, 0xc0, 0x00, 0x00 }, /* AMMETER */ + { 0x60, 0xc0, 0x00, 0x01 }, /* SCSI_TGT */ + { 0x60, 0xc0, 0x00, 0x01 }, /* SCSI_INI*/ + { 0x60, 0xc0, 0x00, 0x00 }, /* SUBENC */ + { 0x60, 0xff, 0x4e, 0x3c }, /* ARRAY_DEV */ + { 0x60, 0xc0, 0x00, 0x00 }, /* SAS_EXP */ + { 0x60, 0x80, 0x00, 0x40 }, /* SAS_CONN */ + }; + + if (type >= sizeof(mask) / sizeof(mask[0])) + type = 0; + for (int i = 0; i < 4; i++) + bytes[i] &= mask[type][i]; +} + /*===================== SCSI SES Status Diagnostic Page =====================*/ struct ses_status_page { struct ses_page_hdr hdr; diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c index 9e6098e1da35..d78a9172e454 100644 --- a/usr.sbin/sesutil/sesutil.c +++ b/usr.sbin/sesutil/sesutil.c @@ -138,10 +138,11 @@ do_led(int fd, unsigned int idx, elm_type_t type, bool onoff, bool setfault) close(fd); xo_err(EXIT_FAILURE, "ENCIOC_GETELMSTAT"); } - slot = (struct ses_ctrl_dev_slot *) &o.cstat[0]; + ses_status_to_ctrl(type, &o.cstat[0]); switch (type) { case ELMTYP_DEVICE: case ELMTYP_ARRAY_DEV: + slot = (struct ses_ctrl_dev_slot *) &o.cstat[0]; ses_ctrl_common_set_select(&slot->common, 1); if (setfault) ses_ctrl_dev_slot_set_rqst_fault(slot, state);