From nobody Wed Jan 03 15:34:06 2024 X-Original-To: dev-commits-src-branches@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 4T4tzy6gqPz566nV; Wed, 3 Jan 2024 15:34:06 +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 4T4tzy5s5fz4Z7F; Wed, 3 Jan 2024 15:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704296046; 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=x+84gRZo0ibSF+fyZffQl7PhDLkm//bfKQA2wZc9fWY=; b=H//zCnzfzd6sff2pKFHjmUTw1YeJEMzuFEPa8SzlhiVySQyTzZXr59MpYITJ07icRkSC6C Wdv3b8ZRfU3P61QwCRQoFUKErO7FBzAb/MS7vzxSmfmBvdFG/DjAtlBSTUvigwGxkp7SvR UBdp/kv/Iv3A7uwosi+vGEmbrTYeMAvsS4voj1V84LCxInbw1bBoEtPAqP/MHnn7JN10at dAxLju1YcqdAMea5clZKoJXcYodKzSPVYltbWgszV+AjT4yBpFy+smFXpWxQQTRCTn8fiR MDjq+Zm9ARHB3GS0/v5fESeogDOOj/AXB5uYJ2o8YBFdjr0hvahgxn6p62KubA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704296046; 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=x+84gRZo0ibSF+fyZffQl7PhDLkm//bfKQA2wZc9fWY=; b=WM2i9wSeQeIXWcW9A7Cn9xUsNnX+akp44sI4/3qJiaQO07trfF3nxGWVeDY7KBAdtk0Sxt O2w2kogyA2F55Hi3L3eqG+AYdaOg+afDNTrUm0RjoAh0zmLjGHQ5wbKX5czq9Ml1ERYzPf /Yr8IwXIZ+SBMirIA+Q4qar2ZSrhI8gQ5AbU6juwh8UTJrncCEfdfNUAKwyM59edVSnTqS p8S4E7QalMo3j6UQRLitmKrlBHI+ncvFMelj9wtxs+umpnXAOZDBl7Hg37I3U+343NYA8M QwjC5siSvsKUhSu1zBEb82gWzpKIweI2cPay2y5/NQBiIng0ZRHDRD9oIf9O7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704296046; a=rsa-sha256; cv=none; b=xs6fcZAIEpCnsTaK7F56qEw8a5qZ8BcS5+bgxd/4/RudV2LviayfJL1Ro3acw3eyHx/e2A 4/RlS832J3Er0ARph47J6ItoCWRy8GTPkzlcFFyEi/UAgKDzxfj97NDIMPCPYon/Cr6kFw F9oRUfZSyxo1raHVkx0tmNuUgu3XYhgx0pOkGYB5FB10iNn7Z4Ad/iz07weFtivFEOaqtb BhxiF4aBe5H8EOmR3mwxi02bCMDwsD4lBE7TaQ6pSDxVMHdokqe6xMysesC7ytCKki+2pQ 8+URlvjmeLPJhIIiHxG3UKvVNrisb9qNnjeqEBPqPiRYl00lFRgPBzKsQl5nYg== 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 4T4tzy4x6pzr0L; Wed, 3 Jan 2024 15:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403FY6T3014669; Wed, 3 Jan 2024 15:34:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403FY61r014666; Wed, 3 Jan 2024 15:34:06 GMT (envelope-from git) Date: Wed, 3 Jan 2024 15:34:06 GMT Message-Id: <202401031534.403FY61r014666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Kenneth D. Merry" Subject: git: ce6c84abe6c2 - stable/14 - camcontrol: add support for Toshiba drive firmware update List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce6c84abe6c2bc70c547dfa4ff6ed33917138f1d Auto-Submitted: auto-generated The branch stable/14 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=ce6c84abe6c2bc70c547dfa4ff6ed33917138f1d commit ce6c84abe6c2bc70c547dfa4ff6ed33917138f1d Author: Kenneth D. Merry AuthorDate: 2023-12-29 19:23:51 +0000 Commit: Kenneth D. Merry CommitDate: 2024-01-03 15:33:12 +0000 camcontrol: add support for Toshiba drive firmware update Thanks to Toshiba for providing the SCSI spec for their latest generation drives so I could confirm how they operate. The firmware download works in a pretty standard way, so this is a straightforward table addition. sbin/camcontrol/camcontrol.8: Document that Toshiba drives are supported for fwdownload, and that it was tested on TOSHIBA MG10SFA22TE 22TB drives. sbin/camcontrol/fwdownload.c: Add TOSHIBA to the known SCSI vendors list for fwdownload. Sponsored by: Spectra Logic (cherry picked from commit cd95f18c477ca30c3ba6f98577d321f56b1e8439) --- sbin/camcontrol/camcontrol.8 | 2 ++ sbin/camcontrol/fwdownload.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index ec9af63be63d..065dfbe8a1b4 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -1700,6 +1700,8 @@ Tested with Constellation ES (ST32000444SS), ES.2 (ST33000651SS) and ES.3 (ST1000NM0023) drives. .It SmrtStor Tested with 400GB Optimus SSDs (TXA2D20400GA6001). +.It TOSHIBA +Tested with 22TB MG10SFA22TE SAS drives. .El .Pp .Em WARNING! WARNING! WARNING! diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c index 25b98c804e3e..cfb8b70ccb76 100644 --- a/sbin/camcontrol/fwdownload.c +++ b/sbin/camcontrol/fwdownload.c @@ -84,6 +84,7 @@ typedef enum { VENDOR_SAMSUNG, VENDOR_SEAGATE, VENDOR_SMART, + VENDOR_TOSHIBA, VENDOR_ATA, VENDOR_UNKNOWN } fw_vendor_t; @@ -213,6 +214,8 @@ static struct fw_vendor vendors_list[] = { 0x8000, 0x07, 0x07, 0, 1, FW_TUR_READY, WB_TIMEOUT, FW_TIMEOUT_DEFAULT}, {VENDOR_SMART, "SmrtStor", T_DIRECT, 0x8000, 0x07, 0x07, 0, 1, FW_TUR_READY, WB_TIMEOUT, FW_TIMEOUT_DEFAULT}, + {VENDOR_TOSHIBA, "TOSHIBA", T_DIRECT, + 0x8000, 0x07, 0x07, 0, 1, FW_TUR_READY, WB_TIMEOUT, FW_TIMEOUT_DEFAULT}, {VENDOR_HGST, "WD", T_DIRECT, 0x1000, 0x07, 0x07, 1, 0, FW_TUR_READY, WB_TIMEOUT, FW_TIMEOUT_DEFAULT}, {VENDOR_HGST, "WDC", T_DIRECT,