From nobody Wed May 07 21:37:12 2025 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 4Zt7rn01QMz5vKp7; Wed, 07 May 2025 21:37:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7rm4SMQz3lyw; Wed, 07 May 2025 21:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653832; 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=K4+AiFcG8BpRurY4lu6dIxmRb6iQp+4Uq0X/UuGrNok=; b=AuJnwr3TvDxpHR2zau0zndxqTSioaTe4UgV0TlZ2YkbQ4EWwfAAeXtgNiGoW4gffFKuDh3 JxUW7IrGnldcIWw3Garjc7VN+YzQiRM4mAbG4WZ/oc778NiGbUtsqFdDTMKUMVe0wLvS1P itIMfMnlt/CG+kHS0FywT6f0eGn+gbeYsUemPB8nbZoxTvS9S4mbIEHr6xzHIyeVWadYCW /StXWq21y76b/nS4AZLypAUBgaKq9hmgTdq1vS6AQDD1RXrlIxs7JMURm+E6Ga90BxSDGV RGdbFuKHWSqfLlVeC+wXxNOzGifrSD0EcHmuL4g01ZPWvxsE8a5eOrKe1qnVBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653832; 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=K4+AiFcG8BpRurY4lu6dIxmRb6iQp+4Uq0X/UuGrNok=; b=l8Ga1OwSNxHeGSGo8tlZ9trufk2OOQagRiaKCSWtEwNpxitrL9oJtXHJLKnvQK8GBukWTE wP9ryVrrZGON1MZc4vpxL/gtK3D2SikowZWaPYxAIXAVm8rql8B5iMbGIWLrV5vEWTXZe6 EQ2bLi3xTAgW9td2tHHN6zUUdS5vHMjxuzwuxgSq+nSOA/yyCTYTVo6hLTbzI5tfd5ZcYX pB+aFyJ3HZzixZYq5j7KClRrUeTfJinwX8E+89Hw248wQr/y1wFUTYltdadrVzUGYnm6R4 BkYlwFFiBXFufbCwzFxdkkkXxDXlV1s2TTI+g7gpu5jBRI1vneYIE+Cm9k4qUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653832; a=rsa-sha256; cv=none; b=WYZAli9WmjzynqmRmy8uiq7V3Dkb0N1LAYcOl+YlYeG+92aspiZjVZwrO3IUmSav45EVch manEGdB7XTjEy4+2vbYw0jLwMaCMilUE5SUX7L83Dr1mdClpRkbh1HwjtHLLg5hMOp43nk PXs/4p6OpX4+sZybLInWQuLolJf6J3NmGJE0D3+5AxgFnlC6esubumUKeAzuy9HFVjhp+p 1JCBrCklNqhOP39sHxjeUVnuKY2KowV8eRYBgCrAppV2GXb/pCQde79zQ096J0jG6FhZgy M9YPHMQtOA8+JHrb0ihB5dtsidHJFaL/WKhSD4PqNuF5h/jbcEJJ4s+CqJOGCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zt7rm3wk7zmpm; Wed, 07 May 2025 21:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547LbCBU092157; Wed, 7 May 2025 21:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547LbCGb092154; Wed, 7 May 2025 21:37:12 GMT (envelope-from git) Date: Wed, 7 May 2025 21:37:12 GMT Message-Id: <202505072137.547LbCGb092154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 86de66a67432 - main - umass: Move INQUIRY and TEST UNIT READY quirks to umass_std_transform 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: 86de66a67432008fb92a1520931e6ec4365b770b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=86de66a67432008fb92a1520931e6ec4365b770b commit 86de66a67432008fb92a1520931e6ec4365b770b Author: Warner Losh AuthorDate: 2025-05-07 16:07:36 +0000 Commit: Warner Losh CommitDate: 2025-05-07 21:36:55 +0000 umass: Move INQUIRY and TEST UNIT READY quirks to umass_std_transform Only doing a short inquiry and converting TUR to START STOP UNIT are the same everywhere, so move those quirks to umass_std_transform. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D49472 --- sys/dev/usb/storage/umass.c | 100 ++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 64 deletions(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index 344a42f718fc..a5f1c891a509 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -2682,28 +2682,6 @@ umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, { sc->sc_transfer.cmd_len = cmd_len; - switch (cmd_ptr[0]) { - case TEST_UNIT_READY: - if (sc->sc_quirks & NO_TEST_UNIT_READY) { - DPRINTF(sc, UDMASS_SCSI, "Converted TEST_UNIT_READY " - "to START_UNIT\n"); - memset(sc->sc_transfer.cmd_data, 0, cmd_len); - sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; - sc->sc_transfer.cmd_data[4] = SSS_START; - return (true); - } - break; - - case INQUIRY: - /* - * some drives wedge when asked for full inquiry - * information. - */ - if (sc->sc_quirks & FORCE_SHORT_INQUIRY) { - sc->sc_transfer.cmd_data[4] = SHORT_INQUIRY_LENGTH; - } - break; - } return (true); } @@ -2759,27 +2737,12 @@ umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, * should work. Copy the command into the (zeroed out) * destination buffer. */ - case TEST_UNIT_READY: - if (sc->sc_quirks & NO_TEST_UNIT_READY) { - /* - * Some devices do not support this command. Start - * Stop Unit should give the same results - */ - DPRINTF(sc, UDMASS_UFI, "Converted TEST_UNIT_READY " - "to START_UNIT\n"); - - /* Zero the command data */ - memset(sc->sc_transfer.cmd_data, 0, UFI_COMMAND_LENGTH); - sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; - sc->sc_transfer.cmd_data[4] = SSS_START; - return (1); - } - break; case REZERO_UNIT: case REQUEST_SENSE: case FORMAT_UNIT: case INQUIRY: + case TEST_UNIT_READY: case START_STOP_UNIT: case SEND_DIAGNOSTIC: case PREVENT_ALLOW: @@ -2828,30 +2791,11 @@ umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, * should work. Copy the command into the destination * buffer. */ - case INQUIRY: - /* - * some drives wedge when asked for full inquiry - * information, so adjust the transfer length - */ - if (sc->sc_quirks & FORCE_SHORT_INQUIRY) { - sc->sc_transfer.cmd_data[4] = SHORT_INQUIRY_LENGTH; - } - break; - - case TEST_UNIT_READY: - if (sc->sc_quirks & NO_TEST_UNIT_READY) { - DPRINTF(sc, UDMASS_SCSI, "Converted TEST_UNIT_READY " - "to START_UNIT\n"); - memset(sc->sc_transfer.cmd_data, 0, ATAPI_COMMAND_LENGTH); - sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; - sc->sc_transfer.cmd_data[4] = SSS_START; - return (true); - } - break; - case REZERO_UNIT: case REQUEST_SENSE: + case INQUIRY: case START_STOP_UNIT: + case TEST_UNIT_READY: case SEND_DIAGNOSTIC: case PREVENT_ALLOW: case READ_CAPACITY: @@ -2905,18 +2849,46 @@ umass_no_transform(struct umass_softc *sc, uint8_t *cmd, static bool umass_std_transform(struct umass_softc *sc, union ccb *ccb, - uint8_t *cmd, uint8_t cmdlen) + uint8_t *cmd, uint8_t cmd_len) { - uint8_t retval; - if (cmd_len == 0 || cmd_len > sizeof(sc->sc_transfer.cmd_data)) { DPRINTF(sc, UDMASS_SCSI, "Invalid command length: %d bytes\n", cmd_len); return (false); /* failure */ } - memcpy(sc->sc_transfer.cmd_data, cmd_ptr, cmd_len); - if (sc->sc_transform(sc, cmd, cmdlen)) + /* + * Copy the CDB to the cmd_data buffer and then apply the common quirks + * to the code. We then pass the transformed command down to allow + * further transforms. + */ + memset(sc->sc_transfer.cmd_data, 0, sizeof(sc->sc_transfer.cmd_data)); + memcpy(sc->sc_transfer.cmd_data, cmd, cmd_len); + switch (cmd[0]) { + case TEST_UNIT_READY: + /* + * Some drive choke on TEST UNIT READY. Convert it to START STOP + * UNIT to get similar status. + */ + if ((sc->sc_quirks & NO_TEST_UNIT_READY) != 0) { + DPRINTF(sc, UDMASS_SCSI, + "Converted TEST_UNIT_READY to START_UNIT\n"); + memset(sc->sc_transfer.cmd_data, 0, cmd_len); + sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; + sc->sc_transfer.cmd_data[4] = SSS_START; + } + break; + + case INQUIRY: + /* + * some drives wedge when asked for full inquiry + * information. + */ + if ((sc->sc_quirks & FORCE_SHORT_INQUIRY) != 0) + sc->sc_transfer.cmd_data[4] = SHORT_INQUIRY_LENGTH; + break; + } + if (sc->sc_transform(sc, cmd, cmd_len)) return (true); /* Execute command */ xpt_freeze_devq(ccb->ccb_h.path, 1);