From nobody Wed Jan 03 15:35:32 2024 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 4T4v1d2n0mz566dC; Wed, 3 Jan 2024 15:35:33 +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 4T4v1d0Sbcz4ZN5; Wed, 3 Jan 2024 15:35:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704296133; 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=7FO997iV8MP7e7/uV6//6JMB5Thj/4VrWbWpaba8Z5Y=; b=GkXLa746eNh0sp1DX325Ldwh6aRZIuNqvi6Bdtf3pPAxrf+aXnCnAhwYq2ysY7ANQvMOdE M0KKOsF3CKX7VSRAabTO/f9SSg5w7MfDxeWPmojYQx6t9a+f9VFiE4k0wJ2UEWB+SuY0DZ 92eXl/UloKwwIo3UB3HEvgrO43jtX1qwY5HWzSrsQP1/HwC27tKLAfETp4uwLfgoborgqH 91XUZXhvX9HQX8Rtq/6jVVgC52vpmzYJk6DxDc8xDiB5FOcGZC4gsSv+ISytASAT6H1xIz BdQGsrlEz9VwJVqkvOX/aTbT90KBtVbQIR9IOXyz8zQKcTG6IQf7X1i314fJMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704296133; 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=7FO997iV8MP7e7/uV6//6JMB5Thj/4VrWbWpaba8Z5Y=; b=WSe02bUfOsMnAEdg0twhalYuJTdKy2Z1uT8yCuJb2RphKiSFU85/g9E2VFdRp4/BsA9s7J zUNCdKliPOD5BhHAPDgh+mfBFNo8h+CCbXsuFPQYt+1sSdwCRHU8TPwM6rxhDMoS1tV61G YNHxMH+GZtFp+mWWrJAJQTWSurXoY1zSOibfo37lWPG1HFejHkHuUFcz96bMmgCH3Jt3VB bjbWo8QdQQiQ6O7wNbHTon9XQxjzQte0IbtaGUiUdCLqvHM5CKcNK2RtPZVyNR65SPfwF1 JKgLoeFqMGnSUFa7VqAmM4uuEJmQ3SRD0rhFaM2mn7j2e8jKJjIuIZy0YXF2Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704296133; a=rsa-sha256; cv=none; b=GjFTJin9Lnm4u6H2snSIZo4QFW8xJvAjqojx7lX+gZuzovHWyPYCiahJocoyedbvcT3NjW 99i04NWlJuzSVpqGlVM7JqbPVTGvgyT+VTZJW+5Shl7Puhfi5TL8c+2JFiXkhcbcK5Ty1K H5ObNW2HwMwpD9KQRBL5SmID8XQpap4MzeIadKIne6ajzsU5fnQOPoR4M+WTqvOGwpjSQh Rt/PLRJsrUpmGfxzpqSe/Sj3d9viKfJp//AR1zdZtWU8zD1ZhP4EAzywWSDCWAPL/Hlb/u niKmenC2ETyVjwmuyK+MAd71pbbHlTSguWkhBP/9XXGOQkS9M9RQJfcC5+yQkw== 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 4T4v1c6dr6zrBJ; Wed, 3 Jan 2024 15:35:32 +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 403FZW38015012; Wed, 3 Jan 2024 15:35:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403FZWHq015009; Wed, 3 Jan 2024 15:35:32 GMT (envelope-from git) Date: Wed, 3 Jan 2024 15:35:32 GMT Message-Id: <202401031535.403FZWHq015009@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: 789a2b4e5c7d - stable/13 - camcontrol: add support for Toshiba drive firmware update 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: ken X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 789a2b4e5c7d88c424346fd326c475c31993d801 Auto-Submitted: auto-generated The branch stable/13 has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=789a2b4e5c7d88c424346fd326c475c31993d801 commit 789a2b4e5c7d88c424346fd326c475c31993d801 Author: Kenneth D. Merry AuthorDate: 2023-12-29 19:23:51 +0000 Commit: Kenneth D. Merry CommitDate: 2024-01-03 15:34:27 +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 fc5ba3a9f20c..e19a222a1cf7 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -1693,6 +1693,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 c91bb138bc7b..192ddd128836 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,