From nobody Fri Dec 29 19:25:42 2023 X-Original-To: dev-commits-src-main@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 4T1wMV6TlFz5531m; Fri, 29 Dec 2023 19:25:42 +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 4T1wMV5vJyz3Jtt; Fri, 29 Dec 2023 19:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703877942; 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=wTZ0nzNSKVd7GewhOZCuyZrdfz5scD5y2kuXb6VJK18=; b=VOCpUTN5+rlkno6ezgzovqezIOPMxmgqM3jiV0/kvh5o7ygzcwwBVaB9NTPBhekdWWwkFy AF3xqS7nT3p8smBsM/Su9c0ycdYtDAscLa0306neWH/ZFY6jrHYn+bfUwAs0HQ7tqrJJfs 9TwwVWOJShC90F8ZArr0fX+jHnG7W+gZeIA1Zs0yrysf+J4/IFXpHiptJToDyNJdFUAwiM upKuhi6HJWLB+jfME8Ue2wYvrFEqkNg8UzbOuhl62o5eA2kewBAS1Jvl3qYifaWnrFNrRl tuJ8HH1eeT6Mnq73kUbwlBPpgvm8fq+YSehN5j3BXC3lUGGTkGRcOwbbBkVspQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703877942; a=rsa-sha256; cv=none; b=a/lqWyNKfXh0TwdthLi2c4HtKrBnSexXw/brtn6kYgdfF4XvZBxHwbWEZ11iHVQsJNSM0V mjfOww4xHN1e6epwDz+SRD3/UHFU3i77o1IWQtzIwaNqGTsWuvXyClmGUOq5kX/ptYJNKh 6gWOEGxyoH8vdLVcJj2IL+auNeWtAWolMJOjVGmFmQ6I0mbtNeMGpo0tT1crz96W5PE+GB CRmox/+bwBhrjL1g1fvwXboN2nWAy0wKBlkdm+m/etjE6Q1ExYy/dzerpdCLEBoATJHnR+ Ylx+rvFxZbQ6kgGGMhHjnabvRTaeA359WS/D6BMQUM9fjsQKfN0KgUlIwoXKNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703877942; 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=wTZ0nzNSKVd7GewhOZCuyZrdfz5scD5y2kuXb6VJK18=; b=dHbp1dYml9cSjkva0rHjKABGSNRPFr9ClgO3sHVnUGC88FI4CEzxy09zyAgBBmH3/m9Ome Sezuy/nL5qPvthZMMIw/M4xHBOposp5KPtFvDJWKDLeR6/P3qKaECYxr/JnS2u6iFE4ESJ NsRPg5pcM8N8IKJ8hfV0FU3QPkfmp3YN59LKFKIP8Sqqwp6Tt122liyRLbWiuCt5mVTxJg 1+0Jx5GgcFQxdB/tDS4Ej0U9GHdBkwnpa6U/oBwsU70McIC1NAcAV0okz/k2w6biBYCYkZ s03QdciZ8KbfjuCbbE0PRqNGtdoHu8uX22MNXw0Yi+x2royBgx40hE840mXRdg== 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 4T1wMV4xvlz3jC; Fri, 29 Dec 2023 19:25:42 +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 3BTJPgvS004119; Fri, 29 Dec 2023 19:25:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTJPgDF004116; Fri, 29 Dec 2023 19:25:42 GMT (envelope-from git) Date: Fri, 29 Dec 2023 19:25:42 GMT Message-Id: <202312291925.3BTJPgDF004116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Kenneth D. Merry" Subject: git: cd95f18c477c - main - camcontrol: add support for Toshiba drive firmware update List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cd95f18c477ca30c3ba6f98577d321f56b1e8439 Auto-Submitted: auto-generated The branch main has been updated by ken: URL: https://cgit.FreeBSD.org/src/commit/?id=cd95f18c477ca30c3ba6f98577d321f56b1e8439 commit cd95f18c477ca30c3ba6f98577d321f56b1e8439 Author: Kenneth D. Merry AuthorDate: 2023-12-29 19:23:51 +0000 Commit: Kenneth D. Merry CommitDate: 2023-12-29 19:23:51 +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 MFC after: 3 days --- 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 0151376ff39f..ae6d896752fc 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 2ab18c93392b..569021c2bfc1 100644 --- a/sbin/camcontrol/fwdownload.c +++ b/sbin/camcontrol/fwdownload.c @@ -83,6 +83,7 @@ typedef enum { VENDOR_SAMSUNG, VENDOR_SEAGATE, VENDOR_SMART, + VENDOR_TOSHIBA, VENDOR_ATA, VENDOR_UNKNOWN } fw_vendor_t; @@ -212,6 +213,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,